diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-05-22 15:07:43 +0300 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-05-23 08:26:14 -0700 |
commit | f31935321b97dc664b1d7a1d87fec60a72ba249e (patch) | |
tree | c2000f31a6ffbe6f49763077b2f1b31bd703dabf /meta-oe | |
parent | c45eb9fe2169f433e45e1fb67b525cd05a9b4a47 (diff) | |
download | meta-openembedded-contrib-f31935321b97dc664b1d7a1d87fec60a72ba249e.tar.gz |
Remove start-stop-daemon
It was an older version of what is now also available
in oe-core in the dpkg-start-stop package.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
14 files changed, 1 insertions, 545 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 5fcf9899b6..89680d69a0 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -241,7 +241,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\ pngcheck poco poppler poppler-data portaudio-v19 pps-tools \ pv pxaregs raptor2 rdfind read-edid rsnapshot s3c24xx-gpio s3c64xx-gpio \ sjf2410-linux-native satyr sdparm pty-forward-native serial-forward \ - sg3-utils sharutils smem spitools srecord ssiapi start-stop-daemon stm32flash \ + sg3-utils sharutils smem spitools srecord ssiapi stm32flash \ syslog-ng system-config-keyboard tbb thin-provisioning-tools tokyocabinet \ tree uhubctl unixodbc uriparser usb-modeswitch \ usb-modeswitch-data usbpath uthash utouch-evemu utouch-frame \ diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-Support-muslx32-build.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-Support-muslx32-build.patch deleted file mode 100644 index 50e6894406..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-Support-muslx32-build.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a328c8bec0bf8071ae8f20fee4c7475205064ba1 Mon Sep 17 00:00:00 2001 -From: sweeaun <swee.aun.khor@intel.com> -Date: Sun, 10 Sep 2017 00:14:15 -0700 -Subject: [PATCH] dpkg: Support muslx32 build - -Upstream-Status: Pending. -Changes made on ostable and tupletable to enable muslx32 build. - -Signed-off-by: sweeaun <swee.aun.khor@intel.com> ---- - data/ostable | 1 + - data/tupletable | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/data/ostable b/data/ostable -index be64342..87db273 100644 ---- a/data/ostable -+++ b/data/ostable -@@ -19,6 +19,7 @@ base-uclibc-linux linux-uclibc linux[^-]*-uclibc - eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf - eabi-musl-linux linux-musleabi linux[^-]*-musleabi - base-musl-linux linux-musl linux[^-]*-musl -+x32-musl-linux linux-muslx32 linux[^-]*-muslx32 - eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf - eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi - abin32-gnu-linux linux-gnuabin32 linux[^-]*-gnuabin32 -diff --git a/data/tupletable b/data/tupletable -index 28f00bf..748ffab 100644 ---- a/data/tupletable -+++ b/data/tupletable -@@ -10,6 +10,7 @@ base-uclibc-linux-<cpu> uclibc-linux-<cpu> - eabihf-musl-linux-arm musl-linux-armhf - eabi-musl-linux-arm musl-linux-armel - base-musl-linux-<cpu> musl-linux-<cpu> -+x32-musl-linux-amd64 x32 - ilp32-gnu-linux-arm64 arm64ilp32 - eabihf-gnu-linux-arm armhf - eabi-gnu-linux-arm armel --- -2.7.4 - diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch deleted file mode 100644 index e988efded6..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch +++ /dev/null @@ -1,39 +0,0 @@ -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-oe/recipes-support/start-stop-daemon/start-stop-daemon/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch deleted file mode 100644 index 9fe0ca7600..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b4ea54158c399874e12394ebc91afe98954695e2 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 26 Aug 2015 16:16:16 +0300 -Subject: [PATCH 2/5] Adapt to linux-wrs kernel version, which has character - '_' inside. Remove the first-char-digit-check (as the 1.15.8.5 version does). - -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Upstream-Status: Inappropriate [embedded specific] ---- - lib/dpkg/parsehelp.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c -index 453077fd9..f42ea2882 100644 ---- a/lib/dpkg/parsehelp.c -+++ b/lib/dpkg/parsehelp.c -@@ -243,14 +243,12 @@ parseversion(struct dpkg_version *rversion, const char *string, - ptr = rversion->version; - if (!*ptr) - return dpkg_put_error(err, _("version number is empty")); -- if (*ptr && !c_isdigit(*ptr++)) -- return dpkg_put_warn(err, _("version number does not start with digit")); - for (; *ptr; ptr++) { -- if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:", *ptr) == NULL) -+ if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:_", *ptr) == NULL) - return dpkg_put_warn(err, _("invalid character in version number")); - } - for (ptr = rversion->revision; *ptr; ptr++) { -- if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".+~", *ptr) == NULL) -+ if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~_", *ptr) == NULL) - return dpkg_put_warn(err, _("invalid character in revision number")); - } - - --- -2.11.0 diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch deleted file mode 100644 index 93d870443c..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 24229971492515b64c81e8c6392e5dfbdc22b44c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 26 Aug 2015 16:25:45 +0300 -Subject: [PATCH 3/5] Our pre/postinsts expect $D to be set when running in a - sysroot and don't expect a chroot. This matches up our system expectations - with what dpkg does. - -Upstream-Status: Inappropriate [OE Specific] - -RP 2011/12/07 -ALIMON 2016/05/26 -ALIMON 2017/02/21 ---- - src/script.c | 44 +++----------------------------------------- - 1 file changed, 3 insertions(+), 41 deletions(-) - -diff --git a/src/script.c b/src/script.c -index 2f252ae..768a9d1 100644 ---- a/src/script.c -+++ b/src/script.c -@@ -97,48 +97,10 @@ setexecute(const char *path, struct stat *stab) - static const char * - maintscript_pre_exec(struct command *cmd) - { -- const char *admindir = dpkg_db_get_dir(); -- const char *changedir; -- size_t instdirlen = strlen(instdir); -- -- if (instdirlen > 0 && fc_script_chrootless) -- changedir = instdir; -- else -- changedir = "/"; -- -- if (instdirlen > 0 && !fc_script_chrootless) { -- if (strncmp(admindir, instdir, instdirlen) != 0) -- ohshit(_("admindir must be inside instdir for dpkg to work properly")); -- if (setenv("DPKG_ADMINDIR", admindir + instdirlen, 1) < 0) -- ohshite(_("unable to setenv for subprocesses")); -- if (setenv("DPKG_ROOT", "", 1) < 0) -- ohshite(_("unable to setenv for subprocesses")); -- -- if (chroot(instdir)) -- ohshite(_("failed to chroot to '%.250s'"), instdir); -+ if (*instdir) { -+ setenv("D", instdir, 1); - } -- /* Switch to a known good directory to give the maintainer script -- * a saner environment, also needed after the chroot(). */ -- if (chdir(changedir)) -- ohshite(_("failed to chdir to '%.255s'"), changedir); -- if (debug_has_flag(dbg_scripts)) { -- struct varbuf args = VARBUF_INIT; -- const char **argv = cmd->argv; -- -- while (*++argv) { -- varbuf_add_char(&args, ' '); -- varbuf_add_str(&args, *argv); -- } -- varbuf_end_str(&args); -- debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename, -- args.buf); -- varbuf_destroy(&args); -- } -- if (instdirlen == 0 || fc_script_chrootless) -- return cmd->filename; -- -- assert(strlen(cmd->filename) >= instdirlen); -- return cmd->filename + instdirlen; -+ return cmd->filename; - } - - /** --- -2.1.4 - diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch deleted file mode 100644 index 56c85c7733..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch +++ /dev/null @@ -1,31 +0,0 @@ -From adb6bfd0feeceaf030df0debe3343d7f73e708a0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 26 Aug 2015 16:27:45 +0300 -Subject: [PATCH 4/5] The lutimes function doesn't work properly for all - systems. - -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Upstream-Status: Inappropriate [embedded specific] ---- - src/archives.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/archives.c b/src/archives.c -index bff5f14..b711013 100644 ---- a/src/archives.c -+++ b/src/archives.c -@@ -449,8 +449,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path) - - if (te->type == TAR_FILETYPE_SYMLINK) { - #ifdef HAVE_LUTIMES -- if (lutimes(path, tv) && errno != ENOSYS) -+/* if (lutimes(path, tv) && errno != ENOSYS) - ohshite(_("error setting timestamps of '%.255s'"), path); -+*/ - #endif - } else { - if (utimes(path, tv)) --- -2.1.4 - diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0005-dpkg-compiler.m4-remove-Wvla.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0005-dpkg-compiler.m4-remove-Wvla.patch deleted file mode 100644 index 96e96f277b..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0005-dpkg-compiler.m4-remove-Wvla.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0ad7bba80d5b9035089ff2b2f77a774b5b201915 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 26 Aug 2015 16:28:59 +0300 -Subject: [PATCH 5/5] dpkg-compiler.m4: remove -Wvla -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Remove the -Wvla flag from the set of compiler warning flags, since gcc -on old host systems such as CentOS 5.8 doesn't support it, and it -causes a build error for dpkg-native. - -Upstream-Status: Pending - -Signed-off-by: Donn Seeley <donn.seeley@windriver.com> -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> -Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> ---- - m4/dpkg-compiler.m4 | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4 -index 682857c..23ed7d0 100644 ---- a/m4/dpkg-compiler.m4 -+++ b/m4/dpkg-compiler.m4 -@@ -52,7 +52,6 @@ AC_DEFUN([DPKG_CHECK_COMPILER_WARNINGS], [ - DPKG_CHECK_COMPILER_FLAG([-Wlogical-op]) - DPKG_CHECK_COMPILER_FLAG([-Wlogical-not-parentheses]) - DPKG_CHECK_COMPILER_FLAG([-Wswitch-bool]) -- DPKG_CHECK_COMPILER_FLAG([-Wvla]) - DPKG_CHECK_COMPILER_FLAG([-Winit-self]) - DPKG_CHECK_COMPILER_FLAG([-Wwrite-strings]) - DPKG_CHECK_COMPILER_FLAG([-Wcast-align]) --- -2.1.4 - diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0006-add-musleabi-to-known-target-tripets.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0006-add-musleabi-to-known-target-tripets.patch deleted file mode 100644 index 8797ea55c6..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0006-add-musleabi-to-known-target-tripets.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f8910022dc3ec622272f168cd0022dbdf6dff93a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 30 Dec 2015 23:05:41 +0000 -Subject: [PATCH] add musleabi to known target tripets - -helps compiling dpkg for musl/arm-softfloat - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> ---- - data/ostable | 1 + - data/tupletable | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/data/ostable b/data/ostable -index 99c1f889d..be6434271 100644 ---- a/data/ostable -+++ b/data/ostable -@@ -17,6 +17,7 @@ - eabi-uclibc-linux linux-uclibceabi linux[^-]*-uclibceabi - base-uclibc-linux linux-uclibc linux[^-]*-uclibc - eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf -+eabi-musl-linux linux-musleabi linux[^-]*-musleabi - base-musl-linux linux-musl linux[^-]*-musl - eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf - eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi -diff --git a/data/tupletable b/data/tupletable -index 5f500f6ca..28f00bfe6 100644 ---- a/data/tupletable -+++ b/data/tupletable -@@ -8,6 +8,7 @@ - eabi-uclibc-linux-arm uclibc-linux-armel - base-uclibc-linux-<cpu> uclibc-linux-<cpu> - eabihf-musl-linux-arm musl-linux-armhf -+eabi-musl-linux-arm musl-linux-armel - base-musl-linux-<cpu> musl-linux-<cpu> - ilp32-gnu-linux-arm64 arm64ilp32 - eabihf-gnu-linux-arm armhf --- -2.11.0 - diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch deleted file mode 100644 index 1b985df0f5..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8659eeeeda74d71e12080121f0b13a88cbdda433 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> -Date: Tue, 21 Feb 2017 11:23:27 -0600 -Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Recently dpkg added --clamp-mtime to tar to create reproducible -build tarballs [1]. - -But host tools doesn't support this option because is new on tar -so disable in our builds. - -Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> - -Upstream-Status: Inappropriate [Configuration] - -[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759999#20 -[2] https://lists.gnu.org/archive/html/help-tar/2016-01/msg00000.html ---- - dpkg-deb/build.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c -index a92b58e..a3d1912 100644 ---- a/dpkg-deb/build.c -+++ b/dpkg-deb/build.c -@@ -450,7 +450,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder, - - command_init(&cmd, TAR, "tar -cf"); - command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu", -- "--mtime", mtime, "--clamp-mtime", NULL); -+ "--mtime", mtime, NULL); - /* Mode might become a positional argument, pass it before -T. */ - if (mode) - command_add_args(&cmd, "--mode", mode, NULL); --- -2.11.0 diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/add_armeb_triplet_entry.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/add_armeb_triplet_entry.patch deleted file mode 100644 index d165616a19..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/add_armeb_triplet_entry.patch +++ /dev/null @@ -1,48 +0,0 @@ -Author: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> -Date: Wed Apr 8 18:08:14 2015 +0530 - -[PATCH] add armeb triplet entry into triplettable. - -Cross-compling dpkg application for armeb fails with below error -during configure task, - -(snip) - configure:23141: checking dpkg cpu type - configure:23148: result: armeb - configure:23150: WARNING: armeb not found in cputable - configure:23162: checking dpkg operating system type - configure:23169: result: linux-gnueabi - configure:23171: WARNING: linux-gnueabi not found in ostable - configure:23183: checking dpkg architecture name - configure:23189: error: cannot determine host dpkg architecture --- CUT -- - -the required combination of "gnueabi-linux-armeb" was not found in -the triplettable file thereby returning dpkg_arch as -empty in configure script. - -Upstream-Status: Pending - -Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com> -Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> - ---- - data/tupletable | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/tupletable b/data/tupletable -index b7802bec3..5f500f6ca 100644 ---- a/data/tupletable -+++ b/data/tupletable -@@ -12,6 +12,7 @@ base-musl-linux-<cpu> musl-linux-<cpu> - ilp32-gnu-linux-arm64 arm64ilp32 - eabihf-gnu-linux-arm armhf - eabi-gnu-linux-arm armel -+eabi-gnu-linux-armeb armeb - abin32-gnu-linux-mips64r6el mipsn32r6el - abin32-gnu-linux-mips64r6 mipsn32r6 - abin32-gnu-linux-mips64el mipsn32el --- -2.11.0 - - diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/arch_pm.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/arch_pm.patch deleted file mode 100644 index 4e0d22acbb..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/arch_pm.patch +++ /dev/null @@ -1,29 +0,0 @@ -configure cannot determine the proper cpu, os, or -architecture for mips64, and possibly other arch's -because of faulty code added to Arch.pm in the latest -release from upstream. We remove that code. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater <jslater@windriver.com> - ---- - scripts/Dpkg/Arch.pm | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm -index 1720847b8..6345ce3b9 100644 ---- a/scripts/Dpkg/Arch.pm -+++ b/scripts/Dpkg/Arch.pm -@@ -323,9 +323,6 @@ sub _load_tupletable() - (my $dt = $debtuple) =~ s/<cpu>/$_cpu/; - (my $da = $debarch) =~ s/<cpu>/$_cpu/; - -- next if exists $debarch_to_debtuple{$da} -- or exists $debtuple_to_debarch{$dt}; -- - $debarch_to_debtuple{$da} = $dt; - $debtuple_to_debarch{$dt} = $da; - } --- -2.11.0 diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/noman.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/noman.patch deleted file mode 100644 index a7f3cb8f45..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/noman.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - ---- - Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 0da52cb16..a1f79e0a2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -13,8 +13,7 @@ SUBDIRS = \ - $(MAYBE_DSELECT) \ - scripts \ - t-func \ -- po \ -- man -+ po - - ACLOCAL_AMFLAGS = -I m4 - --- -2.11.0 diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/remove-tar-no-timestamp.patch b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/remove-tar-no-timestamp.patch deleted file mode 100644 index 4f408ff777..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/remove-tar-no-timestamp.patch +++ /dev/null @@ -1,17 +0,0 @@ -busybox-1.19.4 tar utility doesn't support --warning=no-timestamp - -Signed-off-by: Constantin Musca <constantinx.musca@intel.com> - -Upstream-Status: Inappropriate [configuration] -Index: dpkg-1.17.1/dpkg-deb/extract.c -=================================================================== ---- dpkg-1.17.1.orig/dpkg-deb/extract.c -+++ dpkg-1.17.1/dpkg-deb/extract.c -@@ -318,7 +318,6 @@ extracthalf(const char *debar, const cha - - command_add_arg(&cmd, "-f"); - command_add_arg(&cmd, "-"); -- command_add_arg(&cmd, "--warning=no-timestamp"); - - m_dup2(p2[0],0); - close(p2[0]); diff --git a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.18.25.bb b/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.18.25.bb deleted file mode 100644 index b372d3c4a1..0000000000 --- a/meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.18.25.bb +++ /dev/null @@ -1,87 +0,0 @@ -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" -DEPENDS = "zlib bzip2 perl ncurses" -# start-stop-daemon is usually shipped by dpkg -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 \ - file://noman.patch \ - file://remove-tar-no-timestamp.patch \ - file://arch_pm.patch \ - file://add_armeb_triplet_entry.patch \ - file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \ - file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \ - file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ - file://0005-dpkg-compiler.m4-remove-Wvla.patch \ - file://0006-add-musleabi-to-known-target-tripets.patch \ - file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \ - file://0001-dpkg-Support-muslx32-build.patch \ -" -SRC_URI[md5sum] = "e463f58b04acb23659df23d2a7a05cff" -SRC_URI[sha256sum] = "c49c371953aea03f543814dcae37c069e86069333fb2e24e9252e76647663492" - -inherit autotools gettext perlnative pkgconfig perl-version - -S = "${WORKDIR}/dpkg-${PV}" - -EXTRA_OECONF = "\ - --disable-dselect \ - --enable-start-stop-daemon \ - --with-libz \ - --with-libbz2 \ - --without-libselinux \ - " - -PACKAGECONFIG = "liblzma" -PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz" - -export PERL = "${bindir}/perl" -export PERL_LIBDIR = "${libdir}/perl/${@get_perl_version(d)}" -EXTRA_OECONF += "TAR=tar" - -EXTRA_OECONF_append_class-target = " DEB_HOST_ARCH=${DPKG_ARCH}" - -DPKG_ARCH ??= "${@deb_arch_map(d.getVar('TARGET_ARCH'), d.getVar('TUNE_FEATURES'))}" - -def deb_arch_map(arch, tune): - tune_features = tune.split() - if arch == "allarch": - return "all" - if arch in ["i586", "i686"]: - return "i386" - if arch == "x86_64": - if "mx32" in tune_features: - return "x32" - return "amd64" - if arch.startswith("mips"): - endian = ["el", ""]["bigendian" in tune_features] - if "n64" in tune_features: - return "mips64" + endian - if "n32" in tune_features: - return "mipsn32" + endian - return "mips" + endian - if arch == "powerpc": - return arch + ["", "spe"]["spe" in tune_features] - if arch == "aarch64": - return "arm64" - if arch == "arm": - return arch + ["el", "hf"]["callconvention-hard" in tune_features] - return arch - -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 -} |