From: Denys Dmytriyenko <[email protected]> Fix up additional bashisms thoughout the code.
This is far from being complete - there are plenty of bashisms left in tisdk-bundle and manifest generation code, but at least the bundle can be built now. Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../classes/tisdk-bundle.bbclass | 6 ++--- .../recipes-core/images/arago-image.inc | 1 + .../ti-tisdk-makefile_1.0.bb | 2 +- .../recipes-core/meta/meta-toolchain-arago.bb | 22 +++++++++---------- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass index 6a0b4eca..b92ca0c0 100644 --- a/meta-arago-distro/classes/tisdk-bundle.bbclass +++ b/meta-arago-distro/classes/tisdk-bundle.bbclass @@ -500,7 +500,7 @@ generate_sw_manifest_table() { return 1 fi - if [ "$gplv3_only" == "" ] + if [ "$gplv3_only" = "" ] then # The second parameter was not passed so set to false gplv3_only="false" @@ -633,7 +633,7 @@ EOF esac done - if [ "$extra_files" == "1" ] + if [ "$extra_files" = "1" ] then source="$source"" <br>Files from:<br><a href=https://git.yoctoproject.org/meta-arago>https://git.yoctoproject.org/meta-arago</a><br><a href=https://git.yoctoproject.org/meta-ti>https://git.yoctoproject.org/meta-ti</a>" fi @@ -662,7 +662,7 @@ echo " " >> ${SW_MANIFEST_FILE} cat >> ${SW_MANIFEST_TEXT} << EOF -| ${package} | ${version} | ${license//\|/or} | ${delivered_as} | ${modified} | ${location} | ${source} +| ${package} | ${version} | ${license} | ${delivered_as} | ${modified} | ${location} | ${source} EOF done diff --git a/meta-arago-distro/recipes-core/images/arago-image.inc b/meta-arago-distro/recipes-core/images/arago-image.inc index 73c49ce4..0bb3634b 100644 --- a/meta-arago-distro/recipes-core/images/arago-image.inc +++ b/meta-arago-distro/recipes-core/images/arago-image.inc @@ -22,6 +22,7 @@ IMAGE_LINGUAS = "" TOOLCHAIN_HOST_TASK += "nativesdk-buildtools-perl-dummy" SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}" +# FIXME: remove bashisms from this function (currently disabled) make_bootfiles_symlinks_relative() { for f in "${IMAGE_ROOTFS}/boot"/* do diff --git a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb index 85b99bf2..b991351f 100644 --- a/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb +++ b/meta-arago-distro/recipes-tisdk/ti-tisdk-makefile/ti-tisdk-makefile_1.0.bb @@ -267,7 +267,7 @@ do_install () { cat ${D}/Makefile | grep "__DTB_DEPEND__" > /dev/null - if [ "$?" == "0" ] + if [ "$?" = "0" ] then sed -i -e "s|__KERNEL_DEVICETREE__|${KERNEL_DEVICETREE}|" ${D}/Makefile sed -i -e "s/__DTB_DEPEND__/linux-dtbs/" ${D}/Makefile 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 b89f54c7..9dfa6c85 100644 --- a/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb +++ b/meta-arago-extras/recipes-core/meta/meta-toolchain-arago.bb @@ -112,17 +112,17 @@ arago_sdk_fixup () { [ -e ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/usr/lib/${TOOLCHAIN_SYS} ] || ln -s . ${SDK_OUTPUT}/${SDKTARGETSYSROOT}/usr/lib/${TOOLCHAIN_SYS} tcpath="${SDK_OUTPUT}/${SDKPATHNATIVE}${prefix_nativesdk}/${TOOLCHAIN_SYS}" mkdir -p $tcpath - pushd $tcpath - ln -s ${SDKTARGETSYSROOT}/include include - if [ "${TOOLCHAIN_BRAND}" != "arago" ]; then - mkdir -p libc - cd libc - fi - mkdir -p usr - ln -s ${SDKTARGETSYSROOT}/lib lib - ln -s ${SDKTARGETSYSROOT}/usr/lib usr/lib - ln -s ${SDKTARGETSYSROOT}/usr/include usr/include - popd + ( cd $tcpath; \ + ln -s ${SDKTARGETSYSROOT}/include include; \ + if [ "${TOOLCHAIN_BRAND}" != "arago" ]; then \ + mkdir -p libc; \ + cd libc; \ + fi; \ + mkdir -p usr; \ + ln -s ${SDKTARGETSYSROOT}/lib lib; \ + ln -s ${SDKTARGETSYSROOT}/usr/lib usr/lib; \ + ln -s ${SDKTARGETSYSROOT}/usr/include usr/include; \ + ) } fakeroot create_sdk_files() { -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14028): https://lists.yoctoproject.org/g/meta-arago/message/14028 Mute This Topic: https://lists.yoctoproject.org/mt/93649129/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-arago/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
