mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-09 00:17:31 +00:00
alarm/devtools-alarm to 20151002-1
This commit is contained in:
Kevin Mihelich
parent
d763442be2
commit
d984cd1ff8
8 changed files with 65 additions and 37 deletions
|
|
@ -1,14 +1,14 @@
|
|||
From 119a424a42587211528322a7ddbbd8875a3aa176 Mon Sep 17 00:00:00 2001
|
||||
From 270fc7be6bfab43cb0e7451d7b60acfa14e5915d 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
|
||||
Subject: [PATCH 1/7] makechrootpkg: cache dir
|
||||
|
||||
---
|
||||
makechrootpkg.in | 10 ++++++++--
|
||||
1 file changed, 8 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/makechrootpkg.in b/makechrootpkg.in
|
||||
index cc02547..53c0a07 100644
|
||||
index 3c8a20f..64bdbcb 100644
|
||||
--- a/makechrootpkg.in
|
||||
+++ b/makechrootpkg.in
|
||||
@@ -51,6 +51,7 @@ usage() {
|
||||
|
|
@ -19,7 +19,7 @@ index cc02547..53c0a07 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'
|
||||
@@ -312,12 +313,13 @@ move_products() {
|
||||
@@ -313,12 +314,13 @@ move_products() {
|
||||
|
||||
orig_argv=("$@")
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ index cc02547..53c0a07 100644
|
|||
r) passeddir="$OPTARG" ;;
|
||||
I) install_pkgs+=("$OPTARG") ;;
|
||||
l) copy="$OPTARG" ;;
|
||||
@@ -336,6 +338,10 @@ chrootdir=$(readlink -e "$passeddir")
|
||||
@@ -337,6 +339,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,9 +45,9 @@ index cc02547..53c0a07 100644
|
|||
# Detect chrootdir filesystem type
|
||||
chroottype=$(stat -f -c %T "$chrootdir")
|
||||
|
||||
@@ -387,7 +393,7 @@ prepare_chroot
|
||||
@@ -388,7 +394,7 @@ download_sources
|
||||
|
||||
download_sources
|
||||
prepare_chroot
|
||||
|
||||
-if arch-nspawn "$copydir" \
|
||||
+if arch-nspawn $cache_dir "$copydir" \
|
||||
|
|
@ -55,5 +55,5 @@ index cc02547..53c0a07 100644
|
|||
--bind-ro="$SRCDEST:/srcdest_host" \
|
||||
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
|
||||
--
|
||||
2.3.2
|
||||
2.5.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From eb112c0d69e14ee6eb02e59c0c35089ed0cc6ea1 Mon Sep 17 00:00:00 2001
|
||||
From 740e9c34465918fb67963f38b923ee821908b3d1 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
|
||||
Subject: [PATCH 2/7] arch-nspawn: keep mirrorlist
|
||||
|
||||
---
|
||||
arch-nspawn.in | 2 +-
|
||||
|
|
@ -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.3.2
|
||||
2.5.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
From 3ffcd8940c52a9039c84cc5eb2693fa5189d10c7 Mon Sep 17 00:00:00 2001
|
||||
From ebbe6cb1aebe334184d1fb7a54d954e6e33dcd8e 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
|
||||
Subject: [PATCH 3/7] makechrootpkg: distcc
|
||||
|
||||
---
|
||||
makechrootpkg.in | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/makechrootpkg.in b/makechrootpkg.in
|
||||
index 53c0a07..1e73785 100644
|
||||
index 64bdbcb..ae2b3a3 100644
|
||||
--- a/makechrootpkg.in
|
||||
+++ b/makechrootpkg.in
|
||||
@@ -289,7 +289,10 @@ _chrootbuild() {
|
||||
@@ -290,7 +290,10 @@ _chrootbuild() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -24,5 +24,5 @@ index 53c0a07..1e73785 100644
|
|||
|
||||
move_products() {
|
||||
--
|
||||
2.3.2
|
||||
2.5.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From d07a4e837ad185e1859396231e96edcbdc8b3bd1 Mon Sep 17 00:00:00 2001
|
||||
From e1d7f3e29da6557dc3b8f008fb4b3abd06a18dc5 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
|
||||
Subject: [PATCH 4/7] arch-nspawn: arm fix
|
||||
|
||||
---
|
||||
arch-nspawn.in | 2 +-
|
||||
|
|
@ -22,10 +22,10 @@ index 20726e8..3f3d563 100644
|
|||
--register=no \
|
||||
"${mount_args[@]}" \
|
||||
diff --git a/makechrootpkg.in b/makechrootpkg.in
|
||||
index 1e73785..ffb14f4 100644
|
||||
index ae2b3a3..104f54f 100644
|
||||
--- a/makechrootpkg.in
|
||||
+++ b/makechrootpkg.in
|
||||
@@ -239,10 +239,10 @@ download_sources() {
|
||||
@@ -240,10 +240,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 1e73785..ffb14f4 100644
|
|||
fi
|
||||
(( $? != 0 )) && die "Could not download sources."
|
||||
--
|
||||
2.3.2
|
||||
2.5.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
From 295da58da62f657923518a699f3210aab5089568 Mon Sep 17 00:00:00 2001
|
||||
From 224229bd0c3812c796f45c3fb623c693806a8b8a 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
|
||||
Subject: [PATCH 5/7] makechrootpkg: no default logging
|
||||
|
||||
---
|
||||
makechrootpkg.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/makechrootpkg.in b/makechrootpkg.in
|
||||
index ffb14f4..ad689cd 100644
|
||||
index 104f54f..88363c9 100644
|
||||
--- a/makechrootpkg.in
|
||||
+++ b/makechrootpkg.in
|
||||
@@ -12,7 +12,7 @@ m4_include(lib/common.sh)
|
||||
|
|
@ -21,5 +21,5 @@ index ffb14f4..ad689cd 100644
|
|||
update_first=false
|
||||
clean_first=false
|
||||
--
|
||||
2.3.2
|
||||
2.5.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 8243eccb65f5756506e1ef9c1ac3f80176d3c314 Mon Sep 17 00:00:00 2001
|
||||
From ed9a17b1307489ae390cf25d35fb6b298eebfda4 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
|
||||
Subject: [PATCH 6/7] archbuild: no setarch
|
||||
|
||||
---
|
||||
archbuild.in | 2 +-
|
||||
|
|
@ -21,5 +21,5 @@ index 9c5d706..a4b5bed 100644
|
|||
-M "@pkgdatadir@/makepkg-${arch}.conf" \
|
||||
"${chroots}/${repo}-${arch}/root" \
|
||||
--
|
||||
2.3.2
|
||||
2.5.2
|
||||
|
||||
|
|
|
|||
25
alarm/devtools-alarm/0007-arch-nspawn-keep-stderr.patch
Normal file
25
alarm/devtools-alarm/0007-arch-nspawn-keep-stderr.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
From 46b1986e26b017b3d38eaf238e3d8c8947243fb7 Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
Date: Tue, 6 Oct 2015 17:39:00 -0600
|
||||
Subject: [PATCH 7/7] arch-nspawn: keep stderr
|
||||
|
||||
---
|
||||
arch-nspawn.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch-nspawn.in b/arch-nspawn.in
|
||||
index 3f3d563..13eba35 100644
|
||||
--- a/arch-nspawn.in
|
||||
+++ b/arch-nspawn.in
|
||||
@@ -96,7 +96,7 @@ copy_hostconf
|
||||
|
||||
eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
|
||||
|
||||
-exec systemd-nspawn 2>/dev/null \
|
||||
+exec systemd-nspawn -q \
|
||||
-D "$working_dir" \
|
||||
--register=no \
|
||||
"${mount_args[@]}" \
|
||||
--
|
||||
2.5.2
|
||||
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
pkgname=devtools-alarm
|
||||
_pkgname=devtools
|
||||
pkgver=20150228
|
||||
pkgver=20151002
|
||||
pkgrel=1
|
||||
pkgdesc='Tools for Arch Linux ARM package maintainers'
|
||||
arch=('any')
|
||||
|
|
@ -21,14 +21,16 @@ source=("https://sources.archlinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz"
|
|||
'0003-makechrootpkg-distcc.patch'
|
||||
'0004-arch-nspawn-arm-fix.patch'
|
||||
'0005-makechrootpkg-no-default-logging.patch'
|
||||
'0006-archbuild-no-setarch.patch')
|
||||
md5sums=('4b17a83dac3f8c93de85acebd0a90a16'
|
||||
'9e70b777886ec0af1a787b32c7444ed8'
|
||||
'd6ff97c5dcc0cbfbe65ec3cc3ae495f7'
|
||||
'9bb4797d676a56437a5ed130ce202e68'
|
||||
'14c261c1d0139888a2fb10cb9bbfda37'
|
||||
'2af8e8b30dbc22d5a0f3ddfcaecf64fa'
|
||||
'97ed4af62c8020fe6f7f991f930fb68e')
|
||||
'0006-archbuild-no-setarch.patch'
|
||||
'0007-arch-nspawn-keep-stderr.patch')
|
||||
md5sums=('a8d1234c6c7b936a850858e3bc03b2c8'
|
||||
'0e45d16790108fc111419ae9bd59dd46'
|
||||
'3e280d1d9cd35ae00c162540bd61b928'
|
||||
'5bd85e32b390eafbf6407ec49eba44f8'
|
||||
'f362832cb3f83b0fb1d7be837c03a21c'
|
||||
'89b2887b77b08a75056c47eb9496aadd'
|
||||
'b1ca4df008be9fa5bc6b09dc9c31d8c1'
|
||||
'2ee1b1680bd794187fbbe277eca32be1')
|
||||
|
||||
prepare() {
|
||||
cd "${_pkgname}-${pkgver}"
|
||||
|
|
@ -38,6 +40,7 @@ prepare() {
|
|||
patch -p1 -i ../0004-arch-nspawn-arm-fix.patch
|
||||
patch -p1 -i ../0005-makechrootpkg-no-default-logging.patch
|
||||
patch -p1 -i ../0006-archbuild-no-setarch.patch
|
||||
patch -p1 -i ../0007-arch-nspawn-keep-stderr.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
Loading…
Reference in a new issue