Bump alpine 3.22 by christoph-zededa · Pull Request #5650 · lf-edge/eve

christoph-zededa · 2026-03-04T12:46:48Z

Description

Update EVE to alpine 3.22

People that look at this PR, should also have a look at lf-edge/eve-rust#19

How to test and validate this PR

All current tests should work the same with this PR.

Changelog notes

Update Alpine to 3.22

PR Backports

For all current LTS branches, please state explicitly if this PR should be
backported or not. This section is used by our scripts to track the backports,
so, please, do not omit it.

Here is the list of current LTS branches (it should be always up to date):

16.0-stable: no
14.5-stable: no
13.4-stable: no

Checklist

I've provided a proper description
I've added the proper documentation
I've tested my PR on amd64 device
I've tested my PR on arm64 device
I've written the test verification instructions
I've set the proper labels to this PR

And the last but not least:

I've checked the boxes above, or I've provided a good reason why I didn't
check them.

Please, check the boxes above after submitting the PR in interactive mode.

Thanks to @famleebob for the initial alpine bumping and help with several packages.

rene · 2026-03-04T13:00:11Z

pkg/alpine-base/Dockerfile

-    riscv64) \
-        ROOT_URL=https://storage.googleapis.com/eve-alpine && \
-        ROOTFS_URL="$ROOT_URL/images/alpine-minirootfs-220909-riscv64.tar.gz"; \
+    x86_64|aarch64|riscv64) \


My understanding is that we had alpine-base solely because of lack of support for riscv64, so we had to download the minirootfs from a personal customized repo. AFAIU we can just do the bootstrap of pkg/alpine directly from alpine:3.22. Is pkg/alpine-base really needed?

Can we please do only the bump of alpine in this PR and do "refactorings" in future PRs?

It is a lot of effort rebasing these >30 commits on master all the time while also the alpine packages get updated in parallel.

I'm working on a pull request to eliminate alpine-base (two lines, maybe three), but need to add documentation changes.

rene · 2026-03-04T13:03:22Z

pkg/wwan/Dockerfile

 COPY --from=build /usr/share/dbus-1 /usr/share/dbus-1
 COPY --from=build /bin/udevadm /bin/udevadm
-COPY --from=build /lib/udev/rules.d /lib/udev/rules.d
+COPY --from=build /usr/lib/udev/rules.d /lib/udev/rules.d


Question to @milan-zededa, considering Alpine 3.22, is really needed to build all these libraries? Isn't their versions from Alpine 3.22 good enough?

rene · 2026-03-04T13:05:02Z

pkg/vtpm/Dockerfile

-    ./configure && \
-    make -j$(nproc)
+RUN ./bootstrap
+RUN ./configure CFLAGS="-Wno-error"


vtpm is a critical tool. Which build warnings are you ignoring? Better double check with @shjala .

this one:

#43 4.290 In file included from tools/tpm2_getekcertificate.c:8: #43 4.290 In function 'retrieve_web_endorsement_certificate', #43 4.290 inlined from 'get_web_ek_certificate' at tools/tpm2_getekcertificate.c:334:11, #43 4.290 inlined from 'get_ek_certificates' at tools/tpm2_getekcertificate.c:539:19, #43 4.290 inlined from 'tpm2_tool_onrun' at tools/tpm2_getekcertificate.c:793:10: #43 4.290 tools/tpm2_getekcertificate.c:235:14: error: call to '_curl_easy_setopt_err_long' declared with attribute warning: curl_easy_setopt expects a long argument [-Werror=attribute-warning] #43 4.290 235 | rc = curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0); #43 4.290 | ^~~~~~~~~~~~~~~~ #43 4.290 tools/tpm2_getekcertificate.c:292:10: error: call to '_curl_easy_setopt_err_long' declared with attribute warning: curl_easy_setopt expects a long argument [-Werror=attribute-warning] #43 4.290 292 | rc = curl_easy_setopt(curl, CURLOPT_FAILONERROR, true); #43 4.290 | ^~~~~~~~~~~~~~~~ #43 4.387 cc1: all warnings being treated as errors #43 4.392 make: *** [Makefile:4067: tools/tpm2-tpm2_getekcertificate.o] Error 1 #43 ERROR: process "/bin/sh -c make -j$(nproc)" did not complete successfully: exit code: 2 Error: error building "lfedge/eve-vtpm:7ee178e008fe2cadcc6be8e32a0cbfddc5eb4990-dirty-dcf2937": error building for arch amd64: failed to solve: process "/bin/sh -c make -j$(nproc)" did not complete successfully: exit code: 2

