]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
meta: remove S in recipes that fetch from git via setting BB_GIT_DEFAULT_DESTSUFFIX
authorAlexander Kanavin <alex@linutronix.de>
Mon, 16 Jun 2025 09:49:51 +0000 (11:49 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 20 Jun 2025 11:05:52 +0000 (12:05 +0100)
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.

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>
200 files changed:
meta-selftest/recipes-devtools/mtd/mtd-utils-selftest_git.bb
meta-selftest/recipes-devtools/python/python3-guessing-game_git.bb
meta-selftest/recipes-devtools/python/python3-guessing-game_git.bb.upgraded
meta-selftest/recipes-devtools/rust/rust-c-lib-example-bin_git.bb
meta-selftest/recipes-devtools/rust/rust-c-lib-example_git.bb
meta-selftest/recipes-extended/sysdig/sysdig-selftest_0.28.0.bb
meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb
meta-selftest/recipes-test/devtool/devtool-upgrade-test2_git.bb.upgraded
meta-selftest/recipes-test/git-submodule-test/git-submodule-test.bb
meta-selftest/recipes-test/gitrepotest/gitrepotest.bb
meta-selftest/recipes-test/gitunpackoffline/gitunpackoffline.inc
meta/classes-recipe/devupstream.bbclass
meta/classes-recipe/kernel-yocto.bbclass
meta/conf/bitbake.conf
meta/lib/oe/reproducible.py
meta/lib/oeqa/selftest/cases/devtool.py
meta/lib/oeqa/selftest/cases/recipetool.py
meta/recipes-bsp/efibootmgr/efibootmgr_18.bb
meta/recipes-bsp/efivar/efivar_39.bb
meta/recipes-bsp/gnu-efi/gnu-efi_4.0.1.bb
meta/recipes-bsp/opensbi/opensbi_1.6.bb
meta/recipes-bsp/u-boot/libubootenv_0.3.6.bb
meta/recipes-bsp/u-boot/u-boot-common.inc
meta/recipes-connectivity/avahi/avahi-libnss-mdns_0.15.1.bb
meta/recipes-connectivity/connman/connman-gnome_0.7.bb
meta/recipes-connectivity/dhcpcd/dhcpcd_10.2.4.bb
meta/recipes-connectivity/libuv/libuv_1.51.0.bb
meta/recipes-connectivity/mobile-broadband-provider-info/mobile-broadband-provider-info_20240407.bb
meta/recipes-connectivity/neard/neard_0.19.bb
meta/recipes-connectivity/resolvconf/resolvconf_1.93.bb
meta/recipes-connectivity/slirp/libslirp_4.9.1.bb
meta/recipes-core/dbus-wait/dbus-wait_git.bb
meta/recipes-core/fts/fts_1.2.7.bb
meta/recipes-core/glibc/cross-localedef-native_2.41.bb
meta/recipes-core/glibc/glibc_2.41.bb
meta/recipes-core/ifupdown/ifupdown_0.8.44.bb
meta/recipes-core/images/build-appliance-image_15.0.0.bb
meta/recipes-core/initscripts/init-system-helpers_1.68.bb
meta/recipes-core/libxcrypt/libxcrypt.inc
meta/recipes-core/musl/gcompat_git.bb
meta/recipes-core/musl/libc-test_git.bb
meta/recipes-core/musl/libucontext_1.3.2.bb
meta/recipes-core/musl/musl-locales_git.bb
meta/recipes-core/musl/musl-obstack.bb
meta/recipes-core/musl/musl-utils.bb
meta/recipes-core/musl/musl_git.bb
meta/recipes-core/ncurses/ncurses_6.5.bb
meta/recipes-core/newlib/newlib.inc
meta/recipes-core/ovmf/ovmf_git.bb
meta/recipes-core/picolibc/picolibc.inc
meta/recipes-core/psplash/psplash_git.bb
meta/recipes-core/seatd/seatd_0.9.1.bb
meta/recipes-core/sysfsutils/sysfsutils_2.1.1.bb
meta/recipes-core/systemd/systemd.inc
meta/recipes-core/ttyrun/ttyrun_2.37.0.bb
meta/recipes-core/update-rc.d/update-rc.d_0.8.bb
meta/recipes-devtools/bindgen-cli/bindgen-cli_0.71.1.bb
meta/recipes-devtools/binutils/binutils-2.44.inc
meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb
meta/recipes-devtools/btrfs-tools/btrfs-tools_6.14.bb
meta/recipes-devtools/createrepo-c/createrepo-c_1.2.1.bb
meta/recipes-devtools/distcc/distcc_3.4.bb
meta/recipes-devtools/dnf/dnf_4.22.0.bb
meta/recipes-devtools/dpkg/dpkg_1.22.11.bb
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
meta/recipes-devtools/erofs-utils/erofs-utils_1.8.5.bb
meta/recipes-devtools/fastfloat/fastfloat_8.0.2.bb
meta/recipes-devtools/file/file_5.46.bb
meta/recipes-devtools/fmt/fmt_11.2.0.bb
meta/recipes-devtools/gnu-config/gnu-config_git.bb
meta/recipes-devtools/libcomps/libcomps_0.1.21.bb
meta/recipes-devtools/libdnf/libdnf_0.74.0.bb
meta/recipes-devtools/libmodulemd/libmodulemd_2.15.1.bb
meta/recipes-devtools/librepo/librepo_1.19.0.bb
meta/recipes-devtools/mmc/mmc-utils_git.bb
meta/recipes-devtools/mtd/mtd-utils_2.3.0.bb
meta/recipes-devtools/ninja/ninja_1.12.1.bb
meta/recipes-devtools/opkg-utils/opkg-utils_0.7.0.bb
meta/recipes-devtools/patchelf/patchelf_0.18.0.bb
meta/recipes-devtools/pkgconfig/pkgconfig_git.bb
meta/recipes-devtools/pseudo/pseudo_git.bb
meta/recipes-devtools/python/python3-calver_2025.04.17.bb
meta/recipes-devtools/python/python3-dtc_1.7.2.bb
meta/recipes-devtools/python/python3-pefile_2024.8.26.bb
meta/recipes-devtools/python/python3-unittest-automake-output_0.2.bb
meta/recipes-devtools/repo/repo_2.55.2.bb
meta/recipes-devtools/rpm-sequoia/rpm-sequoia-crypto-policy_git.bb
meta/recipes-devtools/rpm-sequoia/rpm-sequoia_1.7.0.bb
meta/recipes-devtools/rpm/rpm_4.20.1.bb
meta/recipes-devtools/squashfs-tools/squashfs-tools_4.7.bb
meta/recipes-devtools/systemd-bootchart/systemd-bootchart_235.bb
meta/recipes-devtools/tcf-agent/tcf-agent_1.8.0.bb
meta/recipes-devtools/unfs3/unfs3_0.11.0.bb
meta/recipes-devtools/xmlto/xmlto_0.0.29.bb
meta/recipes-extended/acpica/acpica_20240827.bb
meta/recipes-extended/asciidoc/asciidoc_10.2.1.bb
meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
meta/recipes-extended/bzip2/bzip2_1.0.8.bb
meta/recipes-extended/cracklib/cracklib_2.10.3.bb
meta/recipes-extended/iputils/iputils_20250605.bb
meta/recipes-extended/libaio/libaio_0.3.113.bb
meta/recipes-extended/libnsl/libnsl2_2.0.1.bb
meta/recipes-extended/libnss-nis/libnss-nis.bb
meta/recipes-extended/libsolv/libsolv_0.7.33.bb
meta/recipes-extended/lsof/lsof_4.99.4.bb
meta/recipes-extended/ltp/ltp_20250130.bb
meta/recipes-extended/mdadm/mdadm_4.4.bb
meta/recipes-extended/net-tools/net-tools_2.10.bb
meta/recipes-extended/procps/procps_4.0.5.bb
meta/recipes-extended/psmisc/psmisc_23.7.bb
meta/recipes-extended/rpcsvc-proto/rpcsvc-proto.bb
meta/recipes-extended/scdoc/scdoc_1.11.3.bb
meta/recipes-extended/stress-ng/stress-ng_0.18.12.bb
meta/recipes-extended/sysklogd/sysklogd_2.7.2.bb
meta/recipes-extended/sysstat/sysstat_12.7.7.bb
meta/recipes-extended/xinetd/xinetd_2.3.15.4.bb
meta/recipes-extended/zstd/zstd_1.5.7.bb
meta/recipes-gnome/gi-docgen/gi-docgen_2025.3.bb
meta/recipes-gnome/libhandy/libhandy_1.8.3.bb
meta/recipes-gnome/libportal/libportal_0.9.1.bb
meta/recipes-gnome/libxmlb/libxmlb_0.3.22.bb
meta/recipes-graphics/glslang/glslang_1.4.313.0.bb
meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.30.bb
meta/recipes-graphics/kmscube/kmscube_git.bb
meta/recipes-graphics/libepoxy/libepoxy_1.5.10.bb
meta/recipes-graphics/libfakekey/libfakekey_git.bb
meta/recipes-graphics/libmatchbox/libmatchbox_1.14.bb
meta/recipes-graphics/libva/libva-utils_2.22.0.bb
meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.3.bb
meta/recipes-graphics/piglit/piglit_git.bb
meta/recipes-graphics/shaderc/shaderc_2025.2.bb
meta/recipes-graphics/spir/spirv-headers_1.4.313.0.bb
meta/recipes-graphics/spir/spirv-llvm-translator_20.1.2.bb
meta/recipes-graphics/spir/spirv-tools_1.4.313.0.bb
meta/recipes-graphics/virglrenderer/virglrenderer_1.1.0.bb
meta/recipes-graphics/vulkan/vulkan-headers_1.4.313.0.bb
meta/recipes-graphics/vulkan/vulkan-loader_1.4.313.0.bb
meta/recipes-graphics/vulkan/vulkan-samples_git.bb
meta/recipes-graphics/vulkan/vulkan-tools_1.4.313.0.bb
meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.4.313.0.bb
meta/recipes-graphics/vulkan/vulkan-validation-layers_1.4.313.0.bb
meta/recipes-graphics/vulkan/vulkan-volk_1.4.313.0.bb
meta/recipes-graphics/waffle/waffle_1.8.1.bb
meta/recipes-graphics/wayland/libinput_1.28.1.bb
meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb
meta/recipes-graphics/xinput-calibrator/xinput-calibrator_0.8.0.bb
meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
meta/recipes-graphics/xorg-lib/libxcvt_0.1.3.bb
meta/recipes-graphics/xorg-lib/libxkbcommon_1.10.0.bb
meta/recipes-kernel/blktrace/blktrace_1.3.0.bb
meta/recipes-kernel/cryptodev/cryptodev.inc
meta/recipes-kernel/dtc/dtc_1.7.2.bb
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
meta/recipes-kernel/libtraceevent/libtraceevent_1.8.4.bb
meta/recipes-kernel/lttng/babeltrace2_2.1.1.bb
meta/recipes-kernel/lttng/babeltrace_1.5.11.bb
meta/recipes-kernel/makedumpfile/makedumpfile_1.7.7.bb
meta/recipes-kernel/powertop/powertop_2.15.bb
meta/recipes-kernel/systemtap/systemtap_git.inc
meta/recipes-multimedia/gstreamer/gst-examples_1.26.2.bb
meta/recipes-multimedia/x264/x264_git.bb
meta/recipes-rt/rt-tests/rt-tests.inc
meta/recipes-sato/l3afpad/l3afpad_git.bb
meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.3.bb
meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_0.1.1.bb
meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb
meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb
meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_0.2.bb
meta/recipes-sato/puzzles/puzzles_git.bb
meta/recipes-sato/sato-icon-theme/sato-icon-theme_git.bb
meta/recipes-sato/sato-screenshot/sato-screenshot_0.3.bb
meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
meta/recipes-support/argp-standalone/argp-standalone_1.4.1.bb
meta/recipes-support/bmaptool/bmaptool_3.9.0.bb
meta/recipes-support/boost/boost-build-native_1.87.0.bb
meta/recipes-support/debianutils/debianutils_5.23.1.bb
meta/recipes-support/dos2unix/dos2unix_7.5.2.bb
meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2021.1.bb
meta/recipes-support/hwdata/hwdata_0.396.bb
meta/recipes-support/iso-codes/iso-codes_4.18.0.bb
meta/recipes-support/libcap-ng/libcap-ng.inc
meta/recipes-support/libdisplay-info/libdisplay-info_0.2.0.bb
meta/recipes-support/libgit2/libgit2_1.9.0.bb
meta/recipes-support/libjitterentropy/libjitterentropy_3.6.3.bb
meta/recipes-support/libproxy/libproxy_0.5.9.bb
meta/recipes-support/libseccomp/libseccomp_2.6.0.bb
meta/recipes-support/lz4/lz4_1.10.0.bb
meta/recipes-support/numactl/numactl_2.0.19.bb
meta/recipes-support/p11-kit/p11-kit_0.25.5.bb
meta/recipes-support/ptest-runner/ptest-runner_2.4.5.1.bb
meta/recipes-support/rng-tools/rng-tools_6.17.bb
meta/recipes-support/sass/libsass_3.6.6.bb
meta/recipes-support/sass/sassc_3.6.2.bb
meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb
meta/recipes-support/utfcpp/utfcpp_4.0.6.bb
meta/recipes-support/vim/vim.inc
meta/recipes-support/xxhash/xxhash_0.8.3.bb
scripts/lib/recipetool/append.py
scripts/lib/recipetool/create.py

index ca2141c9722e799725fe9233e77752336614da76..e87e8f15b3e8d10f1347f94d961ad5b4d19f12e1 100644 (file)
@@ -18,7 +18,6 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
            file://0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch \
            "
 
-S = "${WORKDIR}/git"
 
 # xattr support creates an additional compile-time dependency on acl because
 # the sys/acl.h header is needed. libacl is not needed and thus enabling xattr
index 50246a8a118fd203a10d3dbea219d6aec3ea4196..b600c24daf4837d5bc2ad9b03d1593c8e2cb38dc 100644 (file)
@@ -12,7 +12,6 @@ SRC_URI = "git://git.yoctoproject.org/guessing-game.git;protocol=https;branch=ma
 PV = "0.1.0"
 SRCREV = "469c9e2230ca4fa9e391c94be6e697733e769500"
 
-S = "${WORKDIR}/git"
 
 inherit python_maturin cargo-update-recipe-crates
 
index f60a62718db36911f8b12bf503d6363dc211abbe..69339956cc9f3e47b77f600004cdb686e5a367f3 100644 (file)
@@ -12,7 +12,6 @@ SRC_URI = "git://git.yoctoproject.org/guessing-game.git;protocol=https;branch=ma
 PV = "0.2.0"
 SRCREV = "40cf004c2772ffa20ea803fa3be1528a75be3e98"
 
-S = "${WORKDIR}/git"
 
 inherit python_maturin cargo-update-recipe-crates
 
index 47d878597ad432f269e7220366a4cb15fb94be6e..890dbbbe8d1f2ef06d203040d0e451041460cd96 100644 (file)
@@ -8,7 +8,6 @@ SRC_URI = " \
 "
 
 SRCREV = "fc53c457f69aa5221ec1f8619a007e8150db5e60"
-S = "${WORKDIR}/git"
 
 DEPENDS = "rust-c-lib-example"
 
index 6e7c250b92a5b6d2eccbab85539be914bd73a80f..0217d1718fe6a34439bbc807658e38eb5f3ac144 100644 (file)
@@ -8,7 +8,6 @@ SRC_URI = " \
 "
 
 SRCREV = "fc53c457f69aa5221ec1f8619a007e8150db5e60"
-S = "${WORKDIR}/git"
 
 inherit cargo_c
 
index 819f65409d6e5c41d3b592ef5dbfd0a64a7e33a8..fc5e0ee3eca23aa67cb713a0ce741562ed9f99e7 100644 (file)
@@ -23,7 +23,7 @@ JIT:powerpc64 = ""
 RDEPENDS:${PN} = "bash"
 
 SRC_URI = "git://github.com/draios/sysdig.git;branch=dev;protocol=https;name=sysdig \
-           git://github.com/falcosecurity/libs;protocol=https;branch=master;name=falco;subdir=git/falcosecurity-libs \
+           git://github.com/falcosecurity/libs;protocol=https;branch=master;name=falco;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/falcosecurity-libs \
            file://0055-Add-cstdint-for-uintXX_t-types.patch;patchdir=./falcosecurity-libs \
            file://0099-cmake-Pass-PROBE_NAME-via-CFLAGS.patch \
            "
@@ -32,7 +32,6 @@ SRCREV_falco = "caa0e4d0044fdaaebab086592a97f0c7f32aeaa9"
 
 SRCREV_FORMAT = "sysdig_falco"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE = "\
                 -DBUILD_DRIVER=OFF \
index 2558a22ce57c7302d24fdb3f3024c7ad07831023..24ca32f86f8e6405e542c0481b4e923f4516db61 100644 (file)
@@ -15,7 +15,6 @@ SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master"
 UPSTREAM_CHECK_COMMITS = "1"
 RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
 
-S = "${WORKDIR}/git"
 
 EXCLUDE_FROM_WORLD = "1"
 
index eaa8bd898dafbdddc38e213ce45b53affffb59b6..63bfed8a7afa58fdc14c02a99094305b96fe0aa4 100644 (file)
@@ -14,7 +14,6 @@ SRC_URI = "git://git.yoctoproject.org/dbus-wait;branch=master"
 UPSTREAM_CHECK_COMMITS = "1"
 RECIPE_NO_UPDATE_REASON = "This recipe is used to test devtool upgrade feature"
 
-S = "${WORKDIR}/git"
 
 EXCLUDE_FROM_WORLD = "1"
 
index 90d9b66b2c8d23f32d8da5101dee3da2fcd46816..055657b239ae5fb9734152e52b53a1492950c2ed 100644 (file)
@@ -10,7 +10,6 @@ UPSTREAM_VERSION_UNKNOWN = "1"
 SRC_URI = "gitsm://git.yoctoproject.org/git-submodule-test;branch=master"
 SRCREV = "a2885dd7d25380d23627e7544b7bbb55014b16ee"
 
-S = "${WORKDIR}/git"
 
 do_test_git_as_user() {
     cd ${S}
index c4806793eed4c1ee339b5c996c5cac03b920c82d..756c01cb09942bc849f4d38735e15b86332acab9 100644 (file)
@@ -13,4 +13,3 @@ SRC_URI = "git://git.yoctoproject.org/git/matchbox-panel-2;branch=master;protoco
 
 SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7"
 
-S = "${WORKDIR}/git"
index 602e895199b349eb0d6e4de9021a0ba9a1f7627e..59b383800cd19f8c7f584487604c19e38704dae6 100644 (file)
@@ -13,4 +13,3 @@ SRC_URI:append:gitunpack-enable-recipe = ";tag=${TAGVALUE}"
 SRCREV = "f82ca3f42510fb3ef10f598b393eb373a2c34ca7"
 SRCREV:gitunpack-enable-recipe = ""
 
-S = "${WORKDIR}/git"
index d941763fb75cbd01e4a5486a50a788160e405a03..60026a527fc3025fa18ff7ddb807c17ba78c0b7d 100644 (file)
@@ -13,9 +13,6 @@
 # SRC_URI:class-devupstream = "git://git.example.com/example;branch=master"
 # SRCREV:class-devupstream = "abcdef"
 #
-# If the first entry in SRC_URI is a git: URL then S is rewritten to
-# WORKDIR/git.
-#
 # There are a few caveats that remain to be solved:
 # - You can't build native or nativesdk recipes using for example
 #   devupstream:native, you can only build target recipes.
@@ -39,9 +36,6 @@ python devupstream_virtclass_handler () {
     src_uri = d.getVar("SRC_URI:class-devupstream") or d.getVar("SRC_URI")
     uri = bb.fetch2.URI(src_uri.split()[0])
 
-    if uri.scheme == "git" and not d.getVar("S:class-devupstream"):
-        d.setVar("S", "${WORKDIR}/git")
-
     # Modify the PV if the recipe hasn't already overridden it
     pv = d.getVar("PV")
     proto_marker = "+" + uri.scheme
index ba93145fd3d59d774585062113e19dcdd3db4640..e53bf1519418fe93b99ab1376cc9f188cbee0e81 100644 (file)
@@ -388,19 +388,19 @@ do_kernel_checkout() {
        set +e
 
        source_dir=`echo ${S} | sed 's%/$%%'`
-       source_workdir="${UNPACKDIR}/git"
-       if [ -d "${UNPACKDIR}/git/" ]; then
+       source_unpackdir="${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
+       if [ -d "${source_unpackdir}" ]; then
                # case: git repository
-               # if S is WORKDIR/git, then we shouldn't be moving or deleting the tree.
-               if [ "${source_dir}" != "${source_workdir}" ]; then
-                       if [ -d "${source_workdir}/.git" ]; then
+               # if S is UNPACKDIR/BB_GIT_DEFAULT_DESTSUFFIX, then we shouldn't be moving or deleting the tree.
+               if [ "${source_dir}" != "${source_unpackdir}" ]; then
+                       if [ -d "${source_unpackdir}/.git" ]; then
                                # regular git repository with .git
                                rm -rf ${S}
-                               mv ${UNPACKDIR}/git ${S}
+                               mv ${source_unpackdir} ${S}
                        else
                                # create source for bare cloned git repository
-                               git clone ${WORKDIR}/git ${S}
-                               rm -rf ${UNPACKDIR}/git
+                               git clone ${source_unpackdir} ${S}
+                               rm -rf ${source_unpackdir}
                        fi
                fi
                cd ${S}
index 77399abce0abad0da17e42ddee4ecfc158c3056a..1076661b9131bb2f58c4219fcb5562b1658326bb 100644 (file)
@@ -408,6 +408,7 @@ STAMPCLEAN = "${STAMPS_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/*-*"
 BASE_WORKDIR ?= "${TMPDIR}/work"
 WORKDIR = "${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}/${PN}/${PV}"
 UNPACKDIR ??= "${WORKDIR}/sources-unpack"
+BB_GIT_DEFAULT_DESTSUFFIX = "${BP}"
 T = "${WORKDIR}/temp"
 D = "${WORKDIR}/image"
 S = "${WORKDIR}/${BP}"
index cdb38d5aa45d54bb358f819bc40864b84f125ef2..0270024a83f5927be0f55593976c4bc8497dc022 100644 (file)
@@ -75,10 +75,11 @@ def get_source_date_epoch_from_known_files(d, sourcedir):
     return source_date_epoch
 
 def find_git_folder(d, sourcedir):
-    # First guess: UNPACKDIR/git
+    # First guess: UNPACKDIR/BB_GIT_DEFAULT_DESTSUFFIX
     # This is the default git fetcher unpack path
     unpackdir = d.getVar('UNPACKDIR')
-    gitpath = os.path.join(unpackdir, "git/.git")
+    default_destsuffix = d.getVar('BB_GIT_DEFAULT_DESTSUFFIX')
+    gitpath = os.path.join(unpackdir, default_destsuffix, ".git")
     if os.path.isdir(gitpath):
         return gitpath
 
index 0155ee62ee0e259c006c6be7cdf663085e18fb54..f30dba5a46967c98157158e39b7d7d40e844ee69 100644 (file)
@@ -469,7 +469,7 @@ class DevtoolAddTests(DevtoolBase):
         checkvars = {}
         checkvars['LICENSE'] = 'GPL-2.0-only'
         checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'
-        checkvars['S'] = '${WORKDIR}/git'
+        checkvars['S'] = None
         checkvars['PV'] = '0.1+git'
         checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/dbus-wait;protocol=https;branch=master'
         checkvars['SRCREV'] = srcrev
@@ -609,7 +609,7 @@ class DevtoolAddTests(DevtoolBase):
         recipefile = get_bb_var('FILE', testrecipe)
         self.assertIn('_git.bb', recipefile, 'Recipe file incorrectly named')
         checkvars = {}
-        checkvars['S'] = '${WORKDIR}/git'
+        checkvars['S'] = None
         checkvars['PV'] = '1.0+git'
         checkvars['SRC_URI'] = url_branch
         checkvars['SRCREV'] = '${AUTOREV}'
@@ -628,7 +628,7 @@ class DevtoolAddTests(DevtoolBase):
         recipefile = get_bb_var('FILE', testrecipe)
         self.assertIn('_git.bb', recipefile, 'Recipe file incorrectly named')
         checkvars = {}
-        checkvars['S'] = '${WORKDIR}/git'
+        checkvars['S'] = None
         checkvars['PV'] = '1.5+git'
         checkvars['SRC_URI'] = url_branch
         checkvars['SRCREV'] = checkrev
@@ -1627,9 +1627,9 @@ class DevtoolUpdateTests(DevtoolBase):
         # Check preconditions
         testrecipe = 'dos2unix'
         self.append_config('ERROR_QA:remove:pn-dos2unix = "patch-status"\n')
-        bb_vars = get_bb_vars(['SRC_URI', 'S', 'WORKDIR', 'FILE'], testrecipe)
+        bb_vars = get_bb_vars(['SRC_URI', 'S', 'WORKDIR', 'FILE', 'BB_GIT_DEFAULT_DESTSUFFIX'], testrecipe)
         self.assertIn('git://', bb_vars['SRC_URI'], 'This test expects the %s recipe to be a git recipe' % testrecipe)
-        workdir_git = '%s/git/' % bb_vars['WORKDIR']
+        workdir_git = '%s/%s/' % (bb_vars['WORKDIR'], bb_vars['BB_GIT_DEFAULT_DESTSUFFIX'])
         if not bb_vars['S'].startswith(workdir_git):
             self.fail('This test expects the %s recipe to be building from a subdirectory of the git repo' % testrecipe)
         subdir = bb_vars['S'].split(workdir_git, 1)[1]
index 36557f270fb8f772e591bc29a6f40cc62ee46422..8cd639bd45bcca7549239359d59a86f219a2fd44 100644 (file)
@@ -385,7 +385,7 @@ class RecipetoolCreateTests(RecipetoolBase):
         checkvars = {}
         checkvars['LICENSE'] = 'LGPL-2.1-only'
         checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34'
-        checkvars['S'] = '${WORKDIR}/git'
+        checkvars['S'] = None
         checkvars['PV'] = '1.11+git'
         checkvars['SRC_URI'] = srcuri + ';branch=master'
         checkvars['DEPENDS'] = set(['libcheck', 'libjpeg-turbo', 'libpng', 'libx11', 'libxext', 'pango'])
index fbd2f5dbc83f613e0f13b79bfc8fd7147a8dd644..444cd53fdd198ff203ee3fa9817317cb430ac64f 100644 (file)
@@ -13,7 +13,6 @@ COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https;branch=main"
 SRCREV = "c3f9f0534e32158f62c43564036878b93b9e0fd6"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
index b052e3838fe87f01f6bedda57a67083f28bd3391..7c8e9ac43df8fec4fa74a1c95de6b5d031fe27fb 100644 (file)
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/rhinstaller/efivar.git;branch=main;protocol=https \
            "
 SRCREV = "c47820c37ac26286559ec004de07d48d05f3308c"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig
 
index c93e06b96cf6616c7e223940ec440d65bef9f102..d0be55559b92d719844d5125f58beb23f5209c55 100644 (file)
@@ -20,7 +20,6 @@ SRC_URI = "git://github.com/ncroxon/gnu-efi;protocol=https;branch=master \
            "
 SRCREV = "00cdfa66e923ab2f6683bb52cab0d0d1a9083b16"
 
-S = "${WORKDIR}/git"
 
 # llvm-objcopy fails
 # arm-poky-linux-gnueabi-llvm-objcopy: error: 't8.so': section '.dynstr' cannot be removed because it is referenced by the section '.dynamic'
index c9dfcfbe4f1a32db2c5728cd1d1157192da47e7a..308ac43ac85dc9c2e44e1c1e844d99defabb8892 100644 (file)
@@ -12,7 +12,6 @@ SRCREV = "bd613dd92113f683052acfb23d9dc8ba60029e0a"
 SRC_URI = "git://github.com/riscv/opensbi.git;branch=master;protocol=https \
            file://0001-Makefile-Add-flag-for-reprodubility-compiler-flags.patch \
 "
-S = "${WORKDIR}/git"
 
 TARGET_DBGSRC_DIR = "/share/opensbi/*/generic/firmware/"
 
index 8c7a59ba963dacda1fbca71a31758cab4b0f0b6d..ef74967b81393f74dc5642402ae46ba8f7de84de 100644 (file)
@@ -13,7 +13,6 @@ SECTION = "libs"
 SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https;branch=master"
 SRCREV = "5507339628b5caf244e1ff9d58cb3fa534b16beb"
 
-S = "${WORKDIR}/git"
 
 inherit cmake lib_package
 
index fd1eab5cdde63480bd2903e2d59ed7d1c0d03878..617f5a60bb882f75e59fce36ad4d9751f2bb1ae5 100644 (file)
@@ -16,7 +16,6 @@ SRCREV = "34820924edbc4ec7803eb89d9852f4b870fa760a"
 
 SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV}"
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
 inherit pkgconfig
index 9b8275b1138d1d6b6a8728a27cb2ca264e47dfca..b37cd51ad19c677ca59e857a555d7a53ff024dae 100644 (file)
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/lathiat/nss-mdns;branch=master;protocol=https \
 
 SRCREV = "4b3cfe818bf72d99a02b8ca8b8813cb2d6b40633"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
index 46b3f854c52a43c12a22072604b178b92ae014c3..ab691b6580e660f1ccab185ff73f647e9bf4e820 100644 (file)
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/connectivity/connman-gnome.git;branch=master;protoco
            file://0001-Port-to-Gtk3.patch \
           "
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep gtk-icon-cache pkgconfig features_check
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
index dee921d21c45830fbcd6788247a07006b6273070..bfb24aa58ce271d70490288c0cc4a23de27f2746 100644 (file)
@@ -18,7 +18,6 @@ SRC_URI = "git://github.com/NetworkConfiguration/dhcpcd;protocol=https;branch=ma
            "
 
 SRCREV = "93df2b254caf9639f9ffb66e0fe2b584eeba6220"
-S = "${WORKDIR}/git"
 
 # Doesn't use automake so we can't do out-of-tree builds
 inherit pkgconfig autotools-brokensep systemd useradd
index 569bff1439736d4475243712464560780b8cd57f..ea3a858da46e0fda4239923bd156c01faae48b48 100644 (file)
@@ -10,7 +10,6 @@ SRCREV = "5152db2cbfeb5582e9c27c5ea1dba2cd9e10759b"
 SRC_URI = "git://github.com/libuv/libuv.git;branch=v1.x;protocol=https;tag=v${PV}"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
index e07b93d6955d30ab4ebcb22ae09726847aa720ee..2e8702a045283d2f39980292f1c0d5c2235ff12f 100644 (file)
@@ -10,8 +10,6 @@ PE = "1"
 SRC_URI = "git://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git;protocol=https;branch=main"
 SRCREV = "55ba955d53305df96123534488fd160ea882b4dd"
 
-S = "${WORKDIR}/git"
-
 inherit meson
 
 DEPENDS += "libxslt-native"
index 9e0ac6aa6971ac3a9410e0c30f17b6560a3e3ea4..ab52ab8b6ca6d4f4ff6f57774b9199f1379a2065 100644 (file)
@@ -17,7 +17,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=https;bra
 
 SRCREV = "a1dc8a75cba999728e154a0f811ab9dd50c809f7"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig systemd update-rc.d
 
index 93e5a944d143f7aeeb0601031d7064cfe720d402..b64c694332cc84709c309e566a40e6ecaa6ee870 100644 (file)
@@ -17,7 +17,6 @@ SRC_URI = "git://salsa.debian.org/debian/resolvconf.git;protocol=https;branch=un
 
 SRCREV = "ab766fa31f7939f6d879123236b4275320b7ff64"
 
-S = "${WORKDIR}/git"
 
 # the package is taken from snapshots.debian.org; that source is static and goes stale
 # so we check the latest upstream from a directory that does get updated
index 568bac389f57cbee705b971571f034ff44fbd28c..2c6b5f06dc485aaf8cbf4bb1d11df4c2fa777988 100644 (file)
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727"
 SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master"
 SRCREV = "9c744e1e52aa0d9646ed91d789d588696292c21e"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0"
 
index 39363b9b3aa2288fe6922d841ac47f789403fa86..b25ee6b6a3516672dff71f116d7d7301a9b23fed 100644 (file)
@@ -13,6 +13,5 @@ PV = "0.1+git"
 SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https"
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
index 10103830af8dc625afad706d435ac80960790973..399907ab9a85da8b73d93154a86acbc227d5a47d 100644 (file)
@@ -12,7 +12,6 @@ SRCREV = "0bde52df588e8969879a2cae51c3a4774ec62472"
 
 SRC_URI = "git://github.com/pullmoll/musl-fts.git;branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 #
index 5aeb84ac8000c9c9f9b609ef79228504fb721cf3..924020343ddbf487b0b586dd95bffc2a6e7795ff 100644 (file)
@@ -20,7 +20,7 @@ inherit native
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/glibc:"
 
 SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
-           git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=git/localedef;protocol=https \
+           git://github.com/kraj/localedef;branch=master;name=localedef;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/localedef;protocol=https \
            \
            file://0001-localedef-Add-hardlink-resolver-from-util-linux.patch \
            file://0002-localedef-fix-ups-hardlink-to-make-it-compile.patch \
@@ -37,7 +37,6 @@ SRC_URI = "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
 #
 SRCREV_FORMAT = "glibc_localedef"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF = "--with-glibc=${S}"
 
index 82dcf08fcd04e3e9cea016bfbf10185c732564cc..eb6a6740398924943de351bb1951705cf78df5ae 100644 (file)
@@ -56,7 +56,6 @@ SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
            file://0001-stdlib-Add-single-threaded-fast-path-to-rand.patch \
            file://0001-Propagate-ffile-prefix-map-from-CFLAGS-to-ASFLAGS.patch \
 "
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build-${TARGET_SYS}"
 
 PACKAGES_DYNAMIC = ""
index 3e7bece41b674ef022f09916bb6f7e46029da6bc..500414eb47e26a69755b8a25b39528c7b33d3fe6 100644 (file)
@@ -18,7 +18,6 @@ SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=mast
            "
 SRCREV = "7d44f9ce6717a4a496fd46f28c52e12dbf5bafdd"
 
-S = "${WORKDIR}/git"
 
 
 inherit ptest update-alternatives
index df6b2b101a3b722d81d657d5361da643e219c3cd..4daedfb43c0460bd6e9ea88bd2eb858d4ba585bf 100644 (file)
@@ -27,7 +27,7 @@ inherit core-image setuptools3 features_check
 REQUIRED_DISTRO_FEATURES += "xattr"
 
 SRCREV ?= "b1b3318eff36d4d9b2d3a935dee607c4f012f992"
-SRC_URI = "git://git.yoctoproject.org/poky;branch=master \
+SRC_URI = "git://git.yoctoproject.org/poky;branch=master;destsuffix=poky \
            file://Yocto_Build_Appliance.vmx \
            file://Yocto_Build_Appliance.vmxf \
            file://README_VirtualBox_Guest_Additions.txt \
@@ -44,10 +44,10 @@ IMAGE_CMD:ext4:append () {
 fakeroot do_populate_poky_src () {
        # Because fetch2's git's unpack uses -s cloneflag, the unpacked git repo
        # will become invalid in the target.
-       rm -rf ${UNPACKDIR}/git/.git
-       rm -f ${UNPACKDIR}/git/.gitignore
+       rm -rf ${UNPACKDIR}/poky/.git
+       rm -f ${UNPACKDIR}/poky/.gitignore
 
-       cp -R ${UNPACKDIR}/git ${IMAGE_ROOTFS}/home/builder/poky
+       cp -R ${UNPACKDIR}/poky ${IMAGE_ROOTFS}/home/builder/poky
 
        mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/conf
        mkdir -p ${IMAGE_ROOTFS}/home/builder/poky/build/downloads
index 036c86a536e36bde66ef464612e8ffcddd30e023..03a226de56d4c8b18cdc6ce1ac46586f32941578 100644 (file)
@@ -20,7 +20,6 @@ SRCREV = "78486a4a2a305170b66ce4d907bedadbaed10daf"
 SRC_URI = "git://salsa.debian.org/debian/init-system-helpers.git;protocol=https;branch=master"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))(?!_exp)"
 
-S = "${WORKDIR}/git"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
index 55619daef7d147e8408d95397d2f4ab1173f9d2a..10705586ec46c6530cc4cf5e92d5d4dfcb043511 100644 (file)
@@ -16,7 +16,6 @@ SRCBRANCH ?= "master"
 
 PROVIDES = "virtual/crypt"
 
-S = "${WORKDIR}/git"
 
 BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
 TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir} -Wno-error"
index 40fe8c6a5f5f7d4df71f629c8fea061fe9d930e9..460f759899ef6d77dcd3d15324ed1571394c1b3b 100644 (file)
@@ -16,7 +16,6 @@ SRC_URI:append:powerpc = "\
 PV = "1.1.0"
 SRCREV = "b7bfe0b08c52fdc72e0c1d9d4dcb2129f1642bd6"
 
-S = "${WORKDIR}/git"
 
 inherit pkgconfig linuxloader siteinfo
 
index f55a125a89ab00375bf43d62ef81f0644d60960d..bd639e059b3b576a1622a73da1ab8627e14a6e40 100644 (file)
@@ -18,7 +18,6 @@ SRC_URI = " \
 
 PV = "0+git"
 
-S = "${WORKDIR}/git"
 
 # libc-test 'make' or 'make run' command is designed to build and run tests. It
 # reports both build and test failures. The commands should be run on target.
index 65ee77d06e79fe918a88544556cb121842d448da..10ebb6bd316b4a529c91b9364d842d25a9537c6a 100644 (file)
@@ -12,7 +12,6 @@ SRCREV = "a0323579ac50b9a9d4033754d089f1fed0f59a00"
 SRC_URI = "git://github.com/kaniini/libucontext;branch=master;protocol=https \
            "
 
-S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST = ".*-musl.*"
 
index 2815e2ddf082a6d4e7bd50ee41c8c1e77546a044..d9e68e98830c36d80118cb97f1d0b720f242594e 100644 (file)
@@ -12,7 +12,6 @@ SRC_URI = "git://git.adelielinux.org/adelie/musl-locales;protocol=https;branch=m
 PV = "1.0+git"
 SRCREV = "5663f5bfd30bf9e1e0ba3fc5fe2da6725969f30e"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "virtual/libintl gettext-native"
 
index 4c71a141b2441f7c062571f8b6e9fc9792b5438f..23361400c7ce2123ce59094c6d0c39b4a47a3b31 100644 (file)
@@ -16,7 +16,6 @@ UPSTREAM_CHECK_COMMITS = "1"
 
 inherit autotools pkgconfig
 
-S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST = ".*-musl.*"
 
index 8280333daf4e466923194fb5f47ffa08ea0c901f..05adeb161924b35f141993159bdbafb5ca53a398 100644 (file)
@@ -17,7 +17,6 @@ UPSTREAM_CHECK_COMMITS = "1"
 
 inherit autotools
 
-S = "${WORKDIR}/git"
 
 PACKAGES =+ "${PN}-iconv"
 
index afc459bf1c9eb9e039f032696e43fc2ebe91b67c..1e1a9cc26246cf6319109d56ac0c79d69a37b622 100644 (file)
@@ -16,7 +16,6 @@ SRC_URI = "git://git.musl-libc.org/musl;branch=master \
            file://0001-Update-syscalls-for-r32-rv64-from-kernel-6.4-through.patch \
           "
 
-S = "${WORKDIR}/git"
 
 PROVIDES += "virtual/libc virtual/libiconv virtual/libintl virtual/crypt"
 
index 2e3ee337ea405a16a5a1e2c51e35f2f08591a182..bba3495266c5a36162bded43160e2375985ef241 100644 (file)
@@ -7,7 +7,6 @@ SRC_URI += "file://0001-tic-hang.patch \
            "
 # commit id corresponds to the revision in package version
 SRCREV = "1c55d64d9d3e00399a21f04e9cac1e472ab5f70a"
-S = "${WORKDIR}/git"
 EXTRA_OECONF += "--with-abi-version=5"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+_\d+)$"
 
index 5b5025148e5e23f3d583d4d6b63497199370973e..604bef3e24b05935e2bb39774984ea84489dcf3c 100644 (file)
@@ -22,7 +22,6 @@ SRCREV = "5e5e51f1dc56a99eb4648c28e00d73b6ea44a8b0"
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS = "virtual/cross-cc"
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
 
 ## disable stdlib
index ab6c580722552820956d423d180eaa60d19038e7..3c88e935ddb2009c52a9fe62de8a5b21edcc02dc 100644 (file)
@@ -55,7 +55,6 @@ inherit deploy
 
 PARALLEL_MAKE = ""
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "nasm-native acpica-native ovmf-native util-linux-native"
 
index 640be819a3d4bc6d9c59ee3f6f999571c0eef844..68c32894a7ae85f9187687c078413d61c8a850d3 100644 (file)
@@ -17,5 +17,4 @@ PV = "${BASEVER}+git"
 SRC_URI = "git://github.com/picolibc/picolibc.git;protocol=https;branch=main"
 SRCREV = "764ef4e401a8f4c6a86ab723533841f072885a5b"
 
-S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
index f3647d389d730ec9527dd552e0e3571f7409f012..ba2e097ec197bdc3d17c2d6602b82dfccd92ba7b 100644 (file)
@@ -62,7 +62,6 @@ python __anonymous() {
             d.appendVar("RDEPENDS:%s" % pn, " %s" % ep)
 }
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig update-rc.d update-alternatives systemd
 
index 3b4b3bae4c513f0f3effe897f9852648d5674d35..3be27dda9d26906b75f99cfbfeb53e45a59809a4 100644 (file)
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a"
 SRC_URI = "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master \
            file://init"
 SRCREV = "566ffeb032af42865dc1210e48cec08368059bb9"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig systemd update-rc.d useradd
 
index d99039b6f8d11f49162bcb31731f6d696918665a..5e9532868a9203237d779249b5c0570d253cd819 100644 (file)
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/linux-ras/sysfsutils.git;protocol=https;branch=maste
 
 SRCREV = "da2f1f8500c0af6663a56ce2bff07f67e60a92e0"
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
index 5ed84757f3835d0406b29d3705bae63ff26c2811..cd90491431544f0311b07df10cbb5362f08340e9 100644 (file)
@@ -19,6 +19,5 @@ SRCREV = "00a12c234e2506f5cab683460199575f13c454db"
 SRCBRANCH = "v257-stable"
 SRC_URI = "git://github.com/systemd/systemd.git;protocol=https;branch=${SRCBRANCH};tag=v${PV}"
 
-S = "${WORKDIR}/git"
 
 CVE_PRODUCT = "systemd"
index e8fb4831e27591c839e7e04bd73c463c0802fbd8..8c335cafcbe9ec1e5ecbd7216521536b316de3f7 100644 (file)
@@ -11,7 +11,6 @@ SRCREV = "793c037ded98cd001075cdb55a9c58e122380256"
 
 CVE_PRODUCT = "s390-tools"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "\
     V=1 \
index 27723c88ef27cd96f87daf990d63219844b29bb9..b5349152046300703511ee9f6a11c879a19e254a 100644 (file)
@@ -12,7 +12,6 @@ PV .= "+git"
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit allarch
 
index 5578fb3d18bf9cb622859ab3ff64ea23ea642e96..79f24887271d4f8d48965e78718e83c76e1c4693 100644 (file)
@@ -8,7 +8,6 @@ inherit rust cargo cargo-update-recipe-crates
 
 SRC_URI += "git://github.com/rust-lang/rust-bindgen.git;protocol=https;branch=main"
 SRCREV = "af7fd38d5e80514406fb6a8bba2d407d252c30b9"
-S = "${WORKDIR}/git"
 
 require ${BPN}-crates.inc
 
index 90546a0cfa24af33bea73768d7742642c368ce8d..18bff2816a59faae4a2de5bcd4c651b6c76428f4 100644 (file)
@@ -44,4 +44,3 @@ SRC_URI = "\
      file://0019-CVE-2025-5244.patch \
      file://0019-CVE-2025-3198.patch \
 "
-S  = "${WORKDIR}/git"
index 06625d099e635fa6b36802c2743507910b001afe..16bf345d1df5464cd9104edc97d69ea89b96fa8d 100644 (file)
@@ -98,7 +98,6 @@ SRC_URI = "git://github.com/xrmx/bootchart.git;branch=master;protocol=https \
            file://0002-Makefile-Add-n-to-gzip.patch \
           "
 
-S = "${WORKDIR}/git"
 SRCREV = "868a2afab9da34f32c007d773b77253c93104636"
 
 
index d3d320e107ca97ce5d3ea00583cab939664f2fcc..04be9439d884d438ae63f4eadaad9395e18676ab 100644 (file)
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/kdave/btrfs-progs.git;branch=master;protocol=https;t
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            "
 SRCREV = "5ad147c9ec00e657393c85b195c9bcc0f4c35a54"
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \
     programs \
index d12e3184a045d1105d4039f745d8fd5e12d5942d..1d2ad9ebfba7d9e876973f8dcf6e7f2ddf29fde6 100644 (file)
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/rpm-software-management/createrepo_c;branch=master;p
 
 SRCREV = "8c6e6f88df86d1e34ca26d3835d77a2816326414"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm"
 DEPENDS:append:class-native = " file-replacement-native"
index ab138b3ab6f0d96f5f8b4a98623a7332e15b4ea4..392f4ae272501cbc7d530fe93084defa8d8a012a 100644 (file)
@@ -21,7 +21,6 @@ SRC_URI = "git://github.com/distcc/distcc.git;branch=master;protocol=https \
            file://distcc.service \
            "
 SRCREV = "50d821efe99cae82c05be0a4ab3b4035ef0d3883"
-S = "${WORKDIR}/git"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 inherit autotools pkgconfig update-rc.d useradd systemd
index e5ac3c9824ce71d85e97133e4e9def6cd3be129e..7bb0f02d3f947d91a67d04a1cac62dc0df6c797e 100644 (file)
@@ -23,7 +23,6 @@ SRC_URI:append:class-native = " file://0001-dnf-write-the-log-lock-to-root.patch
 SRCREV = "da9a7066be8e1628d9453428d33685225cd9c90d"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit cmake gettext bash-completion setuptools3-base systemd
 
index 47a8d5d5eafbada7f1c02daf4a7296d8e5b5ca32..adceebf8e6a3f3315b13df166408885e2733a62c 100644 (file)
@@ -19,4 +19,3 @@ SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-
 
 SRCREV = "ee7e9118d0a9581cb00c5ce02dccd561b3096387"
 
-S = "${WORKDIR}/git"
index 0cb3f0e6a6f4fd450ada694e5caa4c62ad59ee35..cce6e5f1acb8f11db48a76f891bf7a52cfb0c5e4 100644 (file)
@@ -20,7 +20,6 @@ SECTION = "base"
 DEPENDS = "util-linux attr autoconf-archive-native"
 
 SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git;branch=master;protocol=https"
-S = "${WORKDIR}/git"
 
 inherit autotools gettext texinfo pkgconfig multilib_header update-alternatives ptest
 
index 54ead294fb1532138b297ff2a0a5d8d4ab1cc9c8..830cf435ce872aa8da91301fbeb52414dc79fad6 100644 (file)
@@ -10,7 +10,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;b
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "util-linux-libuuid"
 
index b3f45ccef455fb564fabd257dcc8d20e906d88ed..ca69a4238f683bbb82131d40e1c40baa51dc2179 100644 (file)
@@ -10,6 +10,5 @@ LIC_FILES_CHKSUM = " \
 SRC_URI = "git://github.com/fastfloat/fast_float.git;protocol=https;branch=main"
 
 SRCREV = "50a80a73ab2ab256ba1c3bf86923ddd8b4202bc7"
-S = "${WORKDIR}/git"
 
 inherit cmake
index e97fac99f21057696738d2cf0f10d332f1b4f8a0..c035e0b11d8ada27d33b084b9b937487ec866998 100644 (file)
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/file/file.git;branch=master;protocol=https \
            "
 
 SRCREV = "c5aa4f7f8d5063fb3c37ad57bf54bb67ec641a09"
-S = "${WORKDIR}/git"
 
 inherit autotools update-alternatives
 
index b2b8c575c8a6fe344f336702498b4e975eba3fc3..ce63f94025535631d453be2ba876977646949990 100644 (file)
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/fmtlib/fmt;branch=master;protocol=https;tag=${PV}\
            file://0001-Workaround-an-ABI-issue-in-spdlog.patch"
 SRCREV = "40626af88bd7df9a5fb80be7b25ac85b122d6c21"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
index 60601d23e2285174b783c1a462f4934476b35740..515777caf4cbcf82b2233c465f361501bb403571 100644 (file)
@@ -14,7 +14,6 @@ PV = "20240823+git"
 
 SRC_URI = "git://git.savannah.gnu.org/git/config.git;protocol=https;branch=master \
            file://gnu-configize.in"
-S = "${WORKDIR}/git"
 UPSTREAM_CHECK_COMMITS = "1"
 
 CLEANBROKEN = "1"
index 91170dfbed9fbdd8c00648e4c86df319fced025e..ee2fb10a08a911760dbc056001014355eec62552 100644 (file)
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;p
 
 SRCREV = "2e973ce22698dd64f472180e3a689755268fb06b"
 
-S = "${WORKDIR}/git"
 
 inherit cmake setuptools3-base
 
index 5a2d4d93642d16267831a4ff808bb40695eb3f3a..06be5776f2413ae4c19e50e04255e6cb04a0497b 100644 (file)
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p
 SRCREV = "91a0bf9aada36a722855051526f012e0b5ab1af9"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native util-linux"
 
index c31fc44ce4ffbfc188890cac0c78dd702d65721f..d6613131bd04fe7f326cd210b10c661aa703155d 100644 (file)
@@ -8,7 +8,6 @@ SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=
 
 SRCREV = "e7f179eeeb6eee1403f090fc43a3c80bb08b5bfd"
 
-S = "${WORKDIR}/git"
 
 inherit meson gobject-introspection pkgconfig manpages
 
index 634967fcbcc9c6c6dc2cffccbb0ef36e9d773a30..d985601a28bddfd83a72e1a6f32ba78f55272f9b 100644 (file)
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git;branch=master;pr
 
 SRCREV = "7955987e33ba98dddb3fc2c63bb6dc892e3505fa"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "curl glib-2.0 openssl attr gpgme libxml2"
 
index 1f287a8df9ee862685d0c8449777766d061c1ea2..fed0ef89161780c6cde6a954104ed495cb3c0db8 100644 (file)
@@ -15,7 +15,6 @@ UPSTREAM_CHECK_COMMITS = "1"
 DEPENDS = "python3-sphinx-native"
 EXTRA_OEMAKE = "C="
 
-S = "${WORKDIR}/git"
 
 CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
index 2f7043b9773de5912bcd60d8021f8f1c1fec642d..52dcbcce4abbfde924e0f7e10a7e0f9c4e80c6ef 100644 (file)
@@ -19,7 +19,6 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
            file://0004-ubifs-utils-extract_files-Include-linux-limits.h.patch \
            file://0001-Improve-check-for-GCC-compiler-version.patch"
 
-S = "${WORKDIR}/git"
 
 # xattr support creates an additional compile-time dependency on acl because
 # the sys/acl.h header is needed. libacl is not needed and thus enabling xattr
index 9f5c014b9b53e5a0a1d28695bd20dbb8d08c4dfc..2667c932b0c0d16bc5e0c2536de2a4bd2d038dd3 100644 (file)
@@ -11,7 +11,6 @@ SRCREV = "2daa09ba270b0a43e1929d29b073348aa985dfaa"
 SRC_URI = "git://github.com/ninja-build/ninja.git;branch=release;protocol=https"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
 
-S = "${WORKDIR}/git"
 
 do_configure[noexec] = "1"
 
index 44958b442ed677e3d85c8533f5b41099c8b17494..9c5cfb837ed8bb2f6eae2123950c3a0d7f0a3d47 100644 (file)
@@ -12,7 +12,6 @@ SRC_URI = "git://git.yoctoproject.org/opkg-utils;protocol=https;branch=master \
            "
 SRCREV = "68a969f0e867ace0d94faf8ebe7c7bb67f59d386"
 
-S = "${WORKDIR}/git"
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
index dece34240c5f22691abdc91844102aa708a96b2e..cefc586f2f7dd87fa347fff351a7db285d6820b9 100644 (file)
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/NixOS/patchelf;protocol=https;branch=master \
 "
 SRCREV = "99c24238981b7b1084313aca8f5c493bb46f302c"
 
-S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
index af512a42b43849791ea56e43eef669be1ea55202..1ce4888e578c964b8c7c99084c2fbe1900110f45 100644 (file)
@@ -18,7 +18,6 @@ SRC_URI = "git://gitlab.freedesktop.org/pkg-config/pkg-config.git;branch=master;
            file://0001-Do-not-use-bool-as-a-field-name.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools
 
index 4693afcaf62cb1fd48b802db78b32a1f51e44df3..385b6f34d90cfb56f5656f584920254700880008 100644 (file)
@@ -5,15 +5,14 @@ SRC_URI = "git://git.yoctoproject.org/pseudo;branch=master;protocol=https \
            file://fallback-group \
            "
 SRC_URI:append:class-native = " \
-    http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \
+    http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/prebuilt;name=prebuilt \
     file://older-glibc-symbols.patch"
 SRC_URI:append:class-nativesdk = " \
-    http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=git/prebuilt;name=prebuilt \
+    http://downloads.yoctoproject.org/mirror/sources/pseudo-prebuilt-2.33.tar.xz;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/prebuilt;name=prebuilt \
     file://older-glibc-symbols.patch"
 SRC_URI[prebuilt.sha256sum] = "ed9f456856e9d86359f169f46a70ad7be4190d6040282b84c8d97b99072485aa"
 
 SRCREV = "2c43381180f9cfef4c0a8bb0c1658a86c3fcc876"
-S = "${WORKDIR}/git"
 PV = "1.9.0+git"
 
 # largefile and 64bit time_t support adds these macros via compiler flags globally
index 290be21ce250037ae5ec8a2b5c6bd3cc8d7800e4..fb2fa93173ee197193a7330186c41684d23ede4c 100644 (file)
@@ -8,7 +8,6 @@ SRCREV = "3b74bdce35f2814eb2b65db39a133d5c849ddea7"
 
 inherit python_setuptools_build_meta ptest-python-pytest
 
-S = "${WORKDIR}/git"
 
 RDEPENDS:${PN}-ptest += " \
     python3-pretend \
index 99ff0cca874698992b5686b930777e515d0faf8f..99eb209a9cbd1476eec4fa8a2b23e6d6dc9c1d2e 100644 (file)
@@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = "file://pylibfdt/libfdt.i;beginline=1;endline=6;md5=afda088c9
 
 SRCREV = "2d10aa2afe35527728db30b35ec491ecb6959e5c"
 
-S = "${WORKDIR}/git"
 
 PYPA_WHEEL = "${S}/dist/libfdt-1.6.2*.whl"
 
index 6e72c937413703cbae9171ae174244184dccd955..11765b3cb31fe444b9814f4d90404ec1a796cca3 100644 (file)
@@ -8,7 +8,6 @@ inherit setuptools3 ptest-python-pytest
 SRCREV = "4b3b1e2e568a88d4f1897d694d684f23d9e270c4"
 SRC_URI = "git://github.com/erocarrera/pefile;branch=master;protocol=https \
            file://run-ptest"
-S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native nativesdk"
 
index a8b834a12650b958b8ea12adf0885973ac3666ea..5121a57868dfde02fa8e897d77cbd16d8836396b 100644 (file)
@@ -8,7 +8,6 @@ SRC_URI = "git://gitlab.com/rossburton/python-unittest-automake-output;protocol=
 
 SRCREV = "aebdfb188e368c690ea55cf6c9c9ffa1a52def65"
 
-S = "${WORKDIR}/git"
 
 inherit python_flit_core
 
index 9cff3c0b7c2f6f5c7ce0cc9d6b6a272490a8bedf..b4370ca113e8fdc66e0d6c7e6dd560e64f239d1b 100644 (file)
@@ -15,7 +15,6 @@ SRCREV = "b262d0e4619c406a2708856ed312091d21c5bf39"
 
 MIRRORS += "git://gerrit.googlesource.com/git-repo.git git://github.com/GerritCodeReview/git-repo.git"
 
-S = "${WORKDIR}/git"
 
 do_configure:prepend() {
        sed -Ei "s/REPO_REV\s*=\s*('|\")stable('|\")/REPO_REV = '${SRCREV}'/g" ${S}/repo
index 4ccfc95c33c38344392e772818fb92c2de8d27f7..13ef83fdc7be39c543b91cf96fd7dd1ff347541d 100644 (file)
@@ -16,7 +16,6 @@ SRC_URI = " \
 SRCREV = "032b418a6db842f0eab330eb5909e4604e888728"
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${UNPACKDIR}/git"
 
 do_compile () {
        # Remove most policy variants, leave DEFAULT.pol
index 6ef626e4667a16746ad7e9efa55d38f8dcb879dd..297370f7b51913e9576b960d27b72f267d3fb800 100644 (file)
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/rpm-software-management/rpm-sequoia.git;protocol=htt
 
 SRCREV = "0667e04ae7fb8cf0490919978d69883d16400e41"
 
-S = "${UNPACKDIR}/git"
 
 require ${BPN}-crates.inc
 
index 7bb6993811ca81aee5ed5995e05081aab7f80797..a1190e8dd1ed56b6bce5feaf18d7fac35eefe20d 100644 (file)
@@ -44,7 +44,6 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.20.x;protoc
 PE = "1"
 SRCREV = "c8dc5ea575a2e9c1488036d12f4b75f6a5a49120"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd"
 DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native"
index 930439e2d26d859cb39ad6529b6604ebf6947de6..fbcfedbb345cf2ced4c8531dc7038efb0cac1573 100644 (file)
@@ -12,7 +12,6 @@ SRCREV = "2e87d42ed089dc31990d83eeb07437b9d085d6d1"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE = "${PACKAGECONFIG_CONFARGS}"
 
index 859c7eb906f52543cc4b02c0b21e206d1e2d8ae5..308ecc4be68a7d9bb23e67d943e5c543fbe8d00f 100644 (file)
@@ -24,7 +24,6 @@ SRC_URI:append:libc-musl = " \
 
 SRCREV = "8ab9680a1bd5eb8fe7a7dcc44897af7ee41e56e7"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "systemd libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native intltool"
 
index b02fcb9cad1f4b57f9ad02eae16637a8c4e0e382..5d7598379503a2f0580bf18043c88ef0384d42e7 100644 (file)
@@ -18,7 +18,7 @@ SRC_URI = "git://gitlab.eclipse.org/eclipse/tcf/tcf.agent.git;protocol=https;bra
 DEPENDS = "util-linux openssl"
 RDEPENDS:${PN} = "bash"
 
-S = "${WORKDIR}/git/agent"
+S = "${UNPACKDIR}/${BP}/agent"
 
 inherit update-rc.d systemd
 
index da5ca45277db381379f92cb4a286a5c517a21aaa..b8c235fb7cd7402d8b8083ea9511e724b5575bba 100644 (file)
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c1c621cd2786a3a1344a60a0d608c910"
 
 DEPENDS = "bison-native flex-native libtirpc"
 
-S = "${WORKDIR}/git"
 SRC_URI = "git://github.com/unfs3/unfs3.git;protocol=https;branch=master;tag=${BP}"
 SRCREV = "ec1660ba33c80d5c67131e163e68834c1a10e243"
 UPSTREAM_CHECK_GITTAGREGEX = "unfs3\-(?P<pver>\d+(\.\d+)+)"
index 1415e5d781ccdcc8c3f5a80fb171ae4a361cb9e6..613d7973ec10e07c8e51fe12d9ca754f38d6f9ae 100644 (file)
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 SRCREV = "74862a684907ada3d4ed2ce0f8111adf626e1456"
 SRC_URI = "git://pagure.io/xmlto.git;protocol=https;branch=master"
-S = "${WORKDIR}/git"
 
 inherit autotools
 
index 7e8c68db90c9983b4a1641a953d590f2c27836f0..4b61e92141d565a2a0a7017fcc8c5b34ed02fb47 100644 (file)
@@ -19,7 +19,6 @@ DEPENDS = "m4-native flex-native bison-native"
 SRC_URI = "git://github.com/acpica/acpica;protocol=https;branch=master"
 SRCREV = "e80cbd7b52de20aa8c75bfba9845e9cb61f2e681"
 
-S = "${WORKDIR}/git"
 
 inherit update-alternatives
 
index 0360a342b41231f10693144b0ecf28bd5990247c..57b56802ed1d593f812838dbf48505a4c53e8311 100644 (file)
@@ -14,7 +14,6 @@ SRCREV = "21e33efe96ba9a51d99d1150691dae750afd6ed1"
 
 DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
 
-S = "${WORKDIR}/git"
 
 # Tell xmllint where to find the DocBook XML catalogue, because right now it
 # opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch
index 0e873604a4415542661f86cafba29ba8342917eb..2fdace01b85588eed51051baa217fe5ebe6dc30b 100644 (file)
@@ -10,7 +10,6 @@ PV = "0.1+git"
 SRC_URI = "git://github.com/ahcbb6/baremetal-helloqemu.git;protocol=https;branch=master"
 UPSTREAM_VERSION_UNKNOWN = "1"
 
-S = "${WORKDIR}/git"
 
 # The following variables should be set to accomodate each application
 BAREMETAL_BINNAME ?= "hello_baremetal_${MACHINE}"
index 0d7ff9edcdc1e04079cb5cd0c16703b46ff7ab7f..5b10821ccb066878d851be76bbc1e7d1eb6731f8 100644 (file)
@@ -14,15 +14,15 @@ LICENSE:libbz2 = "bzip2-1.0.6"
 LICENSE:${PN}-ptest = "bzip2-1.0.6 & GPL-3.0-or-later & Apache-2.0 & MS-PL & BSD-3-Clause & Zlib"
 
 LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;endline=37;md5=600af43c50f1fcb82e32f19b32df4664 \
-                    file://${UNPACKDIR}/git/commons-compress/LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327 \
-                    file://${UNPACKDIR}/git/dotnetzip/License.txt;md5=9cb56871eed4e748c3bc7e8ff352a54f \
-                    file://${UNPACKDIR}/git/dotnetzip/License.zlib.txt;md5=cc421ccd22eeb2e5db6b79e6de0a029f \
-                    file://${UNPACKDIR}/git/go/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
-                    file://${UNPACKDIR}/git/lbzip2/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
+                    file://${UNPACKDIR}/bzip2-tests/commons-compress/LICENSE.txt;md5=86d3f3a95c324c9479bd8986968f4327 \
+                    file://${UNPACKDIR}/bzip2-tests/dotnetzip/License.txt;md5=9cb56871eed4e748c3bc7e8ff352a54f \
+                    file://${UNPACKDIR}/bzip2-tests/dotnetzip/License.zlib.txt;md5=cc421ccd22eeb2e5db6b79e6de0a029f \
+                    file://${UNPACKDIR}/bzip2-tests/go/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
+                    file://${UNPACKDIR}/bzip2-tests/lbzip2/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
 "
 
 SRC_URI = "https://sourceware.org/pub/${BPN}/${BPN}-${PV}.tar.gz \
-           git://sourceware.org/git/bzip2-tests.git;name=bzip2-tests;branch=master;protocol=https \
+           git://sourceware.org/git/bzip2-tests.git;name=bzip2-tests;branch=master;protocol=https;destsuffix=bzip2-tests/ \
            file://configure.ac;subdir=${BP} \
            file://Makefile.am;subdir=${BP} \
            file://run-ptest \
@@ -52,13 +52,13 @@ do_configure:prepend () {
 
 do_install_ptest () {
        install -d ${D}${PTEST_PATH}/bzip2-tests
-       cp -r ${UNPACKDIR}/git/commons-compress ${D}${PTEST_PATH}/bzip2-tests/commons-compress
-       cp -r ${UNPACKDIR}/git/dotnetzip ${D}${PTEST_PATH}/bzip2-tests/dotnetzip
-       cp -r ${UNPACKDIR}/git/go ${D}${PTEST_PATH}/bzip2-tests/go
-       cp -r ${UNPACKDIR}/git/lbzip2 ${D}${PTEST_PATH}/bzip2-tests/lbzip2
-       cp -r ${UNPACKDIR}/git/pyflate ${D}${PTEST_PATH}/bzip2-tests/pyflate
-       cp ${UNPACKDIR}/git/README ${D}${PTEST_PATH}/bzip2-tests/
-       cp ${UNPACKDIR}/git/run-tests.sh ${D}${PTEST_PATH}/bzip2-tests/
+       cp -r ${UNPACKDIR}/bzip2-tests/commons-compress ${D}${PTEST_PATH}/bzip2-tests/commons-compress
+       cp -r ${UNPACKDIR}/bzip2-tests/dotnetzip ${D}${PTEST_PATH}/bzip2-tests/dotnetzip
+       cp -r ${UNPACKDIR}/bzip2-tests/go ${D}${PTEST_PATH}/bzip2-tests/go
+       cp -r ${UNPACKDIR}/bzip2-tests/lbzip2 ${D}${PTEST_PATH}/bzip2-tests/lbzip2
+       cp -r ${UNPACKDIR}/bzip2-tests/pyflate ${D}${PTEST_PATH}/bzip2-tests/pyflate
+       cp ${UNPACKDIR}/bzip2-tests/README ${D}${PTEST_PATH}/bzip2-tests/
+       cp ${UNPACKDIR}/bzip2-tests/run-tests.sh ${D}${PTEST_PATH}/bzip2-tests/
        sed -i -e "s|^Makefile:|_Makefile:|" ${D}${PTEST_PATH}/Makefile
 }
 
index c3396521ffe174ff4a7ff77d0c83063ba30d9ddb..7feba2c95093a962523c97b96b364ef569c56452 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/cracklib/cracklib;protocol=https;branch=main \
            "
 
 SRCREV = "e73d5db1789d198b5f9ec44b68b9c775c3e6c042"
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/${BP}/src"
 
 inherit autotools gettext
 
index bb495a7d130de333d861730f17da3d1945967de4..39d2fd8bb65b17a228eaacf5c6afe95a4a3331d3 100644 (file)
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/iputils/iputils;branch=master;protocol=https \
           "
 SRCREV = "6e1cb146547eb6fbb127ffc8397a9241be0d33c2"
 
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>20\d+)"
 
index 87ab22ed1768921609cbe4e5c2771705377e87a1..2392fd5db2374375b88ee178075add745f1b84d9 100644 (file)
@@ -11,7 +11,6 @@ SRC_URI = "git://pagure.io/libaio.git;protocol=https;branch=master \
            file://system-linkage.patch \
            "
 SRCREV = "1b18bfafc6a2f7b9fa2c6be77a95afed8b7be448"
-S = "${WORKDIR}/git"
 
 EXTRA_OEMAKE =+ "prefix=${prefix} includedir=${includedir} libdir=${libdir}"
 
index 1b9be620c078ad0b0a4d9dbd32a42e2484f2ba62..b40ff34dd8df86987729019116831228a1659e02 100644 (file)
@@ -15,7 +15,6 @@ CVE_PRODUCT = "libnsl_project:libnsl"
 SRC_URI = "git://github.com/thkukuk/libnsl;branch=master;protocol=https"
 SRCREV = "d4b22e54b5e6637a69b26eab5faad2a326c9b182"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig gettext
 
index f0e687c3305abf9d2bfddf76f333ef84baa3e76b..c04c9b34f1d50698a5821c154739930d5959958d 100644 (file)
@@ -20,7 +20,6 @@ SRCREV = "cd0d391af9535b56e612ed227c1b89be269f3d59"
 SRC_URI = "git://github.com/thkukuk/libnss_nis;branch=master;protocol=https \
           "
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
index 75842514200be3705a03e813fd0da7763f1bac62..6b4adef03e40664e177e2a97652f4591ad11c7d3 100644 (file)
@@ -16,7 +16,6 @@ SRCREV = "9fb855d872139fb1ebebec4c892b338fccda69ba"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
index f1ec650029acb1a5680175cb04aa2c655349f53c..f245666d80acd433c04d63fa6c9ca13aeac50338 100644 (file)
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \
            file://remove-host-information.patch"
 SRCREV = "bbf320ce586a848f880bca7b758d50ae4c712624"
 
-S = "${WORKDIR}/git"
 
 inherit update-alternatives autotools pkgconfig manpages
 PACKAGECONFIG[manpages] = ""
index f9521acbc6a15386ffde1c5cd4756576149a0626..e82d3ed066d7ae236a1f8bd093ee61d981dd8d66 100644 (file)
@@ -33,7 +33,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=ht
            file://0001-cve-2015-3290-Disable-AVX-for-x86_64.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep pkgconfig
 
index db45df43d3d62c2968e1dbde2485db36c1db2207..d8ded85d4c2e779363186452f99d478924a0d3a7 100644 (file)
@@ -20,7 +20,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/mdadm/mdadm.git;protocol=https;bra
            "
 
 SRCREV = "8e56efac9afd7080bb42bae4b77cdad5f345633a"
-S = "${WORKDIR}/git"
 
 inherit ptest systemd
 
index 547079f4cf6285db326b3c4a538f7916ae465f85..191717987a895ee2142cb83a908118cb51762a6a 100644 (file)
@@ -15,7 +15,6 @@ SRC_URI = "git://git.code.sf.net/p/net-tools/code;protocol=https;branch=master \
     file://CVE-2025-46836-02.patch \
 "
 
-S = "${WORKDIR}/git"
 
 inherit gettext
 
index 3be40c38a4e84ffd4db0bb8a53589718dba3cf60..7c40b3b974e84c8ea645639f621e4bc5178b5e02 100644 (file)
@@ -17,7 +17,6 @@ SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master \
            "
 SRCREV = "f46b2f7929cdfe2913ed0a7f585b09d6adbf994e"
 
-S = "${WORKDIR}/git"
 
 # Upstream has a custom autogen.sh which invokes po/update-potfiles as they
 # don't ship a po/POTFILES.in (which is silly).  Without that file gettext
index 4128ca05335c8e883d73b32ddb8964270ace6302..653095c81cd2c59832ebb9d859a9b7d832146d1e 100644 (file)
@@ -15,7 +15,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \
            "
 SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c"
-S = "${WORKDIR}/git"
 
 inherit autotools gettext
 
index 20933153a32c1f13328dbdab2c8a9e3554a690ed..dc928c736e9fe2dc3ad9f1c450239a8b4e671f2b 100644 (file)
@@ -23,7 +23,6 @@ SRC_URI = "git://github.com/thkukuk/${BPN};branch=master;protocol=https \
            file://0001-Use-cross-compiled-rpcgen.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools gettext
 
index 7bbedcb66da024206445fb4061b1fa29437a7eb2..3641b03b90b15fffc3f237ce190d5759a0eb7071 100644 (file)
@@ -10,7 +10,6 @@ SRC_URI = "git://git.sr.ht/~sircmpwn/scdoc;protocol=https;branch=master \
            file://0001-Makefile-drop-static.patch "
 SRCREV = "0528bcb993cac6c412acd3ae2e09539e994c0a59"
 
-S = "${WORKDIR}/git"
 
 do_install() {
        oe_runmake 'DESTDIR=${D}' install
index b1cfdc371fbd7438e420b0df427bc4b6b68d9549..85a0d6a709903043287fdc4e4c9e4ef68010bd14 100644 (file)
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master;tag=V${PV} \
            "
 SRCREV = "d4eef982dc98fe915aa82303c0a24070d0a51b00"
-S = "${WORKDIR}/git"
 
 DEPENDS = "coreutils-native libbsd"
 
index ba69a7a8b8e369d9421e0ac4235cee3f9b11b238..f8a1bac186810ffd8adf810df93d571e231f6843 100644 (file)
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/troglobit/sysklogd.git;branch=master;protocol=https;
 
 SRCREV = "5fb314cb9060afa3bd4eed2f0be3200f02f729e9"
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF = "--with-systemd=${systemd_system_unitdir} --without-logger"
 
index 8ea47d7797462627a7a339b139fcb44c0b817620..0fa4a3c950328776f58f5cb556be583da4e29860 100644 (file)
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/sysstat/sysstat.git;protocol=https;branch=master \
 LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
 
 SRCREV = "dac10e13c70d1102aa3beea10135a3ed60520c36"
-S = "${WORKDIR}/git"
 
 DEPENDS += "base-passwd"
 
index 111c50bdfec8661f2b2e8c1f42c63a53f2d59570..93c211e3ba315d6cf1e793b633918a8c29950288 100644 (file)
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/openSUSE/xinetd.git;protocol=https;branch=master \
 
 SRCREV = "6a4af7786630ce48747d9687e2f18f45ea6684c4"
 
-S = "${WORKDIR}/git"
 
 # https://github.com/xinetd-org/xinetd/pull/10 is merged into this git tree revision
 CVE_STATUS[CVE-2013-4342] = "fixed-version: Fixed directly in git tree revision"
index d173558a0fbfb70b5cba5207907d44afc38e776b..81d05f980fc0db2cf282b16a0841ba2b08fdebc8 100644 (file)
@@ -17,7 +17,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 CVE_PRODUCT = "zstandard"
 
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[lz4] = "HAVE_LZ4=1,HAVE_LZ4=0,lz4"
index a16574955f11383e6036269a558ec094c2bc0238..58d5cb07b5f19b2fbf3a51feeeddb5a05030dd7b 100644 (file)
@@ -12,7 +12,6 @@ SRC_URI = "git://gitlab.gnome.org/GNOME/gi-docgen.git;protocol=https;branch=main
 
 SRCREV = "9ab2ab8fa3f4a04f5d2cc24b0c8e91e73bc57b51"
 
-S = "${WORKDIR}/git"
 
 inherit python_setuptools_build_meta
 
index 7f5f02a7ba95956d1d8551a8455f1aa960a9cc95..cf2c64f8d0a7435b5a890f0eecfc756dffc10738 100644 (file)
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
 SRC_URI = "git://gitlab.gnome.org/GNOME/libhandy.git;protocol=https;branch=libhandy-1-8"
 SRCREV = "9b0071408ce86a3ef843806fddd723a85f6f2416"
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.(\d*[02468])+(\.\d+))"
 GIR_MESON_ENABLE_FLAG = 'enabled'
index 970db65bc5758d0eda3a40b3d0e0cf219aaa6184..9713f70dbb14c1641274760d490247d8c43b8007 100644 (file)
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404"
 
 SRC_URI = "git://github.com/flatpak/${BPN}.git;protocol=https;branch=main"
 SRCREV = "8f5dc8d192f6e31dafe69e35219e3b707bde71ce"
-S = "${WORKDIR}/git"
 
 inherit meson gi-docgen gobject-introspection vala features_check pkgconfig
 GIDOCGEN_MESON_OPTION = 'docs'
index 1d6ad58b6828c683b31cc890b3f6ba58dce6acc7..761426148a5470c77ab1b38eebeb3651d7cf746d 100644 (file)
@@ -9,7 +9,6 @@ SRC_URI = " \
        file://run-ptest \
 "
 SRCREV = "addcce32a3bd6a09303f052bd59fb758621d30fb"
-S = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0 xz zstd"
 
index 988b2ef2a31bc3664385cb2521d8a56a29ceb38f..cb754c6ac81c22aa8b50493496d71a1a851278d0 100644 (file)
@@ -19,7 +19,6 @@ PE = "1"
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
 
 inherit cmake python3native
 
index dad752cb19902ffc9f36e02f21954cb7d97c0252..397352b761539fe0a955372ffa19f96f7dcfb776 100644 (file)
@@ -15,7 +15,6 @@ SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;bra
            file://0001-lib-igt_aux.c-address-procps-4.0.5-compatibility.patch \
            "
 
-S = "${WORKDIR}/git"
 
 DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 procps libunwind kmod openssl elfutils alsa-lib json-c bison-native"
 RDEPENDS:${PN} += "bash perl"
index 7035dd446b913d8eb460a68232357919fd3bd790..3b976364296937fb6db7d875183234fd77daac1d 100644 (file)
@@ -16,7 +16,6 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=http
 
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 BASEPV = "0.0.1"
 PV = "${BASEPV}+git"
index 384afa690791c124617bc94de5f20ba7bd44a5ab..2427ce3f96fa468fe2e424adad1c95183649758f 100644 (file)
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b"
 
 SRC_URI = "git://github.com/anholt/libepoxy;branch=master;protocol=https"
 SRCREV = "c84bc9459357a40e46e2fec0408d04fbdde2c973"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check github-releases
 
index 5f902d3a67e80479d945b02b6287406b5ecdb24a..5ddbbb7eae0df5e120fb65ac21526a6af2310107 100644 (file)
@@ -15,7 +15,6 @@ PV = "0.3+git"
 
 SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig gettext features_check
 
index 87ec4c812fa44735e6939fa27b6f55fb3aab7586..c9dbc0202bf870922895be7c98cb4988ff6d4c1d 100644 (file)
@@ -16,7 +16,6 @@ DEPENDS = "virtual/libx11 libxext"
 SRCREV = "04b214a0d5cf8285e196d90bf2332626b12c74ef"
 SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https;tag=${PV}"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check
 # depends on virtual/libx11
index 078cd7ea0a73bb16592c070dc5c0b42978e6f7c8..de36f01afd5fd27f13fe42e95c67f327204fde63 100644 (file)
@@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e"
 
 SRC_URI = "git://github.com/intel/libva-utils.git;branch=v2.22-branch;protocol=https"
 SRCREV = "1a13ae13382b7b548f3a7e8035e1d7df66662c0a"
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))$"
 
