mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
core/mkinitcpio to 37.1-2
This commit is contained in:
Kevin Mihelich
parent
df5979df85
commit
01477a880a
3 changed files with 113 additions and 6 deletions
|
|
@ -1,13 +1,13 @@
|
|||
pkgbase = mkinitcpio
|
||||
pkgdesc = Modular initramfs image creation utility
|
||||
pkgver = 37.1
|
||||
pkgrel = 1
|
||||
pkgrel = 2
|
||||
url = https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio
|
||||
install = mkinitcpio.install
|
||||
arch = any
|
||||
license = GPL
|
||||
checkdepends = bash-bats
|
||||
checkdepends = bash-bats-assert
|
||||
checkdepends = bats
|
||||
checkdepends = bats-assert
|
||||
checkdepends = lzop
|
||||
depends = awk
|
||||
depends = mkinitcpio-busybox>=1.19.4-2
|
||||
|
|
@ -33,11 +33,14 @@ pkgbase = mkinitcpio
|
|||
backup = etc/mkinitcpio.conf
|
||||
source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-37.1.tar.gz
|
||||
source = https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-37.1.tar.gz.sig
|
||||
source = test-use-system-library-loading-mechanism.patch
|
||||
validpgpkeys = ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB
|
||||
validpgpkeys = C100346676634E80C940FB9E9C02FF419FECBE16
|
||||
sha512sums = 68fd36eb95317977dfb389be8bd1f6f09d455ca81b55cde8f64245fc59ceee74afa64b55dbb7e8b2e28abe8274397dbba2f4b021499f9ad6d662175ced678585
|
||||
sha512sums = SKIP
|
||||
sha512sums = c9a0dc49e7a22808f0556c79da3320edb93377d775c91343b2a1380aebde4e255b5e675e53a00192c73e4ea9a98a91b05b56c9d56d9e7537847274710115a6ae
|
||||
b2sums = 0b43d0d035fdba6195ca0e8facd654cbcff9c99d34d14b1f493c86cbea335c8f363e6117df7f0307e55b3e684fe7977d89ac226b79ed612270791e084b46aa4f
|
||||
b2sums = SKIP
|
||||
b2sums = 11b8297ce18d47a0029490b950180801e5762ad7b7e36383d2f954cbc7aee10d3b901dd2703fd07b23b38aa6b74577b7d88a1d9eb5ff5633a665610c6fbec51b
|
||||
|
||||
pkgname = mkinitcpio
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
pkgname=mkinitcpio
|
||||
pkgver=37.1
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Modular initramfs image creation utility"
|
||||
arch=('any')
|
||||
url='https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio'
|
||||
|
|
@ -18,7 +18,7 @@ license=('GPL')
|
|||
depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'
|
||||
'bash' 'binutils' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip' 'systemd')
|
||||
makedepends=('asciidoc')
|
||||
checkdepends=('bash-bats' 'bash-bats-assert' 'lzop')
|
||||
checkdepends=('bats' 'bats-assert' 'lzop')
|
||||
optdepends=('xz: Use lzma or xz compression for the initramfs image'
|
||||
'bzip2: Use bzip2 compression for the initramfs image'
|
||||
'lzop: Use lzo compression for the initramfs image'
|
||||
|
|
@ -27,17 +27,20 @@ optdepends=('xz: Use lzma or xz compression for the initramfs image'
|
|||
provides=('initramfs')
|
||||
backup=('etc/mkinitcpio.conf')
|
||||
source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
|
||||
test-use-system-library-loading-mechanism.patch
|
||||
'0001-use-gzip-for-compression-by-default.patch'
|
||||
'0002-functions-handle-gzip-compressed-kernels-in-kver_gen.patch'
|
||||
'0003-check-for-ALARM-kernels-in-run_post_hooks.patch')
|
||||
install=mkinitcpio.install
|
||||
sha512sums=('68fd36eb95317977dfb389be8bd1f6f09d455ca81b55cde8f64245fc59ceee74afa64b55dbb7e8b2e28abe8274397dbba2f4b021499f9ad6d662175ced678585'
|
||||
'SKIP'
|
||||
'c9a0dc49e7a22808f0556c79da3320edb93377d775c91343b2a1380aebde4e255b5e675e53a00192c73e4ea9a98a91b05b56c9d56d9e7537847274710115a6ae'
|
||||
'24f8431b23ee039fc1aee7b10482d310a8fe37a36975e83aa31d3d0d35d12973c1397057876425fe712be25e999b10753ae05613f3900eccfe5af47e86eda202'
|
||||
'e7c14829c0b5c1330819bfef00923f92a1eb59f6d9cf41b8ac421dc970497b9c75e093b37a41f63aa75f9c11ba3ac72c5385d3a00c6a7686cfda82a1a9ad1883'
|
||||
'd16c37550da527ef1ca1451c9c81c52197f10a30dfa91aa434a55562f06d4ac97c90f1cb3008b1ba612d6ccf3a46683e001a6e2ba04088d2169274e561183f24')
|
||||
b2sums=('0b43d0d035fdba6195ca0e8facd654cbcff9c99d34d14b1f493c86cbea335c8f363e6117df7f0307e55b3e684fe7977d89ac226b79ed612270791e084b46aa4f'
|
||||
'SKIP'
|
||||
'11b8297ce18d47a0029490b950180801e5762ad7b7e36383d2f954cbc7aee10d3b901dd2703fd07b23b38aa6b74577b7d88a1d9eb5ff5633a665610c6fbec51b'
|
||||
'f62db2646bb8828de66e73ea479b2276bba970c5338451e2df4122012d42f453e6fc6892702a58cf36b94f759a8ed7d2f65782067922578d81ae1aaa8cc78806'
|
||||
'e0dc41210fb7b811624758022b4254c396d243460e63c86358fe46dc18510a39e021ff9c53944dffb8ec5fbd37681c47f4f83714b63751b7a57d7d9710f47cca'
|
||||
'107ef9ee2623a3634a31d62b49efc316615e4c34c847f27a55886c93b2bdb87020bcd7f513ab922de730fe4a6d3bffd26a82180467c14c0993c603bc8801b5df')
|
||||
|
|
@ -45,7 +48,8 @@ validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolin
|
|||
'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
cd "$pkgname-$pkgver"
|
||||
patch -Np1 < ../test-use-system-library-loading-mechanism.patch
|
||||
patch -p1 -i ../0001-use-gzip-for-compression-by-default.patch
|
||||
patch -p1 -i ../0002-functions-handle-gzip-compressed-kernels-in-kver_gen.patch
|
||||
patch -p1 -i ../0003-check-for-ALARM-kernels-in-run_post_hooks.patch
|
||||
|
|
|
|||
100
core/mkinitcpio/test-use-system-library-loading-mechanism.patch
Normal file
100
core/mkinitcpio/test-use-system-library-loading-mechanism.patch
Normal file
|
|
@ -0,0 +1,100 @@
|
|||
From eba62eadec261da0e8f1fb9e95849057679daf07 Mon Sep 17 00:00:00 2001
|
||||
From: Levente Polyak <anthraxx@archlinux.org>
|
||||
Date: Sat, 16 Dec 2023 13:51:25 +0100
|
||||
Subject: [PATCH] test: use system library loading mechanism instead of
|
||||
absolute paths
|
||||
|
||||
This resolves system libraries automatically from the canonical paths,
|
||||
or falls back to `BATS_LIB_PATH`.
|
||||
|
||||
Previously this was not possible as bats plugins were not packaged at
|
||||
the appropriate path in /usr/lib/bats/* which resulted in the plugin
|
||||
auto loading not being able to resolve the libraries. This has been
|
||||
fixed now, so lets use the recommended way to load libraries.
|
||||
|
||||
https://bats-core.readthedocs.io/en/stable/writing-tests.html#bats-load-library-load-system-wide-libraries
|
||||
|
||||
Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
|
||||
---
|
||||
test/cases/bash-completion.bats | 4 ++--
|
||||
test/cases/extglob.bats | 2 +-
|
||||
test/cases/functions.bats | 4 ++--
|
||||
test/cases/parse_cmdline.bats | 4 ++--
|
||||
test/cases/zsh-completion.bats | 4 ++--
|
||||
5 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/test/cases/bash-completion.bats b/test/cases/bash-completion.bats
|
||||
index 4d358ad..a47a495 100644
|
||||
--- a/test/cases/bash-completion.bats
|
||||
+++ b/test/cases/bash-completion.bats
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
shopt -s extglob
|
||||
|
||||
-load '/usr/lib/bats-assert/load'
|
||||
-load '/usr/lib/bats-support/load'
|
||||
+bats_load_library 'bats-assert'
|
||||
+bats_load_library 'bats-support'
|
||||
load "../helpers/common"
|
||||
|
||||
setup() {
|
||||
diff --git a/test/cases/extglob.bats b/test/cases/extglob.bats
|
||||
index 4eeda72..6da116c 100644
|
||||
--- a/test/cases/extglob.bats
|
||||
+++ b/test/cases/extglob.bats
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bats
|
||||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
-load '/usr/lib/bats-support/load'
|
||||
+bats_load_library 'bats-support'
|
||||
|
||||
@test "check for syntax errors" {
|
||||
local bash_scripts=(mkinitcpio lsinitcpio)
|
||||
diff --git a/test/cases/functions.bats b/test/cases/functions.bats
|
||||
index c1f4e8b..f3d356c 100644
|
||||
--- a/test/cases/functions.bats
|
||||
+++ b/test/cases/functions.bats
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
shopt -s extglob
|
||||
|
||||
-load '/usr/lib/bats-assert/load'
|
||||
-load '/usr/lib/bats-support/load'
|
||||
+bats_load_library 'bats-assert'
|
||||
+bats_load_library 'bats-support'
|
||||
load "../helpers/common"
|
||||
|
||||
setup() {
|
||||
diff --git a/test/cases/parse_cmdline.bats b/test/cases/parse_cmdline.bats
|
||||
index a265d9f..dd603fc 100644
|
||||
--- a/test/cases/parse_cmdline.bats
|
||||
+++ b/test/cases/parse_cmdline.bats
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
shopt -s extglob
|
||||
|
||||
-load '/usr/lib/bats-assert/load'
|
||||
-load '/usr/lib/bats-support/load'
|
||||
+bats_load_library 'bats-assert'
|
||||
+bats_load_library 'bats-support'
|
||||
load "../helpers/common"
|
||||
|
||||
setup() {
|
||||
diff --git a/test/cases/zsh-completion.bats b/test/cases/zsh-completion.bats
|
||||
index 3e6526e..500a756 100644
|
||||
--- a/test/cases/zsh-completion.bats
|
||||
+++ b/test/cases/zsh-completion.bats
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
shopt -s extglob
|
||||
|
||||
-load '/usr/lib/bats-assert/load'
|
||||
-load '/usr/lib/bats-support/load'
|
||||
+bats_load_library 'bats-assert'
|
||||
+bats_load_library 'bats-support'
|
||||
load "../helpers/common"
|
||||
|
||||
setup() {
|
||||
--
|
||||
2.43.0
|
||||
|
||||
Loading…
Reference in a new issue