gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-18 11:19:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove eol spaces

Browse Source
This commit is contained in:
Pierre Labastie 2021-09-07 23:10:29 +02:00
parent 4458e3d2d8
commit 3781c69cbc
9 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -143,7 +143,7 @@ validate: tmpdir version
$(Q)./aux-file-data.sh $(RENDERTMP)/lfs-full.xml $(Q)./aux-file-data.sh $(RENDERTMP)/lfs-full.xml
@echo "Validation complete." @echo "Validation complete."
profile-html: profile-html:
@echo "Generating profiled XML for XHTML..." @echo "Generating profiled XML for XHTML..."
$(Q)xsltproc --nonet \ $(Q)xsltproc --nonet \
--stringparam profile.condition html \ --stringparam profile.condition html \

26
lfs-latest-git.php
View File

@ -30,13 +30,13 @@ function find_max( $lines, $regex_match, $regex_replace )
foreach ( $lines as $line ) foreach ( $lines as $line )
{ {
if ( ! preg_match( $regex_match, $line ) ) continue; if ( ! preg_match( $regex_match, $line ) ) continue;
// Isolate the version and put in an array // Isolate the version and put in an array
$slice = preg_replace( $regex_replace, "$1", $line ); $slice = preg_replace( $regex_replace, "$1", $line );
if ( $slice == $line ) continue; if ( $slice == $line ) continue;
array_push( $a, $slice ); array_push( $a, $slice );
} }
// SORT_NATURAL requires php-5.4.0 or later // SORT_NATURAL requires php-5.4.0 or later
@ -98,7 +98,7 @@ function max_parent( $dirpath, $prefix )
$regex_replace = "#^.*(${prefix}[\d\.]+)/.*$#"; $regex_replace = "#^.*(${prefix}[\d\.]+)/.*$#";
$max = find_max( $lines, $regex_match, $regex_replace ); $max = find_max( $lines, $regex_match, $regex_replace );
return "$dirpath/$max"; return "$dirpath/$max";
} }
function get_packages( $package, $dirpath ) function get_packages( $package, $dirpath )
@ -112,8 +112,8 @@ if ( $package == "bc" ) $dirpath = "https://github.com/gavinhoward/bc/re
if ( $package == "check" ) $dirpath = "https://github.com/libcheck/check/releases"; if ( $package == "check" ) $dirpath = "https://github.com/libcheck/check/releases";
if ( $package == "e2fsprogs" ) $dirpath = "https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/"; if ( $package == "e2fsprogs" ) $dirpath = "https://sourceforge.net/projects/e2fsprogs/files/e2fsprogs/";
if ( $package == "expat" ) $dirpath = "http://sourceforge.net/projects/expat/files"; if ( $package == "expat" ) $dirpath = "http://sourceforge.net/projects/expat/files";
if ( $package == "elfutils" ) $dirpath = "https://sourceware.org/ftp/elfutils"; if ( $package == "elfutils" ) $dirpath = "https://sourceware.org/ftp/elfutils";
if ( $package == "expect" ) $dirpath = "http://sourceforge.net/projects/expect/files"; if ( $package == "expect" ) $dirpath = "http://sourceforge.net/projects/expect/files";
if ( $package == "file" ) $dirpath = "https://github.com/file/file/releases"; if ( $package == "file" ) $dirpath = "https://github.com/file/file/releases";
if ( $package == "flex" ) $dirpath = "https://github.com/westes/flex/releases"; if ( $package == "flex" ) $dirpath = "https://github.com/westes/flex/releases";
if ( $package == "gcc" ) $dirpath = max_parent( $dirpath, "gcc-" ); if ( $package == "gcc" ) $dirpath = max_parent( $dirpath, "gcc-" );
@ -138,8 +138,8 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel
//if ( $package == "vim" ) $dirpath = "ftp://ftp.vim.org/pub/vim/unix"; //if ( $package == "vim" ) $dirpath = "ftp://ftp.vim.org/pub/vim/unix";
// Check for ftp // Check for ftp
if ( preg_match( "/^ftp/", $dirpath ) ) if ( preg_match( "/^ftp/", $dirpath ) )
{ {
$dirpath = substr( $dirpath, 6 ); // Remove ftp:// $dirpath = substr( $dirpath, 6 ); // Remove ftp://
$dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash $dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash
$position = strpos( $dirpath, "/" ); // Divide at first slash $position = strpos( $dirpath, "/" ); // Divide at first slash
@ -147,7 +147,7 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel
$path = substr( $dirpath, $position ); $path = substr( $dirpath, $position );
$conn = ftp_connect( $server ); $conn = ftp_connect( $server );
ftp_login( $conn, "anonymous", "" ); ftp_login( $conn, "anonymous", "" );
// See if we need special handling // See if we need special handling
if ( isset( $exceptions[ $package ] ) ) if ( isset( $exceptions[ $package ] ) )
@ -166,7 +166,7 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel
$path = substr( $path, 0, $position ); $path = substr( $path, 0, $position );
// Get dir listing // Get dir listing
$lines = ftp_rawlist ($conn, $path); $lines = ftp_rawlist ($conn, $path);
$max = find_max( $lines, $regexp, $regexp ); $max = find_max( $lines, $regexp, $regexp );
break; break;
@ -233,7 +233,7 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel
$lines = $tmp; $lines = $tmp;
} }
if ( $package == "attr" || if ( $package == "attr" ||
$package == "acl" ) $package == "acl" )
{ {
return find_max( $lines, "/$package/", "/^.*$package-([\d\.-]*\d).tar.*$/" ); return find_max( $lines, "/$package/", "/^.*$package-([\d\.-]*\d).tar.*$/" );
@ -361,8 +361,8 @@ function get_current()
$pattern = "/\D*(\d.*[a-z]*)\.tar\D*/"; $pattern = "/\D*(\d.*[a-z]*)\.tar\D*/";
} }
else if ( preg_match( "/systemd-man-pages/", $file ) ) continue; else if ( preg_match( "/systemd-man-pages/", $file ) ) continue;
else if ( preg_match( "/python/" , $file ) ) continue; else if ( preg_match( "/python/" , $file ) ) continue;
$version = preg_replace( $pattern, "$1", $file ); // Isolate version $version = preg_replace( $pattern, "$1", $file ); // Isolate version
$version = preg_replace( "/^\d-/", "", $version ); // Remove leading #- $version = preg_replace( "/^\d-/", "", $version ); // Remove leading #-

