We shouldn't run ldd on non-executable files (see #799443). Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- hook-functions | 8 +++----- mkinitramfs | 7 ++++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/hook-functions b/hook-functions index 407dc61..9c6732d 100644 --- a/hook-functions +++ b/hook-functions @@ -107,12 +107,10 @@ manual_add_modules() fi if [ -e "/lib/firmware/${version}/${firmware}" ]; then - copy_exec "/lib/firmware/${version}/${firmware}" + copy_file firmware \ + "/lib/firmware/${version}/${firmware}" else - copy_exec "/lib/firmware/${firmware}" - fi - if [ "${verbose}" = "y" ]; then - echo "Adding firmware ${firmware}" + copy_file firmware "/lib/firmware/${firmware}" fi done done diff --git a/mkinitramfs b/mkinitramfs index b64c7fb..fac0049 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -255,9 +255,10 @@ echo "DPKG_ARCH=${DPKG_ARCH}" > ${DESTDIR}/conf/arch.conf cp -p "${CONFDIR}/initramfs.conf" ${DESTDIR}/conf for i in ${EXTRA_CONF}; do if [ -e "${CONFDIR}/conf.d/${i}" ]; then - copy_exec "${CONFDIR}/conf.d/${i}" /conf/conf.d + copy_file config "${CONFDIR}/conf.d/${i}" /conf/conf.d elif [ -e "/usr/share/initramfs-tools/conf.d/${i}" ]; then - copy_exec "/usr/share/initramfs-tools/conf.d/${i}" /conf/conf.d + copy_file config "/usr/share/initramfs-tools/conf.d/${i}" \ + /conf/conf.d fi done @@ -307,7 +308,7 @@ fi # Apply DSDT to initramfs if [ -e "${CONFDIR}/DSDT.aml" ]; then - copy_exec "${CONFDIR}/DSDT.aml" / + copy_file DSDT "${CONFDIR}/DSDT.aml" fi # Make sure there is a final sh in initramfs
Attachment:
signature.asc
Description: Digital signature