summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-11-24 12:26:43 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-11-24 12:26:43 +0000
commit5641ee0f55fad238521791999e00d8f0ed1f1431 (patch)
tree67c782228cca0edfd03e80756281824d37471f3b /main
parent5e5a560508e8f572032a69c2e52f9240d835f287 (diff)
downloadaports-5641ee0f55fad238521791999e00d8f0ed1f1431.tar.bz2
aports-5641ee0f55fad238521791999e00d8f0ed1f1431.tar.xz
main/mkinitfs: use --never-overwrite apk option
fixes #197
Diffstat (limited to 'main')
-rw-r--r--main/mkinitfs/0001-init-never-overwrite-existing-files.patch26
-rw-r--r--main/mkinitfs/APKBUILD9
2 files changed, 32 insertions, 3 deletions
diff --git a/main/mkinitfs/0001-init-never-overwrite-existing-files.patch b/main/mkinitfs/0001-init-never-overwrite-existing-files.patch
new file mode 100644
index 000000000..970b13a0a
--- /dev/null
+++ b/main/mkinitfs/0001-init-never-overwrite-existing-files.patch
@@ -0,0 +1,26 @@
+From bf94c9b9aa7884fc50d3110d69e2d28e413159ed Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 24 Nov 2009 12:23:38 +0000
+Subject: [PATCH] init: never overwrite existing files
+
+ref #197
+---
+ initramfs-init.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/initramfs-init.in b/initramfs-init.in
+index 04798de..bd97ace 100755
+--- a/initramfs-init.in
++++ b/initramfs-init.in
+@@ -372,7 +372,7 @@ if [ -n "$KOPT_chart" ]; then
+ fi
+ apkflags="--initdb --quiet --progress --force --no-network"
+ if [ -z "$KOPT_keep_apk_new" ]; then
+- apkflags="$apkflags --clean-protected"
++ apkflags="$apkflags --clean-protected --never-overwrite"
+ fi
+ apk add --root $sysroot $repo_opt $apkflags $pkgs >/dev/null
+ eend $?
+--
+1.6.5.3
+
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index e8725a0fa..8f2789fbc 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -1,19 +1,22 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mkinitfs
pkgver=2.0_rc6
-pkgrel=0
+pkgrel=1
pkgdesc="Tool to generate initramfs images for Alpine"
url=http://git.alpinelinux.org/cgit/mkinitfs
-depends="busybox"
+depends="busybox apk-tools>=2.0_rc7"
triggers="$pkgname.trigger:/usr/share/kernel/*"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
+ 0001-init-never-overwrite-existing-files.patch
"
license="GPL-2"
build() {
cd "$srcdir"/$pkgname-$pkgver
+ patch -p1 -i ../0001-init-never-overwrite-existing-files.patch || return 1
make || return 1
make install DESTDIR="$pkgdir" || return 1
}
-md5sums="6b8945b2e3be747caf8cfb29230f180e mkinitfs-2.0_rc6.tar.bz2"
+md5sums="6b8945b2e3be747caf8cfb29230f180e mkinitfs-2.0_rc6.tar.bz2
+921aadd7e302d5e565e539e611be946e 0001-init-never-overwrite-existing-files.patch"