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

Merge trunk 3745:3750

Browse source
This commit is contained in:
Pierre Labastie 2013-11-06 21:56:23 +00:00
parent adc85de5af
commit df41521ba6
3 changed files with 79 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BLFS/xsl/gen_pkg_list.xsl
View file

@ -209,7 +209,9 @@
</xsl:text> </xsl:text>
<xsl:choose> <xsl:choose>
<xsl:when test="contains(preceding-sibling::sect1[1]/@id, <xsl:when test="contains(preceding-sibling::sect1[1]/@id,
'xorg7-') and not(@id='printproto')"> 'xorg7-') and
not(contains(preceding-sibling::sect1[1]/@id,
'driver'))">
<xsl:call-template name="expand-deps"> <xsl:call-template name="expand-deps">
<xsl:with-param name="section"> <xsl:with-param name="section">
<xsl:value-of select="preceding-sibling::sect1[1]/@id"/> <xsl:value-of select="preceding-sibling::sect1[1]/@id"/>

52
CLFS/clfs.xsl
View file

@ -6,7 +6,8 @@
<!-- $Id$ --> <!-- $Id$ -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" <xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:exsl="http://exslt.org/common" xmlns:exsl="http://exslt.org/common"
extension-element-prefixes="exsl" extension-element-prefixes="exsl"
version="1.0"> version="1.0">
@ -30,8 +31,8 @@
--> -->
<xsl:param name="bomb-testsuite" select="n"/> <xsl:param name="bomb-testsuite" select="n"/>
<!-- Install vim-lang package? --> <!-- Install vim-lang package? OBSOLETE should always be 'n'-->
<xsl:param name="vim-lang" select="y"/> <xsl:param name="vim-lang" select="n"/>
<!-- Time zone --> <!-- Time zone -->
<xsl:param name="timezone" select="GMT"/> <xsl:param name="timezone" select="GMT"/>
@ -217,6 +218,25 @@
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<!-- Fixing toolchain test suites run XXX more to fix --> <!-- Fixing toolchain test suites run XXX more to fix -->
<xsl:when test="contains(string(),'glibc-check-log')">
<xsl:choose>
<xsl:when test="$testsuite != '0'">
<xsl:value-of select="substring-before(string(),'2&gt;')"/>
<xsl:choose>
<xsl:when test="$bomb-testsuite = 'n'">
<xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1</xsl:text>
<xsl:if test="contains(string(),' -k ')">
<xsl:text> || true</xsl:text>
</xsl:if>
<xsl:text>&#xA;</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
</xsl:choose>
</xsl:when>
<xsl:when test="string() = 'make check' or <xsl:when test="string() = 'make check' or
contains(string(), 'make -k check')"> contains(string(), 'make -k check')">
<xsl:choose> <xsl:choose>
@ -237,25 +257,6 @@
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<xsl:when test="contains(string(),'glibc-check-log')">
<xsl:choose>
<xsl:when test="$testsuite != '0'">
<xsl:value-of select="substring-before(string(),'&gt;g')"/>
<xsl:choose>
<xsl:when test="$bomb-testsuite = 'n'">
<xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1</xsl:text>
<xsl:if test="contains(string(),' -k ')">
<xsl:text> || true</xsl:text>
</xsl:if>
<xsl:text>&#xA;</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
</xsl:choose>
</xsl:when>
<xsl:when test="contains(string(),'test_summary') or <xsl:when test="contains(string(),'test_summary') or
contains(string(),'expect -c')"> contains(string(),'expect -c')">
<xsl:choose> <xsl:choose>
@ -278,6 +279,13 @@
<xsl:value-of select="substring-after(string(),'make ')"/> <xsl:value-of select="substring-after(string(),'make ')"/>
<xsl:text>&#xA;</xsl:text> <xsl:text>&#xA;</xsl:text>
</xsl:when> </xsl:when>
<!-- Avoid calling hostname in chroot -->
<xsl:when test="ancestor::note[@os='a00']">
<xsl:if test="$method='boot'">
<xsl:apply-templates/>
<xsl:text>&#xA;</xsl:text>
</xsl:if>
</xsl:when>
<!-- The rest of commands --> <!-- The rest of commands -->
<xsl:otherwise> <xsl:otherwise>
<xsl:apply-templates/> <xsl:apply-templates/>

92
CLFS/master.sh
View file

