Create additional symbolic link in the purecap-base-libdir (on top of actual base libdir) to the C library that lives in the purecap- /usr/lib. This is done to cover a purecap chroot.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-core/musl/musl-morello-c64-so.inc | 5 +++++ .../recipes-core/musl/musl-morello-c64.inc | 2 +- .../recipes-core/musl/musl-morello-common.inc | 6 +++--- .../musl/{musl_morello-1.6.bb => musl_morello-1.7.bb} | 0 4 files changed, 9 insertions(+), 4 deletions(-) rename meta-morello-toolchain/recipes-core/musl/{musl_morello-1.6.bb => musl_morello-1.7.bb} (100%)
diff --git a/meta-morello-toolchain/recipes-core/musl/musl-morello-c64-so.inc b/meta-morello-toolchain/recipes-core/musl/musl-morello-c64-so.inc index b6c8c75..4dbc3c6 100644 --- a/meta-morello-toolchain/recipes-core/musl/musl-morello-c64-so.inc +++ b/meta-morello-toolchain/recipes-core/musl/musl-morello-c64-so.inc @@ -4,4 +4,9 @@ do_install:append() { install -d ${D}${nonarch_base_libdir} ln -rs ${TARGET_INSTALL_DIR}${libdir}/libc.so ${D}${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1 rm -f ${TARGET_INSTALL_DIR}${nonarch_base_libdir}/ld-musl-morello.so.1 +} + +do_install:append() { + install -d ${TARGET_INSTALL_DIR}${nonarch_base_libdir} + ln -rs ${TARGET_INSTALL_DIR}${libdir}/libc.so ${TARGET_INSTALL_DIR}${nonarch_base_libdir}/ld-musl-${MUSL_LDSO_ARCH}.so.1 } \ No newline at end of file diff --git a/meta-morello-toolchain/recipes-core/musl/musl-morello-c64.inc b/meta-morello-toolchain/recipes-core/musl/musl-morello-c64.inc index 761b9d2..bb9955d 100644 --- a/meta-morello-toolchain/recipes-core/musl/musl-morello-c64.inc +++ b/meta-morello-toolchain/recipes-core/musl/musl-morello-c64.inc @@ -4,4 +4,4 @@ EXTRA_CONFIGUREOPTS = "--enable-morello"
ARCH_TRIPLE = "${C64_ARCH_TRIPLE}" LIB_TRIPLE = "${C64_LIB_TRIPLE}" -ARCH_FLAGS = "-march=morello+c64 -mabi=purecap" \ No newline at end of file +ARCH_FLAGS = "-march=morello -mabi=purecap" \ No newline at end of file diff --git a/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc b/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc index 5cb03df..516bd18 100644 --- a/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc +++ b/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc @@ -13,8 +13,8 @@ SRC_URI = " \ file://files/compiler_rt.cmake \ "
-# morello-release-1.6.1 -SRCREV = "b82b5af221072d68e18fad82bae6d2ab308e3985" +# morello-release-1.7 +SRCREV = "f712fa4d03821e9fba9c3e3afd9fb570efdecedd" SRCBRANCH = "morello/master"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68" @@ -64,7 +64,7 @@ do_configure() { local config="${CONFIGUREOPTS}" echo "Install dir ${TARGET_INSTALL_DIR} with ${TCLIBC} MACHINE_INC ${MACHINE_INC}" config="${config} --target=${ARCH_TRIPLE} ${EXTRA_CONFIGUREOPTS} --disable-shared" - ${S}/configure ${config} + ${S}/configure ${config} }
do_compile() { diff --git a/meta-morello-toolchain/recipes-core/musl/musl_morello-1.6.bb b/meta-morello-toolchain/recipes-core/musl/musl_morello-1.7.bb similarity index 100% rename from meta-morello-toolchain/recipes-core/musl/musl_morello-1.6.bb rename to meta-morello-toolchain/recipes-core/musl/musl_morello-1.7.bb