mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-02-16 23:57:11 +00:00
alarm/devtools-alarm to 20150228-1
This commit is contained in:
Kevin Mihelich
parent
64a75b2866
commit
7dafff3ed1
7 changed files with 30 additions and 30 deletions
|
|
@ -1,4 +1,4 @@
|
|||
From b75cef2844996db5f326b6945b757aa623777611 Mon Sep 17 00:00:00 2001
|
||||
From 119a424a42587211528322a7ddbbd8875a3aa176 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Sun, 28 Dec 2014 22:25:58 -0700
|
||||
Subject: [PATCH 1/6] makechrootpkg: cache dir
|
||||
|
|
@ -8,7 +8,7 @@ Subject: [PATCH 1/6] makechrootpkg: cache dir
|
|||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/makechrootpkg.in b/makechrootpkg.in
|
||||
index 26deaca..c0a15c0 100644
|
||||
index cc02547..53c0a07 100644
|
||||
--- a/makechrootpkg.in
|
||||
+++ b/makechrootpkg.in
|
||||
@@ -51,6 +51,7 @@ usage() {
|
||||
|
|
@ -19,7 +19,7 @@ index 26deaca..c0a15c0 100644
|
|||
echo '-d <dir> Bind directory into build chroot as read-write'
|
||||
echo '-D <dir> Bind directory into build chroot as read-only'
|
||||
echo '-u Update the working copy of the chroot before building'
|
||||
@@ -68,12 +69,13 @@ usage() {
|
||||
@@ -312,12 +313,13 @@ move_products() {
|
||||
|
||||
orig_argv=("$@")
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ index 26deaca..c0a15c0 100644
|
|||
r) passeddir="$OPTARG" ;;
|
||||
I) install_pkgs+=("$OPTARG") ;;
|
||||
l) copy="$OPTARG" ;;
|
||||
@@ -92,6 +94,10 @@ chrootdir=$(readlink -e "$passeddir")
|
||||
@@ -336,6 +338,10 @@ chrootdir=$(readlink -e "$passeddir")
|
||||
[[ ! -d $chrootdir ]] && die "No chroot dir defined, or invalid path '%s'" "$passeddir"
|
||||
[[ ! -d $chrootdir/root ]] && die "Missing chroot dir root directory. Try using: mkarchroot %s/root base-devel" "$chrootdir"
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ index 26deaca..c0a15c0 100644
|
|||
# Detect chrootdir filesystem type
|
||||
chroottype=$(stat -f -c %T "$chrootdir")
|
||||
|
||||
@@ -386,7 +392,7 @@ prepare_chroot
|
||||
@@ -387,7 +393,7 @@ prepare_chroot
|
||||
|
||||
download_sources
|
||||
|
||||
|
|
@ -55,5 +55,5 @@ index 26deaca..c0a15c0 100644
|
|||
--bind-ro="$SRCDEST:/srcdest_host" \
|
||||
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
|
||||
--
|
||||
2.2.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 909075d5bd73f8791e3ccb40c19ee92918c541fb Mon Sep 17 00:00:00 2001
|
||||
From eb112c0d69e14ee6eb02e59c0c35089ed0cc6ea1 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Sun, 28 Dec 2014 22:27:34 -0700
|
||||
Subject: [PATCH 2/6] arch-nspawn: keep mirrorlist
|
||||
|
|
@ -21,5 +21,5 @@ index 19f1410..20726e8 100644
|
|||
[[ -n $pac_conf ]] && cp $pac_conf "$working_dir/etc/pacman.conf"
|
||||
[[ -n $makepkg_conf ]] && cp $makepkg_conf "$working_dir/etc/makepkg.conf"
|
||||
--
|
||||
2.2.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 375082ca4e5c03e0ffa0d81ee3739cd131d58ca4 Mon Sep 17 00:00:00 2001
|
||||
From 3ffcd8940c52a9039c84cc5eb2693fa5189d10c7 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Sun, 28 Dec 2014 22:32:15 -0700
|
||||
Subject: [PATCH 3/6] makechrootpkg: distcc
|
||||
|
|
@ -8,10 +8,10 @@ Subject: [PATCH 3/6] makechrootpkg: distcc
|
|||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/makechrootpkg.in b/makechrootpkg.in
|
||||
index c0a15c0..bdc9938 100644
|
||||
index 53c0a07..1e73785 100644
|
||||
--- a/makechrootpkg.in
|
||||
+++ b/makechrootpkg.in
|
||||
@@ -347,7 +347,10 @@ _chrootbuild() {
|
||||
@@ -289,7 +289,10 @@ _chrootbuild() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -24,5 +24,5 @@ index c0a15c0..bdc9938 100644
|
|||
|
||||
move_products() {
|
||||
--
|
||||
2.2.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 448f11996fc2c167084d96954746ab0153d26e9e Mon Sep 17 00:00:00 2001
|
||||
From d07a4e837ad185e1859396231e96edcbdc8b3bd1 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Sun, 28 Dec 2014 22:33:00 -0700
|
||||
Subject: [PATCH 4/6] arch-nspawn: arm fix
|
||||
|
|
@ -22,10 +22,10 @@ index 20726e8..3f3d563 100644
|
|||
--register=no \
|
||||
"${mount_args[@]}" \
|
||||
diff --git a/makechrootpkg.in b/makechrootpkg.in
|
||||
index bdc9938..46aff89 100644
|
||||
index 1e73785..ffb14f4 100644
|
||||
--- a/makechrootpkg.in
|
||||
+++ b/makechrootpkg.in
|
||||
@@ -297,10 +297,10 @@ download_sources() {
|
||||
@@ -239,10 +239,10 @@ download_sources() {
|
||||
# Ensure sources are downloaded
|
||||
if [[ -n $SUDO_USER ]]; then
|
||||
sudo -u $SUDO_USER env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \
|
||||
|
|
@ -39,5 +39,5 @@ index bdc9938..46aff89 100644
|
|||
fi
|
||||
(( $? != 0 )) && die "Could not download sources."
|
||||
--
|
||||
2.2.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From b186821bb6ac5e7aee3c3b63074bae2a2ebbaabd Mon Sep 17 00:00:00 2001
|
||||
From 295da58da62f657923518a699f3210aab5089568 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Sun, 28 Dec 2014 22:33:41 -0700
|
||||
Subject: [PATCH 5/6] makechrootpkg: no default logging
|
||||
|
|
@ -8,7 +8,7 @@ Subject: [PATCH 5/6] makechrootpkg: no default logging
|
|||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/makechrootpkg.in b/makechrootpkg.in
|
||||
index 46aff89..e1da896 100644
|
||||
index ffb14f4..ad689cd 100644
|
||||
--- a/makechrootpkg.in
|
||||
+++ b/makechrootpkg.in
|
||||
@@ -12,7 +12,7 @@ m4_include(lib/common.sh)
|
||||
|
|
@ -21,5 +21,5 @@ index 46aff89..e1da896 100644
|
|||
update_first=false
|
||||
clean_first=false
|
||||
--
|
||||
2.2.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From efc9edfa8dc84799cbafd3c516ac31038bd7e847 Mon Sep 17 00:00:00 2001
|
||||
From 8243eccb65f5756506e1ef9c1ac3f80176d3c314 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Sun, 28 Dec 2014 22:34:04 -0700
|
||||
Subject: [PATCH 6/6] archbuild: no setarch
|
||||
|
|
@ -21,5 +21,5 @@ index 9c5d706..a4b5bed 100644
|
|||
-M "@pkgdatadir@/makepkg-${arch}.conf" \
|
||||
"${chroots}/${repo}-${arch}/root" \
|
||||
--
|
||||
2.2.1
|
||||
2.3.2
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
pkgname=devtools-alarm
|
||||
_pkgname=devtools
|
||||
pkgver=20141224
|
||||
pkgver=20150228
|
||||
pkgrel=1
|
||||
pkgdesc='Tools for Arch Linux ARM package maintainers'
|
||||
arch=('any')
|
||||
|
|
@ -15,20 +15,20 @@ url='http://projects.archlinux.org/devtools.git/'
|
|||
conflicts=('devtools')
|
||||
provides=('devtools')
|
||||
depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts')
|
||||
source=("ftp://ftp.archlinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz"
|
||||
source=("https://sources.archlinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz"
|
||||
'0001-makechrootpkg-cache-dir.patch'
|
||||
'0002-arch-nspawn-keep-mirrorlist.patch'
|
||||
'0003-makechrootpkg-distcc.patch'
|
||||
'0004-arch-nspawn-arm-fix.patch'
|
||||
'0005-makechrootpkg-no-default-logging.patch'
|
||||
'0006-archbuild-no-setarch.patch')
|
||||
md5sums=('9b6e6ce9da5b8e861c77f9badc652553'
|
||||
'587badc10432dd0db01f4c79344205d8'
|
||||
'9cbf8c343b38d0b5a07f015218ecae6e'
|
||||
'c18f2a1b20388c4014536396ed56e3cb'
|
||||
'54abb054918968b47c81d1e0ade98e69'
|
||||
'100924fdcc75766d99a84f0f351ca79c'
|
||||
'503229d4055f4877bad0f9cf2a929b5d')
|
||||
md5sums=('4b17a83dac3f8c93de85acebd0a90a16'
|
||||
'9e70b777886ec0af1a787b32c7444ed8'
|
||||
'd6ff97c5dcc0cbfbe65ec3cc3ae495f7'
|
||||
'9bb4797d676a56437a5ed130ce202e68'
|
||||
'14c261c1d0139888a2fb10cb9bbfda37'
|
||||
'2af8e8b30dbc22d5a0f3ddfcaecf64fa'
|
||||
'97ed4af62c8020fe6f7f991f930fb68e')
|
||||
|
||||
prepare() {
|
||||
cd "${_pkgname}-${pkgver}"
|
||||
|
|
|
|||
Loading…
Reference in a new issue