Skip to content

Commit

Permalink
fix(ci): remove cliwrap
Browse files Browse the repository at this point in the history
  • Loading branch information
m2Giles committed Feb 22, 2025
1 parent 9d83d07 commit b39098d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
3 changes: 3 additions & 0 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
--mount=type=bind,from=ctx,src=/,dst=/ctx \
--mount=type=bind,from=akmods_nvidia,src=/rpms,dst=/tmp/akmods-rpms \
mkdir -p /var/lib/alternatives && \
if [ ! -x /usr/bin/dnf5 ]; then \
rpm-ostree install --idempotent dnf5 dnf5-plugins \
; fi && \
IMAGE_FLAVOR=nvidia /ctx/image-info.sh && \
NVIDIA_FLAVOR=nvidia /ctx/nvidia-install.sh && \
/ctx/build-initramfs.sh && \
Expand Down
6 changes: 1 addition & 5 deletions build-initramfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,8 @@ else
KERNEL_SUFFIX=""
fi

if [ ! -f /usr/libexec/rpm-ostree/wrapped/dracut ]; then
rpm-ostree cliwrap install-to-root /
fi

QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(|'"$KERNEL_SUFFIX"'-)(\d+\.\d+\.\d+)' | sed -E 's/kernel-(|'"$KERNEL_SUFFIX"'-)//')"

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

chmod 0600 "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
2 changes: 0 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ if [ "${KERNEL_FLAVOR}" = "asus" ]; then
# Install Asus kernel
curl -Lo /etc/yum.repos.d/_copr_lukenukem-asus-linux.repo \
https://copr.fedorainfracloud.org/coprs/lukenukem/asus-linux/repo/fedora-"${RELEASE}"/lukenukem-asus-linux-fedora-"${RELEASE}".repo
rpm-ostree cliwrap install-to-root /
rpm-ostree override replace \
--experimental \
/tmp/kernel-rpms/kernel-"${KERNEL_VERSION}".rpm \
Expand All @@ -33,7 +32,6 @@ elif [ "${KERNEL_FLAVOR}" = "surface" ]; then
# curl -Lo /tmp/surface-kernel.rpm \
# https://github.com/linux-surface/linux-surface/releases/download/silverblue-20201215-1/kernel-20201215-1.x86_64.rpm
# Install Surface kernel
rpm-ostree cliwrap install-to-root /
rpm-ostree override replace \
--experimental \
--remove kernel \
Expand Down

0 comments on commit b39098d

Please sign in to comment.