summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2017-02-21 12:34:52 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-01 23:27:06 +0000
commit9b175c060276926d31ae358dac0ad7b30229482c (patch)
treea7cd50719be36c8c49affea574658ae6360d5111 /meta
parent95a4f9aa12c4f6cfec2aa13fb4195f20504486f6 (diff)
downloadpoky-9b175c060276926d31ae358dac0ad7b30229482c.tar.gz
dpkg: Upgrade to 1.18.10
Add a patch to don't use --clamp-time when call tar because isn't supported in tar hosts versions. See 0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch patch for details. Rebased patch: - 0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch (From OE-Core rev: 4c23b8ce417551f2ee252426158fea272b8a9dfd) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc6
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch31
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch40
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.18.10.bb (renamed from meta/recipes-devtools/dpkg/dpkg_1.18.7.bb)7
4 files changed, 65 insertions, 19 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index ff883183dc..bd1fc9ec79 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -26,10 +26,10 @@ PERL_LIBDIR_class-native = "${libdir}/perl-native/perl"
26EXTRA_OECONF = "\ 26EXTRA_OECONF = "\
27 --disable-dselect \ 27 --disable-dselect \
28 --enable-start-stop-daemon \ 28 --enable-start-stop-daemon \
29 --with-zlib \ 29 --with-libz \
30 --with-bz2 \ 30 --with-libbz2 \
31 --without-liblzma \ 31 --without-liblzma \
32 --without-selinux \ 32 --without-libselinux \
33 " 33 "
34 34
35EXTRA_OECONF += "TAR=tar" 35EXTRA_OECONF += "TAR=tar"
diff --git a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
index 80504ce8b9..93d870443c 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
@@ -9,27 +9,32 @@ Upstream-Status: Inappropriate [OE Specific]
9 9
10RP 2011/12/07 10RP 2011/12/07
11ALIMON 2016/05/26 11ALIMON 2016/05/26
12 12ALIMON 2017/02/21
13--- 13---
14 src/script.c | 39 +++------------------------------------ 14 src/script.c | 44 +++-----------------------------------------
15 1 file changed, 3 insertions(+), 36 deletions(-) 15 1 file changed, 3 insertions(+), 41 deletions(-)
16 16
17diff --git a/src/script.c b/src/script.c 17diff --git a/src/script.c b/src/script.c
18index 3c88be8..ce66a86 100644 18index 2f252ae..768a9d1 100644
19--- a/src/script.c 19--- a/src/script.c
20+++ b/src/script.c 20+++ b/src/script.c
21@@ -97,43 +97,10 @@ setexecute(const char *path, struct stat *stab) 21@@ -97,48 +97,10 @@ setexecute(const char *path, struct stat *stab)
22 static const char * 22 static const char *
23 maintscript_pre_exec(struct command *cmd) 23 maintscript_pre_exec(struct command *cmd)
24 { 24 {
25- const char *admindir = dpkg_db_get_dir(); 25- const char *admindir = dpkg_db_get_dir();
26- const char *changedir = fc_script_chrootless ? instdir : "/"; 26- const char *changedir;
27- size_t instdirl = strlen(instdir); 27- size_t instdirlen = strlen(instdir);
28-
29- if (instdirlen > 0 && fc_script_chrootless)
30- changedir = instdir;
31- else
32- changedir = "/";
28- 33-
29- if (*instdir && !fc_script_chrootless) { 34- if (instdirlen > 0 && !fc_script_chrootless) {
30- if (strncmp(admindir, instdir, instdirl) != 0) 35- if (strncmp(admindir, instdir, instdirlen) != 0)
31- ohshit(_("admindir must be inside instdir for dpkg to work properly")); 36- ohshit(_("admindir must be inside instdir for dpkg to work properly"));
32- if (setenv("DPKG_ADMINDIR", admindir + instdirl, 1) < 0) 37- if (setenv("DPKG_ADMINDIR", admindir + instdirlen, 1) < 0)
33- ohshite(_("unable to setenv for subprocesses")); 38- ohshite(_("unable to setenv for subprocesses"));
34- if (setenv("DPKG_ROOT", "", 1) < 0) 39- if (setenv("DPKG_ROOT", "", 1) < 0)
35- ohshite(_("unable to setenv for subprocesses")); 40- ohshite(_("unable to setenv for subprocesses"));
@@ -56,11 +61,11 @@ index 3c88be8..ce66a86 100644
56- args.buf); 61- args.buf);
57- varbuf_destroy(&args); 62- varbuf_destroy(&args);
58- } 63- }
59- if (!instdirl || fc_script_chrootless) 64- if (instdirlen == 0 || fc_script_chrootless)
60- return cmd->filename; 65- return cmd->filename;
61- 66-
62- assert(strlen(cmd->filename) >= instdirl); 67- assert(strlen(cmd->filename) >= instdirlen);
63- return cmd->filename + instdirl; 68- return cmd->filename + instdirlen;
64+ return cmd->filename; 69+ return cmd->filename;
65 } 70 }
66 71
diff --git a/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch
new file mode 100644
index 0000000000..8bfaad14d8
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch
@@ -0,0 +1,40 @@
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 655aa55..927f56f 100644
27--- a/dpkg-deb/build.c
28+++ b/dpkg-deb/build.c
29@@ -447,7 +447,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
30 snprintf(mtime, sizeof(mtime), "@%ld", timestamp);
31
32 execlp(TAR, "tar", "-cf", "-", "--format=gnu",
33- "--mtime", mtime, "--clamp-mtime",
34+ "--mtime", mtime,
35 "--null", "--no-unquote",
36 "--no-recursion", "-T", "-", NULL);
37 ohshite(_("unable to execute %s (%s)"), "tar -cf", TAR);
38--
392.1.4
40
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.18.7.bb b/meta/recipes-devtools/dpkg/dpkg_1.18.10.bb
index 28fdc136a0..21385af878 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.18.7.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.18.10.bb
@@ -1,7 +1,7 @@
1require dpkg.inc 1require dpkg.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 2LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
3 3
4SRC_URI = "http://snapshot.debian.org/archive/debian/20160509T100042Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz \ 4SRC_URI = "http://snapshot.debian.org/archive/debian/20160731T221931Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz \
5 file://noman.patch \ 5 file://noman.patch \
6 file://remove-tar-no-timestamp.patch \ 6 file://remove-tar-no-timestamp.patch \
7 file://arch_pm.patch \ 7 file://arch_pm.patch \
@@ -12,8 +12,9 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160509T100042Z/pool/main/
12 file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \ 12 file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \
13 file://0005-dpkg-compiler.m4-remove-Wvla.patch \ 13 file://0005-dpkg-compiler.m4-remove-Wvla.patch \
14 file://0006-add-musleabi-to-known-target-tripets.patch \ 14 file://0006-add-musleabi-to-known-target-tripets.patch \
15 file://0007-dpkg-deb-build.c-Remove-usage-of-clamp-mtime-in-tar.patch \
15 " 16 "
16SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch " 17SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch "
17 18
18SRC_URI[md5sum] = "073dbf2129a54b0fc627464bf8af4a1b" 19SRC_URI[md5sum] = "ccff17730c0964428fc186ded2f2f401"
19SRC_URI[sha256sum] = "ace36d3a6dc750a42baf797f9e75ec580a21f92bb9ff96b482100755d6d9b87b" 20SRC_URI[sha256sum] = "025524da41ba18b183ff11e388eb8686f7cc58ee835ed7d48bd159c46a8b6dc5"