mirror of
https://github.com/t2linux/T2-Ubuntu.git
synced 2024-09-11 13:17:27 +03:00
22.04
This commit is contained in:
parent
90931ba8ed
commit
02a29d91f7
8
.github/workflows/CI.yml
vendored
8
.github/workflows/CI.yml
vendored
@ -6,7 +6,7 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
|
||||||
@ -40,13 +40,13 @@ jobs:
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
- name: Release
|
- name: Release
|
||||||
if: github.ref == 'refs/heads/OTP'
|
if: github.ref == 'refs/heads/jammy'
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
with:
|
with:
|
||||||
files: ${{ github.workspace }}/*.iso
|
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/).
|
body: If you are facing blank screen after installation, try [booting using refind](https://wiki.t2linux.org/guides/refind/).
|
||||||
draft: false
|
draft: false
|
||||||
prerelease: false
|
prerelease: true
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
@ -5,7 +5,7 @@ echo >&2 "===]> Info: Checkout bootstrap... "
|
|||||||
debootstrap \
|
debootstrap \
|
||||||
--arch=amd64 \
|
--arch=amd64 \
|
||||||
--variant=minbase \
|
--variant=minbase \
|
||||||
focal \
|
jammy \
|
||||||
"${CHROOT_PATH}" \
|
"${CHROOT_PATH}" \
|
||||||
http://archive.ubuntu.com/ubuntu/
|
http://archive.ubuntu.com/ubuntu/
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ done
|
|||||||
|
|
||||||
echo >&2 "===]> Info: Create diskdefines... "
|
echo >&2 "===]> Info: Create diskdefines... "
|
||||||
cat <<EOF >"${IMAGE_PATH}"/README.diskdefines
|
cat <<EOF >"${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 TYPE binary
|
||||||
#define TYPEbinary 1
|
#define TYPEbinary 1
|
||||||
#define ARCH amd64
|
#define ARCH amd64
|
||||||
|
6
build.sh
6
build.sh
@ -5,7 +5,7 @@ ROOT_PATH=$(pwd)
|
|||||||
WORKING_PATH=/root/work
|
WORKING_PATH=/root/work
|
||||||
CHROOT_PATH="${WORKING_PATH}/chroot"
|
CHROOT_PATH="${WORKING_PATH}/chroot"
|
||||||
IMAGE_PATH="${WORKING_PATH}/image"
|
IMAGE_PATH="${WORKING_PATH}/image"
|
||||||
KERNEL_VERSION=5.17.7
|
KERNEL_VERSION=5.17.9
|
||||||
PKGREL=1
|
PKGREL=1
|
||||||
sed -i "s/KVER/${KERNEL_VERSION}/g" $(pwd)/files/chroot_build.sh
|
sed -i "s/KVER/${KERNEL_VERSION}/g" $(pwd)/files/chroot_build.sh
|
||||||
sed -i "s/PREL/${PKGREL}/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
|
do
|
||||||
echo >&2 "===]> Info: Start building ${ALTERNATIVE}... "
|
echo >&2 "===]> Info: Start building ${ALTERNATIVE}... "
|
||||||
|
|
||||||
echo >&2 "===]> Info: Build Ubuntu FS... "
|
echo >&2 "===]> Info: Build Ubuntu Jammy... "
|
||||||
/bin/bash -c "
|
/bin/bash -c "
|
||||||
ROOT_PATH=${ROOT_PATH} \\
|
ROOT_PATH=${ROOT_PATH} \\
|
||||||
WORKING_PATH=${WORKING_PATH} \\
|
WORKING_PATH=${WORKING_PATH} \\
|
||||||
@ -50,7 +50,7 @@ do
|
|||||||
${ROOT_PATH}/01_build_file_system.sh
|
${ROOT_PATH}/01_build_file_system.sh
|
||||||
"
|
"
|
||||||
|
|
||||||
echo >&2 "===]> Info: Build Image FS... "
|
echo >&2 "===]> Info: Build Image Jammy... "
|
||||||
/bin/bash -c "
|
/bin/bash -c "
|
||||||
ROOT_PATH=${ROOT_PATH} \\
|
ROOT_PATH=${ROOT_PATH} \\
|
||||||
WORKING_PATH=${WORKING_PATH} \\
|
WORKING_PATH=${WORKING_PATH} \\
|
||||||
|
@ -11,17 +11,17 @@ mount none -t devpts /dev/pts
|
|||||||
export HOME=/root
|
export HOME=/root
|
||||||
export LC_ALL=C
|
export LC_ALL=C
|
||||||
|
|
||||||
echo "ubuntu-fs-live" >/etc/hostname
|
echo "ubuntu-jammy-live" >/etc/hostname
|
||||||
|
|
||||||
echo >&2 "===]> Info: Configure and update apt... "
|
echo >&2 "===]> Info: Configure and update apt... "
|
||||||
|
|
||||||
cat <<EOF >/etc/apt/sources.list
|
cat <<EOF >/etc/apt/sources.list
|
||||||
deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse
|
deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse
|
||||||
deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse
|
deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse
|
||||||
deb http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
|
deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse
|
||||||
deb-src http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
|
deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse
|
||||||
deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
|
deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse
|
||||||
deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse
|
deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse
|
||||||
EOF
|
EOF
|
||||||
apt-get update
|
apt-get update
|
||||||
|
|
||||||
@ -103,8 +103,6 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="
|
|||||||
gcc \
|
gcc \
|
||||||
dkms \
|
dkms \
|
||||||
iwd
|
iwd
|
||||||
|
|
||||||
snap install snap-store
|
|
||||||
|
|
||||||
echo >&2 "===]> Info: Change initramfs format (for grub)... "
|
echo >&2 "===]> Info: Change initramfs format (for grub)... "
|
||||||
sed -i "s/COMPRESS=lz4/COMPRESS=gzip/g" "/etc/initramfs-tools/initramfs.conf"
|
sed -i "s/COMPRESS=lz4/COMPRESS=gzip/g" "/etc/initramfs-tools/initramfs.conf"
|
||||||
@ -161,13 +159,13 @@ apt-get purge -y -qq \
|
|||||||
vim \
|
vim \
|
||||||
binutils \
|
binutils \
|
||||||
linux-generic \
|
linux-generic \
|
||||||
linux-headers-5.4.0-28 \
|
linux-headers-5.15.0-30 \
|
||||||
linux-headers-5.4.0-28-generic \
|
linux-headers-5.15.0-30-generic \
|
||||||
linux-headers-generic \
|
linux-headers-generic \
|
||||||
linux-image-5.4.0-28-generic \
|
linux-image-5.15.0-30-generic \
|
||||||
linux-image-generic \
|
linux-image-generic \
|
||||||
linux-modules-5.4.0-28-generic \
|
linux-modules-5.15.0-30-generic \
|
||||||
linux-modules-extra-5.4.0-28-generic
|
linux-modules-extra-5.15.0-30-generic
|
||||||
|
|
||||||
apt-get autoremove -y
|
apt-get autoremove -y
|
||||||
|
|
||||||
|
@ -6,43 +6,23 @@ insmod all_video
|
|||||||
set default="0"
|
set default="0"
|
||||||
set timeout=30
|
set timeout=30
|
||||||
|
|
||||||
menuentry "Try Ubuntu FS without installing" {
|
menuentry "Try Ubuntu Jammy 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 ---
|
linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat intel_iommu=on iommu=pt ---
|
||||||
initrd /casper/initrd
|
initrd /casper/initrd
|
||||||
}
|
}
|
||||||
menuentry "Try Ubuntu FS without installing (Experimental NVRAM writes)" {
|
menuentry "Try Ubuntu Jammy without installing (Safe Graphics)" {
|
||||||
linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat acpi=force intel_iommu=on iommu=pt ---
|
linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro nomodeset pcie_ports=compat intel_iommu=on iommu=pt ---
|
||||||
initrd /casper/initrd
|
initrd /casper/initrd
|
||||||
}
|
}
|
||||||
menuentry "Try Ubuntu FS without installing (Safe Graphics)" {
|
menuentry "Install Ubuntu Jammy" {
|
||||||
linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro nomodeset efi=noruntime pcie_ports=compat acpi=force intel_iommu=on iommu=pt ---
|
linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat intel_iommu=on iommu=pt ---
|
||||||
initrd /casper/initrd
|
initrd /casper/initrd
|
||||||
}
|
}
|
||||||
menuentry "Try Ubuntu FS without installing (blacklist=thunderbolt)" {
|
menuentry "Install Ubuntu Jammy (Safe Graphics)" {
|
||||||
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
|
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 "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
|
|
||||||
initrd /casper/initrd
|
initrd /casper/initrd
|
||||||
}
|
}
|
||||||
menuentry "Check disc for defects" {
|
menuentry "Check disc for defects" {
|
||||||
linux /casper/vmlinuz boot=casper integrity-check efi=noruntime enforcing=0 efi=noruntime pcie_ports=compat acpi=force ---
|
linux /casper/vmlinuz boot=casper integrity-check enforcing=0 efi=noruntime pcie_ports=compat ---
|
||||||
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
|
|
||||||
initrd /casper/initrd
|
initrd /casper/initrd
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user