Commit graph

239 commits

Author SHA1 Message Date
Pierre Labastie
706e5bf46a Various small fixes/improvements:
- Prefer SysV over Sys V in Config.in
- do not generate the package list for lfs, it is not needed anymore
- prevent an (ignored) error in LFS/master.sh
- log new files under the scriptlet name (allows to log files for the same
  package from different builds)
- keep the full name in log_new_file functions (fix a undetected bug in
  CLFS/HLFS)
2020-06-20 17:01:23 +00:00
Pierre Labastie
3da8c49659 Update ICA for new LFS/master.sh 2020-06-14 07:08:19 +00:00
Pierre Labastie
22bb166d9d Fix the save-ch5 target 2020-06-11 08:22:20 +00:00
Pierre Labastie
ebe1ba613c Adapt for the cross 2 branch. Note that ICA is broken now. Keeping some old
code to use for fixing ICA, but committing now so that testing can begin!
2020-06-10 20:01:17 +00:00
Pierre Labastie
ae1d8a5b59 Prevent a permission problem when using blfs tools with the cros-chap5 branch:
/var/lib needs to be owned by LUSER during chap 5, but it is owned
by root after installing the blfs tools. SO chown it.
2020-05-08 08:22:55 +00:00
Pierre Labastie
38016d5ca7 Add a missing file for saving chapter 5 work 2020-05-01 19:36:10 +00:00
Pierre Labastie
f5ecc2838a Add code to save work at the end of chapter 5
(and finish the rebuild-makefile change)
2020-05-01 14:24:32 +00:00
Pierre Labastie
31a9b1440c remove the __pycache__ dirs from comparison analysis 2020-04-10 10:16:41 +00:00
Pierre Labastie
7b7b5e9624 Various fixes for ICA 2020-04-02 09:56:51 +00:00
Pierre Labastie
0835a1065f Two fixes:"
- use /etc/passwd to check whether LUSER exists
- use sudo -H -u $(LUSER) to be sure that HOME is set (depends on distro)
2020-04-01 09:11:32 +00:00
Pierre Labastie
04de9bc4db Allow to find kernfs and chroot in any chapter
We use those files to generate code snippets to use in Makefile.
They used to be in chapter 6, but the new book will have some
of them in chapter 5.
2020-03-29 17:19:25 +00:00
Pierre Labastie
939731aa52 No need to prin DU from Makefile in LFS
We now print the disk usage from the scriptlet, so printing
again from the Makefile results in a duplicated line. Remove
the printing if book=lfs
2020-03-29 13:46:19 +00:00
Pierre Labastie
20e3fcdec2 Do not use a login shell for LUSER
Most books have something like "exec /bin/bash" in .bash_profile for the
building user. This results in stopping and waiting for commands when
running a a login shell. The current jhalfs way of removing .bash_profile is
suboptimal, since a user may want to login as $(LUSER) and expect that the
environment is set (without having to source .bashrc). So remove the
"-i" flag in "sudo -u $(LUSER) ..."
2020-03-29 12:58:06 +00:00
Pierre Labastie
a1795f0351 TRACKFILE should not contain LFS packages that are also in BLFS, ticket #1723 2019-09-25 07:50:45 +00:00
Pierre Labastie
085435e66f Remove the obsolete vim-lang instructions and variable, and add non-wide-
charater ncurses library
2019-09-05 17:22:04 +00:00
Pierre Labastie
2c603d8caf Fix a few missing bits of the transition to the new menu subsystem 2019-04-25 08:44:43 +00:00
Pierre Labastie
f596dde66c Get rid of the GPLv2 license:
- Replace the menu system with the Kconfiglib, which has an ISC license
- Remove farce and any reference to it
- Rewrite the copyright notice, add the LICENSE files
- Adapt Config.in and a few other programs to the new menu system
2019-04-24 16:16:20 +00:00
Pierre Labastie
7fa93699d4 Fix a long standing bug in func_compare.sh:
The files in test-logs have the package version in their names
2019-04-24 15:07:04 +00:00
Pierre Labastie
72e9e684e7 Fix a long standing bug in func_check_version.sh:
Using the non existent dotSTR variable caused a ragged output.
Use the spaceSTR variable rather
2019-04-24 15:01:26 +00:00
Pierre Labastie
2758d9421e Use sect1info for getting informations on LFS packages:
- add sect1info sections to packagemanager.xml.xxx + various fixes
- add templates in LFS/lfs.xsl for script start and script end:
  - script start: define variables containing package information
                  print disk usage
                  unpack and change dir
  - script end: print disk usage
                remove build dir
