Commit Graph

462 Commits

Author SHA1 Message Date
William Pitcock 4b24af9e9f abuild: add support for provider_priority
provider_priority is a number which determines what priority a package should be
given when solving a dependency graph using a provides entry instead of a direct
package, in the event of conflicts.
2017-11-02 04:51:51 +00:00
Carlo Landmeter 573925a0dc abuild: add env option to require tests
This adds an env option REQUIRE_CHECK to require testsuites to
be run. This does not clutter getopts so it can be safely removed
afterwards when we enforce tests globally. This will allow our CI
infrastructure to enforce testsuites where possible.
2017-10-26 22:14:11 +02:00
Natanael Copa 919e549a04 abuild: use provides = cmd:foo instead of 'command:foo'
it is slightly shorter
2017-10-24 13:42:38 +00:00
William Pitcock 4dfc57946e abuild: log command: providers 2017-10-20 14:53:34 +00:00
Natanael Copa a2f839fd27 abuild: only print version if we are building
The purpose was to show abuild version in the build logs
2017-09-28 10:43:28 +00:00
A. Wilcox dc4f5cb972 abuild: fix typo 2017-09-28 10:01:10 +03:00
Timo Teräs 545eed3a24 abuild: rootbld: reflect build branch in the builder hostname 2017-09-27 14:58:56 +03:00
Timo Teräs 4736a56c8e abuild: do not try to strip standalone elf images
Guile uses ELF is internal object format, and creates them as
"no machine" and "standlone" OSABI. Scanelf supports printing
OSABI, so use that to filter these out.
See: https://github.com/alpinelinux/aports/pull/1714

This also removes unneccessary 'sed' from the pipeline as it's
simple to read each field outputted by scanelf.
2017-09-26 07:27:49 +00:00
tmpfile 56b8d45079 abuild.in: remove saveas- syntax and fix sourcecheck()
As discussed in alpinelinux/aports#1438
saveas- was removed from abuild-fetch.c with https://github.com/alpinelinux/abuild/pull/20 but abuild.in slipped.
Also fixes a wget -s instance that's not supported by recent busybox (-s was changed for --spider).
/cc @kaniini
2017-09-19 12:02:57 +00:00
A. Wilcox f1faef7868 abuild: ensure a package has deps before printing them
After the first dep is printed, `shift` is called to avoid the special
case where the first dep cannot have a comma prepended.  However,
if there are no deps for a package (seen early on in the aports main
repo in acf-jquery), $# is 0.  POSIX specifies that `shift` has two
options when the shift operand (1) is greater than $#:

- if non-interactive, it can exit the shell
- if it does not exit the shell, it must return a non-zero exit code

Since we run the shell with -e, the second case folds in to the first.

BusyBox ash does not implement this behaviour, but bash does when called
as /bin/sh or when the `posix` shopt is set.
2017-09-19 12:02:57 +00:00
Natanael Copa d03366f80c abuild: avoid print version multiple times
and respect -q flag
2017-09-19 11:59:18 +00:00
Breno Leitao da720069ca abuild: Always print the builder version
Currently is hard to discover what abuild version was used on a build log.
This lack of information makes it hard to reproduce a buld failure.

