[oe-commits] Marcin Juszkiewicz : dpkg: unbreak 1.13.* versions

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: e7e16edfa3fa08d60e74e7ef1f0032599c984160
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e7e16edfa3fa08d60e74e7ef1f0032599c984160

Author: Marcin Juszkiewicz <hrw at openembedded.org>
Date:   Thu Oct 23 21:30:13 2008 +0200

dpkg: unbreak 1.13.* versions

---

 .../dpkg/dpkg-1.14.19/ignore_extra_fields.patch    |   26 ++++++++++++++++++++
 packages/dpkg/dpkg-native_1.14.19.bb               |    2 +
 packages/dpkg/files/ignore_extra_fields.patch      |   15 ++++-------
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/packages/dpkg/dpkg-1.14.19/ignore_extra_fields.patch b/packages/dpkg/dpkg-1.14.19/ignore_extra_fields.patch
new file mode 100644
index 0000000..d09343c
--- /dev/null
+++ b/packages/dpkg/dpkg-1.14.19/ignore_extra_fields.patch
@@ -0,0 +1,26 @@
+ dpkg-deb/build.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- dpkg-1.14.19.orig/dpkg-deb/build.c
++++ dpkg-1.14.19/dpkg-deb/build.c
+@@ -241,18 +241,18 @@ void do_build(const char *const *argv) {
+     if (checkedinfo->priority == pri_other) {
+       fprintf(stderr, _("warning, `%s' contains user-defined Priority value `%s'\n"),
+               controlfile, checkedinfo->otherpriority);
+       warns++;
+     }
+-    for (field= checkedinfo->available.arbs; field; field= field->next) {
++    /*for (field= checkedinfo->available.arbs; field; field= field->next) {
+       if (known_arbitrary_field(field))
+         continue;
+ 
+       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);
+ 
+     if (subdir) {
diff --git a/packages/dpkg/dpkg-native_1.14.19.bb b/packages/dpkg/dpkg-native_1.14.19.bb
index bf947b5..f8d6705 100644
--- a/packages/dpkg/dpkg-native_1.14.19.bb
+++ b/packages/dpkg/dpkg-native_1.14.19.bb
@@ -2,6 +2,8 @@ require dpkg.inc
 DEPENDS += "bzip2-native zlib-native virtual/update-alternatives-native"
 SRC_URI += "file://noman.patch;patch=1"
 
+FILESPATH += "dpkg-${PV}"
+
 inherit native
 
 EXTRA_OECONF = "--without-static-progs \
diff --git a/packages/dpkg/files/ignore_extra_fields.patch b/packages/dpkg/files/ignore_extra_fields.patch
index d09343c..4387846 100644
--- a/packages/dpkg/files/ignore_extra_fields.patch
+++ b/packages/dpkg/files/ignore_extra_fields.patch
@@ -1,19 +1,16 @@
  dpkg-deb/build.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- dpkg-1.14.19.orig/dpkg-deb/build.c
-+++ dpkg-1.14.19/dpkg-deb/build.c
-@@ -241,18 +241,18 @@ void do_build(const char *const *argv) {
-     if (checkedinfo->priority == pri_other) {
-       fprintf(stderr, _("warning, `%s' contains user-defined Priority value `%s'\n"),
+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) {
-       if (known_arbitrary_field(field))
-         continue;
- 
        fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"),
                controlfile, field->name);
        warns++;
@@ -22,5 +19,3 @@
      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);
- 
-     if (subdir) {