Changeset d540567
- Timestamp:
- 03/18/2006 11:42:56 AM (19 years ago)
- Branches:
- experimental
- Children:
- 389fe2a
- Parents:
- e2860d3
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
HLFS/hlfs.xsl
re2860d3 rd540567 16 16 <!-- What libc implentation must be used? --> 17 17 <xsl:param name="model" select="glibc"/> 18 19 <!-- Is the host kernel using grsecurity? --> 20 <xsl:param name="grsecurity_host" select="0"/> 21 22 <!-- Compile the keymap into the kernel? --> 23 <xsl:param name="keymap" select="none"/> 18 24 19 25 <!-- Run test suites? … … 78 84 </xsl:otherwise> 79 85 </xsl:choose> 80 <xsl:if test="sect2[@role='installation'] or 86 <xsl:if test="(sect2[@role='installation'] and 87 not(@id='bootable-kernel')) or 81 88 @id='ch-tools-adjusting' or 82 89 @id='ch-system-readjusting'"> … … 153 160 <xsl:text>
</xsl:text> 154 161 </xsl:when> 162 <!-- grsecurity kernel in the host? --> 163 <xsl:when test="ancestor::sect1[@id='ch-system-kernfs'] and 164 contains(string(),'sysctl') 165 and $grsecurity_host ='0'"/> 155 166 <!-- Setting $LC_ALL and $LANG for /etc/profile --> 156 167 <xsl:when test="ancestor::sect1[@id='bootable-profile'] and … … 162 173 <xsl:text>
</xsl:text> 163 174 </xsl:when> 175 <!-- Fixing bootscripts installation --> 176 <xsl:when test="ancestor::sect1[@id='bootable-bootscripts'] and 177 string() = 'make install'"> 178 <xsl:text>make install
</xsl:text> 179 <xsl:text>cd ../blfs-bootscripts-&blfs-bootscripts-version;
</xsl:text> 180 </xsl:when> 181 <!-- Compile the keymap into the kernel? --> 182 <xsl:when test="contains(string(),'defkeymap') and 183 $keymap = 'none'"/> 164 184 <!-- Copying the kernel config file --> 165 185 <xsl:when test="string() = 'make mrproper'"> … … 198 218 ancestor::sect1[@id='ch-system-binutils'] 199 219 and $testsuite = '0'"/> 200 <!-- Don't stop on strip run --> 201 <xsl:when test="contains(string(),'strip ')"> 220 <!-- Don't stop on strip run and chapter05 GCC installation test--> 221 <xsl:when test="contains(string(),'strip ') or 222 ancestor::sect2[@id='testing-gcc']"> 202 223 <xsl:apply-templates/> 203 224 <xsl:text> || true
</xsl:text> … … 219 240 <xsl:when test="ancestor::sect1[@id='ch-system-groff']"> 220 241 <xsl:text>$PAGE</xsl:text> 242 </xsl:when> 243 <xsl:when test="ancestor::sect1[@id='bootable-kernel']"> 244 <xsl:value-of select="$keymap"/> 221 245 </xsl:when> 222 246 <xsl:otherwise> -
common/common-functions
re2860d3 rd540567 661 661 --stringparam model $MODEL \ 662 662 --stringparam testsuite $TEST \ 663 --stringparam keymap $KEYMAP \ 664 --stringparam grsecurity_host $GRSECURITY_HOST \ 663 665 -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1 664 666 for i in $(find ./${PROGNAME}-commands/chapter07/*) ; do -
common/config
re2860d3 rd540567 27 27 # 2 = all chapter06 testsuites 28 28 # 3 = all chapter05 and chapter06 testsuites 29 TEST= 029 TEST=1 30 30 31 31 #--- Run the stripping phases 0(no)/1(yes) 32 STRIP= 032 STRIP=1 33 33 34 34 #--- page definition for groff letter/A4 … … 45 45 LANG=$LANG 46 46 47 #--- Include the keymap in the kernel if defined 48 KEYMAP=/usr/share/kbd/keymaps/i386/qwerty/us.map.gz 47 #--- Include the keymap in the kernel if defined. Path to the 48 # keymap file relative to /usr/share/kbd/keymaps/ 49 # (e.g., i386/qwerty/us.map.gz) or "none" 50 KEYMAP=none 49 51 50 52 #=== Variables needed by ICA === -
common/func_validate_configs.sh
re2860d3 rd540567 93 93 for config_param in KEYMAP; do 94 94 [[ $1 = "1" ]] && echo "`eval echo $PARAM_VALS`" 95 [[ -z "${!config_param}" ]] && continue96 [[ -e " ${!config_param}" ]] && [[ -s "${!config_param}" ]] && continue95 [[ "${!config_param}" = "none" ]] && continue 96 [[ -e "/usr/share/kbd/keymaps/${!config_param}" ]] && [[ -s "/usr/share/kbd/keymaps/${!config_param}" ]] && continue 97 97 98 98 # If you make it this far then there is a problem
Note:
See TracChangeset
for help on using the changeset viewer.