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.

config.txt

@@ -1,8 +1,12 @@
 arm_64bit=1
-arm_boost=1
 
 start_x=1
 
+bootcode_delay=0
+boot_delay=0
+
+gpu_mem=32
+
 kernel=u-boot.bin
 
 enable_uart=1
@@ -10,10 +14,5 @@ dtoverlay=miniuart-bt
 
 dtparam i2c_arm=on
 
-display_auto_detect=1
 dtoverlay=vc4-kms-v3d
 dtoverlay=vc4-kms-dsi-ili9881-7inch
-max_framebuffers=2
-disable_fw_kms_setup=1
-disable_overscan=1
-dtparam=audio=on

customize.sh

@@ -7,12 +7,13 @@ O=$1
 
 export PORTAGE_CONFIGROOT="$O"/portage
 
-if [ ! -f /mnt/gentoo/usr/lib64/firefox/firefox ]; then
 ${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
-fi
 
 passwd -R /mnt/gentoo -d root
 
-systemctl --root=/mnt/gentoo set-default graphical.target
+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,6 +1,3 @@
-gui-apps/swayidle
 gui-wm/sway
-media-gfx/feh
-media-video/pipewire
-net-misc/curl
 net-wireless/wpa_supplicant
+media-video/pipewire

linux.config

@@ -46,7 +46,6 @@ CONFIG_IPV6_SIT=m
 CONFIG_IPV6_SIT_6RD=m
 
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
 
@@ -54,45 +53,17 @@ 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=m
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_DISPLAY_HELPER=m
-CONFIG_DRM_GEM_SHMEM_HELPER=m
-CONFIG_DRM_SCHED=m
+CONFIG_DRM=y
 CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_PANEL_ILITEK_ILI9806E=m
-CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=y
-CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_TOSHIBA_TC358762=m
-CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_V3D=m
+CONFIG_V3D=m
 CONFIG_VC4=m
-CONFIG_DRM_VC4_HDMI_CEC=y
-CONFIG_DRM_RP1_DSI=m
-CONFIG_DRM_RP1_DPI=m
-CONFIG_DRM_RP1_VEC=m
-CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=m
-CONFIG_FB_BCM2708=y
-CONFIG_FB_SIMPLE=y
-CONFIG_FB_SSD1307=m
-CONFIG_FB_RPISENSE=m
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-CONFIG_FB_IOMEM_HELPERS=y
-CONFIG_FB_BACKLIGHT=m
+CONFIG_DRM_SIMPLEDRM=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_PWM=m
 CONFIG_BACKLIGHT_RPI=m
-CONFIG_BACKLIGHT_LM3630A=m
-CONFIG_BACKLIGHT_GPIO=m
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_BCM_VC_SM_CMA=m
 
-CONFIG_SOUND=y
+CONFIG_SOUND=m
 CONFIG_SND=m
 # CONFIG_SND_PCM_TIMER is not set
 # CONFIG_SND_SUPPORT_OLD_API is not set
@@ -118,9 +89,7 @@ CONFIG_MEMCG=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_BPF=y
 CONFIG_BLK_CGROUP=y
-CONFIG_USER_NS=y
 
-CONFIG_I2C_HID_OF_GOODIX=m
 CONFIG_USB_DWC2=m
 CONFIG_USB_DWC2_PCI=m
 CONFIG_USB_ACM=m

overlay/etc/firefox/policies/policies.json

@@ -1,57 +0,0 @@
-{
-  "policies": {
-    "BlockAboutAddons": true,
-    "BlockAboutConfig": true,
-    "BlockAboutProfiles": true,
-    "CaptivePortal": false,
-    "DisableDeveloperTools": true,
-    "DisableFeedbackCommands": true,
-    "DisableFirefoxScreenshots": true,
-    "DisableFirefoxSutudies": true,
-    "DisableFormHistory": true,
-    "DisableMasterPasswordCreation": true,
-    "DisablePasswordReveal": true,
-    "DisablePocket": true,
-    "DisablePrivateBrowsing": true,
-    "DisableProfileImport": true,
-    "DisableProfileRefresh": true,
-    "DisableSecurityBypass": true,
-    "DisableSetDesktopBackground": true,
-    "DNSOverHTTPS": {
-      "Enabled": false,
-      "Locked": true
-    },
-    "DontCheckDefaultBrowser": true,
-    "Homepage": {
-      "URL": "https://homeassistant.pyrocufflink.blue/",
-      "Locked": true,
-      "StartPage": "homepage-locked"
-    },
-    "NewTabPage": false,
-    "NoDefaultBookmarks": true,
-    "OfferToSaveLogins": false,
-    "OverrideFirstRunPage": "",
-    "OverridePostUpdatePage": "",
-    "PasswordManagerEnabled": false,
-    "Preferences": {
-      "browser.sessionstore.resume_from_crash": {
-        "Value": false
-      },
-      "browser.startup.couldRestoreSession.count": {
-        "Value": -1
-      },
-      "datareporting.policy.dataSubmissionPolicyBypassNotification": {
-        "Value": true
-      },
-      "extensions.activeThemeID": {
-        "Value": "firefox-compact-dark@mozilla.org"
-      }
-    },
-    "WebsiteFilter": {
-      "Block": ["<all_urls>"],
-      "Exceptions": [
-        "https://*.pyrocufflink.blue/*"
-      ]
-    }
-  }
-}

overlay/etc/pam.d/kiosk

@@ -1,7 +0,0 @@
-account required pam_localuser.so
-
-session optional pam_loginuid.so
-session required pam_env.so envfile=/etc/profile.env
-session required pam_limits.so
-session required pam_env.so
-session required pam_systemd.so

overlay/etc/sway/kiosk.conf

@@ -1,19 +0,0 @@
-# vim: set ft=swayconfig :
-
-output DSI-1 resolution 720x1280 transform 90
-
-input * {
-    map_to_output DSI-1
-}
-
-exec /usr/lib64/firefox/firefox
-exec /usr/bin/photoframe stream
-
-exec swayidle -w \
-    timeout 120 'photoframe show' resume 'photoframe hide'
-
-for_window [title="Mozilla Firefox"] fullscreen
-for_window [class="photoframe"] fullscreen
-
-assign [title="Mozilla Firefox"] 1
-assign [class="photoframe"] 2

overlay/etc/systemd/network/95-default.network

@@ -5,7 +5,6 @@ Type=ether wlan
 DHCP=yes
 
 [DHCPv4]
-ClientIdentifier=mac
 UseDomains=yes
 
 [DHCPv6]

overlay/root/.ssh/authorized_keys

@@ -1,4 +0,0 @@
-sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAINZCN2cxMDwedJ1Ke23Z3CZRcOYjqW8fFqsooRus7RK0AAAABHNzaDo= dustin@rosalina.p
-yrocufflink.blue
-sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIAB6xTCSNz+AcQCWcyVKs84tThXN4wpLgCo2Lc48L6EsAAAABHNzaDo= dustin@luma.pyroc
-ufflink.blue

overlay/usr/bin/photoframe

@@ -1,46 +0,0 @@
-#!/bin/sh
-
-photoframe_hide() {
-    swaymsg 'workspace 1'
-}
-
-photoframe_show() {
-    # Run on a separate workspace so Firefox can stay fullscreen, too
-    swaymsg 'workspace 2'
-    if [ -f /tmp/photoframe.pid ]; then
-        # feh is already running
-        return 0
-    fi
-    if [ ! -f /tmp/photoframe-current ]; then
-        cp /usr/share/feh/images/feh.png /tmp/photoframe-current
-    fi
-    feh -FZ --draw-exif --class photoframe /tmp/photoframe-current &
-    # Wait for the feh window to actually appear ...
-    swaymsg -t subscribe '["window"]'
-    # Sometimes, Sway's `for_window ... fullscreen` doesn't work?
-    swaymsg fullscreen
-    echo $! > /tmp/photoframe.pid
-}
-
-photoframe_stream() {
-    while :; do
-        curl -NsS https://photos.pyrocufflink.blue/stream |
-            while read url; do
-                curl -fsL -o /tmp/photoframe-next "${url}" || continue
-                mv /tmp/photoframe-next /tmp/photoframe-current
-            done
-        sleep 30
-    done
-}
-
-case $1 in
-show)
-    photoframe_show
-    ;;
-hide)
-    photoframe_hide
-    ;;
-stream)
-    photoframe_stream
-    ;;
-esac

