From 02a29d91f76ad22af3630b1deb02a1b25c355b60 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Fri, 20 May 2022 17:22:30 +0530 Subject: [PATCH] 22.04 --- .github/workflows/CI.yml | 8 ++++---- 01_build_file_system.sh | 2 +- 02_build_image.sh | 2 +- build.sh | 6 +++--- files/chroot_build.sh | 26 ++++++++++++-------------- files/grub/grub.cfg | 38 +++++++++----------------------------- 6 files changed, 30 insertions(+), 52 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6d64ff7..1e3ca6e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -6,7 +6,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 @@ -40,13 +40,13 @@ jobs: EOF - name: Release - if: github.ref == 'refs/heads/OTP' + if: github.ref == 'refs/heads/jammy' uses: softprops/action-gh-release@v1 with: files: ${{ github.workspace }}/*.iso - tag_name: v20.04-${{ steps.tag.outputs.tag }} + tag_name: v22.04-${{ steps.tag.outputs.tag }} body: If you are facing blank screen after installation, try [booting using refind](https://wiki.t2linux.org/guides/refind/). draft: false - prerelease: false + prerelease: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/01_build_file_system.sh b/01_build_file_system.sh index e812ad2..265e0ae 100755 --- a/01_build_file_system.sh +++ b/01_build_file_system.sh @@ -5,7 +5,7 @@ echo >&2 "===]> Info: Checkout bootstrap... " debootstrap \ --arch=amd64 \ --variant=minbase \ - focal \ + jammy \ "${CHROOT_PATH}" \ http://archive.ubuntu.com/ubuntu/ diff --git a/02_build_image.sh b/02_build_image.sh index b843809..1f8a66a 100755 --- a/02_build_image.sh +++ b/02_build_image.sh @@ -37,7 +37,7 @@ done echo >&2 "===]> Info: Create diskdefines... " cat <"${IMAGE_PATH}"/README.diskdefines -#define DISKNAME Ubuntu MBP 20.04 LTS "Focal Fossa" - Beta amd64 +#define DISKNAME Ubuntu MBP 22.04 LTS "Jammy Jellyfish" - Beta amd64 #define TYPE binary #define TYPEbinary 1 #define ARCH amd64 diff --git a/build.sh b/build.sh index c01f4d1..094db3d 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ ROOT_PATH=$(pwd) WORKING_PATH=/root/work CHROOT_PATH="${WORKING_PATH}/chroot" IMAGE_PATH="${WORKING_PATH}/image" -KERNEL_VERSION=5.17.7 +KERNEL_VERSION=5.17.9 PKGREL=1 sed -i "s/KVER/${KERNEL_VERSION}/g" $(pwd)/files/chroot_build.sh sed -i "s/PREL/${PKGREL}/g" $(pwd)/files/chroot_build.sh @@ -40,7 +40,7 @@ for ALTERNATIVE in t2 do echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " - echo >&2 "===]> Info: Build Ubuntu FS... " + echo >&2 "===]> Info: Build Ubuntu Jammy... " /bin/bash -c " ROOT_PATH=${ROOT_PATH} \\ WORKING_PATH=${WORKING_PATH} \\ @@ -50,7 +50,7 @@ do ${ROOT_PATH}/01_build_file_system.sh " - echo >&2 "===]> Info: Build Image FS... " + echo >&2 "===]> Info: Build Image Jammy... " /bin/bash -c " ROOT_PATH=${ROOT_PATH} \\ WORKING_PATH=${WORKING_PATH} \\ diff --git a/files/chroot_build.sh b/files/chroot_build.sh index 12b2470..1e892be 100755 --- a/files/chroot_build.sh +++ b/files/chroot_build.sh @@ -11,17 +11,17 @@ mount none -t devpts /dev/pts export HOME=/root export LC_ALL=C -echo "ubuntu-fs-live" >/etc/hostname +echo "ubuntu-jammy-live" >/etc/hostname echo >&2 "===]> Info: Configure and update apt... " cat </etc/apt/sources.list -deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse EOF apt-get update @@ -103,8 +103,6 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" gcc \ dkms \ iwd - -snap install snap-store echo >&2 "===]> Info: Change initramfs format (for grub)... " sed -i "s/COMPRESS=lz4/COMPRESS=gzip/g" "/etc/initramfs-tools/initramfs.conf" @@ -161,13 +159,13 @@ apt-get purge -y -qq \ vim \ binutils \ linux-generic \ - linux-headers-5.4.0-28 \ - linux-headers-5.4.0-28-generic \ + linux-headers-5.15.0-30 \ + linux-headers-5.15.0-30-generic \ linux-headers-generic \ - linux-image-5.4.0-28-generic \ + linux-image-5.15.0-30-generic \ linux-image-generic \ - linux-modules-5.4.0-28-generic \ - linux-modules-extra-5.4.0-28-generic + linux-modules-5.15.0-30-generic \ + linux-modules-extra-5.15.0-30-generic apt-get autoremove -y diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index 2ff5ef8..892790e 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -6,43 +6,23 @@ insmod all_video set default="0" set timeout=30 -menuentry "Try Ubuntu FS without installing" { - linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- +menuentry "Try Ubuntu Jammy without installing" { + linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Try Ubuntu FS without installing (Experimental NVRAM writes)" { - linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- +menuentry "Try Ubuntu Jammy without installing (Safe Graphics)" { + linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro nomodeset pcie_ports=compat intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Try Ubuntu FS without installing (Safe Graphics)" { - linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro nomodeset efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- +menuentry "Install Ubuntu Jammy" { + linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Try Ubuntu FS without installing (blacklist=thunderbolt)" { - linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- modprobe.blacklist=thunderbolt - initrd /casper/initrd -} -menuentry "Install Ubuntu FS" { - linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- - initrd /casper/initrd -} -menuentry "Install Ubuntu FS (Experimental NVRAM writes)" { - linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- - initrd /casper/initrd -} -menuentry "Install Ubuntu FS (Safe Graphics)" { - linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity nomodeset efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- - initrd /casper/initrd -} -menuentry "Install Ubuntu FS (blacklist=thunderbolt)" { - linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt --- modprobe.blacklist=thunderbolt +menuentry "Install Ubuntu Jammy (Safe Graphics)" { + linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity nomodeset pcie_ports=compat intel_iommu=on iommu=pt --- initrd /casper/initrd } menuentry "Check disc for defects" { - linux /casper/vmlinuz boot=casper integrity-check efi=noruntime enforcing=0 efi=noruntime pcie_ports=compat acpi=force --- - initrd /casper/initrd -} -menuentry "Check disc for defects (blacklist=thunderbolt)" { - linux /casper/vmlinuz boot=casper integrity-check efi=noruntime enforcing=0 efi=noruntime pcie_ports=compat --- modprobe.blacklist=thunderbolt + linux /casper/vmlinuz boot=casper integrity-check enforcing=0 efi=noruntime pcie_ports=compat --- initrd /casper/initrd }