- Timestamp:
- 11/06/2013 09:56:23 PM (11 years ago)
- Branches:
- ablfs
- Children:
- 84a651c
- Parents:
- adc85de
- Location:
- CLFS
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
CLFS/clfs.xsl
radc85de rdf41521 7 7 <!-- $Id$ --> 8 8 9 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 9 <xsl:stylesheet 10 xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 10 11 xmlns:exsl="http://exslt.org/common" 11 12 extension-element-prefixes="exsl" … … 31 32 <xsl:param name="bomb-testsuite" select="n"/> 32 33 33 <!-- Install vim-lang package? -->34 <xsl:param name="vim-lang" select=" y"/>34 <!-- Install vim-lang package? OBSOLETE should always be 'n'--> 35 <xsl:param name="vim-lang" select="n"/> 35 36 36 37 <!-- Time zone --> … … 218 219 </xsl:when> 219 220 <!-- Fixing toolchain test suites run XXX more to fix --> 221 <xsl:when test="contains(string(),'glibc-check-log')"> 222 <xsl:choose> 223 <xsl:when test="$testsuite != '0'"> 224 <xsl:value-of select="substring-before(string(),'2>')"/> 225 <xsl:choose> 226 <xsl:when test="$bomb-testsuite = 'n'"> 227 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 228 </xsl:when> 229 <xsl:otherwise> 230 <xsl:text>>> $TEST_LOG 2>&1</xsl:text> 231 <xsl:if test="contains(string(),' -k ')"> 232 <xsl:text> || true</xsl:text> 233 </xsl:if> 234 <xsl:text>
</xsl:text> 235 </xsl:otherwise> 236 </xsl:choose> 237 </xsl:when> 238 </xsl:choose> 239 </xsl:when> 220 240 <xsl:when test="string() = 'make check' or 221 241 contains(string(), 'make -k check')"> … … 238 258 </xsl:choose> 239 259 </xsl:when> 240 <xsl:when test="contains(string(),'glibc-check-log')">241 <xsl:choose>242 <xsl:when test="$testsuite != '0'">243 <xsl:value-of select="substring-before(string(),'>g')"/>244 <xsl:choose>245 <xsl:when test="$bomb-testsuite = 'n'">246 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text>247 </xsl:when>248 <xsl:otherwise>249 <xsl:text>>> $TEST_LOG 2>&1</xsl:text>250 <xsl:if test="contains(string(),' -k ')">251 <xsl:text> || true</xsl:text>252 </xsl:if>253 <xsl:text>
</xsl:text>254 </xsl:otherwise>255 </xsl:choose>256 </xsl:when>257 </xsl:choose>258 </xsl:when>259 260 <xsl:when test="contains(string(),'test_summary') or 260 261 contains(string(),'expect -c')"> … … 279 280 <xsl:text>
</xsl:text> 280 281 </xsl:when> 282 <!-- Avoid calling hostname in chroot --> 283 <xsl:when test="ancestor::note[@os='a00']"> 284 <xsl:if test="$method='boot'"> 285 <xsl:apply-templates/> 286 <xsl:text>
</xsl:text> 287 </xsl:if> 288 </xsl:when> 281 289 <!-- The rest of commands --> 282 290 <xsl:otherwise> -
CLFS/master.sh
radc85de rdf41521 19 19 023-creatingtoolsdir: 20 20 @\$(call echo_message, Building) 21 @ mkdir\$(MOUNT_PT)/tools && \\21 @install -dv \$(MOUNT_PT)/tools && \\ 22 22 rm -f /tools && \\ 23 23 ln -s \$(MOUNT_PT)/tools / … … 26 26 024-creatingcrossdir: 023-creatingtoolsdir 27 27 @\$(call echo_message, Building) 28 @ mkdir -v \$(MOUNT_PT)/cross-tools && \\28 @install -dv \$(MOUNT_PT)/cross-tools && \\ 29 29 rm -f /cross-tools && \\ 30 30 ln -s \$(MOUNT_PT)/cross-tools / … … 34 34 @\$(call echo_message, Building) 35 35 @if [ ! -d \$(LUSER_HOME) ]; then \\ 36 groupadd \$(LGROUP); \\ 37 useradd -s /bin/bash -g \$(LGROUP) -m -k /dev/null \$(LUSER); \\ 36 groupadd \$(LGROUP); \\ 37 useradd -s /bin/bash -g \$(LGROUP) -d \$(LUSER_HOME) \$(LUSER); \\ 38 mkdir -pv \$(LUSER_HOME); \\ 39 chown -v \$(LUSER):\$(LGROUP) \$(LUSER_HOME); \\ 38 40 else \\ 39 40 fi ;41 @chown \$(LUSER) \$(MOUNT_PT)/tools && \\42 chown \$(LUSER) \$(MOUNT_PT)/cross-tools && \\41 touch luser-exist; \\ 42 fi 43 @chown -v \$(LUSER) \$(MOUNT_PT)/tools && \\ 44 chown -v \$(LUSER) \$(MOUNT_PT)/cross-tools && \\ 43 45 chmod -R a+wt \$(MOUNT_PT)/\$(SCRIPT_ROOT) && \\ 44 46 chmod a+wt \$(SRCSDIR) … … 49 51 @if [ -f \$(LUSER_HOME)/.bashrc -a ! -f \$(LUSER_HOME)/.bashrc.XXX ]; then \\ 50 52 mv \$(LUSER_HOME)/.bashrc \$(LUSER_HOME)/.bashrc.XXX; \\ 51 fi ;53 fi 52 54 @if [ -f \$(LUSER_HOME)/.bash_profile -a ! -f \$(LUSER_HOME)/.bash_profile.XXX ]; then \\ 53 55 mv \$(LUSER_HOME)/.bash_profile \$(LUSER_HOME)/.bash_profile.XXX; \\ … … 68 70 echo "source $JHALFSDIR/envars" >> \$(LUSER_HOME)/.bashrc 69 71 @chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc && \\ 72 chmod a+wt \$(MOUNT_PT) && \\ 73 if [ -d \$(MOUNT_PT)/var ]; then \\ 74 chown -R \$(LUSER) \$(MOUNT_PT)/var; \\ 75 fi && \\ 70 76 touch envars && \\ 71 chmod -R a+wt \$(MOUNT_PT) && \\ 72 chown -R \$(LUSER) \$(MOUNT_PT)/\$(SCRIPT_ROOT) 77 chown \$(LUSER):\$(LGROUP) envars 73 78 @\$(call housekeeping) 74 79 EOF … … 557 562 # If the testsuites must be run, initialize the log file 558 563 case $name in 559 binutils | gcc | glibc | eglibc )564 binutils | gcc | glibc | eglibc | gmp | mpfr | mpc | isl | cloog ) 560 565 [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}" 561 566 ;; … … 846 851 build_Makefile() { # Construct a Makefile from the book scripts 847 852 #--------------------------------------# 848 #849 # Script crashes if error trapping is on850 #851 set +e852 declare -f method_cmds853 set -e854 853 855 854 echo "...Creating Makefile... ${BOLD}START${OFF}" 856 855 857 856 cd $JHALFSDIR/${PROGNAME}-commands 858 # Start with aclean files857 # Start with clean files 859 858 >$MKFILE 860 859 >$MKFILE.tmp … … 880 879 # Add the CUSTOM_TOOLS targets, if needed 881 880 [[ "$CUSTOM_TOOLS" = "y" ]] && wrt_CustomTools_target 882 # Add the BLFS_TOOL targets, if needed883 [[ "$BLFS_TOOL" = "y" ]] && wrt_blfs_tool_targets884 881 885 882 # Add a header, some variables and include the function file … … 916 913 @sudo make do-housekeeping 917 914 @echo "$VERSION - jhalfs build" > clfs-release && \\ 918 sudo mv clfs-release \$(MOUNT_PT)/etc 915 sudo mv clfs-release \$(MOUNT_PT)/etc && \\ 916 sudo chown root:root \$(MOUNT_PT)/etc/clfs-release 919 917 @\$(call echo_finished,$VERSION) 920 918 … … 936 934 mk_CROSS: mk_SETUP 937 935 @\$(call echo_PHASE,Cross and Temporary Tools) 938 @( sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && makeBREAKPOINT=\$(BREAKPOINT) AS_LUSER" )936 @( \$(SU_LUSER) "make -C \$(MOUNT_PT)/\$(SCRIPT_ROOT) BREAKPOINT=\$(BREAKPOINT) AS_LUSER" ) 939 937 @sudo make restore-luser-env 940 938 @touch \$@ … … 952 950 @touch \$@ 953 951 954 mk_CUSTOM_TOOLS: create-sbu_du-report 952 mk_BLFS_TOOL: create-sbu_du-report 953 @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ 954 \$(call sh_echo_PHASE,Building BLFS_TOOL); \\ 955 (sudo \$(CHROOT1) "make -C $BLFS_ROOT/work"); \\ 956 fi; 957 @touch \$@ 958 959 mk_CUSTOM_TOOLS: mk_BLFS_TOOL 955 960 @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ 956 961 \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\ 957 962 sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\ 958 963 (sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CUSTOM_TOOLS"); \\ 959 fi;960 @touch \$@961 962 mk_BLFS_TOOL: mk_CUSTOM_TOOLS963 @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\964 \$(call sh_echo_PHASE,Building BLFS_TOOL); \\965 sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\966 sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) BLFS_TOOL"; \\967 964 fi; 968 965 @touch \$@ … … 976 973 CHROOT_JAIL: $testsuitetools $basicsystem $bootscripttools $bootabletools 977 974 CUSTOM_TOOLS: $custom_list 978 BLFS_TOOL: $blfs_tool979 975 980 976 … … 989 985 do-housekeeping: 990 986 @-umount \$(MOUNT_PT)/dev/pts 991 @-umount \$(MOUNT_PT)/dev/shm 987 @-if [ -h \$(MOUNT_PT)/dev/shm ]; then \\ 988 link=\$\$(readlink \$(MOUNT_PT)/dev/shm); \\ 989 umount \$(MOUNT_PT)/\$\$link; \\ 990 unset link; \\ 991 else \\ 992 umount \$(MOUNT_PT)/dev/shm; \\ 993 fi 992 994 @-umount \$(MOUNT_PT)/dev 993 995 @-umount \$(MOUNT_PT)/sys … … 1027 1029 echo "| the command you are looking for is |"; \\ 1028 1030 echo "| make makesys |"; \\ 1029 echo "| to finish off the build|"; \\1031 echo "| to complete the build |"; \\ 1030 1032 echo "+--------------------------------------------------+"; \\ 1031 1033 exit 1; \\ … … 1043 1045 mk_CROSS: mk_SETUP 1044 1046 @\$(call echo_PHASE,Cross Tool) 1045 @( sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && makeBREAKPOINT=\$(BREAKPOINT) AS_LUSER" )1047 @( \$(SU_LUSER) "make -C \$(MOUNT_PT)/\$(SCRIPT_ROOT) BREAKPOINT=\$(BREAKPOINT) AS_LUSER" ) 1046 1048 @touch \$@ 1047 1049 … … 1057 1059 @touch \$@ 1058 1060 1059 mk_CUSTOM_TOOLS: mk_FINAL 1061 mk_BLFS_TOOL: mk_FINAL 1062 @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ 1063 \$(call sh_echo_PHASE,Building BLFS_TOOL); \\ 1064 ( make -C $BLFS_ROOT/work ); \\ 1065 fi; 1066 @touch \$@ 1067 1068 mk_CUSTOM_TOOLS: mk_BLFS_TOOL 1060 1069 @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ 1061 1070 \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\ … … 1065 1074 @touch \$@ 1066 1075 1067 mk_BLFS_TOOL: mk_CUSTOM_TOOLS1068 @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\1069 \$(call sh_echo_PHASE,Building BLFS_TOOL); \\1070 mkdir -p $TRACKING_DIR; \\1071 ( source /root/.bash_profile && make BREAKPOINT=\$(BREAKPOINT) BLFS_TOOL ); \\1072 fi1073 @touch \$@1074 1075 1076 SETUP: $host_prep 1076 1077 AS_LUSER: $cross_tools $temptools ${boottools} … … 1079 1080 AS_ROOT: $testsuitetools $basicsystem $bootscripttools $bootabletools 1080 1081 CUSTOM_TOOLS: $custom_list 1081 BLFS_TOOL: $blfs_tool1082 1082 1083 1083 do-housekeeping:
Note:
See TracChangeset
for help on using the changeset viewer.