pkg/nvidia/Dockerfile

rene · 2026-03-04T13:12:20Z

pkg/debug/lshw/0004-JSON-output-clean-up-list-object.patch

@@ -1,49 +0,0 @@
-From 78e87b0d8e4aa57aae85bc756c78ec47357697d9 Mon Sep 17 00:00:00 2001
-From: Lyonel Vincent <lyonel@ezix.org>


You can rename the patch number 5 (0005-core-osutils-Fix-std-length_error.patch) to 0001-core-osutils-Fix-std-length_error.patch

rene · 2026-03-04T13:14:44Z

@christoph-zededa (and @famleebob) thank you very much for this work.... this was something everyone was eagerly awaiting....

christoph-zededa · 2026-03-04T13:24:19Z

pkg/vtpm/Dockerfile

 RUN find /out/usr/lib/ -name '*.la' -delete
 RUN find /out/usr/lib/ -name '*.a' -delete

+RUN rm /out/usr/lib/libprotoc.so* /out/usr/lib/libprotobuf*


@shjala can you comment on if it is okay to remove these? According to ldd vtpm is not linking against it dynamically, but perhaps it does a dlopen?

eriknordmark · 2026-03-04T14:31:58Z

Do the arm64 kvm images still fit in 300Mbyte with these updates?

christoph-zededa · 2026-03-04T18:13:00Z

Do the arm64 kvm images still fit in 300Mbyte with these updates?

Yes, on master qemu I see that the size taken is 265.1mb and on my temporary alpine bump branch it is about the same size - 263.5mb.

add necessary CXX flags for stat64 and add packages to compile Signed-off-by: Christoph Ostarek <christoph@zededa.com>

to fix compile errors on newer alpine versions Signed-off-by: Christoph Ostarek <christoph@zededa.com>

missing libraries added C++ standard increased Signed-off-by: Christoph Ostarek <christoph@zededa.com>

do not error our if FORTIFY_SOURCE is set twice, once as per compiler, once as per project. Unfortunately we do not have control over setting it here besides disabling it completely, so we disable erroring out on this warning Signed-off-by: Christoph Ostarek <christoph@zededa.com>

adding includes for building on arm64 Signed-off-by: Christoph Ostarek <christoph@zededa.com>

to avoid compile error source of this package: https://github.com/openwrt/openwrt/pull/17352/changes for bsp-imx also fix version name Signed-off-by: Christoph Ostarek <christoph@zededa.com>

add necessary alpine packages needed for the cross-compilers package Signed-off-by: Christoph Ostarek <christoph@zededa.com>

Updated items built within the container, that is `muscl` version to 1.2.5, `lshw` version to 2.20, and `openssh` to 10.0p1`. We download the sources from a `Debian` mirror. This appearsd to be more trusted than `mucl.libc.org`. That assumption should be tested someday (is it still valid?). `abuild` has changed such that a step that a failed `apk add` did not "fail" the `docker` step, needed to mask that new failure. (step is repeated in the Dockerfile, with require `--allow-trusted` argument). Updated to the latest from alpine musl ABUILD file (updated patches, and such). `lshw` insured that all patches are factored in, keeping a fix by Rene. `https://ezix.org/src/pkg/lshw` appears to be the currently active git repository, continued to download tar file. `hexedit` built, so I left it alone. Need to check for fixes. `openssh` the file `/usr/src/ssh/RELEASE_KEY.asc` no longer found. Needed to ADD it from the openssh web site. Signed-off-by: Gerald (Bob) Lee <bob@famleehouse.net>

Often fails verify of the openssh source tar file trying to get a lock. Appears that the import has not completed when the verify starts (at least not released the lock). Inserting a `RUN sleep 5` between the operations passed consistently. Further, tried putting them on a single RUN line (must exit and have result examined). Build consistently work. Signed-off-by: Gerald (Bob) Lee <bob@famleehouse.net>

- fix compiling tpm2 - replace dhclient with dhcpcd as dhclient is no more available in alpine packages Signed-off-by: Christoph Ostarek <christoph@zededa.com>

