Commit Graph

1209 Commits

Author SHA1 Message Date
Natanael Copa 43fb2c012e add basic tests using bats 2019-11-07 11:32:37 +00:00
Jakub Jirutka a8f564287e newapkbuild: simplify source URL derived from GitHub URL
GitHub allows to reference https://github.com/<user>/<proj>/archive/<ver>.tar.gz
also as https://github.com/<user>/<proj>/archive/<ver>/<anything>.tar.gz.
2019-10-27 20:35:10 +01:00
Jakub Jirutka 6c3b2e6b58 newapkbuild: run cargo install with --locked
This forces cargo to install the exact versions of the dependencies
specified in Cargo.lock. This is essential for reproducible builds!
2019-10-27 13:50:53 +01:00
Natanael Copa b09bdddff3 abuild: remove unused print_version function
the function is not used since commit  3379e67551 (abuild: print
version of built package early)
2019-10-01 16:56:47 +00:00
Natanael Copa 511b934182 abuild: add -V for print abuild version 2019-10-01 16:51:21 +00:00
Natanael Copa 66177eb5ec abuild: only set sysconfdir in functions.sh
we set sysconfdir in functions.sh so there is no need to set it in
abuild.
2019-10-01 16:20:53 +00:00
Leo 1c075c2855 Fix package version check on checkapk
The assignment of the oldpkg variable is missing the name of the package
2019-10-01 17:14:36 +01:00
Rasmus Thomsen 05eee44039 newapkbuild: add rust support 2019-10-01 17:12:19 +01:00
Joseph Burt f9da71cc68 apkbuild-cpan.in: add 'configure' prereqs
Prereqs from the 'configure' phase also belong in makedepends
2019-10-01 17:08:51 +01:00
Joseph Burt baf17c8dd7 apkbuild-cpan.in: always start pkgver with a digit
The 'version' string from CPAN can start with 'v...' or similar.
2019-10-01 17:08:51 +01:00
Leo dbf0e80e62 Make default_dev move to /usr/share/pkgconfig 2019-10-01 17:01:11 +01:00
Leo 6e5bd59d6f Add support for parsing pkg-config files in /usr/share/pkgconfig 2019-10-01 16:37:42 +01:00
Natanael Copa aa86438443 abuild: add amove func to move from $pkgdir to $subpkgdir
moving files and directories from $pkgdir to $subpkgdir is a common
pattern, so make a helper function for this.

usage: amove FILESPEC...

FILESPEC is a list of files or patterns/globs that will be exanded by
the shell.

amove will clean up empty directories after moving the files/dirs.

Example usage:

  amove 'usr/lib/lib*.a'
  amove 'etc/*.d' # moves both etc/conf.d and etc/init.d
  amove 'lib/*.so' 'usr/lib/*.so'

  cd "$pkgdir"
  find usr -name '*.h' | xargs amove

This is based on the work of Chloe Kudryavtsev:
https://github.com/alpinelinux/abuild/pull/92
2019-10-01 16:25:45 +01:00
Natanael Copa 610f1982ef Makefile: clean *.o files 2019-10-01 15:00:31 +01:00
Natanael Copa f9707808ef abuild: various USE_CCACHE fixes
- set PATH in the rootbld environment so ccache is actually used.

- drop the check for command -v ccache. ccache will be pulled in as
  build dependency so we don't need to die if its missing.

- create ~/.ccache if missing rather than die. This directory will
  normally be created by ccache itself, but we need to create it so we
  can bind mount it incase of rootbld.

- don't die if ccache.conf is missing. ccache will create it.
2019-10-01 13:13:43 +00:00
Natanael Copa 3ca7660b66 abuild: only set up ccache in rootbld when USE_CCACHE is set
avoid install ccache and bind mount ~/.ccache when USE_CCACHE is not
set.

This fixes bind mount error when ~/.ccache is missing and USE_CCACHE is
unset.
2019-10-01 12:49:49 +00:00
Joseph Benden b1b47140ea feat: add support for ccache
This introduces basic support for ccache, during packaging builds.

If you are building many packages, it is recommended to manually
increase the maximum size of the ccache cache. This is typically
achieved by modifying `~/.ccache/ccache.conf` and adjusting the
`max_size` setting.

Signed-off-by: Joseph Benden <joe@benden.us>
2019-09-30 12:08:17 +00:00
Richard Mortier 9be3a6c6a0 abuild: simplify depends_static
Should not be any significant functional difference.
2019-09-30 12:05:28 +00:00
tcely 5486d877c5 abuild: -static depends on -dev by default
When you have `-dev` and install `-libs-static`, for example,
it helps to only need to add one to `makedepends` instead of both.

