From 3de06660b096bfc761ef58b7e197b0c9742c853e Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Tue, 10 Dec 2024 14:43:10 -0600 Subject: [PATCH 01/17] wip: Enable BCM2835_MMC Trying to get the kernel to find the root filesystem on the SD card... --- linux.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/linux.config b/linux.config index 169ff93..579d5e5 100644 --- a/linux.config +++ b/linux.config @@ -14,6 +14,9 @@ CONFIG_PCI=y CONFIG_PCIE_BRCMSTB=y CONFIG_BLK_DEV_NVME=y +CONFIG_MMC_BCM2835_SDHOST=y +CONFIG_MMC_BCM2835_MMC=y + CONFIG_FW_LOADER_COMPRESS=y CONFIG_I2C=y -- 2.51.0 From 26d83bd68b78df865871ed37df99fa804bbac281 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Fri, 13 Dec 2024 19:37:21 -0600 Subject: [PATCH 02/17] config: Set rootflags Need to add `rootwait` because the Raspberry Pi SD card reader is really slow and does not initialize in time for the kernel to load the root filesystem from it. --- config | 1 + 1 file changed, 1 insertion(+) diff --git a/config b/config index 498a548..cfaad3e 100644 --- a/config +++ b/config @@ -3,3 +3,4 @@ profile=default/linux/arm64/23.0/systemd kernel_pkg=sys-kernel/raspberrypi-sources kernel_defconfig=bcm2835 device_tree=broadcom/bcm2711-rpi-4-b.dtb +rootflags='ro rootwait=4' -- 2.51.0 From a9e01d36e85d24ad4bce9e5253f89e732379cc4b Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Fri, 13 Dec 2024 19:41:03 -0600 Subject: [PATCH 03/17] Add Rasperry Pi WiFi support We need the Broadcom firmware from the _linux-firmware_ package (and nothing else). We also need _wpa_supplicant_, to configure the WiFi connection. Finally, we need to configure _systemd-networkd_ to manage the network device. --- install.packages | 1 + installonly.packages | 1 + overlay/etc/aimee-os/writable-etc | 1 + overlay/etc/systemd/network/95-default.network | 11 +++++++++++ portage/package.license/linux-firmware | 1 + portage/savedconfig/sys-kernel/linux-firmware | 17 +++++++++++++++++ 6 files changed, 32 insertions(+) create mode 100644 installonly.packages create mode 100644 overlay/etc/aimee-os/writable-etc create mode 100644 overlay/etc/systemd/network/95-default.network create mode 100644 portage/package.license/linux-firmware create mode 100644 portage/savedconfig/sys-kernel/linux-firmware diff --git a/install.packages b/install.packages index e69de29..31638b0 100644 --- a/install.packages +++ b/install.packages @@ -0,0 +1 @@ +net-wireless/wpa_supplicant diff --git a/installonly.packages b/installonly.packages new file mode 100644 index 0000000..5227b06 --- /dev/null +++ b/installonly.packages @@ -0,0 +1 @@ +sys-kernel/linux-firmware diff --git a/overlay/etc/aimee-os/writable-etc b/overlay/etc/aimee-os/writable-etc new file mode 100644 index 0000000..f364079 --- /dev/null +++ b/overlay/etc/aimee-os/writable-etc @@ -0,0 +1 @@ +d wpa_supplicant diff --git a/overlay/etc/systemd/network/95-default.network b/overlay/etc/systemd/network/95-default.network new file mode 100644 index 0000000..3a1192d --- /dev/null +++ b/overlay/etc/systemd/network/95-default.network @@ -0,0 +1,11 @@ +[Match] +Type=ether wlan + +[Network] +DHCP=yes + +[DHCPv4] +UseDomains=yes + +[DHCPv6] +UseDomains=yes diff --git a/portage/package.license/linux-firmware b/portage/package.license/linux-firmware new file mode 100644 index 0000000..348558e --- /dev/null +++ b/portage/package.license/linux-firmware @@ -0,0 +1 @@ +sys-kernel/linux-firmware linux-fw-redistributable diff --git a/portage/savedconfig/sys-kernel/linux-firmware b/portage/savedconfig/sys-kernel/linux-firmware new file mode 100644 index 0000000..70350d9 --- /dev/null +++ b/portage/savedconfig/sys-kernel/linux-firmware @@ -0,0 +1,17 @@ +# symlink targets have to be specified explicity +../cypress/cyfmac43455-sdio.bin +../cypress/cyfmac43455-sdio.clm_blob + +brcm/brcmfmac43455-sdio.AW-CM256SM.txt +brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt +brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi 4 Model B.txt +brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi Compute Module 4.txt +brcm/brcmfmac43455-sdio.acepc-t8.txt +brcm/brcmfmac43455-sdio.beagle,am5729-beagleboneai.txt +brcm/brcmfmac43455-sdio.bin +brcm/brcmfmac43455-sdio.clm_blob +brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt +brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt +brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt +cypress/cyfmac43455-sdio.bin +cypress/cyfmac43455-sdio.clm_blob -- 2.51.0 From 5871260128e0d373e4145faae22d9d8e0b0b7068 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Fri, 13 Dec 2024 19:43:33 -0600 Subject: [PATCH 04/17] customize: Add script Deleting the initial password for `root` so we can log in to the serial console for debugging. Enabling _wpa_supplicant_ to connect to WiFi automatically. --- customize.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 customize.sh diff --git a/customize.sh b/customize.sh new file mode 100755 index 0000000..f0bc12a --- /dev/null +++ b/customize.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# vim: set sw=4 ts=4 sts=4 et : + +passwd -R /mnt/gentoo -d root + +systemctl --root=/mnt/gentoo enable wpa_supplicant@wlan0 -- 2.51.0 From 4161d20de2ad846182e6163a3f54d29567a6e2f7 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Fri, 13 Dec 2024 19:44:30 -0600 Subject: [PATCH 05/17] portage: Install-mask systemd-nsresourced I don't know what this is for; I think it has something to do with containers, possibly for `systemd-npsawn`? It spawns a bunch of processes and wastes several megabytes of RAM. --- portage/make.conf/systemd.conf | 1 + 1 file changed, 1 insertion(+) create mode 100644 portage/make.conf/systemd.conf diff --git a/portage/make.conf/systemd.conf b/portage/make.conf/systemd.conf new file mode 100644 index 0000000..d052222 --- /dev/null +++ b/portage/make.conf/systemd.conf @@ -0,0 +1 @@ +INSTALL_MASK="${INSTALL_MASK} /usr/lib/systemd/systemd-nsresourced* /usr/lib/systemd/system/systemd-nsresourced.*" -- 2.51.0 From f560d965cfc7cc37ca3fdb4ae0b941c8119229d3 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Fri, 13 Dec 2024 19:46:09 -0600 Subject: [PATCH 06/17] Update aimee-os --- aimee-os | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aimee-os b/aimee-os index 79e69cf..0f32bf3 160000 --- a/aimee-os +++ b/aimee-os @@ -1 +1 @@ -Subproject commit 79e69cf70df3586bd4ef4b15f577b42719380f38 +Subproject commit 0f32bf3fcbdb13a9c5ac6ba2ad20944dfd761efc -- 2.51.0 From 428e30c01dcb4d36143b9ba5aac886bb819bfe58 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Sun, 22 Dec 2024 14:26:14 -0600 Subject: [PATCH 07/17] ci: Clear env to run build We don't need any of the environment variables Jenkins sets, and some of them (like `GIT_COMMIT`) interfere with building packages. --- ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index caa909c..ff0de97 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { stages { stage('Build') { steps { - sh 'make -C aimee-os CONFIGDIR=${PWD} O=/build' + sh 'env -i PATH="${PATH}" make -C aimee-os CONFIGDIR=${PWD} O=/build' } } } -- 2.51.0 From fd925c3da0c3a2859e5fd606ba058de5be72f874 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Sun, 22 Dec 2024 17:03:40 -0600 Subject: [PATCH 08/17] Update Aimee OS --- aimee-os | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aimee-os b/aimee-os index 0f32bf3..554063e 160000 --- a/aimee-os +++ b/aimee-os @@ -1 +1 @@ -Subproject commit 0f32bf3fcbdb13a9c5ac6ba2ad20944dfd761efc +Subproject commit 554063e1f4e316a6d3087a27076e0c6d5a34fca1 -- 2.51.0 From 05e8dbcc5ba56e14102357f2e40308718f24b4a6 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Fri, 13 Dec 2024 19:45:47 -0600 Subject: [PATCH 09/17] wip: Install Firefox --- ci/Jenkinsfile | 6 +++ install.packages | 1 + portage/make.conf/60-use.conf | 1 + portage/make.conf/introspection.conf | 4 ++ portage/make.conf/videocore.conf | 1 + portage/make.conf/wayland.conf | 1 + portage/package.accept_keywords/firefox | 1 + portage/package.use/firefox | 6 +++ .../librsvg/do-not-build-rsvg-convert.patch | 48 +++++++++++++++++++ prepare.sh | 13 +++++ 10 files changed, 82 insertions(+) create mode 100644 portage/make.conf/60-use.conf create mode 100644 portage/make.conf/introspection.conf create mode 100644 portage/make.conf/videocore.conf create mode 100644 portage/make.conf/wayland.conf create mode 100644 portage/package.accept_keywords/firefox create mode 100644 portage/package.use/firefox create mode 100644 portage/patches/gnome-base/librsvg/do-not-build-rsvg-convert.patch create mode 100644 prepare.sh diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index ff0de97..1270b8c 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -9,6 +9,12 @@ pipeline { } stages { + stage('Prepare') { + steps { + sh '. ./prepare.sh' + } + } + stage('Build') { steps { sh 'env -i PATH="${PATH}" make -C aimee-os CONFIGDIR=${PWD} O=/build' diff --git a/install.packages b/install.packages index 31638b0..5c67a29 100644 --- a/install.packages +++ b/install.packages @@ -1 +1,2 @@ net-wireless/wpa_supplicant +www-client/firefox diff --git a/portage/make.conf/60-use.conf b/portage/make.conf/60-use.conf new file mode 100644 index 0000000..ad110bb --- /dev/null +++ b/portage/make.conf/60-use.conf @@ -0,0 +1 @@ +USE="${USE} -python -readline" diff --git a/portage/make.conf/introspection.conf b/portage/make.conf/introspection.conf new file mode 100644 index 0000000..63c418a --- /dev/null +++ b/portage/make.conf/introspection.conf @@ -0,0 +1,4 @@ +# Disable GObject introspection because it cannot be cross-compiled +# https://bugs.gentoo.org/850895 +# https://bugs.gentoo.org/751325 +USE="${USE} -introspection -vala" diff --git a/portage/make.conf/videocore.conf b/portage/make.conf/videocore.conf new file mode 100644 index 0000000..05c0c2b --- /dev/null +++ b/portage/make.conf/videocore.conf @@ -0,0 +1 @@ +VIDEO_CARDS='v3d vc4' diff --git a/portage/make.conf/wayland.conf b/portage/make.conf/wayland.conf new file mode 100644 index 0000000..71d123e --- /dev/null +++ b/portage/make.conf/wayland.conf @@ -0,0 +1 @@ +USE="${USE} -X wayland" diff --git a/portage/package.accept_keywords/firefox b/portage/package.accept_keywords/firefox new file mode 100644 index 0000000..f0cbd3b --- /dev/null +++ b/portage/package.accept_keywords/firefox @@ -0,0 +1 @@ +dev-libs/nss ~amd64 diff --git a/portage/package.use/firefox b/portage/package.use/firefox new file mode 100644 index 0000000..3580b88 --- /dev/null +++ b/portage/package.use/firefox @@ -0,0 +1,6 @@ +media-libs/harfbuzz -cairo +media-libs/libvpx postproc +media-libs/mesa -llvm wayland +media-video/ffmpeg openssl -gnutls +www-client/firefox -telemetry dbus wayland +x11-libs/gtk+ wayland diff --git a/portage/patches/gnome-base/librsvg/do-not-build-rsvg-convert.patch b/portage/patches/gnome-base/librsvg/do-not-build-rsvg-convert.patch new file mode 100644 index 0000000..4e2775e --- /dev/null +++ b/portage/patches/gnome-base/librsvg/do-not-build-rsvg-convert.patch @@ -0,0 +1,48 @@ +--- a/Makefile.in 2024-12-13 12:17:08.339616211 -0600 ++++ b/Makefile.in 2024-12-13 12:18:30.301517960 -0600 +@@ -641,12 +641,6 @@ + rsvg/src/test_utils/reference_utils.rs \ + rsvg-bench/Cargo.toml \ + rsvg-bench/src/main.rs \ +- rsvg_convert/tests/internal_predicates/file.rs \ +- rsvg_convert/tests/internal_predicates/mod.rs \ +- rsvg_convert/tests/internal_predicates/pdf.rs \ +- rsvg_convert/tests/internal_predicates/png.rs \ +- rsvg_convert/tests/internal_predicates/svg.rs \ +- rsvg_convert/tests/rsvg_convert.rs \ + librsvg-c/tests/legacy_sizing.rs \ + gdk-pixbuf-loader/Cargo.toml \ + gdk-pixbuf-loader/src/lib.rs \ +@@ -685,15 +679,6 @@ + librsvgincdir = $(includedir)/librsvg-$(RSVG_API_VERSION)/librsvg + librsvginc_HEADERS = $(librsvg_public_headers) + +-# Use SCRIPTS instead of PROGRAMS since we build it on our own +-bin_SCRIPTS = rsvg-convert$(EXEEXT) +-RSVG_CONVERT_BIN = $(CARGO_TARGET_DIR)/$(RUST_TARGET_SUBDIR)/rsvg-convert$(EXEEXT) +-RSVG_CONVERT_SRC = \ +- rsvg_convert/Cargo.toml \ +- rsvg_convert/build.rs \ +- rsvg_convert/src/main.rs \ +- $(NULL) +- + @HAVE_RST2MAN_TRUE@man1_MANS = rsvg-convert.1 + dist_doc_DATA = \ + README.md \ +@@ -1643,16 +1628,6 @@ + $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --package librsvg-c \ + && cd $(LIBRSVG_BUILD_DIR) && $(LINK) $< && cp $(RUST_LIB) .libs/librsvg_c_api.a + +-$(RSVG_CONVERT_BIN): $(RSVG_CONVERT_SRC) | librsvg_c_api.la +- +cd $(top_srcdir) && \ +- PKG_CONFIG_ALLOW_CROSS=1 \ +- PKG_CONFIG='$(PKG_CONFIG)' \ +- CARGO_TARGET_DIR=$(CARGO_TARGET_DIR) \ +- $(CARGO) --locked build $(CARGO_VERBOSE) $(CARGO_TARGET_ARGS) $(CARGO_RELEASE_ARGS) --package rsvg_convert +- +-rsvg-convert$(EXEEXT): $(RSVG_CONVERT_BIN) +- cd $(LIBRSVG_BUILD_DIR) && cp $(RSVG_CONVERT_BIN) rsvg-convert$(EXEEXT) +- + rsvg-convert.1: rsvg-convert.rst + @HAVE_RST2MAN_TRUE@ $(RST2MAN) $(top_srcdir)/rsvg-convert.rst rsvg-convert.1 + @HAVE_RST2MAN_FALSE@ @echo "========================================" diff --git a/prepare.sh b/prepare.sh new file mode 100644 index 0000000..8d0283a --- /dev/null +++ b/prepare.sh @@ -0,0 +1,13 @@ +#!/bin/sh + + +mkdir -p /etc/portage/package.use +mkdir -p /etc/portage/make.conf +cp portage/package.use/firefox /etc/portage/package.use/ +cp portage/make.conf/introspection.conf /etc/portage/make.conf/ +cp portage/make.conf/wayland.conf /etc/portage/make.conf/ +echo 'VIDEO_CARDS=""' > /etc/portage/make.conf/videocards.conf + +xargs -r emerge -vbknuUj --rebuilt-binaries=y --color=y < Date: Sun, 22 Dec 2024 20:29:33 -0600 Subject: [PATCH 10/17] wip: use persistent volumes for portage, binpkgs --- ci/podTemplate.yaml | 17 +++++++++++++---- prepare.sh | 6 ++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ci/podTemplate.yaml b/ci/podTemplate.yaml index 7ea65cf..f4bc25b 100644 --- a/ci/podTemplate.yaml +++ b/ci/podTemplate.yaml @@ -21,12 +21,21 @@ spec: name: workspace-volume subPath: gentoo - mountPath: /usr/aarch64-unknown-linux-gnu/var/cache/binpkgs - name: workspace-volume - subPath: binpkgs + name: binpkgs + subPath: photoframe2 - mountPath: /var/cache/binpkgs - name: workspace-volume - subPath: binpkgs + name: binpkgs + subPath: photoframe2 - mountPath: /var/cache/distfiles name: workspace-volume subPath: distfiles + - mountPath: /var/db/repos/gentoo + name: portage hostUsers: false + volumes: + - name: binpkgs + persistentVolumeClaim: + claimName: binpkgs + - name: portage + persistentVolumeClaim: + claimName: portage diff --git a/prepare.sh b/prepare.sh index 8d0283a..919d248 100644 --- a/prepare.sh +++ b/prepare.sh @@ -1,5 +1,11 @@ #!/bin/sh +if [ ! -f /var/db/repos/gentoo/metadata/timestamp ]; then + emerge-webrsync +fi +if [ "$(find /var/db/repos/gentoo/metadata -newermt '-24 hours' | wc -l)" -eq 0 ]; then + emaint sync +fi mkdir -p /etc/portage/package.use mkdir -p /etc/portage/make.conf -- 2.51.0 From 3355d16fc6965ff620544ecfccd9297a5cf7e70a Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Mon, 23 Dec 2024 08:41:04 -0600 Subject: [PATCH 11/17] wip: build firefox w/ gcc cannot find aarch64-unknown-linux-gnu-clang-19 --- portage/package.use/firefox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portage/package.use/firefox b/portage/package.use/firefox index 3580b88..a07789a 100644 --- a/portage/package.use/firefox +++ b/portage/package.use/firefox @@ -2,5 +2,5 @@ media-libs/harfbuzz -cairo media-libs/libvpx postproc media-libs/mesa -llvm wayland media-video/ffmpeg openssl -gnutls -www-client/firefox -telemetry dbus wayland +www-client/firefox -clang -telemetry dbus wayland x11-libs/gtk+ wayland -- 2.51.0 From c1bd918fe6111f4ed90541a5c44dc86f17f6915a Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Mon, 23 Dec 2024 16:20:17 -0600 Subject: [PATCH 12/17] wip: Install Firefox from Gentoo binpkg > 3:30.02 [gecko-profiler 0.1.0] /../lib/gcc/aarch64-unknown-linux-gnu/14/include/g++-v14/cstdlib:79:15: fatal error: 'stdlib.h' file not found > 3:30.02 [gecko-profiler 0.1.0] thread 'main' panicked at tools/profiler/rust-api/build.rs:104:10: > 3:30.02 [gecko-profiler 0.1.0] Unable to generate bindings: ClangDiagnostic("/../lib/gcc/aarch64-unknown-linux-gnu/14/include/g++-v14/cstdlib:79:15: fatal error: 'stdlib.h' file not found\n") --- build.packages | 3 +++ customize.sh | 10 ++++++++++ install.packages | 2 +- portage/make.conf/wayland.conf | 2 +- portage/package.accept_keywords/firefox | 1 - portage/package.use/firefox | 11 ++++++++++- prepare.sh | 5 +++++ 7 files changed, 30 insertions(+), 4 deletions(-) delete mode 100644 portage/package.accept_keywords/firefox diff --git a/build.packages b/build.packages index 9677552..26ab468 100644 --- a/build.packages +++ b/build.packages @@ -1,2 +1,5 @@ sys-boot/raspberrypi-firmware sys-boot/u-boot +x11-libs/gtk+ +media-libs/mesa +media-video/ffmpeg diff --git a/customize.sh b/customize.sh index f0bc12a..b0cb5da 100755 --- a/customize.sh +++ b/customize.sh @@ -1,6 +1,16 @@ #!/bin/sh # vim: set sw=4 ts=4 sts=4 et : +. "${CONFIGDIR:=${PWD}}"/config + +O=$1 + +export PORTAGE_CONFIGROOT="$O"/portage + +${target}-emerge -vbknuUDj --onlydeps www-client/firefox:esr +PORTAGE_BINHOST=https://distfiles.gentoo.org/releases/arm64/binpackages/23.0/arm64 \ +${target}-emerge -vgKnj --root=/mnt/gentoo www-client/firefox:esr + passwd -R /mnt/gentoo -d root systemctl --root=/mnt/gentoo enable wpa_supplicant@wlan0 diff --git a/install.packages b/install.packages index 5c67a29..7998e21 100644 --- a/install.packages +++ b/install.packages @@ -1,2 +1,2 @@ net-wireless/wpa_supplicant -www-client/firefox +media-video/pipewire diff --git a/portage/make.conf/wayland.conf b/portage/make.conf/wayland.conf index 71d123e..624b840 100644 --- a/portage/make.conf/wayland.conf +++ b/portage/make.conf/wayland.conf @@ -1 +1 @@ -USE="${USE} -X wayland" +USE="${USE} wayland" diff --git a/portage/package.accept_keywords/firefox b/portage/package.accept_keywords/firefox deleted file mode 100644 index f0cbd3b..0000000 --- a/portage/package.accept_keywords/firefox +++ /dev/null @@ -1 +0,0 @@ -dev-libs/nss ~amd64 diff --git a/portage/package.use/firefox b/portage/package.use/firefox index a07789a..d877364 100644 --- a/portage/package.use/firefox +++ b/portage/package.use/firefox @@ -2,5 +2,14 @@ media-libs/harfbuzz -cairo media-libs/libvpx postproc media-libs/mesa -llvm wayland media-video/ffmpeg openssl -gnutls -www-client/firefox -clang -telemetry dbus wayland + +# Must match USE flags of the www-client/firefox package on the +# offical Gentoo binhost +www-client/firefox X clang dbus gmp-autoupdate gnome-shell jumbo-build pulseaudio system-av1 system-harfbuzz system-icu system-jpeg system-libevent system-libvpx system-webp telemetry wayland LLVM_SLOT: 19 -17 -18 +x11-libs/cairo X x11-libs/gtk+ wayland +media-libs/libglvnd X + +# Firefox requires a PulseAudio-compatible sound server; we use Pipewire +media-video/pipewire sound-server +media-libs/libcanberra udev alsa diff --git a/prepare.sh b/prepare.sh index 919d248..9c6dd89 100644 --- a/prepare.sh +++ b/prepare.sh @@ -1,5 +1,7 @@ #!/bin/sh +. "${CONFIGDIR:=${PWD}}"/config + if [ ! -f /var/db/repos/gentoo/metadata/timestamp ]; then emerge-webrsync fi @@ -9,6 +11,7 @@ fi mkdir -p /etc/portage/package.use mkdir -p /etc/portage/make.conf +echo 'virtual/libudev systemd' >> /etc/portage/package.use/systemd cp portage/package.use/firefox /etc/portage/package.use/ cp portage/make.conf/introspection.conf /etc/portage/make.conf/ cp portage/make.conf/wayland.conf /etc/portage/make.conf/ @@ -17,3 +20,5 @@ echo 'VIDEO_CARDS=""' > /etc/portage/make.conf/videocards.conf xargs -r emerge -vbknuUj --rebuilt-binaries=y --color=y < Date: Sun, 29 Dec 2024 15:03:28 -0600 Subject: [PATCH 13/17] Update AimeeOS --- aimee-os | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aimee-os b/aimee-os index 554063e..c30da6a 160000 --- a/aimee-os +++ b/aimee-os @@ -1 +1 @@ -Subproject commit 554063e1f4e316a6d3087a27076e0c6d5a34fca1 +Subproject commit c30da6a5ff0d2f9fade417e91b083d7b483f0984 -- 2.51.0 From 8d3212cecad8d03bc026c61e882d3ce1044b6aa9 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Sun, 29 Dec 2024 12:08:09 -0600 Subject: [PATCH 14/17] ci: archive build logs on failure --- ci/Jenkinsfile | 5 +++++ ci/podTemplate.yaml | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index 1270b8c..adcf8e4 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -29,5 +29,10 @@ pipeline { archiveArtifacts '*' } } + failure { + dir('/var/tmp/portage') { + archiveArtifacts '*/*/temp/*.log' + } + } } } diff --git a/ci/podTemplate.yaml b/ci/podTemplate.yaml index f4bc25b..97319d3 100644 --- a/ci/podTemplate.yaml +++ b/ci/podTemplate.yaml @@ -31,6 +31,9 @@ spec: subPath: distfiles - mountPath: /var/db/repos/gentoo name: portage + - mountPath: /var/tmp + name: workspace-volume + subPath: tmp hostUsers: false volumes: - name: binpkgs -- 2.51.0 From b6232802e8b257d5b6df9759b56304c449199e5d Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Sun, 29 Dec 2024 20:25:49 -0600 Subject: [PATCH 15/17] ci: Add CAP_CHROOT to build container This is needed in order to run `passwd -R` to clear the root password in the target filesystem. --- ci/podTemplate.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/podTemplate.yaml b/ci/podTemplate.yaml index 97319d3..a0f1c5c 100644 --- a/ci/podTemplate.yaml +++ b/ci/podTemplate.yaml @@ -13,6 +13,7 @@ spec: capabilities: add: - CAP_SETFCAP + - CAP_SYS_CHROOT volumeMounts: - mountPath: /build name: workspace-volume -- 2.51.0 From 22b3b4c9a5ac3f369da465d8a88461e56966f352 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Sun, 29 Dec 2024 20:28:06 -0600 Subject: [PATCH 16/17] wip: Install Sway WM --- install.packages | 1 + 1 file changed, 1 insertion(+) diff --git a/install.packages b/install.packages index 7998e21..1c92159 100644 --- a/install.packages +++ b/install.packages @@ -1,2 +1,3 @@ +gui-wm/sway net-wireless/wpa_supplicant media-video/pipewire -- 2.51.0 From 1db07ebc97ad651dae90bdd51fc53ba3b2295061 Mon Sep 17 00:00:00 2001 From: "Dustin C. Hatch" Date: Mon, 30 Dec 2024 13:18:05 -0600 Subject: [PATCH 17/17] Update Aimee OS --- aimee-os | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aimee-os b/aimee-os index c30da6a..5bce7df 160000 --- a/aimee-os +++ b/aimee-os @@ -1 +1 @@ -Subproject commit c30da6a5ff0d2f9fade417e91b083d7b483f0984 +Subproject commit 5bce7dfab30a142491330529a86f87091b0c1ec0 -- 2.51.0