[oe-commits] org.oe.dev merge of '7d861d6a945af531929902d5717003486976079d'

[oe commit]

merge of '7d861d6a945af531929902d5717003486976079d'
     and 'e01f270130b45051b21882abdc8e136007852697'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 5f1edcec4260feeecf3c6e726fe015f3e1728140
ViewMTN: http://monotone.openembedded.org/revision/info/5f1edcec4260feeecf3c6e726fe015f3e1728140
Files:
1
conf/distro/angstrom-2007.1.conf
conf/machine/include/ixp4xx.inc
packages/images/nslu2-minimal-image.bb
packages/linux/linux-ixp4xx_2.6.23.8.bb
Diffs:

#
# mt diff -r7d861d6a945af531929902d5717003486976079d -r5f1edcec4260feeecf3c6e726fe015f3e1728140
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [4f075d6c3bd4ae2a9b4d05a4d9e04b48aaafc380]
#    to [c6bbfa10816eda24513e92b21827c75003bb4daa]
# 
# patch "conf/machine/include/ixp4xx.inc"
#  from [cb920f8ba1f7dcaa3cd855595d1197004c12a26a]
#    to [6e346e8a0d72478aa861a2ea2324cc2871a72e54]
# 
# patch "packages/images/nslu2-minimal-image.bb"
#  from [ba69b1979b2563ba442f7d7bb0453c6168f8bafd]
#    to [14898795bea95dfcd88ed66ae25730964af725c5]
# 
# patch "packages/linux/linux-ixp4xx_2.6.23.8.bb"
#  from [74a1a67b09d506c633f8fd365bdc1b3c521a46f6]
#    to [5072d1cda9fcc89b0db1894b9225812ec971acc9]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	4f075d6c3bd4ae2a9b4d05a4d9e04b48aaafc380
+++ conf/distro/angstrom-2007.1.conf	c6bbfa10816eda24513e92b21827c75003bb4daa
@@ -61,6 +61,7 @@ PREFERRED_VERSION_linux-handhelds-2.6   
 
 #Preferred version for the kernel on various machines
 PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh18"
+PREFERRED_VERSION_linux-ixp4xx                      ?= "2.6.21.6+svnr${SRCREV}"
 RDEPENDS_kernel-base_hx4700 = ""
 RDEPENDS_kernel-base_htcuniversal = ""
 
============================================================
--- conf/machine/include/ixp4xx.inc	cb920f8ba1f7dcaa3cd855595d1197004c12a26a
+++ conf/machine/include/ixp4xx.inc	6e346e8a0d72478aa861a2ea2324cc2871a72e54
@@ -5,18 +5,28 @@ MACHINE_FEATURES ?= "kernel26 usbhost ex
 # Set default for nslu2 - can be overridden for machines with other features.
 MACHINE_FEATURES ?= "kernel26 usbhost ext2"
 
-# Set defaults for nslu2 - can be overridden for machines with other requirements.
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS    ?= "ixp4xx-npe"
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
+PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
 
+# Add modules required for basic networking support
+
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= " \
+	ixp4xx-npe \
+	"
+
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \
+	kernel-module-mii \
+	kernel-module-ixp4xx-mac \
+	kernel-module-ixp4xx-qmgr \
+	kernel-module-via-velocity \
+	"
+
 # Set default for nslu2 - can be overridden for machines with more flash.
 ROOT_FLASH_SIZE ?= "12"
 
 # Set default for nslu2, nas100d, dsmg600
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
-
 require conf/machine/include/tune-xscale.inc
 require conf/machine/include/tune-thumb.inc
 
============================================================
--- packages/images/nslu2-minimal-image.bb	ba69b1979b2563ba442f7d7bb0453c6168f8bafd
+++ packages/images/nslu2-minimal-image.bb	14898795bea95dfcd88ed66ae25730964af725c5
@@ -1,5 +1,14 @@
-require minimal-image.bb
+# Note that this package is intended to create an *identical*
+# kernel and rootfs as the normal minimal-image.bb
 
-export IMAGE_BASENAME = "nslu2-minimalist-image"
+# The only reason for the existence of this .bb file is to
+# create the 8MB and 16MB flashable NSLU2 firmware images.
 
+# Please do not add anything other than the following two
+# lines to this file, and please do not do anything in
+# the nslu2-image.bb class which might affect the kernel
+# or rootfs.
+
+require minimal-image.bb
+
 inherit nslu2-image
============================================================
--- packages/linux/linux-ixp4xx_2.6.23.8.bb	74a1a67b09d506c633f8fd365bdc1b3c521a46f6
+++ packages/linux/linux-ixp4xx_2.6.23.8.bb	5072d1cda9fcc89b0db1894b9225812ec971acc9
@@ -1,3 +1,7 @@
+# The new ethernet driver included in the 2.6.23 version of the nslu2-linux.org kernel patches
+# has problems with providing the correct MAC address on the initial DHCP request.
+DEFAULT_PREFERENCE = "-1"
+
 require linux.inc
 require linux-ixp4xx.inc
 
@@ -8,7 +12,7 @@ PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \


#
# mt diff -re01f270130b45051b21882abdc8e136007852697 -r5f1edcec4260feeecf3c6e726fe015f3e1728140
#
# 
# no changes
#