> -----Original Message----- > From: yocto-boun...@yoctoproject.org [mailto:yocto-boun...@yoctoproject.org] > On Behalf Of Peter Kjellerstedt > Sent: den 21 april 2018 03:31 > To: yocto@yoctoproject.org > 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. > > Signed-off-by: Peter Kjellerstedt <peter.kjellerst...@axis.com> > --- > recipes-extended/bash/bash.inc | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/recipes-extended/bash/bash.inc b/recipes-extended/bash/bash.inc > index a05b987..0f0d679 100644 > --- a/recipes-extended/bash/bash.inc > +++ b/recipes-extended/bash/bash.inc > @@ -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)}" > -- > 2.12.0
This change is needed for both Sumo and Rocko, and corresponds to commit 4759408677a4e60c5fa7131afcb5bc184cf2f90a in OE-Core. //Peter -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto
