summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-06-19 15:16:11 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-06-19 15:16:11 +0000
commit7e8cf4d8d6e6f923e4b6dacd9b4df6f03d8649ad (patch)
treef92a9ba6d770120f9596c7612819b10f89fdfdd4 /meta
parent2bbbafbf5fafff8006d19dc08a699fa89d487b83 (diff)
downloadpoky-7e8cf4d8d6e6f923e4b6dacd9b4df6f03d8649ad.tar.gz
dpkg: upgrade to 1.14.19
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4709 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/dpkg/dpkg-native_1.14.19.bb13
-rw-r--r--meta/packages/dpkg/dpkg_1.14.19.bb11
-rw-r--r--meta/packages/dpkg/files/ignore_extra_fields.patch15
3 files changed, 34 insertions, 5 deletions
diff --git a/meta/packages/dpkg/dpkg-native_1.14.19.bb b/meta/packages/dpkg/dpkg-native_1.14.19.bb
new file mode 100644
index 0000000000..b21e95dd1f
--- /dev/null
+++ b/meta/packages/dpkg/dpkg-native_1.14.19.bb
@@ -0,0 +1,13 @@
1require dpkg.inc
2DEPENDS += "ncurses-native bzip2-native zlib-native virtual/update-alternatives-native"
3SRC_URI += "file://noman.patch;patch=1"
4
5inherit native
6
7EXTRA_OECONF = "--without-static-progs \
8 --without-dselect \
9 --with-start-stop-daemon \
10 --with-zlib \
11 --with-bz2lib \
12 --without-selinux \
13 --without-sgml-doc"
diff --git a/meta/packages/dpkg/dpkg_1.14.19.bb b/meta/packages/dpkg/dpkg_1.14.19.bb
new file mode 100644
index 0000000000..81415f6b54
--- /dev/null
+++ b/meta/packages/dpkg/dpkg_1.14.19.bb
@@ -0,0 +1,11 @@
1require dpkg.inc
2DEPENDS += "ncurses zlib bzip2"
3RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
4SRC_URI += "file://noman.patch;patch=1"
5
6EXTRA_OECONF = "--without-static-progs \
7 --without-dselect \
8 --with-start-stop-daemon \
9 --with-zlib \
10 --with-bz2lib \
11 --without-sgml-doc"
diff --git a/meta/packages/dpkg/files/ignore_extra_fields.patch b/meta/packages/dpkg/files/ignore_extra_fields.patch
index 43878463e9..d09343c6e5 100644
--- a/meta/packages/dpkg/files/ignore_extra_fields.patch
+++ b/meta/packages/dpkg/files/ignore_extra_fields.patch
@@ -1,16 +1,19 @@
1 dpkg-deb/build.c | 4 ++-- 1 dpkg-deb/build.c | 4 ++--
2 1 file changed, 2 insertions(+), 2 deletions(-) 2 1 file changed, 2 insertions(+), 2 deletions(-)
3 3
4Index: dpkg-1.13.22/dpkg-deb/build.c 4--- dpkg-1.14.19.orig/dpkg-deb/build.c
5=================================================================== 5+++ dpkg-1.14.19/dpkg-deb/build.c
6--- dpkg-1.13.22.orig/dpkg-deb/build.c 2006-05-19 23:11:08.000000000 +0100 6@@ -241,18 +241,18 @@ void do_build(const char *const *argv) {
7+++ dpkg-1.13.22/dpkg-deb/build.c 2006-11-17 14:43:20.000000000 +0000 7 if (checkedinfo->priority == pri_other) {
8@@ -220,11 +220,11 @@ void do_build(const char *const *argv) { 8 fprintf(stderr, _("warning, `%s' contains user-defined Priority value `%s'\n"),
9 controlfile, checkedinfo->otherpriority); 9 controlfile, checkedinfo->otherpriority);
10 warns++; 10 warns++;
11 } 11 }
12- for (field= checkedinfo->available.arbs; field; field= field->next) { 12- for (field= checkedinfo->available.arbs; field; field= field->next) {
13+ /*for (field= checkedinfo->available.arbs; field; field= field->next) { 13+ /*for (field= checkedinfo->available.arbs; field; field= field->next) {
14 if (known_arbitrary_field(field))
15 continue;
16
14 fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"), 17 fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"),
15 controlfile, field->name); 18 controlfile, field->name);
16 warns++; 19 warns++;
@@ -19,3 +22,5 @@ Index: dpkg-1.13.22/dpkg-deb/build.c
19 checkversion(checkedinfo->available.version.version,"(upstream) version",&errs); 22 checkversion(checkedinfo->available.version.version,"(upstream) version",&errs);
20 checkversion(checkedinfo->available.version.revision,"Debian revision",&errs); 23 checkversion(checkedinfo->available.version.revision,"Debian revision",&errs);
21 if (errs) ohshit(_("%d errors in control file"),errs); 24 if (errs) ohshit(_("%d errors in control file"),errs);
25
26 if (subdir) {