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

Fix package management and put back optional stripping again for backwards compatibility.

Browse source
This commit is contained in:
DJ Lucas 2021-08-17 18:23:24 -05:00
parent 756863be9b
commit 33a4e41462
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
HLFS/hlfs.xsl
View file

@ -93,6 +93,7 @@
<xsl:when test="@id='ch-system-creatingdirs' or <xsl:when test="@id='ch-system-creatingdirs' or
@id='ch-system-createfiles' or @id='ch-system-createfiles' or
@id='ch-system-changingowner' or @id='ch-system-changingowner' or
@id='ch-system-strippingagain' or
@id='ch-system-stripping'"> @id='ch-system-stripping'">
<xsl:text>#!/tools/bin/bash&#xA;set +h&#xA;</xsl:text> <xsl:text>#!/tools/bin/bash&#xA;set +h&#xA;</xsl:text>
</xsl:when> </xsl:when>
@ -101,6 +102,7 @@
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
<xsl:if test="not(@id='ch-tools-stripping') and <xsl:if test="not(@id='ch-tools-stripping') and
not(@id='ch-system-strippingagain') and
not(@id='ch-system-stripping')"> not(@id='ch-system-stripping')">
<xsl:text>set -e&#xA;</xsl:text> <xsl:text>set -e&#xA;</xsl:text>
</xsl:if> </xsl:if>

6
LFS/lfs.xsl
View file

@ -148,11 +148,13 @@ otherwise it is in /bin.-->
<xsl:text>#!</xsl:text> <xsl:text>#!</xsl:text>
<xsl:if test="@id='ch-system-creatingdirs' or <xsl:if test="@id='ch-system-creatingdirs' or
@id='ch-system-createfiles' or @id='ch-system-createfiles' or
@id='ch-system-strippingagain' or
@id='ch-system-stripping'"> @id='ch-system-stripping'">
<xsl:copy-of select="$bashdir"/> <xsl:copy-of select="$bashdir"/>
</xsl:if> </xsl:if>
<xsl:text>/bin/bash&#xA;set +h&#xA;</xsl:text> <xsl:text>/bin/bash&#xA;set +h&#xA;</xsl:text>
<xsl:if test="not(@id='ch-tools-stripping') and <xsl:if test="not(@id='ch-tools-stripping') and
not(@id='ch-system-strippingagain') and
not(@id='ch-system-stripping')"> not(@id='ch-system-stripping')">
<xsl:text>set -e&#xA;</xsl:text> <xsl:text>set -e&#xA;</xsl:text>
</xsl:if> </xsl:if>
@ -187,7 +189,7 @@ otherwise it is in /bin.-->
</exsl:document> </exsl:document>
<!-- Inclusion of package manager scriptlets --> <!-- Inclusion of package manager scriptlets -->
<xsl:if test="$pkgmngt='y' and <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:choose>
<xsl:when test="$bashdir='/tools'"> <xsl:when test="$bashdir='/tools'">
<xsl:apply-templates <xsl:apply-templates
@ -210,7 +212,7 @@ otherwise it is in /bin.-->
</xsl:choose> </xsl:choose>
</xsl:if> </xsl:if>
<xsl:if test="$pkgmngt='y' and <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 <xsl:apply-templates
select="document('packageManager.xml')//sect1[ select="document('packageManager.xml')//sect1[
contains(@id,'ch-system')]" contains(@id,'ch-system')]"

1
LFS/master.sh
View file

@ -58,6 +58,7 @@ chapter_targets() { #
case "${this_script}" in case "${this_script}" in
5*glibc) [[ "${TEST}" = "3" ]] && \ 5*glibc) [[ "${TEST}" = "3" ]] && \
sed -i 's@/usr/lib/locale@/tools/lib/locale@' $file ;; sed -i 's@/usr/lib/locale@/tools/lib/locale@' $file ;;
*strippingagain) [[ "${STRIP}" = "n" ]] && continue ;;
*stripping) [[ "${STRIP}" = "n" ]] && continue ;; *stripping) [[ "${STRIP}" = "n" ]] && continue ;;
*linux-headers*) [[ -n "$N" ]] && continue ;; *linux-headers*) [[ -n "$N" ]] && continue ;;
8*grub) (( nb_chaps == 5 )) && continue ;; 8*grub) (( nb_chaps == 5 )) && continue ;;