28
lfs-latest.php
View File

@ -30,13 +30,13 @@ function find_max( $lines, $regex_match, $regex_replace )
foreach ( $lines as $line ) foreach ( $lines as $line )
{ {
if ( ! preg_match( $regex_match, $line ) ) continue; if ( ! preg_match( $regex_match, $line ) ) continue;
// Isolate the version and put in an array // Isolate the version and put in an array
$slice = preg_replace( $regex_replace, "$1", $line ); $slice = preg_replace( $regex_replace, "$1", $line );
if ( $slice == $line ) continue; if ( $slice == $line ) continue;
array_push( $a, $slice ); array_push( $a, $slice );
} }
// SORT_NATURAL requires php-5.4.0 or later // SORT_NATURAL requires php-5.4.0 or later
@ -98,7 +98,7 @@ function max_parent( $dirpath, $prefix )
$regex_replace = "#^.*(${prefix}[\d\.]+)/.*$#"; $regex_replace = "#^.*(${prefix}[\d\.]+)/.*$#";
$max = find_max( $lines, $regex_match, $regex_replace ); $max = find_max( $lines, $regex_match, $regex_replace );
return "$dirpath/$max"; return "$dirpath/$max";
} }
function get_packages( $package, $dirpath ) function get_packages( $package, $dirpath )
@ -112,8 +112,8 @@ if ( $package == "bc" ) $dirpath = "https://github.com/gavinhoward/bc/re
if ( $package == "check" ) $dirpath = "https://github.com/libcheck/check/releases"; if ( $package == "check" ) $dirpath = "https://github.com/libcheck/check/releases";
if ( $package == "e2fsprogs" ) $dirpath = "http://sourceforge.net/projects/e2fsprogs/files/e2fsprogs"; if ( $package == "e2fsprogs" ) $dirpath = "http://sourceforge.net/projects/e2fsprogs/files/e2fsprogs";
if ( $package == "expat" ) $dirpath = "http://sourceforge.net/projects/expat/files"; if ( $package == "expat" ) $dirpath = "http://sourceforge.net/projects/expat/files";
if ( $package == "elfutils" ) $dirpath = "https://sourceware.org/ftp/elfutils"; if ( $package == "elfutils" ) $dirpath = "https://sourceware.org/ftp/elfutils";
if ( $package == "expect" ) $dirpath = "http://sourceforge.net/projects/expect/files"; if ( $package == "expect" ) $dirpath = "http://sourceforge.net/projects/expect/files";
if ( $package == "file" ) $dirpath = "https://github.com/file/file/releases"; if ( $package == "file" ) $dirpath = "https://github.com/file/file/releases";
if ( $package == "flex" ) $dirpath = "https://github.com/westes/flex/releases"; if ( $package == "flex" ) $dirpath = "https://github.com/westes/flex/releases";
if ( $package == "gcc" ) $dirpath = max_parent( $dirpath, "gcc-" ); if ( $package == "gcc" ) $dirpath = max_parent( $dirpath, "gcc-" );
@ -135,8 +135,8 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel
//if ( $package == "vim" ) $dirpath = "ftp://ftp.vim.org/pub/vim/unix"; //if ( $package == "vim" ) $dirpath = "ftp://ftp.vim.org/pub/vim/unix";
// Check for ftp // Check for ftp
if ( preg_match( "/^ftp/", $dirpath ) ) if ( preg_match( "/^ftp/", $dirpath ) )
{ {
$dirpath = substr( $dirpath, 6 ); // Remove ftp:// $dirpath = substr( $dirpath, 6 ); // Remove ftp://
$dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash $dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash
$position = strpos( $dirpath, "/" ); // Divide at first slash $position = strpos( $dirpath, "/" ); // Divide at first slash
@ -144,7 +144,7 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel
$path = substr( $dirpath, $position ); $path = substr( $dirpath, $position );
$conn = ftp_connect( $server ); $conn = ftp_connect( $server );
ftp_login( $conn, "anonymous", "" ); ftp_login( $conn, "anonymous", "" );
// See if we need special handling // See if we need special handling
if ( isset( $exceptions[ $package ] ) ) if ( isset( $exceptions[ $package ] ) )
@ -163,7 +163,7 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel
$path = substr( $path, 0, $position ); $path = substr( $path, 0, $position );
// Get dir listing // Get dir listing
$lines = ftp_rawlist ($conn, $path); $lines = ftp_rawlist ($conn, $path);
$max = find_max( $lines, $regexp, $regexp ); $max = find_max( $lines, $regexp, $regexp );
break; break;
@ -196,7 +196,7 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel
$dirpath = substr ( $dirpath, 0, $position ); $dirpath = substr ( $dirpath, 0, $position );
} }
//if ( $package == "bzip2" ) //if ( $package == "bzip2" )
//{ //{
// // Remove one directory // // Remove one directory
// $dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash // $dirpath = rtrim ( $dirpath, "/" ); // Trim any trailing slash
@ -238,7 +238,7 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel
$lines = $tmp; $lines = $tmp;
} }
if ( $package == "attr" || if ( $package == "attr" ||
$package == "acl" ) $package == "acl" )
{ {
return find_max( $lines, "/$package/", "/^.*$package-([\d\.-]*\d).tar.*$/" ); return find_max( $lines, "/$package/", "/^.*$package-([\d\.-]*\d).tar.*$/" );
@ -356,8 +356,8 @@ function get_current()
$pattern = "/\D*(\d.*[a-z]*)\.tar\D*/"; $pattern = "/\D*(\d.*[a-z]*)\.tar\D*/";
} }
else if ( preg_match( "/systemd-man-pages/", $file ) ) continue; else if ( preg_match( "/systemd-man-pages/", $file ) ) continue;
else if ( preg_match( "/python/" , $file ) ) continue; else if ( preg_match( "/python/" , $file ) ) continue;
$version = preg_replace( $pattern, "$1", $file ); // Isolate version $version = preg_replace( $pattern, "$1", $file ); // Isolate version
$version = preg_replace( "/^\d-/", "", $version ); // Remove leading #- $version = preg_replace( "/^\d-/", "", $version ); // Remove leading #-

