Commit Graph

617 Commits

Author SHA1 Message Date
Natanael Copa
1de902f2fa abuild: fix -openrc to work with multiple subpackages
allow a single APKBUILD have multiple -openrc subpackages.
2019-05-03 18:35:44 +02:00
Leo
f263cb9f49 abuild.in: fix warning with gawk-5.0
awk: cmd. line:1: warning: regexp escape sequence `\#' is not a known regexp operator
2019-04-30 09:35:51 +00:00
Natanael Copa
cf86b45836 abuild: cleanup default_dbg
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.
2019-04-30 07:41:23 +00:00
tcely
acf1fa5553 abuild: default_dbg: do not trigger trap with test failure
Resolves alpinelinux/abuild#71
2019-04-30 07:12:00 +00:00
Leo
ed88353836 abuild.in: remove duplicate options_has call 2019-04-29 21:40:06 +00:00
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
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
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
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
Natanael Copa
a2f839fd27 abuild: only print version if we are building
The purpose was to show abuild version in the build logs
2017-09-28 10:43:28 +00:00
A. Wilcox
dc4f5cb972 abuild: fix typo 2017-09-28 10:01:10 +03:00
Timo Teräs
545eed3a24 abuild: rootbld: reflect build branch in the builder hostname 2017-09-27 14:58:56 +03:00
Timo Teräs
4736a56c8e abuild: do not try to strip standalone elf images
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.
2017-09-26 07:27:49 +00:00
tmpfile
56b8d45079 abuild.in: remove saveas- syntax and fix sourcecheck()
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
2017-09-19 12:02:57 +00:00
A. Wilcox
f1faef7868 abuild: ensure a package has deps before printing them
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.
2017-09-19 12:02:57 +00:00
Natanael Copa
d03366f80c abuild: avoid print version multiple times
and respect -q flag
2017-09-19 11:59:18 +00:00
Breno Leitao
da720069ca abuild: Always print the builder version
Currently is hard to discover what abuild version was used on a build log.
This lack of information makes it hard to reproduce a buld failure.

This change simply adds the abuild version at all logs.
2017-09-19 11:59:18 +00:00
Natanael Copa
9a63a17228 abuild: exit with success if arch is disabled
the set -e made script exit early
2017-09-19 11:08:13 +00:00
William Pitcock
eb0a7d0811 abuild: prepare_metafiles: use new /bin/sh virtual instead of hardcoded busybox dependency 2017-08-05 22:03:13 +00:00
A. Wilcox
a74359e8e2 abuild: Add default split OpenRC function 2017-07-26 16:00:12 +00:00
Natanael Copa
443fc07c79 abuild: print url we are fetching
This is useful for debugging
2017-07-20 08:08:17 +00:00
Natanael Copa
1efaa3996e abuild: add sanitycheck for secfixes comment
The secfixes comment will be parsed and added to alpine-secdb. add
sanitycheck so we catch errors early.
2017-07-20 08:08:17 +00:00
Kaarle Ritvanen
90d62ca5e0 abuild: rootbld: require metapackage 2017-07-16 19:29:54 +03:00
Kaarle Ritvanen
4aa6e2ddff abuild: rootbld: improve version compatibility 2017-07-16 19:19:24 +03:00
Kaarle Ritvanen
e7404e1633 abuild: rootbld: require envsubst 2017-07-16 19:19:24 +03:00
Kaarle Ritvanen
cf18bf6ed9 abuild: rootbld: make mkusers work 2017-07-06 17:45:20 +03:00
Kaarle Ritvanen
ee52fee11c abuild: rootbld: always require repo template 2017-07-06 16:17:31 +03:00
Kaarle Ritvanen
e3a2e14ffa abuild: build in chroot
This patch is based on earlier work by Timo Teräs.
2017-06-27 14:52:50 +03:00
Kaarle Ritvanen
6ff70e3763 abuild: disable trap when entering the handler 2017-06-27 14:52:50 +03:00
Carlo Landmeter
9605ce1792 abuild: add config option to globally enable dbg 2017-06-27 08:06:45 +02:00
A. Wilcox
610bf6c281 abuild: fix bad git merge 2017-06-23 18:56:00 +03:00
A. Wilcox
f39ef92cde abuild: use portable awk exponentiation operator 2017-06-23 11:27:41 +03:00
A. Wilcox
597a7f167b abuild: call tar portably 2017-06-23 11:27:41 +03:00
A. Wilcox
9dd4a70eb3 abuild: Correctly comment default_dbg 2017-06-23 11:27:41 +03:00
A. Wilcox
67f297d3ac abuild: Add verbose option '-v' to show everything 2017-06-23 11:27:41 +03:00
Andrej
56355bff21 Allow $patch_args to pass multiple arguments to patch 2017-06-21 18:15:06 +00:00
Shiz
79525de509 abuild: add !checkroot option to run tests without fakeroot
Due to fakeroot being very permissive with regards to file permissions,
some package testsuites that explicitly check for failing permission checks
will fail.

For those testsuites, give the APKBUILD the option to run the tests outside
of a fakeroot environment.
2017-06-21 18:14:32 +00:00
Oliver Smith
3d74cd9e8e Add parameter '-D' for alternative APKINDEX description
This patch allows to set a nice description for the APKINDEX, in case
the aport that is being built is not inside a git repository.

I have tested it, and it behaves exactly like without the patch,
even when git is not installed, or the folder is not inside a git repository:
The `|| true` at the end of the DESCRIPTION= line makes sure, aport
does not get aborted, just like it does not get aborted in that case
as of now, as the `git describe` command gets executed in a subshell.
2017-06-21 18:13:18 +00:00
A. Wilcox
c8253dc83a abuild: More readable message for missing dependencies 2017-06-12 09:39:46 +00:00
Breno Leitao
5b7b1f80cb abuild: Add support for lzip source packages
Currently abuild does not understand .tar.lz packages, which blocks
the inclusion of certain packages in Alpine Linux.

I found this issue when adding 'ed' package to the repository. With
this change, abuild package will now depend on lzip package. I might
send a patch for abuild's APKBUILD.
2017-04-08 16:28:09 +00:00
Natanael Copa
ecc1f509c6 abuild: set -e fix for update_config_{sub,guess} 2017-04-04 13:12:48 +00:00
William Pitcock
1ddc910eb3 abuild: wrap check() with fakeroot 2017-03-27 19:38:38 +00:00
William Pitcock
dec68bd03f abuild: use new PKG_CONFIG_MAXIMUM_TRAVERSE_DEPTH env variable to disable the SAT solver 2017-03-27 06:00:03 +00:00
Natanael Copa
76f3ac4058 abuild: fix -K option
make sure we don't delete files when -K is specified

fixes #7008
2017-03-24 11:32:09 +00:00
William Pitcock
834cb718f6 abuild: if ABUILD_BOOTSTRAP environment variable is set, do not ever enable check() or checkdepends 2017-03-21 09:28:34 +00:00
Natanael Copa
3b61bfb644 abuild: fix runpart
we need to run the function for runpart in the same shell, otherwise we
will lose the global variables set in the split functions.
2017-03-21 08:05:44 +00:00
Kaarle Ritvanen
36d5193776 abuild: enable -e shell option 2017-03-07 12:29:38 +02:00
Kaarle Ritvanen
d8174e4f3a abuild: fix dependency checking
- versioned dependencies
- dependencies on 'provides' tags or library names
2017-03-07 12:29:38 +02:00
William Pitcock
c909c82ac2 abuild: expand on APKBUILD check() warning message 2017-02-28 08:22:36 +00:00
Timo Teräs
32dbf36f0e abuild: use BOOTSTRAP to determine if build-base is needed
Just checking the build, host and target triplet is not enough
due to various different combinations used in the early bootstrap.
So use detect specifical bootstrap setting.
2017-02-24 10:16:55 +02:00
Timo Teräs
5a8993e161 abuild: $depends should not part of $makedepends_build 2017-02-24 08:55:13 +02:00
Timo Teräs
53ae72567d abuild: fix setting build-base properly for cross-create/cross-build 2017-02-23 13:31:49 +02:00
Timo Teräs
ad46156cc7 abuild: use $builddir in default_prepare only if it exists 2017-02-17 15:17:44 +02:00
Natanael Copa
2c1aaa5536 abuild: unset md5 and sha256 sums when updating checksum
this fixes problem with abump
2017-02-17 11:07:15 +01:00
Timo Teräs
30c5103bfb abuild: remove g++ makedepends warning from toolchain packages 2017-02-17 09:20:58 +02:00
Timo Teräs
ab748f4eda abuild: make build-base target specific 2017-02-16 16:07:27 +02:00
Timo Teräs
6fa4c26226 abuild: allow injecting extra dependencies for bootstrap
Allowing bootstrap.sh to inject extra dependencies for build/host/target,
simplifies things greatly in the bootstrap script.
2017-02-16 15:18:16 +02:00
Timo Teräs
9d2567f1e6 abuild: preserve xattrs when creating -dbg 2017-02-09 11:32:49 +00:00
G.J.R. Timmer
21bf69f6ad abuild: fix package size calculation on certain filesystems 2017-02-08 13:10:36 +02:00
Natanael Copa
ab79e3fe6f abuild: fix location of built apk
we need to replace noarch with CARCH for now
2017-02-01 11:49:40 +01:00
Timo Teräs
4442efff6e abuild: add symlinksrc target for create the source file symlinks
needed for upcoming 'rootbld' support
2017-01-31 10:23:56 +02:00
Tuomas Jaakola
520cc15fe9 abuild: support local archives 2017-01-31 10:21:13 +02:00
William Pitcock
ea1db36f1f abuild: implement check and $checkdepends support.
The check() function is an APKBUILD overridable function which runs a testsuite.  The packages listed in
$checkdepends are packages which will be installed at build time only if check() will be run.
2017-01-29 09:47:25 +00:00
Valery Kartel
89d62e9d4d abuild.in: fix dealing with named remote patches (closes github #11)
for patches like:
patchname.patch::http://github/.../commit/<md5hash>.patch

use strict filename instead of the whole line
2017-01-27 06:41:59 +00:00
Timo Teräs
0ff2cf73f5 abuild: use only sha512sum
use only the strongest hash. this simplifies apkbuilds a bit.
2017-01-26 13:57:18 +02:00
Breno Leitao
f41036ac3a abuild: check for ppc64le on config.guess
Currently, if aarch64 exists in config.guess, it is not updated.
This breaks spl, which has aarch64 entry, but not ppc64le.

update_config_guess should update config.guess if any of those
does not exists.
2017-01-19 22:20:42 +01:00
Timo Teräs
8bddd02b10 abuild: remove noarch files from CARCH target direct
this is where it is built too
2017-01-09 11:17:39 +02:00
xentec
971504f0ec abuild: pass --arch to apk whenever sysroot is used
so we can crosscompile for different architectures
2016-12-21 10:05:41 +00:00
Przemyslaw Pawelczyk
6b2fd4a891 abuild: make default_prepare() always end up in "$builddir"
So far default_prepare() ended up in "$builddir" only if there were any
patches.  It's better to be more consistent and make such change always.
2016-12-04 02:38:09 +01:00
Jakub Jirutka
4d6114bdce abuild: change shebang to /bin/ash
This script uses variable expansion / pattern replacement, which is not
defined in POSIX-sh. Also APKBUILDs are not required to be strictly
POSIX-sh compatible. If someone run abuild on system with e.g. dash as
/bin/sh, then it fails (and someone reported exactly that on IRC
today). Therefore abuild should explicitly use /bin/ash in shebang and
not /bin/sh.
2016-11-23 21:44:52 +01:00
Timo Teräs
e18d6228e7 abuild: properly detect failure of dependency installation 2016-10-31 15:49:29 +02:00
Jakub Jirutka
4f37c8efd3 abuild: set default builddir when not defined in APKBUILD 2016-09-02 23:13:31 +02:00
Jakub Jirutka
948fedc5f7 indent heredocs when possible 2016-08-23 00:09:06 +02:00
Sören Tempel
8a4680cc74 abuild: don't overwrite existing files when using unzip in unpack
Default is asking for each file.
2016-08-18 23:45:33 +02:00
Carlo Landmeter
b874a4c8cd abuild: add update_config_guess 2016-08-12 15:26:06 +02:00
Sören Tempel
4f7a4556a0 abuild: ash only always local in functions these days 2016-08-11 14:04:44 +02:00
Timo Teräs
4134332906 abuild: fix dependency tracing for cross builds 2016-08-01 14:28:44 +03:00
Timo Teräs
495dac7fa9 abuild: unify dependency installation and removal code
this fixes cross deps such as "CHOST=armhf abuild deps"
to work properly.

if makedepends is not defined the following default
will be used (as that's the definition cross-build
aware apkbuilds use):
  makedepends="$makedepends_build $makedepends_host"
2016-08-01 14:28:44 +03:00
Timo Teräs
a01d11d9bc abuild: check both build and host dependencies first
So we don't waste time installing dependencies on builder if
the host dependencies are not satisfiable.
2016-08-01 14:28:44 +03:00
Timo Teräs
9207fccde2 abuild: display target arch in xterm title for cross build 2016-08-01 14:28:44 +03:00
Timo Teräs
8c8d741b32 abuild: use subpkgarch to construct the package paths everywhere 2016-08-01 14:28:44 +03:00
Timo Teräs
f7e2b48d1c abuild: remove PKGDEST and install_after features
supporting these features with cross building is non-trivial
and they do are generally not useful features, so remove them.
as result the abuildrepo is also removed to write out paths.
all package generation paths now use $REPODEST/$repo/$CARCH
which allows easily writing packages to correct $subpkgarch
in future commits.
2016-08-01 14:28:44 +03:00
Timo Teräs
f459607da7 abuild: use proper strip for each subpkg according to it's arch 2016-08-01 14:28:44 +03:00
Timo Teräs
b217bbb2ea abuild: support subpackages="pkg:split:arch" syntax
For proper cross-build support, the subpackage arch needs to
be known before invoking the split function. This implements
a way to do that. This also changes to write the actual subpkg
arch to .PKGINFO - apk index --rewrite-arch still overwrites
index to have machine arch for noarch packages.
2016-08-01 14:28:44 +03:00
Timo Teräs
26ec31c6c2 abuild: improve cross compiling support 2016-08-01 14:28:44 +03:00
Timo Teräs
b6e721580d abuild: don't set and reset xterm title when splitting subpkg
it's annoying flickering, and results the title being unset for
the time when last split is executed and packages are created.
2016-07-27 10:04:22 +03:00
Timo Teräs
34081a1719 abuild: treat subpackages items as colon separated lists
This is in preparation to support subpackages="pkg:split:arch"
syntax, and just makes the current code ignore anything after
the second colon if it exists. This allows to use the new syntax
in aports git without running experimental abuild on the official
builders.
2016-07-26 10:11:46 +00:00
Timo Teräs
a1364565d2 abuild: use apk --no-scripts for target sysroot
we probably will not be able to run the scripts as it can
be incompatible system type
2016-07-23 06:20:00 +00:00
Paul Lorenz
8946d01ed7 Fix src builds
Fix filename_from_uri call
Ensure remote sources are fetched
Include remote sources in source package
Include pre/post scripts
Include trigger scripts
2016-07-20 10:24:46 +00:00
Timo Teräs
90899669c2 abuild: rename distfile copy when checksum does not match
The previous deletion of file did not work properly at all. Fix
this instead to rename the file, so we keep the previous download.
This allows builders to redownload upstream file if the checksum
has been changed in aports.
2016-07-08 13:44:31 +03:00
Timo Teräs
97d924dfed abuild: support arch="all !armhf"
this allows blacklisting architectures instead of just
whitelisting them. useful when more architectures comeabout.
2016-07-07 12:04:06 +03:00
Sören Tempel
670fc1ae14 abuild: perform unzip operations quietly
unzip(1) is verbose by default since we don't run tar(1) in verbose mode
we should run unzip with -q for consistency.
2016-07-06 12:24:59 +02:00
Timo Teräs
fd02387cc1 abuild: fix cross compilation undeps()
"apk del" now returns error if the package name does not exist.
Thus when cross compiling, always install the virtual
.makedepends-$pkgname name for chroot also since undeps() will
try to uninstall it always.
2016-07-05 17:28:48 +03:00
Natanael Copa
0d1a06045b abuild: fix apk_up2date check
fix check that all subpackages exists, not only main package
2016-06-13 12:34:05 +00:00
Natanael Copa
d413730550 abuild: don't cd to $builddir unless patches exists
some packages don't have patches. We should not error if builddir is not
set in this case.
2016-04-05 20:35:34 +00:00
Natanael Copa
a1d23dc995 abuild: rename _builddir to builddir
the _ prefix is reserved for APKBUILD. This is to avoid use variable
names in APKBUILD that may clash with abuilds internal vars
2016-03-23 10:07:36 +00:00
Kaarle Ritvanen
18b09f9d91 abuild: set umask
consistent result regardless of current setting
2016-03-17 15:20:34 +02:00
Sören Tempel
d8dabed4aa abuild: allow passing custom flags to patch(1) in prepare
To do so you need to set the patch_args variable to your desired
command line flags.
2016-03-14 15:09:10 +01:00
Timo Teräs
289400213c abuild: fix getfattr match
it's a regular expression, not shell pattern. empty match will
match everything (default is ^user\\.)
2016-02-22 14:16:13 +02:00
Timo Teräs
5c05446d07 abuild: use gnu find supported way to find suid binaries 2016-02-22 14:07:16 +02:00
Michael Zuo
251dce53e1 abuild: use standard-issue prepare by default
A majority of APKBUILDs currently use exactly the prepare() provided by
newapkbuild verbatim, even for packages where no patches exist, which
has created the expectation that patches listed as sources are applied
by default.

This rev simply adds that default prepare() to abuild (and exposes it as
default_prepare), with no configurability. If needed, default behaviour
can be overridden by providing explicitly prepare().
2016-02-22 14:04:52 +02:00
Sören Tempel
578ab740ad abuild: Respect $reporev variable when fetching git repositories
For git repositories the $reporev variable is not really used since the
$_rev variable is passed to git and $_rev was only set when $reporev was
empty.
2016-02-11 14:26:08 +01:00
Michael Zuo
8d272af174 abuild: Fix indention of the snapshot() function
The snapshot function was indented with spaces while the rest of the
code is indented with tabs.
2016-02-11 14:21:12 +01:00
Natanael Copa
a2c0a6897e abuild: minor speed improvement in symlink compression
instead of forking stat once force every file with one file argument,
we fork it once with all the files as arg. This reduces number of forks.
2016-02-03 19:33:35 +00:00
Natanael Copa
eee56356ab abuild: fix finding already compressed manpages 2016-02-03 19:32:30 +00:00
Natanael Copa
b628bb4305 abuild: avoid compress man pages double
we should not compress man pages that are already compressed.
2016-02-03 18:42:47 +00:00
Sören Tempel
2b8ffc9876 abuild: update symlinks before updating hardlinks
This should be a minimal performance improvement since hardlinks are
replaced with symlinks and should thus already point to the correct
file.
2016-02-03 18:21:02 +00:00
Sören Tempel
e8e0b9e90a abuild: rewrite hardlink handling when compressing man pages
The problem is that gzip refuses to run if it detects that a file has
more than 1 link. Our existing solution (removing hardlinks, compressing
the man page and recreating the hardlinks) made certain assumptions
about inode order that are only given on Unix v7 like filesystems
meaning it didn't work properly on 'tree-based' filesystems like BTRFS
or ZFS.

This patch has a different more bulletproof approach: It simply replaces
all hardlinks with symlinks. This is way easier because symlinks (unlike
hardlinks) can point to a file that doesn't exist, therefore we can
update all links before compressing the file in an easy way.
2016-02-03 18:21:02 +00:00
Sören Tempel
042921b798 abuild: there is no man page section 9 2016-02-03 18:21:02 +00:00
Sören Tempel
eb0ffe7a8a abuild: use id instead of whoami
Furthermore compare the UID instead of the username.
2016-02-03 18:21:02 +00:00
Natanael Copa
d537a005c6 abuild: avoid dupes in provides so:*
similar as commit b3174ba76 ("abuild: make sure we don't add dupes of
provides", Fri Jun 5 12:56:44 2015 +0000)
2016-01-27 10:50:50 +00:00
Kaarle Ritvanen
f37a174836 abuild: exclude non-dangling symlinks from dependency resolution
This commit also fixes incorrect behavior in case where an absolute
symlink points to a file installed on the build host but which is
missing from the package.
2015-11-30 07:26:56 +00:00
Timo Teräs
55041a1e10 abuild: fix conflict checking 2015-11-12 14:10:19 +02:00
Natanael Copa
ef647cce73 abuild: do not install itself as a makedepend
we might need add $pkgname as a dependency for $pkgname-dev and then we
should not install ourselves in case makedepends="$depends_dev"

This is needed foor bootstraping.
2015-10-29 18:06:42 +00:00
Christian Kampka
b67dec210a abuild: avoid division by zero when input is zero for calculating human size for packages
This occurs when building meta packages that do not have any package content.
2015-10-28 14:26:59 +00:00
Natanael Copa
62853e7145 abuild: fix check_depends_dev 2015-10-12 07:01:06 +00:00
Carlo Landmeter
ea8ab0c920 abuild: check if depends_dev is set unnecessarily
depends_dev are dependencies of the of the developement subpackage
it does not need to be set when there is no developement subpackage
2015-09-28 13:08:16 +02:00
Carlo Landmeter
ac8b0e55cb abuild: fix issue in maintainer check
seems the maintainer variable is not set anymore when building .PKGINFO
2015-09-16 22:58:27 +02:00
Carlo Landmeter
aa32ec14e6 abuild: try to validate maintainer address
abuild will error when the maintainer is set but is not a RFC822 address
2015-09-16 11:00:10 +02:00
Natanael Copa
4bc9e3dd6e abuild: add -K for keeping tempdirs and deps 2015-09-08 09:04:45 +02:00
Natanael Copa
92186b70ca abuild: fix fetch lock file on nfs
flock(2) on an NFS mount will on the server side convert the lock to a
POSIX lock (fcntl(F_SETLK)). This means that abuild running on NFS
server and client will create different locks and they will both try
download same file at same time.

We fix this by creating a small abuild-fetch application that will
create a POSIX lock which works with NFS.
2015-08-26 16:44:23 +02:00
Natanael Copa
fe2332d186 abuild: fix man pages compression
fix handling of hardlinks and symlinks.
also compress n man pages and localized man pages
2015-08-19 10:59:00 +02:00
Natanael Copa
72fefe0f1d abuild: add support for sonameprefix
This is a feature to prefix all so:* provides with a tag. This was done
so that the openjdk8 so depends would only be satisfied by openjdk8
provides and not openjdk7, which might provide same so:lib*.so file.

To use it do: sonameprefix="openjdk8:"
2015-08-18 16:56:26 +02:00
Natanael Copa
a2c4d5b00d abuild: check correct name for -doc 2015-08-18 13:46:15 +02:00
Natanael Copa
784f75ee94 abuild: always check for uncompressed man pages 2015-08-17 13:10:14 +02:00
Sören Tempel
cf65c9b41b abuild: check for /usr/share/{doc,man}
Output a warning if those directories exist on a non-doc package.
Furthermore, check if uncompressed man pages where installed to
/usr/share/man.
2015-08-17 11:41:19 +02:00
Natanael Copa
b8b4929245 abuild: fix dep-scanning when sub and main pkg's arch differs
Force dependency scanning when main pkg has noarch but subpackage
overrides it. We need to save the arch setting set in split func for
later if it differs from main pkg's arch in a temp file because the
splitfunc runs in a subprocess.

fixes #4491
2015-08-10 07:58:21 +00:00
Natanael Copa
3020891009 abuild: add install_if for -doc packages
This lets users 'apk add docs' to always pull in -doc packages.
2015-07-20 14:10:36 +00:00
Natanael Copa
3f3281c87e abuild: fix circular dependency for symlink deps
The package should not have itself as dependency.
2015-06-23 11:20:29 +00:00
Natanael Copa
ec0a5ee93e abuild: fix deps for versioned pkg-config deps
Fix version stripping when filtering out needed pkg-configs that are
provided from same (sub)package.
2015-06-12 07:12:47 +00:00
Natanael Copa
09427f9c7c abuild: fix finding pkg-config deps in subpackages
We strip version from pkg-config dependency when scanning the
subpackages.
2015-06-12 07:09:30 +00:00
Natanael Copa
0e58eeff80 abuild: fix provides and install_if in subpackages
we need to clear provides set in global scope before splitting the
subpackages so the subpackage does not inherit main packages' provides.

But at the same time, we must not clear the provides/install_if set in
the splitfunction itself.
2015-06-11 11:56:04 +00:00
Natanael Copa
563409ed82 abuild: clear inherit provides and install_if for subpackages
Unexpected result will happen if subpackages inherits the provides or
install_if from main package. So we clear them.
2015-06-08 07:27:23 +00:00
Natanael Copa
b3174ba768 abuild: make sure we don't add dupes of provides 2015-06-05 12:56:44 +00:00
Natanael Copa
fede6d1161 abuild: remove "added pkgconfig (found /usr/lib/pkgconfig)" message 2015-06-05 12:16:39 +00:00
Natanael Copa
b4c8ef7dad abuild: normalize path when finding symlink targets
some paths like usr/lib/../../lib/libudev.so.0.13.0 will fail to resolve
if usr/lib is does not exist, even if lib/libudev.so.0.13.0 does.

To solve thise we normalize out the ../ in path string before we try to
resolve it.
2015-06-05 12:11:47 +00:00
Natanael Copa
9e91755369 abuild: add warning when depends_dev needs cleanup 2015-06-05 07:27:44 +00:00
Natanael Copa
f5dce44bf9 abuild: add warning when pc:* provider is missing
and indicate which package that should provide it and needs a rebuild.
2015-06-05 07:18:09 +00:00
Natanael Copa
e59de7c8a2 abuild: fix detection of symlink dependencies
- add as dep when the target is also a symlink
- fix handling of absolute path in target
2015-06-04 11:50:41 +00:00
Natanael Copa
fddc01bbbb abuild: fix detection of pkg-config module version
pkg-config will not print version unless dependencies are met so we can
not exclude the system modules.
2015-06-04 07:51:44 +00:00
Natanael Copa
2f5ef7e2fa abuild: autodetect pkg-config dependencies
we create provides for pc:<module>=<version> for pkg-config files and
whenever possible we add depends=pc:<module>.

We also handle version requirements whenever those are specified.
2015-06-03 12:16:35 +00:00
Natanael Copa
f8a2871a9c abuild: fix regression in scanning shared objects
fix regression introduced with commit c70dbf8 (abuild: automatically
detect symlink targets in other subpackages)
2015-06-03 11:12:28 +00:00
Natanael Copa
0263b66cc1 abuild: do not exclude depends_dev
fixes regression introduced with commit 6582be1d (abuild: pull only in
needed dependencies for -dev packages)
2015-06-03 09:39:36 +00:00
Natanael Copa
6582be1d0b abuild: pull only in needed dependencies for -dev packages
ref #4109
2015-06-03 06:45:04 +00:00
Natanael Copa
c70dbf8495 abuild: automatically detect symlink targets in other subpackages
Automatically pull in dependencies for symlink targets provided by other
subpackages.

This is mainly for pulling in target of .so symlinks.
2015-06-03 06:28:34 +00:00
Natanael Copa
5e268f8d70 abuild: cleanup. use better function names
no change in code logic
2015-06-03 06:27:15 +00:00
Natanael Copa
25a56f81a2 abuild: check that source package is not a version number only
github tarballs are normally only a version number. we need to force
that those are renamed so we dont get source tarball name collisions.
2015-04-28 14:09:11 +00:00
Natanael Copa
553762ca30 abuild: require that .initd files are sbin/openrc-run
The sbin/runscript was renamed to sbin/openrc-run with openrc-0.13

warn only if it is sbin/runscript for compatibility
2015-04-28 14:09:11 +00:00
Natanael Copa
60225fc46c abuild: fix license in pkginfo
license is a simple string, not an array
2015-04-23 12:23:38 +00:00
Timo Teräs
a664181714 abuild: preserve all xattrs
by default getfattr omits system xattrs like security.capability
2015-04-09 08:47:56 +03:00