Commit graph

70 commits

Author SHA1 Message Date
Juan RP
5803db23a3 Fix spurious chars passed to grep in extract_distfiles().
--HG--
extra : convert_revision : 6f1f9ca0640b8cbb0dcb8ef7f42046566d479fc0
2008-10-29 18:37:04 +01:00
Juan RP
2cb592e66e Remove bash specific features to not depend on it.
--HG--
extra : convert_revision : 0ff8eac00a603d8aae549a8bfa568bb710e4b0bf
2008-10-29 18:33:55 +01:00
Juan RP
2680b4827d Looks like I removed a line accidentally for the configure phase.
--HG--
extra : convert_revision : 4554d5b18761b54653785df10117fda04d88ac42
2008-10-29 05:34:57 +01:00
Juan RP
087e6ae23d Use bye() instead of restore_color() for signals caught.
--HG--
extra : convert_revision : 86e2e0f57155740d6206a3476f7879764a51770b
2008-10-29 05:09:38 +01:00
Juan RP
cfcbec0b91 Misc tweaks again for msg_{error,warn}.
--HG--
extra : convert_revision : 03960afc7bc1b52309315f55e0548b6a20121df7
2008-10-29 04:54:57 +01:00
Juan RP
1e0ee707b4 Bah, fix previous.
--HG--
extra : convert_revision : a1b67af86cec707608560c84088d519acb195a20
2008-10-29 04:04:32 +01:00
Juan RP
8a928f76d8 Remove unused $distfiles stuff.
--HG--
extra : convert_revision : 1d91a0ff92b2fe393c5cb6f5a206d4dadda7dd24
2008-10-29 04:02:58 +01:00
Juan RP
d5d8bb96b0 Some redirections in {set,restore}_color to hide escape sequencies.
--HG--
extra : convert_revision : 443255949d85cce1d381d5227c1773fa8901f4cf
2008-10-29 03:32:28 +01:00
Juan RP
5a0aac4fd2 Added some ANSI colors for messages, may be disabled.
With the -e flag those colors will be disabled. As bonus also
I removed blank lines in .xbps-filelist and other misc tweaks, fixes
I cannot remember now.

--HG--
extra : convert_revision : 5e481d0faa14518363eafc622633d645c335ed78
2008-10-29 03:20:14 +01:00
Juan RP
93401521f9 Bah, removed too much in previous commit.
--HG--
extra : convert_revision : 998be8e3fc013755676c91ea2f9a1df5883cdc75
2008-10-29 00:06:32 +01:00
Juan RP
7f0b12faf8 Update info_tmpl() after last changes to $distfiles parsing.
--HG--
extra : convert_revision : d7f54cf85b5d3f509e993b58bc5e479bc80a3f0c
2008-10-29 00:05:03 +01:00
Juan RP
ac80ddda40 Use bash features to improve $distfiles parsing.
That means that it's not necessary anymore to use an '@' before the
extract suffix string. yay.

--HG--
extra : convert_revision : 83ce2c783cb917ef59b87eacb0565cfcff277218
2008-10-28 23:57:52 +01:00
Juan RP
b011885995 Update reset_tmpl_vars().
--HG--
extra : convert_revision : e74bf4fec6f8f74cd877e85d1d950880ca329387
2008-10-28 16:28:46 +01:00
Juan RP
4b276a75ac Remove $extract_sufx item from TODO, add some more from xbps.sh.
--HG--
extra : convert_revision : 8be664ab1189c24842158700823cea3dce03fae8
2008-10-28 16:22:30 +01:00
pancake
1732450967 Added wget package (dependency of xbps-base-chroot)
Make chroot copy etc/resolv.conf when entering
Added buggy gstreamer template (exposese some bugs of xbps.sh)
utils build now does not cleanups the dir after build