to the same version we bump everything else Signed-off-by: Christoph Ostarek <christoph@zededa.com>

- add packages needed for new alpine - update aports to alpine 3.22.3 - add needed distfiles for building aports - add workaround for building for armhf Signed-off-by: Christoph Ostarek <christoph@zededa.com>

add necessary packages and cflags Signed-off-by: Christoph Ostarek <christoph@zededa.com>

newer gcc complains and errors out with: ``` 26 19.38 INSTALL out/arm/export-ta_arm64/ta/f04a0fe7-1f5d-4b9b-abf7-619b85b4ce8c.ta 26 19.40 ld.bfd: warning: out/arm/core/all_objs.o has a LOAD segment with RWX permissions 26 19.47 GEN out/arm/core/unpaged_entries.txt 26 19.47 GEN out/arm/core/init_entries.txt 26 19.47 LD out/arm/core/unpaged.o 26 19.48 UPD out/arm/core/.buildcount 26 19.49 GEN out/arm/core/version.o 26 19.50 LD out/arm/core/init.o 26 19.55 ld.bfd: warning: out/arm/core/unpaged.o has a LOAD segment with RWX permissions 26 19.56 GEN out/arm/core/text_unpaged.ld.S 26 19.56 GEN out/arm/core/rodata_unpaged.ld.S 26 19.58 ld.bfd: warning: out/arm/core/init.o has a LOAD segment with RWX permissions 26 19.59 GEN out/arm/core/text_init.ld.S 26 19.60 GEN out/arm/core/rodata_init.ld.S 26 19.63 CPP out/arm/core/kern.ld 26 19.65 LD out/arm/core/tee.elf 26 19.77 ld.bfd: warning: out/arm/core/tee.elf has a LOAD segment with RWX permissions 26 19.84 make: *** [core/arch/arm/kernel/link.mk:167: out/arm/core/tee.elf] Error 1 ``` Signed-off-by: Christoph Ostarek <christoph@zededa.com>

in order to make it compile similar to pkg/optee-os Signed-off-by: Christoph Ostarek <christoph@zededa.com>

busybox adds 'vi' Signed-off-by: Christoph Ostarek <christoph@zededa.com>

This reverts commit 4c0c966. Signed-off-by: Christoph Ostarek <christoph@zededa.com>

to save a lot of space as it brings in libLLVM Signed-off-by: Christoph Ostarek <christoph@zededa.com>

in order to save space Signed-off-by: Christoph Ostarek <christoph@zededa.com>

use `unsigned int` here to avoid compiler error Signed-off-by: Christoph Ostarek <christoph@zededa.com>

