Skip to content
Snippets Groups Projects
Commit b3341971 authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

update patch

parent c86bcc29
No related branches found
No related tags found
No related merge requests found
Pipeline #39254 passed
Stage: update
Hide whitespace changes
Inline Side-by-side
diff/file/fix_manpage.patch 0 → 100644
+ 12
− 0
View file @ b3341971
diff -Nuar --unified --recursive --text --color a/mkinitcpio-39.1/man/mkinitcpio.8 b/mkinitcpio-39.1/man/mkinitcpio.8
--- a/mkinitcpio-39.1/man/mkinitcpio.8 2024-05-14 16:09:00.109483198 +1100
+++ b/mkinitcpio-39.1/man/mkinitcpio.8 2024-05-14 16:14:48.713241713 +1100
@@ -152,7 +152,7 @@
comma\-separated. This option can be specified multiple times.
.RE
.sp
-\fB\-s\fP, \fB\-\-save\fP
+\fB\-S\fP, \fB\-\-save\fP
.RS 4
Saves the build directory for the initial ramdisk. Default: no; This means
the directory will not be retained if this option is not specified. Useful
diff/file/makefile_remove_generate_shutdown_ramfs.patch 0 → 100644
+ 15
− 0
View file @ b3341971
diff -Nuar --unified --recursive --text --color a/mkinitcpio-39.1/Makefile b/mkinitcpio-39.1/Makefile
--- a/mkinitcpio-39.1/Makefile 2024-05-14 16:09:00.092816623 +1100
+++ b/mkinitcpio-39.1/Makefile 2024-05-14 16:10:11.191231625 +1100
@@ -75,11 +75,6 @@
cp -at $(DESTDIR)/usr/lib/initcpio hooks install
install -m644 -t $(DESTDIR)/usr/share/mkinitcpio mkinitcpio.d/*
- install -m644 systemd/mkinitcpio-generate-shutdown-ramfs.service \
- $(DESTDIR)/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service
- for target in $(addprefix $(DESTDIR),$(SHUTDOWN_DIRS)); do \
- ln -s ../mkinitcpio-generate-shutdown-ramfs.service -t $$target || exit; \
- done
install -m644 tmpfiles/mkinitcpio.conf $(DESTDIR)/usr/lib/tmpfiles.d/mkinitcpio.conf
install -m755 kernel-install/50-mkinitcpio.install $(DESTDIR)/usr/lib/kernel/install.d/50-mkinitcpio.install
diff/file/remove_fsck_warning.patch 0 → 100644
+ 21
− 0
View file @ b3341971
diff -Nuar --unified --recursive --text --color a/mkinitcpio-39.1/init_functions b/mkinitcpio-39.1/init_functions
--- a/mkinitcpio-39.1/init_functions 2024-05-14 16:09:00.096149938 +1100
+++ b/mkinitcpio-39.1/init_functions 2024-05-14 16:12:22.287178910 +1100
@@ -350,17 +350,6 @@
elif bitfield_has_bit "$fsckret" 128; then
err "fatal error invoking fsck"
fi
-
- # ensure that root is going to be mounted rw. Otherwise, systemd
- # might fsck the device again. Annoy the user so that they fix this.
- if [ "${rwopt:-ro}" != 'rw' ]; then
- echo "********************** WARNING **********************"
- echo "* *"
- echo "* The root device is not configured to be mounted *"
- echo "* read-write! It may be fsck'd again later. *"
- echo "* *"
- echo "*****************************************************"
- fi
fi
}
diff/file/001-remove-systemd-and-kept-gzip-as-default.patch → diff/file/remove_uki_test.patch
+ 126
− 0
View file @ b3341971
diff -Nuar --unified --recursive --text --color a/mkinitcpio-39/Makefile b/mkinitcpio-39/Makefile
--- a/mkinitcpio-39/Makefile 2024-05-07 10:12:35.213010895 +1100
+++ b/mkinitcpio-39/Makefile 2024-05-07 10:20:24.149020201 +1100
@@ -75,11 +75,6 @@
cp -at $(DESTDIR)/usr/lib/initcpio hooks install
install -m644 -t $(DESTDIR)/usr/share/mkinitcpio mkinitcpio.d/*
- install -m644 systemd/mkinitcpio-generate-shutdown-ramfs.service \
- $(DESTDIR)/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service
- for target in $(addprefix $(DESTDIR),$(SHUTDOWN_DIRS)); do \
- ln -s ../mkinitcpio-generate-shutdown-ramfs.service -t $$target || exit; \
- done
install -m644 tmpfiles/mkinitcpio.conf $(DESTDIR)/usr/lib/tmpfiles.d/mkinitcpio.conf
install -m755 kernel-install/50-mkinitcpio.install $(DESTDIR)/usr/lib/kernel/install.d/50-mkinitcpio.install
diff -Nuar --unified --recursive --text --color a/mkinitcpio-39/init_functions b/mkinitcpio-39/init_functions
--- a/mkinitcpio-39/init_functions 2024-05-07 10:12:35.216345877 +1100
+++ b/mkinitcpio-39/init_functions 2024-05-07 10:19:24.839345660 +1100
@@ -350,17 +350,6 @@
elif bitfield_has_bit "$fsckret" 128; then
err "fatal error invoking fsck"
fi
-
- # ensure that root is going to be mounted rw. Otherwise, systemd
- # might fsck the device again. Annoy the user so that they fix this.
- if [ "${rwopt:-ro}" != 'rw' ]; then
- echo "********************** WARNING **********************"
- echo "* *"
- echo "* The root device is not configured to be mounted *"
- echo "* read-write! It may be fsck'd again later. *"
- echo "* *"
- echo "*****************************************************"
- fi
fi
}
diff -Nuar --unified --recursive --text --color a/mkinitcpio-39/man/mkinitcpio.8 b/mkinitcpio-39/man/mkinitcpio.8
--- a/mkinitcpio-39/man/mkinitcpio.8 2024-05-07 10:12:35.229685804 +1100
+++ b/mkinitcpio-39/man/mkinitcpio.8 2024-05-07 10:46:20.842516788 +1100
@@ -146,7 +146,7 @@
Specifies the root directory to find modules in, defaulting to \fI/\fP.
.RE
.sp
-\fB\-S\fP, \fB\-\-skiphooks\fP \fIhooks\fP
+\fB\-s\fP, \fB\-\-skiphooks\fP \fIhooks\fP
.RS 4
Skip \fIhooks\fP when generating the image. Multiple hooks should be
comma\-separated. This option can be specified multiple times.
@@ -290,7 +290,7 @@
Further command line arguments to pass to mkinitcpio as a string or array.
They will get appended at the end of the call to mkinitcpio (after all the
options mentioned above), so this can be used to overwrite options (for
-example pass a \fB\-S\fP \fIhook\fP here to skip a hook).
+example pass a \fB\-s\fP \fIhook\fP here to skip a hook).
.RE
.SH "ABOUT INSTALL HOOKS"
.sp
diff -Nuar --unified --recursive --text --color a/mkinitcpio-39/mkinitcpio b/mkinitcpio-39/mkinitcpio
--- a/mkinitcpio-39/mkinitcpio 2024-05-07 10:12:35.229685804 +1100
+++ b/mkinitcpio-39/mkinitcpio 2024-05-07 10:17:05.172650231 +1100
@@ -413,7 +413,7 @@
}
validate_compression() {
- local major minor compression_fallback='zstd'
+ local major minor compression_fallback='gzip'
if [[ -z "$_optcompress" && -v COMPRESSION_OPTIONS && ! -v COMPRESSION ]]; then
warning 'COMPRESSION_OPTIONS is set without also setting COMPRESSION. Configure COMPRESSION explicitly!'
diff -Nuar --unified --recursive --text --color a/mkinitcpio-39/mkinitcpio.conf b/mkinitcpio-39/mkinitcpio.conf
--- a/mkinitcpio-39/mkinitcpio.conf 2024-05-07 10:12:35.229685804 +1100
+++ b/mkinitcpio-39/mkinitcpio.conf 2024-05-07 10:13:51.786316910 +1100
@@ -55,11 +55,10 @@
HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block filesystems fsck)
# COMPRESSION
-# Use this to compress the initramfs image. By default, zstd compression
-# is used for Linux ≥ 5.9 and gzip compression is used for Linux < 5.9.
+# Use this to compress the initramfs image. By default, zstd compression.
# Use 'cat' to create an uncompressed image.
#COMPRESSION="zstd"
-#COMPRESSION="gzip"
+COMPRESSION="gzip"
#COMPRESSION="bzip2"
#COMPRESSION="lzma"
#COMPRESSION="xz"
diff -Nuar --unified --recursive --text --color a/mkinitcpio-39/test/cases/mkinitcpio.bats b/mkinitcpio-39/test/cases/mkinitcpio.bats
--- a/mkinitcpio-39/test/cases/mkinitcpio.bats 2024-05-07 10:12:35.233020785 +1100
+++ b/mkinitcpio-39/test/cases/mkinitcpio.bats 2024-05-07 10:43:36.329645330 +1100
@@ -28,118 +28,6 @@
diff -Nuar --unified --recursive --text --color a/mkinitcpio-39.1/test/cases/mkinitcpio.bats b/mkinitcpio-39.1/test/cases/mkinitcpio.bats
--- a/mkinitcpio-39.1/test/cases/mkinitcpio.bats 2024-05-14 16:09:00.116149829 +1100
+++ b/mkinitcpio-39.1/test/cases/mkinitcpio.bats 2024-05-14 16:18:59.927260425 +1100
@@ -28,122 +28,6 @@
cmp "$tmpdir/initramfs-1.img" "$tmpdir/initramfs-2.img"
}
......@@ -101,12 +15,13 @@ diff -Nuar --unified --recursive --text --color a/mkinitcpio-39/test/cases/mkini
- tmpdir="$(mktemp -d --tmpdir="$BATS_RUN_TMPDIR" "${BATS_TEST_NAME}.XXXXXX")"
- kver="$(uname -r)"
-
- ln -s "/lib/modules/$kver/vmlinuz" "$tmpdir/linux.in"
- tmp_knl="$(__gen_test_kernel "$kver")"
- ln -s "$tmp_knl" "$tmpdir/linux.in"
- printf '%s' "$kver" > "$tmpdir/uname.in"
- printf 'VERSION_ID=%s\n' "$kver" > "$tmpdir/osrel.in"
- grep -v '^VERSION_ID=' /etc/os-release >> "$tmpdir/osrel.in"
- printf '%s' 'root=gpt-auto rw' > "$tmpdir/cmdline.in"
- ln -s /usr/share/systemd/bootctl/splash-arch.bmp "$tmpdir/splash.in"
- ln -s "$BATS_TEST_DIRNAME/../fixtures/uki/splash.bmp" "$tmpdir/splash.in"
-
- echo 'HOOKS=(base)' > "$tmpdir/mkinitcpio.conf"
- run ./mkinitcpio \
......@@ -144,6 +59,9 @@ diff -Nuar --unified --recursive --text --color a/mkinitcpio-39/test/cases/mkini
-}
-
-@test "test creating UKI with ukify" {
- if ! command -v ukify &>/dev/null; then
- skip "ukify is not available"
- fi
- __validate_uki ukify --ukiconfig /dev/null
-}
-
......
diff/file/use_gzip_as_default.patch 0 → 100644
+ 12
− 0
View file @ b3341971
diff -Nuar --unified --recursive --text --color a/mkinitcpio-39.1/mkinitcpio b/mkinitcpio-39.1/mkinitcpio
--- a/mkinitcpio-39.1/mkinitcpio 2024-05-14 16:09:00.109483198 +1100
+++ b/mkinitcpio-39.1/mkinitcpio 2024-05-14 16:16:20.586070899 +1100
@@ -413,7 +413,7 @@
}
validate_compression() {
- local major minor compression_fallback='zstd'
+ local major minor compression_fallback='gzip'
if [[ -z "$_optcompress" && -v COMPRESSION_OPTIONS && ! -v COMPRESSION ]]; then
warning 'COMPRESSION_OPTIONS is set without also setting COMPRESSION. Configure COMPRESSION explicitly!'
diff/file/use_gzip_as_default_in_conf.patch 0 → 100644
+ 17
− 0
View file @ b3341971
diff -Nuar --unified --recursive --text --color a/mkinitcpio-39.1/mkinitcpio.conf b/mkinitcpio-39.1/mkinitcpio.conf
--- a/mkinitcpio-39.1/mkinitcpio.conf 2024-05-14 16:09:00.109483198 +1100
+++ b/mkinitcpio-39.1/mkinitcpio.conf 2024-05-14 16:17:41.494357488 +1100
@@ -55,11 +55,10 @@
HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block filesystems fsck)
# COMPRESSION
-# Use this to compress the initramfs image. By default, zstd compression
-# is used for Linux ≥ 5.9 and gzip compression is used for Linux < 5.9.
+# Use this to compress the initramfs image. By default, gzip compression
# Use 'cat' to create an uncompressed image.
#COMPRESSION="zstd"
-#COMPRESSION="gzip"
+COMPRESSION="gzip"
#COMPRESSION="bzip2"
#COMPRESSION="lzma"
#COMPRESSION="xz"
diff/patch/PKG.patch
+ 32
− 11
View file @ b3341971
......@@ -6,7 +6,7 @@ diff -uar a/PKGBUILD b/PKGBUILD
license=('GPL-2.0-only')
depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'
- 'bash' 'binutils' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'zstd' 'systemd')
+ 'bash' 'binutils' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'zstd')
+ 'bash' 'binutils' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip')
checkdepends=('bats' 'bats-assert' 'lzop')
-makedepends=('asciidoc')
-optdepends=('gzip: Use gzip compression for the initramfs image'
......@@ -15,31 +15,52 @@ diff -uar a/PKGBUILD b/PKGBUILD
'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'
@@ -22,18 +22,33 @@
@@ -22,18 +22,54 @@
'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
provides=('initramfs')
backup=('etc/mkinitcpio.conf')
-source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}
+ '001-remove-systemd-and-kept-gzip-as-default.patch'
+ '002-add-back-lvm2-hook.patch')
sha512sums=('50ae08ddf7596b821c89f927ff6692ca907a5045590096155ec6de64e0b5da647ff2c75d1603ab0035046096d37a6eacae383d458b1bb36bd525691b2b23c9ea'
+ '002-add-back-lvm2-hook.patch'
+ 'fix_manpage.patch'
+ 'makefile_remove_generate_shutdown_ramfs.patch'
+ 'remove_fsck_warning.patch'
+ 'remove_uki_test.patch'
+ 'use_gzip_as_default_in_conf.patch'
+ 'use_gzip_as_default.patch')
sha512sums=('8d6ed6eb222f34960e5cd9480e965f1fdb9b1af439d68e199cd17e92a3bbc8a34fb9d4ade1b32a3f8b844529b1c6fbeb2d2fa40e0cf9bd1dd767caa2bb148b60'
- 'SKIP')
+ 'SKIP'
+ '37a8f8c3c37eea174f8b8cb887fd9a7e4915d521f7834fe29fec725f31c66984f715bb9013c88c27079a70814ebde4bbe5ed9fbd41e949d99aa711cd52f3e5f4'
+ 'ee0018e7b5c1c7c3c3e47f831bec45ae6b43f34d52d984909f40f4835f7994745412b8be8bf83145df98e18e39df3338ad632c4a143e2bb9b1cbc13f9bb03136')
b2sums=('3a28d6711ce843aafe2868b09ba5a723e57e4fdffe905ac915aa5d224279590a10bba902933f183de33e08e96a6aad4d9e1d4752be74c011a37c4cbe83c8d645'
+ 'ee0018e7b5c1c7c3c3e47f831bec45ae6b43f34d52d984909f40f4835f7994745412b8be8bf83145df98e18e39df3338ad632c4a143e2bb9b1cbc13f9bb03136'
+ '5dfd93105bfbff433fbe1bc98daff03bf17d090a1220e1e60e36c7ec0063696ef3f5c4d236bd1e6675a52acd6b2125eb140a019e98f172776dc48a014e36bccd'
+ 'b9c03a0c8b9fbe2989f8c14f49dea4f46cdd9d60a5b461d16467e182aeb1284509505b9036520b4230e4c00cb61da2f86bca71611f10234c7e49886f166e55d1'
+ '685adc11c167e4aa3509543295417fdc102dfb0017ae31d969c2f2c9de4b3acd7edff5309d36b02b2f53b68bb9b61f8e138f5e17c3f645fafc2809c7cfed0ac2'
+ '9fcf40cde5d2a4a9ee68fa9265569c36d4568f21975ffcaae7e0bfc2d24023c0fbb76a9b882c3f0f589441dd790a25bec62cad4ec3c99e61c455d08ac881866e'
+ '32b4c118f8efd9a9bb6a9e8ed9e5677ca42e5822e81d57dddaef2ba71b0ab9bfc08be29c8764b53822333d7089ab4219e01e3c43480e04f7df50954c8f75f0fe'
+ '6cff553bd395b05b2a43beb256f4b5802fedaff5f2aa21b24097ef547a805707b8b35979a6591bebc966a96c4c1148e8c77e31b3c0adfad217682d1d31b10bdf')
b2sums=('f3ac6e73dcb3825f6708a97022a7573078d9ac11bd5f7f147dc6dabfbe406fb56157cf0efef126b0e505b22816257c329d809f1bc085724ad305928137be9248'
- 'SKIP')
+ 'SKIP'
+ 'e5e4e8bdd15aa41464af295fd022baf716c59648df091ca4a1c56113ef31a42f3730fd747a821711aaadb58db237a3d1341832224ab9d03faee318146d8e6909'
+ '18c543b78fc3e0f88ba460a8c72072587369715615da9d7f590599449eb99d5b6e2f7037c6ddbcf2f5ca645ed141379235228a59332c78a8e27634d7eeb7d1dd')
+ '18c543b78fc3e0f88ba460a8c72072587369715615da9d7f590599449eb99d5b6e2f7037c6ddbcf2f5ca645ed141379235228a59332c78a8e27634d7eeb7d1dd'
+ '4d5eefc9dd0847b7d90922876e835a460680911bd2127f636e8cadb32142cb6a16abcb954702866eb0262aa8b3431da4e9ba53d27cc75628f7e6de0c8f67ab54'
+ '980facf0329fb52694d7acd393a323a74a6b8c859231a9b6da1988a55c241a7bae59a4df6cf9afc4be9e7b72cb1585ee89c879dcc79c3ec171ec4b593e2944ea'
+ '34472cf077805bc9d8a885a15ae8d0b6b03aed6bf6b0919e1703fc4265373a2caf50e485b919218cbec1b1cb5af62576cb37c5be13b873dca3d60579845ce9a6'
+ '564b46dbaf03e87e862dcfb48d9488d2f364c574097bfdc31509008f45f7e3db6e0a70429b21674a009f1043f81b10d3d6253c2dc14473595f9405c9434ceda4'
+ '2758bc3df97648e66fe74fbdaeb23d21827db031860247fef6052f0bcda3e604ca7e1c68e98030e5ee211ad4c3d61cc7288c0954d6f2369a48d5dbe8aab0215e'
+ '1f3f7c607eae091e9f1212c9c1faf8ea41fd27a151c79f0767e607210fae7f621e2e7e1c36316aaa50cbf40b49f7d94548603443fa5e4b790289a0af4e6cc835')
validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolini
'C100346676634E80C940FB9E9C02FF419FECBE16') # Morten Linderud
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ patch -Np2 < ../001-remove-systemd-and-kept-gzip-as-default.patch
+ patch -Np1 < ../002-add-back-lvm2-hook.patch
+ patch -Np2 < ../fix_manpage.patch
+ patch -Np2 < ../makefile_remove_generate_shutdown_ramfs.patch
+ patch -Np2 < ../remove_fsck_warning.patch
+ patch -Np2 < ../remove_uki_test.patch
+ patch -Np2 < ../use_gzip_as_default_in_conf.patch
+ patch -Np2 < ../use_gzip_as_default.patch
+
+}
+
check() {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment