- Timestamp:
- 11/03/2013 10:49:46 PM (11 years ago)
- Branches:
- 2.4, ablfs-more, legacy, new_features, trunk
- Children:
- 2982825
- Parents:
- 730436a
- Location:
- CLFS
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
CLFS/clfs.xsl
r730436a r269d81c 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
r730436a r269d81c 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; \\ … … 557 559 # If the testsuites must be run, initialize the log file 558 560 case $name in 559 binutils | gcc | glibc | eglibc )561 binutils | gcc | glibc | eglibc | gmp | mpfr | mpc | isl | cloog ) 560 562 [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}" 561 563 ;; … … 874 876 # Add the CUSTOM_TOOLS targets, if needed 875 877 [[ "$CUSTOM_TOOLS" = "y" ]] && wrt_CustomTools_target 876 # Add the BLFS_TOOL targets, if needed877 [[ "$BLFS_TOOL" = "y" ]] && wrt_blfs_tool_targets878 878 879 879 # Add a header, some variables and include the function file … … 910 910 @sudo make do-housekeeping 911 911 @echo "$VERSION - jhalfs build" > clfs-release && \\ 912 sudo mv clfs-release \$(MOUNT_PT)/etc 912 sudo mv clfs-release \$(MOUNT_PT)/etc && \\ 913 sudo chown root:root \$(MOUNT_PT)/etc/clfs-release 913 914 @\$(call echo_finished,$VERSION) 914 915 … … 946 947 @touch \$@ 947 948 948 mk_CUSTOM_TOOLS: create-sbu_du-report 949 mk_BLFS_TOOL: create-sbu_du-report 950 @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ 951 \$(call sh_echo_PHASE,Building BLFS_TOOL); \\ 952 (sudo \$(CHROOT1) "make -C $BLFS_ROOT/work"); \\ 953 fi; 954 @touch \$@ 955 956 mk_CUSTOM_TOOLS: mk_BLFS_TOOL 949 957 @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ 950 958 \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\ 951 959 sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\ 952 960 (sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CUSTOM_TOOLS"); \\ 953 fi;954 @touch \$@955 956 mk_BLFS_TOOL: mk_CUSTOM_TOOLS957 @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\958 \$(call sh_echo_PHASE,Building BLFS_TOOL); \\959 sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\960 sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) BLFS_TOOL"; \\961 961 fi; 962 962 @touch \$@ … … 970 970 CHROOT_JAIL: $testsuitetools $basicsystem $bootscripttools $bootabletools 971 971 CUSTOM_TOOLS: $custom_list 972 BLFS_TOOL: $blfs_tool973 972 974 973 … … 983 982 do-housekeeping: 984 983 @-umount \$(MOUNT_PT)/dev/pts 985 @-umount \$(MOUNT_PT)/dev/shm 984 @-if [ -h \$(MOUNT_PT)/dev/shm ]; then \\ 985 link=\$\$(readlink \$(MOUNT_PT)/dev/shm); \\ 986 umount \$(MOUNT_PT)/\$\$link; \\ 987 unset link; \\ 988 else \\ 989 umount \$(MOUNT_PT)/dev/shm; \\ 990 fi 986 991 @-umount \$(MOUNT_PT)/dev 987 992 @-umount \$(MOUNT_PT)/sys … … 1051 1056 @touch \$@ 1052 1057 1053 mk_CUSTOM_TOOLS: mk_FINAL 1058 mk_BLFS_TOOL: mk_FINAL 1059 @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\ 1060 \$(call sh_echo_PHASE,Building BLFS_TOOL); \\ 1061 ( make -C $BLFS_ROOT/work ); \\ 1062 fi; 1063 @touch \$@ 1064 1065 mk_CUSTOM_TOOLS: mk_BLFS_TOOL 1054 1066 @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ 1055 1067 \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\ … … 1059 1071 @touch \$@ 1060 1072 1061 mk_BLFS_TOOL: mk_CUSTOM_TOOLS1062 @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\1063 \$(call sh_echo_PHASE,Building BLFS_TOOL); \\1064 mkdir -p $TRACKING_DIR; \\1065 ( source /root/.bash_profile && make BREAKPOINT=\$(BREAKPOINT) BLFS_TOOL ); \\1066 fi1067 @touch \$@1068 1069 1073 SETUP: $host_prep 1070 1074 AS_LUSER: $cross_tools $temptools ${boottools} … … 1073 1077 AS_ROOT: $testsuitetools $basicsystem $bootscripttools $bootabletools 1074 1078 CUSTOM_TOOLS: $custom_list 1075 BLFS_TOOL: $blfs_tool1076 1079 1077 1080 do-housekeeping:
Note:
See TracChangeset
for help on using the changeset viewer.
