mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
alarm/devtools-alarm to 20151129-1
This commit is contained in:
Kevin Mihelich
parent
74e0016b6c
commit
c23e8cc456
8 changed files with 31 additions and 59 deletions
|
|
@ -1,7 +1,7 @@
|
|||
From 270fc7be6bfab43cb0e7451d7b60acfa14e5915d Mon Sep 17 00:00:00 2001
|
||||
From cb456c4fa987a07e9ff07058f8edddce38b78ca3 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/7] makechrootpkg: cache dir
|
||||
Subject: [PATCH 1/6] makechrootpkg: cache dir
|
||||
|
||||
---
|
||||
makechrootpkg.in | 10 ++++++++--
|
||||
|
|
@ -55,5 +55,5 @@ index 3c8a20f..64bdbcb 100644
|
|||
--bind-ro="$SRCDEST:/srcdest_host" \
|
||||
"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
|
||||
--
|
||||
2.5.2
|
||||
2.6.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
From 740e9c34465918fb67963f38b923ee821908b3d1 Mon Sep 17 00:00:00 2001
|
||||
From ba27d39600d09455e1741a15044a4d2df6c9eabb 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/7] arch-nspawn: keep mirrorlist
|
||||
Subject: [PATCH 2/6] arch-nspawn: keep mirrorlist
|
||||
|
||||
---
|
||||
arch-nspawn.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch-nspawn.in b/arch-nspawn.in
|
||||
index 19f1410..20726e8 100644
|
||||
index 357d950..f9c2ffb 100644
|
||||
--- a/arch-nspawn.in
|
||||
+++ b/arch-nspawn.in
|
||||
@@ -73,7 +73,7 @@ build_mount_args() {
|
||||
|
|
@ -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.5.2
|
||||
2.6.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From ebbe6cb1aebe334184d1fb7a54d954e6e33dcd8e Mon Sep 17 00:00:00 2001
|
||||
From f81c6b778a9057e54d633c66bdd6de24c028faea 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/7] makechrootpkg: distcc
|
||||
Subject: [PATCH 3/6] makechrootpkg: distcc
|
||||
|
||||
---
|
||||
makechrootpkg.in | 5 ++++-
|
||||
|
|
@ -24,5 +24,5 @@ index 64bdbcb..ae2b3a3 100644
|
|||
|
||||
move_products() {
|
||||
--
|
||||
2.5.2
|
||||
2.6.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From e1d7f3e29da6557dc3b8f008fb4b3abd06a18dc5 Mon Sep 17 00:00:00 2001
|
||||
From c98f3cc8414affb83161bf5f18172dc4d34718e3 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/7] arch-nspawn: arm fix
|
||||
Subject: [PATCH 4/6] arch-nspawn: arm fix
|
||||
|
||||
---
|
||||
arch-nspawn.in | 2 +-
|
||||
|
|
@ -9,15 +9,15 @@ Subject: [PATCH 4/7] arch-nspawn: arm fix
|
|||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch-nspawn.in b/arch-nspawn.in
|
||||
index 20726e8..3f3d563 100644
|
||||
index f9c2ffb..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 ${CARCH:+setarch "$CARCH"} systemd-nspawn 2>/dev/null \
|
||||
+exec systemd-nspawn 2>/dev/null \
|
||||
-exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
|
||||
+exec systemd-nspawn -q \
|
||||
-D "$working_dir" \
|
||||
--register=no \
|
||||
"${mount_args[@]}" \
|
||||
|
|
@ -39,5 +39,5 @@ index ae2b3a3..104f54f 100644
|
|||
fi
|
||||
(( $? != 0 )) && die "Could not download sources."
|
||||
--
|
||||
2.5.2
|
||||
2.6.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From 224229bd0c3812c796f45c3fb623c693806a8b8a Mon Sep 17 00:00:00 2001
|
||||
From 6027ea9d3d63da7d91f8153537644259fc58c2d2 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/7] makechrootpkg: no default logging
|
||||
Subject: [PATCH 5/6] makechrootpkg: no default logging
|
||||
|
||||
---
|
||||
makechrootpkg.in | 2 +-
|
||||
|
|
@ -21,5 +21,5 @@ index 104f54f..88363c9 100644
|
|||
update_first=false
|
||||
clean_first=false
|
||||
--
|
||||
2.5.2
|
||||
2.6.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
From ed9a17b1307489ae390cf25d35fb6b298eebfda4 Mon Sep 17 00:00:00 2001
|
||||
From 515e0bd96effaf05e0e407570cf04947e9b9a684 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/7] archbuild: no setarch
|
||||
Subject: [PATCH 6/6] archbuild: no setarch
|
||||
|
||||
---
|
||||
archbuild.in | 2 +-
|
||||
|
|
@ -21,5 +21,5 @@ index 9c5d706..a4b5bed 100644
|
|||
-M "@pkgdatadir@/makepkg-${arch}.conf" \
|
||||
"${chroots}/${repo}-${arch}/root" \
|
||||
--
|
||||
2.5.2
|
||||
2.6.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
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=20151002
|
||||
pkgver=20151129
|
||||
pkgrel=1
|
||||
pkgdesc='Tools for Arch Linux ARM package maintainers'
|
||||
arch=('any')
|
||||
|
|
@ -21,16 +21,14 @@ 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'
|
||||
'0007-arch-nspawn-keep-stderr.patch')
|
||||
md5sums=('a8d1234c6c7b936a850858e3bc03b2c8'
|
||||
'0e45d16790108fc111419ae9bd59dd46'
|
||||
'3e280d1d9cd35ae00c162540bd61b928'
|
||||
'5bd85e32b390eafbf6407ec49eba44f8'
|
||||
'f362832cb3f83b0fb1d7be837c03a21c'
|
||||
'89b2887b77b08a75056c47eb9496aadd'
|
||||
'b1ca4df008be9fa5bc6b09dc9c31d8c1'
|
||||
'2ee1b1680bd794187fbbe277eca32be1')
|
||||
'0006-archbuild-no-setarch.patch')
|
||||
md5sums=('86fe057b7180ce0247338e64f1a8722c'
|
||||
'755e80123ab9d6afc8bb392b9e41a5fc'
|
||||
'85a94eb74f123d420cc16db1edacd10f'
|
||||
'8a778d0f0ec93340c0ecd98df8e38527'
|
||||
'adf75517838b4fdbbc3199ea2049fa73'
|
||||
'29ca8fac5cf40b5f2b83a16b9eb968f8'
|
||||
'9182e6ab4f3ed7a60d9263e839c0d71a')
|
||||
|
||||
prepare() {
|
||||
cd "${_pkgname}-${pkgver}"
|
||||
|
|
@ -40,7 +38,6 @@ 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