diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-01-16 15:00:38 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-01-16 15:01:23 +0000 |
| commit | 047e4c683e032d20c3e63c29e783b912c2942581 (patch) | |
| tree | b7179a0b7dc0bb81af9bf220a61023b2bacc79ac | |
| parent | b9fdcd0449c4592a587ff4c98b7cf98180ea6878 (diff) | |
| download | aports-047e4c683e032d20c3e63c29e783b912c2942581.tar.bz2 aports-047e4c683e032d20c3e63c29e783b912c2942581.tar.xz | |
main/mkinitfs: upgrade to 3.4.5
| -rw-r--r-- | main/mkinitfs/0001-init-quote-rootfstype-during-comparison.patch | 24 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 10 |
2 files changed, 4 insertions, 30 deletions
diff --git a/main/mkinitfs/0001-init-quote-rootfstype-during-comparison.patch b/main/mkinitfs/0001-init-quote-rootfstype-during-comparison.patch deleted file mode 100644 index 2f0239164c..0000000000 --- a/main/mkinitfs/0001-init-quote-rootfstype-during-comparison.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6e5b1852be0247803ea070a6708010a0d3c2bc3e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> -Date: Thu, 19 Dec 2019 22:39:11 +0100 -Subject: [PATCH] init: quote $rootfstype during comparison - -Without this change this may result in a warning message to be printed -during boot if the rootfstype kernel parameter is not set. ---- - initramfs-init.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/initramfs-init.in b/initramfs-init.in -index 76f284c..eaacb13 100755 ---- a/initramfs-init.in -+++ b/initramfs-init.in -@@ -503,7 +503,7 @@ if [ -n "$KOPT_root" ]; then - mkdir -p /media/root-rw/work /media/root-rw/root - mount -t overlay -o lowerdir=/media/root-ro,upperdir=/media/root-rw/root,workdir=/media/root-rw/work overlayfs $sysroot - else -- if [ $rootfstype = "zfs" ]; then -+ if [ "$rootfstype" = "zfs" ]; then - prepare_zfs_root - fi - mount ${rootfstype:+-t} ${rootfstype} \ diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index fded998892..387666617b 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs -pkgver=3.4.4 +pkgver=3.4.5 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=0 pkgdesc="Tool to generate initramfs images for Alpine" url="https://git.alpinelinux.org/cgit/mkinitfs" arch="all" @@ -15,8 +15,7 @@ depends="busybox>=1.28.2-r1 apk-tools>=2.9.1 lddtree>=1.25" subpackages="$pkgname-doc" install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade" triggers="$pkgname.trigger=/usr/share/kernel/*" -source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz - 0001-init-quote-rootfstype-during-comparison.patch" +source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz" build() { cd "$builddir" @@ -28,5 +27,4 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="0f26969cb0e6627e7594f09038ada99ea1fa161de918834b95a92d5ba41ebe2ffa93510e2797310f98c963a3140dbde53747064f43ebc31c15bb061a56173ee5 mkinitfs-3.4.4.tar.xz -2cf3c2fb190e0001c4c29495cd1f3661a75ae61cd540f77759836b0cca13c638e7c3789c1456dbc27be124cf6f7ebc688815a1ad8a2dff09f4e75eac62a67d58 0001-init-quote-rootfstype-during-comparison.patch" +sha512sums="e12f603dd9a51c0afbafeca7b4a061733514c4cf509b1dd61cc37c94e6102e5b3439d7a0379e1e4179aeaff13a382dab985c9737812e52803f038c1b2bb97cf8 mkinitfs-3.4.5.tar.xz" |