diff options
| -rw-r--r-- | main/alpine-conf/0001-setup-keymap-keymaps-OpenRC-service-has-been-renamed.patch | 47 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 6 |
2 files changed, 51 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-setup-keymap-keymaps-OpenRC-service-has-been-renamed.patch b/main/alpine-conf/0001-setup-keymap-keymaps-OpenRC-service-has-been-renamed.patch new file mode 100644 index 0000000000..6279666db8 --- /dev/null +++ b/main/alpine-conf/0001-setup-keymap-keymaps-OpenRC-service-has-been-renamed.patch @@ -0,0 +1,47 @@ +From b1febd985fe1b5cd183b19ee5e491fceda0e0a9a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> +Date: Wed, 28 Feb 2018 17:04:27 +0100 +Subject: [PATCH] setup-keymap: keymaps OpenRC service has been renamed to + loadkmap + +--- + setup-keymap.in | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/setup-keymap.in b/setup-keymap.in +index ebcd29c..21ba2ac 100644 +--- a/setup-keymap.in ++++ b/setup-keymap.in +@@ -5,8 +5,8 @@ PREFIX= + + MAPDIR="$ROOT/usr/share/bkeymaps" + +-if [ -f "$ROOT/etc/conf.d/keymaps" ]; then +- . "$ROOT/etc/conf.d/keymaps" ++if [ -f "$ROOT/etc/conf.d/loadkmap" ]; then ++ . "$ROOT/etc/conf.d/loadkmap" + variant=$(basename "KEYMAP") + variant="${variant%%.*}" + fi +@@ -52,15 +52,15 @@ select_layout() { + + setup_mapfile() { + local name=$(basename "$1") +- local conf="$ROOT/etc/conf.d/keymaps" ++ local conf="$ROOT/etc/conf.d/loadkmap" + mkdir -p "$ROOT/etc/keymap" + mkdir -p "$ROOT/etc/conf.d/" + if cp "$1" "$ROOT/etc/keymap/$name" ; then + [ -f "$conf" ] && sed -i '/^KEYMAP=/d' "$conf" + echo "KEYMAP=/etc/keymap/$name" >> "$conf" + # we actually load the keymap now +- rc-service keymaps restart +- rc-update -q add keymaps boot ++ rc-service loadkmap restart ++ rc-update -q add loadkmap boot + goodbye 0 + fi + } +-- +2.16.2 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 2ecbd3ba4b..2c34b9e870 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.7.0 -pkgrel=2 +pkgrel=3 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" license="MIT" -depends="openrc>0.13 busybox>=1.26.1-r3" +depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3" source="http://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz 0001-update-kernel-handle-vanilla-suffix-in-System.map-co.patch + 0001-setup-keymap-keymaps-OpenRC-service-has-been-renamed.patch s390x-bootloader.patch " @@ -28,4 +29,5 @@ package() { sha512sums="13fed0532aa84c39d54d2c905f31276c4b8f2d596c33bebd796f36e2e796f2d66c172440c20d19e8753f531204cacecc79ca24cd3ec1b24e3e51de251297207b alpine-conf-3.7.0.tar.xz fdeb9f0c67a81b545e372199558fc81222f0c6599d42f0731f7fe0398bc0b9deb631c8e98f7147fb63b570ac0e97497d416332ddbfefbb833073df9c1baffee0 0001-update-kernel-handle-vanilla-suffix-in-System.map-co.patch +7042eb135af468cf39644fae1d96fe2e7ae1f02a15e25156fbf74aef9b83c382c7a925ed9e02d738199b923164ed1847e4bd876e9ee96818dcb4c2f6ba2b5404 0001-setup-keymap-keymaps-OpenRC-service-has-been-renamed.patch bb152798caf602d99a22edc127dd1bc61bbfb012f62978f65f7126c0f704ebfa53500c93ff2f0d654e88979ab2f7f2e1f6b58b9d2235689c3f993292db8da7bc s390x-bootloader.patch" |