Gentoo Archives: gentoo-commits

From: Marco Scardovi <marco@××××××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-boot/osk-sdl/, sys-boot/osk-sdl/files/
Date: Tue, 13 Jul 2021 17:02:54
Message-Id: 1626195735.e107ec4b3bd60ae35214888e5411cd03a77b66a5.marco@gentoo
1 commit: e107ec4b3bd60ae35214888e5411cd03a77b66a5
2 Author: Marco Scardovi <marco <AT> scardovi <DOT> com>
3 AuthorDate: Tue Jul 13 17:00:18 2021 +0000
4 Commit: Marco Scardovi <marco <AT> scardovi <DOT> com>
5 CommitDate: Tue Jul 13 17:02:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e107ec4b
7
8 sys-boot/osk-sdl: dropping package
9 It is actually required only for crypted boot (and actually I'm not
10 interested on maintaining it) so drops in progress.
11
12 Signed-off-by: Marco Scardovi <marco <AT> scardovi.com>
13
14 sys-boot/osk-sdl/Manifest | 2 -
15 sys-boot/osk-sdl/files/module-setup.sh | 29 -------------
16 sys-boot/osk-sdl/files/osk-sdl-pp.conf | 2 -
17 sys-boot/osk-sdl/files/osk-sdl-pp.path | 21 ----------
18 sys-boot/osk-sdl/files/osk-sdl-pp.service | 21 ----------
19 sys-boot/osk-sdl/files/osk-sdl.sh | 49 ----------------------
20 sys-boot/osk-sdl/metadata.xml | 8 ----
21 sys-boot/osk-sdl/osk-sdl-0.64-r1.ebuild | 69 -------------------------------
22 sys-boot/osk-sdl/osk-sdl-0.65.ebuild | 65 -----------------------------
23 9 files changed, 266 deletions(-)
24
25 diff --git a/sys-boot/osk-sdl/Manifest b/sys-boot/osk-sdl/Manifest
26 deleted file mode 100644
27 index baa5d6334..000000000
28 --- a/sys-boot/osk-sdl/Manifest
29 +++ /dev/null
30 @@ -1,2 +0,0 @@
31 -DIST osk-sdl-0.64.tar.gz 37851 BLAKE2B dc297a0b1879f7b64bceb3032275b30f10072c50a2e2ddd985e94136ebf2308819fe71ca831fcc05d413c5e74f8ab955d920cc63bd90529e0c45fd3b6aae44db SHA512 0da985e1e8d0352f53f661dd4f7f6243a8f9b48279297f4ea3b120aa239c733411a83d324b58d152cafd9c2e7a791a36506afec6449e141c6445f0420bb9fd6b
32 -DIST osk-sdl-0.65.tar.gz 38007 BLAKE2B 3b64b44f74d72ab58468ecafe2e9aea054cd8a836ce18ece7e0b407de4311af7e70e197330ff3e88091c007a82942c33c1a2b538849cb45f78bd35674cd15e97 SHA512 070dcc1073266ecbe4c4c0089f29ac8687d98bbdcbd1c1578aa737bd6fbc96adeab6bd958295d073ef95515e63f536cef67c7e7e7b492b4ee3dc81fdcc8b9464
33
34 diff --git a/sys-boot/osk-sdl/files/module-setup.sh b/sys-boot/osk-sdl/files/module-setup.sh
35 deleted file mode 100644
36 index f27d34582..000000000
37 --- a/sys-boot/osk-sdl/files/module-setup.sh
38 +++ /dev/null
39 @@ -1,29 +0,0 @@
40 -#!/bin/bash
41 -
42 -# called by dracut
43 -check() {
44 - return 0
45 -}
46 -
47 -# called by dracut
48 -depends() {
49 - echo drm crypt
50 - return 0
51 -}
52 -
53 -# called by dracut
54 -install() {
55 - inst_multiple "/etc/osk.conf" \
56 - "/usr/share/glvnd/egl_vendor.d/50_mesa.json" \
57 - "/usr/share/fonts/dejavu/DejaVuSans.ttf" \
58 - osk-sdl
59 - inst_simple $moddir/osk-sdl.sh /usr/bin/osk-sdl.sh
60 - inst_simple $moddir/osk-sdl-pp.service ${systemdsystemunitdir}/osk-sdl-pp.service
61 - inst_simple $moddir/osk-sdl-pp.path ${systemdsystemunitdir}/osk-sdl-pp.path
62 - systemctl -q --root "$initdir" add-wants sysinit.target osk-sdl-pp.path
63 - # mesa cogl libglvnd
64 - equery f mesa cogl libglvnd | grep ".so$" | while read -r so; do
65 - inst ${so}
66 - done
67 -
68 -}
69
70 diff --git a/sys-boot/osk-sdl/files/osk-sdl-pp.conf b/sys-boot/osk-sdl/files/osk-sdl-pp.conf
71 deleted file mode 100644
72 index bc5ec8bf0..000000000
73 --- a/sys-boot/osk-sdl/files/osk-sdl-pp.conf
74 +++ /dev/null
75 @@ -1,2 +0,0 @@
76 -# dracut config, need osk-sdl for encrypted root, uncomment the following line to enable it in initramfs
77 -#add_dracutmodules+=" osk-sdl "
78
79 diff --git a/sys-boot/osk-sdl/files/osk-sdl-pp.path b/sys-boot/osk-sdl/files/osk-sdl-pp.path
80 deleted file mode 100644
81 index 5a386bdaf..000000000
82 --- a/sys-boot/osk-sdl/files/osk-sdl-pp.path
83 +++ /dev/null
84 @@ -1,21 +0,0 @@
85 -# SPDX-License-Identifier: LGPL-2.1-or-later
86 -#
87 -# This file is part of systemd.
88 -#
89 -# systemd is free software; you can redistribute it and/or modify it
90 -# under the terms of the GNU Lesser General Public License as published by
91 -# the Free Software Foundation; either version 2.1 of the License, or
92 -# (at your option) any later version.
93 -
94 -[Unit]
95 -Description=Run on screen keyboard to unlock root dev path watch
96 -DefaultDependencies=no
97 -Conflicts=shutdown.target emergency.service
98 -Before=systemd-ask-password-console.service systemd-ask-password-plymouth.service systemd-fsck-root.service paths.target shutdown.target
99 -
100 -[Path]
101 -PathExists=/dev/null
102 -# touch screen
103 -#PathExists=/dev/input/by-path/platform-1c2ac00.i2c-event
104 -# video
105 -PathExists=/dev/dri/renderD128/
106
107 diff --git a/sys-boot/osk-sdl/files/osk-sdl-pp.service b/sys-boot/osk-sdl/files/osk-sdl-pp.service
108 deleted file mode 100644
109 index e5445b7cc..000000000
110 --- a/sys-boot/osk-sdl/files/osk-sdl-pp.service
111 +++ /dev/null
112 @@ -1,21 +0,0 @@
113 -# SPDX-License-Identifier: LGPL-2.1-or-later
114 -#
115 -# This file is part of systemd.
116 -#
117 -# systemd is free software; you can redistribute it and/or modify it
118 -# under the terms of the GNU Lesser General Public License as published by
119 -# the Free Software Foundation; either version 2.1 of the License, or
120 -# (at your option) any later version.
121 -
122 -[Unit]
123 -Description=Run on screen keyboard to unlock root
124 -DefaultDependencies=no
125 -Conflicts=shutdown.target
126 -After=systemd-modules-load.service systemd-udevd.service
127 -Before=systemd-ask-password-console.service systemd-ask-password-plymouth.service systemd-fsck-root.service
128 -ConditionPathExists=!/dev/mapper/root
129 -
130 -[Service]
131 -Type=oneshot
132 -ExecStart=/usr/bin/osk-sdl.sh
133 -RemainAfterExit=true
134
135 diff --git a/sys-boot/osk-sdl/files/osk-sdl.sh b/sys-boot/osk-sdl/files/osk-sdl.sh
136 deleted file mode 100644
137 index 36cba93e8..000000000
138 --- a/sys-boot/osk-sdl/files/osk-sdl.sh
139 +++ /dev/null
140 @@ -1,49 +0,0 @@
141 -#!/bin/bash
142 -# stolen from postmarket
143 -# https://gitlab.com/postmarketOS/pmaports/-/blob/master/main/postmarketos-mkinitfs/init_functions.sh
144 -find_crypt_partition() {
145 - # The partition layout is one of the following:
146 - # a) boot, root partitions on sdcard
147 - # b) boot, root partition on the "system" partition (which has its
148 - # own partition header! so we have partitions on partitions!)
149 - #
150 - # mount_subpartitions() must get executed before calling
151 - # find_root_partition(), so partitions from b) also get found.
152 -
153 - # Short circuit all autodetection logic if pmos_root= is supplied
154 - # on the kernel cmdline
155 - # shellcheck disable=SC2013
156 - for x in $(cat /proc/cmdline); do
157 - [ "$x" = "${x#cryptroot=}" ] && continue
158 - DEVICE="${x#cryptroot=}"
159 - done
160 - echo "$DEVICE"
161 -}
162 -
163 -setup_directfb_tslib() {
164 - # Set up directfb and tslib
165 - # Note: linux_input module is disabled since it will try to take over
166 - # the touchscreen device from tslib (e.g. on the N900)
167 - export SDL_VIDEO_DRIVER="kmsdrm"
168 - export SDL_RENDER_DRIVER="software"
169 - #export DFBARGS="system=fbdev,no-cursor,disable-module=linux_input"
170 - # shellcheck disable=SC2154
171 - if [ -n "$deviceinfo_dev_touchscreen" ]; then
172 - export TSLIB_TSDEVICE="$deviceinfo_dev_touchscreen"
173 - fi
174 -}
175 -
176 -start_onscreen_keyboard() {
177 - setup_directfb_tslib
178 - sleep 1 # wait for dev settle
179 - /usr/bin/osk-sdl -n root -d "$partition" -c /etc/osk.conf
180 - unset DFBARGS
181 - unset TSLIB_TSDEVICE
182 -}
183 -
184 -unlock_root_partition() {
185 - partition="$(find_crypt_partition)"
186 - start_onscreen_keyboard
187 -}
188 -
189 -unlock_root_partition
190
191 diff --git a/sys-boot/osk-sdl/metadata.xml b/sys-boot/osk-sdl/metadata.xml
192 deleted file mode 100644
193 index 144c8091c..000000000
194 --- a/sys-boot/osk-sdl/metadata.xml
195 +++ /dev/null
196 @@ -1,8 +0,0 @@
197 -<?xml version='1.0' encoding='UTF-8'?>
198 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
199 -<pkgmetadata>
200 - <maintainer type="person">
201 - <email>marco@××××××××.com</email>
202 - <name>Marco Scardovi</name>
203 - </maintainer>
204 -</pkgmetadata>
205
206 diff --git a/sys-boot/osk-sdl/osk-sdl-0.64-r1.ebuild b/sys-boot/osk-sdl/osk-sdl-0.64-r1.ebuild
207 deleted file mode 100644
208 index d7af7ff79..000000000
209 --- a/sys-boot/osk-sdl/osk-sdl-0.64-r1.ebuild
210 +++ /dev/null
211 @@ -1,69 +0,0 @@
212 -# Copyright 1999-2021 Gentoo Authors
213 -# Distributed under the terms of the GNU General Public License v2
214 -
215 -EAPI=7
216 -
217 -inherit meson
218 -
219 -COMMIT="69fb2d943a8664d5a587c967ac828f9ed5acd7ce"
220 -
221 -DESCRIPTION="Lightweight On-Screen-Keyboard based on SDL2"
222 -HOMEPAGE="https://gitlab.com/postmarketOS/osk-sdl"
223 -SRC_URI="https://gitlab.com/postmarketOS/osk-sdl/-/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
224 -
225 -LICENSE="GPL-3"
226 -SLOT="0"
227 -KEYWORDS="~amd64 ~arm64"
228 -IUSE="test"
229 -RESTRICT="!test? ( test )"
230 -
231 -RDEPEND="
232 - app-portage/gentoolkit
233 - media-libs/cogl
234 - media-fonts/dejavu
235 - media-libs/libglvnd
236 - media-libs/libsdl2[kms,haptic]
237 - media-libs/mesa
238 - media-libs/sdl2-ttf
239 - sys-fs/cryptsetup
240 - sys-kernel/dracut
241 -"
242 -
243 -BDEPEND="
244 - app-text/scdoc
245 - test? (
246 - x11-misc/xdotool
247 - x11-misc/xvfb-run
248 - )
249 -"
250 -
251 -S="${WORKDIR}/${PN}-${COMMIT}"
252 -
253 -src_prepare() {
254 - default
255 - sed -e s/ttf-dejavu/dejavu/ -i osk.conf || die "Failed to sed"
256 -}
257 -
258 -src_test() {
259 - meson_src_test
260 -}
261 -
262 -src_install() {
263 - meson_src_install
264 - insinto /etc
265 - doins osk.conf
266 - insinto /etc/dracut.conf.d/
267 - doins "${FILESDIR}"/osk-sdl-pp.conf
268 - insinto /usr/lib/dracut/modules.d/50osk-sdl
269 - doins "${FILESDIR}"/osk-sdl-pp.path
270 - doins "${FILESDIR}"/osk-sdl-pp.service
271 - exeinto /usr/lib/dracut/modules.d/50osk-sdl
272 - doexe "${FILESDIR}"/module-setup.sh
273 - doexe "${FILESDIR}"/osk-sdl.sh
274 -}
275 -
276 -pkg_postinst() {
277 - einfo "For more info on how to test osk-sdl, and how to report problems, see: ${HOMEPAGE}"
278 - einfo "To use osk-sdl to unlock encrypted root at bootime, check osk-sdl-pp.conf in /etc/dracut.conf.d"
279 - einfo "and add these boot option 'root=/dev/mapper/root cryptroot=/dev/path/to/encrypted_partition' "
280 -}
281
282 diff --git a/sys-boot/osk-sdl/osk-sdl-0.65.ebuild b/sys-boot/osk-sdl/osk-sdl-0.65.ebuild
283 deleted file mode 100644
284 index 8b3e203bf..000000000
285 --- a/sys-boot/osk-sdl/osk-sdl-0.65.ebuild
286 +++ /dev/null
287 @@ -1,65 +0,0 @@
288 -# Copyright 1999-2021 Gentoo Authors
289 -# Distributed under the terms of the GNU General Public License v2
290 -
291 -EAPI=7
292 -
293 -inherit meson
294 -
295 -DESCRIPTION="Lightweight On-Screen-Keyboard based on SDL2"
296 -HOMEPAGE="https://gitlab.com/postmarketOS/osk-sdl"
297 -SRC_URI="https://gitlab.com/postmarketOS/osk-sdl/-/archive/${PV}/${P}.tar.gz"
298 -
299 -LICENSE="GPL-3"
300 -SLOT="0"
301 -KEYWORDS="~amd64 ~arm64"
302 -IUSE="test"
303 -RESTRICT="!test? ( test )"
304 -
305 -RDEPEND="
306 - app-portage/gentoolkit
307 - media-libs/cogl
308 - media-fonts/dejavu
309 - media-libs/libglvnd
310 - media-libs/libsdl2[kms,haptic]
311 - media-libs/mesa
312 - media-libs/sdl2-ttf
313 - sys-fs/cryptsetup
314 - sys-kernel/dracut
315 -"
316 -
317 -BDEPEND="
318 - app-text/scdoc
319 - test? (
320 - x11-misc/xdotool
321 - x11-misc/xvfb-run
322 - )
323 -"
324 -
325 -src_prepare() {
326 - default
327 - sed -e s/ttf-dejavu/dejavu/ -i osk.conf || die "Failed to sed"
328 -}
329 -
330 -src_test() {
331 - meson_src_test
332 -}
333 -
334 -src_install() {
335 - meson_src_install
336 - insinto /etc
337 - doins osk.conf
338 - insinto /etc/dracut.conf.d/
339 - doins "${FILESDIR}"/osk-sdl-pp.conf
340 - insinto /usr/lib/dracut/modules.d/50osk-sdl
341 - doins "${FILESDIR}"/osk-sdl-pp.path
342 - doins "${FILESDIR}"/osk-sdl-pp.service
343 - exeinto /usr/lib/dracut/modules.d/50osk-sdl
344 - doexe "${FILESDIR}"/module-setup.sh
345 - doexe "${FILESDIR}"/osk-sdl.sh
346 -}
347 -
348 -pkg_postinst() {
349 - einfo "For more info on how to test osk-sdl, and how to report problems, see: ${HOMEPAGE}"
350 - einfo "To use osk-sdl to unlock encrypted root at bootime, check osk-sdl-pp.conf in /etc/dracut.conf.d"
351 - einfo "and add these boot option 'root=/dev/mapper/root cryptroot=/dev/path/to/encrypted_partition' "
352 -}