index c8b6f07ed0d04f317e1abdc54b9ed86d4db979b0..29d6644f5103de28e67e48b291129746510749bd 100644 (file)
@@ -14,7 +14,6 @@ SRCREV = "ce8c1053270d960a7235ab5c3435f707541810a4"
 SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager;branch=master;protocol=https \
            file://kbdconfig"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check
 # depends on virtual/libx11
index b3469fabe1c1f71c068d5b8bfaed65f59ece0f0e..5637855fa03107654e4bbfaa1564c856f779bba2 100644 (file)
@@ -20,7 +20,6 @@ SRCREV = "a0a27e528f643dfeb785350a1213bfff09681950"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr"
 
-S = "${WORKDIR}/git"
 
 X11_DEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender libglu', '', d)}"
 X11_RDEPS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'mesa-demos', '', d)}"
index 8c451e6e4689cd9741909e9a5f7a69226804f46c..9e56b9783085d224f052d02bc99f0e68fb2e0924 100644 (file)
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main;tag=v$
            file://0002-libshaderc_util-fix-glslang-header-file-location.patch \
            "
 UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$"
-S = "${WORKDIR}/git"
 
 inherit cmake python3native pkgconfig
 
index 981c2599aec3a9a3cbb39d7131e428143b16bd70..a551814689ccfeb294fd2d9bcc35cb87621d663e 100644 (file)
@@ -13,7 +13,6 @@ PE = "1"
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
 
 inherit cmake
 
