dpkg: Sync with poky. -native doesn't need ncurses depends as dsleect isn't built. Ignore unknown fields in control files making deb builds quieter.

4 files changed, 26 insertions, 4 deletions

diff --git a/packages/dpkg/dpkg-native_1.13.22.bb b/packages/dpkg/dpkg-native_1.13.22.bb
index 67e9306de6..7087f1f90a 100644
--- a/packages/dpkg/dpkg-native_1.13.22.bb
+++ b/packages/dpkg/dpkg-native_1.13.22.bb
@@ -1,6 +1,6 @@
 require dpkg.inc
-PR = "r1"
-DEPENDS += "ncurses-native zlib-native virtual/update-alternatives-native"
+PR = "r3"
+DEPENDS += "zlib-native virtual/update-alternatives-native"
 SRC_URI += "file://noman.patch;patch=1"
 
 inherit native
diff --git a/packages/dpkg/dpkg.inc b/packages/dpkg/dpkg.inc
index 90173aa55b..5fab2a7e3a 100644
--- a/packages/dpkg/dpkg.inc
+++ b/packages/dpkg/dpkg.inc
@@ -3,11 +3,12 @@ LICENSE = "GPL"
 SECTION = "base"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
+           file://ignore_extra_fields.patch;patch=1 \
            file://noupdalt.patch;patch=1"
 
 S = "${WORKDIR}/dpkg-${PV}"
 
-RDEPENDS_${PN} += "update-alternatives"
+DEPENDS_${PN} += "update-alternatives"
 
 PARALLEL_MAKE = ""
 
diff --git a/packages/dpkg/dpkg_1.13.22.bb b/packages/dpkg/dpkg_1.13.22.bb
index deccb32827..0d6ae5c5fb 100644
--- a/packages/dpkg/dpkg_1.13.22.bb
+++ b/packages/dpkg/dpkg_1.13.22.bb
@@ -1,5 +1,5 @@
 require dpkg.inc
-PR = "r0"
+PR = "r4"
 DEPENDS += "ncurses zlib bzip2"
 SRC_URI += "file://noman.patch;patch=1"
 
diff --git a/packages/dpkg/files/ignore_extra_fields.patch b/packages/dpkg/files/ignore_extra_fields.patch
new file mode 100644
index 0000000000..43878463e9
--- /dev/null
+++ b/packages/dpkg/files/ignore_extra_fields.patch
@@ -0,0 +1,21 @@
+ dpkg-deb/build.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: dpkg-1.13.22/dpkg-deb/build.c
+===================================================================
+--- dpkg-1.13.22.orig/dpkg-deb/build.c	2006-05-19 23:11:08.000000000 +0100
++++ dpkg-1.13.22/dpkg-deb/build.c	2006-11-17 14:43:20.000000000 +0000
+@@ -220,11 +220,11 @@ void do_build(const char *const *argv) {
+               controlfile, checkedinfo->otherpriority);
+       warns++;
+     }
+-    for (field= checkedinfo->available.arbs; field; field= field->next) {
++    /*for (field= checkedinfo->available.arbs; field; field= field->next) {
+       fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"),
+               controlfile, field->name);
+       warns++;
+-    }
++    }*/
+     checkversion(checkedinfo->available.version.version,"(upstream) version",&errs);
+     checkversion(checkedinfo->available.version.revision,"Debian revision",&errs);
+     if (errs) ohshit(_("%d errors in control file"),errs);