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] 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 0000000..d5cd6dd --- /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 601d4a7..6aa744f 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"