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>
This commit is contained in:
Aníbal Limón
Richard Purdie
parent
95a4f9aa12
commit
9b175c0602
|
|
@ -26,10 +26,10 @@ PERL_LIBDIR_class-native = "${libdir}/perl-native/perl"
|
|||
EXTRA_OECONF = "\
|
||||
--disable-dselect \
|
||||
--enable-start-stop-daemon \
|
||||
--with-zlib \
|
||||
--with-bz2 \
|
||||
--with-libz \
|
||||
--with-libbz2 \
|
||||
--without-liblzma \
|
||||
--without-selinux \
|
||||
--without-libselinux \
|
||||
"
|
||||
|
||||
EXTRA_OECONF += "TAR=tar"
|
||||
|
|
|
|||
|
|
@ -9,27 +9,32 @@ Upstream-Status: Inappropriate [OE Specific]
|
|||
|
||||
RP 2011/12/07
|
||||
ALIMON 2016/05/26
|
||||
|
||||
ALIMON 2017/02/21
|
||||
---
|
||||
src/script.c | 39 +++------------------------------------
|
||||
1 file changed, 3 insertions(+), 36 deletions(-)
|
||||
src/script.c | 44 +++-----------------------------------------
|
||||
1 file changed, 3 insertions(+), 41 deletions(-)
|
||||
|
||||
diff --git a/src/script.c b/src/script.c
|
||||
index 3c88be8..ce66a86 100644
|
||||
index 2f252ae..768a9d1 100644
|
||||
--- a/src/script.c
|
||||
+++ b/src/script.c
|
||||
@@ -97,43 +97,10 @@ setexecute(const char *path, struct stat *stab)
|
||||
@@ -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 = fc_script_chrootless ? instdir : "/";
|
||||
- size_t instdirl = strlen(instdir);
|
||||
- const char *changedir;
|
||||
- size_t instdirlen = strlen(instdir);
|
||||
-
|
||||
- if (*instdir && !fc_script_chrootless) {
|
||||
- if (strncmp(admindir, instdir, instdirl) != 0)
|
||||
- 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 + instdirl, 1) < 0)
|
||||
- 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"));
|
||||
|
|
@ -56,11 +61,11 @@ index 3c88be8..ce66a86 100644
|
|||
- args.buf);
|
||||
- varbuf_destroy(&args);
|
||||
- }
|
||||
- if (!instdirl || fc_script_chrootless)
|
||||
- if (instdirlen == 0 || fc_script_chrootless)
|
||||
- return cmd->filename;
|
||||
-
|
||||
- assert(strlen(cmd->filename) >= instdirl);
|
||||
- return cmd->filename + instdirl;
|
||||
- assert(strlen(cmd->filename) >= instdirlen);
|
||||
- return cmd->filename + instdirlen;
|
||||
+ return cmd->filename;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
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 655aa55..927f56f 100644
|
||||
--- a/dpkg-deb/build.c
|
||||
+++ b/dpkg-deb/build.c
|
||||
@@ -447,7 +447,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
|
||||
snprintf(mtime, sizeof(mtime), "@%ld", timestamp);
|
||||
|
||||
execlp(TAR, "tar", "-cf", "-", "--format=gnu",
|
||||
- "--mtime", mtime, "--clamp-mtime",
|
||||
+ "--mtime", mtime,
|
||||
"--null", "--no-unquote",
|
||||
"--no-recursion", "-T", "-", NULL);
|
||||
ohshite(_("unable to execute %s (%s)"), "tar -cf", TAR);
|
||||
--
|
||||
2.1.4
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
require dpkg.inc
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
|
||||
|
||||
SRC_URI = "http://snapshot.debian.org/archive/debian/20160509T100042Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz \
|
||||
SRC_URI = "http://snapshot.debian.org/archive/debian/20160731T221931Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz \
|
||||
file://noman.patch \
|
||||
file://remove-tar-no-timestamp.patch \
|
||||
file://arch_pm.patch \
|
||||
|
|
@ -12,8 +12,9 @@ SRC_URI = "http://snapshot.debian.org/archive/debian/20160509T100042Z/pool/main/
|
|||
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 \
|
||||
"
|
||||
SRC_URI_append_class-native = " file://glibc2.5-sync_file_range.patch "
|
||||
|
||||
SRC_URI[md5sum] = "073dbf2129a54b0fc627464bf8af4a1b"
|
||||
SRC_URI[sha256sum] = "ace36d3a6dc750a42baf797f9e75ec580a21f92bb9ff96b482100755d6d9b87b"
|
||||
SRC_URI[md5sum] = "ccff17730c0964428fc186ded2f2f401"
|
||||
SRC_URI[sha256sum] = "025524da41ba18b183ff11e388eb8686f7cc58ee835ed7d48bd159c46a8b6dc5"
|
||||
Loading…
Reference in New Issue