From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.saftware.de (mail.saftware.de [83.141.3.46]) by mail.openembedded.org (Postfix) with ESMTP id 8ABB571A66 for ; Tue, 6 Dec 2016 11:50:10 +0000 (UTC) Received: by t510.zcs.saftware.de (Postfix, from userid 1000) id 515F9B8B286; Tue, 6 Dec 2016 12:49:54 +0100 (CET) From: Andreas Oberritter To: openembedded-core@lists.openembedded.org Date: Tue, 6 Dec 2016 12:49:41 +0100 Message-Id: <1481024991-5882-24-git-send-email-obi@opendreambox.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481024991-5882-1-git-send-email-obi@opendreambox.org> References: <1481024991-5882-1-git-send-email-obi@opendreambox.org> Subject: [PATCH 23/33] dpkg: use PACKAGECONFIG X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Dec 2016 11:50:10 -0000 Keep default dependencies as before. Set default compressor to xz if selected, gzip otherwise. Signed-off-by: Andreas Oberritter --- meta/recipes-devtools/dpkg/dpkg.inc | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 6769a70..5b5ea01 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -1,13 +1,10 @@ SUMMARY = "Package maintenance system from Debian" LICENSE = "GPLv2.0+" SECTION = "base" +DEPENDS = "perl" +DEPENDS_append_class-native = " bzip2-replacement-native" PROVIDES = "virtual/update-alternatives" -DEPENDS = "zlib bzip2 perl ncurses" -DEPENDS_class-native = "bzip2-replacement-native zlib-native gettext-native perl-native" -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} xz run-postinsts perl" -RDEPENDS_${PN}_class-native = "xz-native" - UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/" inherit autotools gettext perlnative pkgconfig systemd @@ -24,14 +21,18 @@ PERL_class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" export PERL_LIBDIR = "${libdir}/perl" PERL_LIBDIR_class-native = "${libdir}/perl-native/perl" -EXTRA_OECONF = "\ - --disable-dselect \ - --enable-start-stop-daemon \ - --with-zlib \ - --with-bz2 \ - --without-liblzma \ - --without-selinux \ - " +PACKAGECONFIG ??= "bzip2 gzip start-stop-daemon update-alternatives" +PACKAGECONFIG[bzip2] = "--with-bz2,--without-bz2,bzip2" +PACKAGECONFIG[dselect] = "--enable-dselect,--disable-dselect,ncurses" +PACKAGECONFIG[gzip] = "--with-zlib,--without-zlib,zlib" +PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" +PACKAGECONFIG[start-stop-daemon] = "--enable-start-stop-daemon,--disable-start-stop-daemon" +PACKAGECONFIG[update-alternatives] = "--enable-update-alternatives,--disable-update-alternatives" +PACKAGECONFIG[xz] = "--with-liblzma,--without-liblzma,xz" + +DPKG_DEB_COMPRESSOR ?= "${@bb.utils.contains('PACKAGECONFIG', 'xz', 'xz', 'gzip', d)}" + +EXTRA_OECONF += "--with-dpkg-deb-compressor=${DPKG_DEB_COMPRESSOR}" EXTRA_OECONF += "TAR=tar" EXTRA_OECONF_append_class-target = " DEB_HOST_ARCH=${DPKG_ARCH}" @@ -65,6 +66,10 @@ do_install_append () { } PACKAGES =+ "update-alternatives-dpkg" + +RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} run-postinsts perl" +RDEPENDS_${PN}_class-native = "" + FILES_update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives" RPROVIDES_update-alternatives-dpkg = "update-alternatives" RCONFLICTS_update-alternatives-dpkg = "update-alternatives" -- 2.7.4