From 7ccf2e3c6b5b3c45bf5fe42ea40113c576865876 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Fri, 31 May 2013 18:39:05 +0000 Subject: [PATCH] alarm/devtools-alarm to 20130408-1 --- .../0001-makechrootpkg-cache-dir.patch | 44 +++++++++++++++ .../0002-mkarchroot-dont-change-confs.patch | 21 +++++++ .../0003-makechrootpkg-distcc.patch | 14 +++++ alarm/devtools-alarm/PKGBUILD | 56 +++++++++---------- 4 files changed, 106 insertions(+), 29 deletions(-) create mode 100644 alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch create mode 100644 alarm/devtools-alarm/0002-mkarchroot-dont-change-confs.patch create mode 100644 alarm/devtools-alarm/0003-makechrootpkg-distcc.patch diff --git a/alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch b/alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch new file mode 100644 index 000000000..1198c28e5 --- /dev/null +++ b/alarm/devtools-alarm/0001-makechrootpkg-cache-dir.patch @@ -0,0 +1,44 @@ +diff -urN a/makechrootpkg.in b/makechrootpkg.in +--- a/makechrootpkg.in 2013-04-08 10:09:19.000000000 -0600 ++++ b/makechrootpkg.in 2013-05-31 12:12:06.555461241 -0600 +@@ -49,6 +49,7 @@ + echo 'Flags:' + echo '-h This help' + echo '-c Clean the chroot before building' ++ echo '-C Set pacman cache to pass to mkarchroot' + echo '-u Update the working copy of the chroot before building' + echo ' This is useful for rebuilds without dirtying the pristine' + echo ' chroot' +@@ -63,10 +64,11 @@ + exit 1 + } + +-while getopts 'hcudr:I:l:nT' arg; do ++while getopts 'hcudC:r:I:l:nT' arg; do + case "$arg" in + h) usage ;; + c) clean_first=true ;; ++ C) cache_dir="$OPTARG" ;; + u) update_first=true ;; + d) add_to_db=true ;; + r) passeddir="$OPTARG" ;; +@@ -116,6 +118,10 @@ + + umask 0022 + ++if [ -n "$cache_dir" ]; then ++ cache_dir="-c $cache_dir" ++fi ++ + # Detect chrootdir filesystem type + chroottype=$(stat -f -c %T "$chrootdir") + +@@ -288,7 +294,7 @@ + EOF + chmod +x "$copydir/chrootbuild" + +-if mkarchroot -r "/chrootbuild" "$copydir"; then ++if mkarchroot $cache_dir -r "/chrootbuild" "$copydir"; then + for pkgfile in "$copydir"/pkgdest/*.pkg.tar.?z; do + if $add_to_db; then + mkdir -p "$copydir/repo" diff --git a/alarm/devtools-alarm/0002-mkarchroot-dont-change-confs.patch b/alarm/devtools-alarm/0002-mkarchroot-dont-change-confs.patch new file mode 100644 index 000000000..2e2d62a15 --- /dev/null +++ b/alarm/devtools-alarm/0002-mkarchroot-dont-change-confs.patch @@ -0,0 +1,21 @@ +diff -urN a/mkarchroot.in b/mkarchroot.in +--- a/mkarchroot.in 2013-04-08 10:09:19.000000000 -0600 ++++ b/mkarchroot.in 2013-05-31 10:53:46.465229553 -0600 +@@ -142,7 +142,7 @@ + + chroot_lock + build_mount_args +- copy_hostconf ++ #copy_hostconf + + chroot_run "${working_dir}" ${RUN} + +@@ -178,7 +178,7 @@ + chroot_run "${working_dir}" locale-gen + echo 'LANG=C' > "${working_dir}/etc/locale.conf" + +- copy_hostconf ++ #copy_hostconf + + echo "${CHROOT_VERSION}" > "${working_dir}/.arch-chroot" + # }}} diff --git a/alarm/devtools-alarm/0003-makechrootpkg-distcc.patch b/alarm/devtools-alarm/0003-makechrootpkg-distcc.patch new file mode 100644 index 000000000..0e4b94d0b --- /dev/null +++ b/alarm/devtools-alarm/0003-makechrootpkg-distcc.patch @@ -0,0 +1,14 @@ +diff -urN a/makechrootpkg.in b/makechrootpkg.in +--- a/makechrootpkg.in 2013-05-31 10:49:38.866569102 -0600 ++++ b/makechrootpkg.in 2013-05-31 10:57:39.183970506 -0600 +@@ -280,7 +280,9 @@ + export HOME=/build + + cd /build +-sudo -u nobody makepkg $makepkg_args || exit 1 ++mkdir .distcc ++chown nobody .distcc ++sudo -u nobody DISTCC_IO_TIMEOUT=0 DISTCC_DIR='/build/.distcc' makepkg $makepkg_args || exit 1 + + if $run_namcap; then + pacman -S --needed --noconfirm namcap diff --git a/alarm/devtools-alarm/PKGBUILD b/alarm/devtools-alarm/PKGBUILD index d663d0686..e0ef31262 100644 --- a/alarm/devtools-alarm/PKGBUILD +++ b/alarm/devtools-alarm/PKGBUILD @@ -1,44 +1,42 @@ -# $Id: PKGBUILD 152237 2012-03-05 17:04:50Z pierre $ +# $Id: PKGBUILD 182399 2013-04-10 05:34:09Z pierre $ # Maintainer: Pierre Schmitz # ALARM: Kevin Mihelich -# - packaged using our git version - -plugrel=1 +# - patches to fix issues with how we use the tools pkgname=devtools-alarm -pkgver=20120516 +_pkgname=devtools +pkgver=20130408 pkgrel=1 -pkgdesc='Tools for Arch Linux ARM build system clients' +pkgdesc='Tools for Arch Linux package maintainers' arch=('any') license=('GPL') -url='https://github.com/archlinuxarm/devtools' -depends=('namcap' 'openssh' 'subversion' 'rsync') -makedepends=('git') -conflicts=('devtools') -provides=('devtools') +url='http://projects.archlinux.org/devtools.git/' +depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts') +source=("ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" + "ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz.sig" + '0001-makechrootpkg-cache-dir.patch' + '0002-mkarchroot-dont-change-confs.patch' + '0003-makechrootpkg-distcc.patch') +md5sums=('12b42b429744af6517ae789f728e9f63' + 'SKIP' + '1a85c2d42aa9aaa77847e303422bc11e' + '37d9d2ca96a3a5130d39b1441b7acb99' + '550d15ec4ee1803476424d60460b89ec') -_gitroot="git://github.com/archlinuxarm/devtools.git" -_gitname="devtools" +prepare() { + cd ${srcdir}/${_pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/0001-makechrootpkg-cache-dir.patch + patch -p1 -i "${srcdir}"/0002-mkarchroot-dont-change-confs.patch + patch -p1 -i "${srcdir}"/0003-makechrootpkg-distcc.patch +} build() { - cd "${srcdir}" - msg "Connecting to GIT server...." - - if [ -d $_gitname ] ; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot - fi - - msg "GIT checkout done or server timeout" - - cd "${srcdir}/${_gitname}" - make PREFIX=/usr + cd ${srcdir}/${_pkgname}-${pkgver} + make PREFIX=/usr } package() { - cd "${srcdir}/${_gitname}" - make PREFIX=/usr DESTDIR="${pkgdir}" install + cd ${srcdir}/${_pkgname}-${pkgver} + make PREFIX=/usr DESTDIR=${pkgdir} install }