Fix package management and put back optional stripping again for backwards compatibility.
This commit is contained in:
parent
756863be9b
commit
33a4e41462
3 changed files with 7 additions and 2 deletions
|
@ -93,6 +93,7 @@
|
|||
<xsl:when test="@id='ch-system-creatingdirs' or
|
||||
@id='ch-system-createfiles' or
|
||||
@id='ch-system-changingowner' or
|
||||
@id='ch-system-strippingagain' or
|
||||
@id='ch-system-stripping'">
|
||||
<xsl:text>#!/tools/bin/bash
set +h
</xsl:text>
|
||||
</xsl:when>
|
||||
|
@ -101,6 +102,7 @@
|
|||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
<xsl:if test="not(@id='ch-tools-stripping') and
|
||||
not(@id='ch-system-strippingagain') and
|
||||
not(@id='ch-system-stripping')">
|
||||
<xsl:text>set -e
</xsl:text>
|
||||
</xsl:if>
|
||||
|
|
|
@ -148,11 +148,13 @@ otherwise it is in /bin.-->
|
|||
<xsl:text>#!</xsl:text>
|
||||
<xsl:if test="@id='ch-system-creatingdirs' or
|
||||
@id='ch-system-createfiles' or
|
||||
@id='ch-system-strippingagain' or
|
||||
@id='ch-system-stripping'">
|
||||
<xsl:copy-of select="$bashdir"/>
|
||||
</xsl:if>
|
||||
<xsl:text>/bin/bash
set +h
</xsl:text>
|
||||
<xsl:if test="not(@id='ch-tools-stripping') and
|
||||
not(@id='ch-system-strippingagain') and
|
||||
not(@id='ch-system-stripping')">
|
||||
<xsl:text>set -e
</xsl:text>
|
||||
</xsl:if>
|
||||
|
@ -187,7 +189,7 @@ otherwise it is in /bin.-->
|
|||
</exsl:document>
|
||||
<!-- Inclusion of package manager scriptlets -->
|
||||
<xsl:if test="$pkgmngt='y' and
|
||||
following-sibling::sect1[1][@id='ch-tools-stripping']">
|
||||
following-sibling::sect1[1][@id='ch-tools-stripping' or @id='ch-tools-cleanup']">
|
||||
<xsl:choose>
|
||||
<xsl:when test="$bashdir='/tools'">
|
||||
<xsl:apply-templates
|
||||
|
@ -210,7 +212,7 @@ otherwise it is in /bin.-->
|
|||
</xsl:choose>
|
||||
</xsl:if>
|
||||
<xsl:if test="$pkgmngt='y' and
|
||||
following-sibling::sect1[2][@id='ch-system-stripping']">
|
||||
following-sibling::sect1[2][@id='ch-system-strippingagain' or @id='ch-system-stripping']">
|
||||
<xsl:apply-templates
|
||||
select="document('packageManager.xml')//sect1[
|
||||
contains(@id,'ch-system')]"
|
||||
|
|
|
@ -58,6 +58,7 @@ chapter_targets() { #
|
|||
case "${this_script}" in
|
||||
5*glibc) [[ "${TEST}" = "3" ]] && \
|
||||
sed -i 's@/usr/lib/locale@/tools/lib/locale@' $file ;;
|
||||
*strippingagain) [[ "${STRIP}" = "n" ]] && continue ;;
|
||||
*stripping) [[ "${STRIP}" = "n" ]] && continue ;;
|
||||
*linux-headers*) [[ -n "$N" ]] && continue ;;
|
||||
8*grub) (( nb_chaps == 5 )) && continue ;;
|
||||
|
|
Reference in a new issue