summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/Add-support-for-mipsn32-el-and-mips64-el-to-arch-tab.patch78
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/preinst.patch30
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/remove-tar-no-timestamp.patch21
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.17.1.bb (renamed from meta/recipes-devtools/dpkg/dpkg_1.16.10.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 abebdc57c8..0000000000
--- a/meta/recipes-devtools/dpkg/dpkg/Add-support-for-mipsn32-el-and-mips64-el-to-arch-tab.patch
+++ /dev/null
@@ -1,78 +0,0 @@
1Upstream-Status: Backport
2
3Signed-off-by: Roy.Li <rongqing.li@windriver.com>
4
5
6From 597a7348527cbe91e35cf04a2e214a562612a768 Mon Sep 17 00:00:00 2001
7From: YunQiang Su <wzssyqa@gmail.com>
8Date: Sat, 22 Jun 2013 06:14:09 +0200
9Subject: [PATCH] Add support for mipsn32(el) and mips64(el) to arch tables
10
11[guillem@debian.org:
12 - Remove unneeded abi entry.
13 - Fix mips64 endianness. ]
14
15Closes: #685096, #707323
16
17Signed-off-by: Guillem Jover <guillem@debian.org>
18---
19 abitable | 1 +
20 cputable | 2 ++
21 ostable | 2 ++
22 triplettable | 4 ++++
23 5 files changed, 11 insertions(+)
24
25diff --git a/abitable b/abitable
26index 578228d..300a1ab 100644
27--- a/abitable
28+++ b/abitable
29@@ -7,4 +7,5 @@
30 # Column 2 is the size (in bits) of the ABI integers/pointers.
31 #
32 # <Debian name> <Bits>
33+gnuabin32 32
34 gnux32 32
35diff --git a/cputable b/cputable
36index c556fdd..d48e59c 100644
37--- a/cputable
38+++ b/cputable
39@@ -27,6 +27,8 @@ m32r m32r m32r 32 big
40 m68k m68k m68k 32 big
41 mips mips mips(eb)? 32 big
42 mipsel mipsel mipsel 32 little
43+mips64 mips64 mips64 64 big
44+mips64el mips64el mips64el 64 little
45 powerpc powerpc (powerpc|ppc) 32 big
46 ppc64 powerpc64 (powerpc|ppc)64 64 big
47 s390 s390 s390 32 big
48diff --git a/ostable b/ostable
49index 1383150..29d3843 100644
50--- a/ostable
51+++ b/ostable
52@@ -18,6 +18,8 @@ musleabihf-linux linux-musleabihf linux[^-]*-musleabihf
53 musl-linux linux-musl linux[^-]*-musl
54 gnueabihf-linux linux-gnueabihf linux[^-]*-gnueabihf
55 gnueabi-linux linux-gnueabi linux[^-]*-gnueabi
56+gnuabin32-linux linux-gnuabin32 linux[^-]*-gnuabin32
57+gnuabi64-linux linux-gnuabi64 linux[^-]*-gnuabi64
58 gnuspe-linux linux-gnuspe linux[^-]*-gnuspe
59 gnux32-linux linux-gnux32 linux[^-]*-gnux32
60 gnulp-linux linux-gnulp linux[^-]*-gnulp
61diff --git a/triplettable b/triplettable
62index e0d78a4..a2c683f 100644
63--- a/triplettable
64+++ b/triplettable
65@@ -9,6 +9,10 @@ musleabihf-linux-arm musl-linux-armhf
66 musl-linux-<cpu> musl-linux-<cpu>
67 gnueabihf-linux-arm armhf
68 gnueabi-linux-arm armel
69+gnuabin32-linux-mips64el mipsn32el
70+gnuabin32-linux-mips64 mipsn32
71+gnuabi64-linux-mips64el mips64el
72+gnuabi64-linux-mips64 mips64
73 gnuspe-linux-powerpc powerpcspe
74 gnux32-linux-amd64 x32
75 gnulp-linux-i386 lpia
76--
771.7.10.4
78
diff --git a/meta/recipes-devtools/dpkg/dpkg/preinst.patch b/meta/recipes-devtools/dpkg/dpkg/preinst.patch
index f9cb4089fb..0549121ef1 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]
6 6
7RP 2011/12/07 7RP 2011/12/07
8 8
9Index: dpkg-1.16.8/src/script.c 9Index: dpkg-1.17.1/src/script.c
10=================================================================== 10===================================================================
11--- dpkg-1.16.8.orig/src/script.c 11--- dpkg-1.17.1.orig/src/script.c
12+++ dpkg-1.16.8/src/script.c 12+++ dpkg-1.17.1/src/script.c
13@@ -102,38 +102,10 @@ setexecute(const char *path, struct stat 13@@ -111,36 +111,9 @@ preexecscript(struct command *cmd)
14 static const char * 14 size_t instdirl = strlen(instdir);
15 preexecscript(struct command *cmd) 15
16 {
17- const char *admindir = dpkg_db_get_dir();
18- size_t instdirl = strlen(instdir);
19-
20 if (*instdir) { 16 if (*instdir) {
21- if (strncmp(admindir, instdir, instdirl) != 0) 17- if (strncmp(admindir, instdir, instdirl) != 0)
22- ohshit(_("admindir must be inside instdir for dpkg to work properly")); 18- ohshit(_("admindir must be inside instdir for dpkg to work properly"));
@@ -25,10 +21,11 @@ Index: dpkg-1.16.8/src/script.c
25- 21-
26- if (chroot(instdir)) 22- if (chroot(instdir))
27- ohshite(_("failed to chroot to `%.250s'"), instdir); 23- ohshite(_("failed to chroot to `%.250s'"), instdir);
28- if (chdir("/")) 24- }
29- ohshite(_("failed to chdir to `%.255s'"), "/"); 25- /* Switch to a known good directory to give the maintainer script
30+ setenv("D", instdir, 1); 26- * a saner environment, also needed after the chroot(). */
31 } 27- if (chdir("/"))
28- ohshite(_("failed to chdir to `%.255s'"), "/");
32- if (debug_has_flag(dbg_scripts)) { 29- if (debug_has_flag(dbg_scripts)) {
33- struct varbuf args = VARBUF_INIT; 30- struct varbuf args = VARBUF_INIT;
34- const char **argv = cmd->argv; 31- const char **argv = cmd->argv;
@@ -41,7 +38,8 @@ Index: dpkg-1.16.8/src/script.c
41- debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename, 38- debug(dbg_scripts, "fork/exec %s (%s )", cmd->filename,
42- args.buf); 39- args.buf);
43- varbuf_destroy(&args); 40- varbuf_destroy(&args);
44- } 41+ setenv("D", instdir, 1);
42 }
45- if (!instdirl) 43- if (!instdirl)
46- return cmd->filename; 44- return cmd->filename;
47- 45-
@@ -50,4 +48,4 @@ Index: dpkg-1.16.8/src/script.c
50+ return cmd->filename; 48+ return cmd->filename;
51 } 49 }
52 50
53 static int 51 /**
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 8d884e543c..4f408ff777 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
3Signed-off-by: Constantin Musca <constantinx.musca@intel.com> 3Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
4 4
5Upstream-Status: Inappropriate [configuration] 5Upstream-Status: Inappropriate [configuration]
6--- a/dpkg-deb/extract.c 6Index: dpkg-1.17.1/dpkg-deb/extract.c
7+++ b/dpkg-deb/extract.c 7===================================================================
8@@ -319,7 +319,7 @@ extracthalf(const char *debar, const cha 8--- dpkg-1.17.1.orig/dpkg-deb/extract.c
9 } 9+++ dpkg-1.17.1/dpkg-deb/extract.c
10 } 10@@ -318,7 +318,6 @@ extracthalf(const char *debar, const cha
11 11
12- execlp(TAR, "tar", buffer, "-", "--warning=no-timestamp", NULL); 12 command_add_arg(&cmd, "-f");
13+ execlp(TAR, "tar", buffer, "-", NULL); 13 command_add_arg(&cmd, "-");
14 ohshite(_("unable to execute %s (%s)"), "tar", TAR); 14- command_add_arg(&cmd, "--warning=no-timestamp");
15 } 15
16 close(p2[0]); 16 m_dup2(p2[0],0);
17 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
index 5a486ed510..9ac2aa73c5 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 \
7 file://preinst.patch \ 7 file://preinst.patch \
8 file://fix-timestamps.patch \ 8 file://fix-timestamps.patch \
9 file://remove-tar-no-timestamp.patch \ 9 file://remove-tar-no-timestamp.patch \
10 file://Add-support-for-mipsn32-el-and-mips64-el-to-arch-tab.patch" 10 "
11 11
12SRC_URI[md5sum] = "a20a06a5272717274a8b009368f237da" 12SRC_URI[md5sum] = "ece3ae87a099158c17bde95c0036c575"
13SRC_URI[sha256sum] = "aeaacf0884039940d9463901102194f9a42eb5702157b9e7a23f43e0d9f65cf2" 13SRC_URI[sha256sum] = "8912ea77bc9c14297c0a340f5f461fbd212582ce814e1805d1d0436ca885e3a1"
14 14
15PR = "${INC_PR}.0"