postmarketos-ondev: ondev2

Put this as an install_if for sdm845 devices

main/postmarketos-initramfs/APKBUILD

@@ -2,7 +2,7 @@
 # Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-initramfs
 pkgver=1.1.1
-pkgrel=0
+pkgrel=9999
 pkgdesc="Base files for the postmarketOS initramfs / initramfs-extra"
 url="https://postmarketos.org"
 depends="

main/postmarketos-initramfs/init_functions.sh

@@ -180,6 +180,11 @@ find_root_partition() {
 				DEVICE="$next"
 			fi
 		fi
+	else
+		# After unlocking the root partition, it should be here
+		if [ -e /dev/mapper/root ]; then
+			DEVICE="/dev/mapper/root"
+		fi
 	fi
 
 	# Try partitions in /dev/mapper and /dev/dm-* first

main/postmarketos-ondev/APKBUILD

@@ -1,53 +1,42 @@
 # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
 pkgname=postmarketos-ondev
-pkgver=0.8.1
+pkgver=2.0.0
 pkgrel=1
-pkgdesc="Calamares based on-device installer"
-url="https://postmarketos.org"
-# armhf blocked by qt5-qtdeclarative
-# riscv64 blocked by calamares
-arch="all !armhf !riscv64"
+pkgdesc="Next-gen on-device installer (pmOS specific build)"
+url="https://gitlab.com/postmarketOS/ondev2/"
+arch="all"
 license="GPL-3.0-or-later"
 depends="
-	$pkgname-openrc
-	calamares
-	calamares-extensions-brand-default-mobile
-	calamares-extensions-mod-mobile
-	calamares-mod-mount
-	calamares-mod-shellprocess
-	calamares-mod-unpackfs
-	dbus
-	dbus-openrc
-	e2fsprogs
-	elogind
-	elogind-openrc
-	font-dejavu
-	haveged
-	haveged-openrc
-	i3wm
-	kirigami2
-	losetup
-	mesa-egl
-	qt5-qtvirtualkeyboard
-	qtvirtualkeyboard-plasma
-	tinydm
-	tinydm-openrc
-	unclutter-xfixes
-	util-linux-misc
-	xf86-input-libinput
-	xf86-video-fbdev
-	xorg-server
-	xset
+	$pkgname-lang
+	dosfstools
 	"
-subpackages="$pkgname-openrc"
-install="$pkgname.post-install"
-source="https://gitlab.com/postmarketOS/postmarketos-ondev/-/archive/$pkgver/postmarketos-ondev-$pkgver.tar.gz"
+subpackages="$pkgname-lang"
+source="https://gitlab.com/postmarketOS/ondev2/-/archive/$pkgver/ondev2-$pkgver.tar.gz"
 options="!check"  # has no tests
+makedepends="
+	cryptsetup-dev
+	eudev-dev
+	gettext-tiny
+	inih-dev
+	libdrm-dev
+	libinput-dev
+	libxkbcommon-dev
+	linux-headers
+	meson
+	musl-libintl
+	pkgconf
+	util-linux-dev
+"
+install="$pkgname.pre-install"
+
+build() {
+	abuild-meson -Ddistro=postmarketOS . output
+	meson compile ${JOBS:+-j ${JOBS}} -C output
+}
 
 package() {
-	make DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
 }
 
 sha512sums="
-259c1d771edf4722b3ef2959c0cb381e684f7db54079012d7ed76e389f7671106c7c5cea27e9e33c2fbd8bcac1cded9c43913639c98772465648df505c5495c3  postmarketos-ondev-0.8.1.tar.gz
 "

main/postmarketos-ondev/postmarketos-ondev.post-install

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-rc-update add dbus default
-rc-update add elogind default
-rc-update add haveged default
-rc-update add postmarketos-ondev default
-
-exit 0

main/postmarketos-ondev/postmarketos-ondev.pre-install

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# This file is generated by ondev-prepare which is run by
+# pmbootstrap when setting up the on device installer
+# but it needs to exist because mkinitfs looks for it
+# FIXME: defer running mkinitfs until the end of the
+# installation!
+touch /etc/ondev2.cfg

main/postmarketos-ui-console/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=postmarketos-ui-console
 pkgver=0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Console environment, with no graphical/touch UI"
 url="https://postmarketos.org/"
 arch="noarch"
@@ -12,6 +12,7 @@ depends="
 	postmarketos-base-ui
 	postmarketos-base-ui-networkmanager
 	wireless-tools
+	ttyescape
 	"
 options="!check" # No testsuite
 install="$pkgname.post-install $pkgname.post-upgrade"