diff --git a/.ci/shellcheck.sh b/.ci/shellcheck.sh index 34e6b5ce6..9af28f641 100755 --- a/.ci/shellcheck.sh +++ b/.ci/shellcheck.sh @@ -15,7 +15,6 @@ fi # Shell: shellcheck sh_files=" ./main/mdss-fb-init-hack/mdss-fb-init-hack.sh - ./main/osk-sdl/unlock.sh ./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh ./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh ./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh diff --git a/CODEOWNERS b/CODEOWNERS index 70b0f430a..3914640dd 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -48,7 +48,6 @@ device/*/linux-postmarketos-allwinner/ @Arnavion device/*/u-boot-pinephone/ @Arnavion main/postmarketos-update-depthcharge-kernel/ @jenneron -main/osk-sdl/ @craftyguy main/postmarketos-ui-plasma-mobile/ @bshah main/ttyescape/ @calebccff main/shutdown-clear-rtc-wakealarm/ @Arnavion diff --git a/main/osk-sdl/APKBUILD b/main/osk-sdl/APKBUILD deleted file mode 100644 index 4ad2cc0f3..000000000 --- a/main/osk-sdl/APKBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# Maintainer: Clayton Craft -# Co-Maintainer: Oliver Smith -# -# Note: cannot upstream to Alpine until: -# https://gitlab.alpinelinux.org/alpine/apk-tools/-/issues/10712 -pkgname=osk-sdl -pkgver=0.67.1 -pkgrel=5 -pkgdesc="Onscreen keyboard for unlocking LUKS devices" -url="https://gitlab.com/postmarketOS/osk-sdl" -arch="all" -license="GPL-3.0-or-later" -depends=" - cryptsetup-libs - devicepkg-utils - directfb - mesa-egl - mesa-gl - mesa-gles - font-dejavu - " -makedepends=" - cryptsetup-dev - linux-headers - meson - scdoc - sdl2-dev - sdl2_ttf-dev - " -source=" - https://gitlab.com/postmarketOS/osk-sdl/-/archive/$pkgver/osk-sdl-$pkgver.tar.gz - osk-sdl.files - unlock.sh - set-font.patch - " -options="!strip !check" # No tests -subpackages="$pkgname-doc" -provides="postmarketos-fde-unlocker" -provider_priority=999 - -build() { - abuild-meson build - meson compile ${JOBS:+-j ${JOBS}} -C build -} - -package() { - DESTDIR="$pkgdir" meson install --no-rebuild -C build - - install -Dm755 "$srcdir"/unlock.sh \ - "$pkgdir"/bin/fde-unlock - - # needed to trigger initfs rebuild: - touch osk-sdl - install -Dm644 osk-sdl \ - "$pkgdir"/usr/share/mkinitfs-triggers/osk-sdl - - install -Dm644 "$srcdir"/osk-sdl.files \ - "$pkgdir"/usr/share/mkinitfs/files/30-osk-sdl.files -} - -sha512sums=" -d699069b7acc1af9ade87ba01b3c2e8e9556bf762ea95b8379ebc7309fcb14ce7972d1563b599dd72068d50ebac039304089fdeb3a2c7972c84c2abe94853098 osk-sdl-0.67.1.tar.gz -e1017bc0667756b82527d88f47a77e2f5a44e0769b5ccdea0c6c1f86bd3d0a1df9d9f5bbb224888748cfef5edc3375036a25099eb02c963302f155c3b2e8fefd osk-sdl.files -c6c81ce64420be19d6eb63917bc56474eb19978ccb3ffe26fb4f09ed7cc69caa89ee2e35da366aa6a4f612c04bed105922152645a43cf693be47aa2f5a7b324c unlock.sh -b4dfd5030603e35553dadb5617d27f4fbf1101daafee2cdc9ccff6e7570b5c853abee98c627fbd37927b2f6e10ebc1a5e0de20e8a61cd97b2c573a7a81447236 set-font.patch -" diff --git a/main/osk-sdl/osk-sdl.files b/main/osk-sdl/osk-sdl.files deleted file mode 100644 index 2ddddd33b..000000000 --- a/main/osk-sdl/osk-sdl.files +++ /dev/null @@ -1 +0,0 @@ -/bin/fde-unlock diff --git a/main/osk-sdl/set-font.patch b/main/osk-sdl/set-font.patch deleted file mode 100644 index 8cfa11bbd..000000000 --- a/main/osk-sdl/set-font.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/osk.conf b/osk.conf -index 7fcf3ff..f4f306c 100644 ---- a/osk.conf -+++ b/osk.conf -@@ -5,7 +5,7 @@ wallpaper = #000000 - - keyboard-background = #0E0E12 - keyboard-map = us --keyboard-font = /usr/share/fonts/ttf-dejavu/DejaVuSans.ttf -+keyboard-font = /usr/share/fonts/dejavu/DejaVuSans.ttf - keyboard-font-size = 24 - - key-foreground = #FFFFFF diff --git a/main/osk-sdl/unlock.sh b/main/osk-sdl/unlock.sh deleted file mode 100644 index 20c9284b8..000000000 --- a/main/osk-sdl/unlock.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -partition=$1 -# shellcheck disable=SC1091 -. /usr/share/misc/source_deviceinfo - -# $1: SDL_VIDEODRIVER value (e.g. 'kmsdrm', 'directfb') -run_osk_sdl() { - unset ETNA_MESA_DEBUG - unset SDL_VIDEODRIVER - unset DFBARGS - unset TSLIB_TSDEVICE - unset OSK_EXTRA_ARGS - case "$1" in - "kmsdrm") - # Set up SDL and Mesa env to use kmsdrm backend - export SDL_VIDEODRIVER="kmsdrm" - # needed for librem 5 - export ETNA_MESA_DEBUG="no_supertile" - ;; - "directfb") - # Set up directfb and tslib - # Note: linux_input module is disabled since it will try to take over - # the touchscreen device from tslib (e.g. on the N900) - # Note: ps2mouse module is disabled because it causes - # jerky/inconsistent touch input on some devices - export DFBARGS="system=fbdev,no-cursor,disable-module=linux_input,disable-module=ps2mouse" - export SDL_VIDEODRIVER="directfb" - # SDL/directfb tries to use gles even though it's not - # actually available, so disable it in osk-sdl - export OSK_EXTRA_ARGS="--no-gles" - # shellcheck disable=SC2154 - if [ -n "$deviceinfo_dev_touchscreen" ]; then - export TSLIB_TSDEVICE="$deviceinfo_dev_touchscreen" - fi - ;; - esac - - # osk-sdl needs evdev for input and doesn't launch without it, so - # make sure the module isn't missed - modprobe evdev - osk-sdl $OSK_EXTRA_ARGS -n root -d "$partition" -c /etc/osk.conf \ - -o /boot/osk.conf -v > /osk-sdl.log 2>&1 -} - -# shellcheck disable=SC2154 -if [ -n "$deviceinfo_mesa_driver" ]; then - # try to run osk-sdl with kmsdrm driver, then fallback to - # directfb if that fails - if ! run_osk_sdl "kmsdrm"; then - run_osk_sdl "directfb" - fi -else - run_osk_sdl "directfb" -fi