diff options
| author |   Richard Purdie <richard@openedhand.com> | 2006-11-17 15:40:56 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-11-17 15:40:56 +0000 |
| commit | 941d957cb967145014f383db50eff714c03fb295 (patch) | |
| tree | a476d1375659e327e29d800cee056a71c1000292 /meta | |
| parent | 177e1a17c0b735cfe47b7e6be0c74b68c0344510 (diff) | |
| download | openembedded-core-contrib-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')
| -rw-r--r-- | meta/packages/dpkg/dpkg-native_1.13.22.bb | 2 | ||||
| -rw-r--r-- | meta/packages/dpkg/dpkg.inc | 1 | ||||
| -rw-r--r-- | meta/packages/dpkg/dpkg_1.13.22.bb | 2 | ||||
| -rw-r--r-- | meta/packages/dpkg/files/ignore_extra_fields.patch | 21 |
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 @@ require dpkg.inc -PR = "r1" +PR = "r2" DEPENDS += "ncurses-native zlib-native virtual/update-alternatives-native" SRC_URI += "file://noman.patch;patch=1" 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" 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}" 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 @@ require dpkg.inc -PR = "r3" +PR = "r4" DEPENDS += "ncurses zlib bzip2" SRC_URI += "file://noman.patch;patch=1" 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 @@ + 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); |