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

Replace tabs with spaces

Browse Source
This commit is contained in:
Pierre Labastie 2022-09-11 18:42:26 +02:00
parent 84e1bb6b85
commit c37e846f4b
13 changed files with 224 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bootscripts/lfs/sysconfig/createfiles
View File

@ -8,23 +8,23 @@
# Version : 00.00 # Version : 00.00
# #
# Notes : The syntax of this file is as follows: # Notes : The syntax of this file is as follows:
# if type is equal to "file" or "dir" # if type is equal to "file" or "dir"
# <filename> <type> <permissions> <user> <group> # <filename> <type> <permissions> <user> <group>
# if type is equal to "dev" # if type is equal to "dev"
# <filename> <type> <permissions> <user> <group> <devtype> # <filename> <type> <permissions> <user> <group> <devtype>
# <major> <minor> # <major> <minor>
# #
# <filename> is the name of the file which is to be created # <filename> is the name of the file which is to be created
# <type> is either file, dir, or dev. # <type> is either file, dir, or dev.
# file creates a new file # file creates a new file
# dir creates a new directory # dir creates a new directory
# dev creates a new device # dev creates a new device
# <devtype> is either block, char or pipe # <devtype> is either block, char or pipe
# block creates a block device # block creates a block device
# char creates a character deivce # char creates a character deivce
# pipe creates a pipe, this will ignore the <major> and # pipe creates a pipe, this will ignore the <major> and
# <minor> fields # <minor> fields
# <major> and <minor> are the major and minor numbers used for # <major> and <minor> are the major and minor numbers used for
# the device. # the device.
######################################################################## ########################################################################

2
bootscripts/lfs/sysconfig/modules
View File

@ -8,7 +8,7 @@
# Version : 00.00 # Version : 00.00
# #
# Notes : The syntax of this file is as follows: # Notes : The syntax of this file is as follows:
# <module> [<arg1> <arg2> ...] # <module> [<arg1> <arg2> ...]
# #
# Each module should be on its own line, and any options that you want # Each module should be on its own line, and any options that you want
# passed to the module should follow it. The line deliminator is either # passed to the module should follow it. The line deliminator is either

6
chapter03/packages.xml
View File

@ -20,9 +20,9 @@
reachable, you should read the security advisories first to figure out reachable, you should read the security advisories first to figure out
if a newer version (with the vulnerability fixed) should be used. If if a newer version (with the vulnerability fixed) should be used. If
not, try to download the removed package from a mirror. Although it's not, try to download the removed package from a mirror. Although it's
possible to download an old release from a mirror even if this release possible to download an old release from a mirror even if this release
has been removed because of a vulnerability, it's not recommended to has been removed because of a vulnerability, it's not recommended to
use a release known to be vulnerable for building your system.</para> use a release known to be vulnerable for building your system.</para>
</note> </note>
<para>Download or otherwise obtain the following packages:</para> <para>Download or otherwise obtain the following packages:</para>

2
chapter04/settingenviron.xml
View File

@ -186,7 +186,7 @@ EOF</userinput></screen>
<para>After use of the <systemitem class="username">lfs</systemitem> <para>After use of the <systemitem class="username">lfs</systemitem>
user is finished at the beginning of <xref user is finished at the beginning of <xref
linkend="chapter-chroot-temporary-tools"/>, you can restore linkend="chapter-chroot-temporary-tools"/>, you can restore
<filename>/etc/bash.bashrc</filename> (if desired).</para> <filename>/etc/bash.bashrc</filename> (if desired).</para>
<para>Note that the LFS Bash package we will build in <para>Note that the LFS Bash package we will build in
<xref linkend="ch-system-bash"/> is not configured to load or execute <xref linkend="ch-system-bash"/> is not configured to load or execute

2
chapter08/gettext.xml
View File

@ -62,7 +62,7 @@
<listitem> <listitem>
<para>Since bison is not yet installed in /usr, configure hardcodes <para>Since bison is not yet installed in /usr, configure hardcodes
the directory containing translations for the bison program (the the directory containing translations for the bison program (the
"locale" directory) as /tools/share/locale. Passing this variable "locale" directory) as /tools/share/locale. Passing this variable
to make allows overriding the choice made by configure.</para> to make allows overriding the choice made by configure.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>

2
chapter08/meson.xml
View File

