Remove spaces at the end of lines
This commit is contained in:
parent
dc7fd7b7ba
commit
2e1c1c3c16
19 changed files with 84 additions and 84 deletions
|
@ -128,7 +128,7 @@ esac
|
|||
# Has this entry already been seen?
|
||||
if [ -f ${id_of_dep}.dep ]; then # found ${id_of_dep}.dep already in tree
|
||||
otherlink=($(head -n 1 ${id_of_dep}.dep))
|
||||
if [ -z "${otherlink[*]}" ]
|
||||
if [ -z "${otherlink[*]}" ]
|
||||
then echo otherlink empty for $id_of_dep.dep
|
||||
echo This should not happen, but happens to happen...
|
||||
exit 1
|
||||
|
|
|
@ -194,7 +194,7 @@
|
|||
select="descendant::node()[contains(translate(@xreflabel,
|
||||
'123456789',
|
||||
'000000000'),
|
||||
'-0')
|
||||
'-0')
|
||||
]"
|
||||
mode="normal">
|
||||
<xsl:sort select="@id"/>
|
||||
|
|
|
@ -151,9 +151,9 @@
|
|||
<xsl:otherwise>
|
||||
<xsl:choose>
|
||||
<xsl:when test="@linkend='bootscripts' or
|
||||
@linkend='systemd-units'">
|
||||
@linkend='systemd-units'">
|
||||
<xsl:copy-of select="."/>
|
||||
</xsl:when>
|
||||
</xsl:when>
|
||||
<xsl:otherwise>
|
||||
<xsl:value-of select="@linkend"/> (in full book)
|
||||
</xsl:otherwise>
|
||||
|
@ -292,7 +292,7 @@
|
|||
</xsl:template>
|
||||
|
||||
<!-- The case of depdendencies of perl modules. Same treatment
|
||||
as for perl modules. Just easier because always perl standard -->
|
||||
as for perl modules. Just easier because always perl standard -->
|
||||
<xsl:template match="para">
|
||||
<xsl:element name="sect1">
|
||||
<xsl:attribute name="id"><xsl:value-of select="./@id"/></xsl:attribute>
|
||||
|
|
|
@ -828,7 +828,7 @@ network_Makefiles() { #
|
|||
this_script=`basename $file`
|
||||
|
||||
case $this_script in
|
||||
*choose) continue ;; # This is not a script but a commentary.
|
||||
*choose) continue ;; # This is not a script but a commentary.
|
||||
*dhcp) continue ;; # Assume static networking.
|
||||
*dhcpcd) continue ;; # Assume static networking.
|
||||
*) ;;
|
||||
|
@ -1015,7 +1015,7 @@ build_Makefile() { # Construct a Makefile from the book scri
|
|||
# Add the iterations targets, if needed
|
||||
[[ "$COMPARE" = "y" ]] && wrt_compare_targets
|
||||
bootscripts_Makefiles # mk_BOOTSCRIPT (CHROOT) $bootscripttools
|
||||
if [ -d network ]; then
|
||||
if [ -d network ]; then
|
||||
network_Makefiles # If present, process network setup.
|
||||
fi
|
||||
bootable_Makefiles # mk_BOOTABLE (CHROOT) $bootabletools
|
||||
|
|
102
FUNCTION_LIST
102
FUNCTION_LIST
|
@ -39,7 +39,7 @@ create_urls():
|
|||
From common/libs/func_download_pkgs.
|
||||
Description: Runs xsltproc with stylesheet urls.xsl on chapter 3 of the
|
||||
book. Add BLFS dependencies and custom dependencies if `BLFS_TOOLS' is `y'
|
||||
and `CUSTOM_TOOLS' is `y' respectively.
|
||||
and `CUSTOM_TOOLS' is `y' respectively.
|
||||
Called by: get_sources
|
||||
--------------------------------------------------------------------------
|
||||
wrt_CustomTools_target():
|
||||
|
@ -68,7 +68,7 @@ script-name to the beginning of a line in the list. Writes the name found
|
|||
to stdout.
|
||||
Implements the behavior described in README.CUSTOM, that is, if script_name
|
||||
begins with d-, strip that part.
|
||||
Called by: various functions in master.sh
|
||||
Called by: various functions in master.sh
|
||||
--------------------------------------------------------------------------
|
||||
LUSER_wrt_target():
|
||||
From common/libs/func_wrt_Makefile.
|
||||
|
@ -128,67 +128,67 @@ Description: Calculate time with perl, footer to log file
|
|||
--------------------------------------------------------------------------
|
||||
CHROOT_wrt_RunAsRoot():
|
||||
From common/libs/func_wrt_Makefile.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
LUSER_wrt_CopyFstab():
|
||||
From common/libs/func_wrt_Makefile.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
CHROOT_wrt_CopyFstab():
|
||||
From common/libs/func_wrt_Makefile.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
LUSER_wrt_TouchTimestamp():
|
||||
From common/libs/func_wrt_Makefile.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
CHROOT_wrt_TouchTimestamp():
|
||||
From common/libs/func_wrt_Makefile.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
LUSER_wrt_LogNewFiles():
|
||||
From common/libs/func_wrt_Makefile.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
CHROOT_wrt_LogNewFiles():
|
||||
From common/libs/func_wrt_Makefile.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
LUSER_RemoveBuildDirs():
|
||||
From common/libs/func_wrt_Makefile.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
CHROOT_wrt_RemoveBuildDirs():
|
||||
From common/libs/func_wrt_Makefile.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
wrt_touch():
|
||||
From common/libs/func_wrt_Makefile.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
wrt_compare_targets():
|
||||
From common/libs/func_compare.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
wrt_system_build():
|
||||
From common/libs/func_compare.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
wrt_compare_work():
|
||||
From common/libs/func_compare.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
wrt_do_ica_work():
|
||||
From common/libs/func_compare.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
wrt_do_farce_work():
|
||||
From common/libs/func_compare.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
wrt_logs():
|
||||
From common/libs/func_compare.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
validate_config():
|
||||
From common/libs/func_validate_configs.sh.
|
||||
|
@ -196,111 +196,111 @@ Description: Are the config values sane (within reason)
|
|||
--------------------------------------------------------------------------
|
||||
write_error_and_die():
|
||||
From common/libs/func_validate_configs.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
validate_file():
|
||||
From common/libs/func_validate_configs.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
validate_dir():
|
||||
From common/libs/func_validate_configs.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
get_book():
|
||||
From common/libs/func_book_parser.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
extract_commands():
|
||||
From common/libs/func_book_parser.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
create_package_list():
|
||||
From common/libs/func_book_parser.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
check_version():
|
||||
From common/libs/func_check_version.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
write_error_and_die():
|
||||
From common/libs/func_check_version.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
check_prerequisites():
|
||||
From common/libs/func_check_version.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
write_or_exit():
|
||||
From common/progress_bar.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
no_empty_builddir():
|
||||
From common/common-functions.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
run_make():
|
||||
From common/common-functions.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
clean_builddir():
|
||||
From common/common-functions.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function dohelp():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function emessage():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function expected():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function failure():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function fatal():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function filetype():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function message():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function onlyone():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function testar():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function testgzip():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function testso():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function tokenize():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function tokenizeanddiff():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
function validateargs():
|
||||
From extras/farce.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
process_toolchain():
|
||||
From HLFS/master.sh.
|
||||
|
@ -332,27 +332,27 @@ Description: Basic error trap.... JUST DIE
|
|||
--------------------------------------------------------------------------
|
||||
see_ya():
|
||||
From jhalfs.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
chapter4_Makefiles():
|
||||
From LFS/master.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
chapter5_Makefiles():
|
||||
From LFS/master.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
chapter6_Makefiles():
|
||||
From LFS/master.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
chapter78_Makefiles():
|
||||
From LFS/master.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
build_Makefile():
|
||||
From LFS/master.sh.
|
||||
Description:
|
||||
Description:
|
||||
--------------------------------------------------------------------------
|
||||
validate_opt_settings():
|
||||
From optimize/optimize_functions.
|
||||
|
|
20
LFS/lfs.xsl
20
LFS/lfs.xsl
|
@ -26,7 +26,7 @@
|
|||
note that pkgmngt must be 'y' in this case
|
||||
-->
|
||||
<xsl:param name="wrap-install" select='"n"'/>
|
||||
|
||||
|
||||
<!-- Run test suites?
|
||||
0 = none
|
||||
1 = only chapter06 critical testsuites
|
||||
|
@ -43,7 +43,7 @@
|
|||
|
||||
<!-- Install vim-lang package? OBSOLETE should always be 'n'-->
|
||||
<xsl:param name="vim-lang" select="'n'"/>
|
||||
|
||||
|
||||
<!-- Should we strip excutables and libraries? -->
|
||||
<xsl:param name='strip' select="'n'"/>
|
||||
|
||||
|
@ -52,16 +52,16 @@
|
|||
|
||||
<!-- Time zone -->
|
||||
<xsl:param name="timezone" select="'GMT'"/>
|
||||
|
||||
|
||||
<!-- Page size -->
|
||||
<xsl:param name="page" select="'letter'"/>
|
||||
|
||||
|
||||
<!-- Locale settings -->
|
||||
<xsl:param name="lang" select="'C'"/>
|
||||
|
||||
<!-- Install the whole set of locales -->
|
||||
<xsl:param name='full-locale' select='"n"'/>
|
||||
|
||||
|
||||
<!-- Hostname -->
|
||||
<xsl:param name='hostname' select='"HOSTNAME"'/>
|
||||
|
||||
|
@ -82,7 +82,7 @@
|
|||
<xsl:apply-templates select="//sect1[not(@revision) or
|
||||
@revision=$revision]"/>
|
||||
</xsl:template>
|
||||
|
||||
|
||||
<xsl:template match="sect1">
|
||||
<!-- Since this xsl:if tag encloses the whole template, it would
|
||||
be much better to transpose this condition to the select part
|
||||
|
@ -147,7 +147,7 @@
|
|||
<exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
|
||||
<xsl:choose>
|
||||
<xsl:when test="@id='ch-system-creatingdirs' or
|
||||
@id='ch-system-createfiles' or
|
||||
@id='ch-system-createfiles' or
|
||||
@id='ch-system-strippingagain'">
|
||||
<xsl:text>#!/tools/bin/bash
set +h
</xsl:text>
|
||||
</xsl:when>
|
||||
|
@ -406,7 +406,7 @@ exit
|
|||
<xsl:apply-templates/>
|
||||
<xsl:text>
</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
|
||||
<xsl:template match="userinput">
|
||||
<xsl:choose>
|
||||
<!-- Copying the kernel config file -->
|
||||
|
@ -545,7 +545,7 @@ unset OLD_PKGDIR
|
|||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:template>
|
||||
|
||||
|
||||
<xsl:template match="replaceable">
|
||||
<xsl:choose>
|
||||
<xsl:when test="ancestor::sect1[@id='ch-system-glibc']">
|
||||
|
@ -592,7 +592,7 @@ unset OLD_PKGDIR
|
|||
</xsl:otherwise>
|
||||
</xsl:choose>
|
||||
</xsl:template>
|
||||
|
||||
|
||||
<xsl:template match="literal">
|
||||
<xsl:choose>
|
||||
<xsl:when test="contains(string(),'ONBOOT')">
|
||||
|
|
|
@ -538,7 +538,7 @@ devices: ck_UID
|
|||
sudo mkdir -p \$(MOUNT_PT)/\$\$(readlink \$(MOUNT_PT)/dev/shm); \\
|
||||
fi
|
||||
|
||||
teardown:
|
||||
teardown:
|
||||
sudo umount -v \$(MOUNT_PT)/sys
|
||||
sudo umount -v \$(MOUNT_PT)/proc
|
||||
sudo umount -v \$(MOUNT_PT)/dev/pts
|
||||
|
|
2
README
2
README
|
@ -81,7 +81,7 @@ $Id$
|
|||
default entry for "Package Archive Directory". If you choose to download
|
||||
the packages by yourself, you should download (or copy) them to
|
||||
/mnt/build_dir/sources directly.
|
||||
|
||||
|
||||
If you want to build the kernel as part of the automated build, select
|
||||
"Build the kernel" in the menu. Then, a configuration file must be
|
||||
provided. In order to do so, it is recommended to download the kernel
|
||||
|
|
|
@ -123,7 +123,7 @@ $Id$
|
|||
|
||||
blfs-xml/* SVN tree of the selected BLFS book version
|
||||
lfs-xml/* SVN tree of the selected LFS book version
|
||||
lib/constants.inc functions libraries
|
||||
lib/constants.inc functions libraries
|
||||
/func_dependencies for building the dependency tree
|
||||
menu/* lxdialog and menuconfig source code
|
||||
xsl/gen_pkg_list.xsl XSL stylesheet to generate the package database
|
||||
|
|
|
@ -77,7 +77,7 @@ $Id$
|
|||
|
||||
The last thing to do is to tell how to use the package manager. The user
|
||||
has to provide two functions, "wrapInstall" and "packInstall", as described
|
||||
above. Please note that nothing has been done to manage configuration files,
|
||||
above. Please note that nothing has been done to manage configuration files,
|
||||
which are ususally treated specially by package managers: depending on
|
||||
the book layout, it is sometimes possible to create those files afterwards,
|
||||
and sometimes not, which means that you have to check them after each
|
||||
|
|
|
@ -82,7 +82,7 @@ if [ "${CLEAN}" = "y" ]; then
|
|||
sudo rm -rf $BUILDDIR/{bin,boot,dev,etc,home,lib{,64},media,mnt,run}
|
||||
sudo rm -rf $BUILDDIR/{opt,root,sbin,srv,tmp,tools,cross-tools,usr,var}
|
||||
echo "done"
|
||||
if [[ "${BLFS_TOOL}" = "y" ]] ; then
|
||||
if [[ "${BLFS_TOOL}" = "y" ]] ; then
|
||||
echo -n "Cleaning $BUILDDIR/$BLFS_ROOT ..."
|
||||
sudo rm -rf $BUILDDIR/$BLFS_ROOT
|
||||
echo "done"
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
<xsl:template match="emphasis">
|
||||
<!-- We assume that what is emphasized is in the form:
|
||||
aa...aa-dccsaaa (a anything except @, - "dash", d digit,
|
||||
c anything except space, s space)
|
||||
c anything except space, s space)
|
||||
or
|
||||
aa...aasdccsaaa
|
||||
This means we have to replace digits with @, and look for '-@'
|
||||
|
|
|
@ -206,7 +206,7 @@ inline_doc
|
|||
|
||||
XMLLINT_LOC="$(whereis -b xmllint | cut -d" " -f2)"
|
||||
XSLTPROC_LOC="$(whereis -b xsltproc | cut -d" " -f2)"
|
||||
|
||||
|
||||
if [ ! -x $XMLLINT_LOC ]; then
|
||||
echo "${nl_}\"${RED}xmllint${OFF}\" ${BOLD}must be installed on your system for jhalfs to run"
|
||||
exit 1
|
||||
|
@ -222,7 +222,7 @@ inline_doc
|
|||
# Version numbers are packed strings not xx.yy.zz format.
|
||||
check_version "2.06.20" "${libxmlVer:0:1}.${libxmlVer:1:2}.${libxmlVer:3:2}" "LIBXML2"
|
||||
check_version "1.01.14" "${libxsltVer:0:1}.${libxsltVer:1:2}.${libxsltVer:3:2}" "LIBXSLT"
|
||||
|
||||
|
||||
else
|
||||
echo "${nl_}\"${RED}xsltproc${OFF}\" ${BOLD}must be installed on your system for jhalfs to run"
|
||||
exit 1
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
# $Id$
|
||||
#
|
||||
# The PPP package contains the pppd daemon and the chat program.
|
||||
# This is used for connecting to other machines; often for connecting
|
||||
# to the Internet via a dial-up or PPPoE connection to an ISP.
|
||||
# This is used for connecting to other machines; often for connecting
|
||||
# to the Internet via a dial-up or PPPoE connection to an ISP.
|
||||
#
|
||||
|
||||
PKG="ppp"
|
||||
|
|
|
@ -26,6 +26,6 @@ make install
|
|||
# Add the following to boot scripts.
|
||||
#make install-service-dhcpcd
|
||||
|
||||
# more configuration?
|
||||
# more configuration?
|
||||
xEOFx
|
||||
) > tmp
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
# using PXE firmware, or from CD-ROMs. The FAT
|
||||
# filesystem version can be installed from DOS, NT, or
|
||||
# Linux.
|
||||
#
|
||||
#
|
||||
# It includes a sophisticated API for add-on "COM32"
|
||||
# modules, including a significant subset of the
|
||||
# standard C library.
|
||||
#
|
||||
#
|
||||
# It also includes MEMDISK, a tool to boot legacy
|
||||
# operating systems from nontraditional media like PXE
|
||||
# or CD-ROM.
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# Code taken from CLFS-Embedded
|
||||
# Chapter 12 Beyond CLFS Embedded
|
||||
#
|
||||
# iptables is the userspace command line program
|
||||
# iptables is the userspace command line program
|
||||
# used to configure the Linux firewall.
|
||||
#
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
This is NOT the official version of dialog. This version has been
|
||||
significantly modified from the original. It is for use by the Linux
|
||||
kernel configuration script. Please do not bother Savio Lam with
|
||||
kernel configuration script. Please do not bother Savio Lam with
|
||||
questions about this program.
|
||||
|
|
|
@ -32,7 +32,7 @@ pushd $PKG_DEST
|
|||
rm -fv ./usr/share/info/dir # recommended since this directory is already there
|
||||
# on the system
|
||||
# The next lines are specific to dpkg, but usually all package managers
|
||||
# need some information on the version and the package.
|
||||
# need some information on the version and the package.
|
||||
mkdir DEBIAN
|
||||
cat > DEBIAN/control <<EOF
|
||||
Package: $PACKAGE
|
||||
|
|
Reference in a new issue