summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* abuild: rename makedepends_host virtual packageHEADmasterOliver Smith2019-08-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | With a recent change in apk [1], virtual packages of the same name will upgrade each other. Adjust abuild to this by not using the same virtual package name for two types of dependencies. This fixes the way crosscompilers are built in postmarketOS [2], which is essentially the same as running this on Alpine's gcc aport: $ cd aports/main/gcc $ C_TARGET_ARCH=armhf CTARGET=armv6-alpine-linux-musleabihf \ BOOTSTRAP=nobuildbase CBUILDROOT=/ abuild -r ... >>> gcc-armhf: Installing for host: (1/24) Upgrading .makedepends-gcc-armhf (20190714.104731 -> 20190714.104741) (2/24) Purging binutils-armhf (2.31.1-r2) ... [1] apk-tools.git 37fbafcd928c466c82c892a7868d686d710e5d07 ("add: make virtual packages upgradeable (ref #9957)") [2] https://gitlab.com/postmarketOS/pmaports/blob/master/cross/gcc-armhf/APKBUILD Fixes: https://gitlab.alpinelinux.org/alpine/apk-tools/issues/10649
* add missing backslash on rmdir commandLeo2019-07-301-1/+1
|
* abuild: remove empty dirs in main packageNatanael Copa2019-07-171-0/+6
| | | | clean up empty dirs
* abuild: add SOURCE_DATE_EPOCH supportkpcyrd2019-07-172-2/+17
|
* change ~ to /home/pdietlPete Dietl2019-07-171-2/+2
|
* abuild.in: fixup flags and usage textPete Dietl2019-07-171-3/+3
|
* Better use license.lst in abuild sanitycheckKeith Maxwell2019-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change an invalid licence= in an APKBUILD will pass `abuild sanitycheck`. '/usr/share/spdx/license.lst' contains one licence per line. `grep -x` will match partial lines whereas `grep -w` will only match whole lines. An simple demonstration is with 'GPL-3.0' which is not a valid SPDX licence identifier. 'GPL-3.0-only' and 'GPL-3.0-or-later' are valid licences. ``` $ grep --help BusyBox v1.30.1 (2019-04-26 06:26:16 UTC) multi-call binary. Usage: grep [-HhnlLoqvsriwFE] [-m N] [-A/B/C N] PATTERN/-e PATTERN.../-f FILE [FILE]... Search for PATTERN in FILEs (or stdin) ✂ -w Match whole words only -x Match whole lines only ✂ $ grep -w -F GPL-3.0 /usr/share/spdx/license.lst GPL-3.0-only GPL-3.0-or-later $ grep -x -F GPL-3.0 /usr/share/spdx/license.lst $ ```
* abuild-fetch: use local insecure variabletcely2019-07-171-3/+3
|
* abuild-fetch: when http:// was used, ignore https:// problemstcely2019-07-171-1/+2
|
* abuild-fetch: add -k (insecure as in curl) optiontcely2019-07-171-1/+11
|
* newapkbuild: make python packages only depend on setuptoolsNatanael Copa2019-07-171-1/+1
| | | | They normally don't need the python3-dev.
* newapkbuild: add py3-setuptools to python apkbuildRuss2019-07-171-1/+1
| | | | | | Seeing as the default python build/check/package apkbuild functions call `setup.py` and that relies on `py3-setuptools`, perhaps it should be added to the makedepends. Inspiration from https://github.com/alpinelinux/aports/pull/7641#pullrequestreview-234326397
* make default_static depend on depends_staticLeo2019-07-172-1/+3
| | | | keeps it in line with other default_ functions.
* abuild.in: make is_x_package functions reliant on being given a nameLeo2019-07-171-2/+2
|
* Fix condition check for adding static libraries to -dev package.Leo2019-07-081-1/+1
| | | | | This was the wrong way, we only want to add the static library to the -dev package when there isn't a -static package.
* abuild-sudo: don't allow --keys-dirMax Rees2019-06-201-3/+15
| | | | | | | | | | | | | | | | | | | | | | Not allowing --allow-untrusted is obviously a good idea, but it can be trivially bypassed if --keys-dir is allowed: $ abuild-apk add foo-1-r0.apk ERROR: foo-1-r0.apk: UNTRUSTED signature $ abuild-apk --allow-untrusted add foo-1-r0.apk abuild-apk: --allow-untrusted: not allowed option $ cp -rp /etc/apk/keys /tmp/keys $ cp untrusted.pub /tmp/keys $ abuild-apk --keys-dir /tmp/keys add foo-1-r0.apk (1/1) Installing foo (1-r0) OK: 4319 MiB in 806 packages If both --allow-untrusted and --keys-dir are not allowed, then it should no longer be possible for an unprivileged member of the abuild group to add an untrusted package. $ abuild-apk --keys-dir /tmp/keys add foo-1-r0.apk abuild-apk: --keys-dir: not allowed option
* ==== release 3.4.0 ====Natanael Copa2019-06-141-1/+1
|
* ==== release 3.4.0_rc5 ====Natanael Copa2019-06-121-1/+1
|
* apkbuild-cpan.in: add OR to licenses to indicate perl_5 GPL or artistic is a ↵Timothy Legge2019-06-121-1/+1
| | | | choice
* abuild usage fix: fetch does not verify sourcesOliver Smith2019-06-121-1/+1
| | | | | | | | | Replace text in usage description of fetch that claims to verify sources with a suggestion to use 'abuild fetch verify', which will actually verify them. 'abuild fetch' alone will not verify sources, as it only executes the fetch() function.
* APKBUILD.5: match install_if example to abuild.inKeith Maxwell2019-06-121-3/+3
| | | | | This change makes the example in the description of install_if in the APKBUILD man page match abuild.in:1791.
* newapkbuild: use current directory for cmakeRuss2019-06-121-1/+1
|
* newapkbuild: quote pkgname and pkgvertcely2019-06-121-2/+2
| | | | These are strings after all and should be quoted even if not strictly necessary because of tradition excluding spaces from package names.
* newapkbuild.in: add default check() for meson packages.Leo2019-06-121-0/+6
|
* Cosmetic: newapkbuild: comment for check sectionsOliver Smith2019-06-121-0/+1
| | | | | Add a '# Check sections' comment, for consistency with the equally commented build and package sections.
* newapkbuild: fix empty function regressionOliver Smith2019-06-121-0/+27
| | | | | | | | | | | | | | | | | | | | Since the obsolete 'cd "$builddir"' statements have been removed in [1], build(), check() and package() can generate empty functions if no build system is specified or if there is no default for the given build system. newapkbuild will then fail, as it tries to parse the script it generated: $ cd /home/pmos && newapkbuild test /usr/bin/abuild: /home/pmos/test/APKBUILD: line 18: syntax error: unexpected "}" $ cat test/APKBUILD ... build() { } ... Fix this by placing ":" in functions that would be empty. [1]: f83d19ce79ab9f2dcc5238346a910cd18ae0f330
* ==== release 3.4.0_rc4 ====Natanael Copa2019-05-031-1/+1
|
* abuild: fix -openrc to work with multiple subpackagesNatanael Copa2019-05-031-1/+1
| | | | allow a single APKBUILD have multiple -openrc subpackages.
* abuild.in: fix warning with gawk-5.0Leo2019-04-301-1/+1
| | | | awk: cmd. line:1: warning: regexp escape sequence `\#' is not a known regexp operator
* ==== release 3.4.0_rc3 ====Natanael Copa2019-04-301-1/+1
|
* abuild: cleanup default_dbgNatanael Copa2019-04-301-20/+18
| | | | | | | | | Run the loop in a subshell via a pipe so we dont need a subshell for each iteration. Use `if ...; then` to make code slightly more readable. Fix a whitespace before tab while at it.
* abuild: default_dbg: do not trigger trap with test failuretcely2019-04-301-0/+1
| | | | Resolves alpinelinux/abuild#71
* abuild.in: remove duplicate options_has callLeo2019-04-291-1/+1
|
* abuild: default_dbg: eliminate side effectstcely2019-04-291-17/+18
| | | | | | | | | | | - do not overwrite variables srcdir is very important for abuild operation - quoted various paths - use a sub-shell to contain directory changing Resolves alpinelinux/abuild#58
* ==== release 3.4.0_rc2 ====Natanael Copa2019-04-291-1/+1
|
* abuild-clean: add option to make files writable before cleanupKevin Daudt2019-04-291-0/+3
| | | | | | | | | | | Some projects might leave files which are not writable for the current user. The cleanup process then fails and leaves files / directories behind. This can easily be fixed by making everything writable before removing the files. Add the option 'chmod-clean' which does just that.
* abuild: change word choice in commenttcely2019-04-291-1/+1
|
* abuild: fix whitespace before EOLNatanael Copa2019-04-291-1/+1
|
* abuild: provide a default_static() and static() functionsLeo2019-04-291-2/+37
| | | | - Also check for static archives and warn on lack of static subpackage
* newapkbuild: remove obsolete cd statementsIkke2019-04-291-3/+0
| | | | Since `$builddir` is officially supported and abuild automatically cd's to `$builddir`, it does not need to be part of the template anymore.
* Revert "abuild: replace command -v with which to fix build issues"Mike Sullivan2019-04-291-1/+1
| | | | | | This reverts commit 57f2830739e31f9c73d2edaf5103502fbdae6822. https://github.com/alpinelinux/aports/pull/7203 fixes the original problem
* apkbuild-cpan.in: Update licenses to spdx format and remove redundant ↵Timothy Legge2019-04-291-9/+4
| | | | directory change
* abuild-fetch: enable curl certificate verificationtcely2019-04-291-2/+2
|
* APKBUILD.5: sort depends_* descriptionstcely2019-04-291-2/+2
|
* functions: adjust armhf tripletLuca Weiss2019-04-291-1/+1
| | | | | From what I could find, it was changed to -musleabihf during the Alpine 3.6 release cycle but this function was never updated to reflect that
* Revert "abuild: unset depends for subpackages"Natanael Copa2019-04-251-1/+0
| | | | | | | | | | | | | | | Apparently there are many packages that does soemthing like: subpackages="$pkgname-foo:_foo" _foo() { depends="$depends something-else" } and thus depend on the previous behavior. We need to revert and plan this better. This reverts commit 8fbbffd201a28a06804c7f6d3a2b5cd948c6ce07.
* APKBUILD.5: document depends_* variables for -doc and -openrcSören Tempel2019-04-091-0/+4
|
* abuild: add depends_libs variable to default_libs()Sören Tempel2019-04-092-0/+3
| | | | | | | | | Other subpackage such as -dev, -doc and even -openrc allow adjusting depends of the subpackage through such a variable. This is, for instance, useful to remove a dependency of the origin package from the -libs subpackage. While at it document it in APKBUILD(5).
* ==== release 3.4.0_rc1 ====Natanael Copa2019-04-051-1/+1
|
* get and use pkgdesc from cpan api data if the module has no metadata files ↵Timothy Legge2019-04-031-1/+2
| | | | (returnes unknown)