index bc2bebcda8825664a6e0effec78354b693320644..f5cd50ef93d3493ce3d5937fe968cf5401ce27ba 100644 (file)
@@ -14,7 +14,6 @@ SRCREV_spirv = "6dd8f2a1681a27f16c53d932d2765920f312aeb2"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 DEPENDS = "clang spirv-tools spirv-headers"
 
index 57dce4f3fd246e0fa79f46817da883bf9b483ecf..4594a1a942666b0760d21bb21c621a35e6454a3e 100644 (file)
@@ -17,7 +17,6 @@ PE = "1"
 # The tags versions should always be sdk-x.y.z, as this is what
 # upstream considers a release.
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
-S = "${WORKDIR}/git"
 
 inherit cmake
 
index 07abde1c4f79b443b1b88ec6f26982ff4cbd584e..89770f7d51379426739f5390aefc8d6f1fa716b2 100644 (file)
@@ -15,7 +15,6 @@ SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;prot
            file://0001-vrend-Fix-int-conversion-fatal-build-error-with-GCC-.patch \
            "
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig features_check
 
index 12a6923ac610ad9d29bf110e545f35268552039a..c83a7ae2e263cefd332ca44a9f3bce06d22c03f3 100644 (file)
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol
 
 SRCREV = "409c16be502e39fe70dd6fe2d9ad4842ef2c9a53"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
