diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-19 09:26:16 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-19 09:26:16 +0000 |
| commit | f6030ee416b3fa9339bca737f6b76180e5963f3a (patch) | |
| tree | 4a7fabe8fce4338aa6b4826aefbdb15f9c097a1f /main | |
| parent | 5099d853bd3c972ad4a83a31d1499b157559a5a6 (diff) | |
| download | aports-f6030ee416b3fa9339bca737f6b76180e5963f3a.tar.bz2 aports-f6030ee416b3fa9339bca737f6b76180e5963f3a.tar.xz | |
main/abuild: support for optional remote logging
Diffstat (limited to 'main')
| -rw-r--r-- | main/abuild/0001-abuild-add-support-for-optional-remote-logging.patch | 60 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 12 |
2 files changed, 68 insertions, 4 deletions
diff --git a/main/abuild/0001-abuild-add-support-for-optional-remote-logging.patch b/main/abuild/0001-abuild-add-support-for-optional-remote-logging.patch new file mode 100644 index 0000000000..75c653bc7e --- /dev/null +++ b/main/abuild/0001-abuild-add-support-for-optional-remote-logging.patch @@ -0,0 +1,60 @@ +From 8b3ecdf1f4f120878a43da89afeed62533acb6c4 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 19 Apr 2013 11:22:32 +0200 +Subject: [PATCH] abuild: add support for optional remote logging + +via ABUILD_LOG_CMD config option + +This is supposed to be used on the build servers +--- + abuild.in | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/abuild.in b/abuild.in +index 284ee6f..76a0806 100755 +--- a/abuild.in ++++ b/abuild.in +@@ -5,7 +5,7 @@ + # + # Distributed under GPL-2 + # +-# Depends on: busybox utilities, fakeroot, ++# Depends on: busybox utilities, fakeroot + # + + abuild_ver=@VERSION@ +@@ -52,8 +52,13 @@ monochrome() { + #colors + if [ -n "$USE_COLORS" ]; then + default_colors +-fi +- ++fi ++ ++# run optional log command for remote logging ++logcmd() { ++ ${ABUILD_LOG_CMD:-true} "$@" ++ return 0 ++} + + # functions + msg() { +@@ -87,6 +92,7 @@ error() { + local fake="${FAKEROOTKEY:+${BLUE}*${NORMAL}}" + local name="${STRONG}${subpkgname:-$pkgname}${NORMAL}" + printf "${prompt} ${name}${fake}: %s\n" "$1" >&2 ++ logcmd "ERROR: $pkgname: $1" + } + + error2() { +@@ -1161,6 +1167,7 @@ mklinks_abuildrepo() { + build_abuildrepo() { + local d apk + if ! apk_up2date || [ -n "$force" ]; then ++ logcmd "building $pkgname" + sanitycheck && builddeps && clean && fetch && unpack \ + && prepare && mkusers && rootpkg || return 1 + fi +-- +1.8.2.1 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index b360f346ad..5e93df766d 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -3,7 +3,7 @@ pkgdesc="Script to build Alpine Packages" pkgname=abuild pkgver=2.14.1 _ver=${pkgver%_git*} -pkgrel=2 +pkgrel=3 url=http://git.alpinelinux.org/cgit/abuild/ depends="fakeroot file sudo pax-utils openssl apk-tools>=2.0.7-r1 abuildhelper curl libc-utils" @@ -16,6 +16,7 @@ license=GPL-2 source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$_ver.tar.bz2 0001-buildrepo-parse-APKBUILDs-in-subshell.patch 0001-buildrepo-set-REPODEST-when-running-abuild.patch + 0001-abuild-add-support-for-optional-remote-logging.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -55,10 +56,13 @@ cpan() { md5sums="ec7c8e453d4331ac20c164c263234f02 abuild-2.14.1.tar.bz2 d44821805530e9e57a4e27f8fe7f2970 0001-buildrepo-parse-APKBUILDs-in-subshell.patch -1b0e56775cace496612afc9e2e233ff9 0001-buildrepo-set-REPODEST-when-running-abuild.patch" +1b0e56775cace496612afc9e2e233ff9 0001-buildrepo-set-REPODEST-when-running-abuild.patch +63379b334ed76c562ee07fb3a0ba506a 0001-abuild-add-support-for-optional-remote-logging.patch" sha256sums="e9ee3df70118f4f5eb6aca00570c8fb8fb5cf79ed08eb653929116384af77c35 abuild-2.14.1.tar.bz2 d30ff115fe3595c1dbc8efaeb13233527148ac72c966521f04b9c166a5cceee3 0001-buildrepo-parse-APKBUILDs-in-subshell.patch -e33d919078c122b426d09bab7a761bb880fee0d36cc23a4de5114e6f3829f235 0001-buildrepo-set-REPODEST-when-running-abuild.patch" +e33d919078c122b426d09bab7a761bb880fee0d36cc23a4de5114e6f3829f235 0001-buildrepo-set-REPODEST-when-running-abuild.patch +5a191d2f984c65cdc3d1cb496d04711c0f6b33906974e4864536a7ef373b5081 0001-abuild-add-support-for-optional-remote-logging.patch" sha512sums="3eb14b4d4a104c459a7689d862e9efc29b0a5585101af25604248ad6453c7538c56bfe59f4250e3c56357db37dbf7c04115338c55a4ac0231bb3a61545a83cdf abuild-2.14.1.tar.bz2 775f1ae3128b4083b33c162e572ce2ef438385f5a40145e719331feb60e10e6ad4d0d2c9a9c7f639a7bd53bb01d93b6e23de030b2a22916f275fcaa1fd34e043 0001-buildrepo-parse-APKBUILDs-in-subshell.patch -caea0aad0efbc67b4fe8989d5cc9a07c4d99b4882ec7215fb3c769f2f3f7e0a9ab4ac7f0ebbaced05435a797af03328a146c963b5ade6139a7c8fffad167e1c1 0001-buildrepo-set-REPODEST-when-running-abuild.patch" +caea0aad0efbc67b4fe8989d5cc9a07c4d99b4882ec7215fb3c769f2f3f7e0a9ab4ac7f0ebbaced05435a797af03328a146c963b5ade6139a7c8fffad167e1c1 0001-buildrepo-set-REPODEST-when-running-abuild.patch +0d7625621f85fa4798463c83170a6bad4e26521baa99338009e699939fd09897b68334f950ded22e379acb3542a5002af0d47d8beea27d939a4b3a2b8970cfd2 0001-abuild-add-support-for-optional-remote-logging.patch" |