diff options
| author | Ross Burton <ross.burton@arm.com> | 2025-03-17 13:27:47 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-03-18 11:25:36 +0000 |
| commit | d599ce3d6373a33f795dd50d4ed988f45966bcdc (patch) | |
| tree | 1a28b6fe4b4618c2d628f22facf2cca666e388c3 | |
| parent | 2c6cb136cad37643f159e6968b8d7d5594562967 (diff) | |
| download | poky-d599ce3d6373a33f795dd50d4ed988f45966bcdc.tar.gz | |
mdadm: don't inherit autotools
mdadm doesn't use autotools at all:
- do_configure does nothing as it can't find configure.ac or configure
- do_compile is overridden to pass SYSROOT
- do_install is overridden but still calls autotools_do_install (which
is just 'make install DESTDIR=$D') and then appended.
Clean this up by passing SYSROOT and STRIP in EXTRA_OEMAKE, removing the
now-obsolete do_compile(), and merging the do_install()s.
(From OE-Core rev: a43888fda9aedaa5ac13d298644aedbf4134165d)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-extended/mdadm/mdadm_4.3.bb | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/meta/recipes-extended/mdadm/mdadm_4.3.bb b/meta/recipes-extended/mdadm/mdadm_4.3.bb index 63c61b68c9..d90497d5a7 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.3.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.3.bb | |||
| @@ -28,7 +28,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ | |||
| 28 | 28 | ||
| 29 | SRC_URI[sha256sum] = "416727ae1f1080ea6e3090cea36dd076826fc369151e36ab736557ba92196f9f" | 29 | SRC_URI[sha256sum] = "416727ae1f1080ea6e3090cea36dd076826fc369151e36ab736557ba92196f9f" |
| 30 | 30 | ||
| 31 | inherit autotools-brokensep ptest systemd | 31 | inherit ptest systemd |
| 32 | 32 | ||
| 33 | DEPENDS = "udev" | 33 | DEPENDS = "udev" |
| 34 | 34 | ||
| @@ -44,30 +44,19 @@ CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' | |||
| 44 | CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' | 44 | CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' |
| 45 | 45 | ||
| 46 | EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ | 46 | EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ |
| 47 | BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}"' | 47 | BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}" \ |
| 48 | SYSROOT="${STAGING_DIR_TARGET}" STRIP=' | ||
| 48 | 49 | ||
| 49 | DEBUG_OPTIMIZATION:append = " -Wno-error" | 50 | DEBUG_OPTIMIZATION:append = " -Wno-error" |
| 50 | 51 | ||
| 51 | do_compile() { | ||
| 52 | oe_runmake SYSROOT="${STAGING_DIR_TARGET}" | ||
| 53 | } | ||
| 54 | |||
| 55 | do_install() { | 52 | do_install() { |
| 56 | export STRIP="" | 53 | oe_runmake 'DESTDIR=${D}' install install-systemd |
| 57 | autotools_do_install | ||
| 58 | } | ||
| 59 | |||
| 60 | do_install:append() { | ||
| 61 | install -d ${D}/${sysconfdir}/ | 54 | install -d ${D}/${sysconfdir}/ |
| 62 | install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf | 55 | install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf |
| 63 | install -d ${D}/${sysconfdir}/init.d | 56 | install -d ${D}/${sysconfdir}/init.d |
| 64 | install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor | 57 | install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor |
| 65 | } | 58 | } |
| 66 | 59 | ||
| 67 | do_install:append() { | ||
| 68 | oe_runmake install-systemd DESTDIR=${D} | ||
| 69 | } | ||
| 70 | |||
| 71 | do_compile_ptest() { | 60 | do_compile_ptest() { |
| 72 | oe_runmake test | 61 | oe_runmake test |
| 73 | } | 62 | } |
