mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-19 16:40:46 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/dracut: use host-cross-ldd instead of host-prelink-cross

Browse Source 
This commit reworks the dracut package to use the cross-ldd installed
by host-cross-ldd instead of prelink-rtld installed by
host-prelink-cross.

Indeed, prelink-cross is not maintained upstream, and its dependency
on host-libiberty causes problems in Buildroot with other packages.

The only change needed is that the dracut_wrapper script needs to be
generated, as we now need to know the prefix of the cross-compilation
tool (TARGET_CROSS).

Tested by running the dracut tests of the test suite.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
This commit is contained in:
Thomas Petazzoni
2025-01-08 23:43:15 +01:00
committed by Romain Naour
parent 2528672d39
commit b171b7bd78
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/dracut/dracut.mk
View File

@@ -10,12 +10,14 @@ DRACUT_LICENSE = GPL-2.0
DRACUT_LICENSE_FILES = COPYING DRACUT_LICENSE_FILES = COPYING
DRACUT_CPE_ID_VALID = YES DRACUT_CPE_ID_VALID = YES
HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-prelink-cross HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-cross-ldd
define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT define HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT
mv $(HOST_DIR)/bin/dracut $(HOST_DIR)/bin/dracut.real mv $(HOST_DIR)/bin/dracut $(HOST_DIR)/bin/dracut.real
install -D -m 0755 $(HOST_DRACUT_PKGDIR)/dracut_wrapper \ sed -e "s%@@TARGET_CROSS@@%$(TARGET_CROSS)%" \
$(HOST_DIR)/bin/dracut $(HOST_DRACUT_PKGDIR)/dracut_wrapper.in > \
$(@D)/dracut_wrapper
install -D -m 0755 $(@D)/dracut_wrapper $(HOST_DIR)/bin/dracut
endef endef
HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT HOST_DRACUT_POST_INSTALL_HOOKS += HOST_DRACUT_POST_INSTALL_WRAPPER_SCRIPT

2
package/dracut/dracut_wrapper → package/dracut/dracut_wrapper.in
View File

@@ -34,7 +34,7 @@ topdir="$(dirname "$(realpath "$(dirname "${0}")")")"
DRACUT_LDD="$(mktemp /tmp/dracut-ldd.XXXXXX)" DRACUT_LDD="$(mktemp /tmp/dracut-ldd.XXXXXX)"
cat >"${DRACUT_LDD}" <<EOL cat >"${DRACUT_LDD}" <<EOL
#!/bin/bash #!/bin/bash
${topdir}/sbin/prelink-rtld --root='${sysroot}' \${1} @@TARGET_CROSS@@xldd --root='${sysroot}' \${1}
EOL EOL
chmod +x "${DRACUT_LDD}" chmod +x "${DRACUT_LDD}"
export DRACUT_LDD export DRACUT_LDD