zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge trunk r3694

Browse source
This commit is contained in:
Pierre Labastie 2013-04-05 13:26:25 +00:00
parent 07278936c8
commit 1825286a86
4 changed files with 85 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
common/hostreqs.xsl Normal file
View file

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $Id:$ -->
<!-- Extracts minimal versions from LFS book host requirements,
and generates a script containing statements of the
form MIN_prog_VERSION=xx.yy.zz.
-->
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
version="1.0">
<xsl:output method="text"/>
<xsl:template match="/sect1">
<xsl:apply-templates select=".//listitem//emphasis"/>
</xsl:template>
<xsl:template match="emphasis">
<xsl:text>local MIN_</xsl:text>
<xsl:choose>
<xsl:when test="contains(string(),' ')">
<xsl:value-of select=
"substring-before(substring-after(normalize-space(string()),
' '),
'-')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="substring-before(string(),'-')"/>
</xsl:otherwise>
</xsl:choose>
<xsl:text>_VER=</xsl:text>
<xsl:value-of select="substring-after(string(),'-')"/>
<xsl:text>
</xsl:text>
</xsl:template>
</xsl:stylesheet>

29
common/libs/func_book_parser
View file

@ -25,36 +25,17 @@ get_book() { #
# Grab a fresh book if it's missing, otherwise, update it from the # Grab a fresh book if it's missing, otherwise, update it from the
# repo. If we've already extracted the commands, move on to getting the # repo. If we've already extracted the commands, move on to getting the
# sources. # sources.
if [ -d ${PROGNAME}-$LFSVRS ] ; then if ! [ -d ${PROGNAME}-$LFSVRS ] || ! [ -d ${PROGNAME}-$LFSVRS/.svn ]; then
cd ${PROGNAME}-$LFSVRS
if LC_ALL=C svn up | grep -q At && \
test -d $JHALFSDIR/${PROGNAME}-commands && \
test -f $JHALFSDIR/pkg_tarball_list ; then
# Set the canonical book version
echo -ne "done\n"
cd $JHALFSDIR
case $PROGNAME in
clfs | clfs2 | clfs3 )
VERSION=$(xmllint --noent $BOOK/prologue/$ARCH/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //' -e 's/<\/.*//') ;;
*)
VERSION=$(xmllint --noent $BOOK/prologue/bookinfo.xml 2>/dev/null | grep subtitle | sed -e 's/^.*ion //' -e 's/<\/.*//') ;;
esac
get_sources
else
echo -ne "done\n"
extract_commands
fi
else
svn co $SVN/${svn_root}/${TREE} ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1 svn co $SVN/${svn_root}/${TREE} ${PROGNAME}-$LFSVRS >>$LOGDIR/$LOG 2>&1
echo -ne "done\n" else
extract_commands cd ${PROGNAME}-$LFSVRS
svn up >>$LOGDIR/$LOG 2>&1
fi fi
echo -ne "done\n"
else else
echo -ne "Using $BOOK as book's sources ...\n" echo -ne "Using $BOOK as book's sources ...\n"
extract_commands
fi fi
echo -ne " Document version ${L_arrow}${BOLD}${VERSION}${R_arrow}\n"
} }
#----------------------------# #----------------------------#

58
common/libs/func_check_version.sh
View file

