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)
This commit is contained in:
parent
7b33f40896
commit
706e5bf46a
3 changed files with 13 additions and 13 deletions
|
@ -13,7 +13,7 @@ menu "BOOK Settings"
|
|||
config BOOK_LFS
|
||||
bool "Linux From Scratch System V"
|
||||
help
|
||||
Set up the tools to build LFS with Sys V init.
|
||||
Set up the tools to build LFS with SysV init.
|
||||
|
||||
config BOOK_LFS_SYSD
|
||||
bool "Linux From Scratch systemd"
|
||||
|
@ -47,9 +47,9 @@ menu "BOOK Settings"
|
|||
prompt "Init system"
|
||||
|
||||
config BLFS_SYSV
|
||||
bool "BLFS Sys V"
|
||||
bool "BLFS SysV"
|
||||
help
|
||||
Extract the Sys V flavour of the BLFS book
|
||||
Extract the SysV flavour of the BLFS book
|
||||
|
||||
config BLFS_SYSD
|
||||
bool "BLFS systemd"
|
||||
|
|
|
@ -70,10 +70,12 @@ chapter_targets() { #
|
|||
cp ${CONFIG} $BUILDDIR/sources/kernel-config ;;
|
||||
esac
|
||||
# Grab the name of the target
|
||||
# This is only use to check the name in "opt_override" or "BLACKIST"
|
||||
name=`echo ${this_script} | sed -e 's@[0-9]\{3,4\}-@@' \
|
||||
-e 's@-pass[0-9]\{1\}@@' \
|
||||
-e 's@-libstdc++@@' \
|
||||
-e 's,'$N',,'`
|
||||
-e 's,'$N',,' \
|
||||
-e 's@-32@@'`
|
||||
|
||||
# Find the name of the tarball and the version of the package
|
||||
# If it doesn't exist, we skip it in iterations rebuilds (except stripping
|
||||
|
@ -192,7 +194,7 @@ EOF
|
|||
if [ "${INSTALL_LOG}" = "y" ] &&
|
||||
(( 1+nb_chaps <= $1 )) &&
|
||||
[ "x${N}" = "x" ] ; then
|
||||
CHROOT_wrt_LogNewFiles "$name"
|
||||
CHROOT_wrt_LogNewFiles "${this_script}"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
@ -485,7 +487,7 @@ restore-luser:
|
|||
@\$(call housekeeping)
|
||||
|
||||
do_housekeeping:
|
||||
@-rm /tools
|
||||
@-rm -f /tools
|
||||
|
||||
EOF
|
||||
) >> $MKFILE
|
||||
|
|
|
@ -209,7 +209,10 @@ extract_commands() { #
|
|||
chmod -R +x $JHALFSDIR/${PROGNAME}-commands
|
||||
|
||||
# Create the packages file. We need it for proper Makefile creation
|
||||
# lfs does not use this anymore, but thei is taken care in the
|
||||
# funtion body
|
||||
create_package_list
|
||||
# On the other hand, lfs needs two auxiliary files
|
||||
if [ "${PROGNAME}" = lfs ]; then
|
||||
create_chroot_scripts
|
||||
create_kernfs_scripts
|
||||
|
@ -227,7 +230,7 @@ create_package_list() { #
|
|||
# Create the packages file. We need it for proper Makefile creation
|
||||
rm -f pkg_tarball_list
|
||||
echo -n "Creating <${PROGNAME}> list of tarball names for $BOOK"
|
||||
if [ ! -z $ARCH ] ; then echo -n " $ARCH" ; fi
|
||||
if [ ! -z "$ARCH" ] ; then echo -n " $ARCH" ; fi
|
||||
echo -n "... "
|
||||
case ${PROGNAME} in
|
||||
clfs*)
|
||||
|
@ -245,12 +248,7 @@ create_package_list() { #
|
|||
$BOOK/chapter04/chapter04.xml >>$LOGDIR/$LOG 2>&1
|
||||
;;
|
||||
lfs)
|
||||
xsltproc --nonet --xinclude \
|
||||
--stringparam pkgmngt "$PKGMNGT" \
|
||||
--stringparam revision "$INITSYS" \
|
||||
--output pkg_tarball_list \
|
||||
packages.xsl \
|
||||
$BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
|
||||
# lfs does not use the package list anymore
|
||||
;;
|
||||
*)
|
||||
esac
|
||||
|
|
Reference in a new issue