Message ID | 20250317132749.1778185-1-ross.burton@arm.com |
---|---|
State | New |
Headers | show |
Series | [1/3] mdadm: don't inherit autotools | expand |
On Mon, Mar 17, 2025 at 6:27 AM Ross Burton via lists.openembedded.org <ross.burton=arm.com@lists.openembedded.org> wrote: > > 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. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > meta/recipes-extended/mdadm/mdadm_4.3.bb | 19 ++++--------------- > 1 file 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 63c61b68c96..d90497d5a74 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 \ > > SRC_URI[sha256sum] = "416727ae1f1080ea6e3090cea36dd076826fc369151e36ab736557ba92196f9f" > > -inherit autotools-brokensep ptest systemd > +inherit ptest systemd > > DEPENDS = "udev" > > @@ -44,30 +44,19 @@ CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' > CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' > > EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ > - BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}"' > + BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}" \ > + SYSROOT="${STAGING_DIR_TARGET}" STRIP=' STRIP here is not pointing to tool called strip here right ? perhaps some install -s mumbo jumbo > > DEBUG_OPTIMIZATION:append = " -Wno-error" > > -do_compile() { > - oe_runmake SYSROOT="${STAGING_DIR_TARGET}" > -} > - > do_install() { > - export STRIP="" > - autotools_do_install > -} > - > -do_install:append() { > + oe_runmake 'DESTDIR=${D}' install install-systemd > install -d ${D}/${sysconfdir}/ > install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf > install -d ${D}/${sysconfdir}/init.d > install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor > } > > -do_install:append() { > - oe_runmake install-systemd DESTDIR=${D} > -} > - > do_compile_ptest() { > oe_runmake test > } > -- > 2.43.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#213093): https://lists.openembedded.org/g/openembedded-core/message/213093 > Mute This Topic: https://lists.openembedded.org/mt/111749081/1997914 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 17 Mar 2025, at 18:51, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote: >> EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ >> - BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}"' >> + BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}" \ >> + SYSROOT="${STAGING_DIR_TARGET}" STRIP=' > > STRIP here is not pointing to tool called strip here right ? perhaps > some install -s mumbo jumbo I was just moving a line to disable stripping so we get debug symbols, but I just checked and the default is unset so this could be removed. Ross
diff --git a/meta/recipes-extended/mdadm/mdadm_4.3.bb b/meta/recipes-extended/mdadm/mdadm_4.3.bb index 63c61b68c96..d90497d5a74 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 \ SRC_URI[sha256sum] = "416727ae1f1080ea6e3090cea36dd076826fc369151e36ab736557ba92196f9f" -inherit autotools-brokensep ptest systemd +inherit ptest systemd DEPENDS = "udev" @@ -44,30 +44,19 @@ CFLAGS:append:mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__' CFLAGS:append:mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__' EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}" SYSTEMD_DIR=${systemd_system_unitdir} \ - BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}"' + BINDIR="${base_sbindir}" UDEVDIR="${nonarch_base_libdir}/udev" LDFLAGS="${LDFLAGS}" \ + SYSROOT="${STAGING_DIR_TARGET}" STRIP=' DEBUG_OPTIMIZATION:append = " -Wno-error" -do_compile() { - oe_runmake SYSROOT="${STAGING_DIR_TARGET}" -} - do_install() { - export STRIP="" - autotools_do_install -} - -do_install:append() { + oe_runmake 'DESTDIR=${D}' install install-systemd install -d ${D}/${sysconfdir}/ install -m 644 ${S}/mdadm.conf-example ${D}${sysconfdir}/mdadm.conf install -d ${D}/${sysconfdir}/init.d install -m 755 ${UNPACKDIR}/mdadm.init ${D}${sysconfdir}/init.d/mdmonitor } -do_install:append() { - oe_runmake install-systemd DESTDIR=${D} -} - do_compile_ptest() { oe_runmake test }
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. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/recipes-extended/mdadm/mdadm_4.3.bb | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)