Commit graph

233 commits

Author SHA1 Message Date
Xi Ruoyao
ed335a3113
handle '+' in kernel version string
It appears if the kernel is built from Git repo where HEAD is not a tag.
2022-11-04 22:44:57 +08:00
Pierre Labastie
87eb9e9a94 Make the kernel filesystem scriptlets executable
This is so that they can be run from the main Makefile, instead
of having to edit them to put them inside the Makefile.
2022-10-06 10:20:34 +02:00
Pierre Labastie
594ff3d878 Remove the "Abort on testsuite failure" config (4)
Remove the bomb-testsuite param in lfs.xsl, with the associated
code.
This implies not passing this param in func_book_parser.
2022-06-15 15:10:52 +02:00
Pierre Labastie
29615d9e3a Remove the "Abort on testsuite failure" config (3)
Remove the display of BOMB_TEST when validating the config.
2022-06-15 15:09:49 +02:00
Pierre Labastie
ff30640702 Fix an error when not downloading packages
When not downloading packages, the function "get_sources" returns
early because it begins with:
[ "$GETPKG" = y ] || return
The problem is that in this case it returns with an exit code
inherited from the last executed instruction, which is the
test (and therefore "false"). The solution is to change to
return 0.
2022-06-14 18:55:36 +02:00
Pierre Labastie
55e82d2ae0 Various updates for pacman PM
- update versions and instructions in packageManager.xml.pacman.
  Also remove the pages for old books.
- Fix packInstall.sh.pacman, so that restarting after a failure
  is possible
- Change LFS/lfs.xsl so that destdir install use symlinks for
  /lib, /sbin, and /bin. Remove also absolete commands for old
  books
- fix gcc script in book parser
2022-06-12 22:54:14 +02:00
Pierre Labastie
28ef51b817 Fix spurious quotes in download code
$WGETPARM contains several switches separated by blank spaces.
If quoted in the wget command, it appears as an url with
spaces, not as switches.
2022-05-07 11:56:28 +02:00
Pierre Labastie
dc53def3ee Only use upstream URL when downloading packages
Also fix typos and shell programming. Use "cat file | while read"
instead of a complicated construct for reading only lines and then
breaking lines into their fields... Fix a TODO item
2022-05-07 11:25:43 +02:00
Pierre Labastie
88e5cbc258 Use only upstream's URL in urls.lst 2022-05-07 11:24:06 +02:00
Pierre Labastie
924a237843 Fix $(BUILDDIR)/jhalfs/Makefile
Now that we have only lfs, some lines in the Makefile have been
removed, but still some shell continuation (&& \) were left. This
leads to weird error message (@ non existing command, or so).
Remove the continuation characters.
2022-04-03 21:42:25 +02:00
Pierre Labastie
9b99adace9 Change variable names and logic for BLFS book
Only use BLFS_COMMIT instead of BLFS_BRANCH_ID, BLFS_TREE, BLFS_BOOK
Same for le LFS_BLFS variables
2022-04-01 10:26:17 +02:00
Pierre Labastie
30a444a477 Fix some bugs in func_install_blfs
- do not try to copy downloaded files to $SRC_ARCHIVE: they may
  belong to another user, and so be non writable.
- trunk/BOOK is not used anymore in BLFS/Makefile
- do not make update a second time
2022-04-01 10:25:48 +02:00
Pierre Labastie
8c2b505caf Fix small bugs in func_download_pkgs
- If MISSING_FILES.DMP is left from a preceding attempt, it may
generate a false warning a bout missing files even if they could
all be downloaded.
- do not try to copy a modified file to SRC_ARCHIVE if it already
exists: it may belong to another user...
2022-04-01 10:18:15 +02:00
Pierre Labastie
2bf44e2724 Try to make an information clearer about $COMMIT 2022-04-01 10:13:55 +02:00
Pierre Labastie
2c1a763990 try to fix func_install_blfs to work in all cases
WIP...
2022-03-30 22:35:12 +02:00
Pierre Labastie
8825e69592 Get completely rid of PROGNAME
There is only one PROGNAME: lfs, so no need for a variable.
2022-03-30 17:45:35 +02:00
Pierre Labastie
2bd2fb81d0 Replace $PROGNAME-commands with $COMMANDS
This allows to remove some references to PROGNAME
2022-03-30 14:49:43 +02:00
Pierre Labastie
2fd624d8f6 Get rid of BRANCH_ID, TREE, LFSVRS variables
There is only one variable: COMMIT. Note that this commit
also changes $PROGNAME-$LFSVRS to $BOOK.
2022-03-30 14:26:41 +02:00
Pierre Labastie
9f89fae89a LFS: Simplify git repo management
Use inly one variable, REPO, containing the LFS git repo url. The
BLFS Makefile hardcodes the LFS and BLFS git repo urls, so no need
to pass them.
2022-03-30 12:27:03 +02:00
Pierre Labastie
0fa52f2403 Remove legacy: Remove almost all occurrences of CLFS/clfs 2022-03-01 21:09:30 +01:00
Pierre Labastie
978286a4b9 Remove legacy: remove everything about HLFS 2022-02-28 13:30:53 +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
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
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
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
fd4a7982f2 Remove $Id$ comments, they are useless with git 2021-10-31 10:22:30 +01: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
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
Pierre Labastie
52cced4e53 Add the number of parallel jobs to var validation
This allows to have it also in the SBU report
2021-08-28 19:53:16 +02:00
Pierre Labastie
97b270f9bd LFS: Generate version.ent before profiling the book 2021-08-03 14:33:11 +02:00
Pierre Labastie
106157fdae Do not assume there is a group named as $USER
Remove any use of chown $USER:$USER
2021-06-30 16:03:51 +02:00
Pierre Labastie
0722dde31d Do not use global $version when writing Makefile
In func_wrt_makefile, the two functions LUSER_wrt_unpack and
CHROOT_Unpack use the version variable without setting it.
This leads to the global version variable being used, which
writes garbage into the Makefile. Fix: just define version locally.

This bug does not occur often because those functions are only
used when using custom scripts for versioned packages (if building LFS).
It has been found by William Harrington.
2021-06-04 21:13:04 +02:00
Pierre Labastie
605ea3628b Fix forgotten "git_root" in func_book_parser 2021-05-01 13:50:43 +02:00
Pierre Labastie
2ac2fc50b9 BLFS: call make with proper arguments
Uses *-BRANCH variables when running make
2021-05-01 09:23:14 +02:00
Pierre Labastie
dfab075401 Change variable name to DEP_GIT in validate_configs 2021-04-30 21:39:34 +02:00
Pierre Labastie
de67016950 Adapt func_book_parser to git
The variable name "TREE" makes no sense now. It is rather a branch or a tag.
So more work is needed here.
2021-04-30 14:21:44 +02:00
Pierre Labastie
dd5d63d102 Adapt to git in func_install_blfs 2021-04-29 11:40:46 +02: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
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
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
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
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
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