Changeset 3781c69


Ignore:
Timestamp:
09/07/2021 09:10:29 PM (3 years ago)
Author:
Pierre Labastie <pierre.labastie@…>
Branches:
11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc
Children:
9ee05b53
Parents:
4458e3d
Message:

Remove eol spaces

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    r4458e3d r3781c69  
    144144        @echo "Validation complete."
    145145
    146 profile-html: 
     146profile-html:
    147147        @echo "Generating profiled XML for XHTML..."
    148148        $(Q)xsltproc --nonet                              \

  • lfs-latest-git.php

    r4458e3d r3781c69  
    3131  foreach ( $lines as $line )
    3232  {
    33      if ( ! preg_match( $regex_match, $line ) ) continue; 
     33     if ( ! preg_match( $regex_match, $line ) ) continue;
    3434
    3535     // Isolate the version and put in an array
    3636     $slice = preg_replace( $regex_replace, "$1", $line );
    37      if ( $slice == $line ) continue; 
    38 
    39      array_push( $a, $slice );     
     37     if ( $slice == $line ) continue;
     38
     39     array_push( $a, $slice );
    4040  }
    4141
    … …  
    9999  $max           = find_max( $lines, $regex_match, $regex_replace );
    100100
    101   return "$dirpath/$max"; 
     101  return "$dirpath/$max";
    102102}
    103103
    … …  
    113113if ( $package == "e2fsprogs"  ) $dirpath = "https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/";
    114114if ( $package == "expat"      ) $dirpath = "http://sourceforge.net/projects/expat/files";
    115 if ( $package == "elfutils"   ) $dirpath = "https://sourceware.org/ftp/elfutils"; 
    116 if ( $package == "expect"     ) $dirpath = "http://sourceforge.net/projects/expect/files"; 
     115if ( $package == "elfutils"   ) $dirpath = "https://sourceware.org/ftp/elfutils";
     116if ( $package == "expect"     ) $dirpath = "http://sourceforge.net/projects/expect/files";
    117117if ( $package == "file"       ) $dirpath = "https://github.com/file/file/releases";
    118118if ( $package == "flex"       ) $dirpath = "https://github.com/westes/flex/releases";
    … …  
    139139
    140140  // Check for ftp
    141   if ( preg_match( "/^ftp/", $dirpath ) ) 
    142   { 
     141  if ( preg_match( "/^ftp/", $dirpath ) )
     142  {
    143143    $dirpath  = substr( $dirpath, 6 );           // Remove ftp://
    144144    $dirpath  = rtrim ( $dirpath, "/" );         // Trim any trailing slash
    … …  
    148148
    149149    $conn = ftp_connect( $server );
    150     ftp_login( $conn, "anonymous", "" ); 
     150    ftp_login( $conn, "anonymous", "" );
    151151
    152152    // See if we need special handling
    … …  
    167167
    168168              // Get dir listing
    169               $lines = ftp_rawlist ($conn, $path);             
     169              $lines = ftp_rawlist ($conn, $path);
    170170              $max   = find_max( $lines, $regexp, $regexp );
    171171              break;
    … …  
    234234  }
    235235
    236   if ( $package == "attr" || 
     236  if ( $package == "attr" ||
    237237       $package == "acl"  )
    238238  {
    … …  
    362362      }
    363363
    364       else if ( preg_match( "/systemd-man-pages/", $file ) ) continue; 
    365       else if ( preg_match( "/python/"         , $file ) ) continue; 
     364      else if ( preg_match( "/systemd-man-pages/", $file ) ) continue;
     365      else if ( preg_match( "/python/"         , $file ) ) continue;
    366366
    367367      $version = preg_replace( $pattern, "$1", $file );   // Isolate version

  • lfs-latest.php

    r4458e3d r3781c69  
    3131  foreach ( $lines as $line )
    3232  {
    33      if ( ! preg_match( $regex_match, $line ) ) continue; 
     33     if ( ! preg_match( $regex_match, $line ) ) continue;
    3434
    3535     // Isolate the version and put in an array
    3636     $slice = preg_replace( $regex_replace, "$1", $line );
    37      if ( $slice == $line ) continue; 
    38 
    39      array_push( $a, $slice );     
     37     if ( $slice == $line ) continue;
     38
     39     array_push( $a, $slice );
    4040  }
    4141
    … …  
    9999  $max           = find_max( $lines, $regex_match, $regex_replace );
    100100
    101   return "$dirpath/$max"; 
     101  return "$dirpath/$max";
    102102}
    103103
    … …  
    113113if ( $package == "e2fsprogs"  ) $dirpath = "http://sourceforge.net/projects/e2fsprogs/files/e2fsprogs";
    114114if ( $package == "expat"      ) $dirpath = "http://sourceforge.net/projects/expat/files";
    115 if ( $package == "elfutils"   ) $dirpath = "https://sourceware.org/ftp/elfutils"; 
    116 if ( $package == "expect"     ) $dirpath = "http://sourceforge.net/projects/expect/files"; 
     115if ( $package == "elfutils"   ) $dirpath = "https://sourceware.org/ftp/elfutils";
     116if ( $package == "expect"     ) $dirpath = "http://sourceforge.net/projects/expect/files";
    117117if ( $package == "file"       ) $dirpath = "https://github.com/file/file/releases";
    118118if ( $package == "flex"       ) $dirpath = "https://github.com/westes/flex/releases";
    … …  
    136136
    137137  // Check for ftp
    138   if ( preg_match( "/^ftp/", $dirpath ) ) 
    139   { 
     138  if ( preg_match( "/^ftp/", $dirpath ) )
     139  {
    140140    $dirpath  = substr( $dirpath, 6 );           // Remove ftp://
    141141    $dirpath  = rtrim ( $dirpath, "/" );         // Trim any trailing slash
    … …  
    145145
    146146    $conn = ftp_connect( $server );
    147     ftp_login( $conn, "anonymous", "" ); 
     147    ftp_login( $conn, "anonymous", "" );
    148148
    149149    // See if we need special handling
    … …  
    164164
    165165              // Get dir listing
    166               $lines = ftp_rawlist ($conn, $path);             
     166              $lines = ftp_rawlist ($conn, $path);
    167167              $max   = find_max( $lines, $regexp, $regexp );
    168168              break;
    … …  
    197197     }
    198198
    199      //if ( $package == "bzip2" ) 
     199     //if ( $package == "bzip2" )
    200200     //{
    201201     //   // Remove one directory
    … …  
    239239  }
    240240
    241   if ( $package == "attr" || 
     241  if ( $package == "attr" ||
    242242       $package == "acl"  )
    243243  {
    … …  
    357357      }
    358358
    359       else if ( preg_match( "/systemd-man-pages/", $file ) ) continue; 
    360       else if ( preg_match( "/python/"         , $file ) ) continue; 
     359      else if ( preg_match( "/systemd-man-pages/", $file ) ) continue;
     360      else if ( preg_match( "/python/"         , $file ) ) continue;
    361361
    362362      $version = preg_replace( $pattern, "$1", $file );   // Isolate version

  • make-aux-files.sh

    r4458e3d r3781c69  
    99# Create the tarball and clean up
    1010tar -cJf lfs-bootscripts-$version.tar.xz --exclude .svn lfs-bootscripts-$version
    11 mv lfs-bootscripts-$version bootscripts 
     11mv lfs-bootscripts-$version bootscripts
    1212
    1313#rm -f udev-config*.bz2

  • pdf-fixups.sh

    r4458e3d r3781c69  
    11#!/bin/bash
    22
    3 if [ $# -lt 1 ] ; then 
     3if [ $# -lt 1 ] ; then
    44  echo "This script needs the location of the fo file to update"
    55  exit 1

  • process-scripts.sh

    r4458e3d r3781c69  
    99do
    1010  script=$(basename $s)
    11  
     11
    1212  # Skip directories
    1313  [ $script == 'network-devices' ] && continue
    … …  
    1515
    1616  # Disambiguate duplicate file names
    17   [ $s == 'bootscripts/lfs/sysconfig/rc'         ] && script='rc-sysinit'; 
    18   [ $s == 'bootscripts/lfs/sysconfig/modules'    ] && script='modules-sysinit'; 
    19   [ $s == 'bootscripts/lfs/sysconfig/udev_retry' ] && script='config-udev-retry'; 
    20  
     17  [ $s == 'bootscripts/lfs/sysconfig/rc'         ] && script='rc-sysinit';
     18  [ $s == 'bootscripts/lfs/sysconfig/modules'    ] && script='modules-sysinit';
     19  [ $s == 'bootscripts/lfs/sysconfig/udev_retry' ] && script='config-udev-retry';
     20
    2121  sed  -e 's/\&/\&amp\;/g' -e 's/</\&lt\;/g'   -e 's/>/\&gt\;/g' \
    2222       -e "s/'/\&apos\;/g" -e 's/"/\&quot\;/g' -e 's/\t/    /g'  \
    23        $s > appendices/${script}.script 
     23       $s > appendices/${script}.script
    2424done

  • udev-lfs/ChangeLog

    r4458e3d r3781c69  
    6262        * 55-lfs.rules: Override default perms on floppy disk devices provided
    6363          by 50-udev-default.rules.  Thanks to Bruce Dubbs for the fix.  Closes
    64           LFS ticket #2076. 
     64          LFS ticket #2076.
    6565
    66662008-05-21  Bryan Kadzban  <bryan@linuxfromscratch.org>
    … …  
    146146          upstream sample rules files (from udev-102), except for one rule
    147147          which is more specific in our tarball and should probably be changed
    148           upstream. 
     148          upstream.
    149149        * doc/60-persistent-storage.txt: Modify to match the changes.  Also
    150150          fix a couple typos.

  • udev-lfs/Makefile.lfs

    r4458e3d r3781c69  
    1616        @echo "Use the install target"
    1717
    18 install: 
     18install:
    1919        @mkdir -pv $(DESTDIR)/lib/udev/rules.d \
    2020              $(DESTDIR)/etc/udev/rules.d \

  • udev-lfs/init-net-rules.sh

    r4458e3d r3781c69  
    55# Updated fof udev-197 (DEVICES=en*)
    66
    7 RULES=/etc/udev/rules.d/70-persistent-net.rules 
     7RULES=/etc/udev/rules.d/70-persistent-net.rules
    88DEVICES=$(eval echo /sys/class/net/{en*,eth*,ath*,wlan*[0-9],msh*,ra*,sta*,ctc*,lcs*,hsi*})
    99
    … …  
    6969
    7070  # S/390 uses id matches only, do not use MAC address match
    71   # SUBSYSTEMS=="ccwgroup", 
    72   # export COMMENT="S/390 $driver device at $id", 
    73   # export MATCHID="$id" 
     71  # SUBSYSTEMS=="ccwgroup",
     72  # export COMMENT="S/390 $driver device at $id",
     73  # export MATCHID="$id"
    7474  # export MATCHDRV="$driver"
    7575  # export MATCHADDR=""
    … …  
    9999  msg="The rules file should not be created in the Xen environment"
    100100  usage
    101 fi 
     101fi
    102102
    103103# Variables used to communicate with write_net_rules:
    104 #   INTERFACE             simple interface name         
     104#   INTERFACE             simple interface name
    105105#   MATCHADDR             MAC address used for the match
    106106#   MATCHID               bus_id used for the match
    … …  
    125125     comment
    126126
    127      /lib/udev/write_net_rules 
     127     /lib/udev/write_net_rules
    128128done
    129129
Note: See TracChangeset for help on using the changeset viewer.