summaryrefslogtreecommitdiffstats
path: root/meta/packages/dpkg
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-17 15:40:56 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-17 15:40:56 +0000
commit941d957cb967145014f383db50eff714c03fb295 (patch)
treea476d1375659e327e29d800cee056a71c1000292 /meta/packages/dpkg
parent177e1a17c0b735cfe47b7e6be0c74b68c0344510 (diff)
downloadpoky-941d957cb967145014f383db50eff714c03fb295.tar.gz
dpkg: Make it a little quieter by removing extra fields warnings
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@870 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/dpkg')
-rw-r--r--meta/packages/dpkg/dpkg-native_1.13.22.bb2
-rw-r--r--meta/packages/dpkg/dpkg.inc1
-rw-r--r--meta/packages/dpkg/dpkg_1.13.22.bb2
-rw-r--r--meta/packages/dpkg/files/ignore_extra_fields.patch21
4 files changed, 24 insertions, 2 deletions
diff --git a/meta/packages/dpkg/dpkg-native_1.13.22.bb b/meta/packages/dpkg/dpkg-native_1.13.22.bb
index 67e9306de6..68e8f190c7 100644
--- a/meta/packages/dpkg/dpkg-native_1.13.22.bb
+++ b/meta/packages/dpkg/dpkg-native_1.13.22.bb
@@ -1,5 +1,5 @@
1require dpkg.inc 1require dpkg.inc
2PR = "r1" 2PR = "r2"
3DEPENDS += "ncurses-native zlib-native virtual/update-alternatives-native" 3DEPENDS += "ncurses-native zlib-native virtual/update-alternatives-native"
4SRC_URI += "file://noman.patch;patch=1" 4SRC_URI += "file://noman.patch;patch=1"
5 5
diff --git a/meta/packages/dpkg/dpkg.inc b/meta/packages/dpkg/dpkg.inc
index a2504dd89f..5fab2a7e3a 100644
--- a/meta/packages/dpkg/dpkg.inc
+++ b/meta/packages/dpkg/dpkg.inc
@@ -3,6 +3,7 @@ LICENSE = "GPL"
3SECTION = "base" 3SECTION = "base"
4 4
5SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \ 5SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz \
6 file://ignore_extra_fields.patch;patch=1 \
6 file://noupdalt.patch;patch=1" 7 file://noupdalt.patch;patch=1"
7 8
8S = "${WORKDIR}/dpkg-${PV}" 9S = "${WORKDIR}/dpkg-${PV}"
diff --git a/meta/packages/dpkg/dpkg_1.13.22.bb b/meta/packages/dpkg/dpkg_1.13.22.bb
index 9c7cdd0dc4..0d6ae5c5fb 100644
--- a/meta/packages/dpkg/dpkg_1.13.22.bb
+++ b/meta/packages/dpkg/dpkg_1.13.22.bb
@@ -1,5 +1,5 @@
1require dpkg.inc 1require dpkg.inc
2PR = "r3" 2PR = "r4"
3DEPENDS += "ncurses zlib bzip2" 3DEPENDS += "ncurses zlib bzip2"
4SRC_URI += "file://noman.patch;patch=1" 4SRC_URI += "file://noman.patch;patch=1"
5 5
diff --git a/meta/packages/dpkg/files/ignore_extra_fields.patch b/meta/packages/dpkg/files/ignore_extra_fields.patch
new file mode 100644
index 0000000000..43878463e9
--- /dev/null
+++ b/meta/packages/dpkg/files/ignore_extra_fields.patch
@@ -0,0 +1,21 @@
1 dpkg-deb/build.c | 4 ++--
2 1 file changed, 2 insertions(+), 2 deletions(-)
3
4Index: dpkg-1.13.22/dpkg-deb/build.c
5===================================================================
6--- dpkg-1.13.22.orig/dpkg-deb/build.c 2006-05-19 23:11:08.000000000 +0100
7+++ dpkg-1.13.22/dpkg-deb/build.c 2006-11-17 14:43:20.000000000 +0000
8@@ -220,11 +220,11 @@ void do_build(const char *const *argv) {
9 controlfile, checkedinfo->otherpriority);
10 warns++;
11 }
12- for (field= checkedinfo->available.arbs; field; field= field->next) {
13+ /*for (field= checkedinfo->available.arbs; field; field= field->next) {
14 fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"),
15 controlfile, field->name);
16 warns++;
17- }
18+ }*/
19 checkversion(checkedinfo->available.version.version,"(upstream) version",&errs);
20 checkversion(checkedinfo->available.version.revision,"Debian revision",&errs);
21 if (errs) ohshit(_("%d errors in control file"),errs);