main/postmarketos-ondev: upgrade to 0.3.2 (MR 1780)

The calamares module and branding was made distro-agnostic and moved to
calamares-extensions.git. A new "make install" target inside
postmarketos-ondev.git installs all files, so we need less logic in the
APKBUILD.

Replace lightdm with tinydm. Add xset dependency to disable screen
blanking.
This commit is contained in:
Oliver Smith 2020-09-22 22:02:44 +02:00 committed by clayton craft
parent 0f5fd1f8fc
commit 411f3160a3
No known key found for this signature in database
GPG key ID: 23A30DA6D406B355
2 changed files with 10 additions and 56 deletions

View file

@ -1,7 +1,7 @@
# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org> # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
pkgname=postmarketos-ondev pkgname=postmarketos-ondev
pkgver=0.2.1 pkgver=0.3.2
pkgrel=4 pkgrel=0
pkgdesc="Calamares based on-device installer" pkgdesc="Calamares based on-device installer"
url="https://postmarketos.org" url="https://postmarketos.org"
arch="all !armhf" # armhf: qt5-qtdeclarative arch="all !armhf" # armhf: qt5-qtdeclarative
@ -9,62 +9,30 @@ license="GPL-3.0-or-later"
depends=" depends="
$pkgname-openrc $pkgname-openrc
calamares calamares
calamares-extensions-brand-default-mobile
calamares-extensions-mod-mobile
calamares-mod-mount calamares-mod-mount
calamares-mod-shellprocess calamares-mod-shellprocess
calamares-mod-unpackfs calamares-mod-unpackfs
e2fsprogs e2fsprogs
i3wm i3wm
kirigami2 kirigami2
lightdm
lightdm-openrc
mesa-egl mesa-egl
qt5-qtvirtualkeyboard qt5-qtvirtualkeyboard
qtvirtualkeyboard-plasma qtvirtualkeyboard-plasma
tinydm
tinydm-openrc
unclutter-xfixes unclutter-xfixes
xorg-server xorg-server
" xset
makedepends="
calamares-dev
qt5-qtquickcontrols2-dev
qt5-qtsvg-dev
" "
subpackages="$pkgname-openrc" subpackages="$pkgname-openrc"
install="$pkgname.post-install" install="$pkgname.post-install"
source="https://gitlab.com/postmarketOS/postmarketos-ondev/-/archive/$pkgver/postmarketos-ondev-$pkgver.tar.bz2 source="https://gitlab.com/postmarketOS/postmarketos-ondev/-/archive/$pkgver/postmarketos-ondev-$pkgver.tar.bz2"
postmarketos-ondev.initd
"
options="!check" # has no tests options="!check" # has no tests
build() {
cd calamares
cmake -B build \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=None
make -C build
}
package() { package() {
# Calamares modules (don't conflict with official modules) make DESTDIR="$pkgdir" install
make -C calamares/build DESTDIR="$pkgdir" install
mv "$pkgdir/usr/lib/calamares/modules" \
"$pkgdir/usr/lib/calamares/modules-pmos"
# Calamares configs
mkdir -p "$pkgdir/etc"
cp -r "$builddir/calamares/config/" "$pkgdir/etc/calamares"
# Scripts
install -Dm755 "$builddir/ondev-prepare.sh" \
"$pkgdir/usr/bin/ondev-prepare"
install -Dm755 "$builddir/ondev-boot.sh" \
"$pkgdir/usr/bin/ondev-boot"
# OpenRC
install -Dm755 "$srcdir/postmarketos-ondev.initd" \
"$pkgdir/etc/init.d/postmarketos-ondev"
} }
sha512sums="5838b8b592918818ed40dc6c2364a1f233f31b14c0283ac1dffd0e01b6bddf0462424a233d060f8740e0d393fe0f907fb8f33386e0ae633218c49db18c136310 postmarketos-ondev-0.2.1.tar.bz2 sha512sums="e90a0db3f0c9535a107cf0331754c9704d0d2208a36faac311a03705bd7577bff82397a5f77346e2d58651efa0de14419368fb9379ea34213122bf9f21866bfe postmarketos-ondev-0.3.2.tar.bz2"
eff2c9f4ddcc7d22d8afd4c5d1cac92f6e6e9fef7713af2370dae715819ca2aba2d33b1cd0ea0478526c503dfc6948fee2242b6d804f8e9dcd6ef5cf1500fc7f postmarketos-ondev.initd"

View file

@ -1,14 +0,0 @@
#!/sbin/openrc-run
description="postmarketOS on-device installer"
depend()
{
need localmount dbus
}
start()
{
ebegin "Running postmarketOS on-device installer"
ondev-boot &
}