diff --git a/templates/initramfs-tools/initramfs-tools-xbps.diff b/templates/initramfs-tools/initramfs-tools-xbps.diff index 9be20acb500..c16ee1bc106 100644 --- a/templates/initramfs-tools/initramfs-tools-xbps.diff +++ b/templates/initramfs-tools/initramfs-tools-xbps.diff @@ -155,11 +155,11 @@ -# workaround: libgcc always needed on old-abi arm -if [ "$DPKG_ARCH" = arm ] || [ "$DPKG_ARCH" = armeb ]; then - cp -a /lib/libgcc_s.so.1 "${DESTDIR}/lib/" -+copy_exec /usr/lib/klibc/sbin/modprobe /sbin -+copy_exec /usr/lib/klibc/sbin/depmod /sbin -+copy_exec /usr/lib/klibc/sbin/lsmod /sbin -+copy_exec /usr/lib/klibc/sbin/rmmod /sbin -+copy_exec /usr/lib/klibc/sbin/insmod /sbin ++copy_exec /sbin/modprobe /sbin ++copy_exec /sbin/depmod /sbin ++# ++copy_exec /sbin/rmmod /sbin ++# +if [ -d /etc/modprobe.d ]; then + mkdir -p "${DESTDIR}/etc/modprobe.d" + cp -a /etc/modprobe.d/* "${DESTDIR}/etc/modprobe.d/" diff --git a/templates/initramfs-tools/template b/templates/initramfs-tools/template index c655d6fb50c..dc6075b8a1d 100644 --- a/templates/initramfs-tools/template +++ b/templates/initramfs-tools/template @@ -1,7 +1,7 @@ # Template file for 'initramfs-tools' pkgname=initramfs-tools version=0.93.2 -revision=3 +revision=4 wrksrc=$pkgname patch_files="$pkgname-xbps.diff" distfiles="${DEBIAN_SITE}/main/i/${pkgname}/${pkgname}_${version}.tar.gz" @@ -26,16 +26,15 @@ conf_files="/etc/$pkgname/initramfs.conf /etc/$pkgname/update-initramfs.conf Add_dependency full glibc Add_dependency full cpio Add_dependency full util-linux-ng -Add_dependency build klibc -Add_dependency run klibc-utils -Add_dependency full klibc-udev -Add_dependency full klibc-module-init-tools Add_dependency full gawk Add_dependency full findutils Add_dependency full sed Add_dependency full grep Add_dependency full gzip -Add_dependency full libblkid +Add_dependency full udev +Add_dependency full module-init-tools +Add_dependency build klibc +Add_dependency run klibc-utils Add_dependency run xbps-base-pkg do_install()