Commit graph

1233 commits

Author SHA1 Message Date
Pierre Labastie
47dfc81bdc Account for the change in umount command in LFS
The command for unmounting the kernel vfs is now
  umount -Rv $LFS
So we have first to use that command in teardown (change in
kernfs.xsl). Second, since the command tries to umount
$LFS, but the Makefile is on $LFS, it fails. Ignore the
error in the Makefile (change in master.sh)
2021-03-09 21:58:44 +01:00
Pierre Labastie
c2af9cd73f Fix gen-special when an entity is commented out:
In the xorg application, mkfontdir is commented out, but we did not
check that because it was complicated with the shell. This was
leading to mkfontfir appearing in the packages to install, which
is not wanted. We use the information in the "cat" command to
eliminate the commented out package.
2021-03-09 21:53:29 +01:00
Pierre Labastie
e5518fd03e jhalfs: update copyright years and adapt to git
- use git log to retrieve the most recent version to display with
  -v
2021-01-17 11:13:43 +01:00
Pierre Labastie
f9babd04b5 packInstall.sh.porg: fixes for inih and libhandy 2021-01-15 11:00:05 +01:00
Pierre Labastie
782a77b2c4 Fix an inaccurate comment in packInstall.sh.porg 2020-12-04 09:30:37 +00:00
Pierre Labastie
ea0be93e9e Now that tcl, expect, and dejagnu are only in lfs, update instpkg.xml
with those packages after installing lfs, or when updating lfs
2020-10-15 13:15:33 +00:00
Pierre Labastie
018ab000f3 Fix downloading blfs books tag versions greater than 9 2020-10-15 12:39:52 +00:00
Pierre Labastie
5562bf14e0 Fix make exiting with an error if $(MOUNT_PT)/var/lib does not exist 2020-09-30 05:43:59 +00:00
Pierre Labastie
088130f04a Fix changing the ownership of $BUILDDIR/var/lib to LUSER when it has been
created by func_install_blfs. Fixes ticket #1729
2020-09-17 15:30:29 +00:00
Pierre Labastie
426e40be67 add the desktop-file-utils case for non install instructions in blfs tools 2020-09-15 12:39:59 +00:00
Pierre Labastie
7ce5a6195f packInstall.sh.porg: remove special case for x264: it is now packaged
"normally"...
2020-09-15 12:14:50 +00: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
56c1fff69a Create os-release also for SysV
This has been in the book for a few months, but jhalfs was not updated.
It is now...
2020-08-22 11:49:09 +00:00
Pierre Labastie
a8b8d192eb Use a custom date format in the filename of the chapter 5 tarball
The format of "date -Iseconds" generates character that are not accepted by
"cp". Use only letters, digits, and dash "-".
2020-08-22 11:47:10 +00:00
Pierre Labastie
f7c6c3c108 Allow versions up to 19 for lfs 2020-08-22 11:44:07 +00:00
Pierre Labastie
7e9e66faa4 Fix name of book repo for tag version greater than 9 2020-08-16 08:05:57 +00:00
Pierre Labastie
6f74ca146f LFS/master.sh: only count chapter* dirs in lfs-commands
We count the number of files in lfs-commands to know whether
we have an old or a new book. But this shouldn't include the
custom-tools dir, so only count chapter*.
2020-07-10 13:29:15 +00:00
Pierre Labastie
8b85dae454 Prevent users to tick "Rebuild Makefile" if Makefile does not exist
For some reason, beginners tend to tick this at the first pass. Since
it is hard to prevent that in Config.in, use a sanity check in jhalfs.
2020-07-10 13:26:23 +00:00
Pierre Labastie
e3ccc2786a Config.in: Reinstate the whole menus if "Rebuild Makefile" is ticked
Building the Makefile needs quite a few variables set, which
are scattered in all the menus of Config.in. So all the menus
are needed.
2020-07-10 13:24:00 +00:00
Pierre Labastie
88a8275eb8 lfs.xsl: mode=pkgmngt: use $pos and not position() when calling
start-script
2020-07-09 17:04:30 +00:00
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