summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2006-02-03 21:10:17 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-03 21:10:17 +0000
commit2d79e20a4ae0620cec67b56d8e007a1973f5959a (patch)
tree1fe5bf507f7c319c4dad8faf3a50ef885f374081
parentb93316c605729ae370a1163b901b39b4e2b3f319 (diff)
parent7c02bc02736aad32e38b413bc8e7de9dc69bdaa1 (diff)
merge of b8ec663985e414ccfe39f06489f001bf60b50a0b
and cecb9f4ed88a2986bdd6aa503026a79211b79375
-rw-r--r--conf/distro/unslung-packages.conf2
-rw-r--r--packages/netbase/netbase/interfaces6
-rw-r--r--packages/netbase/netbase_4.21.bb2
3 files changed, 7 insertions, 3 deletions
diff --git a/conf/distro/unslung-packages.conf b/conf/distro/unslung-packages.conf
index 4cef102535..e889a65df5 100644
--- a/conf/distro/unslung-packages.conf
+++ b/conf/distro/unslung-packages.conf
@@ -1,4 +1,3 @@
-# automatically generated by bitbake freeze
BBFILES := "\
${PKGDIR}/packages/autoconf/*.bb \
${PKGDIR}/packages/automake/*.bb \
@@ -8,6 +7,7 @@ ${PKGDIR}/packages/busybox/*.bb \
${PKGDIR}/packages/cpio/*.bb \
${PKGDIR}/packages/devio/*.bb \
${PKGDIR}/packages/fakeroot/*.bb \
+${PKGDIR}/packages/file/*.bb \
${PKGDIR}/packages/findutils/*.bb \
${PKGDIR}/packages/flex/*.bb \
${PKGDIR}/packages/freeze/*.bb \
diff --git a/packages/netbase/netbase/interfaces b/packages/netbase/netbase/interfaces
index ccb0a2e0c5..fbeb14ffbc 100644
--- a/packages/netbase/netbase/interfaces
+++ b/packages/netbase/netbase/interfaces
@@ -24,7 +24,11 @@ iface usb0 inet static
# Zaurus 2.4 Lineo net_fd; obsolete
-iface usbd0 inet dhcp
+iface usbd0 inet static
+ address 192.168.129.201
+ netmask 255.255.255.0
+ network 192.168.129.0
+ gateway 192.168.129.200
# iPAQ 2.4 mach-sa1100/usb-eth
# (192.168.0.202 is the iPAQ's IP, 192.168.0.200 is the host's IP)
diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb
index e875d8f621..89a7d3c7cd 100644
--- a/packages/netbase/netbase_4.21.bb
+++ b/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ SECTION = "base"
DESCRIPTION = "This package provides the necessary \
infrastructure for basic TCP/IP based networking."
LICENSE = "GPL"
-PR = "r8"
+PR = "r9"
inherit update-rc.d