mkinitcpio: update to 39.1.
remove unnecessary patches
This commit is contained in:
parent
79c61c79dc
commit
fd24d63ed9
3 changed files with 8 additions and 58 deletions
|
@ -1,25 +0,0 @@
|
|||
From 6a100b4a4a709f177f383988079a2a3c3ada08b8 Mon Sep 17 00:00:00 2001
|
||||
From: Andrea Brancaleoni <miwaxe@gmail.com>
|
||||
Date: Thu, 25 Jun 2015 01:59:58 +0200
|
||||
Subject: [PATCH] default to runit-init
|
||||
|
||||
---
|
||||
init | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/init b/init
|
||||
index 4891ed8..7534d23 100644
|
||||
--- a/init
|
||||
+++ b/init
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
udevd_running=0
|
||||
mount_handler=default_mount_handler
|
||||
-init=/sbin/init
|
||||
+init=/usr/bin/runit-init
|
||||
rd_logmask=0
|
||||
|
||||
. /init_functions
|
||||
--
|
||||
2.4.4
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
Tests expecting unwritable directories fail in CI containers, regardless of
|
||||
directory modes.
|
||||
|
||||
--- a/test/cases/functions.bats
|
||||
+++ b/test/cases/functions.bats
|
||||
@@ -162,21 +162,11 @@
|
||||
}
|
||||
|
||||
@test "initialize_buildroot unwriteable parent directory" {
|
||||
- local parentdir="${BATS_RUN_TMPDIR}/${BATS_TEST_NAME}/"
|
||||
-
|
||||
- install -dm555 "$parentdir"
|
||||
- TMPDIR="$parentdir" run initialize_buildroot 'none'
|
||||
- assert_failure
|
||||
- assert_output "==> ERROR: Failed to create temporary working directory in $parentdir"
|
||||
+ true
|
||||
}
|
||||
|
||||
@test "initialize_buildroot unwriteable working directory" {
|
||||
- local generatedir="${BATS_RUN_TMPDIR}/${BATS_TEST_NAME}/workdir"
|
||||
-
|
||||
- install -dm555 "$generatedir"
|
||||
- run initialize_buildroot 'none' "$generatedir"
|
||||
- assert_failure
|
||||
- assert_output "==> ERROR: Unable to write to build root: $generatedir"
|
||||
+ true
|
||||
}
|
||||
|
||||
@test "add_file parent directory is a symlink" {
|
|
@ -1,18 +1,18 @@
|
|||
# Template file for 'mkinitcpio'
|
||||
pkgname=mkinitcpio
|
||||
version=39
|
||||
version=39.1
|
||||
revision=1
|
||||
build_style=gnu-makefile
|
||||
hostmakedepends="asciidoc"
|
||||
depends="busybox-static bsdtar bash zstd"
|
||||
checkdepends="busybox-static bats-assert lz4 xz zstd lzop parallel"
|
||||
checkdepends="busybox-static bats-assert lz4 xz zstd lzop parallel ukify"
|
||||
short_desc="Next generation of initramfs creation"
|
||||
maintainer="classabbyamp <void@placeviolette.net>"
|
||||
license="GPL-2.0-only"
|
||||
homepage="https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio"
|
||||
changelog="https://gitlab.archlinux.org/archlinux/mkinitcpio/mkinitcpio/-/raw/master/CHANGELOG"
|
||||
distfiles="https://sources.archlinux.org/other/${pkgname}/${pkgname}-${version}.tar.xz"
|
||||
checksum=d91cfe9f04f2fd71839ce2c73ed53083573ab7e80dde9dff52ca9fd68a14d5cd
|
||||
distfiles="https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-${version}.tar.xz"
|
||||
checksum=2cad61b96702d6076d9509cad56548e0cab6de8cdf91e5c9c293910c20340720
|
||||
conf_files="/etc/mkinitcpio.conf"
|
||||
alternatives="
|
||||
initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/mkinitcpio/kernel-hook-postinst
|
||||
|
@ -21,6 +21,10 @@ alternatives="
|
|||
replaces="mkinitcpio-udev>=0"
|
||||
make_dirs="/etc/mkinitcpio.conf.d 0755 root root"
|
||||
|
||||
pre_check() {
|
||||
export BATS_ARGS="--filter-tags '!no_root'"
|
||||
}
|
||||
|
||||
post_install() {
|
||||
# Install udev rule used by both lvm2 and encrypt hook
|
||||
vinstall ${FILESDIR}/11-dm-initramfs.rules 644 usr/lib/initcpio/udev
|
||||
|
|
Loading…
Add table
Reference in a new issue