[alfs-log] r4212 - jhalfs/trunk/BLFS

[pierre]

Author: pierre
Date: Tue Mar  9 09:51:24 2021
New Revision: 4212

Log:
Fix gen-special when an entity is commented out:

In the xorg application, mkfontdir is commented out, but we do not
check that because it is complicated with the shell. This leads to
mkfontfir appearing in the packages to install, which is not
wanted. Check that now.

Modified:
   jhalfs/trunk/BLFS/gen-special.sh

Modified: jhalfs/trunk/BLFS/gen-special.sh
==
--- jhalfs/trunk/BLFS/gen-special.shSat Feb 27 05:08:34 2021(r4211)
+++ jhalfs/trunk/BLFS/gen-special.shTue Mar  9 09:51:24 2021(r4212)
@@ -133,7 +133,11 @@
   if [ "$i" = "$packname" ]; then break; fi
   precpack=$i
 done
-
+# It may happen that packname is not in list_cat, because its entity
+# is commented out in the xml, but we do not check that (too complicated).
+# In that case, the whole list is scanned, and $precpack=$i at the end.
+# when packname is found in the list $precpack!=$i.
+if [ "$precpack" = "$i" ]; then continue; fi
 cat >>$SPECIAL_FILE << EOF
   
   $packname
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4211 - in jhalfs/trunk: LFS common

[pierre]

Author: pierre
Date: Sat Feb 27 05:08:34 2021
New Revision: 4211

Log:
(possibly temporary) Fix for new umount instructions in LFS

Modified:
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/common/kernfs.xsl

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Sat Feb 27 04:45:30 2021(r4210)
+++ jhalfs/trunk/LFS/master.sh  Sat Feb 27 05:08:34 2021(r4211)
@@ -299,7 +299,7 @@
 -e 's|\$\$LFS|$(MOUNT_PT)|g'`
   teardown=`cat ../kernfs-scripts/teardown.sh | \
 sed -e 's|^|   |'   \
--e 's|umount|sudo &|' \
+-e 's|umount|-sudo &|' \
 -e 's|\$LFS|$(MOUNT_PT)|'`
   teardownat=`cat ../kernfs-scripts/teardown.sh | \
   sed -e 's|^| |'   \

Modified: jhalfs/trunk/common/kernfs.xsl
==
--- jhalfs/trunk/common/kernfs.xsl  Sat Feb 27 04:45:30 2021(r4210)
+++ jhalfs/trunk/common/kernfs.xsl  Sat Feb 27 05:08:34 2021(r4211)
@@ -11,7 +11,8 @@
   
 
+ contains(string(),'readlink') or
+ contains(string(),'-Rv')]"/>
   
 
   
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4210 - jhalfs/trunk/pkgmngt

[pierre]

Author: pierre
Date: Sat Feb 27 04:45:30 2021
New Revision: 4210

Log:
Fixes for libhandy and inih in packInstall.sh.porg

Modified:
   jhalfs/trunk/pkgmngt/packInstall.sh.porg

Modified: jhalfs/trunk/pkgmngt/packInstall.sh.porg
==
--- jhalfs/trunk/pkgmngt/packInstall.sh.porgFri Dec  4 01:30:37 2020
(r4209)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.porgSat Feb 27 04:45:30 2021
(r4210)
@@ -67,7 +67,7 @@
   cacerts*)
 VERSION=0.1
 ;;
-  btrfs*|node*|pnmixer*|libhandy*)
+  btrfs*|node*|pnmixer*)
 VERSION=$(echo $1 | sed 's/^.*v//')
 ;;
   x265*) # can contain vd.d or just d.d: thanks to packagers
@@ -76,7 +76,7 @@
   libuv*|Test-MockModule*) # can contain -vd.d or just -d.d
 VERSION=$(echo $1 | sed 's/^.*[v-]//')
 ;;
-  junit*) # can contain -rd.d or just -d.d
+  junit*|inih*) # can contain -rd.d or just -d.d
 VERSION=$(echo $1 | sed 's/^.*[r-]//')
 ;;
   *)
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4209 - jhalfs/trunk/pkgmngt

[pierre]

Author: pierre
Date: Fri Dec  4 01:30:37 2020
New Revision: 4209

Log:
Fix an inaccurate comment in packInstall.sh.porg

Modified:
   jhalfs/trunk/pkgmngt/packInstall.sh.porg

Modified: jhalfs/trunk/pkgmngt/packInstall.sh.porg
==
--- jhalfs/trunk/pkgmngt/packInstall.sh.porgThu Oct 15 06:15:33 2020
(r4208)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.porgFri Dec  4 01:30:37 2020
(r4209)
@@ -98,8 +98,8 @@
 # a bash command is passed as an argument (that may be a compound command).
 # It is executed by this function, after various set-ups...
 
-# Note that PKGDIR is changed to UNPACKDIR
-# and PKG_DEST is changed to PKG_DIR in BLFS tools.
+# Note that PKGDIR is changed to JH_UNPACKDIR
+# and PKG_DEST is changed to JH_PKG_DIR in BLFS tools.
 # The sed for PACKAGE is therefore not needed in BLFS,
 # but it does not hurt, either.
 local PCKGVRS=$(basename $PKGDIR)
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4208 - in jhalfs/trunk: BLFS common/libs

[pierre]

Author: pierre
Date: Thu Oct 15 06:15:33 2020
New Revision: 4208

Log:
Now that tcl, expect, and dejagnu are only in lfs, update instpkg.xml
with those packages after installing lfs, or when updating lfs

Modified:
   jhalfs/trunk/BLFS/update-lfs.sh
   jhalfs/trunk/common/libs/func_install_blfs

Modified: jhalfs/trunk/BLFS/update-lfs.sh
==
--- jhalfs/trunk/BLFS/update-lfs.sh Thu Oct 15 05:39:52 2020(r4207)
+++ jhalfs/trunk/BLFS/update-lfs.sh Thu Oct 15 06:15:33 2020(r4208)
@@ -99,7 +99,7 @@
   sed 's/.*>\([^<]*\)<.*/\1/' |
   sort | uniq); do
 case "x$pack" in
-xtcl | xexpect | xdejagnu | xgcc* | *pass[12] | xvim | \
+xgcc* | *pass[12] | xvim | \
 xshadow | xPython | xlinux-headers | xdbus | xsystemd )
continue ;;
 esac

Modified: jhalfs/trunk/common/libs/func_install_blfs
==
--- jhalfs/trunk/common/libs/func_install_blfs  Thu Oct 15 05:39:52 2020
(r4207)
+++ jhalfs/trunk/common/libs/func_install_blfs  Thu Oct 15 06:15:33 2020
(r4208)
@@ -212,7 +212,7 @@
sed 's/.*>\([^<]*\)<.*/\1/' | \\
sort | uniq); do \\
case "x\$\$pack" in \\
- xtcl | xexpect | xdejagnu | xgcc* | *pass[12] | xvim | \\
+ xgcc* | *pass[12] | xvim | \\
  xshadow | xPython | xlinux-headers | xdbus | xsystemd )\\
continue ;; \\
esac; \\
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4207 - jhalfs/trunk

[pierre]

Author: pierre
Date: Thu Oct 15 05:39:52 2020
New Revision: 4207

Log:
Fix downloading blfs books tag versions greater than 9

Modified:
   jhalfs/trunk/install-blfs-tools.sh

Modified: jhalfs/trunk/install-blfs-tools.sh
==
--- jhalfs/trunk/install-blfs-tools.sh  Tue Sep 29 22:43:59 2020(r4206)
+++ jhalfs/trunk/install-blfs-tools.sh  Thu Oct 15 05:39:52 2020(r4207)
@@ -135,8 +135,8 @@
  development )  BLFS_TREE=trunk/BOOK ;;
   branch-6.* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
 branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
-6.2* | 7.* | 8.* )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
-   * )  BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;;
+   [isv]* | 6.3* )  BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;;
+   * )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
 esac
 case $LFS_BRANCH_ID in
   development )  LFS_TREE=trunk/BOOK ;;
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4206 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Tue Sep 29 22:43:59 2020
New Revision: 4206

Log:
Fix make exiting with an error if $(MOUNT_PT)/var/lib does not exist

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Thu Sep 17 08:30:29 2020(r4205)
+++ jhalfs/trunk/LFS/master.sh  Tue Sep 29 22:43:59 2020(r4206)
@@ -154,8 +154,9 @@
\$(CMDSDIR)/`dirname $file`/\$@ >> \$(LOGDIR)/\$@ 2>&1; \\
\$(PRT_DU) >>logs/\$@
@chown \$(LUSER):\$(LGROUP) envars
-   @[ -d "\$(MOUNT_PT)/var/lib" ] && \\
-   chown \$(LUSER):\$(LGROUP) \$(MOUNT_PT)/var/lib
+   @if [ -d "\$(MOUNT_PT)/var/lib" ]; then \\
+   chown \$(LUSER):\$(LGROUP) \$(MOUNT_PT)/var/lib; \\
+   fi
@chmod -R a+wt $JHALFSDIR
@chmod a+wt \$(SRCSDIR)
 EOF
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4205 - in jhalfs/trunk: LFS common/libs

[pierre]

Author: pierre
Date: Thu Sep 17 08:30:29 2020
New Revision: 4205

Log:
Fix changing the ownership of $BUILDDIR/var/lib to LUSER when it has been
created by func_install_blfs. Fixes ticket #1729

Modified:
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/common/libs/func_install_blfs

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Tue Sep 15 05:39:59 2020(r4204)
+++ jhalfs/trunk/LFS/master.sh  Thu Sep 17 08:30:29 2020(r4205)
@@ -70,7 +70,7 @@
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"
+# This is only used 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++@@' \
@@ -142,6 +142,8 @@
 case "${this_script}" in
   *addinguser)
 (
+# /var/lib may already exist and be owned by root if blfs tools
+# have been installed.
 cat << EOF
@if [ -f luser-id ]; then \\
  function useradd() { true; }; \\
@@ -152,6 +154,8 @@
\$(CMDSDIR)/`dirname $file`/\$@ >> \$(LOGDIR)/\$@ 2>&1; \\
\$(PRT_DU) >>logs/\$@
@chown \$(LUSER):\$(LGROUP) envars
+   @[ -d "\$(MOUNT_PT)/var/lib" ] && \\
+   chown \$(LUSER):\$(LGROUP) \$(MOUNT_PT)/var/lib
@chmod -R a+wt $JHALFSDIR
@chmod a+wt \$(SRCSDIR)
 EOF

Modified: jhalfs/trunk/common/libs/func_install_blfs
==
--- jhalfs/trunk/common/libs/func_install_blfs  Tue Sep 15 05:39:59 2020
(r4204)
+++ jhalfs/trunk/common/libs/func_install_blfs  Thu Sep 17 08:30:29 2020
(r4205)
@@ -62,8 +62,10 @@
   $BUILDDIR$BLFS_ROOT/packages.xml
 
 # But then $BUILDDIR/var/lib/ is owned by root if just created, which
-# prevents $LUSER to create "nss_db". Change ownership here
-sudo chown $LUSER:$LGROUP $BUILDDIR/var/lib
+# prevents $LUSER to create "nss_db". The problem is that $LUSER
+# May not have been created yet. So do not change ownership here
+# and do it in master.sh for chapter 4.
+#sudo chown $LUSER:$LGROUP $BUILDDIR/var/lib
 
 # Because the BLFS Makefile is supposed to be used in chroot (or booted)
 # mode, the tracking file has wrong path for DTD. Change it:
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4204 - jhalfs/trunk/BLFS/xsl

[pierre]

Author: pierre
Date: Tue Sep 15 05:39:59 2020
New Revision: 4204

Log:
add the desktop-file-utils case for non install instructions in blfs tools

Modified:
   jhalfs/trunk/BLFS/xsl/process-install.xsl

Modified: jhalfs/trunk/BLFS/xsl/process-install.xsl
==
--- jhalfs/trunk/BLFS/xsl/process-install.xsl   Tue Sep 15 05:14:50 2020
(r4203)
+++ jhalfs/trunk/BLFS/xsl/process-install.xsl   Tue Sep 15 05:39:59 2020
(r4204)
@@ -11,6 +11,7 @@
  contains(string($current-instr),'pam.d') or
  contains(string($current-instr),'/opt/rustc') or
  contains(string($current-instr),'libQt5WebEngine') or
+ contains(string($current-instr),'desktop-file-edit') or
  contains(string($current-instr),'query-immodules')">
 ]>
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4203 - jhalfs/trunk/pkgmngt

[pierre]

Author: pierre
Date: Tue Sep 15 05:14:50 2020
New Revision: 4203

Log:
packInstall.sh.porg: remove special case for x264: it is now packaged
"normally"...

Modified:
   jhalfs/trunk/pkgmngt/packInstall.sh.porg

Modified: jhalfs/trunk/pkgmngt/packInstall.sh.porg
==
--- jhalfs/trunk/pkgmngt/packInstall.sh.porgTue Sep 15 02:09:18 2020
(r4202)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.porgTue Sep 15 05:14:50 2020
(r4203)
@@ -18,9 +18,6 @@
   wireless_tools*|LVM2*)
 VERSION=$(echo $1 | sed 's/^[^.]*\.//')
 ;;
-  x264*)
-VERSION=$(echo $1 | sed 's/.*shot-//')
-;;
   icu*) # No version in PCKGVRS! Use version directly from xml book.
 # JH_PACK_INSTALL contains the path to this script, which is in the
 # parent dir of the book.
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4202 - jhalfs/trunk/BLFS/xsl

[pierre]

Author: pierre
Date: Tue Sep 15 02:09:18 2020
New Revision: 4202

Log:
Typo

Modified:
   jhalfs/trunk/BLFS/xsl/scripts.xsl

Modified: jhalfs/trunk/BLFS/xsl/scripts.xsl
==
--- jhalfs/trunk/BLFS/xsl/scripts.xsl   Tue Sep 15 00:36:23 2020(r4201)
+++ jhalfs/trunk/BLFS/xsl/scripts.xsl   Tue Sep 15 02:09:18 2020(r4202)
@@ -420,7 +420,7 @@
   
   
   
-  
+  
 
   
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4201 - jhalfs/trunk/BLFS/xsl

[pierre]

Author: pierre
Date: Tue Sep 15 00:36:23 2020
New Revision: 4201

Log:
New bridgehead layout for llvm

Modified:
   jhalfs/trunk/BLFS/xsl/scripts.xsl

Modified: jhalfs/trunk/BLFS/xsl/scripts.xsl
==
--- jhalfs/trunk/BLFS/xsl/scripts.xsl   Sat Aug 22 04:49:09 2020(r4200)
+++ jhalfs/trunk/BLFS/xsl/scripts.xsl   Tue Sep 15 00:36:23 2020(r4201)
@@ -419,7 +419,11 @@
  mode="package"/>
   
   
-  
+  
+  
+
+  
   
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4200 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sat Aug 22 04:49:09 2020
New Revision: 4200

Log:
Create os-release also for SysV

This has been in the book for a few months, but jhalfs was not updated.
It is now...

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Sat Aug 22 04:47:10 2020(r4199)
+++ jhalfs/trunk/LFS/master.sh  Sat Aug 22 04:49:09 2020(r4200)
@@ -308,25 +308,6 @@
 all:   ck_UID ck_terminal mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT 
create-sbu_du-report mk_BLFS_TOOL mk_CUSTOM_TOOLS
 $teardownat
@sudo make do_housekeeping
-EOF
-) >> $MKFILE
-if [ "$INITSYS" = systemd ]; then
-(
-cat << EOF
-   @/bin/echo -e -n \\
-   NAME=\\"Linux From Scratch\\"n\\
-   VERSION=\\"$VERSION\\"n\\
-   ID=lfsn\\
-   PRETTY_NAME=\\"Linux From Scratch $VERSION\\"n\\
-   VERSION_CODENAME=\\"$(whoami)-jhalfs\\"n\\
-   > os-release && \\
-   sudo mv os-release \$(MOUNT_PT)/etc && \\
-   sudo chown root:root \$(MOUNT_PT)/etc/os-release
-EOF
-) >> $MKFILE
-fi
-(
-cat << EOF
@echo $VERSION > lfs-release && \\
sudo mv lfs-release \$(MOUNT_PT)/etc && \\
sudo chown root:root \$(MOUNT_PT)/etc/lfs-release
@@ -338,6 +319,15 @@
> lsb-release && \\
sudo mv lsb-release \$(MOUNT_PT)/etc && \\
sudo chown root:root \$(MOUNT_PT)/etc/lsb-release
+   @/bin/echo -e -n \\
+   NAME=\\"Linux From Scratch\\"n\\
+   VERSION=\\"$VERSION\\"n\\
+   ID=lfsn\\
+   PRETTY_NAME=\\"Linux From Scratch $VERSION\\"n\\
+   VERSION_CODENAME=\\"$(whoami)-jhalfs\\"n\\
+   > os-release && \\
+   sudo mv os-release \$(MOUNT_PT)/etc && \\
+   sudo chown root:root \$(MOUNT_PT)/etc/os-release
@\$(call echo_finished,$VERSION)
 
 ck_UID:
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4199 - jhalfs/trunk/common/libs

[pierre]

Author: pierre
Date: Sat Aug 22 04:47:10 2020
New Revision: 4199

Log:
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 "-".

Modified:
   jhalfs/trunk/common/libs/func_save.sh

Modified: jhalfs/trunk/common/libs/func_save.sh
==
--- jhalfs/trunk/common/libs/func_save.sh   Sat Aug 22 04:44:07 2020
(r4198)
+++ jhalfs/trunk/common/libs/func_save.sh   Sat Aug 22 04:47:10 2020
(r4199)
@@ -31,7 +31,7 @@
 (
 cat << EOF
@mkdir -p /tmp >>logs/\$@ 2>&1 && \\
-   TARNAME=chapter5-\$\$(date -Iseconds).tar && \\
+   TARNAME=chapter5-\$\$(date +%Y-%m-%d-T-%Hh%M).tar && \\
 TMPFILE=\$\$(mktemp -p /tmp) && \\
 TMPLOG=\$\$(mktemp -p /tmp) && \\
for F in $PRUNEPATH; do echo \$\$F >> \$\$TMPFILE; done && \\
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4198 - jhalfs/trunk

[pierre]

Author: pierre
Date: Sat Aug 22 04:44:07 2020
New Revision: 4198

Log:
Allow versions up to 19 for lfs

Modified:
   jhalfs/trunk/jhalfs

Modified: jhalfs/trunk/jhalfs
==
--- jhalfs/trunk/jhalfs Sun Aug 16 01:05:57 2020(r4197)
+++ jhalfs/trunk/jhalfs Sat Aug 22 04:44:07 2020(r4198)
@@ -228,7 +228,7 @@
 LFSVRS=${BRANCH_ID}
 TREE=tags/${BRANCH_ID}
 case ${BRANCH_ID:0:2} in
-10) ;;
+[1-9][0-9]) ;;
 [789]*) ;;
 *) TREE=${TREE}/BOOK ;;
 esac
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4197 - jhalfs/trunk

[pierre]

Author: pierre
Date: Sun Aug 16 01:05:57 2020
New Revision: 4197

Log:
Fix name of book repo for tag version greater than 9

Modified:
   jhalfs/trunk/jhalfs

Modified: jhalfs/trunk/jhalfs
==
--- jhalfs/trunk/jhalfs Fri Jul 10 06:29:15 2020(r4196)
+++ jhalfs/trunk/jhalfs Sun Aug 16 01:05:57 2020(r4197)
@@ -227,9 +227,11 @@
   lfs )
 LFSVRS=${BRANCH_ID}
 TREE=tags/${BRANCH_ID}
-if (( ${BRANCH_ID:0:1} < 7 )) ; then
-TREE=${TREE}/BOOK
-fi
+case ${BRANCH_ID:0:2} in
+10) ;;
+[789]*) ;;
+*) TREE=${TREE}/BOOK ;;
+esac
 ;;
   hlfs )
 LFSVRS=${BRANCH_ID}
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4196 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Fri Jul 10 06:29:15 2020
New Revision: 4196

Log:
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*.

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Fri Jul 10 06:26:23 2020(r4195)
+++ jhalfs/trunk/LFS/master.sh  Fri Jul 10 06:29:15 2020(r4196)
@@ -242,7 +242,7 @@
 
   # We need to know the chapter numbering, which depends on the version
   # of the book. Use the number of subdirs to know which version we have
