Commit graph

471 commits

Author SHA1 Message Date
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
Pierre Labastie
4a03ca1421 Avoid to remove "make-ca.sh" from cacerts script 2015-11-20 06:15:24 +00:00
Pierre Labastie
39da010453 Fix the installation of jhalfs for BLFS:
- Remove the download part of the book instruction for cacerts
- Separate download and md5sum instructions in "download-script" generation,
  so that packages with no md5sum can still be downloaded.
2015-11-19 13:13:29 +00:00
Pierre Labastie
b7515ec4fc Bug in ICA:
Some time ago, we added the version information to the logs filename, but
the iteration targets did not know about that, and failed.
2015-03-07 22:05:24 +00:00
Pierre Labastie
56d842655b Fix 2 minor bugs:
- the tzdata DESTDIR should not be tzdata, because some package managers use
$PACKAGE as their working directory, and this may conflicts with this one.
tzdata DESTDIR is now 001-tzdata
- when reading md5sums, the current code assumes that there is only one
<para><literal> node reachable from ../.. (relative to <ulink>). This is true
for the "official" book, but not necessarily for the snippets written for
package management. The following change only assumes that the md5sum
<para><literal> for a given <ulink> is the first one after <para><ulink>,
which does not change anything for the book, and is better for user
written snippets.
2014-12-21 11:25:47 +00:00
Pierre Labastie
3d96a65554 Fix version extraction for XML-Parser 2014-12-09 20:58:02 +00:00
Pierre Labastie
82808d1b14 Fixes addition of "pass1" util-linux in new version of CLFS.
Thanks to William Harrington for the patch.
2014-11-04 12:57:31 +00:00
Pierre Labastie
2af991dc0b Allow "wget --version" to return a missing version field, since only
wget presence is required
2014-10-31 10:08:40 +00:00
Pierre Labastie
1f25a75e57 Have openssl build before python in blfs tools 2014-08-27 09:56:45 +00:00
Pierre Labastie
3f83cb0f8e For CLFS 3.0, variable setting is now in final-prep chapter.
Adapt CLFS for that
2014-05-31 06:57:41 +00:00
Pierre Labastie
659be15f60 In get_package_tarball_name function, patterns corresponding to #- are
dropped. This should happen only when the digit is at the beginning of the
name. Change the sed accordingly
2014-05-24 08:50:45 +00:00
Pierre Labastie
ff9938fe50 Account for the possibility of a trailing slash in an url in pacakges.xsl 2014-05-08 20:58:12 +00:00
Pierre Labastie
719d0fc0a3 Correct urls generation when there is a trailing slash (thanks to sourceforge
for the homework;)
2014-05-07 15:30:33 +00:00
Pierre Labastie
2270ffd83f Change the wording of the error message when Docbook XML DTD are
not installed
2014-01-23 08:59:08 +00:00
Pierre Labastie
b97ed5bbb3 Change the svn:keyword property of common/chroot.xsl 2014-01-12 21:43:04 +00:00
Pierre Labastie
d68eb1b205 Major change to th scripts layout:
- Do not put the chroot commands in $PROGNAME-commands, but rather
  in a separate directory chroot-scripts
- Use the commands in the chroot-scripts directory to generate the CHROOT
  variables in Makefile
- The commands are extracted to $PROGNAME-commands only if they do not
  have role="nodump attribute and they do not begin with "chroot" (for
  compatibility with previous books where chroot commands did not have
  the role="nodump" attribute.
2014-01-12 21:40:20 +00:00
Pierre Labastie
94744cd687 Only check versions which appear in hostreqs.xml 2013-12-27 07:38:30 +00:00
Pierre Labastie
cbca63a173 Further changes to BLFS tools installation 2013-12-25 11:26:55 +00:00
Pierre Labastie
c1626d892a Adapt blfs installation to recent changes in BLFS book 2013-12-24 18:52:24 +00:00
Pierre Labastie
6ed3dd7533 Change the prerequisite tests so that alfs tools are first checked, then blfs,
and the host reqs are tested later
2013-12-15 10:10:25 +00:00
Pierre Labastie
382b083182 Changes in func_install_blfs:
- Add --preserve-timestamps when copying the local BLFS book working copy
  so that if the book has already been validated it is not validated again
