From 94e8b22effabf66d1999fa16e4a816e01b3e21be Mon Sep 17 00:00:00 2001 From: aliriza Date: Fri, 10 Feb 2023 13:35:11 +0000 Subject: [PATCH] initramfs-tools update --- .../patches/no-coreutils.patch | 30 +++++++++++++++++++ .../{ => patches}/non-debian.patch | 0 .../{ => patches}/remove-logsave.patch | 0 .../{ => patches}/remove-zstd.patch | 0 sys/kernel/initramfs-tools/ympbuild | 11 ++++--- 5 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 sys/kernel/initramfs-tools/patches/no-coreutils.patch rename sys/kernel/initramfs-tools/{ => patches}/non-debian.patch (100%) rename sys/kernel/initramfs-tools/{ => patches}/remove-logsave.patch (100%) rename sys/kernel/initramfs-tools/{ => patches}/remove-zstd.patch (100%) diff --git a/sys/kernel/initramfs-tools/patches/no-coreutils.patch b/sys/kernel/initramfs-tools/patches/no-coreutils.patch new file mode 100644 index 00000000..0f268b30 --- /dev/null +++ b/sys/kernel/initramfs-tools/patches/no-coreutils.patch @@ -0,0 +1,30 @@ +diff --git a/hook-functions b/hook-functions +index 95bd584..1909e8d 100644 +--- a/hook-functions ++++ b/hook-functions +@@ -200,7 +200,7 @@ copy_file() { + + # Create a relative link so it always points + # to the right place +- ln -rs "${DESTDIR}/${link_target}" "${DESTDIR}/${target}" ++ ln -s "${DESTDIR}/${link_target}" "${DESTDIR}/${target}" + fi + + # Copy the link target if it doesn't already exist +@@ -863,7 +863,7 @@ cache_run_scripts() + [ ! -d "${initdir}" ] && return + + true > "${initdir}/ORDER" +- runlist=$(get_prereq_pairs | tsort) ++ runlist=$(get_prereq_pairs | sort) + for crs_x in ${runlist}; do + [ -f "${initdir}/${crs_x}" ] || continue + echo "${scriptdir}/${crs_x} \"\$@\"" >> "${initdir}/ORDER" +@@ -901,6 +901,6 @@ run_scripts() + initdir=${1} + [ ! -d "${initdir}" ] && return + +- runlist=$(get_prereq_pairs | tsort) ++ runlist=$(get_prereq_pairs | sort) + call_scripts "$scriptdir" + } diff --git a/sys/kernel/initramfs-tools/non-debian.patch b/sys/kernel/initramfs-tools/patches/non-debian.patch similarity index 100% rename from sys/kernel/initramfs-tools/non-debian.patch rename to sys/kernel/initramfs-tools/patches/non-debian.patch diff --git a/sys/kernel/initramfs-tools/remove-logsave.patch b/sys/kernel/initramfs-tools/patches/remove-logsave.patch similarity index 100% rename from sys/kernel/initramfs-tools/remove-logsave.patch rename to sys/kernel/initramfs-tools/patches/remove-logsave.patch diff --git a/sys/kernel/initramfs-tools/remove-zstd.patch b/sys/kernel/initramfs-tools/patches/remove-zstd.patch similarity index 100% rename from sys/kernel/initramfs-tools/remove-zstd.patch rename to sys/kernel/initramfs-tools/patches/remove-zstd.patch diff --git a/sys/kernel/initramfs-tools/ympbuild b/sys/kernel/initramfs-tools/ympbuild index 329d2c5b..dec06378 100644 --- a/sys/kernel/initramfs-tools/ympbuild +++ b/sys/kernel/initramfs-tools/ympbuild @@ -8,16 +8,18 @@ email='aliriza.keskin@pardus.org.tr' maintainer='aliriza' license=('GPLv3') source=("https://salsa.debian.org/kernel-team/initramfs-tools/-/archive/v$version/initramfs-tools-v$version.tar.gz" - "remove-zstd.patch" - "non-debian.patch" - "remove-logsave.patch" + "patches/remove-zstd.patch" + "patches/non-debian.patch" + "patches/remove-logsave.patch" + "patches/no-coreutils.patch" "initramfs-tools.sysconf") -depends=(eudev coreutils findutils) +depends=(eudev findutils) makedepends=() md5sums=('a3765010fe0fc6a71fe900a798b759ea' 'SKIP' 'SKIP' 'SKIP' + 'SKIP' 'SKIP') uses=() group=(sys.kernel) @@ -29,6 +31,7 @@ prepare(){ patch -Np1 < ../remove-zstd.patch patch -Np1 < ../remove-logsave.patch patch -Np1 < ../non-debian.patch + patch -Np1 < ../no-coreutils.patch } package(){