@ -108,7 +108,7 @@ install -vDm644 data/shell-completions/zsh/_meson /usr/share/zsh/site-functions/
<?dbhtml list-presentation="table"?> <?dbhtml list-presentation="table"?>
<varlistentry id="meson"> <varlistentry id="meson">
<term><command>meson</command></term> <term><command>meson</command></term>
<listitem> <listitem>
<para>A high productivity build system</para> <para>A high productivity build system</para>
<indexterm zone="ch-system-meson meson"> <indexterm zone="ch-system-meson meson">

6
chapter08/readline.xml
View File

@ -63,9 +63,9 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
<term><parameter>--with-curses</parameter></term> <term><parameter>--with-curses</parameter></term>
<listitem> <listitem>
<para>This option tells Readline that it can find the termcap <para>This option tells Readline that it can find the termcap
library functions in the curses library, rather than a separate library functions in the curses library, rather than a separate
termcap library. It allows generating a correct termcap library. It allows generating a correct
<filename>readline.pc</filename> file.</para> <filename>readline.pc</filename> file.</para>
</listitem> </listitem>
</varlistentry> </varlistentry>

5
chapter08/vim.xml
View File

@ -170,8 +170,9 @@ EOF</userinput></screen>
To install spell files for your preferred language, download the To install spell files for your preferred language, download the
<filename>*.spl</filename> and optionally, the <filename>*.sug</filename> <filename>*.spl</filename> and optionally, the <filename>*.sug</filename>
files for your language and character encoding from <ulink files for your language and character encoding from <ulink
url="ftp://ftp.vim.org/pub/vim/runtime/spell/"/> and save them to url="https://github.com/vim/vim/tree/master/runtime/spell/"/> and save
<filename class='directory'>/usr/share/&vim-docdir;/spell/</filename>.</para> them to <filename class='directory'>
/usr/share/&vim-docdir;/spell/</filename>.</para>
<para>To use these spell files, some configuration in <para>To use these spell files, some configuration in
<filename>/etc/vimrc</filename> is needed, e.g.:</para> <filename>/etc/vimrc</filename> is needed, e.g.:</para>

46
git-version.sh
View File

@ -1,31 +1,31 @@
#!/bin/sh #!/bin/sh
if [ "$1" = sysv ]; then if [ "$1" = sysv ]; then
SYSV="INCLUDE" SYSV="INCLUDE"
SYSTEMD="IGNORE " SYSTEMD="IGNORE "
elif [ "$1" = systemd ]; then elif [ "$1" = systemd ]; then
SYSV="IGNORE " SYSV="IGNORE "
SYSTEMD="INCLUDE" SYSTEMD="INCLUDE"
else else
echo You must provide either \"sysv\" or \"systemd\" as argument echo You must provide either \"sysv\" or \"systemd\" as argument
exit 1 exit 1
fi fi
echo "<!ENTITY % sysv \"$SYSV\">" > conditional.ent echo "<!ENTITY % sysv \"$SYSV\">" > conditional.ent
echo "<!ENTITY % systemd \"$SYSTEMD\">" >> conditional.ent echo "<!ENTITY % systemd \"$SYSTEMD\">" >> conditional.ent
if ! git status > /dev/null; then if ! git status > /dev/null; then
# Either it's not a git repository, or git is unavaliable. # Either it's not a git repository, or git is unavaliable.
# Just workaround. # Just workaround.
echo "<![ %sysv; [" > version.ent echo "<![ %sysv; [" > version.ent
echo "<!ENTITY version \"unknown\">" >> version.ent echo "<!ENTITY version \"unknown\">" >> version.ent
echo "]]>" >> version.ent echo "]]>" >> version.ent
echo "<![ %systemd; [" >> version.ent echo "<![ %systemd; [" >> version.ent
echo "<!ENTITY version \"unknown-systemd\">" >> version.ent echo "<!ENTITY version \"unknown-systemd\">" >> version.ent
echo "]]>" >> version.ent echo "]]>" >> version.ent
echo "<!ENTITY releasedate \"unknown\">" >> version.ent echo "<!ENTITY releasedate \"unknown\">" >> version.ent
echo "<!ENTITY copyrightdate \"1999-2022\">" >> version.ent echo "<!ENTITY copyrightdate \"1999-2022\">" >> version.ent
exit 0 exit 0
fi fi
export LC_ALL=en_US.utf8 export LC_ALL=en_US.utf8
@ -39,10 +39,10 @@ month_digit=$(date --date "$commit_date" "+%m")
day=$(date --date "$commit_date" "+%d" | sed 's/^0//') day=$(date --date "$commit_date" "+%d" | sed 's/^0//')
case $day in case $day in
"1" | "21" | "31" ) suffix="st";; "1" | "21" | "31" ) suffix="st";;
"2" | "22" ) suffix="nd";; "2" | "22" ) suffix="nd";;
"3" | "23" ) suffix="rd";; "3" | "23" ) suffix="rd";;
* ) suffix="th";; * ) suffix="th";;
esac esac
full_date="$month $day$suffix, $year" full_date="$month $day$suffix, $year"
@ -53,8 +53,8 @@ version="$rev"
versiond="$rev-systemd" versiond="$rev-systemd"
if [ "$(git diff HEAD | wc -l)" != "0" ]; then if [ "$(git diff HEAD | wc -l)" != "0" ]; then
version="$version+" version="$version+"
versiond="$versiond+" versiond="$versiond+"
fi fi
echo "<![ %sysv; [" > version.ent echo "<![ %sysv; [" > version.ent

