diff --git a/.cirrus.yml b/.cirrus.yml index b067d7b..a729146 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -45,12 +45,12 @@ run_task: deps_script: - apt-get -y update - apt-get -y dist-upgrade - - apt-get -y install sudo git cpio linux-image-4.19.0-13-amd64 expect wget + - apt-get -y install sudo git cpio linux-image-4.19.0-16-amd64 expect wget - apt-get -y clean submodule_script: - git submodule update --init --recursive kernel_script: - - cp /boot/vmlinuz-4.19.0-13-amd64 ./kernel + - cp /boot/vmlinuz-4.19.0-16-amd64 ./kernel run_script: - ./.cirrus.expect | tee -a /tmp/run.log - grep -q 'Bootstrapping completed.' /tmp/run.log diff --git a/sysa/musl-1.1.24/binutils-rebuild.sh b/sysa/musl-1.1.24/binutils-rebuild.sh index 4ac8ff8..775110f 100755 --- a/sysa/musl-1.1.24/binutils-rebuild.sh +++ b/sysa/musl-1.1.24/binutils-rebuild.sh @@ -18,7 +18,9 @@ src_configure() { --includedir=/after/include/ # configure script creates this file - test -f /dev/null && rm /dev/null + if test -f /dev/null; then + rm /dev/null + fi } src_compile() { diff --git a/sysa/musl-1.1.24/musl-1.1.24.sh b/sysa/musl-1.1.24/musl-1.1.24.sh index ac6de04..8b82124 100755 --- a/sysa/musl-1.1.24/musl-1.1.24.sh +++ b/sysa/musl-1.1.24/musl-1.1.24.sh @@ -21,7 +21,9 @@ src_configure() { --includedir=/after/include/musl # configure script creates this file - test -f /dev/null && rm /dev/null + if test -f /dev/null; then + rm /dev/null + fi } src_compile() { diff --git a/sysa/musl-1.2.2/musl-1.2.2.sh b/sysa/musl-1.2.2/musl-1.2.2.sh index aa723b7..c637b0a 100755 --- a/sysa/musl-1.2.2/musl-1.2.2.sh +++ b/sysa/musl-1.2.2/musl-1.2.2.sh @@ -11,7 +11,10 @@ src_configure() { --includedir=/after/include/ # configure script creates this file - test -f /dev/null && rm /dev/null && mknod -m 666 /dev/null c 1 3 + if test -f /dev/null; then + rm /dev/null + mknod -m 666 /dev/null c 1 3 + fi } src_compile() { diff --git a/sysa/run.sh b/sysa/run.sh index 6f12ec9..8127604 100755 --- a/sysa/run.sh +++ b/sysa/run.sh @@ -12,7 +12,6 @@ set -e populate_device_nodes() { # http://www.linuxfromscratch.org/lfs/view/6.1/chapter06/devices.html - test -c /dev/console || mknod -m 622 /dev/console c 5 1 test -c /dev/null || mknod -m 666 /dev/null c 1 3 test -c /dev/zero || mknod -m 666 /dev/zero c 1 5 test -c /dev/ptmx || mknod -m 666 /dev/ptmx c 5 2