- remove the corresponding operations from master.sh
2019-04-11 07:40:50 +00:00
Pierre Labastie
13c475babc Get virtual kernel filesystem commands from the book, and really add
/run/systemd/resolve/resolv.conf after creating the kernel FS in chapter 6
2019-03-13 06:31:55 +00:00
Pierre Labastie
49ba78d711 Always display gcc's full version 2019-03-11 14:25:09 +00:00
Pierre Labastie
3b43e17bda Generate console files:
- add variables LOCAL (y is hw clock set to local time) and LOG_LEVEL (sysv)
- generate /etc/sysconfig/console (sysv) or /etc/vconsole.conf (systemd)
- generate /etc/adjtime (only systemd)
- remove UNICODE and FONTMAP variables (jhalfs makes unicode default)
2019-03-09 08:11:37 +00:00
Pierre Labastie
90f5b6de2e Remove obsolete blfs_tools dependencies 2019-03-09 08:02:10 +00:00
Pierre Labastie
399058f718 Python in func_check_version should be uppercase 2019-02-15 16:06:46 +00:00
Pierre Labastie
7a821947ad Add version check for Python 2019-02-15 14:11:36 +00:00
Pierre Labastie
f168be19d5 Remove "-i" flags in kernel scriptlet 2019-01-02 20:57:01 +00:00
Pierre Labastie
94a78ddfa2 When installing BLFS tools, the database of installed packages is populated
with LFS pacakges. But packages installed only in tools should not be in
this database. As a side note, it would be cleaner to use an xsl stylesheet
for that.
2018-12-08 09:04:01 +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
c7b535b488 Remove the need to have write access to BUILDDIR, using sudi, which is
required anyway. ticket #1715
2018-02-03 16:37:32 +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
84a3fda1c3 Do not optimize binutils-pass1 in order to measure the SBU:
- introduce REALSBU variable if Config.in and jhalfs, and display it
- Adpat LFS/master.sh
2018-01-14 10:26:43 +00:00
Pierre Labastie
2e1c1c3c16 Remove spaces at the end of lines 2018-01-13 09:08:56 +00:00
Pierre Labastie
dc7fd7b7ba Add .la file removal to LFS and BLFS scripts 2018-01-12 19:04:19 +00:00
Pierre Labastie
5637b53ba7 override libelf->elfutils for getting the tarball name 2018-01-12 16:10:54 +00:00
Pierre Labastie
4b2a5fd304 Typos and removing useless instruction 2018-01-07 18:23:51 +00:00
Pierre Labastie
e3f4b9a4c1 Fix grepping for VERSION (func_install_blfs)
Add LFS-Release (update-lfs.sh and func_install_blfs)
2017-08-17 11:27:07 +00:00
Pierre Labastie
6d1d77c1e8 Improve the list of installed LFS packages:
Take package names and versions from <sect1info> tags in lfs-full.xml
2017-08-10 15:25:12 +00:00
Pierre Labastie
b8aa7ed93b common/libs/func_install_blfs: Add LFS to BLFS tools 2017-08-09 14:10:46 +00:00
Pierre Labastie
340c27e8ae common/libs/func_install_blfs:
Honour-variables-set-in-jhalfs
2017-08-09 13:47:45 +00:00
Pierre Labastie
203a64ca76 Allow a non numeric version in glibc 2017-07-11 16:21:26 +00:00
Pierre Labastie
9bbb9c83f3 Package management: compute times and sizes without packing times and sizes 2017-07-04 12:19:46 +00:00
Pierre Labastie
322226dbf8 Do not export the wrapInstall function when porg style is not in use 2017-07-04 12:17:11 +00:00
Pierre Labastie
45f8a9c86d Forgotten quotes 2017-06-29 16:54:28 +00:00
Pierre Labastie
a4acb1236b Quote bash variables in arguments to --stringparam for xsltproc 2017-06-29 14:10:30 +00:00
Pierre Labastie
cee84ade49 Copy the right files to SRC_ARCHIVE when "Retrieve source files" is on
and "Add blfs-tool support" is on: only $PACKAGE{,1} files were copied.
2017-04-10 08:34:27 +00:00
Pierre Labastie
945ccaa75e Merge the new_features branch (manully, thanks to svn) 2017-04-09 10:29:32 +00:00
Pierre Labastie
de57ef4f16 Fix issue with clfs, when using
a tag in git, and not checking "Rebuild files": git pull fails because
the local repo is in "detached head" state.
- fix an issue with iputils patch in clfs-3.0.0
2017-04-01 11:05:15 +00:00
Pierre Labastie
5e59386c6d Logging of the scriptlets generation had disappeared in the preceding
commit...
2017-03-27 19:10:38 +00:00
Pierre Labastie
0ad3a337f1 When choosing the LFS book, we should not depend on docbook-xml. This is achieved by directly treating the revision attribute in lfs.xsl, instead of using profiling from docbook-xsl. 2017-03-27 09:40:41 +00:00
Pierre Labastie
c67990fd77 Existence of package management files is tested even if PKGMNGT=n. Fix that. Thanks to Michael D.L. for reporting. 2017-03-25 21:00:16 +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
3aa1acdc0d Add checks for the files used by package management functions. Fix #1701 2017-03-19 14:54:28 +00:00
Pierre Labastie
2cf28dcaf1 Merge new_features r3922:
Add instructions to copy to SRC_ARCHIVE in func_install_blfs, so that files
    are kept in host repo, and not downloaded again, should a new build be
    started.
