Commit graph

48 commits

Author SHA1 Message Date
Pierre Labastie
3fa4147515 outputpkgdest: don't mix make and qmake
For outputting DESTDIR=, we need to test whether the text contains
"make". But when it contains "qmake" (or any different word containing
"make" but not exactly "make), we don't want to output anything more
than the text. So strengthen the test.
2023-03-19 10:15:18 +01:00
Pierre Labastie
6ac0d96300 outputpkgdest: fix the case of several <literal>
We output text()[1], literal (literally), text(2). This does
not work if there are several <literal> tags. Change it to
outputing preceding-sibling::text()[1], literal for each
literal tag, then output text()[last()] (which works also
when there are no literal tag, so it removes a choose.
2023-03-19 10:10:24 +01:00
Pierre Labastie
24ad4fd4f4 Fix outputting too many sh <<ROOT_EOF
When installing a bootscript or a unit, this sometimes happen
(e.g. samba).
2023-03-18 22:44:03 +01:00
Pierre Labastie
0f4df7ccfd BLFS tools: don't generate duplicate download code
For additional downloads, the normal book layout is a <bridgehead>
containing "Additional Downloads" followed by one or more
<itemizedlist>, one for each file to download. But on some pages,
there are several <bridgehead>, each followed by one or more
<itemizedlist>. So we have to check that only the <itemizedlist>
correponding to the current <bridgehead> are treated. Otherwise,
the download code may be generated more than once. This imposes
that no other bridgehead is inserted between the one containing
"Additional" (or in some case "Recommended/Optional Download") and
the <itemizedlist>.
2022-11-18 15:45:42 +01:00
Pierre Labastie
1870b56894 Ensure that MAKE_TERM(OUT|ERR) are unset
Some packages use those variables to determine whether they are
talking to a terminal, and issue color codes that mess our
logs if the top level make has been launched from a terminal.
2021-11-21 19:23:11 +01:00
Pierre Labastie
b0965faf0d BLFS tools: Source /etc/profile in scripts
Since this is not done anymore in envars.conf...
2021-11-21 19:21:45 +01:00
Pierre Labastie
9daa202654 BLFS tools: Take variables from config instead of envars.conf
Get them in gen_pkg_book, and pass them to sripts.xsl
use them in scripts.xsl. We set them at the beginning of
of the scriptlet, so that it is easy to modify them.
2021-11-21 19:19:16 +01:00
Pierre Labastie
59c4761950 Display the size of $BUILD_DIR for stats
Displaying the size of /, but excluding other filesystems is not
good if BUILD_DIR is on another filesystem. Furthermore, when
doing stats, the DESTDIR is inside $BUILD_DIR, so the full size is
recorded. The only thing that is not recorded is if the
build system downloads files to the user's home (cargo, maven, ...).
2021-11-01 13:18:09 +01:00
Pierre Labastie
fd4a7982f2 Remove $Id$ comments, they are useless with git 2021-10-31 10:22:30 +01:00
Pierre Labastie
bfc99d1f9f Typo 2020-09-15 09:09:18 +00:00
Pierre Labastie
2873df61d7 New bridgehead layout for llvm 2020-09-15 07:36:23 +00:00
Pierre Labastie
0a0b60984c Several things:
- refactor again process-install. Allows for better generation of test
  instructions
- only output the instructions of the first sect2 with role="installation".
  this will miss the vaapi intel driver, the installation of help files in
  GIMP, and the second method for which
- always run porg logging in "append" mode
- allows pass1 in sect2 (libva again)
2019-08-17 08:30:36 +00:00
Pierre Labastie
96d7e44922 BLFS/xsl: move the template for replaceable tags out of the main stylesheet,
and allow replacing some hostname/domainname replaceable tags
2019-08-14 10:32:59 +00:00
Pierre Labastie
8fc6a47249 BLFS/xsl: refactor the generation of installation instructions, owing to
the new remap="test/doc" attributes
2019-08-13 15:28:49 +00:00
Pierre Labastie
7933ed76c6 Refactoring the output of installation instructions:
Create a template which processes the instruction tree fragment (only header
for now, the content is bogus), and call it from main sheet.
2019-08-13 15:03:39 +00:00
Pierre Labastie
6622409404 Don't output role="nodump" in "not-pack" mode 2019-06-19 07:56:39 +00:00
Pierre Labastie
619b313adb Various fixes and improvements coming from github:
- the case for "pax" in packInstall.sh.prog
- an error in packageManager.xml.porg (comment before <?xml?> tag)
- a non-working $Id in Makefile
- some fixes for using the sect1info in lfs (in BLFS tools)
- a big rewrite for generating scripts with more consistent line spacing,
  opening the way to manage remap="test" and remap="doc" attributes
2019-06-15 15:26:23 +00:00
Pierre Labastie
aeb8539125 Fix generation of install instructions, and remove those pesky && as much as
possible
2019-04-22 09:38:44 +00:00
Pierre Labastie
c048987a2c BLFS: fix generation of install and test instructions (ticket #1721):
- add a gen-install.xsl stylesheet for grouping all cases
- add a mode="installation" attribute for templates
- rewrite sect2 template so that the right templates are applied
- adapt other templates so that they are compatible
- rewording of some comments (no direct relation with the ticket)
2019-04-16 07:30:02 +00:00
Pierre Labastie
eabfc593e5 Unset MAKELEVEL in BLFS scriptlets. Fixes #1720. 2019-03-26 07:53:17 +00:00
Pierre Labastie
625cb147bd Add possibility to automate bash shell startup files, vimrc, and rng.
This adds a new variable to the configuration (LANGUAGE).
Also automate the generation of various <replaceable> instructions
2018-09-28 14:35:46 +00:00
Pierre Labastie
2b67b9ba4d Finally, openldap does not need .la files 2018-03-11 05:55:16 +00:00
Pierre Labastie
2969cdfb6b Prevent openldap module .la files to be removed
They are needed for loading modules...
2018-03-10 14:30:21 +00:00
Pierre Labastie
9e0c4b6a3a Wrong variable name when naming info.log file if stats are requested 2018-02-10 21:46:46 +00:00
Pierre Labastie
67c3df4aef Add stats to jhalfs-blfs. NB: due to book layout, far from perfect... 2018-02-05 18:12:17 +00:00
Pierre Labastie
bcbecc53f9 Don't generate porg and del .la instructions when doing userad or groupadd 2018-02-04 15:19:14 +00:00
Pierre Labastie
1fa0dee15b Prepend JH_ to exported variables in jhalfs-blfs, so that collision with
build system variables is unlikely
2018-01-30 13:53:34 +00:00
Pierre Labastie
dc7fd7b7ba Add .la file removal to LFS and BLFS scripts 2018-01-12 19:04:19 +00:00
Pierre Labastie
973c767b90 Use BUILD_DIR and SRC_DIR in bootscripts/systemd-units download instructions
(cherry picked from r3967 in 2.4 branch)
2017-06-29 08:25:01 +00:00
Pierre Labastie
945ccaa75e Merge the new_features branch (manully, thanks to svn) 2017-04-09 10:29:32 +00:00
Pierre Labastie
9da16d9bf1 Fix a bug in the blfs scripts, occuring when the pacakge is neither a
tarball nor a zip file: copy the package from $SRC_DIR to the xxx-build dir.
And in case they are needed, copy the additional files too.
2017-03-19 16:17:18 +00:00
Pierre Labastie
8dc464678e Merge new_features: Allows to retrieve package from SRC_ARCHIVE, in case it is not already there
and is in archive. This should not happen in normal operation, but may happen
    in func_install_blfs
2017-03-16 12:49:01 +00:00
Pierre Labastie
39dc04a73d Merge new_features rev 3918 2017-03-15 21:06:17 +00:00
Pierre Labastie
56178bab73 Add a few forgotten keywords properties 2017-03-12 13:20:02 +00:00
Pierre Labastie
70d73d1e82 Install units when revision is systemd, rather than bootscripts 2017-03-01 15:54:16 +00:00
Pierre Labastie
6eaae5e34c Fix Ed tarball unpacking 2017-02-28 12:46:52 +00:00
Pierre Labastie
342c862481 Merge new_feature branch r3884 to3886:
- Adapt BLFS/envars.conf to modern BLFS books
- Fix try order for downloading BLFS packages
- Fixes to use the XORG Legacy page in BLFS
2017-02-27 14:09:03 +00:00
Pierre Labastie
e6967a11b1 Add possibility for lzma extension when untarring in BLFS tools 2016-01-30 08:33:14 +00:00
Pierre Labastie
07f7eff8b8 BLFS tools: fix usage of sudo when cleaning directory before unpacking
Package management: update dpkg version
2015-11-30 21:29:12 +00:00
Pierre Labastie
67992a0559 Fortify unpacking in the scripts generated for BLFS, see ticket #1693 2015-11-20 17:19:08 +00:00
Pierre Labastie
967b819f07 Add a new possibility for role tag in sect2 2015-09-20 10:18:20 +00:00
Pierre Labastie
a743e57256 Avoid spurious linebreaks
in test commands, because some developpers
include them for formatting the xml
2014-09-28 08:06:23 +00:00
Pierre Labastie
f079f8f2a8 When a package installs bootscripts, the UNPACKDIR variable is used for
unpacking the booscripts. Then, when we want to remove the build directory
of the package, the UNPACKDIR is set to something else and the build
directory is not removed.
2014-09-24 10:10:53 +00:00
Pierre Labastie
ba57e61b6c Add code to download clang in BLFS tools 2014-05-20 20:31:22 +00:00
Pierre Labastie
642722f5c1 Improve script generation for BLFS tools:
- introduce a template for downloading code
- account for various layout of the BLFS pages for package information and additional
downloads
- Add the possibility for addtional downloads in xorg pages
2014-03-26 08:47:59 +00:00
Pierre Labastie
9c5ea2fa6f Correct a bug which could replace "makeinfo" with "make -j1info" 2013-11-17 08:26:47 +00:00
Pierre Labastie
bbcdeab57b Handle errors while installing blfs tools and makes the error
message more accurate
2013-10-30 15:44:46 +00:00
Pierre Labastie
e576789367 Merge ablfs branch. Normally, jhalfs should not perform differently
for building LFS
2013-10-29 15:42:03 +00:00