index 73f80d64ff0a0bb8285159283db4f798fbd8578a..565652be27b7fa19adcd3107a7fe83e1501c45c8 100644 (file)
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.4.313;protocol=https"
 SRCREV = "fb78607414e154c7a5c01b23177ba719c8a44909"
 
-S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = "vulkan"
 
index 844e0e6b688885ae5f89e8ec0673ccb63725c24f..b7c9ddd2febf292de0bda87539490d5e7cf20784 100644 (file)
@@ -13,7 +13,6 @@ UPSTREAM_CHECK_COMMITS = "1"
 SRCREV = "d27205d14d01ea7d33efc8ba2862478612370182"
 
 UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for"
-S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = 'vulkan'
 
index 85578df467eb48a0a272c466f3747c2c8f0176cd..39c6c710179bdbb4f89484ff585fbcafb2ca50d2 100644 (file)
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=vulkan-sdk-1.4.313;protocol=https"
 SRCREV = "ad2f0170f9466fadd96e3fdd65fad02cd3a3739b"
 
-S = "${WORKDIR}/git"
 
 inherit cmake features_check pkgconfig
 ANY_OF_DISTRO_FEATURES = "x11 wayland"
index 785c6f305b77386021349064aac94bacfa707486..38ae173969972ad2936a212cdf293f671d7ede24 100644 (file)
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=4ca2d6799091aaa98a8520f1b793939b"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Utility-Libraries.git;branch=vulkan-sdk-1.4.313;protocol=https"
 SRCREV = "4e246c56ec5afb5ad66b9b04374d39ac04675c8e"
 
