]> code.ossystems Code Review - openembedded-core.git/commitdiff
coreutils: use u-a for base32
authorMartin Jansa <Martin.Jansa@gmail.com>
Tue, 2 Mar 2021 09:25:02 +0000 (10:25 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 2 Mar 2021 20:35:08 +0000 (20:35 +0000)
* busybox 1.33.0 added base32 applet and now do_rootfs for read-only images is failing with:
  do_rootfs: busybox.postinst returned 1, marking as unpacked only, configuration required on target.
  ERROR: image-devel-1.0-r2 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 image-devel/1.0-r2/temp/log.do_rootfs.

  and log.do_rootfs shows:
  update-alternatives: Error: not linking image-devel/1.0-r2/rootfs/usr/bin/base32 to /usr/bin/busybox.nosuid since image-devel/1.0-r2/rootfs/usr/bin/base32 exists and is not a link

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/coreutils/coreutils_8.32.bb

index 320f93bdc20362952aa5719209a79a12a2517ee5..c1962ccb9095d8ad9f8694f1dd4fe5f443feed61 100644 (file)
@@ -117,7 +117,7 @@ inherit update-alternatives
 ALTERNATIVE_PRIORITY = "100"
 # Make hostname's priority higher than busybox but lower than net-tools
 ALTERNATIVE_PRIORITY[hostname] = "90"
-ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base64 nice printenv mktemp df"
+ALTERNATIVE_${PN} = "lbracket ${bindir_progs} ${base_bindir_progs} ${sbindir_progs} base32 base64 nice printenv mktemp df"
 ALTERNATIVE_${PN}-doc = "base64.1 nice.1 mktemp.1 df.1 groups.1 kill.1 uptime.1 stat.1 hostname.1"
 
 ALTERNATIVE_LINK_NAME[hostname.1] = "${mandir}/man1/hostname.1"