* temporarily disable keymap hook by default (archpower#60)

This commit is contained in:
Alexander Baldeck 2023-08-02 09:23:16 +02:00
parent 89c0688c72
commit d7304b2efc
2 changed files with 20 additions and 8 deletions

View File

@ -5,7 +5,7 @@
pkgname=mkinitcpio
pkgver=36
pkgrel=1
pkgrel=1.1
pkgdesc="Modular initramfs image creation utility"
arch=(any)
url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio'
@ -27,10 +27,10 @@ source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,
install=mkinitcpio.install
sha512sums=('f13cfdfee62dc1a344b75413fde8f35eb594c4c372d4a2ed8bbc22f2c01d93ea59d423807d06d19a6d1789e47b35286845daffeffef0fec4bae022e0e92b7b64'
'SKIP'
'134afb4fc56f752fcf7b067617fcacf3579950540e3ffe1af28ed4b78e61c24bdba4dee8ff97e392bc7eeeca8e460c555e36e7fcf18d7007373e49ca73268127')
'36b8477bee33d23a0e796e637ffc6f64d320c78a36d0774ca8209eb86e0a3c5560e818f9e012baae6013941ffa57effa4366bdcbcb7f18081aa9c7e76f17f92f')
b2sums=('b60d8e61a15167df3316a7336467740efd4888784228dd6a08b1d974c54c479c082ba142eb60d3f356b06053e5c472f747e0ca830d50bed9f31c13d52b549ca1'
'SKIP'
'd16c93bb7aaf3848fb26f0b7bfe4f3d5e0b89ad6b407a2bf638f22ec20ec9bb91ea83c3675a7b7730c5e498c1faf4497f987f41110f59650f0ed1852a7bbc2cd')
'217e8bef636bc060a1e87893192c9ef3063de40f1d48e19fb38f25892f5f518b4e1d295fe79de46ac98f844bac3aaf7b1e05e19fb9746d95be8338e3481caa82')
validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini
'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud

View File

@ -1,6 +1,6 @@
diff -ruN mkinitcpio-36.orig/functions mkinitcpio-36/functions
--- mkinitcpio-36.orig/functions 2023-07-24 10:58:23.782395559 +0200
+++ mkinitcpio-36/functions 2023-07-24 10:58:45.240228952 +0200
--- mkinitcpio-36.orig/functions 2023-08-02 09:20:47.645390041 +0200
+++ mkinitcpio-36/functions 2023-08-02 09:20:52.416909417 +0200
@@ -154,6 +154,14 @@
printf '%s' "$kver"
}
@ -49,7 +49,7 @@ diff -ruN mkinitcpio-36.orig/functions mkinitcpio-36/functions
;;
diff -ruN mkinitcpio-36.orig/functions.orig mkinitcpio-36/functions.orig
--- mkinitcpio-36.orig/functions.orig 1970-01-01 01:00:00.000000000 +0100
+++ mkinitcpio-36/functions.orig 2023-05-29 23:56:00.000000000 +0200
+++ mkinitcpio-36/functions.orig 2023-08-02 09:20:52.416909417 +0200
@@ -0,0 +1,1095 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: GPL-2.0-only
@ -1147,8 +1147,8 @@ diff -ruN mkinitcpio-36.orig/functions.orig mkinitcpio-36/functions.orig
+
+# vim: set ft=sh ts=4 sw=4 et:
diff -ruN mkinitcpio-36.orig/mkinitcpio mkinitcpio-36/mkinitcpio
--- mkinitcpio-36.orig/mkinitcpio 2023-07-24 10:58:23.786395155 +0200
+++ mkinitcpio-36/mkinitcpio 2023-07-24 10:58:45.240228952 +0200
--- mkinitcpio-36.orig/mkinitcpio 2023-08-02 09:20:47.645390041 +0200
+++ mkinitcpio-36/mkinitcpio 2023-08-02 09:20:52.420909014 +0200
@@ -133,7 +133,7 @@
error "invalid kernel specified: '%s'" "$1"
@ -1158,3 +1158,15 @@ diff -ruN mkinitcpio-36.orig/mkinitcpio mkinitcpio-36/mkinitcpio
error "kernel version extraction from image not supported for '%s' architecture" "$arch"
error "there's a chance the generic version extractor may work with a valid uncompressed kernel image"
fi
diff -ruN mkinitcpio-36.orig/mkinitcpio.conf mkinitcpio-36/mkinitcpio.conf
--- mkinitcpio-36.orig/mkinitcpio.conf 2023-08-02 09:20:47.645390041 +0200
+++ mkinitcpio-36/mkinitcpio.conf 2023-08-02 09:21:02.839859549 +0200
@@ -49,7 +49,7 @@
#
## NOTE: If you have /usr on a separate partition, you MUST include the
# usr and fsck hooks.
-HOOKS=(base udev autodetect modconf kms keyboard keymap consolefont block filesystems fsck)
+HOOKS=(base udev autodetect modconf kms keyboard consolefont block filesystems fsck)
# COMPRESSION
# Use this to compress the initramfs image. By default, zstd compression