Skip to content
This repository was archived by the owner on Apr 27, 2025. It is now read-only.

Commit b39098d

Browse files
committed
fix(ci): remove cliwrap
1 parent 9d83d07 commit b39098d

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

Containerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
4545
--mount=type=bind,from=ctx,src=/,dst=/ctx \
4646
--mount=type=bind,from=akmods_nvidia,src=/rpms,dst=/tmp/akmods-rpms \
4747
mkdir -p /var/lib/alternatives && \
48+
if [ ! -x /usr/bin/dnf5 ]; then \
49+
rpm-ostree install --idempotent dnf5 dnf5-plugins \
50+
; fi && \
4851
IMAGE_FLAVOR=nvidia /ctx/image-info.sh && \
4952
NVIDIA_FLAVOR=nvidia /ctx/nvidia-install.sh && \
5053
/ctx/build-initramfs.sh && \

build-initramfs.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,8 @@ else
99
KERNEL_SUFFIX=""
1010
fi
1111

12-
if [ ! -f /usr/libexec/rpm-ostree/wrapped/dracut ]; then
13-
rpm-ostree cliwrap install-to-root /
14-
fi
15-
1612
QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(|'"$KERNEL_SUFFIX"'-)(\d+\.\d+\.\d+)' | sed -E 's/kernel-(|'"$KERNEL_SUFFIX"'-)//')"
1713

18-
/usr/libexec/rpm-ostree/wrapped/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
14+
/usr/bin/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
1915

2016
chmod 0600 "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"

install.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ if [ "${KERNEL_FLAVOR}" = "asus" ]; then
1818
# Install Asus kernel
1919
curl -Lo /etc/yum.repos.d/_copr_lukenukem-asus-linux.repo \
2020
https://copr.fedorainfracloud.org/coprs/lukenukem/asus-linux/repo/fedora-"${RELEASE}"/lukenukem-asus-linux-fedora-"${RELEASE}".repo
21-
rpm-ostree cliwrap install-to-root /
2221
rpm-ostree override replace \
2322
--experimental \
2423
/tmp/kernel-rpms/kernel-"${KERNEL_VERSION}".rpm \
@@ -33,7 +32,6 @@ elif [ "${KERNEL_FLAVOR}" = "surface" ]; then
3332
# curl -Lo /tmp/surface-kernel.rpm \
3433
# https://github.com/linux-surface/linux-surface/releases/download/silverblue-20201215-1/kernel-20201215-1.x86_64.rpm
3534
# Install Surface kernel
36-
rpm-ostree cliwrap install-to-root /
3735
rpm-ostree override replace \
3836
--experimental \
3937
--remove kernel \

0 commit comments

Comments
 (0)