summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/dpkg
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2010-10-09 00:35:01 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-10-08 13:51:29 -0700
commit0ae7e9e2cbfbc9e1c59e9fcc39f2f1feafc11bcc (patch)
tree61b040ad38a35fd930ee18329d67350507c4bf93 /meta/recipes-devtools/dpkg
parentc449c78c25eacb17797097377802af291247b8c0 (diff)
downloadpoky-0ae7e9e2cbfbc9e1c59e9fcc39f2f1feafc11bcc.tar.gz
dpkg: upgrade to version 1.15.8.5
Rebase several patches to fit the latest version Fix a compile issue related with snprintf. Reset PR in dpkg.inc Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta/recipes-devtools/dpkg')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc7
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch32
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch18
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/noman.patch17
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.15.8.5.bb (renamed from meta/recipes-devtools/dpkg/dpkg_1.14.19.bb)3
5 files changed, 50 insertions, 27 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 7a4a1a607a..c3ee244d7d 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -1,11 +1,10 @@
1DESCRIPTION = "Package maintenance system for Debian." 1DESCRIPTION = "Package maintenance system for Debian."
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "base" 3SECTION = "base"
4PR = "r7" 4PR = "r0"
5 5
6SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \ 6SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2 \
7 file://ignore_extra_fields.patch;patch=1 \ 7 file://ignore_extra_fields.patch;patch=1"
8 file://noupdalt.patch;patch=1"
9 8
10DEPENDS = "zlib bzip2" 9DEPENDS = "zlib bzip2"
11DEPENDS_virtclass-native = "bzip2-native zlib-native virtual/update-alternatives-native gettext-native" 10DEPENDS_virtclass-native = "bzip2-native zlib-native virtual/update-alternatives-native gettext-native"
diff --git a/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch b/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch
new file mode 100644
index 0000000000..7673cf1bd7
--- /dev/null
+++ b/meta/recipes-devtools/dpkg/dpkg/check_snprintf.patch
@@ -0,0 +1,32 @@
1diff -ruN dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4 dpkg-1.15.8.5/m4/dpkg-funcs.m4
2--- dpkg-1.15.8.5-orig/m4/dpkg-funcs.m4 2010-10-08 12:27:15.082131611 +0800
3+++ dpkg-1.15.8.5/m4/dpkg-funcs.m4 2010-10-08 13:56:50.074284346 +0800
4@@ -27,7 +27,7 @@
5 # -----------------------
6 # Define HAVE_C99_SNPRINTF if we have C99 snprintf family semantics
7 AC_DEFUN([DPKG_FUNC_C99_SNPRINTF],
8-[AC_CACHE_CHECK([for C99 snprintf functions], [dpkg_cv_c99_snprintf],
9+[AC_CACHE_CHECK([for C99 snprintf functions], [ac_cv_func_snprintf_c99],
10 [AC_RUN_IFELSE([AC_LANG_SOURCE([[
11 #include <stdarg.h>
12 #include <stdio.h>
13@@ -58,14 +58,14 @@
14 return 0;
15 }
16 ]])],
17- [dpkg_cv_c99_snprintf=yes],
18- [dpkg_cv_c99_snprintf=no],
19- [dpkg_cv_c99_snprintf=no])])
20-AS_IF([test "x$dpkg_cv_c99_snprintf" = "xyes"],
21+ [ac_cv_func_snprintf_c99=yes],
22+ [ac_cv_func_snprintf_c99=no],
23+ [ac_cv_func_snprintf_c99=no])])
24+AS_IF([test "x$ac_cv_func_snprintf_c99" = "xyes"],
25 [AC_DEFINE([HAVE_C99_SNPRINTF], 1,
26 [Define to 1 if the 'snprintf' family is C99 conformant])],
27 )
28-AM_CONDITIONAL(HAVE_C99_SNPRINTF, [test "x$dpkg_cv_c99_snprintf" = "xyes"])
29+AM_CONDITIONAL(HAVE_C99_SNPRINTF, [test "x$ac_cv_func_snprintf_c99" = "xyes"])
30 ])# DPKG_FUNC_C99_SNPRINTF
31
32 # DPKG_MMAP
diff --git a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
index d09343c6e5..27b4f3b004 100644
--- a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
@@ -1,11 +1,7 @@
1 dpkg-deb/build.c | 4 ++-- 1diff -ruN dpkg-1.15.8.5-orig/dpkg-deb/build.c dpkg-1.15.8.5/dpkg-deb/build.c
2 1 file changed, 2 insertions(+), 2 deletions(-) 2--- dpkg-1.15.8.5-orig/dpkg-deb/build.c 2010-10-08 12:27:15.042083703 +0800
3 3+++ dpkg-1.15.8.5/dpkg-deb/build.c 2010-10-08 12:31:53.822534277 +0800
4--- dpkg-1.14.19.orig/dpkg-deb/build.c 4@@ -275,14 +275,14 @@
5+++ dpkg-1.14.19/dpkg-deb/build.c
6@@ -241,18 +241,18 @@ void do_build(const char *const *argv) {
7 if (checkedinfo->priority == pri_other) {
8 fprintf(stderr, _("warning, `%s' contains user-defined Priority value `%s'\n"),
9 controlfile, checkedinfo->otherpriority); 5 controlfile, checkedinfo->otherpriority);
10 warns++; 6 warns++;
11 } 7 }
@@ -14,13 +10,11 @@
14 if (known_arbitrary_field(field)) 10 if (known_arbitrary_field(field))
15 continue; 11 continue;
16 12
17 fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"), 13 warning(_("'%s' contains user-defined field '%s'"),
18 controlfile, field->name); 14 controlfile, field->name);
19 warns++; 15 warns++;
20- } 16- }
21+ }*/ 17+ }*/
22 checkversion(checkedinfo->available.version.version,"(upstream) version",&errs);
23 checkversion(checkedinfo->available.version.revision,"Debian revision",&errs);
24 if (errs) ohshit(_("%d errors in control file"),errs);
25 18
26 if (subdir) { 19 if (subdir) {
20 versionstring= versiondescribe(&checkedinfo->available.version,vdew_never);
diff --git a/meta/recipes-devtools/dpkg/dpkg/noman.patch b/meta/recipes-devtools/dpkg/dpkg/noman.patch
index f5984fe14a..d8fc9c45cc 100644
--- a/meta/recipes-devtools/dpkg/dpkg/noman.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/noman.patch
@@ -1,16 +1,13 @@
1--- 1diff -ruN dpkg-1.15.8.5-orig/Makefile.am dpkg-1.15.8.5/Makefile.am
2 Makefile.am | 3 +-- 2--- dpkg-1.15.8.5-orig/Makefile.am 2010-10-08 12:27:15.042083703 +0800
3 1 file changed, 1 insertion(+), 2 deletions(-) 3+++ dpkg-1.15.8.5/Makefile.am 2010-10-08 12:27:27.755148228 +0800
4 4@@ -12,8 +12,7 @@
5--- dpkg-1.13.22.orig/Makefile.am
6+++ dpkg-1.13.22/Makefile.am
7@@ -15,8 +15,7 @@ SUBDIRS = \
8 utils \ 5 utils \
6 $(MAYBE_DSELECT) \
9 scripts \ 7 scripts \
10 po \ 8- po \
11- origins \
12- man 9- man
13+ origins 10+ po
14 11
15 ACLOCAL_AMFLAGS = -I m4 12 ACLOCAL_AMFLAGS = -I m4
16 13
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.14.19.bb b/meta/recipes-devtools/dpkg/dpkg_1.15.8.5.bb
index 1e54306c93..2562f4b724 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.14.19.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.15.8.5.bb
@@ -1,6 +1,7 @@
1require dpkg.inc 1require dpkg.inc
2 2
3SRC_URI += "file://noman.patch;patch=1" 3SRC_URI += "file://noman.patch;patch=1 \
4 file://check_snprintf.patch"
4 5
5EXTRA_OECONF = "--without-static-progs \ 6EXTRA_OECONF = "--without-static-progs \
6 --without-dselect \ 7 --without-dselect \