diff options
| -rw-r--r-- | appendices/udev-rules.xml | 2 | ||||
| -rwxr-xr-x | aux-file-data.sh | 10 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 12 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 2 | ||||
| -rw-r--r-- | chapter03/packages.xml | 14 | ||||
| -rw-r--r-- | chapter06/chapter06.xml | 2 | ||||
| -rw-r--r-- | chapter06/systemd.xml | 178 | ||||
| -rw-r--r-- | chapter06/udev.xml | 339 | ||||
| -rw-r--r-- | chapter07/udev.xml | 2 | ||||
| -rw-r--r-- | general.ent | 5 | ||||
| -rwxr-xr-x | make-aux-files.sh | 10 | ||||
| -rw-r--r-- | packages.ent | 26 |
12 files changed, 227 insertions, 375 deletions
diff --git a/appendices/udev-rules.xml b/appendices/udev-rules.xml index 71881ddc2..2549e5fc9 100644 --- a/appendices/udev-rules.xml +++ b/appendices/udev-rules.xml @@ -12,7 +12,7 @@ <title>Udev configuration rules</title> - <para>The rules from &udev-config;.tar.bz2 in this appendix are listed for + <para>The rules from &udev-lfs;.tar.bz2 in this appendix are listed for convenience. Installation is normally done via instructions in <xref linkend='ch-system-udev'/>. </para> diff --git a/aux-file-data.sh b/aux-file-data.sh index 527635e12..04678db8f 100755 --- a/aux-file-data.sh +++ b/aux-file-data.sh @@ -31,10 +31,10 @@ sed -i -e s/BOOTSCRIPTS-SIZE/$bootsize/ \ ############ # udev configuration tarball data -udevconfig=$(ls udev-config*.bz2) -udevsize=$(ls -lk $udevconfig | cut -f5 -d" ") -udevmd5=$(md5sum $udevconfig | cut -f1 -d" ") +#udevconfig=$(ls udev-config*.bz2) +#udevsize=$(ls -lk $udevconfig | cut -f5 -d" ") +#udevmd5=$(md5sum $udevconfig | cut -f1 -d" ") -sed -i -e s/UDEV-SIZE/$udevsize/ \ - -e s/UDEV-MD5SUM/$udevmd5/ $FILE +#sed -i -e s/UDEV-SIZE/$udevsize/ \ +# -e s/UDEV-MD5SUM/$udevmd5/ $FILE diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index a590c6293..9ee401277 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -38,6 +38,18 @@ --> <listitem> + <para>2012-07-16</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Updated udev to version 186. This update + has a major procedure change due to merging systemd and + udev. Fixes + <ulink url="&lfs-ticket-root;3098">#3098</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2012-07-14</para> <itemizedlist> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 2879ddb30..71f1e85ca 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -188,7 +188,7 @@ <para>Texinfo &texinfo-version;</para> </listitem>--> <listitem> - <para>Udev &udev-version;</para> + <para>Udev &systemd-version; (extracted from systemd-&systemd-version;)</para> </listitem> <!--<listitem> <para>&udev-config;</para> diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 9e1708a44..66e3d4252 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -568,19 +568,19 @@ </varlistentry> <varlistentry> - <term>Udev (&udev-version;) - <token>&udev-size;</token>:</term> + <term>Systemd (&systemd-version;) - <token>&systemd-size;</token>:</term> <listitem> - <para>Home page: <ulink url="&udev-home;"/></para> - <para>Download: <ulink url="&udev-url;"/></para> - <para>MD5 sum: <literal>&udev-md5;</literal></para> + <para>Home page: <ulink url="&systemd-home;"/></para> + <para>Download: <ulink url="&systemd-url;"/></para> + <para>MD5 sum: <literal>&systemd-md5;</literal></para> </listitem> </varlistentry> <varlistentry> - <term>Udev Configuration Tarball - <token>&udev-config-size;</token>:</term> + <term>Udev-lfs Tarball (&systemd-version;) - <token>&udev-lfs-size;</token>:</term> <listitem> - <para>Download: <ulink url="&udev-config-url;"/></para> - <para>MD5 sum: <literal>&udev-config-md5;</literal></para> + <para>Download: <ulink url="&udev-lfs-url;"/></para> + <para>MD5 sum: <literal>&udev-lfs-md5;</literal></para> </listitem> </varlistentry> diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 1fa0ff71b..27c16cfb3 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -72,7 +72,7 @@ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/> - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/> + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/> diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml new file mode 100644 index 000000000..fbefd2f4c --- /dev/null +++ b/chapter06/systemd.xml @@ -0,0 +1,178 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ + <!ENTITY % general-entities SYSTEM "../general.ent"> + %general-entities; +]> + +<sect1 id="ch-system-udev" role="wrap"> + <?dbhtml filename="udev.html"?> + + <sect1info condition="script"> + <productname>udev</productname> + <productnumber>&systemd-version;</productnumber> + <address>&systemd-url;</address> + </sect1info> + + <title>Udev-&systemd-version; (Extracted from systemd-&systemd-version;)</title> + + <indexterm zone="ch-system-udev"> + <primary sortas="a-Udev">Udev</primary> + </indexterm> + + <sect2 role="package"> + <title/> + + <para>The Udev package contains programs for dynamic creation of device + nodes. The development of udev has been merged with systemd, but + most of systemd is incompatible with LFS. Here we build and install just + the needed udev files.</para> + + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> + + <seglistitem> + <seg>&systemd-ch6-sbu;</seg> + <seg>&systemd-ch6-du;</seg> + </seglistitem> + </segmentedlist> + </sect2> + + <sect2 role="installation"> + <title>Installation of Udev</title> + + <para>The udev-lfs tarball contains LFS-specific files used to build + Udev. Unpack it into the Udev source directory:</para> + +<screen><userinput remap="pre">tar -xvf ../&udev-lfs;.tar.bz2</userinput></screen> + + <para>Compile the package:</para> + +<screen><userinput remap="make">make -f udev-lfs-&systemd-version;/Makefile.lfs</userinput></screen> + + <para>Install the package:</para> + +<screen><userinput remap="install">make -f udev-lfs-&systemd-version;/Makefile.lfs install</userinput></screen> + </sect2> + + <sect2 id="contents-udev" role="content"> + <title>Contents of Udev</title> + + <segmentedlist> + <segtitle>Installed programs</segtitle> + <segtitle>Installed libraries</segtitle> + <segtitle>Installed directories</segtitle> + + <seglistitem> + <seg>accelerometer, ata_id, cdrom_id, collect, mtd_probe, + scsi_id, v4l_id, udevadm, udevd,</seg> + + <seg>libudev.{a,so}</seg> + + <seg>/etc/udev, /lib/udev, /lib/firmware, /usr/share/doc/udev</seg> + </seglistitem> + </segmentedlist> + + <variablelist> + <bridgehead renderas="sect3">Short Descriptions</bridgehead> + <?dbfo list-presentation="list"?> + <?dbhtml list-presentation="table"?> + + <varlistentry id="ata_id"> + <term><command>ata_id</command></term> + <listitem> + <para>Provides Udev with a unique string and + additional information (uuid, label) for an ATA drive</para> + <indexterm zone="ch-system-udev ata_id"> + <primary sortas="b-ata_id">ata_id</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="cdrom_id"> + <term><command>cdrom_id</command></term> + <listitem> + <para>Provides Udev with the capabilities of a + CD-ROM or DVD-ROM drive</para> + <indexterm zone="ch-system-udev cdrom_id"> + <primary sortas="b-cdrom_id">cdrom_id</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="collect"> + <term><command>collect</command></term> + <listitem> + <para>Given an ID for the current uevent and a list of + IDs (for all target uevents), registers the current ID + and indicates whether all target IDs have been registered</para> + <indexterm zone="ch-system-udev collect"> + <primary sortas="b-collect">collect</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="scsi_id"> + <term><command>scsi_id</command></term> + <listitem> + <para>Provides Udev with a unique SCSI identifier + based on the data returned from sending a SCSI INQUIRY command to + the specified device</para> + <indexterm zone="ch-system-udev scsi_id"> + <primary sortas="b-scsi_id">scsi_id</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="udevadm"> + <term><command>udevadm</command></term> + <listitem> + <para>Generic udev administration tool: controls the udevd daemon, + provides info from the Udev database, monitors uevents, waits for + uevents to finish, tests Udev configuration, and triggers uevents + for a given device</para> + <indexterm zone="ch-system-udev udevadm"> + <primary sortas="b-udevadm">udevadm</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="udevd"> + <term><command>udevd</command></term> + <listitem> + <para>A daemon that listens for uevents on the netlink socket, + creates devices and runs the configured external programs in + response to these uevents</para> + <indexterm zone="ch-system-udev udevd"> + <primary sortas="b-udevd">udevd</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="libudev"> + <term><filename class="libraryfile">libudev</filename></term> + <listitem> + <para>A library interface to udev device information</para> + <indexterm zone="ch-system-udev libudev"> + <primary sortas="c-libudev">libudev</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="etc-udev"> + <term><filename class="directory">/etc/udev</filename></term> + <listitem> + <para>Contains Udev configuration files, + device permissions, and rules for device naming</para> + <indexterm zone="ch-system-udev etc-udev"> + <primary sortas="e-/etc/udev">/etc/udev</primary> + </indexterm> + </listitem> + </varlistentry> + + </variablelist> + + </sect2> + +</sect1> diff --git a/chapter06/udev.xml b/chapter06/udev.xml deleted file mode 100644 index 9ce3350c9..000000000 --- a/chapter06/udev.xml +++ /dev/null @@ -1,339 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ - <!ENTITY % general-entities SYSTEM "../general.ent"> - %general-entities; -]> - -<sect1 id="ch-system-udev" role="wrap"> - <?dbhtml filename="udev.html"?> - - <sect1info condition="script"> - <productname>udev</productname> - <productnumber>&udev-version;</productnumber> - <address>&udev-url;</address> - </sect1info> - - <title>Udev-&udev-version;</title> - - <indexterm zone="ch-system-udev"> - <primary sortas="a-Udev">Udev</primary> - </indexterm> - - <sect2 role="package"> - <title/> - - <para>The Udev package contains programs for dynamic creation of device - nodes.</para> - - <segmentedlist> - <segtitle>&buildtime;</segtitle> - <segtitle>&diskspace;</segtitle> - - <seglistitem> - <seg>&udev-ch6-sbu;</seg> - <seg>&udev-ch6-du;</seg> - </seglistitem> - </segmentedlist> - </sect2> - - <sect2 role="installation"> - <title>Installation of Udev</title> - - <para>The udev-config tarball contains LFS-specific files used to configure - Udev. Unpack it into the Udev source directory:</para> - -<screen><userinput remap="pre">tar -xvf ../&udev-config;.tar.bz2</userinput></screen> - - <para>Create some devices and directories that Udev cannot handle due to - them being required very early in the boot process, or by Udev itself:</para> - -<screen><userinput remap="install">install -dv /lib/{firmware,udev/devices/pts} -mknod -m0666 /lib/udev/devices/null c 1 3</userinput></screen> - - <para>Prepare the package for compilation:</para> - -<!-- Note that "libdir=/usr/lib64" would be required for multilib. --> -<screen><userinput remap="configure">./configure --prefix=/usr \ - --with-rootprefix='' \ - --bindir=/sbin \ - --sysconfdir=/etc \ - --libexecdir=/lib \ - --enable-rule_generator \ - --disable-introspection \ - --disable-keymap \ - --disable-gudev \ - --with-usb-ids-path=no \ - --with-pci-ids-path=no \ - --with-systemdsystemunitdir=no</userinput></screen> - - <variablelist> - <title>The meaning of the new configure options</title> - - <!-- Note that libexecdir *MUST* stay /lib, even on a 64-bit - / multilib system where udev is compiled for 64-bit. The udev - configure system automatically adds "udev" onto this path, and other - packages require /lib/udev; the udev maintainers have - said this is part of the udev API. --> - <varlistentry> - <term><parameter>--libexecdir=/lib</parameter></term> - <listitem> - <para>This controls where Udev-internal rules and helper programs - are installed.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><parameter>--enable-rule_generator</parameter></term> - <listitem> - <para>This allows persistent rules to be generated for network and - optical media devices</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><parameter>--disable-* and --with-*</parameter></term> - <listitem> - <para>These options prevent Udev from installing helper programs and - other extras which require more external libraries. These libraries - are not part of the base LFS system. See the Udev - <filename>README</filename> file for more information.</para> - </listitem> - </varlistentry> - </variablelist> - - <para>Compile the package:</para> - -<screen><userinput remap="make">make</userinput></screen> - - <para>Test the package.</para> - -<screen><userinput remap="test">make check</userinput></screen> - - <para>Install the package:</para> - -<screen><userinput remap="install">make install</userinput></screen> - - <para>Remove an empty documentation directory:</para> - -<screen><userinput remap="install">rmdir -v /usr/share/doc/udev</userinput></screen> - - <para>Now install the LFS-specific custom rules files:</para> - -<screen><userinput remap="install">cd &udev-config; -make install</userinput></screen> - - <para>Install the documentation that explains the LFS-specific rules - files:</para> - -<screen><userinput remap="install">make install-doc</userinput></screen> - - </sect2> - - <sect2 id="contents-udev" role="content"> - <title>Contents of Udev</title> - - <segmentedlist> - <segtitle>Installed programs</segtitle> - <segtitle>Installed libraries</segtitle> - <segtitle>Installed directories</segtitle> - - <seglistitem> - <seg>ata_id, cdrom_id, collect, create_floppy_devices, edd_id, - firmware.sh, fstab_import, path_id, scsi_id, udevadm, udevd, - usb_id, write_cd_rules, and write_net_rules</seg> - <seg>libudev.{a,so}</seg> - <seg>/etc/udev, /lib/udev, /lib/firmware, /usr/share/doc/udev-config, - /usr/share/gtk-doc/html/libudev</seg> - </seglistitem> - </segmentedlist> - - <variablelist> - <bridgehead renderas="sect3">Short Descriptions</bridgehead> - <?dbfo list-presentation="list"?> - <?dbhtml list-presentation="table"?> - - <varlistentry id="ata_id"> - <term><command>ata_id</command></term> - <listitem> - <para>Provides Udev with a unique string and - additional information (uuid, label) for an ATA drive</para> - <indexterm zone="ch-system-udev ata_id"> - <primary sortas="b-ata_id">ata_id</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="cdrom_id"> - <term><command>cdrom_id</command></term> - <listitem> - <para>Provides Udev with the capabilities of a - CD-ROM or DVD-ROM drive</para> - <indexterm zone="ch-system-udev cdrom_id"> - <primary sortas="b-cdrom_id">cdrom_id</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="collect"> - <term><command>collect</command></term> - <listitem> - <para>Given an ID for the current uevent and a list of - IDs (for all target uevents), registers the current ID - and indicates whether all target IDs have been registered</para> - <indexterm zone="ch-system-udev collect"> - <primary sortas="b-collect">collect</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="create_floppy_devices"> - <term><command>create_floppy_devices</command></term> - <listitem> - <para>Creates all possible floppy devices based on the CMOS type</para> - <indexterm zone="ch-system-udev create_floppy_devices"> - <primary sortas="b-create_floppy_devices">create_floppy_devices</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="edd_id"> - <term><command>edd_id</command></term> - <listitem> - <para>Provides Udev with the EDD ID for a BIOS disk drive</para> - <indexterm zone="ch-system-udev edd_id"> - <primary sortas="b-edd_id">edd_id</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="firmware.sh"> - <term><command>firmware.sh</command></term> - <listitem> - <para>Uploads firmware to devices</para> - <indexterm zone="ch-system-udev firmware.sh"> - <primary sortas="b-firmware.sh">firmware.sh</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="fstab_import"> - <term><command>fstab_import</command></term> - <listitem> - <para>Finds an entry in <filename>/etc/fstab</filename> that - matches the current device, and provides its information to - Udev</para> - <indexterm zone="ch-system-udev fstab_import"> - <primary sortas="b-fstab_import">fstab_import</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="path_id"> - <term><command>path_id</command></term> - <listitem> - <para>Provides the shortest possible unique hardware path to a - device</para> - <indexterm zone="ch-system-udev path_id"> - <primary sortas="b-path_id">path_id</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="scsi_id"> - <term><command>scsi_id</command></term> - <listitem> - <para>Provides Udev with a unique SCSI identifier - based on the data returned from sending a SCSI INQUIRY command to - the specified device</para> - <indexterm zone="ch-system-udev scsi_id"> - <primary sortas="b-scsi_id">scsi_id</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="udevadm"> - <term><command>udevadm</command></term> - <listitem> - <para>Generic udev administration tool: controls the udevd daemon, - provides info from the Udev database, monitors uevents, waits for - uevents to finish, tests Udev configuration, and triggers uevents - for a given device</para> - <indexterm zone="ch-system-udev udevadm"> - <primary sortas="b-udevadm">udevadm</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="udevd"> - <term><command>udevd</command></term> - <listitem> - <para>A daemon that listens for uevents on the netlink socket, - creates devices and runs the configured external programs in - response to these uevents</para> - <indexterm zone="ch-system-udev udevd"> - <primary sortas="b-udevd">udevd</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="usb_id"> - <term><command>usb_id</command></term> - <listitem> - <para>Provides Udev with information about USB - devices</para> - <indexterm zone="ch-system-udev usb_id"> - <primary sortas="b-usb_id">usb_id</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="write_cd_rules"> - <term><command>write_cd_rules</command></term> - <listitem> - <para>A script which generates Udev rules to provide stable names for - optical drives (see also <xref linkend="ch-scripts-symlinks"/>)</para> - <indexterm zone="ch-system-udev write_cd_rules"> - <primary sortas="b-write_cd_rules">write_cd_rules</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="write_net_rules"> - <term><command>write_net_rules</command></term> - <listitem> - <para>A script which generates rules to provide stable names for - network interfaces (see also <xref linkend="ch-scripts-network"/>) - </para> - <indexterm zone="ch-system-udev write_net_rules"> - <primary sortas="b-write_net_rules">write_net_rules</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="libudev"> - <term><filename class="libraryfile">libudev</filename></term> - <listitem> - <para>A library interface to udev device information</para> - <indexterm zone="ch-system-udev libudev"> - <primary sortas="c-libudev">libudev</primary> - </indexterm> - </listitem> - </varlistentry> - - <varlistentry id="etc-udev"> - <term><filename class="directory">/etc/udev</filename></term> - <listitem> - <para>Contains Udev configuration files, - device permissions, and rules for device naming</para> - <indexterm zone="ch-system-udev etc-udev"> - <primary sortas="e-/etc/udev">/etc/udev</primary> - </indexterm> - </listitem> - </varlistentry> - - </variablelist> - - </sect2> - -</sect1> diff --git a/chapter07/udev.xml b/chapter07/udev.xml index 33d10c17d..1d65a221f 100644 --- a/chapter07/udev.xml +++ b/chapter07/udev.xml @@ -132,7 +132,7 @@ <sect3> <title>Device Node Creation</title> - <para>As of Udev-&udev-version;, <command>udevd</command> no longer + <para>In recent version of udev, <command>udevd</command> no longer creates device files in <filename class="directory">/dev</filename>. Instead, this must be handled in the kernel, by the <systemitem class="filesystem">devtmpfs</systemitem> filesystem. Any driver that diff --git a/general.ent b/general.ent index 21e9083f5..3ef270ce9 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20120714"> -<!ENTITY releasedate "July 14, 2012"> +<!ENTITY version "SVN-20120716"> +<!ENTITY releasedate "July 16, 2012"> <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "7.2"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> @@ -13,6 +13,7 @@ <!ENTITY patches-root "&lfs-root;patches/lfs/&generic-version;/"> <!ENTITY downloads-root "&lfs-root;lfs/downloads/&generic-version;/"> <!ENTITY anduin-sources "http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages/conglomeration/"> +<!ENTITY anduin-other "http://anduin.linuxfromscratch.org/sources/other/"> <!ENTITY livecd-root "&lfs-root;livecd/"> <!ENTITY test-results "&lfs-root;lfs/build-logs/&generic-version;/"> <!ENTITY errata "&lfs-root;lfs/errata/&generic-version;/"> diff --git a/make-aux-files.sh b/make-aux-files.sh index c57352a9d..fbec73302 100755 --- a/make-aux-files.sh +++ b/make-aux-files.sh @@ -10,13 +10,13 @@ mv bootscripts lfs-bootscripts-$version tar -cjf lfs-bootscripts-$version.tar.bz2 --exclude .svn lfs-bootscripts-$version mv lfs-bootscripts-$version bootscripts -rm -f udev-config*.bz2 +#rm -f udev-config*.bz2 # Get file name and move udev config directory to that name -version=`grep "ENTITY udev-config " packages.ent |cut -d'"' -f2` -mv udev-config $version +#version=`grep "ENTITY udev-config " packages.ent |cut -d'"' -f2` +#mv udev-config $version # Create the tarball and clean up -tar -cjf $version.tar.bz2 --exclude .svn $version -mv $version udev-config +#tar -cjf $version.tar.bz2 --exclude .svn $version +#mv $version udev-config diff --git a/packages.ent b/packages.ent index 70c837618..ca51d6ade 100644 --- a/packages.ent +++ b/packages.ent @@ -532,19 +532,19 @@ <!ENTITY texinfo-ch6-du "21 MB"> <!ENTITY texinfo-ch6-sbu "0.3 SBU"> -<!ENTITY udev-version "182"> -<!ENTITY udev-size "673 KB"> -<!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.xz"> -<!ENTITY udev-md5 "023877e6cc0d907994b8c648beab542b"> -<!ENTITY udev-home "&kernel;linux/utils/kernel/hotplug/udev/udev.html"> -<!ENTITY udev-ch6-du "9.3 MB"> -<!ENTITY udev-ch6-sbu "0.2 SBU"> - -<!ENTITY udev-config "udev-config-20100128"> <!-- Scripts depend on this format --> -<!ENTITY udev-config-size "UDEV-SIZE KB"> <!-- Updated in Makefile --> -<!ENTITY udev-config-url "&downloads-root;&udev-config;.tar.bz2"> -<!ENTITY udev-config-md5 "UDEV-MD5SUM"> <!-- Updated in Makefile --> -<!ENTITY udev-config-home " "> +<!ENTITY systemd-version "186"> +<!ENTITY systemd-size "1,272 KB"> +<!ENTITY systemd-url "http://www.freedesktop.org/software/systemd/systemd-&systemd-version;.tar.xz"> +<!ENTITY systemd-md5 "17eff1d31e6e49bf82e129fe57efd59b"> +<!ENTITY systemd-home "http://www.freedesktop.org/wiki/Software/systemd/"> +<!ENTITY systemd-ch6-du "16 MB"> +<!ENTITY systemd-ch6-sbu "0.1 SBU"> + +<!ENTITY udev-lfs "udev-lfs-&systemd-version;"> +<!ENTITY udev-lfs-size "12 KB"> +<!ENTITY udev-lfs-url "&anduin-other;udev-lfs-&systemd-version;.tar.bz2"> +<!ENTITY udev-lfs-md5 "8aa70a2e7726a75bb1d8b239a016b4a9"> +<!ENTITY udev-lfs-home " "> <!ENTITY util-linux-version "2.21.2"> <!ENTITY util-linux-size "2,916 KB"> |