Commit graph

1412 commits

Author SHA1 Message Date
Pierre Labastie
46c6113b28 Prevent overwriting /var/run and lock symlinks with PM
/var/run and /var/lock are created as symlinks in creatingdirs. But
if a package install something into those dirs (with DESTDIR install),
they get overwritten with true directories if using a package
manager. Note that without PM, anything installed into those dirs
is lost at next reboot. So remove those dirs before packaging.
2020-07-09 17:02:10 +00:00
Pierre Labastie
ee842e234b Now that packageManager.xml createfiles is also included
for new book, test that /tools/etc/porgrc exists before moving it
2020-07-09 16:59:36 +00:00
Pierre Labastie
3484658167 Various fixes for recent pacman with new book
- add createfiles instructions of packageManager.xml for new book too
- remove unneeded chown when installing pacman (not needed thanks to
  the above)
- Use a dedicated user "builder" for running makepkg: user "tester" is 
  removed at the end of chapter 8, but is needed in following chapters.
2020-07-07 15:27:54 +00:00
Pierre Labastie
b6e981a9a3 Typo in Config.in 2020-07-06 09:38:47 +00:00
Pierre Labastie
f017b22731 LFS/lfs.xsl: fix cases when using DESTDIR
We cannot use only the fact that it is not in chapter-temporary-tools
since now we have several chapter for the temporary system.
so use a list of chapters (non negated).
2020-07-06 05:51:22 +00:00
Pierre Labastie
2f8d952deb Forgot one instance of minor scriptlet number removal 2020-07-06 05:46:07 +00:00
Pierre Labastie
89bcb1be0e Allow scriptlet numbering to be on 4 digits in packInstall.sh* 2020-07-06 05:44:22 +00:00
Pierre Labastie
3ac3ae199f Change numberings of scriptlets:
- major number can be on 4 digits, so use it in packInstall
- minor number (for package manager) can be greater than 10
  - code on 2 digits
  - change various files accordingly
