Skip to contentSkip to conversation

bash: Provide /bin/{sh, bash} when usrmerge is used

PATCH Peter Kjellerstedt 1 participant 1 message Apr 21, 2018

lore
Share & tools
lore
#0 lore raw
Quoted 31 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Peter Kjellerstedt
Sent: den 21 april 2018 03:31
To: [email protected]
Subject: [yocto] [meta-gplv2][sumo][rocko][PATCH] bash: Provide /bin/{sh, bash} when usrmerge is used

Most shell scripts have '#!/bin/{sh,bash}' on the first line of the script, which triggers RPM to automatically add a runtime dependency on that path for any package that contains shell scripts. However, when the usrmerge feature is enabled, the path will actually be /usr/bin/{sh,bash}.

So, to satisfy the runtime dependencies, add '/bin/{sh,bash}' to what the bash package provides.

---
 recipes-extended/bash/bash.inc | 2 ++
 1 file changed, 2 insertions(+)
recipes-extended/bash/bash.inc +2 -1
index a05b987..0f0d679 100644
@@ -65,3 +65,5 @@ pkg_postinst_${PN} () {
 pkg_postrm_${PN} () {
 	printf "$(grep -v "^${base_bindir}/bash$" $D${sysconfdir}/shells)\n" > $D${sysconfdir}/shells
 }
+
+RPROVIDES_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/sh /bin/bash', '', d)}"
--
Quoted 1 line

2.12.0

This change is needed for both Sumo and Rocko, and corresponds to commit 4759408677a4e60c5fa7131afcb5bc184cf2f90a in OE-Core.

//Peter