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:41:39 +0000 |
| commit | ee20ced73ec58624c78f69b7fe8b6bfba678bc65 (patch) | |
| tree | 6c9c232aeb1f44c3779f3608f9fc9040225d0ea2 | |
| parent | 36dda31006e60f3860740260bf77fd606108a384 (diff) | |
| download | aports-ee20ced73ec58624c78f69b7fe8b6bfba678bc65.tar.bz2 aports-ee20ced73ec58624c78f69b7fe8b6bfba678bc65.tar.xz | |
main/mkinitfs: upgrade to 2.0_rc7
| -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 @@ -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 c3f3e767c4..797b803e9a 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -1,22 +1,18 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mkinitfs -pkgver=2.0_rc6 -pkgrel=2 +pkgver=2.0_rc7 +pkgrel=0 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs -depends="busybox apk-tools>=2.0_rc7" +depends="busybox apk-tools>=2.0" 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 -921aadd7e302d5e565e539e611be946e 0001-init-never-overwrite-existing-files.patch" +md5sums="1e4ec2bb620f080699fddb40e273e33c mkinitfs-2.0_rc7.tar.bz2" |