Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into extra-refactor-buil…
Browse files Browse the repository at this point in the history
…d_files-dir
  • Loading branch information
mulderje committed Jun 6, 2024
2 parents 49463ec + 2da9db2 commit 3fc17df
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build_files/common/build-kmod-kvmfr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ else
COPR_RELEASE="${RELEASE}"
fi

curl -Lo /etc/yum.repos.d/_copr_hikariknight-looking-glass-kvmfr.repo "https://copr.fedorainfracloud.org/coprs/hikariknight/looking-glass-kvmfr/repo/fedora-${COPR_RELEASE}/hikariknight-looking-glass-kvmfr-fedora-${COPR_RELEASE}.repo"
curl -LsSf -o /etc/yum.repos.d/_copr_hikariknight-looking-glass-kvmfr.repo "https://copr.fedorainfracloud.org/coprs/hikariknight/looking-glass-kvmfr/repo/fedora-${COPR_RELEASE}/hikariknight-looking-glass-kvmfr-fedora-${COPR_RELEASE}.repo"

### BUILD kvmfr (succeed or fail-fast with debug output)
rpm-ostree install \
Expand Down
2 changes: 1 addition & 1 deletion build_files/extra/build-kmod-vhba.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ else
COPR_RELEASE="${RELEASE}"
fi

curl -Lo /etc/yum.repos.d/_copr_rok-cdemu.repo "https://copr.fedorainfracloud.org/coprs/rok/cdemu/repo/fedora-${COPR_RELEASE}/rok-cdemu-fedora-${COPR_RELEASE}.repo"
curl -LsSf -o /etc/yum.repos.d/_copr_rok-cdemu.repo "https://copr.fedorainfracloud.org/coprs/rok/cdemu/repo/fedora-${COPR_RELEASE}/rok-cdemu-fedora-${COPR_RELEASE}.repo"

### BUILD vhba (succeed or fail-fast with debug output)
rpm-ostree install \
Expand Down
12 changes: 6 additions & 6 deletions build_files/shared/build-prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ if [ -n "${RPMFUSION_MIRROR}" ]; then
fi

# required for main and surface when fedora repo has updated kernel beyond what was in the image
curl -L -o /etc/yum.repos.d/fedora-coreos-pool.repo \
curl -LsSf -o /etc/yum.repos.d/fedora-coreos-pool.repo \
https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora-coreos-pool.repo

### PREPARE CUSTOM KERNEL SUPPORT
if [[ "asus" == "${KERNEL_FLAVOR}" ]]; then
echo "Installing ASUS Kernel:"
curl -L -o /etc/yum.repos.d/_copr_lukenukem-asus-kernel.repo \
curl -LsSf -o /etc/yum.repos.d/_copr_lukenukem-asus-kernel.repo \
https://copr.fedorainfracloud.org/coprs/lukenukem/asus-kernel/repo/fedora-$(rpm -E %fedora)/lukenukem-asus-kernel-fedora-$(rpm -E %fedora).repo
rpm-ostree cliwrap install-to-root /
rpm-ostree override replace \
Expand All @@ -59,7 +59,7 @@ if [[ "asus" == "${KERNEL_FLAVOR}" ]]; then
kernel-modules-extra
elif [[ "fsync-lts" == "${KERNEL_FLAVOR}" ]]; then
echo "Installing fsync-lts kernel:"
curl -L -o /etc/yum.repos.d/_copr_sentry-kernel-ba.repo \
curl -LsSf -o /etc/yum.repos.d/_copr_sentry-kernel-ba.repo \
https://copr.fedorainfracloud.org/coprs/sentry/kernel-ba/repo/fedora-$(rpm -E %fedora)/sentry-kernel-ba-fedora-$(rpm -E %fedora).repo
rpm-ostree cliwrap install-to-root /
rpm-ostree override replace \
Expand All @@ -74,7 +74,7 @@ elif [[ "fsync-lts" == "${KERNEL_FLAVOR}" ]]; then
kernel-modules-extra
elif [[ "fsync" == "${KERNEL_FLAVOR}" ]]; then
echo "Installing fsync kernel:"
curl -L -o /etc/yum.repos.d/_copr_sentry-kernel-fsync.repo \
curl -LsSf -o /etc/yum.repos.d/_copr_sentry-kernel-fsync.repo \
https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/repo/fedora-$(rpm -E %fedora)/sentry-kernel-fsync-fedora-$(rpm -E %fedora).repo
rpm-ostree cliwrap install-to-root /
rpm-ostree override replace \
Expand All @@ -90,9 +90,9 @@ elif [[ "fsync" == "${KERNEL_FLAVOR}" ]]; then
elif [[ "surface" == "${KERNEL_FLAVOR}" ]]; then
echo "Installing Surface Kernel:"
# Add Linux Surface repo
curl -L -o /etc/yum.repos.d/linux-surface.repo \
curl -LsSf -o /etc/yum.repos.d/linux-surface.repo \
https://pkg.surfacelinux.com/fedora/linux-surface.repo
curl -L -o /tmp/surface-kernel.rpm \
curl -LsSf -o /tmp/surface-kernel.rpm \
https://github.com/linux-surface/linux-surface/releases/download/silverblue-20201215-1/kernel-20201215-1.x86_64.rpm
rpm-ostree cliwrap install-to-root /
rpm-ostree override replace /tmp/surface-kernel.rpm \
Expand Down

0 comments on commit 3fc17df

Please sign in to comment.