2
make-aux-files.sh
View File

@ -8,7 +8,7 @@ mv bootscripts lfs-bootscripts-$version
# Create the tarball and clean up # Create the tarball and clean up
tar -cJf lfs-bootscripts-$version.tar.xz --exclude .svn lfs-bootscripts-$version tar -cJf lfs-bootscripts-$version.tar.xz --exclude .svn lfs-bootscripts-$version
mv lfs-bootscripts-$version bootscripts mv lfs-bootscripts-$version bootscripts
#rm -f udev-config*.bz2 #rm -f udev-config*.bz2

2
pdf-fixups.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
if [ $# -lt 1 ] ; then if [ $# -lt 1 ] ; then
echo "This script needs the location of the fo file to update" echo "This script needs the location of the fo file to update"
exit 1 exit 1
fi fi

12
process-scripts.sh
View File

@ -8,17 +8,17 @@ for s in bootscripts/lfs/init.d/* \
udev-lfs/*.rules udev-lfs/*.rules
do do
script=$(basename $s) script=$(basename $s)
# Skip directories # Skip directories
[ $script == 'network-devices' ] && continue [ $script == 'network-devices' ] && continue
#[ $script == 'services' ] && continue #[ $script == 'services' ] && continue
# Disambiguate duplicate file names # Disambiguate duplicate file names
[ $s == 'bootscripts/lfs/sysconfig/rc' ] && script='rc-sysinit'; [ $s == 'bootscripts/lfs/sysconfig/rc' ] && script='rc-sysinit';
[ $s == 'bootscripts/lfs/sysconfig/modules' ] && script='modules-sysinit'; [ $s == 'bootscripts/lfs/sysconfig/modules' ] && script='modules-sysinit';
[ $s == 'bootscripts/lfs/sysconfig/udev_retry' ] && script='config-udev-retry'; [ $s == 'bootscripts/lfs/sysconfig/udev_retry' ] && script='config-udev-retry';
sed -e 's/\&/\&amp\;/g' -e 's/</\&lt\;/g' -e 's/>/\&gt\;/g' \ sed -e 's/\&/\&amp\;/g' -e 's/</\&lt\;/g' -e 's/>/\&gt\;/g' \
-e "s/'/\&apos\;/g" -e 's/"/\&quot\;/g' -e 's/\t/ /g' \ -e "s/'/\&apos\;/g" -e 's/"/\&quot\;/g' -e 's/\t/ /g' \
$s > appendices/${script}.script $s > appendices/${script}.script
done done

4
udev-lfs/ChangeLog
View File

@ -61,7 +61,7 @@
2008-10-15 DJ Lucas <dj@linuxfromscratch.org> 2008-10-15 DJ Lucas <dj@linuxfromscratch.org>
* 55-lfs.rules: Override default perms on floppy disk devices provided * 55-lfs.rules: Override default perms on floppy disk devices provided
by 50-udev-default.rules. Thanks to Bruce Dubbs for the fix. Closes by 50-udev-default.rules. Thanks to Bruce Dubbs for the fix. Closes
LFS ticket #2076. LFS ticket #2076.
2008-05-21 Bryan Kadzban <bryan@linuxfromscratch.org> 2008-05-21 Bryan Kadzban <bryan@linuxfromscratch.org>
* 81-firmware.rules, doc/81-firmware.txt: Remove. This rule is * 81-firmware.rules, doc/81-firmware.txt: Remove. This rule is
@ -145,7 +145,7 @@
* 05-udev-early.rules, 60-persistent-storage.rules: Sync up with * 05-udev-early.rules, 60-persistent-storage.rules: Sync up with
upstream sample rules files (from udev-102), except for one rule upstream sample rules files (from udev-102), except for one rule
which is more specific in our tarball and should probably be changed which is more specific in our tarball and should probably be changed
upstream. upstream.
* doc/60-persistent-storage.txt: Modify to match the changes. Also * doc/60-persistent-storage.txt: Modify to match the changes. Also
fix a couple typos. fix a couple typos.

2
udev-lfs/Makefile.lfs
View File

@ -15,7 +15,7 @@ endif
all: all:
@echo "Use the install target" @echo "Use the install target"
install: install:
@mkdir -pv $(DESTDIR)/lib/udev/rules.d \ @mkdir -pv $(DESTDIR)/lib/udev/rules.d \
$(DESTDIR)/etc/udev/rules.d \ $(DESTDIR)/etc/udev/rules.d \
$(DESTDIR)/usr/share/doc/udev-$(VERSION)/lfs $(DESTDIR)/usr/share/doc/udev-$(VERSION)/lfs

14
udev-lfs/init-net-rules.sh
View File

@ -4,7 +4,7 @@
# Data from udev-182 75-persistent-net-generator.rules # Data from udev-182 75-persistent-net-generator.rules
# Updated fof udev-197 (DEVICES=en*) # Updated fof udev-197 (DEVICES=en*)
RULES=/etc/udev/rules.d/70-persistent-net.rules RULES=/etc/udev/rules.d/70-persistent-net.rules
DEVICES=$(eval echo /sys/class/net/{en*,eth*,ath*,wlan*[0-9],msh*,ra*,sta*,ctc*,lcs*,hsi*}) DEVICES=$(eval echo /sys/class/net/{en*,eth*,ath*,wlan*[0-9],msh*,ra*,sta*,ctc*,lcs*,hsi*})
function usage function usage
@ -68,9 +68,9 @@ function comment
# export COMMENT="ibmveth ($id)" # export COMMENT="ibmveth ($id)"
# S/390 uses id matches only, do not use MAC address match # S/390 uses id matches only, do not use MAC address match
# SUBSYSTEMS=="ccwgroup", # SUBSYSTEMS=="ccwgroup",
# export COMMENT="S/390 $driver device at $id", # export COMMENT="S/390 $driver device at $id",
# export MATCHID="$id" # export MATCHID="$id"
# export MATCHDRV="$driver" # export MATCHDRV="$driver"
# export MATCHADDR="" # export MATCHADDR=""
@ -98,10 +98,10 @@ fi
if [ -e /proc/xen ]; then if [ -e /proc/xen ]; then
msg="The rules file should not be created in the Xen environment" msg="The rules file should not be created in the Xen environment"
usage usage
fi fi
# Variables used to communicate with write_net_rules: # Variables used to communicate with write_net_rules:
# INTERFACE simple interface name # INTERFACE simple interface name
# MATCHADDR MAC address used for the match # MATCHADDR MAC address used for the match
# MATCHID bus_id used for the match # MATCHID bus_id used for the match
# MATCHDRV driver name used for the match # MATCHDRV driver name used for the match
@ -124,6 +124,6 @@ for NIC in $DEVICES; do
export MATCHIFTYPE="$(cat $NIC/type)" # Read interface type export MATCHIFTYPE="$(cat $NIC/type)" # Read interface type
comment comment
/lib/udev/write_net_rules /lib/udev/write_net_rules
done done