| Message ID | 20220110124644.1388438-2-thierry.bultel@linatsea.fr |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v4,1/3] package/cross-ldd: new package | expand |
Hello! Thank you for the patch series! Hopefully I can help a bit. First things first: - dracut.hash is missing. - Please run ./utils/check-package package/dracut/* and fix any warnings Your Dracut package does not depend on systemd, which results in the error: dracut: FAILED: output/host/lib/dracut/dracut-install -r output/build/buildroot-fs/cpio/target -D output/build/buildroot-fs/cpio/tmp/dracut.Sm7N5J/initramfs -a -l udevadm cat uname blkid dracut: Cannot find [systemd-]udevd binary! I do have a dracut package you may find useful here: https://gitlab.com/aduskett/buildroot/-/tree/dracut/external/package/dracut Thanks! Adam On Mon, Jan 10, 2022 at 4:57 AM Thierry Bultel <thierry.bultel@linatsea.fr> wrote: > > Dracut is the tool used by desktop distributions to build initrds. > > In the embedded world, it can be very usefull, too, for instance when > wanting to create an initramfs for a system recovery mode. > Whereas it is definitively possible to achieve this with buildroot, the > process is to have a dedicated buildroot configuration for that, and > perform a full build. Instead of doing that, the idea is to use dracut > to pick the needed binaries/shared libraries, configuration files, or > kernel modules from the 'target' directory. > The advantage is to save build time, and also to have a consistency > between the packages versions taken for the recovery and the production > filesystem. > > The principle of dracut is based on the so-called 'dracut modules' > On the host, they are on host/lib/dracut/modules.d > Each directory as a prefix number for the order of execution, and > at least a "module-setup.sh" script. > > Dracut sources all of them, and typically calls the "check()" function, > which is the placeholder for required binaries (that are aimed to be > polulated in the initrd), then the "depends()" function, that lists > other modules to depend on, and the "install()" function, that makes > the actual work. > > Dracut was initially thought to work with systems using systemd, > but it can also work without it. Do to so, every "systemd-xxx" > modules must be disabled in the dracut configuration file. For > convenience, the 05busybox-buildroot module is provided, to support > busybox init system. > > Signed-off-by: Thierry Bultel <thierry.bultel@linatsea.fr> > --- > Changes v1 -> v2 (all suggested by Arnoult) > - added a wrapper script > Changes v2 -> v3 > - added modules for: > - supporting busybox system init type > - fixing a missing symlink for uClibc > Changes v3 -> v4 > - some explanations on the dracut modules in the commit log > - fixed a bug on the 'require_binary' line in busybox module > - expanded variables with double quotes and curly braces > - removed commented out code > - fixes for 'fakeroot' and 'uclibc' and 'musl' as patches > - musl and uclibc dynamic fix > - renamed dracut wrapper > - disabled when using another init system than systemd or busybox > > Signed-off-by: Thierry Bultel <thierry.bultel@linatsea.fr> > --- > package/Config.in.host | 1 + > package/dracut/0000-enable-fakeroot.patch | 12 ++++ > ...01-add-a-module-to-fix-libc-ld-links.patch | 56 +++++++++++++++++ > .../05busybox-buildroot/module-setup.sh | 60 +++++++++++++++++++ > package/dracut/Config.in.host | 10 ++++ > package/dracut/dracut | 2 +- > package/dracut/dracut.mk | 41 +++++++++++++ > package/dracut/dracut_wrapper.sh | 15 +++++ > 8 files changed, 196 insertions(+), 1 deletion(-) > create mode 100644 package/dracut/0000-enable-fakeroot.patch > create mode 100644 package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch > create mode 100644 package/dracut/05busybox-buildroot/module-setup.sh > create mode 100644 package/dracut/Config.in.host > create mode 100644 package/dracut/dracut.mk > create mode 100644 package/dracut/dracut_wrapper.sh > > diff --git a/package/Config.in.host b/package/Config.in.host > index b3e00bb482..caa28262be 100644 > --- a/package/Config.in.host > +++ b/package/Config.in.host > @@ -14,6 +14,7 @@ menu "Host utilities" > source "package/cramfs/Config.in.host" > source "package/cryptsetup/Config.in.host" > source "package/dbus-python/Config.in.host" > + source "package/dracut/Config.in.host" > source "package/dfu-util/Config.in.host" > source "package/dos2unix/Config.in.host" > source "package/dosfstools/Config.in.host" > diff --git a/package/dracut/0000-enable-fakeroot.patch b/package/dracut/0000-enable-fakeroot.patch > new file mode 100644 > index 0000000000..e148485135 > --- /dev/null > +++ b/package/dracut/0000-enable-fakeroot.patch > @@ -0,0 +1,12 @@ > +diff -purN host-dracut-055.orig/dracut.sh host-dracut-055/dracut.sh > +--- host-dracut-055.orig/dracut.sh 2021-05-27 12:34:19.000000000 +0000 > ++++ host-dracut-055/dracut.sh 2022-01-06 14:17:57.022317138 +0000 > +@@ -868,8 +868,6 @@ export LC_ALL=C > + export LANG=C > + unset LC_MESSAGES > + unset LC_CTYPE > +-unset LD_LIBRARY_PATH > +-unset LD_PRELOAD > + unset GREP_OPTIONS > + > + export DRACUT_LOG_LEVEL=warning > diff --git a/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch b/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch > new file mode 100644 > index 0000000000..ad5e97b34a > --- /dev/null > +++ b/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch > @@ -0,0 +1,56 @@ > +From 2c0188164223563adfce4852faa83d2553bee367 Mon Sep 17 00:00:00 2001 > +From: Thierry Bultel <thierry.bultel@linatsea.fr> > +Date: Mon, 10 Jan 2022 09:09:43 +0100 > +Subject: [PATCH] add a module to fix libc ld links > + > +When using uClibc or musl, there must > +be "ls-uClibc.so.1" or "ld-musl-x.so" symlinks, > +respectively (else the init process cannot > +start) > + > +Signed-off-by: Thierry Bultel <thierry.bultel@linatsea.fr> > +--- > + modules.d/05libc-links/module-setup.sh | 31 ++++++++++++++++++++++++++ > + 1 file changed, 31 insertions(+) > + create mode 100755 modules.d/05libc-links/module-setup.sh > + > +diff --git a/modules.d/05libc-links/module-setup.sh b/modules.d/05libc-links/module-setup.sh > +new file mode 100755 > +index 00000000..249bb80c > +--- /dev/null > ++++ b/modules.d/05libc-links/module-setup.sh > +@@ -0,0 +1,31 @@ > ++#!/bin/bash > ++ > ++# Adds the missing links for uClibc or musl, if needed > ++ > ++check() { > ++ return 0 > ++} > ++ > ++depends() { > ++ return 0 > ++} > ++ > ++install() { > ++ > ++ # Despite of the fact that the listed dependency (reported by readelf -d) > ++ # is purely /lib/libc.so, the musl symlink is needed anyway. > ++ > ++ musl_link=$(find "${dracutsysrootdir}"/lib -name "ld-musl-*.so*") > ++ if [ $? -eq 0 ] ; then > ++ ln -s /lib/libc.so ${initdir}/lib/`basename "${musl_link}"` > ++ fi > ++ > ++ # Same for uClibc, the listed dependency > ++ # is ld-uClibc.so.1, the loader needs the ld-uClibc.so.0, too > ++ > ++ uclibc_link = $(find "${dracutsysrootdir}"/lib -name "ld-uClibc-*.so*") > ++ if [ $? -eq 0 ] ; then > ++ ln -s ld-uClibc.so.1 "${initdir}"/`basename "${uclibc_link}"` > ++ fi > ++ > ++} > +-- > +2.25.1 > + > diff --git a/package/dracut/05busybox-buildroot/module-setup.sh b/package/dracut/05busybox-buildroot/module-setup.sh > new file mode 100644 > index 0000000000..ab4e0a5c50 > --- /dev/null > +++ b/package/dracut/05busybox-buildroot/module-setup.sh > @@ -0,0 +1,60 @@ > +#!/bin/bash > + > +check() { > + require_binaries busybox || return 1 > + return 0 > +} > + > +depends() { > + return 0 > +} > + > +install_busybox_links() { > + dir=$1 > + linkname=$2 > + > + (cd "${dracutsysrootdir}${dir}" && > + for x in *; do > + if [ "$(readlink "$x")" = "${linkname}" ]; then > + ln -sf "${linkname}" "${initdir}/${dir}/$x" > + fi > + done > + ) > +} > + > +install() { > + inst_multiple /bin/busybox > + > + # wrapper script for early console; will launch /sbin/init > + # after having mounted devtmpfs > + inst_multiple /init > + > + ln -s ../bin/busybox "${initdir}"/sbin/init > + > + if [ -e "${dracutsysrootdir}/lib64" ]; then > + ln -s lib "${initdir}/lib64" > + ln -s lib "${initdir}/usr/lib64" > + fi > + > + if [ -e "${dracutsysrootdir}/lib32" ]; then > + ln -s lib "${initdir}/lib32" > + ln -s lib "${initdir}/usr/lib32" > + fi > + > + install_busybox_links "/bin" "busybox" > + install_busybox_links "/sbin" "../bin/busybox" > + install_busybox_links "/usr/bin" "../../bin/busybox" > + install_busybox_links "/usr/sbin" "../../bin/busybox" > + > + inst_multiple \ > + /etc/inittab \ > + /etc/init.d/rcS \ > + /etc/init.d/rcK \ > + /etc/issue \ > + /etc/fstab \ > + /etc/group \ > + /etc/passwd \ > + /etc/shadow \ > + /etc/hostname > +} > + > diff --git a/package/dracut/Config.in.host b/package/dracut/Config.in.host > new file mode 100644 > index 0000000000..074d46f623 > --- /dev/null > +++ b/package/dracut/Config.in.host > @@ -0,0 +1,10 @@ > +config BR2_PACKAGE_HOST_DRACUT > + bool > + select BR2_PACKAGE_HOST_KMOD > + select BR2_PACKAGE_HOST_CROSS_LDD > + help > + dracut is used to create an initramfs image by > + copying tools and files from an installed system > + and combining it with the dracut framework. > + > + https://dracut.wiki.kernel.org > diff --git a/package/dracut/dracut b/package/dracut/dracut > index 9d3db3b58e..eb15ea9abd 100644 > --- a/package/dracut/dracut > +++ b/package/dracut/dracut > @@ -8,7 +8,7 @@ if [ -z "$*" ]; then > exit > fi > > -DRACUT_LDD=${TARGET_CROSS}ldd-cross \ > +DRACUT_LDD=${TARGET_CROSS}ldd-buildroot \ > DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ > dracutbasedir=${HOST_DIR}/usr/lib/dracut \ > dracutsysrootdir=${TARGET_DIR} \ > diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk > new file mode 100644 > index 0000000000..5a9e154ccc > --- /dev/null > +++ b/package/dracut/dracut.mk > @@ -0,0 +1,41 @@ > +################################################################################ > +# > +# dracut > +# > +################################################################################ > + > +DRACUT_VERSION = 055 > +DRACUT_SOURCE = dracut-$(DRACUT_VERSION).tar.xz > +DRACUT_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/dracut > +DRACUT_LICENSE = GPL-2.0 > +DRACUT_LICENSE_FILES = COPYING > + > +HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-cross-ldd > + > +define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT > + $(INSTALL) -D -m 0755 package/dracut/dracut \ > + $(HOST_DIR)/sbin/dracut > +endef > +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT > + > + > +# Dracut does not support busybox init (systemd init is assumed to work > +# out of the box, though). It provides a busybox module, that does not > +# use the same paths as buildroot, and is not meant to be used as an init > +# system. > +# So it is simplier for users to disable the standard 'busybox' module in > +# the configuration file, and enable the "busybox-buildroot' module > +# instead. > +# Notice that setting the script as executable (0755) is not mandatory, > +# but this is what dracut does on all its modules, so lets just conform > +# to it. > + > +ifeq ($(BR2_INIT_BUSYBOX),y) > +define HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE > + $(INSTALL) -D -m 0755 package/dracut/05busybox-buildroot/module-setup.sh \ > + $(HOST_DIR)/lib/dracut/modules.d/05busybox-buildroot/module-setup.sh > +endef > +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE > +endif > + > +$(eval $(host-autotools-package)) > diff --git a/package/dracut/dracut_wrapper.sh b/package/dracut/dracut_wrapper.sh > new file mode 100644 > index 0000000000..9d3db3b58e > --- /dev/null > +++ b/package/dracut/dracut_wrapper.sh > @@ -0,0 +1,15 @@ > +#!/bin/bash > + > +set -e > +set -x > + > +if [ -z "$*" ]; then > + echo "No argument supplied" > + exit > +fi > + > +DRACUT_LDD=${TARGET_CROSS}ldd-cross \ > +DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ > +dracutbasedir=${HOST_DIR}/usr/lib/dracut \ > +dracutsysrootdir=${TARGET_DIR} \ > +${HOST_DIR}/bin/dracut "$@" > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
One other thing: I do not believe cross-ldd is needed. My package uses the existing host-prelink-cross package. On Fri, Feb 4, 2022 at 12:56 PM Adam Duskett <aduskett@gmail.com> wrote: > > Hello! Thank you for the patch series! Hopefully I can help a bit. > > First things first: > - dracut.hash is missing. > - Please run ./utils/check-package package/dracut/* and fix any warnings > > Your Dracut package does not depend on systemd, which results in the error: > > dracut: FAILED: output/host/lib/dracut/dracut-install -r > output/build/buildroot-fs/cpio/target -D > output/build/buildroot-fs/cpio/tmp/dracut.Sm7N5J/initramfs -a -l > udevadm cat uname blkid > dracut: Cannot find [systemd-]udevd binary! > > I do have a dracut package you may find useful here: > https://gitlab.com/aduskett/buildroot/-/tree/dracut/external/package/dracut > > Thanks! > Adam > > On Mon, Jan 10, 2022 at 4:57 AM Thierry Bultel > <thierry.bultel@linatsea.fr> wrote: > > > > Dracut is the tool used by desktop distributions to build initrds. > > > > In the embedded world, it can be very usefull, too, for instance when > > wanting to create an initramfs for a system recovery mode. > > Whereas it is definitively possible to achieve this with buildroot, the > > process is to have a dedicated buildroot configuration for that, and > > perform a full build. Instead of doing that, the idea is to use dracut > > to pick the needed binaries/shared libraries, configuration files, or > > kernel modules from the 'target' directory. > > The advantage is to save build time, and also to have a consistency > > between the packages versions taken for the recovery and the production > > filesystem. > > > > The principle of dracut is based on the so-called 'dracut modules' > > On the host, they are on host/lib/dracut/modules.d > > Each directory as a prefix number for the order of execution, and > > at least a "module-setup.sh" script. > > > > Dracut sources all of them, and typically calls the "check()" function, > > which is the placeholder for required binaries (that are aimed to be > > polulated in the initrd), then the "depends()" function, that lists > > other modules to depend on, and the "install()" function, that makes > > the actual work. > > > > Dracut was initially thought to work with systems using systemd, > > but it can also work without it. Do to so, every "systemd-xxx" > > modules must be disabled in the dracut configuration file. For > > convenience, the 05busybox-buildroot module is provided, to support > > busybox init system. > > > > Signed-off-by: Thierry Bultel <thierry.bultel@linatsea.fr> > > --- > > Changes v1 -> v2 (all suggested by Arnoult) > > - added a wrapper script > > Changes v2 -> v3 > > - added modules for: > > - supporting busybox system init type > > - fixing a missing symlink for uClibc > > Changes v3 -> v4 > > - some explanations on the dracut modules in the commit log > > - fixed a bug on the 'require_binary' line in busybox module > > - expanded variables with double quotes and curly braces > > - removed commented out code > > - fixes for 'fakeroot' and 'uclibc' and 'musl' as patches > > - musl and uclibc dynamic fix > > - renamed dracut wrapper > > - disabled when using another init system than systemd or busybox > > > > Signed-off-by: Thierry Bultel <thierry.bultel@linatsea.fr> > > --- > > package/Config.in.host | 1 + > > package/dracut/0000-enable-fakeroot.patch | 12 ++++ > > ...01-add-a-module-to-fix-libc-ld-links.patch | 56 +++++++++++++++++ > > .../05busybox-buildroot/module-setup.sh | 60 +++++++++++++++++++ > > package/dracut/Config.in.host | 10 ++++ > > package/dracut/dracut | 2 +- > > package/dracut/dracut.mk | 41 +++++++++++++ > > package/dracut/dracut_wrapper.sh | 15 +++++ > > 8 files changed, 196 insertions(+), 1 deletion(-) > > create mode 100644 package/dracut/0000-enable-fakeroot.patch > > create mode 100644 package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch > > create mode 100644 package/dracut/05busybox-buildroot/module-setup.sh > > create mode 100644 package/dracut/Config.in.host > > create mode 100644 package/dracut/dracut.mk > > create mode 100644 package/dracut/dracut_wrapper.sh > > > > diff --git a/package/Config.in.host b/package/Config.in.host > > index b3e00bb482..caa28262be 100644 > > --- a/package/Config.in.host > > +++ b/package/Config.in.host > > @@ -14,6 +14,7 @@ menu "Host utilities" > > source "package/cramfs/Config.in.host" > > source "package/cryptsetup/Config.in.host" > > source "package/dbus-python/Config.in.host" > > + source "package/dracut/Config.in.host" > > source "package/dfu-util/Config.in.host" > > source "package/dos2unix/Config.in.host" > > source "package/dosfstools/Config.in.host" > > diff --git a/package/dracut/0000-enable-fakeroot.patch b/package/dracut/0000-enable-fakeroot.patch > > new file mode 100644 > > index 0000000000..e148485135 > > --- /dev/null > > +++ b/package/dracut/0000-enable-fakeroot.patch > > @@ -0,0 +1,12 @@ > > +diff -purN host-dracut-055.orig/dracut.sh host-dracut-055/dracut.sh > > +--- host-dracut-055.orig/dracut.sh 2021-05-27 12:34:19.000000000 +0000 > > ++++ host-dracut-055/dracut.sh 2022-01-06 14:17:57.022317138 +0000 > > +@@ -868,8 +868,6 @@ export LC_ALL=C > > + export LANG=C > > + unset LC_MESSAGES > > + unset LC_CTYPE > > +-unset LD_LIBRARY_PATH > > +-unset LD_PRELOAD > > + unset GREP_OPTIONS > > + > > + export DRACUT_LOG_LEVEL=warning > > diff --git a/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch b/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch > > new file mode 100644 > > index 0000000000..ad5e97b34a > > --- /dev/null > > +++ b/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch > > @@ -0,0 +1,56 @@ > > +From 2c0188164223563adfce4852faa83d2553bee367 Mon Sep 17 00:00:00 2001 > > +From: Thierry Bultel <thierry.bultel@linatsea.fr> > > +Date: Mon, 10 Jan 2022 09:09:43 +0100 > > +Subject: [PATCH] add a module to fix libc ld links > > + > > +When using uClibc or musl, there must > > +be "ls-uClibc.so.1" or "ld-musl-x.so" symlinks, > > +respectively (else the init process cannot > > +start) > > + > > +Signed-off-by: Thierry Bultel <thierry.bultel@linatsea.fr> > > +--- > > + modules.d/05libc-links/module-setup.sh | 31 ++++++++++++++++++++++++++ > > + 1 file changed, 31 insertions(+) > > + create mode 100755 modules.d/05libc-links/module-setup.sh > > + > > +diff --git a/modules.d/05libc-links/module-setup.sh b/modules.d/05libc-links/module-setup.sh > > +new file mode 100755 > > +index 00000000..249bb80c > > +--- /dev/null > > ++++ b/modules.d/05libc-links/module-setup.sh > > +@@ -0,0 +1,31 @@ > > ++#!/bin/bash > > ++ > > ++# Adds the missing links for uClibc or musl, if needed > > ++ > > ++check() { > > ++ return 0 > > ++} > > ++ > > ++depends() { > > ++ return 0 > > ++} > > ++ > > ++install() { > > ++ > > ++ # Despite of the fact that the listed dependency (reported by readelf -d) > > ++ # is purely /lib/libc.so, the musl symlink is needed anyway. > > ++ > > ++ musl_link=$(find "${dracutsysrootdir}"/lib -name "ld-musl-*.so*") > > ++ if [ $? -eq 0 ] ; then > > ++ ln -s /lib/libc.so ${initdir}/lib/`basename "${musl_link}"` > > ++ fi > > ++ > > ++ # Same for uClibc, the listed dependency > > ++ # is ld-uClibc.so.1, the loader needs the ld-uClibc.so.0, too > > ++ > > ++ uclibc_link = $(find "${dracutsysrootdir}"/lib -name "ld-uClibc-*.so*") > > ++ if [ $? -eq 0 ] ; then > > ++ ln -s ld-uClibc.so.1 "${initdir}"/`basename "${uclibc_link}"` > > ++ fi > > ++ > > ++} > > +-- > > +2.25.1 > > + > > diff --git a/package/dracut/05busybox-buildroot/module-setup.sh b/package/dracut/05busybox-buildroot/module-setup.sh > > new file mode 100644 > > index 0000000000..ab4e0a5c50 > > --- /dev/null > > +++ b/package/dracut/05busybox-buildroot/module-setup.sh > > @@ -0,0 +1,60 @@ > > +#!/bin/bash > > + > > +check() { > > + require_binaries busybox || return 1 > > + return 0 > > +} > > + > > +depends() { > > + return 0 > > +} > > + > > +install_busybox_links() { > > + dir=$1 > > + linkname=$2 > > + > > + (cd "${dracutsysrootdir}${dir}" && > > + for x in *; do > > + if [ "$(readlink "$x")" = "${linkname}" ]; then > > + ln -sf "${linkname}" "${initdir}/${dir}/$x" > > + fi > > + done > > + ) > > +} > > + > > +install() { > > + inst_multiple /bin/busybox > > + > > + # wrapper script for early console; will launch /sbin/init > > + # after having mounted devtmpfs > > + inst_multiple /init > > + > > + ln -s ../bin/busybox "${initdir}"/sbin/init > > + > > + if [ -e "${dracutsysrootdir}/lib64" ]; then > > + ln -s lib "${initdir}/lib64" > > + ln -s lib "${initdir}/usr/lib64" > > + fi > > + > > + if [ -e "${dracutsysrootdir}/lib32" ]; then > > + ln -s lib "${initdir}/lib32" > > + ln -s lib "${initdir}/usr/lib32" > > + fi > > + > > + install_busybox_links "/bin" "busybox" > > + install_busybox_links "/sbin" "../bin/busybox" > > + install_busybox_links "/usr/bin" "../../bin/busybox" > > + install_busybox_links "/usr/sbin" "../../bin/busybox" > > + > > + inst_multiple \ > > + /etc/inittab \ > > + /etc/init.d/rcS \ > > + /etc/init.d/rcK \ > > + /etc/issue \ > > + /etc/fstab \ > > + /etc/group \ > > + /etc/passwd \ > > + /etc/shadow \ > > + /etc/hostname > > +} > > + > > diff --git a/package/dracut/Config.in.host b/package/dracut/Config.in.host > > new file mode 100644 > > index 0000000000..074d46f623 > > --- /dev/null > > +++ b/package/dracut/Config.in.host > > @@ -0,0 +1,10 @@ > > +config BR2_PACKAGE_HOST_DRACUT > > + bool > > + select BR2_PACKAGE_HOST_KMOD > > + select BR2_PACKAGE_HOST_CROSS_LDD > > + help > > + dracut is used to create an initramfs image by > > + copying tools and files from an installed system > > + and combining it with the dracut framework. > > + > > + https://dracut.wiki.kernel.org > > diff --git a/package/dracut/dracut b/package/dracut/dracut > > index 9d3db3b58e..eb15ea9abd 100644 > > --- a/package/dracut/dracut > > +++ b/package/dracut/dracut > > @@ -8,7 +8,7 @@ if [ -z "$*" ]; then > > exit > > fi > > > > -DRACUT_LDD=${TARGET_CROSS}ldd-cross \ > > +DRACUT_LDD=${TARGET_CROSS}ldd-buildroot \ > > DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ > > dracutbasedir=${HOST_DIR}/usr/lib/dracut \ > > dracutsysrootdir=${TARGET_DIR} \ > > diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk > > new file mode 100644 > > index 0000000000..5a9e154ccc > > --- /dev/null > > +++ b/package/dracut/dracut.mk > > @@ -0,0 +1,41 @@ > > +################################################################################ > > +# > > +# dracut > > +# > > +################################################################################ > > + > > +DRACUT_VERSION = 055 > > +DRACUT_SOURCE = dracut-$(DRACUT_VERSION).tar.xz > > +DRACUT_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/dracut > > +DRACUT_LICENSE = GPL-2.0 > > +DRACUT_LICENSE_FILES = COPYING > > + > > +HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-cross-ldd > > + > > +define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT > > + $(INSTALL) -D -m 0755 package/dracut/dracut \ > > + $(HOST_DIR)/sbin/dracut > > +endef > > +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT > > + > > + > > +# Dracut does not support busybox init (systemd init is assumed to work > > +# out of the box, though). It provides a busybox module, that does not > > +# use the same paths as buildroot, and is not meant to be used as an init > > +# system. > > +# So it is simplier for users to disable the standard 'busybox' module in > > +# the configuration file, and enable the "busybox-buildroot' module > > +# instead. > > +# Notice that setting the script as executable (0755) is not mandatory, > > +# but this is what dracut does on all its modules, so lets just conform > > +# to it. > > + > > +ifeq ($(BR2_INIT_BUSYBOX),y) > > +define HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE > > + $(INSTALL) -D -m 0755 package/dracut/05busybox-buildroot/module-setup.sh \ > > + $(HOST_DIR)/lib/dracut/modules.d/05busybox-buildroot/module-setup.sh > > +endef > > +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE > > +endif > > + > > +$(eval $(host-autotools-package)) > > diff --git a/package/dracut/dracut_wrapper.sh b/package/dracut/dracut_wrapper.sh > > new file mode 100644 > > index 0000000000..9d3db3b58e > > --- /dev/null > > +++ b/package/dracut/dracut_wrapper.sh > > @@ -0,0 +1,15 @@ > > +#!/bin/bash > > + > > +set -e > > +set -x > > + > > +if [ -z "$*" ]; then > > + echo "No argument supplied" > > + exit > > +fi > > + > > +DRACUT_LDD=${TARGET_CROSS}ldd-cross \ > > +DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ > > +dracutbasedir=${HOST_DIR}/usr/lib/dracut \ > > +dracutsysrootdir=${TARGET_DIR} \ > > +${HOST_DIR}/bin/dracut "$@" > > -- > > 2.25.1 > > > > _______________________________________________ > > buildroot mailing list > > buildroot@buildroot.org > > https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Adam, thanks for the comments, mine follow below ... Le 04/02/2022 à 21:56, Adam Duskett a écrit : > Hello! Thank you for the patch series! Hopefully I can help a bit. > > First things first: > - dracut.hash is missing. Sure. I will had it. > - Please run ./utils/check-package package/dracut/* and fix any warnings I am pretty sure I had done in at least once. Will recheck, thanks; > > Your Dracut package does not depend on systemd, which results in the error: > > dracut: FAILED: output/host/lib/dracut/dracut-install -r > output/build/buildroot-fs/cpio/target -D > output/build/buildroot-fs/cpio/tmp/dracut.Sm7N5J/initramfs -a -l > udevadm cat uname blkid > dracut: Cannot find [systemd-]udevd binary! I do no agree. Despite of the fact that dracut was indeed thought to use systemd, it is absolutely possible to use it without. That is what the provided configuration file in my cpio patch does (support/testing/conf/dracut.conf). I personally use with busybox init. About host-prelink-cross, I have to check that it works in the configurations I have. Thanks, Thierry > > I do have a dracut package you may find useful here: > https://gitlab.com/aduskett/buildroot/-/tree/dracut/external/package/dracut > > Thanks! > Adam > > On Mon, Jan 10, 2022 at 4:57 AM Thierry Bultel > <thierry.bultel@linatsea.fr> wrote: >> Dracut is the tool used by desktop distributions to build initrds. >> >> In the embedded world, it can be very usefull, too, for instance when >> wanting to create an initramfs for a system recovery mode. >> Whereas it is definitively possible to achieve this with buildroot, the >> process is to have a dedicated buildroot configuration for that, and >> perform a full build. Instead of doing that, the idea is to use dracut >> to pick the needed binaries/shared libraries, configuration files, or >> kernel modules from the 'target' directory. >> The advantage is to save build time, and also to have a consistency >> between the packages versions taken for the recovery and the production >> filesystem. >> >> The principle of dracut is based on the so-called 'dracut modules' >> On the host, they are on host/lib/dracut/modules.d >> Each directory as a prefix number for the order of execution, and >> at least a "module-setup.sh" script. >> >> Dracut sources all of them, and typically calls the "check()" function, >> which is the placeholder for required binaries (that are aimed to be >> polulated in the initrd), then the "depends()" function, that lists >> other modules to depend on, and the "install()" function, that makes >> the actual work. >> >> Dracut was initially thought to work with systems using systemd, >> but it can also work without it. Do to so, every "systemd-xxx" >> modules must be disabled in the dracut configuration file. For >> convenience, the 05busybox-buildroot module is provided, to support >> busybox init system. >> >> Signed-off-by: Thierry Bultel<thierry.bultel@linatsea.fr> >> --- >> Changes v1 -> v2 (all suggested by Arnoult) >> - added a wrapper script >> Changes v2 -> v3 >> - added modules for: >> - supporting busybox system init type >> - fixing a missing symlink for uClibc >> Changes v3 -> v4 >> - some explanations on the dracut modules in the commit log >> - fixed a bug on the 'require_binary' line in busybox module >> - expanded variables with double quotes and curly braces >> - removed commented out code >> - fixes for 'fakeroot' and 'uclibc' and 'musl' as patches >> - musl and uclibc dynamic fix >> - renamed dracut wrapper >> - disabled when using another init system than systemd or busybox >> >> Signed-off-by: Thierry Bultel<thierry.bultel@linatsea.fr> >> --- >> package/Config.in.host | 1 + >> package/dracut/0000-enable-fakeroot.patch | 12 ++++ >> ...01-add-a-module-to-fix-libc-ld-links.patch | 56 +++++++++++++++++ >> .../05busybox-buildroot/module-setup.sh | 60 +++++++++++++++++++ >> package/dracut/Config.in.host | 10 ++++ >> package/dracut/dracut | 2 +- >> package/dracut/dracut.mk | 41 +++++++++++++ >> package/dracut/dracut_wrapper.sh | 15 +++++ >> 8 files changed, 196 insertions(+), 1 deletion(-) >> create mode 100644 package/dracut/0000-enable-fakeroot.patch >> create mode 100644 package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch >> create mode 100644 package/dracut/05busybox-buildroot/module-setup.sh >> create mode 100644 package/dracut/Config.in.host >> create mode 100644 package/dracut/dracut.mk >> create mode 100644 package/dracut/dracut_wrapper.sh >> >> diff --git a/package/Config.in.host b/package/Config.in.host >> index b3e00bb482..caa28262be 100644 >> --- a/package/Config.in.host >> +++ b/package/Config.in.host >> @@ -14,6 +14,7 @@ menu "Host utilities" >> source "package/cramfs/Config.in.host" >> source "package/cryptsetup/Config.in.host" >> source "package/dbus-python/Config.in.host" >> + source "package/dracut/Config.in.host" >> source "package/dfu-util/Config.in.host" >> source "package/dos2unix/Config.in.host" >> source "package/dosfstools/Config.in.host" >> diff --git a/package/dracut/0000-enable-fakeroot.patch b/package/dracut/0000-enable-fakeroot.patch >> new file mode 100644 >> index 0000000000..e148485135 >> --- /dev/null >> +++ b/package/dracut/0000-enable-fakeroot.patch >> @@ -0,0 +1,12 @@ >> +diff -purN host-dracut-055.orig/dracut.sh host-dracut-055/dracut.sh >> +--- host-dracut-055.orig/dracut.sh 2021-05-27 12:34:19.000000000 +0000 >> ++++ host-dracut-055/dracut.sh 2022-01-06 14:17:57.022317138 +0000 >> +@@ -868,8 +868,6 @@ export LC_ALL=C >> + export LANG=C >> + unset LC_MESSAGES >> + unset LC_CTYPE >> +-unset LD_LIBRARY_PATH >> +-unset LD_PRELOAD >> + unset GREP_OPTIONS >> + >> + export DRACUT_LOG_LEVEL=warning >> diff --git a/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch b/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch >> new file mode 100644 >> index 0000000000..ad5e97b34a >> --- /dev/null >> +++ b/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch >> @@ -0,0 +1,56 @@ >> +From 2c0188164223563adfce4852faa83d2553bee367 Mon Sep 17 00:00:00 2001 >> +From: Thierry Bultel<thierry.bultel@linatsea.fr> >> +Date: Mon, 10 Jan 2022 09:09:43 +0100 >> +Subject: [PATCH] add a module to fix libc ld links >> + >> +When using uClibc or musl, there must >> +be "ls-uClibc.so.1" or "ld-musl-x.so" symlinks, >> +respectively (else the init process cannot >> +start) >> + >> +Signed-off-by: Thierry Bultel<thierry.bultel@linatsea.fr> >> +--- >> + modules.d/05libc-links/module-setup.sh | 31 ++++++++++++++++++++++++++ >> + 1 file changed, 31 insertions(+) >> + create mode 100755 modules.d/05libc-links/module-setup.sh >> + >> +diff --git a/modules.d/05libc-links/module-setup.sh b/modules.d/05libc-links/module-setup.sh >> +new file mode 100755 >> +index 00000000..249bb80c >> +--- /dev/null >> ++++ b/modules.d/05libc-links/module-setup.sh >> +@@ -0,0 +1,31 @@ >> ++#!/bin/bash >> ++ >> ++# Adds the missing links for uClibc or musl, if needed >> ++ >> ++check() { >> ++ return 0 >> ++} >> ++ >> ++depends() { >> ++ return 0 >> ++} >> ++ >> ++install() { >> ++ >> ++ # Despite of the fact that the listed dependency (reported by readelf -d) >> ++ # is purely /lib/libc.so, the musl symlink is needed anyway. >> ++ >> ++ musl_link=$(find "${dracutsysrootdir}"/lib -name "ld-musl-*.so*") >> ++ if [ $? -eq 0 ] ; then >> ++ ln -s /lib/libc.so ${initdir}/lib/`basename "${musl_link}"` >> ++ fi >> ++ >> ++ # Same for uClibc, the listed dependency >> ++ # is ld-uClibc.so.1, the loader needs the ld-uClibc.so.0, too >> ++ >> ++ uclibc_link = $(find "${dracutsysrootdir}"/lib -name "ld-uClibc-*.so*") >> ++ if [ $? -eq 0 ] ; then >> ++ ln -s ld-uClibc.so.1 "${initdir}"/`basename "${uclibc_link}"` >> ++ fi >> ++ >> ++} >> +-- >> +2.25.1 >> + >> diff --git a/package/dracut/05busybox-buildroot/module-setup.sh b/package/dracut/05busybox-buildroot/module-setup.sh >> new file mode 100644 >> index 0000000000..ab4e0a5c50 >> --- /dev/null >> +++ b/package/dracut/05busybox-buildroot/module-setup.sh >> @@ -0,0 +1,60 @@ >> +#!/bin/bash >> + >> +check() { >> + require_binaries busybox || return 1 >> + return 0 >> +} >> + >> +depends() { >> + return 0 >> +} >> + >> +install_busybox_links() { >> + dir=$1 >> + linkname=$2 >> + >> + (cd "${dracutsysrootdir}${dir}" && >> + for x in *; do >> + if [ "$(readlink "$x")" = "${linkname}" ]; then >> + ln -sf "${linkname}" "${initdir}/${dir}/$x" >> + fi >> + done >> + ) >> +} >> + >> +install() { >> + inst_multiple /bin/busybox >> + >> + # wrapper script for early console; will launch /sbin/init >> + # after having mounted devtmpfs >> + inst_multiple /init >> + >> + ln -s ../bin/busybox "${initdir}"/sbin/init >> + >> + if [ -e "${dracutsysrootdir}/lib64" ]; then >> + ln -s lib "${initdir}/lib64" >> + ln -s lib "${initdir}/usr/lib64" >> + fi >> + >> + if [ -e "${dracutsysrootdir}/lib32" ]; then >> + ln -s lib "${initdir}/lib32" >> + ln -s lib "${initdir}/usr/lib32" >> + fi >> + >> + install_busybox_links "/bin" "busybox" >> + install_busybox_links "/sbin" "../bin/busybox" >> + install_busybox_links "/usr/bin" "../../bin/busybox" >> + install_busybox_links "/usr/sbin" "../../bin/busybox" >> + >> + inst_multiple \ >> + /etc/inittab \ >> + /etc/init.d/rcS \ >> + /etc/init.d/rcK \ >> + /etc/issue \ >> + /etc/fstab \ >> + /etc/group \ >> + /etc/passwd \ >> + /etc/shadow \ >> + /etc/hostname >> +} >> + >> diff --git a/package/dracut/Config.in.host b/package/dracut/Config.in.host >> new file mode 100644 >> index 0000000000..074d46f623 >> --- /dev/null >> +++ b/package/dracut/Config.in.host >> @@ -0,0 +1,10 @@ >> +config BR2_PACKAGE_HOST_DRACUT >> + bool >> + select BR2_PACKAGE_HOST_KMOD >> + select BR2_PACKAGE_HOST_CROSS_LDD >> + help >> + dracut is used to create an initramfs image by >> + copying tools and files from an installed system >> + and combining it with the dracut framework. >> + >> +https://dracut.wiki.kernel.org >> diff --git a/package/dracut/dracut b/package/dracut/dracut >> index 9d3db3b58e..eb15ea9abd 100644 >> --- a/package/dracut/dracut >> +++ b/package/dracut/dracut >> @@ -8,7 +8,7 @@ if [ -z "$*" ]; then >> exit >> fi >> >> -DRACUT_LDD=${TARGET_CROSS}ldd-cross \ >> +DRACUT_LDD=${TARGET_CROSS}ldd-buildroot \ >> DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ >> dracutbasedir=${HOST_DIR}/usr/lib/dracut \ >> dracutsysrootdir=${TARGET_DIR} \ >> diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk >> new file mode 100644 >> index 0000000000..5a9e154ccc >> --- /dev/null >> +++ b/package/dracut/dracut.mk >> @@ -0,0 +1,41 @@ >> +################################################################################ >> +# >> +# dracut >> +# >> +################################################################################ >> + >> +DRACUT_VERSION = 055 >> +DRACUT_SOURCE = dracut-$(DRACUT_VERSION).tar.xz >> +DRACUT_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/dracut >> +DRACUT_LICENSE = GPL-2.0 >> +DRACUT_LICENSE_FILES = COPYING >> + >> +HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-cross-ldd >> + >> +define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT >> + $(INSTALL) -D -m 0755 package/dracut/dracut \ >> + $(HOST_DIR)/sbin/dracut >> +endef >> +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT >> + >> + >> +# Dracut does not support busybox init (systemd init is assumed to work >> +# out of the box, though). It provides a busybox module, that does not >> +# use the same paths as buildroot, and is not meant to be used as an init >> +# system. >> +# So it is simplier for users to disable the standard 'busybox' module in >> +# the configuration file, and enable the "busybox-buildroot' module >> +# instead. >> +# Notice that setting the script as executable (0755) is not mandatory, >> +# but this is what dracut does on all its modules, so lets just conform >> +# to it. >> + >> +ifeq ($(BR2_INIT_BUSYBOX),y) >> +define HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE >> + $(INSTALL) -D -m 0755 package/dracut/05busybox-buildroot/module-setup.sh \ >> + $(HOST_DIR)/lib/dracut/modules.d/05busybox-buildroot/module-setup.sh >> +endef >> +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE >> +endif >> + >> +$(eval $(host-autotools-package)) >> diff --git a/package/dracut/dracut_wrapper.sh b/package/dracut/dracut_wrapper.sh >> new file mode 100644 >> index 0000000000..9d3db3b58e >> --- /dev/null >> +++ b/package/dracut/dracut_wrapper.sh >> @@ -0,0 +1,15 @@ >> +#!/bin/bash >> + >> +set -e >> +set -x >> + >> +if [ -z "$*" ]; then >> + echo "No argument supplied" >> + exit >> +fi >> + >> +DRACUT_LDD=${TARGET_CROSS}ldd-cross \ >> +DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ >> +dracutbasedir=${HOST_DIR}/usr/lib/dracut \ >> +dracutsysrootdir=${TARGET_DIR} \ >> +${HOST_DIR}/bin/dracut "$@" >> -- >> 2.25.1 >> >> _______________________________________________ >> buildroot mailing list >> buildroot@buildroot.org >> https://lists.buildroot.org/mailman/listinfo/buildroot > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/Config.in.host b/package/Config.in.host index b3e00bb482..caa28262be 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -14,6 +14,7 @@ menu "Host utilities" source "package/cramfs/Config.in.host" source "package/cryptsetup/Config.in.host" source "package/dbus-python/Config.in.host" + source "package/dracut/Config.in.host" source "package/dfu-util/Config.in.host" source "package/dos2unix/Config.in.host" source "package/dosfstools/Config.in.host" diff --git a/package/dracut/0000-enable-fakeroot.patch b/package/dracut/0000-enable-fakeroot.patch new file mode 100644 index 0000000000..e148485135 --- /dev/null +++ b/package/dracut/0000-enable-fakeroot.patch @@ -0,0 +1,12 @@ +diff -purN host-dracut-055.orig/dracut.sh host-dracut-055/dracut.sh +--- host-dracut-055.orig/dracut.sh 2021-05-27 12:34:19.000000000 +0000 ++++ host-dracut-055/dracut.sh 2022-01-06 14:17:57.022317138 +0000 +@@ -868,8 +868,6 @@ export LC_ALL=C + export LANG=C + unset LC_MESSAGES + unset LC_CTYPE +-unset LD_LIBRARY_PATH +-unset LD_PRELOAD + unset GREP_OPTIONS + + export DRACUT_LOG_LEVEL=warning diff --git a/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch b/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch new file mode 100644 index 0000000000..ad5e97b34a --- /dev/null +++ b/package/dracut/0001-add-a-module-to-fix-libc-ld-links.patch @@ -0,0 +1,56 @@ +From 2c0188164223563adfce4852faa83d2553bee367 Mon Sep 17 00:00:00 2001 +From: Thierry Bultel <thierry.bultel@linatsea.fr> +Date: Mon, 10 Jan 2022 09:09:43 +0100 +Subject: [PATCH] add a module to fix libc ld links + +When using uClibc or musl, there must +be "ls-uClibc.so.1" or "ld-musl-x.so" symlinks, +respectively (else the init process cannot +start) + +Signed-off-by: Thierry Bultel <thierry.bultel@linatsea.fr> +--- + modules.d/05libc-links/module-setup.sh | 31 ++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + create mode 100755 modules.d/05libc-links/module-setup.sh + +diff --git a/modules.d/05libc-links/module-setup.sh b/modules.d/05libc-links/module-setup.sh +new file mode 100755 +index 00000000..249bb80c +--- /dev/null ++++ b/modules.d/05libc-links/module-setup.sh +@@ -0,0 +1,31 @@ ++#!/bin/bash ++ ++# Adds the missing links for uClibc or musl, if needed ++ ++check() { ++ return 0 ++} ++ ++depends() { ++ return 0 ++} ++ ++install() { ++ ++ # Despite of the fact that the listed dependency (reported by readelf -d) ++ # is purely /lib/libc.so, the musl symlink is needed anyway. ++ ++ musl_link=$(find "${dracutsysrootdir}"/lib -name "ld-musl-*.so*") ++ if [ $? -eq 0 ] ; then ++ ln -s /lib/libc.so ${initdir}/lib/`basename "${musl_link}"` ++ fi ++ ++ # Same for uClibc, the listed dependency ++ # is ld-uClibc.so.1, the loader needs the ld-uClibc.so.0, too ++ ++ uclibc_link = $(find "${dracutsysrootdir}"/lib -name "ld-uClibc-*.so*") ++ if [ $? -eq 0 ] ; then ++ ln -s ld-uClibc.so.1 "${initdir}"/`basename "${uclibc_link}"` ++ fi ++ ++} +-- +2.25.1 + diff --git a/package/dracut/05busybox-buildroot/module-setup.sh b/package/dracut/05busybox-buildroot/module-setup.sh new file mode 100644 index 0000000000..ab4e0a5c50 --- /dev/null +++ b/package/dracut/05busybox-buildroot/module-setup.sh @@ -0,0 +1,60 @@ +#!/bin/bash + +check() { + require_binaries busybox || return 1 + return 0 +} + +depends() { + return 0 +} + +install_busybox_links() { + dir=$1 + linkname=$2 + + (cd "${dracutsysrootdir}${dir}" && + for x in *; do + if [ "$(readlink "$x")" = "${linkname}" ]; then + ln -sf "${linkname}" "${initdir}/${dir}/$x" + fi + done + ) +} + +install() { + inst_multiple /bin/busybox + + # wrapper script for early console; will launch /sbin/init + # after having mounted devtmpfs + inst_multiple /init + + ln -s ../bin/busybox "${initdir}"/sbin/init + + if [ -e "${dracutsysrootdir}/lib64" ]; then + ln -s lib "${initdir}/lib64" + ln -s lib "${initdir}/usr/lib64" + fi + + if [ -e "${dracutsysrootdir}/lib32" ]; then + ln -s lib "${initdir}/lib32" + ln -s lib "${initdir}/usr/lib32" + fi + + install_busybox_links "/bin" "busybox" + install_busybox_links "/sbin" "../bin/busybox" + install_busybox_links "/usr/bin" "../../bin/busybox" + install_busybox_links "/usr/sbin" "../../bin/busybox" + + inst_multiple \ + /etc/inittab \ + /etc/init.d/rcS \ + /etc/init.d/rcK \ + /etc/issue \ + /etc/fstab \ + /etc/group \ + /etc/passwd \ + /etc/shadow \ + /etc/hostname +} + diff --git a/package/dracut/Config.in.host b/package/dracut/Config.in.host new file mode 100644 index 0000000000..074d46f623 --- /dev/null +++ b/package/dracut/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_DRACUT + bool + select BR2_PACKAGE_HOST_KMOD + select BR2_PACKAGE_HOST_CROSS_LDD + help + dracut is used to create an initramfs image by + copying tools and files from an installed system + and combining it with the dracut framework. + + https://dracut.wiki.kernel.org diff --git a/package/dracut/dracut b/package/dracut/dracut index 9d3db3b58e..eb15ea9abd 100644 --- a/package/dracut/dracut +++ b/package/dracut/dracut @@ -8,7 +8,7 @@ if [ -z "$*" ]; then exit fi -DRACUT_LDD=${TARGET_CROSS}ldd-cross \ +DRACUT_LDD=${TARGET_CROSS}ldd-buildroot \ DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ dracutbasedir=${HOST_DIR}/usr/lib/dracut \ dracutsysrootdir=${TARGET_DIR} \ diff --git a/package/dracut/dracut.mk b/package/dracut/dracut.mk new file mode 100644 index 0000000000..5a9e154ccc --- /dev/null +++ b/package/dracut/dracut.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# dracut +# +################################################################################ + +DRACUT_VERSION = 055 +DRACUT_SOURCE = dracut-$(DRACUT_VERSION).tar.xz +DRACUT_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/dracut +DRACUT_LICENSE = GPL-2.0 +DRACUT_LICENSE_FILES = COPYING + +HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-cross-ldd + +define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT + $(INSTALL) -D -m 0755 package/dracut/dracut \ + $(HOST_DIR)/sbin/dracut +endef +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT + + +# Dracut does not support busybox init (systemd init is assumed to work +# out of the box, though). It provides a busybox module, that does not +# use the same paths as buildroot, and is not meant to be used as an init +# system. +# So it is simplier for users to disable the standard 'busybox' module in +# the configuration file, and enable the "busybox-buildroot' module +# instead. +# Notice that setting the script as executable (0755) is not mandatory, +# but this is what dracut does on all its modules, so lets just conform +# to it. + +ifeq ($(BR2_INIT_BUSYBOX),y) +define HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE + $(INSTALL) -D -m 0755 package/dracut/05busybox-buildroot/module-setup.sh \ + $(HOST_DIR)/lib/dracut/modules.d/05busybox-buildroot/module-setup.sh +endef +HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_BUSYBOX_MODULE +endif + +$(eval $(host-autotools-package)) diff --git a/package/dracut/dracut_wrapper.sh b/package/dracut/dracut_wrapper.sh new file mode 100644 index 0000000000..9d3db3b58e --- /dev/null +++ b/package/dracut/dracut_wrapper.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +set -e +set -x + +if [ -z "$*" ]; then + echo "No argument supplied" + exit +fi + +DRACUT_LDD=${TARGET_CROSS}ldd-cross \ +DRACUT_INSTALL="${HOST_DIR}/lib/dracut/dracut-install" \ +dracutbasedir=${HOST_DIR}/usr/lib/dracut \ +dracutsysrootdir=${TARGET_DIR} \ +${HOST_DIR}/bin/dracut "$@"