jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
140832 commits 2 branches 0 tags 520 MiB
Commit graph

500 commits

Author SHA1 Message Date
Juan RP
ad71cffe79 xbps-src/bulk: silence output if there are no pkgs to build. 2015-04-11 08:40:46 +02:00
Juan RP
e2e7b10b0d xbps-src: repair bootstrap-update in the !chroot case. 2015-04-09 19:45:59 +02:00
Juan RP
c7f21fd595 xbps-src: introduce support for multiple chroot implementations. 
Available implementations at common/chroot-style/*.sh. Each .sh
script there implements a chroot style to be able to chroot and bind
mount with multiple utilities. The current supported list:

 - uunshare (uses xbps-uunshare(8))
 - uchroot (uses xbps-uchroot(8))
 - proot (uses proot, see http://proot.me)

The XBPS_CHROOT_CMD can be set in etc/conf to use a specific implementation,
and XBPS_CHROOT_CMD_ARGS to pass in additional arguments to the cmd.
 2015-04-09 18:57:41 +02:00
Juan RP
8cd7f1a901 Revert "xbps-src: Set the MAKEFLAGS environment variable" 
This reverts commit d803775b3d.

This breaks all pkgs that exec make directly without ${makejobs}
(which should be built as -j1) and makes installation also parallel,
which we do not want.

We'll probably resurrect this in a certain future.
 2015-04-09 09:21:53 +02:00
Juan RP
3964b12de6 Merge pull request #1214 from nmeum/makeflags 
xbps-src: Set the MAKEFLAGS environment variable
 2015-04-09 07:51:46 +02:00
Sören Tempel
d803775b3d xbps-src: Set the MAKEFLAGS environment variable 
This ensures that packages with custom build functions also use our
provided MAKEFLAGS. Without this commit it was necessary to always
append the "${makejobs}" variable manually to make. For compatibility
reasons that is still possible but should probably be removed in the
future by making "makejobs" a local variable.
 2015-04-08 19:44:06 +02:00
Juan RP
6d465e0a43 xbps-src/bulk: simplify and make the toposort work again. 2015-04-07 12:34:23 +02:00
Juan RP
66f6780b31 xbps-src: show-build-deps: only return pkgnames. 
We do not care about its version really.
 2015-04-07 12:33:42 +02:00
Juan RP
efbb1f4a8a xbps-src: make -a target work with show-repo-updates/update-bulk. 2015-04-07 12:18:26 +02:00
Juan RP
48548f1983 xbps-src/build.sh: sleep 1 second while running do-pkg.sh. 
This will ensure that binpkg files do not have recorded the same mtime,
which is required in xbps to detect obsolete files properly.
 2015-04-02 09:09:12 +02:00
Juan RP
7a59746763 xbps-src/build.sh: pass $sourcepkg not subpkgname to the helpers. 
Close #1243
 2015-03-30 20:24:11 +02:00
Juan RP
f7cd626a1c xbps-src/build_dependencies: create XBPS_STATEDIR. 
This fixes cross compilation of pkgs that depend on itself.
 2015-03-28 04:49:18 +01:00
Juan RP
7cffdb2d28 xbps-src/build_dependencies: handle deps provided by vpkgs correctly. 
... otherwise deps specified by the cross-vpkg-dummy pkg aren't
taken into account. Assume that version provided by the vpkg is
good enough for building.
 2015-03-28 03:22:07 +01:00
Juan RP
1c5f4690e6 xbps-src: always require current srcpkgs version in build dependencies. 
That means that version comparators are not supported anymore in
hostmakedepends and makedepends.

This will ensure that a pkg is always built with the same build dependencies
everywhere, if the srcpkgs tree is uptodate.
 2015-03-27 10:59:58 +01:00
Juan RP
b43411d4d2 xbps-src: show-build-deps: sort -u the results. 2015-03-26 04:18:42 +01:00
Juan RP
439807df63 xbps-src: setup_pkg: re-read conf file to propagate vars to build.sh. 2015-03-23 18:02:45 +01:00
Juan RP
451411ad21 xbps-src: set_build_options: read conf file for XBPS_PKG_OPTIONS. 
This makes XBPS_PKG_OPTIONS* settings work via build.sh. Thanks chris2.
 2015-03-23 17:57:23 +01:00
Juan RP
a86b30ba05 xbps-src: fix remaining issues with -N and -a. 2015-03-23 16:05:43 +01:00
Juan RP
03ef5b6804 xbps-src: make -N -a <target> work. 
If required cross pkgs are not available in xbps repos, those are now built
automagically.
 2015-03-23 12:44:37 +01:00
Christian Neukirchen
ca81f8e7f1 xbps-src/shutils/common.sh: check $version, - and _ are now forbidden. 2015-03-20 19:06:18 +01:00
Juan RP
55ce6f836f xbps-src/bulk: do not use tac(1) in the tsort result, it's inverted otherwise. 2015-03-20 14:45:06 +01:00
Juan RP
ce859b4188 xbps-src: run_func on error must return 1 not 2. 2015-03-20 09:17:40 +01:00
Juan RP
95ca05e6e6 xbps-src: check_pkg_arch now exits with errcode 2. 2015-03-19 10:26:19 +01:00
Juan RP
0337b86f43 xbps-src: return 0 on success, 1 on error and 2 on nocross/broken (ignore). 2015-03-19 10:08:02 +01:00
Christian Neukirchen
be94bdd70a xbps-src/shutils/common.sh: actively unset disabled build options to override default values. 2015-03-18 16:14:51 +01:00
Juan RP
aab0fe7ed3 xbps-src/bulk: declare some more local vars. 2015-03-17 11:04:09 +01:00
Juan RP
43258cc391 xbps-src: remove autodeps before running the phase unless -C is set. 
This should avoid unexpected issues due to building pkgs with dependencies
installed by previous builds.
 2015-03-15 10:34:13 +01:00
Juan RP
01afe81aac xbps-src: fix -E to check for the target pkg being registered in repos. 
rather than just checking if its binary package is available.
 2015-03-15 09:54:52 +01:00
Juan RP
d8f69bde78 xbps-src: repair 'update-bulk' target (close #1121). 2015-03-14 09:47:56 +01:00
Juan RP
a8962ace18 xbps-src/build.sh: only skip building/installing deps for target pkg with -N. 2015-03-14 09:24:35 +01:00
Juan RP
f2883afc1b xbps-src/build.sh: fix xbps-src-doinstall() when pkg is a subpkg. 
Close #1120
 2015-03-14 09:06:44 +01:00
Juan RP
849d22e46d xbps-src: refactor build logic into its own script (build.sh). 
The build.sh script is now responsible to handle all the logic to build
a source package and its subpackages, as well as all its required
build dependencies. Thanks to this and subshells, dependencies are now
built into its own child process, creating a process tree that can go
nested as long as your system allows forking and has enough memory :-)

This fixes some issues that have been while building pkgs that have lots
of nested dependencies.
 2015-03-14 07:52:29 +01:00
Juan RP
891b7e661e xbps-src: move xbps repo conf files to etc/. 2015-03-13 09:53:30 +01:00
Juan RP
5c177c7b67 Require xbps>=0.44 for xbps-uunshare(8) to simplify code. 2015-03-12 18:56:14 +01:00
Juan RP
d694d022d1 xbps-src: use xbps-uunshare(8) to sync remote cross repos too. 2015-03-12 18:49:21 +01:00
Juan RP
388c3143ac xbps-src: tweak the order of LDFLAGS set in templates. 
Rather than appending to the final LDFLAGS, add it to the head,
this way packages that use LDFLAGS="-lfoo" will still work with --as-needed.

This fixes hsetroot build, at least.
 2015-03-12 10:46:36 +01:00
Juan RP
31b544020f xbps-src/libexec: remove double slash from shebang. 2015-03-11 08:28:13 +01:00
Juan RP
87d91f0594 xbps-src: fix previous. 2015-03-09 09:52:35 +01:00
Juan RP
c74c204a6e xbps-src: do not sync repodata with -N. 2015-03-09 09:50:09 +01:00
Juan RP
b7063fa1bc xbps-src: fix previous. 2015-03-05 21:47:41 +01:00
Juan RP
3d21df48e7 xbps-src: use xbps-uunshare(8) if it's available. 2015-03-05 21:44:22 +01:00
Juan RP
50a116d27a xbps-src: set default compiler/preprocessor/linker flags via etc/conf. 
Rather than setting them in the build profile, just set them in
etc/defaults.conf (overridable via etc/conf) to simplify the code.

- Also enable _FORTIFY_SOURCE=2 in CPPFLAGS.
- Also enable -z,relro in LDFLAGS.

As suggested by @chneukirchen.
 2015-03-04 15:18:46 +01:00
Juan RP
d2f127d7ab xbps-src: create log files in $XBPS_STATEDIR while installing bdeps. 2015-03-03 10:45:34 +01:00
Juan RP
083d139f68 xbps-src: setup_pkg: rename a var for clarity. 2015-03-01 19:29:16 +01:00
Juan RP
bdb798fa64 xbps-src: more improvements for -E and -t options. 
If both options are set, check first if the binpkg exists before
creating the temporary masterdir, and clean this up properly.
 2015-03-01 19:29:16 +01:00
Juan RP
2f524cf66a xbps-src: cleanups for -E and -t. 
-E also detect noarch binpkgs.
-t make sure to cleanup the temporary masterdirs.
 2015-03-01 19:29:16 +01:00
Juan RP
8ee4a7c257 xbps-src: added -E opt to exit immediately if a binpkg already exists. 
With -E if there's a binary package in a local repository for the
target pkg, exit immediately. This will be used by the upcoming xbps-fbulk(8).
 2015-02-28 10:29:27 +01:00
Juan RP
cda175e0d6 xbps-src: make show-build-deps return err when arch is not supported. 2015-02-28 02:38:00 +01:00
Juan RP
429df59e2a xbps-src: show-build-deps: fix an issue with subpkgs. 2015-02-28 01:52:23 +01:00
Juan RP
4130cd3e8f xbps-src: show-build-deps: ignore virtual rdeps completely. 2015-02-28 01:46:38 +01:00
Juan RP
3107408b9e xbps-src: show-build-deps: convert virtual rdeps. 2015-02-28 01:36:22 +01:00
Juan RP
98ae47f3eb xbps-src: show-build-deps: also print rdeps and drop subpkgs. 2015-02-28 00:13:42 +01:00
Juan RP
ad74cbe1b4 xbps-src: show-build-deps: sanitize deps and use etc/virtual. 2015-02-27 23:48:14 +01:00
Juan RP
fcf24b660f xbps-src: added -t option to create a temporary masterdir. 
This temporary masterdir contains hardlinks of files stored in a real
masterdir, and once the target has finished will be removed.

Could be useful to create fully up to date and immutable real masterdirs
that are used as base for the temporary masterdirs.
 2015-02-27 23:00:55 +01:00
Juan RP
d3811ca891 xbps-src: show-build-deps: take only_for_archs into account. 
Silently error out if arch is not supported... my new bulk build code
expects ERROR if pkg cannot be built for the target arch.
 2015-02-27 19:32:54 +01:00
Juan RP
a4ff74aeb6 xbps-src: make sure to not propagate <subpkg>_package() funcs. 
Unset all them before processing a new template. Close #1023
 2015-02-25 18:54:00 +01:00
Juan RP
df4c861f97 xbps-src: common/{,environment}/build_style -> common/${,environment}/build-style. 2015-02-21 12:13:07 +01:00
Juan RP
3adb1c5c6b xbps-src: add environment/build_style to set env vars for build_styles. 2015-02-21 12:03:48 +01:00
Juan RP
f38c8ba711 xbps-src: fix per pkg options declared in etc/conf (close #973). 2015-02-16 10:48:21 +01:00
Alessio Sergi
f417430e41 xbps-src: update_check: set default url to PYPI for Python packages 2015-02-10 12:15:10 +01:00
Eivind Uggedal
cc8762d3fb update_check.sh: escape gnome package names. 2015-01-21 18:32:25 +00:00
Eivind Uggedal
3b7a76512d update_check.sh: use external update file for overrides 2015-01-15 11:16:30 +00:00
Juan RP
aed0f3ee0e xbps-src: fix hooks that are expected to be used in subpkgs. 2015-01-14 14:23:10 +01:00
Juan RP
5f63a3cf4f xbps-src: run pre-install hooks for subpkgs too. 
The pre-install hooks are run before pkg_install().
 2015-01-14 11:31:52 +01:00
Juan RP
5a2536f135 xbps-src: really disable --as-needed if broken_as_needed is set. 
Also remove some unnecessary stuff from gnu-configure build_style,
because it's done elsewhere.
 2015-01-08 11:54:28 +01:00
Juan RP
29b171a284 xbps-src: return early in the bootstrap target when all deps are built. 
This fixes the last issue for the 'bootstrap' target... this requires
xbps>=0.43.1 to work properly.
 2015-01-05 17:11:23 +01:00
Juan RP
6100f83bcf Revert "xbps-src: simplify chroot_handler usage." 
This reverts commit 0e0eb9001a.

Introduces new issues... revert until it's fixed properly.
 2015-01-04 12:14:14 +01:00
Juan RP
0e0eb9001a xbps-src: simplify chroot_handler usage. 2015-01-04 11:41:22 +01:00
Juan RP
88d6f0a9f5 xbps-src: add all subrepos if an alternate repo is set. 2014-12-30 08:23:42 +01:00
Juan RP
897b504d6b xbps-src: use bootstrap build-profile for the bootstrap target. 
... otherwise the proper compiler flags are being used in the chroot case.
 2014-12-24 09:55:29 +01:00
Juan RP
8252c1a719 xbps-src: set defaults to XBPS_C{,XX}FLAGS for the bootstrap target. 2014-12-23 09:24:17 +01:00
Juan RP
4a91db3b95 xbps-src: do not use ${version} to compose XBPS_STATEDIR. 
GNU autoconf configure scripts will separate PATH components with `:'
and some pkgs could use this char in its version component.
 2014-12-22 12:15:34 +01:00
Juan RP
57dc040df6 xbps-src: create required dir for xbps-src.conf. 2014-12-22 11:28:52 +01:00
Juan RP
2e78e7fdcf xbps-src: create xbps.d/xbps.conf with our settings. 2014-12-22 11:24:58 +01:00
Juan RP
b77c7a6836 xbps-src: update for xbps-0.42 and bump required version. 2014-12-22 11:15:44 +01:00
Juan RP
bf104ce0c4 xbps-src: no need to remove xbps main repo file; it's disabled already. 2014-12-13 10:01:33 +01:00
Juan RP
5929c2458a xbps-src: remove pkg statedir unless -C is set. 2014-12-13 09:42:11 +01:00
Juan RP
6e13dcbaff xbps-src: introduce XBPS_STATEDIR to store state files, logs and others. 
XBPS_STATEDIR is created in XBPS_BUILDDIR/.xbps-${sourcepkg}-${version}
and contains logs and state files for all phases, as well as wrappers.

We can now inspect the output from all hooks.
 2014-12-11 11:02:22 +01:00
Juan RP
a5193023b9 xbps-src: quote PATH while entering the chroot. 
... otherwise if PATH contains whitespaces you could be fucked up.
 2014-12-08 18:27:19 +01:00
Juan RP
782f331b10 xbps-src: repair running post-install hooks. 2014-12-06 18:10:08 +01:00
Juan RP
2a7a3209b8 xbps-src: make the 'pkg' target work after 'install'. 
- Create state files in $wrksrc for $sourcepkg and $subpackages
to see if the phase needs to be re-run.
 2014-12-06 13:45:49 +01:00
Juan RP
efc17d8c22 xbps-src: accept subpkgname as target pkg for the install target. 
Close #686
 2014-12-06 12:33:30 +01:00
Eivind Uggedal
1a3b512069 update_check.sh: support for kernels 2014-11-30 19:29:46 +00:00
Enno Boland
b7c7cc67fa xbps-src: update-check reports all newer versions one gnome sites. 2014-11-29 17:59:18 +01:00
Eivind Uggedal
154c5cd605 update_check.sh: support for update_version (upstream version). 2014-11-24 14:57:41 +00:00
Eivind Uggedal
8525392a11 update_check.sh: bitbucket.org support 2014-11-24 14:44:09 +00:00
Juan RP
8ade12549f xbps-src: rename disable_debug to nodebug, to follow our naming convention. 2014-11-16 11:52:36 +01:00
Juan RP
dc9144500c xbps-src: get rid of CHROOT_CMD and use xbps-uchroot directly. 2014-11-12 09:52:17 +01:00
Juan RP
cd9f85c1a5 xbps-src: print $broken if set: it should contain the url to the build log. 2014-11-11 22:10:30 +01:00
Juan RP
d189235b2b xbps-src: prefer LDFLAGS from template if set. 2014-11-11 16:39:57 +01:00
Juan RP
8d9f0ed815 xbps-src: bulk: setup srcpkg vars before reading target template. 2014-11-11 10:41:20 +01:00
Juan RP
d982c558f2 xbps-src: correct test behaviour for build-profiles. 2014-11-10 12:30:07 +01:00
Juan RP
67c854fc64 xbps-src: chroot: do nothing if we are already in the chroot. 2014-11-10 11:57:46 +01:00
Juan RP
88c76fb588 xbps-src: also use build-profiles for bootstrap pkgs. 2014-11-10 11:25:36 +01:00
Juan RP
c2bd01c8d3 xbps-src: introduce build profiles and use it by default. 
common/build-profiles contains the compilation flags used in native
builds, and are defined per architecture:

	- x86_64 (glibc)
	- x86_64-musl (musl)

If XBPS_CFLAGS or XBPS_CXXFLAGS are set in `etc/conf`, the settings
from the build profile will be overrided.
 2014-11-10 11:17:34 +01:00
Juan RP
26682d2b86 Revert "Revert "xbps-src: return early if masterdir is not ready for chroot ops."" 
This reverts commit c6cec1010f.
 2014-11-08 11:07:40 +01:00
Enno Boland
c6cec1010f Revert "xbps-src: return early if masterdir is not ready for chroot ops." 
This reverts commit d9943a330d.
 2014-11-08 11:02:38 +01:00
Juan RP
d9943a330d xbps-src: return early if masterdir is not ready for chroot ops. 2014-11-08 10:52:38 +01:00
Juan RP
f7543fb5b6 xbps-src: libexec: simplify chdir to wrksrc/build_wrksrc. 2014-11-06 17:23:58 +01:00
Juan RP
457fd7aefb xbps-src: respect XBPS_DEBUG_PKGS for bootstrap pkgs too. 2014-11-05 17:29:58 +01:00
Enno Boland
1a75818e7b common: fix "$repository" = "nonfree" comparision. 2014-11-05 14:55:47 +01:00
Enno Boland
59cc3e0d45 replace nonfree=yes with repository=nonfree. 
This way it is possible to set up package specific repositories for
i.e. specific devices.
 2014-11-05 14:15:25 +01:00
Eivind Uggedal
aeb7baef31 Revert "update_check.sh: do not check packages without distfiles" 
This reverts commit e67c2718f2.
 2014-11-03 12:18:28 +00:00
Eivind Uggedal
e67c2718f2 update_check.sh: do not check packages without distfiles 2014-11-03 11:45:03 +00:00
Eivind Uggedal
451b5d3bcc update_check.sh: reset regex before each site 
Fixes a bug where python projects from PYPI which have a github
homepage gets the github regex when checking PYPI.
 2014-11-03 11:37:08 +00:00
Eivind Uggedal
b7219e9407 update_check.sh: fix globals 2014-11-03 11:37:08 +00:00
Christian Neukirchen
637dcf9472 update_check.sh: scan tags page instead of using the API. 2014-11-02 16:31:17 +01:00
Christian Neukirchen
01646ec643 update_check.sh: escape pkgname in default regexp. 2014-11-02 15:54:08 +01:00
Christian Neukirchen
ebbb33b519 update_check.sh: ignore SSL errors. 2014-11-02 15:45:57 +01:00
Christian Neukirchen
85ea2492c3 update_check.sh: regard dashes as dots for version comparison. 2014-11-01 20:37:17 +01:00
Christian Neukirchen
bcaeae6d24 update_check.sh: extract launchpad project name from URL instead of guessing it. 2014-11-01 19:43:55 +01:00
Christian Neukirchen
c36f464f4d update_check.sh: extract sourceforge project name from URL instead of guessing it. 2014-11-01 19:04:21 +01:00
Juan RP
07dd4ad339 xbps-src: update-check: avoid bashism, requested by @chneukirchen. 2014-11-01 15:23:51 +01:00
Juan RP
1e445fe096 xbps-src: update-check: return if curl not available; simplify output for match. 2014-10-31 21:24:07 +01:00
Christian Neukirchen
60ac25fd1f xbps-src: add update-check. 2014-10-31 20:43:35 +01:00
Juan RP
cc45da3f6d xbps-src: indent enabled build options correctly too. 2014-10-30 07:09:33 +01:00
Juan RP
3f31573ed5 xbps-src: align show options correctly. 2014-10-28 10:15:58 +01:00
Juan RP
58bbb98712 xbps-src: move ccache/distcc to hostdir, to make them shared by multiple masterdirs. 
This way a single ccache or distcc directory can be shared by multiple
independent masterdirs.
 2014-10-26 10:22:30 +01:00
Juan RP
4545aca5e3 xbps-src: repair bootstrap installation. 2014-10-18 16:45:16 +02:00
Juan RP
033c4ed0f5 xbps-src: remove WIP repo delta support. 
- it never worked correctly
- it's WIP and looks like it will be stalled forever
- won't be necessary anymore with xbps-0.42
 2014-10-14 19:19:07 +02:00
Juan RP
6928b52a4e xbps-src: full switch to void-packages. 2014-10-11 11:15:02 +02:00
Juan RP
4b6129eeb7 xbps-src: chroot: use /void-packages. 2014-10-11 11:11:09 +02:00
Juan RP
77d1837155 xbps-src: misc tweaks for zap and use void-packages too in chroot ops. 2014-10-11 11:02:57 +02:00
Juan RP
774685aaa2 xbps-src: create the void-packages symlink unconditionally. 2014-09-28 08:19:32 +02:00
Juan RP
62e0fb53be xbps-src: export XBPS_WRAPPERDIR for cross builds (could be used for native too). 2014-09-28 08:02:12 +02:00
Juan RP
3efa28ecbf xbps-src: create a void-packages symlink for xbps>=0.41. 2014-09-28 07:25:09 +02:00
Juan RP
5202f22f48 xbps-src: define some xxx_FOR_BUILD vars for cross builds. 2014-09-25 16:37:14 +02:00
Juan RP
952848ebc3 xbps-src: make sure a target is always passed in to xbps-uhelper. 2014-09-25 12:44:36 +02:00
Juan RP
1ce278f035 xbps-src: drop fakeroot; xbps-create(8) is our friend. 
- This should work for almost 90% current packages, as reported by OpenBSD/ports.
- Packages that use install -o <user> -g <group>  will get fixed progressively.
- xbps-create(8) by default sets pkg files as 0:0, if any pkg needs special
  permissions those can be set via INSTALL scripts (for now).
 2014-09-24 19:51:17 +02:00
Juan RP
8063adde71 xbps-src: for runtime deps (depends) do not resolve vpkgs. 
...otherwise the following would happen:

	- foo depends on musl
	- musl is provided by cross-vpkg-dummy
	- musl is then detected as resolved and it's not built.
 2014-09-21 11:44:45 +02:00
Juan RP
dbde6e849e Revert "Revert "xbps-src: when all deps have been processed exit directly."" 
This reverts commit ad79b8e7e2.
 2014-09-21 11:25:38 +02:00
Juan RP
75b6468fa0 Introduce a way to override dependencies for all pkgs thru a file. 
The `etc/defaults.virtual` file contains the default replacement
for our use cases; at this moment we only use it to use `eudev`
rather than `systemd` for udev.

If `etc/virtual` exists it overrides the settings of `etc/defaults.virtual`.
 2014-09-06 12:43:24 +02:00
Juan RP
ad79b8e7e2 Revert "xbps-src: when all deps have been processed exit directly." 
This reverts commit 9bf1ba5f88.

I still think the behaviour I observed was related to something else.
 2014-09-05 12:57:15 +02:00
Juan RP
13c2ca3bd2 xbps-src: reorganize code in more sections. 2014-09-05 11:10:07 +02:00
Juan RP
9bf1ba5f88 xbps-src: when all deps have been processed exit directly. 2014-08-30 20:45:57 +02:00
Juan RP
6d20b9a05a xbps-src: move vopt_* helpers to environment/setup/options.sh. 2014-08-30 09:10:11 +02:00
Juan RP
790202ddbd xbps-src: move helpers to environment; there's no need to have them. 
Those helpers were just setting up some extra functions that can be used
on templates, and this can be done already via environment, so let's remove
the helpers completely.
 2014-08-30 09:01:29 +02:00
Dominik Honnef
cdd2ce0da4 add helpers for working with options 
Add the helpers vopt_if, vopt_with and vopt_enable that simplify common
option-based operations.

Instead of a bunch of

if [ "$build_option_foo" ]; then
	configure_args+=" --with-foo"
	makedepends+=" foo-devel"
else
	configure_args+=" --without-foo"
fi

one can use

configure_args="... $(vopt_with foo)
makedepends="... $(vopt_if foo foo-devel)"

instead.

We're adding these functions to common/xbps-src/shutils/common.sh but
that might not be the ideal place. I would've preferred
common/helpers/options.sh, but helpers are only available in the
individual phases, not when the template itself gets parsed.
 2014-08-30 00:39:46 +02:00
Juan RP
e582f328b3 xbps-src: repair and improve the bootstrap target (from scratch). 
- There's no need to install rdeps into the masterdir, just base-files.
- There's no need to exit if XBPS_TARGET_PKG == sourcepkg, just return.
- After building base-chroot, install bootstrap binary packages.
 2014-08-26 10:33:15 +02:00
Juan RP
1651a5fe6e xbps-src/doinstall: there's no need to remove pkg metafiles on destdir. 2014-08-26 09:55:40 +02:00
Juan RP
3fdd0e180e xbps-src: run pre-pkg hooks in the install to destdir target. 
The prepare-32bit hook has been moved to the pre-pkg stage and now
those hooks are executed as part of the install phase. That means that
pre-pkg hooks are now independently run for the subpkgs and the sourcepkg
after the install-destdir phase and pre/do/install hooks.

As bonus, finally correct rdeps can now be collected for the 32bit pkgs
and works for all them, without the need to sort the order of subpkgs!
 2014-08-25 22:34:13 +02:00
Juan RP
5290c2a839 xbps-src: change order of how subpackages are processed. 
10 Non development packages are processed first lexically.
20 Development packages are processed after 10.

This resolves the issue of 32bit pkg creation with development pkgs
that depend on other non-development subpkgs, and result in wrong
dependencies being propagated to the 32bit development pkgs.
 2014-08-25 17:43:08 +02:00
Juan RP
22e0c33b39 xbps-src: chroot: do not copy /etc/services; we use iana-etc now. 2014-08-25 15:30:57 +02:00
Juan RP
12a3b16e42 Introduce "broken" var to skip building broken packages; make "nocross" not error out. 
- broken var simply exits (without error) and skips building a pkg.
- nocross var now simply exits without an error, to make buildbot continue building pkgs.
 2014-08-22 16:49:23 +02:00
Juan RP
7e9f329643 xbps-src: remove_pkg: exit early if destdir does not exist. 2014-08-21 12:16:53 +02:00
Juan RP
108a6d3fac xbps-src: introduce "nocross" to not allow cross compilation. 2014-08-21 12:07:44 +02:00
Juan RP
954e1aff05 xbps-src/chroot: disable xbps/repo.d/00-main.conf with a symlink; rather than removing the file. 2014-08-21 11:42:51 +02:00
Juan RP
9d50c2fb05 xbps-src: use "virtual?" keyword to declare virtual runtime dependencies. 
The syntax "pkg?vpkg" can be used in hostmakedepends, makedepends and depends;
but the "virtual" keyword can be declared specifically for runtime dependencies
(depends).
 2014-08-17 19:21:25 +02:00
Juan RP
b0aedbb03a xbps-src: added -D to generate repository binary deltas; disabled for now. 2014-08-14 12:28:27 +02:00
Juan RP
0ac14b23ad xbps-src: remove a local var introduced in previous. 2014-08-05 11:52:12 +02:00
Juan RP
1e1136cfac xbps-src: do not skip build deps that are also runtime deps. 2014-08-05 11:51:25 +02:00
Juan RP
933513adaa Improve how run-time deps (aka "depends") are handled in packages. 
Run-time dependencies declared via "${depends}" are now also part of the
build process, but those are not installed to the master directory; rather
those dependencies are only checked if a binary package exists in a
local repository to satisfy the required version.

Thanks to @dominikh for idea and suggestions.
 2014-07-30 17:58:17 +02:00
Juan RP
8cefd7e1cc xbps-src: make sure to re-read template for build options. 
The issue was that when building dependencies of target pkg, the
template wasn't re-read with defined build options and those were
completely ignored.
 2014-07-24 18:40:52 +02:00
Juan RP
c49e01fc15 xbps-src: make it possible to override the subpackages list via ${subpackages}. 
This overrides the automatic list generated by xbps-src and it's overridable
to change the processing order of subpackages.
 2014-07-23 15:44:36 +02:00
Juan RP
e372fcc6e0 xbps-src: fix pkg options parsing in package names containing dashes. 
When using per-pkg options via etc/conf, all dashes should be replaced by
underscores, i.e:

	XBPS_PKG_OPTIONS_xorg_server=opt,~opt2
 2014-07-19 10:39:22 +02:00
Juan RP
9067c2e4f7 xbps-src: xbps-src-doextract: change cwd to wrksrc for post_extract(). 2014-07-17 15:54:37 +02:00
Juan RP
67358807ea xbps-src: chroot: remove xbps conf remote repos with -N. 2014-07-14 12:28:08 +02:00
Juan RP
407a882b1a xbps-src/xbps-src-doextract: if build_style declares do_extract(), use it rather than hooks. 2014-07-12 17:44:54 +02:00
Juan RP
758ea97981 xbps-src: fix -o in chroot (reported by al3hex). 2014-07-12 15:56:40 +02:00
Juan RP
719de35774 xbps-src: print some more details if installation of cross pkgs fails. 2014-07-08 15:09:21 +02:00
Juan RP
4d55b696c3 xbps-src: chroot_init: do not propagate XBPS_MASTERDIR to the generated xbps-src.conf. 
Fixes Ypnose issue where he has XBPS_MASTERDIR set in `etc/conf`.
 2014-07-05 16:12:14 +02:00
Juan RP
aee9d60bec xbps-src: document xbps-install(8) ENXIO rval. 2014-07-02 11:09:41 +02:00
Juan RP
71f0a912ef xbps-src: chroot.sh: XBPS_CONFIG_FILE could be unset, handle it. 2014-07-01 18:47:39 +02:00
Juan RP
ff00dc5448 xbps-src: destroy <masterdir>/tmp before entering the chroot. 2014-07-01 15:07:01 +02:00
Juan RP
e64f3d8a95 xbps-src: make sure XBPS_CONFIG_FILE is set. 2014-07-01 13:15:52 +02:00
Juan RP
c06d1e4d85 xbps-src: partial revert of 871d2fa87. 
We can't pass XBPS_OPTIONS to xbps-uchroot(8) as is.
 2014-07-01 11:04:34 +02:00
Juan RP
871d2fa873 xbps-src: added -G to enable XBPS_USE_GIT_REVS. 2014-07-01 10:33:54 +02:00
Juan RP
67947330cc xbps-src: set XBPS_HOSTDIR correctly for chroot ops. 2014-06-30 12:03:56 +02:00
Juan RP
a5e726c4ec xbps-src: copy XBPS_* settings from etc/conf only if the file exists. 2014-06-30 11:52:52 +02:00
Juan RP
9d34c36e0a Implemented support for permanent pkg build options (globally or per-pkg). 
Permanent global pkg build options can be defined via 'XBPS_PKG_OPTIONS' in etc/conf.
Permament per-pkg build options can be defined via 'XBPS_PKG_OPTIONS_<pkgname>' in etc/conf.

Close GH #452.
 2014-06-30 11:32:07 +02:00
Juan RP
e3246539e7 xbps-src: do not copy x86_64 specific repos to the cross target root. 2014-06-10 09:36:58 +02:00
Juan RP
b747269490 xbps-src: make local/remote multilib repos only available on x86_64. 2014-06-10 09:22:18 +02:00
Juan RP
fedcbc4423 xbps-src: remove local copy of xbps.conf; it's unnecessary with xbps-0.37. 2014-06-07 06:07:04 +02:00
Juan RP
bb2361c130 xbps-src: set correct xbps cachedir for chroot ops. 2014-06-07 05:52:42 +02:00
Juan RP
b308d7cfac xbps-src: fix previous correctly for local mode too. 2014-06-06 16:29:50 +02:00
Juan RP
f90fe6abb8 xbps-src: fixed repo handling with xbps-0.37 in cross builds. 2014-06-06 16:24:35 +02:00
Juan RP
cf76c65be9 xbps-src: use xbps-0.37 config repo dir feature (etc/repo.d). 2014-06-06 16:10:42 +02:00
Juan RP
3ba23bbc4f xbps-src/common.sh: recursively remove all cross pkgs. 2014-05-19 16:45:34 +02:00
Juan RP
14a5ef4503 xbps-src/build_dependencies.sh: in !CHROOT_READY case don't install pkgs with fakeroot. 2014-05-19 12:40:44 +02:00
Juan RP
ea719b3f59 Added multilib, multilib/nonfree and debug repositories by default. 
- multilib: to store 32bit packages.
- multilib/nonfree: to store nonfree 32bit packages.
- debug: to store debug packages.
 2014-05-05 10:59:33 +02:00
Juan RP
4d9ed5639f xbps-src/shutils/chroot.sh: unconditionally copy repo conf files into masterdir. 2014-05-05 10:56:00 +02:00
Juan RP
8aa48b07ff xbps-src/shutils/bulk: pass --distdir option to xbps-checkvers(8) instead. 2014-04-17 10:36:45 +02:00
Juan RP
ff700d0a40 xbps-src/shutils/chroot: use existing PATH when entering xbps-src cmds. 
... otherwise xbps-uchroot might not be found when it's in an uncommon path.
 2014-04-14 19:58:32 +02:00
Juan RP
06ac73239f xbps-src/shutils/common: read build_dependencies.sh for check_installed_pkg(). 2014-04-10 14:54:30 +02:00
Juan RP
e60eb854e6 xbps-src: move check_installed_pkg() to build_dependencies.sh. 2014-04-10 11:58:06 +02:00
Juan RP
3c79f11a6f xbps-src/shutils/bulk: also add pkgs with no deps. 2014-04-10 11:26:02 +02:00
Juan RP
922d37f590 xbps-src/shutils/bulk: perform topological sort of build-deps. 2014-04-10 11:10:39 +02:00
Juan RP
51882b7ec4 xbps-src: apply sane indentation to all shell code (2/2). 2014-04-09 16:55:58 +02:00
Juan RP
d4e4d826e6 xbps-src: new targets: update-bulk and update-sys. 
* update-bulk:
	This rebuilds all pkgs in system repositories that are outdated.
	with this xbps-bulk is now considered fully obsolete.

* update-sys:
	This rebuilds all pkgs in system that are oudated and once built,
	updates them via xbps-install(8).

	This target defines a new configuration option "XBPS_SUCMD" that
	is the command to execute to update the system. By default set to
	"sudo sh -c".

CAVEATS
	- need to check if binpkg is in local repo.
	- need to add support to specify alternative rootdir.
	- need to add support to specify system repos.
 2014-04-09 16:42:07 +02:00
Juan RP
1af40eb476 xbps-src: apply sane indentation to all shell code. 2014-04-09 16:40:27 +02:00
Juan RP
576b865cf4 Update for xbps>=0.35 which contains xbps-uchroot. 
That means that the Makefile and xbps-src generated files are not required
anymore, and the xbps-src script can be used as is.

Bump xbps requirement to 0.35 and enable XBPS_INSTALL_ARGS by default.
 2014-04-01 11:29:21 +02:00
Juan RP
f6f59dec8b xbps-src: make sure that wrksrc is expanded after reading build-options. 2014-03-27 10:06:27 +01:00
Juan RP
67fd042d4b xbps-src: make alternative repos work again with git branches. 2014-03-25 09:55:40 +01:00
Juan RP
3b291a8b1d xbps-src: resolve XBPS_DISTDIR correctly with relative paths. 2014-03-24 11:43:16 +01:00
Juan RP
0d953db70b xbps-src: 'pkg' target replaces 'build-pkg' but the latter is kept for compat. 2014-03-23 11:27:09 +01:00
Juan RP
bc256eed73 xbps-src: repair -V 2014-03-23 09:08:41 +01:00
Juan RP
ae8458d875 xbps-src: re-add support for looking in templates in cwd. 2014-03-23 09:04:05 +01:00
Juan RP
c343fbf42a xbps-src: make install/remove targets defaults now, but keep previous for compat. 2014-03-22 20:59:39 +01:00
Juan RP
85624c1a6a common/xbps-src/shutils/chroot.sh: prepend /xbps-packages to PATH for the chroot target. 2014-03-22 13:21:04 +01:00
Juan RP
0b95cb8f5d Merge xbps-src code to make it usable in a standalone mode. 
The new xbps-src configuration file is `etc/conf` where you can
add your local overrides from defaults set via `etc/defaults.conf`.

To use this xbps-src, run these steps:

	$ make
	$ sudo make setup (to make chroot helper setgid)
	$ ./xbps-src ...
 2014-03-22 12:31:42 +01:00