diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/start-stop-daemon')
2 files changed, 77 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch b/meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch new file mode 100644 index 000000000..e988efded --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch @@ -0,0 +1,39 @@ +From 685645a20e39cf2ab7db8d1f5e3666a4228abca8 Mon Sep 17 00:00:00 2001 +From: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> +Date: Wed, 8 Jul 2015 09:44:57 +0300 +Subject: [PATCH 1/1] dpkg start-stop-daemon: Accept SIG prefixed signal names + +--- + utils/start-stop-daemon.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c +index 6aebe9b..e805082 100644 +--- a/utils/start-stop-daemon.c ++++ b/utils/start-stop-daemon.c +@@ -18,6 +18,9 @@ + * and Andreas Schuldei <andreas@schuldei.org> + * + * Changes by Ian Jackson: added --retry (and associated rearrangements). ++ * ++ * Changes by Haris Okanovic <haris.okanovic@ni.com> to support 'SIG' ++ * prefixed signal names placed in public domain as well. + */ + + #include <config.h> +@@ -661,6 +664,12 @@ parse_signal(const char *sig_str, int *sig_num) + if (parse_unsigned(sig_str, 10, sig_num) == 0) + return 0; + ++ /* Skip over optional "SIG" prefix */ ++ if (strncmp(sig_str, "SIG", 3) == 0) { ++ warning("Using deprecated signal name %s. Drop the 'SIG' prefix.\n", sig_str); ++ sig_str += 3; ++ } ++ + for (i = 0; i < array_count(siglist); i++) { + if (strcmp(sig_str, siglist[i].name) == 0) { + *sig_num = siglist[i].signal; +-- +2.1.4 + diff --git a/meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb b/meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb new file mode 100644 index 000000000..cc2727b75 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.17.25.bb @@ -0,0 +1,38 @@ +SUMMARY = "Debian's start-stop-daemon utility extracted from the dpkg \ +package" +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://utils/start-stop-daemon.c;endline=21;md5=8fbd0497a7d0b01e99820bffcb58e9ad" +# start-stop-daemon is usually shipped by dpkg +DEPENDS = "ncurses" +RCONFLICTS_${PN} = "dpkg" + +SRC_URI = " \ + ${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz \ + file://0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch \ +" + +SRC_URI[md5sum] = "e48fcfdb2162e77d72c2a83432d537ca" +SRC_URI[sha256sum] = "07019d38ae98fb107c79dbb3690cfadff877f153b8c4970e3a30d2e59aa66baa" + +inherit autotools gettext pkgconfig + +S = "${WORKDIR}/dpkg-${PV}" + +EXTRA_OECONF = " \ + --without-bz2 \ + --without-selinux \ +" + +do_install_append () { + # remove everything that is not related to start-stop-daemon, since there + # is no explicit rule for only installing ssd + find ${D} -type f -not -name "*start-stop-daemon*" -exec rm {} \; + find ${D} -depth -type d -empty -exec rmdir {} \; + + # support for buggy init.d scripts that refer to an alternative + # explicit path to start-stop-daemon + if [ "${base_sbindir}" != "${sbindir}" ]; then + mkdir -p ${D}${base_sbindir} + ln -sf ${sbindir}/start-stop-daemon ${D}${base_sbindir}/start-stop-daemon + fi +} |
