diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2014-08-28 16:00:07 +0200 |
---|---|---|
committer | Andreas Oberritter <obi@opendreambox.org> | 2018-05-07 23:25:22 +0200 |
commit | 597f57f42767660c48dbf5a601cfcc9079bfeae8 (patch) | |
tree | e0c115a1ebdd816a617089b8a7008eab8d6d33bd | |
parent | 972b741153e38dd07c7295092c7ccfe6bad79cb4 (diff) | |
download | openembedded-core-contrib-597f57f42767660c48dbf5a601cfcc9079bfeae8.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>
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 18df061b0a..d172f19a5a 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -35,7 +35,7 @@ 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 += "--sbindir=${base_sbindir} --with-dpkg-deb-compressor=${DPKG_DEB_COMPRESSOR}" PACKAGECONFIG = "liblzma" PACKAGECONFIG[liblzma] = "--with-liblzma,--without-liblzma, xz" @@ -65,10 +65,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" @@ -96,14 +100,4 @@ 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" - -RDEPENDS_${PN} += "${PN}-start-stop" - - BBCLASSEXTEND = "native" |