-S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = "vulkan"
 
index 65cafa359e285b0ff4a48502ee1b21697cf4ebfd..1572b4ce9bea26ca81d2036be72eb390115b6234 100644 (file)
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b1a17d548e004bfbbfaa0c40988b6b31"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.4.313;protocol=https"
 SRCREV = "50b87dd4be883b63c10e3c4f7b9c5aac0c82efd3"
 
-S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = "vulkan"
 
index 5e661080a07dee5ccdb839d763a4ccb30dd24af8..ec6683dbb608ce732c35e568d918efbbadf1a879 100644 (file)
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb3d6e8051a71edca1e54bc38d35e5af"
 SRC_URI = "git://github.com/zeux/volk.git;branch=master;protocol=https"
 SRCREV = "43c29e655cb8117fd9cfb65ad9cefe2d40965102"
 
-S = "${WORKDIR}/git"
 
 REQUIRED_DISTRO_FEATURES = "vulkan"
 
index 684124bc4d2ae89309e6b4f53d37438af3a8072a..606881e0c91d16ff2b09e1689f9d2500c53c5fdd 100644 (file)
@@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
 SRC_URI = "git://gitlab.freedesktop.org/mesa/waffle.git;protocol=https;branch=maint-1.8 \
            "
 SRCREV = "49abc7cb5f73cc6852136c91da49ea3a338960e4"
