From d1a5739b34834ffde2a15bd69c9df2ed1ae96ab1 Mon Sep 17 00:00:00 2001 From: alperak Date: Fri, 21 Jun 2024 13:02:44 +0300 Subject: recipes: set S to fix the QA warning Fix the warning by pointing S to ${WORKDIR}/sources and UNPACKDIR to ${S}. Since recent UNPACKDIR work, default S directory is not created anymore. By setting UNPACKDIR to S, S in indirectly created in do_unpack. Signed-off-by: alperak Signed-off-by: Khem Raj --- .../selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb | 3 +++ meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb | 3 +++ meta-oe/recipes-extended/inputattach-config/inputattach-config.bb | 3 +++ meta-oe/recipes-extended/zram/zram_0.2.bb | 3 +++ .../recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb | 4 ++++ meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb | 3 ++- meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb | 4 +++- meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb | 3 +++ meta-oe/recipes-support/libusbgx/libusbgx-config.bb | 3 +++ 9 files changed, 27 insertions(+), 2 deletions(-) diff --git a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb index cb2ff672e3..b98c70db77 100644 --- a/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb +++ b/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb @@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = "file://android-gadget-setup" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d ${D}${bindir} install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} diff --git a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb index f73be8dbbf..abf21803e5 100644 --- a/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb +++ b/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb @@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = "file://android-gadget-setup" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + PACKAGE_ARCH = "${MACHINE_ARCH}" do_install() { diff --git a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb index fb1aefad61..9bb2e2f1f3 100644 --- a/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb +++ b/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb @@ -4,6 +4,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171d SRC_URI = "file://inputattach.conf" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/meta-oe/recipes-extended/zram/zram_0.2.bb b/meta-oe/recipes-extended/zram/zram_0.2.bb index 800dd6b7c4..89292118d0 100644 --- a/meta-oe/recipes-extended/zram/zram_0.2.bb +++ b/meta-oe/recipes-extended/zram/zram_0.2.bb @@ -17,6 +17,9 @@ SRC_URI = " \ file://dev-zram0.swap \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install () { # Install systemd related configuration file if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then diff --git a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb index 1cfd9c1cba..c929763763 100644 --- a/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb +++ b/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb @@ -5,8 +5,12 @@ it requires libxml2 and python 2 at the same time, which can no longer be satisf LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ file://${COREBASE}/meta/files/common-licenses/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780" + SRC_URI = "file://gnome-doc-utils.m4" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + PROVIDES = "gnome-doc-utils" do_install:append() { diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb index 5a8fe4c320..43b4614f0b 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://${UNPACKDIR}/OFL.txt;md5=969851e3a70122069a4d9ee61dd5 SRC_URI = "http://levien.com/type/myfonts/Inconsolata.otf \ file://OFL.txt" -S = "${UNPACKDIR}/ttf-inconsolata-${PV}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" FILES:${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \ ${datadir}/doc/ttf-inconsolata/*" diff --git a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb index 02a6952188..4770fae50e 100644 --- a/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb +++ b/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb @@ -20,6 +20,9 @@ SRC_URI += "\ file://COPYING \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "libcap" @@ -50,7 +53,6 @@ do_configure:prepend() { cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S} fi cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S} - cp -r ${UNPACKDIR}/COPYING ${S} } diff --git a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb index 90db08544d..ece30a598b 100644 --- a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb +++ b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb @@ -8,6 +8,9 @@ SRC_URI = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" SRC_URI[sha256sum] = "87a74eb0a66055c34ba2c5c919e74f3211c5950ae1c2cbab967fdf4137f5de91" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_compile() { install -pm 644 ${UNPACKDIR}/ctapi-common.LICENSE LICENSE install -pm 644 ${UNPACKDIR}/ctapi-common.README README diff --git a/meta-oe/recipes-support/libusbgx/libusbgx-config.bb b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb index 4e9e6bcdfd..c79dd092cd 100644 --- a/meta-oe/recipes-support/libusbgx/libusbgx-config.bb +++ b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb @@ -4,6 +4,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = "file://usbgx.default" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" -- cgit v1.2.3-54-g00ecf