commit: e107ec4b3bd60ae35214888e5411cd03a77b66a5
Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
AuthorDate: Tue Jul 13 17:00:18 2021 +0000
Commit: Marco Scardovi <marco <AT> scardovi <DOT> com>
CommitDate: Tue Jul 13 17:02:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e107ec4b
sys-boot/osk-sdl: dropping package
It is actually required only for crypted boot (and actually I'm not
interested on maintaining it) so drops in progress.
Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
sys-boot/osk-sdl/Manifest | 2 -
sys-boot/osk-sdl/files/module-setup.sh | 29 -------------
sys-boot/osk-sdl/files/osk-sdl-pp.conf | 2 -
sys-boot/osk-sdl/files/osk-sdl-pp.path | 21 ----------
sys-boot/osk-sdl/files/osk-sdl-pp.service | 21 ----------
sys-boot/osk-sdl/files/osk-sdl.sh | 49 ----------------------
sys-boot/osk-sdl/metadata.xml | 8 ----
sys-boot/osk-sdl/osk-sdl-0.64-r1.ebuild | 69 -------------------------------
sys-boot/osk-sdl/osk-sdl-0.65.ebuild | 65 -----------------------------
9 files changed, 266 deletions(-)
diff --git a/sys-boot/osk-sdl/Manifest b/sys-boot/osk-sdl/Manifest
deleted file mode 100644
index baa5d6334..000000000
--- a/sys-boot/osk-sdl/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST osk-sdl-0.64.tar.gz 37851 BLAKE2B
dc297a0b1879f7b64bceb3032275b30f10072c50a2e2ddd985e94136ebf2308819fe71ca831fcc05d413c5e74f8ab955d920cc63bd90529e0c45fd3b6aae44db
SHA512
0da985e1e8d0352f53f661dd4f7f6243a8f9b48279297f4ea3b120aa239c733411a83d324b58d152cafd9c2e7a791a36506afec6449e141c6445f0420bb9fd6b
-DIST osk-sdl-0.65.tar.gz 38007 BLAKE2B
3b64b44f74d72ab58468ecafe2e9aea054cd8a836ce18ece7e0b407de4311af7e70e197330ff3e88091c007a82942c33c1a2b538849cb45f78bd35674cd15e97
SHA512
070dcc1073266ecbe4c4c0089f29ac8687d98bbdcbd1c1578aa737bd6fbc96adeab6bd958295d073ef95515e63f536cef67c7e7e7b492b4ee3dc81fdcc8b9464
diff --git a/sys-boot/osk-sdl/files/module-setup.sh
b/sys-boot/osk-sdl/files/module-setup.sh
deleted file mode 100644
index f27d34582..000000000
--- a/sys-boot/osk-sdl/files/module-setup.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# called by dracut
-check() {
- return 0
-}
-
-# called by dracut
-depends() {
- echo drm crypt
- return 0
-}
-
-# called by dracut
-install() {
- inst_multiple "/etc/osk.conf" \
- "/usr/share/glvnd/egl_vendor.d/50_mesa.json" \
- "/usr/share/fonts/dejavu/DejaVuSans.ttf" \
- osk-sdl
- inst_simple $moddir/osk-sdl.sh /usr/bin/osk-sdl.sh
- inst_simple $moddir/osk-sdl-pp.service
${systemdsystemunitdir}/osk-sdl-pp.service
- inst_simple $moddir/osk-sdl-pp.path ${systemdsystemunitdir}/osk-sdl-pp.path
- systemctl -q --root "$initdir" add-wants sysinit.target osk-sdl-pp.path
- # mesa cogl libglvnd
- equery f mesa cogl libglvnd | grep ".so$" | while read -r so; do
- inst ${so}
- done
-
-}
diff --git a/sys-boot/osk-sdl/files/osk-sdl-pp.conf
b/sys-boot/osk-sdl/files/osk-sdl-pp.conf
deleted file mode 100644
index bc5ec8bf0..000000000
--- a/sys-boot/osk-sdl/files/osk-sdl-pp.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# dracut config, need osk-sdl for encrypted root, uncomment the following line
to enable it in initramfs
-#add_dracutmodules+=" osk-sdl "
diff --git a/sys-boot/osk-sdl/files/osk-sdl-pp.path
b/sys-boot/osk-sdl/files/osk-sdl-pp.path
deleted file mode 100644
index 5a386bdaf..000000000
--- a/sys-boot/osk-sdl/files/osk-sdl-pp.path
+++ /dev/null
@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Run on screen keyboard to unlock root dev path watch
-DefaultDependencies=no
-Conflicts=shutdown.target emergency.service
-Before=systemd-ask-password-console.service
systemd-ask-password-plymouth.service systemd-fsck-root.service paths.target
shutdown.target
-
-[Path]
-PathExists=/dev/null
-# touch screen
-#PathExists=/dev/input/by-path/platform-1c2ac00.i2c-event
-# video
-PathExists=/dev/dri/renderD128/
diff --git a/sys-boot/osk-sdl/files/osk-sdl-pp.service
b/sys-boot/osk-sdl/files/osk-sdl-pp.service
deleted file mode 100644
index e5445b7cc..000000000
--- a/sys-boot/osk-sdl/files/osk-sdl-pp.service
+++ /dev/null
@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-#
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Run on screen keyboard to unlock root
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=systemd-modules-load.service systemd-udevd.service
-Before=systemd-ask-password-console.service
systemd-ask-password-plymouth.service systemd-fsck-root.service
-ConditionPathExists=!/dev/mapper/root
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/osk-sdl.sh
-RemainAfterExit=true
diff --git a/sys-boot/osk-sdl/files/osk-sdl.sh
b/sys-boot/osk-sdl/files/osk-sdl.sh
deleted file mode 100644
index 36cba93e8..000000000
--- a/sys-boot/osk-sdl/files/osk-sdl.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-# stolen from postmarket
-#
https://gitlab.com/postmarketOS/pmaports/-/blob/master/main/postmarketos-mkinitfs/init_functions.sh
-find_crypt_partition() {
- # The partition layout is one of the following:
- # a) boot, root partitions on sdcard
- # b) boot, root partition on the "system" partition (which has its
- # own partition header! so we have partitions on partitions!)
- #
- # mount_subpartitions() must get executed before calling
- # find_root_partition(), so partitions from b) also get found.
-
- # Short circuit all autodetection logic if pmos_root= is supplied
- # on the kernel cmdline
- # shellcheck disable=SC2013
- for x in $(cat /proc/cmdline); do
- [ "$x" = "${x#cryptroot=}" ] && continue
- DEVICE="${x#cryptroot=}"
- done
- echo "$DEVICE"
-}
-
-setup_directfb_tslib() {
- # 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)
- export SDL_VIDEO_DRIVER="kmsdrm"
- export SDL_RENDER_DRIVER="software"
- #export DFBARGS="system=fbdev,no-cursor,disable-module=linux_input"
- # shellcheck disable=SC2154
- if [ -n "$deviceinfo_dev_touchscreen" ]; then
- export TSLIB_TSDEVICE="$deviceinfo_dev_touchscreen"
- fi
-}
-
-start_onscreen_keyboard() {
- setup_directfb_tslib
- sleep 1 # wait for dev settle
- /usr/bin/osk-sdl -n root -d "$partition" -c /etc/osk.conf
- unset DFBARGS
- unset TSLIB_TSDEVICE
-}
-
-unlock_root_partition() {
- partition="$(find_crypt_partition)"
- start_onscreen_keyboard
-}
-
-unlock_root_partition
diff --git a/sys-boot/osk-sdl/metadata.xml b/sys-boot/osk-sdl/metadata.xml
deleted file mode 100644
index 144c8091c..000000000
--- a/sys-boot/osk-sdl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="person">
- <email>ma...@scardovi.com</email>
- <name>Marco Scardovi</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sys-boot/osk-sdl/osk-sdl-0.64-r1.ebuild
b/sys-boot/osk-sdl/osk-sdl-0.64-r1.ebuild
deleted file mode 100644
index d7af7ff79..000000000
--- a/sys-boot/osk-sdl/osk-sdl-0.64-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-COMMIT="69fb2d943a8664d5a587c967ac828f9ed5acd7ce"
-
-DESCRIPTION="Lightweight On-Screen-Keyboard based on SDL2"
-HOMEPAGE="https://gitlab.com/postmarketOS/osk-sdl";
-SRC_URI="https://gitlab.com/postmarketOS/osk-sdl/-/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-portage/gentoolkit
- media-libs/cogl
- media-fonts/dejavu
- media-libs/libglvnd
- media-libs/libsdl2[kms,haptic]
- media-libs/mesa
- media-libs/sdl2-ttf
- sys-fs/cryptsetup
- sys-kernel/dracut
-"
-
-BDEPEND="
- app-text/scdoc
- test? (
- x11-misc/xdotool
- x11-misc/xvfb-run
- )
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
- default
- sed -e s/ttf-dejavu/dejavu/ -i osk.conf || die "Failed to sed"
-}
-
-src_test() {
- meson_src_test
-}
-
-src_install() {
- meson_src_install
- insinto /etc
- doins osk.conf
- insinto /etc/dracut.conf.d/
- doins "${FILESDIR}"/osk-sdl-pp.conf
- insinto /usr/lib/dracut/modules.d/50osk-sdl
- doins "${FILESDIR}"/osk-sdl-pp.path
- doins "${FILESDIR}"/osk-sdl-pp.service
- exeinto /usr/lib/dracut/modules.d/50osk-sdl
- doexe "${FILESDIR}"/module-setup.sh
- doexe "${FILESDIR}"/osk-sdl.sh
-}
-
-pkg_postinst() {
- einfo "For more info on how to test osk-sdl, and how to report
problems, see: ${HOMEPAGE}"
- einfo "To use osk-sdl to unlock encrypted root at bootime, check
osk-sdl-pp.conf in /etc/dracut.conf.d"
- einfo "and add these boot option 'root=/dev/mapper/root
cryptroot=/dev/path/to/encrypted_partition' "
-}
diff --git a/sys-boot/osk-sdl/osk-sdl-0.65.ebuild
b/sys-boot/osk-sdl/osk-sdl-0.65.ebuild
deleted file mode 100644
index 8b3e203bf..000000000
--- a/sys-boot/osk-sdl/osk-sdl-0.65.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Lightweight On-Screen-Keyboard based on SDL2"
-HOMEPAGE="https://gitlab.com/postmarketOS/osk-sdl";
-SRC_URI="https://gitlab.com/postmarketOS/osk-sdl/-/archive/${PV}/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-portage/gentoolkit
- media-libs/cogl
- media-fonts/dejavu
- media-libs/libglvnd
- media-libs/libsdl2[kms,haptic]
- media-libs/mesa
- media-libs/sdl2-ttf
- sys-fs/cryptsetup
- sys-kernel/dracut
-"
-
-BDEPEND="
- app-text/scdoc
- test? (
- x11-misc/xdotool
- x11-misc/xvfb-run
- )
-"
-
-src_prepare() {
- default
- sed -e s/ttf-dejavu/dejavu/ -i osk.conf || die "Failed to sed"
-}
-
-src_test() {
- meson_src_test
-}
-
-src_install() {
- meson_src_install
- insinto /etc
- doins osk.conf
- insinto /etc/dracut.conf.d/
- doins "${FILESDIR}"/osk-sdl-pp.conf
- insinto /usr/lib/dracut/modules.d/50osk-sdl
- doins "${FILESDIR}"/osk-sdl-pp.path
- doins "${FILESDIR}"/osk-sdl-pp.service
- exeinto /usr/lib/dracut/modules.d/50osk-sdl
- doexe "${FILESDIR}"/module-setup.sh
- doexe "${FILESDIR}"/osk-sdl.sh
-}
-
-pkg_postinst() {
- einfo "For more info on how to test osk-sdl, and how to report
problems, see: ${HOMEPAGE}"
- einfo "To use osk-sdl to unlock encrypted root at bootime, check
osk-sdl-pp.conf in /etc/dracut.conf.d"
- einfo "and add these boot option 'root=/dev/mapper/root
cryptroot=/dev/path/to/encrypted_partition' "
-}
