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

chore: quiet curl output in build logs #198

Merged
merged 4 commits into from
Jun 5, 2024
Merged

chore: quiet curl output in build logs #198

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
e74433a
chore: quiet curl output in build logs
mulderje May 15, 2024
6295047
Merge branch 'main' into quiet-curl
mulderje May 22, 2024
8315ade
Merge branch 'main' into quiet-curl
mulderje May 28, 2024
036461e
Merge branch 'main' into quiet-curl
mulderje Jun 5, 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 build-kmod-kvmfr.sh
View file
Open in desktop
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-kmod-vhba.sh
View file
Open in desktop
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-prep.sh
View file
Open in desktop
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