-S = "${WORKDIR}/git"
 
 inherit meson features_check lib_package bash-completion pkgconfig
 
index c10422bf9bee558265485cf623d12ef855e38c4c..521a7f9a099478bc0e49cf41fe39ec339dcd3816 100644 (file)
@@ -16,7 +16,6 @@ SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;bra
            file://run-ptest \
            "
 SRCREV = "4f7b4ef0e4eb5d569df36be387579858eba349bb"
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
 
index 40b77422bf6993be1fb6389ebe64026b51eb2a8e..744899952a7b353a5e7732b4d636daad38ccc020 100644 (file)
@@ -13,7 +13,6 @@ PV = "0.1.1+git"
 SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https"
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit autotools allarch
 
index c37b36897b67fcfc075943410dd7f24e65e8e1d9..337777648ac819eaf03127a32543df80703238ef 100644 (file)
@@ -14,7 +14,6 @@ SRC_URI = "git://gitlab.freedesktop.org/xorg/app/xinput-calibrator;protocol=http
            file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch \
            "
 
-S = "${WORKDIR}/git"
 
 EXTRA_OECONF += "--with-gui=x11"
 
index 0a42bd9975540e70fad2034e08ed81f4d8c466ca..fd8324409eacef3e6314e788ac6d62b84dd0e022 100644 (file)
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
 
 SRCREV = "31486f40f8e8f8923ca0799aea84b58799754564"
 PV = "2.99.917+git"
