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

HLFS: Fixed MAKEDEV download.

Browse source 
Solved /dev/console and /dev/null issue.
Removed a hardcoded script number.
This commit is contained in:
Manuel Canales Esparcia 2006-12-10 10:43:20 +00:00
parent c63c0faf0b
commit 37002aec07
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
HLFS/hlfs.xsl
View file

@ -175,6 +175,10 @@
<xsl:when test="ancestor::sect1[@id='ch-system-kernfs'] and <xsl:when test="ancestor::sect1[@id='ch-system-kernfs'] and
contains(string(),'sysctl') contains(string(),'sysctl')
and $grsecurity_host ='n'"/> and $grsecurity_host ='n'"/>
<!-- We need to have /dev/console and /dev/null availables before
entering to the chroot -->
<xsl:when test="ancestor::sect1[@id='ch-system-devices'] and
contains(string(),'600 /dev/console')"/>
<!-- Fix MAKEDEV installation in 2.4-branch --> <!-- Fix MAKEDEV installation in 2.4-branch -->
<xsl:when test="ancestor::sect1[@id='ch-system-devices'] and <xsl:when test="ancestor::sect1[@id='ch-system-devices'] and
contains(string(),'bzcat MAKEDEV')"> contains(string(),'bzcat MAKEDEV')">

12
HLFS/master.sh
View file

@ -557,12 +557,18 @@ mk_SUDO: mk_LUSER
mk_CHROOT: mk_SUDO mk_CHROOT: mk_SUDO
@if [ ! -e \$(MOUNT_PT)/bin ]; then \\ @if [ ! -e \$(MOUNT_PT)/bin ]; then \\
mkdir \$(MOUNT_PT)/bin; \\ mkdir \$(MOUNT_PT)/bin && \\
cd \$(MOUNT_PT)/bin && \\ cd \$(MOUNT_PT)/bin && \\
ln -sf /tools/bin/bash bash; ln -sf bash sh; \\ ln -sf /tools/bin/bash bash; ln -sf bash sh && \\
sudo chown -R 0:0 \$(MOUNT_PT)/bin; \\ sudo chown -R 0:0 \$(MOUNT_PT)/bin; \\
fi; fi;
@sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chapter06/064-createfiles @if [ ! -e \$(MOUNT_PT)/dev ]; then \\
mkdir \$(MOUNT_PT)/dev && \\
sudo mknod -m 666 \$(MOUNT_PT)/dev/null c 1 3 && \\
sudo mknod -m 666 \$(MOUNT_PT)/dev/console c 5 1 && \\
sudo chown -R 0:0 \$(MOUNT_PT)/dev;
fi;
@sudo sed -e 's|^ln -.. |ln -svf |' -i \$(CMDSDIR)/chapter06/*-createfiles
@\$(call echo_CHROOT_request) @\$(call echo_CHROOT_request)
@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT") @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
@touch \$@ @touch \$@

4
common/urls.xsl
View file

@ -23,8 +23,8 @@
duplicated URLs due that may be splitted for PDF output --> duplicated URLs due that may be splitted for PDF output -->
<xsl:if test="(ancestor::varlistentry[@condition=$model] <xsl:if test="(ancestor::varlistentry[@condition=$model]
or not(ancestor::varlistentry[@condition])) and or not(ancestor::varlistentry[@condition])) and
(contains(@url, '.tar.') or contains(@url, '.tgz') (contains(@url, '.bz2') or contains(@url, '.tar.gz') or
or contains(@url, '.patch')) and contains(@url, '.tgz') or contains(@url, '.patch')) and
not(ancestor-or-self::*/@condition = 'pdf')"> not(ancestor-or-self::*/@condition = 'pdf')">
<!-- Extract the package name --> <!-- Extract the package name -->
<xsl:variable name="package"> <xsl:variable name="package">