alarm/devtools-alarm: Remove setarch from a call to mkarchroot.

setarch does not support ARM architectures. Without this patch,
archbuild fails with this error:

    setarch: armv6h: Unrecognized architecture

This patch is similar in intent to the first hunk of
0004-arch-nspawn-arm-fix.patch.
This commit is contained in:
Evan Teitelman 2014-02-16 08:02:19 -05:00
parent 432fce648e
commit f38e52e29e
2 changed files with 17 additions and 3 deletions

View file

@ -0,0 +1,11 @@
--- a/archbuild.in 2014-02-16 07:57:21.777365491 -0500
+++ b/archbuild.in 2014-02-16 07:57:54.280700229 -0500
@@ -62,7 +62,7 @@
rm -rf --one-file-system "${chroots}/${repo}-${arch}"
mkdir -p "${chroots}/${repo}-${arch}"
- setarch "${arch}" mkarchroot \
+ mkarchroot \
-C "@pkgdatadir@/pacman-${repo}.conf" \
-M "@pkgdatadir@/makepkg-${arch}.conf" \
"${chroots}/${repo}-${arch}/root" \

View file

@ -7,7 +7,7 @@
pkgname=devtools-alarm
_pkgname=devtools
pkgver=20131107
pkgrel=2
pkgrel=3
pkgdesc='Tools for Arch Linux ARM package maintainers'
arch=('any')
license=('GPL')
@ -21,14 +21,16 @@ source=("ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
'0002-arch-nspawn-keep-mirrorlist.patch'
'0003-makechrootpkg-distcc.patch'
'0004-arch-nspawn-arm-fix.patch'
'0005-makechrootpkg-no-default-logging.patch')
'0005-makechrootpkg-no-default-logging.patch'
'0006-archbuild-no-setarch.patch')
md5sums=('8b78e5f8e68d09864cf231c999ab222a'
'SKIP'
'7b96700206f0832d8f9c72adeccb8f9f'
'ac6a4477565030c8e2bea08068e7597f'
'97a011ae19be82b932ef8abab83f9b6a'
'd7c5800ed19500e33e2c9cf89c41a86c'
'473f7128e088188121f5565e7ca34759')
'473f7128e088188121f5565e7ca34759'
'a9f511668f1f8bb8f408017ec7dbabc9')
prepare() {
cd ${srcdir}/${_pkgname}-${pkgver}
@ -37,6 +39,7 @@ prepare() {
patch -p1 -i "${srcdir}"/0003-makechrootpkg-distcc.patch
patch -p1 -i "${srcdir}"/0004-arch-nspawn-arm-fix.patch
patch -p1 -i "${srcdir}"/0005-makechrootpkg-no-default-logging.patch
patch -p1 -i "${srcdir}"/0006-archbuild-no-setarch.patch
}
build() {