| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
Changes:
* argument sanity checks:
* `PKGNAME[-PKGVER] | SRCURL`
* check if missing
* check if specified more than once (see below)
* specifying more than one buildtype flag
* `-n` (set pkgname) without using SRCURL as last argument
* `-s` (sourceforge source) without using PKGNAME as last argument
* Typo fix: exist -> exists
* `usage()`:
* always print PKGNAME and PKGDESC (instead of NAME and DESC,
NAME was used in one place and PKGNAME in another)
* link to <https://spdx.org/licenses/>
* `-m` (meson) flag was missing in short usage line at the top
* indicate that the buildtypes are exclusive
* `-c` flag: remove "to new directory" wording to make the
message shorter (this should be obvious)
* remove empty line at the end
NOTE: Before this commit, the `PKGNAME[-PKGVER] | SRCURL` was allowed
to be specified more than once, and the code looped over the arguments.
But this was not documented in `usage()` and had unexpected results:
```
$ newapkbuild first second third
$ tree
.
___ first
___ APKBUILD
___ first
___ ___ APKBUILD
___ ___ first
___ ___ ___ APKBUILD
___ ___ ___ src
___ ___ src
___ src
```
|
|
|
|
scanelf may pick up tempfiles created by strip or setfattr since it runs
in spearate process and pipes the out to a subshell. This causes a race
and may lead to the while loop attempt to strip seomthing that no longer
exists.
We fix that by test if file exists before try manipulate it. We could
have written he file list to a temp file first, but this way we benefit
from multiple cores working in parallel.
|
|
unpack will no longer unpack without a checksum, even with -f. This
means that newapkbuild will not be able to deduce what kind of build
system is contained within, so the templates for CMake, Perl, etc are
never used.
This patch ensures checksumming is done right after fetch, so that
unpack works properly.
|
|
|
|
|
|
|
|
abuild package misleadingly stated that it will create packages in
$REPODIR (suggesting that it actually creates apks).
|
|
`git describe` by default looks for tags, but `git clone` does not clone
tags by default which causes failures on travis currently.
Also redirect `git describe` errors to /dev/null while being here.
|
|
|
|
busybox unxz does not support --threads/-T option
|
|
set git=true if git is missing so all git commands are ignored. This
simplifies the code a bit
|
|
|
|
valid operators are AND OR WITH
|
|
I've forgot to add a patch file to the source variable in an APKBUILD,
altought I did add it to the sums variable.
The error message made it
seem that I've forgot to add the file to the source directory, which led
me to check if my build system was missing the files for some reason.
Only after reading the `abuild.in` file did I understood what happened.
Hopefully this change makes the message clearer and more helpful.
|
|
|
|
licenses will be checked against the license.lst file provided by
the spdx-licenses-list package when installed except when explicitly
disabled by the !spdx options flag.
|
|
abuild, as packaged in Alpine Linux, does not depend on git. But when
you use it without git, it will print out errors like the following:
/usr/bin/abuild: line 2554: git: not found
With this commit, it saves the git_path in the beginning (just like
abuild_path). Later in the code it does not try to run git if that
variable is empty.
Notably `abuild rootbld` is already checking whether `abuild-rootbld`
is installed, and that subpackage of `abuild` does already depend on
`git`. So no additional check was added before using `git ` inside
`rootbld`.
Fixes #32
|
|
The force flag used to skip the following functions, without any
documentation in the help (-h) output:
* verify (checksum verification)
* initdcheck (check if the init scripts are openrc scripts)
* check_arch (check if the target architecture is in "arch=")
* check_libc (check if the target libc is masked in the options)
This was counter-intuitive and could even be dangerous (when one relies
on the checksum verification to prevent man-in-the-middle attacks, but
always uses the -f flag).
With this commit, it only skips check_arch and check_libc besides the
package up to date check and the help output mentions this.
|
|
|
|
|
|
Since we already check that $install is not in $source is does make
sense to also check that $triggers is not in $source.
|
|
|
|
|
|
provides cannot contain the pkgname or apk will be very unhappy.
|
|
|
|
|
|
this is needed for running some test runners such as kyua under rootbld.
|
|
|
|
when building a package with abuildd, a copy of the git checkout is cloned to /tmp, which
causes difficulties.
|
|
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.
|
|
|
|
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.
|
|
|
|
it is slightly shorter
|
|
|
|
|
|
|
|
It is documented in the help output but didn't work because getopts(1)
didn't check for that option. I am assuming the person who added cmake
support simply forgot to adjust the getopts line.
|
|
|
|
|
|
The purpose was to show abuild version in the build logs
|
|
|
|
Some CMake packages do not have cmake/ directory, but all have
CMakeLists.txt present in the root directory.
|
|
|
|
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.
|
|
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
|
|
|
|
|
|
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.
|
