From c2be672c98b4e4438118c8927729f4944a52204b Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 19 Jun 2008 15:16:11 +0000 Subject: dpkg: upgrade to 1.14.19 (from Poky) git-svn-id: https://svn.o-hand.com/repos/poky@4709 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- packages/dpkg/dpkg-native_1.14.19.bb | 13 +++++++++++++ packages/dpkg/dpkg_1.14.19.bb | 11 +++++++++++ packages/dpkg/files/ignore_extra_fields.patch | 15 ++++++++++----- 3 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 packages/dpkg/dpkg-native_1.14.19.bb create mode 100644 packages/dpkg/dpkg_1.14.19.bb (limited to 'packages/dpkg') diff --git a/packages/dpkg/dpkg-native_1.14.19.bb b/packages/dpkg/dpkg-native_1.14.19.bb new file mode 100644 index 0000000000..b21e95dd1f --- /dev/null +++ b/packages/dpkg/dpkg-native_1.14.19.bb @@ -0,0 +1,13 @@ +require dpkg.inc +DEPENDS += "ncurses-native bzip2-native zlib-native virtual/update-alternatives-native" +SRC_URI += "file://noman.patch;patch=1" + +inherit native + +EXTRA_OECONF = "--without-static-progs \ + --without-dselect \ + --with-start-stop-daemon \ + --with-zlib \ + --with-bz2lib \ + --without-selinux \ + --without-sgml-doc" diff --git a/packages/dpkg/dpkg_1.14.19.bb b/packages/dpkg/dpkg_1.14.19.bb new file mode 100644 index 0000000000..81415f6b54 --- /dev/null +++ b/packages/dpkg/dpkg_1.14.19.bb @@ -0,0 +1,11 @@ +require dpkg.inc +DEPENDS += "ncurses zlib bzip2" +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" +SRC_URI += "file://noman.patch;patch=1" + +EXTRA_OECONF = "--without-static-progs \ + --without-dselect \ + --with-start-stop-daemon \ + --with-zlib \ + --with-bz2lib \ + --without-sgml-doc" diff --git a/packages/dpkg/files/ignore_extra_fields.patch b/packages/dpkg/files/ignore_extra_fields.patch index 43878463e9..d09343c6e5 100644 --- a/packages/dpkg/files/ignore_extra_fields.patch +++ b/packages/dpkg/files/ignore_extra_fields.patch @@ -1,16 +1,19 @@ 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) { +--- 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++; @@ -19,3 +22,5 @@ Index: dpkg-1.13.22/dpkg-deb/build.c 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) { -- cgit v1.2.3 From 86f7175cc8759812d71c8f95c22ad9edc292b4b6 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 30 Jun 2008 13:32:50 +0000 Subject: dpkg: ncurses were needed only for dselect (from Poky) git-svn-id: https://svn.o-hand.com/repos/poky@4748 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- packages/dpkg/dpkg-native_1.14.19.bb | 2 +- packages/dpkg/dpkg_1.13.22.bb | 2 +- packages/dpkg/dpkg_1.13.25.bb | 2 +- packages/dpkg/dpkg_1.14.19.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/dpkg') diff --git a/packages/dpkg/dpkg-native_1.14.19.bb b/packages/dpkg/dpkg-native_1.14.19.bb index b21e95dd1f..bf947b5054 100644 --- a/packages/dpkg/dpkg-native_1.14.19.bb +++ b/packages/dpkg/dpkg-native_1.14.19.bb @@ -1,5 +1,5 @@ require dpkg.inc -DEPENDS += "ncurses-native bzip2-native zlib-native virtual/update-alternatives-native" +DEPENDS += "bzip2-native zlib-native virtual/update-alternatives-native" SRC_URI += "file://noman.patch;patch=1" inherit native diff --git a/packages/dpkg/dpkg_1.13.22.bb b/packages/dpkg/dpkg_1.13.22.bb index fb301a6db9..67d8010f2f 100644 --- a/packages/dpkg/dpkg_1.13.22.bb +++ b/packages/dpkg/dpkg_1.13.22.bb @@ -1,6 +1,6 @@ require dpkg.inc PR = "r4" -DEPENDS += "ncurses zlib bzip2" +DEPENDS += "zlib bzip2" SRC_URI += "file://noman.patch;patch=1" EXTRA_OECONF = "--without-static-progs \ diff --git a/packages/dpkg/dpkg_1.13.25.bb b/packages/dpkg/dpkg_1.13.25.bb index a0bb1dcf47..96840c956c 100644 --- a/packages/dpkg/dpkg_1.13.25.bb +++ b/packages/dpkg/dpkg_1.13.25.bb @@ -1,6 +1,6 @@ require dpkg.inc PR = "r0" -DEPENDS += "ncurses zlib bzip2" +DEPENDS += "zlib bzip2" SRC_URI += "file://noman.patch;patch=1" EXTRA_OECONF = "--without-static-progs \ diff --git a/packages/dpkg/dpkg_1.14.19.bb b/packages/dpkg/dpkg_1.14.19.bb index 81415f6b54..b1f84fadf5 100644 --- a/packages/dpkg/dpkg_1.14.19.bb +++ b/packages/dpkg/dpkg_1.14.19.bb @@ -1,5 +1,5 @@ require dpkg.inc -DEPENDS += "ncurses zlib bzip2" +DEPENDS += "zlib bzip2" RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" SRC_URI += "file://noman.patch;patch=1" -- cgit v1.2.3 From 688f4743ab915dea5c157b82b3afa9230880d3f9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 3 Jul 2008 10:46:27 +0000 Subject: dpkg: rm rcS.d/S98configure to not run it on non-first boot (from Poky) --- packages/dpkg/dpkg.inc | 1 + packages/dpkg/dpkg_1.13.22.bb | 2 +- packages/dpkg/dpkg_1.13.25.bb | 2 +- packages/dpkg/dpkg_1.14.19.bb | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'packages/dpkg') diff --git a/packages/dpkg/dpkg.inc b/packages/dpkg/dpkg.inc index 1065f2c186..dfbdf718f9 100644 --- a/packages/dpkg/dpkg.inc +++ b/packages/dpkg/dpkg.inc @@ -24,6 +24,7 @@ if [ "x$D" != "x" ]; then # this happens at S98 where our good 'ole packages script used to run printf "#!/bin/sh dpkg --configure -a + rm -f /${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure \n" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure fi diff --git a/packages/dpkg/dpkg_1.13.22.bb b/packages/dpkg/dpkg_1.13.22.bb index 67d8010f2f..e4e7a3b279 100644 --- a/packages/dpkg/dpkg_1.13.22.bb +++ b/packages/dpkg/dpkg_1.13.22.bb @@ -1,5 +1,5 @@ require dpkg.inc -PR = "r4" +PR = "r5" DEPENDS += "zlib bzip2" SRC_URI += "file://noman.patch;patch=1" diff --git a/packages/dpkg/dpkg_1.13.25.bb b/packages/dpkg/dpkg_1.13.25.bb index 96840c956c..8a2c8abae0 100644 --- a/packages/dpkg/dpkg_1.13.25.bb +++ b/packages/dpkg/dpkg_1.13.25.bb @@ -1,5 +1,5 @@ require dpkg.inc -PR = "r0" +PR = "r1" DEPENDS += "zlib bzip2" SRC_URI += "file://noman.patch;patch=1" diff --git a/packages/dpkg/dpkg_1.14.19.bb b/packages/dpkg/dpkg_1.14.19.bb index b1f84fadf5..29e718a55d 100644 --- a/packages/dpkg/dpkg_1.14.19.bb +++ b/packages/dpkg/dpkg_1.14.19.bb @@ -1,4 +1,5 @@ require dpkg.inc +PR = "r1" DEPENDS += "zlib bzip2" RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" SRC_URI += "file://noman.patch;patch=1" -- cgit v1.2.3 From e70a309755778974f82565cdc314865fb0b136be Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 23 Oct 2008 21:08:42 +0200 Subject: dpkg: disable dependency on update-alternatives for now --- packages/dpkg/dpkg_1.14.19.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/dpkg') diff --git a/packages/dpkg/dpkg_1.14.19.bb b/packages/dpkg/dpkg_1.14.19.bb index 29e718a55d..0377ce10f1 100644 --- a/packages/dpkg/dpkg_1.14.19.bb +++ b/packages/dpkg/dpkg_1.14.19.bb @@ -1,7 +1,7 @@ require dpkg.inc PR = "r1" DEPENDS += "zlib bzip2" -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" +#RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" SRC_URI += "file://noman.patch;patch=1" EXTRA_OECONF = "--without-static-progs \ -- cgit v1.2.3 From e7e16edfa3fa08d60e74e7ef1f0032599c984160 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 23 Oct 2008 21:30:13 +0200 Subject: dpkg: unbreak 1.13.* versions --- .../dpkg/dpkg-1.14.19/ignore_extra_fields.patch | 26 ++++++++++++++++++++++ packages/dpkg/dpkg-native_1.14.19.bb | 2 ++ packages/dpkg/files/ignore_extra_fields.patch | 15 +++++-------- 3 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 packages/dpkg/dpkg-1.14.19/ignore_extra_fields.patch (limited to 'packages/dpkg') 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) { -- cgit v1.2.3 From 458702db3c425f1c31ca125d2331584837443110 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 23 Oct 2008 21:35:24 +0200 Subject: dpkg-native: disable SELinux in 1.13.22 --- packages/dpkg/dpkg-native_1.13.22.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/dpkg') diff --git a/packages/dpkg/dpkg-native_1.13.22.bb b/packages/dpkg/dpkg-native_1.13.22.bb index 7087f1f90a..5dcf53c164 100644 --- a/packages/dpkg/dpkg-native_1.13.22.bb +++ b/packages/dpkg/dpkg-native_1.13.22.bb @@ -1,5 +1,5 @@ require dpkg.inc -PR = "r3" +PR = "r4" DEPENDS += "zlib-native virtual/update-alternatives-native" SRC_URI += "file://noman.patch;patch=1" @@ -10,4 +10,5 @@ EXTRA_OECONF = "--without-static-progs \ --with-start-stop-daemon \ --with-zlib \ --with-bz2lib \ + --without-selinux \ --without-sgml-doc" -- cgit v1.2.3 From c6ca7d1b5a0dc3e3fceca2f97584dce3377f42a9 Mon Sep 17 00:00:00 2001 From: Rodrigo Vivi Date: Mon, 30 Jun 2008 10:46:26 -0300 Subject: dpkg & task-mamona-base: Moving perl and its modules from task-mamona-base to dpkg. --- packages/dpkg/dpkg.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages/dpkg') diff --git a/packages/dpkg/dpkg.inc b/packages/dpkg/dpkg.inc index dfbdf718f9..eb5778fa3b 100644 --- a/packages/dpkg/dpkg.inc +++ b/packages/dpkg/dpkg.inc @@ -10,6 +10,8 @@ S = "${WORKDIR}/dpkg-${PV}" DEPENDS_${PN} += "update-alternatives" +RDEPENDS += "perl perl-module-base perl-module-carp perl-module-cwd perl-module-english perl-module-exporter perl-module-exporter-heavy perl-module-fcntl perl-module-file-spec-unix perl-module-file-temp perl-module-io perl-module-io-handle perl-module-posix perl-module-strict perl-module-vars perl-module-warnings perl-module-warnings-register perl-module-autoloader perl-module-config perl-module-constant perl-module-errno perl-module-file-basename perl-module-file-path perl-module-file-spec perl-module-overload perl-module-selectsaver perl-module-symbol perl-module-xsloader" + PARALLEL_MAKE = "" inherit autotools gettext -- cgit v1.2.3