summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc2
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch (renamed from meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch)37
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch38
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch (renamed from meta/recipes-devtools/dpkg/dpkg/preinst.patch)29
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch31
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch (renamed from meta/recipes-devtools/dpkg/dpkg/no-vla-warning.patch)26
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch34
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/check_version.patch28
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/fix-timestamps.patch21
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/tarfix.patch45
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.17.25.bb21
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.18.2.bb19
12 files changed, 146 insertions, 185 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 5db1fde8f1..6eec2cde9e 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -4,7 +4,7 @@ SECTION = "base"
4 4
5SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz" 5SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.xz"
6 6
7SRC_URI_append_class-native = " file://tar-error-code.patch" 7SRC_URI_append_class-native = " file://0001-When-running-do_package_write_deb-we-have-trees-of-h.patch"
8 8
9DEPENDS = "zlib bzip2 perl ncurses" 9DEPENDS = "zlib bzip2 perl ncurses"
10DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native" 10DEPENDS_class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native"
diff --git a/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch b/meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch
index dcde5087a0..6967ef4980 100644
--- a/meta/recipes-devtools/dpkg/dpkg/tar-error-code.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-When-running-do_package_write_deb-we-have-trees-of-h.patch
@@ -1,7 +1,10 @@
1When running do_package_write_deb, we have trees of hardlinked files 1From d14ffd786993da60ca84c4812da8a6594a8c764e Mon Sep 17 00:00:00 2001
2such as the dbg source files in ${PN}-dbg. If something makes another 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3copy of one of those files (or deletes one), the number of links a file 3Date: Wed, 26 Aug 2015 15:48:13 +0300
4has changes and tar can notice this, e.g.: 4Subject: [PATCH 1/5] When running do_package_write_deb, we have trees of
5 hardlinked files such as the dbg source files in ${PN}-dbg. If something
6 makes another copy of one of those files (or deletes one), the number of
7 links a file has changes and tar can notice this, e.g.:
5 8
6| DEBUG: Executing python function do_package_deb 9| DEBUG: Executing python function do_package_deb
7| dpkg-deb: building package `sed-ptest' in `/media/build1/poky/build/tmp/work/i586-poky-linux/sed/4.2.2-r0/deploy-debs/i586/sed-ptest_4.2.2-r0.3_i386.deb'. 10| dpkg-deb: building package `sed-ptest' in `/media/build1/poky/build/tmp/work/i586-poky-linux/sed/4.2.2-r0/deploy-debs/i586/sed-ptest_4.2.2-r0.3_i386.deb'.
@@ -15,13 +18,16 @@ place to avoid that kind of issue).
15 18
16Upstream-Status: Inappropriate 19Upstream-Status: Inappropriate
17RP 2015/3/27 20RP 2015/3/27
21---
22 dpkg-deb/build.c | 11 ++++++++---
23 1 file changed, 8 insertions(+), 3 deletions(-)
18 24
19Index: dpkg-1.17.21/dpkg-deb/build.c 25diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
20=================================================================== 26index ea3d861..1589927 100644
21--- dpkg-1.17.21.orig/dpkg-deb/build.c 27--- a/dpkg-deb/build.c
22+++ dpkg-1.17.21/dpkg-deb/build.c 28+++ b/dpkg-deb/build.c
23@@ -398,7 +398,7 @@ do_build(const char *const *argv) 29@@ -458,7 +458,7 @@ do_build(const char *const *argv)
24 bool subdir; 30 char *debar;
25 char *tfbuf; 31 char *tfbuf;
26 int arfd; 32 int arfd;
27- int p1[2], p2[2], gzfd; 33- int p1[2], p2[2], gzfd;
@@ -29,10 +35,10 @@ Index: dpkg-1.17.21/dpkg-deb/build.c
29 pid_t c1, c2; 35 pid_t c1, c2;
30 36
31 /* Decode our arguments. */ 37 /* Decode our arguments. */
32@@ -493,7 +493,9 @@ do_build(const char *const *argv) 38@@ -538,7 +538,9 @@ do_build(const char *const *argv)
33 } 39 }
34 close(p1[0]); 40 close(p1[0]);
35 subproc_reap(c2, "gzip -9c", 0); 41 subproc_reap(c2, _("<compress> from tar -cf"), 0);
36- subproc_reap(c1, "tar -cf", 0); 42- subproc_reap(c1, "tar -cf", 0);
37+ rc = subproc_reap(c1, "tar -cf", SUBPROC_RETERROR); 43+ rc = subproc_reap(c1, "tar -cf", SUBPROC_RETERROR);
38+ if (rc && rc != 1) 44+ if (rc && rc != 1)
@@ -40,8 +46,8 @@ Index: dpkg-1.17.21/dpkg-deb/build.c
40 46
41 if (lseek(gzfd, 0, SEEK_SET)) 47 if (lseek(gzfd, 0, SEEK_SET))
42 ohshite(_("failed to rewind temporary file (%s)"), _("control member")); 48 ohshite(_("failed to rewind temporary file (%s)"), _("control member"));
43@@ -581,7 +583,10 @@ do_build(const char *const *argv) 49@@ -626,7 +628,10 @@ do_build(const char *const *argv)
44 /* All done, clean up wait for tar and gzip to finish their job. */ 50 /* All done, clean up wait for tar and <compress> to finish their job. */
45 close(p1[1]); 51 close(p1[1]);
46 subproc_reap(c2, _("<compress> from tar -cf"), 0); 52 subproc_reap(c2, _("<compress> from tar -cf"), 0);
47- subproc_reap(c1, "tar -cf", 0); 53- subproc_reap(c1, "tar -cf", 0);
@@ -52,3 +58,6 @@ Index: dpkg-1.17.21/dpkg-deb/build.c
52 /* Okay, we have data.tar as well now, add it to the ar wrapper. */ 58 /* Okay, we have data.tar as well now, add it to the ar wrapper. */
53 if (deb_format.major == 2) { 59 if (deb_format.major == 2) {
54 char datamember[16 + 1]; 60 char datamember[16 + 1];
61--
622.1.4
63
diff --git a/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
new file mode 100644
index 0000000000..231a6a2909
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch
@@ -0,0 +1,38 @@
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 79b2908..7758aa5 100644
17--- a/lib/dpkg/parsehelp.c
18+++ b/lib/dpkg/parsehelp.c
19@@ -235,14 +235,12 @@ parseversion(struct dpkg_version *rversion, const char *string,
20
21 /* XXX: Would be faster to use something like cisversion and cisrevision. */
22 ptr = rversion->version;
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--
372.1.4
38
diff --git a/meta/recipes-devtools/dpkg/dpkg/preinst.patch b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
index 0549121ef1..9f77c6c991 100644
--- a/meta/recipes-devtools/dpkg/dpkg/preinst.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
@@ -1,16 +1,22 @@
1Our pre/postinsts expect $D to be set when running in a sysroot and 1From 24229971492515b64c81e8c6392e5dfbdc22b44c Mon Sep 17 00:00:00 2001
2don't expect a chroot. This matches up our system expectations with 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3what dpkg does. 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.
4 7
5Upstream-Status: Inappropriate [OE Specific] 8Upstream-Status: Inappropriate [OE Specific]
6 9
7RP 2011/12/07 10RP 2011/12/07
11---
12 src/script.c | 31 ++-----------------------------
13 1 file changed, 2 insertions(+), 29 deletions(-)
8 14
9Index: dpkg-1.17.1/src/script.c 15diff --git a/src/script.c b/src/script.c
10=================================================================== 16index a958145..24c49f9 100644
11--- dpkg-1.17.1.orig/src/script.c 17--- a/src/script.c
12+++ dpkg-1.17.1/src/script.c 18+++ b/src/script.c
13@@ -111,36 +111,9 @@ preexecscript(struct command *cmd) 19@@ -100,36 +100,9 @@ maintscript_pre_exec(struct command *cmd)
14 size_t instdirl = strlen(instdir); 20 size_t instdirl = strlen(instdir);
15 21
16 if (*instdir) { 22 if (*instdir) {
@@ -20,12 +26,12 @@ Index: dpkg-1.17.1/src/script.c
20- ohshite(_("unable to setenv for subprocesses")); 26- ohshite(_("unable to setenv for subprocesses"));
21- 27-
22- if (chroot(instdir)) 28- if (chroot(instdir))
23- ohshite(_("failed to chroot to `%.250s'"), instdir); 29- ohshite(_("failed to chroot to '%.250s'"), instdir);
24- } 30- }
25- /* Switch to a known good directory to give the maintainer script 31- /* Switch to a known good directory to give the maintainer script
26- * a saner environment, also needed after the chroot(). */ 32- * a saner environment, also needed after the chroot(). */
27- if (chdir("/")) 33- if (chdir("/"))
28- ohshite(_("failed to chdir to `%.255s'"), "/"); 34- ohshite(_("failed to chdir to '%.255s'"), "/");
29- if (debug_has_flag(dbg_scripts)) { 35- if (debug_has_flag(dbg_scripts)) {
30- struct varbuf args = VARBUF_INIT; 36- struct varbuf args = VARBUF_INIT;
31- const char **argv = cmd->argv; 37- const char **argv = cmd->argv;
@@ -49,3 +55,6 @@ Index: dpkg-1.17.1/src/script.c
49 } 55 }
50 56
51 /** 57 /**
58--
592.1.4
60
diff --git a/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch
new file mode 100644
index 0000000000..56c85c7733
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch
@@ -0,0 +1,31 @@
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/recipes-devtools/dpkg/dpkg/no-vla-warning.patch b/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch
index f660b18646..96e96f277b 100644
--- a/meta/recipes-devtools/dpkg/dpkg/no-vla-warning.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0005-dpkg-compiler.m4-remove-Wvla.patch
@@ -1,7 +1,10 @@
1From e94474d805377d67c8b09664a602f20969e12b8a Mon Sep 17 00:00:00 2001 1From 0ad7bba80d5b9035089ff2b2f77a774b5b201915 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 23 Jan 2014 04:17:23 -0500 3Date: Wed, 26 Aug 2015 16:28:59 +0300
4Subject: [PATCH] dpkg-compiler.m4: remove -Wvla 4Subject: [PATCH 5/5] dpkg-compiler.m4: remove -Wvla
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
5 8
6Remove the -Wvla flag from the set of compiler warning flags, since gcc 9Remove the -Wvla flag from the set of compiler warning flags, since gcc
7on old host systems such as CentOS 5.8 doesn't support it, and it 10on old host systems such as CentOS 5.8 doesn't support it, and it
@@ -13,20 +16,21 @@ Signed-off-by: Donn Seeley <donn.seeley@windriver.com>
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 16Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> 17Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
15--- 18---
16 m4/dpkg-compiler.m4 | 1 - 19 m4/dpkg-compiler.m4 | 1 -
17 1 file changed, 1 deletion(-) 20 1 file changed, 1 deletion(-)
18 21
19diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4 22diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4
20index 53f67c6..6e66a43 100644 23index 682857c..23ed7d0 100644
21--- a/m4/dpkg-compiler.m4 24--- a/m4/dpkg-compiler.m4
22+++ b/m4/dpkg-compiler.m4 25+++ b/m4/dpkg-compiler.m4
23@@ -49,7 +49,6 @@ AC_DEFUN([DPKG_CHECK_COMPILER_WARNINGS], [ 26@@ -52,7 +52,6 @@ AC_DEFUN([DPKG_CHECK_COMPILER_WARNINGS], [
24 DPKG_CHECK_COMPILER_FLAG([-Wformat-security])
25 DPKG_CHECK_COMPILER_FLAG([-Wpointer-arith])
26 DPKG_CHECK_COMPILER_FLAG([-Wlogical-op]) 27 DPKG_CHECK_COMPILER_FLAG([-Wlogical-op])
28 DPKG_CHECK_COMPILER_FLAG([-Wlogical-not-parentheses])
29 DPKG_CHECK_COMPILER_FLAG([-Wswitch-bool])
27- DPKG_CHECK_COMPILER_FLAG([-Wvla]) 30- DPKG_CHECK_COMPILER_FLAG([-Wvla])
28 DPKG_CHECK_COMPILER_FLAG([-Winit-self]) 31 DPKG_CHECK_COMPILER_FLAG([-Winit-self])
29 DPKG_CHECK_COMPILER_FLAG([-Wwrite-strings]) 32 DPKG_CHECK_COMPILER_FLAG([-Wwrite-strings])
30 DPKG_CHECK_COMPILER_FLAG([-Wcast-align]) 33 DPKG_CHECK_COMPILER_FLAG([-Wcast-align])
31--- 34--
321.17.21 352.1.4
36
diff --git a/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch b/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch
deleted file mode 100644
index 56eb0ca5be..0000000000
--- a/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff -ruN dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4 dpkg-1.15.8.5/m4/dpkg-funcs.m4
4--- dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4 2010-10-08 12:27:15.082131611 +0800
5+++ dpkg-1.15.8.5/m4/dpkg-funcs.m4 2010-10-08 13:56:50.074284346 +0800
6@@ -27,7 +27,7 @@
7 # -----------------------
8 # Define HAVE_C99_SNPRINTF if we have C99 snprintf family semantics
9 AC_DEFUN([DPKG_FUNC_C99_SNPRINTF],
10-[AC_CACHE_CHECK([for C99 snprintf functions], [dpkg_cv_c99_snprintf],
11+[AC_CACHE_CHECK([for C99 snprintf functions], [ac_cv_func_snprintf_c99],
12 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
13 #include <stdarg.h>
14 #include <stdio.h>
15@@ -58,14 +58,14 @@
16 return 0;
17 }
18 ]])],
19- [dpkg_cv_c99_snprintf=yes],
20- [dpkg_cv_c99_snprintf=no],
21- [dpkg_cv_c99_snprintf=no])])
22-AS_IF([test "x$dpkg_cv_c99_snprintf" = "xyes"],
23+ [ac_cv_func_snprintf_c99=yes],
24+ [ac_cv_func_snprintf_c99=no],
25+ [ac_cv_func_snprintf_c99=no])])
26+AS_IF([test "x$ac_cv_func_snprintf_c99" = "xyes"],
27 [AC_DEFINE([HAVE_C99_SNPRINTF], 1,
28 [Define to 1 if the 'snprintf' family is C99 conformant])],
29 )
30-AM_CONDITIONAL(HAVE_C99_SNPRINTF, [test "x$dpkg_cv_c99_snprintf" = "xyes"])
31+AM_CONDITIONAL(HAVE_C99_SNPRINTF, [test "x$ac_cv_func_snprintf_c99" = "xyes"])
32 ])# DPKG_FUNC_C99_SNPRINTF
33
34 # DPKG_MMAP
diff --git a/meta/recipes-devtools/dpkg/dpkg/check_version.patch b/meta/recipes-devtools/dpkg/dpkg/check_version.patch
deleted file mode 100644
index 3175731522..0000000000
--- a/meta/recipes-devtools/dpkg/dpkg/check_version.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Adapt to linux-wrs kernel version, which has character '_' inside.
2Remove the first-char-digit-check (as the 1.15.8.5 version does).
3
4Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
5Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
6
7Upstream-Status: Inappropriate [embedded specific]
8
9Index: dpkg-1.16.8/lib/dpkg/parsehelp.c
10===================================================================
11--- dpkg-1.16.8.orig/lib/dpkg/parsehelp.c
12+++ dpkg-1.16.8/lib/dpkg/parsehelp.c
13@@ -258,14 +258,12 @@ parseversion(struct dpkg_version *rversi
14
15 /* XXX: Would be faster to use something like cisversion and cisrevision. */
16 ptr = rversion->version;
17- if (*ptr && !cisdigit(*ptr++))
18- return dpkg_put_warn(err, _("version number does not start with digit"));
19 for (; *ptr; ptr++) {
20- if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:", *ptr) == NULL)
21+ if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~:_", *ptr) == NULL)
22 return dpkg_put_warn(err, _("invalid character in version number"));
23 }
24 for (ptr = rversion->revision; *ptr; ptr++) {
25- if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".+~", *ptr) == NULL)
26+ if (!cisdigit(*ptr) && !cisalpha(*ptr) && strchr(".-+~_", *ptr) == NULL)
27 return dpkg_put_warn(err, _("invalid character in revision number"));
28 }
diff --git a/meta/recipes-devtools/dpkg/dpkg/fix-timestamps.patch b/meta/recipes-devtools/dpkg/dpkg/fix-timestamps.patch
deleted file mode 100644
index d2cabbe065..0000000000
--- a/meta/recipes-devtools/dpkg/dpkg/fix-timestamps.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1The lutimes function doesn't work properly for all systems.
2
3Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
4
5Upstream-Status: Inappropriate [embedded specific]
6
7Index: dpkg-1.16.8/src/archives.c
8===================================================================
9--- dpkg-1.16.8.orig/src/archives.c
10+++ dpkg-1.16.8/src/archives.c
11@@ -440,8 +440,10 @@ tarobject_set_mtime(struct tar_entry *te
12
13 if (te->type == tar_filetype_symlink) {
14 #ifdef HAVE_LUTIMES
15+/*
16 if (lutimes(path, tv) && errno != ENOSYS)
17 ohshite(_("error setting timestamps of `%.255s'"), path);
18+*/
19 #endif
20 } else {
21 if (utimes(path, tv))
diff --git a/meta/recipes-devtools/dpkg/dpkg/tarfix.patch b/meta/recipes-devtools/dpkg/dpkg/tarfix.patch
deleted file mode 100644
index 50e0bb4069..0000000000
--- a/meta/recipes-devtools/dpkg/dpkg/tarfix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1They managed to 'break' tar. Again. Sorry, they fixed a regression
2which broke dpkg-deb.
3
4The addition of:
5http://git.savannah.gnu.org/cgit/tar.git/commit/?id=163e96a0e619a900eab6de827c7c5749ecc9d3f2
6("Bugfix: entries read from the -T file did not get proper matching_flag.")
7means that the no-recursion option gets lost. This leads to many files getting included
8multiple times, along with files which shouldn't be there.
9
10The commit message is horrendous. The patch actually makes the option positional
11(as documnted since 2003) and therefore doesn't affect the input from the -T option.
12
13Moving the --no-reursion option to earlier in the command avoids the bug.
14
15The bug was not present in tar 1.28 however it has been backported in at least
16Fedora 22 and heading into Fedora 21.
17
18Redhat reports of issue:
19https://bugzilla.redhat.com/show_bug.cgi?id=1230762 [tar]
20https://bugzilla.redhat.com/show_bug.cgi?id=1241508 [dpkg]
21
22Discussion of bug in upstream tar:
23http://www.mail-archive.com/bug-tar@gnu.org/msg04799.html
24
25Yocto bug:
26https://bugzilla.yoctoproject.org/show_bug.cgi?id=7988
27
28Upstream-Status: Submitted [have mailed dpkg maintainer about this]
29
30RP
312015/7/13
32
33Index: dpkg-1.17.25/dpkg-deb/build.c
34===================================================================
35--- dpkg-1.17.25.orig/dpkg-deb/build.c
36+++ dpkg-1.17.25/dpkg-deb/build.c
37@@ -560,7 +560,7 @@ do_build(const char *const *argv)
38 if (chdir(dir))
39 ohshite(_("failed to chdir to `%.255s'"), dir);
40 execlp(TAR, "tar", "-cf", "-", "--format=gnu", "--null", "--no-unquote",
41- "-T", "-", "--no-recursion", NULL);
42+ "--no-recursion", "-T", "-", NULL);
43 ohshite(_("unable to execute %s (%s)"), "tar -cf", TAR);
44 }
45 close(p1[0]);
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.17.25.bb b/meta/recipes-devtools/dpkg/dpkg_1.17.25.bb
deleted file mode 100644
index 1969effd61..0000000000
--- a/meta/recipes-devtools/dpkg/dpkg_1.17.25.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1require dpkg.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
3
4SRC_URI += "file://noman.patch \
5 file://check_snprintf.patch \
6 file://check_version.patch \
7 file://preinst.patch \
8 file://fix-timestamps.patch \
9 file://remove-tar-no-timestamp.patch \
10 file://fix-abs-redefine.patch \
11 file://arch_pm.patch \
12 file://dpkg-configure.service \
13 file://glibc2.5-sync_file_range.patch \
14 file://no-vla-warning.patch \
15 file://add_armeb_triplet_entry.patch \
16 file://tarfix.patch \
17 "
18
19SRC_URI[md5sum] = "e48fcfdb2162e77d72c2a83432d537ca"
20SRC_URI[sha256sum] = "07019d38ae98fb107c79dbb3690cfadff877f153b8c4970e3a30d2e59aa66baa"
21
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb b/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb
new file mode 100644
index 0000000000..4c3fa4f395
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg_1.18.2.bb
@@ -0,0 +1,19 @@
1require dpkg.inc
2LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
3
4SRC_URI += "file://noman.patch \
5 file://remove-tar-no-timestamp.patch \
6 file://fix-abs-redefine.patch \
7 file://arch_pm.patch \
8 file://dpkg-configure.service \
9 file://glibc2.5-sync_file_range.patch \
10 file://add_armeb_triplet_entry.patch \
11 file://0002-Adapt-to-linux-wrs-kernel-version-which-has-characte.patch \
12 file://0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch \
13 file://0004-The-lutimes-function-doesn-t-work-properly-for-all-s.patch \
14 file://0005-dpkg-compiler.m4-remove-Wvla.patch \
15 "
16
17SRC_URI[md5sum] = "63b9d869081ec49adeef6c5ff62d6576"
18SRC_URI[sha256sum] = "11484f2a73d027d696e720a60380db71978bb5c06cd88fe30c291e069ac457a4"
19
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 05:05:54 +0000