--HG--
extra : convert_revision : a36211b7dab8627f912f3b8f844d16bbcec0bc6e
2008-10-28 12:45:30 +01:00
Juan RP
62c195287c Put back '=>' in msg_normal() as before in non-chroot.
--HG--
extra : convert_revision : a3007e87884a904b47e7ecdfddeafe582ffbaaff
2008-10-28 09:35:05 +01:00
Juan RP
8297c06b59 Enhance informative/error/warning messages.
--HG--
extra : convert_revision : 30b7cec773da5e93b31cb1f6a86d65fe89c4b260
2008-10-28 08:00:03 +01:00
Juan RP
12d0412547 No need to run umount_chroot_fs anymore in xbps.sh.
--HG--
extra : convert_revision : 7d0338fb96eeb8ecb62a993087323a70efa57d8b
2008-10-28 07:37:30 +01:00
Juan RP
c50c3cab2a Simplify chroot helper and fix a minor glitch in stow_pkg().
--HG--
extra : convert_revision : a84053dacf4768c9a7b8b6d2d8e4548902f8a97e
2008-10-28 07:17:35 +01:00
Juan RP
0a71559ee4 info_tmpl(): missing quotes to evaluate $checksum.
--HG--
extra : convert_revision : 9b5917d5a82f57a992eba6b28cf5294f6af497ac
2008-10-28 06:19:06 +01:00
Juan RP
dff230ebcb Simplify and improve list_pkg_files() and configure_src_phase().
--HG--
extra : convert_revision : 512bf3f7499ec8deff05af56cf5a6b44ee6e0ab5
2008-10-28 06:02:52 +01:00
Juan RP
f365ce8bce Remove an item from TODO that has been implemented.
--HG--
extra : convert_revision : 32438c0f717ce8a4787440af67d62514a8a3804b
2008-10-28 05:09:00 +01:00
Juan RP
62defd3fd1 Added new build_style option "custom-install".
If a template uses this, it should provide a do_install() function to
install all required stuff.

--HG--
extra : convert_revision : ffbb388b83ac72e506c2c1fe98a942a41f3777d2
2008-10-28 05:01:40 +01:00
Juan RP
d2b65a9b0d Simplify configure/build target for chroot templates.
--HG--
extra : convert_revision : 528f8e0dbb3af0c120ecea434cdd5c73c6c16314
2008-10-27 11:19:37 +01:00
Juan RP
c2362703e2 Add disable_parallel_build option.
To disable -jX per template.

--HG--
extra : convert_revision : cd5765c13ab9d1b465077d4367b762490a48bc5b
2008-10-27 10:45:07 +01:00
Juan RP
69aa44ff17 Fix installing base_chroot pkgs.
--HG--
extra : convert_revision : 80b4baf95c1eaa9465662cca381f823841fe8eb6
2008-10-27 10:29:21 +01:00
Juan RP
3f1c7c69cf Use msg_normal() in more places.
--HG--
extra : convert_revision : 84a2e9c6bd3baf5e7f76668af061442892dfb04b
2008-10-27 09:15:34 +01:00
Juan RP
4ee2fd5e1a unstow: ignore rmdir messages sent to stderr.
--HG--
extra : convert_revision : 666b70cdb9b729bf7858bd91db242a2d5c05a605
2008-10-27 08:44:41 +01:00
Juan RP
40a6d63364 chroot: do not umount unnecessarily in the build target.
--HG--
extra : convert_revision : bb005f7c4dae217282a231eea9f71869479b97d2
2008-10-27 08:35:40 +01:00
Juan RP
5a249b6c4f Require to configure/build/install in the chroot all packages.
This is to ensure that only stuff found in the chroot will be used,
and to avoid some stupid problems with libtool scripts. Therefore only
templates that have $base_chroot set can be built without the chroot.

As bonus now all messages are prepended with "[chroot]" when xbps.sh
is running inside of it.

--HG--
extra : convert_revision : 68195f4b240c01eea18777767b555604d892400f
2008-10-27 07:42:40 +01:00
Juan RP
e9231b5999 More changes to {pre,post}_<stage> stuff.
Rather than using a file for stuff like this, change them to be
functions in templates. Now if any template want to use them, it
can specify for example a {pre,post}_<stage>() shell function.

Also remove some NetBSD specific stuff that is not useful anymore.

--HG--
extra : convert_revision : b7157c61c92c05904e0e4d971268e5f018db46bc
2008-10-27 06:12:30 +01:00
Juan RP
5ef5ca8d35 Simplify templates by not needing $patch_files in some cases.
If exists a patch called $pkgname-fix-{build,install}.diff in the
templates directory, they will be applied automatically. If patches
are named differently $patch_files must be used yet.

--HG--
extra : convert_revision : 21f6edfab580c569b3737280f54a6332c44baa49
2008-10-27 04:08:55 +01:00
Juan RP
c06defc719 Replace run_stuff with post/pre_<stage> variables.
If there's a file called "$pkgname.{pre,post}_{configure,build,install}
it will be automatically executed. In addition to this, templates may
use {pre,post}_{configure,build,install}_cmd variables to run arbitrary
commands.

--HG--
extra : convert_revision : 62ad549b8299689ecf8c833e73eda436ffdb7aa7
2008-10-27 03:56:42 +01:00
Juan RP
e3ac7fd84c Fix build_src_phase().
--HG--
extra : convert_revision : 6cdb0f47c17e445bc3bef8ebe52221596059018d
2008-10-26 22:09:16 +01:00
Juan RP
fb77496cb9 Some changes for libtool transform and listfiles target.
It's possible now to specify the target on which libtool_fixup_la_files
will run on, if template doesn't use by default will run at post
install. Also some changes to the listfiles target to not only show
files.

