Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge in bootc support #1419

Closed
wants to merge 4 commits into from
Closed

Merge in bootc support #1419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4c7679
feat: add bootc
m2Giles May 7, 2024
e20e2fa
Merge remote-tracking branch 'origin/main' into bootc
m2Giles Jun 22, 2024
cb304da
chore: add bootc items.
m2Giles Jun 22, 2024
b71eaaa
chore: bump ISO action version to 1.2.1
castrojo Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/reusable-build-iso.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
docker rmi ${image}

- name: Build ISOs
uses: jasonn3/build-container-installer@v1.2.0
uses: jasonn3/build-container-installer@v1.2.1
id: build
with:
arch: x86_64
Expand Down
1 change: 1 addition & 0 deletions build_files/base/build-base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ set -ouex pipefail
. /tmp/build/aurora-changes.sh
. /tmp/build/branding.sh
. /tmp/build/initramfs.sh
. /tmp/build/bootc.sh
. /tmp/build/cleanup.sh
1 change: 1 addition & 0 deletions build_files/dx/build-dx.sh
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be removed. It will break builds.

Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ sysctl -p
. /tmp/build/fetch-install-dx.sh
. /tmp/build/workarounds.sh
. /tmp/build/systemd-dx.sh
. /tmp/build/bootc.sh
. /tmp/build/branding-dx.sh
. /tmp/build/cleanup-dx.sh
5 changes: 5 additions & 0 deletions build_files/shared/bootc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/bash

if [ "$FEDORA_MAJOR_VERSION" -ge "40" ]; then
/usr/bin/bootupctl backend generate-update-metadata
fi
8 changes: 4 additions & 4 deletions build_files/shared/initramfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ set -oue pipefail

# Remove nvidia specific files
if [[ "${IMAGE_FLAVOR}" =~ "nvidia" ]]; then
rm /usr/lib/modprobe.d/nvk.conf
rm /usr/lib/modprobe.d/amd-legacy.conf
rm -f /usr/lib/modprobe.d/nvk.conf
rm -f /usr/lib/modprobe.d/amd-legacy.conf
else
rm /usr/lib/dracut/dracut.conf.d/95-nvidia.conf
rm /usr/lib/modprobe.d/nvidia.conf
rm -f /usr/lib/dracut/dracut.conf.d/95-nvidia.conf
rm -f /usr/lib/modprobe.d/nvidia.conf
fi

if [[ "${AKMODS_FLAVOR}" == "surface" ]]; then
Expand Down
1 change: 1 addition & 0 deletions packages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"all": [
"bash-color-prompt",
"bcache-tools",
"bootc",
"evtest",
"epson-inkjet-printer-escpr",
"epson-inkjet-printer-escpr2",
Expand Down
Loading