diff mbox series

[meta-darwin,06/21] darwin recipes: fix S/WORKDIR/destsuffix breakage from git-fetcher UNPACKDIR relocation

Message ID 20261014141209.488034-6-ecordonnier@snap.com
State New
Headers show
Series [meta-darwin,01/21] meta-darwin: bump layer series to wrynose (6.0.3) | expand

Commit Message

Etienne Cordonnier Oct. 14, 2026, 2:10 p.m. UTC 
From: Etienne Cordonnier <ecordonnier@snap.com>

Two related upstream bitbake.conf changes broke several Darwin
recipes' S assignments:

- The git fetcher's checkout destination moved from ${WORKDIR}/git to
  ${UNPACKDIR}/${destsuffix or BP}, and oe-core's do_qa_unpack now
  fatally rejects any S literally containing "${WORKDIR}"/"git" or
  matching the old default. Drop the now-redundant/forbidden
  S = "${WORKDIR}/git" assignments (cctools-port-crosssdk,
  libdispatch-native, libtapi-native, xar, bomutils, hfsprogs,
  libdmg-hfsplus) and update any LIC_FILES_CHKSUM/CXXFLAGS/B that
  hardcoded the old path to use ${S}/${UNPACKDIR} instead. Also drop
  B = "${WORKDIR}/build" overrides exactly duplicating the
  autotools/cmake class default.

- Two recipes' real unpack destination still diverges from the new
  default (${UNPACKDIR}/${BP}):
    - nativesdk-osx-runtime explicitly overrode destsuffix to the
      now-banned literal "git" (and has a subpath, which would
      otherwise pick a different default destsuffix). Renamed the
      destsuffix to "osx-sdk" and pointed S there explicitly, and
      fixed LIC_FILES_CHKSUM's local LICENSE path, which never
      resolved to WORKDIR either.
    - libtapi-native has a single git fetch with no subpath/destsuffix
      override, so its default destsuffix (${BP}) already matches the
      new S default - no override needed. Fixed S/LIC_FILES_CHKSUM to
      point at the existing ${BP}-named checkout dir instead of
      introducing an unnecessary explicit destsuffix.

AI-Generated: Claude Sonnet 5

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
---
 .../cctools-port/cctools-port-crosssdk_1010.6.bb           | 3 ---
 recipes-devtools/libdispatch/libdispatch-native_git.bb     | 6 +-----
 recipes-devtools/libtapi/libtapi-native_1300.6.5.bb        | 7 +++----
 recipes-devtools/osx-runtime/nativesdk-osx-runtime_14.5.bb | 6 +++---
 recipes-devtools/xar/xar_git.bb                            | 5 +----
 recipes-support/bomutils/bomutils_git.bb                   | 5 ++---
 recipes-support/hfsprogs/hfsprogs_git.bb                   | 2 --
 recipes-support/libdmg-hfsplus/libdmg-hfsplus_git.bb       | 4 +---
 8 files changed, 11 insertions(+), 27 deletions(-)
diff mbox series

Patch

