From fc78d37ff0ce9e0d60455465851dbe4e86d7a8b3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 20 Jun 2025 16:06:53 +0200 Subject: 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 Signed-off-by: Khem Raj --- meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.4.21.bb | 1 - meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb | 1 - .../recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb | 1 - meta-xfce/recipes-art/cursor-themes/openzone_1.2.4.bb | 2 +- meta-xfce/recipes-extended/imsettings/imsettings_1.8.10.bb | 1 - .../recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) (limited to 'meta-xfce') diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.4.21.bb b/meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.4.21.bb index 4822f0cada..61a94f7bf4 100644 --- a/meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.4.21.bb +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_0.5.4.21.bb @@ -10,7 +10,6 @@ DEPENDS = "gtk+3 glib-2.0 xfce4-dev-tools-native intltool-native" SRC_URI = "git://github.com/ib/xarchiver.git;branch=master;protocol=https" SRCREV = "55f923ebc623bcc8f53368543847350a23688189" -S = "${WORKDIR}/git" inherit gettext pkgconfig autotools gtk-icon-cache features_check mime-xdg diff --git a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb index 3e3301f748..880e73849c 100644 --- a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb +++ b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb @@ -11,4 +11,3 @@ SRC_URI = " \ git://github.com/ncopa/${BPN}.git;branch=master;protocol=https \ " SRCREV = "6d3282cc1734c305850d48f5bf4b4d94e88885e9" -S = "${WORKDIR}/git" diff --git a/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb index 6bcfc4ba43..308da40c34 100644 --- a/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb @@ -12,7 +12,6 @@ SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=htt " SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f" -S = "${WORKDIR}/git" inherit gettext meson features_check pkgconfig diff --git a/meta-xfce/recipes-art/cursor-themes/openzone_1.2.4.bb b/meta-xfce/recipes-art/cursor-themes/openzone_1.2.4.bb index 4b2071eb3f..8ba962fbd4 100644 --- a/meta-xfce/recipes-art/cursor-themes/openzone_1.2.4.bb +++ b/meta-xfce/recipes-art/cursor-themes/openzone_1.2.4.bb @@ -9,7 +9,7 @@ inherit allarch gtk-icon-cache SRC_URI = "https://mirrors.dotsrc.org/mirrors/exherbo/111343-OpenZone-${PV}.tar.xz" SRC_URI[sha256sum] = "db6fa6d0798aceb56998ce81382fa2246c77911d56b3b06e6aadee4cf5b4816e" -S = "${WORKDIR}/OpenZone" +S = "${UNPACKDIR}/OpenZone" do_compile() { } diff --git a/meta-xfce/recipes-extended/imsettings/imsettings_1.8.10.bb b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.10.bb index b2d74a3015..59de3b3a08 100644 --- a/meta-xfce/recipes-extended/imsettings/imsettings_1.8.10.bb +++ b/meta-xfce/recipes-extended/imsettings/imsettings_1.8.10.bb @@ -22,7 +22,6 @@ SRC_URI = "git://gitlab.com/tagoh/imsettings.git;protocol=https;branch=main \ " SRCREV = "27d84c88831ef76397a15891ba0738ce9a83902a" -S = "${WORKDIR}/git" do_configure:prepend() { cp ${STAGING_DATADIR_NATIVE}/gettext/ABOUT-NLS ${AUTOTOOLS_AUXDIR}/ diff --git a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb index 2384682ecb..f2a5e544d5 100644 --- a/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb +++ b/meta-xfce/recipes-panel-plugins/closebutton/xfce4-closebutton-plugin_git.bb @@ -11,7 +11,6 @@ PV = "4.16.0" SRC_URI = "git://github.com/schnitzeltony/xfce4-closebutton-plugin.git;branch=master;protocol=https" SRCREV = "538f9acfc5d5019f5cde734d056bcc0c95da9b4c" -S = "${WORKDIR}/git" EXTRA_OECONF += "--enable-maintainer-mode" -- cgit v1.2.3-54-g00ecf