From ec0ab233197d6a4e9dadefcd2c8fa5c2b9ceb2e2 Mon Sep 17 00:00:00 2001 From: Jeff Hatch Date: Mon, 16 Sep 2019 09:20:41 -0500 Subject: Updates to add docker --- recipes-core/busybox/busybox_%.bbappend | 7 +++++++ recipes-core/busybox/files/disable-ipc-for-docker.cfg | 2 ++ 2 files changed, 9 insertions(+) create mode 100644 recipes-core/busybox/files/disable-ipc-for-docker.cfg (limited to 'recipes-core/busybox') diff --git a/recipes-core/busybox/busybox_%.bbappend b/recipes-core/busybox/busybox_%.bbappend index 31b58fa..ca0d56b 100644 --- a/recipes-core/busybox/busybox_%.bbappend +++ b/recipes-core/busybox/busybox_%.bbappend @@ -4,6 +4,13 @@ FILESEXTRAPATHS_prepend := ":${THISDIR}/files:" RDEPENDS_${PN} += "bash" DEPENDS += "libtirpc" +# +# MD: temporally disable IPCS/IPCRM (needed for ntpd/gpsd according to John) +# because those are also provided by util-linux which is in RDEPENDS for docker +# +SRC_URI += "file://disable-ipc-for-docker.cfg \ +" + SRC_URI += "file://udhcpd.conf.example \ file://ifplugd.action \ file://ifplugd.default \ diff --git a/recipes-core/busybox/files/disable-ipc-for-docker.cfg b/recipes-core/busybox/files/disable-ipc-for-docker.cfg new file mode 100644 index 0000000..c2a9405 --- /dev/null +++ b/recipes-core/busybox/files/disable-ipc-for-docker.cfg @@ -0,0 +1,2 @@ +# CONFIG_IPCS is not set +# CONFIG_IPCRM is not set -- cgit v1.2.3