2017-03-16 13:40:18 +00:00
Pierre Labastie
85506da325 Merge new_features branch at r3901; Fixes:
when the user fstab and/or kernel config are the same as the ones in
$BUILDDIR/sources: avoid to cp on itself
- set SRC_ARCHIVE=/dev/null in BLFS tools download script if SRC_ARCHIVE is
empty
2017-03-05 08:38:09 +00:00
Pierre Labastie
67723e1682 merge new_features revision 3888 2017-02-27 17:33:46 +00:00
Pierre Labastie
f1fcb6b7a6 Merge r3879 from new_features branch 2016-11-24 16:52:03 +00:00
Pierre Labastie
26e6739b12 Add a forgotten switch REV=$INITSYS to the make command in BLFS tools,
so that the systemd revision be used when the LFS revision is systemd
2016-10-16 14:02:34 +00:00
Pierre Labastie
78d47793a9 Tidy is not needed anymore for BLFS tools. 2016-06-25 10:27:48 +00:00
Pierre Labastie
878a5a08dc Forgot to change a variable name in the validation code at
last commit
2016-05-28 10:34:51 +00:00
Pierre Labastie
c9598f2108 Adaptation for merged LFS books. A few typos with no consequence are corrected too. 2016-05-28 10:00:30 +00:00
Pierre Labastie
061d54fbd5 change the way the hostreqs.xml file is found, to account for recent move from prologue to chapter 2 in
LFS
2016-05-20 11:46:49 +00:00
Pierre Labastie
4a03ca1421 Avoid to remove "make-ca.sh" from cacerts script 2015-11-20 06:15:24 +00:00
Pierre Labastie
39da010453 Fix the installation of jhalfs for BLFS:
- Remove the download part of the book instruction for cacerts
- Separate download and md5sum instructions in "download-script" generation,
  so that packages with no md5sum can still be downloaded.
2015-11-19 13:13:29 +00:00
Pierre Labastie
b7515ec4fc Bug in ICA:
Some time ago, we added the version information to the logs filename, but
the iteration targets did not know about that, and failed.
2015-03-07 22:05:24 +00:00
Pierre Labastie
3d96a65554 Fix version extraction for XML-Parser 2014-12-09 20:58:02 +00:00
Pierre Labastie
82808d1b14 Fixes addition of "pass1" util-linux in new version of CLFS.
Thanks to William Harrington for the patch.
2014-11-04 12:57:31 +00:00
Pierre Labastie
2af991dc0b Allow "wget --version" to return a missing version field, since only
wget presence is required
2014-10-31 10:08:40 +00:00
Pierre Labastie
1f25a75e57 Have openssl build before python in blfs tools 2014-08-27 09:56:45 +00:00
Pierre Labastie
3f83cb0f8e For CLFS 3.0, variable setting is now in final-prep chapter.
Adapt CLFS for that
2014-05-31 06:57:41 +00:00
Pierre Labastie
659be15f60 In get_package_tarball_name function, patterns corresponding to #- are
dropped. This should happen only when the digit is at the beginning of the
name. Change the sed accordingly
2014-05-24 08:50:45 +00:00
Pierre Labastie
2270ffd83f Change the wording of the error message when Docbook XML DTD are
not installed
2014-01-23 08:59:08 +00:00
Pierre Labastie
d68eb1b205 Major change to th scripts layout:
- Do not put the chroot commands in $PROGNAME-commands, but rather
  in a separate directory chroot-scripts
