Changeset 27c5769
- Timestamp:
- 09/14/2013 10:31:49 AM (11 years ago)
- Branches:
- ablfs
- Children:
- b8cc36b
- Parents:
- f62e4c5
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
common/libs/func_book_parser
rf62e4c5 r27c5769 17 17 lfs) svn_root="LFS" ;; 18 18 hlfs) svn_root="HLFS" ;; 19 clfs) svn_root="cross-lfs" ;; 20 clfs2) svn_root="cross-lfs" ;; 21 clfs3) svn_root="cross-lfs" ;; 19 clfs*) svn_root="cross-lfs" ;; 22 20 *) echo "BOOK not defined in function <get_book>" 23 21 exit 1 ;; … … 26 24 # repo. If we've already extracted the commands, move on to getting the 27 25 # sources. 28 if ! [ -d ${PROGNAME}-$LFSVRS ] || ! [ -d ${PROGNAME}-$LFSVRS/.svn ]; then 29 svn co $SVN/${svn_root}/${TREE} ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1 26 if [ $PROGNAME == "lfs" ] || [ $PROGNAME == "hlfs" ] && [ ! -d ${PROGNAME}-${LFSVRS}/.svn ]; then 27 svn co $SVN/${svn_root}/${TREE} ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1 28 elif [ $PROGNAME == "clfs" ] || [ $PROGNAME == "clfs2" ] || [ $PROGNAME == "clfs3" ] && [ ! -d ${PROGNAME}-${LFSVRS}/.git ]; then 29 echo $TREE 30 git clone $GIT ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1 31 if [ ! $TREE == "development" ]; then 32 cd ${PROGNAME}-$LFSVRS 33 echo "Checking out $LFSVRS at $PWD in $TREE" 34 git checkout ${TREE} >>$LOGDIR/$LOG 2>&1 35 fi 30 36 else 31 37 cd ${PROGNAME}-$LFSVRS 32 svn up >>$LOGDIR/$LOG 2>&1 38 case $PROGNAME in 39 clfs*) git pull >>$LOGDIR/$LOG 2>&1 ;; 40 lfs | hlfs) svn up >>$LOGDIR/$LOG 2>&1 ;; 41 *) ;; 42 esac 33 43 fi 34 44 echo -ne "done\n" … … 49 59 cd $JHALFSDIR 50 60 case $PROGNAME in 51 clfs | clfs2 | clfs3)52 VERSION=$(xmllint --noent $BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //' -e 's/<\/.*//') ;;61 clfs*) 62 VERSION=$(xmllint --noent BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //' -e 's/<\/.*//') ;; 53 63 *) 54 64 VERSION=$(xmllint --noent $BOOK/prologue/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //' -e 's/<\/.*//') ;; … … 76 86 --stringparam lang $LANG \ 77 87 --stringparam sparc $SPARC64_PROC \ 78 -o ./${PROGNAME}-commands/ $XSL $BOOK/ $ARCH-index.xml >>$LOGDIR/$LOG 2>&188 -o ./${PROGNAME}-commands/ $XSL $BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1 79 89 ;; 80 90 … … 87 97 --stringparam page $PAGE \ 88 98 --stringparam lang $LANG \ 89 -o ./${PROGNAME}-commands/ $XSL $BOOK/ $ARCH-index.xml >>$LOGDIR/$LOG 2>&199 -o ./${PROGNAME}-commands/ $XSL $BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1 90 100 ;; 91 101 … … 98 108 --stringparam page $PAGE \ 99 109 --stringparam lang $LANG \ 100 -o ./${PROGNAME}-commands/ $XSL $BOOK/ $ARCH-index.xml >>$LOGDIR/$LOG 2>&1110 -o ./${PROGNAME}-commands/ $XSL $BOOK/BOOK/$ARCH-index.xml >>$LOGDIR/$LOG 2>&1 101 111 ;; 102 112 … … 162 172 echo -n "... " 163 173 case ${PROGNAME} in 164 clfs | clfs2 | clfs3)174 clfs*) 165 175 xsltproc --nonet --xinclude -o pkg_tarball_list packages.xsl \ 166 $BOOK/ materials/${ARCH}-chapter.xml >>$LOGDIR/$LOG 2>&1176 $BOOK/BOOK/materials/${ARCH}-chapter.xml >>$LOGDIR/$LOG 2>&1 167 177 ;; 168 178 hlfs) … … 179 189 $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1 180 190 ;; 191 *) 181 192 esac 182 193 -
common/libs/func_check_version.sh
rf62e4c5 r27c5769 90 90 91 91 # Maybe we should check xsltproc first? 92 eval $(xsltproc $COMMON_DIR/hostreqs.xsl $BOOK/prologue/hostreqs.xml) 92 case $PROGNAME in 93 clfs | clfs2 | clfs3) HOSTREQS="BOOK/prologue/common/hostreqs.xml" ;; 94 *) HOSTREQS="prologue/hostreqs.xml" ;; 95 esac 96 97 eval $(xsltproc $COMMON_DIR/hostreqs.xsl $BOOK/$HOSTREQS) 93 98 # Avoid translation of version strings 94 99 local LC_ALL=C -
jhalfs
rf62e4c5 r27c5769 153 153 development ) 154 154 case $PROGNAME in 155 clfs2 ) TREE=branches/clfs-sysroot/BOOK ;; 156 clfs3 ) TREE=branches/clfs-embedded/BOOK ;; 155 clfs* ) TREE="" ;; 157 156 *) TREE=trunk/BOOK ;; 158 157 esac … … 179 178 TREE=tags/${BRANCH_ID}/BOOK 180 179 ;; 181 clfs | clfs2 | clfs3)180 clfs* ) 182 181 LFSVRS=${BRANCH_ID} 183 TREE=tags/ ${BRANCH_ID}182 TREE=tags/clfs-${BRANCH_ID} 184 183 ;; 184 * ) 185 185 esac 186 186 ;; … … 194 194 case $PROGNAME in 195 195 # TODO: clfs is now on git 196 # clfs* ) declare -r SVN="http://svn.cross-lfs.org/svn/repos" ;; 197 * ) declare -r SVN="svn://svn.linuxfromscratch.org" ;; 196 clfs ) declare -r GIT="git://git.cross-lfs.org/cross-lfs" ;; 197 clfs2 ) declare -r GIT="git://git.cross-lfs.org/clfs-sysroot" ;; 198 clfs3 ) declare -r GIT="git://git.cross-lfs.org/clfs-embedded" ;; 199 *) declare -r SVN="svn://svn.linuxfromscratch.org" ;; 198 200 esac 199 201 declare -r LOG=000-masterscript.log … … 322 324 # 323 325 # Fix the XSL book parser 324 sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL} 326 case $PROGNAME in 327 clfs* ) sed 's,FAKEDIR,'${BOOK}/BOOK',' ${PACKAGE_DIR}/${XSL} > $JHALFSDIR/${XSL} ;; 328 lfs | hlfs ) sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL} ;; 329 * ) ;; 330 esac 325 331 export XSL=$JHALFSDIR/${XSL} 326 332 # … … 383 389 if [[ "$REBUILD_MAKEFILE" = "y" ]] ; then 384 390 case $PROGNAME in 385 clfs | clfs2 | clfs3)391 clfs* ) 386 392 VERSION=$(xmllint --noent $JHALFSDIR/$BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //' -e 's/<\/.*//') ;; 387 393 *)
Note:
See TracChangeset
for help on using the changeset viewer.