From cdcb14610409914472ab8ec621757ba5dbc78cc7 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 19 Mar 2025 17:41:51 +0000 Subject: [PATCH] redis: don't inherit autotools This upstream does not in fact use autotools, so remove the inherit. Also, clean up a oe_runmake to not require a subshell. Signed-off-by: Ross Burton Signed-off-by: Khem Raj --- meta-oe/recipes-extended/redis/redis_6.2.16.bb | 4 ++-- meta-oe/recipes-extended/redis/redis_7.2.7.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-extended/redis/redis_6.2.16.bb b/meta-oe/recipes-extended/redis/redis_6.2.16.bb index 40473461a2..fbf2f04e3d 100644 --- a/meta-oe/recipes-extended/redis/redis_6.2.16.bb +++ b/meta-oe/recipes-extended/redis/redis_6.2.16.bb @@ -20,7 +20,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ SRC_URI[sha256sum] = "846bff83c26d827d49f8cc8114ea9d1e72eea1169f7de36b8135ea2cec104e7d" -inherit autotools-brokensep update-rc.d systemd useradd +inherit update-rc.d systemd useradd FINAL_LIBS:x86:toolchain-clang = "-latomic" FINAL_LIBS:riscv32 = "-latomic" @@ -37,7 +37,7 @@ GROUPADD_PARAM:${PN} = "--system redis" REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" do_compile:prepend() { - (cd deps && oe_runmake hiredis lua linenoise) + oe_runmake -C deps hiredis lua linenoise } do_install() { diff --git a/meta-oe/recipes-extended/redis/redis_7.2.7.bb b/meta-oe/recipes-extended/redis/redis_7.2.7.bb index 7efdebd905..c688e92cca 100644 --- a/meta-oe/recipes-extended/redis/redis_7.2.7.bb +++ b/meta-oe/recipes-extended/redis/redis_7.2.7.bb @@ -22,7 +22,7 @@ SRC_URI[sha256sum] = "72c081e3b8cfae7144273d26d76736f08319000af46c01515cad5d2976 RPROVIDES:${PN} = "virtual-redis" -inherit autotools-brokensep pkgconfig update-rc.d systemd useradd +inherit pkgconfig update-rc.d systemd useradd FINAL_LIBS:x86:toolchain-clang = "-latomic" FINAL_LIBS:riscv32 = "-latomic" @@ -42,7 +42,7 @@ PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd" EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" do_compile:prepend() { - (cd deps && oe_runmake hiredis lua linenoise) + oe_runmake -C deps hiredis lua linenoise } do_install() {