mirrors/mbp-ubuntu
mirrors
/
mbp-ubuntu
mirror of https://github.com/marcosfad/mbp-ubuntu
1
0
Fork 0
Code Issues Releases Wiki Activity

22.10 - Kinetic Kudu

This commit is contained in:
Aditya Garg 2022-11-07 16:14:55 +05:30
parent 8f1d39cf04
commit fc7c118f01
7 changed files with 65 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
.github/workflows/CI.yml vendored
View File

@ -1,5 +1,5 @@
--- ---
name: CI name: CI - Kinetic
# yamllint disable-line rule:truthy # yamllint disable-line rule:truthy
on: on:
[push] [push]
@ -22,30 +22,41 @@ jobs:
VERSION=$(grep ^KERNEL_VERSION build.sh | head -n1| cut -d = -f2) VERSION=$(grep ^KERNEL_VERSION build.sh | head -n1| cut -d = -f2)
REL=$(grep "PKGREL=\d*" build.sh | cut -d = -f2) REL=$(grep "PKGREL=\d*" build.sh | cut -d = -f2)
echo "kerneltag=${VERSION}-${REL}" >> $GITHUB_ENV echo "kerneltag=${VERSION}-${REL}" >> $GITHUB_ENV
sudo apt install git
mkdir /tmp/artifacts DOCKER_IMAGE=ubuntu:22.10
git clone https://github.com/t2linux/T2-Ubuntu-Kernel.git docker pull ${DOCKER_IMAGE}
sed -i 's/LOCALVERSION=-t2-\"${CODENAME}\"/LOCALVERSION=-t2-external/g' ${{ github.workspace }}/T2-Ubuntu-Kernel/build.sh docker run \
cd ${{ github.workspace }}/T2-Ubuntu-Kernel/patches -t \
wget https://github.com/AdityaGarg8/T2-Ubuntu/raw/ssd/ssd.patch -v "$(pwd)":/repo \
cd ${{ github.workspace }}/T2-Ubuntu-Kernel ${DOCKER_IMAGE} \
sudo ./build.sh /bin/bash -c 'cd /repo && \
sudo rm /tmp/artifacts/*dbg* apt-get update && \
sudo rm /tmp/artifacts/*libc-dev* apt-get install -y lsb-release git wget && \
mkdir /tmp/artifacts && \
git clone https://github.com/t2linux/T2-Ubuntu-Kernel.git && \
sed -i 's/LOCALVERSION=-t2-\"${CODENAME}\"/LOCALVERSION=-t2-external/g' /repo/T2-Ubuntu-Kernel/build.sh && cd /repo/T2-Ubuntu-Kernel && \
cd /repo/T2-Ubuntu-Kernel/patches && \
wget https://github.com/AdityaGarg8/T2-Ubuntu/raw/ssd/ssd.patch && \
cd /repo/T2-Ubuntu-Kernel && \
./build.sh && mkdir /repo/debs && \
rm /tmp/artifacts/*dbg*
rm /tmp/artifacts/*libc-dev*
cp -r /tmp/artifacts/* /repo/debs'
cp -r "$(pwd)"/debs/* /tmp/artifacts
- name: Upload package artifact - name: Upload package artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: kernel-${{ env.kerneltag }} name: kernel-${{ env.kerneltag }}-kinetic
path: /tmp/artifacts/* path: /tmp/artifacts/*
- name: Release - name: Release
if: github.ref == 'refs/heads/jammy' if: github.ref == 'refs/heads/kinetic'
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
with: with:
files: | files: |
/tmp/artifacts/*.deb /tmp/artifacts/*.deb
tag_name: v${{ env.kerneltag }}-kernel tag_name: v${{ env.kerneltag }}-kernel-kinetic
draft: false draft: false
prerelease: true prerelease: true
env: env:
@ -55,7 +66,7 @@ jobs:
needs: [Kernel] needs: [Kernel]
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- name: 'Checkout Jammy Repo' - name: 'Checkout Kinetic Repo'
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Get version - name: Get version
@ -65,13 +76,13 @@ jobs:
echo "ver=${VERSION}" >> $GITHUB_ENV echo "ver=${VERSION}" >> $GITHUB_ENV
echo "release=${REL}" >> $GITHUB_ENV echo "release=${REL}" >> $GITHUB_ENV
- name: 'Checkout jammy-16,4 Repo' - name: 'Checkout kinetic-16,4 Repo'
uses: actions/checkout@v3 uses: actions/checkout@v3
with: with:
ref: jammy-16,4 ref: kinetic-16,4
persist-credentials: false persist-credentials: false
- name: 'Push new version to jammy-16,4' - name: 'Push new version to kinetic-16,4'
id: publish id: publish
run: | run: |
sed -i "s/KERNEL_VERSION=6.*/KERNEL_VERSION=${{ env.ver }}/g" build.sh sed -i "s/KERNEL_VERSION=6.*/KERNEL_VERSION=${{ env.ver }}/g" build.sh
@ -83,7 +94,7 @@ jobs:
uses: ad-m/github-push-action@master uses: ad-m/github-push-action@master
with: with:
github_token: ${{ secrets.PAT }} github_token: ${{ secrets.PAT }}
branch: jammy-16,4 branch: kinetic-16,4
ISO: ISO:
needs: [Kernel] needs: [Kernel]
@ -92,7 +103,15 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Build - name: Build
run: sudo ./build.sh run: |
DOCKER_IMAGE=ubuntu:22.10
docker pull ${DOCKER_IMAGE}
docker run \
-t \
-v "$(pwd)":/repo \
${DOCKER_IMAGE} \
/bin/bash -c 'cd /repo && \
./build.sh'
- name: print sha256sum - name: print sha256sum
run: cat output/sha256 run: cat output/sha256
@ -122,11 +141,11 @@ jobs:
EOF EOF
- name: Release - name: Release
if: github.ref == 'refs/heads/jammy' if: github.ref == 'refs/heads/kinetic'
uses: softprops/action-gh-release@v1 uses: softprops/action-gh-release@v1
with: with:
files: ${{ github.workspace }}/*.iso files: ${{ github.workspace }}/*.iso
tag_name: v22.04-${{ env.isotag }} tag_name: ${{ env.isotag }}
body_path: ${{ github.workspace }}/.github/workflows/instructions.txt body_path: ${{ github.workspace }}/.github/workflows/instructions.txt
draft: false draft: false
prerelease: false prerelease: false
@ -134,10 +153,10 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Delete kernel from releases - name: Delete kernel from releases
if: github.ref == 'refs/heads/jammy' if: github.ref == 'refs/heads/kinetic'
uses: dev-drprasad/delete-tag-and-release@v0.2.0 uses: dev-drprasad/delete-tag-and-release@v0.2.0
with: with:
delete_release: true delete_release: true
tag_name: v${{ env.isotag }}-kernel tag_name: v${{ env.isotag }}-kernel-kinetic
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

2
01_build_file_system.sh
View File

@ -5,7 +5,7 @@ echo >&2 "===]> Info: Checkout bootstrap... "
debootstrap \ debootstrap \
--arch=amd64 \ --arch=amd64 \
--variant=minbase \ --variant=minbase \
jammy \ kinetic \
"${CHROOT_PATH}" \ "${CHROOT_PATH}" \
http://archive.ubuntu.com/ubuntu/ http://archive.ubuntu.com/ubuntu/

2
02_build_image.sh
View File

@ -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 22.04 LTS "Jammy Jellyfish" - Beta amd64 #define DISKNAME Ubuntu MBP 22.10 "Kinetic Kudu" - Beta amd64
#define TYPE binary #define TYPE binary
#define TYPEbinary 1 #define TYPEbinary 1
#define ARCH amd64 #define ARCH amd64

2
04_create_iso.sh
View File

@ -23,7 +23,7 @@ xorriso -as mkisofs \
-no-emul-boot \ -no-emul-boot \
-isohybrid-mbr "${ROOT_PATH}/files/isohdpfx.bin" \ -isohybrid-mbr "${ROOT_PATH}/files/isohdpfx.bin" \
-isohybrid-gpt-basdat -isohybrid-apm-hfsplus \ -isohybrid-gpt-basdat -isohybrid-apm-hfsplus \
-output "${ROOT_PATH}/ubuntu-22.04-${KERNEL_VERSION}.iso" \ -output "${ROOT_PATH}/ubuntu-22.10-${KERNEL_VERSION}.iso" \
-graft-points \ -graft-points \
"." \ "." \
/boot/grub/bios.img=isolinux/bios.img \ /boot/grub/bios.img=isolinux/bios.img \

8
build.sh
View File

@ -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=6.0.7 KERNEL_VERSION=6.0.6
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-jammy t2-external
do do
echo >&2 "===]> Info: Start building ${ALTERNATIVE}... " echo >&2 "===]> Info: Start building ${ALTERNATIVE}... "
echo >&2 "===]> Info: Build Ubuntu Jammy... " echo >&2 "===]> Info: Build Ubuntu Kinetic... "
/bin/bash -c " /bin/bash -c "
ROOT_PATH=${ROOT_PATH} \\ ROOT_PATH=${ROOT_PATH} \\
WORKING_PATH=${WORKING_PATH} \\ WORKING_PATH=${WORKING_PATH} \\
@ -51,7 +51,7 @@ do
${ROOT_PATH}/01_build_file_system.sh ${ROOT_PATH}/01_build_file_system.sh
" "
echo >&2 "===]> Info: Build Image Jammy... " echo >&2 "===]> Info: Build Image Kinetic... "
/bin/bash -c " /bin/bash -c "
ROOT_PATH=${ROOT_PATH} \\ ROOT_PATH=${ROOT_PATH} \\
WORKING_PATH=${WORKING_PATH} \\ WORKING_PATH=${WORKING_PATH} \\
@ -85,7 +85,7 @@ do
fi fi
### Zip iso and split it into multiple parts - github max size of release attachment is 2GB, where ISO is sometimes bigger than that ### 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}" cd "${ROOT_PATH}"
zip -s 1500m "${ROOT_PATH}/output/livecd-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-22.04-${KERNEL_VERSION}-${ALTERNATIVE}.iso" zip -s 1500m "${ROOT_PATH}/output/livecd-${KERNEL_VERSION}-${ALTERNATIVE}.zip" "${ROOT_PATH}/ubuntu-22.10-${KERNEL_VERSION}-${ALTERNATIVE}.iso"
done done
## Calculate sha256 sums of built ISO ## Calculate sha256 sums of built ISO
sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256" sha256sum "${ROOT_PATH}"/*.iso >"${ROOT_PATH}/output/sha256"

24
files/chroot_build.sh
View File

@ -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-jammy-live" >/etc/hostname echo "ubuntu-kinetic-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/ jammy main restricted universe multiverse deb http://archive.ubuntu.com/ubuntu/ kinetic main restricted universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse deb-src http://archive.ubuntu.com/ubuntu/ kinetic main restricted universe multiverse
deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse deb http://archive.ubuntu.com/ubuntu/ kinetic-security main restricted universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse deb-src http://archive.ubuntu.com/ubuntu/ kinetic-security main restricted universe multiverse
deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse deb http://archive.ubuntu.com/ubuntu/ kinetic-updates main restricted universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse deb-src http://archive.ubuntu.com/ubuntu/ kinetic-updates main restricted universe multiverse
EOF EOF
apt-get update apt-get update
@ -162,13 +162,13 @@ apt-get purge -y -qq \
vim \ vim \
binutils \ binutils \
linux-generic \ linux-generic \
linux-headers-5.15.0-30 \ linux-headers-5.19.0-21 \
linux-headers-5.15.0-30-generic \ linux-headers-5.19.0-21-generic \
linux-headers-generic \ linux-headers-generic \
linux-image-5.15.0-30-generic \ linux-image-5.19.0-21-generic \
linux-image-generic \ linux-image-generic \
linux-modules-5.15.0-30-generic \ linux-modules-5.19.0-21-generic \
linux-modules-extra-5.15.0-30-generic linux-modules-extra-5.19.0-21-generic
apt-get autoremove -y apt-get autoremove -y

6
files/grub/grub.cfg
View File

@ -6,15 +6,15 @@ insmod all_video
set default="0" set default="0"
set timeout=30 set timeout=30
menuentry "Try Ubuntu Jammy Jellyfish without installing" { menuentry "Try Ubuntu Kinetic Kudu without installing" {
linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro pcie_ports=compat 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 Jammy Jellyfish without installing (Safe Graphics)" { menuentry "Try Ubuntu Kinetic Kudu without installing (Safe Graphics)" {
linux /casper/vmlinuz file=/cdrom/preseed/mbp.seed boot=casper ro nomodeset pcie_ports=compat 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 "Install Ubuntu Jammy Jellyfish" { menuentry "Install Ubuntu Kinetic Kudu" {
linux /casper/vmlinuz preseed/file=/cdrom/preseed/mbp.seed boot=casper only-ubiquity pcie_ports=compat 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
} }