summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/mkinitfs/0001-features-fix-typo-in-gfs2-and-ocfs2-modules.patch28
-rw-r--r--main/mkinitfs/APKBUILD6
2 files changed, 33 insertions, 1 deletions
diff --git a/main/mkinitfs/0001-features-fix-typo-in-gfs2-and-ocfs2-modules.patch b/main/mkinitfs/0001-features-fix-typo-in-gfs2-and-ocfs2-modules.patch
new file mode 100644
index 000000000..762faff0b
--- /dev/null
+++ b/main/mkinitfs/0001-features-fix-typo-in-gfs2-and-ocfs2-modules.patch
@@ -0,0 +1,28 @@
+From fe33d9388ea18748bdf84195d6b070466184400d Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 31 Jul 2014 07:10:48 +0000
+Subject: [PATCH] features: fix typo in gfs2 and ocfs2 modules
+
+ref #3265
+---
+ features.d/gfs2.modules | 2 +-
+ features.d/ocfs2.modules | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/features.d/gfs2.modules b/features.d/gfs2.modules
+index 40ecf79..6943745 100644
+--- a/features.d/gfs2.modules
++++ b/features.d/gfs2.modules
+@@ -1 +1 @@
+-kerne/fs/gfs2
++kernel/fs/gfs2
+diff --git a/features.d/ocfs2.modules b/features.d/ocfs2.modules
+index 910935a..9411020 100644
+--- a/features.d/ocfs2.modules
++++ b/features.d/ocfs2.modules
+@@ -1 +1 @@
+-kerne/fs/ocfs2
++kernel/fs/ocfs2
+--
+2.0.3
+
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 05c77af2d..a92082e61 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -2,7 +2,7 @@
pkgname=mkinitfs
pkgver=2.6.0
_ver=${pkgver%_git*}
-pkgrel=4
+pkgrel=5
pkgdesc="Tool to generate initramfs images for Alpine"
url=http://git.alpinelinux.org/cgit/mkinitfs
depends="busybox apk-tools>=2.0 lddtree>=1.25"
@@ -10,6 +10,7 @@ install="$pkgname.pre-upgrade"
triggers="$pkgname.trigger=/usr/share/kernel/*"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz
0001-mkinitfs-fix-kernel-module-dependency-tracing.patch
+ 0001-features-fix-typo-in-gfs2-and-ocfs2-modules.patch
eglibc.patch
"
arch="noarch"
@@ -48,10 +49,13 @@ package() {
}
md5sums="0451285f9afb152854e6d7f40c2884b3 mkinitfs-2.6.0.tar.xz
885d58c1a10258c9b81e5da77709b424 0001-mkinitfs-fix-kernel-module-dependency-tracing.patch
+762e86d549b5d5252ab99c6505039f2e 0001-features-fix-typo-in-gfs2-and-ocfs2-modules.patch
067649665a767ff1a08578e1f4e61524 eglibc.patch"
sha256sums="03edcc91564dbe0bf3b10a05b4e034cc1ba86fc738821d8ee25171c924c6cbd6 mkinitfs-2.6.0.tar.xz
5f9e093ef33ceadb4a780e34516ffef53c0cd9ade235d0c6c23d6799718b64d8 0001-mkinitfs-fix-kernel-module-dependency-tracing.patch
+f18066aee1fa58a13e3bb5bf2a0b88bf0b5afa02fd68f91d254dbd76572cf7cd 0001-features-fix-typo-in-gfs2-and-ocfs2-modules.patch
2db513d1a058be0f5794dc74d00418807253d8ac850c9713ea0eeb0be5f3f65a eglibc.patch"
sha512sums="49751040ba0a8834ad7c957624cb9ea853e245735f4724c0816b10d89310ffbe65026f6109de3d3629616fff0311002ea6df3162557db777b2112fdd91046a99 mkinitfs-2.6.0.tar.xz
92d625c352504ddf1f22075f60b3b8cd346a40c0592731c2403c58e27f4c7601d31b6bdf7c50b400ada2e4d084410fc0f9d3b6ddbfce48471a82a1ed909177b5 0001-mkinitfs-fix-kernel-module-dependency-tracing.patch
+091fff2284cc28210c25d4b5c6d07beed0a23d8bb9dea56c5fd6582e1ab75fde9c85597cdf39eb3f9ea744ea4536eb2db263a0ff2b8f84bfa2d2b0530bf875a9 0001-features-fix-typo-in-gfs2-and-ocfs2-modules.patch
3498d9930889cd776a34863733d467b50b83679ea7f91d79963c81e4f1dc138f887ef1f2a696da6d836d1f6f862dcfd2c2fb9a55b0e3b2926e9f3fc648bc5a15 eglibc.patch"