Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions build-args.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
# Pass to buildah/podman using `--build-arg-file`.

# This is the developer default version. In pipelines, this is driven by versionary.
VERSION=42.dev
# XXX: This should be a digested pull that gets bumped.
# https://gitlab.com/fedora/bootc/tracker/-/issues/34
BUILDER_IMG=quay.io/fedora/fedora-bootc:42
VERSION=43.dev
BUILDER_IMG=quay.io/bootc-devel/fedora-bootc-43-standard@sha256:b7ad5bc503ead71c091f41e0c4faf2d3726563a6aa61fb50875e15ab900ae5f4
MANIFEST=manifest.yaml
# XXX: see inject_passwd_group() in build-rootfs
PASSWD_GROUP_DIR=manifests
Expand Down
2 changes: 1 addition & 1 deletion ci/buildroot/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# This image is used by CoreOS CI to build software like
# Ignition, rpm-ostree, ostree, coreos-installer, etc...
FROM quay.io/fedora/fedora:42
FROM quay.io/fedora/fedora:43
# Work around for https://bugzilla.redhat.com/show_bug.cgi?id=2278652
ENV container=oci
COPY . /src
Expand Down
8 changes: 1 addition & 7 deletions ci/buildroot/install-buildroot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,8 @@ brs=$(grep -v '^#' "${dn}"/buildroot-buildreqs.txt)
echo "${brs}" | xargs dnf download --source
# rebuild the SRPM for this arch; see
# https://bugzilla.redhat.com/show_bug.cgi?id=1402784#c6
# Add workaround if on F42 for https://github.com/coreos/fedora-coreos-tracker/issues/1901
source /etc/os-release
workaround=""
if [ "${VERSION_ID}" == "42" ]; then
workaround="--noclean"
fi
find . -name '*.src.rpm' -print0 | xargs -0n 1 rpmbuild -rs --nodeps \
-D "%_topdir $PWD/rpmbuild" -D "%_tmppath %{_topdir}/tmp" ${workaround}
Comment on lines -30 to -37
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested this locally on x86_64 and was able to build the container without hitting coreos/fedora-coreos-tracker#1901

-D "%_topdir $PWD/rpmbuild" -D "%_tmppath %{_topdir}/tmp"
dnf builddep -y rpmbuild/SRPMS/*.src.rpm)
rm -rf "${tmpd:?}"/*

Expand Down
Loading
Loading