From a6c55418bed63b71594f1b92abce457b6e6c3d4c Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Fri, 9 Jul 2021 07:22:40 +0200 Subject: [PATCH 1/7] fix clang --- clang/build | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/clang/build b/clang/build index 8264904..bde6329 100755 --- a/clang/build +++ b/clang/build @@ -1,8 +1,6 @@ -wget https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/clang+llvm-12.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz -tar -xf clang+llvm-12.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz -cd clang+llvm-12.0.0-x86_64-linux-gnu-ubuntu-20.04 -cd OBJ_ROOT -cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="$1"/usr/bin +git clone https://github.com/llvm/llvm-project.git +cd llvm-projcet.git +cmake -S llvm -G "Unix Makefiles" -B build -DCMAKE_INSTALL_PREFIX="$1"/usr/bin make make install DESTDIR="$1" From 87989828052cfd9be59d97b800c94a81e7591817 Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Fri, 9 Jul 2021 08:37:56 +0200 Subject: [PATCH 2/7] don't use cummingbird as it does not support ramdisk, instead use openrc wich is kinda also lighter than cummingbird --- grub-defconfig/payload/boot/grub/grub.cfg | 4 ++-- openrc/build | 4 ++++ openrc/package | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 openrc/build create mode 100755 openrc/package diff --git a/grub-defconfig/payload/boot/grub/grub.cfg b/grub-defconfig/payload/boot/grub/grub.cfg index 456aced..1476808 100644 --- a/grub-defconfig/payload/boot/grub/grub.cfg +++ b/grub-defconfig/payload/boot/grub/grub.cfg @@ -1,8 +1,8 @@ set timeout=15 set default=0 - + menuentry "Alnux" { # you will probably want to change the root below... - linux /boot/bzImage noapic root=/dev/sda1 init=/usr/bin/hummingbird + linux /boot/bzImage noapic root=/dev/sda1 init=/sbin/openrc-init boot } diff --git a/openrc/build b/openrc/build new file mode 100644 index 0000000..c1c57be --- /dev/null +++ b/openrc/build @@ -0,0 +1,4 @@ +wget -O openrc-0.43.3.tar.gz https://github.com/OpenRC/openrc/archive/refs/tags/0.43.3.tar.gz +tar -xf openrc-0.43.3.tar.gz +cd openrc-0.43.3 +make install BRANDING=\"Alnux/$(uname -s)\" SH=/bin/sh DESTDIR="$1"/sbin/openrc PREFIX="$1" diff --git a/openrc/package b/openrc/package new file mode 100755 index 0000000..a59cf95 --- /dev/null +++ b/openrc/package @@ -0,0 +1,5 @@ +pkg_config_deploy=true +pkg_config_ver="0.43.3" +pkg_config_name="openrc" +pkg_config_makedepends="" +pkg_config_depends="make" From 903ec564bf7513ecf19f3c1127bef0266576b2ad Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Fri, 9 Jul 2021 08:51:20 +0200 Subject: [PATCH 3/7] fix for openrc --- openrc/build | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 openrc/build diff --git a/openrc/build b/openrc/build old mode 100644 new mode 100755 index c1c57be..f737a1d --- a/openrc/build +++ b/openrc/build @@ -1,4 +1,5 @@ wget -O openrc-0.43.3.tar.gz https://github.com/OpenRC/openrc/archive/refs/tags/0.43.3.tar.gz tar -xf openrc-0.43.3.tar.gz cd openrc-0.43.3 +make make install BRANDING=\"Alnux/$(uname -s)\" SH=/bin/sh DESTDIR="$1"/sbin/openrc PREFIX="$1" From 2bbff8ca8d7e32870506b299817ed1bb16927a51 Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Fri, 9 Jul 2021 08:58:07 +0200 Subject: [PATCH 4/7] 2nd fix for openrc --- openrc/build | 1 + 1 file changed, 1 insertion(+) diff --git a/openrc/build b/openrc/build index f737a1d..86a59da 100755 --- a/openrc/build +++ b/openrc/build @@ -3,3 +3,4 @@ tar -xf openrc-0.43.3.tar.gz cd openrc-0.43.3 make make install BRANDING=\"Alnux/$(uname -s)\" SH=/bin/sh DESTDIR="$1"/sbin/openrc PREFIX="$1" +cat tmpfs /tmp tmpfs rw,nosuid,noatime,nodev,size=20G,mode=1777 0 0 > "$1"/etc/fstab From 2971d07a934f81481c47757c7cf019b8510a6f13 Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Fri, 9 Jul 2021 14:11:57 +0200 Subject: [PATCH 5/7] lets try using runit first. --- grub-defconfig/payload/boot/grub/grub.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-defconfig/payload/boot/grub/grub.cfg b/grub-defconfig/payload/boot/grub/grub.cfg index 1476808..7a4dd2c 100644 --- a/grub-defconfig/payload/boot/grub/grub.cfg +++ b/grub-defconfig/payload/boot/grub/grub.cfg @@ -3,6 +3,6 @@ set default=0 menuentry "Alnux" { # you will probably want to change the root below... - linux /boot/bzImage noapic root=/dev/sda1 init=/sbin/openrc-init + linux /boot/bzImage noapic root=/dev/sda1 init=/sbin/runit boot } From c9c731721fa6f47ebe10aa1553ed7da7b2aa5eb6 Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Fri, 9 Jul 2021 15:16:10 +0200 Subject: [PATCH 6/7] clang fix --- clang/build | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/clang/build b/clang/build index bde6329..7f83d7f 100755 --- a/clang/build +++ b/clang/build @@ -1,5 +1,6 @@ -git clone https://github.com/llvm/llvm-project.git -cd llvm-projcet.git +wget https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/clang-12.0.1.src.tar.xz +untar -xf clang-12.0.1.src.tar.xz +cd clang-12.0.1.src cmake -S llvm -G "Unix Makefiles" -B build -DCMAKE_INSTALL_PREFIX="$1"/usr/bin make make install DESTDIR="$1" From 26a846831de9480c2540e926d343a103be4bb1ef Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Fri, 9 Jul 2021 15:26:45 +0200 Subject: [PATCH 7/7] hippoz told to not change default init system so reverted changes on that --- grub-defconfig/payload/boot/grub/grub.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub-defconfig/payload/boot/grub/grub.cfg b/grub-defconfig/payload/boot/grub/grub.cfg index 7a4dd2c..3cc5cf0 100644 --- a/grub-defconfig/payload/boot/grub/grub.cfg +++ b/grub-defconfig/payload/boot/grub/grub.cfg @@ -3,6 +3,6 @@ set default=0 menuentry "Alnux" { # you will probably want to change the root below... - linux /boot/bzImage noapic root=/dev/sda1 init=/sbin/runit + linux /boot/bzImage noapic root=/dev/sda1 init=/usr/bin/hummingbird boot }