this is currently broken and probably needs updated gcc/binutils (according to https://www.mail-archive.com/grub-devel@gnu.org/msg36136.html ) Signed-off-by: Christoph Ostarek <christoph@zededa.com>

it is what it is Signed-off-by: Christoph Ostarek <christoph@zededa.com>

this has been kept for easier transition, but can go away now Signed-off-by: Christoph Ostarek <christoph@zededa.com>

they use newer alpine Signed-off-by: Christoph Ostarek <christoph@zededa.com>

this PR needs a bit more disk space will be reverted shortly before merging into master or shortly after Signed-off-by: Christoph Ostarek <christoph@zededa.com>

for builds whereever it makes sense this is especially needed when a lot of packages are rebuilt Signed-off-by: Christoph Ostarek <christoph@zededa.com>

this updates the dependencies of the packages to use the newest version Signed-off-by: Christoph Ostarek <christoph@zededa.com>

christoph-zededa · 2026-03-16T15:49:41Z

There is some ZFS issue as seen by several failures of the form: === RUN TestVolStatus vol_test.go:137: time: 2026-03-15T14:40:38.462775146Z out: volumes: '[blank-vol-1]' state: 'CREATED_VOLUME' secs: 180

    time: 2026-03-15T14:40:38.468757581Z out: 	volName blank-vol-1 state changed to UNKNOWN
    time: 2026-03-15T14:40:46.785403594Z out: 	volName blank-vol-1 state changed to INITIAL
    time: 2026-03-15T14:40:48.786870354Z out: 	volName blank-vol-1 state changed to CREATING_VOLUME
        vol_test.go:165: ASSERTION FAILED (2026-03-15T14:43:38.469748715Z): expected volumes [blank-vol-1] in CREATED_VOLUME state
        vol_test.go:167: 	actual blank-vol-1: CREATING_VOLUME
        vol_test.go:169: 	history of states for blank-vol-1:
        vol_test.go:171: 		state: no info from controller received in: 2026-03-15T14:40:38.462794506Z
        vol_test.go:171: 		state: UNKNOWN received in: 2026-03-15T14:40:38.468755587Z
        vol_test.go:171: 		state: INITIAL received in: 2026-03-15T14:40:46.785400207Z
        vol_test.go:171: 		state: CREATING_VOLUME received in: 2026-03-15T14:40:48.786866807Z
        testContext.go:274: WaitForProcWithErrorCallback terminated by timeout 3m0s
    --- FAIL: TestVolStatus (181.01s)

The other failures in Eden are noise (eden_vector, log_test, etc)

Unfortunately I cannot find the logs for what happened on the CI.

Locally it seems /dev/zvol is not getting populated:

67345889-4554-483b-a255-6b9753682ed1:~# ls /dev/zvol/*
ls: /dev/zvol/*: No such file or directory
67345889-4554-483b-a255-6b9753682ed1:~# zfs list -t volume
NAME                                                           USED  AVAIL  REFER  MOUNTPOINT
persist/vault/volumes/10fdebc9-c1ba-492f-8831-c1576128363e.0    56K  4.82G    56K  -
persist/vault/volumes/11051100-246f-4f1a-aefb-e52c25144cfa.0    56K  4.65G    56K  -
persist/vault/volumes/74a61034-d81b-436e-b781-701637200737.0    56K  4.65G    56K  -
persist/vault/volumes/a78bb7fc-88f2-4237-816d-9192c12ff60d.0    56K  4.65G    56K  -

Seems the folder with the udev rules was wrong: https://github.com/lf-edge/eve/compare/9942d57aa8a19748f5c356709166bc65e38122a4..197bc1a3610a9bf57b1b64e5300742ccf239c1e2

thx to @andrewd-zededa for the hint

christoph-zededa force-pushed the bump_alpine-3.22 branch from d84c1b3 to a8040ba Compare March 4, 2026 12:47

github-actions bot requested review from OhmSpectator, andrewd-zededa, deitch, eriknordmark, europaul, jsfakian, milan-zededa, naiming-zededa, rene, rouming, rucoder, shjala and zedi-pramodh March 4, 2026 12:47

christoph-zededa force-pushed the bump_alpine-3.22 branch 4 times, most recently from 9574d8e to 2bf2b96 Compare March 4, 2026 12:56

rene reviewed Mar 4, 2026

View reviewed changes

pkg/nvidia/Dockerfile Show resolved Hide resolved

rene reviewed Mar 4, 2026

View reviewed changes

christoph-zededa commented Mar 4, 2026

View reviewed changes

christoph-zededa mentioned this pull request Mar 4, 2026

bump alpine to 3.22 lf-edge/eve-rust#19

Open

christoph-zededa force-pushed the bump_alpine-3.22 branch from 2bf2b96 to e407213 Compare March 4, 2026 18:46

github-actions bot requested a review from rene March 4, 2026 18:48

christoph-zededa and others added 27 commits March 16, 2026 15:33

pkg/gpt-tools: fix build for alpine 3.22

6e4c2f2

add necessary CXX flags for stat64 and add packages to compile Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkg/kexec: update to 2.0.32

f9f9d04

to fix compile errors on newer alpine versions Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkg/vtpm: fix build for alpine 3.22

1aa8c5f

missing libraries added C++ standard increased Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkg/xen-tools: fix build

59c7caf

adding includes for building on arm64 Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkg/u-boot,bsp-imx: fix swig interface

0bfe24e

to avoid compile error source of this package: https://github.com/openwrt/openwrt/pull/17352/changes for bsp-imx also fix version name Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkg/alpine: pkgs for cross-compilers

643b3da

add necessary alpine packages needed for the cross-compilers package Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkg/installer: fix package

2c3a537

- fix compiling tpm2 - replace dhclient with dhcpcd as dhclient is no more available in alpine packages Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkg/pillar/vcom/api/builder: bump alpine

69dc7cc

to the same version we bump everything else Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkg/cross-compilers: update alpine

4305069

- add packages needed for new alpine - update aports to alpine 3.22.3 - add needed distfiles for building aports - add workaround for building for armhf Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pillar: make it compile on new alpine

75531eb

add necessary packages and cflags Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkg/bsp-imx: ignore compile and link warnings

c588468

in order to make it compile similar to pkg/optee-os Signed-off-by: Christoph Ostarek <christoph@zededa.com>

debug: remove vim to save space

2dbc4d3

busybox adds 'vi' Signed-off-by: Christoph Ostarek <christoph@zededa.com>

Revert "pkg/debug: update openssh to version 9.8p1"

6fc36bc

This reverts commit 4c0c966. Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkg/debug: remove perf

2ea1b6f

to save a lot of space as it brings in libLLVM Signed-off-by: Christoph Ostarek <christoph@zededa.com>

vtpm: remove unused library

5ad9114

in order to save space Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkg/xen: fix signed/unsigned conversion

947f5e3

use `unsigned int` here to avoid compiler error Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkg/grub: disable mkimage on riscv64

6672991

this is currently broken and probably needs updated gcc/binutils (according to https://www.mail-archive.com/grub-devel@gnu.org/msg36136.html ) Signed-off-by: Christoph Ostarek <christoph@zededa.com>

bpftrace-compiler: ignore alpine inconsistency

c20ae49

it is what it is Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkg/alpine: remove 3.16 mirror

6df4c35

this has been kept for easier transition, but can go away now Signed-off-by: Christoph Ostarek <christoph@zededa.com>

rootfs: bump linuxkit images

2aee5b1

they use newer alpine Signed-off-by: Christoph Ostarek <christoph@zededa.com>

gh-workflows: build on jumbo machine

50e5081

this PR needs a bit more disk space will be reverted shortly before merging into master or shortly after Signed-off-by: Christoph Ostarek <christoph@zededa.com>

.github: increase timeout

ff1ed5d

for builds whereever it makes sense this is especially needed when a lot of packages are rebuilt Signed-off-by: Christoph Ostarek <christoph@zededa.com>

pkgs/*: update hashes to use new alpine

197bc1a

this updates the dependencies of the packages to use the newest version Signed-off-by: Christoph Ostarek <christoph@zededa.com>

christoph-zededa force-pushed the bump_alpine-3.22 branch from 9942d57 to 197bc1a Compare March 16, 2026 15:46

github-actions bot requested a review from rucoder March 16, 2026 15:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump alpine 3.22#5650

Bump alpine 3.22#5650
christoph-zededa wants to merge 39 commits intolf-edge:masterfrom
christoph-zededa:bump_alpine-3.22

christoph-zededa commented Mar 4, 2026 •

edited

Loading

Uh oh!

rene Mar 4, 2026

Uh oh!

christoph-zededa Mar 4, 2026

Uh oh!

famleebob Mar 5, 2026

Uh oh!

rene Mar 4, 2026

Uh oh!

rene Mar 4, 2026

Uh oh!

christoph-zededa Mar 4, 2026

Uh oh!

Uh oh!

rene Mar 4, 2026 •

edited

Loading

Uh oh!

rene commented Mar 4, 2026

Uh oh!

christoph-zededa Mar 4, 2026

Uh oh!

eriknordmark commented Mar 4, 2026

Uh oh!

christoph-zededa commented Mar 4, 2026

Uh oh!

christoph-zededa commented Mar 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

		@@ -1,49 +0,0 @@
		From 78e87b0d8e4aa57aae85bc756c78ec47357697d9 Mon Sep 17 00:00:00 2001
		From: Lyonel Vincent <lyonel@ezix.org>

Conversation

christoph-zededa commented Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

How to test and validate this PR

Changelog notes

PR Backports

Checklist

Uh oh!

rene Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

christoph-zededa Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

famleebob Mar 5, 2026

Choose a reason for hiding this comment

Uh oh!

rene Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

rene Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

christoph-zededa Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rene Mar 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rene commented Mar 4, 2026

Uh oh!

christoph-zededa Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

eriknordmark commented Mar 4, 2026

Uh oh!

christoph-zededa commented Mar 4, 2026

Uh oh!

christoph-zededa commented Mar 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

christoph-zededa commented Mar 4, 2026 •

edited

Loading

rene Mar 4, 2026 •

edited

Loading