- Use the commands in the chroot-scripts directory to generate the CHROOT
  variables in Makefile
- The commands are extracted to $PROGNAME-commands only if they do not
  have role="nodump attribute and they do not begin with "chroot" (for
  compatibility with previous books where chroot commands did not have
  the role="nodump" attribute.
2014-01-12 21:40:20 +00:00
Pierre Labastie
94744cd687 Only check versions which appear in hostreqs.xml 2013-12-27 07:38:30 +00:00
Pierre Labastie
cbca63a173 Further changes to BLFS tools installation 2013-12-25 11:26:55 +00:00
Pierre Labastie
c1626d892a Adapt blfs installation to recent changes in BLFS book 2013-12-24 18:52:24 +00:00
Pierre Labastie
6ed3dd7533 Change the prerequisite tests so that alfs tools are first checked, then blfs,
and the host reqs are tested later
2013-12-15 10:10:25 +00:00
Pierre Labastie
382b083182 Changes in func_install_blfs:
- Add --preserve-timestamps when copying the local BLFS book working copy
  so that if the book has already been validated it is not validated again
- Some scriptlet changes are not needed anymore
2013-12-15 07:46:46 +00:00
Pierre Labastie
e58cf15308 improvement of the copy flags when using a BLFS working copy 2013-11-17 07:55:30 +00:00
Pierre Labastie
854854e880 - Make the number of parallel jobs configurable in the menuconfig interface
- Allow choosing a working copy of the blfs book
2013-11-16 22:35:25 +00:00
Pierre Labastie
bb4b5c3c00 Permission problem again 2013-11-08 22:10:11 +00:00
Pierre Labastie
b2c7742927 Revert a previous fix, which could not work when user clfs did not exist yet 2013-11-06 21:44:09 +00:00
Pierre Labastie
e18f80a34a Fix BLFS tool inclusion for CLFS:
-fix a typo in Makefile (8 spaces to tab...)
-fix permission problems (hopefully)
2013-11-06 20:55:27 +00:00
Pierre Labastie
ef32ce5ea5 Getting mad because you cannot interrupt the build once started?
The present set of commands seems to allow interrupting during the chapter
5 phase. No changes to chroot phase yet.
2013-11-01 14:15:43 +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
Pierre Labastie
3cb4ef5b5a Add versions to file names in logs and test-logs: use it for the SBY report 2013-10-05 17:45:52 +00:00
Pierre Labastie
ad4ff97cf4 Fix a bad fix 2013-10-03 10:28:37 +00:00
Pierre Labastie
7ce6de2ee4 Fix updating a git working copy when the head is detached 2013-09-22 07:14:33 +00:00
Pierre Labastie
b86876a6ef Adapted host requirements checks for CLFS 2013-09-21 18:52:02 +00:00
Pierre Labastie
de84c00168 download and builds the test programs, even if tests are disabled 2013-09-19 15:44:49 +00:00
Pierre Labastie
a1dd968a36 Correct a path for clfs, in the version extraction code 2013-09-17 13:42:25 +00:00
Pierre Labastie
809a821b19 Fix missing BOOK/materials and add libee to
MAKEFLAGS blacklist
2013-09-14 21:23:16 +00:00
Pierre Labastie
92b7cb887b Allows to use git for downloading the CLFS book
Adds .lzma as a possible extension for a tarball in urls.xsl
2013-09-14 10:13:04 +00:00
Pierre Labastie
eb14b7fc90 Adapt version check for gawk 2013-06-08 12:19:53 +00:00
Pierre Labastie
8099885218 adaptations to recent modifications in the systemd book and
merging of a change (rev 3750) in the ablfs branch
2013-05-21 20:20:24 +00:00
Pierre Labastie
0700131382 Add the lfs-netscripts case for md5sum test 2013-05-18 20:46:10 +00:00
Pierre Labastie
0f92d7f8ae Adapt func_check_version.sh so that both GCC and Gcc are
recognized in the minimal version table
2013-04-05 15:12:13 +00:00
Pierre Labastie
1cf621b0c1 Take minimal versions from the book host requirements, instead
of hard coding them
2013-04-04 21:13:02 +00:00
Pierre Labastie
eecee981c4 Adding g++ to the version checks 2013-04-03 20:29:46 +00:00