Commit Graph

462 Commits

Author SHA1 Message Date
tcely 5b163c2d58 abuild: default_dbg: eliminate side effects
- 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
2019-04-29 20:52:23 +00:00
Kevin Daudt 2e77e3390f abuild-clean: add option to make files writable before cleanup
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.
2019-04-29 19:26:43 +00:00
tcely 1d854182dd abuild: change word choice in comment 2019-04-29 18:44:35 +00:00
Natanael Copa 30a60d4523 abuild: fix whitespace before EOL 2019-04-29 18:43:46 +00:00
Leo b849aae4b9 abuild: provide a default_static() and static() functions
- Also check for static archives and warn on lack of static subpackage
2019-04-29 18:38:22 +00:00
Mike Sullivan 369e7069b8 Revert "abuild: replace command -v with which to fix build issues"
This reverts commit 57f2830739.

https://github.com/alpinelinux/aports/pull/7203 fixes the original problem
2019-04-29 18:33:37 +00:00
Natanael Copa c0dc7acee7 Revert "abuild: unset depends for subpackages"
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 8fbbffd201.
2019-04-25 12:41:22 +00:00
Sören Tempel f92353f57b abuild: add depends_libs variable to default_libs()
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).
2019-04-09 18:01:44 +02:00
tcely 801578a06a abuild: -openrc should not inherit depends 2019-04-03 16:06:09 +00:00
Chloe Kudryavtsev 6a6310f030 Add default_cleanup_srcdir
In some cases, a simple rm -rf is not sufficent to clean srcdir.
One such case is the new go module system, that marks everything as
read-only - thus only letting root rm -rf it without a chmod.
There is a command intended to clean them - `go clean -modcache`.
However, for that to work, GOPATH must be defined and existent.
Running chmod for all srcdir cleanups makes no sense, nor does enforcing
root, or putting global overrides just for go.

This patch allows overriding what happens on `cleanup srcdir`, by
overriding cleanup_srcdir, and allows the use of default_cleanup_srcdir.

In our go example, it might be used as such:

cleanup_srcdir() {
	go clean -modcache
	default_cleanup_srcdir
}
2019-04-03 15:59:54 +00:00
Chloe Kudryavtsev 30d296ddb3 Make clean() use cleanup()
Avoid DRY issues, and increase consistency.
2019-04-03 15:57:14 +00:00
Natanael Copa 8fbbffd201 abuild: unset depends for subpackages
make sure that subpackages does not inherit main package's depends.
2019-03-21 13:42:36 +01:00
Mike Sullivan 57f2830739 abuild: replace command -v with which to fix build issues 2019-03-05 11:28:04 +00:00
Natanael Copa 376ccc5bd6 abuild: add support for pkg-config prefix pcprefix
Fix issue when two -dev packages provides same pkg-config wil but with
different versions. For example libressl-dev and openssl-dev both ships
libssl.pc and libcrypto.pc, which resulted in automatic provides of
pc:libssl and pc:libcrypto.

apk would end up picking libressl-dev over openssl-dev for packages that
had automatic pc:libssl depends (for example libssl2-dev), when
openssl-dev was the one that was used during build.

To fix this we add support for a pcprefix so we can set
pcprefix="libressl:" in libressl APKBUILD which makes libressl-dev
provide pc:libressl:libssl. This is similar to what we do with
sonameprefix.

We do not yet automatically detect when the prefixed variant should be
used so for now we will have to explicitly add libressl-dev.

ref #9959
2019-02-22 13:57:08 +00:00
Disassembler 9b04be2f79 abuild: replace $0 with $abuild_path, add $forceroot where missing 2019-01-10 16:08:51 +00:00
Natanael Copa 909623950f abuild: use pigz to compress control.tar.gz and manpages 2019-01-10 16:08:51 +00:00
Natanael Copa 13aec9a141 abuild: avoid add depends to itself
packages should never depend on themselves which does not make sense.
This may happen if main package depends on a subpackage, then the
subpackages will inherit the global depends and the subpackage ends up
depend on itself.

Fix abuild to avoid this.
2019-01-09 16:23:46 +01:00
Carlo Landmeter 2f8bbc819e abuild: fix typo 2018-12-02 19:50:28 +00:00
Tiago Ilieve 0bfe4efa99 abuild.in: add multithreaded compression
The 'Compressing data' step takes a significant amount of time when
packaging software with huge binaries, like Kubernetes. This can
certainly be shortened using multithreaded compression, like 'pigz'.
2018-11-08 10:27:47 +00:00
Timo Teräs 100202920b abuild: print build start, end date and elapsed time 2018-11-08 11:55:46 +02:00
Natanael Copa 324a57592e abuild: run build actions via runpart
So we make sure chdir $builddir happens when it should.
2018-10-03 12:46:18 +00:00
Natanael Copa 0bf61ee06a abuild: do not run check in fakeroot by default
Only run check in fakeroot if options="checkroot" is set. This makes
options="!checkroot" the default.

I expect most checks work as non-root, and if a testsuite requires root,
it will likely fail in fakeroot too. Fakeroot has also shown lower
performance for parallel builds.
2018-10-03 12:37:08 +00:00
Natanael Copa 3379e67551 abuild: print version of built package early
instead of printing abuild version, print package version. This is to
avoid confuse the abuild version with the package version.
2018-10-03 12:16:07 +00:00
Natanael Copa 2fe29d5829 abuild: chdir to $builddir if it exists
chdir to $builddir before running prepare, build, package or check.
2018-10-03 12:06:13 +00:00
Natanael Copa 4e455979e0 abuild: fix regression. run build
fix regression introduced in def219994d
2018-10-03 12:06:13 +00:00
Natanael Copa def219994d abuild: require package() function
make a missing function for package() a hard error.

this means we never run build in fakeroot.
2018-10-03 11:21:15 +00:00
Natanael Copa 1cbc853155 abuild: fix checksum update
Fix case where 1) checksum is a single line and 2) there is a variable
under the checksum that should be kept. For example:

  sha512sum="...."
  keepthis="..."

Previously the `keepthis` variable would have been removed.

ref https://github.com/alpinelinux/abuild/pull/41
2018-10-03 10:34:58 +00:00
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
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
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 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
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