meta-openembedded/all: adapt to UNPACKDIR changes

Please see https://git.yoctoproject.org/poky/commit/?id=4dd321f8b83afecd962393101b2a6861275b5265 for what changes are needed, and sed commands that can be used to make them en masse. I've verified that bitbake -c patch world works with these, but did not run a world build; the majority of recipes shouldn't need further fixups, but if there are some that still fall out, they can be fixed in followups. Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Khem Raj <raj.khem@gmail.com>
2026-07-15 16:07:26 +00:00 · 2025-06-20 16:06:53 +02:00
parent 188491dd2b
commit fc78d37ff0
1054 changed files with 385 additions and 1160 deletions
@@ -12,7 +12,7 @@ VERMINOR = "${@get_minor_dir("${PV}")}"
 REALNAME = "${@get_real_name("${BPN}")}"

 SRC_URI = "${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive"
-S = "${WORKDIR}/${REALNAME}-${PV}"
+S = "${UNPACKDIR}/${REALNAME}-${PV}"

 CLUTTERBASEBUILDCLASS ??= "autotools"
 inherit ${CLUTTERBASEBUILDCLASS} pkgconfig gtk-doc gettext
@@ -41,7 +41,6 @@ SRC_URI = " \
 	file://0001-meson-Do-not-check-for-iso-xml-files-during-build.patch \
 "

-S = "${WORKDIR}/git"
 SRCREV = "46e93c0c0dafc381e8a308b1befb07e908121722"

 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
@@ -19,7 +19,6 @@ SRC_URI = " \
    file://polkit-gnome-authentication-agent-1.desktop \
 "
 SRCREV = "a0763a246a81188f60b0f9810143e49224dc752f"
