diff options
Diffstat (limited to 'main')
4 files changed, 3 insertions, 123 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 deleted file mode 100644 index 6279666db8..0000000000 --- a/main/alpine-conf/0001-setup-keymap-keymaps-OpenRC-service-has-been-renamed.patch +++ /dev/null @@ -1,47 +0,0 @@ -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/0001-update-kernel-handle-vanilla-suffix-in-System.map-co.patch b/main/alpine-conf/0001-update-kernel-handle-vanilla-suffix-in-System.map-co.patch deleted file mode 100644 index e52a1116ee..0000000000 --- a/main/alpine-conf/0001-update-kernel-handle-vanilla-suffix-in-System.map-co.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ac90985a323a376b8567710105fdb01e6102e6be Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Fri, 19 Jan 2018 01:33:11 +0000 -Subject: [PATCH] update-kernel: handle -vanilla suffix in System.map, config - and vmlinuz - -Previously the vanilla kernel did not add any suffix to System.map, -config and vmlinuz for the vanilla kernel, but it does now. Fix -update-kernel to handle both cases. - -Note also that /lib/modules/$ver still does not have any -vanilla -suffix. ---- - update-kernel.in | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/update-kernel.in b/update-kernel.in -index 88f266b..930b3eb 100644 ---- a/update-kernel.in -+++ b/update-kernel.in -@@ -254,7 +254,11 @@ mkinitfs $MKINITFS_ARGS -q -b $ROOT -F "$features base squashfs" \ - -o "$STAGING/initramfs-$FLAVOR" "$KVER" - - for file in System.map config vmlinuz; do -- cp "$BOOT/$file$KVER_FLAVOR" $STAGING -+ if [ -f "$BOOT/$file-$FLAVOR" ]; then -+ cp "$BOOT/$file-$FLAVOR" $STAGING -+ else -+ cp "$BOOT/$file" $STAGING -+ fi - done - - if [ "$MNTDIR" ]; then --- -2.15.0 - diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 2c34b9e870..bd88354d58 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,16 +1,13 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf -pkgver=3.7.0 -pkgrel=3 +pkgver=3.8.0_rc1 +pkgrel=0 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" license="MIT" 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 " builddir="$srcdir"/$pkgname-$pkgver @@ -27,7 +24,4 @@ package() { done } -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" +sha512sums="dc3c1ff25c63735bc1264eb6d4e9075367971b54c4b2ff24c252ab9b6724fb1a119403af743ac72ba266ea675aa1a355e18ab76998156f85d46252456f2004be alpine-conf-3.8.0_rc1.tar.xz" diff --git a/main/alpine-conf/s390x-bootloader.patch b/main/alpine-conf/s390x-bootloader.patch deleted file mode 100644 index 30fc6d8179..0000000000 --- a/main/alpine-conf/s390x-bootloader.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/setup-disk.in b/setup-disk.in -old mode 100644 -new mode 100755 -index efb7f41..c84c2eb ---- a/setup-disk.in -+++ b/setup-disk.in -@@ -459,6 +459,7 @@ install_mounted_root() { - case "$BOOTLOADER" in - grub) setup_grub "$mnt" "$root" "$modules" "$kernel_opts" "$bootdev" $disks ;; - syslinux) setup_syslinux "$mnt" "$root" "$modules" "$kernel_opts" "$bootdev" ;; -+ zipl) break;; - *) die "Bootloader \"$BOOTLOADER\" not supported!" ;; - esac - -@@ -585,6 +586,8 @@ select_bootloader() { - local bootloader=syslinux - if [ "$ARCH" = "ppc64le" ]; then - bootloader=grub-ieee1275 -+ elif [ "$ARCH" = "s390x" ]; then -+ bootloader=s390-tools - elif [ -n "$USE_EFI" ]; then - bootloader=grub-efi - elif [ "$BOOTLOADER" = "grub" ]; then -@@ -1266,6 +1269,7 @@ if is_efi || [ -n "$USE_EFI" ]; then - fi - - [ "$ARCH" = "ppc64le" ] && BOOTLOADER=grub -+[ "$ARCH" = "s390x" ] && BOOTLOADER=zipl - - dmesg -n1 - |