Commit Graph

1094 Commits

Author SHA1 Message Date
Natanael Copa
c6609b4739 move logic of curl's http range error to abuild-fetch
Move the logic of deleting partial downloads to abuild-fetch, which
knows if it is curl or wget that was executed.
2018-10-03 09:23:16 +00:00
Oliver Smith
07d9f3bf6b Fix: incomplete partfile gets renamed to distfile
Abuild-fetch uses curl (fallback to wget) to download files. They are
saved with a ".part" extension first, so they can be resumed if
necessary. When the download is through, the ".part" extension gets
removed. However, when the server does not support resume of downloads
(e.g. GitHub's on the fly generated tarballs), then the ".part"
extension got removed anyway. Abuild aborts in that case. But when
running a third time, the distfile exists and it is assumed that this
is the full download.

Changes:
* abuild-fetch:
  * Only remove the ".part" extension, when curl/wget exit with 0
  * Pass the exit code from curl/wget as exit code of abuild-fetch
  * Wherever abuild-fetch would return an exit code on its own, the
    codes have been changed to be > 200 (so they don't collide with
    curl's as of now 92 exit codes)
  * Remove undocumented feature of downloading multiple source URLs at
    a time. This doesn't match with the usage description, was not used
    in abuild at all and it would have made it impossible to pass the
    exit code.
* abuild:
  * After downloading, when curl is installed and abuild-fetch has
    33 as exit code (curl's HTTP range error), then delete the partfile
    and try the download again.
2018-10-03 08:33:52 +00:00
A. Wilcox
3d0080de5e newapkbuild.1: fix mdoc style 2018-10-03 08:24:18 +00:00
A. Wilcox
6cc2e53f3f APKBUILD.5: fix mdoc syntax warnings 2018-10-03 08:24:18 +00:00
A. Wilcox
e073ce1890 docs: Add checkdepends variable 2018-10-03 08:24:18 +00:00
A. Wilcox
10181d9f94 man: Clarify arguments to install scripts 2018-10-03 08:24:18 +00:00
A. Wilcox
03d07e200f man: Better document install scripts 2018-10-03 08:24:18 +00:00
A. Wilcox
8eb4be6c78 man: remove obsolete !libc_* options 2018-10-03 08:24:18 +00:00
A. Wilcox
6a71529fe3 man: Write requested improvements to documentation 2018-10-03 08:24:18 +00:00
A. Wilcox
3e9503bc83 Add initial manpage drafts 2018-10-03 08:24:18 +00:00
prspkt
7fc859d626 sample.APKBUILD: use https for sourceforge download links 2018-09-24 21:43:49 +02:00
prspkt
9aef4769d1 newapkbuild: use https for sourceforge download links 2018-09-24 21:43:49 +02:00
Jakub Jirutka
1820691b94 newapkbuild: fix default check function for python3
`setup.py check` does not run package tests, it performs just some check
of the package metadata. The correct command is `setup.py test`.
2018-07-29 16:21:29 +02:00
Natanael Copa
07b6609d74 ==== release 3.2.0 ==== 2018-06-22 07:24:10 +00:00
Oliver Smith
a68354ebc5 newapkbuild: check arguments and improve usage()
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
```
2018-06-21 15:30:58 +00:00
Natanael Copa
0bb0bd8498 ==== release 3.2.0_rc2 ==== 2018-05-31 16:43:10 +02:00
Natanael Copa
c0a862930c abuild: fix race when stripping
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.
2018-05-31 16:37:31 +02:00
A. Wilcox
75b8cacaf0 newapkbuild: move checksum call to after fetch
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.
2018-05-24 17:58:55 +02:00
A. Wilcox
db5ca2996a newapkbuild: fix typo 2018-05-24 17:58:55 +02:00
Jakub Jirutka
6c2fc64d74 newapkbuild: create check() function 2018-05-07 22:33:12 +02:00
Jakub Jirutka
1264917824 newapkbuild: change python to python3 2018-05-07 22:22:26 +02:00
Jonathan Sieber
20f5ea679b abuild: Fix usage info about package command
abuild package misleadingly stated that it will create packages in
$REPODIR (suggesting that it actually creates apks).
2018-04-25 00:10:15 +02:00
Sören Tempel
720a2c185e abuild.in: don't fail if git describe fails
`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.
2018-04-22 16:21:21 +02:00
Natanael Copa
be30cda326 ==== release 3.2.0_rc1 ==== 2018-04-17 21:06:32 +00:00
Natanael Copa
6d2d09840f abuild: fix unxz with threading
busybox unxz does not support --threads/-T option
2018-04-17 21:02:28 +00:00
Natanael Copa
fd97176583 abuild: simplify optional git usage
set git=true if git is missing so all git commands are ignored. This
simplifies the code a bit
2018-04-17 16:52:54 +00:00
Carlo Landmeter
6fc2f40a0d abuild: add multithread decommpressing support 2018-04-15 18:33:57 +00:00
Carlo Landmeter
683225c064 abuild: allow SPDX license operators
valid operators are AND OR WITH
2018-04-11 20:33:39 +00:00
Manuel Tiago Pereira
38620eeb9f Make file missing in source var explicit.
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.
2018-04-11 15:34:14 +00:00
Jonathan Neuschäfer
33183dadf5 Fix a few typos 2018-04-11 14:09:32 +00:00
Carlo Landmeter
e6ce1f1151 abuild: check license for valid SPDX license identifiers
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.
2018-04-11 14:07:36 +00:00
Oliver Smith
4501a6cc5e Don't print 'git: not found' errors
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
2018-03-20 15:09:58 +01:00
Oliver Smith
6981f3a6ae abuild: Change -f (force) to not ignore checksums/init scripts
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.
2018-03-16 00:40:07 +01:00
Sören Tempel
54dbf5f383 abuild: set arch for -openrc subpackage to noarch 2018-03-11 16:29:00 +01:00
Sören Tempel
f5eb69a5bd abuild: add postcheck for -openrc subpackage 2018-03-11 16:29:00 +01:00
Sören Tempel
45529e54d2 abuild.in: ensure that $triggers is not in $source
Since we already check that $install is not in $source is does make
sense to also check that $triggers is not in $source.
2018-03-11 15:56:02 +01:00
William Pitcock
051d2ced74 rootbld: if networking is enabled, copy resolv.conf into the build root 2018-03-08 00:48:04 +00:00
Natanael Copa
f1dfa55428 abuild: fix typo 2018-02-20 18:02:07 +00:00
Natanael Copa
e970c74b0e abuild: add sanitycheck of provides
provides cannot contain the pkgname or apk will be very unhappy.
2018-01-02 14:22:42 +01:00
Oliver Smith
d007f7967c newapkbuild: fix typo 2017-12-30 10:46:02 +01:00
Nils Andreas Svee
55cef04cf9 abuild: add triplet definitions for mips architectures 2017-12-11 09:04:46 +02:00
William Pitcock
0ea273ebca rootbld: allow the fake $HOME to be writable
this is needed for running some test runners such as kyua under rootbld.
2017-11-15 00:11:14 +00:00
William Pitcock
f7b19c3454 abuild: rootbld: run testsuites if requested, also handle package() only builds 2017-11-10 21:34:27 +00:00
William Pitcock
3225884ed3 abuild: rootbld: fix order of bind-mounts given to bwrap
when building a package with abuildd, a copy of the git checkout is cloned to /tmp, which
causes difficulties.
2017-11-08 05:18:10 +00:00
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
Sören Tempel
800e4a8187 newapkbuild.in: fix package_meson by escaping $pkgdir 2017-10-28 10:35:16 +02: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
6261608ece ==== release 3.1.0 ==== 2017-10-25 13:48:15 +00: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