6
packages.ent
View File

@ -207,10 +207,10 @@
<!ENTITY flex-fin-du "33 MB"> <!ENTITY flex-fin-du "33 MB">
<!ENTITY flex-fin-sbu "0.4 SBU"> <!ENTITY flex-fin-sbu "0.4 SBU">
<!ENTITY gawk-version "5.1.1"> <!ENTITY gawk-version "5.2.0">
<!ENTITY gawk-size "3,075 KB"> <!ENTITY gawk-size "3,306 KB">
<!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz"> <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz">
<!ENTITY gawk-md5 "83650aa943ff2fd519b2abedf8506ace"> <!ENTITY gawk-md5 "2f724d925873fc82f5e7b1d605ba9a42">
<!ENTITY gawk-home "&gnu-software;gawk/"> <!ENTITY gawk-home "&gnu-software;gawk/">
<!ENTITY gawk-tmp-du "45 MB"> <!ENTITY gawk-tmp-du "45 MB">
<!ENTITY gawk-tmp-sbu "0.2 SBU"> <!ENTITY gawk-tmp-sbu "0.2 SBU">

4
part3intro/generalinstructions.xml
View File

@ -82,9 +82,9 @@
<listitem> <listitem>
<para>Place all the sources and patches in a directory that will be <para>Place all the sources and patches in a directory that will be
accessible from the chroot environment such as accessible from the chroot environment such as
<filename class="directory">/mnt/lfs/sources/</filename>.<!-- Do <filename class="directory">/mnt/lfs/sources/</filename>.<!-- Do
<emphasis>not</emphasis> put sources in <emphasis>not</emphasis> put sources in
<filename class="directory">/mnt/lfs/tools/</filename>. --></para> <filename class="directory">/mnt/lfs/tools/</filename>. --></para>
</listitem> </listitem>
<listitem> <listitem>
<para>Change to the sources directory.</para> <para>Change to the sources directory.</para>

336
udev-lfs/ChangeLog
View File