- Some scriptlet changes are not needed anymore
2013-12-15 07:46:46 +00:00
Pierre Labastie
bb7f603391 add verbosity to the cleaning process 2013-12-15 07:34:58 +00:00
Pierre Labastie
e58cf15308 improvement of the copy flags when using a BLFS working copy 2013-11-17 07:55:30 +00:00
Pierre Labastie
854854e880 - Make the number of parallel jobs configurable in the menuconfig interface
- Allow choosing a working copy of the blfs book
2013-11-16 22:35:25 +00:00
Pierre Labastie
bb4b5c3c00 Permission problem again 2013-11-08 22:10:11 +00:00
Pierre Labastie
b2c7742927 Revert a previous fix, which could not work when user clfs did not exist yet 2013-11-06 21:44:09 +00:00
Pierre Labastie
e18f80a34a Fix BLFS tool inclusion for CLFS:
-fix a typo in Makefile (8 spaces to tab...)
-fix permission problems (hopefully)
2013-11-06 20:55:27 +00:00
Pierre Labastie
ef32ce5ea5 Getting mad because you cannot interrupt the build once started?
The present set of commands seems to allow interrupting during the chapter
5 phase. No changes to chroot phase yet.
2013-11-01 14:15:43 +00:00
Pierre Labastie
bbcdeab57b Handle errors while installing blfs tools and makes the error
message more accurate
2013-10-30 15:44:46 +00:00
Pierre Labastie
e576789367 Merge ablfs branch. Normally, jhalfs should not perform differently
for building LFS
2013-10-29 15:42:03 +00:00
Pierre Labastie
3cb4ef5b5a Add versions to file names in logs and test-logs: use it for the SBY report 2013-10-05 17:45:52 +00:00
Pierre Labastie
ad4ff97cf4 Fix a bad fix 2013-10-03 10:28:37 +00:00
Pierre Labastie
7ce6de2ee4 Fix updating a git working copy when the head is detached 2013-09-22 07:14:33 +00:00
Pierre Labastie
b86876a6ef Adapted host requirements checks for CLFS 2013-09-21 18:52:02 +00:00
Pierre Labastie
de84c00168 download and builds the test programs, even if tests are disabled 2013-09-19 15:44:49 +00:00
Pierre Labastie
a1dd968a36 Correct a path for clfs, in the version extraction code 2013-09-17 13:42:25 +00:00
Pierre Labastie
809a821b19 Fix missing BOOK/materials and add libee to
MAKEFLAGS blacklist
2013-09-14 21:23:16 +00:00
Pierre Labastie
038678f452 really add the lzma extension for tarballs 2013-09-14 10:48:45 +00:00
Pierre Labastie
92b7cb887b Allows to use git for downloading the CLFS book
Adds .lzma as a possible extension for a tarball in urls.xsl
2013-09-14 10:13:04 +00:00
Pierre Labastie
4b1dd337e1 typo 2013-07-22 13:45:15 +00:00
Pierre Labastie
cb29c9cac6 Add /etc/resolv/conf to the list of files to edit at the end 2013-07-22 13:43:25 +00:00
Pierre Labastie
eb14b7fc90 Adapt version check for gawk 2013-06-08 12:19:53 +00:00
Pierre Labastie
8099885218 adaptations to recent modifications in the systemd book and
merging of a change (rev 3750) in the ablfs branch
2013-05-21 20:20:24 +00:00
Pierre Labastie
0700131382 Add the lfs-netscripts case for md5sum test 2013-05-18 20:46:10 +00:00
Pierre Labastie
0f92d7f8ae Adapt func_check_version.sh so that both GCC and Gcc are
recognized in the minimal version table
2013-04-05 15:12:13 +00:00
Pierre Labastie
1cf621b0c1 Take minimal versions from the book host requirements, instead
of hard coding them
2013-04-04 21:13:02 +00:00
Pierre Labastie
eecee981c4 Adding g++ to the version checks 2013-04-03 20:29:46 +00:00
Pierre Labastie
7d109d45f2 Fix bug #1687 2013-03-21 11:02:48 +00:00
Thomas Pegg
f445e26055 Fix bug where if xmllint is not installed, book version information is not extracted to be used for lfs-release,lsb-release and SBU reports.
Added checks in the code to ensure both xmllint and xstlproc are available prior to use.
2013-03-19 01:01:30 +00:00
Pierre Labastie
66c09d00a0 typo 2013-03-03 12:33:25 +00:00
Pierre Labastie
f0a31dea50 Add a sect2 template to lfs.xsl, so that it is possible to build
several packages on the same page
2013-03-02 14:10:45 +00:00
Pierre Labastie
06bb141298 fix spacing in echo_finished 2013-03-01 21:12:05 +00:00
Pierre Labastie
80ee2ff07a Update the instructions printed at the end of a jhalfs run
to the new layout of files in chapter 7.
2013-03-01 11:20:35 +00:00
Pierre Labastie
4f700a968d Test the presence of wget, which was not done before, although
it is neede for downloading pacakges
2013-02-19 18:00:22 +00:00
Pierre Labastie
57ec8958ed Add "run" to the list of
removed directories when cleaning
jhalfs.
2013-01-11 13:27:58 +00:00
Pierre Labastie
21cab345b3 Add lib64 to the list of
removed directories when cleaning the
build directory
2012-12-30 16:26:22 +00:00
Matthew Burgess
083e2fd883 Handle systemd-provided Udev. 2012-07-16 19:55:06 +00:00
Pierre Labastie
ea81eb28cc Added the case when sleep is in /usr/bin to progress_bar.sh 2012-04-21 21:22:28 +00:00
Pierre Labastie
48acdd4ecf Change xz version requirement to 5.0.0 as per LFS r9794 2012-03-29 08:20:43 +00:00
Pierre Labastie
bb7de70faf An endef was inadvertenlty removed in last commit 2012-03-15 15:45:20 +00:00
Matthew Burgess
9af9dfa1ef Fix a couple of typos 2012-03-13 23:43:48 +00:00
Pierre Labastie
125e05ec13 Update create-sbu-report so that it works with CLFS
and that it prints the last "Installed file size"
2012-02-28 13:20:40 +00:00
Pierre Labastie
8ea21f8684 Fix a warning when $BUILDDIR/sources is empty and "Rebuild files" is done 2012-02-22 10:18:02 +00:00
Pierre Labastie
f21dff80de Avoiding warnings in 000-masterscript.log, coming from missing
scripts in LFS source
2012-02-21 08:58:49 +00:00
Pierre Labastie
b0881bdfef reverting a change to func_book_parser inadvertently propagated on
last commit
2012-02-19 11:06:38 +00:00
Pierre Labastie
4c6f54f3df Fix svn properties on some files 2012-02-19 10:54:17 +00:00
Pierre Labastie
52575b817e Corrected a typo in 911-sqlite 2012-02-14 13:09:49 +00:00
Pierre Labastie
256e8334a2 Bump Sqlite version to 3.7.10 2012-02-14 09:20:57 +00:00
Pierre Labastie
eddf6650af Bump lynx version to 2.8.8dev.10 2012-02-14 09:07:15 +00:00
Pierre Labastie
e639536073 Corrects Makefile generation when some script names are of the form
ddd-d-name, where d represent a digit. This is used for package management
and/or for adding custom scripts (see README)
2012-02-12 18:54:37 +00:00
Matthew Burgess
3158dfaccd Remove GETKERNEL parameter. The kernel has been required for its headers since LFS-6.3. 2012-02-10 22:35:59 +00:00
Pierre Labastie
92256610ee Correct testing of emptyness of builddir, which may fail if
the user lacks read permissions on some dir (root, lost+found...)
2012-02-10 13:56:57 +00:00
Pierre Labastie
b339c942c1 Add a choice between installing the full set of supported locales
and installing just the minimal set for tests, after glibc build.
If the second option is chosen, the locale specified in LANG is also
installed, if not in the minimal set.
2012-02-10 09:43:23 +00:00
Pierre Labastie
d7390a52cf Changes the logic of "rebuild files" so that jhalfs does not stop if this item is ticked and the build dir is empty 2012-02-10 09:33:23 +00:00
Matthew Burgess
608fbe13d0 Fix various issues when building CLFS. 2012-02-09 22:58:45 +00:00
Matthew Burgess
93fd2d011e Fix ICA build and a couple of other miscellaneous issues. Patch courtesy of Pierre Labastie. 2012-02-07 22:30:26 +00:00
Thomas Pegg
b533b78317 Fix a typo. Fixes #1683 2012-02-01 23:59:11 +00:00
Thomas Pegg
7072e1faf4 Commit Pierre Labastie's patch for including package management support in jhalfs. NOTE: Package management is by default disabled. 2012-02-01 23:29:37 +00:00
Matthew Burgess
f5dc6d7423 Fix Glibc version detection on 64-bit Debian hosts. Thanks to Pierre Labastie for the report and fix. 2011-12-28 17:41:35 +00:00
Matthew Burgess
ec20730f2b Correctly detect libc.so.6 on x86_64 distros that place it in /lib64 2011-11-30 21:29:55 +00:00
Matthew Burgess
a7e1348cb9 Handle .xz format packages as well as .bz2 and .gz 2011-10-27 07:11:12 +00:00
Thomas Pegg
4b54394ca1 Add handling for the different name of the xz-utils tarball 2011-01-08 00:17:08 +00:00
Matthew Burgess
d8006a00f3 Fix Expect tarball name detection for Expect 5.45. 2010-11-18 19:54:26 +00:00
Thomas Pegg
9d55d85112 Enhance messages produced by jhalfs when files do not exist in either /sources or SRC_ARCHIVE, also in cases when SRC_ARCHIVE is not set. Thanks to Tim Sarbin for the patch. 2010-03-12 03:46:12 +00:00
Thomas Pegg
de63126155 Add configuration options for retry on connection refused, number of times to attemp to download a file, and timeout for wget invocation. Thanks to Tim Sarbin for the patch, slightly modified by me to accomodate a second set of wget calls. 2010-03-12 03:32:25 +00:00
George Boudreau
0850553edb LFS has new build method. Added new vars to LFS/master.sh (JHuntwork) 2008-12-06 15:05:59 +00:00
George Boudreau
2c04c28295 Adjust M4 version check to deal with (GNU M4) in version string 2008-11-04 02:46:27 +00:00
George Boudreau
75d6d1cbf4 Added menu item to deselect the progress_bar display. Requested by Matthew Burgess 2008-10-27 23:26:29 +00:00
George Boudreau
15c9e722d5 Added Perl and M4 as host requirements (code:Matthew Burgess) 2008-10-21 21:24:25 +00:00
Thomas Pegg
d4bbfe2067 Add check for makeinfo (texinfo), thanks to Matthew Burgess 2008-10-20 23:33:54 +00:00
George Boudreau
31a37db331 Correction made to allow CLFS to use kernel headers trac# 1681 2008-10-15 17:04:20 +00:00
George Boudreau
cc24cda644 Deal with Ubuntu binutils version report. 2008-10-06 21:13:41 +00:00
Thomas Pegg
134572c8e7 Use continue instead of return, continue allows the loop to continue from the beginning instead of jumping completely out of the function. 2008-10-06 16:27:36 +00:00
George Boudreau
5210ae1ec1 Problem: udev-config and bootscripts have their md5sum generated when the book is created. Ignore md5sum for these 2 packages 2008-08-26 14:16:37 +00:00
George Boudreau
56e487e8e0 Patch: force locale when checking version requirements 2007-12-14 20:30:09 +00:00
Manuel Canales Esparcia
e5842d6984 Changed grep version check. Thanks to Dan Nicholson for the fix. 2007-09-14 16:47:17 +00:00
Manuel Canales Esparcia
68713c9186 Dump build time using Bash $SECONDS internal variable instead of using date calls + Perl-based calculations. 2007-08-17 16:24:47 +00:00
Manuel Canales Esparcia
3abe9d7e29 Actually fixed the race condition. 2007-08-15 17:04:38 +00:00
Manuel Canales Esparcia
1449dd2d0d Test fix to avoid a race condition. 2007-08-15 16:27:56 +00:00
Manuel Canales Esparcia
9695fa7cca Failsafe tests to be sure that we are deleting an existing unpacked sources directory.
Thanks to Petr "Qaxi" Klíma for the report and patch.
2007-08-10 21:24:02 +00:00
Manuel Canales Esparcia
d09e32ad28 For blfs-tool dependencies, replaced links by linx.
Lynx have better GPM support and no locale issues.
2007-08-08 17:24:58 +00:00
Manuel Canales Esparcia
823f608161 Fixed DocBook-XML tracking file when installed via blfs-tool support dependencies. 2007-08-08 17:00:36 +00:00
Manuel Canales Esparcia
12d11369e3 Set Coreutils-5.2.1 as the minimun required version. 2007-08-02 16:44:36 +00:00
Manuel Canales Esparcia
650acce1b8 CLFS: Fixed Sparc64 build flags issues. 2007-07-28 15:40:53 +00:00
Manuel Canales Esparcia
7a84ba7713 Fixed bug in func_compare.sh when running ICA/farce builds on CLFS. 2007-07-28 11:28:34 +00:00
Manuel Canales Esparcia
e05fba2435 DocBook-XSL package is not required for now. 2007-07-24 21:04:34 +00:00
Manuel Canales Esparcia
cf829f0624 func_check_version.sh:
ask the user instead of bomb, to make happy that packages which version
ouput don't follow our expectations
2007-07-24 20:21:18 +00:00
Manuel Canales Esparcia
9436828ae9 CLFS3: Fixed endian setting in uClibc configuration. 2007-07-24 19:22:46 +00:00