浏览代码

Change the location for the python gdb module
generated by gcc to the correct location.

Fix a logic error in the ifdown script.


git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9805 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Bruce Dubbs 13 年之前
父节点
当前提交
3710570619
共有 4 个文件被更改,包括 17 次插入5 次删除
  1. 2 1
      bootscripts/lfs/sbin/ifdown
  2. 11 0
      chapter01/changelog.xml
  3. 2 2
      chapter06/gcc.xml
  4. 2 2
      general.ent

+ 2 - 1
bootscripts/lfs/sbin/ifdown

@@ -93,7 +93,8 @@ link_status=`ip link show ${IFACE} 2>/dev/null`
 
 if [ -n "${link_status}" ]; then
    if [ "$(echo "${link_status}" | grep UP)" != "" ]; then
-      if [ "$(ip addr show ${IFACE} | grep 'inet ')" != ""  ]; then
+      # Set the interface down only if all IP addresses have been removed.
+      if [ "$(ip addr show ${IFACE} | grep 'inet ')" == ""  ]; then
          log_info_msg "Bringing down the ${IFACE} interface..."
          ip link set ${IFACE} down
          evaluate_retval

+ 11 - 0
chapter01/changelog.xml

@@ -36,6 +36,17 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2012-05-05</para>
+      <itemizedlist>
+         <listitem>
+           <para>[bdubbs] - Change the location for the python gdb module 
+           generated by gcc to the correct location. Fixes (again)
+           <ulink url="&lfs-ticket-root;3048">#3048</ulink>.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2012-04-03</para>
       <itemizedlist>

+ 2 - 2
chapter06/gcc.xml

@@ -292,8 +292,8 @@ SEARCH_DIR("/usr/lib");</computeroutput></screen>
     <para>Finally, move a misplced file:</para>
 
 <screen><userinput remap="install">case `uname -m` in
-  i?86) GDBDIR=/usr/share/gdb/auto-load/usr/lib/gcc/i686-pc-linux-gnu/&gcc-version;/     ;;
-  *)    GDBDIR=/usr/share/gdb/auto-load/usr/lib64/gcc/x86_64-pc-linux-gnu/&gcc-version;/ ;;
+  i?86) GDBDIR=/usr/share/gdb/auto-load/usr/lib/     ;;
+  *)    GDBDIR=/usr/share/gdb/auto-load/usr/lib64/ ;;
 esac
 
 mkdir -pv $GDBDIR

+ 2 - 2
general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120403">
-<!ENTITY releasedate "Apr 03, 2012">
+<!ENTITY version "SVN-20120405">
+<!ENTITY releasedate "Apr 05, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.2">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->