diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2014-08-28 16:00:07 +0200 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2020-07-02 12:18:38 +0200 |
| commit | ee0ff4a259a60b005b27c70df6436a7b6943aee8 (patch) | |
| tree | 5a5686b1a58d1694bd6ceb95128b6f1b5c8cd50c /meta | |
| parent | 64d67200b1ba9e8284c1bfa7bc867741256099e6 (diff) | |
| download | openembedded-core-contrib-ee0ff4a259a60b005b27c70df6436a7b6943aee8.tar.gz | |
dpkg: clean-up packaging of start-stop-daemon
Dpkg-start-stop is not an intuitive name. Just call the package
start-stop-daemon. Don't rdepend on it, because it might be empty.
Install start-stop-daemon to /sbin to match Debian and busybox.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 70f9042c77..abd0c0abca 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -19,9 +19,9 @@ UA_native = "${@['', 'update-alternatives'][d.getVar('PREFERRED_PROVIDER_virtual DPKG_DEB_COMPRESSOR ?= "${@bb.utils.contains('PACKAGECONFIG', 'liblzma', 'xz', 'gzip', d)}" -EXTRA_OECONF += "--with-dpkg-deb-compressor=${DPKG_DEB_COMPRESSOR} TAR=tar" +EXTRA_OECONF += "--sbindir=${base_sbindir} --with-dpkg-deb-compressor=${DPKG_DEB_COMPRESSOR} TAR=tar" -EXTRA_OECONF_append_class-target = " --disable-update-alternatives DEB_HOST_ARCH=${DPKG_ARCH}" +EXTRA_OECONF_append_class-target = " DEB_HOST_ARCH=${DPKG_ARCH}" PACKAGECONFIG = "bzip2 gzip liblzma start-stop-daemon ${UA}" PACKAGECONFIG[bzip2] = "--with-libbz2,--without-libbz2,bzip2" @@ -44,10 +44,14 @@ do_install_append () { fi } -PACKAGES =+ "update-alternatives-dpkg" +PACKAGES =+ "start-stop-daemon update-alternatives-dpkg" RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} perl" RDEPENDS_${PN}_class-native = "" +RRECOMMENDS_${PN} = "start-stop-daemon" +RRECOMMENDS_${PN}_class-native = "" + +FILES_start-stop-daemon = "${base_sbindir}/start-stop-daemon" FILES_update-alternatives-dpkg = "${bindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives" RPROVIDES_update-alternatives-dpkg = "update-alternatives" @@ -75,17 +79,8 @@ RDEPENDS_${PN}-perl += "perl-module-carp perl-module-constant \ perl-module-time-hires perl-module-time-piece \ perl-module-xsloader" -# Split out start-stop-daemon to its own package. Note that it -# is installed in a different directory than the one used for -# the bitbake version. -# -PACKAGES =+ "${PN}-start-stop" -FILES_${PN}-start-stop = "${sbindir}/start-stop-daemon.${BPN}" -ALTERNATIVE_${PN}-start-stop = "start-stop-daemon" -ALTERNATIVE_LINK_NAME[start-stop-daemon] = "${sbindir}/start-stop-daemon" +ALTERNATIVE_${PN}-start-stop-daemon = "start-stop-daemon" +ALTERNATIVE_LINK_NAME[start-stop-daemon] = "${base_sbindir}/start-stop-daemon" ALTERNATIVE_PRIORITY = "100" -RDEPENDS_${PN} += "${PN}-start-stop" - - BBCLASSEXTEND = "native" |