Transfer of initrd (nyanit) build into kernel pkgbuild. Version bump

PKGBUILD

@@ -1,18 +1,22 @@
 # Maintainer: Kira <[@kira](https://dev.kira-linux.org/kira)>
 
 pkgbase=linux-kira-lts
-pkgver=6.18.43
+pkgver=6.18.46
 pkgrel=1
 pkgdesc='Kira LTS Linux'
 url='https://www.kernel.org'
-_bcachefs_ver=1.39.1
+_bcachefs_ver=1.39.2
+_nyanit_ver=0.2.1-1
 
 arch=(x86_64)
 makedepends=(
-  bzz-initrd
+  bcachefs-tools
   bc
   binutils
   cpio
+  dosfstools
+  coreutils
+  pax-utils
   gettext
   glibc
   libelf
@@ -34,18 +38,20 @@ makedepends=(
   python-sphinx
   python-yaml
   texlive-latexextra
-
 )
 options=(
   !debug
 )
-_bcachefs_src_dir=bcachefs-tools-$_bcachefs_ver
+_nyanit_src=v${_nyanit_ver}.tar.gz
 _nyanit_src_dir=nyanit
+_bcachefs_src_dir=bcachefs-tools-$_bcachefs_ver
 _srcname=linux-$pkgver
 _srctag=v$pkgver
+
 source=(
   https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
   https://github.com/koverstreet/bcachefs-tools/archive/refs/tags/v${_bcachefs_ver}.tar.gz
+  https://dev.kira-linux.org/kira-linux/nyanit/archive/${_nyanit_src}
   0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
   0002-drm-amdgpu-avoid-memory-allocation-in-the-critical-code-path-v3.patch
   0003-drm-amdgpu-use-GFP_ATOMIC-instead-of-NOWAIT-in-the-critical-path.patch
@@ -59,23 +65,25 @@ validpgpkeys=(
 )
 
 # https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256sums=('a1aeb926c7c4a1564368200b1082e45bb958007682d804aff88abbc3a7a47b5d'
+sha256sums=('f5d44b93808b02cc2969c5404ba081d97523719c9fd2ba2de6db318b4141cca0'
             'SKIP'
-            '4c29a25036c5795f9ebe0dbc619c803b73447e8f938bd40e7f7ea223d038a38d'
+            '87e08942d4a94a38c463202cde31b2923e1fb67698e661a61c781f80b95e4997'
+            '9c8e20c3d32174037b26fea4e936467ed9391284bf7ff4675ecf4a83fd820742'
             'e5bda61fa4405571a0267cd8812329bb8a432a37efb50459461628d371849906'
             'c31b8c0ace123f5c1a0012a1254272eea9ac9cdd0d3e5d538ca6b11830dd01b0'
             '0f482368b62c3cece941e2d3ba497bf322db59315df5c2f72500fc1318e4768e'
-            '60a560c3c4324322dc97b6d4d75dea6182a17f6747b4a42054c053a99b1635df'
-            'a1f0001ec03f1f1d75d6f72165dc77b42145b3fc1c8de20afcd512c6c677482b'
+            'e652e2d7ccb388802684ae5ab4481fb33b78212b8a97d579b9be80060b02df18'
+            'cc00807a0b1a0163728c797195b2cb97c23930118bfb47fa24c00b35527c3519'
             'c6aa9877b0612805690d8abfc13c941530a11a7b56979d814e674c86c42ca0cf')
-b2sums=('434ba598863ac5ede162d7147a78884c2dc6090e8f0447f6368a681a0e7077143a0753c62f4ad6e1be8b971a46266bf00f3b3fe4218345483360bda86a3f855c'
+b2sums=('0a378ec56bfc97a2de3403e37bc7a3fe8e3fb876f4afdb5278310362745ec192acd56c9330e42f52019b6c35244f95691efb14afed338347a95f9846fcb386ca'
         'SKIP'
-        '7aa199260780c3867295a2bbb46badddd9e9ec84a1339c2d26ebc79048181c88cf96246c1025611c7608962f2efe95769850d836aa927803135fe7a0232a0bfb'
+        '79d40bbd52345c6c2aa682ad1ddd8bc98b1e32110f34b82c0076cf6cadad9a24ea83e866727b9cbd18e23b46194d1f5a7b5d82e4e2719f3e97dc25f106a81d92'
+        '05f25e60c491b7ef558d832addd44784db09170418f643ad341050dddb60a78fb9feb9fb47603cdd4a651eacf1b1cbf515bf37dadf84b8dfc2755c1eeead7c30'
         '5b3597cab8b174ff41b3f17aae6d1376a155356f781542e2e176d66c5a6dee53f7a1db8e2b9540ce8246efac4e27476c882fc8cc8063f0f514ae09230b5aef0a'
         'a71f78bea42d158fc9383f2bbb985dafa71274d2032876b67f84602c8085b1c53f3d36965e54e5fdbab5c0d7537c98d917bd7743d3cf373c1dcb6da3bc19f4e7'
         'c9d4ec8fac86a9b6f0567c57f6d5be04d56f8efbc9dc1b183981dad38387d750b53c17fcdd295cb68a874bf50f81d117cfe94bd3a8d9e08e1918644ae8daa3e5'
-        '58484f0e3123a3a5eac2f00d1a892dd51492ebbfd1dfd01ac9f05deaf733dd9c7993845a905f22c1e655d8fe74d40fb6e11d786626bea89a990616846c561141'
-        '7951209de07fd31600d838f34ca00fca94384f71936d81a0d3c0b3bd5069b984be1de31715a43e3badc828e3bc4129bebe090661c57395e80471be0cbc1302c9'
+        '1127262c540b09fc030854db6e6f4c93ab2475956f986d6327c99a0ff87eea635ea7bb0d1cdb246d0a64b938d6be59cf847d359c6f084db2b424a0ceeebcfab7'
+        '938ff785b5ff3ec883b65e16d422889691624c996e01bcd1c91e9b80903fc32211c10eba1fe11f13f984a7d6c5264f1765f00678abeb82894d794b3eb7ad6dc3'
         '2d581d66fe4e4afe0158755f5ea0cd0df9765b63464cb81e2b9115a37230e4489f16526393c47009c4392e5de70d2d37e496f764ad89e214ec7010c5bbfbcfc1')
 
 export KBUILD_BUILD_HOST=kiralinux
@@ -131,8 +139,25 @@ prepare() {
   echo "Prepared $pkgbase version $(<version)"
 }
 
+
 build() {
 
+  echo "Building NYANIT..."
+  cd $_nyanit_src_dir
+  cargo build --release
+  cp target/release/nyanit $srcdir/init
+  chmod +x $srcdir/init
+  echo "##### DONE Building NYANIT #####"
+  echo ""
+
+  echo "Build initramfs image..."
+  cd $srcdir
+  $_nyanit_src_dir/build_initcpio.sh $srcdir
+  mv $srcdir/initramfs.cpio $srcdir/$_srcname/
+  echo ""
+
+  echo "Build Linux..."
+
   cd $srcdir/$_srcname
 
   echo "Building docs..."
@@ -141,6 +166,7 @@ build() {
 
   echo "Building all"
   make all
+  echo ""
 
   # BPF stuff that makes world a worse place
   # make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1
@@ -208,6 +234,7 @@ _package() {
     NTSYNC-MODULE
     VIRTUALBOX-GUEST-MODULES
     WIREGUARD-MODULE
+    'initramfs'
   )
   replaces=(
     wireguard-lts