From: Scott Murray Date: Wed, 7 Dec 2022 09:45:42 +0000 (+0900) Subject: Update cluster network configuration X-Git-Tag: 14.0.3~38 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=b7ea2af70b543fcea0f3c9a83cbd6b12c779b2d1;p=AGL%2Fmeta-agl-demo.git Update cluster network configuration Update configuration files as appropriate with the IVI board as 192.168.10.2 and the cluster as 192.168.10.3. This includes removing the cluster-connman-conf network configuration recipe. Bug-AGL: SPEC-4632 Change-Id: I60011a3615152a036057ca1a98d3916c67a3cd1e Signed-off-by: Scott Murray --- diff --git a/recipes-connectivity/cluster-connman-conf/cluster-connman-conf/cluster.config b/recipes-connectivity/cluster-connman-conf/cluster-connman-conf/cluster.config deleted file mode 100644 index 6ce2a76f5..000000000 --- a/recipes-connectivity/cluster-connman-conf/cluster-connman-conf/cluster.config +++ /dev/null @@ -1,3 +0,0 @@ -[service_cluster_ethernet] -Type=ethernet -IPv4=@CLUSTER_DEMO_SERVER_IP@/255.255.255.0 diff --git a/recipes-connectivity/cluster-connman-conf/cluster-connman-conf_1.0.bb b/recipes-connectivity/cluster-connman-conf/cluster-connman-conf_1.0.bb deleted file mode 100644 index a6610b75f..000000000 --- a/recipes-connectivity/cluster-connman-conf/cluster-connman-conf_1.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Cluster demo connman configuration" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI = "file://cluster.config" - -CLUSTER_DEMO_SERVER_IP ?= "192.168.20.99" - -do_install() { - install -d ${D}${localstatedir}/lib/connman - sed "s/@CLUSTER_DEMO_SERVER_IP@/${CLUSTER_DEMO_SERVER_IP}/g" \ - ${WORKDIR}/cluster.config > ${D}${localstatedir}/lib/connman/cluster.config -} - -FILES:${PN} += "${localstatedir}/*" diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf b/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf index b24c64e2e..922ab0a66 100644 --- a/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf +++ b/recipes-demo/cluster-dashboard/cluster-dashboard/cluster-dashboard.conf @@ -1,3 +1,3 @@ [vis-client] -server = "192.168.20.93" +server = "192.168.10.2" authorization = "/etc/xdg/AGL/cluster-dashboard/cluster-dashboard.token" diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb index a950ef408..9836207f0 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo-cluster-support.bb @@ -12,6 +12,5 @@ PACKAGES = "\ RDEPENDS:${PN} += "\ packagegroup-agl-demo-platform \ tbtnavi \ - cluster-demo-network-config \ kuksa-val-agl-demo-cluster \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-networking.bb b/recipes-platform/packagegroups/packagegroup-agl-networking.bb index c3f9c4057..74f7757a5 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-networking.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-networking.bb @@ -17,6 +17,5 @@ RDEPENDS:${PN}:append = " \ connman \ connman-client \ connman-tools \ - cluster-connman-conf \ iproute2 \ "