rb3gen2 hax

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
main/postmarketos-network-gadget: new aport
2025-04-01 14:36:23 +02:00 · 2025-04-01 14:36:23 +02:00 · 2025-02-12 19:55:13 +00:00 · 2025-02-12 19:54:55 +00:00 · 2025-02-12 19:54:36 +00:00 · 2025-02-12 19:54:24 +00:00
12 changed files with 97 additions and 24 deletions
@@ -3,7 +3,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-postmarketos-trailblazer
 pkgdesc="postmarketOS Trailblazer generic ARM64"
-pkgver=12
+pkgver=13
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -13,20 +13,12 @@ depends="
 	postmarketos-base
 	soc-qcom-sdm845-qbootctl
 	linux-firmware-qcom
-	linux-firmware-ath10k
 	linux-firmware-ath11k
-	linux-firmware-ath12k
-	linux-firmware-qca
-	linux-firmware-rtw88
 	rmtfs
 	pd-mapper
 	tqftpserv
 	bootmac
 	systemd-boot
-	firmware-siliconlabs-rs9116
-	firmware-brcm43752
-	dtbloader
-	woa-firmware-yoinker
 "
 makedepends="devicepkg-dev"
 subpackages="
@@ -1,7 +1,7 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 # pmbootstrap installs this, if systemd is selected in "pmbootstrap init".
 pkgname=postmarketos-base-systemd
-pkgver=21
+pkgver=22
 pkgrel=0
 pkgdesc="Meta package for running postmarketOS with systemd"
 url="https://postmarketos.org"
