alarm/devtools-alarm to 20130525-2

This commit is contained in:
Kevin Mihelich 2013-08-20 19:26:57 +00:00
parent 77b584f9ae
commit 7b26bf26a9
2 changed files with 22 additions and 3 deletions

View file

@ -0,0 +1,16 @@
diff -urN a/arch-nspawn.in b/arch-nspawn.in
--- a/arch-nspawn.in 2013-08-20 13:23:41.830745058 -0600
+++ b/arch-nspawn.in 2013-08-20 13:24:29.500531210 -0600
@@ -98,8 +98,11 @@
eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
+machine_name="${working_dir//\//-}"
+machine_name="${machine_name#-}"
+
exec systemd-nspawn 2>/dev/null \
-D "$working_dir" \
- --machine "${working_dir//\//-}" \
+ --machine "$machine_name" \
"${mount_args[@]}" \
"$@"

View file

@ -7,7 +7,7 @@
pkgname=devtools-alarm
_pkgname=devtools
pkgver=20130525
pkgrel=1
pkgrel=2
pkgdesc='Tools for Arch Linux ARM package maintainers'
arch=('any')
license=('GPL')
@ -19,14 +19,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-machine-name.patch')
md5sums=('afec33a914471db8b8fb8ef65ee6b9ee'
'SKIP'
'2164cda16c7caf9789f2441d49fcdf77'
'8d229b27e16c74a5308b1f452a17d97e'
'1d0c06106bf633e555e2ce3cf26d30d5'
'a53f7dea2392ffede8f2a1012707f201'
'473f7128e088188121f5565e7ca34759')
'473f7128e088188121f5565e7ca34759'
'2e7d45805bb6f989052fbf3a75ad4bea')
prepare() {
cd ${srcdir}/${_pkgname}-${pkgver}
@ -35,6 +37,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-machine-name.patch
}
build() {