-  chaps=($(echo *))
+  chaps=($(echo chapter*))
   nb_chaps=${#chaps[*]} # 5 if classical version, 7 if new version
 # DEBUG
 #  echo chaps: ${chaps[*]}
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4194 - jhalfs/trunk

[pierre]

Author: pierre
Date: Fri Jul 10 06:24:00 2020
New Revision: 4194

Log:
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.

Modified:
   jhalfs/trunk/Config.in

Modified: jhalfs/trunk/Config.in
==
--- jhalfs/trunk/Config.in  Thu Jul  9 10:04:30 2020(r4193)
+++ jhalfs/trunk/Config.in  Fri Jul 10 06:24:00 2020(r4194)
@@ -1,8 +1,6 @@
 # $Id$
 menu "BOOK Settings"
 
-depends on !REBUILD_MAKEFILE
-
 #--- BOOK/script
 choice
 prompt "Use BOOK"
@@ -638,7 +636,7 @@
 will be installed after finished the xLFS system build.
 #--- End Custom Tools support
 
-#--- This direcotry is needed for blfs tools installation and custom tools
+#--- This directory is needed for blfs tools installation and custom tools
 #As well.
 configTRACKING_DIR
 string "Installed packages database directory"
@@ -665,7 +663,7 @@
 endmenu
 
 menu "General Settings"
-depends on !BOOK_BLFS && !REBUILD_MAKEFILE
+depends on !BOOK_BLFS
 
 #--- {C,H,}LFS User Account
 
@@ -764,7 +762,7 @@
 endmenu
 
 menu "Build Settings"
-depends on !BOOK_BLFS && !REBUILD_MAKEFILE
+depends on !BOOK_BLFS
 
 #--- Test Suites
 configCONFIG_TESTS
@@ -923,7 +921,7 @@
 endmenu
 
 menu "System configuration"
-depends on !BOOK_BLFS && !REBUILD_MAKEFILE
+depends on !BOOK_BLFS
 
 #--- FSTAB
 configHAVE_FSTAB
@@ -1110,7 +1108,7 @@
 endmenu#--- System configuration
 
 menu "Advanced Features"
-depends on !BOOK_BLFS && !REBUILD_MAKEFILE
+depends on !BOOK_BLFS
 
 configREPORT
 bool "Create SBU and disk usage report"
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4193 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Thu Jul  9 10:04:30 2020
New Revision: 4193

Log:
lfs.xsl: mode=pkgmngt: use $pos and not position() when calling
 start-script

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslThu Jul  9 10:02:10 2020(r4192)
+++ jhalfs/trunk/LFS/lfs.xslThu Jul  9 10:04:30 2020(r4193)
@@ -391,7 +391,7 @@
 set -e
 
 
-  
+  
 
 http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4191 - jhalfs/trunk/pkgmngt

[pierre]

Author: pierre
Date: Thu Jul  9 09:59:36 2020
New Revision: 4191

Log:
Now that packageManager.xml createfiles is also included
 for new book, test that /tools/etc/porgrc exists before moving it

Modified:
   jhalfs/trunk/pkgmngt/packageManager.xml.porg

Modified: jhalfs/trunk/pkgmngt/packageManager.xml.porg
==
--- jhalfs/trunk/pkgmngt/packageManager.xml.porgTue Jul  7 08:27:54 
2020(r4190)
+++ jhalfs/trunk/pkgmngt/packageManager.xml.porgThu Jul  9 09:59:36 
2020(r4191)
@@ -74,7 +74,11 @@
   Files
   porgball needs porgrc
 in /etc:
-  cp /tools/etc/porgrc /etc
+
+if [ -f /tools/etc/porgrc ]; then
+cp /tools/etc/porgrc /etc
+fi
+
 
 
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4192 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Thu Jul  9 10:02:10 2020
New Revision: 4192

Log:
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.

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslThu Jul  9 09:59:36 2020(r4191)
+++ jhalfs/trunk/LFS/lfs.xslThu Jul  9 10:02:10 2020(r4192)
@@ -311,6 +311,12 @@
 done
 [ -d $PKG_DEST/lib64 ]  [ -z "$(ls $PKG_DEST/lib64)" ] 
   rmdir -v $PKG_DEST/lib64
+
+rm -rf $PKG_DEST/var/{run,lock}
+
+[ -d $PKG_DEST/var ]  [ -z "$(ls $PKG_DEST/var)" ]  rmdir 
-v $PKG_DEST/var
 PREV_SEC=${SECONDS}
 packInstall
 SECONDS=${PREV_SEC}
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4190 - in jhalfs/trunk: LFS pkgmngt

[pierre]

Author: pierre
Date: Tue Jul  7 08:27:54 2020
New Revision: 4190

Log:
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.

Modified:
   jhalfs/trunk/LFS/lfs.xsl
   jhalfs/trunk/pkgmngt/packInstall.sh.pacman
   jhalfs/trunk/pkgmngt/packageManager.xml.pacman

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslMon Jul  6 02:38:47 2020(r4189)
+++ jhalfs/trunk/LFS/lfs.xslTue Jul  7 08:27:54 2020(r4190)
@@ -172,9 +172,7 @@
 ]//userinput"
mode="pkgmngt"/>
   
-  
+  
 
+EOF
 
   
 
@@ -550,11 +549,17 @@
   Creating Essential Files
 
 if ! grep -q tester /etc/passwd; then
-echo "tester:x:101:101::/home/tester:/bin/bash" >> /etc/passwd
-echo "tester:x:101:" >> /etc/group
-install -o tester -d /home/tester
+echo "builder:x:101:101::/home/builder:/bin/bash" >> /etc/passwd
+echo "builder:x:101:" >> /etc/group
+install -o builder -d /home/builder
+else
+TEST_UID=$(grep tester /etc/passwd | cut -d: -f3)
+TEST_GID=$(grep tester /etc/group | cut -d: -f3)
+echo "builder:x:$((TEST_UID+1)):$((TEST_GID+1))::/home/builder:/bin/bash" 
>> /etc/passwd
+echo "builder:x:$((TEST_GID+1)):" >> /etc/group
+install -o builder -d /home/builder
 fi
-chown tester:tester /var/lib/{packages,pacman}
+chown builder:builder /var/lib/{packages,pacman}
 
 
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4189 - jhalfs/trunk

[pierre]

Author: pierre
Date: Mon Jul  6 02:38:47 2020
New Revision: 4189

Log:
Typo in Config.in

Modified:
   jhalfs/trunk/Config.in

Modified: jhalfs/trunk/Config.in
==
--- jhalfs/trunk/Config.in  Sun Jul  5 22:51:22 2020(r4188)
+++ jhalfs/trunk/Config.in  Mon Jul  6 02:38:47 2020(r4189)
@@ -131,7 +131,7 @@
 config LFS_MULTILIB_NO
 bool "Standard LFS on i686 or amd64"
 help
-Ues standard LFS book (choose this if not multilib source)
+Use standard LFS book (choose this if not multilib source)
 
 config LFS_MULTILIB_I686
 bool "Multilib LFS on amd64 with i686 libraries"
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4188 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sun Jul  5 22:51:22 2020
New Revision: 4188

Log:
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).

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslSun Jul  5 22:46:07 2020(r4187)
+++ jhalfs/trunk/LFS/lfs.xslSun Jul  5 22:51:22 2020(r4188)
@@ -235,6 +235,7 @@
 
 
 
   
-
+
 
 
   
+  ancestor::chapter[@id='chapter-building-system' or
+@id = 'chapter-config'or
+@id = 'chapter-bootscripts'   or
+@id = 'chapter-bootable']">
 
   
 
@@ -559,8 +562,10 @@
 
   
   
-  
-  
 
   
@@ -573,7 +578,7 @@
   
 
 
-  
+  
   
   
 
@@ -1241,8 +1246,9 @@
 
   
   
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4186 - jhalfs/trunk/pkgmngt

[pierre]

Author: pierre
Date: Sun Jul  5 22:44:22 2020
New Revision: 4186

Log:
Allow scriptlet numbering to be on 4 digits in packInstall.sh*

Modified:
   jhalfs/trunk/pkgmngt/packInstall.sh.dpkg
   jhalfs/trunk/pkgmngt/packInstall.sh.porg
   jhalfs/trunk/pkgmngt/packInstall.sh.template

Modified: jhalfs/trunk/pkgmngt/packInstall.sh.dpkg
==
--- jhalfs/trunk/pkgmngt/packInstall.sh.dpkgSun Jul  5 22:38:54 2020
(r4185)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.dpkgSun Jul  5 22:44:22 2020
(r4186)
@@ -6,7 +6,7 @@
 
 local PCKGVRS=$(basename $PKGDIR)
 local TGTPKG=$(basename $PKG_DEST)
-local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
+local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3,4\}-//' |
sed 's/^[0-9]\{2\}-//')
 case $PCKGVRS in
   expect*|tcl*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*//') ;;

Modified: jhalfs/trunk/pkgmngt/packInstall.sh.porg
==
--- jhalfs/trunk/pkgmngt/packInstall.sh.porgSun Jul  5 22:38:54 2020
(r4185)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.porgSun Jul  5 22:44:22 2020
(r4186)
@@ -107,7 +107,7 @@
 # but it does not hurt, either.
 local PCKGVRS=$(basename $PKGDIR)
 local TGTPKG=$(basename $PKG_DEST)
-local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
+local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3,4\}-//' |
sed 's/^[0-9]\{2\}-//')
 # Porg converts package names to lowercase anyway, so do the conversion
 # ourselves
@@ -126,7 +126,7 @@
 
 # With porg, we need only the package name to make the tarball
 local TGTPKG=$(basename $PKG_DEST)
-local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
+local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3,4\}-//' |
sed 's/^[0-9]\{1\}-//')
 local PCKGVRS=$(basename $PKGDIR)
 # Porg converts package names to lowercase anyway, so do the conversion

Modified: jhalfs/trunk/pkgmngt/packInstall.sh.template
==
--- jhalfs/trunk/pkgmngt/packInstall.sh.templateSun Jul  5 22:38:54 
2020(r4185)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.templateSun Jul  5 22:44:22 
2020(r4186)
@@ -8,7 +8,7 @@
 # A proposed implementation for versions and package names.
 local PCKGVRS=$(basename $PKGDIR)
 local TGTPKG=$(basename $PKG_DEST)
-local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
+local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3,4\}-//' |
sed 's/^[0-9]\{2\}-//')
 # version is only accessible from PKGDIR name. Since the format of the
 # name is not normalized, several hacks are necessary...
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4187 - jhalfs/trunk/pkgmngt

[pierre]

Author: pierre
Date: Sun Jul  5 22:46:07 2020
New Revision: 4187

Log:
Forgot one instance of minor scriptlet number removal

Modified:
   jhalfs/trunk/pkgmngt/packInstall.sh.porg

Modified: jhalfs/trunk/pkgmngt/packInstall.sh.porg
==
--- jhalfs/trunk/pkgmngt/packInstall.sh.porgSun Jul  5 22:44:22 2020
(r4186)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.porgSun Jul  5 22:46:07 2020
(r4187)
@@ -127,7 +127,7 @@
 # With porg, we need only the package name to make the tarball
 local TGTPKG=$(basename $PKG_DEST)
 local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3,4\}-//' |
-   sed 's/^[0-9]\{1\}-//')
+   sed 's/^[0-9]\{2\}-//')
 local PCKGVRS=$(basename $PKGDIR)
 # Porg converts package names to lowercase anyway, so do the conversion
 # ourselves
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4185 - in jhalfs/trunk: LFS common/libs pkgmngt

[pierre]

Author: pierre
Date: Sun Jul  5 22:38:54 2020
New Revision: 4185

Log:
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

Modified:
   jhalfs/trunk/LFS/lfs.xsl
   jhalfs/trunk/common/libs/func_wrt_Makefile
   jhalfs/trunk/pkgmngt/packInstall.sh.dpkg
   jhalfs/trunk/pkgmngt/packInstall.sh.pacman
   jhalfs/trunk/pkgmngt/packInstall.sh.porg
   jhalfs/trunk/pkgmngt/packInstall.sh.template

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslSun Jul  5 22:31:55 2020(r4184)
+++ jhalfs/trunk/LFS/lfs.xslSun Jul  5 22:38:54 2020(r4185)
@@ -368,11 +368,17 @@
 
 
 
+
+  
+0
+  
+  
+
  
 
-  
 #!/bin/bash
 set +h

Modified: jhalfs/trunk/common/libs/func_wrt_Makefile
==
--- jhalfs/trunk/common/libs/func_wrt_Makefile  Sun Jul  5 22:31:55 2020
(r4184)
+++ jhalfs/trunk/common/libs/func_wrt_Makefile  Sun Jul  5 22:38:54 2020
(r4185)
@@ -64,7 +64,7 @@
 #--#
 get_package_tarball_name() {   #
 #--#
-  local script_name=`echo ${1} | sed -e 's@^[0-9]\{1\}-@@'`
+  local script_name=`echo ${1} | sed -e 's@^[0-9]\{2\}-@@'`
 
# The use of 'head' is necessary to limit the return value to the FIRST 
match..
# hopefully this will not cause problems.

Modified: jhalfs/trunk/pkgmngt/packInstall.sh.dpkg
==
--- jhalfs/trunk/pkgmngt/packInstall.sh.dpkgSun Jul  5 22:31:55 2020
(r4184)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.dpkgSun Jul  5 22:38:54 2020
(r4185)
@@ -7,7 +7,7 @@
 local PCKGVRS=$(basename $PKGDIR)
 local TGTPKG=$(basename $PKG_DEST)
 local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
-   sed 's/^[0-9]\{1\}-//')
+   sed 's/^[0-9]\{2\}-//')
 case $PCKGVRS in
   expect*|tcl*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*//') ;;
   vim*|unzip*) local VERSION=$(echo $PCKGVRS | sed 
's/^[^0-9]*\([0-9]\)\([0-9]\)/\1.\2/') ;;

Modified: jhalfs/trunk/pkgmngt/packInstall.sh.pacman
==
--- jhalfs/trunk/pkgmngt/packInstall.sh.pacman  Sun Jul  5 22:31:55 2020
(r4184)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.pacman  Sun Jul  5 22:38:54 2020
(r4185)
@@ -8,8 +8,8 @@
 # A proposed implementation for versions and package names.
 local PCKGVRS=$(basename $PKGDIR)
 local TGTPKG=$(basename $PKG_DEST)
-local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3\}-//' |
-   sed 's/^[0-9]\{1\}-//')
+local PACKAGE=$(echo ${TGTPKG} | sed 's/^[0-9]\{3,4\}-//' |
+   sed 's/^[0-9]\{2\}-//')
 # version is only accessible from PKGDIR name. Since the format of the
 # name is not normalized, several hacks are necessary...
 case $PCKGVRS in
@@ -33,7 +33,11 @@
 # Right now, we have the files in the current directory. They should be moved
 # to /sources/$PACKAGE/src.
 mkdir -p ../$PACKAGE/src
+# We'll build as user tester. We need this directory to be owned by that user.
+chown -R tester ../$PACKAGE
 mv * ../$PACKAGE/src
+chown -R tester $PKG_DEST
+chmod -R o+r ../$PACKAGE
 
 cat > PKGBUILD <http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4184 - jhalfs/trunk/pkgmngt

[pierre]

Author: pierre
Date: Sun Jul  5 22:31:55 2020
New Revision: 4184

Log:
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

Modified:
   jhalfs/trunk/pkgmngt/packageManager.xml.pacman

Modified: jhalfs/trunk/pkgmngt/packageManager.xml.pacman
==
--- jhalfs/trunk/pkgmngt/packageManager.xml.pacman  Sun Jul  5 22:23:47 
2020(r4183)
+++ jhalfs/trunk/pkgmngt/packageManager.xml.pacman  Sun Jul  5 22:31:55 
2020(r4184)
@@ -9,15 +9,20 @@
 it in html -->
 http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd; [
-
-
-
-http://www.libarchive.org/downloads/libarchive-.tar.gz;>
-http://curl.haxx.se/download/curl-.tar.lzma;>
+
+
+
+
+https://github.com/libarchive/libarchive/releases/download/v/libarchive-.tar.xz;>
+https://curl.haxx.se/download/curl-.tar.xz;>
+http://deb.debian.org/debian/pool/main/f/fakeroot/fakeroot_.orig.tar.gz;>
 https://sources.archlinux.org/other/pacman/pacman-.tar.gz;>
-
-
-
+
+
+
+
+
+%general-entities;
 ]>
 
 
@@ -34,6 +39,8 @@
   All Packages
 Download: 
 MD5 sum: 
+Download: 
+MD5 sum: 
 Download: 
 MD5 sum: 
 Download: 
@@ -74,6 +81,28 @@
 
 
 
+
+  
+
+  
+openssl
+
+
+  
+
+  openssl-
+
+  
+
+./config --prefix=/tools\
+ --openssldir=/tools/etc/ssl \
+ --libdir=lib
+make
+make install
+  
+
+
+
 
   
 
@@ -95,6 +124,45 @@
 
 
 
+
+  
+
+  
+libcap
+
+
+  
+
+  libcap-
+
+  
+
+make lib=lib prefix=/tools GOLANG=no 
PAM_CAP=no
+make lib=lib prefix=/tools GOLANG=no 
PAM_CAP=no install
+  
+
+
+
+
+  
+
+  
+fakeroot
+
+
+  
+
+  fakeroot-
+
+  
+
+./configure 
--prefix=/tools
+make
+make install
+  
+
+
+
 
   
 
@@ -116,17 +184,23 @@
 put line breaks before and after your instructions.  without
 remap attribute are considered configuration instructions and executed last. 
You
 can also use remap="adjust" for the same purpose. -->
-./configure --prefix=/tools \
---without-openssl \
-PKG_CONFIG_PATH=/tools/lib/pkgconfig \
-DUPATH=/tools/bin/du
+mkdir build
+cd build
+meson --prefix=/tools\
+  --sysconfdir=/tools/etc\
+  --localstatedir=/tools/var \
+  -Dcrypto=openssl   \
+  -Ddoc=disabled \
+  -Dgpgme=disabled   \
+  -Dpkg_config_path=/tools/lib/pkgconfig
 
-make
+ninja
 
-make install
+ninja install
 
 sed -e 's@/usr@/tools@g' \
 -e 's/\([^!]\)strip/\1!strip/' \
+-e 's/\([^!]\)libtool/\1!libtool/' \
 -e 's/\([^!]\)zipman/\1!zipman/' \
 -i /tools/etc/makepkg.conf
 cat  /tools/etc/makepkg.conf  EOF
@@ -146,6 +220,320 @@
 
 
 
+
+
+  
+
+  
+libarchive
+
+
+  
+
+  Libarchive-
+
+  
+
+./configure --prefix=/usr \
+--without-bz2lib \
+--without-xml2   \
+--enable-bsdtar=static \
+--enable-bsdcpio=static
+make
+make install
+  
+
+
+
+
+  
+
+  
+openssl
+
+
+  
+
+  openssl-
+
+  
+
+
+./config --prefix=/usr \
+ --openssldir=/etc/ssl \
+ --libdir=lib  \
+ shared
+make
+make install
+  
+
+
+
+
+  
+
+  
+curl
+
+
+  
+
+  Curl-
+
+  
+
+./configure --prefix=/usr \
+--disable-static
+make
+make install
+  
+
+
+
+
+  
+
+  
+libcap
+
+
+  
+
+  libcap-
+
+  
+
+sed -i '/install.*STACAPLIBNAME/d' 
libcap/Makefile
+make lib=lib
+make lib=lib 
PKGCONFIGDIR=/usr/lib/pkgconfig install
+chmod -v 755 /lib/libcap.so.
+mv -v /lib/libpsx.a /usr/lib
+rm -v /lib/libcap.so
+ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so
+  
+
+
+
+
+  
+
+  
+fakeroot
+
+
+  
+
+  fakeroot-
+
+  
+
+./configure 
--prefix=/usr
+make
+make install
+  
+
+
+
+
+  
+
+  
+zlib
+
+
+  
+
+  zlib-
+
+  
+
+./configure 
--prefix=/usr
+make
+make install
+mv -v /usr/lib/libz.so.* /lib
+ln -sfv ../../lib/$(readlink /usr/lib/libz.so) 
/usr/lib/libz.so
+  
+
+
+
+
+  
+
+  
+libffi
+
+
+  
+
+  libffi-
+
+  
+
+./configure --prefix=/usr 
--disable-static --with-gcc-arch=native
+make
+make install
+  
+
+
+
+
+  
+
+  
+Python
+
+
+  
+
+  Python-
+
+  
+
+./configure --prefix=/usr 
--without-ensurepip --enable-shared
+make
+make install
+  
+
+
+
+
+  
+
+  
+ninja
+
+
+  
+
+  ninja-
+
+  
+
+python3 configure.py 
--bootstrap
+install -vm755 ninja 
/usr/bin/
+  
+
+
+
+
+  
+
+  
+meson
+
+
+  
+
+  meson-
+
+  
+
+cp meson.py /usr/bin/meson
+cp -rv mesonbuild /usr/bin
+  
+
+
+
+
+  
+
+  
+pkg-config
+
+
+  
+
+  pkg-config-
+
+  
+
+./configure --prefix=/usr   

[alfs-log] r4183 - jhalfs/trunk

[pierre]

Author: pierre
Date: Sun Jul  5 22:23:47 2020
New Revision: 4183

Log:
When copying packageManager.xml, use a sed to replace BOOK with $BOOK

This allows loading entities from the lfs book

Modified:
   jhalfs/trunk/jhalfs

Modified: jhalfs/trunk/jhalfs
==
--- jhalfs/trunk/jhalfs Sun Jul  5 22:20:06 2020(r4182)
+++ jhalfs/trunk/jhalfs Sun Jul  5 22:23:47 2020(r4183)
@@ -411,7 +411,8 @@
 
 # Copy packageManager.xml, if needed
   [[ "$PKGMNGT" = "y" ]] && [[ "$PROGNAME" = "lfs" ]] && {
-cp "$PKGMNGTDIR/packageManager.xml" "$JHALFSDIR/"
+sed s@BOOK@"$BOOK"@ "$PKGMNGTDIR/packageManager.xml" > \
+"$JHALFSDIR/"packageManager.xml
 cp "$PKGMNGTDIR/packInstall.sh" "$JHALFSDIR/"
 }
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4182 - jhalfs/trunk/pkgmngt

[pierre]

Author: pierre
Date: Sun Jul  5 22:20:06 2020
New Revision: 4182

Log:
Remove special cases for vim and tidy in packInstall.sh.pacman

Modified:
   jhalfs/trunk/pkgmngt/packInstall.sh.pacman

Modified: jhalfs/trunk/pkgmngt/packInstall.sh.pacman
==
--- jhalfs/trunk/pkgmngt/packInstall.sh.pacman  Sun Jul  5 22:17:16 2020
(r4181)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.pacman  Sun Jul  5 22:20:06 2020
(r4182)
@@ -14,8 +14,7 @@
 # name is not normalized, several hacks are necessary...
 case $PCKGVRS in
   expect*|tcl*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*//') ;;
-  vim*|unzip*) local VERSION=$(echo $PCKGVRS | sed 
's/^[^0-9]*\([0-9]\)\([0-9]\)/\1.\2/') ;;
-  tidy*) local VERSION=$(echo $PCKGVRS | sed 's/^[^0-9]*\([0-9]*\)/\1cvs/') ;;
+  unzip*) local VERSION=$(echo $PCKGVRS | sed 
's/^[^0-9]*\([0-9]\)\([0-9]\)/\1.\2/') ;;
   docbook-xml) local VERSION=4.5 ;;
   *) local VERSION=$(echo ${PCKGVRS} | sed 's/^.*[-_]\([0-9]\)/\1/' |
sed 's/_/./g');;
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4181 - jhalfs/trunk/common

[pierre]

Author: pierre
Date: Sun Jul  5 22:17:16 2020
New Revision: 4181

Log:
When cleaning BUILD_DIR, clean also 32 bit library dirs in case multilib
has been used

Modified:
   jhalfs/trunk/common/common-functions

Modified: jhalfs/trunk/common/common-functions
==
--- jhalfs/trunk/common/common-functionsTue Jun 23 23:26:05 2020
(r4180)
+++ jhalfs/trunk/common/common-functionsSun Jul  5 22:17:16 2020
(r4181)
@@ -81,7 +81,7 @@
   if [ -d $BUILDDIR/sys ] ; then
 sudo rmdir $BUILDDIR/sys || exit 1
   fi
-  sudo rm -rf $BUILDDIR/{bin,boot,dev,etc,home,lib{,64},media,mnt,run}
+  sudo rm -rf 
$BUILDDIR/{bin,boot,dev,etc,home,lib{,64,32,x32},media,mnt,run}
   sudo rm -rf $BUILDDIR/{opt,root,sbin,srv,tmp,tools,cross-tools,usr,var}
   echo "done"
   if [[ "${BLFS_TOOL}" = "y" ]] ; then
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4180 - in jhalfs/trunk: LFS pkgmngt

[pierre]