-S = "${WORKDIR}/git"
 
 SRC_URI = "git://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git;protocol=https;branch=master"
 
index 08194e4815925d41ed4b4e1133c40e4a7331e868..2431fae6ce56eef837bd8971ff7f64eff82c6abe 100644 (file)
@@ -9,7 +9,6 @@ SECTION = "x11/libs"
 SRC_URI = "git://gitlab.freedesktop.org/xorg/lib/libxcvt.git;protocol=https;branch=master"
 SRCREV = "dd8631c61465cc0de5e476c7a98e56528d62b163"
 
-S = "${WORKDIR}/git"
 
 inherit meson
 
index e10bbf7af03979608cfe3f5f72cb8beee84c59fb..79c95cb8eda95f6fdb6b514ffac15f920e80cf42 100644 (file)
@@ -10,7 +10,6 @@ DEPENDS = "flex-native bison-native"
 SRC_URI = "git://github.com/xkbcommon/libxkbcommon;protocol=https;branch=master;tag=xkbcommon-${PV}"
 
 SRCREV = "7888474d0296dcad50c9ba4adfdfdf2be02d35e1"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig bash-completion
 
index 061a7b978463ec9e46046e402b6c959e8569fd0e..e678927d2243d55858f41992bb713e69a2d0199d 100644 (file)
@@ -17,8 +17,6 @@ SRC_URI = "git://git.kernel.dk/blktrace.git;protocol=https;branch=master \
 
 SRCREV = "366d30b9cdb20345c5d064af850d686da79b89eb"
 
-S = "${WORKDIR}/git"
-
 EXTRA_OEMAKE = "\
     'CC=${CC}' \
     'CFLAGS=${CFLAGS}' \
index 8d0aad4a01cb959812faed2db26ca884436c2903..7611335c5d1fcba2d42e45cb9a99e5b29c2cc238 100644 (file)
@@ -13,6 +13,5 @@ SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux;branch=master;protoc
 SRCREV = "135cbff90af2ba97d88f1472be595ce78721972c"
 PV = "1.14"
 
-S = "${WORKDIR}/git"
 
 CLEANBROKEN = "1"
index 3df95ec1ee3cab749cecf78594afe969b83cda40..7884c87086053337d2d32137537b228a5c39bae0 100644 (file)
@@ -15,7 +15,6 @@ SRCREV = "2d10aa2afe35527728db30b35ec491ecb6959e5c"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
index 20b1bcaf37bba234d9618a8e8a3dcb937cc863c1..84b8b10a266110b17493d0fa1ae2104f297f93aa 100644 (file)
@@ -17,7 +17,6 @@ PV = "0.3+git"
 inherit native
 
 SRC_URI = "git://git.yoctoproject.org/yocto-kernel-tools.git;branch=master;protocol=https"
-S = "${WORKDIR}/git"
 
 do_configure() {
        :
index 7a33da37c2afa43176dab93f4b3a95dcf9bb4c73..b7a781e2e964f230deb5bc53c865c7bc3f00fef2 100644 (file)
@@ -12,7 +12,6 @@ SRCREV = "bd47bd544c9ebc9f44bd88c2b2f2049230741058"
 SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \
           "
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig
 
index fdcb637761548f3ceb46a4b8526650e10f163c85..b227fe488a7e0b247760a65e1f33d3d10c11b84d 100644 (file)
@@ -17,7 +17,6 @@ SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-2.1;protocol=http
 SRCREV = "7f2f8cd6dac497cbb466efb31219b531c62013f5"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig ptest python3targetconfig
 
index 2585747fb6bd5519882f2984b3c37e07d1a2ee38..6e1c2406481a30165846a23bae1351ab0d16bb96 100644 (file)
@@ -13,7 +13,6 @@ SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.5;protocol=http
 SRCREV = "91c00f70884887ff5c4849a8e3d47e311a22ba9d"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>1(\.\d+)+)$"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig ptest
 
index 23fcef9569bb0379595f3d6064474264f837634e..4076e97163242ca64903b795ce13eb0ab202f388 100644 (file)
@@ -28,7 +28,6 @@ SRC_URI = "\
     file://0001-makedumpfile-replace-hardcode-CFLAGS.patch \
 "
 
-S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
 
index ec81d546a86a00150f47a18e95e544389e599bb2..3f9be0993a27a22a2fa49c1354f35876b5b6940f 100644 (file)
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/fenrus75/powertop;protocol=https;branch=master \
            "
 SRCREV = "d51ad395436d4d1dcc3ca46e1519ffeb475bf651"
 
-S = "${WORKDIR}/git"
 
 LDFLAGS += "-pthread"
 
index a6688f26042a008086acea689a85938dd22d69b0..211cbde8831cc4bfa2e920f51e81b8ef394b5301 100644 (file)
@@ -12,7 +12,6 @@ SRCREV = "3a92ffe673c1621309a0b60892114495b651c9de"
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips|riscv64).*-linux'
 COMPATIBLE_HOST:libc-musl = 'null'
 
-S = "${WORKDIR}/git"
 
 # systemtap can't be built without optimization, if someone tries to compile an
 # entire image as -O0, break with fatal.
index 8974b9ac0ba9d0451d2846a08e47da5332536197..33c4119d1a6ab6ce11c30d613ba67b27d647a524 100644 (file)
@@ -14,7 +14,7 @@ SRC_URI = "git://gitlab.freedesktop.org/gstreamer/gstreamer.git;protocol=https;b
 
 SRCREV = "100c21e1faf68efe7f3830b6e9f856760697ab48"
 
-S = "${WORKDIR}/git/subprojects/gst-examples"
+S = "${UNPACKDIR}/${BP}/subprojects/gst-examples"
 
 inherit meson pkgconfig features_check
 
index fae88d24d136f1dcbbd4baaf5a431c987fd56987..4f4ff173042a3c0006b1d8420a015face5f36947 100644 (file)
@@ -16,7 +16,6 @@ SRCREV = "31e19f92f00c7003fa115047ce50978bc98c3a0d"
 
 PV = "r3039+git"
 
-S = "${WORKDIR}/git"
 
 inherit lib_package pkgconfig
 
index f28258ef58e71954f02a0ce856f494340c8162a2..a2e8558c4c6ffaf3b4b0c5d1f31aeae43a5a05c5 100644 (file)
@@ -4,4 +4,3 @@ PE = "1"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main;protocol=https"
 
-S = "${WORKDIR}/git"
index 3d8c427b69d36d67ea002ef62f82eede1df902ae..07a4f7a6763759ec68799851457ed8ef518d9592 100644 (file)
@@ -19,7 +19,6 @@ PV = "0.8.18.1.11+git"
 SRC_URI = "git://github.com/stevenhoneyman/l3afpad.git;branch=master;protocol=https"
 SRCREV = "3cdccdc9505643e50f8208171d9eee5de11a42ff"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check mime-xdg
 
index caa34966ccc1d6ef1d29686aecc3d925f486f88c..8d5913f16bee9497ec534331a8b09d09fa4dedd2 100644 (file)
@@ -15,7 +15,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https \
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 PV = "0.2+git"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check
 
index ab178f97e6fd7b3c4b66f8beca159457c85ec0d8..c6354f05e31825f97fb4fc0e7cef2d3b8620c0ec 100644 (file)
@@ -18,7 +18,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN}-2;branch=master;protocol=https \
 
 EXTRA_OECONF = "--enable-startup-notification --with-dbus"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check
 
index a1f7862efa424eca79b4b28131906c51da828add..a941cd36929ca1698063af1b2cf76498f1881930 100644 (file)
@@ -17,7 +17,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1;protoc
            file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \
            file://80matchboxkeyboard.sh"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig gettext gtk-immodules-cache features_check
 
index 83425f60fe1e35781172fea2871100041cbaa2e5..0946c42a09de2e0a513d4d511e5f6c60e4e2a61d 100644 (file)
@@ -28,7 +28,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master \
 EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
 EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} += "${libdir}/matchbox-panel/*.so \
                 ${datadir}/matchbox-panel/brightness/*.png \
index c9b01b3cfd90f3d66b11b7aa13410f2e92d972a5..27bc596dfb0ed823e1a97962644133389b7a358d 100644 (file)
@@ -14,7 +14,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master;protocol=https"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 PV = "0.2+git"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check update-alternatives
 
index c60a11c3c0fadc3b274cd059a80b90fa29ed4795..ece4f25ecaf25f9a6c8ce79b5da3d1a8101f6b40 100644 (file)
@@ -5,4 +5,3 @@ SRCREV = "df085ba9cdaeaf2956890b0e29d7ea1779bf6c78"
 SRC_URI = "git://git.yoctoproject.org/matchbox-sato;branch=master;protocol=https"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-S = "${WORKDIR}/git"
index 23eb20d350c565a1fa99f2f3c8e02ae2516ef46c..d1cb6ac7348b4f859ea3e0dd79c7523420086d11 100644 (file)
@@ -14,7 +14,6 @@ SRCREV = "7fa03051562ee81e2a5371f8b3a6d0bb6e646aa0"
 PE = "2"
 PV = "0.0+git"
 
-S = "${WORKDIR}/git"
 
 inherit cmake features_check pkgconfig
 
index 1ebbf010f37e8b27affccb57c37b373bb9efd2da..ec74e33fcdf99c12a19bc4c7044c904b513e1f6b 100644 (file)
@@ -12,7 +12,6 @@ SRC_URI = "git://git.yoctoproject.org/sato-icon-theme.git;protocol=https;branch=
 SRCREV = "d23f04ecb0328f655bf195df8eb04c1b734d53a9"
 UPSTREAM_CHECK_COMMITS = "1"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig allarch gtk-icon-cache perlnative
 
