From 07046f300bbd6048fce7abf5390ccf417f986af0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 13 Jan 2010 23:25:08 +0000 Subject: dpkg: Convert to BBCLASSEXTEND Signed-off-by: Richard Purdie --- meta/packages/dpkg/dpkg-native_1.14.19.bb | 13 ------ meta/packages/dpkg/dpkg.inc | 6 ++- meta/packages/dpkg/dpkg/autofoo.patch | 48 ++++++++++++++++++++++ meta/packages/dpkg/dpkg/ignore_extra_fields.patch | 26 ++++++++++++ meta/packages/dpkg/dpkg/nochroot.patch | 18 ++++++++ meta/packages/dpkg/dpkg/noman.patch | 16 ++++++++ meta/packages/dpkg/dpkg/noupdalt.patch | 16 ++++++++ meta/packages/dpkg/dpkg_1.14.19.bb | 5 ++- meta/packages/dpkg/files/autofoo.patch | 48 ---------------------- meta/packages/dpkg/files/ignore_extra_fields.patch | 26 ------------ meta/packages/dpkg/files/nochroot.patch | 18 -------- meta/packages/dpkg/files/noman.patch | 16 -------- meta/packages/dpkg/files/noupdalt.patch | 16 -------- 13 files changed, 132 insertions(+), 140 deletions(-) delete mode 100644 meta/packages/dpkg/dpkg-native_1.14.19.bb create mode 100644 meta/packages/dpkg/dpkg/autofoo.patch create mode 100644 meta/packages/dpkg/dpkg/ignore_extra_fields.patch create mode 100644 meta/packages/dpkg/dpkg/nochroot.patch create mode 100644 meta/packages/dpkg/dpkg/noman.patch create mode 100644 meta/packages/dpkg/dpkg/noupdalt.patch delete mode 100644 meta/packages/dpkg/files/autofoo.patch delete mode 100644 meta/packages/dpkg/files/ignore_extra_fields.patch delete mode 100644 meta/packages/dpkg/files/nochroot.patch delete mode 100644 meta/packages/dpkg/files/noman.patch delete mode 100644 meta/packages/dpkg/files/noupdalt.patch (limited to 'meta') diff --git a/meta/packages/dpkg/dpkg-native_1.14.19.bb b/meta/packages/dpkg/dpkg-native_1.14.19.bb deleted file mode 100644 index bf947b5054..0000000000 --- a/meta/packages/dpkg/dpkg-native_1.14.19.bb +++ /dev/null @@ -1,13 +0,0 @@ -require dpkg.inc -DEPENDS += "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/meta/packages/dpkg/dpkg.inc b/meta/packages/dpkg/dpkg.inc index 67c0781ce8..d002b3ec8a 100644 --- a/meta/packages/dpkg/dpkg.inc +++ b/meta/packages/dpkg/dpkg.inc @@ -7,7 +7,11 @@ 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}" +DEPENDS = "zlib bzip2" +DEPENDS_virtclass-native = "bzip2-native zlib-native virtual/update-alternatives-native" +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" + +S = "${WORKDIR}/${BPN}-${PV}" PARALLEL_MAKE = "" diff --git a/meta/packages/dpkg/dpkg/autofoo.patch b/meta/packages/dpkg/dpkg/autofoo.patch new file mode 100644 index 0000000000..691121e418 --- /dev/null +++ b/meta/packages/dpkg/dpkg/autofoo.patch @@ -0,0 +1,48 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- dpkg-1.10.23/configure.in~autofoo ++++ dpkg-1.10.23/configure.in +@@ -227,21 +227,36 @@ + # OpenBSD passes AC_TRY_COMPILE for va_copy even though + # it doesn't seem to exist, which is odd. We need to use + # AC_TRY_RUN. ++# ++# If crosscompiling, use AC_TRY_COMPILE. -CL + AC_TRY_RUN([ + #include + main(){ + va_list v1,v2; + va_copy(v1, v2); + exit(0);} +-], [AC_MSG_RESULT(yes) +-AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])],[AC_MSG_RESULT(no) +-AC_MSG_CHECKING([for va_list assignment copy]) ++], [dpkg_cv_va_copy=yes], [dpkg_cv_va_copy=no], + AC_TRY_COMPILE([ + #include ++main(){ ++va_list v1,v2; ++va_copy(v1, v2); ++exit(0);} ++], [dpkg_cv_va_copy=yes], [dpkg_vc_va_copy=no])) ++ ++if test "$dpkg_cv_va_copy" = "yes"; then ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists]) ++else ++ AC_MSG_RESULT(no) ++ AC_MSG_CHECKING([for va_list assignment copy]) ++ AC_TRY_COMPILE([ ++#include + ],[ + va_list v1,v2; + v1 = v2; +-], AC_MSG_RESULT(yes),AC_MSG_ERROR(no))]) ++], AC_MSG_RESULT(yes), AC_MSG_ERROR(no)) ++fi + + DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attributes a la GCC 2.5 and higher are available.], + DPKG_C_GCC_ATTRIBUTE(noreturn,noreturn,[int x],noreturn,NORETURN,[Define if nonreturning functions a la GCC 2.5 and higher are available.]) diff --git a/meta/packages/dpkg/dpkg/ignore_extra_fields.patch b/meta/packages/dpkg/dpkg/ignore_extra_fields.patch new file mode 100644 index 0000000000..d09343c6e5 --- /dev/null +++ b/meta/packages/dpkg/dpkg/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/meta/packages/dpkg/dpkg/nochroot.patch b/meta/packages/dpkg/dpkg/nochroot.patch new file mode 100644 index 0000000000..3a8beaebbf --- /dev/null +++ b/meta/packages/dpkg/dpkg/nochroot.patch @@ -0,0 +1,18 @@ +--- + src/help.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- dpkg-1.13.22.orig/src/help.c ++++ dpkg-1.13.22/src/help.c +@@ -175,9 +175,11 @@ static const char* preexecscript(const c + */ + size_t instdirl; + ++#if 0 + if (*instdir) { + if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir); + } ++#endif + if (f_debug & dbg_scripts) { + fprintf(stderr,"D0%05o: fork/exec %s (",dbg_scripts,path); + while (*++argv) fprintf(stderr," %s",*argv); diff --git a/meta/packages/dpkg/dpkg/noman.patch b/meta/packages/dpkg/dpkg/noman.patch new file mode 100644 index 0000000000..f5984fe14a --- /dev/null +++ b/meta/packages/dpkg/dpkg/noman.patch @@ -0,0 +1,16 @@ +--- + Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- dpkg-1.13.22.orig/Makefile.am ++++ dpkg-1.13.22/Makefile.am +@@ -15,8 +15,7 @@ SUBDIRS = \ + utils \ + scripts \ + po \ +- origins \ +- man ++ origins + + ACLOCAL_AMFLAGS = -I m4 + diff --git a/meta/packages/dpkg/dpkg/noupdalt.patch b/meta/packages/dpkg/dpkg/noupdalt.patch new file mode 100644 index 0000000000..023e99ae8d --- /dev/null +++ b/meta/packages/dpkg/dpkg/noupdalt.patch @@ -0,0 +1,16 @@ +--- + scripts/Makefile.am | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- dpkg-1.13.22.orig/scripts/Makefile.am ++++ dpkg-1.13.22/scripts/Makefile.am +@@ -20,8 +20,7 @@ bin_SCRIPTS = \ + sbin_SCRIPTS = \ + cleanup-info \ + dpkg-divert \ +- dpkg-statoverride \ +- update-alternatives ++ dpkg-statoverride + + changelogdir = $(pkglibdir)/parsechangelog + changelog_SCRIPTS = \ diff --git a/meta/packages/dpkg/dpkg_1.14.19.bb b/meta/packages/dpkg/dpkg_1.14.19.bb index 1a7991d40e..1e54306c93 100644 --- a/meta/packages/dpkg/dpkg_1.14.19.bb +++ b/meta/packages/dpkg/dpkg_1.14.19.bb @@ -1,6 +1,4 @@ require dpkg.inc -DEPENDS += "zlib bzip2" -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" SRC_URI += "file://noman.patch;patch=1" @@ -9,4 +7,7 @@ EXTRA_OECONF = "--without-static-progs \ --with-start-stop-daemon \ --with-zlib \ --with-bz2lib \ + --without-selinux \ --without-sgml-doc" + +BBCLASSEXTEND = "native" diff --git a/meta/packages/dpkg/files/autofoo.patch b/meta/packages/dpkg/files/autofoo.patch deleted file mode 100644 index 691121e418..0000000000 --- a/meta/packages/dpkg/files/autofoo.patch +++ /dev/null @@ -1,48 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- dpkg-1.10.23/configure.in~autofoo -+++ dpkg-1.10.23/configure.in -@@ -227,21 +227,36 @@ - # OpenBSD passes AC_TRY_COMPILE for va_copy even though - # it doesn't seem to exist, which is odd. We need to use - # AC_TRY_RUN. -+# -+# If crosscompiling, use AC_TRY_COMPILE. -CL - AC_TRY_RUN([ - #include - main(){ - va_list v1,v2; - va_copy(v1, v2); - exit(0);} --], [AC_MSG_RESULT(yes) --AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists])],[AC_MSG_RESULT(no) --AC_MSG_CHECKING([for va_list assignment copy]) -+], [dpkg_cv_va_copy=yes], [dpkg_cv_va_copy=no], - AC_TRY_COMPILE([ - #include -+main(){ -+va_list v1,v2; -+va_copy(v1, v2); -+exit(0);} -+], [dpkg_cv_va_copy=yes], [dpkg_vc_va_copy=no])) -+ -+if test "$dpkg_cv_va_copy" = "yes"; then -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_VA_COPY,,[Whether the va_copy macro exists]) -+else -+ AC_MSG_RESULT(no) -+ AC_MSG_CHECKING([for va_list assignment copy]) -+ AC_TRY_COMPILE([ -+#include - ],[ - va_list v1,v2; - v1 = v2; --], AC_MSG_RESULT(yes),AC_MSG_ERROR(no))]) -+], AC_MSG_RESULT(yes), AC_MSG_ERROR(no)) -+fi - - DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attributes a la GCC 2.5 and higher are available.], - DPKG_C_GCC_ATTRIBUTE(noreturn,noreturn,[int x],noreturn,NORETURN,[Define if nonreturning functions a la GCC 2.5 and higher are available.]) diff --git a/meta/packages/dpkg/files/ignore_extra_fields.patch b/meta/packages/dpkg/files/ignore_extra_fields.patch deleted file mode 100644 index d09343c6e5..0000000000 --- a/meta/packages/dpkg/files/ignore_extra_fields.patch +++ /dev/null @@ -1,26 +0,0 @@ - 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/meta/packages/dpkg/files/nochroot.patch b/meta/packages/dpkg/files/nochroot.patch deleted file mode 100644 index 3a8beaebbf..0000000000 --- a/meta/packages/dpkg/files/nochroot.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- - src/help.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- dpkg-1.13.22.orig/src/help.c -+++ dpkg-1.13.22/src/help.c -@@ -175,9 +175,11 @@ static const char* preexecscript(const c - */ - size_t instdirl; - -+#if 0 - if (*instdir) { - if (chroot(instdir)) ohshite(_("failed to chroot to `%.250s'"),instdir); - } -+#endif - if (f_debug & dbg_scripts) { - fprintf(stderr,"D0%05o: fork/exec %s (",dbg_scripts,path); - while (*++argv) fprintf(stderr," %s",*argv); diff --git a/meta/packages/dpkg/files/noman.patch b/meta/packages/dpkg/files/noman.patch deleted file mode 100644 index f5984fe14a..0000000000 --- a/meta/packages/dpkg/files/noman.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- - Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- dpkg-1.13.22.orig/Makefile.am -+++ dpkg-1.13.22/Makefile.am -@@ -15,8 +15,7 @@ SUBDIRS = \ - utils \ - scripts \ - po \ -- origins \ -- man -+ origins - - ACLOCAL_AMFLAGS = -I m4 - diff --git a/meta/packages/dpkg/files/noupdalt.patch b/meta/packages/dpkg/files/noupdalt.patch deleted file mode 100644 index 023e99ae8d..0000000000 --- a/meta/packages/dpkg/files/noupdalt.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- - scripts/Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - ---- dpkg-1.13.22.orig/scripts/Makefile.am -+++ dpkg-1.13.22/scripts/Makefile.am -@@ -20,8 +20,7 @@ bin_SCRIPTS = \ - sbin_SCRIPTS = \ - cleanup-info \ - dpkg-divert \ -- dpkg-statoverride \ -- update-alternatives -+ dpkg-statoverride - - changelogdir = $(pkglibdir)/parsechangelog - changelog_SCRIPTS = \ -- cgit v1.2.3-54-g00ecf