overlay/usr/lib/systemd/system-preset/70-kiosk.preset

@@ -1,3 +0,0 @@
-enable wpa_supplicant@.service wlan0
-
-enable kiosk.service

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

@@ -10,11 +10,12 @@ Wants=time-sync.target
 After=time-sync.target
 
 [Service]
-StateDirectory=%N
-CacheDirectory=%N
-Environment=XDG_CACHE_HOME=%C/%N
-ExecStart=/usr/bin/sway -c /etc/sway/kiosk.conf
+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
@@ -22,10 +23,6 @@ TTYPath=/dev/tty1
 TTYReset=yes
 TTYVHangup=yes
 TTYVTDisallocate=yes
-PAMName=kiosk
+PAMName=system-login
 UtmpMode=user
 UtmpIdentifier=tty1
-
-[Install]
-WantedBy=graphical.target
-Alias=display-manager.service

overlay/usr/lib/sysusers.d/kiosk.conf

@@ -1,2 +0,0 @@
-g kiosk -
-u kiosk - "Kiosk User" /var/lib/kiosk /bin/sh

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/package.use/photoframe

@@ -1,5 +0,0 @@
-gui-apps/swayidle -systemd
-gui-libs/wlroots X
-gui-wm/sway X
-media-gfx/feh exif inotify
-net-misc/curl -alt-svc -ftp -hsts -http3 -imap -pop3 -progress-meter -psl -quic -smtp -tftp -websockets -adns -http2 CURL_QUIC: -*

prepare.sh

@@ -2,6 +2,13 @@
 
 . "${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

squashfs.exclude

@@ -1,5 +0,0 @@
-etc/ssh/ssh_config.d/20-systemd-ssh-proxy.conf
-etc/ssh/sshd_config.d/20-systemd-userdb.conf
-usr/lib/systemd/ssh_config.d
-usr/lib/systemd/sshd_config.d
-usr/lib/systemd/system-generators/systemd-ssh-generator