Adds support for Whinlatter release series (#940)

lumag · web-flow · commit 5336aeeadb0a · 2025-06-21T08:36:19.000+03:00
- layer.conf: Update to whinlatter release series
- Set S to be in UNPACKDIR in recipes that explicitly set S
- Remove S in recipes that fetch from git via setting
BB_GIT_DEFAULT_DESTSUFFIX
diff --git a/conf/layer.conf b/conf/layer.conf
@@ -11,7 +11,7 @@ BBFILE_PRIORITY_qcom = "6"
 
 LAYERDEPENDS_qcom = "core"
 LAYERRECOMMENDS_qcom = "openembedded-layer"
-LAYERSERIES_COMPAT_qcom = "styhead walnascar"
+LAYERSERIES_COMPAT_qcom = "whinlatter"
 
 BBFILES_DYNAMIC += " \
     openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/*/*/*.bb \
diff --git a/dynamic-layers/openembedded-layer/recipes-devtools/android-tools/android-tools-adbd-cmdline.bb b/dynamic-layers/openembedded-layer/recipes-devtools/android-tools/android-tools-adbd-cmdline.bb
@@ -3,16 +3,15 @@ SECTION = "console/utils"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 SRC_URI = " \
     file://50-adbd-cmdline.conf \
 "
 
 do_install() {
     install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
-    install -m 0644 ${UNPACKDIR}/50-adbd-cmdline.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
+    install -m 0644 ${S}/50-adbd-cmdline.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
 }
 
 FILES:${PN} += " \
diff --git a/dynamic-layers/openembedded-layer/recipes-support/libssc/libssc_git.bb b/dynamic-layers/openembedded-layer/recipes-support/libssc/libssc_git.bb
@@ -10,8 +10,6 @@ SRCREV = "5e699fc97d92684c6882741fc9f71cb57a33e25b"
 
 PV = "0.2.2+"
 
-S = "${WORKDIR}/git"
-
 inherit meson pkgconfig gobject-introspection
 
 # There is no separate meson option
diff --git a/recipes-bsp/firmware/firmware-ath6kl_git.bb b/recipes-bsp/firmware/firmware-ath6kl_git.bb
@@ -13,8 +13,6 @@ SRCREV = "2e02576c1dab6fd35118eea1004f50aaaed3794f"
 
 PV = "3.5.0.349-1+git"
 
-S = "${WORKDIR}/git"
-
 inherit allarch
 
 CLEANBROKEN = "1"
diff --git a/recipes-bsp/hexagon-dsp-binaries/hexagon-dsp-binaries_20250509.bb b/recipes-bsp/hexagon-dsp-binaries/hexagon-dsp-binaries_20250509.bb
@@ -24,8 +24,6 @@ SRC_URI = " \
 
 SRCREV = "4195fbd4da54f3830af2c01d141c30051f446e51"
 
-S = "${WORKDIR}/git"
-
 inherit allarch
 
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
diff --git a/recipes-bsp/partition/qcom-partition-conf.inc b/recipes-bsp/partition/qcom-partition-conf.inc
@@ -7,8 +7,7 @@ DEPENDS += "qcom-ptool-native"
 
 SRC_URI = "file://${PARTCONF}"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 B = "${WORKDIR}/build"
 
 inherit python3native deploy
diff --git a/recipes-devtools/debugcc/debugcc_git.bb b/recipes-devtools/debugcc/debugcc_git.bb
@@ -13,6 +13,4 @@ SRCREV = "6444cf924b53b8453c2285cde48b6c52e5960089"
 
 PV = "0.0+git"
 
-S = "${WORKDIR}/git"
-
 inherit meson
diff --git a/recipes-devtools/partition-utils/qcom-ptool_git.bb b/recipes-devtools/partition-utils/qcom-ptool_git.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/qualcomm-linux/qcom-ptool.git;branch=main;protocol=h
 SRCREV = "be9d04e7940c777d361f05f0468e260ee493b76e"
 
 PV = "0.0+git"
-S = "${WORKDIR}/git"
 
 inherit python3native
 
diff --git a/recipes-devtools/pil-squasher/pil-squasher_git.bb b/recipes-devtools/pil-squasher/pil-squasher_git.bb
@@ -12,8 +12,6 @@ SRC_URI = " \
 
 PV = "0.0+"
 
-S = "${WORKDIR}/git"
-
 do_install () {
     oe_runmake install DESTDIR=${D} prefix=${prefix}
 }
diff --git a/recipes-devtools/qc-image-unpacker/qc-image-unpacker_git.bb b/recipes-devtools/qc-image-unpacker/qc-image-unpacker_git.bb
@@ -13,7 +13,7 @@ SRC_URI = " \
 SRCREV = "28a783a9fc25dc87b7416b6d5b6f9ccd497d1c2e"
 
 PV = "0.2.0+"
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/${BP}/src"
 
 DEPENDS = "zlib"
 
diff --git a/recipes-devtools/qca-swiss-army-knife/qca-swiss-army-knife_git.bb b/recipes-devtools/qca-swiss-army-knife/qca-swiss-army-knife_git.bb
@@ -15,7 +15,6 @@ SRC_URI = " \
 "
 
 PV = "0.0+"
-S = "${WORKDIR}/git"
 
 do_install () {
 	install -d ${D}/${bindir}
diff --git a/recipes-devtools/qdl/qdl_git.bb b/recipes-devtools/qdl/qdl_git.bb
@@ -16,8 +16,6 @@ SRC_URI = "git://github.com/linux-msm/${BPN}.git;branch=master;protocol=https"
 
 PV = "2.1+${SRCREV}"
 
-S = "${WORKDIR}/git"
-
 do_install () {
     oe_runmake install DESTDIR=${D} prefix=${prefix}
 }
diff --git a/recipes-devtools/qmic/qmic_git.bb b/recipes-devtools/qmic/qmic_git.bb
@@ -10,8 +10,6 @@ SRC_URI = "git://github.com/linux-msm/${BPN}.git;branch=master;protocol=https"
 
 PV = "0.0+"
 
-S = "${WORKDIR}/git"
-
 BBCLASSEXTEND = "native nativesdk"
 
 do_install () {
diff --git a/recipes-devtools/qtestsign/qtestsign_git.bb b/recipes-devtools/qtestsign/qtestsign_git.bb
@@ -8,8 +8,6 @@ SRCREV = "ce6ba20f4ead008e5b522a81179c98dd48ccf06e"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
-S = "${WORKDIR}/git"
-
 inherit python3native
 
 do_install() {
@@ -29,4 +27,4 @@ do_install() {
 FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/qtestsign"
 RDEPENDS:${PN} = "python3 python3-cryptography"
 
-BBCLASSEXTEND = "native nativesdk"
+BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-devtools/skales/skales_git.bb b/recipes-devtools/skales/skales_git.bb
@@ -13,8 +13,6 @@ SRC_URI = "git://git.codelinaro.org/clo/qsdk/oss/tools/skales.git;protocol=https
           file://0002-mkbootimg-use-python3.patch \
           "
 
-S = "${WORKDIR}/git"
-
 do_install () {
     install -d ${D}${bindir}/skales
     install -m 0755 ${S}/mkbootimg ${D}${bindir}/skales
diff --git a/recipes-kernel/linux/linux-qcom-staging_6.14.bb b/recipes-kernel/linux/linux-qcom-staging_6.14.bb
@@ -22,8 +22,6 @@ SRCREV:class-devupstream = "${AUTOREV}"
 SRCREV = "6613b499fc6956027cc6d24f36c59f0d986a19f3"
 PV = "6.14+git"
 
-S = "${WORKDIR}/git"
-
 KERNEL_CONFIG ?= "qcom_defconfig"
 
 # Additional fragment for qcom value add features
diff --git a/recipes-support/fastrpc/fastrpc_git.bb b/recipes-support/fastrpc/fastrpc_git.bb
@@ -16,8 +16,6 @@ SRC_URI = "\
 
 PV = "0.0+"
 
-S = "${WORKDIR}/git"
-
 inherit autotools systemd
 
 PACKAGES += "${PN}-systemd"
diff --git a/recipes-support/hexagonrpc/hexagonrpc_git.bb b/recipes-support/hexagonrpc/hexagonrpc_git.bb
@@ -17,6 +17,4 @@ SRCREV = "2377fd46f0c121df0ed21f6530ebdda1ecb4339a"
 
 PV = "0.3.2+"
 
-S = "${WORKDIR}/git"
-
 inherit meson
diff --git a/recipes-support/initrdscripts/initramfs-module-copy-modules_1.0.bb b/recipes-support/initrdscripts/initramfs-module-copy-modules_1.0.bb
@@ -5,12 +5,11 @@ RDEPENDS:${PN} = "initramfs-framework-base ${VIRTUAL-RUNTIME_base-utils}"
 
 SRC_URI = "file://copy-modules.sh"
 
-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"
 
 do_install() {
     install -d ${D}/init.d
-    install -m 0755 ${UNPACKDIR}/copy-modules.sh ${D}/init.d/95-copy_modules
+    install -m 0755 ${S}/copy-modules.sh ${D}/init.d/95-copy_modules
 }
 
 FILES:${PN} = "/init.d/"
diff --git a/recipes-support/libdmabufheap/libdmabufheap_1.0.0.bb b/recipes-support/libdmabufheap/libdmabufheap_1.0.0.bb
@@ -11,6 +11,5 @@ SRCREV = "5ead341efb667cbd2cf519bfaf2837ee8e97b747"
 SRC_URI = " \
 git://git.codelinaro.org//clo/le/platform/system/memory/libdmabufheap.git;branch=memory-le-apps.lnx.3.0;protocol=https \
 "
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
diff --git a/recipes-support/libvmmem/libvmmem_1.0.0.bb b/recipes-support/libvmmem/libvmmem_1.0.0.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM += "\
     "
 
 SRCREV = "2b88e9bc6030893b8e9b46ae85999c8de103858d"
-S = "${WORKDIR}/git"
 
 PV = "0.0+git"
 
diff --git a/recipes-support/pd-mapper/pd-mapper_git.bb b/recipes-support/pd-mapper/pd-mapper_git.bb
@@ -15,8 +15,6 @@ SRC_URI = "git://github.com/linux-msm/${BPN}.git;branch=master;protocol=https \
 
 PV = "0.0+"
 
-S = "${WORKDIR}/git"
-
 do_install () {
     oe_runmake install DESTDIR=${D} prefix=${prefix} servicedir=${systemd_unitdir}/system
 }
diff --git a/recipes-support/qbootctl/qbootctl_git.bb b/recipes-support/qbootctl/qbootctl_git.bb
@@ -8,8 +8,6 @@ SRC_URI = "git://github.com/linux-msm/qbootctl.git;protocol=https;branch=main \
            file://qbootctl-bless-boot.service.in \
            "
 
-S = "${WORKDIR}/git"
-
 PV = "0.2.2"
 
 inherit meson systemd
diff --git a/recipes-support/qrtr/qrtr_git.bb b/recipes-support/qrtr/qrtr_git.bb
@@ -12,8 +12,6 @@ SRC_URI = "git://github.com/linux-msm/${BPN}.git;branch=master;protocol=https"
 
 PV = "0.3+"
 
-S = "${WORKDIR}/git"
-
 EXTRA_OEMAKE = "prefix=${prefix} bindir=${bindir} libdir=${libdir} includedir=${includedir}"
 
 do_install () {
diff --git a/recipes-support/rmtfs/rmtfs_git.bb b/recipes-support/rmtfs/rmtfs_git.bb
@@ -13,8 +13,6 @@ DEPENDS = "qmic-native qrtr udev"
 
 PV = "0.2+"
 
-S = "${WORKDIR}/git"
-
 do_install () {
     oe_runmake install DESTDIR=${D} prefix=${prefix} servicedir=${systemd_unitdir}/system
 }
diff --git a/recipes-support/tqftpserv/tqftpserv_git.bb b/recipes-support/tqftpserv/tqftpserv_git.bb
@@ -15,8 +15,6 @@ SRC_URI = "git://github.com/linux-msm/${BPN}.git;branch=master;protocol=https \
 
 PV = "0.0+"
 
-S = "${WORKDIR}/git"
-
 do_install () {
     oe_runmake install DESTDIR=${D} prefix=${prefix} servicedir=${systemd_unitdir}/system
 }
diff --git a/recipes-test/bootrr/bootrr_git.bb b/recipes-test/bootrr/bootrr_git.bb
@@ -8,8 +8,6 @@ SRC_URI = "\
 	git://github.com/linux-msm/bootrr.git;branch=master;protocol=https \
 "
 
-S = "${WORKDIR}/git"
-
 PV = "0.0+git"
 
 inherit allarch
diff --git a/recipes-test/diag/diag_git.bb b/recipes-test/diag/diag_git.bb
@@ -8,8 +8,6 @@ SRC_URI = "git://github.com/linux-msm/${BPN}.git;branch=master;protocol=https"
 PV = "0.0+git"
 SRCREV = "d06e599d197790c9e84ac41a51bf124a69768c4f"
 
-S = "${WORKDIR}/git"
-
 DEPENDS = "qrtr udev"
 
 do_compile () {
diff --git a/recipes-test/mybw/mybw_git.bb b/recipes-test/mybw/mybw_git.bb
@@ -8,8 +8,6 @@ SRC_URI = "git://github.com/andersson/mybw;protocol=https;branch=main \
            file://0001-makefile-Allow-CFLAGS-LDFLAGS-from-environment.patch \
            "
 
-S = "${WORKDIR}/git"
-
 PV = "0.0+git"
 
 do_compile () {

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ SRC_URI = " \`
`12`	`12`
`13`	`13`	`PV = "0.0+"`
`14`	`14`
`15`		`-S = "${WORKDIR}/git"`
`16`		`-`
`17`	`15`	`do_install () {`
`18`	`16`	`oe_runmake install DESTDIR=${D} prefix=${prefix}`
`19`	`17`	`}`