Use the include files to create a bb recipe and use the new versioning scheme. Pure-cap-app is affected.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- .../recipes-core/musl/musl-morello-common.inc | 1 - .../recipes-core/musl/musl_%.bbappend | 17 ----------------- .../recipes-core/musl/musl_morello-1.5.bb | 15 +++++++++++++++ .../recipes-core/musl/override-glibc.inc | 5 +---- .../recipes-core/musl/override-musl.inc | 5 +++-- .../conf/machine/include/morello-common.inc | 2 ++ .../applications/pure-cap-app.bb | 4 ++-- 7 files changed, 23 insertions(+), 26 deletions(-) delete mode 100644 meta-morello-toolchain/recipes-core/musl/musl_%.bbappend create mode 100644 meta-morello-toolchain/recipes-core/musl/musl_morello-1.5.bb
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 78ebd91..cd2190a 100644 --- a/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc +++ b/meta-morello-toolchain/recipes-core/musl/musl-morello-common.inc @@ -18,7 +18,6 @@ SRCBRANCH = "morello/master"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68"
-PV = "git${SRCPV}" S = "${WORKDIR}/git" B = "${WORKDIR}/build"
diff --git a/meta-morello-toolchain/recipes-core/musl/musl_%.bbappend b/meta-morello-toolchain/recipes-core/musl/musl_%.bbappend deleted file mode 100644 index 4f899a9..0000000 --- a/meta-morello-toolchain/recipes-core/musl/musl_%.bbappend +++ /dev/null @@ -1,17 +0,0 @@ -require musl-morello-${MORELLO_ARCH}.inc musl-morello-${MORELLO_ARCH}-so.inc musl-morello-target.inc - -MACHINE_INC ?= "" -MACHINE_INC:morello-soc = "override-glibc.inc" -MACHINE_INC:morello-fvp = "override-glibc.inc" - -require ${MACHINE_INC} - -DEPENDS:remove = "virtual/${TARGET_PREFIX}binutils \ - virtual/${TARGET_PREFIX}gcc \ - libgcc-initial \ - linux-libc-headers \ - bsd-headers \ - libssp-nonshared \ - " - -RDEPENDS:${PN}-dev:remove = "linux-libc-headers-dev bsd-headers-dev libssp-nonshared-staticdev" \ No newline at end of file diff --git a/meta-morello-toolchain/recipes-core/musl/musl_morello-1.5.bb b/meta-morello-toolchain/recipes-core/musl/musl_morello-1.5.bb new file mode 100644 index 0000000..ebb8969 --- /dev/null +++ b/meta-morello-toolchain/recipes-core/musl/musl_morello-1.5.bb @@ -0,0 +1,15 @@ +require musl-morello-${MORELLO_ARCH}.inc musl-morello-${MORELLO_ARCH}-so.inc musl-morello-target.inc + +MACHINE_INC ?= "" +MACHINE_INC:morello-soc = "override-glibc.inc" +MACHINE_INC:morello-fvp = "override-glibc.inc" + +LEAD_SONAME = "libc.so" + +INSANE_SKIP:${PN}-dev = "staticdev" +INSANE_SKIP:${PN} = "libdir" +INSANE_SKIP:${PN} = "dev-so" + +RPROVIDES:${PN} += "ldd rtld(GNU_HASH) musl-libc" + +require ${MACHINE_INC} \ No newline at end of file diff --git a/meta-morello-toolchain/recipes-core/musl/override-glibc.inc b/meta-morello-toolchain/recipes-core/musl/override-glibc.inc index 9ccf9c2..7cd642e 100644 --- a/meta-morello-toolchain/recipes-core/musl/override-glibc.inc +++ b/meta-morello-toolchain/recipes-core/musl/override-glibc.inc @@ -1,4 +1 @@ -PROVIDES:append = " virtual/musl-morello" -PROVIDES:remove = "virtual/libc virtual/libiconv virtual/libintl virtual/crypt" -RPROVIDES:${PN}-dev:remove = "libc-dev virtual-libc-dev" -RPROVIDES:${PN}:append = " musl-libc" \ No newline at end of file +PROVIDES:append = " virtual/musl-morello" \ No newline at end of file diff --git a/meta-morello-toolchain/recipes-core/musl/override-musl.inc b/meta-morello-toolchain/recipes-core/musl/override-musl.inc index 1a810e6..6229389 100644 --- a/meta-morello-toolchain/recipes-core/musl/override-musl.inc +++ b/meta-morello-toolchain/recipes-core/musl/override-musl.inc @@ -1,2 +1,3 @@ -PROVIDES:append = " virtual/musl-morello" -RPROVIDES:${PN}:append = " musl-libc" \ No newline at end of file +PROVIDES:append = " virtual/musl-morello" +PROVIDES:append = " virtual/libc virtual/libiconv virtual/libintl virtual/crypt" +RPROVIDES:${PN}-dev:append = " libc-dev virtual-libc-dev" \ No newline at end of file diff --git a/meta-morello/conf/machine/include/morello-common.inc b/meta-morello/conf/machine/include/morello-common.inc index 4e5779d..b01dda2 100644 --- a/meta-morello/conf/machine/include/morello-common.inc +++ b/meta-morello/conf/machine/include/morello-common.inc @@ -11,6 +11,8 @@ PREFERRED_VERSION_trusted-firmware-a = "morello-2.7" PREFERRED_PROVIDER_virtual/kernel = "linux-morello" PREFERRED_VERSION_virtual/kernel = "morello-1.5"
+PREFERRED_VERSION_musl = "morello-1.5" + GDBVERSION = "morello-11.0"
MUSL_INSTALL_DIR ??="" diff --git a/meta-morello/recipes-morello-apps/applications/pure-cap-app.bb b/meta-morello/recipes-morello-apps/applications/pure-cap-app.bb index c1e9d86..f7edde0 100644 --- a/meta-morello/recipes-morello-apps/applications/pure-cap-app.bb +++ b/meta-morello/recipes-morello-apps/applications/pure-cap-app.bb @@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ec TOOLCHAIN = "${MORELLO_TOOLCHAIN}"
PROVIDES = "${OUTPUTS_NAME}" -RDEPENDS:${PN} = "musl-libc" -RPROVIDES:${PN} = "${OUTPUTS_NAME}" +RDEPENDS:${PN} += "musl" +RPROVIDES:${PN} += "${OUTPUTS_NAME}"
FILES:${PN} += "/${APP_DIR}" SYSROOT_DIRS +="/${APP_DIR}"