[Clfs-commits] [CLFS Embedded]Cross-LFS Embedded Book branch, master, updated. 7e2c90d578f3dda83ec6b230d312ae338b7d19d6
git
git at cross-lfs.org
Fri Oct 18 13:12:59 PDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Embedded Book".
The branch, master has been updated
via 7e2c90d578f3dda83ec6b230d312ae338b7d19d6 (commit)
via 66e014bb51111b90c3e985ab4ff666be5f9a2806 (commit)
via d92670cff5916fe922b89e14f47be4fc140a1865 (commit)
via d262fc0d1f22285fe4fa1bb2103bdec6b097994c (commit)
from 2da453263911fe769e27e87342b4bebef8376412 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7e2c90d578f3dda83ec6b230d312ae338b7d19d6
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Fri Oct 18 16:05:45 2013 -0400
Update date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 885c8e4..9ccb9d4 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "10"> <!-- Use two digits -->
<!ENTITY month_name "October">
-<!ENTITY day "17"> <!-- Use two digits -->
+<!ENTITY day "18"> <!-- Use two digits -->
<!ENTITY year "2013"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
commit 66e014bb51111b90c3e985ab4ff666be5f9a2806
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Fri Oct 18 16:05:38 2013 -0400
changelog: Update
diff --git a/BOOK/preface/common/changelog.xml b/BOOK/preface/common/changelog.xml
index eb1e136..a933277 100644
--- a/BOOK/preface/common/changelog.xml
+++ b/BOOK/preface/common/changelog.xml
@@ -36,6 +36,16 @@
</listitem>
-->
<listitem>
+ <para>October 18, 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[abradford] - Fix the networking configuration to use eth0 and
+ DHCP to obtain a valid IP address.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>October 17, 2013</para>
<itemizedlist>
<listitem>
commit d92670cff5916fe922b89e14f47be4fc140a1865
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Fri Oct 18 16:03:04 2013 -0400
network: Create simple DHCP client config
Using udhcpc and eth0, on 'ifup eth0' obtain an IP address via DHCP and
assign it properly to eth0.
diff --git a/BOOK/bootscripts/common/network.xml b/BOOK/bootscripts/common/network.xml
index 448b7b7..eed04b8 100644
--- a/BOOK/bootscripts/common/network.xml
+++ b/BOOK/bootscripts/common/network.xml
@@ -17,99 +17,31 @@
<sect2>
<title>Creating Network Interface Configuration Files</title>
- <para>Which interfaces are brought up and down by the network script
- depends on the files and directories in the <filename
- class="directory">/etc/network.d</filename> hierarchy.
- This directory should contain a file for each interface to be
- configured, such as <filename>interface.xyz</filename>, where
- <quote>xyz</quote> is a network interface name. Inside this file we
- would be defining the attributes to this interface, such as its IP
- address(es), subnet masks, and so forth.</para>
-
- <para>The following command creates the <filename>network.conf</filename>
- file for use by the entire system:</para>
-
-<screen><userinput>cat > ${CLFS}/targetfs/etc/network.conf << "EOF"
-<literal># /etc/network.conf
-# Global Networking Configuration
-# interface configuration is in /etc/network.d/
-
-# set to yes to enable networking
-NETWORKING=yes
-
-# set to yes to set default route to gateway
-USE_GATEWAY=no
-
-# set to gateway IP address
-GATEWAY=192.168.0.1
-
-# Interfaces to add to br0 bridge
-# Leave commented to not setup a network bridge
-# Substitute br0 for eth0 in the interface.eth0 sample below to bring up br0
-# instead
-# bcm47xx with vlans:
-#BRIDGE_INTERFACES="eth0.0 eth0.1 wlan0"
-# Other access point with a wired eth0 and a wireless wlan0 interface:
-#BRIDGE_INTERFACES="eth0 wlan0"
-</literal>
+ <para>Which interfaces are brought up and down by the network utilities
+ depends on the files and directories in the
+ <filename class="directory">/etc/network</filename> directory. The
+ <filename>interfaces</filename> file should contain a
+ description of the interfaces, as done by Debian, and each of the
+ directories contain scripts for actions to perform on each type of network
+ event.</para>
+
+ <para>The following command creates the required directories and the
+ <filename>interfaces</filename> file, assuming DHCP will be used for
+ eth0:</para>
+
+<screen><userinput>mkdir -pv ${CLFS}/targetfs/etc/network/if-{post-{up,down},pre-{up,down},up,down}.d
+mkdir -pv ${CLFS}/targetfs/usr/share/udhcpc
+
+cat > ${CLFS}/targetfs/etc/network/interfaces << "EOF"
+<literal>auto eth0
+iface eth0 inet dhcp</literal>
EOF</userinput></screen>
- <para>The <envar>GATEWAY</envar> variable should contain the default
- gateway IP address, if one is present. If not, then comment out the
- variable entirely.</para>
+ <para>For DHCP to work properly with udhcpc, the BusyBox dhcp client, a
+ configuration script is needed. Create a simple script to assign the
+ provided DHCP address and update <filename>/etc/resolv.conf</filename>:</para>
- <para>The following command creates a sample <filename>interface.eth0</filename>
- file for the <emphasis>eth0</emphasis> device:</para>
-
-<screen><userinput>mkdir ${CLFS}/targetfs/etc/network.d &&
-cat > ${CLFS}/targetfs/etc/network.d/interface.eth0 << "EOF"
-<literal># Network Interface Configuration
-
-# network device name
-INTERFACE=eth0
-
-# set to yes to use DHCP instead of the settings below
-DHCP=no
-
-# IP address
-IPADDRESS=192.168.1.2
-
-# netmask
-NETMASK=255.255.255.0
-
-# broadcast address
-BROADCAST=192.168.1.255</literal>
-EOF</userinput></screen>
-
- <para>The <envar>INTERFACE</envar> variable should contain the name of
- the interface interface.</para>
-
- <para>The <envar>DHCP</envar> variable if set to yes will allow you to
- use dhcp. If set to no, you will need to configure the rest of the options.</para>
-
- <para>The <envar>IPADDRESS</envar> variable should contain the default
- IP address for this interface.</para>
-
- <para>The <envar>NETMASK</envar> variable should contain the default
- Subnet Mask for the IP address for this interface.</para>
-
- <para>The <envar>BROADCAST</envar> variable should contain the default
- Broadcast Address for the Subnet Mask of the IP Range being used on
- this interface.</para>
-
- </sect2>
-
- <sect2 id="udhcpc.conf">
- <title>Creating the ${CLFS}/targetfs/etc/udhcpc.conf File</title>
-
- <indexterm zone="udhcpc.conf">
- <primary sortas="e-/etc/udhcpc.conf">/etc/udhcpc.conf</primary>
- </indexterm>
-
- <para>For DHCP to work properly a configuration script is needed.
- Create a sample udhcpc.conf:</para>
-
- <screen><userinput>cat > ${CLFS}/targetfs/etc/udhcpc.conf << "EOF"
+<screen><userinput>cat > ${CLFS}/targetfs/usr/share/udhcpc/default.script << "EOF"
<literal>#!/bin/sh
# udhcpc Interface Configuration
# Based on http://lists.debian.org/debian-boot/2002/11/msg00500.html
@@ -118,16 +50,11 @@ EOF</userinput></screen>
[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
RESOLV_CONF="/etc/resolv.conf"
-RESOLV_BAK="/etc/resolv.bak"
-
[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
[ -n "$subnet" ] && NETMASK="netmask $subnet"
case "$1" in
deconfig)
- if [ -f "$RESOLV_BAK" ]; then
- mv "$RESOLV_BAK" "$RESOLV_CONF"
- fi
/sbin/ifconfig $interface 0.0.0.0
;;
@@ -144,10 +71,6 @@ case "$1" in
done
fi
- if [ ! -f "$RESOLV_BAK" ] && [ -f "$RESOLV_CONF" ]; then
- mv "$RESOLV_CONF" "$RESOLV_BAK"
- fi
-
echo -n > $RESOLV_CONF
[ -n "$domain" ] && echo search $domain >> $RESOLV_CONF
for i in $dns ; do
@@ -159,41 +82,7 @@ esac
exit 0
</literal>EOF
-chmod +x ${CLFS}/targetfs/etc/udhcpc.conf</userinput></screen>
-
- </sect2>
-
- <sect2 id="resolv.conf">
- <title>Creating the ${CLFS}/targetfs/etc/resolv.conf File</title>
-
- <indexterm zone="resolv.conf">
- <primary sortas="e-/etc/resolv.conf">/etc/resolv.conf</primary>
- </indexterm>
-
- <para>If the system is going to be connected to the Internet, it will
- need some means of Domain Name Service (DNS) name resolution to
- resolve Internet domain names to IP addresses, and vice versa. This is
- best achieved by placing the IP address of the DNS server, available
- from the ISP or network administrator, into
- <filename>/etc/resolv.conf</filename>. Create the file by running the
- following:</para>
-
-<screen><userinput>cat > ${CLFS}/targetfs/etc/resolv.conf << "EOF"
-<literal># Begin /etc/resolv.conf
-
-domain <replaceable>[Your Domain Name]</replaceable>
-nameserver <replaceable>[IP address of your primary nameserver]</replaceable>
-nameserver <replaceable>[IP address of your secondary nameserver]</replaceable>
-
-# End /etc/resolv.conf</literal>
-EOF</userinput></screen>
-
- <para>Replace <replaceable>[IP address of the nameserver]</replaceable>
- with the IP address of the DNS most appropriate for the setup. There will
- often be more than one entry (requirements demand secondary servers for
- fallback capability). If you only need or want one DNS server, remove the
- second <emphasis>nameserver</emphasis> line from the file. The IP address
- may also be a router on the local network.</para>
+chmod +x ${CLFS}/targetfs/usr/share/udhcpc/default.script</userinput></screen>
</sect2>
commit d262fc0d1f22285fe4fa1bb2103bdec6b097994c
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Thu Oct 17 16:47:35 2013 -0400
Fully remove libnl and hostapd
Had missed removing them from packages.ent and the beyond-net packages
listing.
diff --git a/BOOK/beyond-net/common/packages.xml b/BOOK/beyond-net/common/packages.xml
index 99d60c0..b8bca2b 100644
--- a/BOOK/beyond-net/common/packages.xml
+++ b/BOOK/beyond-net/common/packages.xml
@@ -33,24 +33,6 @@
</varlistentry>
<varlistentry>
- <term>libnl (&libnl-version;) - <token>&libnl-size;</token>:</term>
- <listitem>
- <para>Home page: <ulink url="&libnl-home;"/></para>
- <para>Download: <ulink url="&libnl-url;"/></para>
- <para>MD5 sum: <literal>&libnl-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Hostapd (&hostapd-version;) - <token>&hostapd-size;</token>:</term>
- <listitem>
- <para>Home page: <ulink url="&hostapd-home;"/></para>
- <para>Download: <ulink url="&hostapd-url;"/></para>
- <para>MD5 sum: <literal>&hostapd-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>Wireless Tools (&wireless_tools-version;) - <token>&wireless_tools-size;</token>:</term>
<listitem>
<para>Home page: <ulink url="&wireless_tools-home;"/></para>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 8922c12..2d0d5bd 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -88,18 +88,6 @@
<!ENTITY iptables-md5 "be97ce9007fa42c867901b496c935a0a">
<!ENTITY iptables-home "http://www.netfilter.org/projects/iptables/">
-<!ENTITY libnl-version "3.2.22">
-<!ENTITY libnl-size "713 KB">
-<!ENTITY libnl-url "http://http://www.carisma.slowglass.com/~tgr/libnl/files/libnl-&libnl-version;.tar.gz">
-<!ENTITY libnl-md5 "2e1c889494d274aca24ce5f6a748e66e">
-<!ENTITY libnl-home "http://www.carisma.slowglass.com/~tgr/libnl/">
-
-<!ENTITY hostapd-version "2.0">
-<!ENTITY hostapd-size "1343 KB">
-<!ENTITY hostapd-url "http://hostap.epitest.fi/releases/hostapd-&hostapd-version;.tar.gz">
-<!ENTITY hostapd-md5 "ba22e639bc57aa4035d2ea8ffa9bbbee">
-<!ENTITY hostapd-home "http://hostap.epitest.fi/">
-
<!ENTITY wireless_tools-version "29">
<!ENTITY wireless_tools-size "288 KB">
<!ENTITY wireless_tools-url "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.&wireless_tools-version;.tar.gz">
-----------------------------------------------------------------------
Summary of changes:
BOOK/beyond-net/common/packages.xml | 18 ----
BOOK/bootscripts/common/network.xml | 157 +++++-----------------------------
BOOK/general.ent | 2 +-
BOOK/packages.ent | 12 ---
BOOK/preface/common/changelog.xml | 10 ++
5 files changed, 34 insertions(+), 165 deletions(-)
hooks/post-receive
--
Cross-LFS Embedded Book
More information about the Clfs-commits
mailing list