Skip to content

.github: Don't install QEMU on the Ubuntu systems #4340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chewi merged 5 commits into from
Oct 28, 2026
+16 −22
Merged

.github: Don't install QEMU on the Ubuntu systems #4340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1938d4b
build_image_util: Don't chroot to run semodule
chewi Oct 27, 2026
99f77c9
coreos-devel/sdk-depends: Update SELinux dependencies
chewi Oct 27, 2026
5a11ae8
setup_board: Fix the bwrap wrapper script when QEMU is needed
chewi Oct 27, 2026
880b2cd
build_image_util: Don't invoke localedef with bwrap and QEMU
chewi Oct 27, 2026
15cc22f
.github: Don't install QEMU on the Ubuntu systems
chewi Oct 27, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
sudo rm /bin/sh
sudo ln -s /bin/bash /bin/sh
sudo apt-get update
sudo apt-get install -y ca-certificates curl git gnupg lsb-release python3 python3-packaging qemu-user-static zstd
sudo apt-get install -y ca-certificates curl git gnupg lsb-release python3 python3-packaging zstd

@chewi chewi Oct 27, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Hmmm. It seems you're right, although I wonder how that's working on Jenkins. I'll find out.

@chewi chewi Oct 27, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I've changed this to not run semodule in a chroot. @krnowak, it seems to work, but what do you think? I'll kick off a GHA build now.


- name: Set up Docker
uses: docker/setup-docker-action@v4
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/setup-flatcar-sdk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ fi

sudo ln -sfn /bin/bash /bin/sh
sudo apt-get update
sudo apt-get install -y ca-certificates curl git gnupg lbzip2 lsb-release \
qemu-user-static zstd
sudo apt-get install -y ca-certificates curl git gnupg lbzip2 lsb-release zstd
sudo mkdir -p /etc/apt/keyrings
curl -fsSL https://download.docker.com/linux/ubuntu/gpg \
| sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-sdk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
run: |
sudo rm /bin/sh
sudo ln -s /bin/bash /bin/sh
sudo apt-get install -y ca-certificates curl gnupg lsb-release qemu-user-static git jq openssh-client rsync zstd
sudo apt-get install -y ca-certificates curl gnupg lsb-release git jq openssh-client rsync zstd

- name: Set up Docker
uses: docker/setup-docker-action@v4
Expand Down
7 changes: 4 additions & 3 deletions build_library/build_image_util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,9 @@ run_localedef() {
[[ -f "${i18n}/charmaps/UTF-8.gz" ]] || die
[[ -f "${i18n}/locales/C" ]] || die
sudo mkdir -p "${root_fs_dir}/usr/lib/locale"
sudo I18NPATH="${i18n}" "bwrap-${BOARD}" "${root_fs_dir}" /usr/bin/localedef \
--charmap=UTF-8 --inputfile=C C.UTF-8
# We could detect board endianness, but just assume little for now.
sudo env I18NPATH="${i18n}" localedef --prefix="${root_fs_dir}" \
--little-endian --charmap=UTF-8 --inputfile=C C.UTF-8
}

# Basic command to emerge binary packages into the target image.
Expand Down Expand Up @@ -647,7 +648,7 @@ EOF

# Build the selinux policy
if pkg_use_enabled coreos-base/coreos selinux; then
sudo chroot "${root_fs_dir}" bash -c "cd /usr/share/selinux/mcs && semodule -s mcs -i *.pp"
sudo semodule -n -s mcs -p "${root_fs_dir}" -i "${root_fs_dir}"/usr/share/selinux/mcs/*.pp
fi

# Run tmpfiles once to make sure that /etc has everything in place before
Expand Down
0 .../sdk-depends/sdk-depends-0.0.1-r57.ebuild → .../sdk-depends/sdk-depends-0.0.1-r58.ebuild
View file
Open in desktop
File renamed without changes.
22 changes: 8 additions & 14 deletions ...ontainer/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $

EAPI=7
EAPI=9

DESCRIPTION="Meta ebuild for everything that needs to be in the SDK."
HOMEPAGE="http://coreos.com/docs/sdk/"
SRC_URI=""

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 arm64"
IUSE=""

DEPEND="
app-admin/sudo
Expand All @@ -29,15 +27,19 @@ DEPEND="
coreos-base/hard-host-depends
coreos-base/coreos-sb-keys
dev-libs/gobject-introspection-common
dev-perl/Parse-Yapp
>=dev-python/gpep517-15
dev-python/setuptools
dev-python/six
dev-util/catalyst
dev-util/pahole
dev-util/patchelf
dev-util/pkgcheck
net-dns/bind
>=net-dns/dnsmasq-2.72[dhcp,ipv6]
net-libs/rpcsvc-proto
net-misc/curl
sys-apps/bubblewrap
sys-apps/debianutils
sys-apps/iproute2
amd64? ( sys-apps/iucode_tool )
Expand All @@ -47,21 +49,13 @@ DEPEND="
sys-fs/btrfs-progs
sys-fs/cryptsetup
sys-fs/erofs-utils
dev-perl/Parse-Yapp
dev-util/pkgcheck
"

# Must match the build-time dependencies listed in selinux-policy-2.eclass
DEPEND="${DEPEND}
!arm64? (
>=sys-apps/checkpolicy-2.0.21
>=sys-apps/policycoreutils-2.0.82
)
sys-devel/m4"

DEPEND="${DEPEND}
sys-apps/bubblewrap
>=dev-python/gpep517-15
>=sys-apps/checkpolicy-2.0.21
>=sys-apps/policycoreutils-2.5
sys-devel/m4
"

# These packages are pulled indirectly during the multi-stage SDK
Expand Down
2 changes: 1 addition & 1 deletion setup_board
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ EOF
#!/bin/sh -e
_ROOT=\${1?Pass a root directory as the first argument}
shift
exec bwrap --bind "\${_ROOT}" / --tmpfs /tmp --dev-bind /dev /dev --proc /proc --bind /sys /sys ${qemu+--ro-bind ${qemu} ${qemu}} -- "\$@"
exec bwrap --bind "\${_ROOT}" / --tmpfs /tmp --dev-bind /dev /dev --proc /proc --bind /sys /sys ${qemu+--ro-bind ${qemu} ${qemu}} -- ${qemu} "\$@"
EOF
wrappers+=( "${wrapper}" )

Expand Down
Loading