Skip to content

Commit

Permalink
fix: include architecture in kernel version
Browse files Browse the repository at this point in the history
  • Loading branch information
p5 authored Dec 26, 2024
1 parent 469f226 commit 382c3b7
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
sudo apt install sbsigntool curl openssl
fi
podman run -d --rm --name ${IMAGE_NAME} ${IMAGE_REGISTRY}/${IMAGE_NAME}@${IMAGE_DIGEST} sleep 1000
KERNEL_VERSION=$(podman exec ${IMAGE_NAME} rpm -q --qf "%{VERSION}-%{RELEASE}\n" kernel | tail -n 1)
KERNEL_VERSION=$(podman exec ${IMAGE_NAME} rpm -q --qf "%{VERSION}-%{RELEASE}.%{ARCH}\n" kernel | tail -n 1)
podman cp ${IMAGE_NAME}:/usr/lib/modules/${KERNEL_VERSION}/vmlinuz .
podman rm -f ${IMAGE_NAME}
sbverify --list vmlinuz
Expand Down
32 changes: 16 additions & 16 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.7-200.fc40.x86_64}"

COPY sys_files/usr /usr

RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
--mount=type=bind,from=ctx,src=/,dst=/ctx \
--mount=type=bind,from=config,src=/rpms,dst=/tmp/rpms \
--mount=type=bind,from=akmods,src=/rpms/ublue-os,dst=/tmp/akmods-rpms \
--mount=type=bind,from=kernel,src=/tmp/rpms,dst=/tmp/kernel-rpms \
rm -f /usr/bin/chsh && \
rm -f /usr/bin/lchsh && \
mkdir -p /var/lib/alternatives && \
/ctx/install.sh && \
/ctx/post-install.sh && \
mv /var/lib/alternatives /staged-alternatives && \
/ctx/cleanup.sh && \
ostree container commit && \
mkdir -p /var/lib && mv /staged-alternatives /var/lib/alternatives && \
mkdir -p /var/tmp && \
chmod -R 1777 /var/tmp
# RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
# --mount=type=bind,from=ctx,src=/,dst=/ctx \
# --mount=type=bind,from=config,src=/rpms,dst=/tmp/rpms \
# --mount=type=bind,from=akmods,src=/rpms/ublue-os,dst=/tmp/akmods-rpms \
# --mount=type=bind,from=kernel,src=/tmp/rpms,dst=/tmp/kernel-rpms \
# rm -f /usr/bin/chsh && \
# rm -f /usr/bin/lchsh && \
# mkdir -p /var/lib/alternatives && \
# /ctx/install.sh && \
# /ctx/post-install.sh && \
# mv /var/lib/alternatives /staged-alternatives && \
# /ctx/cleanup.sh && \
# ostree container commit && \
# mkdir -p /var/lib && mv /staged-alternatives /var/lib/alternatives && \
# mkdir -p /var/tmp && \
# chmod -R 1777 /var/tmp

0 comments on commit 382c3b7

Please sign in to comment.