@@ -1,6 +1,3 @@
-\033[1;33mNOTICE:\033[22m systemd support in postmarketOS is
-currently a preview and NOT suitable for use on devices you rely on.
-
 For up more information about using postmarketOS with systemd,
 including how to report bugs, please see \033[38;5;75mhttps://postmarketos.org/systemd\033[0m

@@ -6,7 +6,7 @@
 # How to add a new service file (5 steps):
 pkgname=systemd-services
 # 1. bump pkgver
-pkgver=43
+pkgver=44
 pkgrel=0
 pkgdesc="Systemd service files"
 url="https://postmarketos.org"
@@ -46,6 +46,7 @@ subpackages="
 	modemmanager-systemd:_service
 	nftables-systemd:_service
 	openssh-server-pam-systemd:_service
+	optee-client-systemd:_service
 	pd-mapper-systemd:_service
 	phosh-systemd:_service
 	plasma-mobile-systemd:_service
@@ -127,6 +128,7 @@ _mmsd_tng_sources="user/mmsd-tng.service"
 _modemmanager_sources="system/ModemManager.service"
 _nftables_sources="system/nftables.service"
 _openssh_server_pam_sources="system/sshd.service system/sshdgenkeys.service"
+_optee_client_sources="system/tee-supplicant.service"
 _pd_mapper_sources="system/pd-mapper.service"
 _phosh_sources="system/phosh.service"
 _plasma_mobile_sources="system/plasma-mobile.service"
@@ -196,6 +198,7 @@ source="$(flatpath \
 	$_modemmanager_sources \
 	$_nftables_sources \
 	$_openssh_server_pam_sources \
+	$_optee_client_sources \
 	$_pd_mapper_sources \
 	$_phosh_sources \
 	$_plasma_mobile_sources \
@@ -240,6 +243,7 @@ _mmsd_tng_user_presets="mmsd-tng.service"
 _modemmanager_system_presets="ModemManager.service"
 _nftables_system_presets="nftables.service"
 _openssh_server_pam_system_presets="sshd.service"
+_optee_client_system_presets="tee-supplicant.service"
 _pd_mapper_system_presets="pd-mapper.service"
 _phosh_system_presets="phosh.service"
 _plasma_mobile_system_presets="plasma-mobile.service"
@@ -353,6 +357,7 @@ f6fb4c890cbf72e344ca7a22e7f033fb4c32ce9f5edc27c03ccc5c21424d6a0ef871d79e8a89a502
 12bb9aa2a2ab8d4b21c72a785b41057eb16a27eca5718cd03a987a50b77d669fe90abafae48c68b41616f31b1953853b3b4a74db4bc3cdeccacc00df113de204  system-nftables.service
 fa445c4a53214524baed4e9c52a5463592a074f88a5a286eacb60d0907c0545f725afde23abd68cf611067add80c2ccb289a381fc5ff6a5f654ea49c81f02fe8  system-sshd.service
 c0badea3905c1d53d213fbfe11d25b556a2e484fe77eb50e9f4d42e25b67b56a0804e7d8e1b7731cd280cbb3525b4c60311817609381e2308d9f2dfb7c0d7072  system-sshdgenkeys.service
+15a4bfb6f461747b9cb56f5c2188b24741e9c2c7fc0782492b95cb66cebd3fd12266e692e1d30a7eb0f7618bbb340d9ed8b4cb0d812893a59788657d19fe3c13  system-tee-supplicant.service
 0bed9a8a719661609ad84d1c6fcdf2fe9213e741682b7ddebad82d9744f137c593788ed522868f10b95b599d81743d07ec3212630a7e99d333261dfa1bf1cc11  system-pd-mapper.service
 0025c83b3007d1bcf6de70fd6400f3c845aff575987c87f2228e7ccedc8cf69703cd04abf8b51805f31722bb4b8eea9b4fd9afdfe7fdfe1d4c6c4664273de77c  system-phosh.service
 e12d8e98e28a795f879aebcceb32a991ee4abcb3bc5ec458aa5378bb52ff86cf39be04bc4a196925f532d623304b3005f561fa5e55d1c87944d718058ec4c0e6  system-plasma-mobile.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=OpenSSH Daemon
+
+[Service]
+ExecStartPre=-ln -s /usr/lib/optee_armtz /lib/optee_armtz
+ExecStart=/usr/sbin/tee-supplicant
+KillMode=process
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
@@ -5,10 +5,11 @@ pkgver=0.3.1
 pkgrel=0
 url="https://git.sr.ht/~calebccff/pbsplash"
 arch="all"
-options="!check" # no testsuite
+options="!check pmb:cross-native" # no testsuite
 license="GPL-3.0"
 source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~calebccff/pbsplash/archive/$pkgver.tar.gz"
-makedepends="meson tfblib linux-headers"
+makedepends_build="meson"
+makedepends_host="tfblib linux-headers"

 build() {
 	abuild-meson . output
@@ -1,11 +1,11 @@
 # Maintainer: Caleb Connolly <caleb@postmarketos.org>
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-initramfs
-pkgver=3.7.3
+pkgver=3.7.4
 pkgrel=0
 pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra"
 url="https://postmarketos.org"
-options="!check"  # no tests
+options="!check pmb:cross-native"  # no tests
 provides="postmarketos-ramdisk=$pkgver-r$pkgrel"
 provider_priority=10
 depends="
@@ -8,7 +8,7 @@ PMOS_BOOT="${PMOS_BOOT:-}"
 PMOS_ROOT="${PMOS_ROOT:-}"
 SUBPARTITION_DEV="${SUBPARTITION_DEV:-}"

-CONFIGFS="/config/usb_gadget"
+CONFIGFS="/sys/kernel/config/usb_gadget"
 CONFIGFS_ACM_FUNCTION="acm.usb0"
 CONFIGFS_MASS_STORAGE_FUNCTION="mass_storage.0"
 HOST_IP="${unudhcpd_host_ip:-172.16.42.1}"
@@ -72,8 +72,9 @@ mount_proc_sys_dev() {
 	mount -t devtmpfs -o mode=0755,nosuid dev /dev || echo "Couldn't mount /dev"
 	mount -t tmpfs -o nosuid,nodev,mode=0755 run /run || echo "Couldn't mount /run"

-	mkdir /config
-	mount -t configfs -o nodev,noexec,nosuid configfs /config
+	mkdir -p /sys/kernel/config
+	mount -t configfs -o nodev,noexec,nosuid configfs /sys/kernel/config
+	ln -sf sys/kernel/config /config

 	# /dev/pts (needed for telnet)
 	mkdir -p /dev/pts
@@ -0,0 +1,29 @@
+# Maintainer: Caleb Connolly <caleb@postmarketos.org>
+# Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
+pkgname=postmarketos-network-gadget
+pkgver=1
+pkgrel=0
+pkgdesc="Script to set up usb network gadget from rootfs"
+url="https://postmarketos.org"
+options="!check pmb:cross-native"  # no tests
+depends="postmarketos-initramfs	"
+source="
+	start_network_gadget.sh
+	network-gadget.service
+	"
+subpackages="$pkgname-systemd"
+arch="noarch"
+license="GPL-2.0-or-later"
+
+package() {
+	install -Dm755 "$srcdir/start_network_gadget.sh" \
+		"$pkgdir/usr/libexec/start_network_gadget"
+
+	install -Dm644 "$srcdir/network-gadget.service" \
+		"$pkgdir/usr/lib/systemd/system/network-gadget.service"
+}
+
+sha512sums="
+b7f6f7ea9fae8ca3ec0c7ea7aab04fafa6aaaaac1e97361a867e80b9e3f57d5127fa284816aa8e5d4e4f455c36a97bc89a347e7cb4723e0aa7233ea80fd1ad7f  start_network_gadget.sh
+abd61b7027cf48fefe8a503fb978de007064d29d5e3b5eb569ef7db23ed881b75793456b7f65eb9a4ef9ed6a1585085e3c333fee43787dc6cb64c997e379c8f1  network-gadget.service
+"
@@ -0,0 +1,13 @@
+[Unit]
+Description=Start USB network gadget
+Wants=modprobe@libcomposite.service
+Requires=usb-gadget.target
+After=usb-gadget.target
+
+[Service]
+RemainAfterExit=yes
+ExecStart=/usr/libexec/start_network_gadget
+
+[Install]
+WantedBy=multi-user.target
+Also=modprobe@libcomposite.service
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+#
+# Standalone utility for setting up the postmarketOS network gadget
+#
+
+. /usr/share/initramfs/init_functions.sh
+
+CONFIGFS=/sys/kernel/config/usb_gadget
+
+for i in $(seq 1 30); do
+	if [ -n "$(ls /sys/class/udc)" ]; then
+		break
+	fi
+	sleep 1
+done
+
+if [ $i = 30 ]; then
+	echo "UDC never appeared!"
+	exit 1
+fi
+
+setup_usb_network_configfs
+start_unudhcpd
@@ -12,12 +12,13 @@ subpackages="$pkgname-openrc"
 source="https://gitlab.postmarketos.org/postmarketOS/q6voiced/-/archive/$_commit/q6voiced-$_commit.tar.gz
 	q6voiced.initd
 	"
-options="!check" # no tests
+options="!check pmb:cross-native" # no tests
 builddir="$srcdir/q6voiced-$_commit"

 build() {
-	gcc -o q6voiced q6voiced.c -I/usr/include/dbus-1.0/ \
-		-I/usr/lib/dbus-1.0/include -ltinyalsa -ldbus-1
+	$CC -o q6voiced q6voiced.c -I$CBUILDROOT/usr/include/dbus-1.0/ \
+		-I$CBUILDROOT/usr/lib/dbus-1.0/include -ltinyalsa -ldbus-1 \
+		$CFLAGS
 }

 package() {
Author	SHA1	Message	Date
Caleb Connolly	a47ada013d	rb3gen2 hax Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2025-04-01 14:36:23 +02:00
Caleb Connolly	34ba2ade9a	main/postmarketos-network-gadget: new aport This extremely minimal script reuses the initramfs scripts for configuring the network gadget in the rootfs. This is only useful for cases where the initramfs is skipped or for some reason didn't start the usb gadget. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2025-04-01 14:36:23 +02:00
Caleb Connolly	335e1f212f	systemd-services: add optee-client add the tee-supplicant service Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2025-02-12 19:55:13 +00:00
Caleb Connolly	9af0919120	postmarketos-initramfs: use proper configfs path Use the correct /sys/kernel/configfs path for configs, set up a symlink at boot to the old path for compatibility. This simplifies re-using some initramfs scripts from the rootfs. Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2025-02-12 19:54:55 +00:00
Caleb Connolly	4b3b9c138e	postmarketos-initramfs: use cross-native Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2025-02-12 19:54:36 +00:00
Caleb Connolly	cd65cd9280	pbsplash: support cross compiling Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2025-02-12 19:54:24 +00:00
Caleb Connolly	8a0a532bc8	modem/q6voiced: support cross compiling Use $CC and $CFLAGS to support proper cross compiling Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2025-02-12 19:54:24 +00:00
Caleb Connolly	e9293bdb28	systemd/postmarketos-base-systemd: remove notice about systemd being in preview it's time! Signed-off-by: Caleb Connolly <caleb@postmarketos.org>	2025-02-12 19:54:24 +00:00