Commit graph

467 commits

Author SHA1 Message Date
classabbyamp
7548d06eca shutils: introduce XBPS_ORIG_MAKEJOBS variable
Some packages couldn't work well with XBPS_MAKEJOBS,
thus we disable parallel build for those packages.

On the other hand, some packages including but not limited to openjdk
use an internal mechanism to build themselves in parallel.

Let's invent another variable for those packages.

(message by sgn)

Co-authored-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
2022-02-11 20:03:30 +01:00
Gonzalo Tornaría
7231f47b26 etc/conf: implement XBPS_MIRROR for remote repos
Setting this variable will make xbps-src use an alternative mirror for
remote repositories.

Using this variable one can change the remote repository for all
architectures in a single setting and without the need to modify
`etc/xbps.d/repos-remote*.conf`. This is much more convenient as it
allows changing remote repos without a dirty worktree.

To use just add a line like the following to `etc/conf`:

    XBPS_MIRROR=https://repo-us.voidlinux.org/current

We also disable 00-repository-main.conf for cross so we don't use the
remote repo from the xbps package.
2021-12-22 23:12:06 +01:00
Piotr Wójcik
9cdfea60ca xbps-src: improve error message on dependencies installation
Message contained one of many packages to install,
incorrectly suggesting that this is problematic one.
Remove that. List of packages is printed on previous line.
2021-10-15 19:01:15 +02:00
Piotr Wójcik
4f03807529 xbps-src: overwrite packages in local repo 2021-09-13 23:04:48 +02:00
Đoàn Trần Công Danh
e5626f81c7 update_check: support pkgs.fedoraproject.org 2021-06-23 19:04:03 +07:00
Đoàn Trần Công Danh
fb4838a591 base-chroot: add tzdata
Some packages require tzdata to testing, however, adding `tzdata` to
those checkdepends will break masterdir, since `tzdata` provides
`/usr/share/zoneinfo/UTC`, hence, it will be removed upon cleanup.

Let's add `tzdata` into `base-chroot` and remove the shenanigan in
`chroot.sh`.
2021-06-17 07:33:49 +07:00
Đoàn Trần Công Danh
cf11f9987e update-check: fix update pattern for literal dot
The dot (.) inside [] matches literal dot. I don't know how it's
working, however the update-check for some packages is broken (i.e.
anthy-unicode).

Let's remove the backslash.
2021-05-23 12:11:03 +07:00
Érico Nogueira
47dae4b67d shutils/pkgtarget: don't spam stderr with expected rm errors
Since the first `rm -rf` command is allowed/expected to fail, hide its
output. This was missed with the initial optimization in
d7bf8e06a0.
2021-05-14 16:13:51 -03:00
Érico Nogueira
d7bf8e06a0 shutils/pkgtarget: speed up build dir cleanup.
We need `chmod -R` to be able to cleanup after Go packages, but it's
unnecessary in most other cases. By only running it when the first `rm
-rf` fails, we optimize for the most common case and get a tiny speedup
for this build step.
2021-05-11 20:09:09 -03:00
Piotr Wójcik
490ef8c8b2 xbps-src: update-check: print out match pattern in verbose mode 2021-04-17 21:34:10 +02:00
Michael Aldridge
4f896929b9 xbps-src: remove remove-obsoletes 2021-04-16 00:02:06 -07:00
Michael Aldridge
0c9e6e56e7 common/xbps-src: Fix remove-obsoletes 2021-04-15 01:35:17 -07:00
Michael Aldridge
f5e766c248 xbps-src: Add remove-obsoletes command 2021-04-14 22:45:13 -07:00
Enno Boland
6d243d7619
common/xbps-src: update-check checks new gnome upstream sites 2021-04-09 18:52:35 +02:00
Đoàn Trần Công Danh
59c67f7d6d xbps-src/update_check: update pattern for GitHub 2021-03-19 22:48:10 +07:00
Duncaen
1f6ab168de xbps-src: simplify dbulk-dump output
* List dependencies of subpackages as part of the source packages
  dependencies, knowing the subpackage they are coming from does
  not matter to a build scheduler as long as xbps-src requires
  those to exist in the same way to main depends= have to exist.
