diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-20 14:59:31 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-04-20 15:03:00 +0000 |
commit | c42a611b8c3372a5cc71651c10c2977b83e6cee5 (patch) | |
tree | 80b63fe311dcf735f4be1ee0301d812d9d12b4eb | |
parent | 18d77b6614c1c493c2c4a0c8fb9d26460f18483e (diff) | |
download | alpine_aports-c42a611b8c3372a5cc71651c10c2977b83e6cee5.tar.bz2 alpine_aports-c42a611b8c3372a5cc71651c10c2977b83e6cee5.tar.xz alpine_aports-c42a611b8c3372a5cc71651c10c2977b83e6cee5.zip |
main/mkinitfs: upgrade to 2.3.4
-rw-r--r-- | main/mkinitfs/0001-init-use-new-location-for-world.patch | 25 | ||||
-rw-r--r-- | main/mkinitfs/APKBUILD | 8 |
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 @@ | |||
1 | From d50371d52ddad76f6393ceadd74ed5f4433b9666 Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Thu, 7 Apr 2011 19:46:29 +0000 | ||
4 | Subject: [PATCH] init: use new location for world | ||
5 | |||
6 | --- | ||
7 | initramfs-init.in | 2 +- | ||
8 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
9 | |||
10 | diff --git a/initramfs-init.in b/initramfs-init.in | ||
11 | index 1040288..abc888f 100755 | ||
12 | --- a/initramfs-init.in | ||
13 | +++ b/initramfs-init.in | ||
14 | @@ -391,7 +391,7 @@ if [ -f "$ovl" ]; then | ||
15 | umount /media/$i 2>/dev/null & | ||
16 | pkgs="$pkgs $(sed 's/\#.*//' $sysroot/etc/lbu/packages.list 2>/dev/null)" | ||
17 | rm -f "$sysroot"/etc/lbu/packages.list | ||
18 | - pkgs="$pkgs $(cat $sysroot/var/lib/apk/world 2>/dev/null)" | ||
19 | + pkgs="$pkgs $(cat $sysroot/var/lib/apk/world $sysroot/etc/apk/world 2>/dev/null)" | ||
20 | else | ||
21 | # add some boot services by default | ||
22 | rc_add devfs sysinit | ||
23 | -- | ||
24 | 1.7.4.4 | ||
25 | |||
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 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=mkinitfs | 2 | pkgname=mkinitfs |
3 | pkgver=2.3.3 | 3 | pkgver=2.3.4 |
4 | pkgrel=1 | 4 | pkgrel=0 |
5 | pkgdesc="Tool to generate initramfs images for Alpine" | 5 | pkgdesc="Tool to generate initramfs images for Alpine" |
6 | url=http://git.alpinelinux.org/cgit/mkinitfs | 6 | url=http://git.alpinelinux.org/cgit/mkinitfs |
7 | depends="busybox apk-tools>=2.0" | 7 | depends="busybox apk-tools>=2.0" |
8 | triggers="$pkgname.trigger:/usr/share/kernel/*" | 8 | triggers="$pkgname.trigger:/usr/share/kernel/*" |
9 | source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2 | 9 | source="http://git.alpinelinux.org/cgit/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2 |
10 | 0001-init-use-new-location-for-world.patch | ||
11 | eglibc.patch | 10 | eglibc.patch |
12 | " | 11 | " |
13 | arch="noarch" | 12 | arch="noarch" |
@@ -43,6 +42,5 @@ package() { | |||
43 | cd "$srcdir"/$pkgname-$pkgver | 42 | cd "$srcdir"/$pkgname-$pkgver |
44 | make install DESTDIR="$pkgdir" || return 1 | 43 | make install DESTDIR="$pkgdir" || return 1 |
45 | } | 44 | } |
46 | md5sums="84ee5953a0043fd0546fb015ca5f0f62 mkinitfs-2.3.3.tar.bz2 | 45 | md5sums="abec6dced89e137dc60542c1e5f938ac mkinitfs-2.3.4.tar.bz2 |
47 | 8a7a934a402ca7503edac602fe07a7d5 0001-init-use-new-location-for-world.patch | ||
48 | e59c2f7de496fe430b07e32fd812ebe0 eglibc.patch" | 46 | e59c2f7de496fe430b07e32fd812ebe0 eglibc.patch" |