Compare commits

...
4 Commits
2 changed files with 13 additions and 51 deletions
+5 -5
View File
@@ -1,7 +1,7 @@
pkgbase = bzz-initrd pkgbase = bzz-initrd
pkgdesc = Initrd image for Kira Linux pkgdesc = Initrd image for Kira Linux
pkgver = 0.1.7 pkgver = 0.2.1
pkgrel = 1 pkgrel = 3
url = https://dev.kira-linux.org url = https://dev.kira-linux.org
arch = x86_64 arch = x86_64
makedepends = bcachefs-tools makedepends = bcachefs-tools
@@ -20,9 +20,9 @@ pkgbase = bzz-initrd
makedepends = gzip makedepends = gzip
makedepends = zstd makedepends = zstd
options = !debug options = !debug
source = https://dev.kira-linux.org/kira-linux/nyanit/archive/v0.1.6.tar.gz source = https://dev.kira-linux.org/kira-linux/nyanit/archive/v0.2.1-1.tar.gz
sha256sums = 3b71ddc98088ecde2c9a87815ba7f11ae126df7b3d3e6b44846b135234637300 sha256sums = 9c8e20c3d32174037b26fea4e936467ed9391284bf7ff4675ecf4a83fd820742
b2sums = 848605659ca4d5399720f0e8baf2abfdf05ba970b1eb117a7477ec6cd6e407690c9f28e76f1a225558f3d9e0747c4a0d5e9e24b6965b6a700f6ba2ae09951e16 b2sums = 05f25e60c491b7ef558d832addd44784db09170418f643ad341050dddb60a78fb9feb9fb47603cdd4a651eacf1b1cbf515bf37dadf84b8dfc2755c1eeead7c30
pkgname = bzz-initrd pkgname = bzz-initrd
pkgdesc = The Initrd image for Kira Linux kernel and modules pkgdesc = The Initrd image for Kira Linux kernel and modules
+8 -46
View File
@@ -1,14 +1,15 @@
# Maintainer: Kira <[@kira](https://dev.kira-linux.org/kira)> # Maintainer: Kira <[@kira](https://dev.kira-linux.org/kira)>
pkgname=bzz-initrd pkgname=bzz-initrd
pkgver=0.1.7 pkgver=0.2.1
pkgrel=1 pkgrel=3
pkgdesc='Initrd image for Kira Linux' pkgdesc='Initrd image for Kira Linux'
url='https://dev.kira-linux.org' url='https://dev.kira-linux.org'
arch=(x86_64) arch=(x86_64)
_nyanit_ver=0.1.6 _nyanit_ver=0.2.1-1
_nyanit_src=v${_nyanit_ver}.tar.gz _nyanit_src=v${_nyanit_ver}.tar.gz
_nyanit_src_dir=nyanit
makedepends=( makedepends=(
bcachefs-tools bcachefs-tools
@@ -31,7 +32,6 @@ options=(
!debug !debug
) )
_nyanit_src_dir=nyanit
source=( source=(
https://dev.kira-linux.org/kira-linux/nyanit/archive/${_nyanit_src} https://dev.kira-linux.org/kira-linux/nyanit/archive/${_nyanit_src}
@@ -42,18 +42,14 @@ source=(
# ) # )
sha256sums=('9c8e20c3d32174037b26fea4e936467ed9391284bf7ff4675ecf4a83fd820742')
sha256sums=('3b71ddc98088ecde2c9a87815ba7f11ae126df7b3d3e6b44846b135234637300') b2sums=('05f25e60c491b7ef558d832addd44784db09170418f643ad341050dddb60a78fb9feb9fb47603cdd4a651eacf1b1cbf515bf37dadf84b8dfc2755c1eeead7c30')
b2sums=('848605659ca4d5399720f0e8baf2abfdf05ba970b1eb117a7477ec6cd6e407690c9f28e76f1a225558f3d9e0747c4a0d5e9e24b6965b6a700f6ba2ae09951e16')
_tools_list=( _tools_list=(
/usr/bin/mount
/usr/bin/umount
/usr/bin/bcachefs /usr/bin/bcachefs
/usr/bin/fsck /usr/bin/fsck
/usr/bin/fsck.vfat /usr/bin/fsck.vfat
/usr/bin/switch_root /usr/bin/switch_root
/usr/bin/lsblk
/usr/bin/blkid /usr/bin/blkid
) )
@@ -67,28 +63,9 @@ build() {
echo "##### DONE Building NYANIT #####" echo "##### DONE Building NYANIT #####"
echo "" echo ""
echo "Populate initdramfs tree..." echo "Build initramfs image..."
cd $srcdir cd $srcdir
mkdir -p initramfs/{dev,proc,sys,mnt,tmp,etc,usr,usr/bin,usr/lib} $_nyanit_src_dir/build_initcpio.sh $srcdir
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
lddtree --bindir / --copy-to-tree $srcdir/initramfs init
echo "Copy libs and binaries"
cd $srcdir
lddtree --copy-to-tree $srcdir/initramfs "${_tools_list[@]}"
echo "Remove setuid flag from everything..."
chmod -R a-s $srcdir/initramfs
} }
@@ -101,21 +78,6 @@ package() {
Zlib 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" echo "Installing bzz-initrd"
install -vDm 644 $srcdir/initramfs.cpio -t "$pkgdir/usr/share/$pkgname/" install -vDm 644 $srcdir/initramfs.cpio -t "$pkgdir/usr/share/$pkgname/"
} }