summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-22 15:07:43 +0300
committerKhem Raj <raj.khem@gmail.com>2019-05-23 08:26:14 -0700
commitf31935321b97dc664b1d7a1d87fec60a72ba249e (patch)
treec2000f31a6ffbe6f49763077b2f1b31bd703dabf
parentc45eb9fe2169f433e45e1fb67b525cd05a9b4a47 (diff)
downloadmeta-openembedded-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>
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb2
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-Support-muslx32-build.patch41
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch39
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch38
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch75
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch31
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0005-dpkg-compiler.m4-remove-Wvla.patch36
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0006-add-musleabi-to-known-target-tripets.patch42
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch39
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/add_armeb_triplet_entry.patch48
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/arch_pm.patch29
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/noman.patch22
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon/remove-tar-no-timestamp.patch17
-rw-r--r--meta-oe/recipes-support/start-stop-daemon/start-stop-daemon_1.18.25.bb87
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 ="\
241 pngcheck poco poppler poppler-data portaudio-v19 pps-tools \ 241 pngcheck poco poppler poppler-data portaudio-v19 pps-tools \
242 pv pxaregs raptor2 rdfind read-edid rsnapshot s3c24xx-gpio s3c64xx-gpio \ 242 pv pxaregs raptor2 rdfind read-edid rsnapshot s3c24xx-gpio s3c64xx-gpio \
243 sjf2410-linux-native satyr sdparm pty-forward-native serial-forward \ 243 sjf2410-linux-native satyr sdparm pty-forward-native serial-forward \
244 sg3-utils sharutils smem spitools srecord ssiapi start-stop-daemon stm32flash \ 244 sg3-utils sharutils smem spitools srecord ssiapi stm32flash \
245 syslog-ng system-config-keyboard tbb thin-provisioning-tools tokyocabinet \ 245 syslog-ng system-config-keyboard tbb thin-provisioning-tools tokyocabinet \
246 tree uhubctl unixodbc uriparser usb-modeswitch \ 246 tree uhubctl unixodbc uriparser usb-modeswitch \
247 usb-modeswitch-data usbpath uthash utouch-evemu utouch-frame \ 247 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 @@
1From a328c8bec0bf8071ae8f20fee4c7475205064ba1 Mon Sep 17 00:00:00 2001
2From: sweeaun <swee.aun.khor@intel.com>
3Date: Sun, 10 Sep 2017 00:14:15 -0700
4Subject: [PATCH] dpkg: Support muslx32 build
5
6Upstream-Status: Pending.
7Changes made on ostable and tupletable to enable muslx32 build.
8
9Signed-off-by: sweeaun <swee.aun.khor@intel.com>
10---
11 data/ostable | 1 +
12 data/tupletable | 1 +
13 2 files changed, 2 insertions(+)
14
15diff --git a/data/ostable b/data/ostable
16index be64342..87db273 100644
17--- a/data/ostable
18+++ b/data/ostable
19@@ -19,6 +19,7 @@ base-uclibc-linux linux-uclibc linux[^-]*-uclibc
20 eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf
21 eabi-musl-linux linux-musleabi linux[^-]*-musleabi
22 base-musl-linux linux-musl linux[^-]*-musl
23+x32-musl-linux linux-muslx32 linux[^-]*-muslx32
24 eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf
25 eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi
26 abin32-gnu-linux linux-gnuabin32 linux[^-]*-gnuabin32
27diff --git a/data/tupletable b/data/tupletable
28index 28f00bf..748ffab 100644
29--- a/data/tupletable
30+++ b/data/tupletable
31@@ -10,6 +10,7 @@ base-uclibc-linux-<cpu> uclibc-linux-<cpu>
32 eabihf-musl-linux-arm musl-linux-armhf
33 eabi-musl-linux-arm musl-linux-armel
34 base-musl-linux-<cpu> musl-linux-<cpu>
35+x32-musl-linux-amd64 x32
36 ilp32-gnu-linux-arm64 arm64ilp32
37 eabihf-gnu-linux-arm armhf
38 eabi-gnu-linux-arm armel
39--
402.7.4
41
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 @@
1From 685645a20e39cf2ab7db8d1f5e3666a4228abca8 Mon Sep 17 00:00:00 2001
2From: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
3Date: Wed, 8 Jul 2015 09:44:57 +0300
4Subject: [PATCH 1/1] dpkg start-stop-daemon: Accept SIG prefixed signal names
5
6---
7 utils/start-stop-daemon.c | 9 +++++++++
8 1 file changed, 9 insertions(+)
9
10diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
11index 6aebe9b..e805082 100644
12--- a/utils/start-stop-daemon.c
13+++ b/utils/start-stop-daemon.c
14@@ -18,6 +18,9 @@
15 * and Andreas Schuldei <andreas@schuldei.org>
16 *
17 * Changes by Ian Jackson: added --retry (and associated rearrangements).
18+ *
19+ * Changes by Haris Okanovic <haris.okanovic@ni.com> to support 'SIG'
20+ * prefixed signal names placed in public domain as well.
21 */
22
23 #include <config.h>
24@@ -661,6 +664,12 @@ parse_signal(const char *sig_str, int *sig_num)
25 if (parse_unsigned(sig_str, 10, sig_num) == 0)
26 return 0;
27
28+ /* Skip over optional "SIG" prefix */
29+ if (strncmp(sig_str, "SIG", 3) == 0) {
30+ warning("Using deprecated signal name %s. Drop the 'SIG' prefix.\n", sig_str);
31+ sig_str += 3;
32+ }
33+
34 for (i = 0; i < array_count(siglist); i++) {
35 if (strcmp(sig_str, siglist[i].name) == 0) {
36 *sig_num = siglist[i].signal;
37--
382.1.4
39
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 @@
1From b4ea54158c399874e12394ebc91afe98954695e2 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 26 Aug 2015 16:16:16 +0300
4Subject: [PATCH 2/5] Adapt to linux-wrs kernel version, which has character
5 '_' inside. Remove the first-char-digit-check (as the 1.15.8.5 version does).
6
7Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
8Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
9
10Upstream-Status: Inappropriate [embedded specific]
11---
12 lib/dpkg/parsehelp.c | 6 ++----
13 1 file changed, 2 insertions(+), 4 deletions(-)
14
15diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c
16index 453077fd9..f42ea2882 100644
17--- a/lib/dpkg/parsehelp.c
18+++ b/lib/dpkg/parsehelp.c
19@@ -243,14 +243,12 @@ parseversion(struct dpkg_version *rversion, const char *string,
20 ptr = rversion->version;
21 if (!*ptr)
22 return dpkg_put_error(err, _("version number is empty"));
23- if (*ptr && !c_isdigit(*ptr++))
24- return dpkg_put_warn(err, _("version number does not start with digit"));
25 for (; *ptr; ptr++) {
26- if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:", *ptr) == NULL)
27+ if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~:_", *ptr) == NULL)
28 return dpkg_put_warn(err, _("invalid character in version number"));
29 }
30 for (ptr = rversion->revision; *ptr; ptr++) {
31- if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".+~", *ptr) == NULL)
32+ if (!c_isdigit(*ptr) && !c_isalpha(*ptr) && strchr(".-+~_", *ptr) == NULL)
33 return dpkg_put_warn(err, _("invalid character in revision number"));
34 }
35
36
37--
382.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 @@
1From 24229971492515b64c81e8c6392e5dfbdc22b44c Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 26 Aug 2015 16:25:45 +0300
4Subject: [PATCH 3/5] Our pre/postinsts expect $D to be set when running in a
5 sysroot and don't expect a chroot. This matches up our system expectations
6 with what dpkg does.
7
8Upstream-Status: Inappropriate [OE Specific]
9
10RP 2011/12/07
11ALIMON 2016/05/26
12ALIMON 2017/02/21
13---
14 src/script.c | 44 +++-----------------------------------------
15 1 file changed, 3 insertions(+), 41 deletions(-)
16
17diff --git a/src/script.c b/src/script.c
18index 2f252ae..768a9d1 100644
19--- a/src/script.c
20+++ b/src/script.c
21@@ -97,48 +97,10 @@ setexecute(const char *path, struct stat *stab)
22 static const char *
23 maintscript_pre_exec(struct command *cmd)
24 {
25- const char *admindir = dpkg_db_get_dir();
26- const char *changedir;
27- size_t instdirlen = strlen(instdir);
28-
29- if (instdirlen > 0 && fc_script_chrootless)
30- changedir = instdir;
31- else
32- changedir = "/";
33-
34- if (instdirlen > 0 && !fc_script_chrootless) {
35- if (strncmp(admindir, instdir, instdirlen) != 0)
36- ohshit(_("admindir must be inside instdir for dpkg to work properly"));
37- if (setenv("DPKG_ADMINDIR", admindir + instdirlen, 1) < 0)
38- ohshite(_("unable to setenv for subprocesses"));
39- if (setenv("DPKG_ROOT", "", 1) < 0)
40- ohshite(_("unable to setenv for subprocesses"));
41-
42- if (chroot(instdir))
43- ohshite(_("failed to chroot to '%.250s'"), instdir);
44+ if (*instdir) {
45+ setenv("D", instdir, 1);
46 }
47- /* Switch to a known good directory to give the maintainer script
48- * a saner environment, also needed after the chroot(). */
49- if (chdir(changedir))
50- ohshite(_("failed to chdir to '%.255s'"), changedir);
51- if (debug_has_flag(dbg_scripts)) {
52- struct varbuf args = VARBUF_INIT;
53- const char **argv = cmd->argv;
54-
55- while (*++argv) {
56- varbuf_add_char(&args, ' ');
57- varbuf_add_str(&args, *argv);
58- }
59- varbuf_end_str(&args);
60- debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename,
61- args.buf);
62- varbuf_destroy(&args);
63- }
64- if (instdirlen == 0 || fc_script_chrootless)
65- return cmd->filename;
66-
67- assert(strlen(cmd->filename) >= instdirlen);
68- return cmd->filename + instdirlen;
69+ return cmd->filename;
70 }
71
72 /**
73--
742.1.4
75
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 @@
1From adb6bfd0feeceaf030df0debe3343d7f73e708a0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 26 Aug 2015 16:27:45 +0300
4Subject: [PATCH 4/5] The lutimes function doesn't work properly for all
5 systems.
6
7Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
8
9Upstream-Status: Inappropriate [embedded specific]
10---
11 src/archives.c | 3 ++-
12 1 file changed, 2 insertions(+), 1 deletion(-)
13
14diff --git a/src/archives.c b/src/archives.c
15index bff5f14..b711013 100644
16--- a/src/archives.c
17+++ b/src/archives.c
18@@ -449,8 +449,9 @@ tarobject_set_mtime(struct tar_entry *te, const char *path)
19
20 if (te->type == TAR_FILETYPE_SYMLINK) {
21 #ifdef HAVE_LUTIMES
22- if (lutimes(path, tv) && errno != ENOSYS)
23+/* if (lutimes(path, tv) && errno != ENOSYS)
24 ohshite(_("error setting timestamps of '%.255s'"), path);
25+*/
26 #endif
27 } else {
28 if (utimes(path, tv))
29--
302.1.4
31
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 @@
1From 0ad7bba80d5b9035089ff2b2f77a774b5b201915 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 26 Aug 2015 16:28:59 +0300
4Subject: [PATCH 5/5] dpkg-compiler.m4: remove -Wvla
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Remove the -Wvla flag from the set of compiler warning flags, since gcc
10on old host systems such as CentOS 5.8 doesn't support it, and it
11causes a build error for dpkg-native.
12
13Upstream-Status: Pending
14
15Signed-off-by: Donn Seeley <donn.seeley@windriver.com>
16Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
17Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
18---
19 m4/dpkg-compiler.m4 | 1 -
20 1 file changed, 1 deletion(-)
21
22diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4
23index 682857c..23ed7d0 100644
24--- a/m4/dpkg-compiler.m4
25+++ b/m4/dpkg-compiler.m4
26@@ -52,7 +52,6 @@ AC_DEFUN([DPKG_CHECK_COMPILER_WARNINGS], [
27 DPKG_CHECK_COMPILER_FLAG([-Wlogical-op])
28 DPKG_CHECK_COMPILER_FLAG([-Wlogical-not-parentheses])
29 DPKG_CHECK_COMPILER_FLAG([-Wswitch-bool])
30- DPKG_CHECK_COMPILER_FLAG([-Wvla])
31 DPKG_CHECK_COMPILER_FLAG([-Winit-self])
32 DPKG_CHECK_COMPILER_FLAG([-Wwrite-strings])
33 DPKG_CHECK_COMPILER_FLAG([-Wcast-align])
34--
352.1.4
36
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 @@
1From f8910022dc3ec622272f168cd0022dbdf6dff93a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 30 Dec 2015 23:05:41 +0000
4Subject: [PATCH] add musleabi to known target tripets
5
6helps compiling dpkg for musl/arm-softfloat
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
11---
12 data/ostable | 1 +
13 data/tupletable | 1 +
14 2 files changed, 2 insertions(+)
15
16diff --git a/data/ostable b/data/ostable
17index 99c1f889d..be6434271 100644
18--- a/data/ostable
19+++ b/data/ostable
20@@ -17,6 +17,7 @@
21 eabi-uclibc-linux linux-uclibceabi linux[^-]*-uclibceabi
22 base-uclibc-linux linux-uclibc linux[^-]*-uclibc
23 eabihf-musl-linux linux-musleabihf linux[^-]*-musleabihf
24+eabi-musl-linux linux-musleabi linux[^-]*-musleabi
25 base-musl-linux linux-musl linux[^-]*-musl
26 eabihf-gnu-linux linux-gnueabihf linux[^-]*-gnueabihf
27 eabi-gnu-linux linux-gnueabi linux[^-]*-gnueabi
28diff --git a/data/tupletable b/data/tupletable
29index 5f500f6ca..28f00bfe6 100644
30--- a/data/tupletable
31+++ b/data/tupletable
32@@ -8,6 +8,7 @@
33 eabi-uclibc-linux-arm uclibc-linux-armel
34 base-uclibc-linux-<cpu> uclibc-linux-<cpu>
35 eabihf-musl-linux-arm musl-linux-armhf
36+eabi-musl-linux-arm musl-linux-armel
37 base-musl-linux-<cpu> musl-linux-<cpu>
38 ilp32-gnu-linux-arm64 arm64ilp32
39 eabihf-gnu-linux-arm armhf
40--
412.11.0
42
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 @@
1From 8659eeeeda74d71e12080121f0b13a88cbdda433 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
3Date: Tue, 21 Feb 2017 11:23:27 -0600
4Subject: [PATCH] dpkg-deb/build.c: Remove usage of --clamp-mtime in tar
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Recently dpkg added --clamp-mtime to tar to create reproducible
10build tarballs [1].
11
12But host tools doesn't support this option because is new on tar
13so disable in our builds.
14
15Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
16
17Upstream-Status: Inappropriate [Configuration]
18
19[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759999#20
20[2] https://lists.gnu.org/archive/html/help-tar/2016-01/msg00000.html
21---
22 dpkg-deb/build.c | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
26index a92b58e..a3d1912 100644
27--- a/dpkg-deb/build.c
28+++ b/dpkg-deb/build.c
29@@ -450,7 +450,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
30
31 command_init(&cmd, TAR, "tar -cf");
32 command_add_args(&cmd, "tar", "-cf", "-", "--format=gnu",
33- "--mtime", mtime, "--clamp-mtime", NULL);
34+ "--mtime", mtime, NULL);
35 /* Mode might become a positional argument, pass it before -T. */
36 if (mode)
37 command_add_args(&cmd, "--mode", mode, NULL);
38--
392.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 @@
1Author: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com>
2Date: Wed Apr 8 18:08:14 2015 +0530
3
4[PATCH] add armeb triplet entry into triplettable.
5
6Cross-compling dpkg application for armeb fails with below error
7during configure task,
8
9(snip)
10 configure:23141: checking dpkg cpu type
11 configure:23148: result: armeb
12 configure:23150: WARNING: armeb not found in cputable
13 configure:23162: checking dpkg operating system type
14 configure:23169: result: linux-gnueabi
15 configure:23171: WARNING: linux-gnueabi not found in ostable
16 configure:23183: checking dpkg architecture name
17 configure:23189: error: cannot determine host dpkg architecture
18-- CUT --
19
20the required combination of "gnueabi-linux-armeb" was not found in
21the triplettable file thereby returning dpkg_arch as
22empty in configure script.
23
24Upstream-Status: Pending
25
26Signed-off-by: Krishnanjanappa, Jagadeesh <jagadeesh.krishnanjanappa@caviumnetworks.com>
27Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
28
29---
30 data/tupletable | 1 +
31 1 file changed, 1 insertion(+)
32
33diff --git a/data/tupletable b/data/tupletable
34index b7802bec3..5f500f6ca 100644
35--- a/data/tupletable
36+++ b/data/tupletable
37@@ -12,6 +12,7 @@ base-musl-linux-<cpu> musl-linux-<cpu>
38 ilp32-gnu-linux-arm64 arm64ilp32
39 eabihf-gnu-linux-arm armhf
40 eabi-gnu-linux-arm armel
41+eabi-gnu-linux-armeb armeb
42 abin32-gnu-linux-mips64r6el mipsn32r6el
43 abin32-gnu-linux-mips64r6 mipsn32r6
44 abin32-gnu-linux-mips64el mipsn32el
45--
462.11.0
47
48
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 @@
1configure cannot determine the proper cpu, os, or
2architecture for mips64, and possibly other arch's
3because of faulty code added to Arch.pm in the latest
4release from upstream. We remove that code.
5
6Upstream-Status: Pending
7
8Signed-off-by: Joe Slater <jslater@windriver.com>
9
10---
11 scripts/Dpkg/Arch.pm | 3 ---
12 1 file changed, 3 deletions(-)
13
14diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
15index 1720847b8..6345ce3b9 100644
16--- a/scripts/Dpkg/Arch.pm
17+++ b/scripts/Dpkg/Arch.pm
18@@ -323,9 +323,6 @@ sub _load_tupletable()
19 (my $dt = $debtuple) =~ s/<cpu>/$_cpu/;
20 (my $da = $debarch) =~ s/<cpu>/$_cpu/;
21
22- next if exists $debarch_to_debtuple{$da}
23- or exists $debtuple_to_debarch{$dt};
24-
25 $debarch_to_debtuple{$da} = $dt;
26 $debtuple_to_debarch{$dt} = $da;
27 }
28--
292.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 @@
1Upstream-Status: Inappropriate [disable feature]
2
3---
4 Makefile.am | 3 +--
5 1 file changed, 1 insertion(+), 2 deletions(-)
6
7diff --git a/Makefile.am b/Makefile.am
8index 0da52cb16..a1f79e0a2 100644
9--- a/Makefile.am
10+++ b/Makefile.am
11@@ -13,8 +13,7 @@ SUBDIRS = \
12 $(MAYBE_DSELECT) \
13 scripts \
14 t-func \
15- po \
16- man
17+ po
18
19 ACLOCAL_AMFLAGS = -I m4
20
21--
222.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 @@
1busybox-1.19.4 tar utility doesn't support --warning=no-timestamp
2
3Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
4
5Upstream-Status: Inappropriate [configuration]
6Index: dpkg-1.17.1/dpkg-deb/extract.c
7===================================================================
8--- dpkg-1.17.1.orig/dpkg-deb/extract.c
9+++ dpkg-1.17.1/dpkg-deb/extract.c
10@@ -318,7 +318,6 @@ extracthalf(const char *debar, const cha
11
12 command_add_arg(&cmd, "-f");
13 command_add_arg(&cmd, "-");
14- command_add_arg(&cmd, "--warning=no-timestamp");
15
16 m_dup2(p2[0],0);
17 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 @@
1SUMMARY = "Debian's start-stop-daemon utility extracted from the dpkg \
2package"
3LICENSE = "PD"
4LIC_FILES_CHKSUM = "file://utils/start-stop-daemon.c;endline=21;md5=8fbd0497a7d0b01e99820bffcb58e9ad"
5DEPENDS = "zlib bzip2 perl ncurses"
6# start-stop-daemon is usually shipped by dpkg
7RCONFLICTS_${PN} = "dpkg"
8
9SRC_URI = " \
10 ${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz \
11 file://0001-dpkg-start-stop-daemon-Accept-SIG-prefixed-signal-na.patch \
12 file://noman.patch \
13 file://remove-tar-no-timestamp.patch \
14 file://arch_pm.patch \
15 file://add_armeb_triplet_entry.patch \
16 file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \
17 file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \
18 file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \
19 file://0005-dpkg-compiler.m4-remove-Wvla.patch \
20 file://0006-add-musleabi-to-known-target-tripets.patch \
21 file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \
22 file://0001-dpkg-Support-muslx32-build.patch \
23"
24SRC_URI[md5sum] = "e463f58b04acb23659df23d2a7a05cff"
25SRC_URI[sha256sum] = "c49c371953aea03f543814dcae37c069e86069333fb2e24e9252e76647663492"
26
27inherit autotools gettext perlnative pkgconfig perl-version
28
29S = "${WORKDIR}/dpkg-${PV}"
30
31EXTRA_OECONF = "\
32 --disable-dselect \
33 --enable-start-stop-daemon \
34 --with-libz \
35 --with-libbz2 \
36 --without-libselinux \
37 "
38
39PACKAGECONFIG = "liblzma"
40PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz"
41
42export PERL = "${bindir}/perl"
43export PERL_LIBDIR = "${libdir}/perl/${@get_perl_version(d)}"
44EXTRA_OECONF += "TAR=tar"
45
46EXTRA_OECONF_append_class-target = " DEB_HOST_ARCH=${DPKG_ARCH}"
47
48DPKG_ARCH ??= "${@deb_arch_map(d.getVar('TARGET_ARCH'), d.getVar('TUNE_FEATURES'))}"
49
50def deb_arch_map(arch, tune):
51 tune_features = tune.split()
52 if arch == "allarch":
53 return "all"
54 if arch in ["i586", "i686"]:
55 return "i386"
56 if arch == "x86_64":
57 if "mx32" in tune_features:
58 return "x32"
59 return "amd64"
60 if arch.startswith("mips"):
61 endian = ["el", ""]["bigendian" in tune_features]
62 if "n64" in tune_features:
63 return "mips64" + endian
64 if "n32" in tune_features:
65 return "mipsn32" + endian
66 return "mips" + endian
67 if arch == "powerpc":
68 return arch + ["", "spe"]["spe" in tune_features]
69 if arch == "aarch64":
70 return "arm64"
71 if arch == "arm":
72 return arch + ["el", "hf"]["callconvention-hard" in tune_features]
73 return arch
74
75do_install_append () {
76 # remove everything that is not related to start-stop-daemon, since there
77 # is no explicit rule for only installing ssd
78 find ${D} -type f -not -name "*start-stop-daemon*" -exec rm {} \;
79 find ${D} -depth -type d -empty -exec rmdir {} \;
80
81 # support for buggy init.d scripts that refer to an alternative
82 # explicit path to start-stop-daemon
83 if [ "${base_sbindir}" != "${sbindir}" ]; then
84 mkdir -p ${D}${base_sbindir}
85 ln -sf ${sbindir}/start-stop-daemon ${D}${base_sbindir}/start-stop-daemon
86 fi
87}