Author: pierre
Date: Tue Jun 23 23:26:05 2020
New Revision: 4180

Log:
Fix package management for new book, and add a patch for porg

Modified:
   jhalfs/trunk/LFS/lfs.xsl
   jhalfs/trunk/pkgmngt/packageManager.xml.porg
   jhalfs/trunk/pkgmngt/packageManager.xml.template

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslSat Jun 20 10:16:22 2020(r4179)
+++ jhalfs/trunk/LFS/lfs.xslTue Jun 23 23:26:05 2020(r4180)
@@ -143,28 +143,6 @@
   
   
 
-
-
-  
-
-
-  
-
-
-  
-
-
-  
-
 
 
   #!
@@ -187,14 +165,16 @@
   
-  
+  
 
   
-  
+  
 
+  
+
+  
+
+
+  
+
+
+  
+
+
+  
+
+  
+
+
+  
+
+
+  
+
   
 
   
@@ -219,7 +233,9 @@
  not(current()/../@id='ch-tools-dejagnu') and
  not(current()/../@id='ch-system-systemd')]"/>
 
-
@@ -367,7 +385,7 @@
select=".//screen[not(@role) or
 @role != 'nodump']/userinput[@remap != 'adjust']"
mode="pkgmngt"/>
-
+
   PREV_SEC=${SECONDS}
 packInstall
 SECONDS=${PREV_SEC}
@@ -1216,8 +1234,12 @@
   
 
   
-  
+  
+
 
 source ${ROOT}${SCRIPT_ROOT}/packInstall.sh
 export -f packInstall

Modified: jhalfs/trunk/pkgmngt/packageManager.xml.porg
==
--- jhalfs/trunk/pkgmngt/packageManager.xml.porgSat Jun 20 10:16:22 
2020(r4179)
+++ jhalfs/trunk/pkgmngt/packageManager.xml.porgTue Jun 23 23:26:05 
2020(r4180)
@@ -1,10 +1,11 @@
 
-
 http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd; [
 
 https://sourceforge.net/projects/porg/files/porg-.tar.gz;>
 
+http://www.linuxfromscratch.org/patches/downloads/porg/porg-0.10-renameat2-1.patch;>
+
 ]>
 
 
@@ -14,6 +15,12 @@
 Download: 
 MD5 sum: 
 
+
+  Package Information
+Download: 
+MD5 sum: 
+
+
 
 
   
@@ -27,6 +34,7 @@
   Porg in tools
   
 Instructions
+patch -Np1 -i 
../porg-0.10-renameat2-1.patch
 ./configure --prefix=/tools \
--disable-grop  \
--with-porg-logdir=/tools/var/porg
@@ -69,6 +77,38 @@
   cp /tools/etc/porgrc /etc
 
 
+
+  
+
+  
+porg
+
+
+  
+
+  Temporary Porg
+  
+Instructions
+
+patch -Np1 -i 
../porg-0.10-renameat2-1.patch
+./configure --prefix=/usr \
+--disable-grop\
+--sysconfdir=/etc \
+--with-porg-logdir=/var/lib/porg
+
+make
+
+make install
+mkdir -p /usr/share/bash-completion/completions
+mv /etc/bash_completion.d/porg* 
/usr/share/bash-completion/completions
+
+sed -e '/EXCLUDE/{s/^#//;s@$@:/sources:/home@}' \
+-e '/LOGDIR/s/^#//' \
+-i /etc/porgrc
+  
+
+
+
 
   
 
@@ -82,6 +122,7 @@
   
 Instructions
 
+patch -Np1 -i 
../porg-0.10-renameat2-1.patch
 ./configure --prefix=/usr \
 --disable-grop\
 --sysconfdir=/etc \

Modified: jhalfs/trunk/pkgmngt/packageManager.xml.template
==
--- jhalfs/trunk/pkgmngt/packageManager.xml.templateSat Jun 20 10:16:22 
2020(r4179)
+++ jhalfs/trunk/pkgmngt/packageManager.xml.templateTue Jun 23 23:26:05 
2020(r4180)
@@ -16,6 +16,7 @@
 
 
 Download: http://your/package-manager/url"/>
@@ -29,11 +30,76 @@
 
 -->
 
-
+
 
-  
+  
+
+  
+dpkg
+x.y.z
+http://where/is/your/package
+  
+
+  
+
+./configure --prefix=/tools \
+--disable-nls --without-dselect \
+--without-start-stop-daemon \
+--without-update-alternatives \
+--without-install-info \
+--without-zlib --with-bz2=static --without-selinux
+
+(cd lib   make)
+(cd src  make)
+(cd dpkg-deb  make)
+(cd dpkg-split  make)
+
+cp src/dpkg src/dpkg-* /tools/bin
+cp dpkg-deb/dpkg-deb /tools/bin
+cp dpkg-split/dpkg-split /tools/bin
+mkdir -pv /tools/etc/dpkg/{,dpkg.cfg.d}
+cp debian/dpkg.cfg /tools/etc/dpkg
+
+cat  /tools/etc/dpkg/dpkg.cfg  EOF
+# admindir on LFS system
+admindir /var/lib/dpkg
+EOF
+
+cat  /tools/etc/dpkg/dpkg.cfg  EOF
+# disable fatal error on path checking
+force-bad-path
+EOF
+
+  
+
+
+
+
+
+  
 
   
@@ -95,7 +161,9 @@
 mkdir -pv /var/lib/packages
 
 
-
+
 
 
 touch /var/lib/dpkg/{available,status}
@@ -106,6 +174,8 @@
 
 
   
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4179 - in jhalfs/trunk: . LFS common/libs

[pierre]

Author: pierre
Date: Sat Jun 20 10:16:22 2020
New Revision: 4179

Log:
Add the multilib book: fixes ticket #1722

Modified:
   jhalfs/trunk/Config.in
   jhalfs/trunk/LFS/lfs.xsl
   jhalfs/trunk/common/libs/func_book_parser
   jhalfs/trunk/common/libs/func_wrt_Makefile

Modified: jhalfs/trunk/Config.in
==
--- jhalfs/trunk/Config.in  Sat Jun 20 10:01:23 2020(r4178)
+++ jhalfs/trunk/Config.in  Sat Jun 20 10:16:22 2020(r4179)
@@ -124,6 +124,39 @@
 help
 The full path to a local copy of the book XML sources
 
+choice
+depends on (BOOK_LFS || BOOK_LFS_SYSD) && (BRANCH || WORKING_COPY)
+prompt "Mutilib"
+default LFS_MULTILIB_NO
+config LFS_MULTILIB_NO
+bool "Standard LFS on i686 or amd64"
+help
+Ues standard LFS book (choose this if not multilib source)
+
+config LFS_MULTILIB_I686
+bool "Multilib LFS on amd64 with i686 libraries"
+help
+Use Multilib LFS book with i686 libraries
+
+config LFS_MULTILIB_X32
+bool "Multilib LFS on amd64 with x32 libraries"
+help
+Use Multilib LFS book with x32 libraries
+
+config LFS_MULTILIB_ALL
+bool "Multilib LFS on amd64 with i686 and x32 libraries"
+help
+Use Multilib LFS book with i686 and x32 libraries
+
+endchoice
+
+configMULTILIB
+string
+default "default"  if LFS_MULTILIB_NO
+default "ml_32"if LFS_MULTILIB_I686
+default "ml_x32"   if LFS_MULTILIB_X32
+default "ml_all"   if LFS_MULTILIB_ALL
+
 #--- End BOOK version
 
 #--- CLFS specific params

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslSat Jun 20 10:01:23 2020(r4178)
+++ jhalfs/trunk/LFS/lfs.xslSat Jun 20 10:16:22 2020(r4179)
@@ -10,10 +10,6 @@
 
 
 
-  
-  
-
   

[alfs-log] r4178 - in jhalfs/trunk: . LFS common/libs

[pierre]

Author: pierre
Date: Sat Jun 20 10:01:23 2020
New Revision: 4178

Log:
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)

Modified:
   jhalfs/trunk/Config.in
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/common/libs/func_book_parser

Modified: jhalfs/trunk/Config.in
==
--- jhalfs/trunk/Config.in  Sat Jun 20 09:53:31 2020(r4177)
+++ jhalfs/trunk/Config.in  Sat Jun 20 10:01:23 2020(r4178)
@@ -13,7 +13,7 @@
 configBOOK_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.
 
 configBOOK_LFS_SYSD
 bool "Linux From Scratch systemd"
@@ -47,9 +47,9 @@
 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"

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Sat Jun 20 09:53:31 2020(r4177)
+++ jhalfs/trunk/LFS/master.sh  Sat Jun 20 10:01:23 2020(r4178)
@@ -70,10 +70,12 @@
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 @@
   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 @@
@\$(call housekeeping)
 
 do_housekeeping:
-   @-rm /tools
+   @-rm -f /tools
 
 EOF
 ) >> $MKFILE

Modified: jhalfs/trunk/common/libs/func_book_parser
==
--- jhalfs/trunk/common/libs/func_book_parser   Sat Jun 20 09:53:31 2020
(r4177)
+++ jhalfs/trunk/common/libs/func_book_parser   Sat Jun 20 10:01:23 2020
(r4178)
@@ -209,7 +209,10 @@
   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 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 @@
  $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
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4177 - jhalfs/trunk/common

[pierre]

Author: pierre
Date: Sat Jun 20 09:53:31 2020
New Revision: 4177

Log:
Use an XPath expression to select  that contains packages with right
attributes in packages.xsl, rather than an .

Modified:
   jhalfs/trunk/common/packages.xsl

Modified: jhalfs/trunk/common/packages.xsl
==
--- jhalfs/trunk/common/packages.xslSat Jun 20 09:45:26 2020(r4176)
+++ jhalfs/trunk/common/packages.xslSat Jun 20 09:53:31 2020(r4177)
@@ -20,7 +20,11 @@
   
 
   
-
+
 
   
@@ -28,21 +32,13 @@
   
 
   
-
   
 
   
-
   
 
   
-
+
 
 
   http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4176 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sat Jun 20 09:45:26 2020
New Revision: 4176

Log:
Clean LFS/master.sh from unused
functions

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Fri Jun 19 07:25:52 2020(r4175)
+++ jhalfs/trunk/LFS/master.sh  Sat Jun 20 09:45:26 2020(r4176)
@@ -219,335 +219,6 @@
   fi
 }
 
-# NOT USED -- NOT USED
-##
-chapter5_Makefiles() {
-##
-  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter5 ( LUSER ) 
${R_arrow}"
-
-# Initialize the Makefile target: it'll change during chapter
-# For vanilla lfs, the "changingowner" script should be run as root. So
-# it belongs to the "SUDO" target, with list in the "runasroot" variable.
-# For new lfs, changingowner and kernfs are in "runasroot", then the following,
-# starting at creatingdirs, are in the "CHROOT" target, in variable "chapter6".
-# Makefile_target records the variable, not really the target!
-# We use a case statement on that variable, because instructions in the
-# Makefile change according to the phase of the build (LUSER, SUDO, CHROOT).
-  Makefile_target=chapter5
-
-# Start loop
-  for file in chapter05/* ; do
-# Keep the script file name
-this_script=`basename $file`
-
-# Append each name of the script files to a list that Makefile_target
-# points to. But before that, change Makefile_target at the first script
-# of each target.
-case "${this_script}" in
-  *changingowner) Makefile_target=runasroot ;;
-  *creatingdirs ) Makefile_target=chapter6  ;; # only run for new lfs
-esac
-eval $Makefile_target=\"\$$Makefile_target ${this_script}\"
-
-# Grab the name of the target (minus the -pass1 or -pass2 in the case of 
gcc
-# and binutils in chapter 5)
-name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@' \
--e 's@-pass[0-9]\{1\}@@' \
--e 's@-libstdc++@@'`
-
-##
-# >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<<  #
-##
-#
-# Find the name of the tarball and the version of the package
-pkg_tarball=$(sed -n 's/tar -xf \(.*\)/\1/p' $file)
-pkg_version=$(sed -n 's/VERSION=\(.*\)/\1/p' $file)
-
-# Drop in the name of the target on a new line, and the previous target
-# as a dependency. Also call the echo_message function.
-case $Makefile_target in
-  chapter6) CHROOT_wrt_target "${this_script}" "$PREV" "$pkg_version" ;;
-  *)LUSER_wrt_target "${this_script}" "$PREV" "$pkg_version" ;;
-esac
-
-# If $pkg_tarball isn't empty, we've got a package...
-if [ "$pkg_tarball" != "" ] ; then
-  # Always initialize the log file, since the test instructions may be
-  # "uncommented" by the user
-  case $Makefile_target in
-   chapter6) CHROOT_wrt_test_log "${this_script}" "$pkg_version" ;;
-   *)LUSER_wrt_test_log "${this_script}" "$pkg_version" ;;
-  esac
-
-  # If using optimizations, write the instructions
-  case "${OPTIMIZE}${this_script}${REALSBU}" in
-  *binutils-pass1y) ;;
-  2*) wrt_optimize "$name" && wrt_makeflags "$name" ;;
-  *) ;;
-  esac
-fi
-
-# Insert date and disk usage at the top of the log file, the script run
-# and date and disk usage again at the bottom of the log file.
-# The changingowner script must be run as root.
-case "${Makefile_target}" in
-  runasroot)  wrt_RunAsRoot "$file" "$pkg_version" ;;
-  chapter5)   LUSER_wrt_RunAsUser "$file" "$pkg_version" ;;
-  chapter6)   CHROOT_wrt_RunAsRoot "$file" "$pkg_version" ;;
-esac
-
-# Include a touch of the target name so make can check
-# if it's already been made.
-wrt_touch
-#
-##
-#  >>>>>>>> END OF Makefile ENTRY <<<<<<<<   #
-##
-
-# Keep the script file name for Makefile dependencies.
-PREV=${this_script}
-  done  # end for file in chapter05/*
-}
-
-# NOT USED -- NOT USED keep for ICA code
-##
-chapter6_Makefiles() {
-##
-
-  # Set envars and scripts for iterat

[alfs-log] r4175 - in jhalfs/trunk: . LFS

[pierre]

Author: pierre
Date: Fri Jun 19 07:25:52 2020
New Revision: 4175

Log:
Remove spaces at the end of lines

Modified:
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/jhalfs

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Thu Jun 18 23:51:10 2020(r4174)
+++ jhalfs/trunk/LFS/master.sh  Fri Jun 19 07:25:52 2020(r4175)
@@ -175,7 +175,7 @@
   fi
   ;;
 
-  *) 
+  *)
  # Insert date and disk usage at the top of the log file, the script
  # run and date and disk usage again at the bottom of the log file.
  case "${Makefile_target}" in

Modified: jhalfs/trunk/jhalfs
==
--- jhalfs/trunk/jhalfs Thu Jun 18 23:51:10 2020(r4174)
+++ jhalfs/trunk/jhalfs Fri Jun 19 07:25:52 2020(r4175)
@@ -101,7 +101,7 @@
 
 version="
 ${BOLD}  \"jhalfs\"${OFF} builder tool (development) \$Rev$
- \$Date$ 
+ \$Date$
 
   Copyright (C) 2005-2019, the jhalfs team:
 Jeremy Huntwork
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4174 - jhalfs/trunk/common

[pierre]

Author: pierre
Date: Thu Jun 18 23:51:10 2020
New Revision: 4174

Log:
Replace "cat /proc/cpuinfo" with "lscpu" in the sub-du report: cpuinfo gets
too big with several cores

Modified:
   jhalfs/trunk/common/create-sbu_du-report.sh

Modified: jhalfs/trunk/common/create-sbu_du-report.sh
==
--- jhalfs/trunk/common/create-sbu_du-report.sh Sun Jun 14 08:54:44 2020
(r4173)
+++ jhalfs/trunk/common/create-sbu_du-report.sh Thu Jun 18 23:51:10 2020
(r4174)
@@ -45,7 +45,7 @@
 
 # Dump CPU and memory info
 echo -e "\n\n\t\tCPU type:\n" >> "$REPORT"
-cat /proc/cpuinfo >> "$REPORT"
+lscpu >> "$REPORT"
 echo -e "\n\t\tMemory info:\n" >> "$REPORT"
 free >> "$REPORT"
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4173 - jhalfs/trunk/BLFS/xsl

[pierre]

Author: pierre
Date: Sun Jun 14 08:54:44 2020
New Revision: 4173

Log:
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

Modified:
   jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl
   jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl

Modified: jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl
==
--- jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl  Sun Jun 14 00:08:19 2020
(r4172)
+++ jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl  Sun Jun 14 08:54:44 2020
(r4173)
@@ -31,9 +31,9 @@
 LFS Packages
 
 
-  lfs-6
+  lfs-system
 
-  LFS Chapter 6
+  LFS Final System
   
   
 
 
-  lfs-8
+  lfs-boot
 
-  LFS Chapter 8
+  LFS Making Bootable
   
   
 
 
-  lfs-9
+  lfs-theend
 
-  LFS Chapter 9
+  LFS The end
   
   
 

Modified: jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl
==
--- jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl Sun Jun 14 00:08:19 2020
(r4172)
+++ jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl Sun Jun 14 08:54:44 2020
(r4173)
@@ -40,7 +40,7 @@
   $package='shadow'"/>
   
 
-  
+  
 
   
   
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4172 - in jhalfs/trunk: LFS common/libs

[pierre]

Author: pierre
Date: Sun Jun 14 00:08:19 2020
New Revision: 4172

Log:
Update ICA for new LFS/master.sh

Modified:
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/common/libs/func_compare.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Thu Jun 11 13:43:33 2020(r4171)
+++ jhalfs/trunk/LFS/master.sh  Sun Jun 14 00:08:19 2020(r4172)
@@ -17,23 +17,49 @@
 # number:
   printf -v dir chapter%02d $1
 
-  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter $1${R_arrow}"
+# $2 contains the build number if rebuilding for ICA
+  if [[ -z "$2" ]] ; then
+local N=""
+  else
+local N=-build_$2
+local CHROOT_TGT=""
+mkdir ${dir}$N
+cp ${dir}/* ${dir}$N
+for script in ${dir}$N/* ; do
+  # Overwrite existing symlinks, files, and dirs
+  sed -e 's/ln *-sv//g' \
+  -e 's/mv *-v//g' \
+  -e 's/mkdir *-v//g' -i ${script}
+  # Rename the scripts
+  mv ${script} ${script}$N
+done
+# Remove Bzip2 binaries before make install (LFS-6.2 compatibility)
+sed -e 's@make install@rm -vf /usr/bin/bz*\n&@' -i ${dir}$N/*-bzip2$N
+# Remove openssl- from /usr/share/doc (LFS-9.x), because
+# otherwise the mv command creates an openssl directory.
+sed -e 's@mv -v@rm -rfv /usr/share/doc/openssl-*\n&@' \
+-i ${dir}$N/*-openssl$N
+  fi
+
+  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter $1$N${R_arrow}"
 
-  for file in $dir/* ; do
+  for file in ${dir}$N/* ; do
 # Keep the script file name
 this_script=`basename $file`
 
 # Some scripts need peculiar actions:
-# - glibc chap 5: ix locales creation when running chapter05 testsuites
+# - glibc chap 5: fix locales creation when running chapter05 testsuites
 # - Stripping at the end of system build: lfs.xsl does not generate
 #   correct commands if the user does not want to strip, so skip it
 #   in this case
+# - do not reinstall linux-headers when rebuilding
 # - grub config: must be done manually; skip it
 # - handle fstab and .config. Skip kernel if .config not supplied
 case "${this_script}" in
   5*glibc) [[ "${TEST}" = "3" ]] && \
sed -i 's@/usr/lib/locale@/tools/lib/locale@' $file ;;
   *strippingagain) [[ "${STRIP}" = "n" ]] && continue ;;
+  *linux-headers*) [[ -n "$N" ]] && continue ;;
   8*grub)  (( nb_chaps == 5 )) && continue ;;
   10*grub) continue ;;
   *fstab)  [[ -z "${FSTAB}" ]] ||
@@ -43,6 +69,24 @@
[[ ${CONFIG} == $BUILDDIR/sources/kernel-config ]] ||
cp ${CONFIG} $BUILDDIR/sources/kernel-config  ;;
 esac
+# Grab the name of the target
+name=`echo ${this_script} | sed -e 's@[0-9]\{3,4\}-@@' \
+-e 's@-pass[0-9]\{1\}@@' \
+-e 's@-libstdc++@@' \
+-e 's,'$N',,'`
+
+# 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
+# and revisedchroot, where .a and .la files are removed).
+pkg_tarball=$(sed -n 's/tar -xf \(.*\)/\1/p' $file)
+pkg_version=$(sed -n 's/VERSION=\(.*\)/\1/p' $file)
+
+if [[ "$pkg_tarball" = "" ]] && [[ -n "$N" ]] ; then
+  case "${this_script}" in
+*stripping*|*revised*) ;;
+*)  continue ;;
+  esac
+fi
 
 # Append the name of the script to a list. The name of the
 # list is contained in the variable Makefile_target. We adjust this
@@ -57,18 +101,9 @@
 esac
 eval $Makefile_target=\"\$$Makefile_target ${this_script}\"
 
-# Grab the name of the target
-name=`echo ${this_script} | sed -e 's@[0-9]\{3,4\}-@@' \
--e 's@-pass[0-9]\{1\}@@' \
--e 's@-libstdc++@@'`
-
 ##
 # >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<<  #
 ##
-#
-# Find the name of the tarball and the version of the package
-pkg_tarball=$(sed -n 's/tar -xf \(.*\)/\1/p' $file)
-pkg_version=$(sed -n 's/VERSION=\(.*\)/\1/p' $file)
 
 # Drop in the name of the target on a new line, and the previous target
 # as a dependency. Also call the echo_message function.
@@ -80,8 +115,10 @@
 # If $pkg_tarball isn't empty, we've got a package...
 if [ "$pkg_tarball" != "" ] ; then
   # Touch timestamp file if installed

[alfs-log] r4171 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Thu Jun 11 13:43:33 2020
New Revision: 4171

Log:
Fix the case of the kernel for otimization

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Thu Jun 11 06:59:59 2020(r4170)
+++ jhalfs/trunk/LFS/master.sh  Thu Jun 11 13:43:33 2020(r4171)
@@ -94,7 +94,7 @@
   # If using optimizations, write the instructions
   case "${OPTIMIZE}$1${nb_chaps}${this_script}${REALSBU}" in
   0* | *binutils-pass1y | 15* | 167* | 177*) ;;
-  *kernel) wrt_makeflags "$name" ;; # No CFLAGS for kernel
+  *kernel*) wrt_makeflags "$name" ;; # No CFLAGS for kernel
   *) wrt_optimize "$name" && wrt_makeflags "$name" ;;
   esac
 fi
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4170 - jhalfs/trunk/common

[pierre]

Author: pierre
Date: Thu Jun 11 06:59:59 2020
New Revision: 4170

Log:
Fix sbu-du calculations for the new numbering

Modified:
   jhalfs/trunk/common/create-sbu_du-report.sh

Modified: jhalfs/trunk/common/create-sbu_du-report.sh
==
--- jhalfs/trunk/common/create-sbu_du-report.sh Thu Jun 11 01:22:20 2020
(r4169)
+++ jhalfs/trunk/common/create-sbu_du-report.sh Thu Jun 11 06:59:59 2020
(r4170)
@@ -50,13 +50,15 @@
 free >> "$REPORT"
 
 # Parse only that logs that have time data
-BUILDLOGS="`grep -l "^Totalseconds:" ${LOGSDIR}/*`"
+pushd ${LOGSDIR}
+BUILDLOGS="`grep -l "^Totalseconds:" * | sort -n`"
 
 # Match the first timed log to extract the SBU unit value from it
-FIRSTLOG=`grep -l "^Totalseconds:" $LOGSDIR/* | head -n1`
-BASELOG=`grep -l "^Totalseconds:" $LOGSDIR/???-binutils* | head -n1`
+FIRSTLOG=`grep -l "^Totalseconds:" * | sort -n | head -n1`
+BASELOG=`grep -l "^Totalseconds:" ???-binutils* | head -n1`
 echo -e "\nUsing ${BASELOG#*[[:digit:]]-} to obtain the SBU unit value."
 SBU_UNIT=`sed -n 's/^Totalseconds:\s\([[:digit:]]*\)$/\1/p' $BASELOG`
+popd
 echo -e "\nThe SBU unit value is equal to $SBU_UNIT seconds.\n"
 echo -e "\n\n$LINE\n\nThe SBU unit value is equal to $SBU_UNIT seconds.\n" >> 
"$REPORT"
 
@@ -73,7 +75,7 @@
 
 # Start SBU calculation
 # Build time
-  TIME=`sed -n 's/^Totalseconds:\s\([[:digit:]]*\)$/\1/p' $log`
+  TIME=`sed -n 's/^Totalseconds:\s\([[:digit:]]*\)$/\1/p' ${LOGSDIR}/$log`
   SECS=`perl -e 'print ('$TIME' % '60')';`
   MINUTES=`perl -e 'printf "%.0f" , (('$TIME' - '$SECS') / '60')';`
   SBU=`perl -e 'printf "%.1f" , ('$TIME' / '$SBU_UNIT')';`
@@ -83,10 +85,10 @@
 
 # Start disk usage calculation
 # Disk usage before unpacking the package
-  DU1=`grep "^KB: " $log | head -n1 | cut -f1 | sed -e 's/KB: //'`
+  DU1=`grep "^KB: " ${LOGSDIR}/$log | head -n1 | cut -f1 | sed -e 's/KB: //'`
   DU1MB=`perl -e 'printf "%.3f" , ('$DU1' / '1024')';`
 # Disk usage before deleting the source and build dirs
-  DU2=`grep "^KB: " $log | tail -n1 | cut -f1 | sed -e 's/KB: //'`
+  DU2=`grep "^KB: " ${LOGSDIR}/$log | tail -n1 | cut -f1 | sed -e 's/KB: //'`
   DU2MB=`perl -e 'printf "%.3f" , ('$DU2' / '1024')';`
 # Calculate disk space required to do the build
   REQUIRED1=`perl -e 'print ('$DU2' - '$DU1')';`
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4169 - jhalfs/trunk/common/libs

[pierre]

Author: pierre
Date: Thu Jun 11 01:22:20 2020
New Revision: 4169

Log:
Fix the save-ch5 target

Modified:
   jhalfs/trunk/common/libs/func_save.sh

Modified: jhalfs/trunk/common/libs/func_save.sh
==
--- jhalfs/trunk/common/libs/func_save.sh   Wed Jun 10 13:58:33 2020
(r4168)
+++ jhalfs/trunk/common/libs/func_save.sh   Thu Jun 11 01:22:20 2020
(r4169)
@@ -6,8 +6,8 @@
 
 local target
 case $1 in
-runasroot) target=SUDO ;;
-chapter6 ) target=CHROOT ;;
+SUDO_TGT   ) target=SUDO ;;
+CHROOT_TGT ) target=CHROOT ;;
 esac
 CHROOT_wrt_target save-ch5 "$PREV";
 wrt_save_work $target
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4168 - jhalfs/trunk

[pierre]

Author: pierre
Date: Wed Jun 10 13:58:33 2020
New Revision: 4168

Log:
Fix detection of the cross2 branch

Modified:
   jhalfs/trunk/jhalfs

Modified: jhalfs/trunk/jhalfs
==
--- jhalfs/trunk/jhalfs Wed Jun 10 13:01:17 2020(r4167)
+++ jhalfs/trunk/jhalfs Wed Jun 10 13:58:33 2020(r4168)
@@ -458,7 +458,7 @@
 # the position of gcc-pass2 (chapter 6 or 5) tells us (not valid for
 # cross-chap5 branch).
   if (( TEST == 3 )) && \
- [ -f "$JHALFSDIR/${PROGNAME}-commands/chapter06/gcc-pass2.xml" ]; then
+ [ -f "$BOOK/chapter06/gcc-pass2.xml" ]; then
 TEST=2
   fi
   extract_commands
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4167 - in jhalfs/trunk: . LFS common/libs

[pierre]

Author: pierre
Date: Wed Jun 10 13:01:17 2020
New Revision: 4167

Log:
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!

Modified:
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/common/libs/func_book_parser
   jhalfs/trunk/jhalfs

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Tue Jun  9 00:28:05 2020(r4166)
+++ jhalfs/trunk/LFS/master.sh  Wed Jun 10 13:01:17 2020(r4167)
@@ -10,53 +10,97 @@
 #
 
 
-##
-chapter4_Makefiles() {   #
-##
-  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter4 ( SETUP ) 
${R_arrow}"
-  # Ensure the first dependency is empty
-  unset PREV
+#-#
+chapter_targets() {   #
+#-#
+# $1 is the chapter number. Pad it with 0 to the left to obtain a 2-digit
+# number:
+  printf -v dir chapter%02d $1
+
+  echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter $1${R_arrow}"
 
-  for file in chapter04/* ; do
+  for file in $dir/* ; do
 # Keep the script file name
 this_script=`basename $file`
 
-# First append each name of the script files to a list (this will become
-# the names of the targets in the Makefile
-# DO NOT append the settingenvironment script, it need be run as luser.
-# A hack is necessary: create script in chap4 BUT run as a dependency for
-# LUSER target
+# Some scripts need peculiar actions:
+# - glibc chap 5: ix locales creation when running chapter05 testsuites
+# - Stripping at the end of system build: lfs.xsl does not generate
+#   correct commands if the user does not want to strip, so skip it
+#   in this case
+# - grub config: must be done manually; skip it
+# - handle fstab and .config. Skip kernel if .config not supplied
+case "${this_script}" in
+  5*glibc) [[ "${TEST}" = "3" ]] && \
+   sed -i 's@/usr/lib/locale@/tools/lib/locale@' $file ;;
+  *strippingagain) [[ "${STRIP}" = "n" ]] && continue ;;
+  8*grub)  (( nb_chaps == 5 )) && continue ;;
+  10*grub) continue ;;
+  *fstab)  [[ -z "${FSTAB}" ]] ||
+   [[ ${FSTAB} == $BUILDDIR/sources/fstab ]] ||
+   cp ${FSTAB} $BUILDDIR/sources/fstab ;;
+  *kernel) [[ -z ${CONFIG} ]] && continue
+   [[ ${CONFIG} == $BUILDDIR/sources/kernel-config ]] ||
+   cp ${CONFIG} $BUILDDIR/sources/kernel-config  ;;
+esac
+
+# Append the name of the script to a list. The name of the
+# list is contained in the variable Makefile_target. We adjust this
+# variable at various points. Note that it is initialized to "SETUP"
+# in the main function, before calling this function for the first time.
 case "${this_script}" in
-  *settingenvironment) chapter5="$chapter5 ${this_script}" ;;
-*) chapter4="$chapter4 ${this_script}" ;;
+  *settingenvironment) Makefile_target=LUSER_TGT  ;;
+  *changingowner ) Makefile_target=SUDO_TGT   ;;
+  *creatingdirs  ) Makefile_target=CHROOT_TGT ;;
+  *bootscripts   ) Makefile_target=BOOT_TGT   ;; # case of sysvbook
+  *network   ) Makefile_target=BOOT_TGT   ;; # case of systemd book
 esac
+eval $Makefile_target=\"\$$Makefile_target ${this_script}\"
 
 # Grab the name of the target
-name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'`
+name=`echo ${this_script} | sed -e 's@[0-9]\{3,4\}-@@' \
+-e 's@-pass[0-9]\{1\}@@' \
+-e 's@-libstdc++@@'`
 
 ##
 # >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<<  #
 ##
 #
+# Find the name of the tarball and the version of the package
+pkg_tarball=$(sed -n 's/tar -xf \(.*\)/\1/p' $file)
+pkg_version=$(sed -n 's/VERSION=\(.*\)/\1/p' $file)
 
 # Drop in the name of the target on a new line, and the previous target
 # as a dependency. Also call the echo_message function.
-LUSER_wrt_target "${this_script}" "$PREV"
+case $Makefile_target in
+  CHROOT_TGT)  CHROOT_wrt_target "${this_script}" "$PREV" "$pkg_version" ;;
+  *)LUSER_wrt_target "${this_script}" "$PREV" "$pkg_version" ;;

[alfs-log] r4166 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Tue Jun  9 00:28:05 2020
New Revision: 4166

Log:
Fix lfs.xsl for cross2, and change scriptlet numbering for trunk and cross2

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslFri Jun  5 03:18:27 2020(r4165)
+++ jhalfs/trunk/LFS/lfs.xslTue Jun  9 00:28:05 2020(r4166)
@@ -102,35 +102,40 @@
   
 
   
+
+
   
-
+
   
 
-  
-
-
-
-
-  
-  
-  
-  
+  
+
+  
+
+
+
+
+
+

 
 
@@ -138,32 +143,29 @@
 
 
 
-  
-
-  00
-  
-
-
-  0
-  
-
-
-  
-
-  
+  
+  
+0
+  
+  
 
 
-
+
   
+
select="document('packageManager.xml')//sect1[contains(@id,'ch-tools')]"
+mode="pkgmngt">
 
 
   
 
-
+
   
 
 
@@ -214,7 +216,6 @@
   
   exit
 
-
   
 
   
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4165 - in jhalfs/trunk: . common optimize optimize/opt_config.d

[pierre]

Author: pierre
Date: Fri Jun  5 03:18:27 2020
New Revision: 4165

Log:
Use a private name for MAKEFLAGS in jhalfs, so that it does not propagate
to top make, when ticking "Run the makefile"

Modified:
   jhalfs/trunk/common/common-functions
   jhalfs/trunk/jhalfs
   jhalfs/trunk/optimize/opt_config.d/noOpt
   jhalfs/trunk/optimize/optimize_functions

Modified: jhalfs/trunk/common/common-functions
==
--- jhalfs/trunk/common/common-functionsSun May 31 01:58:41 2020
(r4164)
+++ jhalfs/trunk/common/common-functionsFri Jun  5 03:18:27 2020
(r4165)
@@ -36,8 +36,10 @@
 # Build the system
 if [ -e "$MKFILE" ] ; then
   echo -ne "Building the system...\n"
+  if { echo try tty; tty; }; then
   cd "$JHALFSDIR" && make
   echo -ne "done\n"
+  else echo there is no terminal!!; fi
 fi
   fi
 }

Modified: jhalfs/trunk/jhalfs
==
--- jhalfs/trunk/jhalfs Sun May 31 01:58:41 2020(r4164)
+++ jhalfs/trunk/jhalfs Fri Jun  5 03:18:27 2020(r4165)
@@ -368,7 +368,7 @@
   load_file optimize/opt_config 'Loading optimization config'
   # The number of parallel jobs is taken from configuration now
   # shellcheck disable=SC2034
-  MAKEFLAGS="-j${N_PARALLEL}"
+  JH_MAKEFLAGS="-j${N_PARALLEL}"
   # Validate optimize settings, if required
   validate_opt_settings
 fi

Modified: jhalfs/trunk/optimize/opt_config.d/noOpt
==
--- jhalfs/trunk/optimize/opt_config.d/noOptSun May 31 01:58:41 2020
(r4164)
+++ jhalfs/trunk/optimize/opt_config.d/noOptFri Jun  5 03:18:27 2020
(r4165)
@@ -9,9 +9,6 @@
 #  doing.  By default, this is set to disable optimization
 #  of packages known to have build or runtime failure.
 #
-#  Also, if you what to use MAKEFLAGS but no build
-#  optimizations, set this mode in DEF_OPT_MODE
-#
 # Usage: - Apply optimization string to each variable
 #- "unset" will cause the variable to be not set
 #  instead of being just set to null.

Modified: jhalfs/trunk/optimize/optimize_functions
==
--- jhalfs/trunk/optimize/optimize_functionsSun May 31 01:58:41 2020
(r4164)
+++ jhalfs/trunk/optimize/optimize_functionsFri Jun  5 03:18:27 2020
(r4165)
@@ -18,9 +18,8 @@
   echo -e "expected, please rebuild without optimizations before"
   echo -e "asking for support.${OFF}\n"
 
-  echo -e "MAKEFLAGS: ${L_arrow}${BOLD}${MAKEFLAGS}${OFF}${R_arrow}"
-  [[ "$MAKEFLAGS" = "unset" ]] && echo
-  [[ "$MAKEFLAGS" != "unset" ]] && \
+  echo -e "MAKEFLAGS: ${L_arrow}${BOLD}${JH_MAKEFLAGS}${OFF}${R_arrow}"
+  [ -n "$JH_MAKEFLAGS" ] && \
   echo -e "BLACK_LIST: ${L_arrow}${BOLD}${BLACK_LIST}${OFF}${R_arrow}\n"
 
   echo -e "DEF_OPT_MODE: ${L_arrow}${BOLD}${DEF_OPT_MODE}${OFF}${R_arrow}\n"
@@ -78,13 +77,13 @@
   if [[ "$BLACK_LIST" =~ ${pkg} ]]; then
 MKF=unset
   else
-MKF=$MAKEFLAGS
+MKF=$JH_MAKEFLAGS
   fi
 
   if [[ "$MKF" != "unset" ]]; then
 (
 cat << EOF
-   @echo "export MAKEFLAGS=\"$MAKEFLAGS\"" >> envars
+   @echo "export MAKEFLAGS=\"$JH_MAKEFLAGS\"" >> envars
 EOF
 ) >> $MKFILE.tmp
   fi
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4164 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sun May 31 01:58:41 2020
New Revision: 4164

Log:
Fix an issue in ck_terminal, which was working only by chance (compensating
bugs) on some setup (but not all)

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Sun May 31 00:31:32 2020(r4163)
+++ jhalfs/trunk/LFS/master.sh  Sun May 31 01:58:41 2020(r4164)
@@ -535,14 +535,14 @@
fi
 
 ck_terminal:
-   @stty size | read LINES COLUMNS; \\
-   if (( LINES < 24 )) || (( COLUMNS < 80 )) ; then \\
+   @stty size | ( read L C; \\
+   if (( L < 24 )) || (( C < 80 )) ; then \\
  echo "--"; \\
- echo "Terminal too small: \$\$COLUMNS columns x \$\$LINES lines";\\
+ echo "Terminal too small: \$\$C columns x \$\$L lines";\\
  echo "Minimum: 80 columns x 24 lines";\\
  echo "--"; \\
  exit 1; \\
-   fi
+   fi )
 
 mk_SETUP:
@\$(call echo_SU_request)
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4163 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sun May 31 00:31:32 2020
New Revision: 4163

Log:
Allows having << EOF in tests, and not generating >> $TEST_LOG... until the
matching EOF is found.

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslSun May 24 23:47:48 2020(r4162)
+++ jhalfs/trunk/LFS/lfs.xslSun May 31 00:31:32 2020(r4163)
@@ -1080,16 +1080,31 @@
 
   
 
+
 
   
 
   
+  
 
-
-  
-
+
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+
   
   
 
 
-  $TEST_LOG 21 || 
true
+
+$TEST_LOG 21 || true
+
+
   
   
 
 make -k
 
-  $TEST_LOG 21 || 
true
+
+$TEST_LOG 21 || true
+
+
   
   
 
 
-$TEST_LOG 21
+$TEST_LOG 21 || true
 
 
   
@@ -1133,11 +1155,15 @@
 
   
 
-  $TEST_LOG 21 || 
true
+
+$TEST_LOG 21 || true
+
+
   
   
 
 
 $TEST_LOG 21
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4162 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sun May 24 23:47:48 2020
New Revision: 4162

Log:
Check terminal size before starting build

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Thu May 21 22:03:40 2020(r4161)
+++ jhalfs/trunk/LFS/master.sh  Sun May 24 23:47:48 2020(r4162)
@@ -491,7 +491,7 @@
 (
 cat << EOF
 
-all:   ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report 
mk_BLFS_TOOL mk_CUSTOM_TOOLS
+all:   ck_UID ck_terminal mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT 
create-sbu_du-report mk_BLFS_TOOL mk_CUSTOM_TOOLS
 $teardownat
@sudo make do_housekeeping
 EOF
@@ -533,6 +533,16 @@
  echo "--"; \\
  exit 1; \\
fi
+
+ck_terminal:
+   @stty size | read LINES COLUMNS; \\
+   if (( LINES < 24 )) || (( COLUMNS < 80 )) ; then \\
+ echo "--"; \\
+ echo "Terminal too small: \$\$COLUMNS columns x \$\$LINES lines";\\
+ echo "Minimum: 80 columns x 24 lines";\\
+ echo "--"; \\
+ exit 1; \\
+   fi
 
 mk_SETUP:
@\$(call echo_SU_request)
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4161 - jhalfs/trunk/BLFS

[pierre]

Author: pierre
Date: Thu May 21 22:03:40 2020
New Revision: 4161

Log:
Fix update-lfs.sh (missing continuation character in a case statement

Modified:
   jhalfs/trunk/BLFS/update-lfs.sh

Modified: jhalfs/trunk/BLFS/update-lfs.sh
==
--- jhalfs/trunk/BLFS/update-lfs.sh Mon May 18 01:31:43 2020(r4160)
+++ jhalfs/trunk/BLFS/update-lfs.sh Thu May 21 22:03:40 2020(r4161)
@@ -99,7 +99,7 @@
   sed 's/.*>\([^<]*\)<.*/\1/' |
   sort | uniq); do
 case "x$pack" in
-xtcl | xexpect | xdejagnu | xgcc* | *pass[12] | xvim |
+xtcl | xexpect | xdejagnu | xgcc* | *pass[12] | xvim | \
 xshadow | xPython | xlinux-headers | xdbus | xsystemd )
continue ;;
 esac
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4160 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Mon May 18 01:31:43 2020
New Revision: 4160

Log:
Add -j1 to "make install" in the
lfs book (done long ago in blfs)

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslFri May  8 01:22:55 2020(r4159)
+++ jhalfs/trunk/LFS/lfs.xslMon May 18 01:31:43 2020(r4160)
@@ -442,6 +442,7 @@
   
 
 
+
   
+
+make -j1 
+
+
+  
   
 
 
@@ -499,7 +506,7 @@
 
   
 
-   
+   
   
   
@@ -546,6 +553,21 @@
 
   
   
+  
+  
+
+  
+
+make -j1 
+
+  
+  
+
+  
+
+
+  
   
   
 
@@ -913,34 +935,34 @@
  install
 
 
- make PREFIX=$PKG_DEST/usr install
+ make -j1 PREFIX=$PKG_DEST/usr install
 
 
-  make BINDIR=$PKG_DEST/sbin prefix=$PKG_DEST install
+  make -j1 BINDIR=$PKG_DEST/sbin prefix=$PKG_DEST 
install
 
 
- make DESTDIR=$PKG_DEST DOCDIR=
+ make -j1 DESTDIR=$PKG_DEST DOCDIR=
  
  install
 
 
- make ROOT=$PKG_DEST
+ make -j1 ROOT=$PKG_DEST
  
  install
 
 
- make INSTALL_MOD_PATH=$PKG_DEST
+ make -j1 INSTALL_MOD_PATH=$PKG_DEST
  
  install
 
 
-  make DESTDIR=$PKG_DEST
+  make -j1 DESTDIR=$PKG_DEST
   
 http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4159 - jhalfs/trunk/common/libs

[pierre]

Author: pierre
Date: Fri May  8 01:22:55 2020
New Revision: 4159

Log:
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.

Modified:
   jhalfs/trunk/common/libs/func_install_blfs

Modified: jhalfs/trunk/common/libs/func_install_blfs
==
--- jhalfs/trunk/common/libs/func_install_blfs  Fri May  1 12:36:10 2020
(r4158)
+++ jhalfs/trunk/common/libs/func_install_blfs  Fri May  8 01:22:55 2020
(r4159)
@@ -61,6 +61,10 @@
   SVN=$SVN_2/BLFS/$BLFS_TREE \
   $BUILDDIR$BLFS_ROOT/packages.xml
 
+# But then $BUILDDIR/var/lib/ is owned by root if just created, which
+# prevents $LUSER to create "nss_db". Change ownership here
+sudo chown $LUSER:$LGROUP $BUILDDIR/var/lib
+
 # Because the BLFS Makefile is supposed to be used in chroot (or booted)
 # mode, the tracking file has wrong path for DTD. Change it:
 sudo sed -i s@$BUILDDIR@@ $BUILDDIR$TRACKING_DIR/instpkg.xml
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4158 - jhalfs/trunk/common/libs

[pierre]

Author: pierre
Date: Fri May  1 12:36:10 2020
New Revision: 4158

Log:
Add a missing file for saving chapter 5 work

Added:
   jhalfs/trunk/common/libs/func_save.sh

Added: jhalfs/trunk/common/libs/func_save.sh
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ jhalfs/trunk/common/libs/func_save.sh   Fri May  1 12:36:10 2020
(r4158)
@@ -0,0 +1,85 @@
+# $Id: func_compare.sh 3824 2015-03-07 22:05:24Z pierre $
+
+#--#
+wrt_save_target() {#
+#--#
+
+local target
+case $1 in
+runasroot) target=SUDO ;;
+chapter6 ) target=CHROOT ;;
+esac
+CHROOT_wrt_target save-ch5 "$PREV";
+wrt_save_work $target
+wrt_touch
+PREV=save-ch5
+eval $1=\"\$$1 save-ch5\"
+}
+
+#--#
+wrt_save_work() {   #
+#--#
+  localROOT_DIR
+  case x"$1" in
+  xSUDO  ) ROOT_DIR="$BUILDDIR/" ;;
+  xCHROOT) ROOT_DIR=/  ;;
+  esac
+
+  local PRUNEPATH="./dev ./home ./lost+found ./media ./mnt ./opt ./proc ./root 
./run ./srv ./sys ./tmp ./var"
+  local DEST_TOPDIR="${ROOT_DIR}${SCRIPT_ROOT}"
+
+(
+cat << EOF
+   @mkdir -p /tmp >>logs/\$@ 2>&1 && \\
+   TARNAME=chapter5-\$\$(date -Iseconds).tar && \\
+TMPFILE=\$\$(mktemp -p /tmp) && \\
+TMPLOG=\$\$(mktemp -p /tmp) && \\
+   for F in $PRUNEPATH; do echo \$\$F >> \$\$TMPFILE; done && \\
+   tar -X \$\$TMPFILE -cvf /tmp/\$\$TARNAME -C ${ROOT_DIR} . >>\$\$TMPLOG 
2>>logs/\$@ && \\
+   cat \$\$TMPLOG >>logs/\$@ 2>&1 && \\
+   mv /tmp/\$\$TARNAME $DEST_TOPDIR >>logs/\$@ 2>&1 && \\
+   rm \$\$TMPFILE \$\$TMPLOG
+EOF
+) >> $MKFILE.tmp
+
+}
+
+#--#
+wrt_do_ica_work() {#
+#--#
+  echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3 >>logs/\$@ 2>&1" >> 
$MKFILE.tmp
+}
+
+#--#
+wrt_logs() {   #
+#--#
+  local build=build_$1
+  local file
+
+(
+cat << EOF
+   @cd logs && \\
+   mkdir $build && \\
+   mv -f `echo ${system_build} | sed 's/ /* /g'`* $build && \\
+   if [ ! $build = build_1 ] ; then \\
+ cd $build && \\
+ for file in \`ls .\` ; do \\
+   mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\
+ done ; \\
+   fi
+   @cd /\$(SCRIPT_ROOT)
+   @if [ -d test-logs ] ; then \\
+ cd test-logs && \\
+ mkdir $build && \\
+ mv -f `echo ${system_build} | sed 's/ /* /g'`* $build && \\
+ if [ ! $build = build_1 ] ; then \\
+   cd $build && \\
+   for file in \`ls .\` ; do \\
+ mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\
+   done ; \\
+ fi ; \\
+ cd /\$(SCRIPT_ROOT) ; \\
+   fi ;
+EOF
+) >> $MKFILE.tmp
+}
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4157 - in jhalfs/trunk: . LFS common/libs

[pierre]

Author: pierre
Date: Fri May  1 07:24:32 2020
New Revision: 4157

Log:
Add code to save work at the end of chapter 5
(and finish the rebuild-makefile change)

Modified:
   jhalfs/trunk/Config.in
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/common/libs/func_compare.sh
   jhalfs/trunk/common/libs/func_validate_configs.sh
   jhalfs/trunk/jhalfs

Modified: jhalfs/trunk/Config.in
==
--- jhalfs/trunk/Config.in  Fri May  1 07:20:45 2020(r4156)
+++ jhalfs/trunk/Config.in  Fri May  1 07:24:32 2020(r4157)
@@ -1077,12 +1077,23 @@
 endmenu#--- System configuration
 
 menu "Advanced Features"
-depends on !BOOK_BLFS
+depends on !BOOK_BLFS && !REBUILD_MAKEFILE
 
 configREPORT
 bool "Create SBU and disk usage report"
 default y
 
+configSAVE_CH5
+bool "Save Chapter 5 work"
+depends on BOOK_LFS || BOOK_LFS_SYSD
+default n
+help
+Save the state of jhalfs at the end of chapter 5:
+
+if you tick this item, the whole $LFS directory is
+saved when chapter 5 is finished. It'll be in an xz
+compressed tarball in the $LFS/jhalfs directory
+
 #--- ICA
 configCOMPARE
 bool "Run comparison analysis on final stage"

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Fri May  1 07:20:45 2020(r4156)
+++ jhalfs/trunk/LFS/master.sh  Fri May  1 07:24:32 2020(r4157)
@@ -100,7 +100,7 @@
 # Initialize the Makefile target: it'll change during chapter
 # For vanilla lfs, the "changingowner" script should be run as root. So
 # it belongs to the "SUDO" target, with list in the "runasroot" variable.
-# For new lfs, changingowner and kernfs are in "runsaroot", then the following,
+# For new lfs, changingowner and kernfs are in "runasroot", then the following,
 # starting at creatingdirs, are in the "CHROOT" target, in variable "chapter6".
 # Makefile_target records the variable, not really the target!
 # We use a case statement on that variable, because instructions in the
@@ -441,6 +441,8 @@
 
   chapter4_Makefiles
   chapter5_Makefiles
+  # Add the save target, if needed
+  [[ "$SAVE_CH5" = "y" ]] && wrt_save_target $Makefile_target
   chapter6_Makefiles
   # Add the iterations targets, if needed
   [[ "$COMPARE" = "y" ]] && wrt_compare_targets

Modified: jhalfs/trunk/common/libs/func_compare.sh
==
--- jhalfs/trunk/common/libs/func_compare.shFri May  1 07:20:45 2020
(r4156)
+++ jhalfs/trunk/common/libs/func_compare.shFri May  1 07:24:32 2020
(r4157)
@@ -53,7 +53,7 @@
   local ITERATION=$1
   local   PREV_IT=$2
   local PRUNEPATH="/dev /home /${SCRIPT_ROOT} /lost+found /media /mnt /opt 
/proc \
-/sources /root /srv /sys /tmp /tools /usr/local /usr/src"
+/sources /root /run /srv /sys /tmp /tools /usr/local /usr/src /var"
 
   localROOT_DIR=/
   local DEST_TOPDIR=/${SCRIPT_ROOT}

Modified: jhalfs/trunk/common/libs/func_validate_configs.sh
==
--- jhalfs/trunk/common/libs/func_validate_configs.sh   Fri May  1 07:20:45 
2020(r4156)
+++ jhalfs/trunk/common/libs/func_validate_configs.sh   Fri May  1 07:24:32 
2020(r4157)
@@ -51,7 +51,7 @@
   local -r LFS_system="HOSTNAME INTERFACE IP_ADDR GATEWAY PREFIX BROADCAST 
DOMAIN DNS1 DNS2 FONT KEYMAP LOCAL LOG_LEVEL"
 
   # Full list of books settings
-  local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build 
$LFS_system  $ADVANCED_chroot REALSBU $ADVANCED_common"
+  local -r   lfs_PARAM_LIST="$LFS_book   $GENERAL_common $LFS_build 
$LFS_system  $ADVANCED_chroot REALSBU SAVE_CH5 $ADVANCED_common"
   local -r  hlfs_PARAM_LIST="$HLFS_book  $GENERAL_common $HLFS_build  
$ADVANCED_chroot $ADVANCED_common"
   local -r  clfs_PARAM_LIST="$CLFS_book  $GENERAL_common $CLFS_build  
$ADVANCED_chroot $ADVANCED_common"
   local -r clfs2_PARAM_LIST="$CLFS2_book $GENERAL_common $CLFS2_build  
$ADVANCED_common"

Modified: jhalfs/trunk/jhalfs
==
--- jhalfs/trunk/jhalfs Fri May  1 07:20:45 2020(r4156)
+++ jhalfs/trunk/jhalfs Fri May  1 07:24:32 2020(r4157)
@@ -178,6 +178,7 @@
 UNICODE=${UNICODE:=n}
 LOCAL=${LOCAL:=n}
 REALSBU=${REALSBU:=n}
+SAVE_CH5=${SAVE_CH5:=n}
 
 if [[ "${NO_PROGRESS_BAR}" = "y" ]] ; then
 # shellcheck disable=SC2034
@@ -354,6 +355,11 @@
   load_file "${COMMON_DIR}

[alfs-log] r4156 - jhalfs/trunk

[pierre]

Author: pierre
Date: Fri May  1 07:20:45 2020
New Revision: 4156

Log:
Make "Rebuild Makefile" disable all the other options:
This prevents users from using it without setting a build first

Modified:
   jhalfs/trunk/Config.in

Modified: jhalfs/trunk/Config.in
==
--- jhalfs/trunk/Config.in  Fri Apr 10 03:16:41 2020(r4155)
+++ jhalfs/trunk/Config.in  Fri May  1 07:20:45 2020(r4156)
@@ -1,6 +1,8 @@
 # $Id$
 menu "BOOK Settings"
 
+depends on !REBUILD_MAKEFILE
+
 #--- BOOK/script
 choice
 prompt "Use BOOK"
@@ -630,7 +632,7 @@
 endmenu
 
 menu "General Settings"
-depends on !BOOK_BLFS
+depends on !BOOK_BLFS && !REBUILD_MAKEFILE
 
 #--- {C,H,}LFS User Account
 
@@ -729,7 +731,7 @@
 endmenu
 
 menu "Build Settings"
-depends on !BOOK_BLFS
+depends on !BOOK_BLFS && !REBUILD_MAKEFILE
 
 #--- Test Suites
 configCONFIG_TESTS
@@ -888,7 +890,7 @@
 endmenu
 
 menu "System configuration"
-depends on !BOOK_BLFS
+depends on !BOOK_BLFS && !REBUILD_MAKEFILE
 
 #--- FSTAB
 configHAVE_FSTAB
@@ -1229,7 +1231,7 @@
 endmenu
 
 config REBUILD_MAKEFILE
-depends on !BOOK_BLFS
+#depends on !BOOK_BLFS
 bool "Rebuild the Makefile (see help)"
 default n
 help
@@ -1239,4 +1241,6 @@
 #   customizing the base system build scripts.
 #
 #   See README.CUSTOM for more info about this feature.
-
+#   Note that you should do that after configuring a jhalfs
+#   build, and only if you need changing the build scripts order
+#   or add a new one.
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4155 - jhalfs/trunk/common/libs

[pierre]

Author: pierre
Date: Fri Apr 10 03:16:41 2020
New Revision: 4155

Log:
remove the __pycache__ dirs from comparison analysis

Modified:
   jhalfs/trunk/common/libs/func_compare.sh

Modified: jhalfs/trunk/common/libs/func_compare.sh
==
--- jhalfs/trunk/common/libs/func_compare.shWed Apr  8 01:37:54 2020
(r4154)
+++ jhalfs/trunk/common/libs/func_compare.shFri Apr 10 03:16:41 2020
(r4155)
@@ -61,9 +61,11 @@
 
   if [[ "$RUN_ICA" = "y" ]] ; then
 local DEST_ICA=$DEST_TOPDIR/ICA && \
+  # the PRUNEPATH additional setting is to avoid .pyc files to show up in diff
 (
 cat << EOF
-   @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_ICA/$ITERATION 
>>logs/\$@ 2>&1 && \\
+   @PRUNEPATH="$PRUNEPATH \$\$(find /usr/lib -name __pycache__)"; \\
+   extras/do_copy_files "\$\$PRUNEPATH" $ROOT_DIR $DEST_ICA/$ITERATION 
>>logs/\$@ 2>&1 && \\
extras/do_ica_prep $DEST_ICA/$ITERATION >>logs/\$@ 2>&1
 EOF
 ) >> $MKFILE.tmp
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4154 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Wed Apr  8 01:37:54 2020
New Revision: 4154

Log:
Run "Cleaning up" page in ICA iterations too: it allows to remove .la and some 
.a
files

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Tue Apr  7 10:08:30 2020(r4153)
+++ jhalfs/trunk/LFS/master.sh  Wed Apr  8 01:37:54 2020(r4154)
@@ -250,13 +250,14 @@
 name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@' -e 's,'$N',,'`
 
 # Find the tarball corresponding to our script.
-# If it doesn't exist, we skip it in iterations rebuilds (except 
stripping).
+# If it doesn't exist, we skip it in iterations rebuilds (except stripping
+# and revisedchroot, where .a and .la files are removed).
 pkg_tarball=$(sed -n 's/tar -xf \(.*\)/\1/p' $file)
 pkg_version=$(sed -n 's/VERSION=\(.*\)/\1/p' $file)
 
 if [[ "$pkg_tarball" = "" ]] && [[ -n "$N" ]] ; then
   case "${this_script}" in
-*stripping*) ;;
+*stripping*|*revised*) ;;
 *)  continue ;;
   esac
 fi
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4153 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Tue Apr  7 10:08:30 2020
New Revision: 4153

Log:
Remove the /usr/share/doc/openssl- dir before renaming
/usr/share/doc/openssl, otherwise it moves it as a subdirectory

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Thu Apr  2 04:54:50 2020(r4152)
+++ jhalfs/trunk/LFS/master.sh  Tue Apr  7 10:08:30 2020(r4153)
@@ -215,6 +215,10 @@
 done
 # Remove Bzip2 binaries before make install (LFS-6.2 compatibility)
 sed -e 's@make install@rm -vf /usr/bin/bz*\n&@' -i chapter06$N/*-bzip2$N
+# Remove openssl- from /usr/share/doc (LFS-9.x), because
+# otherwise the mv command creates an openssl directory.
+sed -e 's@mv -v@rm -rfv /usr/share/doc/openssl-*\n&@' \
+-i chapter06$N/*-openssl$N
   fi
 
   echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter6$N ( CHROOT ) 
${R_arrow}"
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4152 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Thu Apr  2 04:54:50 2020
New Revision: 4152

Log:
Further fix user creation (or no)

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Thu Apr  2 04:46:36 2020(r4151)
+++ jhalfs/trunk/LFS/master.sh  Thu Apr  2 04:54:50 2020(r4152)
@@ -627,7 +627,7 @@
 
 save-luser:
@\$(call echo_message, Building)
-   @LUSER_ID=\$(grep '^\$(LUSER):' /etc/passwd | cut -d: -f3); \\
+   @LUSER_ID=\$\$(grep '^\$(LUSER):' /etc/passwd | cut -d: -f3); \\
if [ -n "\$\$LUSER_ID" ]; then  \\
if [ ! -d \$(LUSER_HOME).XXX ]; then \\
mv \$(LUSER_HOME){,.XXX}; \\
@@ -637,7 +637,7 @@
echo "\$\$LUSER_ID" > luser-id; \\
echo User \$(LUSER) exists with ID \$\$LUSER_ID; \\
else \\
-   rm luser-id; \\
+   rm -f luser-id; \\
echo User \$(LUSER) does not exist; \\
echo It will be created with book instructions.; \\
fi
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4151 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Thu Apr  2 04:46:36 2020
New Revision: 4151

Log:
Fix LUSER creation (or no creation).

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Thu Apr  2 02:56:51 2020(r4150)
+++ jhalfs/trunk/LFS/master.sh  Thu Apr  2 04:46:36 2020(r4151)
@@ -528,8 +528,8 @@
fi
 
 mk_SETUP:
-   @sudo make save-luser
@\$(call echo_SU_request)
+   @sudo make save-luser
@sudo make BREAKPOINT=\$(BREAKPOINT) SETUP
@touch \$@
 
@@ -628,15 +628,18 @@
 save-luser:
@\$(call echo_message, Building)
@LUSER_ID=\$(grep '^\$(LUSER):' /etc/passwd | cut -d: -f3); \\
-   if [ -n "\$LUSER_ID" ]; then  \\
+   if [ -n "\$\$LUSER_ID" ]; then  \\
if [ ! -d \$(LUSER_HOME).XXX ]; then \\
mv \$(LUSER_HOME){,.XXX}; \\
mkdir \$(LUSER_HOME); \\
chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME); \\
-   echo "\$LUSER_ID" > luser-id; \\
fi; \\
+   echo "\$\$LUSER_ID" > luser-id; \\
+   echo User \$(LUSER) exists with ID \$\$LUSER_ID; \\
else \\
-   rm luser-id; \\
+   rm luser-id; \\
+   echo User \$(LUSER) does not exist; \\
+   echo It will be created with book instructions.; \\
fi
@\$(call housekeeping)
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4150 - in jhalfs/trunk: LFS common/libs extras

[pierre]

Author: pierre
Date: Thu Apr  2 02:56:51 2020
New Revision: 4150

Log:
Various fixes for ICA

Modified:
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/common/libs/func_compare.sh
   jhalfs/trunk/extras/do_ica_prep

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Wed Apr  1 02:14:14 2020(r4149)
+++ jhalfs/trunk/LFS/master.sh  Thu Apr  2 02:56:51 2020(r4150)
@@ -225,7 +225,10 @@
 # chapter 6. Note that this Makefile_target business is not really needed here
 # but we do it to have a similar structure to chapter 5 (we may merge all
 # those functions at some point).
-  Makefile_target=runasroot
+  case "$N" in
+ -build*) Makefile_target=chapter6   ;;
+   *) Makefile_target=runasroot  ;;
+  esac
 
 # Start loop
   for file in chapter06$N/* ; do
@@ -317,8 +320,13 @@
 # Keep the script file name for Makefile dependencies.
 PREV=${this_script}
 # Set system_build envar for iteration targets
-system_build=$chapter6
+if [ -z "$N" ]; then
+  system_build="$system_build $this_script"
+fi
   done # end for file in chapter06/*
+  if [ -n "$N" ]; then
+system_build="$chapter6"
+  fi
 }
 
 ##

Modified: jhalfs/trunk/common/libs/func_compare.sh
==
--- jhalfs/trunk/common/libs/func_compare.shWed Apr  1 02:14:14 2020
(r4149)
+++ jhalfs/trunk/common/libs/func_compare.shThu Apr  2 02:56:51 2020
(r4150)
@@ -96,7 +96,7 @@
  for file in \`ls .\` ; do \\
mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\
  done ; \\
-   fi ;
+   fi
@cd /\$(SCRIPT_ROOT)
@if [ -d test-logs ] ; then \\
  cd test-logs && \\

Modified: jhalfs/trunk/extras/do_ica_prep
==
--- jhalfs/trunk/extras/do_ica_prep Wed Apr  1 02:14:14 2020(r4149)
+++ jhalfs/trunk/extras/do_ica_prep Thu Apr  2 02:56:51 2020(r4150)
@@ -43,9 +43,9 @@
   # hackery to allow easy diffing. Essentially, replace each
   # archive with a dir of the same name and extract the object
   # files from the archive into this dir. Despite their names,
-  # libieee.a & libmcheck.a are not actual ar archives.
+  # libm.a & libmcheck.a are not actual ar archives.
   echo -n "Extracting object files from \".a\" files in ${CMP_DIR}... "
-  L=$(find $CMP_DIR -name '*.a' ! -name 'libieee.a' ! -name 'libmcheck.a')
+  L=$(find $CMP_DIR -name '*.a' ! -name 'libm.a' ! -name 'libmcheck.a')
   for F in $L; do
 mv $F ${F}.XX
 mkdir $F
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4148 - in jhalfs/trunk: LFS common/libs

[pierre]

Author: pierre
Date: Wed Apr  1 02:11:32 2020
New Revision: 4148

Log:
Two fixes:"
- use /etc/passwd to check whether LUSER exists
- use sudo -H -u $(LUSER) to be sure that HOME is set (depends on distro)

Modified:
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/common/libs/func_wrt_Makefile

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Tue Mar 31 01:47:52 2020(r4147)
+++ jhalfs/trunk/LFS/master.sh  Wed Apr  1 02:11:32 2020(r4148)
@@ -619,11 +619,13 @@
 
 save-luser:
@\$(call echo_message, Building)
-   @if lslogins \$(LUSER) > luser-id 2>/dev/null; then  \\
+   @LUSER_ID=\$(grep '^$(LUSER):' /etc/passwd | cut -d: -f3); \\
+   if [ -n "\$LUSER_ID" ]; then  \\
if [ ! -d \$(LUSER_HOME).XXX ]; then \\
mv \$(LUSER_HOME){,.XXX}; \\
mkdir \$(LUSER_HOME); \\
chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME); \\
+   echo "\$LUSER_ID" > luser-id; \\
fi; \\
else \\
rm luser-id; \\

Modified: jhalfs/trunk/common/libs/func_wrt_Makefile
==
--- jhalfs/trunk/common/libs/func_wrt_Makefile  Tue Mar 31 01:47:52 2020
(r4147)
+++ jhalfs/trunk/common/libs/func_wrt_Makefile  Wed Apr  1 02:11:32 2020
(r4148)
@@ -36,7 +36,7 @@
 crTESTLOGDIR   = /\$(SCRIPT_ROOT)/$TESTLOGDIRBASE
 crFILELOGDIR   = /\$(SCRIPT_ROOT)/$FILELOGDIRBASE
 
-SU_LUSER   = sudo -u \$(LUSER) sh -c
+SU_LUSER   = sudo -H -u \$(LUSER) sh -c
 LUSER_HOME = \$(LHOME)/\$(LUSER)
 PRT_DU = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) 
--exclude=lost+found \$(MOUNT_PT) \`\n"
 PRT_DU_CR  = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) 
--exclude=lost+found --exclude /var/lib / \`\n"
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4149 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Wed Apr  1 02:14:14 2020
New Revision: 4149

Log:
typo forgotten \

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Wed Apr  1 02:11:32 2020(r4148)
+++ jhalfs/trunk/LFS/master.sh  Wed Apr  1 02:14:14 2020(r4149)
@@ -619,7 +619,7 @@
 
 save-luser:
@\$(call echo_message, Building)
-   @LUSER_ID=\$(grep '^$(LUSER):' /etc/passwd | cut -d: -f3); \\
+   @LUSER_ID=\$(grep '^\$(LUSER):' /etc/passwd | cut -d: -f3); \\
if [ -n "\$LUSER_ID" ]; then  \\
if [ ! -d \$(LUSER_HOME).XXX ]; then \\
mv \$(LUSER_HOME){,.XXX}; \\
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4147 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Tue Mar 31 01:47:52 2020
New Revision: 4147

Log:
Fix the SHELL for CHROOT target for LFS

We use the filter builtin function of make to retrieve the right
shell to use during the CHROOT phase, which is the same as the
one in CHROOT1.
Also do not assume envars exist when removing it at the beginning
of the SUDO phase.

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Sun Mar 29 13:35:52 2020(r4146)
+++ jhalfs/trunk/LFS/master.sh  Tue Mar 31 01:47:52 2020(r4147)
@@ -532,7 +532,7 @@
@touch \$@
 
 mk_SUDO: mk_LUSER
-   @sudo rm envars
+   @sudo rm -f envars
@sudo make BREAKPOINT=\$(BREAKPOINT) SUDO
@touch \$@
 
@@ -603,7 +603,7 @@
 fi
 (
 cat << EOF
-CHROOT:   SHELL=/tools/bin/bash
+CHROOT:   SHELL=\$(filter %bash,\$(CHROOT1))
 CHROOT:   $chapter6
 BOOT: $chapter78
 CUSTOM_TOOLS: $custom_list
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4146 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sun Mar 29 13:35:52 2020
New Revision: 4146

Log:
Fix a forgotten new IDREF

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslSun Mar 29 10:19:25 2020(r4145)
+++ jhalfs/trunk/LFS/lfs.xslSun Mar 29 13:35:52 2020(r4146)
@@ -94,7 +94,7 @@
 otherwise it is in /bin.-->
   
 
-  
+  
 /tools
   
   
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4145 - jhalfs/trunk/common/libs

[pierre]

Author: pierre
Date: Sun Mar 29 10:19:25 2020
New Revision: 4145

Log:
Allow to find kernfs and chroot in any chapter

We use those files to generate code snippets to use in Makefile.
They used to be in chapter 6, but the new book will have some
of them in chapter 5.

Modified:
   jhalfs/trunk/common/libs/func_book_parser

Modified: jhalfs/trunk/common/libs/func_book_parser
==
--- jhalfs/trunk/common/libs/func_book_parser   Sun Mar 29 10:16:09 2020
(r4144)
+++ jhalfs/trunk/common/libs/func_book_parser   Sun Mar 29 10:19:25 2020
(r4145)
@@ -281,7 +281,7 @@
 lfs)
   xsltproc --nonet --xinclude \
-o chroot-scripts/ chroot.xsl \
-   $BOOK/chapter06/chapter06.xml >> $LOGDIR/$LOG 2>&1
+   $BOOK/chapter0?/*chroot*.xml >> $LOGDIR/$LOG 2>&1
   ;;
 *)
   esac
@@ -312,7 +312,7 @@
 lfs)
   xsltproc --nonet \
-o kernfs-scripts/devices.sh kernfs.xsl \
-   $BOOK/chapter06/kernfs.xml >> $LOGDIR/$LOG 2>&1
+   $BOOK/*/kernfs.xml >> $LOGDIR/$LOG 2>&1
   xsltproc --nonet \
