Merge pull request #727 from farcaller/master

Fixed the +build rules for docker, now that actually *works* on arm
This commit is contained in:
Kevin Mihelich 2014-02-23 10:56:06 -07:00
commit 656b047d60

View file

@ -6,7 +6,7 @@
pkgname=docker pkgname=docker
_truever=0.8.0 _truever=0.8.0
pkgver=${_truever%.*} pkgver=${_truever%.*}
pkgrel=1.1 pkgrel=1.2
epoch=1 epoch=1
pkgdesc='Pack, ship and run any application as a lightweight container' pkgdesc='Pack, ship and run any application as a lightweight container'
arch=('x86_64') arch=('x86_64')
@ -34,9 +34,9 @@ prepare() {
cd "${srcdir}/docker" cd "${srcdir}/docker"
patch -p1 <"${srcdir}/docker-arm.patch" patch -p1 <"${srcdir}/docker-arm.patch"
patch -p1 <"${srcdir}/btrfs-arm.patch" patch -p1 <"${srcdir}/btrfs-arm.patch"
find . -name '*.go' | xargs sed --in-place= -e 's/\/\/ +build amd64/\/\/ +build amd64,arm/' find . -name '*.go' | xargs sed --in-place= -e 's/\/\/ +build amd64/\/\/ +build arm/'
find . -name '*.go' | xargs sed --in-place= -e 's/\/\/ +build !linux !amd64/\/\/ +build !linux !amd64 !arm/' find . -name '*.go' | xargs sed --in-place= -e 's/\/\/ +build !linux !amd64/\/\/ +build !linux !arm/'
find . -name '*.go' | xargs sed --in-place= -e 's/\/\/ +build linux,amd64/\/\/ +build linux,amd64 linux,arm/' find . -name '*.go' | xargs sed --in-place= -e 's/\/\/ +build linux,amd64/\/\/ +build linux,arm/'
} }
build() { build() {