From bb499959d88da1b3937c23b5405089c907188a81 Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Thu, 10 Mar 2022 11:59:16 +0000
Subject: added and patched broken packages

---
 repo/linux/linux-firmware.xibuild |  4 ++--
 repo/linux/linux-headers.xibuild  |  4 ++--
 repo/linux/linux.xibuild          | 29 +++++++++++++++++------------
 3 files changed, 21 insertions(+), 16 deletions(-)

(limited to 'repo/linux')

diff --git a/repo/linux/linux-firmware.xibuild b/repo/linux/linux-firmware.xibuild
index 16746b7..67f5f14 100644
--- a/repo/linux/linux-firmware.xibuild
+++ b/repo/linux/linux-firmware.xibuild
@@ -10,6 +10,6 @@ BRANCH=0c6a7b3bf728b95c8b7b95328f94335e2bb2c967
 DESC="All firmware files for linux"
 
 package () {
-    mkdir -pv $PKG_DEST/usr/lib/firmware
-    cp -rv * $PKG_DEST/usr/lib/firmware
+    mkdir -p $PKG_DEST/usr/lib/firmware
+    cp -r * $PKG_DEST/usr/lib/firmware
 }
diff --git a/repo/linux/linux-headers.xibuild b/repo/linux/linux-headers.xibuild
index c7d4d5f..c4a3a7e 100644
--- a/repo/linux/linux-headers.xibuild
+++ b/repo/linux/linux-headers.xibuild
@@ -16,6 +16,6 @@ build () {
 }
 
 package () {
-    mkdir -pv $PKG_DEST/usr/include
-    cp -rv usr/include/* $PKG_DEST/usr/include/
+    mkdir -p $PKG_DEST/usr/include
+    cp -r usr/include/* $PKG_DEST/usr/include/
 }
diff --git a/repo/linux/linux.xibuild b/repo/linux/linux.xibuild
index caf0918..ff11076 100644
--- a/repo/linux/linux.xibuild
+++ b/repo/linux/linux.xibuild
@@ -3,39 +3,43 @@
 MAKEDEPS="make bc"
 DEPS="sbase kmod"
 
-PKG_VER=5.16.11
-SOURCE=https://cdn.kernel.org/pub/linux/kernel/v$(echo $PKG_VER | cut -d. -f1).x/linux-$PKG_VER.tar.xz
+PKG_VER=5.16.12
+SOURCE=https://cdn.kernel.org/pub/linux/kernel/v${PKG_VER%%.*}.x/linux-$PKG_VER.tar.xz
 ADDITIONAL="
-    https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/linux/trunk/config
+    config
+    fix-sbase-coreutils.patch
     "
 
 prepare () {
+    apply_patches
     mv config .config
 
+    export GREP="ggrep"
+
     make olddefconfig
     make -s kernelrelease > version
-    echo "Prepared linux version $(<version)"
+    echo "Prepared linux version $(cat version)"
 }
 
 build () {
-    make all
+    make all 
 }
 
 package () {
-    local kernver="$(<version)"
+    local kernver="$(cat version)"
     local modulesdir="$PKG_DEST/usr/lib/modules/$PKG_VER"
 
     echo "Installing boot image..."
-    mkdir -pv $PKG_DEST/boot
-    cp -iv arch/x86/boot/bzImage $PKG_DEST/boot/vmlinuz-$PKG_VER
-    cp -iv System.map $PKG_DEST/boot/System.map-$PKG_VER
-    cp -iv .config $PKG_DEST/boot/config-$PKG_VER
+    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
 
     install -d $PKG_DEST/usr/share/doc/linux-$PKG_VER
     cp -r Documentation/* $PKG_DEST/usr/share/doc/linux-$PKG_VER
 
 
-    install -v -m755 -d $PKG_DEST/etc/modprobe.d
+    install -m755 -d $PKG_DEST/etc/modprobe.d
     cat > $PKG_DEST/etc/modprobe.d/usb.conf << "EOF"
 # Begin /etc/modprobe.d/usb.conf
 
@@ -48,6 +52,7 @@ EOF
 
   echo "Installing modules..."
   make INSTALL_MOD_PATH="$PKG_DEST/usr" INSTALL_MOD_STRIP=1 modules_install
-  rm "$modulesdir"/{source,build}
+  rm "$modulesdir"/source
+  rm "$modulesdir"/build
 }
 
-- 
cgit v1.2.1