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-connectivity | |
| 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-connectivity')
8 files changed, 0 insertions, 9 deletions
diff --git a/meta/recipes-connectivity/avahi/avahi-libnss-mdns_0.15.1.bb b/meta/recipes-connectivity/avahi/avahi-libnss-mdns_0.15.1.bb index 9b8275b113..b37cd51ad1 100644 --- a/meta/recipes-connectivity/avahi/avahi-libnss-mdns_0.15.1.bb +++ b/meta/recipes-connectivity/avahi/avahi-libnss-mdns_0.15.1.bb | |||
| @@ -13,7 +13,6 @@ SRC_URI = "git://github.com/lathiat/nss-mdns;branch=master;protocol=https \ | |||
| 13 | 13 | ||
| 14 | SRCREV = "4b3cfe818bf72d99a02b8ca8b8813cb2d6b40633" | 14 | SRCREV = "4b3cfe818bf72d99a02b8ca8b8813cb2d6b40633" |
| 15 | 15 | ||
| 16 | S = "${WORKDIR}/git" | ||
| 17 | 16 | ||
| 18 | inherit autotools pkgconfig | 17 | inherit autotools pkgconfig |
| 19 | 18 | ||
diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb index 46b3f854c5..ab691b6580 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb +++ b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb | |||
| @@ -18,7 +18,6 @@ SRC_URI = "git://github.com/connectivity/connman-gnome.git;branch=master;protoco | |||
| 18 | file://0001-Port-to-Gtk3.patch \ | 18 | file://0001-Port-to-Gtk3.patch \ |
| 19 | " | 19 | " |
| 20 | 20 | ||
| 21 | S = "${WORKDIR}/git" | ||
| 22 | 21 | ||
| 23 | inherit autotools-brokensep gtk-icon-cache pkgconfig features_check | 22 | inherit autotools-brokensep gtk-icon-cache pkgconfig features_check |
| 24 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.4.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.4.bb index dee921d21c..bfb24aa58c 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.4.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.4.bb | |||
| @@ -18,7 +18,6 @@ SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma | |||
| 18 | " | 18 | " |
| 19 | 19 | ||
| 20 | SRCREV = "93df2b254caf9639f9ffb66e0fe2b584eeba6220" | 20 | SRCREV = "93df2b254caf9639f9ffb66e0fe2b584eeba6220" |
| 21 | S = "${WORKDIR}/git" | ||
| 22 | 21 | ||
| 23 | # Doesn't use automake so we can't do out-of-tree builds | 22 | # Doesn't use automake so we can't do out-of-tree builds |
| 24 | inherit pkgconfig autotools-brokensep systemd useradd | 23 | inherit pkgconfig autotools-brokensep systemd useradd |
diff --git a/meta/recipes-connectivity/libuv/libuv_1.51.0.bb b/meta/recipes-connectivity/libuv/libuv_1.51.0.bb index 569bff1439..ea3a858da4 100644 --- a/meta/recipes-connectivity/libuv/libuv_1.51.0.bb +++ b/meta/recipes-connectivity/libuv/libuv_1.51.0.bb | |||
| @@ -10,7 +10,6 @@ SRCREV = "5152db2cbfeb5582e9c27c5ea1dba2cd9e10759b" | |||
| 10 | SRC_URI = "git://github.com/libuv/libuv.git;branch=v1.x;protocol=https;tag=v${PV}" | 10 | SRC_URI = "git://github.com/libuv/libuv.git;branch=v1.x;protocol=https;tag=v${PV}" |
| 11 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" | 11 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" |
| 12 | 12 | ||
| 13 | S = "${WORKDIR}/git" | ||
| 14 | 13 | ||
| 15 | inherit autotools | 14 | inherit autotools |
| 16 | 15 | ||
diff --git a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_20240407.bb b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_20240407.bb index e07b93d695..2e8702a045 100644 --- a/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_20240407.bb +++ b/meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_20240407.bb | |||
| @@ -10,8 +10,6 @@ PE = "1" | |||
| 10 | SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=main" | 10 | SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=main" |
| 11 | SRCREV = "55ba955d53305df96123534488fd160ea882b4dd" | 11 | SRCREV = "55ba955d53305df96123534488fd160ea882b4dd" |
| 12 | 12 | ||
| 13 | S = "${WORKDIR}/git" | ||
| 14 | |||
| 15 | inherit meson | 13 | inherit meson |
| 16 | 14 | ||
| 17 | DEPENDS += "libxslt-native" | 15 | DEPENDS += "libxslt-native" |
diff --git a/meta/recipes-connectivity/neard/neard_0.19.bb b/meta/recipes-connectivity/neard/neard_0.19.bb index 9e0ac6aa69..ab52ab8b6c 100644 --- a/meta/recipes-connectivity/neard/neard_0.19.bb +++ b/meta/recipes-connectivity/neard/neard_0.19.bb | |||
| @@ -17,7 +17,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=https;bra | |||
| 17 | 17 | ||
| 18 | SRCREV = "a1dc8a75cba999728e154a0f811ab9dd50c809f7" | 18 | SRCREV = "a1dc8a75cba999728e154a0f811ab9dd50c809f7" |
| 19 | 19 | ||
| 20 | S = "${WORKDIR}/git" | ||
| 21 | 20 | ||
| 22 | inherit autotools pkgconfig systemd update-rc.d | 21 | inherit autotools pkgconfig systemd update-rc.d |
| 23 | 22 | ||
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.93.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.93.bb index 93e5a944d1..b64c694332 100644 --- a/meta/recipes-connectivity/resolvconf/resolvconf_1.93.bb +++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.93.bb | |||
| @@ -17,7 +17,6 @@ SRC_URI = "git://salsa.debian.org/debian/resolvconf.git;protocol=https;branch=un | |||
| 17 | 17 | ||
| 18 | SRCREV = "ab766fa31f7939f6d879123236b4275320b7ff64" | 18 | SRCREV = "ab766fa31f7939f6d879123236b4275320b7ff64" |
| 19 | 19 | ||
| 20 | S = "${WORKDIR}/git" | ||
| 21 | 20 | ||
| 22 | # the package is taken from snapshots.debian.org; that source is static and goes stale | 21 | # the package is taken from snapshots.debian.org; that source is static and goes stale |
| 23 | # so we check the latest upstream from a directory that does get updated | 22 | # so we check the latest upstream from a directory that does get updated |
diff --git a/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb b/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb index 568bac389f..2c6b5f06dc 100644 --- a/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb +++ b/meta/recipes-connectivity/slirp/libslirp_4.9.1.bb | |||
| @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727" | |||
| 7 | SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master" | 7 | SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master" |
| 8 | SRCREV = "9c744e1e52aa0d9646ed91d789d588696292c21e" | 8 | SRCREV = "9c744e1e52aa0d9646ed91d789d588696292c21e" |
| 9 | 9 | ||
| 10 | S = "${WORKDIR}/git" | ||
| 11 | 10 | ||
| 12 | DEPENDS = "glib-2.0" | 11 | DEPENDS = "glib-2.0" |
| 13 | 12 | ||
