Merge pull request #97 from slhfyj93/master

10056

Author: David Gao

chapter01/changelog.xml

@@ -32,6 +32,15 @@
     </listitem>
 -->
 
+    <listitem>
+        <para>2012-13-03</para>
+        <itemizedlist>
+            <listitem>
+                <para>[bdubbs] - 修复 systemd-196/udev-lfs-196 的 makefile 中的编制问题。</para>
+            </listitem>
+        </itemizedlist>
+    </listitem>
+      
     <listitem>
       <para>2012-11-28</para>
       <itemizedlist>

general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20121128">
-<!ENTITY releasedate "2012 年 11 月 28 日">
+<!ENTITY version "SVN-20121203">
+<!ENTITY releasedate "2012 年 12 月 3 日">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

packages.ent

@@ -540,10 +540,10 @@
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "少于 0.1 SBU">
 
-<!ENTITY udev-lfs        "udev-lfs-&systemd-version;-2"> 
+<!ENTITY udev-lfs        "udev-lfs-&systemd-version;-3"> 
 <!ENTITY udev-lfs-size   "20 KB">   
 <!ENTITY udev-lfs-url    "&anduin-other;&udev-lfs;.tar.bz2">
-<!ENTITY udev-lfs-md5    "4021f31350f409a458e6f421041c62e4">    
+<!ENTITY udev-lfs-md5    "0dbcb1731ee2b74b34ab4f1a65e66c30">    
 <!ENTITY udev-lfs-home   " ">
 
 <!ENTITY util-linux-version "2.22.1">

udev-lfs/Makefile.lfs

@@ -4,7 +4,8 @@
 # vim: tabstop=3
 
 SHELL=/bin/bash
-VERSION=196
+SYSTEMD_VERSION=196
+VERSION=196-3
 
 ifeq ($(V),)
  VB = @
@@ -137,7 +138,7 @@ VPATH = src/login          src/udev          src/udev/accelerometer \
         src/libudev        src/libsystemd-daemon
 
 SED_PROCESS = \
-  sed  -e 's|@VERSION@|$(VERSION)|g'       \
+  sed  -e 's|@VERSION@|$(SYSTEMD_VERSION)|g'       \
        -e 's|@prefix@|/usr|g'              \
        -e 's|@exec_prefix@|/usr|g'         \
        -e 's|@udevlibexecdir@|/lib/udev|g' \
@@ -162,7 +163,7 @@ udev: common                     \
       build/libudev.pc
 
 cfg.h: udev-lfs-$(VERSION)/cfg.h
-	sed  -e 's/LFS-VERSION/$(VERSION)/' udev-lfs-$(VERSION)/cfg.h > ./cfg.h
+	sed  -e 's/LFS-VERSION/$(SYSTEMD_VERSION)/' udev-lfs-$(VERSION)/cfg.h > ./cfg.h
 	@mkdir -p build
 
 common: cfg.h