This change simply adds the abuild version at all logs.
2017-09-19 11:59:18 +00:00
Natanael Copa 9a63a17228 abuild: exit with success if arch is disabled
the set -e made script exit early
2017-09-19 11:08:13 +00:00
William Pitcock eb0a7d0811 abuild: prepare_metafiles: use new /bin/sh virtual instead of hardcoded busybox dependency 2017-08-05 22:03:13 +00:00
A. Wilcox a74359e8e2 abuild: Add default split OpenRC function 2017-07-26 16:00:12 +00:00
Natanael Copa 443fc07c79 abuild: print url we are fetching
This is useful for debugging
2017-07-20 08:08:17 +00:00
Natanael Copa 1efaa3996e abuild: add sanitycheck for secfixes comment
The secfixes comment will be parsed and added to alpine-secdb. add
sanitycheck so we catch errors early.
2017-07-20 08:08:17 +00:00
Kaarle Ritvanen 90d62ca5e0 abuild: rootbld: require metapackage 2017-07-16 19:29:54 +03:00
Kaarle Ritvanen 4aa6e2ddff abuild: rootbld: improve version compatibility 2017-07-16 19:19:24 +03:00
Kaarle Ritvanen e7404e1633 abuild: rootbld: require envsubst 2017-07-16 19:19:24 +03:00
Kaarle Ritvanen cf18bf6ed9 abuild: rootbld: make mkusers work 2017-07-06 17:45:20 +03:00
Kaarle Ritvanen ee52fee11c abuild: rootbld: always require repo template 2017-07-06 16:17:31 +03:00
Kaarle Ritvanen e3a2e14ffa abuild: build in chroot
This patch is based on earlier work by Timo Teräs.
2017-06-27 14:52:50 +03:00
Kaarle Ritvanen 6ff70e3763 abuild: disable trap when entering the handler 2017-06-27 14:52:50 +03:00
Carlo Landmeter 9605ce1792 abuild: add config option to globally enable dbg 2017-06-27 08:06:45 +02:00
A. Wilcox 610bf6c281 abuild: fix bad git merge 2017-06-23 18:56:00 +03:00
A. Wilcox f39ef92cde abuild: use portable awk exponentiation operator 2017-06-23 11:27:41 +03:00
A. Wilcox 597a7f167b abuild: call tar portably 2017-06-23 11:27:41 +03:00
A. Wilcox 9dd4a70eb3 abuild: Correctly comment default_dbg 2017-06-23 11:27:41 +03:00
A. Wilcox 67f297d3ac abuild: Add verbose option '-v' to show everything 2017-06-23 11:27:41 +03:00
Andrej 56355bff21 Allow $patch_args to pass multiple arguments to patch 2017-06-21 18:15:06 +00:00
Shiz 79525de509 abuild: add !checkroot option to run tests without fakeroot
Due to fakeroot being very permissive with regards to file permissions,
some package testsuites that explicitly check for failing permission checks
will fail.

For those testsuites, give the APKBUILD the option to run the tests outside
of a fakeroot environment.
2017-06-21 18:14:32 +00:00
Oliver Smith 3d74cd9e8e Add parameter '-D' for alternative APKINDEX description
This patch allows to set a nice description for the APKINDEX, in case
the aport that is being built is not inside a git repository.

I have tested it, and it behaves exactly like without the patch,
even when git is not installed, or the folder is not inside a git repository:
The `|| true` at the end of the DESCRIPTION= line makes sure, aport
does not get aborted, just like it does not get aborted in that case
as of now, as the `git describe` command gets executed in a subshell.
2017-06-21 18:13:18 +00:00
A. Wilcox c8253dc83a abuild: More readable message for missing dependencies 2017-06-12 09:39:46 +00:00
Breno Leitao 5b7b1f80cb abuild: Add support for lzip source packages
Currently abuild does not understand .tar.lz packages, which blocks
the inclusion of certain packages in Alpine Linux.

I found this issue when adding 'ed' package to the repository. With
this change, abuild package will now depend on lzip package. I might
send a patch for abuild's APKBUILD.
2017-04-08 16:28:09 +00:00
Natanael Copa ecc1f509c6 abuild: set -e fix for update_config_{sub,guess} 2017-04-04 13:12:48 +00:00
William Pitcock 1ddc910eb3 abuild: wrap check() with fakeroot 2017-03-27 19:38:38 +00:00
William Pitcock dec68bd03f abuild: use new PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH env variable to disable the SAT solver 2017-03-27 06:00:03 +00:00
Natanael Copa 76f3ac4058 abuild: fix -K option
make sure we don't delete files when -K is specified

