systemd/systemd: lower systemd-resolved provider_priority

Currently we do not package the configurations needed to use systemd-resolved as a replacement for openresolv. Without this patch current systems that have wireguard-tools installed will automatically pull systemd-resolved. See https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/80058/diffs
linux-postmarketos-mediatek-mt8173: upgrade to 6.13.5 (MR 6262)
2025-02-28 01:23:22 -05:00 · 2025-02-27 23:39:19 +01:00 · 2025-02-27 12:06:55 -08:00 · 2025-02-27 09:57:13 -08:00 · 2025-02-27 09:48:03 -08:00 · 2025-02-27 17:00:24 +00:00
9 changed files with 32 additions and 1608 deletions
@@ -2,7 +2,7 @@
 # Maintainer: Sicelo <absicsz@gmail.com>
 # Co-Maintainer: Danct12 <danct12@disroot.org>
 pkgname=device-nokia-n900
-pkgver=40
+pkgver=41
 pkgrel=0
 pkgdesc="Nokia N900"
 url="https://postmarketos.org"
@@ -239,7 +239,7 @@ e440ed7a3070c17e003b86b72dbe6d8194d01b577ca8dd56dd066f216b6dda32bb965c780950f178
 862ebc7cd2d7a1b3d41b10701b8418308c89eb0732eb99c42ec1091d48e08db9421727f67a3272b7309549798d59afb1b8d7d2fa48d1447b208fcb2329472d4d  modules.blocklist
 143c21f0b18a016d37cb44178e9daea09f128a90769b48353c03c3f245cb9b1f7e773b9ccee084973fc78ddd7a18c2642e54888a85bda7c7daecddc9a8c62eff  pointercal
 134f51d20decc0c63ab08010931a0b410b70d2f85bf6899f2ff137b1680f59f706a6287d01f5fbb41fa5309125df75a430d0783149bd1a6a1bca07d22f4f6a21  proxishot.sh
-7eed68f7eab450e9c68534af9182065f1a8ea98e882adeae11da9db48dc6fbf4b4c440e38e1308b52074952bfa1496c88b5595e2ca03529785a92ec04d8c6baf  uboot-script.cmd
+42f916d87dd305111028992a1107bf6fe108bebbd782ae8edd065e76505db2b3a75e57515970c3e40cb0d1b7e83097a1bba92785be13df7c3fd80959a8d9c5c1  uboot-script.cmd
 465b9a0d2b46d0981c64b47cb1f656c2456a90b91b1751a2efad10af38a96030dd99108b1fd76ce31bf1ea0f236d55bed38b114d6bd712f09f8968de034c946c  10-nokia-modem.rules
 1acc441b9f83dc91fd65fa3f89b8205bfd72a465286bc181b4e7e92dd4b8c0bc5c20a18dab46ff3ee8ae70940efd7d767b3dfb920edb4c74377bd418b838693d  15-bq27k.rules
 03079030237440080e833dbfeff80327c1ad6a8129c6c730b401a3052cd00a986783ec3473a526b14ae73ba1f20653b4c7b2a6590839bfe6cc156bbbc3b7bb74  80-feedbackd-twl4030.rules
@@ -2,7 +2,7 @@ setenv mmcnum 0
 setenv mmcpart 1
 setenv mmctype ext2
 setenv setup_omap_atag 1
-setenv bootargs init=/init.sh rw console=tty0
+setenv bootargs init=/init.sh rw console=tty0 PMOS_FORCE_PARTITION_RESIZE
 setenv mmckernfile /uImage
 setenv mmcinitrdfile /uInitrd
 setenv mmcscriptfile
@@ -1,7 +1,7 @@
 # Maintainer: Adam Thiede <me@adamthiede.com>
 # Co-Maintainer: Jenneron <jenneron@protonmail.com>
 pkgname=linux-postmarketos-mediatek-mt8173
-pkgver=6.13.2
+pkgver=6.13.5
 pkgrel=0
 pkgdesc="Mainline kernel fork for Mediatek MT8173 devices"
 arch="aarch64"
@@ -66,7 +66,7 @@ package() {
 }

 sha512sums="
