From 14a1fee0a54d94f0f57f50d2532849f3c2383a15 Mon Sep 17 00:00:00 2001 From: davidovski Date: Tue, 29 Mar 2022 22:30:13 +0100 Subject: fixed dracut to work, and can boot --- repo/util/dracut.xibuild | 17 +++++++++++++++++ repo/util/grep.xibuild | 5 ++--- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'repo/util') diff --git a/repo/util/dracut.xibuild b/repo/util/dracut.xibuild index 30b8641..3bc9e0a 100644 --- a/repo/util/dracut.xibuild +++ b/repo/util/dracut.xibuild @@ -13,6 +13,23 @@ ADDITIONAL=" prepare () { apply_patches + # make all this into a patch + find ./ -name "*.sh" | xargs sed -i "s/ln -sfn/ln -sf/g" + find ./ -name "*.sh" | xargs sed -i "s/ln -sfr/ln -sf/g" + find ./ -name "*.sh" | xargs sed -i "s/sort -Vu/sort -u/g" + find ./ -name "*.sh" | xargs sed -i "s/realpath -e/realpath /g" + find ./ -name "*.sh" | xargs sed -i "s/cp --reflink=auto/cp /g" + find ./ -name "*.sh" | xargs sed -i "s/cp -axT/cp -a/g" + find ./ -name "*.sh" | xargs sed -i "s/cp -ax/cp -a/g" + find ./ -name "*.sh" | xargs sed -i "s/cp -a -t/cp -a/g" + find ./ -name "*.sh" | xargs sed -i "s/cp -af \. -t/cp -af . /g" + find ./ -name "*.sh" | xargs sed -i "s/cp -a -l/cp -a/g" + find ./ -name "*.sh" | xargs sed -i "s/cp -a --/cp -a/g" + find ./ -name "*.sh" | xargs sed -i "s/cp -f --/cp -f/g" + find ./ -name "*.sh" | xargs sed -i "s/cp --sparse=auto --preserve=.* -dfr/cp -fr/g" + find ./ -name "*.sh" | xargs sed -i "s/\$CP_HARDLINK --backup --suffix=.usrmove~//g" + find ./ -name "*.sh" | xargs sed -i "s/find . -print0 | sort -z/find . -print0/g" + } build () { diff --git a/repo/util/grep.xibuild b/repo/util/grep.xibuild index e7689f9..52cd6f7 100644 --- a/repo/util/grep.xibuild +++ b/repo/util/grep.xibuild @@ -1,7 +1,7 @@ #!/bin/sh MAKEDEPS="grep make " -DEPS="musl pcre2" +DEPS="musl pcre" PKG_VER=3.7 SOURCE=https://ftp.gnu.org/gnu/grep/grep-$PKG_VER.tar.xz @@ -18,6 +18,5 @@ check () { package () { make DESTDIR=$PKG_DEST install - mv $PKG_DEST/bin/grep $PKG_DEST/bin/ggrep - + ln -s grep $PKG_DEST/bin/ggrep } -- cgit v1.2.1