diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-01 22:52:57 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-21 12:07:18 +0100 |
| commit | d9328e3b0b062f0621de3d114584b44f384a1c02 (patch) | |
| tree | 8045f8d89f3e1d35999ab41940766f62dd07d42d /meta/recipes-core/musl | |
| parent | 1f18b9a512800860d5153d89eb82b56388efad6f (diff) | |
| download | openembedded-core-d9328e3b0b062f0621de3d114584b44f384a1c02.tar.gz | |
recipes: Switch away from S = WORKDIR
Where recipes use S = ${WORKDIR}, change them to set UNPACKDIR to
a subdir of WORKDIR and make S point at this instead.
I've chosen not to force S into any standard UNPACKDIR we may pick in
future just so the S = UNPACKDIR case is clearly visible by the
directory naming under WORKDIR as that should aid usability.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/musl')
| -rw-r--r-- | meta/recipes-core/musl/bsd-headers.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-core/musl/libssp-nonshared.bb | 3 | ||||
| -rw-r--r-- | meta/recipes-core/musl/musl-legacy-error.bb | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-core/musl/bsd-headers.bb b/meta/recipes-core/musl/bsd-headers.bb index 887a816031..7d0bdee870 100644 --- a/meta/recipes-core/musl/bsd-headers.bb +++ b/meta/recipes-core/musl/bsd-headers.bb @@ -15,7 +15,8 @@ do_compile[noexec] = "1" INHIBIT_DEFAULT_DEPS = "1" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install() { install -Dm 0644 ${S}/sys-queue.h ${D}${includedir}/sys/queue.h diff --git a/meta/recipes-core/musl/libssp-nonshared.bb b/meta/recipes-core/musl/libssp-nonshared.bb index 3faf8f00c3..e9f652fc3e 100644 --- a/meta/recipes-core/musl/libssp-nonshared.bb +++ b/meta/recipes-core/musl/libssp-nonshared.bb @@ -17,7 +17,8 @@ DEPENDS = "virtual/${TARGET_PREFIX}binutils \ do_configure[noexec] = "1" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_compile() { ${CC} ${CPPFLAGS} ${CFLAGS} -fPIE -c stack_chk.c -o stack_chk.o diff --git a/meta/recipes-core/musl/musl-legacy-error.bb b/meta/recipes-core/musl/musl-legacy-error.bb index 5ce5a233ab..11a838a6e8 100644 --- a/meta/recipes-core/musl/musl-legacy-error.bb +++ b/meta/recipes-core/musl/musl-legacy-error.bb @@ -13,7 +13,8 @@ do_compile[noexec] = "1" INHIBIT_DEFAULT_DEPS = "1" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_install() { install -Dm 0644 ${S}/error.h -t ${D}${includedir} |