-c21b5d41c8983cb404a5b1747e17e900a10e09fb1a2b56f73d3c4d8ceed6af376e5149fc5484f97aacb771ca2e7def66789c6ae06eb696875f3ef89c67db302f  linux-6.13.2.tar.xz
-9a01db584a8ee8a64cf04dc4e10f8e22fa2830ca1dbf1b8d4531ce5f9bbdc88a2051b8e47dbba8455feb061789b1de90ed69ea870b33dcad8cd4116fac87d022  config-postmarketos-mediatek-mt8173.aarch64
+654c03973dc57c6e4fd66e2b5639ebeaaab2737a1702b7235572b4b88bebd67b80e7e3c364e76f1b29c66e046c3109e8052bff1ec6f79f4afcad387624680d00  linux-6.13.5.tar.xz
+acd8d6baf266ea6c622adbcbaf19341a8b4067260752a5025284d3facddc6181bc79b0c5aa8923489fddf7d54b7c27851426257a3e68bb81f74dff320655d8f5  config-postmarketos-mediatek-mt8173.aarch64
 c86f8dfc32165a32381d45a4c8b6811ebf43f01b5d8a48fbe227cf5084cfefe24b32264c1c150cb49115db4759a2d21ad48b37dcaac78367d226e9cc2a5ba849  fix-mmc-order.patch
 "
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.13.2 Kernel Configuration
+# Linux/arm64 6.13.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 14.2.0) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1955,7 +1955,6 @@ CONFIG_EFI_EARLYCON=y
 # end of EFI (Extensible Firmware Interface) Support

 # CONFIG_TEE_STMM_EFI is not set
-# CONFIG_IMX_SCMI_MISC_DRV is not set
 CONFIG_ARM_PSCI_FW=y
 # CONFIG_ARM_PSCI_CHECKER is not set

@@ -2440,6 +2439,7 @@ CONFIG_PATA_OF_PLATFORM=y
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m
 CONFIG_MD_BITMAP_FILE=y
+# CONFIG_MD_LINEAR is not set
 # CONFIG_MD_RAID0 is not set
 # CONFIG_MD_RAID1 is not set
 # CONFIG_MD_RAID10 is not set
@@ -6697,7 +6697,6 @@ CONFIG_CROS_EC_TYPEC=m
 # CONFIG_CROS_HPS_I2C is not set
 CONFIG_CROS_USBPD_LOGGER=m
 CONFIG_CROS_USBPD_NOTIFY=y
-# CONFIG_CZNIC_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
 CONFIG_SURFACE_PLATFORMS=y
 CONFIG_ARM64_PLATFORM_DEVICES=y
@@ -7743,7 +7742,6 @@ CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
 CONFIG_IRQ_MSI_LIB=y
 # CONFIG_AL_FIC is not set
-# CONFIG_LAN966X_OIC is not set
 # CONFIG_XILINX_INTC is not set
 CONFIG_PARTITION_PERCPU=y
 CONFIG_MST_IRQ=y
@@ -2,7 +2,7 @@
 # Kernel config based on: arch/arm64/configs/defconfig

 pkgname=linux-next
-pkgver=6.14_git20250226
+pkgver=6.14_git20250227
 pkgrel=0
 _nextver="${pkgver#*_git}"
 pkgdesc="Linux next kernel"
@@ -69,7 +69,7 @@ package() {
 }

 sha512sums="
-ec56a74c4b80001e8e1e14fa81b14ef81ef7f466684eabbe2e1b2738afa63ae5d4ad48f9b5ce1b53ec1aabbbffeadf744a470ce8b95d374a542b85bc8c988ae3  linux-next-next-20250226.tar.gz
+8149eba61700f7c38605d4dd4302ea27904663b3b1dbcdf056982d9e191b905bd70ab9294b23bebc32a06c9a5a2f734672677f75d162d63ad23bc1429fb241c0  linux-next-next-20250227.tar.gz
 8de0a3791ea671528a9fc753071683dfea68ea4f4c22060fc0ca8a4b1b3d76eaa2a3fd40bb013173f0e55da15dde91cf285902779beb35781b6c90f39244ce11  devices.config
 48999c505effe9be5e9394d4954691de453f01f6bf24dc9971f1d742a1c4e36133bcc4b95b82b6b1d59993ff58f53168f0019280947de6963fb4fc37c0ab1679  pmos.config
 "
@@ -3,7 +3,7 @@ maintainer="fossdd <fossdd@pwned.life>"
 pkgname=phosh
 _pkgver=0.44.1
 pkgver=9999$_pkgver
-pkgrel=0
+pkgrel=1
 pkgdesc="Wayland shell for GNOME on mobile devices"
 # armhf: blocked by gnome-shell-schemas
 arch="all !armhf"
@@ -70,7 +70,6 @@ subpackages="
 	$pkgname-systemd
 	"
 source="https://sources.phosh.mobi/releases/phosh/phosh-${_pkgver/_/.}.tar.xz
-	phosh.desktop
 	"
 builddir="$srcdir/$pkgname-${_pkgver/_/.}"
 # TODO: crossdirect disabled due to armv7 crosscompile failure on x86_64, see
