aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2013-01-16 07:53:34 -0600
committerWilliam Pitcock <nenolod@dereferenced.org>2013-01-16 07:53:34 -0600
commitdf942413a42cc716d2f767beaee40d33ac084f34 (patch)
treec079c2e3e978303dbf2dfea7dc6c629fbc14ce46 /testing
parentb29fbf9758541919f206904d5366883a0dfa983d (diff)
downloadaports-df942413a42cc716d2f767beaee40d33ac084f34.tar.bz2
aports-df942413a42cc716d2f767beaee40d33ac084f34.tar.xz
testing/rinse: use posix CPIO invocation
Diffstat (limited to 'testing')
-rw-r--r--testing/rinse/APKBUILD8
-rw-r--r--testing/rinse/rinse-posix-cpio-use.patch11
2 files changed, 16 insertions, 3 deletions
diff --git a/testing/rinse/APKBUILD b/testing/rinse/APKBUILD
index dd52b058a1..4f2e3de8b6 100644
--- a/testing/rinse/APKBUILD
+++ b/testing/rinse/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=rinse
pkgver=2.0
-pkgrel=1
+pkgrel=2
pkgdesc="RPM chroot bootstrapping tool"
url="http://www.steve.org.uk/Software/rinse/"
arch="noarch"
@@ -12,7 +12,8 @@ depends_dev=""
makedepends="$depends_dev gzip coreutils"
install=""
subpackages="$pkgname-doc"
-source="http://www.steve.org.uk/Software/rinse/rinse-$pkgver.tar.gz"
+source="http://www.steve.org.uk/Software/rinse/rinse-$pkgver.tar.gz
+ rinse-posix-cpio-use.patch"
_builddir="$srcdir"/rinse-$pkgver
prepare() {
@@ -34,4 +35,5 @@ package() {
make PREFIX="$pkgdir" install || return 1
}
-md5sums="ccae96895b413bb1040a86d17bec4b06 rinse-2.0.tar.gz"
+md5sums="ccae96895b413bb1040a86d17bec4b06 rinse-2.0.tar.gz
+6761f834b3f50bded544021ccb90c700 rinse-posix-cpio-use.patch"
diff --git a/testing/rinse/rinse-posix-cpio-use.patch b/testing/rinse/rinse-posix-cpio-use.patch
new file mode 100644
index 0000000000..429410f981
--- /dev/null
+++ b/testing/rinse/rinse-posix-cpio-use.patch
@@ -0,0 +1,11 @@
+--- rinse-2.0.orig/bin/rinse
++++ rinse-2.0/bin/rinse
+@@ -1144,7 +1144,7 @@
+ # Run the unpacking command.
+ #
+ my $cmd =
+- "rpm2cpio $file | (cd $CONFIG{'directory'} ; cpio --extract --make-directories --no-absolute-filenames --preserve-modification-time) 2>/dev/null >/dev/null";
++ "rpm2cpio $file | (cd $CONFIG{'directory'} ; cpio -idm) 2>/dev/null >/dev/null";
+ if ( $file =~ /(fedora|centos|redhat|mandriva)-release-/ )
+ {
+ my $rpmname = basename($file);