@ -18,14 +18,14 @@ host_prep_Makefiles() { #
cat << EOF cat << EOF
023-creatingtoolsdir: 023-creatingtoolsdir:
@\$(call echo_message, Building) @\$(call echo_message, Building)
@mkdir \$(MOUNT_PT)/tools && \\ @install -dv \$(MOUNT_PT)/tools && \\
rm -f /tools && \\ rm -f /tools && \\
ln -s \$(MOUNT_PT)/tools / ln -s \$(MOUNT_PT)/tools /
@\$(call housekeeping) @\$(call housekeeping)
024-creatingcrossdir: 023-creatingtoolsdir 024-creatingcrossdir: 023-creatingtoolsdir
@\$(call echo_message, Building) @\$(call echo_message, Building)
@mkdir -v \$(MOUNT_PT)/cross-tools && \\ @install -dv \$(MOUNT_PT)/cross-tools && \\
rm -f /cross-tools && \\ rm -f /cross-tools && \\
ln -s \$(MOUNT_PT)/cross-tools / ln -s \$(MOUNT_PT)/cross-tools /
@\$(call housekeeping) @\$(call housekeeping)
@ -33,13 +33,15 @@ cat << EOF
025-addinguser: 024-creatingcrossdir 025-addinguser: 024-creatingcrossdir
@\$(call echo_message, Building) @\$(call echo_message, Building)
@if [ ! -d \$(LUSER_HOME) ]; then \\ @if [ ! -d \$(LUSER_HOME) ]; then \\
groupadd \$(LGROUP); \\ groupadd \$(LGROUP); \\
useradd -s /bin/bash -g \$(LGROUP) -m -k /dev/null \$(LUSER); \\ useradd -s /bin/bash -g \$(LGROUP) -d \$(LUSER_HOME) \$(LUSER); \\
mkdir -pv \$(LUSER_HOME); \\
chown -v \$(LUSER):\$(LGROUP) \$(LUSER_HOME); \\
else \\ else \\
touch luser-exist; \\ touch luser-exist; \\
fi; fi
@chown \$(LUSER) \$(MOUNT_PT)/tools && \\ @chown -v \$(LUSER) \$(MOUNT_PT)/tools && \\
chown \$(LUSER) \$(MOUNT_PT)/cross-tools && \\ chown -v \$(LUSER) \$(MOUNT_PT)/cross-tools && \\
chmod -R a+wt \$(MOUNT_PT)/\$(SCRIPT_ROOT) && \\ chmod -R a+wt \$(MOUNT_PT)/\$(SCRIPT_ROOT) && \\
chmod a+wt \$(SRCSDIR) chmod a+wt \$(SRCSDIR)
@\$(call housekeeping) @\$(call housekeeping)
@ -48,7 +50,7 @@ cat << EOF
@\$(call echo_message, Building) @\$(call echo_message, Building)
@if [ -f \$(LUSER_HOME)/.bashrc -a ! -f \$(LUSER_HOME)/.bashrc.XXX ]; then \\ @if [ -f \$(LUSER_HOME)/.bashrc -a ! -f \$(LUSER_HOME)/.bashrc.XXX ]; then \\
mv \$(LUSER_HOME)/.bashrc \$(LUSER_HOME)/.bashrc.XXX; \\ mv \$(LUSER_HOME)/.bashrc \$(LUSER_HOME)/.bashrc.XXX; \\
fi; fi
@if [ -f \$(LUSER_HOME)/.bash_profile -a ! -f \$(LUSER_HOME)/.bash_profile.XXX ]; then \\ @if [ -f \$(LUSER_HOME)/.bash_profile -a ! -f \$(LUSER_HOME)/.bash_profile.XXX ]; then \\
mv \$(LUSER_HOME)/.bash_profile \$(LUSER_HOME)/.bash_profile.XXX; \\ mv \$(LUSER_HOME)/.bash_profile \$(LUSER_HOME)/.bash_profile.XXX; \\
fi; fi;
@ -67,9 +69,12 @@ cat << EOF
echo "export CLFS_TARGET32=\"${TARGET32}\"" >> \$(LUSER_HOME)/.bashrc && \\ echo "export CLFS_TARGET32=\"${TARGET32}\"" >> \$(LUSER_HOME)/.bashrc && \\
echo "source $JHALFSDIR/envars" >> \$(LUSER_HOME)/.bashrc echo "source $JHALFSDIR/envars" >> \$(LUSER_HOME)/.bashrc
@chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc && \\ @chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc && \\
chmod a+wt \$(MOUNT_PT) && \\
if [ -d \$(MOUNT_PT)/var ]; then \\
chown -R \$(LUSER) \$(MOUNT_PT)/var; \\
fi && \\
touch envars && \\ touch envars && \\
chmod -R a+wt \$(MOUNT_PT) && \\ chown \$(LUSER):\$(LGROUP) envars
chown -R \$(LUSER) \$(MOUNT_PT)/\$(SCRIPT_ROOT)
@\$(call housekeeping) @\$(call housekeeping)
EOF EOF
) >> $MKFILE.tmp ) >> $MKFILE.tmp
@ -556,7 +561,7 @@ final_system_Makefiles() { #
CHROOT_Unpack "$pkg_tarball" CHROOT_Unpack "$pkg_tarball"
# If the testsuites must be run, initialize the log file # If the testsuites must be run, initialize the log file
case $name in case $name in
binutils | gcc | glibc | eglibc ) binutils | gcc | glibc | eglibc | gmp | mpfr | mpc | isl | cloog )
[[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}" [[ "$TEST" != "0" ]] && CHROOT_wrt_test_log "${this_script}"
;; ;;
* ) * )
@ -845,17 +850,11 @@ bootable_Makefiles() { #
#--------------------------------------# #--------------------------------------#
build_Makefile() { # Construct a Makefile from the book scripts build_Makefile() { # Construct a Makefile from the book scripts
#--------------------------------------# #--------------------------------------#
#
# Script crashes if error trapping is on
#
set +e
declare -f method_cmds
set -e
echo "...Creating Makefile... ${BOLD}START${OFF}" echo "...Creating Makefile... ${BOLD}START${OFF}"
cd $JHALFSDIR/${PROGNAME}-commands cd $JHALFSDIR/${PROGNAME}-commands
# Start with a clean files # Start with clean files
>$MKFILE >$MKFILE
>$MKFILE.tmp >$MKFILE.tmp
@ -879,8 +878,6 @@ set -e
# Add the CUSTOM_TOOLS targets, if needed # Add the CUSTOM_TOOLS targets, if needed
[[ "$CUSTOM_TOOLS" = "y" ]] && wrt_CustomTools_target [[ "$CUSTOM_TOOLS" = "y" ]] && wrt_CustomTools_target
# Add the BLFS_TOOL targets, if needed
[[ "$BLFS_TOOL" = "y" ]] && wrt_blfs_tool_targets
# Add a header, some variables and include the function file # Add a header, some variables and include the function file
# to the top of the real Makefile. # to the top of the real Makefile.
@ -915,7 +912,8 @@ cat << EOF
all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS create-sbu_du-report mk_CUSTOM_TOOLS mk_BLFS_TOOL all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS create-sbu_du-report mk_CUSTOM_TOOLS mk_BLFS_TOOL
@sudo make do-housekeeping @sudo make do-housekeeping
@echo "$VERSION - jhalfs build" > clfs-release && \\ @echo "$VERSION - jhalfs build" > clfs-release && \\
sudo mv clfs-release \$(MOUNT_PT)/etc sudo mv clfs-release \$(MOUNT_PT)/etc && \\
sudo chown root:root \$(MOUNT_PT)/etc/clfs-release
@\$(call echo_finished,$VERSION) @\$(call echo_finished,$VERSION)
ck_UID: ck_UID:
@ -935,7 +933,7 @@ mk_SETUP:
#---------------AS LUSER #---------------AS LUSER
mk_CROSS: mk_SETUP mk_CROSS: mk_SETUP
@\$(call echo_PHASE,Cross and Temporary Tools) @\$(call echo_PHASE,Cross and Temporary Tools)
@(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) AS_LUSER" ) @( \$(SU_LUSER) "make -C \$(MOUNT_PT)/\$(SCRIPT_ROOT) BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
@sudo make restore-luser-env @sudo make restore-luser-env
@touch \$@ @touch \$@
@ -951,7 +949,14 @@ mk_SYSTOOLS: mk_SUDO
@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CHROOT_JAIL") @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) CHROOT_JAIL")
@touch \$@ @touch \$@
mk_CUSTOM_TOOLS: create-sbu_du-report mk_BLFS_TOOL: create-sbu_du-report
@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
\$(call sh_echo_PHASE,Building BLFS_TOOL); \\
(sudo \$(CHROOT1) "make -C $BLFS_ROOT/work"); \\
fi;
@touch \$@
mk_CUSTOM_TOOLS: mk_BLFS_TOOL
@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
\$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\ \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\ sudo mkdir -p ${BUILDDIR}${TRACKING_DIR}; \\
@ -959,14 +964,6 @@ mk_CUSTOM_TOOLS: create-sbu_du-report
fi; fi;
@touch \$@ @touch \$@
mk_BLFS_TOOL: mk_CUSTOM_TOOLS
@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
\$(call sh_echo_PHASE,Building BLFS_TOOL); \\
sudo mkdir -p $BUILDDIR$TRACKING_DIR; \\
sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) BLFS_TOOL"; \\
fi;
@touch \$@
SETUP: $host_prep SETUP: $host_prep
AS_LUSER: $cross_tools $temptools AS_LUSER: $cross_tools $temptools
SUDO: $orphan_scripts SUDO: $orphan_scripts
@ -975,7 +972,6 @@ PREP_CHROOT_JAIL: ${chroottools}
CHROOT_JAIL: SHELL=/tools/bin/bash CHROOT_JAIL: SHELL=/tools/bin/bash
CHROOT_JAIL: $testsuitetools $basicsystem $bootscripttools $bootabletools CHROOT_JAIL: $testsuitetools $basicsystem $bootscripttools $bootabletools
CUSTOM_TOOLS: $custom_list CUSTOM_TOOLS: $custom_list
BLFS_TOOL: $blfs_tool
create-sbu_du-report: mk_SYSTOOLS create-sbu_du-report: mk_SYSTOOLS
@ -988,7 +984,13 @@ create-sbu_du-report: mk_SYSTOOLS
do-housekeeping: do-housekeeping:
@-umount \$(MOUNT_PT)/dev/pts @-umount \$(MOUNT_PT)/dev/pts
@-umount \$(MOUNT_PT)/dev/shm @-if [ -h \$(MOUNT_PT)/dev/shm ]; then \\
link=\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
umount \$(MOUNT_PT)/\$\$link; \\
unset link; \\
else \\
umount \$(MOUNT_PT)/dev/shm; \\
fi
@-umount \$(MOUNT_PT)/dev @-umount \$(MOUNT_PT)/dev
@-umount \$(MOUNT_PT)/sys @-umount \$(MOUNT_PT)/sys
@-umount \$(MOUNT_PT)/proc @-umount \$(MOUNT_PT)/proc
@ -1026,7 +1028,7 @@ ck_UID:
echo "|However, if this is the boot environment |"; \\ echo "|However, if this is the boot environment |"; \\
echo "| the command you are looking for is |"; \\ echo "| the command you are looking for is |"; \\
echo "| make makesys |"; \\ echo "| make makesys |"; \\
echo "| to finish off the build |"; \\ echo "| to complete the build |"; \\
echo "+--------------------------------------------------+"; \\ echo "+--------------------------------------------------+"; \\
exit 1; \\ exit 1; \\
fi fi
@ -1042,7 +1044,7 @@ mk_SETUP:
mk_CROSS: mk_SETUP mk_CROSS: mk_SETUP
@\$(call echo_PHASE,Cross Tool) @\$(call echo_PHASE,Cross Tool)
@(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make BREAKPOINT=\$(BREAKPOINT) AS_LUSER" ) @( \$(SU_LUSER) "make -C \$(MOUNT_PT)/\$(SCRIPT_ROOT) BREAKPOINT=\$(BREAKPOINT) AS_LUSER" )
@touch \$@ @touch \$@
mk_SUDO: mk_CROSS mk_SUDO: mk_CROSS
@ -1056,7 +1058,14 @@ mk_FINAL:
@( source /root/.bash_profile && make BREAKPOINT=\$(BREAKPOINT) AS_ROOT ) @( source /root/.bash_profile && make BREAKPOINT=\$(BREAKPOINT) AS_ROOT )
@touch \$@ @touch \$@
mk_CUSTOM_TOOLS: mk_FINAL mk_BLFS_TOOL: mk_FINAL
@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
\$(call sh_echo_PHASE,Building BLFS_TOOL); \\
( make -C $BLFS_ROOT/work ); \\
fi;
@touch \$@
mk_CUSTOM_TOOLS: mk_BLFS_TOOL
@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\ @if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
\$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\ \$(call sh_echo_PHASE,Building CUSTOM_TOOLS); \\
mkdir -p ${TRACKING_DIR}; \\ mkdir -p ${TRACKING_DIR}; \\
@ -1064,21 +1073,12 @@ mk_CUSTOM_TOOLS: mk_FINAL
fi; fi;
@touch \$@ @touch \$@
mk_BLFS_TOOL: mk_CUSTOM_TOOLS
@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
\$(call sh_echo_PHASE,Building BLFS_TOOL); \\
mkdir -p $TRACKING_DIR; \\
( source /root/.bash_profile && make BREAKPOINT=\$(BREAKPOINT) BLFS_TOOL ); \\
fi
@touch \$@
SETUP: $host_prep SETUP: $host_prep
AS_LUSER: $cross_tools $temptools ${boottools} AS_LUSER: $cross_tools $temptools ${boottools}
SUDO: $orphan_scripts SUDO: $orphan_scripts
AS_ROOT: SHELL=/tools/bin/bash AS_ROOT: SHELL=/tools/bin/bash
AS_ROOT: $testsuitetools $basicsystem $bootscripttools $bootabletools AS_ROOT: $testsuitetools $basicsystem $bootscripttools $bootabletools
CUSTOM_TOOLS: $custom_list CUSTOM_TOOLS: $custom_list
BLFS_TOOL: $blfs_tool
do-housekeeping: do-housekeeping:
@-rm /tools /cross-tools @-rm /tools /cross-tools