diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2025-06-16 11:49:51 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-20 12:07:26 +0100 |
| commit | f59a7df3fe946e2274440275a638a58321842ee9 (patch) | |
| tree | 6cf875056d11cf09d732b52370e1ad015e301af2 /meta/recipes-kernel | |
| parent | 724b86c08ad914ee2fcb029b15f151fdf6416e6c (diff) | |
| download | poky-f59a7df3fe946e2274440275a638a58321842ee9.tar.gz | |
meta: remove S in recipes that fetch from git via setting BB_GIT_DEFAULT_DESTSUFFIX
Removing all the S = ${WORKDIR}/git assignments works because BB_GIT_DEFAULT_DESTSUFFIX
is set to match S from bitbake.conf (which itself is set to match typical tarball
releases).
A few recipes are setting S to a sub-directory of the git tree and need
to be adjusted accordingly.
bzip2 recipe is fetching a tarball and separately cloning tests;
adjust the recipe to put the latter into 'bzip2-tests', instead of 'git'.
devupstream.bbclass no longer needs to rewrite S, and is adjusted accordingly.
Adjust scripts/lib/recipetool/append.py to not hardcode 'git' as unpack
destination.
Adjust kernel-yocto.bbclass to use the git unpack variable instead
of hardcoding 'git' (there's also removal of repetition of
string constants and a correction of workdir/unpackdir mismatch in
one of the if-else branches).
Ensure build-appliance-image recipe does not use 'git' as checkout directory for
poky repo, but rather explicitly name it 'poky'.
Ensure reproducible.py code that looks for git repositories does not
hardcode 'git' but uses the destination set by BB_GIT_DEFAULT_DESTSUFFIX.
Ensure recipetool does not write out unneeded S settings into newly
created recipes that fetch from git.
Adjust selftest to not hardcode 'git' as unpack directory.
(From OE-Core rev: f80c07019ddadaf9c5fb890faabfda7920ecd15e)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
| -rw-r--r-- | meta/recipes-kernel/blktrace/blktrace_1.3.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-kernel/cryptodev/cryptodev.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-kernel/dtc/dtc_1.7.2.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-kernel/libtraceevent/libtraceevent_1.8.4.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/babeltrace2_2.1.1.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/babeltrace_1.5.11.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-kernel/powertop/powertop_2.15.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.inc | 1 |
10 files changed, 0 insertions, 11 deletions
diff --git a/meta/recipes-kernel/blktrace/blktrace_1.3.0.bb b/meta/recipes-kernel/blktrace/blktrace_1.3.0.bb index 061a7b9784..e678927d22 100644 --- a/meta/recipes-kernel/blktrace/blktrace_1.3.0.bb +++ b/meta/recipes-kernel/blktrace/blktrace_1.3.0.bb | |||
| @@ -17,8 +17,6 @@ SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=https;branch=master \ | |||
| 17 | 17 | ||
| 18 | SRCREV = "366d30b9cdb20345c5d064af850d686da79b89eb" | 18 | SRCREV = "366d30b9cdb20345c5d064af850d686da79b89eb" |
| 19 | 19 | ||
| 20 | S = "${WORKDIR}/git" | ||
| 21 | |||
| 22 | EXTRA_OEMAKE = "\ | 20 | EXTRA_OEMAKE = "\ |
| 23 | 'CC=${CC}' \ | 21 | 'CC=${CC}' \ |
| 24 | 'CFLAGS=${CFLAGS}' \ | 22 | 'CFLAGS=${CFLAGS}' \ |
diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc index 8d0aad4a01..7611335c5d 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev.inc +++ b/meta/recipes-kernel/cryptodev/cryptodev.inc | |||
| @@ -13,6 +13,5 @@ SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux;branch=master;protoc | |||
| 13 | SRCREV = "135cbff90af2ba97d88f1472be595ce78721972c" | 13 | SRCREV = "135cbff90af2ba97d88f1472be595ce78721972c" |
| 14 | PV = "1.14" | 14 | PV = "1.14" |
| 15 | 15 | ||
| 16 | S = "${WORKDIR}/git" | ||
| 17 | 16 | ||
| 18 | CLEANBROKEN = "1" | 17 | CLEANBROKEN = "1" |
diff --git a/meta/recipes-kernel/dtc/dtc_1.7.2.bb b/meta/recipes-kernel/dtc/dtc_1.7.2.bb index 3df95ec1ee..7884c87086 100644 --- a/meta/recipes-kernel/dtc/dtc_1.7.2.bb +++ b/meta/recipes-kernel/dtc/dtc_1.7.2.bb | |||
| @@ -15,7 +15,6 @@ SRCREV = "2d10aa2afe35527728db30b35ec491ecb6959e5c" | |||
| 15 | 15 | ||
| 16 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" | 16 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" |
| 17 | 17 | ||
| 18 | S = "${WORKDIR}/git" | ||
| 19 | 18 | ||
| 20 | inherit meson pkgconfig | 19 | inherit meson pkgconfig |
| 21 | 20 | ||
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 20b1bcaf37..84b8b10a26 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | |||
| @@ -17,7 +17,6 @@ PV = "0.3+git" | |||
| 17 | inherit native | 17 | inherit native |
| 18 | 18 | ||
| 19 | SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git;branch=master;protocol=https" | 19 | SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git;branch=master;protocol=https" |
| 20 | S = "${WORKDIR}/git" | ||
| 21 | 20 | ||
| 22 | do_configure() { | 21 | do_configure() { |
| 23 | : | 22 | : |
diff --git a/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.4.bb b/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.4.bb index 7a33da37c2..b7a781e2e9 100644 --- a/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.4.bb +++ b/meta/recipes-kernel/libtraceevent/libtraceevent_1.8.4.bb | |||
| @@ -12,7 +12,6 @@ SRCREV = "bd47bd544c9ebc9f44bd88c2b2f2049230741058" | |||
| 12 | SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \ | 12 | SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \ |
| 13 | " | 13 | " |
| 14 | 14 | ||
| 15 | S = "${WORKDIR}/git" | ||
| 16 | 15 | ||
| 17 | inherit meson pkgconfig | 16 | inherit meson pkgconfig |
| 18 | 17 | ||
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.1.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.1.1.bb index fdcb637761..b227fe488a 100644 --- a/meta/recipes-kernel/lttng/babeltrace2_2.1.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace2_2.1.1.bb | |||
| @@ -17,7 +17,6 @@ SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.1;protocol=http | |||
| 17 | SRCREV = "7f2f8cd6dac497cbb466efb31219b531c62013f5" | 17 | SRCREV = "7f2f8cd6dac497cbb466efb31219b531c62013f5" |
| 18 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" | 18 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$" |
| 19 | 19 | ||
| 20 | S = "${WORKDIR}/git" | ||
| 21 | 20 | ||
| 22 | inherit autotools pkgconfig ptest python3targetconfig | 21 | inherit autotools pkgconfig ptest python3targetconfig |
| 23 | 22 | ||
diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.11.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.11.bb index 2585747fb6..6e1c240648 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.5.11.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.5.11.bb | |||
| @@ -13,7 +13,6 @@ SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.5;protocol=http | |||
| 13 | SRCREV = "91c00f70884887ff5c4849a8e3d47e311a22ba9d" | 13 | SRCREV = "91c00f70884887ff5c4849a8e3d47e311a22ba9d" |
| 14 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>1(\.\d+)+)$" | 14 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>1(\.\d+)+)$" |
| 15 | 15 | ||
| 16 | S = "${WORKDIR}/git" | ||
| 17 | 16 | ||
| 18 | inherit autotools pkgconfig ptest | 17 | inherit autotools pkgconfig ptest |
| 19 | 18 | ||
diff --git a/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb b/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb index 23fcef9569..4076e97163 100644 --- a/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb +++ b/meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb | |||
| @@ -28,7 +28,6 @@ SRC_URI = "\ | |||
| 28 | file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ | 28 | file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \ |
| 29 | " | 29 | " |
| 30 | 30 | ||
| 31 | S = "${WORKDIR}/git" | ||
| 32 | 31 | ||
| 33 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" | 32 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" |
| 34 | 33 | ||
diff --git a/meta/recipes-kernel/powertop/powertop_2.15.bb b/meta/recipes-kernel/powertop/powertop_2.15.bb index ec81d546a8..3f9be0993a 100644 --- a/meta/recipes-kernel/powertop/powertop_2.15.bb +++ b/meta/recipes-kernel/powertop/powertop_2.15.bb | |||
| @@ -11,7 +11,6 @@ SRC_URI = "git://github.com/fenrus75/powertop;protocol=https;branch=master \ | |||
| 11 | " | 11 | " |
| 12 | SRCREV = "d51ad395436d4d1dcc3ca46e1519ffeb475bf651" | 12 | SRCREV = "d51ad395436d4d1dcc3ca46e1519ffeb475bf651" |
| 13 | 13 | ||
| 14 | S = "${WORKDIR}/git" | ||
| 15 | 14 | ||
| 16 | LDFLAGS += "-pthread" | 15 | LDFLAGS += "-pthread" |
| 17 | 16 | ||
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index a6688f2604..211cbde883 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc | |||
| @@ -12,7 +12,6 @@ SRCREV = "3a92ffe673c1621309a0b60892114495b651c9de" | |||
| 12 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' | 12 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux' |
| 13 | COMPATIBLE_HOST:libc-musl = 'null' | 13 | COMPATIBLE_HOST:libc-musl = 'null' |
| 14 | 14 | ||
| 15 | S = "${WORKDIR}/git" | ||
| 16 | 15 | ||
| 17 | # systemtap can't be built without optimization, if someone tries to compile an | 16 | # systemtap can't be built without optimization, if someone tries to compile an |
| 18 | # entire image as -O0, break with fatal. | 17 | # entire image as -O0, break with fatal. |