-o kernfs-scripts/teardown.sh kernfs.xsl \
$BOOK/chapter09/reboot.xml >> $LOGDIR/$LOG 2>&1
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4144 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sun Mar 29 10:16:09 2020
New Revision: 4144

Log:
Adapt master.sh to new book, staying compatible

This involves changing the way make targets are built. Specially
the make target is changed when encountering a specific file
(for example the make target becomes sudo when rencountering kernfs)
This allows more flexibility.

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Sun Mar 29 08:13:15 2020(r4143)
+++ jhalfs/trunk/LFS/master.sh  Sun Mar 29 10:16:09 2020(r4144)
@@ -97,34 +97,35 @@
 ##
   echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter5 ( LUSER ) 
${R_arrow}"
 
+# Initialize the Makefile target: it'll change during chapter
+# For vanilla lfs, the "changingowner" script should be run as root. So
+# it belongs to the "SUDO" target, with list in the "runasroot" variable.
+# For new lfs, changingowner and kernfs are in "runsaroot", then the following,
+# starting at creatingdirs, are in the "CHROOT" target, in variable "chapter6".
+# Makefile_target records the variable, not really the target!
+# We use a case statement on that variable, because instructions in the
+# Makefile change according to the phase of the build (LUSER, SUDO, CHROOT).
+  Makefile_target=chapter5
+
+# Start loop
   for file in chapter05/* ; do
 # Keep the script file name
 this_script=`basename $file`
 
-# If no testsuites are run, then TCL, Expect, DejaGNU and Check
-# aren't needed (but building them does not hurt).
-# Fix also locales creation when running chapter05 testsuites (ugly)
+# Fix locales creation when running chapter05 testsuites (ugly)
 case "${this_script}" in
-#  *tcl)   [[ "${TEST}" = "0" ]] && continue ;;
-#  *expect)[[ "${TEST}" = "0" ]] && continue ;;
-#  *dejagnu)   [[ "${TEST}" = "0" ]] && continue ;;
-#  *check) [[ "${TEST}" = "0" ]] && continue ;;
-# We now do that in LFS.xsl, because stripping.xml contains other cleaning
-# instructions
-#  *stripping) [[ "${STRIP}" = "n" ]] && continue ;;
   *glibc) [[ "${TEST}" = "3" ]] && \
   sed -i 's@/usr/lib/locale@/tools/lib/locale@' $file ;;
 esac
 
-# First append each name of the script files to a list (this will become
-# the names of the targets in the Makefile
-# DO NOT append the changingowner script, it need be run as root.
-# A hack is necessary: create script in chap5 BUT run as a dependency for
-# SUDO target
+# Append each name of the script files to a list that Makefile_target
+# points to. But before that, change Makefile_target at the first script
+# of each target.
 case "${this_script}" in
-  *changingowner) runasroot="$runasroot ${this_script}" ;;
-   *) chapter5="$chapter5 ${this_script}" ;;
+  *changingowner) Makefile_target=runasroot ;;
+  *creatingdirs ) Makefile_target=chapter6  ;; # only run for new lfs
 esac
+eval $Makefile_target=\"\$$Makefile_target ${this_script}\"
 
 # Grab the name of the target (minus the -pass1 or -pass2 in the case of 
gcc
 # and binutils in chapter 5)
@@ -142,13 +143,20 @@
 
 # Drop in the name of the target on a new line, and the previous target
 # as a dependency. Also call the echo_message function.
-LUSER_wrt_target "${this_script}" "$PREV" "$pkg_version"
+case $Makefile_target in
+  chapter6) CHROOT_wrt_target "${this_script}" "$PREV" "$pkg_version" ;;
+  *)LUSER_wrt_target "${this_script}" "$PREV" "$pkg_version" ;;
+esac
 
 # If $pkg_tarball isn't empty, we've got a package...
 if [ "$pkg_tarball" != "" ] ; then
   # Always initialize the log file, since the test instructions may be
   # "uncommented" by the user
-  LUSER_wrt_test_log "${this_script}" "$pkg_version"
+  case $Makefile_target in
+   chapter6) CHROOT_wrt_test_log "${this_script}" "$pkg_version" ;;
+   *)LUSER_wrt_test_log "${this_script}" "$pkg_version" ;;
+  esac
+
   # If using optimizations, write the instructions
   case "${OPTIMIZE}${this_script}${REALSBU}" in
   *binutils-pass1y) ;;
@@ -160,9 +168,10 @@
 # Insert date and disk usage at the top of the log file, the script run
 # and date and disk usage again at the bottom of the log file.
 # The changingowner script must be run as root.

[alfs-log] r4143 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sun Mar 29 08:13:15 2020
New Revision: 4143

Log:
Set the correct #! executable in creat* scriptlets

Those scriptlets need to use a temporary bash, which is in /tools/bin
for current LFS. But if we use a new method (cross-compiling + sysroot)
it ends into /bin. So we have to set the correct `#!' header
in both cases.
We rely on the pesence of a "creatingtoolsdir" sect1 to know that
bash is in /tools

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslSun Mar 29 07:06:41 2020(r4142)
+++ jhalfs/trunk/LFS/lfs.xslSun Mar 29 08:13:15 2020(r4143)
@@ -89,6 +89,19 @@
 
 
 
+
+  
+
+  
+/tools
+  
+  
+
+  
+
+  
   
 
@@ -158,16 +171,13 @@
 
 
 
-  
-
-  #!/tools/bin/bashset +h
-
-
-  #!/bin/bashset +h
-
-  
+  #!
+  
+
+  
+  /bin/bashset +h
   
 set -e
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4142 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sun Mar 29 07:06:41 2020
New Revision: 4142

Log:
Adapt LFS/master.sh to use chap4 scriptlets

- take targets from scriptlet names
- neutralize some commands or bash builtins so that they are not
  used even if they are in the scriptlets, if not needed
- do not set PREV in chapter 5 anymore
- Improve save and restore user, so that if the LUSER exists,
  its home is saved while building temporary tools, and restored
  afterwards

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Sun Mar 29 06:46:19 2020(r4141)
+++ jhalfs/trunk/LFS/master.sh  Sun Mar 29 07:06:41 2020(r4142)
@@ -14,56 +14,80 @@
 chapter4_Makefiles() {   #
 ##
   echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter4 ( SETUP ) 
${R_arrow}"
+  # Ensure the first dependency is empty
+  unset PREV
 
-# If $LUSER_HOME is already present in the host, we asume that the
-# lfs user and group are also presents in the host, and a backup
-# of their bash init files is made.
-(
-cat << EOF
-020-creatingtoolsdir:
-   @\$(call echo_message, Building)
-   @mkdir \$(MOUNT_PT)/tools && \\
-   rm -f /tools && \\
-   ln -s \$(MOUNT_PT)/tools /
-   @\$(call housekeeping)
+  for file in chapter04/* ; do
+# Keep the script file name
+this_script=`basename $file`
 
-021-addinguser:  020-creatingtoolsdir
-   @\$(call echo_message, Building)
-   @-if [ ! -d \$(LUSER_HOME) ]; then \\
-   groupadd \$(LGROUP); \\
-   useradd -s /bin/bash -g \$(LGROUP) -m -k /dev/null \$(LUSER); \\
-   else \\
-   touch luser-exist; \\
-   fi;
-   @chown \$(LUSER) \$(MOUNT_PT)/tools && \\
-   chmod -R a+wt \$(MOUNT_PT)/\$(SCRIPT_ROOT) && \\
-   chmod a+wt \$(SRCSDIR)
-   @\$(call housekeeping)
+# First append each name of the script files to a list (this will become
+# the names of the targets in the Makefile
+# DO NOT append the settingenvironment script, it need be run as luser.
+# A hack is necessary: create script in chap4 BUT run as a dependency for
+# LUSER target
+case "${this_script}" in
+  *settingenvironment) chapter5="$chapter5 ${this_script}" ;;
+*) chapter4="$chapter4 ${this_script}" ;;
+esac
 
-022-settingenvironment:  021-addinguser
-   @\$(call echo_message, Building)
-   @if [ -f \$(LUSER_HOME)/.bashrc -a ! -f \$(LUSER_HOME)/.bashrc.XXX ]; 
then \\
-   mv \$(LUSER_HOME)/.bashrc \$(LUSER_HOME)/.bashrc.XXX; \\
-   fi;
-   @if [ -f \$(LUSER_HOME)/.bash_profile  -a ! -f 
\$(LUSER_HOME)/.bash_profile.XXX ]; then \\
-   mv \$(LUSER_HOME)/.bash_profile 
\$(LUSER_HOME)/.bash_profile.XXX; \\
-   fi;
-   @echo "set +h" > \$(LUSER_HOME)/.bashrc && \\
-   echo "umask 022" >> \$(LUSER_HOME)/.bashrc && \\
-   echo "LFS=\$(MOUNT_PT)" >> \$(LUSER_HOME)/.bashrc && \\
-   echo "LC_ALL=POSIX" >> \$(LUSER_HOME)/.bashrc && \\
-   echo "LFS_TGT=`uname -m`-lfs-linux-gnu" >> \$(LUSER_HOME)/.bashrc && \\
-   echo "PATH=/tools/bin:/bin:/usr/bin" >> \$(LUSER_HOME)/.bashrc && \\
-   echo "export LFS LC_ALL LFS_TGT PATH" >> \$(LUSER_HOME)/.bashrc && \\
-   echo "source $JHALFSDIR/envars" >> \$(LUSER_HOME)/.bashrc && \\
-   chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc && \\
-   touch envars && \\
-   chown \$(LUSER) envars
-   @\$(call housekeeping)
+# Grab the name of the target
+name=`echo ${this_script} | sed -e 's@[0-9]\{3\}-@@'`
+
+##
+# >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<<  #
+##
+#
+
+# Drop in the name of the target on a new line, and the previous target
+# as a dependency. Also call the echo_message function.
+LUSER_wrt_target "${this_script}" "$PREV"
+
+case "${this_script}" in
+  *settingenvironment)
+(
+cat << EOF
+   @cd && \\
+   function source() { true; } && \\
+   export -f source && \\
+   \$(CMDSDIR)/`dirname $file`/\$@ >> \$(LOGDIR)/\$@ 2>&1 && \\
+   sed 's|/mnt/lfs|\$(MOUNT_PT)|' -i .bashrc && \\
+   echo source $JHALFSDIR/envars >> .bashrc
+   @\$(PRT_DU) >>logs/\$@
+EOF
+) >> $MKFILE.tmp
+ ;;
+  *addinguser)
+(
+c

[alfs-log] r4141 - jhalfs/trunk/common/libs

[pierre]

Author: pierre
Date: Sun Mar 29 06:46:19 2020
New Revision: 4141

Log:
No need to prin DU from Makefile in LFS

We now print the disk usage from the scriptlet, so printing
again from the Makefile results in a duplicated line. Remove
the printing if book=lfs

Modified:
   jhalfs/trunk/common/libs/func_wrt_Makefile

Modified: jhalfs/trunk/common/libs/func_wrt_Makefile
==
--- jhalfs/trunk/common/libs/func_wrt_Makefile  Sun Mar 29 06:42:43 2020
(r4140)
+++ jhalfs/trunk/common/libs/func_wrt_Makefile  Sun Mar 29 06:46:19 2020
(r4141)
@@ -322,7 +322,9 @@
 cat << EOF
@export ${MOUNT_ENV}=\$(MOUNT_PT) && \\
${PROGNAME}-commands/`dirname $file`/\$@ >>logs/\$@$version 2>&1 && \\
-   \$(PRT_DU) >>logs/\$@$version
+   if [ "${PROGNAME}" != lfs ]; then \\
+   \$(PRT_DU) >>logs/\$@$version; \\
+   fi
 EOF
 ) >> $MKFILE.tmp
 }
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4140 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sun Mar 29 06:42:43 2020
New Revision: 4140

Log:
Do not rely on /tools for setting ROOT (again)

Using the chapter ancestor is not enough. It's better to use the sect1 id
and test that it starts with ch-tools: package-manager does not have this
ancestor. Also the virtual kernel filesystems are done before chroot,
so directly test this one.

This works for the current lfs book. We'll need something new if we
change the order of pages.

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslSun Mar 29 06:24:48 2020(r4139)
+++ jhalfs/trunk/LFS/lfs.xslSun Mar 29 06:42:43 2020(r4140)
@@ -1144,7 +1144,8 @@
   
 ROOT=
 
-  
+  
 $LFS/
 
   
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4139 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sun Mar 29 06:24:48 2020
New Revision: 4139

Log:
Don't use /tools for setting the ROOT variable

In the generated scriptlets, we need to know if we are on host
or chrooted. Presently, we
rely on /tools being a symlink or not. But we may want to remove this
ugly symlink in future versions of LFS, so anticipate and use the
chapter ancestor.

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslSun Mar 29 06:17:38 2020(r4138)
+++ jhalfs/trunk/LFS/lfs.xslSun Mar 29 06:24:48 2020(r4139)
@@ -1142,11 +1142,18 @@
 
 PREV_SEC=${SECONDS}
   
-if [ -h /tools ]; then
-  ROOT=$(dirname $(readlink /tools))/
-else
-  ROOT=/
-fi
+ROOT=
+
+  
+$LFS/
+
+  
+  
+/
+
+  
+
+
 SCRIPT_ROOT=
 
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4138 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sun Mar 29 06:17:38 2020
New Revision: 4138

Log:
Generate chapter 4 scriptlets

This is a major change for LFS. We won't be using the makefile for
the final preparations, but we'll extract the book instructions and
use them (the "use part not in this commit).
Since getting figures for those scriptlets is not important, and we
cannot use start and end scripts, which need already set up user and
dirs, do not use them

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslSun Mar 29 06:05:48 2020(r4137)
+++ jhalfs/trunk/LFS/lfs.xslSun Mar 29 06:17:38 2020(r4138)
@@ -100,11 +100,12 @@
  of the "calling" apply-template. But that would change the numbering,
  so that it would be difficult to compare to previous versions. So for
  version 2.4, let us keep this -->
-set -e
   
   
-  
-
-  
+  
+
+  
+
+  
   
   
-  echo -e "\n\nTotalseconds: $SECONDS\n"
-  
+  
+echo -e "\n\nTotalseconds: $SECONDS\n"
+
+  
   exit
 
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4137 - jhalfs/trunk/common

[pierre]

Author: pierre
Date: Sun Mar 29 06:05:48 2020
New Revision: 4137

Log:
Remove /tools and /cross-tools when cleaning

If we stop a build before the "do-housekeeping" target is executed, there
may be symlinks of the type /tools->/mnt/lfs/tools. If we want to restart,
for example after fixing something else, and we run the "creatingtoolsdir"
target (or similar one in CLFS) again, it will fail. It's better to clean
those symlinks when cleaning the build directory.

Modified:
   jhalfs/trunk/common/common-functions

Modified: jhalfs/trunk/common/common-functions
==
--- jhalfs/trunk/common/common-functionsSun Mar 29 05:58:06 2020
(r4136)
+++ jhalfs/trunk/common/common-functionsSun Mar 29 06:05:48 2020
(r4137)
@@ -93,6 +93,9 @@
   echo -n "Cleaning remaining extracted sources in $BUILDDIR/sources ..."
   sudo rm -rf `find $BUILDDIR/sources -maxdepth 1 -mindepth 1 -type d`
   echo "done"
+  echo -n "Removing dangling symlinks in / ..."
+  sudo rm -f /tools /cross-tools
+  echo "done"
 fi
   fi
 fi
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4136 - jhalfs/trunk/common/libs

[pierre]

Author: pierre
Date: Sun Mar 29 05:58:06 2020
New Revision: 4136

Log:
Do not use a login shell for LUSER

Most books have something like "exec /bin/bash" in .bash_profile for the
building user. This results in stopping and waiting for commands when
running a a login shell. The current jhalfs way of removing .bash_profile is
suboptimal, since a user may want to login as $(LUSER) and expect that the
environment is set (without having to source .bashrc). So remove the
"-i" flag in "sudo -u $(LUSER) ..."

Modified:
   jhalfs/trunk/common/libs/func_wrt_Makefile

Modified: jhalfs/trunk/common/libs/func_wrt_Makefile
==
--- jhalfs/trunk/common/libs/func_wrt_Makefile  Sun Mar 15 10:15:28 2020
(r4135)
+++ jhalfs/trunk/common/libs/func_wrt_Makefile  Sun Mar 29 05:58:06 2020
(r4136)
@@ -36,7 +36,7 @@
 crTESTLOGDIR   = /\$(SCRIPT_ROOT)/$TESTLOGDIRBASE
 crFILELOGDIR   = /\$(SCRIPT_ROOT)/$FILELOGDIRBASE
 
-SU_LUSER   = sudo -u \$(LUSER) -i sh -c
+SU_LUSER   = sudo -u \$(LUSER) sh -c
 LUSER_HOME = \$(LHOME)/\$(LUSER)
 PRT_DU = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) 
--exclude=lost+found \$(MOUNT_PT) \`\n"
 PRT_DU_CR  = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) 
--exclude=lost+found --exclude /var/lib / \`\n"
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4135 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Sun Mar 15 10:15:28 2020
New Revision: 4135

Log:
Remove envars before the SUDO phase
This is to allow root to execute ": > envars". On a non empty envars
owned by lfs, in a directory world writable with sticky bit and not owned
by lfs, this may be forbiden by the fs/protected_regular sysctl.
See https://www.kernel.org/doc/Documentation/sysctl/fs.txt

Modified:
   jhalfs/trunk/LFS/master.sh

Modified: jhalfs/trunk/LFS/master.sh
==
--- jhalfs/trunk/LFS/master.sh  Tue Feb 11 05:55:28 2020(r4134)
+++ jhalfs/trunk/LFS/master.sh  Sun Mar 15 10:15:28 2020(r4135)
@@ -491,6 +491,7 @@
@touch \$@
 
 mk_SUDO: mk_LUSER
+   @sudo rm envars
@sudo make BREAKPOINT=\$(BREAKPOINT) SUDO
@touch \$@
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4134 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Tue Feb 11 05:55:28 2020
New Revision: 4134

Log:
Remain compatible with older versions of lfs

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslTue Feb 11 05:25:03 2020(r4133)
+++ jhalfs/trunk/LFS/lfs.xslTue Feb 11 05:55:28 2020(r4134)
@@ -102,6 +102,7 @@
  version 2.4, let us keep this -->
 http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4130 - jhalfs/trunk/pkgmngt

[pierre]

Author: pierre
Date: Fri Dec  6 13:46:21 2019
New Revision: 4130

Log:
Fix libhandy VERSION computation in packInstall.sh.porg

Modified:
   jhalfs/trunk/pkgmngt/packInstall.sh.porg

Modified: jhalfs/trunk/pkgmngt/packInstall.sh.porg
==
--- jhalfs/trunk/pkgmngt/packInstall.sh.porgFri Sep 27 02:59:32 2019
(r4129)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.porgFri Dec  6 13:46:21 2019
(r4130)
@@ -70,7 +70,7 @@
   cacerts*)
 VERSION=0.1
 ;;
-  btrfs*|node*|pnmixer*)
+  btrfs*|node*|pnmixer*|libhandy*)
 VERSION=$(echo $1 | sed 's/^.*v//')
 ;;
   x265*) # can contain vd.d or just d.d: thanks to packagers
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4129 - jhalfs/trunk/BLFS

[pierre]

Author: pierre
Date: Fri Sep 27 02:59:32 2019
New Revision: 4129

Log:
Remove the lfs- prefix when writing to the instpkg file, for lfs bootscripts

Modified:
   jhalfs/trunk/BLFS/gen-makefile.sh

Modified: jhalfs/trunk/BLFS/gen-makefile.sh
==
--- jhalfs/trunk/BLFS/gen-makefile.sh   Wed Sep 25 08:36:20 2019(r4128)
+++ jhalfs/trunk/BLFS/gen-makefile.sh   Fri Sep 27 02:59:32 2019(r4129)
@@ -50,12 +50,15 @@
 #--#
 __wrt_touch() {#
 #--#
-  local pkg_name=$1
+local pkg_name="${1#*-?-}"
+# For having a unique id, we have added lfs- to bootscripts package.
+# We need to remove it now.
+case "$pkg_name" in lfs-bootscripts) pkg_name=bootscripts ;; esac
 
 (
 cat << EOF
@xsltproc --stringparam packages ${PACK_FILE} \\
-   --stringparam package ${pkg_name#*-?-} \\
+   --stringparam package "${pkg_name}" \\
-o track.tmp \\
${BUMP} \$(TRACKING_FILE) && \\
sed -i 's@PACKDESC@${ATOPDIR}/packdesc.dtd@' track.tmp && \\
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4128 - jhalfs/trunk/BLFS/xsl

[pierre]

Author: pierre
Date: Wed Sep 25 08:36:20 2019
New Revision: 4128

Log:
Put {DISTRIB,VERSION}_CODENAME="jhalfs" in /etc/*-release, and fix a typo

Modified:
   jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl

Modified: jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl
==
--- jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl Wed Sep 25 08:29:17 2019
(r4127)
+++ jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl Wed Sep 25 08:36:20 2019
(r4128)
@@ -157,7 +157,7 @@
   
 
   
-  i
   
 
   
-
+  
+
+  
+  jhalfs
+  
+
+  
   
 
   
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4127 - jhalfs/trunk/BLFS/xsl

[pierre]

Author: pierre
Date: Wed Sep 25 08:29:17 2019
New Revision: 4127

Log:
Add the possibility to update lfs bootscripts with blfs tools.
Ticket #1724

Modified:
   jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl
   jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl

Modified: jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl
==
--- jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl  Wed Sep 25 00:50:45 2019
(r4126)
+++ jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl  Wed Sep 25 08:29:17 2019
(r4127)
@@ -41,6 +41,16 @@
   
 
 
+  lfs-7
+
+  LFS Chapter 7
+  
+  
+
+
   lfs-8
 
   LFS Chapter 8

Modified: jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl
==
--- jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl Wed Sep 25 00:50:45 2019
(r4126)
+++ jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl Wed Sep 25 08:29:17 2019
(r4127)
@@ -17,6 +17,7 @@
   $package='systemd' or
   $package='Python' or
   $package='shadow'"/>
+  true
   true
   true
   
@@ -37,6 +38,11 @@
   $package='systemd' or
   $package='Python' or
   $package='shadow'"/>
+  
+
+  
+
+  
   
 
   
@@ -66,7 +72,14 @@
   
 
   
-
+
+  lfs-bootscripts
+  
+
+  
+
   
   
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4125 - jhalfs/trunk/BLFS/xsl

[pierre]

Author: pierre
Date: Sun Sep 15 20:50:29 2019
New Revision: 4125

Log:
BLFS/xsl/Process-install: detect config instruction in QtWebEngine page

Modified:
   jhalfs/trunk/BLFS/xsl/process-install.xsl

Modified: jhalfs/trunk/BLFS/xsl/process-install.xsl
==
--- jhalfs/trunk/BLFS/xsl/process-install.xsl   Sat Sep 14 12:30:15 2019
(r4124)
+++ jhalfs/trunk/BLFS/xsl/process-install.xsl   Sun Sep 15 20:50:29 2019
(r4125)
@@ -1,15 +1,17 @@
 
 
+
 ]>
 
 http://www.w3.org/1999/XSL/Transform;
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4124 - jhalfs/trunk/BLFS/xsl

[pierre]

Author: pierre
Date: Sat Sep 14 12:30:15 2019
New Revision: 4124

Log:
BLFS/xsl/process-install: make an entity for config instruction conditions
and add a condition for /opt/rustc creation

Modified:
   jhalfs/trunk/BLFS/xsl/process-install.xsl

Modified: jhalfs/trunk/BLFS/xsl/process-install.xsl
==
--- jhalfs/trunk/BLFS/xsl/process-install.xsl   Fri Sep  6 14:20:03 2019
(r4123)
+++ jhalfs/trunk/BLFS/xsl/process-install.xsl   Sat Sep 14 12:30:15 2019
(r4124)
@@ -1,4 +1,16 @@
 
+
+]>
 
 http://www.w3.org/1999/XSL/Transform;
 version="1.0">
@@ -122,19 +134,11 @@
 
   
 
 
 
-  
+  
 
   
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4123 - jhalfs/trunk/BLFS/xsl

[pierre]

Author: pierre
Date: Fri Sep  6 14:20:03 2019
New Revision: 4123

Log:
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.

Modified:
   jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl

Modified: jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl
==
--- jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl  Thu Sep  5 10:22:04 2019
(r4122)
+++ jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl  Fri Sep  6 14:20:03 2019
(r4123)
@@ -150,7 +150,9 @@
'123456789',
'0'),
   '-0')
-])  0">
+])  0 or @id='postlfs-config'">
+
   
   
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4122 - in jhalfs/trunk: . CLFS CLFS2 LFS common/libs

[pierre]

Author: pierre
Date: Thu Sep  5 10:22:04 2019
New Revision: 4122

Log:
Remove the obsolete vim-lang instructions and variable, and add non-wide-
charater ncurses library

Modified:
   jhalfs/trunk/CHEATSHEET
   jhalfs/trunk/CLFS/clfs.xsl
   jhalfs/trunk/CLFS2/clfs2.xsl
   jhalfs/trunk/Config.in
   jhalfs/trunk/LFS/lfs.xsl
   jhalfs/trunk/common/libs/func_book_parser
   jhalfs/trunk/common/libs/func_download_pkgs
   jhalfs/trunk/common/libs/func_validate_configs.sh
   jhalfs/trunk/jhalfs

Modified: jhalfs/trunk/CHEATSHEET
==
--- jhalfs/trunk/CHEATSHEET Sun Sep  1 14:00:48 2019(r4121)
+++ jhalfs/trunk/CHEATSHEET Thu Sep  5 10:22:04 2019(r4122)
@@ -40,7 +40,7 @@
[*] Build the kernel
  Kernel config file ($HOME/config-4.15-lfs-1)
[ ] Strip Installed Binaries/Libraries
-   [ ] Install vim-lang package
+   [ ] Install non-wide-character ncurses
[ ] DO NOT use/display progress_bar
TimeZone (Europe/Paris)
Language (fr_FR.UTF-8)
@@ -99,7 +99,7 @@
[*] Build the kernel
  Kernel config file ($HOME/config-4.15-lfs-systemd
[ ] Strip Installed Binaries/Libraries
-   [ ] Install vim-lang package
+   [ ] Install non-wide-character ncurses
[ ] DO NOT use/display progress_bar
TimeZone (America/Los_Angeles)
Language (en_US.UTF-8)
@@ -163,7 +163,7 @@
[*] Build the kernel
  Kernel config file ($HOME/config-4.15-clfs-systemd
[ ] Strip Installed Binaries/Libraries
-   [ ] Install vim-lang package
+   [ ] Install non-wide-character ncurses
[ ] DO NOT use/display progress_bar
TimeZone (Australia/Sydney)
Language (en_AU.UTF-8)

Modified: jhalfs/trunk/CLFS/clfs.xsl
==
--- jhalfs/trunk/CLFS/clfs.xsl  Sun Sep  1 14:00:48 2019(r4121)
+++ jhalfs/trunk/CLFS/clfs.xsl  Thu Sep  5 10:22:04 2019(r4122)
@@ -31,9 +31,6 @@
   -->
   
 
-  
-  
-
   
   
 
@@ -113,9 +110,6 @@
 
   cd $PKGDIR
-  
-tar -xvf ../vim--lang.* 
--strip-components=1
-  
 
 
 

Modified: jhalfs/trunk/CLFS2/clfs2.xsl
==
--- jhalfs/trunk/CLFS2/clfs2.xslSun Sep  1 14:00:48 2019(r4121)
+++ jhalfs/trunk/CLFS2/clfs2.xslThu Sep  5 10:22:04 2019(r4122)
@@ -13,9 +13,6 @@
 
 
 
-  
-  
-
   
   
 
@@ -74,9 +71,6 @@
 
   cd $PKGDIR
-  
-tar -xvf ../vim--lang.* 
--strip-components=1
-  
 
 
 exit

Modified: jhalfs/trunk/Config.in
==
--- jhalfs/trunk/Config.in  Sun Sep  1 14:00:48 2019(r4121)
+++ jhalfs/trunk/Config.in  Thu Sep  5 10:22:04 2019(r4122)
@@ -927,14 +927,12 @@
 #   and renamed 'kernel-config'
 #--- End Kernel
 
-configVIMLANG
-bool "Install vim-lang package"
+configNCURSES5
+bool "Install non-wide-character ncurses"
 default n
-depends on !BOOK_HLFS && !BOOK_CLFS3
+depends on BOOK_LFS || BOOK_LFS_SYSD
 help
-#-- Install the optional vim-lang package
-#   NOTE: This option is obsolete with the 7.3 release of Vim
-#   which is included in all recent releases of LFS.
+#-- Install the optional non wide character ncurses5 library
 
 configTIMEZONE
 string "TimeZone"

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslSun Sep  1 14:00:48 2019(r4121)
+++ jhalfs/trunk/LFS/lfs.xslThu Sep  5 10:22:04 2019(r4122)
@@ -41,8 +41,8 @@
   -->
   
 
-  
-  
+  
+  
 
   
   
@@ -357,6 +357,9 @@
@remap='test' and current()/../@id='ch-tools-dejagnu' or
@remap='test' and current()/../@id='ch-system-systemd'
]"/>
+
+  
+
   
 
   

Modified: jhalfs/trunk/common/libs/func_book_parser
==
--- jhalfs/trunk/common/libs/func_book_parser   Sun Sep  1 14:00:48 2019
(r4121)
+++ jhalfs/trunk/common/libs/func_book_parser   Thu Sep  5 10:22:04 2019
(r4122)
@@ -100,7 +100,6 @@
  --stringparam method "$METHOD"\
  --stringparam testsuite "$TEST"   \
  --stringparam bomb-testsuite "$BOMB_TEST" \
- --stringparam vim-lang "$VIMLANG" \
 

[alfs-log] r4121 - jhalfs/trunk

[pierre]

Author: pierre
Date: Sun Sep  1 14:00:48 2019
New Revision: 4121

Log:
Fix retrieval of BLFS 9.0 tag. Note that older tags cannot be processed by
present jhalfs, and the case statement should be simplified...

Modified:
   jhalfs/trunk/jhalfs

Modified: jhalfs/trunk/jhalfs
==
--- jhalfs/trunk/jhalfs Sat Aug 31 05:52:05 2019(r4120)
+++ jhalfs/trunk/jhalfs Sun Sep  1 14:00:48 2019(r4121)
@@ -326,8 +326,8 @@
  exit 2 ;;
branch-6.* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-}/BOOK ;;
  branch-* )  BLFS_TREE=branches/${BLFS_BRANCH_ID#branch-} ;;
-  6.2* | 7.* | 8.*)  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
-* )  BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;;
+[isv]* | 6.3* )  BLFS_TREE=tags/${BLFS_BRANCH_ID}/BOOK ;;
+* )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
 esac
   fi
   load_file "${COMMON_DIR}/libs/func_install_blfs"
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4120 - jhalfs/trunk/pkgmngt

[pierre]

Author: pierre
Date: Sat Aug 31 05:52:05 2019
New Revision: 4120

Log:
The new vim tarball has a standard directory name, not need for a tweak in
packInstall

Modified:
   jhalfs/trunk/pkgmngt/packInstall.sh.porg

Modified: jhalfs/trunk/pkgmngt/packInstall.sh.porg
==
--- jhalfs/trunk/pkgmngt/packInstall.sh.porgSat Aug 31 05:47:22 2019
(r4119)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.porgSat Aug 31 05:52:05 2019
(r4120)
@@ -12,7 +12,7 @@
   expect*|tcl*|tk*|mozjs*|lynx*)
 VERSION=$(echo $1 | sed 's/^[^0-9]*//')
 ;;