--HG--
extra : convert_revision : fc0656e6504184b890e1096e5a158f29f54b414b
2008-10-26 06:50:52 +01:00
Juan RP
9447f6f738 Passing --prefix=/ is redundant, just use an empty value.
--HG--
extra : convert_revision : 314499d7133bee4bd805c379061afb0a382eb260
2008-10-26 01:43:48 +02:00
Juan RP
c658c03ba6 {set,unset}_build_vars are not needed in the chroot.
--HG--
extra : convert_revision : 9d6a23fdba12bc1a4ef04d7579b677fb79e64ae9
2008-10-26 00:44:31 +02:00
Juan RP
69ea8000e9 install_dependencies_pkg(): use grep -w to match exact pkgs.
--HG--
extra : convert_revision : 2d49492a5bc6f3525af5d3ced97cd77a3b805ce9
2008-10-25 23:31:12 +02:00
Juan RP
be392f9c9e Do not run fixup_la_files() if there's no libtool or ltmain.sh in
wrksrc.

--HG--
extra : convert_revision : b58add2a00c9b36a3f389a3a3ed4f1956ec34b5c
2008-10-25 04:57:53 +02:00
Juan RP
ffbd0ad5ae Reread config file and set vars in the chroot to get correct paths!
--HG--
extra : convert_revision : dbc4e06cf93ef92d12090a53be4270d720c88f9f
2008-10-24 10:09:42 +02:00
Juan RP
758eff37a8 Add another target: chroot. Use this to make stuff on it.
Also the helper has been renamed to just chroot.sh.

--HG--
extra : convert_revision : 9d21ca6e9eb55a31a21cb800450376d60cf3af40
2008-10-24 09:44:51 +02:00
Juan RP
ccce118103 When stowning a pkg, do not copy file with -f.
--HG--
extra : convert_revision : 9d99ad0b7b4f616e8681b24e858988842eb3a9d2
2008-10-24 08:49:49 +02:00
Juan RP
8e9465f816 Do not make libtool transforms in the chroot.
--HG--
extra : convert_revision : 4467323784c7e690b303ee2c278f8db36a102e1d
2008-10-24 05:20:12 +02:00
Juan RP
b0f9cd1ef7 xbps: misc changes to perform better in chroot target.
- Use masterdir path before system path, this is needed in chroot!
- Use system grep because before starting the chroot LD_LIBRARY_PATH
  has been configured and might fail.

--HG--
extra : convert_revision : 767a9fb94819ee85eab44096a0741b536e59763f
2008-10-24 03:34:50 +02:00
Juan RP
206a4e1485 Don't forget to unset base_package and add another pattern to
fixup_la_files.

--HG--
extra : convert_revision : f5ea720e905e7a1512560fb764a771f9641054b5
2008-10-24 00:55:51 +02:00
Juan RP
d987a000cc Remove pkg-config-transform helper, it's not useful right now.
--HG--
extra : convert_revision : 7c9627f3487c03ae21c1b4ca7682cffdb62808fb
2008-10-23 23:37:45 +02:00
Juan RP
0c2a5b90da Added file-4.26 template and make xbps-base-chroot depend on it.
Also allow packages to disable fixup_libtool_file() via
$no_fixup_libtool, it's enabled by default.

--HG--
extra : convert_revision : 5fd550379cc78d08c2131fa011ee0121422bbae4
2008-10-23 23:27:10 +02:00
Juan RP
b8e0a0f535 Also pass LDFLAGS as before.
--HG--
extra : convert_revision : 54e27f1de2235c3f9a920a34003f2dd94f530a5a
2008-10-23 18:32:11 +02:00
Juan RP
89f264e88c Massive changes to allow installing pkgs in a chroot.
Some changes include:
 - Xstow is not used anymore, files are copied into masterdir.
 - a new target install-chroot has been created.
 - a new meta-template xbps-base-chroot has been created required for
   the install-chroot target.
 - Removed XBPS_SYSCONFDIR, /etc is used by default.
Other changes that I cannot remember right now...

--HG--
extra : convert_revision : fb57d9dafb56aeb03cc935580172e075ce584fd5
2008-10-23 17:14:00 +02:00
Juan RP
e13b08218a Set and unset compilation vars in all phases not just configure.
--HG--
extra : convert_revision : 8260a0608d8e90720c27139c76b4bf70830da12b
2008-10-22 04:08:46 +02:00