@ -65,13 +65,19 @@ inline_doc
major=${1##*(0)}; minor=${2##*(0)}; revision=${3##*(0)} major=${1##*(0)}; minor=${2##*(0)}; revision=${3##*(0)}
# #
# Compare against minimum acceptable version.. # Compare against minimum acceptable version..
(( major > ref_major )) && echo " ${spaceSTR:${#tst_version}}${GREEN}OK${OFF}" && return (( major > ref_major )) &&
echo " ${spaceSTR:${#tst_version}}${GREEN}OK${OFF} (Min version: ${ref_version})" &&
return
(( major < ref_major )) && write_error_and_die (( major < ref_major )) && write_error_and_die
# major=ref_major # major=ref_major
(( minor < ref_minor )) && write_error_and_die (( minor < ref_minor )) && write_error_and_die
(( minor > ref_minor )) && echo " ${spaceSTR:${#tst_version}}${GREEN}OK${OFF}" && return (( minor > ref_minor )) &&
echo " ${spaceSTR:${#tst_version}}${GREEN}OK${OFF} (Min version: ${ref_version})" &&
return
# minor=ref_minor # minor=ref_minor
(( revision >= ref_revision )) && echo " ${spaceSTR:${#tst_version}}${GREEN}OK${OFF}" && return (( revision >= ref_revision )) &&
echo " ${spaceSTR:${#tst_version}}${GREEN}OK${OFF} (Min version: ${ref_version})" &&
return
# oops.. write error msg and die # oops.. write error msg and die
write_error_and_die write_error_and_die
@ -82,34 +88,36 @@ inline_doc
check_prerequisites() { # check_prerequisites() { #
#----------------------------# #----------------------------#
# Maybe we should check xsltproc first?
eval $(xsltproc $COMMON_DIR/hostreqs.xsl $BOOK/prologue/hostreqs.xml)
# Avoid translation of version strings # Avoid translation of version strings
local LC_ALL=C local LC_ALL=C
export LC_ALL export LC_ALL
# LFS/HLFS/CLFS prerequisites # LFS/HLFS/CLFS prerequisites
check_version "2.6.25" "`uname -r`" "KERNEL" check_version "$MIN_Kernel_VER" "`uname -r`" "KERNEL"
check_version "3.2" "$BASH_VERSION" "BASH" check_version "$MIN_Bash_VER" "$BASH_VERSION" "BASH"
check_version "4.1.2" "`gcc -dumpversion`" "GCC" check_version "$MIN_GCC_VER" "`gcc -dumpversion`" "GCC"
check_version "4.1.2" "`g++ -dumpversion`" "G++" check_version "$MIN_GCC_VER" "`g++ -dumpversion`" "G++"
check_version "2.5.1" "$(ldd --version | head -n1 | awk '{print $NF}')" "GLIBC" check_version "$MIN_Glibc_VER" "$(ldd --version | head -n1 | awk '{print $NF}')" "GLIBC"
check_version "2.17" "$(ld --version | head -n1 | awk '{print $NF}')" "BINUTILS" check_version "$MIN_Binutils_VER" "$(ld --version | head -n1 | awk '{print $NF}')" "BINUTILS"
check_version "1.18" "$(tar --version | head -n1 | cut -d" " -f4)" "TAR" check_version "$MIN_Tar_VER" "$(tar --version | head -n1 | cut -d" " -f4)" "TAR"
bzip2Ver="$(bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d" " -f8)" bzip2Ver="$(bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d" " -f8)"
check_version "1.0.4" "${bzip2Ver%%,*}" "BZIP2" check_version "$MIN_Bzip2_VER" "${bzip2Ver%%,*}" "BZIP2"
check_version "2.3" "$(bison --version | head -n1 | cut -d" " -f4)" "BISON" check_version "$MIN_Bison_VER" "$(bison --version | head -n1 | cut -d" " -f4)" "BISON"
check_version "6.9" "$(chown --version | head -n1 | cut -d")" -f2)" "COREUTILS" check_version "$MIN_Coreutils_VER" "$(chown --version | head -n1 | cut -d")" -f2)" "COREUTILS"
check_version "2.8.1" "$(diff --version | head -n1 | cut -d" " -f4)" "DIFF" check_version "$MIN_Diffutils_VER" "$(diff --version | head -n1 | cut -d" " -f4)" "DIFF"
check_version "4.2.31" "$(find --version | head -n1 | cut -d" " -f4)" "FIND" check_version "$MIN_Findutils_VER" "$(find --version | head -n1 | cut -d" " -f4)" "FIND"
check_version "3.1.5" "$(gawk --version | head -n1 | cut -d" " -f3)" "GAWK" check_version "$MIN_Gawk_VER" "$(gawk --version | head -n1 | cut -d" " -f3)" "GAWK"
check_version "2.5.1a" "$(grep --version | head -n1 | awk '{print $NF}')" "GREP" check_version "$MIN_Grep_VER" "$(grep --version | head -n1 | awk '{print $NF}')" "GREP"
check_version "1.3.12" "$(gzip --version 2>&1 | head -n1 | cut -d" " -f2)" "GZIP" check_version "$MIN_Gzip_VER" "$(gzip --version 2>&1 | head -n1 | cut -d" " -f2)" "GZIP"
check_version "1.4.10" "$(m4 --version 2>&1 | head -n1 | awk '{print $NF}')" "M4" check_version "$MIN_M4_VER" "$(m4 --version 2>&1 | head -n1 | awk '{print $NF}')" "M4"
check_version "3.81" "$(make --version | head -n1 | cut -d " " -f3 | cut -c1-4)" "MAKE" check_version "$MIN_Make_VER" "$(make --version | head -n1 | cut -d " " -f3 | cut -c1-4)" "MAKE"
check_version "2.5.4" "$(patch --version | head -n1 | sed 's/.*patch //')" "PATCH" check_version "$MIN_Patch_VER" "$(patch --version | head -n1 | sed 's/.*patch //')" "PATCH"
check_version "5.8.8" "$(perl -V:version | cut -f2 -d\')" "PERL" check_version "$MIN_Perl_VER" "$(perl -V:version | cut -f2 -d\')" "PERL"
check_version "4.1.5" "$(sed --version | head -n1 | cut -d" " -f4)" "SED" check_version "$MIN_Sed_VER" "$(sed --version | head -n1 | cut -d" " -f4)" "SED"
check_version "4.9" "$(makeinfo --version | head -n1 | awk '{ print$NF }')" "TEXINFO" check_version "$MIN_Texinfo_VER" "$(makeinfo --version | head -n1 | awk '{ print$NF }')" "TEXINFO"
check_version "5.0.0" "$(xz --version | head -n1 | cut -d" " -f4)" "XZ" check_version "$MIN_Xz_VER" "$(xz --version | head -n1 | cut -d" " -f4)" "XZ"
# Check for minimum sudo version # Check for minimum sudo version
SUDO_LOC="$(whereis -b sudo | cut -d" " -f2)" SUDO_LOC="$(whereis -b sudo | cut -d" " -f2)"
if [ -x $SUDO_LOC ]; then if [ -x $SUDO_LOC ]; then

14
jhalfs
View file

@ -187,7 +187,7 @@ case $BRANCH_ID in
esac esac
# Set the document location... # Set the document location...
BOOK=${BOOK:=$PROGNAME-$LFSVRS} BOOK=${BOOK:=$JHALFSDIR/$PROGNAME-$LFSVRS}
#--- Envars not sourced from configuration #--- Envars not sourced from configuration
@ -260,10 +260,6 @@ fi
### MAIN ### ### MAIN ###
################################### ###################################
# Check for build prerequisites.
echo
check_prerequisites
echo "${SD_BORDER}${nl_}"
validate_config validate_config
echo "${SD_BORDER}${nl_}" echo "${SD_BORDER}${nl_}"
@ -375,7 +371,9 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then
fi fi
# #
# Download or updates the book source
get_book get_book
extract_commands
echo "${SD_BORDER}${nl_}" echo "${SD_BORDER}${nl_}"
fi fi
@ -395,4 +393,10 @@ build_Makefile
echo "${SD_BORDER}${nl_}" echo "${SD_BORDER}${nl_}"
# Check for build prerequisites.
echo
cd $CWD
check_prerequisites
echo "${SD_BORDER}${nl_}"
# All is well, run the build (if requested)
run_make run_make