Commit graph

1412 commits

Author SHA1 Message Date
Pierre Labastie
2e35653630 makefile-functions: make sudo/chroot messages less confusing 2022-02-05 20:08:56 +01:00
Pierre Labastie
20051e00f7 Use only CHROOT1 in LFS/master.sh
There is only one chroot command in newer LFS, and using the first one
with previous versions does not hurt.
2022-02-05 18:48:32 +01:00
Pierre Labastie
abadee36de Improve and augment the "func_dependency" doc 2021-12-30 14:20:43 +01:00
Pierre Labastie
f81d8bdb6f func_install_blfs: gen_pkg_book needs the tracking file
The tracking file is needed for gen_pkg_book.sh as a first argument.
Since it is called to generate the initial scriptlets, it needs
to be passed the full path of the tracking file, including
$BUILD_DIR. The $TOPDIR is now the second argument (and still
needs to be passed too).
2021-12-20 10:30:18 +01:00
Pierre Labastie
141d072bf6 BLFS Dependencies: Fix pass2 not run
With the way we manage "first" deps, it may happen that no node
unreference the pass2 node. In that case, we add it to root.
Add some documentation for what we do for those deps, too.
2021-12-19 17:30:10 +01:00
Pierre Labastie
a78cfc961e Better document the loop on "after" deps
Add also a description of that loop in the general header
2021-12-19 17:30:10 +01:00
Pierre Labastie
e0bbc6e6ac Document some variables in func_dependencies
Better document the $seen global variable used in path_to,
also at places where "path_to" is called.
Document p and b flags in the loop over "after" deps.
Document lr variable in the loop over "first" deps.
2021-12-19 17:30:10 +01:00
Pierre Labastie
bbabe74e15 install_blfs_tools: do not call check_blfs_tools
It does not exist anymore, and it has been integrated in
check_alfs_tools.
2021-12-19 17:30:10 +01:00
Pierre Labastie
b734bfb4c6 install_blfs: update trackdir also in gen_pkg_book.sh
Now gen_pkf_book.sh depends on trackfile. This can be passed
as an argument, but to ease calling it standalone, we need to
set the default to the actual file used.
2021-12-19 17:30:10 +01:00
Pierre Labastie
ff5c301860 Treat the case of boost in packInstall.sh.porg
The default VERSION returned is always "0". Create
a special case to prevent that.
2021-12-19 17:30:10 +01:00
Pierre Labastie
dd9ca56bd2 BLFS dependencies: better document the functions
First the function used in pass1. Also some nit in the function itself
2021-12-18 15:28:47 +01:00
Pierre Labastie
7ae97740a8 Fix the logic for -pass1 packages in gen_pkg_book 2021-12-16 13:57:01 +01:00
Pierre Labastie
b8e5cad4c0 Pass tracking file to gen_pkg_book
This is needed for managing -pass1 packages, since their version
can only be found in the tracking file (thanks to previous commit).
2021-12-16 13:50:33 +01:00
Pierre Labastie
a6fbc65357 Allow to store version of -pass1 packages
With the new way of treating dependencies, we need to properly
manage -pass1 packages: For that we need the installed version of
-pass1 packages. But it is recorded nowhere. packages.xml shouldn't
be used for that, because it is directly built from the book
dependencies: adding -pass1 packages would just duplicate the
dependency information. So the version has to be recorded in
the tracking file. This involves changing bump.xsl (this commit),
and passing the tracking file to gen_pkg_book (next commit).
2021-12-16 10:26:43 +01:00
Pierre Labastie
f9a7f8ec34 Update README
Change http to https for the new linuxfromscratch site.
Explicitly cite dependencies for the tools.
Cosmetic change to the kernel config instructions.
2021-12-13 17:23:08 +01:00
Pierre Labastie
0870a7cfdb Do not call check_blfs_tools that doesn't exist anymore 2021-12-13 16:10:37 +01:00
Pierre Labastie
837362b50f Ticket #1732: add Docbook XSL and XML to check_alfs_tools
This is an oversight of when we moved to profiling and when we
removed the docbook xsl stylesheets from the LFS directory.
Docbook XML DTD and XSL stylesheets are needed, so test them
at start. This has the effect of removing the need for check_blfs_tools.
2021-12-13 16:05:39 +01:00
Pierre Labastie
e57e0291c3 Change spacing in func_check_version output
This is needed to be able to fit "Docbook XSL stylesheets" in.
2021-12-13 16:03:46 +01:00
Pierre Labastie
5e1d9dd5d4 [BLFS] Ticket #1730: Do not forget "-pass1" packages 2021-12-12 18:49:58 +01:00
Pierre Labastie
a690d42f88 [BLFS] Ticket #1730: clean the dependency list
With the new xsl/dependencies.xsl, the full dependency list is generated.
We compare the version and installed version gotten from packages.xml
using xsl/get_version.xsl and only install if the installed version is
lower than the available version. Since the installed version returned
by get_version.xsl for a non installed package is 0, that version is
always lower than the available version and the package is installed.
Note that if a package does not exist, both versions are empty, and
they compare as equal with our method. So they are never installed...
2021-12-12 18:39:03 +01:00
Pierre Labastie
1fc36f5654 [BLFS] Ticket #1730: add a .xsl for returning versions
This .xsl, applied to packages.ent, takes the package name as
a string param, then returns:
"version"<nl>"installed version" if both versions are known
"version"<nl>0 if the package is known but not installed
nothing if the package does not exist (case of the groupxx ones)
2021-12-12 18:33:20 +01:00
Pierre Labastie
5132b9373d [BLFS] Ticket #1730: compute the full dependency chain
Comment out the version comparison in BLFS/xsl/dependencies.xsl. It is
a mess in xslt anyway...
2021-12-12 18:29:19 +01:00
Pierre Labastie
794f94f85e BLFS ordered book gen: fix for .xz Xorg packages
In Xorg pages where there are several packages, the .xsl for
separating packages assumed that the package names ended in
tar.bz2 and selected the substring before ".tar.bz2" to extract
the packagedir. This has changed recently for libX11, which is a
.tar.xz package: the fix is to just select the substring before
".tar." for the packagedir.
2021-12-11 07:50:56 +01:00
Pierre Labastie
eec87dbd1f Add dependency thoughts to BLFS/TODO 2021-12-10 18:19:06 +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
0495e57e0a Update README.BLFS for envars.conf removal
And try to clarify... Also remove references to books other than
LFS.
2021-11-21 19:23:11 +01:00
Pierre Labastie
267b19da59 Adapt func_install_blfs.sh to the removal of envars
Add to the configuration file in $BUILD_DIR/blfs_root
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
5fd1a98625 Remove BLFS/envars.conf
Not needed anymore since envars are taken from configuration
2021-11-21 19:21:45 +01:00
Pierre Labastie
0a93085f84 BLFS tools: Do not source envars.conf
Now the environment variables are taken from configuration.
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
60e539b9fc Remove KBLAYOUT setting
it is not needed anymore by any book.
2021-11-09 21:17:05 +01:00
Pierre Labastie
2b3edd2e77 [Remove BLFS envars.conf]: new gen_config.xsl
Now the variables previously defined into envars.conf are in Config.in
2021-11-09 21:17:04 +01:00
Pierre Labastie
f756851d45 BLFS tools: do not needlessly validate book
With the current Makefile, git-version.sh is run unconditionally,
so that the bok is validated each time, even if there is no
text change. Change this to only validate if there is a text change
(the previous behavior), and run git-version.sh just before validation.
2021-11-09 21:11:58 +01:00
Pierre Labastie
e25788e846 install-blfs-tools.sh: Minor tidy up 2021-11-09 13:33:49 +01:00
Pierre Labastie
610a5c4a0e Have install commands use the right PATH and exit if error
Hopefully the present commit fixes those problems:
- use sh -e instead of sh
- set PATH to $PATH (which will expand to the PATH before entering
  sudo) before the install commands.
