[oe-commits] Saul Wold : dpkg: upgrade to 1.17.1
git at git.openembedded.org
git at git.openembedded.org
Sat Aug 3 09:23:52 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: 6d4257217f8c5c61ae9bc02b6607d1066168c03a
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6d4257217f8c5c61ae9bc02b6607d1066168c03a
Author: Saul Wold <sgw at linux.intel.com>
Date: Mon Jul 29 11:11:09 2013 +0300
dpkg: upgrade to 1.17.1
Rebased patches and removed mips related arch triptlet patch due to being upstreamed
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
...-for-mipsn32-el-and-mips64-el-to-arch-tab.patch | 78 --------------------
meta/recipes-devtools/dpkg/dpkg/preinst.patch | 30 ++++----
.../dpkg/dpkg/remove-tar-no-timestamp.patch | 21 +++---
.../dpkg/{dpkg_1.16.10.bb => dpkg_1.17.1.bb} | 7 +-
4 files changed, 28 insertions(+), 108 deletions(-)
diff --git a/meta/recipes-devtools/dpkg/dpkg/Add-support-for-mipsn32-el-and-mips64-el-to-arch-tab.patch b/meta/recipes-devtools/dpkg/dpkg/Add-support-for-mipsn32-el-and-mips64-el-to-arch-tab.patch
deleted file mode 100644
index abebdc5..0000000
--- a/meta/recipes-devtools/dpkg/dpkg/Add-support-for-mipsn32-el-and-mips64-el-to-arch-tab.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Upstream-Status: Backport
-
-Signed-off-by: Roy.Li <rongqing.li at windriver.com>
-
-
-From 597a7348527cbe91e35cf04a2e214a562612a768 Mon Sep 17 00:00:00 2001
-From: YunQiang Su <wzssyqa at gmail.com>
-Date: Sat, 22 Jun 2013 06:14:09 +0200
-Subject: [PATCH] Add support for mipsn32(el) and mips64(el) to arch tables
-
-[guillem at debian.org:
- - Remove unneeded abi entry.
- - Fix mips64 endianness. ]
-
-Closes: #685096, #707323
-
-Signed-off-by: Guillem Jover <guillem at debian.org>
----
- abitable | 1 +
- cputable | 2 ++
- ostable | 2 ++
- triplettable | 4 ++++
- 5 files changed, 11 insertions(+)
-
-diff --git a/abitable b/abitable
-index 578228d..300a1ab 100644
---- a/abitable
-+++ b/abitable
-@@ -7,4 +7,5 @@
- # Column 2 is the size (in bits) of the ABI integers/pointers.
- #
- # <Debian name> <Bits>
-+gnuabin32 32
- gnux32 32
-diff --git a/cputable b/cputable
-index c556fdd..d48e59c 100644
---- a/cputable
-+++ b/cputable
-@@ -27,6 +27,8 @@ m32r m32r m32r 32 big
- m68k m68k m68k 32 big
- mips mips mips(eb)? 32 big
- mipsel mipsel mipsel 32 little
-+mips64 mips64 mips64 64 big
-+mips64el mips64el mips64el 64 little
- powerpc powerpc (powerpc|ppc) 32 big
- ppc64 powerpc64 (powerpc|ppc)64 64 big
- s390 s390 s390 32 big
-diff --git a/ostable b/ostable
-index 1383150..29d3843 100644
---- a/ostable
-+++ b/ostable
-@@ -18,6 +18,8 @@ musleabihf-linux linux-musleabihf linux[^-]*-musleabihf
- musl-linux linux-musl linux[^-]*-musl
- gnueabihf-linux linux-gnueabihf linux[^-]*-gnueabihf
- gnueabi-linux linux-gnueabi linux[^-]*-gnueabi
-+gnuabin32-linux linux-gnuabin32 linux[^-]*-gnuabin32
-+gnuabi64-linux linux-gnuabi64 linux[^-]*-gnuabi64
- gnuspe-linux linux-gnuspe linux[^-]*-gnuspe
- gnux32-linux linux-gnux32 linux[^-]*-gnux32
- gnulp-linux linux-gnulp linux[^-]*-gnulp
-diff --git a/triplettable b/triplettable
-index e0d78a4..a2c683f 100644
---- a/triplettable
-+++ b/triplettable
-@@ -9,6 +9,10 @@ musleabihf-linux-arm musl-linux-armhf
- musl-linux-<cpu> musl-linux-<cpu>
- gnueabihf-linux-arm armhf
- gnueabi-linux-arm armel
-+gnuabin32-linux-mips64el mipsn32el
-+gnuabin32-linux-mips64 mipsn32
-+gnuabi64-linux-mips64el mips64el
-+gnuabi64-linux-mips64 mips64
- gnuspe-linux-powerpc powerpcspe
- gnux32-linux-amd64 x32
- gnulp-linux-i386 lpia
---
-1.7.10.4
-
diff --git a/meta/recipes-devtools/dpkg/dpkg/preinst.patch b/meta/recipes-devtools/dpkg/dpkg/preinst.patch
index f9cb408..0549121 100644
--- a/meta/recipes-devtools/dpkg/dpkg/preinst.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/preinst.patch
@@ -6,17 +6,13 @@ Upstream-Status: Inappropriate [OE Specific]
RP 2011/12/07
-Index: dpkg-1.16.8/src/script.c
+Index: dpkg-1.17.1/src/script.c
===================================================================
---- dpkg-1.16.8.orig/src/script.c
-+++ dpkg-1.16.8/src/script.c
-@@ -102,38 +102,10 @@ setexecute(const char *path, struct stat
- static const char *
- preexecscript(struct command *cmd)
- {
-- const char *admindir = dpkg_db_get_dir();
-- size_t instdirl = strlen(instdir);
--
+--- dpkg-1.17.1.orig/src/script.c
++++ dpkg-1.17.1/src/script.c
+@@ -111,36 +111,9 @@ preexecscript(struct command *cmd)
+ size_t instdirl = strlen(instdir);
+
if (*instdir) {
- if (strncmp(admindir, instdir, instdirl) != 0)
- ohshit(_("admindir must be inside instdir for dpkg to work properly"));
@@ -25,10 +21,11 @@ Index: dpkg-1.16.8/src/script.c
-
- if (chroot(instdir))
- ohshite(_("failed to chroot to `%.250s'"), instdir);
-- if (chdir("/"))
-- ohshite(_("failed to chdir to `%.255s'"), "/");
-+ 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("/"))
+- ohshite(_("failed to chdir to `%.255s'"), "/");
- if (debug_has_flag(dbg_scripts)) {
- struct varbuf args = VARBUF_INIT;
- const char **argv = cmd->argv;
@@ -41,7 +38,8 @@ Index: dpkg-1.16.8/src/script.c
- debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename,
- args.buf);
- varbuf_destroy(&args);
-- }
++ setenv("D", instdir, 1);
+ }
- if (!instdirl)
- return cmd->filename;
-
@@ -50,4 +48,4 @@ Index: dpkg-1.16.8/src/script.c
+ return cmd->filename;
}
- static int
+ /**
diff --git a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
index 8d884e5..4f408ff 100644
--- a/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch
@@ -3,14 +3,15 @@ busybox-1.19.4 tar utility doesn't support --warning=no-timestamp
Signed-off-by: Constantin Musca <constantinx.musca at intel.com>
Upstream-Status: Inappropriate [configuration]
---- a/dpkg-deb/extract.c
-+++ b/dpkg-deb/extract.c
-@@ -319,7 +319,7 @@ extracthalf(const char *debar, const cha
- }
- }
+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
-- execlp(TAR, "tar", buffer, "-", "--warning=no-timestamp", NULL);
-+ execlp(TAR, "tar", buffer, "-", NULL);
- ohshite(_("unable to execute %s (%s)"), "tar", TAR);
- }
- close(p2[0]);
+ 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/recipes-devtools/dpkg/dpkg_1.16.10.bb b/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb
similarity index 58%
rename from meta/recipes-devtools/dpkg/dpkg_1.16.10.bb
rename to meta/recipes-devtools/dpkg/dpkg_1.17.1.bb
index 5a486ed..9ac2aa7 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.16.10.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.17.1.bb
@@ -7,9 +7,8 @@ SRC_URI += "file://noman.patch \
file://preinst.patch \
file://fix-timestamps.patch \
file://remove-tar-no-timestamp.patch \
- file://Add-support-for-mipsn32-el-and-mips64-el-to-arch-tab.patch"
+ "
-SRC_URI[md5sum] = "a20a06a5272717274a8b009368f237da"
-SRC_URI[sha256sum] = "aeaacf0884039940d9463901102194f9a42eb5702157b9e7a23f43e0d9f65cf2"
+SRC_URI[md5sum] = "ece3ae87a099158c17bde95c0036c575"
+SRC_URI[sha256sum] = "8912ea77bc9c14297c0a340f5f461fbd212582ce814e1805d1d0436ca885e3a1"
-PR = "${INC_PR}.0"
More information about the Openembedded-commits
mailing list