diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2009-12-23 14:41:39 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-12-23 14:58:16 +0000 |
commit | 02822ef9cfa2cfb933f5e63e51f5851177ada29f (patch) | |
tree | 4fc02574d429e5f5387fcb0743adbaa8b3081ffb | |
parent | 35c2ef29bae7dcf4131c56d9334e1f5ca2e5f9e5 (diff) | |
download | alpine_aports-02822ef9cfa2cfb933f5e63e51f5851177ada29f.tar.bz2 alpine_aports-02822ef9cfa2cfb933f5e63e51f5851177ada29f.tar.xz alpine_aports-02822ef9cfa2cfb933f5e63e51f5851177ada29f.zip |
main/mkinitfs: upgrade to 2.0_rc7v1.9.3
(cherry picked from commit ee20ced73ec58624c78f69b7fe8b6bfba678bc65)
-rw-r--r-- | main/mkinitfs/0001-init-never-overwrite-existing-files.patch | 26 | ||||
-rw-r--r-- | main/mkinitfs/APKBUILD | 12 |
2 files changed, 4 insertions, 34 deletions
diff --git a/main/mkinitfs/0001-init-never-overwrite-existing-files.patch b/main/mkinitfs/0001-init-never-overwrite-existing-files.patch deleted file mode 100644 index 970b13a0ab..0000000000 --- a/main/mkinitfs/0001-init-never-overwrite-existing-files.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From bf94c9b9aa7884fc50d3110d69e2d28e413159ed Mon Sep 17 00:00:00 2001 | ||
2 | From: Natanael Copa <ncopa@alpinelinux.org> | ||
3 | Date: Tue, 24 Nov 2009 12:23:38 +0000 | ||
4 | Subject: [PATCH] init: never overwrite existing files | ||
5 | |||
6 | ref #197 | ||
7 | --- | ||
8 | initramfs-init.in | 2 +- | ||
9 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
10 | |||
11 | diff --git a/initramfs-init.in b/initramfs-init.in | ||
12 | index 04798de..bd97ace 100755 | ||
13 | --- a/initramfs-init.in | ||
14 | +++ b/initramfs-init.in | ||
15 | @@ -372,7 +372,7 @@ if [ -n "$KOPT_chart" ]; then | ||
16 | fi | ||
17 | apkflags="--initdb --quiet --progress --force --no-network" | ||
18 | if [ -z "$KOPT_keep_apk_new" ]; then | ||
19 | - apkflags="$apkflags --clean-protected" | ||
20 | + apkflags="$apkflags --clean-protected --never-overwrite" | ||
21 | fi | ||
22 | apk add --root $sysroot $repo_opt $apkflags $pkgs >/dev/null | ||
23 | eend $? | ||
24 | -- | ||
25 | 1.6.5.3 | ||
26 | |||
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index c3f3e767c4..797b803e9a 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD | |||
@@ -1,22 +1,18 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=mkinitfs | 2 | pkgname=mkinitfs |
3 | pkgver=2.0_rc6 | 3 | pkgver=2.0_rc7 |
4 | pkgrel=2 | 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_rc7" | 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/snapshot/$pkgname-$pkgver.tar.bz2 | 9 | source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 |
10 | 0001-init-never-overwrite-existing-files.patch | ||
11 | " | 10 | " |
12 | license="GPL-2" | 11 | license="GPL-2" |
13 | 12 | ||
14 | build() { | 13 | build() { |
15 | cd "$srcdir"/$pkgname-$pkgver | 14 | cd "$srcdir"/$pkgname-$pkgver |
16 | |||
17 | patch -p1 -i ../0001-init-never-overwrite-existing-files.patch || return 1 | ||
18 | make || return 1 | 15 | make || return 1 |
19 | make install DESTDIR="$pkgdir" || return 1 | 16 | make install DESTDIR="$pkgdir" || return 1 |
20 | } | 17 | } |
21 | md5sums="6b8945b2e3be747caf8cfb29230f180e mkinitfs-2.0_rc6.tar.bz2 | 18 | md5sums="1e4ec2bb620f080699fddb40e273e33c mkinitfs-2.0_rc7.tar.bz2" |
22 | 921aadd7e302d5e565e539e611be946e 0001-init-never-overwrite-existing-files.patch" | ||