diff options
| author | Ross Burton <ross.burton@arm.com> | 2025-03-19 17:41:51 +0000 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-03-19 11:37:48 -0700 |
| commit | cdcb14610409914472ab8ec621757ba5dbc78cc7 (patch) | |
| tree | 1901400c90e433cc448f8eaaef845ca3df67fd83 /meta-oe/recipes-extended | |
| parent | 5461aa6cbedc705ab6b24a53a0ccc684b20043ea (diff) | |
| download | meta-openembedded-cdcb14610409914472ab8ec621757ba5dbc78cc7.tar.gz | |
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 <ross.burton@arm.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
| -rw-r--r-- | meta-oe/recipes-extended/redis/redis_6.2.16.bb | 4 | ||||
| -rw-r--r-- | 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 \ | |||
| 20 | 20 | ||
| 21 | SRC_URI[sha256sum] = "846bff83c26d827d49f8cc8114ea9d1e72eea1169f7de36b8135ea2cec104e7d" | 21 | SRC_URI[sha256sum] = "846bff83c26d827d49f8cc8114ea9d1e72eea1169f7de36b8135ea2cec104e7d" |
| 22 | 22 | ||
| 23 | inherit autotools-brokensep update-rc.d systemd useradd | 23 | inherit update-rc.d systemd useradd |
| 24 | 24 | ||
| 25 | FINAL_LIBS:x86:toolchain-clang = "-latomic" | 25 | FINAL_LIBS:x86:toolchain-clang = "-latomic" |
| 26 | FINAL_LIBS:riscv32 = "-latomic" | 26 | FINAL_LIBS:riscv32 = "-latomic" |
| @@ -37,7 +37,7 @@ GROUPADD_PARAM:${PN} = "--system redis" | |||
| 37 | REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" | 37 | REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" |
| 38 | 38 | ||
| 39 | do_compile:prepend() { | 39 | do_compile:prepend() { |
| 40 | (cd deps && oe_runmake hiredis lua linenoise) | 40 | oe_runmake -C deps hiredis lua linenoise |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | do_install() { | 43 | 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 | |||
| 22 | 22 | ||
| 23 | RPROVIDES:${PN} = "virtual-redis" | 23 | RPROVIDES:${PN} = "virtual-redis" |
| 24 | 24 | ||
| 25 | inherit autotools-brokensep pkgconfig update-rc.d systemd useradd | 25 | inherit pkgconfig update-rc.d systemd useradd |
| 26 | 26 | ||
| 27 | FINAL_LIBS:x86:toolchain-clang = "-latomic" | 27 | FINAL_LIBS:x86:toolchain-clang = "-latomic" |
| 28 | FINAL_LIBS:riscv32 = "-latomic" | 28 | FINAL_LIBS:riscv32 = "-latomic" |
| @@ -42,7 +42,7 @@ PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd" | |||
| 42 | EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" | 42 | EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" |
| 43 | 43 | ||
| 44 | do_compile:prepend() { | 44 | do_compile:prepend() { |
| 45 | (cd deps && oe_runmake hiredis lua linenoise) | 45 | oe_runmake -C deps hiredis lua linenoise |
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | do_install() { | 48 | do_install() { |
