From df41521ba64fb5c4b2df2b5e8372b280e40ecc4d Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 6 Nov 2013 21:56:23 +0000 Subject: [PATCH] Merge trunk 3745:3750 --- BLFS/xsl/gen_pkg_list.xsl | 4 +- CLFS/clfs.xsl | 52 ++++++++++++---------- CLFS/master.sh | 92 +++++++++++++++++++-------------------- 3 files changed, 79 insertions(+), 69 deletions(-) diff --git a/BLFS/xsl/gen_pkg_list.xsl b/BLFS/xsl/gen_pkg_list.xsl index 6079e90..8b529b2 100644 --- a/BLFS/xsl/gen_pkg_list.xsl +++ b/BLFS/xsl/gen_pkg_list.xsl @@ -209,7 +209,9 @@ + 'xorg7-') and + not(contains(preceding-sibling::sect1[1]/@id, + 'driver'))"> diff --git a/CLFS/clfs.xsl b/CLFS/clfs.xsl index fdf239a..ece3334 100644 --- a/CLFS/clfs.xsl +++ b/CLFS/clfs.xsl @@ -6,7 +6,8 @@ - @@ -30,8 +31,8 @@ --> - - + + @@ -217,6 +218,25 @@ + + + + + + + >> $TEST_LOG 2>&1 || true + + + >> $TEST_LOG 2>&1 + + || true + + + + + + + @@ -237,25 +257,6 @@ - - - - - - - >> $TEST_LOG 2>&1 || true - - - >> $TEST_LOG 2>&1 - - || true - - - - - - - @@ -278,6 +279,13 @@ + + + + + + + diff --git a/CLFS/master.sh b/CLFS/master.sh index f8109a2..3332d1a 100644 --- a/CLFS/master.sh +++ b/CLFS/master.sh @@ -18,14 +18,14 @@ host_prep_Makefiles() { # cat << EOF 023-creatingtoolsdir: @\$(call echo_message, Building) - @mkdir \$(MOUNT_PT)/tools && \\ + @install -dv \$(MOUNT_PT)/tools && \\ rm -f /tools && \\ ln -s \$(MOUNT_PT)/tools / @\$(call housekeeping) 024-creatingcrossdir: 023-creatingtoolsdir @\$(call echo_message, Building) - @mkdir -v \$(MOUNT_PT)/cross-tools && \\ + @install -dv \$(MOUNT_PT)/cross-tools && \\ rm -f /cross-tools && \\ ln -s \$(MOUNT_PT)/cross-tools / @\$(call housekeeping) @@ -33,13 +33,15 @@ cat << EOF 025-addinguser: 024-creatingcrossdir @\$(call echo_message, Building) @if [ ! -d \$(LUSER_HOME) ]; then \\ - groupadd \$(LGROUP); \\ - useradd -s /bin/bash -g \$(LGROUP) -m -k /dev/null \$(LUSER); \\ + groupadd \$(LGROUP); \\ + useradd -s /bin/bash -g \$(LGROUP) -d \$(LUSER_HOME) \$(LUSER); \\ + mkdir -pv \$(LUSER_HOME); \\ + chown -v \$(LUSER):\$(LGROUP) \$(LUSER_HOME); \\ else \\ - touch luser-exist; \\ - fi; - @chown \$(LUSER) \$(MOUNT_PT)/tools && \\ - chown \$(LUSER) \$(MOUNT_PT)/cross-tools && \\ + touch luser-exist; \\ + fi + @chown -v \$(LUSER) \$(MOUNT_PT)/tools && \\ + chown -v \$(LUSER) \$(MOUNT_PT)/cross-tools && \\ chmod -R a+wt \$(MOUNT_PT)/\$(SCRIPT_ROOT) && \\ chmod a+wt \$(SRCSDIR) @\$(call housekeeping) @@ -48,7 +50,7 @@ cat << EOF @\$(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; + 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; @@ -67,9 +69,12 @@ cat << EOF echo "export CLFS_TARGET32=\"${TARGET32}\"" >> \$(LUSER_HOME)/.bashrc && \\ echo "source $JHALFSDIR/envars" >> \$(LUSER_HOME)/.bashrc @chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc && \\ + chmod a+wt \$(MOUNT_PT) && \\ + if [ -d \$(MOUNT_PT)/var ]; then \\ + chown -R \$(LUSER) \$(MOUNT_PT)/var; \\ + fi && \\ touch envars && \\ - chmod -R a+wt \$(MOUNT_PT) && \\ - chown -R \$(LUSER) \$(MOUNT_PT)/\$(SCRIPT_ROOT) + chown \$(LUSER):\$(LGROUP) envars @\$(call housekeeping) EOF ) >> $MKFILE.tmp @@ -556,7 +561,7 @@ final_system_Makefiles() { # CHROOT_Unpack "$pkg_tarball" # If the testsuites must be run, initialize the log file case $name in - binutils | gcc | glibc | eglibc ) + binutils | gcc | glibc | eglibc | gmp | mpfr | mpc | isl | cloog ) [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}" ;; * ) @@ -845,17 +850,11 @@ bootable_Makefiles() { # #--------------------------------------# build_Makefile() { # Construct a Makefile from the book scripts #--------------------------------------# - # - # Script crashes if error trapping is on - # -set +e - declare -f method_cmds -set -e echo "...Creating Makefile... ${BOLD}START${OFF}" cd $JHALFSDIR/${PROGNAME}-commands - # Start with a clean files + # Start with clean files >$MKFILE >$MKFILE.tmp @@ -879,8 +878,6 @@ set -e # Add the CUSTOM_TOOLS targets, if needed [[ "$CUSTOM_TOOLS" = "y" ]] && wrt_CustomTools_target - # Add the BLFS_TOOL targets, if needed - [[ "$BLFS_TOOL" = "y" ]] && wrt_blfs_tool_targets # Add a header, some variables and include the function file # to the top of the real Makefile. @@ -915,7 +912,8 @@ cat << EOF all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS create-sbu_du-report mk_CUSTOM_TOOLS mk_BLFS_TOOL @sudo make do-housekeeping @echo "$VERSION - jhalfs build" > clfs-release && \\ - sudo mv clfs-release \$(MOUNT_PT)/etc + sudo mv clfs-release \$(MOUNT_PT)/etc && \\ + sudo chown root:root \$(MOUNT_PT)/etc/clfs-release @\$(call echo_finished,$VERSION) ck_UID: @@ -935,7 +933,7 @@ mk_SETUP: #---------------AS LUSER mk_CROSS: mk_SETUP @\$(call echo_PHASE,Cross and Temporary Tools) - @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) AS_LUSER" ) + @( \$(SU_LUSER) "make -C \$(MOUNT_PT)/\$(SCRIPT_ROOT) BREAKPOINT=\$(BREAKPOINT) AS_LUSER" ) @sudo make restore-luser-env @touch \$@ @@ -951,7 +949,14 @@ mk_SYSTOOLS: mk_SUDO @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CHROOT_JAIL") @touch \$@ -mk_CUSTOM_TOOLS: create-sbu_du-report +mk_BLFS_TOOL: create-sbu_du-report + @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ + \$(call sh_echo_PHASE,Building BLFS_TOOL); \\ + (sudo \$(CHROOT1) "make -C $BLFS_ROOT/work"); \\ + fi; + @touch \$@ + +mk_CUSTOM_TOOLS: mk_BLFS_TOOL @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\ sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\ @@ -959,14 +964,6 @@ mk_CUSTOM_TOOLS: create-sbu_du-report fi; @touch \$@ -mk_BLFS_TOOL: mk_CUSTOM_TOOLS - @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ - \$(call sh_echo_PHASE,Building BLFS_TOOL); \\ - sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\ - sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) BLFS_TOOL"; \\ - fi; - @touch \$@ - SETUP: $host_prep AS_LUSER: $cross_tools $temptools SUDO: $orphan_scripts @@ -975,7 +972,6 @@ PREP_CHROOT_JAIL: ${chroottools} CHROOT_JAIL: SHELL=/tools/bin/bash CHROOT_JAIL: $testsuitetools $basicsystem $bootscripttools $bootabletools CUSTOM_TOOLS: $custom_list -BLFS_TOOL: $blfs_tool create-sbu_du-report: mk_SYSTOOLS @@ -988,7 +984,13 @@ create-sbu_du-report: mk_SYSTOOLS do-housekeeping: @-umount \$(MOUNT_PT)/dev/pts - @-umount \$(MOUNT_PT)/dev/shm + @-if [ -h \$(MOUNT_PT)/dev/shm ]; then \\ + link=\$\$(readlink \$(MOUNT_PT)/dev/shm); \\ + umount \$(MOUNT_PT)/\$\$link; \\ + unset link; \\ + else \\ + umount \$(MOUNT_PT)/dev/shm; \\ + fi @-umount \$(MOUNT_PT)/dev @-umount \$(MOUNT_PT)/sys @-umount \$(MOUNT_PT)/proc @@ -1026,7 +1028,7 @@ ck_UID: echo "|However, if this is the boot environment |"; \\ echo "| the command you are looking for is |"; \\ echo "| make makesys |"; \\ - echo "| to finish off the build |"; \\ + echo "| to complete the build |"; \\ echo "+--------------------------------------------------+"; \\ exit 1; \\ fi @@ -1042,7 +1044,7 @@ mk_SETUP: mk_CROSS: mk_SETUP @\$(call echo_PHASE,Cross Tool) - @(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) AS_LUSER" ) + @( \$(SU_LUSER) "make -C \$(MOUNT_PT)/\$(SCRIPT_ROOT) BREAKPOINT=\$(BREAKPOINT) AS_LUSER" ) @touch \$@ mk_SUDO: mk_CROSS @@ -1056,7 +1058,14 @@ mk_FINAL: @( source /root/.bash_profile && make BREAKPOINT=\$(BREAKPOINT) AS_ROOT ) @touch \$@ -mk_CUSTOM_TOOLS: mk_FINAL +mk_BLFS_TOOL: mk_FINAL + @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ + \$(call sh_echo_PHASE,Building BLFS_TOOL); \\ + ( make -C $BLFS_ROOT/work ); \\ + fi; + @touch \$@ + +mk_CUSTOM_TOOLS: mk_BLFS_TOOL @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\ mkdir -p ${TRACKING_DIR}; \\ @@ -1064,21 +1073,12 @@ mk_CUSTOM_TOOLS: mk_FINAL fi; @touch \$@ -mk_BLFS_TOOL: mk_CUSTOM_TOOLS - @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ - \$(call sh_echo_PHASE,Building BLFS_TOOL); \\ - mkdir -p $TRACKING_DIR; \\ - ( source /root/.bash_profile && make BREAKPOINT=\$(BREAKPOINT) BLFS_TOOL ); \\ - fi - @touch \$@ - SETUP: $host_prep AS_LUSER: $cross_tools $temptools ${boottools} SUDO: $orphan_scripts AS_ROOT: SHELL=/tools/bin/bash AS_ROOT: $testsuitetools $basicsystem $bootscripttools $bootabletools CUSTOM_TOOLS: $custom_list -BLFS_TOOL: $blfs_tool do-housekeeping: @-rm /tools /cross-tools