diff --git a/PKGBUILD b/PKGBUILD index 7d91fc2..b67baf6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,27 +1,27 @@ # Maintainer: Kira <[@kira](https://dev.kira-linux.org/kira)> pkgname=bzz-initrd -pkgver=0.0.1 +pkgver=0.1.1 pkgrel=1 pkgdesc='Initrd image for Kira Linux' url='https://dev.kira-linux.org' arch=(x86_64) -_nyanit_ver=0.1.0-rc2 +_nyanit_ver=0.1.2 _nyanit_src=v${_nyanit_ver}.tar.gz makedepends=( bcachefs-tools coreutils pax-utils + rust + tar bc cpio gettext pahole perl python - rust - tar xz gzip zstd @@ -36,8 +36,8 @@ source=( https://dev.kira-linux.org/kira-linux/nyanit/archive/${_nyanit_src} ) -sha256sums=('a72256b6fc705cb1a20486edcddc4b1d46d41c83cb0438a4697242d31d3be2b9') -b2sums=('d44d8211d5c28f55e271e1b93f3967696c0ee701f1c9649ba01ce23463303c528d7a54a51decf202f57dcf205ece785df642056b634a756fcb177619e1979119') +sha256sums=('b10be774afaec229c4580b69dd41834fb035653ff026d7e0523d3085b13f6d73') +b2sums=('f9e67272e5bc86c38f140b0fceb276e993827ec3c2d736deaff9076a20a6726cd4bc1df5c060c0836a4981d774987e7bdcfc301267bd22133fd9d56ebb5b9496') _tools_list=( /usr/bin/mount @@ -47,29 +47,45 @@ _tools_list=( /usr/bin/fsck.vfat /usr/bin/switch_root /usr/bin/ls + /usr/bin/sh ) build() { - echo "Populate initdramfs tree..." - mkdir -p initramfs/{bin,lib,lib64,dev,proc,sys,new_root} - echo "Building NYANIT..." cd $_nyanit_src_dir cargo build --release - cp target/release/nyanit $srcdir/initramfs/nyanit - chmod +x $srcdir/initramfs/nyanit + cp target/release/nyanit $srcdir/init + chmod +x $srcdir/init echo "##### DONE Building NYANIT #####" echo "" + echo "Populate initdramfs tree..." + cd $srcdir + mkdir -p initramfs/{bin,lib,lib64,dev,proc,sys,mnt,tmp,etc} + + echo "Create device node" + cd initramfs + sudo mknod -m 622 dev/console c 5 1 + + echo "Install NYANIT..." + cd $srcdir + lddtree --bindir / --copy-to-tree $srcdir/initramfs init + echo "Copy libs and binaries" 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 compressed cpio archive" + echo "Create cpio archive" cd $srcdir/initramfs - find . -print0 | cpio --null -ov --format=newc > ../initramfs.cpio + find . | cpio -ov --format=newc > ../initramfs.cpio }