summaryrefslogtreecommitdiff
path: root/repo
diff options
context:
space:
mode:
Diffstat (limited to 'repo')
-rw-r--r--repo/linux/linux.xibuild9
-rw-r--r--repo/system/eudev.xibuild28
-rw-r--r--repo/system/sbase.xibuild6
-rw-r--r--repo/util/dracut.xibuild17
-rw-r--r--repo/util/grep.xibuild5
5 files changed, 37 insertions, 28 deletions
diff --git a/repo/linux/linux.xibuild b/repo/linux/linux.xibuild
index 94d0cdf..ebc74a6 100644
--- a/repo/linux/linux.xibuild
+++ b/repo/linux/linux.xibuild
@@ -3,11 +3,11 @@
MAKEDEPS="make bc"
DEPS="sbase kmod"
-PKG_VER=5.16.14
+PKG_VER=5.17.1
SOURCE=https://cdn.kernel.org/pub/linux/kernel/v${PKG_VER%%.*}.x/linux-$PKG_VER.tar.xz
ADDITIONAL="
- config
fix-sbase-coreutils.patch
+ config
"
prepare () {
@@ -31,6 +31,7 @@ package () {
echo "Installing boot image..."
mkdir -p $PKG_DEST/boot
+
cp arch/x86/boot/bzImage $PKG_DEST/boot/vmlinuz-$PKG_VER
cp System.map $PKG_DEST/boot/System.map-$PKG_VER
cp .config $PKG_DEST/boot/config-$PKG_VER
@@ -50,7 +51,7 @@ EOF
echo "Installing modules..."
make INSTALL_MOD_PATH="$PKG_DEST/usr" INSTALL_MOD_STRIP=1 modules_install
- rm "$modulesdir"/source
- rm "$modulesdir"/build
+ #rm "$modulesdir"/source
+ #rm "$modulesdir"/build
}
diff --git a/repo/system/eudev.xibuild b/repo/system/eudev.xibuild
index 8697c0f..c6bb6da 100644
--- a/repo/system/eudev.xibuild
+++ b/repo/system/eudev.xibuild
@@ -1,6 +1,6 @@
#!/bin/sh
-MAKEDEPS="make "
+MAKEDEPS="make autoconf automake"
DEPS="gperf udev-rules kmod"
PKG_VER=3.2.10
@@ -12,30 +12,22 @@ ADDITIONAL="
"
prepare () {
- apply_patches
+ #apply_patches
+ autoreconf -fiv
sed -i 's/\$(LN_S) -n -f/\$(LN_S) -f/' src/udev/Makefile.in
}
build () {
- ./configure \
- --prefix=/usr \
- --bindir=/usr/sbin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --enable-split-usr \
- --enable-manpages \
- --disable-hwdb \
- --enable-modules \
- --enable-kmod
- --disable-static
+ ./configure --prefix=/usr \
+ --bindir=/usr/sbin \
+ --sbindir=/usr/sbin \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --enable-manpages \
+ --disable-static
make
}
package () {
- mkdir -p $PKG_DEST/usr/lib/udev/rules.d
- mkdir -p $PKG_DEST/etc/udev/rules.d
-
make DESTDIR=$PKG_DEST install
- rm -rf $PKG_DEST/sbin
}
diff --git a/repo/system/sbase.xibuild b/repo/system/sbase.xibuild
index a101bb9..e4a36cd 100644
--- a/repo/system/sbase.xibuild
+++ b/repo/system/sbase.xibuild
@@ -29,8 +29,8 @@ package () {
make PREFIX=/usr DESTDIR=$PKG_DEST install
# these are provided by other utils
- for p in tar sed find xargs; do
- rm $PKG_DEST/usr/bin/$p
- rm $PKG_DEST/usr/share/man/man1/$p.1
+ for p in tar sed find xargs grep; do
+ mv $PKG_DEST/usr/bin/$p $PKG_DEST/usr/bin/s$p
+ mv $PKG_DEST/usr/share/man/man1/$p.1 $PKG_DEST/usr/share/man/man1/s$p.1
done
}
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
}