After a grep of the current aports, it turns out matching the
prefix of `subpkgname` will be more useful.
2019-09-30 11:58:20 +00:00
Pete Dietl 7a8b3a8e7d Allow for git remote url to end in aports.git, (i.e., allow SSH git remotes) 2019-09-30 10:35:01 +00:00
Timothy Legge 6310405af8 apkbuild-pypi.in: fix bugs, upgrade for python3 only and add to make 2019-08-09 09:32:34 +00:00
Natanael Copa 0d4bb95046 gitignore apkbuild-pypi 2019-08-09 09:32:02 +00:00
Natanael Copa 9c284d4c33 abuild: convert -{alpha,beta,rc,pre} version suffixes from pkgconf
convert version suffixes in pkgconf modversion to something apk
can deal with.
2019-08-09 08:21:37 +00:00
Natanael Copa 7edafd8c75 abuild: verify that the pkgconf version is valid 2019-08-09 08:16:41 +00:00
Kaarle Ritvanen baa554477e abuild: install dependencies from other repos 2019-08-07 14:30:46 +03:00
Kaarle Ritvanen 9a398eac0c abuild: remove recursive mode
This functionality is no longer needed by the build servers and is broken as it
does not handle
* provides= tags
* automatic dependencies added by trace_apk_deps()
* inter-repository dependencies
* circular dependencies caused by the unit tests in check()
2019-08-07 14:22:31 +03:00
Oliver Smith c54d39d8aa abuild: rename makedepends_host virtual package
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
2019-08-05 11:57:21 +00:00
Leo cb3a67edca add missing backslash on rmdir command 2019-07-30 05:48:40 +00:00
Natanael Copa b8b8a651fc abuild: remove empty dirs in main package
clean up empty dirs
2019-07-17 13:57:17 +00:00
kpcyrd ba16a67781 abuild: add SOURCE_DATE_EPOCH support 2019-07-17 13:11:20 +00:00
Pete Dietl 2c2a518ac7 change ~ to /home/pdietl 2019-07-17 12:47:12 +00:00
Pete Dietl beb1b41054 abuild.in: fixup flags and usage text 2019-07-17 12:43:44 +00:00
Keith Maxwell e476188c6f Better use license.lst in abuild sanitycheck
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
$
```
2019-07-17 12:06:32 +00:00
tcely c9d6159637 abuild-fetch: use local insecure variable 2019-07-17 12:02:13 +00:00
tcely 59c1c4a97a abuild-fetch: when http:// was used, ignore https:// problems 2019-07-17 12:02:13 +00:00
tcely 7bd32679b3 abuild-fetch: add -k (insecure as in curl) option 2019-07-17 12:02:13 +00:00
Natanael Copa b7fd57f681 newapkbuild: make python packages only depend on setuptools
They normally don't need the python3-dev.
2019-07-17 12:00:57 +00:00
Russ bffe0efc06 newapkbuild: add py3-setuptools to python apkbuild
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
2019-07-17 12:00:11 +00:00
Leo 68a054e274 make default_static depend on depends_static
keeps it in line with other default_ functions.
2019-07-17 11:58:21 +00:00
Leo 1dd4382ea1 abuild.in: make is_x_package functions reliant on being given a name 2019-07-17 09:27:45 +00:00
Leo f6bcaee895 Fix condition check for adding static libraries to -dev package.
This was the wrong way, we only want to add the static library to the
-dev package when there isn't a -static package.
2019-07-08 11:28:38 +00:00
Max Rees 297de93aef abuild-sudo: don't allow --keys-dir
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
2019-06-20 11:36:40 +02:00
Natanael Copa 0b3f983772 ==== release 3.4.0 ==== 2019-06-14 12:13:23 +00:00
Natanael Copa c26cc11905 ==== release 3.4.0_rc5 ==== 2019-06-12 12:33:07 +00:00
Timothy Legge 00beae32aa apkbuild-cpan.in: add OR to licenses to indicate perl_5 GPL or artistic is a choice 2019-06-12 12:28:42 +00:00
Oliver Smith 7a9683a07b abuild usage fix: fetch does not verify sources
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.
2019-06-12 12:27:14 +00:00
Keith Maxwell 40e6e9995b APKBUILD.5: match install_if example to abuild.in
This change makes the example in the description of install_if in the
APKBUILD man page match abuild.in:1791.
2019-06-12 12:24:44 +00:00
Russ 2122fa7476 newapkbuild: use current directory for cmake 2019-06-12 12:21:19 +00:00
tcely 49c7560c86 newapkbuild: quote pkgname and pkgver
These are strings after all and should be quoted even if not strictly necessary because of tradition excluding spaces from package names.
2019-06-12 12:20:35 +00:00
Leo b743186dfe newapkbuild.in: add default check() for meson packages. 2019-06-12 12:19:58 +00:00