Skip to content

Commit

Permalink
temp: use coreos-testing due to upstream (#28)
Browse files Browse the repository at this point in the history
* chore: fixup

Signed-off-by: m2 <69128853+m2Giles@users.noreply.github.com>

* Put Fedora Version inside Parans

Signed-off-by: m2 <69128853+m2Giles@users.noreply.github.com>

* fix: just formatter changed on version 1.39

Signed-off-by: m2 <69128853+m2Giles@users.noreply.github.com>

* temporary: use coreos-testing due to upstream

Signed-off-by: m2 <69128853+m2Giles@users.noreply.github.com>

---------

Signed-off-by: m2 <69128853+m2Giles@users.noreply.github.com>
  • Loading branch information
m2Giles authored Jan 31, 2025
1 parent 4948d5e commit de56fd9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ build image="bluefin":
"cosmic"*)
just verify-container bluefin:stable-daily
fedora_version="$(skopeo inspect docker://ghcr.io/ublue-os/bluefin:stable-daily | jq -r '.Labels["ostree.linux"]' | grep -oP 'fc\K[0-9]+')"
just verify-container coreos-stable-kernel:"${fedora_version}"
just verify-container coreos-testing-kernel:"${fedora_version}"
BASE_IMAGE=base-main
TAG_VERSION="${fedora_version}"
just verify-container "${BASE_IMAGE}":"${TAG_VERSION}"
skopeo inspect docker://ghcr.io/ublue-os/coreos-stable-kernel:"${fedora_version}" > /tmp/inspect-"{{ image }}".json
skopeo inspect docker://ghcr.io/ublue-os/coreos-testing-kernel:"${fedora_version}" > /tmp/inspect-"{{ image }}".json
;;
"ucore"*)
BASE_IMAGE=ucore
Expand Down
6 changes: 3 additions & 3 deletions cosmic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set ${SET_X:+-x} -eou pipefail

if [[ -z "${KERNEL_FLAVOR:-}" ]]; then
KERNEL_FLAVOR=coreos-stable
KERNEL_FLAVOR=coreos-testing
fi

# Get Kernel Version
Expand Down Expand Up @@ -111,8 +111,8 @@ AKMODS_RPMS=(
)

# Fetch ZFS
if [[ "${KERNEL_FLAVOR}" == "coreos-stable" ]]; then
skopeo copy docker://ghcr.io/ublue-os/akmods-zfs:coreos-stable-"$(rpm -E %fedora)"-"${QUALIFIED_KERNEL}" dir:/tmp/akmods-zfs
if [[ "${KERNEL_FLAVOR}" =~ coreos ]]; then
skopeo copy docker://ghcr.io/ublue-os/akmods-zfs:"${KERNEL_FLAVOR}"-"$(rpm -E %fedora)"-"${QUALIFIED_KERNEL}" dir:/tmp/akmods-zfs
ZFS_TARGZ=$(jq -r '.layers[].digest' </tmp/akmods-zfs/manifest.json | cut -d : -f 2)
tar -xvzf /tmp/akmods-zfs/"$ZFS_TARGZ" -C /tmp/
mv /tmp/rpms/* /tmp/akmods-zfs/
Expand Down
2 changes: 1 addition & 1 deletion vfio.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set ${SET_X:+-x} -eou pipefail

if [[ -z "${KERNEL_FLAVOR:-}" ]]; then
KERNEL_FLAVOR=coreos-stable
KERNEL_FLAVOR=coreos-testing
fi

KERNEL_SUFFIX=""
Expand Down

0 comments on commit de56fd9

Please sign in to comment.