fixup! fixup! wip: vc4 gpu support

The `disableConcurrentBuilds` pipeline option tells Jenkins to force
subsequent builds _of the same job_ to wait in queue until the one
running has completed.  This is sufficient when there is only one
branch/project in development at a time.  In order to prevent multiple
projects from running simultaneously, we need to acquire a global lock;
all projects need to have this same option in order for it to be
effective.

build.packages

@@ -1,2 +1,5 @@
 sys-boot/raspberrypi-firmware
 sys-boot/u-boot
+x11-libs/gtk+
+media-libs/mesa
+media-video/ffmpeg

ci/Jenkinsfile

@@ -8,6 +8,11 @@ pipeline {
         }
     }
 
+    options {
+        disableConcurrentBuilds()
+        lock 'aimee-os'
+    }
+
     stages {
         stage('Prepare') {
             steps {
@@ -29,5 +34,10 @@ pipeline {
                 archiveArtifacts '*'
             }
         }
+        failure {
+            dir('/var/tmp/portage') {
+                archiveArtifacts '*/*/temp/*.log'
+            }
+        }
     }
 }

ci/podTemplate.yaml

@@ -32,6 +32,9 @@ spec:
       subPath: distfiles
     - mountPath: /var/db/repos/gentoo
       name: portage
+    - mountPath: /var/tmp
+      name: workspace-volume
+      subPath: tmp
   hostUsers: false
   volumes:
   - name: binpkgs

config.txt

@@ -14,4 +14,5 @@ dtoverlay=miniuart-bt
 
 dtparam i2c_arm=on
 
-device_tree=bcm2711-rpi-4-b.dtb
+dtoverlay=vc4-kms-v3d
+dtoverlay=vc4-kms-dsi-ili9881-7inch

customize.sh

@@ -1,6 +1,19 @@
 #!/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 --with-bdeps=n 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
 
+groupadd -R /mnt/gentoo -r kiosk
+useradd -R /mnt/gentoo -r -g kiosk kiosk
+
 systemctl --root=/mnt/gentoo enable wpa_supplicant@wlan0

install.packages

@@ -1 +1,3 @@
+gui-wm/sway
 net-wireless/wpa_supplicant
+media-video/pipewire

linux.config

@@ -45,12 +45,36 @@ CONFIG_IPV6=y
 CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=m
 
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
+
+CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m
+CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_V2=m
 # CONFIG_MEDIA_CEC_SUPPORT is not set
 # CONFIG_MEDIA_SUPPORT is not set
+CONFIG_DRM=y
+CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=y
+CONFIG_DRM_TOSHIBA_TC358762=m
+CONFIG_V3D=m
+CONFIG_VC4=m
+CONFIG_DRM_SIMPLEDRM=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_RPI=m
 
-# CONFIG_SOUND is not set
+CONFIG_SOUND=m
-# CONFIG_SND is not set
+CONFIG_SND=m
-# CONFIG_SND_SOC is not set
+# CONFIG_SND_PCM_TIMER is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+# CONFIG_SND_PROC_FS is not set
+# CONFIG_SND_CTL_FAST_LOOKUP is not set
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_PCI is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_BCM2835_SOC_I2S=m
 
 CONFIG_AUDIT=y
 CONFIG_SECURITY=y
@@ -59,9 +83,11 @@ CONFIG_SECURITY_SELINUX=y
 CONFIG_DEFAULT_SECURITY_SELINUX=y
 # DEFAULT_SECURITY_DAC is not set
 
+CONFIG_BPF_SYSCALL=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_MEMCG=y
 CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_BPF=y
 CONFIG_BLK_CGROUP=y
 
 CONFIG_USB_DWC2=m

overlay/usr/lib/systemd/system/kiosk.service

@@ -0,0 +1,28 @@
+[Unit]
+After=systemd-user-sessions.service plymouth-quit-wait.service
+Before=graphical.target
+ConditionPathExists=/dev/tty1
+Wants=dbus.socket systemd-logind.service
+After=dbus.socket systemd-logind.service
+Conflicts=getty@tty1.service
+After=getty@tty1.service
+Wants=time-sync.target
+After=time-sync.target
+
+[Service]
+TemporaryFileSystem=/home
+ExecStartPre=!/bin/install -o kiosk -g kiosk -d -m u=rwx,go= /home/kiosk
+ExecStart=/usr/bin/sway
+User=kiosk
+Environment=WLR_RENDERER_ALLOW_SOFTWARE=1
+Environment=WLR_LIBINPUT_NO_DEVICES=1
+StandardInput=tty
+StandardOutput=tty
+StandardError=journal
+TTYPath=/dev/tty1
+TTYReset=yes
+TTYVHangup=yes
+TTYVTDisallocate=yes
+PAMName=system-login
+UtmpMode=user
+UtmpIdentifier=tty1

portage/make.conf/60-use.conf

@@ -0,0 +1 @@
+USE="${USE} -python -readline"

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"

portage/make.conf/systemd.conf

@@ -1 +1,9 @@
-INSTALL_MASK="${INSTALL_MASK} /usr/lib/systemd/systemd-nsresourced* /usr/lib/systemd/system/systemd-nsresourced.*"
+INSTALL_MASK="
+${INSTALL_MASK}
+/etc/ssh/ssh*_config.d/*systemd*
+/usr/lib/systemd/ssh_config.d
+/usr/lib/systemd/sshd_config.d
+/usr/lib/systemd/system-generators/systemd-ssh-generator
+/usr/lib/systemd/system/systemd-nsresourced.*
+/usr/lib/systemd/systemd-nsresourced*
+"

portage/make.conf/videocore.conf

@@ -0,0 +1 @@
+VIDEO_CARDS='v3d vc4'

portage/make.conf/wayland.conf

@@ -0,0 +1 @@
+USE="${USE} wayland"

portage/package.use/firefox

@@ -0,0 +1,15 @@
+media-libs/harfbuzz -cairo
+media-libs/libvpx postproc
+media-libs/mesa -llvm wayland
+media-video/ffmpeg openssl -gnutls
+
+# 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

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 "========================================"

prepare.sh

@@ -1,8 +1,24 @@
 #!/bin/sh
 
+. "${CONFIGDIR:=${PWD}}"/config
+
 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
+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/
+echo 'VIDEO_CARDS=""' > /etc/portage/make.conf/videocards.conf
+
+xargs -r emerge -vbknuUj --rebuilt-binaries=y --color=y <<EOF
+dev-libs/nss
+EOF
+
+[ -d /etc/portage/gnupg ] || getuto -v