2021-11-06 15:55:03 +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
240d928d23 Fix packInstall.sh.porg for docbook-5.1 2021-10-21 21:24:47 +02:00
Pierre Labastie
59a1e1add9 Add gtweak to non-install commands 2021-10-21 08:42:34 +02:00
Pierre Labastie
d5413a91a1 Add tracker-miner to the list of non-install commands 2021-10-21 08:32:56 +02:00
Pierre Labastie
50cf934f51 Fix blfs tools for condxml 2021-10-17 18:50:24 +02:00
Pierre Labastie
ee96ad26f9 jhalfs: rebuild-makefile. take VERSION from prbook
When rebuilding the Makefile, we should have prbook.xml in
ĴHALFSDIR. Use it to get VERSION (from lfs-release).
2021-10-14 10:25:48 +02:00
Pierre Labastie
4c32ca80bd Adapt to condxml branch: func_book_parser
When running git-version.sh, unconditionally add a $INITSYS
argument, which is needed for the new condxml, and
is harmless if this argument is not needed.
2021-10-14 10:23:24 +02:00
Pierre Labastie
2718053f55 Custom tools: prevent a warning if no md5sum for patches 2021-10-14 08:53:29 +02:00
Pierre Labastie
2257bd71b7 Update and fix documentation of custom tools 2021-10-14 08:51:49 +02:00
Pierre Labastie
e22aa9615e Blfs tools: Fix Makefile for new git-version.sh
With the condxml change, git-version.sh needs an argument. Pass
it unconditionally, since passing an unused arg to older
versions is harmless.
2021-10-14 08:13:10 +02:00
Pierre Labastie
840b9ba06e Fix wrong VERSION variable for dev book
Using version from the ENTITY version line in gneral.ent is not
good anymore, since version is in version.ent for the dev book.
But it _is_ in general.ent for releases...
Use a different approach: take the profiled .xml, and use the
version in lsb-release.
2021-09-16 06:30:58 +02:00
DJ Lucas
b5d1c50492 Fix iproute2 install with package management. 2021-09-06 17:04:11 -05:00
Pierre Labastie
e68c306380 Add the -j value to the sbu report 2021-08-28 22:50:40 +02:00