Merge branch 'master' of a.gmvl.de:/git/m1-debian

diff --git a/README.md b/README.md
index 0e82749c9bff7795ab80b2b57fdcc9a3724fd3a6..a04df989b50b2609fca0959f8ef3a354de5d86b7 100644 (file)
--- a/README.md
+++ b/README.md
@@ -43,6 +43,7 @@ If you don't want to use the prebuild artefacts, you can build them yourself usi
 
 * Install a desktop environment for example blackbox
 
+        apt-get update
         apt-get install -y xinit blackbox xterm firefox-esr lightdm
 
 * Create yourself an unprivileged user

diff --git a/bootstrap.sh b/bootstrap.sh
index 389ccd41b2517ca5632bb9113e2aac16139bdde4..ca3426d2ab06c965b13f84094c1593de0a7d780f 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -205,19 +205,17 @@ publish_artefacts()
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
         sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho 2k.bin 4k.bin k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi debian-base.zip /u/
+        echo 'Reminder: Publish __all__ kernel packages'
 }
 
 mkdir -p build
 cd build
 
-sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves clang-14 lld-14 llvm-14 curl
+sudo apt-get install -y build-essential bash git locales gcc-aarch64-linux-gnu libc6-dev device-tree-compiler imagemagick ccache eatmydata debootstrap pigz libncurses-dev qemu-user-static binfmt-support rsync git flex bison bc kmod cpio libncurses5-dev libelf-dev:native libssl-dev dwarves
 
 build_linux
 build_m1n1
 build_uboot
-
-exit
-
 build_rootfs
 #build_di_stick
 build_dd
@@ -225,5 +223,3 @@ build_efi
 build_asahi_installer_image
 build_live_stick
 publish_artefacts
-
-echo 'Reminder: On the next release publish __all__ kernel packages'

diff --git a/files/quickstart.txt b/files/quickstart.txt
index 6d94093ab42f55378197d6aadb451c8379d29b47..231c0038f23125102efb49b9dd0ea9b34e9b1b71 100644 (file)
--- a/files/quickstart.txt
+++ b/files/quickstart.txt
@@ -27,11 +27,13 @@ passwd username
 
 Lightweight desktop
 ===================
+apt-get update
 apt-get install lightdm blackbox xterm firefox-esr big-cursor
 /etc/init.d/lightdm start
 
 Install gnome
 =============
+apt-get update
 apt-get install gnome
 /etc/init.d/gdm3 start
 
@@ -198,6 +200,7 @@ iwd
 With iwd you can force to use 5ghz. The following needs to be done to get iwd
 running.
 
+sudo apt-get update
 sudo apt-get install iwd
 
 cat <<EOF > /etc/iwd/main.conf