mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
dracut: upgrade 103 -> 106
ChangeLog: https://github.com/dracut-ng/dracut-ng/releases/tag/106 Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
a495fd2a54
commit
9ea6475daa
|
|
@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||||
|
|
||||||
PE = "1"
|
PE = "1"
|
||||||
|
|
||||||
SRCREV = "3fce598fb45aa5618cdf885eb48cf327104ffcb8"
|
SRCREV = "956c08774074ddc45b2f975e13d5c13d1fc36eff"
|
||||||
SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \
|
SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \
|
||||||
file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \
|
file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \
|
||||||
"
|
"
|
||||||
|
|
@ -20,21 +20,21 @@ inherit bash-completion pkgconfig
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
EXTRA_OECONF = "--prefix=${prefix} \
|
EXTRA_OECONF = "--prefix=${prefix} \
|
||||||
--libdir=${prefix}/lib \
|
--libdir=${nonarch_libdir} \
|
||||||
--datadir=${datadir} \
|
--datadir=${datadir} \
|
||||||
--sysconfdir=${sysconfdir} \
|
--sysconfdir=${sysconfdir} \
|
||||||
--sbindir=${sbindir} \
|
--sbindir=${sbindir} \
|
||||||
--disable-documentation \
|
|
||||||
--bindir=${bindir} \
|
--bindir=${bindir} \
|
||||||
--includedir=${includedir} \
|
--includedir=${includedir} \
|
||||||
--localstatedir=${localstatedir} \
|
--localstatedir=${localstatedir} \
|
||||||
|
--disable-documentation \
|
||||||
"
|
"
|
||||||
|
|
||||||
# RDEPEND on systemd optionally
|
# RDEPEND on systemd optionally
|
||||||
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
|
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
|
||||||
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,systemd"
|
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,,,systemd"
|
||||||
|
|
||||||
EXTRA_OEMAKE += 'libdir=${prefix}/lib LDLIBS="${LDLIBS}"'
|
EXTRA_OEMAKE += 'libdir=${nonarch_libdir} LDLIBS="${LDLIBS}" enable_test=no'
|
||||||
|
|
||||||
CFLAGS:append = " -fPIC"
|
CFLAGS:append = " -fPIC"
|
||||||
LDLIBS:append:libc-musl = " -lfts"
|
LDLIBS:append:libc-musl = " -lfts"
|
||||||
|
|
@ -47,22 +47,26 @@ do_install() {
|
||||||
oe_runmake install DESTDIR=${D}
|
oe_runmake install DESTDIR=${D}
|
||||||
# Its Makefile uses cp -arx to install modules.d, so fix the owner
|
# Its Makefile uses cp -arx to install modules.d, so fix the owner
|
||||||
# to root:root
|
# to root:root
|
||||||
chown -R root:root ${D}/${prefix}/lib/dracut/modules.d
|
chown -R root:root ${D}/${nonarch_libdir}/dracut/modules.d \
|
||||||
|
${D}/${nonarch_libdir}/dracut/dracut.conf.d
|
||||||
|
|
||||||
|
if ! ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
|
||||||
|
rm -rf ${D}${nonarch_libdir}/systemd
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
FILES:${PN} += "${prefix}/lib/kernel \
|
FILES:${PN} += "${nonarch_libdir}/kernel \
|
||||||
${prefix}/lib/dracut \
|
${nonarch_libdir}/dracut \
|
||||||
${systemd_unitdir} \
|
${systemd_unitdir} \
|
||||||
"
|
"
|
||||||
FILES:${PN}-dbg += "${prefix}/lib/dracut/.debug"
|
FILES:${PN}-dbg += "${nonarch_libdir}/dracut/.debug"
|
||||||
|
|
||||||
CONFFILES:${PN} += "${sysconfdir}/dracut.conf"
|
CONFFILES:${PN} += "${sysconfdir}/dracut.conf"
|
||||||
|
|
||||||
RDEPENDS:${PN} = "findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd"
|
RDEPENDS:${PN} = "findutils cpio util-linux-blkid util-linux-getopt util-linux bash ldd"
|
||||||
|
|
||||||
# This could be optimized a bit, but let's avoid non-booting systems :)
|
# This could be optimized a bit, but let's avoid non-booting systems :)
|
||||||
RRECOMMENDS:${PN} = " \
|
RRECOMMENDS:${PN} = "kernel-modules \
|
||||||
kernel-modules \
|
|
||||||
coreutils \
|
coreutils \
|
||||||
"
|
"
|
||||||
|
|
||||||
Loading…
Reference in New Issue
Block a user