diff options
| author | William Pitcock <nenolod@dereferenced.org> | 2017-02-28 08:23:59 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-02-28 08:25:21 +0000 |
| commit | e9bbc2f0230a61bcab2487d867df9849eaea678e (patch) | |
| tree | f39082ee7e56cc834bc1dd8cd03382085daeeb8a /main/abuild | |
| parent | fadc96a8cfabe8028d9520eb57490590914c2156 (diff) | |
| download | aports-e9bbc2f0230a61bcab2487d867df9849eaea678e.tar.bz2 aports-e9bbc2f0230a61bcab2487d867df9849eaea678e.tar.xz | |
main/abuild: improve guidance when no check() function is defined
Diffstat (limited to 'main/abuild')
| -rw-r--r-- | main/abuild/APKBUILD | 4 | ||||
| -rw-r--r-- | main/abuild/abuild-check.patch | 27 |
2 files changed, 29 insertions, 2 deletions
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index be53402cbb..cce9c3c2c3 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=2.29.0 _ver=${pkgver%_git*} -pkgrel=9 +pkgrel=10 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -80,4 +80,4 @@ fb7d65b1c65368dfddf7e3b55774a699169eb1de63e1aa619d5a210773e912e66c6a573d7fb98d57 37f9de0e6f160f3ccbee56a973e08fcf9b4c27318023eacb47bf5ff1ee0d7f3710bef368d998a65bff0420fb73e6e05963b05af95e4beacf6a39cfe1bee95ec1 0001-abuild-preserve-xattrs-when-creating-dbg.patch 4a626c1213fa09a8000200c093b6209a57eb31be90c5cc7b4cb18eeb27c9e65fa60a92969f05dd80aa99cd91cab7c7ac16760b9aae72c5aa20883375c5c726df 0001-functions-fix-cross-compile-triplet-for-armhf-archit.patch 8390c080d6e4f90ca7d3aeb5244cc920d277f52bca9db2a42b3758a147baf045b1a95314955ba11182d635a7d90de01d5bc96f42e318ed32d6b5315b691a6ad5 0001-abuild-unset-md5-and-sha256-sums-when-updating-check.patch -d69d19b7788daba045d32ef8720c1ad64d68561e49792628ea621bd7ac81bc10280eea059c56f0e01efa0590b6f5186b0dba0240df80ea803a01e52c293ac305 abuild-check.patch" +b1e44e10aae056c7ada019f414949da293832b63872b1b9d2dd25dbb1c0795fdf09958e5fbdaf403b79fc4a0b7d58e18bed713101817c47531b39c1b5aabf548 abuild-check.patch" diff --git a/main/abuild/abuild-check.patch b/main/abuild/abuild-check.patch index f65d437909..2df7f5809e 100644 --- a/main/abuild/abuild-check.patch +++ b/main/abuild/abuild-check.patch @@ -347,3 +347,30 @@ index 5566f8e..688df6e 100644 -- 2.11.1 +From c909c82ac22563b1235082a73ee1d35fdf1c4b86 Mon Sep 17 00:00:00 2001 +From: William Pitcock <nenolod@dereferenced.org> +Date: Tue, 28 Feb 2017 08:22:36 +0000 +Subject: [PATCH] abuild: expand on APKBUILD check() warning message + +--- + abuild.in | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index b9ab5d6..22bd454 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -1456,7 +1456,9 @@ update_abuildrepo_index() { + + # predefined function check + default_check() { +- warning "APKBUILD does not run any tests - define a check() function!" ++ warning "APKBUILD does not run any tests!" ++ msg2 "Alpine policy will soon require that packages have any relevant testsuites run during the build process." ++ msg2 "To fix, either define a check() function, or declare !check in \$options to indicate the package does not have a testsuite." + } + + check() { +-- +2.11.1 + |