Changeset 76f8888
- Timestamp:
- 03/02/2013 02:14:44 PM (11 years ago)
- Branches:
- ablfs
- Children:
- 96857f8
- Parents:
- 960099f
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
LFS/lfs.xsl
r960099f r76f8888 119 119 <xsl:text>cd $PKGDIR
</xsl:text> 120 120 </xsl:if> 121 <xsl:apply-templates 122 select=".//screen[not(@role) or 123 @role != 'nodump']/userinput[ 124 @remap = 'pre' or 125 @remap = 'configure' or 126 @remap = 'make' or 127 @remap = 'test' and 128 not(current()/@id='ch-tools-dejagnu')]"/> 129 <xsl:if 130 test="ancestor::chapter[@id != 'chapter-temporary-tools'] and 131 $pkgmngt = 'y' and 132 descendant::screen[not(@role) or 133 @role != 'nodump']/userinput[ 134 @remap='install']"> 135 <xsl:text>mkdir -pv $PKG_DEST/{boot,etc,lib,bin,sbin} 136 mkdir -pv $PKG_DEST/usr/{lib,bin,sbin,include} 137 mkdir -pv $PKG_DEST/usr/share/{doc,info,man} 138 mkdir -pv $PKG_DEST/usr/share/man/man{1..8} 139 ln -sv share/{man,doc,info} $PKG_DEST/usr 140 case $(uname -m) in 141 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;; 142 esac 143 </xsl:text> 144 </xsl:if> 145 <xsl:if test="@id = 'ch-system-glibc' and 146 $pkgmngt = 'y'"> 147 <xsl:text>mkdir -pv $PKG_DEST/usr/include/{rpc,rpcsvc} 148 </xsl:text> 149 </xsl:if> 150 <xsl:apply-templates 151 select=".//screen[not(@role) or 152 @role != 'nodump']/userinput[@remap = 'install']"/> 153 <xsl:if test="ancestor::chapter[@id != 'chapter-temporary-tools'] and 154 $pkgmngt = 'y' and 155 descendant::screen[not(@role) or 156 @role != 'nodump']/userinput[ 157 @remap='install']"> 158 <xsl:if test="@id = 'ch-system-man-pages'"> 159 <!-- those files are provided by the shadow package --> 160 <xsl:text>rm -fv $PKG_DEST/usr/share/man/{man3/getspnam.3,man5/passwd.5} 161 </xsl:text> 162 </xsl:if> 163 <xsl:text>rm -fv $PKG_DEST/{,usr/}lib64 164 rm -fv $PKG_DEST/usr/{man,doc,info} 165 for dir in $PKG_DEST/usr/share/man/man{1..8}; do 166 [[ -z $(ls $dir) ]] && rmdir -v $dir 167 done 168 for dir in $PKG_DEST/usr/share/{doc,info,man}; do 169 [[ -z $(ls $dir) ]] && rmdir -v $dir 170 done 171 for dir in $PKG_DEST/usr/{lib,bin,sbin,include}; do 172 [[ -z $(ls $dir) ]] && rmdir -v $dir 173 done 174 for dir in $PKG_DEST/{boot,etc,lib,bin,sbin}; do 175 [[ -z $(ls $dir) ]] && rmdir -v $dir 176 done 177 packInstall 178 rm -rf $PKG_DEST 179 </xsl:text> 180 </xsl:if> 181 <xsl:if test="$testsuite='3' and @id='ch-tools-glibc'"> 182 <xsl:copy-of select="//userinput[@remap='locale-test']"/> 183 <xsl:text>
</xsl:text> 184 </xsl:if> 185 <xsl:if test="@id='ch-system-glibc'"> 186 <xsl:choose> 187 <xsl:when test="$full-locale='y'"> 188 <xsl:copy-of select="//userinput[@remap='locale-full']"/> 189 <xsl:text>
</xsl:text> 190 </xsl:when> 191 <xsl:otherwise> 192 <xsl:copy-of select="//userinput[@remap='locale-test']"/> 193 <xsl:text>
</xsl:text> 194 <xsl:if test="not(contains(string(//userinput[@remap='locale-test']),$lang)) and $lang!='C' and $lang!='POSIX'"> 195 <xsl:text>if LOCALE=`grep "</xsl:text> 196 <xsl:value-of select="$lang"/> 197 <xsl:text>/" $PKGDIR/localedata/SUPPORTED`; then 198 CHARMAP=`echo $LOCALE | sed 's,[^/]*/\([^ ]*\) [\],\1,'` 199 INPUT=`echo $LOCALE | sed 's,[/.].*,,'` 200 LOCALE=`echo $LOCALE | sed 's,/.*,,'` 201 localedef -i $INPUT -f $CHARMAP $LOCALE 202 fi 203 </xsl:text> 204 </xsl:if> 205 </xsl:otherwise> 206 </xsl:choose> 207 </xsl:if> 208 <xsl:apply-templates 209 select=".//screen[ 210 not(@role) or 211 @role != 'nodump' 212 ]/userinput[ 213 not(@remap) or 214 @remap='adjust' or 215 @remap='test' and current()/@id='ch-tools-dejagnu' 216 ]"/> 121 <xsl:apply-templates select="sect2| 122 screen[not(@role) or 123 @role!='nodump']/userinput"/> 217 124 <xsl:if test="@id='ch-system-creatingdirs'"> 218 125 <xsl:apply-templates … … 234 141 </exsl:document> 235 142 </xsl:if> 143 </xsl:template> 144 145 146 147 148 149 150 151 152 153 154 155 156 <xsl:template match="sect2"> 157 <xsl:apply-templates 158 select=".//screen[not(@role) or 159 @role != 'nodump']/userinput[ 160 @remap = 'pre' or 161 @remap = 'configure' or 162 @remap = 'make' or 163 @remap = 'test' and 164 not(current()/../@id='ch-tools-dejagnu')]"/> 165 <xsl:if 166 test="ancestor::chapter[@id != 'chapter-temporary-tools'] and 167 $pkgmngt = 'y' and 168 descendant::screen[not(@role) or 169 @role != 'nodump']/userinput[ 170 @remap='install']"> 171 <xsl:text>mkdir -pv $PKG_DEST/{boot,etc,lib,bin,sbin} 172 mkdir -pv $PKG_DEST/usr/{lib,bin,sbin,include} 173 mkdir -pv $PKG_DEST/usr/share/{doc,info,man} 174 mkdir -pv $PKG_DEST/usr/share/man/man{1..8} 175 ln -sv share/{man,doc,info} $PKG_DEST/usr 176 case $(uname -m) in 177 x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;; 178 esac 179 </xsl:text> 180 </xsl:if> 181 <xsl:if test="../@id = 'ch-system-glibc' and 182 $pkgmngt = 'y'"> 183 <xsl:text>mkdir -pv $PKG_DEST/usr/include/{rpc,rpcsvc} 184 </xsl:text> 185 </xsl:if> 186 <xsl:apply-templates 187 select=".//screen[not(@role) or 188 @role != 'nodump']/userinput[@remap = 'install']"/> 189 <xsl:if test="ancestor::chapter[@id != 'chapter-temporary-tools'] and 190 $pkgmngt = 'y' and 191 descendant::screen[not(@role) or 192 @role != 'nodump']/userinput[ 193 @remap='install']"> 194 <xsl:if test="../@id = 'ch-system-man-pages'"> 195 <!-- those files are provided by the shadow package --> 196 <xsl:text>rm -fv $PKG_DEST/usr/share/man/{man3/getspnam.3,man5/passwd.5} 197 </xsl:text> 198 </xsl:if> 199 <xsl:text>rm -fv $PKG_DEST/{,usr/}lib64 200 rm -fv $PKG_DEST/usr/{man,doc,info} 201 for dir in $PKG_DEST/usr/share/man/man{1..8}; do 202 [[ -z $(ls $dir) ]] && rmdir -v $dir 203 done 204 for dir in $PKG_DEST/usr/share/{doc,info,man}; do 205 [[ -z $(ls $dir) ]] && rmdir -v $dir 206 done 207 for dir in $PKG_DEST/usr/{lib,bin,sbin,include}; do 208 [[ -z $(ls $dir) ]] && rmdir -v $dir 209 done 210 for dir in $PKG_DEST/{boot,etc,lib,bin,sbin}; do 211 [[ -z $(ls $dir) ]] && rmdir -v $dir 212 done 213 packInstall 214 rm -rf $PKG_DEST 215 </xsl:text> 216 </xsl:if> 217 <xsl:if test="$testsuite='3' and 218 ../@id='ch-tools-glibc' and 219 @role='installation'"> 220 <xsl:copy-of select="//userinput[@remap='locale-test']"/> 221 <xsl:text>
</xsl:text> 222 </xsl:if> 223 <xsl:if test="../@id='ch-system-glibc' and @role='installation'"> 224 <xsl:choose> 225 <xsl:when test="$full-locale='y'"> 226 <xsl:copy-of select="//userinput[@remap='locale-full']"/> 227 <xsl:text>
</xsl:text> 228 </xsl:when> 229 <xsl:otherwise> 230 <xsl:copy-of select="//userinput[@remap='locale-test']"/> 231 <xsl:text>
</xsl:text> 232 <xsl:if test="not(contains(string(//userinput[@remap='locale-test']),$lang)) and $lang!='C' and $lang!='POSIX'"> 233 <xsl:text>if LOCALE=`grep "</xsl:text> 234 <xsl:value-of select="$lang"/> 235 <xsl:text>/" $PKGDIR/localedata/SUPPORTED`; then 236 CHARMAP=`echo $LOCALE | sed 's,[^/]*/\([^ ]*\) [\],\1,'` 237 INPUT=`echo $LOCALE | sed 's,[/.].*,,'` 238 LOCALE=`echo $LOCALE | sed 's,/.*,,'` 239 localedef -i $INPUT -f $CHARMAP $LOCALE 240 fi 241 </xsl:text> 242 </xsl:if> 243 </xsl:otherwise> 244 </xsl:choose> 245 </xsl:if> 246 <xsl:apply-templates 247 select=".//screen[ 248 not(@role) or 249 @role != 'nodump' 250 ]/userinput[ 251 not(@remap) or 252 @remap='adjust' or 253 @remap='test' and current()/../@id='ch-tools-dejagnu' 254 ]"/> 236 255 </xsl:template> 237 256 -
common/libs/func_book_parser
r960099f r76f8888 138 138 echo -n " ${L_arrow}${BOLD}LFS${R_arrow} build... " 139 139 pushd $BOOK > /dev/null 140 bash process-scripts.sh >> $LOGDIR/$LOG 2>&1 140 if [ -f process.scripts.sh ]; then 141 bash process-scripts.sh >> $LOGDIR/$LOG 2>&1 142 fi 141 143 popd > /dev/null 142 144 xsltproc --nonet \ -
common/libs/func_wrt_Makefile
r960099f r76f8888 97 97 e2fsprogs-libs) echo $(grep "^e2fsprogs" $JHALFSDIR/pkg_tarball_list | head -n1 ) 98 98 ;; 99 libcap) echo $(grep "^libcap" $JHALFSDIR/pkg_tarball_list | head -n1 ) 100 ;; 99 101 util-linux-libs) echo $(grep "^util-linux" $JHALFSDIR/pkg_tarball_list | head -n1 ) 100 102 ;; -
common/makefile-functions
r960099f r76f8888 183 183 echo ; \ 184 184 echo $(WHITE)Please send the $(BOLD)$(MOUNT_PT)/jhalfs/$(1)$(WHITE) ; \ 185 echo file to $(BOLD) manuel@linuxfromscratch.org$(WHITE) ; \185 echo file to $(BOLD)jhalfs-reports@linuxfromscratch.org$(WHITE) ; \ 186 186 echo ; \ 187 187 echo That will help us to keep more accurate SBU and ; \ … … 201 201 @echo the next steps:$(WHITE) 202 202 @echo 203 @echo $(tab_)- Mount the virtual kernel file systems. 204 @echo 203 205 @echo $(tab_)- Enter to the chroot using the command found 204 206 @echo $(tab_)in the section -Entering the Chroot Environment- … … 207 209 @echo $(tab_)- Set a password for the root user. 208 210 @echo 209 @echo $(tab_)- Edit or create /etc/fstab, /etc/hosts, /etc/sysconfig/clock, 210 @echo $(tab_)/etc/sysconfig/console, /etc/sysconfig/network, 211 @echo $(tab_)/etc/sysconfig//network-devices/ifconfig.eth0/ipv4 and 212 @echo $(tab_)any other configuration file required to suit your needs. 213 @echo 214 @echo $(tab_)- Exit from the chroot. 211 @echo $(tab_)- Edit or create /etc/fstab, 212 @echo $(tab_) " /etc/hosts," 213 @echo $(tab_) " /etc/sysconfig/clock," 214 @echo $(tab_) " /etc/sysconfig/console," 215 @echo $(tab_) " /etc/sysconfig/network," 216 @echo $(tab_) " /etc/sysconfig/ifconfig.eth0" 217 @echo $(tab_)and any other configuration file required to suit your needs. 215 218 @echo 216 219 @echo $(tab_)- Set-up the boot loader, except if building CLFS with METHOD=boot. 217 @echo $(tab_)You can set-up the host bootloader or the new boot-loader 218 @echo $(tab_)installed on the new system. 219 @echo $(tab_)If the last, you must to mount the virtual filesystems, re-enter 220 @echo $(tab_)the chroot and be sure that /dev is populated with the 221 @echo $(tab_)required devices before configure the boot-loader. When ready, 222 @echo $(tab_)exit from the chroot and umount the filesystems 220 @echo 221 @echo $(tab_)You can set-up the new boot-loader installed on the new system 222 @echo $(tab_)or the host bootloader. 223 @echo 224 @echo $(tab_)If the last, it is better to exit first from the chroot. 225 @echo 226 @echo $(tab_)- Exit from the chroot and umount the filesystems. 223 227 @echo 224 228 @echo If you are an experienced LFS user, several of those steps can be
Note:
See TracChangeset
for help on using the changeset viewer.