Any comments on this series?
On Thu, Dec 22, 2022 at 10:12:02PM +0000, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko <[email protected]> > > Fix bashisms - helps with making builds in vanilla Ubuntu containers. > > Signed-off-by: Denys Dmytriyenko <[email protected]> > --- > .../recipes-core/meta/meta-toolchain-arago.bb | 21 +++++++++++++------ > 1 file changed, 15 insertions(+), 6 deletions(-) > > diff --git a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > index 8fed34f5..d2479ad1 100644 > --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb > @@ -106,13 +106,22 @@ arago_sdk_fixup () { > > lexec="${SDK_OUTPUT}/${SDKPATHNATIVE}${prefix_nativesdk}/libexec/gcc/${TOOLCHAIN_SYS}" > fi > tcv=`ls -1 $lexec|head -1` > - [ -e ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/lib/$tcv ] || ln -s . > ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/lib/$tcv > - [ -e ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/usr/lib/$tcv ] || ln -s . > ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/usr/lib/$tcv > - [ -e ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/lib/${TOOLCHAIN_SYS} ] || ln -s > . ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/lib/${TOOLCHAIN_SYS} > - [ -e ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/usr/lib/${TOOLCHAIN_SYS} ] || ln > -s . ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/usr/lib/${TOOLCHAIN_SYS} > + if [ ! -e ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/lib/$tcv ]; then > + ln -s . ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/lib/$tcv > + fi > + if [ ! -e ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/usr/lib/$tcv ]; then > + ln -s . ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/usr/lib/$tcv > + fi > + if [ ! -e ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/lib/${TOOLCHAIN_SYS} ]; then > + ln -s . ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/lib/${TOOLCHAIN_SYS} > + fi > + if [ ! -e ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/usr/lib/${TOOLCHAIN_SYS} ]; > then > + ln -s . > ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/usr/lib/${TOOLCHAIN_SYS} > + fi > > tcpath="${SDK_OUTPUT}/${SDKPATHNATIVE}${prefix_nativesdk}/${TOOLCHAIN_SYS}" > mkdir -p $tcpath > - pushd $tcpath > + curdir=$(pwd) > + cd $tcpath > ln -s ${SDKTARGETSYSROOT}/include include > if [ "${TOOLCHAIN_BRAND}" != "arago" ]; then > mkdir -p libc > @@ -122,7 +131,7 @@ arago_sdk_fixup () { > ln -s ${SDKTARGETSYSROOT}/lib lib > ln -s ${SDKTARGETSYSROOT}/usr/lib usr/lib > ln -s ${SDKTARGETSYSROOT}/usr/include usr/include > - popd > + cd $curdir > } > > fakeroot create_sdk_files() { > -- > 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14170): https://lists.yoctoproject.org/g/meta-arago/message/14170 Mute This Topic: https://lists.yoctoproject.org/mt/95835369/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