index de4ab8248481ee1188b93bf659951dd5f6733baf..e58bb98458abb0d83abc0ad3ad8b74792e5e1d85 100644 (file)
@@ -14,7 +14,6 @@ SRCREV = "9250fa5a012d84ff45984e8c4345ee7635227756"
 SRC_URI = "git://git.yoctoproject.org/screenshot;branch=master;protocol=https"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig features_check
 
index aee89b2f57ca89a7f8a4840ad81a94ea64209d24..b9dd0a1aa15f184bfd73588f50cc8a878777985b 100644 (file)
@@ -15,7 +15,6 @@ SRC_URI = "git://git.yoctoproject.org/xsettings-daemon;branch=master;protocol=ht
            "
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig gconf features_check
 
index 00b603650270f03e439ccae45e608f1ccf1de53c..74f53de6d7950bddc1b3b250194a4296103450b2 100644 (file)
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/ericonr/argp-standalone;branch=master;protocol=https
            file://out_of_tree_build.patch \
           "
 SRCREV = "e5fe9ad9e83e6765cf8fa787f903d4c6792338b5"
-S = "${WORKDIR}/git"
 
 inherit autotools
 
index 28750786afb182e3becf543b54fdbf0db4e8a1dc..d82ce5ded45b4fad2e7ed92e9738497819ced90c 100644 (file)
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/yoctoproject/${BPN};branch=main;protocol=https"
 SRCREV = "618a7316102f6f81faa60537503012a419eafa06"
-S = "${WORKDIR}/git"
 
 # TODO: remove when we upgrade to a release past 3.9.0
 PV .= "+git"
index 764f4107805e4a296490511dd746d7982d740942..e4ef9fe9dfa8e5b40ee5b02fb0cb9e4f6330acc0 100644 (file)
@@ -14,7 +14,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "boost-(?P<pver>(\d+(\.\d+)+))"
 
 inherit native
 
-S = "${WORKDIR}/git"
 
 do_compile() {
     ./bootstrap.sh
index 85955883a4d10ff5de586e2e31ec73d79a7bba98..dcbe66c7d04b3cf8ef875b31040c1adc48f25e12 100644 (file)
@@ -15,7 +15,6 @@ SRCREV = "ab0eaf33b783ba578773af2557753d2b973ba5bb"
 
 inherit autotools update-alternatives
 
-S = "${WORKDIR}/git"
 
 # Disable po4a (translated manpages) sub-directory, as that requires po4a to build
 do_configure:prepend() {
index 06338dd62f98a301c95f093e17361dd9b9411966..c3803f457bea65a11949af11d173683d1e5bb3e5 100644 (file)
@@ -13,7 +13,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "dos2unix-(?P<pver>(\d+(\.\d+)+))"
 
 SRCREV = "c16a0b31a64c7eb6b2d76960e5144732b57f2993"
 
-S = "${WORKDIR}/git/dos2unix"
+S = "${UNPACKDIR}/${BP}/dos2unix"
 
 inherit gettext perlnative
 
index 1173dd4af35e3d7cf02f88404e8b2dcffa25db01..9a605481804baa98ce272e993bfb4e8c15577b7d 100644 (file)
@@ -16,7 +16,6 @@ SRCREV = "e346cd4ed2e2102c9b195b614f3c642d23f5f6e7"
 
 DEPENDS = "glib-2.0"
 
-S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
index 291a4ef85d5d9497e25d6e5fcfdd10c33bc96576..de9c454089fdc8f36f25261634b31ccb692c27d4 100644 (file)
@@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
 SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https;tag=v${PV}"
 SRCREV = "736513dfc1d44c5fb48bead62af7e91c4e1d1dd2"
 
-S = "${WORKDIR}/git"
 
 inherit allarch
 
index c737cfd59f3d6b9e77a8189277327a0b1828b988..ccf9cd55323a3174ed17ed369ab0efad8c7e137c 100644 (file)
@@ -15,7 +15,6 @@ SRCREV = "5be4d112d420706eacd913a3ebd85549fe9eeae4"
 # are inhibited by allarch
 DEPENDS = "gettext-native"
 
-S = "${WORKDIR}/git"
 
 inherit allarch autotools
 
index 4c8ffd41c2c9996055b53dee9d071c1d77866143..ed8712bf2b160891569f3f4b55c423d8c0217b1d 100644 (file)
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/stevegrubb/libcap-ng.git;protocol=https;branch=maste
            file://0001-Fix-python-path-when-invoking-py-compile-54.patch \
            "
 SRCREV = "f5d39702622208b3ada064d7b2eaeaf1454c9bd3"
-S = "${WORKDIR}/git"
 
 inherit lib_package autotools
 
index f5156cc9f736100e2895e813685a4dfdd31e407a..66b30cd6dde5ed87661e87db7e25151ca94faaf0 100644 (file)
@@ -11,6 +11,5 @@ DEPENDS = "hwdata-native"
 SRC_URI = "git://gitlab.freedesktop.org/emersion/libdisplay-info.git;branch=main;protocol=https"
 SRCREV = "66b802d05b374cd8f388dc6ad1e7ae4f08cb3300"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig lib_package
index 47a63ca2862a573a2795d33a4c2987a6fbbe3042..0a5f6427ba3f4d575a872f03af6466e9d6fe8342 100644 (file)
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https \
            "
 SRCREV = "338e6fb681369ff0537719095e22ce9dc602dbf0"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
index e2df84420226a15e33e395e773153f75a8f69203..7890dfa5c70cc3abed0fa911a92b1709e3b4b0b7 100644 (file)
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e01027c4ad1fe5a4768f8488c945d491 \
                     "
 SRC_URI = "git://github.com/smuellerDD/jitterentropy-library.git;branch=master;protocol=https;tag=v${PV}"
 SRCREV = "c90ff465dcdb6a6949542c72a26a8ab496daa8cb"
-S = "${WORKDIR}/git"
 
 do_configure[noexec] = "1"
 
index e6192a6960ef761b1995c151e37de016c2183e9a..ed8a4df2a8da3af96645d34b03da8e9a0bc4d445 100644 (file)
@@ -15,7 +15,6 @@ DEPENDS = "glib-2.0"
 
 SRC_URI = "git://github.com/libproxy/libproxy;protocol=https;branch=main"
 SRCREV = "77e2a2b88a319974cf099c8eaaaa03030bc4c0d4"
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig gobject-introspection vala gi-docgen
 GIDOCGEN_MESON_OPTION = 'docs'
index 949799fc82a7490f3ba34080c58e977843b22fc1..2f05893f08f44d80e6608ba6fb40b8b997205b83 100644 (file)
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/seccomp/libseccomp.git;branch=release-2.6;protocol=h
            file://run-ptest \
            "
 
-S = "${WORKDIR}/git"
 
 inherit autotools-brokensep pkgconfig ptest features_check
 
index f77a2e7bb95641ae65ebc29ebe3b845dd8915a52..5dbefe7c084f2b27df1c8522303da03cf61addfe 100644 (file)
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/lz4/lz4.git;branch=release;protocol=https \
            file://run-ptest"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.*)"
 
-S = "${WORKDIR}/git"
 
 inherit ptest
 
index 62f3020fef8eb5e00d3d98b821b86b66070043ca..e674460dc481a04947fd3bfd770df0ad6aa49c9c 100644 (file)
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/numactl/numactl;branch=master;protocol=https \
            file://0001-define-run-test-target.patch \
            "
 
-S = "${WORKDIR}/git"
 
 LDFLAGS:append:riscv64 = " -latomic"
 LDFLAGS:append:riscv32 = " -latomic"
index 8c2f56be44d960011329aa7b9020e4afe27891d9..d60e4abdaf1f8ac4ae535e73a8bed1cd4b6677f3 100644 (file)
@@ -13,7 +13,6 @@ DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''
 SRC_URI = "gitsm://github.com/p11-glue/p11-kit;branch=master;protocol=https \
            "
 SRCREV = "0dd113361057e477f40ff4d8788f3e7e400af5f9"
-S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native"
index 9f6bb399b4005c39a4179e08f38ef9ec480346a7..adf9f6eff66bacadf6ec7b33e47775c844c4b562 100644 (file)
@@ -12,7 +12,6 @@ SRCREV = "c99e8c2737ff802f110612cc2d90c60233c33255"
 SRC_URI = "git://git.yoctoproject.org/ptest-runner2;branch=master;protocol=https \
 "
 
-S = "${WORKDIR}/git"
 
 FILES:${PN} = "${bindir}/ptest-runner ${bindir}/ptest-runner-collect-system-data"
 
index fc141a984ce4348e0d54acba6ee7decca3756ce4..019f7d3f7171fbffdec14d720ffcf761736cb905 100644 (file)
@@ -13,7 +13,6 @@ SRC_URI = "git://github.com/nhorman/rng-tools.git;branch=master;protocol=https \
            "
 SRCREV = "bd00c08b0c3c6a880b0988befe97fd35b315468c"
 
-S = "${WORKDIR}/git"
 
 inherit autotools update-rc.d systemd pkgconfig
 
index 3878072cf197b25bc53a8f00ab3e442338899c2d..6a2e30e86777b16dc69f68af7153df37644a0dd5 100644 (file)
@@ -10,6 +10,5 @@ SRC_URI = "git://github.com/sass/libsass.git;protocol=https;branch=master \
 
 SRCREV = "7037f03fabeb2b18b5efa84403f5a6d7a990f460"
 
-S = "${WORKDIR}/git"
 
 BBCLASSEXTEND = "native"
index 4d4dbc03fe2648e87b52da82992abfa0339de1db..1de02f44b61ae8f38f34d9d8403bc2b5dce61fee 100644 (file)
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/sass/sassc.git;protocol=https;branch=master \
            file://0001-Remove-sassc_version.h-from-source-directory.patch"
 
 SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0"
-S = "${WORKDIR}/git"
 
 CVE_STATUS[CVE-2022-43357] = "cpe-incorrect: this is CVE for libsass, not sassc wrapper"
 
index b8a377e2b23d162d10bfd9d5c4f0584c0e7b5bbb..64d83085f41e331b826649d1b01121467cf84c8e 100644 (file)
@@ -13,7 +13,6 @@ SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https;
            file://0002-Handle-build-with-older-versions-of-GCC.patch"
 SRCREV = "9a6d6b8e963935f145f3a1ef446552de6996dada"
 
-S = "${WORKDIR}/git"
 
 inherit meson pkgconfig gettext python3native mime
 
index 21f1879c4fb2781c9a07d7c4d55cdaf8a73392a3..8eb4ed89245d9f21e507f96fd1fc4cadfdfe4b5f 100644 (file)
@@ -9,7 +9,6 @@ SRC_URI = "gitsm://github.com/nemtrif/utfcpp;protocol=https;branch=master"
 
 SRCREV = "b26a5f718f4f370af1852a0d5c6ae8fa031ba7d0"
 
-S = "${WORKDIR}/git"
 
 inherit cmake
 
index b39cfadaad1c7822a0cf83b0318882345daf23a7..b0cd0a3094c0510771e53fba6c78fd13c0522d7e 100644 (file)
@@ -26,7 +26,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0"
 # Ignore that the upstream version .z in x.y.z is always newer
 UPSTREAM_VERSION_UNKNOWN = "1"
 
-S = "${WORKDIR}/git"
 
 VIMDIR = "vim${@d.getVar('PV').split('.')[0]}${@d.getVar('PV').split('.')[1]}"
 
index 227649854e30b9528c534576bb989a731f46bb1b..0ac2b4490486bc8c7cb0c26d801ea0b8bf1c8ea1 100644 (file)
@@ -12,7 +12,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
 SRCREV = "e626a72bc2321cd320e953a0ccf1584cad60f363"
 
-S = "${WORKDIR}/git"
 
 CFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}"
 
index 10945d60084537320cef785309e8d7a889b7f99a..c18926e56c69a3f80ef95dffbbbcb0d14af154d9 100644 (file)
@@ -336,9 +336,9 @@ def appendsrc(args, files, rd, extralines=None):
         src_destdir = os.path.dirname(srcfile)
         if not args.use_workdir:
             if rd.getVar('S') == rd.getVar('STAGING_KERNEL_DIR'):
-                srcdir = os.path.join(workdir, 'git')
+                srcdir = os.path.join(workdir, rd.getVar('BB_GIT_DEFAULT_DESTSUFFIX'))
                 if not bb.data.inherits_class('kernel-yocto', rd):
-                    logger.warning('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/git')
+                    logger.warning('S == STAGING_KERNEL_DIR and non-kernel-yocto, unable to determine path to srcdir, defaulting to ${WORKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}')
             src_destdir = os.path.join(os.path.relpath(srcdir, workdir), src_destdir)
         src_destdir = os.path.normpath(src_destdir)
 
index 3c6ef6719faaee12d6512b301081be302904fac1..7080558bebce99bdae807da5b37af5f04b813538 100644 (file)
@@ -638,7 +638,6 @@ def create_recipe(args):
                     if len(splitline) > 1:
                         if splitline[0] == 'origin' and scriptutils.is_src_url(splitline[1]):
                             srcuri = reformat_git_uri(splitline[1]) + ';branch=master'
-                            srcsubdir = 'git'
                             break
 
     if args.src_subdir:
@@ -840,7 +839,7 @@ def create_recipe(args):
                 line = line.replace(realpv, '${PV}')
             if pn:
                 line = line.replace(pn, '${BPN}')
-            if line == 'S = "${WORKDIR}/${BPN}-${PV}"':
+            if line == 'S = "${WORKDIR}/${BPN}-${PV}"' or 'tmp-recipetool-' in line:
                 skipblank = True
                 continue
         elif line.startswith('SRC_URI = '):