aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-08-28 17:02:40 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-02 05:47:34 -0700
commit02e8b5c1fd68fa18ee81ba2920cd48fea8a1ef5e (patch)
treed21c72974b7f9b7b7e833c3e170d32a9e92e23a7 /meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
parent2df064ad46c1510fa8a401c22db4ab3278c3c807 (diff)
downloadopenembedded-core-contrib-02e8b5c1fd68fa18ee81ba2920cd48fea8a1ef5e.tar.gz
dpkg: upgrade to 1.16.8
autofoo.patch: removed - the patch is not used check_version: adapted to the new version - adapt the linux-wrs kernel version, which has character '_' - remove the first-char-digit-check (as the 1.15.8.5 version does) dpkg-deb-avoid-fflush.patch: removed - the patch is included in the new version fix-timestamps.patch: added - the lutimes function doesn't work properly for all systems ignore_extra_fields.patch: adapted to the new version nochroot.patch: removed - the patch is not used noman.patch: adapted to the new version noupdalt.patch: removed - the patch is not used perllibdir.patch: removed - in the new version PERL_LIBDIR will be set only if empty preinst.patch: adapted to new version removed-tar-no-timestamp.patch: added - the busybox-1.19.4 tar utility doesn't support --warning=no-timestamp Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Diffstat (limited to 'meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch35
1 files changed, 17 insertions, 18 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
index 0ff09e7487..4e3eb97ed8 100644
--- a/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/ignore_extra_fields.patch
@@ -1,22 +1,21 @@
Upstream-Status: Inappropriate [workaround]
-diff -ruN dpkg-1.15.8.5-orig/dpkg-deb/build.c dpkg-1.15.8.5/dpkg-deb/build.c
---- dpkg-1.15.8.5-orig/dpkg-deb/build.c 2010-10-08 12:27:15.042083703 +0800
-+++ dpkg-1.15.8.5/dpkg-deb/build.c 2010-10-08 12:31:53.822534277 +0800
-@@ -275,14 +275,14 @@
- 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;
+Index: dpkg-1.16.8/dpkg-deb/build.c
+===================================================================
+--- dpkg-1.16.8.orig/dpkg-deb/build.c
++++ dpkg-1.16.8/dpkg-deb/build.c
+@@ -340,13 +340,13 @@ check_new_pkg(const char *dir)
+ if (pkg->priority == pri_other)
+ warning(_("'%s' contains user-defined Priority value '%s'"),
+ controlfile, pkg->otherpriority);
+- for (field = pkg->available.arbs; field; field = field->next) {
++ /*for (field = pkg->available.arbs; field; field = field->next) {
+ if (known_arbitrary_field(field))
+ continue;
- warning(_("'%s' contains user-defined field '%s'"),
- controlfile, field->name);
- warns++;
-- }
-+ }*/
+ warning(_("'%s' contains user-defined field '%s'"), controlfile,
+ field->name);
+- }
++ }*/
- if (subdir) {
- versionstring= versiondescribe(&checkedinfo->available.version,vdew_never);
+ free(controlfile);