-  vim*|unzip*|zip*)
+  unzip*|zip*)
 VERSION=$(echo $1 | sed 's/^[^0-9]*\([0-9]\)\([0-9]\)/\1.\2/')
 ;;
   wireless_tools*|LVM2*)
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4119 - in jhalfs/trunk/BLFS: . xsl

[pierre]

Author: pierre
Date: Sat Aug 31 05:47:22 2019
New Revision: 4119

Log:
Process layout replaceable

Modified:
   jhalfs/trunk/BLFS/gen_pkg_book.sh
   jhalfs/trunk/BLFS/xsl/gen_config.xsl
   jhalfs/trunk/BLFS/xsl/process-replaceable.xsl

Modified: jhalfs/trunk/BLFS/gen_pkg_book.sh
==
--- jhalfs/trunk/BLFS/gen_pkg_book.sh   Sat Aug 17 01:30:36 2019(r4118)
+++ jhalfs/trunk/BLFS/gen_pkg_book.sh   Sat Aug 31 05:47:22 2019(r4119)
@@ -31,6 +31,7 @@
 declare DEP_LEVEL
 declare SUDO
 declare LANGUAGE
+declare KBLAYOUT
 declare WRAP_INSTALL
 declare DEL_LA_FILES
 declare STATS
@@ -56,6 +57,7 @@
   DEL_LA_FILES=*  | \
   STATS=* | \
   LANGUAGE=*  | \
+  KBLAYOUT=*  | \
   SUDO=*  )  eval ${REPLY} # Define/set a global variable..
   continue ;;
 esac
@@ -83,7 +85,7 @@
 validate_configuration() { #
 #--#
   local -r dotSTR=".."
-  local -r PARAM_LIST="DEP_LEVEL SUDO LANGUAGE MAIL_SERVER WRAP_INSTALL 
DEL_LA_FILES STATS"
+  local -r PARAM_LIST="DEP_LEVEL SUDO LANGUAGE KBLAYOUT MAIL_SERVER 
WRAP_INSTALL DEL_LA_FILES STATS"
   local -r PARAM_VALS='${config_param}${dotSTR:${#config_param}} 
${L_arrow}${BOLD}${!config_param}${OFF}${R_arrow}'
   local config_param
   local -i index
@@ -216,6 +218,7 @@
  --stringparam del-la-files "$DEL_LA_FILES" \
  --stringparam list-stat "$LIST_STAT" \
  --stringparam language "$LANGUAGE" \
+ --stringparam xkblayout "$KBLAYOUT" \
 --stringparam fqdn "$(hostname -f)" \
  -o ./scripts/ ${MakeScripts} \
  ${BookXml}

Modified: jhalfs/trunk/BLFS/xsl/gen_config.xsl
==
--- jhalfs/trunk/BLFS/xsl/gen_config.xslSat Aug 17 01:30:36 2019
(r4118)
+++ jhalfs/trunk/BLFS/xsl/gen_config.xslSat Aug 31 05:47:22 2019
(r4119)
@@ -62,6 +62,13 @@
 Because of the book layout, the 3 fields, ll, CC and charmap are
 mandatory. The @modfier is honoured if present.
 
+config  KBLAYOUT
+string "Keyboard layout (to be used in GDM)"
+default "us"
+help
+Used in GDM for setting the login screen keyboard layout.
+See the GDM page in the book for what to put into this field
+
 config  SUDO
 bool "Build as User"
 default y

Modified: jhalfs/trunk/BLFS/xsl/process-replaceable.xsl
==
--- jhalfs/trunk/BLFS/xsl/process-replaceable.xsl   Sat Aug 17 01:30:36 
2019(r4118)
+++ jhalfs/trunk/BLFS/xsl/process-replaceable.xsl   Sat Aug 31 05:47:22 
2019(r4119)
@@ -54,6 +54,10 @@
 
 
 
+
+  
+
+
 
   
 
@@ -85,6 +89,10 @@
   
 
   
+
+  
+
+  
 
   
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4118 - in jhalfs/trunk: BLFS/xsl pkgmngt

[pierre]

Author: pierre
Date: Sat Aug 17 01:30:36 2019
New Revision: 4118

Log:
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)

Modified:
   jhalfs/trunk/BLFS/xsl/make_book.xsl
   jhalfs/trunk/BLFS/xsl/process-install.xsl
   jhalfs/trunk/BLFS/xsl/scripts.xsl
   jhalfs/trunk/pkgmngt/packInstall.sh.porg

Modified: jhalfs/trunk/BLFS/xsl/make_book.xsl
==
--- jhalfs/trunk/BLFS/xsl/make_book.xsl Wed Aug 14 03:32:59 2019(r4117)
+++ jhalfs/trunk/BLFS/xsl/make_book.xsl Sat Aug 17 01:30:36 2019(r4118)
@@ -102,13 +102,16 @@
   
 
 
-
+
   
   
 
   
+  
+
+  
 
 
   
   
   
+
+  
+
+  
+
+  
+
+  
+
+  -pass1
+  
+  filename="-pass1.html"
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+sect3
+sect4
+  
+  
+
+  
+  
+
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+  
+
+  
+
+  
+  
+ (in full book)
+  
+
+  
+
+  
+  
+
+  
+
+  
+  -pass1
+
+  
+  
+
+  
+  
+
+  
+
+  
+
+  
+  
+
+  
+  
 
   
 

Modified: jhalfs/trunk/BLFS/xsl/process-install.xsl
==
--- jhalfs/trunk/BLFS/xsl/process-install.xsl   Wed Aug 14 03:32:59 2019
(r4117)
+++ jhalfs/trunk/BLFS/xsl/process-install.xsl   Sat Aug 17 01:30:36 2019
(r4118)
@@ -17,6 +17,7 @@
 
 
 
+
 
   
 
@@ -35,7 +36,8 @@
 
   
 
-  
+  
+
   
 
   
@@ -54,15 +56,15 @@
   
 
 
-
-  
-
-  
-  
-
-  
-
+
+
+  
+
+
+
+  
+  
+
 
   
   
 
-  
+  
+
   
 
   
@@ -91,8 +94,15 @@
 
   
 
-
+
+
+  
+
+
+
+  
+
 
@@ -108,9 +118,14 @@
   
   
 
-  
+  
+
   
+
 
+
   
 
   
+
   
 
   
@@ -195,8 +211,10 @@
   
 
   
+
 
   
+
   
 
@@ -220,14 +238,15 @@
 
   
 
-
-  
-
-  
-  
-
-  
-
+
+
+  
+
+
+
+  
+  
+
 
   
   
 
-  
+  
+
   
 
   
@@ -261,14 +281,15 @@
 
   
 
-
-  
-
-  
-  
-
-  
-
+
+
+  
+
+
+
+  
+  
+
 
   
 
   
+
   
 
   
@@ -309,114 +331,116 @@
   
 
   
+
 
   
 
-  
+  
 
 
-
+
   
-  
 
   
 
-  
-
-
-
-  
-  
-
-  
+
 
-  
-
+  
+
+
+
+  
+  
+
 
-
-  
-  
-
+
+  
+  
+
+  
+  
+
+  
+  
+
+
+
+
+  
+  
+
+  
+  
+
+  #
+
+
+  
+
+make -k
+
+  
+  
+
+  
+
+
+  
+  $TESTLOG 2>

[alfs-log] r4117 - in jhalfs/trunk/BLFS: . xsl

[pierre]

Author: pierre
Date: Wed Aug 14 03:32:59 2019
New Revision: 4117

Log:
BLFS/xsl: move the template for replaceable tags out of the main stylesheet,
and allow replacing some hostname/domainname replaceable tags

Added:
   jhalfs/trunk/BLFS/xsl/process-replaceable.xsl   (contents, props changed)
Modified:
   jhalfs/trunk/BLFS/gen_pkg_book.sh
   jhalfs/trunk/BLFS/xsl/scripts.xsl

Modified: jhalfs/trunk/BLFS/gen_pkg_book.sh
==
--- jhalfs/trunk/BLFS/gen_pkg_book.sh   Tue Aug 13 08:30:00 2019(r4116)
+++ jhalfs/trunk/BLFS/gen_pkg_book.sh   Wed Aug 14 03:32:59 2019(r4117)
@@ -216,6 +216,7 @@
  --stringparam del-la-files "$DEL_LA_FILES" \
  --stringparam list-stat "$LIST_STAT" \
  --stringparam language "$LANGUAGE" \
+--stringparam fqdn "$(hostname -f)" \
  -o ./scripts/ ${MakeScripts} \
  ${BookXml}
 # Make the scripts executable.

Added: jhalfs/trunk/BLFS/xsl/process-replaceable.xsl
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ jhalfs/trunk/BLFS/xsl/process-replaceable.xsl   Wed Aug 14 03:32:59 
2019(r4117)
@@ -0,0 +1,132 @@
+
+
+http://www.w3.org/1999/XSL/Transform;
+version="1.0">
+
+
+
+
+  
+  
+
+  
+  
+
+  
+  
+ 
+  
+  
+
+  
+ 
+  
+  
+
+  
+
+  
+  
+
+  
+ 
+  
+  
+
+  
+
+  
+
+
+
+
+  
+
+
+  
+  
+  
+
+
+
+
+  
+
+
+  
+$USER
+  
+
+  
+imps2
+  
+  
+/dev/input/mice
+  
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+4
+  
+
+  
+$USER ${USER}@mail.bogus
+  
+
+  
+
+  
+
+  
+1024
+  
+
+  
+
+  
+  
+
+  
+  
+
+  
+
+  
+$USER
+  
+  
+**EDITME
+
+EDITME**
+  
+
+  
+
+  
+
+  
+
+

Modified: jhalfs/trunk/BLFS/xsl/scripts.xsl
==
--- jhalfs/trunk/BLFS/xsl/scripts.xsl   Tue Aug 13 08:30:00 2019(r4116)
+++ jhalfs/trunk/BLFS/xsl/scripts.xsl   Wed Aug 14 03:32:59 2019(r4117)
@@ -35,41 +35,6 @@
   
   
 
-  
-  
-
-  
-  
-
-  
-  
- 
-  
-  
-
-  
- 
-  
-  
-
-  
-
-  
-  
-
-  
- 
-  
-  
-
-  
-
-  
-
 
 
@@ -93,6 +58,9 @@
  role="install" sect2 -->
   
 
+
+  
+
 
 
   
@@ -811,66 +779,6 @@
 
   
 
-  
-
-
-  
-$USER
-  
-
-  
-imps2
-  
-  
-/dev/input/mice
-  
-  
-
-  
-
-  
-  
-
-  
-  
-
-  
-  
-
-  
-
-  
-4
-  
-
-  
-$USER ${USER}@mail.bogus
-  
-
-  
-
-  
-
-  
-1024
-  
-  
-**EDITME
-
-EDITME**
-  
-
-  
-
-  
-
-  
-
   
 http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4116 - jhalfs/trunk/BLFS/xsl

[pierre]

Author: pierre
Date: Tue Aug 13 08:30:00 2019
New Revision: 4116

Log:
add property svn:keywords to process-install.xsl

Modified:
   jhalfs/trunk/BLFS/xsl/process-install.xsl   (contents, props changed)

Modified: jhalfs/trunk/BLFS/xsl/process-install.xsl
==
--- jhalfs/trunk/BLFS/xsl/process-install.xsl   Tue Aug 13 08:28:49 2019
(r4115)
+++ jhalfs/trunk/BLFS/xsl/process-install.xsl   Tue Aug 13 08:30:00 2019
(r4116)
@@ -3,7 +3,7 @@
 http://www.w3.org/1999/XSL/Transform;
 version="1.0">
 
