commit 3123cb0
chld
·
2025-12-22 16:22:52 +0000 UTC
parent ed959fd
revert 21e719383d0307e1690e704d1d52ca7c16b2b6d1 revert scripts/ sh migration
6 files changed,
+14,
-15
+3,
-3
1@@ -1,12 +1,12 @@
2 #!/bin/sh -e
3-. ../util/lib.sh
4+. ./util/lib.sh
5
6 #set -x
7
8 # remove all except: kiss, musl, curl
9 # kiss will be removed after bootstrapping apk
10
11-sh ../util/kiss-mount $m
12+sh ./util/kiss-mount $m
13
14 _inc '
15 rm -f /var/db/kiss/installed/kiss/depends
16@@ -36,7 +36,7 @@ $m/bin/apk --arch $(arch) -X https://dl-cdn.alpinelinux.org/alpine/latest-stable
17 # add apk repositories
18 mkdir -p $m/etc/
19 mkdir -p $m/etc/apk
20-cp ../rootfs/repositories $m/etc/apk/repositories
21+cp ./rootfs/repositories $m/etc/apk/repositories
22 ls $m/lib/apk
23 ls $m/lib/apk/db
24
+3,
-3
1@@ -1,10 +1,10 @@
2 #!/bin/sh -e
3
4-. ../util/lib.sh
5+. ./util/lib.sh
6
7 set -x
8 # unmount /mnt
9-sh ../util/kiss-mount $m .
10+sh ./util/kiss-mount $m .
11
12 sh ./setup-rootfs
13 sh ./setup-apk
14@@ -12,7 +12,7 @@ sh ./setup-userland
15 sh ./setup-post
16
17 # unmount /mnt as it finished
18-sh ../util/kiss-mount $m .
19+sh ./util/kiss-mount $m .
20 set +x # just for readability
21
22 find $m
+1,
-1
1@@ -1,6 +1,6 @@
2 #!/bin/sh -e
3
4-. ../util/lib.sh
5+. ./util/lib.sh
6
7 echo "WARNING: $0 assumes you have already run setup-distro!"
8 # unmount $m so nothing is messed up during tar
+2,
-2
1@@ -1,13 +1,13 @@
2 #!/bin/sh -e
3
4-. ../util/lib.sh
5+. ./util/lib.sh
6
7 # this runs after everything, some touch ups
8
9 set -x
10
11 # add kiss-chroot
12-cp ../rootfs/kiss-chroot $m/bin/kiss-chroot
13+cp ./rootfs/kiss-chroot $m/bin/kiss-chroot
14 chmod 755 $m/bin/kiss-chroot
15
16 # purge leftover libraries
+4,
-5
1@@ -1,6 +1,5 @@
2 #!/bin/sh -eu
3-
4-. ../util/lib.sh # source functions
5+. ./util/lib.sh # source functions
6
7 echo "WARNING: $0 assumes you have rootfs mounted @ ${m}!"
8 set -x
9@@ -25,12 +24,12 @@ rm -f $m/etc/*tab # situation doesnt use tables, it is not sysv-ish
10 rm -f $m/etc/issue
11
12 rm -f $m/etc/os-release
13-cp ../rootfs/os-release $m/etc/os-release
14+cp ./rootfs/os-release $m/etc/os-release
15
16 rm -f $m/etc/mdev.conf # change later?
17
18 # unlink /sbin due to udevadm errors
19-unlink $m/sbin
20+unlink /mnt/sbin
21
22 # further remove traces of KISS
23 rm -rf $m/root/*
24@@ -39,4 +38,4 @@ rm -rf $m/usr/share/doc
25 # copy KISS no-perl.patch for the linux kernel
26 mkdir -p $m/usr
27 mkdir $m/usr/src
28-cp ../rootfs/no-perl.patch $m/usr/src/no-perl.patch
29+cp ./rootfs/no-perl.patch $m/usr/src/no-perl.patch
+1,
-1
1@@ -1,6 +1,6 @@
2 #!/bin/sh -e
3
4-. ../util/lib.sh
5+. ./util/lib.sh
6
7 # i am looking into baseutils, seems like a good idea
8 # although, we will still be using busybox for now.