@ -8,257 +8,257 @@
* Makefile.lfs: Adjust warning flags. Adjust linking rules to * Makefile.lfs: Adjust warning flags. Adjust linking rules to
allow build with util-linux in LFS's /tools directory. allow build with util-linux in LFS's /tools directory.
2010-01-26 Matt Burgess <matthew@linuxfromscratch.org> 2010-01-26 Matt Burgess <matthew@linuxfromscratch.org>
* 55-lfs.rules: Remove lots of rules that have been merged upstream. * 55-lfs.rules: Remove lots of rules that have been merged upstream.
* 61-cdrom.rules: Remove as upstream has a replacement. * 61-cdrom.rules: Remove as upstream has a replacement.
* doc/*: Cleanup and rewrite now that the rules are much simpler. * doc/*: Cleanup and rewrite now that the rules are much simpler.
2009-09-25 Bryan Kadzban <bryan@linuxfromscratch.org> 2009-09-25 Bryan Kadzban <bryan@linuxfromscratch.org>
* 55-lfs.rules: Make the RTC rule (which runs setclock) work for people * 55-lfs.rules: Make the RTC rule (which runs setclock) work for people
that don't use the RTC-class driver -- add another copy of the rule, that don't use the RTC-class driver -- add another copy of the rule,
using KERNEL=="rtc" instead of SUBSYSTEM=="rtc". Also move the ACTION using KERNEL=="rtc" instead of SUBSYSTEM=="rtc". Also move the ACTION
match before the assignment to MODE. match before the assignment to MODE.
2009-05-23 Bruce Dubbs <bdubbs@linuxfromscratch.org> 2009-05-23 Bruce Dubbs <bdubbs@linuxfromscratch.org>
* 55-lfs.rules: Set the rtc by udev upon boot. Removed aio device from * 55-lfs.rules: Set the rtc by udev upon boot. Removed aio device from
udev configuration so defaults are used. udev configuration so defaults are used.
2009-05-16 Bryan Kadzban <bryan@linuxfromscratch.org> 2009-05-16 Bryan Kadzban <bryan@linuxfromscratch.org>
* 55-lfs.rules: Adopt udev permissions for random, urandom, kmsg, and * 55-lfs.rules: Adopt udev permissions for random, urandom, kmsg, and
input devices (including psaux, which probably doesn't exist anymore input devices (including psaux, which probably doesn't exist anymore
anyway). anyway).
2009-05-16 Matt Burgess <matthew@linuxfromscratch.org> 2009-05-16 Matt Burgess <matthew@linuxfromscratch.org>
* 55-lfs.rules: Remove the block rule as it was only setting * 55-lfs.rules: Remove the block rule as it was only setting
permissions that Udev will set by default permissions that Udev will set by default
* 55-lfs.rules: Remove the rfcomm rule as the group it sets is already * 55-lfs.rules: Remove the rfcomm rule as the group it sets is already
included in upstream's rule included in upstream's rule
* 55-lfs-rules: Remove the tape rules as the group they sets is already * 55-lfs-rules: Remove the tape rules as the group they sets is already
included in upstream's rules included in upstream's rules
2009-03-15 Bryan Kadzban <bryan@linuxfromscratch.org> 2009-03-15 Bryan Kadzban <bryan@linuxfromscratch.org>
* 55-lfs.rules: Remove the ISDN-handling rules (replaced with upstream's * 55-lfs.rules: Remove the ISDN-handling rules (replaced with upstream's
version, which has a better match via SUBSYSTEM). version, which has a better match via SUBSYSTEM).
* 55-lfs.rules: Replace "uucp" with "dialout" now that udev has decided * 55-lfs.rules: Replace "uucp" with "dialout" now that udev has decided
to standardize on a Debian-like setup (uucp is for UUCP daemons to use to standardize on a Debian-like setup (uucp is for UUCP daemons to use
for privilege separation; dialout is for users and devices). for privilege separation; dialout is for users and devices).
2008-12-07 Bruce Dubbs <bdubbs@linuxfromscratch.org> 2008-12-07 Bruce Dubbs <bdubbs@linuxfromscratch.org>
* 55-lfs.rules: Change one line to use continuation so it does * 55-lfs.rules: Change one line to use continuation so it does
not overflow the book's width. not overflow the book's width.
2008-12-07 Bryan Kadzban <bryan@linuxfromscratch.org> 2008-12-07 Bryan Kadzban <bryan@linuxfromscratch.org>
* 55-lfs.rules: Remove several rules that are either provided by upstream, * 55-lfs.rules: Remove several rules that are either provided by upstream,
or that don't have any effect (there is no /dev/js or /dev/djs according or that don't have any effect (there is no /dev/js or /dev/djs according
to devices.txt). to devices.txt).
* 55-lfs.rules, 61-cdrom.rules: Replace ACTION=="add" with "add|change" * 55-lfs.rules, 61-cdrom.rules: Replace ACTION=="add" with "add|change"
everywhere, per upstream's general request. everywhere, per upstream's general request.
2008-11-11 Bryan Kadzban <bryan@linuxfromscratch.org> 2008-11-11 Bryan Kadzban <bryan@linuxfromscratch.org>
* 55-lfs.rules, 61-cdrom.rules: Fix comments to use the right rule * 55-lfs.rules, 61-cdrom.rules: Fix comments to use the right rule
numbers. Thanks to Trent Shea for the fix. Closes #2278. numbers. Thanks to Trent Shea for the fix. Closes #2278.
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
already handled by udev's 50-udev-default.rules file. The docs already handled by udev's 50-udev-default.rules file. The docs
can be added back later if needed. can be added back later if needed.
* Makefile: Don't install the above deleted files. * Makefile: Don't install the above deleted files.
* 55-lfs.rules: Remove the device-mapper rule, since the upstream * 55-lfs.rules: Remove the device-mapper rule, since the upstream
50-udev-default.rules file handles it properly. 50-udev-default.rules file handles it properly.
2008-04-02 Bryan Kadzban <bryan@linuxfromscratch.org> 2008-04-02 Bryan Kadzban <bryan@linuxfromscratch.org>
* Makefile: Make the package DESTDIR-friendly by installing the docs * Makefile: Make the package DESTDIR-friendly by installing the docs
into a fixed $(PREFIX)/share/doc/udev-config directory, instead of into a fixed $(PREFIX)/share/doc/udev-config directory, instead of
trying to figure out what version of udev was just installed. trying to figure out what version of udev was just installed.
2007-10-30 Bryan Kadzban <bryan@linuxfromscratch.org> 2007-10-30 Bryan Kadzban <bryan@linuxfromscratch.org>
* 55-lfs.rules: Since the dialout group was renamed to uucp, delete * 55-lfs.rules: Since the dialout group was renamed to uucp, delete
the rules that override upstream's assignment of the dialout group. the rules that override upstream's assignment of the dialout group.
Replace "dialout" with "uucp" on the remaining rules. Replace "dialout" with "uucp" on the remaining rules.
2007-10-29 Bryan Kadzban <bryan@linuxfromscratch.org> 2007-10-29 Bryan Kadzban <bryan@linuxfromscratch.org>
* 51-lfs.rules: Move to 55-lfs.rules. * 51-lfs.rules: Move to 55-lfs.rules.
* doc/51-lfs.rules: Move to doc/55-lfs.rules. * doc/51-lfs.rules: Move to doc/55-lfs.rules.
2007-10-27 Bryan Kadzban <bryan@linuxfromscratch.org> 2007-10-27 Bryan Kadzban <bryan@linuxfromscratch.org>
* 25-lfs.rules: Some rules in here are duplicates of rules from udev's * 25-lfs.rules: Some rules in here are duplicates of rules from udev's
new 50-udev-defaults.rules file; remove them. Override permissions new 50-udev-defaults.rules file; remove them. Override permissions
where needed elsewhere (and document overrides in comments). where needed elsewhere (and document overrides in comments).
* 26-modprobe.rules: Provided by udev's 80-drivers.rules and built-in * 26-modprobe.rules: Provided by udev's 80-drivers.rules and built-in
modaliases for SCSI device-type modules in 2.6.22+ kernels; remove. modaliases for SCSI device-type modules in 2.6.22+ kernels; remove.
* 25-lfs.rules: Move to 51-lfs.rules. * 25-lfs.rules: Move to 51-lfs.rules.
* 27-firmware.rules: Move to 81-firmware.rules. * 27-firmware.rules: Move to 81-firmware.rules.
* 81-cdrom.rules: Move to 61-cdrom.rules. * 81-cdrom.rules: Move to 61-cdrom.rules.
* doc/25-lfs.txt: Rename to 51-lfs.txt. * doc/25-lfs.txt: Rename to 51-lfs.txt.
* doc/26-modprobe.txt: Rename to 80-drivers.txt, and modify to reflect * doc/26-modprobe.txt: Rename to 80-drivers.txt, and modify to reflect
the upstream rules. the upstream rules.
* doc/27-firmware.txt: Rename to 81-firmware.txt. * doc/27-firmware.txt: Rename to 81-firmware.txt.
* doc/81-cdrom.txt: Rename to 61-cdrom.txt. * doc/81-cdrom.txt: Rename to 61-cdrom.txt.
* Makefile: Use new filenames. * Makefile: Use new filenames.
2007-07-31 Dan Nicholson <dnicholson@linuxfromscratch.org> 2007-07-31 Dan Nicholson <dnicholson@linuxfromscratch.org>
* 25-lfs.rules: Changed the usb_device rule tto create /dev/bus/usb * 25-lfs.rules: Changed the usb_device rule tto create /dev/bus/usb
nodes if the usb_device in 2.6.22+ kernels. The rule was also changed nodes if the usb_device in 2.6.22+ kernels. The rule was also changed
to only trigger on "add" events. This change is not backwards to only trigger on "add" events. This change is not backwards
compatible with older kernels. compatible with older kernels.
2007-06-12 Dan Nicholson <dnicholson@linuxfromscratch.org> 2007-06-12 Dan Nicholson <dnicholson@linuxfromscratch.org>
* 25-lfs.rules: Fix the CPUID nodes from cpu/%n/cpu to cpu/%n/cpuid, * 25-lfs.rules: Fix the CPUID nodes from cpu/%n/cpu to cpu/%n/cpuid,
which is what's expected in userspace apps such as x86info. which is what's expected in userspace apps such as x86info.
2007-06-08 Bryan Kadzban <bryan@linuxfromscratch.org> 2007-06-08 Bryan Kadzban <bryan@linuxfromscratch.org>
* 25-lfs.rules: Add rules for DVB devices (create nodes in /dev/dvb/) * 25-lfs.rules: Add rules for DVB devices (create nodes in /dev/dvb/)
and floppies (create extra nodes based on CMOS type), copied from and floppies (create extra nodes based on CMOS type), copied from
the SuSE rules file. Thanks to Alexander Patrakov for the bugreport. the SuSE rules file. Thanks to Alexander Patrakov for the bugreport.
2007-03-04 Matthew Burgess <matthew@linuxfromscratch.org> 2007-03-04 Matthew Burgess <matthew@linuxfromscratch.org>
* Makefile: Use `udevd --version' to work out what version of Udev is * Makefile: Use `udevd --version' to work out what version of Udev is
installed (requires Udev >= 106) installed (requires Udev >= 106)
2007-01-02 Bryan Kadzban <bryan@linuxfromscratch.org> 2007-01-02 Bryan Kadzban <bryan@linuxfromscratch.org>
* 25-lfs.rules: Change CPU devices (cpu, msr, microcode) to be in * 25-lfs.rules: Change CPU devices (cpu, msr, microcode) to be in
/dev/cpu/ and /dev/cpu/N/, to match Documentation/devices.txt. /dev/cpu/ and /dev/cpu/N/, to match Documentation/devices.txt.
2006-10-21 Bryan Kadzban <bryan@linuxfromscratch.org> 2006-10-21 Bryan Kadzban <bryan@linuxfromscratch.org>
* Makefile: Add a missing backslash in install-extra-doc. * Makefile: Add a missing backslash in install-extra-doc.
* 05-udev-early.rules, 60-persistent-input.rules, * 05-udev-early.rules, 60-persistent-input.rules,
60-persistent-storage.rules, 95-udev-late.rules: Remove. The book 60-persistent-storage.rules, 95-udev-late.rules: Remove. The book
will install these files from udev's etc/udev/rules.d directory will install these files from udev's etc/udev/rules.d directory
instead. instead.
* Makefile: Don't install these rules files after all. Also, only * Makefile: Don't install these rules files after all. Also, only
install corresponding docs if requested. install corresponding docs if requested.
2006-10-20 Bryan Kadzban <bryan@linuxfromscratch.org> 2006-10-20 Bryan Kadzban <bryan@linuxfromscratch.org>
* Makefile: Added; contains targets to install rules and doc files. * Makefile: Added; contains targets to install rules and doc files.
From Dan Nicholson. From Dan Nicholson.
2006-10-14 Bryan Kadzban <bryan@linuxfromscratch.org> 2006-10-14 Bryan Kadzban <bryan@linuxfromscratch.org>
* 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.
* 25-lfs.rules: Remove duplicate rules (ttyS[0-9]* is also matched by * 25-lfs.rules: Remove duplicate rules (ttyS[0-9]* is also matched by
tty[BC...S...][0-9]*, and ttyUSB[0-9]* is in there twice). tty[BC...S...][0-9]*, and ttyUSB[0-9]* is in there twice).
* 25-lfs.rules: Fix Alsa device KERNEL rules. Udev uses shell-style * 25-lfs.rules: Fix Alsa device KERNEL rules. Udev uses shell-style
glob matching, not regular expressions, so the old rules would match glob matching, not regular expressions, so the old rules would match
nonsense device names like hw0asdf and pcmDzxcv. As long as the first nonsense device names like hw0asdf and pcmDzxcv. As long as the first
character after the "fixed" portion was in the list, the rule would character after the "fixed" portion was in the list, the rule would
match; it wouldn't apply the same character range to later characters. match; it wouldn't apply the same character range to later characters.
* doc/25-lfs.txt: Add a note on interaction between permissions and * doc/25-lfs.txt: Add a note on interaction between permissions and
symlinks. symlinks.
2006-10-09 Bryan Kadzban <bryan@linuxfromscrtach.org> 2006-10-09 Bryan Kadzban <bryan@linuxfromscrtach.org>
* 25-lfs.rules: Fix fb[0-9]* device permissions (should use the default * 25-lfs.rules: Fix fb[0-9]* device permissions (should use the default
0660). 0660).
* doc/25-lfs.txt: Fix typo: /dev/ptmx is given mode 0666, not 0660. * doc/25-lfs.txt: Fix typo: /dev/ptmx is given mode 0666, not 0660.
Also tweak the comment about other TTY devices. Also tweak the comment about other TTY devices.
2006-10-04 Bryan Kadzban <bryan@linuxfromscratch.org> 2006-10-04 Bryan Kadzban <bryan@linuxfromscratch.org>
* 05-udev-early.rules: Remove WAIT_FOR_SYSFS="bus" rule. With kernel * 05-udev-early.rules: Remove WAIT_FOR_SYSFS="bus" rule. With kernel
2.6.18, this rule is no longer required. 2.6.18, this rule is no longer required.
* doc/05-udev-early.txt: Update to match. * doc/05-udev-early.txt: Update to match.
2006-09-28 Bryan Kadzban <bryan@linuxfromscratch.org> 2006-09-28 Bryan Kadzban <bryan@linuxfromscratch.org>
* doc/60-persistent-storage.txt: Explain persistent storage rules, or * doc/60-persistent-storage.txt: Explain persistent storage rules, or
at least the parts I understand. (I don't use DASD or netblock or at least the parts I understand. (I don't use DASD or netblock or
several other supported configurations.) several other supported configurations.)
* doc/81-cdrom.txt: Explain 81-cdrom.rules. * doc/81-cdrom.txt: Explain 81-cdrom.rules.
* doc/95-udev-late.txt: Explain 95-udev-late.rules. Documentation is * doc/95-udev-late.txt: Explain 95-udev-late.rules. Documentation is
now finished. now finished.
2006-09-26 Bryan Kadzban <bryan@linuxfromscratch.org> 2006-09-26 Bryan Kadzban <bryan@linuxfromscratch.org>
* doc/60-persistent-input.txt: Explain (in probably too much detail) * doc/60-persistent-input.txt: Explain (in probably too much detail)
60-persistent-input.rules. 60-persistent-input.rules.
2006-09-24 Bryan Kadzban <bryan@linuxfromscratch.org> 2006-09-24 Bryan Kadzban <bryan@linuxfromscratch.org>
* doc/05-udev-early.txt: Rewrap to fit 80 columns. * doc/05-udev-early.txt: Rewrap to fit 80 columns.
* doc/26-modprobe.txt: Explain 26-modprobe.rules, and modaliases. * doc/26-modprobe.txt: Explain 26-modprobe.rules, and modaliases.
* doc/27-firmware.txt: Explain 27-firmware.rules. * doc/27-firmware.txt: Explain 27-firmware.rules.
2006-09-24 Bryan Kadzban <bryan@linuxfromscratch.org> 2006-09-24 Bryan Kadzban <bryan@linuxfromscratch.org>
* doc/25-lfs.txt: Explain 25-lfs.rules. * doc/25-lfs.txt: Explain 25-lfs.rules.
* 25-lfs.rules: Use SYMLINK+= for isdn/capi20 also. * 25-lfs.rules: Use SYMLINK+= for isdn/capi20 also.
2006-09-23 Bryan Kadzban <bryan@linuxfromscratch.org> 2006-09-23 Bryan Kadzban <bryan@linuxfromscratch.org>
* doc: New subdirectory to contain documentation of rules * doc: New subdirectory to contain documentation of rules
* doc/README: New file, top-level documentation * doc/README: New file, top-level documentation
* doc/*.txt: New documentation files, one for each rules file. Only * doc/*.txt: New documentation files, one for each rules file. Only
05-udev-early.txt has anything in it. 05-udev-early.txt has anything in it.
2006-09-23 Bryan Kadzban <bryan@linuxfromscratch.org> 2006-09-23 Bryan Kadzban <bryan@linuxfromscratch.org>
* 25-lfs.rules: Add "ignore_device" to OPTIONS for DRI devices, instead * 25-lfs.rules: Add "ignore_device" to OPTIONS for DRI devices, instead
of setting NAME to an empty string. This matches the way we ignore of setting NAME to an empty string. This matches the way we ignore
devmapper / LVM devices. devmapper / LVM devices.
2006-09-22 Bryan Kadzban <bryan@linuxfromscratch.org> 2006-09-22 Bryan Kadzban <bryan@linuxfromscratch.org>
* 60-persistent-input.rules, 95-udev-late.rules: Import from udev-100. * 60-persistent-input.rules, 95-udev-late.rules: Import from udev-100.
60-persistent-input.rules creates persistent symlinks for input 60-persistent-input.rules creates persistent symlinks for input
devices, and 95-udev-late.rules enables udevmonitor. devices, and 95-udev-late.rules enables udevmonitor.
* 60-persistent-storage.rules: Replace ATTRS{../removable} with just * 60-persistent-storage.rules: Replace ATTRS{../removable} with just
ATTRS{removable} on partition devices. Replace ATTRS{removable} ATTRS{removable} on partition devices. Replace ATTRS{removable}
with ATTR{removable} on whole-disk devices. with ATTR{removable} on whole-disk devices.
2006-09-20 Bryan Kadzban <bryan@linuxfromscratch.org> 2006-09-20 Bryan Kadzban <bryan@linuxfromscratch.org>
* 05-early.rules: Missed a rule in the last change. ENV{PHYSDEVBUS} * 05-early.rules: Missed a rule in the last change. ENV{PHYSDEVBUS}
in the rule that waits for the "bus" symlink should be replaced by in the rule that waits for the "bus" symlink should be replaced by
SUBSYSTEMS. SUBSYSTEMS.
2006-09-20 Bryan Kadzban <bryan@linuxfromscratch.org> 2006-09-20 Bryan Kadzban <bryan@linuxfromscratch.org>
* Adapted rules to the new matches used in udev-098 and above (e.g., * Adapted rules to the new matches used in udev-098 and above (e.g.,
SYSFS becomes ATTRS). Prevents warnings, and support for the old SYSFS becomes ATTRS). Prevents warnings, and support for the old
matches will be removed eventually. These rules will not work with matches will be removed eventually. These rules will not work with
udev-097 and before! udev-097 and before!
* Fixed several bugs in the rules left over from previous udev * Fixed several bugs in the rules left over from previous udev
versions (missing commas, overwriting user symlinks using ="..." versions (missing commas, overwriting user symlinks using ="..."
instead of +="...", and matching against "*" instead of "?*"). instead of +="...", and matching against "*" instead of "?*").
* Renamed CHANGELOG to ChangeLog, started using pseudo-GNU-format * Renamed CHANGELOG to ChangeLog, started using pseudo-GNU-format
entries. (See standards.info; search it for "changelog" to get entries. (See standards.info; search it for "changelog" to get
the general gist.) the general gist.)
dnicholson - Jul 14, 2006 dnicholson - Jul 14, 2006
* Fixed usbdev PROGRAM so that it works with the BusyBox sh. Thanks * Fixed usbdev PROGRAM so that it works with the BusyBox sh. Thanks
to Anthony Wright. to Anthony Wright.
n/a - Jul 12, 2006 n/a - Jul 12, 2006
* Added options so temporary nodes are not created with device-mapper * Added options so temporary nodes are not created with device-mapper
* Adapted cdrom rules to identify CD-ROM drives correctly by adding * Adapted cdrom rules to identify CD-ROM drives correctly by adding
SUBSYSTEM=="block" test. SUBSYSTEM=="block" test.
* Added simple 81-cdrom.rules file to set cdrom group ownership * Added simple 81-cdrom.rules file to set cdrom group ownership
n/a - Jun 07, 2006 n/a - Jun 07, 2006
* Removed nvidia rules * Removed nvidia rules
* Removed bug reporting rule * Removed bug reporting rule
* Moved Debian-based persistent CD-ROM rules to contrib * Moved Debian-based persistent CD-ROM rules to contrib
* Adapted firmware rule to udev-093 * Adapted firmware rule to udev-093
n/a - May 15, 2006 n/a - May 15, 2006
* Part one of 25-lfs.rules rewrite * Part one of 25-lfs.rules rewrite
* Some minor tweaking of the layout * Some minor tweaking of the layout
n/a - May 12, 2006 n/a - May 12, 2006
* Initial import of the udev-config directory. * Initial import of the udev-config directory.
* Reorganized and modularized the rules files. * Reorganized and modularized the rules files.
* Added explanatory comments * Added explanatory comments

2
udev-lfs/contrib/debian/write_cd_aliases
View File

@ -107,7 +107,7 @@ match="BUS==\"$PHYSDEVBUS\", ID==\"$id\""
comment="$ID_MODEL ($ID_PATH)" comment="$ID_MODEL ($ID_PATH)"
write_rule "$match" "cdrom$link_num" "$comment" write_rule "$match" "cdrom$link_num" "$comment"
[ "$ID_CDROM_CD_RW" ] && write_rule "$match" "cdrw$link_num" [ "$ID_CDROM_CD_RW" ] && write_rule "$match" "cdrw$link_num"
[ "$ID_CDROM_DVD" ] && write_rule "$match" "dvd$link_num" [ "$ID_CDROM_DVD" ] && write_rule "$match" "dvd$link_num"
[ "$ID_CDROM_DVD_RW" ] && write_rule "$match" "dvdrw$link_num" [ "$ID_CDROM_DVD_RW" ] && write_rule "$match" "dvdrw$link_num"