From 7103622b1113e54a23134b0667c0c5ec2b632fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Miotk?= Date: Sat, 5 Nov 2022 01:12:35 +0100 Subject: [PATCH] Fedora Linux v6.0.7 (#65) --- .github/FUNDING.yml | 2 +- .github/workflows/build-iso.yml | 14 +++++++++----- README.md | 15 ++++++++------- fedora-mbp.ks | 15 +++------------ 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 547c04c..35c6427 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,3 +1,3 @@ # These are supported funding model platforms - +--- github: [mikeeq] diff --git a/.github/workflows/build-iso.yml b/.github/workflows/build-iso.yml index e7fe3cd..3d4b451 100644 --- a/.github/workflows/build-iso.yml +++ b/.github/workflows/build-iso.yml @@ -6,7 +6,7 @@ on: [push] jobs: tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - name: "AgentInfo" @@ -35,10 +35,10 @@ jobs: && shellcheck $(find . -type f -name "*.sh" | tr '\n' ' ') " build-gnome: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - - name: "Build Fedora ISO" + - name: "Build Fedora Gnome ISO" run: ./build_in_docker.sh env: FEDORA_DESKTOP_ENV: gnome @@ -53,11 +53,13 @@ jobs: ./output_zip/* env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # You don't need to add this in secrets it's by default. + - name: "AgentInfo" + run: ./.github/agent-info.sh build-kde: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - - name: "Build Fedora ISO" + - name: "Build Fedora KDE ISO" run: ./build_in_docker.sh env: FEDORA_DESKTOP_ENV: kde @@ -72,3 +74,5 @@ jobs: ./output_zip/* env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # You don't need to add this in secrets it's by default. + - name: "AgentInfo" + run: ./.github/agent-info.sh diff --git a/README.md b/README.md index b51bc48..1c1f9eb 100644 --- a/README.md +++ b/README.md @@ -65,13 +65,14 @@ macOS Mojave: 10.14.6 (18G103) - There will be two/three boot options available, usually the last one works for me. (There are multiple boot options, because there are three different partitions in the ISO to make the ISO bootable on different set of computers: 1) ISO9660: with installer data, 2) fat32, 3) hfs+) - I recommend using standard partition layout during partitioning your Disk in Anaconda (Fedora Installer) as I haven't tested other scenarios yet. You can leave the desired capacity value empty for the last partition, Anaconda will allocate all free disk space to that partition when defining it. ![anaconda partitioning](screenshots/anaconda-3.png) @@ -80,7 +81,7 @@ macOS Mojave: 10.14.6 (18G103) ```bash sudo -i - + # /etc/modprobe.d/hid_apple.conf options hid_apple swap_fn_leftctrl=1 options hid_apple swap_opt_cmd=1 @@ -101,7 +102,7 @@ sudo -i # Upgrade kernel beforehand ## update_kernel_mbp has built-in selfupgrade function, so when it fails it's just due to script update - please rerun everything should be good on second run -KERNEL_VERSION="6.0.5-f37" UPDATE_SCRIPT_BRANCH="v6.0-f37" update_kernel_mbp +KERNEL_VERSION="6.0.7-f37" UPDATE_SCRIPT_BRANCH="v6.0-f37" update_kernel_mbp # Upgrade your OS dnf upgrade -y --refresh @@ -110,7 +111,7 @@ dnf install -y dnf-plugin-system-upgrade # Exclude official kernel from upgrade to not override mbp-fedora-kernel ## If you're trying to upgrade older version of mbp-fedora to latest version, please repeat a process by upgrading only to one major release of Fedora, i.e.: Fedora 33 -> 34, 34 -> 35, 35 -> 36 -FEDORA_VERSION=37 dnf system-upgrade download -y --releasever=${FEDORA_VERSION} --exclude='kernel*' +dnf system-upgrade download -y --releasever=37 --exclude='kernel*' # Reboot your Mac dnf system-upgrade reboot diff --git a/fedora-mbp.ks b/fedora-mbp.ks index 7969e67..41a1ed9 100644 --- a/fedora-mbp.ks +++ b/fedora-mbp.ks @@ -2,7 +2,7 @@ repo --name=fedora-mbp --baseurl=https://fedora-mbp-repo.herokuapp.com/ ### Selinux in permissive mode -bootloader --append="enforcing=0 intel_iommu=on iommu=pt pcie_ports=compat" +bootloader --append="intel_iommu=on iommu=pt pcie_ports=compat" ### Accepting EULA eula --agreed @@ -13,9 +13,8 @@ eula --agreed ## Install mbp-fedora-kernel, mbp-fedora-t2-config, mbp-fedora-t2-repo curl -wpa_supplicant -kernel-5.*.fc37.x86_64 -kernel-*.*[0-9].mbp.fc36.x86_64 +kernel-*.*[0-9].mbp.fc37.x86_64 mbp-fedora-t2-config mbp-fedora-t2-repo @@ -36,17 +35,9 @@ echo 'nameserver 8.8.8.8' > /etc/resolv.conf echo "===]> Info: Print /etc/resolv.conf" cat /etc/resolv.conf -KERNEL_VERSION=6.0.5-200.mbp.fc36.x86_64 +KERNEL_VERSION=6.0.7-300.mbp.fc37.x86_64 UPDATE_SCRIPT_BRANCH=v6.0-f37 -/usr/sbin/depmod -a ${KERNEL_VERSION} -dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION - -### Adding fedora-mbp yum repo gpg key -curl -sSL "https://raw.githubusercontent.com/mikeeq/mbp-fedora-kernel/${UPDATE_SCRIPT_BRANCH}/yum-repo/fedora-mbp.gpg" > ./fedora-mbp.gpg -rpm --import ./fedora-mbp.gpg -rm -rf ./fedora-mbp.gpg - ### Add update_kernel_mbp script curl -L https://raw.githubusercontent.com/mikeeq/mbp-fedora-kernel/${UPDATE_SCRIPT_BRANCH}/update_kernel_mbp.sh -o /usr/bin/update_kernel_mbp chmod +x /usr/bin/update_kernel_mbp