diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2019-08-08 13:24:00 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-12 16:23:57 +0100 |
commit | f7486ba1472ad5fde925bb653e58ca5534053863 (patch) | |
tree | e5e608c475820f1cb76315b0c16ada25459e1863 /meta | |
parent | 7365a605ae5aa1207a9a06604c8189cd422ac604 (diff) | |
download | poky-f7486ba1472ad5fde925bb653e58ca5534053863.tar.gz |
dpkg: Provide update-alternative for start-stop-daemon
When using DISTRO_FEATURE usrmerge, busybox and something that
requires dpkg-start-stop there is a conflict which prints the
following error.
===
ERROR: core-image-minimal-1.0-r1 do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot,
then please place them into pkg_postinst_ontarget_${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.
Details of the failure are in /build/tmp-glibc/work/intel_x86_64-linux/core-image-minimal/1.0-r1/temp/log.do_rootfs.
ERROR: core-image-minimal-1.0-r1 do_rootfs: Function failed: do_rootfs
===
Looking at the log file, it shows the problem:
update-alternatives: Error: not linking /build/tmp-glibc/work/intel_x86_64-linux/core-image-minimal/1.0-r1/rootfs/usr/sbin/start-stop-daemon to /usr/bin/busybox.nosuid since /build/tmp-glibc/work/intel_x86_64-linux/core-image-minimal/1.0-r1/rootfs/usr/sbin/start-stop-daemon exists and is not a link
===
The solution is to add an update-alternative to start-stop-daemon for dpkg.
(From OE-Core rev: e6d51c9472dab6cbec313ba51f9e8b9271f02eb8)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/dpkg/dpkg.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index fee7a75814..1c3c585d79 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc | |||
@@ -9,7 +9,7 @@ RDEPENDS_${PN}_class-native = "" | |||
9 | 9 | ||
10 | UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/" | 10 | UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/dpkg/" |
11 | 11 | ||
12 | inherit autotools gettext perlnative pkgconfig perl-version | 12 | inherit autotools gettext perlnative pkgconfig perl-version update-alternatives |
13 | 13 | ||
14 | PERL_class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" | 14 | PERL_class-native = "${STAGING_BINDIR_NATIVE}/perl-native/perl" |
15 | 15 | ||
@@ -76,7 +76,10 @@ RDEPENDS_${PN}-perl += "perl-module-carp perl-module-constant \ | |||
76 | # the bitbake version. | 76 | # the bitbake version. |
77 | # | 77 | # |
78 | PACKAGES =+ "${PN}-start-stop" | 78 | PACKAGES =+ "${PN}-start-stop" |
79 | FILES_${PN}-start-stop = "${sbindir}/start-stop-daemon" | 79 | FILES_${PN}-start-stop = "${sbindir}/start-stop-daemon.${BPN}" |
80 | ALTERNATIVE_${PN}-start-stop = "start-stop-daemon" | ||
81 | ALTERNATIVE_LINK_NAME[start-stop-daemon] = "${sbindir}/start-stop-daemon" | ||
82 | ALTERNATIVE_PRIORITY = "100" | ||
80 | 83 | ||
81 | RDEPENDS_${PN} += "${PN}-start-stop" | 84 | RDEPENDS_${PN} += "${PN}-start-stop" |
82 | 85 | ||