Commit graph

81 commits

Author SHA1 Message Date
Juan RP 5bb36505b1 Rename helper-templates to just helpers.
--HG--
extra : convert_revision : cbaa30da99805accbe250d8dee5494c78cb93291
2008-10-30 23:34:05 +01:00
Juan RP 25a6af5a07 Remove unzip helper and make pkg add a build dep to unzip.
That way we can simply check for unzip bin being installed and
error out if it's not, it's simpler.

--HG--
extra : convert_revision : 8fd6c5f11a54742403a16fa10c3ed1db7f12955b
2008-10-30 23:28:59 +01:00
Juan RP faef73b60c remove_pkg doesn't need $short_desc.
--HG--
extra : convert_revision : ad34005ecd15a99d74f17bec7df37cda3d8d8684
2008-10-30 09:44:02 +01:00
Juan RP 000b040397 Just run xbps-pkgdb list and remove list_pkgs().
--HG--
extra : convert_revision : 8aec0a58b00abe86418ce0d906db03d70f8d62ff
2008-10-30 07:18:21 +01:00
Juan RP f2846165f0 Missed another change for previous.
--HG--
extra : convert_revision : 32531d00f580c993d05c76308b7908859cec0e8d
2008-10-30 07:14:32 +01:00
Juan RP 35df6d0c6e Rewrite xbps-pkgdb to use an array of dictionaries per pkg.
That way we can make it extensible in future changes.
Now it looks like this:

<key>packages_installed</key>
<array>
	<dict>
		<key>pkgname</key>
		<string>dash</string>
		<key>short_desc</key>
		<string>POSIX-compliant Unix shell ...</string>
		<key>version</key>
		<string>0.5.4</string>
	</dict>
	...
</array>

xbps list should be faster than before if a lot of packages
are installed.

--HG--
extra : convert_revision : 816e3e73a4fc72fd8e61f3825757d92ad9d5b511
2008-10-30 06:40:11 +01:00
Juan RP b061a3665e Simplify even more by making msg_error() exit by itself.
--HG--
extra : convert_revision : bd27f0be7b00bef29b8ab4767273c7339ca91c10
2008-10-29 23:34:05 +01:00
Juan RP f19481b477 Remove register_pkg_handler() and use directly xbps-pkgdb.
--HG--
extra : convert_revision : 5984773a47b003a8669a21c3e7f3a9f3c0f46695
2008-10-29 22:53:26 +01:00
Juan RP c467d31a66 Simplify check_installed_pkg to avoid calling xbps-pkgdb unnecessarily.
--HG--
extra : convert_revision : 6e0f6f96a65b346e2e2e3c3253e5469d5eed8ede
2008-10-29 22:05:29 +01:00
Juan RP 728daf9254 $grep_cmd is not needed anymore.
--HG--
extra : convert_revision : 6322150664a1774c4cc2913101b1e3668d4ffda0
2008-10-29 21:14:02 +01:00
Juan RP fb4b091270 Integrate xbps-cmpver and misc tweaks found in the way.
--HG--
extra : convert_revision : dc30942ce1cdf3631972466766e2af6d6f46ffeb
2008-10-29 19:59:06 +01:00
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