aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-12-21 23:05:43 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-12-21 23:05:43 +0000
commitb280f01a1d52b46c724d021872b2ef06b3d84167 (patch)
tree594822eabcddd5f69b08f3909c3026faadf4ebc2
parentf305cd518b92d6b4ecd660a9f2ca54ddf3a45b4b (diff)
downloadaports-b280f01a1d52b46c724d021872b2ef06b3d84167.tar.bz2
aports-b280f01a1d52b46c724d021872b2ef06b3d84167.tar.xz
main/mkinitfs: fix ext3 support
the ext3 is provided by ext4 module nowdays. fixes #6167
-rw-r--r--main/mkinitfs/0001-ext3-functionality-is-provided-by-ext4-module.patch20
-rw-r--r--main/mkinitfs/APKBUILD12
2 files changed, 28 insertions, 4 deletions
diff --git a/main/mkinitfs/0001-ext3-functionality-is-provided-by-ext4-module.patch b/main/mkinitfs/0001-ext3-functionality-is-provided-by-ext4-module.patch
new file mode 100644
index 0000000000..734c635fab
--- /dev/null
+++ b/main/mkinitfs/0001-ext3-functionality-is-provided-by-ext4-module.patch
@@ -0,0 +1,20 @@
+From 92801060dccf632c827867eb361396646e04ae99 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 21 Dec 2016 23:03:01 +0000
+Subject: [PATCH] ext3 functionality is provided by ext4 module
+
+ref #6167
+---
+ features.d/ext3.modules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/features.d/ext3.modules b/features.d/ext3.modules
+index eeadf78..a5bb1c3 100644
+--- a/features.d/ext3.modules
++++ b/features.d/ext3.modules
+@@ -1 +1 @@
+-kernel/fs/ext3
++kernel/fs/ext4
+--
+2.11.0
+
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 4aaeff549b..4291a614d2 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -2,7 +2,7 @@
pkgname=mkinitfs
pkgver=3.0.7
_ver=${pkgver%_git*}
-pkgrel=0
+pkgrel=1
pkgdesc="Tool to generate initramfs images for Alpine"
url="http://git.alpinelinux.org/cgit/mkinitfs"
makedepends_build=""
@@ -12,6 +12,7 @@ depends="busybox apk-tools>=2.0 lddtree>=1.25"
install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade"
triggers="$pkgname.trigger=/usr/share/kernel/*"
source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz
+ 0001-ext3-functionality-is-provided-by-ext4-module.patch
"
arch="all"
license="GPL2"
@@ -27,6 +28,9 @@ package() {
make install DESTDIR="$pkgdir" || return 1
}
-md5sums="f0ce066554bff1e1a3056c51f2fe4610 mkinitfs-3.0.7.tar.xz"
-sha256sums="eb80666fa1f2bb4907f13f7f4c09ee8e1b0b1211aba240c9d2a5cc2a1756f1ba mkinitfs-3.0.7.tar.xz"
-sha512sums="a4080f4709500484904aee34f93007a813c6f2470c8ba9a0493245122291e4c7460580f9ca2f3712662d8f8caea306872d0c79fa94f654300c4798a0332c19b2 mkinitfs-3.0.7.tar.xz"
+md5sums="f0ce066554bff1e1a3056c51f2fe4610 mkinitfs-3.0.7.tar.xz
+79e61fce422c035296fdf00780f15fb3 0001-ext3-functionality-is-provided-by-ext4-module.patch"
+sha256sums="eb80666fa1f2bb4907f13f7f4c09ee8e1b0b1211aba240c9d2a5cc2a1756f1ba mkinitfs-3.0.7.tar.xz
+60ba082ac2a542e55de9e5a335f058fe83789ccb25bf8958772e229b93442a78 0001-ext3-functionality-is-provided-by-ext4-module.patch"
+sha512sums="a4080f4709500484904aee34f93007a813c6f2470c8ba9a0493245122291e4c7460580f9ca2f3712662d8f8caea306872d0c79fa94f654300c4798a0332c19b2 mkinitfs-3.0.7.tar.xz
+815e961b6508c8b6843b8074fa752b6ff7404c1ad0bb2e9ff03211d9c7d7546c7f274fb323934ae455216feb291b05e49f1c5878bc85480757d5b501577151c6 0001-ext3-functionality-is-provided-by-ext4-module.patch"