Different build process improvement and testing.

PKGBUILD

@@ -1,13 +1,13 @@
 # Maintainer: Kira <[@kira](https://dev.kira-linux.org/kira)>
 
 pkgname=bzz-initrd
-pkgver=0.1.1
+pkgver=0.1.5
 pkgrel=1
 pkgdesc='Initrd image for Kira Linux'
 url='https://dev.kira-linux.org'
 arch=(x86_64)
 
-_nyanit_ver=0.1.2
+_nyanit_ver=0.1.5
 _nyanit_src=v${_nyanit_ver}.tar.gz
 
 makedepends=(
@@ -36,8 +36,14 @@ source=(
   https://dev.kira-linux.org/kira-linux/nyanit/archive/${_nyanit_src}
 )
 
-sha256sums=('b10be774afaec229c4580b69dd41834fb035653ff026d7e0523d3085b13f6d73')
-b2sums=('f9e67272e5bc86c38f140b0fceb276e993827ec3c2d736deaff9076a20a6726cd4bc1df5c060c0836a4981d774987e7bdcfc301267bd22133fd9d56ebb5b9496')
+# source=(
+#   nyanit.zip
+# )
+
+
+
+sha256sums=('fd2d19e0a07e6ac997a21e33617915d6791bd1de2f63f602d64dd454e67908b3')
+b2sums=('23a6a81ac74001f518a64b18d63e42fc096e85b053782d2954709e8abacde60b774964b1edc645a47ea7e0198f1f4b01d4d0d187ba6231211c97712164472a31')
 
 _tools_list=(
   /usr/bin/mount
@@ -47,7 +53,11 @@ _tools_list=(
   /usr/bin/fsck.vfat
   /usr/bin/switch_root
   /usr/bin/ls
+  /usr/bin/lsblk
+  /usr/bin/cp
+  /usr/bin/mv
   /usr/bin/sh
+  /usr/bin/bash
 )
 
 build() {
@@ -62,11 +72,15 @@ build() {
 
   echo "Populate initdramfs tree..."
   cd $srcdir
-  mkdir -p initramfs/{bin,lib,lib64,dev,proc,sys,mnt,tmp,etc}
+  mkdir -p initramfs/{dev,proc,sys,mnt,tmp,etc,usr,usr/bin,usr/lib}
 
-  echo "Create device node"
-  cd initramfs
-  sudo mknod -m 622 dev/console c 5 1
+  echo "Create /bin /lib /lib64 simlinks"
+  cd $srcdir/initramfs
+  ln -s usr/lib lib64
+  ln -s usr/lib lib
+  ln -s usr/bin bin
+  cd $srcdir/initramfs/usr
+  ln -s lib lib64
 
   echo "Install NYANIT..."
   cd $srcdir
@@ -76,16 +90,8 @@ build() {
   cd $srcdir
   lddtree --copy-to-tree $srcdir/initramfs "${_tools_list[@]}"
 
-  echo "Copy /usr/lib/libc.so"
-  cp /usr/lib/libc.so  $srcdir/initramfs/usr/lib/
-
-  echo "Run ldconfig"
-  ldconfig -r $srcdir/initramfs -v
-
-  # Create cpio archive
-  echo "Create cpio archive"
-  cd $srcdir/initramfs
-  find . | cpio -ov --format=newc > ../initramfs.cpio
+  echo "Remove setuid flag from everything..."
+  chmod -R a-s $srcdir/initramfs
 
 }
 
@@ -98,6 +104,21 @@ package() {
     Zlib
   )
 
+  echo "Create device node"
+  cd $srcdir/initramfs
+  mknod -m 622 dev/console c 5 1
+
+  # echo "Change owner to root"
+  # chown -R root:root $srcdir/initramfs
+
+  # echo "Run ldconfig"
+  # ldconfig -r $srcdir/initramfs -v
+
+   # Create cpio archive
+  echo "Create cpio archive"
+  cd $srcdir/initramfs
+  find . | cpio -ov --format=newc > ../initramfs.cpio
+
   echo "Installing bzz-initrd"
   install -vDm 644 $srcdir/initramfs.cpio -t "$pkgdir/usr/share/$pkgname/"
 }