[oe-commits] org.oe.dev 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.

[rpurdie commit]

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.

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: e90d16fabb99beb0a9f1471c46a3452f7e0fc622
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e90d16fabb99beb0a9f1471c46a3452f7e0fc622
Files:
1
packages/dpkg/files/ignore_extra_fields.patch
packages/dpkg/dpkg-native_1.13.22.bb
packages/dpkg/dpkg.inc
packages/dpkg/dpkg_1.13.22.bb
Diffs:

#
# mt diff -r25897d2f00b97efc896e63558794b6c556a018d9 -re90d16fabb99beb0a9f1471c46a3452f7e0fc622
#
# 
# 
# add_file "packages/dpkg/files/ignore_extra_fields.patch"
#  content [596755f256ec105e01caa81b6bf55119e3645b5b]
# 
# patch "packages/dpkg/dpkg-native_1.13.22.bb"
#  from [82a4a308af78c566ecf709e27c2d76be1eaf3d14]
#    to [55638bd1960439308135d6cb7cf9372fde3db2c4]
# 
# patch "packages/dpkg/dpkg.inc"
#  from [112b7ff1d72fccc8b4bd444a3617483b0e687ee7]
#    to [73042524486227d9936337860a313a3864cb255c]
# 
# patch "packages/dpkg/dpkg_1.13.22.bb"
#  from [447b8af2ef375b9607b5df7961b6bd2d573eeef3]
#    to [8a65d6983892a8778aea34454d81412dd58743e7]
# 
============================================================
--- packages/dpkg/files/ignore_extra_fields.patch	596755f256ec105e01caa81b6bf55119e3645b5b
+++ packages/dpkg/files/ignore_extra_fields.patch	596755f256ec105e01caa81b6bf55119e3645b5b
@@ -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);
============================================================
--- packages/dpkg/dpkg-native_1.13.22.bb	82a4a308af78c566ecf709e27c2d76be1eaf3d14
+++ packages/dpkg/dpkg-native_1.13.22.bb	55638bd1960439308135d6cb7cf9372fde3db2c4
@@ -1,6 +1,6 @@ require dpkg.inc
 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
============================================================
--- packages/dpkg/dpkg.inc	112b7ff1d72fccc8b4bd444a3617483b0e687ee7
+++ packages/dpkg/dpkg.inc	73042524486227d9936337860a313a3864cb255c
@@ -1,13 +1,14 @@ SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/
 DESCRIPTION = "Package maintenance system for Debian."
 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 = ""
 
============================================================
--- packages/dpkg/dpkg_1.13.22.bb	447b8af2ef375b9607b5df7961b6bd2d573eeef3
+++ packages/dpkg/dpkg_1.13.22.bb	8a65d6983892a8778aea34454d81412dd58743e7
@@ -1,5 +1,5 @@ require dpkg.inc
 require dpkg.inc
-PR = "r0"
+PR = "r4"
 DEPENDS += "ncurses zlib bzip2"
 SRC_URI += "file://noman.patch;patch=1"