-S = "${WORKDIR}/git"


 do_install:append() {
@@ -63,7 +63,6 @@ SRC_URI += "file://0001-meson.build-dont-check-for-lgi.patch"
 SRC_URI += "file://0001-meson.build-require-iso-codes-native.patch"
 SRCREV = "c1901c5be644ab8dcaf779b1f383bf5370bc90c6"

-S = "${WORKDIR}/git"

 PACKAGECONFIG[aa] = "-Daa=enabled,-Daa=disabled,aalib"
 PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib"
@@ -19,7 +19,6 @@ SRCREV = "2768251dacce3939136c839aeca413f4aa4241d0"

 PV = "1.6.1"

-S = "${WORKDIR}/git"

 EXTRA_AUTORECONF += "-I m4"

@@ -7,6 +7,5 @@ inherit autotools allarch
 SRC_URI = "git://github.com/mypaint/mypaint-brushes.git;protocol=https;branch=v1.3.x"
 SRCREV = "8a0124ac0675103eae8fa41fad533851768ae1ce"
 PV = "1.3.1"
-S = "${WORKDIR}/git"

 FILES:${PN} += "${datadir}/mypaint-data"
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/dsalt/devilspie2;branch=master;protocol=https \
    file://devilspie2.desktop \
 "

-S = "${WORKDIR}/git"

 inherit features_check pkgconfig gettext

@@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

 inherit allarch gtk-icon-cache

-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"

 SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${BPN}/${BPN}_${PV}.zip"
 SRC_URI[sha256sum] = "d4486fda0413f8a81a87e0dd2329f50f2a8a7cb4147b48cf147f0160add8174a"
@@ -8,7 +8,6 @@ DEPENDS = "glib-2.0 gtk+3"
 inherit meson pkgconfig gobject-introspection features_check gtk-doc

 SRC_URI = "git://github.com/gedit-technology/libgedit-amtk.git;protocol=https;branch=main"
-S = "${WORKDIR}/git"
 SRCREV = "f6fbfd1c57de3d97cab2056a5c3088b0da49e8a4"

 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
@@ -8,7 +8,6 @@ DEPENDS = "glib-2.0 gtk+3 libxml2"
 inherit meson pkgconfig gobject-introspection features_check gtk-doc

 SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=main"
-S = "${WORKDIR}/git"
 SRCREV = "eaafc892d033713c7c823d8ad602061e456b3c88"

 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
@@ -9,7 +9,7 @@ SECTION = "x11/gnome"
 DEPENDS = "udev gtk+3 libnotify libcanberra bluez5"

 GNOMEBN = "gnome-bluetooth"
-S = "${WORKDIR}/${GNOMEBN}-${PV}"
+S = "${UNPACKDIR}/${GNOMEBN}-${PV}"

 GTKDOC_MESON_OPTION = "gtk_doc"

@@ -28,7 +28,6 @@ inherit meson pkgconfig gobject-introspection gtk-icon-cache vala features_check

 GIR_MESON_OPTION = ""

-S = "${WORKDIR}/git"
 SRCREV = "b0bf5288438f74fcb455e1e49f855b4964a2c7cb"

 FILES:${PN} += "${datadir}"
@@ -8,7 +8,7 @@ SRC_URI = "https://git.savannah.gnu.org/cgit/chess.git/snapshot/chess-${PV}.tar.
           file://0001-Remove-register-storage-class-classifier.patch"
 SRC_URI[sha256sum] = "03f9e844ccdd48d20ee49314174404f8b643d83bb8ce9ec9d2e6a21f1b6fb9f5"

-S = "${WORKDIR}/chess-${PV}"
+S = "${UNPACKDIR}/chess-${PV}"

 inherit autotools gettext

@@ -24,7 +24,6 @@ SRC_URI = " \
 	file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \
 "
 SRCREV = "965cb9307713c618253918633416fcad86bcc5d2"
-S = "${WORKDIR}/git"

 PACKAGECONFIG ?= ""
 PACKAGECONFIG[nautilus] = "-Dnautilus_extension=true,-Dnautilus_extension=false,nautilus,nautilus"
@@ -16,7 +16,6 @@ REQUIRED_DISTRO_FEATURES = "systemd"
 SRC_URI = "git://gitlab.gnome.org/GNOME/gnome-user-share.git;protocol=https;branch=master"
 SRC_URI += "file://0001-build-Define-list-of-libc-feature-test-macros.patch"
 SRCREV = "77ecbaddab0ed2121859926acbfccc9cecdee0db"
-S = "${WORKDIR}/git"

 PACKAGECONFIG ??= "modules"
 PACKAGECONFIG[httpd] = "-Dhttpd=${sbindir}/httpd,,,apache2 mod-dnssd"
@@ -6,8 +6,7 @@ inherit allarch

 SRC_URI = "file://classic-light.xml"

-S = "${WORKDIR}/sources"
-UNPACKDIR = "${S}"
+S = "${UNPACKDIR}"

 do_install() {
    install -d ${D}${datadir}/gtksourceview-3.0/styles
@@ -8,7 +8,7 @@ DEPENDS = "gtk+3 libxml2 glib-2.0-native"

 PNAME = "gtksourceview"

-S = "${WORKDIR}/${PNAME}-${PV}"
+S = "${UNPACKDIR}/${PNAME}-${PV}"

 GNOMEBASEBUILDCLASS = "autotools"
 inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection upstream-version-is-even
@@ -8,7 +8,7 @@ DEPENDS = "gtk+3 libxml2 glib-2.0-native"

 PNAME = "gtksourceview"

-S = "${WORKDIR}/${PNAME}-${PV}"
+S = "${UNPACKDIR}/${PNAME}-${PV}"

 inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspection vala

@@ -16,7 +16,7 @@ DEPENDS = " \

 PNAME = "gtksourceview"

-S = "${WORKDIR}/${PNAME}-${PV}"
+S = "${UNPACKDIR}/${PNAME}-${PV}"


 inherit gnomebase lib_package gettext features_check gi-docgen gtk-icon-cache gobject-introspection vala
@@ -10,5 +10,4 @@ REQUIRED_DISTRO_FEATURES = "opengl"
 SRCREV = "941560af497148588783db991e8135f52a82574d"
 SRC_URI = "git://github.com/gnome/libchamplain.git;branch=master;protocol=https"

-S = "${WORKDIR}/git"

@@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"

 GNOMEBN = "libgweather"
-S = "${WORKDIR}/${GNOMEBN}-${PV}"
+S = "${UNPACKDIR}/${GNOMEBN}-${PV}"

 inherit gnomebase gsettings gobject-introspection gettext gi-docgen vala features_check

@@ -22,7 +22,6 @@ inherit meson gobject-introspection gettext features_check pkgconfig
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 SRC_URI = "git://gitlab.gnome.org/swilmet/tepl;protocol=https;branch=main"
 SRCREV = "16ab2567257a053bd957699f89080fafd0999035"
-S = "${WORKDIR}/git"

 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
@@ -17,7 +17,6 @@ SRC_URI = " \
    file://0001-src-Fix-declaration-errors-with-GCC-15.patch \
 "
 SRCREV = "6a70ab0338206bd1c7d01a4e1874ea0ee5b3a9d3"
-S = "${WORKDIR}/git"

 PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase"
 PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf"
@@ -8,7 +8,6 @@ DEPENDS = "gtk+3 gobject-introspection-native \

 LIC_FILES_CHKSUM = "file://COPYING;md5=1f18f9c6d8b4cfcc7d7804a243a4c0b4"

-S = "${WORKDIR}/git"

 SRCREV = "736ccef40d39603b8111c8a3a0bca0319bbafdc0"
 PV = "3.0+git"
@@ -15,7 +15,6 @@ DEPENDS = " \
    libgudev \
 "

-S = "${WORKDIR}/git"

 inherit meson pkgconfig

@@ -14,7 +14,6 @@ EXTRA_OEMESON = "-Dupdate_cache=true"

 SRC_URI = "git://github.com/aruiz/webp-pixbuf-loader.git;protocol=https;branch=mainline"

-S = "${WORKDIR}/git"
 SRCREV = "52232e4ba282b2fed68e8fcb4b5d45ed0eaa4ed3"

 FILES:${PN} = " \
@@ -17,7 +17,6 @@ REQUIRED_DISTRO_FEATURES = "polkit"

 SRC_URI = "git://github.com/flatpak/xdg-desktop-portal-gtk.git;protocol=https;branch=main"

-S = "${WORKDIR}/git"
 SRCREV = "337202d4e7179857bc37b03c1a6d8c9d92e47c44"

 PACKAGECONFIG ?= "wallpaper appchooser lockdown settings"