Commit graph

378 commits

Author SHA1 Message Date
Pierre Labastie
0e4ddfa0c1 Improve top-level jhalfs based on shellcheck
* Various improvements from shellcheck around quoting, the use of
   read, `` vs $() and other logical comparisons
 * Provide a function for sourcing/loading files so we can remove a lot
   of duplication. Move loading of some functions from
   common/common-functions to ./jhalfs for consistency
 * Provide some functions for standardized messaging
 * Remove other duplication in the code, especially checking VERBOSITY
 * Standardize indentation. Two spaces seemed the most prevalent so I
   went with that.

Patch by Jeremy Huntwork, with slight modifications.
2019-04-13 16:31:24 +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
b86dfaf1c0 Fix generation of chroot instructions 2018-05-12 11:27:10 +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
e6ed1a1de7 Warn before cleaning BUILDDIR; see #1711 2017-11-01 14:40:53 +00:00
Pierre Labastie
9556f88088 Missing word in a comment 2017-11-01 14:40:09 +00:00
Pierre Labastie
fb63ddff14 No need for $() in if command 2017-11-01 14:39:34 +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
c57747dba5 Make the date of the SBU_DU file the same as the one reported at the end of
the jhalfs run. Note that date is the one when the run is started
2017-06-29 16:45:31 +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
316f845e03 Add forgotten svn:keyword "Id" to common/hostreqs.xsl 2015-12-21 07:59:26 +00:00