Changeset 2758d94 for common/libs/func_wrt_Makefile

Timestamp:

04/11/2019 07:40:50 AM (5 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

0e4ddfa

Parents:

adbd09b

Message:

Use sect1info for getting informations on LFS packages:

• add sect1info sections to packagemanager.xml.xxx + various fixes
• add templates in LFS/lfs.xsl for script start and script end:
  • script start: define variables containing package information

print disk usage
unpack and change dir

• script end: print disk usage

remove build dir

• remove the corresponding operations from master.sh

File:

• common/libs/func_wrt_Makefile (modified) (6 diffs)

common/libs/func_wrt_Makefile

@@ -181 +181 @@
 ${NO_PROGRESS}  @export BASHBIN=\$(SHELL) && \$(SHELL) progress_bar.sh \$@ \$\$PPID &
         @echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@$version
-        @\$(PRT_DU) >>logs/\$@$version
+        @ : > envars
 EOF
 ) >> $MKFILE.tmp
@@ -202 +202 @@
 ${NO_PROGRESS}  @export BASHBIN=\$(SHELL) && \$(SHELL) progress_bar.sh \$@ \$\$PPID &
         @echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@$version
-        @\$(PRT_DU_CR) >>logs/\$@$version
+        @ : > envars
 EOF
 ) >> $MKFILE.tmp
@@ -228 +228 @@
 (
 cat << EOF
+        @\$(PRT_DU) >>logs/\$@$version
         @\$(call unpack,$FILE)
         @\$(call get_pkg_root_LUSER)
@@ -247 +248 @@
 ) >> $MKFILE.tmp
   fi
-(
-cat  << EOF
+
+(
+cat << EOF
+        @\$(PRT_DU_CR) >>logs/\$@$version
         @\$(call unpack2,$FILE)
         @\$(call get_pkg_root2)
@@ -337 +340 @@
 cat << EOF
         @source ~/.bashrc && \\
-        \$(CMDSDIR)/`dirname $file`/\$@ >> logs/\$@$version 2>&1 && \\
-        \$(PRT_DU) >>logs/\$@$version
+        \$(CMDSDIR)/`dirname $file`/\$@ >> \$(LOGDIR)/\$@$version 2>&1 && \\
+        if [ "${PROGNAME}" != lfs ]; then \$(PRT_DU) >>logs/\$@$version; fi
 EOF
 ) >> $MKFILE.tmp
@@ -354 +357 @@
 cat << EOF
         @source envars && \\
-        \$(crCMDSDIR)/`dirname $file`/\$@ >>logs/\$@$version 2>&1 && \\
-        \$(PRT_DU_CR) >>logs/\$@$version
+        \$(crCMDSDIR)/`dirname $file`/\$@ >>\$(crLOGDIR)/\$@$version 2>&1 && \\
+        if [ "${PROGNAME}" != lfs ]; then \$(PRT_DU_CR) >>logs/\$@$version; fi
 EOF
 ) >> $MKFILE.tmp