From 122a4cd73c49be91754cdb8cdfbaa4512a2b5a11 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 13 Feb 2015 15:27:24 +0100 Subject: [PATCH 1/3] [idu]: br0.6:0 address should be _static_, not _manual_ --- recipes-bsp/netbase/netbase/sysmocom-idu/interfaces | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/netbase/netbase/sysmocom-idu/interfaces b/recipes-bsp/netbase/netbase/sysmocom-idu/interfaces index 800d2b2714..2503cd8882 100644 --- a/recipes-bsp/netbase/netbase/sysmocom-idu/interfaces +++ b/recipes-bsp/netbase/netbase/sysmocom-idu/interfaces @@ -39,6 +39,6 @@ iface br0.6 inet static # 172.16.1.1 is the service IP address for SOBMGMT auto br0.6:0 -iface br0.6:0 inet manual +iface br0.6:0 inet static address 172.16.1.1 netmask 255.255.255.255 From 396d421838c81cb9fd6364025a3cc9b2a094cc61 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 13 Feb 2015 15:34:49 +0100 Subject: [PATCH 2/3] ifupdown: Always ignore errors for busybox/Poky --exit-on-error is not supported by the busybox run-parts and the easiest way is to make the ignore-errors option the default. I didn't test the change on the device but is looks sound. --- .../ifupdown/files/busybox-yocto-compat.patch | 14 ++++++++++++++ recipes-extra/ifupdown/ifupdown_0.7.52.bb | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 recipes-extra/ifupdown/files/busybox-yocto-compat.patch diff --git a/recipes-extra/ifupdown/files/busybox-yocto-compat.patch b/recipes-extra/ifupdown/files/busybox-yocto-compat.patch new file mode 100644 index 0000000000..d5cd6ddadf --- /dev/null +++ b/recipes-extra/ifupdown/files/busybox-yocto-compat.patch @@ -0,0 +1,14 @@ +Index: ifupdown-0.7.52/execute.c +=================================================================== +--- ifupdown-0.7.52.orig/execute.c ++++ ifupdown-0.7.52/execute.c +@@ -168,8 +168,7 @@ int execute_scripts(interface_defn * ifd + return 1; + + char buf[100]; +- snprintf(buf, sizeof(buf), "run-parts %s%s/etc/network/if-%s.d", +- ignore_failures ? "" : "--exit-on-error ", ++ snprintf(buf, sizeof(buf), "run-parts %s/etc/network/if-%s.d", + verbose ? "--verbose " : "", opt); + + int result = (*exec)(buf); diff --git a/recipes-extra/ifupdown/ifupdown_0.7.52.bb b/recipes-extra/ifupdown/ifupdown_0.7.52.bb index 601d4a74fb..6aa744f76f 100644 --- a/recipes-extra/ifupdown/ifupdown_0.7.52.bb +++ b/recipes-extra/ifupdown/ifupdown_0.7.52.bb @@ -6,7 +6,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://debian/copyright;md5=7adfbe801102d1e7e6bfdd3f03754efa" -SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.tar.xz" +SRC_URI = "${DEBIAN_MIRROR}/main/i/ifupdown/ifupdown_${PV}.tar.xz \ + file://busybox-yocto-compat.patch " SRC_URI[md5sum] = "bb204ae2fa4171d6f1de4097f4570a7d" SRC_URI[sha256sum] = "8a0647c59ee0606f5da9205c5b3c5b000fea98fe39348f6bb2cba5fecfc51090" From 5457cb39b4f48da02abb8b938a759d4fbf130381 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 13 Feb 2015 16:32:37 +0100 Subject: [PATCH 3/3] netbase: We added a new OVERRIDE file.. bump the PR The PR system isn't clever enough to figure out that a different file would be picked. Update the PR right now. --- recipes-bsp/netbase/netbase_sysmocom.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/netbase/netbase_sysmocom.inc b/recipes-bsp/netbase/netbase_sysmocom.inc index 100ccb7252..6f603eb1ca 100644 --- a/recipes-bsp/netbase/netbase_sysmocom.inc +++ b/recipes-bsp/netbase/netbase_sysmocom.inc @@ -1,6 +1,6 @@ SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:" -PRINC = "19" +PRINC = "20" # bug in poky meta/classes/base.bbclass