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-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb | 1 - meta-webserver/recipes-httpd/apache-mod/mod-dnssd_0.6.bb | 1 - meta-webserver/recipes-httpd/apache2/apache2_2.4.63.bb | 2 +- meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb | 1 - meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) (limited to 'meta-webserver/recipes-httpd') diff --git a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb index 4dbf595c19..b93fa2d186 100644 --- a/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb +++ b/meta-webserver/recipes-httpd/apache-mod/apache-websocket_git.bb @@ -17,7 +17,6 @@ SRCREV = "0ee34c77fc78ff08fd548706300b80a7bc7874e4" PV = "0.1.2+git" -S = "${WORKDIR}/git" LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" diff --git a/meta-webserver/recipes-httpd/apache-mod/mod-dnssd_0.6.bb b/meta-webserver/recipes-httpd/apache-mod/mod-dnssd_0.6.bb index 6f2a2330ae..aca6d598f8 100644 --- a/meta-webserver/recipes-httpd/apache-mod/mod-dnssd_0.6.bb +++ b/meta-webserver/recipes-httpd/apache-mod/mod-dnssd_0.6.bb @@ -8,7 +8,6 @@ DEPENDS = "apache2 avahi" SRC_URI = "git://git.0pointer.net/mod_dnssd.git;protocol=https;branch=master" SRCREV = "be2fb9f6158f800685de7a1bc01c39b6cf1fa12c" -S = "${WORKDIR}/git" EXTRA_OECONF = "--disable-lynx" diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.63.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.63.bb index 9ef8c13b79..2b4ae41d95 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.63.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.63.bb @@ -29,7 +29,7 @@ SRC_URI:append:class-target = " \ LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" SRC_URI[sha256sum] = "88fc236ab99b2864b248de7d49a008ec2afd7551e64dce8b95f58f32f94c46ab" -S = "${WORKDIR}/httpd-${PV}" +S = "${UNPACKDIR}/httpd-${PV}" inherit autotools update-rc.d pkgconfig systemd multilib_script multilib_header diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index cdb6fb605c..d593b7092b 100644 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -13,7 +13,6 @@ SRC_URI = "git://github.com/monkey/monkey;branch=1.6;protocol=https \ file://monkey.init" SRCREV = "7999b487fded645381d387ec0e057e92407b0d2c" -S = "${WORKDIR}/git" UPSTREAM_CHECK_URI = "https://github.com/monkey/monkey/releases" UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+).tar.gz" diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb index ec188cc482..9ff1772531 100644 --- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb +++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb @@ -16,7 +16,6 @@ SRC_URI = "git://github.com/blueness/${BPN};branch=master;protocol=https \ UPSTREAM_CHECK_URI = "https://github.com/blueness/sthttpd/releases/" UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+).tar.gz" -S = "${WORKDIR}/git" inherit autotools update-rc.d systemd update-alternatives -- cgit v1.2.3-54-g00ecf