Changeset 2e1c1c3


Ignore:
Timestamp:
01/13/2018 09:08:56 AM (6 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
ablfs-more, legacy, trunk
Children:
d2a7ec8
Parents:
dc7fd7b
Message:

Remove spaces at the end of lines

Files:
19 edited

Legend:

Unmodified
Added
Removed
  • BLFS/libs/func_dependencies

    rdc7fd7b r2e1c1c3  
    129129  if [ -f ${id_of_dep}.dep ]; then # found ${id_of_dep}.dep already in tree
    130130    otherlink=($(head -n 1 ${id_of_dep}.dep))
    131     if [ -z "${otherlink[*]}" ] 
     131    if [ -z "${otherlink[*]}" ]
    132132      then echo otherlink empty for $id_of_dep.dep
    133133      echo This should not happen, but happens to happen...
  • BLFS/xsl/gen_pkg_list.xsl

    rdc7fd7b r2e1c1c3  
    195195                                                         '123456789',
    196196                                                         '000000000'),
    197                                                 '-0')   
     197                                                '-0')
    198198                                      ]"
    199199            mode="normal">
  • BLFS/xsl/make_book.xsl

    rdc7fd7b r2e1c1c3  
    152152            <xsl:choose>
    153153              <xsl:when test="@linkend='bootscripts' or
    154                               @linkend='systemd-units'"> 
     154                              @linkend='systemd-units'">
    155155                <xsl:copy-of select="."/>
    156               </xsl:when> 
     156              </xsl:when>
    157157              <xsl:otherwise>
    158158                <xsl:value-of select="@linkend"/> (in full book)
     
    293293
    294294<!-- The case of depdendencies of perl modules. Same treatment
    295      as for perl modules. Just easier because always perl standard --> 
     295     as for perl modules. Just easier because always perl standard -->
    296296  <xsl:template match="para">
    297297    <xsl:element name="sect1">
  • CLFS/master.sh

    rdc7fd7b r2e1c1c3  
    829829
    830830    case $this_script in
    831       *choose)   continue ;; # This is not a script but a commentary. 
     831      *choose)   continue ;; # This is not a script but a commentary.
    832832      *dhcp)    continue ;; # Assume static networking.
    833833      *dhcpcd)    continue ;; # Assume static networking.
     
    10161016  [[ "$COMPARE" = "y" ]] && wrt_compare_targets
    10171017  bootscripts_Makefiles          # mk_BOOTSCRIPT (CHROOT) $bootscripttools
    1018   if [ -d network ]; then 
     1018  if [ -d network ]; then
    10191019     network_Makefiles           # If present, process network setup.
    10201020  fi
  • FUNCTION_LIST

    rdc7fd7b r2e1c1c3  
    4040Description: Runs xsltproc with stylesheet urls.xsl on chapter 3 of the
    4141book. Add BLFS dependencies and custom dependencies if `BLFS_TOOLS' is `y'
    42 and `CUSTOM_TOOLS' is `y' respectively. 
     42and `CUSTOM_TOOLS' is `y' respectively.
    4343Called by: get_sources
    4444--------------------------------------------------------------------------
     
    6969Implements the behavior described in README.CUSTOM, that is, if script_name
    7070begins with d-, strip that part.
    71 Called by: various functions in master.sh 
     71Called by: various functions in master.sh
    7272--------------------------------------------------------------------------
    7373LUSER_wrt_target():
     
    129129CHROOT_wrt_RunAsRoot():
    130130From common/libs/func_wrt_Makefile.
    131 Description: 
     131Description:
    132132--------------------------------------------------------------------------
    133133LUSER_wrt_CopyFstab():
    134134From common/libs/func_wrt_Makefile.
    135 Description: 
     135Description:
    136136--------------------------------------------------------------------------
    137137CHROOT_wrt_CopyFstab():
    138138From common/libs/func_wrt_Makefile.
    139 Description: 
     139Description:
    140140--------------------------------------------------------------------------
    141141LUSER_wrt_TouchTimestamp():
    142142From common/libs/func_wrt_Makefile.
    143 Description: 
     143Description:
    144144--------------------------------------------------------------------------
    145145CHROOT_wrt_TouchTimestamp():
    146146From common/libs/func_wrt_Makefile.
    147 Description: 
     147Description:
    148148--------------------------------------------------------------------------
    149149LUSER_wrt_LogNewFiles():
    150150From common/libs/func_wrt_Makefile.
    151 Description: 
     151Description:
    152152--------------------------------------------------------------------------
    153153CHROOT_wrt_LogNewFiles():
    154154From common/libs/func_wrt_Makefile.
    155 Description: 
     155Description:
    156156--------------------------------------------------------------------------
    157157LUSER_RemoveBuildDirs():
    158158From common/libs/func_wrt_Makefile.
    159 Description: 
     159Description:
    160160--------------------------------------------------------------------------
    161161CHROOT_wrt_RemoveBuildDirs():
    162162From common/libs/func_wrt_Makefile.
    163 Description: 
     163Description:
    164164--------------------------------------------------------------------------
    165165wrt_touch():
    166166From common/libs/func_wrt_Makefile.
    167 Description: 
     167Description:
    168168--------------------------------------------------------------------------
    169169wrt_compare_targets():
    170170From common/libs/func_compare.sh.
    171 Description: 
     171Description:
    172172--------------------------------------------------------------------------
    173173wrt_system_build():
    174174From common/libs/func_compare.sh.
    175 Description: 
     175Description:
    176176--------------------------------------------------------------------------
    177177wrt_compare_work():
    178178From common/libs/func_compare.sh.
    179 Description: 
     179Description:
    180180--------------------------------------------------------------------------
    181181wrt_do_ica_work():
    182182From common/libs/func_compare.sh.
    183 Description: 
     183Description:
    184184--------------------------------------------------------------------------
    185185wrt_do_farce_work():
    186186From common/libs/func_compare.sh.
    187 Description: 
     187Description:
    188188--------------------------------------------------------------------------
    189189wrt_logs():
    190190From common/libs/func_compare.sh.
    191 Description: 
     191Description:
    192192--------------------------------------------------------------------------
    193193validate_config():
     
    197197  write_error_and_die():
    198198From common/libs/func_validate_configs.sh.
    199 Description: 
     199Description:
    200200--------------------------------------------------------------------------
    201201  validate_file():
    202202From common/libs/func_validate_configs.sh.
    203 Description: 
     203Description:
    204204--------------------------------------------------------------------------
    205205  validate_dir():
    206206From common/libs/func_validate_configs.sh.
    207 Description: 
     207Description:
    208208--------------------------------------------------------------------------
    209209get_book():
    210210From common/libs/func_book_parser.
    211 Description: 
     211Description:
    212212--------------------------------------------------------------------------
    213213extract_commands():
    214214From common/libs/func_book_parser.
    215 Description: 
     215Description:
    216216--------------------------------------------------------------------------
    217217create_package_list():
    218218From common/libs/func_book_parser.
    219 Description: 
     219Description:
    220220--------------------------------------------------------------------------
    221221check_version():
    222222From common/libs/func_check_version.sh.
    223 Description: 
     223Description:
    224224--------------------------------------------------------------------------
    225225  write_error_and_die():
    226226From common/libs/func_check_version.sh.
    227 Description: 
     227Description:
    228228--------------------------------------------------------------------------
    229229check_prerequisites():
    230230From common/libs/func_check_version.sh.
    231 Description: 
     231Description:
    232232--------------------------------------------------------------------------
    233233write_or_exit():
    234234From common/progress_bar.sh.
    235 Description: 
     235Description:
    236236--------------------------------------------------------------------------
    237237no_empty_builddir():
    238238From common/common-functions.
    239 Description: 
     239Description:
    240240--------------------------------------------------------------------------
    241241run_make():
    242242From common/common-functions.
    243 Description: 
     243Description:
    244244--------------------------------------------------------------------------
    245245clean_builddir():
    246246From common/common-functions.
    247 Description: 
     247Description:
    248248--------------------------------------------------------------------------
    249249function dohelp():
    250250From extras/farce.
    251 Description: 
     251Description:
    252252--------------------------------------------------------------------------
    253253function emessage():
    254254From extras/farce.
    255 Description: 
     255Description:
    256256--------------------------------------------------------------------------
    257257function expected():
    258258From extras/farce.
    259 Description: 
     259Description:
    260260--------------------------------------------------------------------------
    261261function failure():
    262262From extras/farce.
    263 Description: 
     263Description:
    264264--------------------------------------------------------------------------
    265265function fatal():
    266266From extras/farce.
    267 Description: 
     267Description:
    268268--------------------------------------------------------------------------
    269269function filetype():
    270270From extras/farce.
    271 Description: 
     271Description:
    272272--------------------------------------------------------------------------
    273273function message():
    274274From extras/farce.
    275 Description: 
     275Description:
    276276--------------------------------------------------------------------------
    277277function onlyone():
    278278From extras/farce.
    279 Description: 
     279Description:
    280280--------------------------------------------------------------------------
    281281function testar():
    282282From extras/farce.
    283 Description: 
     283Description:
    284284--------------------------------------------------------------------------
    285285function testgzip():
    286286From extras/farce.
    287 Description: 
     287Description:
    288288--------------------------------------------------------------------------
    289289function testso():
    290290From extras/farce.
    291 Description: 
     291Description:
    292292--------------------------------------------------------------------------
    293293function tokenize():
    294294From extras/farce.
    295 Description: 
     295Description:
    296296--------------------------------------------------------------------------
    297297function tokenizeanddiff():
    298298From extras/farce.
    299 Description: 
     299Description:
    300300--------------------------------------------------------------------------
    301301function validateargs():
    302302From extras/farce.
    303 Description: 
     303Description:
    304304--------------------------------------------------------------------------
    305305process_toolchain():
     
    333333see_ya():
    334334From jhalfs.
    335 Description: 
     335Description:
    336336--------------------------------------------------------------------------
    337337chapter4_Makefiles():
    338338From LFS/master.sh.
    339 Description: 
     339Description:
    340340--------------------------------------------------------------------------
    341341chapter5_Makefiles():
    342342From LFS/master.sh.
    343 Description: 
     343Description:
    344344--------------------------------------------------------------------------
    345345chapter6_Makefiles():
    346346From LFS/master.sh.
    347 Description: 
     347Description:
    348348--------------------------------------------------------------------------
    349349chapter78_Makefiles():
    350350From LFS/master.sh.
    351 Description: 
     351Description:
    352352--------------------------------------------------------------------------
    353353build_Makefile():
    354354From LFS/master.sh.
    355 Description: 
     355Description:
    356356--------------------------------------------------------------------------
    357357validate_opt_settings():
  • LFS/lfs.xsl

    rdc7fd7b r2e1c1c3  
    2727  -->
    2828  <xsl:param name="wrap-install" select='"n"'/>
    29  
     29
    3030  <!-- Run test suites?
    3131       0 = none
     
    4444  <!-- Install vim-lang package? OBSOLETE should always be 'n'-->
    4545  <xsl:param name="vim-lang" select="'n'"/>
    46  
     46
    4747  <!-- Should we strip excutables and libraries? -->
    4848  <xsl:param name='strip' select="'n'"/>
     
    5353  <!-- Time zone -->
    5454  <xsl:param name="timezone" select="'GMT'"/>
    55  
     55
    5656  <!-- Page size -->
    5757  <xsl:param name="page" select="'letter'"/>
    58  
     58
    5959  <!-- Locale settings -->
    6060  <xsl:param name="lang" select="'C'"/>
     
    6262  <!-- Install the whole set of locales -->
    6363  <xsl:param name='full-locale' select='"n"'/>
    64  
     64
    6565  <!-- Hostname -->
    6666  <xsl:param name='hostname' select='"HOSTNAME"'/>
     
    8383                                         @revision=$revision]"/>
    8484  </xsl:template>
    85  
     85
    8686  <xsl:template match="sect1">
    8787<!-- Since this xsl:if tag encloses the whole template, it would
     
    148148      <xsl:choose>
    149149        <xsl:when test="@id='ch-system-creatingdirs' or
    150                         @id='ch-system-createfiles' or 
     150                        @id='ch-system-createfiles' or
    151151                        @id='ch-system-strippingagain'">
    152152          <xsl:text>#!/tools/bin/bash&#xA;set +h&#xA;</xsl:text>
     
    407407    <xsl:text>&#xA;</xsl:text>
    408408  </xsl:template>
    409  
     409
    410410  <xsl:template match="userinput">
    411411    <xsl:choose>
     
    546546    </xsl:choose>
    547547  </xsl:template>
    548  
     548
    549549  <xsl:template match="replaceable">
    550550    <xsl:choose>
     
    593593    </xsl:choose>
    594594  </xsl:template>
    595  
     595
    596596  <xsl:template match="literal">
    597597    <xsl:choose>
  • LFS/master.sh

    rdc7fd7b r2e1c1c3  
    539539        fi
    540540
    541 teardown: 
     541teardown:
    542542        sudo umount -v \$(MOUNT_PT)/sys
    543543        sudo umount -v \$(MOUNT_PT)/proc
  • README

    rdc7fd7b r2e1c1c3  
    8282    the packages by yourself, you should download (or copy) them to
    8383    /mnt/build_dir/sources directly.
    84    
     84
    8585       If you want to build the kernel as part of the automated build, select
    8686    "Build the kernel" in the menu. Then, a configuration file must be
  • README.BLFS

    rdc7fd7b r2e1c1c3  
    124124    blfs-xml/*              SVN tree of the selected BLFS book version
    125125    lfs-xml/*               SVN tree of the selected LFS book version
    126     lib/constants.inc       functions libraries 
     126    lib/constants.inc       functions libraries
    127127       /func_dependencies     for building the dependency tree
    128128    menu/*                  lxdialog and menuconfig source code
  • README.PACKAGE_MANAGEMENT

    rdc7fd7b r2e1c1c3  
    7878      The last thing to do is to tell how to use the package manager. The user
    7979  has to provide two functions, "wrapInstall" and "packInstall", as described
    80   above. Please note that nothing has been done to manage configuration files, 
     80  above. Please note that nothing has been done to manage configuration files,
    8181  which are ususally treated specially by package managers: depending on
    8282  the book layout, it is sometimes possible to create those files afterwards,
  • common/common-functions

    rdc7fd7b r2e1c1c3  
    8383      sudo rm -rf $BUILDDIR/{opt,root,sbin,srv,tmp,tools,cross-tools,usr,var}
    8484      echo "done"
    85       if [[ "${BLFS_TOOL}" = "y" ]] ; then 
     85      if [[ "${BLFS_TOOL}" = "y" ]] ; then
    8686        echo -n "Cleaning $BUILDDIR/$BLFS_ROOT ..."
    8787        sudo rm -rf $BUILDDIR/$BLFS_ROOT
  • common/hostreqs.xsl

    rdc7fd7b r2e1c1c3  
    2020<!-- We assume that what is emphasized is in the form:
    2121aa...aa-dccsaaa (a anything except @, - "dash", d digit,
    22                  c anything except space, s space) 
     22                 c anything except space, s space)
    2323or
    2424aa...aasdccsaaa
  • common/libs/func_check_version.sh

    rdc7fd7b r2e1c1c3  
    207207  XMLLINT_LOC="$(whereis -b xmllint | cut -d" " -f2)"
    208208  XSLTPROC_LOC="$(whereis -b xsltproc | cut -d" " -f2)"
    209  
     209
    210210  if [ ! -x $XMLLINT_LOC ]; then
    211211    echo "${nl_}\"${RED}xmllint${OFF}\" ${BOLD}must be installed on your system for jhalfs to run"
     
    223223    check_version "2.06.20"  "${libxmlVer:0:1}.${libxmlVer:1:2}.${libxmlVer:3:2}"     "LIBXML2"
    224224    check_version "1.01.14"  "${libxsltVer:0:1}.${libxsltVer:1:2}.${libxsltVer:3:2}"  "LIBXSLT"
    225  
     225
    226226  else
    227227    echo "${nl_}\"${RED}xsltproc${OFF}\" ${BOLD}must be installed on your system for jhalfs to run"
  • custom/examples/960-pppd

    rdc7fd7b r2e1c1c3  
    33#
    44# The PPP package contains the pppd daemon and the chat program.
    5 # This is used for connecting to other machines; often for connecting 
    6 # to the Internet via a dial-up or PPPoE connection to an ISP. 
     5# This is used for connecting to other machines; often for connecting
     6# to the Internet via a dial-up or PPPoE connection to an ISP.
    77#
    88
  • custom/examples/964-dhcpcd

    rdc7fd7b r2e1c1c3  
    2727#make install-service-dhcpcd
    2828
    29 # more configuration? 
     29# more configuration?
    3030xEOFx
    3131) > tmp
  • custom/examples/998-syslinux

    rdc7fd7b r2e1c1c3  
    88# filesystem version can be installed from DOS, NT, or
    99# Linux.
    10 # 
     10#
    1111# It includes a sophisticated API for add-on "COM32"
    1212# modules, including a significant subset of the
    1313# standard C library.
    14 # 
     14#
    1515# It also includes MEMDISK, a tool to boot legacy
    1616# operating systems from nontraditional media like PXE
  • custom/examples_CLFS-E/960-iptables

    rdc7fd7b r2e1c1c3  
    55# Chapter 12 Beyond CLFS Embedded
    66#
    7 # iptables is the userspace command line program 
     7# iptables is the userspace command line program
    88# used to configure the Linux firewall.
    99#
  • menu/lxdialog/BIG.FAT.WARNING

    rdc7fd7b r2e1c1c3  
    11This is NOT the official version of dialog.  This version has been
    22significantly modified from the original.  It is for use by the Linux
    3 kernel configuration script.  Please do not bother Savio Lam with 
     3kernel configuration script.  Please do not bother Savio Lam with
    44questions about this program.
  • pkgmngt/packInstall.sh.template

    rdc7fd7b r2e1c1c3  
    3333                             # on the system
    3434# The next lines are specific to dpkg, but usually all package managers
    35 # need some information on the version and the package. 
     35# need some information on the version and the package.
    3636mkdir DEBIAN
    3737cat > DEBIAN/control <<EOF
Note: See TracChangeset for help on using the changeset viewer.