From 2800f7d613dbddeb623186b606d468628ab4f31b Mon Sep 17 00:00:00 2001 From: Ella-0 <23418164+Ella-0@users.noreply.github.com> Date: Mon, 15 Mar 2021 10:10:15 +0000 Subject: [PATCH 01/11] llvm: disable sanitisers --- pkgs/llvm/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/llvm/build.sh b/pkgs/llvm/build.sh index da9429f..48125bb 100644 --- a/pkgs/llvm/build.sh +++ b/pkgs/llvm/build.sh @@ -80,7 +80,7 @@ build() { -DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON \ -DCOMPILER_RT_DEFAULT_TARGET_ONLY=OFF \ -DCOMPILER_RT_INCLUDE_TESTS=OFF \ - -DCOMPILER_RT_BUILD_SANITIZERS=ON \ + -DCOMPILER_RT_BUILD_SANITIZERS=OFF \ -DCOMPILER_RT_BUILD_XRAY=OFF \ -DCOMPILER_RT_INCLUDE_TESTS=OFF \ -DCOMPILER_RT_BUILD_LIBFUZZER=OFF \ From 375ad77edbae315c1d1b1302e6d6a8c1853562a7 Mon Sep 17 00:00:00 2001 From: Ella-0 <23418164+Ella-0@users.noreply.github.com> Date: Tue, 16 Mar 2021 18:27:36 +0000 Subject: [PATCH 02/11] Added libpsl --- pkgs/libpsl/build.sh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/libpsl/build.sh diff --git a/pkgs/libpsl/build.sh b/pkgs/libpsl/build.sh new file mode 100644 index 0000000..2986f0d --- /dev/null +++ b/pkgs/libpsl/build.sh @@ -0,0 +1,30 @@ +pkgname=libpsl +pkgver=0.21.1 + +fetch() { + curl -L "https://github.com/rockdaboot/libpsl/releases/download/0.21.1/libpsl-0.21.1.tar.gz" -o $pkgname-$pkgver.tar.xz + tar -xf $pkgname-$pkgver.tar.xz + mkdir $pkgname-$pkgver/build +} + +build() { + cd $pkgname-$pkgver + cd build + meson .. \ + --buildtype=release \ + --prefix=/usr \ + --libexecdir=lib + samu +} + +package() { + cd $pkgname-$pkgver + cd build + DESTDIR=$pkgdir samu install +} + +license() { + cd $pkgname-$pkgver + cat LICENSE +# cat COPYING +} From 91b0d32e32c724927400529190e6136938e10d96 Mon Sep 17 00:00:00 2001 From: Ella-0 <23418164+Ella-0@users.noreply.github.com> Date: Tue, 16 Mar 2021 18:30:23 +0000 Subject: [PATCH 03/11] added sqlite --- pkgs/sqlite/build.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pkgs/sqlite/build.sh diff --git a/pkgs/sqlite/build.sh b/pkgs/sqlite/build.sh new file mode 100644 index 0000000..c639853 --- /dev/null +++ b/pkgs/sqlite/build.sh @@ -0,0 +1,29 @@ +pkgname=sqlite +pkgver=3350100 + +fetch() { + curl "https://sqlite.org/2021/sqlite-autoconf-3350100.tar.gz" -o $pkgname-$pkgver.tar.xz + tar -xf $pkgname-$pkgver.tar.xz + mv $pkgname-autoconf-$pkgver $pkgname-$pkgver +} + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --build=x86_64-unknown-linux-musl \ + --host=x86_64-unknown-linux-musl + + make +} + +package() { + cd $pkgname-$pkgver + make install DESTDIR=$pkgdir +} + +license() { + cd $pkgname-$pkgver + cat LICENSE +# cat COPYING +} From 3520b62d250efa3a1fe7fa3adb0b27853d959c05 Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Sat, 27 Mar 2021 14:23:10 +0100 Subject: [PATCH 04/11] Fix kernel package. We were downloading a website, not a diff. *Facepalm* --- pkgs/linux/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/linux/build.sh b/pkgs/linux/build.sh index d323fa5..415115b 100644 --- a/pkgs/linux/build.sh +++ b/pkgs/linux/build.sh @@ -4,7 +4,7 @@ pkgrel=1 ext="dev" fetch() { - curl "https://github.com/kisslinux/website/blob/master/site/dist/kernel-no-perl.patch" -o kernel-no-perl.patch + curl "https://raw.githubusercontent.com/kisslinux/website/master/site/dist/kernel-no-perl.patch" -o kernel-no-perl.patch curl "https://cdn.kernel.org/pub/linux/kernel/v5.x/$pkgname-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.xz tar -xf $pkgname-$pkgver.tar.xz cd $pkgname-$pkgver From bcb0c85d914838f8b1a667f824c498e0f003c7dd Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Sat, 27 Mar 2021 18:52:34 +0100 Subject: [PATCH 05/11] Add live usb ftab file --- pkgs/tiny-linux-bootloader/fstab | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 pkgs/tiny-linux-bootloader/fstab diff --git a/pkgs/tiny-linux-bootloader/fstab b/pkgs/tiny-linux-bootloader/fstab new file mode 100644 index 0000000..4d5c469 --- /dev/null +++ b/pkgs/tiny-linux-bootloader/fstab @@ -0,0 +1,5 @@ +information about the filesystems. +# See fstab(5) for details. + +# +/dev/sda1 / ext4 rw,relatime 0 1 From 6996c42f0d520289da62896875c955dd5f784eca Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Sat, 27 Mar 2021 18:53:32 +0100 Subject: [PATCH 06/11] use fstab & add hostname to real root --- createimg.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/createimg.sh b/createimg.sh index 55d1e04..a8144ca 100644 --- a/createimg.sh +++ b/createimg.sh @@ -43,6 +43,11 @@ mount ${LOOPBACK} ${ROOT} packages=(musl mksh bmake gmake libressl cmake curl rsync flex byacc om4 zlib samurai libffi python ca-certificates zlib expat gettext-tiny git kati netbsd-curses kakoune iglunix rust toybox busybox less file pci-ids e2fsprogs linux-pam kbd) cp_packages ${ROOT} +echo "Copying misc files to ${ROOT}" +mkdir ${ROOT}/etc/ +cp ./pkgs/tiny-linux-bootloader/fstab ${ROOT}/etc/fstab +cp /etc/hostname ${ROOT}/hostname + echo "Using the host keymap" cp /etc/vconsole.conf ${ROOT}/etc/vconsole.conf From bdaa75904a8acd6e85364a5989b0083339ad2af0 Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Sun, 28 Mar 2021 15:23:25 +0200 Subject: [PATCH 07/11] Update fstab --- pkgs/tiny-linux-bootloader/fstab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tiny-linux-bootloader/fstab b/pkgs/tiny-linux-bootloader/fstab index 4d5c469..939a6db 100644 --- a/pkgs/tiny-linux-bootloader/fstab +++ b/pkgs/tiny-linux-bootloader/fstab @@ -1,4 +1,4 @@ -information about the filesystems. +# information about the filesystems. # See fstab(5) for details. # From 993c3adf6c59aae7912579f2ae2d79d01308b0db Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Sun, 28 Mar 2021 15:59:57 +0200 Subject: [PATCH 08/11] Fix fdisk command We want it to create a partition to the end of the file. --- createimg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/createimg.sh b/createimg.sh index a8144ca..e4bcd72 100644 --- a/createimg.sh +++ b/createimg.sh @@ -24,6 +24,7 @@ n p 1 ${PARTITION_START} + w " | fdisk iglunix.img From 3e0992c3cedeca848abb22a83a78726d86f10019 Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Sun, 28 Mar 2021 16:15:36 +0200 Subject: [PATCH 09/11] Don't create new partition table Breaks the boot with tlb? --- createimg.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/createimg.sh b/createimg.sh index e4bcd72..b5cdb69 100644 --- a/createimg.sh +++ b/createimg.sh @@ -19,8 +19,7 @@ ls -al iglunix.img -h dd if=/dev/zero bs=1 count=0 seek=1G of=iglunix.img ls -al iglunix.img -h -echo "o -n +echo "n p 1 ${PARTITION_START} From 31d0732a36a5ce59bc22d17ef4b26f48fa8f8901 Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Sun, 28 Mar 2021 16:30:35 +0200 Subject: [PATCH 10/11] Add util-linux --- pkgs/util-linux/build.sh | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/util-linux/build.sh diff --git a/pkgs/util-linux/build.sh b/pkgs/util-linux/build.sh new file mode 100644 index 0000000..a5b9ce6 --- /dev/null +++ b/pkgs/util-linux/build.sh @@ -0,0 +1,37 @@ +pkgver=2.36.2 +pkgname=util-linux +pkgrel=1 + +fetch() { + curl "https://mirrors.edge.kernel.org/pub/linux/utils/$pkgname/v2.36/$pkgname-$pkgver.tar.xz" -o $pkgname-$pkgver.tar.xz + tar -xf $pkgname-$pkgver.tar.xz + cd $pkgname-$pkgver +} + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --build=x86_64-unknown-linux-musl \ + --host=x86_64-unknown-linux-musl \ + --disable-all-programs \ + --enable-libsmartcols \ + --enable-libuuid \ + --enable-libfdisk \ + --enable-fdisks + + + make LDFLAGS="-lterminfo" + +} + +package() { + cd $pkgname-$pkgver + make install DESTDIR=$pkgdir +} + + +license() { + cd $pkgname-$pkgver + cat COPYING +} From 87b58205a6763d01dc9975648c988f4cb0a2fc91 Mon Sep 17 00:00:00 2001 From: aheirman <48590738+aheirman@users.noreply.github.com> Date: Sun, 28 Mar 2021 16:34:50 +0200 Subject: [PATCH 11/11] Add a working fdisk (from util-linux) --- createimg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/createimg.sh b/createimg.sh index b5cdb69..eddf351 100644 --- a/createimg.sh +++ b/createimg.sh @@ -40,7 +40,7 @@ rm -rf ${ROOT} mkdir -p ${ROOT} mount ${LOOPBACK} ${ROOT} -packages=(musl mksh bmake gmake libressl cmake curl rsync flex byacc om4 zlib samurai libffi python ca-certificates zlib expat gettext-tiny git kati netbsd-curses kakoune iglunix rust toybox busybox less file pci-ids e2fsprogs linux-pam kbd) +packages=(musl mksh bmake gmake libressl cmake curl rsync flex byacc om4 zlib samurai libffi python ca-certificates zlib expat gettext-tiny git kati netbsd-curses kakoune iglunix rust toybox busybox less file pci-ids e2fsprogs util-linux linux-pam kbd) cp_packages ${ROOT} echo "Copying misc files to ${ROOT}"