* Resolve virtual? packages through existing means in xbps-src to
  avoid duplicating and possibly diverting from xbps-src's
  behaviour in tools that use dbulk-dump.
* Filter out dependencies on the template itself from sub packages,
  this matches the xbps-src behaviour and there is no need to
  have to duplicate logic for this into the scheduling tool.
* Error out on archs= restrictions as we do already on broken=
  and nocross=, there shouldn't be the need to discover archs=
  restrictions when attempting to build the package.
2021-03-12 18:33:11 -05:00
Piotr Wójcik
81e0103b38 xbps-src: make update-sys operate on host
partially reverts 75eca1b03e
2021-03-10 17:19:02 +01:00
Érico Rolim
21f5e306a5 xbps-src/shutils/show: remove outdated long_desc printing. 2021-03-02 19:58:28 -03:00
Đoàn Trần Công Danh
36a3b046fb update_check/gnome: also check for 0.* version 2021-02-21 09:28:34 +07:00
sternenseemann
1384e928f7 xbps-src: create $XBPS_MASTERDIR/tmp in chroot_prepare
Missing $XBPS_MASTERDIR/tmp caused ca-certificates and glibc-locales to
fail in the reconfigure step of binary-bootstrap, since a call to mktemp
(which I couldn't locate in source though) assumed /tmp in the chroot
would be present already.

This issue was reproducible reliably for me on NixOS by doing something
like:

    rm -rf masterdir
    ./xbps-src binary-bootstrap

The workaround I found was:

    mkdir -p masterdir/tmp      # or alternatively ./xbps-src clean
                                # which also (re-)creates masterdir/tmp
    ./xbps-src binary-bootstrap

This workaround is now mirrored in chroot_prepare by ensuring that tmp
always exists.
2021-02-11 02:07:32 -03:00
Đoàn Trần Công Danh
2ec0338af6 update_check: update GNOME pattern for GNOME 40 2021-01-28 07:18:59 +07:00
Érico Rolim
ef9c6f9a29 shutils/chroot: add newline to warning about unset timezone.
The warning is being triggered in CI, though it shouldn't have been hit
at all.
2021-01-22 12:51:30 -03:00
q66
cb804fbf85 xbps-src: remove noarch 2021-01-20 13:09:59 +01:00
Olaf Mersmann
0d8589f193 shutils/chroot.sh: create symlink for /etc/localtime
Currently /etc/localtime is copied from the host to the chroot. Some
software expects /etc/localtime to be a symbolic link it can read to
determine the name of the time zone, so set up the expected link
structure.
2021-01-19 22:13:26 -03:00
John
5884118e3a shutils/show.sh: never show self deps for depends
xbps-src always ignore self deps in depends and in hostmakedepends
when not cross compiling. The old behaviour did only check for cross.
This now also ignores them in makedepends, but they are either way
disallowed in there, and returning an error would be correct, but
./xbps-src show-* is and never was suitable for linting, so ignore for now.
2021-01-06 21:19:46 +01:00
q66
5922df60c7 xbps-src: make sure to apply FFLAGS properly like CFLAGS 2021-01-03 14:11:02 +01:00
Érico Rolim
a5ed5f551c shutils/chroot.sh: fix syslog configuration.
The file was created in chroot_prepare(), but the configuration
directory was being cleaned in chroot_sync_repodata(). This commit moves
the configuration to after the directories are created.

Fixes #25534
2020-12-11 15:25:39 -03:00
Đoàn Trần Công Danh
08a382be7e chroot.sh: export XBPS_ALT_REPOSITORY to chroot
Outside of chroot, we calcucate XBPS_ALT_REPOSITORY only to throw it
away and calculate it again inside chroot. Normally, this is not problem
except when we're working with a Git's worktree, in which case, we don't
have the access to original gitdir inside chroot.

Let's bring that value from outside of chroot into it.
2020-12-09 19:54:08 +07:00
Jony
ecc31ed587 xbps-src/shutils/update_check.sh: add support for git.sr.ht
The code for `git.sr.ht` was almost identical to that of `hg.sr.ht`. The
main difference, aside from replacing `hg.sr.ht` in `url` with
`git.sr.ht`, was the endpoint of `url`. The `hg.sr.ht` url uses `tags`
whereas `git.sr.ht` uses `refs`.
2020-10-21 22:10:31 +02:00
Piotr Wójcik
46cb66d525 Prefer flags over config file, again 2020-09-14 23:55:22 +02:00
Piotr Wójcik
600d33006b xbps-src: separate options of target package and its dependencies 2020-09-07 22:18:29 +02:00
Piotr Wójcik
15e7a92951 xbps-src: make build options from config ang flags work together
Flag options was appended to XBPS_PKG_OPTIONS, but was later
overwritten by sourcing config. Instead, pass only flags
options in separate variable and join at very end.
2020-09-07 22:18:29 +02:00
Piotr Wójcik
52781a35fe Revert "xbps-src: fix build-options via cmdline."
Needed to load XBPS_PKG_OPTIONS_foo.

This reverts commit 47175dc8bb.
2020-09-07 22:18:29 +02:00
Piotr Wójcik
6efc7dd98d xbps-src: quote wrksrc to allow whitespace 2020-09-03 21:03:32 +02:00
Isaac Freund
5de1503434 xbps-src/update-check: add codeberg support 2020-08-18 14:46:25 +02:00
Isaac Freund
3d035237ac xbps-src/update-check: unify per-site locals 2020-08-18 14:46:25 +02:00
Đoàn Trần Công Danh
050861b37e xbps-src: enable C.UTF-8 locale on glibc masterdir
`util-linux` requires `C.UTF-8` for testing.

Since this is an important part of system,
enable `C.UTF-8' for checking `util-linux`.
2020-08-07 11:35:11 +00:00
Piotr Wójcik
dabbbffabf xbps-src: -p argument for showing more variables 2020-07-13 19:52:53 +02:00
q66
248503d632 Revert "common/shlibs: fix hidrd"
This reverts commit f7948d6051.

??????
2020-07-06 22:25:02 +02:00
Piraty
f7948d6051 common/shlibs: fix hidrd 2020-07-06 22:07:38 +02:00
Andrew Benson
61a501a104 shutils/bulk.sh: remove newlines from package list 2020-06-04 13:21:42 -05:00
John
6ce531b231 common: unser PKG_CONFIG before sourcing templates, set PKG_CONFIG also for native 2020-05-29 14:30:06 +02:00
John
82734d940c
common/xbps-src: set PKG_CONFIG{,FOR_BUILD} env vars 2020-05-26 21:18:27 +02:00
Đoàn Trần Công Danh
2af30cdd78 setup: compute gitrev from outside of chroot
Together with previous commit, `xbps-src` is able to support
git-worktree and shared repository by now.
2020-05-23 06:59:24 +00:00
Jürgen Buchmüller
8e2cacd746 common/.../purge_distfiles.sh: fix template scan
To avoid scanning templates multiple times, because
symbolic links were included, use find to scan only
directories below srcpkgs and collect their
srcpkgs/<dir>/template files.
2020-05-04 19:23:25 +02:00
q66
2357578d15 shutils/common.sh: plumbing for ppcle 2020-04-30 01:06:51 +02:00
Piotr Wójcik
04e9ee8010 xbps-src: changelog in 'show' target 2020-04-28 23:27:00 +02:00
Piotr Wójcik
6cd3bd1806 xbps-src: break out of following cyclic dependencies 2020-04-15 20:34:06 +02:00
Juan RP
ad3d1f862d
xbps-src: show_pkg_build_depends: handle cross case. 2020-04-15 13:29:44 +02:00
Juan RP
a73783d17d
xbps-src: fix show_pkg_build_depends after af6e1a7e79.
af6e1a7e79 introduces dependencies based in subpkgs,
but this makes "xbps-src show-build-deps" return cyclic
dependencies in some cases, i.e:

$ ./xbps-src show-build-deps kirigami2
cmake
extra-cmake-modules
kcoreaddons
kirigami2
qt5
$

This is because `kirigami2-devel` depends on `kirigami2`, thus
introducing a cycle.

Skip cycles completely, note that "show-build-deps" should not
be used to collect deps for cross compilation, because you can't
know what type of dependency it is: host or target.
2020-04-15 13:12:26 +02:00