more instructions

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index b551e19336c004c22dd8024c690d71346f3109e3..dd3e7aa6f413260dde80d61f08f80433abc4ac09 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -29,8 +29,8 @@ build_linux()
         git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
         curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am -
         curl -s https://tg.st/u/0001-4k-iommu-patch-2022-03-11.patch | git am -
         git reset --hard origin/asahi; git clean -f -x -d &> /dev/null
         curl -s https://tg.st/u/40c9642c7569c52189f84621316fc9149979ee65.patch | git am -
         curl -s https://tg.st/u/0001-4k-iommu-patch-2022-03-11.patch | git am -

-        curl -s https://tg.st/u/config-2022-03-15-4k > .config
-        # curl -s https://tg.st/u/config-debian-distro-kernel-2022-03-09-4k > .config
+        curl -s https://tg.st/u/WQRL.patch | git am -
+        curl -s https://tg.st/u/config-2022-03-17-distro-sven-jannau.txt > .config

         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )
         make olddefconfig
         make -j `nproc` V=0 bindeb-pkg > /dev/null
 )


@@ -69,7 +69,7 @@ build_rootfs()
         handle_crosscompile
         sudo rm -rf testing
         mkdir -p cache
         handle_crosscompile
         sudo rm -rf testing
         mkdir -p cache

-        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk testing testing http://ftp.fau.de/debian
+        sudo eatmydata ${DEBOOTSTRAP} --cache-dir=`pwd`/cache --arch=arm64 --include initramfs-tools,pciutils,wpasupplicant,tcpdump,vim,tmux,vlan,ntpdate,parted,curl,wget,grub-efi-arm64,mtr-tiny,dbus,ca-certificates,sudo,openssh-client,mtools,gdisk testing testing http://deb.debian.org/debian

 
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
 
 
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
 


@@ -143,7 +143,7 @@ build_efi()
 
         export INITRD=`ls -1 testing/boot/ | grep initrd`
         export VMLINUZ=`ls -1 testing/boot/ | grep vmlinuz`
 
         export INITRD=`ls -1 testing/boot/ | grep initrd`
         export VMLINUZ=`ls -1 testing/boot/ | grep vmlinuz`

-        export UUID=`blkid media | awk -F\" '{print $2}'`
+        export UUID=`blkid -s UUID -o value media`

         cat > EFI/debian/grub.cfg <<EOF
 search.fs_uuid ${UUID} root
 linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw
         cat > EFI/debian/grub.cfg <<EOF
 search.fs_uuid ${UUID} root
 linux (\$root)/boot/${VMLINUZ} root=UUID=${UUID} rw


@@ -192,7 +192,7 @@ publish_artefacts()
 {
         export KERNEL=`ls -1rt linux-image*.deb | grep -v dbg | tail -1`
         cp ${KERNEL} k.deb
 {
         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 di-stick/vmlinuz k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi debian-base.zip /u/
+        sudo cp m1-d-i.tar m1.tgz efi.tgz asahi-debian-live.tar u-boot.bin u-boot.macho k.deb m1n1/build/m1n1.bin m1n1/build/m1n1.macho testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi debian-base.zip /u/

 }
 
 mkdir -p build
 }
 
 mkdir -p build


@@ -204,7 +204,7 @@ build_linux
 build_m1n1
 build_uboot
 build_rootfs
 build_m1n1
 build_uboot
 build_rootfs

-# build_di_stick
+#build_di_stick

 build_dd
 build_efi
 build_asahi_installer_image
 build_dd
 build_efi
 build_asahi_installer_image