summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2008-10-23 21:30:13 +0200
committerMarcin Juszkiewicz <hrw@openembedded.org>2008-10-23 21:30:13 +0200
commite7e16edfa3fa08d60e74e7ef1f0032599c984160 (patch)
tree8bf04bfa603b8c2c4fb643c2155ee00c4f097023 /packages
parent06ec44b8cadf446a9c5d455c50395b5b1a2d5a30 (diff)
dpkg: unbreak 1.13.* versions
Diffstat (limited to 'packages')
-rw-r--r--packages/dpkg/dpkg-1.14.19/ignore_extra_fields.patch26
-rw-r--r--packages/dpkg/dpkg-native_1.14.19.bb2
-rw-r--r--packages/dpkg/files/ignore_extra_fields.patch15
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 0000000000..d09343c6e5
--- /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 bf947b5054..f8d6705bb7 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 d09343c6e5..43878463e9 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) {