2020-07-06 05:38:54 +00:00
Pierre Labastie
5dd7bff0ee Use latest version of pacman
Changes to packageManager.xml.pacman:
- Add needed deps in chapter 5/7 and 6/8
- Add user tester if it does not exist
- Change permissions for some dirs so that user tester can write to them
2020-07-06 05:31:55 +00:00
Pierre Labastie
5a965adf4f When copying packageManager.xml, use a sed to replace BOOK with $BOOK
This allows loading entities from the lfs book
2020-07-06 05:23:47 +00:00
Pierre Labastie
959319749e Remove special cases for vim and tidy in packInstall.sh.pacman 2020-07-06 05:20:06 +00:00
Pierre Labastie
d5a739aebd When cleaning BUILD_DIR, clean also 32 bit library dirs in case multilib
has been used
2020-07-06 05:17:16 +00:00
Pierre Labastie
49f8b03399 Fix package management for new book, and add a patch for porg 2020-06-24 06:26:05 +00:00
Pierre Labastie
13e52a5572 Add the multilib book: fixes ticket #1722 2020-06-20 17:16:22 +00:00
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
7b33f40896 Use an XPath expression to select <para> that contains packages with right
attributes in packages.xsl, rather than an <xsl:if>.
2020-06-20 16:53:31 +00:00
Pierre Labastie
9a4c530f55 Clean LFS/master.sh from unused
functions
2020-06-20 16:45:26 +00:00
Pierre Labastie
0a0753d579 Remove spaces at the end of lines 2020-06-19 14:25:52 +00:00
Pierre Labastie
e4b7aa8206 Replace "cat /proc/cpuinfo" with "lscpu" in the sub-du report: cpuinfo gets
too big with several cores
2020-06-19 06:51:10 +00:00
Pierre Labastie
cce9c165cd Change names for lfs chapters in blfs tools:
- change "6" to "final system"
- change "7" to "configuration"
- change "8" to "Bootable"
- change "9" to "The End"
- also fix a id that has changed in January in the lfs book
2020-06-14 15:54:44 +00:00
Pierre Labastie
3da8c49659 Update ICA for new LFS/master.sh 2020-06-14 07:08:19 +00:00
Pierre Labastie
b33c6ee52d Fix the case of the kernel for otimization 2020-06-11 20:43:33 +00:00
Pierre Labastie
b217a303e4 Fix sbu-du calculations for the new numbering 2020-06-11 13:59:59 +00:00
Pierre Labastie
22bb166d9d Fix the save-ch5 target 2020-06-11 08:22:20 +00:00
Pierre Labastie
6447575192 Fix detection of the cross2 branch 2020-06-10 20:58:33 +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
36f5dce727 Fix lfs.xsl for cross2, and change scriptlet numbering for trunk and cross2 2020-06-09 07:28:05 +00:00
Pierre Labastie
9ef12f76bb Use a private name for MAKEFLAGS in jhalfs, so that it does not propagate
to top make, when ticking "Run the makefile"
2020-06-05 10:18:27 +00:00
Pierre Labastie
7e0a1b8018 Fix an issue in ck_terminal, which was working only by chance (compensating
bugs) on some setup (but not all)
2020-05-31 08:58:41 +00:00
Pierre Labastie
6caa5b8816 Allows having << EOF in tests, and not generating >> $TEST_LOG... until the
matching EOF is found.
2020-05-31 07:31:32 +00:00
Pierre Labastie
9728b235e6 Check terminal size before starting build 2020-05-25 06:47:48 +00:00
Pierre Labastie
a26389abd0 Fix update-lfs.sh (missing continuation character in a case statement 2020-05-22 05:03:40 +00:00
Pierre Labastie
323ae3e633 Add -j1 to "make install" in the
lfs book (done long ago in blfs)
2020-05-18 08:31:43 +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
06eddf40f2 Make "Rebuild Makefile" disable all the other options:
This prevents users from using it without setting a build first
2020-05-01 14:20:45 +00:00
Pierre Labastie
31a9b1440c remove the __pycache__ dirs from comparison analysis 2020-04-10 10:16:41 +00:00
Pierre Labastie
bdb0761120 Run "Cleaning up" page in ICA iterations too: it allows to remove .la and some .a
files
2020-04-08 08:37:54 +00:00
Pierre Labastie
709eb7470d Remove the /usr/share/doc/openssl-<version> dir before renaming
/usr/share/doc/openssl, otherwise it moves it as a subdirectory
2020-04-07 17:08:30 +00:00
Pierre Labastie
49e2745200 Further fix user creation (or no) 2020-04-02 11:54:50 +00:00
Pierre Labastie
dd7e0f6793 Fix LUSER creation (or no creation). 2020-04-02 11:46:36 +00:00
Pierre Labastie
7b7b5e9624 Various fixes for ICA 2020-04-02 09:56:51 +00:00
Pierre Labastie
0a577f5575 typo forgotten \ 2020-04-01 09:14:14 +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
a73ed74337 Fix the SHELL for CHROOT target for LFS
We use the filter builtin function of make to retrieve the right
shell to use during the CHROOT phase, which is the same as the
one in CHROOT1.
Also do not assume envars exist when removing it at the beginning
of the SUDO phase.
2020-03-31 08:47:52 +00:00
Pierre Labastie
a2b56892e4 Fix a forgotten new IDREF 2020-03-29 20:35:52 +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
3261fe76c8 Adapt master.sh to new book, staying compatible
This involves changing the way make targets are built. Specially
the make target is changed when encountering a specific file
(for example the make target becomes sudo when rencountering kernfs)
This allows more flexibility.
2020-03-29 17:16:09 +00:00
Pierre Labastie
4762fb9900 Set the correct #! executable in creat* scriptlets
Those scriptlets need to use a temporary bash, which is in /tools/bin
for current LFS. But if we use a new method (cross-compiling + sysroot)
it ends into /bin. So we have to set the correct `#!' header
in both cases.
We rely on the pesence of a "creatingtoolsdir" sect1 to know that
bash is in /tools
2020-03-29 15:13:15 +00:00