From 74ec6ce2043b3f07ea9ba4670e021d48d68f0d96 Mon Sep 17 00:00:00 2001 From: Aditya Garg Date: Sun, 15 Oct 2023 11:43:34 +0530 Subject: [PATCH] Add support for 23.10 Mantic Minotaur --- 01_build_file_system.sh | 2 +- 02_build_image.sh | 2 +- 04_create_iso.sh | 2 +- build.sh | 10 +++++----- build_in_docker.sh | 2 +- files/chroot_build.sh | 24 ++++++++++++------------ files/grub/grub.cfg | 12 ++++++------ 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/01_build_file_system.sh b/01_build_file_system.sh index 758b378..2ed94cd 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 \ - lunar \ + mantic \ "${CHROOT_PATH}" \ http://archive.ubuntu.com/ubuntu/ diff --git a/02_build_image.sh b/02_build_image.sh index 2fb98ef..63d4b15 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 23.04 "Lunar Lobster" - amd64 +#define DISKNAME Ubuntu MBP 23.10 "Mantic Minotaur" - amd64 #define TYPE binary #define TYPEbinary 1 #define ARCH amd64 diff --git a/04_create_iso.sh b/04_create_iso.sh index 93deb7f..d1ffb5a 100755 --- a/04_create_iso.sh +++ b/04_create_iso.sh @@ -23,7 +23,7 @@ xorriso -as mkisofs \ -no-emul-boot \ -isohybrid-mbr "${ROOT_PATH}/files/isohdpfx.bin" \ -isohybrid-gpt-basdat -isohybrid-apm-hfsplus \ - -output "${ROOT_PATH}/ubuntu-23.04-${KERNEL_VERSION}.iso" \ + -output "${ROOT_PATH}/ubuntu-23.10-${KERNEL_VERSION}.iso" \ -graft-points \ "." \ /boot/grub/bios.img=isolinux/bios.img \ diff --git a/build.sh b/build.sh index ab996ed..bead4fa 100755 --- a/build.sh +++ b/build.sh @@ -36,11 +36,11 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::=" syslinux echo >&2 "===]> Info: Start loop... " -for ALTERNATIVE in t2-lunar +for ALTERNATIVE in t2-mantic do echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " - echo >&2 "===]> Info: Build Ubuntu Lunar... " + echo >&2 "===]> Info: Build Ubuntu Mantic... " /bin/bash -c " ROOT_PATH=${ROOT_PATH} \\ WORKING_PATH=${WORKING_PATH} \\ @@ -51,7 +51,7 @@ do ${ROOT_PATH}/01_build_file_system.sh " - echo >&2 "===]> Info: Build Image Lunar... " + echo >&2 "===]> Info: Build Image Mantic... " /bin/bash -c " ROOT_PATH=${ROOT_PATH} \\ WORKING_PATH=${WORKING_PATH} \\ @@ -85,10 +85,10 @@ do fi ### Zip iso and split it into multiple parts - github max size of release attachment is 2GB, where ISO is sometimes bigger than that cd "${ROOT_PATH}" - zip -s 1500m "${ROOT_PATH}/output/ubuntu-23.04-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-23.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso" + zip -s 1500m "${ROOT_PATH}/output/ubuntu-23.10-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-23.10-${KERNEL_VERSION}-${ALTERNATIVE}.iso" done ## Calculate sha256 sums of built ISO -sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256-ubuntu-23.04" +sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256-ubuntu-23.10" find ./ | grep ".iso" find ./ | grep ".zip" diff --git a/build_in_docker.sh b/build_in_docker.sh index 943ac88..340fbdc 100755 --- a/build_in_docker.sh +++ b/build_in_docker.sh @@ -2,7 +2,7 @@ set -eu -o pipefail -DOCKER_IMAGE=ubuntu:23.04 +DOCKER_IMAGE=ubuntu:23.10 docker pull ${DOCKER_IMAGE} docker run \ diff --git a/files/chroot_build.sh b/files/chroot_build.sh index a2129c9..5dd6b8a 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-lunar-live" >/etc/hostname +echo "ubuntu-mantic-live" >/etc/hostname echo >&2 "===]> Info: Configure and update apt... " cat </etc/apt/sources.list -deb http://archive.ubuntu.com/ubuntu/ lunar main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ lunar main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ lunar-security main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ lunar-security main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ lunar-updates main restricted universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ lunar-updates main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ mantic main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ mantic main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ mantic-security main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ mantic-security main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ mantic-updates main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ mantic-updates main restricted universe multiverse EOF apt-get update @@ -136,13 +136,13 @@ apt-get purge -y -qq \ vim \ binutils \ linux-generic \ - linux-headers-6.2.0-20 \ - linux-headers-6.2.0-20-generic \ + linux-headers-6.5.0-9 \ + linux-headers-6.5.0-9-generic \ linux-headers-generic \ - linux-image-6.2.0-20-generic \ + linux-image-6.5.0-9-generic \ linux-image-generic \ - linux-modules-6.2.0-20-generic \ - linux-modules-extra-6.2.0-20-generic \ + linux-modules-6.5.0-9-generic \ + linux-modules-extra-6.5.0-9-generic \ gedit apt-get autoremove -y diff --git a/files/grub/grub.cfg b/files/grub/grub.cfg index 52ae56c..4a5d92f 100644 --- a/files/grub/grub.cfg +++ b/files/grub/grub.cfg @@ -6,27 +6,27 @@ insmod all_video set default="0" set timeout=30 -menuentry "Try Ubuntu Lunar Lobster without installing" { +menuentry "Try Ubuntu Mantic Minotaur without installing" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=native intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Try Ubuntu Lunar Lobster without installing (Safe Graphics)" { +menuentry "Try Ubuntu Mantic Minotaur without installing (Safe Graphics)" { linux /casper/vmlinuz file=/cdrom/preseed/mbp164.seed boot=casper ro nomodeset pcie_ports=native intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Try Ubuntu Lunar Lobster without installing (NVMe blacklisted)" { +menuentry "Try Ubuntu Mantic Minotaur without installing (NVMe blacklisted)" { linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=native intel_iommu=on iommu=pt modprobe.blacklist=nvme --- initrd /casper/initrd } -menuentry "Install Ubuntu Lunar Lobster" { +menuentry "Install Ubuntu Mantic Minotaur" { linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=native intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Install Ubuntu Lunar Lobster (Safe Graphics)" { +menuentry "Install Ubuntu Mantic Minotaur (Safe Graphics)" { linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp164.seed boot=casper only-ubiquity nomodeset pcie_ports=native intel_iommu=on iommu=pt --- initrd /casper/initrd } -menuentry "Install Ubuntu Lunar Lobster (NVMe blacklisted)" { +menuentry "Install Ubuntu Mantic Minotaur (NVMe blacklisted)" { linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=native intel_iommu=on iommu=pt modprobe.blacklist=nvme --- initrd /casper/initrd }