Commit graph

239 commits

Author SHA1 Message Date
Pierre Labastie
a26389abd0 Fix update-lfs.sh (missing continuation character in a case statement 2020-05-22 05:03:40 +00:00
Pierre Labastie
a30c80e273 Remove the lfs- prefix when writing to the instpkg file, for lfs bootscripts 2019-09-27 09:59:32 +00:00
Pierre Labastie
4ad6e44878 Put {DISTRIB,VERSION}_CODENAME="jhalfs" in /etc/*-release, and fix a typo 2019-09-25 15:36:20 +00:00
Pierre Labastie
654f592149 Add the possibility to update lfs bootscripts with blfs tools.
Ticket #1724
2019-09-25 15:29:17 +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
0974c32271 BLFS/xsl/Process-install: detect config instruction in QtWebEngine page 2019-09-16 03:50:29 +00:00
Pierre Labastie
39304601fe BLFS/xsl/process-install: make an entity for config instruction conditions
and add a condition for /opt/rustc creation
2019-09-14 19:30:15 +00:00
Pierre Labastie
0336215926 BLFS/xsl/gen_pkg_list.xsl: allow listing the After LFS config chapter.
Normally only chapters containing versioned pacakges are in the package list.
But with the removal of lsb-release there are no versioned package anymore
in the "After LFS config..." chapter. But we need this chapter. So add
a test explicitly for it.
2019-09-06 21:20:03 +00:00
Pierre Labastie
30732c6a16 Process layout replaceable 2019-08-31 12:47:22 +00:00
Pierre Labastie
0a0b60984c Several things:
- refactor again process-install. Allows for better generation of test
  instructions
- only output the instructions of the first sect2 with role="installation".
  this will miss the vaapi intel driver, the installation of help files in
  GIMP, and the second method for which
- always run porg logging in "append" mode
- allows pass1 in sect2 (libva again)
2019-08-17 08:30:36 +00:00
Pierre Labastie
96d7e44922 BLFS/xsl: move the template for replaceable tags out of the main stylesheet,
and allow replacing some hostname/domainname replaceable tags
2019-08-14 10:32:59 +00:00
Pierre Labastie
c9928765ae add property svn:keywords to process-install.xsl 2019-08-13 15:30:00 +00:00
Pierre Labastie
8fc6a47249 BLFS/xsl: refactor the generation of installation instructions, owing to
the new remap="test/doc" attributes
2019-08-13 15:28:49 +00:00
Pierre Labastie
7933ed76c6 Refactoring the output of installation instructions:
Create a template which processes the instruction tree fragment (only header
for now, the content is bogus), and call it from main sheet.
2019-08-13 15:03:39 +00:00
Pierre Labastie
6622409404 Don't output role="nodump" in "not-pack" mode 2019-06-19 07:56:39 +00:00
Pierre Labastie
a4af6811bd Various fixes for Kconfiglib:
- remove the old setting of LANG in BLFS/Makefile
- explicitly use python3, because now menuconfig.py has #!/usr/bin/python,
  we may have only python3 available
- add quotes in Config.in for BLFS
2019-06-15 20:16:35 +00:00
Pierre Labastie
619b313adb Various fixes and improvements coming from github:
- the case for "pax" in packInstall.sh.prog
- an error in packageManager.xml.porg (comment before <?xml?> tag)
- a non-working $Id in Makefile
- some fixes for using the sect1info in lfs (in BLFS tools)
- a big rewrite for generating scripts with more consistent line spacing,
  opening the way to manage remap="test" and remap="doc" attributes
2019-06-15 15:26:23 +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
aeb8539125 Fix generation of install instructions, and remove those pesky && as much as
possible
2019-04-22 09:38:44 +00:00
Pierre Labastie
8589e90f5c Remove spurious spaces at the end of lines 2019-04-16 13:02:12 +00:00
Pierre Labastie
8fb8ff2612 Remove a spurious blank line in gen-install.xsl 2019-04-16 12:15:21 +00:00
Pierre Labastie
c048987a2c BLFS: fix generation of install and test instructions (ticket #1721):
- add a gen-install.xsl stylesheet for grouping all cases
- add a mode="installation" attribute for templates
- rewrite sect2 template so that the right templates are applied
- adapt other templates so that they are compatible
- rewording of some comments (no direct relation with the ticket)
2019-04-16 07:30:02 +00:00
Pierre Labastie
eabfc593e5 Unset MAKELEVEL in BLFS scriptlets. Fixes #1720. 2019-03-26 07:53:17 +00:00
Pierre Labastie
05f3977323 Add initramfs to non-versioned packages 2019-03-25 21:47:04 +00:00
Pierre Labastie
cd02aa5ad9 Remove obsolete udev detection in BLFS/gen-special.sh 2019-02-10 13:05:14 +00:00
Pierre Labastie
c8d5f11878 update-lfs.sh: remove tools package from instpkg.xml 2018-12-08 10:04:25 +00:00
Pierre Labastie
1646303d91 A module can be a special case, too (perl-test-mockmodule) 2018-11-23 14:30:06 +00:00
Pierre Labastie
6e28f3c4de Translate parentheses to "_" in the module page names. Otherwise there are errors when displaying the
menu
2018-09-28 14:39:18 +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
2b67b9ba4d Finally, openldap does not need .la files 2018-03-11 05:55:16 +00:00
Pierre Labastie
2969cdfb6b Prevent openldap module .la files to be removed
They are needed for loading modules...
2018-03-10 14:30:21 +00:00
Pierre Labastie
e030049a44 BLFS/func_dependencies: when building the graph, and DEP_LEVEL=3 (build opt
deps only for requested packages), it may happen that a requested packages
    is seen at depth > 2 before it is seen at depth=2. In this case, optional
    deps are not processed the first time, and then the package is not processed
    at depth 2 because it has already been seen. Add a case statement against
    that.
2018-02-19 16:01:00 +00:00
Pierre Labastie
df1f318915 Have the STATS variable displayed in jhalfs-blfs 2018-02-11 07:31:23 +00:00
Pierre Labastie
9e0c4b6a3a Wrong variable name when naming info.log file if stats are requested 2018-02-10 21:46:46 +00:00
Pierre Labastie
28546ae95d Output some information during the cleaning phase in BLFS dependency engine
for the impatient
2018-02-09 09:24:55 +00:00
Pierre Labastie
67c3df4aef Add stats to jhalfs-blfs. NB: due to book layout, far from perfect... 2018-02-05 18:12:17 +00:00
Pierre Labastie
bcbecc53f9 Don't generate porg and del .la instructions when doing userad or groupadd 2018-02-04 15:19:14 +00:00
Pierre Labastie
f1edc8e377 Because we do not want to depend on <pack>groupxx if it creates a circular
dependency, it may happen that nothing depends on <pack>groupxx. Detect and
    fix this by appending <pack>groupsxx to root.dep
2018-02-02 21:12:30 +00:00
Pierre Labastie
d80302bf94 Impose -pass1 to be built before its dependant package (bug #1718) 2018-02-02 21:10:16 +00:00
Pierre Labastie
59afe7323a BLFS/libs: Another stupid bug in path_to 2018-02-02 21:06:49 +00:00
Pierre Labastie
5afaf7cc48 BLFS/libs/func_dependencies: fix 2 stupid bug in function path_to 2018-02-02 17:55:29 +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
2140f22a88 New management of dependencies:
- Even if only required or recommended deps only are requested and built,
  account for optional deps to build the pacakge order
- build "runtime" deps after the pacakge dependening on them, but before
  any other package
- using the "first" role in the book, implement pass1 pacakges when there
  are circular dependencies
- Documentation has still to be written
- There must be bugs, thank you for testing...
2018-01-28 17:56:55 +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
ce99eb609b Do not set LC_ALL in BLFS/envars.conf,
and rely on the user setting an UTF-8 locale
2017-11-19 16:59:34 +00:00
Pierre Labastie
7a0c3d2128 Add code to account to the new role attribute in dependencies 2017-10-07 18:48:02 +00:00
Pierre Labastie
87405299a9 Add ninja and python to the list of LFS packages which should not appear,
since they are also in BLFS
2017-10-07 08:17:57 +00:00
Pierre Labastie
b2fa9e83de Merge jhalfs 2.4 branch r4008: Remove characters that are illegal in filenames from external deps 2017-09-14 17:10:47 +00:00
Pierre Labastie
d0d4181726 Vim is in BLFS and should not be in LFS package list 2017-09-14 17:04:16 +00:00
Pierre Labastie
6c8095a04f Avoid infinite recursion in "tree-erase" if there is a circular dependency 2017-08-22 09:00:49 +00:00
Pierre Labastie
ca37fee8d7 Avoid parsing a bridgehead which is not a perl-module 2017-08-22 08:59:04 +00:00
Pierre Labastie
ee68aee4b1 Make BLFS/update-lfs.sh executable 2017-08-21 16:19:26 +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
ce244f6517 Add a script to update the tracking file for LFS packages at a given revision
either by date or tag
2017-08-12 13:07:05 +00:00
Pierre Labastie
2cef19fddd Fix "Id" property in lfs_make_book.xsl 2017-08-09 14:20:25 +00:00
Pierre Labastie
607ef21bf6 Add missing bits to generate scripts for LFS in BLFS tools 2017-08-09 14:18:03 +00:00
Pierre Labastie
91b7b5fd88 Output a linear book for LFS, with BLFS format 2017-08-09 14:15:27 +00:00
Pierre Labastie
506120eeec install-blfs-tools.sh:
- Add instructions to retrieve and parse LFS book into packages.xml
2017-08-09 13:55:55 +00:00
Pierre Labastie
51dba866a0 BLFS/xsl/gen_pkg_list.xsl: misalignned closing tag 2017-08-09 13:32:22 +00:00
Pierre Labastie
e415656b9f BLFS/Makefile:
-  Do not call make after inititalizing the tracking file
-  Remove the <package-version> file from tracking dir after using it
-  Fix a typo
2017-08-09 13:25:26 +00:00
Pierre Labastie
45f8a9c86d Forgotten quotes 2017-06-29 16:54:28 +00:00
Pierre Labastie
973c767b90 Use BUILD_DIR and SRC_DIR in bootscripts/systemd-units download instructions
(cherry picked from r3967 in 2.4 branch)
2017-06-29 08:25:01 +00:00
Pierre Labastie
945ccaa75e Merge the new_features branch (manully, thanks to svn) 2017-04-09 10:29:32 +00:00
Pierre Labastie
c6c2d8966a Small adjustements to READMEs and BLFS/TODO 2017-03-20 15:31:30 +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
8dc464678e Merge new_features: Allows to retrieve package from SRC_ARCHIVE, in case it is not already there
and is in archive. This should not happen in normal operation, but may happen
    in func_install_blfs
2017-03-16 12:49:01 +00:00
Pierre Labastie
39dc04a73d Merge new_features rev 3918 2017-03-15 21:06:17 +00:00
Pierre Labastie
f4a3b0ca3f Add another set of Id keywords properties 2017-03-12 13:34:15 +00:00
Pierre Labastie
56178bab73 Add a few forgotten keywords properties 2017-03-12 13:20:02 +00:00
Pierre Labastie
84440e673d Unless explicitely set on the command line, the REV parameter
in BLFS tools make is the same as the preceding used one. Formerly, it
was set to sysv unless defined on the command line
2017-03-02 16:38:25 +00:00
Pierre Labastie
70d73d1e82 Install units when revision is systemd, rather than bootscripts 2017-03-01 15:54:16 +00:00
Pierre Labastie
6eaae5e34c Fix Ed tarball unpacking 2017-02-28 12:46:52 +00:00
Pierre Labastie
342c862481 Merge new_feature branch r3884 to3886:
- Adapt BLFS/envars.conf to modern BLFS books
- Fix try order for downloading BLFS packages
- Fixes to use the XORG Legacy page in BLFS
2017-02-27 14:09:03 +00:00
Pierre Labastie
9575278319 Fix dependencies when there is
a <phrase> tag above the <xref>
2016-12-03 18:22:50 +00:00
Pierre Labastie
ebb631aad8 With the double book, it may happen that <phrase> is used
inside <title>, and that generates an unwanted linefeed. So, use
normalize-space for titles when generating the package list
2016-08-24 15:21:49 +00:00
Pierre Labastie
4f3c433f7b Fix for using the BLFS "double" book. Note that it does not work if one of the
revisions has been rendered, and you want to switch to the other one
2016-06-13 16:51:45 +00:00
Pierre Labastie
8ebac92b36 Preceding commit fix 2016-03-19 20:25:09 +00:00
Pierre Labastie
e253015c69 When running BLFS/gen-makefile.sh, the current working directory is emptied.
If this is not the directory you intended to work in, you may erase precious
data. So only erase data in directories whose name begin with "work".
2016-03-19 20:07:33 +00:00
Pierre Labastie
4888f0cdd4 typos 2016-02-29 15:30:06 +00:00
Pierre Labastie
f37d08b3aa Fix a bug in "tree_erase",
which occurs rarely
2016-02-28 18:07:52 +00:00
Pierre Labastie
e6967a11b1 Add possibility for lzma extension when untarring in BLFS tools 2016-01-30 08:33:14 +00:00
Pierre Labastie
07f7eff8b8 BLFS tools: fix usage of sudo when cleaning directory before unpacking
Package management: update dpkg version
2015-11-30 21:29:12 +00:00
Pierre Labastie
d020649d05 Fix exchanged lines in BLFS/xsl/gen_pkg_list.xsl 2015-11-29 19:13:54 +00:00
Pierre Labastie
e91a15da8a Print external dependencies when printing the dependency tree 2015-11-23 14:22:48 +00:00
Pierre Labastie
7ac11f0671 Fix a long standing bug preventing the chosen MTA to be used and improve
some comments
2015-11-23 14:14:23 +00:00
Pierre Labastie
cf8e0607a8 Fix name of external dependencies so that they contain no spaces 2015-11-23 14:03:39 +00:00
Pierre Labastie
12fc178906 Add external dependencies to "packages.xml". Next step is to display
them in the dependency tree.
2015-11-21 08:46:54 +00:00
Pierre Labastie
67992a0559 Fortify unpacking in the scripts generated for BLFS, see ticket #1693 2015-11-20 17:19:08 +00:00
Pierre Labastie
82bd7a6423 Adjustements for non-versioned packages:
- allows xorg-env to be a dependency although it is a sect2 id
- remove the ban on xorg-env in dependencies.xsl
- directly call the template mode="normal" for modules, since there are
  no special cases in this case.
- treat all sect1 s, even if they do not have a xreflabel.
2015-11-18 10:54:13 +00:00
Pierre Labastie
7dc8595523 Automate the process of choosing action when there are circular dependencies.
This has to be tested, but hopefully, it should allow to find a coherent
build order when there are not too many circular dependencies
2015-11-17 20:22:04 +00:00
Pierre Labastie
5fb012da9a Add non-versioned packages in packages.xml. This allows for example to list dependencies of CA certificates 2015-11-17 20:18:23 +00:00
Pierre Labastie
d7c07e0b34 Memorize answers for circular dependencies. Still, we need a way to
automaitcally answer when competition is between for example optional
and recommended dep.
2015-11-07 11:36:11 +00:00
Pierre Labastie
1670a20e34 Again minor fix in comments for func_dependencies 2015-11-04 09:26:58 +00:00
Pierre Labastie
7f9fa78b65 Typos and minor fixes 2015-11-03 21:53:34 +00:00
Pierre Labastie
e4b1293971 Improve (?) comments in func_dependencies 2015-11-03 17:17:15 +00:00
Pierre Labastie
6f48f76f20 Modifications for the LXQt chapter 2015-09-27 12:52:55 +00:00
Pierre Labastie
967b819f07 Add a new possibility for role tag in sect2 2015-09-20 10:18:20 +00:00
Pierre Labastie
bd07ef520f The preceding fix is just a workaround, but the correct fix is:
- the problem is when a .dep file contains pack-A pack-B pack-A. If pack-A
and pack-B have some dep in common, say pack-C, that dep is erased from
pack-B, with the idea that it will be built as a dep of pack-A. But when
the program encounters the second pack-A, it removes the first one, so that
pack-C is built before the second pack-A, but after pack-B. Sorting was
a good workaround, but removing the last line instead of the first is
much better.
- Otherwise, add Xfce and Lxde to the list of packages whose preceding
sibling is a required dep.
2015-02-22 21:20:37 +00:00
Pierre Labastie
d607ac3717 Fix dependency generator:
When the .dep file is scanned during the tree building, it outputs dependencies
in the file order, while when the tree is scanned later, dependencies are
output in alphabetical order. This may eventually lead to a wrong order
at the end. To be sure that both output are the same, just sort
the .dep file before scanning it.
2015-02-22 15:16:49 +00:00