-
+
 
   
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4114 - jhalfs/trunk/BLFS/xsl

[pierre]

Author: pierre
Date: Tue Aug 13 08:03:39 2019
New Revision: 4114

Log:
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.

Added:
   jhalfs/trunk/BLFS/xsl/process-install.xsl
Deleted:
   jhalfs/trunk/BLFS/xsl/gen-install.xsl
Modified:
   jhalfs/trunk/BLFS/xsl/scripts.xsl

Added: jhalfs/trunk/BLFS/xsl/process-install.xsl
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ jhalfs/trunk/BLFS/xsl/process-install.xsl   Tue Aug 13 08:03:39 2019
(r4114)
@@ -0,0 +1,277 @@
+
+
+http://www.w3.org/1999/XSL/Transform;
+version="1.0">
+
+
+
+  
+
+
+
+
+
+
+
+
+
+  
+
+  non-root
+
+
+  config
+
+
+  install
+
+  
+
+
+
+
+
+
+
+
+  
+
+  none
+
+
+  non-root
+
+
+  config
+
+
+  install
+
+  
+
+
+
+
+
+
+
+  
+
+  none
+
+
+  non-root
+
+
+  config
+
+
+  install
+
+  
+
+
+
+  
+
+  
+  
+
+
+  
+
+
+  
+
+  
+
+  
+
+
+  
+
+
+
+  
+
+  
+
+  
+
+  
+
+  
+  
+  
+
+
+  
+
+
+
+  
+  
+
+
+
+  
+  
+
+  
+
+
+  
+
+  
+
+  
+sudo -E sh  ROOT_EOF
+
+  
+
+  
+
+  
+if [ -r "$JH_PACK_INSTALL" ]; then
+  source $JH_PACK_INSTALL
+  export -f wrapInstall
+  export -f packInstall
+fi
+wrapInstall '
+
+  
+
+  
+
+  
+ROOT_EOF
+
+  
+
+  
+
+  
+
+  
+
+
+  'packInstall
+
+  
+
+  
+
+
+
+  
+
+  
+
+  
+
+
+  
+
+  
+
+make -j1 
+
+  
+
+  
+  
+
+  
+
+'\''
+
+  
+
+  
+  
+
+  
+
+  
+
+  
+
+

Modified: jhalfs/trunk/BLFS/xsl/scripts.xsl
==
--- jhalfs/trunk/BLFS/xsl/scripts.xsl   Mon Jul 15 13:06:35 2019(r4113)
+++ jhalfs/trunk/BLFS/xsl/scripts.xsl   Tue Aug 13 08:03:39 2019(r4114)
@@ -89,8 +89,9 @@
 
 
 
-
-  
+
+  
 
 
 
@@ -275,13 +276,18 @@
 
 
 
-
+  
+ contains(text(),'test')]"/>
   
-
+  
+  
+  
+  
+
 
 
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4113 - jhalfs/trunk/LFS

[pierre]

Author: pierre
Date: Mon Jul 15 13:06:35 2019
New Revision: 4113

Log:
Fix generation of the SBU-DU stats:
The "create-sbu_du.sh" script expects all the logs containing
"Totalseconds" also contains two lines starting with "KB:" with disk usage
stats. Generates those lines for all the logs. Hopefully, the stats are
fairly accurate now...

Modified:
   jhalfs/trunk/LFS/lfs.xsl

Modified: jhalfs/trunk/LFS/lfs.xsl
==
--- jhalfs/trunk/LFS/lfs.xslMon Jul 15 13:00:32 2019(r4112)
+++ jhalfs/trunk/LFS/lfs.xslMon Jul 15 13:06:35 2019(r4113)
@@ -171,11 +171,9 @@
 set -e
   
   
-  
-
-  
-
-  
+  
+
+  
   
   
   echo -e "\n\nTotalseconds: $SECONDS\n"
-  
-
-  
+  
   exit
 
 
@@ -1151,60 +1147,68 @@
 
   
 
-
 
+
+PREV_SEC=${SECONDS}
+  
 if [ -h /tools ]; then
   ROOT=$(dirname $(readlink /tools))/
 else
   ROOT=/
 fi
+SCRIPT_ROOT=
+
+
+
+
+  
 SRC_DIR=${ROOT}sources
-
-PREV_SEC=${SECONDS}
 
 VERSION=
-
-
+  
+  
 PKG_DEST=${SRC_DIR}/
-
--
-
-
-
+  
+  -
+  
+  
+
 PACKAGE=
-
-  
-
-
-SCRIPT_ROOT=
-
-
-
-
+
+  
+  
-  
+
 source ${ROOT}${SCRIPT_ROOT}/packInstall.sh
 export -f packInstall
-  
-
+
+  
 export -f wrapInstall
 
+
   
-
 
-
+  
 cd $SRC_DIR
 PKGDIR=$(tar -tf $PACKAGE | head -n1 | sed 's@^./@@;s@/.*@@')
 export PKGDIR VERSION PKG_DEST
 
 if [ -d "$PKGDIR" ]; then rm -rf $PKGDIR; fi
 if [ -d "${PKGDIR%-*}-build" ]; then  rm -rf ${PKGDIR%-*}-build; fi
-
-echo "KB: $(du -skx --exclude=lost+found --exclude=/var/lib 
--exclude=$SCRIPT_ROOT $ROOT)"
+
+
+
+echo "KB: $(du -skx --exclude=lost+found --exclude=var/lib 
--exclude=$SCRIPT_ROOT $ROOT)"
+
+
+  
 
 tar -xf $PACKAGE
 cd $PKGDIR
-SECONDS=${PREV_SEC}
+
+
+SECONDS=${PREV_SEC}
 
 # Start of LFS book script
 
@@ -1214,11 +1218,14 @@
 
 # End of LFS book script
 
-echo "KB: $(du -skx --exclude=lost+found --exclude=/var/lib 
--exclude=$SCRIPT_ROOT $ROOT)"
-cd $SRC_DIR
+echo "KB: $(du -skx --exclude=lost+found --exclude=var/lib 
--exclude=$SCRIPT_ROOT $ROOT)"
+
+
+  cd $SRC_DIR
 rm -rf $PKGDIR
 if [ -d "${PKGDIR%-*}-build" ]; then  rm -rf ${PKGDIR%-*}-build; fi
 
+
   
 
 
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4111 - jhalfs/trunk

[pierre]

Author: pierre
Date: Mon Jul 15 07:13:48 2019
New Revision: 4111

Log:
Fix the TEST variable when CONFIG_TESTS is not set:
This is another bug exposed by the new menu system. The TEST variable was set
inside the menu "test settings". But this menu depends on CONFIG_TESTS, and
is not executed if CONFIG_TESTS is not set. So that, the TEST variable was
not set if CONFIG_TESTS was not set (while with the former menu suystem,
it was set to 0). Due to the logic in lfs.xsl, this resulted in all the
tests being run, instead of none...
Move the setting of the TEST variable outside the "test settings" menu.

Modified:
   jhalfs/trunk/Config.in

Modified: jhalfs/trunk/Config.in
==
--- jhalfs/trunk/Config.in  Wed Jun 19 00:56:39 2019(r4110)
+++ jhalfs/trunk/Config.in  Mon Jul 15 07:13:48 2019(r4111)
@@ -795,6 +795,8 @@
 bool"Abort the build on the first test failure"
 endchoice
 
+endmenu # test settings
+
 configTEST
 int
 default"0"if !CONFIG_TESTS
@@ -806,9 +808,7 @@
 bool
 defaultn if NO_BOMB
 defaulty if BOMB
-
-#--- End Test Suites
-endmenu # test settings
+   #--- End Test Suites
 
 #--- Package Management
 config  PKGMNGT
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4110 - jhalfs/trunk/BLFS/xsl

[pierre]

Author: pierre
Date: Wed Jun 19 00:56:39 2019
New Revision: 4110

Log:
Don't output role="nodump" in "not-pack" mode

Modified:
   jhalfs/trunk/BLFS/xsl/scripts.xsl

Modified: jhalfs/trunk/BLFS/xsl/scripts.xsl
==
--- jhalfs/trunk/BLFS/xsl/scripts.xsl   Sat Jun 15 13:16:35 2019(r4109)
+++ jhalfs/trunk/BLFS/xsl/scripts.xsl   Wed Jun 19 00:56:39 2019(r4110)
@@ -539,6 +539,7 @@
 
   
 
+  
   
 
 cat > ~/.vimrc EOF
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4108 - in jhalfs/trunk: . menu

[pierre]

Author: pierre
Date: Sat Jun 15 10:25:10 2019
New Revision: 4108

Log:
Update to Kconfiglib version 12.4.0. This removes the need to use
".configuration.old"

Modified:
   jhalfs/trunk/Makefile
   jhalfs/trunk/jhalfs
   jhalfs/trunk/menu/kconfiglib.py
   jhalfs/trunk/menu/menuconfig.py

Modified: jhalfs/trunk/Makefile
==
--- jhalfs/trunk/Makefile   Sat Jun 15 08:26:23 2019(r4107)
+++ jhalfs/trunk/Makefile   Sat Jun 15 10:25:10 2019(r4108)
@@ -12,12 +12,12 @@
@$$(grep RUN_ME configuration 2>/dev/null | sed -e 's@RUN_ME=\"@@' -e 
's@\"@@')
 
 menuconfig:
-   @cp -a configuration .configuration.old 2>/dev/null || true
+   @cp -a configuration configuration.old 2>/dev/null || true
@CONFIG_="" KCONFIG_CONFIG=configuration $(CONFIG)/menuconfig.py 
$(CONFIG_CONFIG_IN)
 
 # Clean up
 
 clean:
-   rm -f configuration .configuration.old error
+   rm -f configuration configuration.old error
 
 .PHONY: all menuconfig clean

Modified: jhalfs/trunk/jhalfs
==
--- jhalfs/trunk/jhalfs Sat Jun 15 08:26:23 2019(r4107)
+++ jhalfs/trunk/jhalfs Sat Jun 15 10:25:10 2019(r4108)
@@ -131,7 +131,7 @@
 # If the user has not saved his configuration file, let's ask
 # if he or she really wants to run this stuff
 time_current=$(stat -c '%Y' configuration 2>/dev/null || date +%s)
-time_old=$(stat -c '%Y' .configuration.old 2>/dev/null || printf '%s' 
"$time_current")
+time_old=$(stat -c '%Y' configuration.old 2>/dev/null || printf '%s' 
"$time_current")
 if [ "$(printf '%d' "$time_old")" -ge "$(printf '%d' "$time_current")" ] ; then
   printf 'Do you want to run jhalfs? yes/no (yes): '
   read -r ANSWER

Modified: jhalfs/trunk/menu/kconfiglib.py
==
--- jhalfs/trunk/menu/kconfiglib.py Sat Jun 15 08:26:23 2019(r4107)
+++ jhalfs/trunk/menu/kconfiglib.py Sat Jun 15 10:25:10 2019(r4108)
@@ -12,6 +12,11 @@
 See the homepage at https://github.com/ulfalizer/Kconfiglib for a longer
 overview.
 
+Since Kconfiglib 12.0.0, the library version is available in
+kconfiglib.VERSION, which is a (, , ) tuple, e.g.
+(12, 0, 0).
+
+
 Using Kconfiglib on the Linux kernel with the Makefile targets
 ==
 
@@ -47,8 +52,17 @@
 make kmenuconfig
 
 
-This target runs the curses menuconfig interface with Python 3 (Python 2 is
-currently not supported for the menuconfig).
+This target runs the curses menuconfig interface with Python 3. As of
+Kconfiglib 12.2.0, both Python 2 and Python 3 are supported (previously, only
+Python 3 was supported, so this was a backport).
+
+
+make guiconfig
+--
+
+This target runs the Tkinter menuconfig interface. Both Python 2 and Python 3
+are supported. To change the Python interpreter used, pass
+PYTHONCMD= to 'make'. The default is 'python'.
 
 
 make [ARCH=] iscriptconfig
@@ -56,7 +70,7 @@
 
 This target gives an interactive Python prompt where a Kconfig instance has
 been preloaded and is available in 'kconf'. To change the Python interpreter
-used, pass PYTHONCMD= to make. The default is "python".
+used, pass PYTHONCMD= to 'make'. The default is 'python'.
 
 To get a feel for the API, try evaluating and printing the symbols in
 kconf.defined_syms, and explore the MenuNode menu tree starting at
@@ -382,7 +396,7 @@
 -
 
 'source' and 'rsource' accept glob patterns, sourcing all matching Kconfig
-files. They require at least one matching file, throwing a KconfigError
+files. They require at least one matching file, raising a KconfigError
 otherwise.
 
 For example, the following statement might source sub1/foofoofoo and
@@ -437,8 +451,8 @@
 all assignments to undefined symbols within .config files. By default, no
 such warnings are generated.
 
-This warning can also be enabled/disabled via
-Kconfig.enable/disable_undef_warnings().
+This warning can also be enabled/disabled via the Kconfig.warn_assign_undef
+variable.
 
 
 Preprocessor user functions defined in Python
@@ -529,8 +543,10 @@
 
 # Get rid of some attribute lookups. These are obvious in context.
 from glob import iglob
-from os.path import dirname, exists, expandvars, isabs, islink, join, \
-relpath, split
+from os.path import dirname, exists, expandvars, islink, join, realpath
+
+
+VERSION = (12, 4, 0)
 
 
 # File layout:
@@ -619,9 +635,8 @@
   top-level Kconfig file. If a file is source'd multiple times, it will
   appear multiple times. Use set() to get unique filenames.
 
-  Note: Using this for incremental builds is redundant. Kconfig.sync_deps()
-  already ind

[alfs-log] r4107 - in jhalfs/trunk: . BLFS/xsl pkgmngt

[pierre]

Author: pierre
Date: Sat Jun 15 08:26:23 2019
New Revision: 4107

Log:
Various fixes and improvements coming from github:
- the case for "pax" in packInstall.sh.prog
- an error in packageManager.xml.porg (comment before  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

Modified:
   jhalfs/trunk/BLFS/xsl/gen-install.xsl
   jhalfs/trunk/BLFS/xsl/gen_pkg_list.xsl
   jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl
   jhalfs/trunk/BLFS/xsl/scripts.xsl
   jhalfs/trunk/Makefile
   jhalfs/trunk/pkgmngt/packInstall.sh.porg
   jhalfs/trunk/pkgmngt/packageManager.xml.porg

Modified: jhalfs/trunk/BLFS/xsl/gen-install.xsl
==
--- jhalfs/trunk/BLFS/xsl/gen-install.xsl   Thu Apr 25 02:17:56 2019
(r4106)
+++ jhalfs/trunk/BLFS/xsl/gen-install.xsl   Sat Jun 15 08:26:23 2019
(r4107)
@@ -6,6 +6,7 @@
 
 
   
+
 
-  
+  
 
   
 
@@ -98,8 +97,7 @@
   
 
   
-
-  
+
   
   
 

Modified: jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl
==
--- jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl Thu Apr 25 02:17:56 2019
(r4106)
+++ jhalfs/trunk/BLFS/xsl/lfs_make_book.xsl Sat Jun 15 08:26:23 2019
(r4107)
@@ -15,9 +15,9 @@
   $package='dbus' or
   $package='vim' or
   $package='systemd' or
-  $package='ninja' or
   $package='Python' or
   $package='shadow'"/>
+  true
   true
   
 
@@ -35,10 +35,9 @@
   $package='dbus' or
   $package='vim' or
   $package='systemd' or
-  $package='ninja' or
   $package='Python' or
   $package='shadow'"/>
-  
+  
 
   
 

Modified: jhalfs/trunk/BLFS/xsl/scripts.xsl
==
--- jhalfs/trunk/BLFS/xsl/scripts.xsl   Thu Apr 25 02:17:56 2019(r4106)
+++ jhalfs/trunk/BLFS/xsl/scripts.xsl   Sat Jun 15 08:26:23 2019(r4107)
@@ -71,15 +71,15 @@
   
 
 
+
   
 
 for libdir in /lib /usr/lib $(find /opt -name lib); do
   find $libdir -name \*.la   \
  ! -path \*ImageMagick\* \
-delete
-done
-
-
+done
 
   
@@ -103,6 +103,11 @@
 
   
 
+
+
+
   
 
 
@@ -138,27 +143,28 @@
   #!/bin/bash
 set -e
 unset MAKELEVEL
-
 
+
   
 
 
   
-  export JH_PKG_DIR=
+  
+export JH_PKG_DIR=
   
   
 SRC_DIR=${JH_SRC_ARCHIVE}${JH_SRC_SUBDIRS:+/${JH_PKG_DIR}}
 BUILD_DIR=${JH_BUILD_ROOT}${JH_BUILD_SUBDIRS:+/${JH_PKG_DIR}}
 mkdir -p $SRC_DIR
 mkdir -p $BUILD_DIR
-
 
 
 
-  
-INFOLOG=$(pwd)/info-${JH_PKG_DIR}
+  
+
+INFOLOG=$(pwd)/info-${JH_PKG_DIR}
 TESTLOG=$(pwd)/test-${JH_PKG_DIR}
 unset MAKEFLAGS
 #MAKEFLAGS=-j4
@@ -166,41 +172,47 @@
 : > $TESTLOG
 PKG_DEST=${BUILD_DIR}/dest
 rm -rf $PKG_DEST
-
 
   
 
-  
+  
+
+  
 
-  cd $BUILD_DIR
+  
+
+cd $BUILD_DIR
 [[ -n "$JH_KEEP_FILES" ]] || 
 
   
 sudo 
   
-  rm -rf $JH_UNPACKDIR unpacked
+  rm -rf $JH_UNPACKDIR unpacked
+
 
   
 
   
 
   
-  exit
+  
+exit
+
 
   
 
 
 
   
+
 
 
   
-cd $SRC_DIR
-
+
+cd $SRC_DIR
 
 
-
   
 
   
@@ -215,16 +227,16 @@
   sudo 
 
 rm -rf
-
 
-
-
-  echo Start Size: $(sudo du -skx --exclude home /) >> 
$INFOLOG
-
+
+
+  
+echo Start Size: $(sudo du -skx --exclude home /) >> $INFOLOG
 
 
 
-case $PACKAGE in
+
+case $PACKAGE in
   *.tar.gz|*.tar.bz2|*.tar.xz|*.tgz|*.tar.lzma)
  tar -xvf $SRC_DIR/$PACKAGE  unpacked
  JH_UNPACKDIR=`grep '[^./]\+' unpacked | head -n1 | sed 's@^\./@@;s@/.*@@'`
@@ -247,16 +259,19 @@
  JH_UNPACKDIR=$JH_PKG_DIR-build
  mkdir $JH_UNPACKDIR
  cp $SRC_DIR/$PACKAGE $JH_UNPACKDIR
- cp $(find . -mindepth 1 -maxdepth 1 -type l) $JH_UNPACKDIR
+ ADDITIONAL="$(find . -mindepth 1 -maxdepth 1 -type l)"
+ if [ -n "$ADDITIONAL" ]; then
+ cp $ADDITIONAL $JH_UNPACKDIR
+ fi
  ;;
 esac
 export JH_UNPACKDIR
-cd $JH_UNPACKDIR
+cd $JH_UNPACKDIR
 
-
-
-  echo Start Time: ${SECONDS} >> $INFOLOG
-
+
+
+  
+echo Start 

[alfs-log] r4105 - in jhalfs/trunk: . common/libs

[pierre]

Author: pierre
Date: Thu Apr 25 01:44:43 2019
New Revision: 4105

Log:
Fix a few missing bits of the transition to the new menu subsystem

Modified:
   jhalfs/trunk/Makefile
   jhalfs/trunk/common/libs/func_install_blfs
   jhalfs/trunk/install-blfs-tools.sh

Modified: jhalfs/trunk/Makefile
==
--- jhalfs/trunk/Makefile   Wed Apr 24 09:16:20 2019(r4104)
+++ jhalfs/trunk/Makefile   Thu Apr 25 01:44:43 2019(r4105)
@@ -18,6 +18,6 @@
 # Clean up
 
 clean:
-   rm -f configuration configuration.old error
+   rm -f configuration .configuration.old error
 
 .PHONY: all menuconfig clean

Modified: jhalfs/trunk/common/libs/func_install_blfs
==
--- jhalfs/trunk/common/libs/func_install_blfs  Wed Apr 24 09:16:20 2019
(r4104)
+++ jhalfs/trunk/common/libs/func_install_blfs  Thu Apr 25 01:44:43 2019
(r4105)
@@ -25,7 +25,6 @@
 rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn
 rm -rf ${BUILDDIR}${BLFS_ROOT}/xsl/.svn
 rm -rf ${BUILDDIR}${BLFS_ROOT}/menu/.svn
-rm -rf ${BUILDDIR}${BLFS_ROOT}/menu/lxdialog/.svn
 
 # Set some harcoded envars to their proper values
 sed -i s@tracking-dir@$TRACKING_DIR@ \

Modified: jhalfs/trunk/install-blfs-tools.sh
==
--- jhalfs/trunk/install-blfs-tools.sh  Wed Apr 24 09:16:20 2019(r4104)
+++ jhalfs/trunk/install-blfs-tools.sh  Thu Apr 25 01:44:43 2019(r4105)
@@ -164,6 +164,9 @@
 
 # Clean-up
 [[ $VERBOSITY > 0 ]] && echo Cleaning the ${BUILDDIR}${BLFS_ROOT} directory
+rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn
+rm -rf ${BUILDDIR}${BLFS_ROOT}/xsl/.svn
+rm -rf ${BUILDDIR}${BLFS_ROOT}/menu/.svn
 # We do not want to keep an old version of the book:
 rm -rf ${BUILDDIR}${BLFS_ROOT}/$BLFS_XML
 rm -rf ${BUILDDIR}${BLFS_ROOT}/$LFS_XML
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page

[alfs-log] r4106 - jhalfs/trunk/pkgmngt

[pierre]

Author: pierre
Date: Thu Apr 25 02:17:56 2019
New Revision: 4106

Log:
Add the case of pnmixer to packInstall.sh.porg

Modified:
   jhalfs/trunk/pkgmngt/packInstall.sh.porg

Modified: jhalfs/trunk/pkgmngt/packInstall.sh.porg
==
--- jhalfs/trunk/pkgmngt/packInstall.sh.porgThu Apr 25 01:44:43 2019
(r4105)
+++ jhalfs/trunk/pkgmngt/packInstall.sh.porgThu Apr 25 02:17:56 2019
(r4106)
@@ -66,7 +66,7 @@
   cacerts*)
 VERSION=0.1
 ;;
-  btrfs*|node*)
+  btrfs*|node*|pnmixer*)
 VERSION=$(echo $1 | sed 's/^.*v//')
 ;;
   x265*) # can contain vd.d or just d.d: thanks to packagers
-- 
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page