fixes #7008
2017-03-24 11:32:09 +00:00
William Pitcock 834cb718f6 abuild: if ABUILD_BOOTSTRAP environment variable is set, do not ever enable check() or checkdepends 2017-03-21 09:28:34 +00:00
Natanael Copa 3b61bfb644 abuild: fix runpart
we need to run the function for runpart in the same shell, otherwise we
will lose the global variables set in the split functions.
2017-03-21 08:05:44 +00:00
Kaarle Ritvanen 36d5193776 abuild: enable -e shell option 2017-03-07 12:29:38 +02:00
Kaarle Ritvanen d8174e4f3a abuild: fix dependency checking
- versioned dependencies
- dependencies on 'provides' tags or library names
2017-03-07 12:29:38 +02:00
William Pitcock c909c82ac2 abuild: expand on APKBUILD check() warning message 2017-02-28 08:22:36 +00:00
Timo Teräs 32dbf36f0e abuild: use BOOTSTRAP to determine if build-base is needed
Just checking the build, host and target triplet is not enough
due to various different combinations used in the early bootstrap.
So use detect specifical bootstrap setting.
2017-02-24 10:16:55 +02:00
Timo Teräs 5a8993e161 abuild: $depends should not part of $makedepends_build 2017-02-24 08:55:13 +02:00
Timo Teräs 53ae72567d abuild: fix setting build-base properly for cross-create/cross-build 2017-02-23 13:31:49 +02:00
Timo Teräs ad46156cc7 abuild: use $builddir in default_prepare only if it exists 2017-02-17 15:17:44 +02:00
Natanael Copa 2c1aaa5536 abuild: unset md5 and sha256 sums when updating checksum
this fixes problem with abump
2017-02-17 11:07:15 +01:00
Timo Teräs 30c5103bfb abuild: remove g++ makedepends warning from toolchain packages 2017-02-17 09:20:58 +02:00
Timo Teräs ab748f4eda abuild: make build-base target specific 2017-02-16 16:07:27 +02:00
Timo Teräs 6fa4c26226 abuild: allow injecting extra dependencies for bootstrap
Allowing bootstrap.sh to inject extra dependencies for build/host/target,
simplifies things greatly in the bootstrap script.
2017-02-16 15:18:16 +02:00
Timo Teräs 9d2567f1e6 abuild: preserve xattrs when creating -dbg 2017-02-09 11:32:49 +00:00
G.J.R. Timmer 21bf69f6ad abuild: fix package size calculation on certain filesystems 2017-02-08 13:10:36 +02:00
Natanael Copa ab79e3fe6f abuild: fix location of built apk
we need to replace noarch with CARCH for now
2017-02-01 11:49:40 +01:00
Timo Teräs 4442efff6e abuild: add symlinksrc target for create the source file symlinks
needed for upcoming 'rootbld' support
2017-01-31 10:23:56 +02:00
Tuomas Jaakola 520cc15fe9 abuild: support local archives 2017-01-31 10:21:13 +02:00
William Pitcock ea1db36f1f abuild: implement check and $checkdepends support.
The check() function is an APKBUILD overridable function which runs a testsuite.  The packages listed in
$checkdepends are packages which will be installed at build time only if check() will be run.
2017-01-29 09:47:25 +00:00
Valery Kartel 89d62e9d4d abuild.in: fix dealing with named remote patches (closes github #11)
for patches like:
patchname.patch::http://github/.../commit/<md5hash>.patch

use strict filename instead of the whole line
2017-01-27 06:41:59 +00:00
Timo Teräs 0ff2cf73f5 abuild: use only sha512sum
use only the strongest hash. this simplifies apkbuilds a bit.
2017-01-26 13:57:18 +02:00
Breno Leitao f41036ac3a abuild: check for ppc64le on config.guess
Currently, if aarch64 exists in config.guess, it is not updated.
This breaks spl, which has aarch64 entry, but not ppc64le.

update_config_guess should update config.guess if any of those
does not exists.
2017-01-19 22:20:42 +01:00
Timo Teräs 8bddd02b10 abuild: remove noarch files from CARCH target direct
this is where it is built too
2017-01-09 11:17:39 +02:00
xentec 971504f0ec abuild: pass --arch to apk whenever sysroot is used
so we can crosscompile for different architectures
2016-12-21 10:05:41 +00:00
Przemyslaw Pawelczyk 6b2fd4a891 abuild: make default_prepare() always end up in "$builddir"
So far default_prepare() ended up in "$builddir" only if there were any
patches.  It's better to be more consistent and make such change always.
2016-12-04 02:38:09 +01:00
Jakub Jirutka 4d6114bdce abuild: change shebang to /bin/ash
This script uses variable expansion / pattern replacement, which is not
defined in POSIX-sh. Also APKBUILDs are not required to be strictly
POSIX-sh compatible. If someone run abuild on system with e.g. dash as
/bin/sh, then it fails (and someone reported exactly that on IRC
today). Therefore abuild should explicitly use /bin/ash in shebang and
not /bin/sh.
2016-11-23 21:44:52 +01:00
Timo Teräs e18d6228e7 abuild: properly detect failure of dependency installation 2016-10-31 15:49:29 +02:00
Jakub Jirutka 4f37c8efd3 abuild: set default builddir when not defined in APKBUILD 2016-09-02 23:13:31 +02:00
Jakub Jirutka 948fedc5f7 indent heredocs when possible 2016-08-23 00:09:06 +02:00
Sören Tempel 8a4680cc74 abuild: don't overwrite existing files when using unzip in unpack
Default is asking for each file.
2016-08-18 23:45:33 +02:00
Carlo Landmeter b874a4c8cd abuild: add update_config_guess 2016-08-12 15:26:06 +02:00
Sören Tempel 4f7a4556a0 abuild: ash only always local in functions these days 2016-08-11 14:04:44 +02:00
Timo Teräs 4134332906 abuild: fix dependency tracing for cross builds 2016-08-01 14:28:44 +03:00
Timo Teräs 495dac7fa9 abuild: unify dependency installation and removal code
this fixes cross deps such as "CHOST=armhf abuild deps"
to work properly.

if makedepends is not defined the following default
will be used (as that's the definition cross-build
aware apkbuilds use):
  makedepends="$makedepends_build $makedepends_host"
2016-08-01 14:28:44 +03:00
Timo Teräs a01d11d9bc abuild: check both build and host dependencies first
So we don't waste time installing dependencies on builder if
the host dependencies are not satisfiable.
2016-08-01 14:28:44 +03:00
Timo Teräs 9207fccde2 abuild: display target arch in xterm title for cross build 2016-08-01 14:28:44 +03:00
Timo Teräs 8c8d741b32 abuild: use subpkgarch to construct the package paths everywhere 2016-08-01 14:28:44 +03:00
Timo Teräs f7e2b48d1c abuild: remove PKGDEST and install_after features
supporting these features with cross building is non-trivial
and they do are generally not useful features, so remove them.
as result the abuildrepo is also removed to write out paths.
all package generation paths now use $REPODEST/$repo/$CARCH
which allows easily writing packages to correct $subpkgarch
in future commits.
2016-08-01 14:28:44 +03:00
Timo Teräs f459607da7 abuild: use proper strip for each subpkg according to it's arch 2016-08-01 14:28:44 +03:00
Timo Teräs b217bbb2ea abuild: support subpackages="pkg:split:arch" syntax
For proper cross-build support, the subpackage arch needs to
be known before invoking the split function. This implements
a way to do that. This also changes to write the actual subpkg
arch to .PKGINFO - apk index --rewrite-arch still overwrites
index to have machine arch for noarch packages.
2016-08-01 14:28:44 +03:00
Timo Teräs 26ec31c6c2 abuild: improve cross compiling support 2016-08-01 14:28:44 +03:00
Timo Teräs b6e721580d abuild: don't set and reset xterm title when splitting subpkg
it's annoying flickering, and results the title being unset for
the time when last split is executed and packages are created.
2016-07-27 10:04:22 +03:00
Timo Teräs 34081a1719 abuild: treat subpackages items as colon separated lists
This is in preparation to support subpackages="pkg:split:arch"
syntax, and just makes the current code ignore anything after
the second colon if it exists. This allows to use the new syntax
in aports git without running experimental abuild on the official
builders.
2016-07-26 10:11:46 +00:00
Timo Teräs a1364565d2 abuild: use apk --no-scripts for target sysroot
we probably will not be able to run the scripts as it can
be incompatible system type
2016-07-23 06:20:00 +00:00
Paul Lorenz 8946d01ed7 Fix src builds
Fix filename_from_uri call
Ensure remote sources are fetched
Include remote sources in source package
Include pre/post scripts
Include trigger scripts
2016-07-20 10:24:46 +00:00
Timo Teräs 90899669c2 abuild: rename distfile copy when checksum does not match
The previous deletion of file did not work properly at all. Fix
this instead to rename the file, so we keep the previous download.
This allows builders to redownload upstream file if the checksum
has been changed in aports.
2016-07-08 13:44:31 +03:00
Timo Teräs 97d924dfed abuild: support arch="all !armhf"
this allows blacklisting architectures instead of just
whitelisting them. useful when more architectures comeabout.
2016-07-07 12:04:06 +03:00
Sören Tempel 670fc1ae14 abuild: perform unzip operations quietly
unzip(1) is verbose by default since we don't run tar(1) in verbose mode
we should run unzip with -q for consistency.
2016-07-06 12:24:59 +02:00
Timo Teräs fd02387cc1 abuild: fix cross compilation undeps()
"apk del" now returns error if the package name does not exist.
Thus when cross compiling, always install the virtual
.makedepends-$pkgname name for chroot also since undeps() will
try to uninstall it always.
2016-07-05 17:28:48 +03:00
Natanael Copa 0d1a06045b abuild: fix apk_up2date check
fix check that all subpackages exists, not only main package
2016-06-13 12:34:05 +00:00
Natanael Copa d413730550 abuild: don't cd to $builddir unless patches exists
some packages don't have patches. We should not error if builddir is not
set in this case.
2016-04-05 20:35:34 +00:00
Natanael Copa a1d23dc995 abuild: rename _builddir to builddir
the _ prefix is reserved for APKBUILD. This is to avoid use variable
names in APKBUILD that may clash with abuilds internal vars
2016-03-23 10:07:36 +00:00
Kaarle Ritvanen 18b09f9d91 abuild: set umask
consistent result regardless of current setting
2016-03-17 15:20:34 +02:00
Sören Tempel d8dabed4aa abuild: allow passing custom flags to patch(1) in prepare
To do so you need to set the patch_args variable to your desired
command line flags.
2016-03-14 15:09:10 +01:00
Timo Teräs 289400213c abuild: fix getfattr match
it's a regular expression, not shell pattern. empty match will
match everything (default is ^user\\.)
2016-02-22 14:16:13 +02:00
Timo Teräs 5c05446d07 abuild: use gnu find supported way to find suid binaries 2016-02-22 14:07:16 +02:00
Michael Zuo 251dce53e1 abuild: use standard-issue prepare by default
A majority of APKBUILDs currently use exactly the prepare() provided by
newapkbuild verbatim, even for packages where no patches exist, which
has created the expectation that patches listed as sources are applied
by default.

This rev simply adds that default prepare() to abuild (and exposes it as
default_prepare), with no configurability. If needed, default behaviour
can be overridden by providing explicitly prepare().
2016-02-22 14:04:52 +02:00
Sören Tempel 578ab740ad abuild: Respect $reporev variable when fetching git repositories
For git repositories the $reporev variable is not really used since the
$_rev variable is passed to git and $_rev was only set when $reporev was
empty.
2016-02-11 14:26:08 +01:00
Michael Zuo 8d272af174 abuild: Fix indention of the snapshot() function
The snapshot function was indented with spaces while the rest of the
code is indented with tabs.
2016-02-11 14:21:12 +01:00
Natanael Copa a2c0a6897e abuild: minor speed improvement in symlink compression
instead of forking stat once force every file with one file argument,
we fork it once with all the files as arg. This reduces number of forks.
2016-02-03 19:33:35 +00:00
Natanael Copa eee56356ab abuild: fix finding already compressed manpages 2016-02-03 19:32:30 +00:00