system/*: move consolefont & keymaps services from openrc to kbd

2 files changed, 6 insertions, 75 deletions

diff --git a/system/openrc/0007-make-consolefont-service-compatible-with-busyboxs-se.patch b/system/openrc/0007-make-consolefont-service-compatible-with-busyboxs-se.patch
deleted file mode 100644
index 6c23e2ab0..000000000
--- a/system/openrc/0007-make-consolefont-service-compatible-with-busyboxs-se.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 3d0d2b89745597ea973129eafa3f999cf19d761f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Wed, 17 Aug 2016 17:52:58 +0200
-Subject: [PATCH 7/7] make consolefont service compatible with busyboxs setfont
- applet
-
-Compared to kdbs setfont program it doesn't support -O and -m.
----
- conf.d/consolefont    | 11 ++---------
- init.d/consolefont.in |  7 ++-----
- 2 files changed, 4 insertions(+), 14 deletions(-)
-
-diff --git a/conf.d/consolefont b/conf.d/consolefont
-index e01ae842..75544b2f 100644
---- a/conf.d/consolefont
-+++ b/conf.d/consolefont
-@@ -3,16 +3,9 @@
- #
- # consolefont specifies the default font that you'd like Linux to use on the
- # console.  You can find a good selection of fonts in /usr/share/consolefonts;
--# you shouldn't specify the trailing ".psf.gz", just the font name below.
--# To use the default console font, comment out the CONSOLEFONT setting below.
--consolefont="default8x16"
-+consolefont="default8x16.psf.gz"
- 
- # consoletranslation is the charset map file to use.  Leave commented to use
- # the default one.  Have a look in /usr/share/consoletrans for a selection of
- # map files you can use.
--#consoletranslation="8859-1_to_uni"
--
--# unicodemap is the unicode map file to use. Leave commented to use the
--# default one. Have a look in /usr/share/unimaps for a selection of map files
--# you can use.
--#unicodemap="iso01"
-+#consoletranslation="8859-1_to_uni.trans"
-diff --git a/init.d/consolefont.in b/init.d/consolefont.in
-index 9fe95afa..173ed426 100644
---- a/init.d/consolefont.in
-+++ b/init.d/consolefont.in
-@@ -22,7 +22,6 @@ start()
- {
- 	ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
- 	consolefont=${consolefont:-${CONSOLEFONT}}
--	unicodemap=${unicodemap:-${UNICODEMAP}}
- 	consoletranslation=${consoletranslation:-${CONSOLETRANSLATION}}
- 
- 	if [ -z "$consolefont" ]; then
-@@ -43,9 +42,6 @@ start()
- 	if [ -n "$consoletranslation" ]; then
- 		param="$param -m $consoletranslation"
- 	fi
--	if [ -n "${unicodemap}" ]; then
--		param="$param -u $unicodemap"
--	fi
- 
- 	# Set the console font
- 	ebegin "Setting console font [$consolefont]"
-@@ -63,7 +59,8 @@ start()
- 	# Store the font so we can use it ASAP on boot
- 	if [ $retval -eq 0 ] && checkpath -W "$RC_LIBEXECDIR"; then
- 		mkdir -p "$RC_LIBEXECDIR"/console
--		setfont -O "$RC_LIBEXECDIR"/console/font
-+		zcat "/usr/share/consolefonts/$consolefont" \
-+			> "$RC_LIBEXECDIR"/console/font
- 	fi
- 
- 	return $retval
--- 
-2.11.0
-
diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD
index ac9d8b184..c2cb32220 100644
--- a/system/openrc/APKBUILD
+++ b/system/openrc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: 
 pkgname=openrc
 pkgver=0.24.1
-pkgrel=9
+pkgrel=10
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="https://github.com/OpenRC/openrc"
 arch="all"
@@ -19,7 +19,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve
 	0004-hide-error-when-migrating-var-run-to-run.patch
 	0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
 	0006-mount-efivars-read-only.patch
-	0007-make-consolefont-service-compatible-with-busyboxs-se.patch
 
 	openrc-configuration.patch
 
@@ -69,8 +68,11 @@ package() {
 	rm "$pkgdir"/etc/conf.d/network
 	rm "$pkgdir"/etc/init.d/network
 
-	# we use console-setup for keymaps
-	rm "$pkgdir"/etc/init.d/keymaps
+	# we ship these in system/kbd
+	for i in consolefont keymaps; do
+		rm "$pkgdir"/etc/conf.d/$i
+		rm "$pkgdir"/etc/init.d/$i
+	done
 
 	# we use gettys-openrc for TTY
 	rm "$pkgdir"/etc/init.d/agetty
@@ -86,7 +88,6 @@ aedf77f9159fefb4bd5f30a29a33b6aedbc986c9a0f993aa928cc79fbe24aac76bd9e5974dcce52e
 d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc0d301aa91967137d144effbe5f574394af768ce4ebc48738  0004-hide-error-when-migrating-var-run-to-run.patch
 39a35c54ec9112fe84c901ed155a711cec8e194af02d5483ee60b80743dab12391e6fdc7b3da2f86844dd4edcf53e681ff95bd4d6fa1101a89ce54dce2ddbb7c  0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
 7221dd2daccd8844f6f9481b7b5921abc2711c8abd1a4bb72f04db8fd8e734b817f5d0d571daea0e2e05d3bc687f75ee1d8025249996bdee0b3328e18d9da7d3  0006-mount-efivars-read-only.patch
-234c4f3cf39df3350dbea25c00b8d584794b28194f44c726767a6a16d91a26fee1b5d2dd16635f19803fc015b4e9d99c52b23128e6b815938b88365feba8cf59  0007-make-consolefont-service-compatible-with-busyboxs-se.patch
 2dde266f3176456724e4b0c40476e7061e31986b67744b4a53c71ba0d3896860b4569e3af2ea4777a9d8fe3b6282ff869666570f1daa86cdc410c0e09805c990  openrc-configuration.patch
 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec  openrc.logrotate
 99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd  hostname.initd