@@ -99,9 +98,6 @@ check() {

 package() {
 	DESTDIR="$pkgdir/" meson install --no-rebuild --skip-subprojects -C output
-
-	install -D -m644 "$srcdir"/phosh.desktop \
-		"$pkgdir"/usr/share/wayland-sessions/phosh.desktop
 }

 portalsconf() {
@@ -116,14 +112,6 @@ libphosh_dev() {
 	amove usr/lib/pkgconfig/$_soname.pc
 }

-systemd() {
-	pkgdesc="$pkgname systemd service files"
-	install_if="systemd-services=$pkgver-r$pkgrel systemd $name"
-
-	amove usr/lib/systemd
-}
-
 sha512sums="
 dcc7a323e26e5158f53424eac23bf7fdb3c5c9b5d34216155bc167b79941882541c0e70242f7e6c9d7217c6d5add325722527404cf9b3eac2600fbf299bca086  phosh-0.44.1.tar.xz
-8ca4893a751311de326e198314669f5a276092ade99c6353c4c9ce070713fb1a5b1615e7fecb93b428dc79fd4001a9af43d24eafaf2545d7db464963fda25330  phosh.desktop
 "
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Phosh
-Name[en]=Phosh
-Comment=This session logs you into Phosh
-Comment[en]=This session logs in you into Phosh
-Exec=dbus-run-session /usr/bin/phosh-session
-TryExec=/usr/bin/phosh-session
-Type=Application
-DesktopNames=Phosh:GNOME
-Keywords=launch;Phosh;desktop;session;
@@ -3,9 +3,10 @@
 # Co-Maintainer: jane400 <jane400@postmarketos.org>

 pkgname=systemd
-pkgver=256.5
-_pkgver="musl-v${pkgver//_/-}"
-pkgrel=6
+# currently tracking git MR
+pkgver=256.11
+_pkgver="musl-v${pkgver//_/-}-split-usr"
+pkgrel=1
 pkgdesc="System and service manager"
 url="https://github.com/systemd/systemd"
 arch="all !ppc64le !s390x" # blocked by pmboostrap not supporting
@@ -13,6 +14,7 @@ license="MIT AND GPL-2.0-only AND LGPL-2.1-or-later"
 options="pmb:strict !check" # few tests fail, need to debug. We use alpine dbus for building, systemd-dbus for runtime

 makedepends="
+	acl
 	acl-dev
 	audit-dev
 	bash
@@ -118,8 +120,7 @@ subpackages="
 	"

 source="
-	https://gitlab.com/postmarketOS/systemd/-/archive/$_pkgver/systemd-$_pkgver.tar.gz
-	4.patch
+	https://gitlab.postmarketos.org/postmarketOS/systemd/-/archive/$_pkgver/systemd-$_pkgver.tar.gz
 	systemd-apk-macros.sh
 	wired.network
 	"
@@ -157,11 +158,12 @@ build() {
 		-Dkmod-path=/bin/kmod \
 		-Dsulogin-path=/sbin/sulogin \
 		\
+		-Dwheel-group=true \
 		-Ddebug-shell=/bin/ash \
 		-Dpolkit=enabled \
 		-Dpam=enabled \
 		-Dpamlibdir=/usr/lib/security \
-		-Dpamconfdir=/etc/pam.d \
+		-Dpamconfdir=/usr/lib/pam.d \
 		\
 		-Dbootloader=disabled \
 		-Dutmp=false \
@@ -223,6 +225,11 @@ package() {

 	install -Dm755 "$srcdir"/systemd-apk-macros.sh -t \
 		"$pkgdir"/usr/lib/systemd
+
+
+	# initramfs hardcodes /sbin/init
+	mkdir -p "$pkgdir"/sbin
+	ln -sf "../usr/lib/systemd/systemd" "$pkgdir"/sbin/init
 }

 udevd() {
@@ -233,7 +240,6 @@ udevd() {
 	provides="eudev udev eudev-libs"
 	provider_priority=100

-	amove usr/bin/udevadm
 	amove etc/udev
 	amove usr/lib/libudev*
 	amove usr/lib/systemd/system/initrd-udevadm-cleanup-db.service
@@ -243,14 +249,11 @@ udevd() {
 	amove usr/lib/systemd/systemd-udevd
 	amove usr/lib/udev

+	# Install symlinks to be more like eudev
+	# FIXME: systemd-udevd gets placed at /usr/bin/udevadm
 	mkdir -p "$subpkgdir"/sbin "$subpkgdir"/bin
-
-	# Install a symlink to /usr/bin to be compatible with eudev
-	ln -sf /usr/lib/systemd/systemd-udevd "$subpkgdir"/usr/bin/udevd
-	# Install split-user symlinks
-	ln -sf /usr/lib/systemd/systemd-udevd "$subpkgdir"/sbin/udevd
-	ln -sf /usr/lib/systemd/systemd-udevd "$subpkgdir"/bin/udevadm
-	ln -sf /usr/lib/systemd/systemd-udevd "$subpkgdir"/sbin/udevadm
+	ln -sf ../usr/lib/systemd/systemd-udevd "$subpkgdir"/sbin/udevd
+	ln -sf ../usr/lib/systemd/systemd-udevd "$subpkgdir"/bin/udevadm
 }

 udevd_bcomp() {
@@ -325,6 +328,9 @@ resolved() {
 	install="$subpkgname.post-install $subpkgname.pre-deinstall"
 	replaces="resolvconf"
 	provides="resolvconf"
+	# To not auto-install on existing systemd-based systems
+	# until we are ready to use it.
+	provider_priority=0

 	amove etc/systemd/resolved.conf
 	amove usr/sbin/resolvconf
@@ -418,8 +424,7 @@ dev() {
 }

 sha512sums="
-5d1f4625b75b6637afa71519bc7048fe899b4f5785ce26316524ac78941e43cf6ba83391dae68497cfa4f8aaa35d953ec0c04ee581307ffc7007cf4b9d9c4454  systemd-musl-v256.5.tar.gz
-e8ced12eb67a261a5c2788487053451c352e0b2ebe3d72aaf84a3011dc92981affe4f036f693260fc8ee4a49f02de4522fd022e5783dba939023f13891ab228e  4.patch
+3cd75d5ba29a3994230ecbe16ea106d4fe05d7d76e7cd9b9a6a63177f09d8c362c055a1fea49e6c9a10a949afc07a6c75fe75dad2bd302d94e41a81f8ddb2a15  systemd-musl-v256.11-split-usr.tar.gz
 2f9ec875de67fc4bb401bebea88653cd34c22787a26a8122233fbb761bfbf190be72cfa0c26a433c30d703ee1e10489787d75492f0e1a76cbd5f6601e7e23d49  systemd-apk-macros.sh
 81c897fed8a3fbfb67ec591b2398a5d65e4af1b3ef379376c157c98d71f085b707f8ebc896d5571a94f99f8fc84fd6b43e3b879ca9b0d57fc6c4596034c7a777  wired.network
 "
Author	SHA1	Message	Date
Aster Boese	a482f41540	systemd/systemd: lower systemd-resolved provider_priority Currently we do not package the configurations needed to use systemd-resolved as a replacement for openresolv. Without this patch current systems that have wireguard-tools installed will automatically pull systemd-resolved. See https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/80058/diffs	2025-02-28 01:23:22 -05:00
adamthiede	4af4a32b2f	linux-postmarketos-mediatek-mt8173: upgrade to 6.13.5 (MR 6262)	2025-02-27 23:39:19 +01:00
Sicelo A. Mhlongo	6589a57e26	device-nokia-n900: force SD card partition resizing (MR 6257) Reverts `82a8d55197` (device-nokia-n900: drop partition resize cmdline option (MR 6164)) since it seems resizing does not actually take place automatically, at least as far as the N900 is concerned [ci:skip-build]: already built successfully in CI	2025-02-27 12:06:55 -08:00
jane400	6da432b150	systemd/systemd: upgrade to 256.11 (MR 6145) There are some notable changes: - systemd-journal-upload is now available, but not tested - pam files now live under `/usr/lib/pam.d`. users can easily override configuration by putting files under /etc/pam.d with the same name. - journalctl should now work for `wheel` groups without privilege esclation to root. ACLs' for /var/log/journal should hopefully be set correctly now. - /bin/udevadm /sbin/{init,udevd} are now provided by the APKBUILD itself - The split-usr backport lives now in the downstream release.	2025-02-27 09:57:13 -08:00
jane400	ec84571f9b	systemd/phosh: use abuild's systemd splitfunc and launch dbus via socket-activation (MR 6243) The current -systemd subpackage isn't getting installed due to the invalid install_if statement. As abuild's fork in pmOS for systemd specifies a default_systemd() and systemd() function, overriding it here isn't needed. The -systemd subpackage contains configuration for gnome-session in systemd mode. - By placing a file into systemd/user/gnome-session@phosh.target.d, we generate a valid gnome-session@phosh.target. - The first invokation of gnome-session by phosh-session includes the arg `--session phosh`. When gnome-session sees a running systemd user manager via dbus, it will signal to systemd to start `gnome-session@phosh.target`. As we switched to tinydm/autologin for phosh on systemd-edge, this will only work when autologin also tries to load pam_systemd.so. [ci:skip-build]: already built successfully in CI	2025-02-27 09:48:03 -08:00
postmarketOS CI	99b062b484	linux-next: upgrade to next-20250227	2025-02-27 17:00:24 +00:00