diff --git a/recipes-devtools/cctools-port/cctools-port-crosssdk_1010.6.bb b/recipes-devtools/cctools-port/cctools-port-crosssdk_1010.6.bb
index 4d2625a..0053585 100644
--- a/recipes-devtools/cctools-port/cctools-port-crosssdk_1010.6.bb
+++ b/recipes-devtools/cctools-port/cctools-port-crosssdk_1010.6.bb
@@ -36,9 +36,6 @@  EXTRA_OECONF:append = " \
     --with-libtapi=${STAGING_DIR_NATIVE}/usr \
 "
 
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
 AUTOTOOLS_SCRIPT_PATH = "${S}/cctools"
 
 do_configure:prepend() {
diff --git a/recipes-devtools/libdispatch/libdispatch-native_git.bb b/recipes-devtools/libdispatch/libdispatch-native_git.bb
index 07f3c78..c7dadd0 100644
--- a/recipes-devtools/libdispatch/libdispatch-native_git.bb
+++ b/recipes-devtools/libdispatch/libdispatch-native_git.bb
@@ -4,7 +4,7 @@ 
 SUMMARY = "Apple Grand Central Dispatch (libdispatch)"
 HOMEPAGE = "https://github.com/tpoechtrager/apple-libdispatch"
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=1cd73afe3fb82e8d5c899b9d926451d0"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=1cd73afe3fb82e8d5c899b9d926451d0"
 
 SECTION = "devel"
 
@@ -13,10 +13,6 @@  SRC_URI = "git://github.com/swiftlang/swift-corelibs-libdispatch.git;nobranch=1;
 
 inherit cmake native
 
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
-
 DEPENDS += " \
     clang-native \
     libcxx-native \
diff --git a/recipes-devtools/libtapi/libtapi-native_1300.6.5.bb b/recipes-devtools/libtapi/libtapi-native_1300.6.5.bb
index 66fd29d..5442f39 100644
--- a/recipes-devtools/libtapi/libtapi-native_1300.6.5.bb
+++ b/recipes-devtools/libtapi/libtapi-native_1300.6.5.bb
@@ -6,7 +6,7 @@  TAPI_VERSION = "1300.6.5"
 SUMMARY = "Apple libtapi for tdb support"
 HOMEPAGE = "https://github.com/tpoechtrager/apple-libtapi"
 LICENSE = "NCSA"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE.APPLE-LIBTAPI.txt;md5=ecd05d65aa93d096452d196dcd233f1e"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${BP}/LICENSE.APPLE-LIBTAPI.txt;md5=ecd05d65aa93d096452d196dcd233f1e"
 
 SECTION = "devel"
 
@@ -17,8 +17,7 @@  PACKAGES = "${PN}-dbg ${PN} ${PN}-dev"
 
 inherit cmake native
 
-S = "${WORKDIR}/git/src/llvm"
-B = "${WORKDIR}/build"
+S = "${UNPACKDIR}/${BP}/src/llvm"
 
 DEPENDS += " \
     clang-native \
@@ -30,7 +29,7 @@  COMPILER_RT:class-native = "-rtlib=libgcc --unwindlib=libgcc"
 LIBCPLUSPLUS:class-native = "-stdlib=libc++ -lc++abi"
 
 CXXFLAGS += " \
-    -I${WORKDIR}/git/src/llvm/projects/clang/include \
+    -I${S}/projects/clang/include \
     -I${B}/projects/clang/include \
 "
 
diff --git a/recipes-devtools/osx-runtime/nativesdk-osx-runtime_14.5.bb b/recipes-devtools/osx-runtime/nativesdk-osx-runtime_14.5.bb
index a7421cf..06865d8 100644
--- a/recipes-devtools/osx-runtime/nativesdk-osx-runtime_14.5.bb
+++ b/recipes-devtools/osx-runtime/nativesdk-osx-runtime_14.5.bb
@@ -3,7 +3,7 @@  LICENSE = "Proprietary"
 
 COMPATIBLE_HOST = ".*-darwin.*"
 
-OSX_SDK ?= "git://github.com/alexey-lysiuk/macos-sdk.git;nobranch=1;protocol=https;subpath=MacOSX14.5.sdk;destsuffix=git"
+OSX_SDK ?= "git://github.com/alexey-lysiuk/macos-sdk.git;nobranch=1;protocol=https;subpath=MacOSX14.5.sdk;destsuffix=osx-sdk"
 SRCREV = "69ddec41e6224afebd5f19bb24764305ac3e828a"
 
 SRC_URI = " \
@@ -12,11 +12,11 @@  SRC_URI = " \
     file://LICENSE \
 "
 
-LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=03fe683ef28b9ddfe7f658a0f4b3b80e"
+LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=03fe683ef28b9ddfe7f658a0f4b3b80e"
 
 PR = "1"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/osx-sdk"
 
 inherit nativesdk
 
diff --git a/recipes-devtools/xar/xar_git.bb b/recipes-devtools/xar/xar_git.bb
index 19930b5..9941920 100644
--- a/recipes-devtools/xar/xar_git.bb
+++ b/recipes-devtools/xar/xar_git.bb
@@ -11,15 +11,12 @@  SRC_URI = " \
 
 inherit autotools pkgconfig
 
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/xar/LICENSE;md5=64becc7b238f5b2d599c009ab19c2c27"
+LIC_FILES_CHKSUM = "file://${S}/xar/LICENSE;md5=64becc7b238f5b2d599c009ab19c2c27"
 
 DEPENDS = "libxml2"
 
 BBCLASSEXTEND = "native"
 
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
-
 do_configure() {
     ${S}/xar/configure --enable-autogen --prefix=${STAGING_EXECPREFIXDIR}
 }
diff --git a/recipes-support/bomutils/bomutils_git.bb b/recipes-support/bomutils/bomutils_git.bb
index 4c76f26..5d29675 100644
--- a/recipes-support/bomutils/bomutils_git.bb
+++ b/recipes-support/bomutils/bomutils_git.bb
@@ -7,12 +7,11 @@  SRC_URI = " \
     git://github.com/elhernes/bomutils.git;branch=master;protocol=https \
 "
 
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=55d923cdeef7e46b4d6415cb173b345a"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=55d923cdeef7e46b4d6415cb173b345a"
 
 BBCLASSEXTEND = "native"
 
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/git/build"
+B = "${S}/build"
 
 do_compile() {
     make -C ${S}
diff --git a/recipes-support/hfsprogs/hfsprogs_git.bb b/recipes-support/hfsprogs/hfsprogs_git.bb
index 550888d..5572435 100644
--- a/recipes-support/hfsprogs/hfsprogs_git.bb
+++ b/recipes-support/hfsprogs/hfsprogs_git.bb
@@ -9,8 +9,6 @@  LIC_FILES_CHKSUM = "file://README.md;md5=ea27fd14a7e575753270cc5527d29023"
 SRCREV = "064b7fece00d069f206fd2d4a9a4493dd2777d9f"
 SRC_URI = "git://github.com/elhernes/hfsprogs.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
-
 DEPENDS = "openssl libbsd"
 
 inherit cmake native
diff --git a/recipes-support/libdmg-hfsplus/libdmg-hfsplus_git.bb b/recipes-support/libdmg-hfsplus/libdmg-hfsplus_git.bb
index 98ff652..1ee9fff 100644
--- a/recipes-support/libdmg-hfsplus/libdmg-hfsplus_git.bb
+++ b/recipes-support/libdmg-hfsplus/libdmg-hfsplus_git.bb
@@ -7,9 +7,7 @@  LICENSE = "GPL-3.0-only"
 SRC_URI = "git://github.com/elhernes/libdmg-hfsplus.git;branch=master;protocol=https"
 SRCREV = "3c3ce87a7e2f036f771f81147f9e125a2bb207f1"
 
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=d32239bcb673463ab874e80d47fae504"
-
-S = "${WORKDIR}/git"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit cmake