aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-04-20 14:59:31 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-04-20 15:03:00 +0000
commitc42a611b8c3372a5cc71651c10c2977b83e6cee5 (patch)
tree80b63fe311dcf735f4be1ee0301d812d9d12b4eb
parent18d77b6614c1c493c2c4a0c8fb9d26460f18483e (diff)
downloadaports-c42a611b8c3372a5cc71651c10c2977b83e6cee5.tar.gz
aports-c42a611b8c3372a5cc71651c10c2977b83e6cee5.tar.bz2
aports-c42a611b8c3372a5cc71651c10c2977b83e6cee5.tar.xz
main/mkinitfs: upgrade to 2.3.4
-rw-r--r--main/mkinitfs/0001-init-use-new-location-for-world.patch25
-rw-r--r--main/mkinitfs/APKBUILD8
2 files changed, 3 insertions, 30 deletions
diff --git a/main/mkinitfs/0001-init-use-new-location-for-world.patch b/main/mkinitfs/0001-init-use-new-location-for-world.patch
deleted file mode 100644
index 6aaca293d7..0000000000
--- a/main/mkinitfs/0001-init-use-new-location-for-world.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d50371d52ddad76f6393ceadd74ed5f4433b9666 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 7 Apr 2011 19:46:29 +0000
-Subject: [PATCH] init: use new location for world
-
----
- initramfs-init.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/initramfs-init.in b/initramfs-init.in
-index 1040288..abc888f 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -391,7 +391,7 @@ if [ -f "$ovl" ]; then
- umount /media/$i 2>/dev/null &
- pkgs="$pkgs $(sed 's/\#.*//' $sysroot/etc/lbu/packages.list 2>/dev/null)"
- rm -f "$sysroot"/etc/lbu/packages.list
-- pkgs="$pkgs $(cat $sysroot/var/lib/apk/world 2>/dev/null)"
-+ pkgs="$pkgs $(cat $sysroot/var/lib/apk/world $sysroot/etc/apk/world 2>/dev/null)"
- else
- # add some boot services by default
- rc_add devfs sysinit
---
-1.7.4.4
-
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 7a444d4537..7831b005af 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,13 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mkinitfs
-pkgver=2.3.3
-pkgrel=1
+pkgver=2.3.4
+pkgrel=0
pkgdesc="Tool to generate initramfs images for Alpine"
url=http://git.alpinelinux.org/cgit/mkinitfs
depends="busybox apk-tools>=2.0"
triggers="$pkgname.trigger:/usr/share/kernel/*"
source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2
- 0001-init-use-new-location-for-world.patch
eglibc.patch
"
arch="noarch"
@@ -43,6 +42,5 @@ package() {
cd "$srcdir"/$pkgname-$pkgver
make install DESTDIR="$pkgdir" || return 1
}
-md5sums="84ee5953a0043fd0546fb015ca5f0f62 mkinitfs-2.3.3.tar.bz2
-8a7a934a402ca7503edac602fe07a7d5 0001-init-use-new-location-for-world.patch
+md5sums="abec6dced89e137dc60542c1e5f938ac mkinitfs-2.3.4.tar.bz2
e59c2f7de496fe430b07e32fd812ebe0 eglibc.patch"