[oe-commits] org.oe.dev merge of '006d6113a94568f91a2927f810dc644c5b7adc06'

[rwhitby commit]

merge of '006d6113a94568f91a2927f810dc644c5b7adc06'
     and 'f8b383b38cf0d8df1ccc5bccd2a776bc1bca1ae9'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: e1f39a9d05343b3bb1b72d9e08bfe0c7fd20b15b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e1f39a9d05343b3bb1b72d9e08bfe0c7fd20b15b
Files:
1
packages/ixp4xx/ixp4xx-npe-native-2.3
packages/ixp4xx/ixp4xx-npe-native-2.3.2
packages/ixp4xx/ixp4xx-npe-native_2.3.bb
packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb
packages/ixp4xx/ixp4xx-npe_2.3.bb
packages/ixp4xx/ixp4xx-npe_2.3.2.bb
conf/distro/unslung.conf
Diffs:

#
# mt diff -r006d6113a94568f91a2927f810dc644c5b7adc06 -re1f39a9d05343b3bb1b72d9e08bfe0c7fd20b15b
#
# 
# 
# rename "packages/ixp4xx/ixp4xx-npe-native-2.3"
#     to "packages/ixp4xx/ixp4xx-npe-native-2.3.2"
# 
# rename "packages/ixp4xx/ixp4xx-npe-native_2.3.bb"
#     to "packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb"
# 
# rename "packages/ixp4xx/ixp4xx-npe_2.3.bb"
#     to "packages/ixp4xx/ixp4xx-npe_2.3.2.bb"
# 
# patch "conf/distro/unslung.conf"
#  from [0922a555529054926d13d264d43c085c6d36c2bb]
#    to [ff1cf470a007fbade45594572fd61f85e707a45a]
# 
# patch "packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb"
#  from [2d871deb0f64c01d464513f315b12b618eb40eeb]
#    to [1a48057dbc3a9fcb7fa92f416961ed8baa393b5d]
# 
# patch "packages/ixp4xx/ixp4xx-npe_2.3.2.bb"
#  from [6c43191d2fe28e307066d96dddd438836caaedd1]
#    to [55465679e61e65694d073e2a9d8591a9a4c5ccf3]
# 
============================================================
--- conf/distro/unslung.conf	0922a555529054926d13d264d43c085c6d36c2bb
+++ conf/distro/unslung.conf	ff1cf470a007fbade45594572fd61f85e707a45a
@@ -45,6 +45,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGE
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
+PREFERRED_PROVIDERS += " virtual/libc:glibc"
 
 PREFERRED_VERSION_binutils ?= "2.15.94.0.1"
 PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1"
@@ -61,17 +62,9 @@ PREFERRED_VERSION_nslu2-linksys-ramdisk 
 PREFERRED_VERSION_nslu2-linksys-libs     ?= "2.3r63"
 PREFERRED_VERSION_nslu2-linksys-ramdisk  ?= "2.3r63"
 
-SRCDATE_ipkg-utils ?= "20060106"
-SRCDATE_ipkg-utils-native ?= "20060106"
-SRCDATE_ipkg-link ?= "20060106"
-SRCDATE_irssi ?= "20050930"
-
 CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/"
 INHERIT += "nslu2-mirrors"
 
-PREFERRED_VERSION_ipkg ?= "0.99.154"
-PREFERRED_VERSION_ipkg-native ?= "0.99.154"
-
 #-------------------------------------------------------------------
 #                           FIXME!
 # This is clearly wrong, the headers should match the 2.4.22 kernel,
============================================================
--- packages/ixp4xx/ixp4xx-npe-native_2.3.bb	2d871deb0f64c01d464513f315b12b618eb40eeb
+++ packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb	1a48057dbc3a9fcb7fa92f416961ed8baa393b5d
@@ -1,8 +1,8 @@ LICENSE = "Intel Public Licence"
 DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
 LICENSE = "Intel Public Licence"
-PR = "r3"
+PR = "r0"
 
-SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_3.zip"
+SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.2.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3_2.zip"
 SRC_URI += "file://IxNpeMicrocode.h"
 inherit native
 S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
============================================================
--- packages/ixp4xx/ixp4xx-npe_2.3.bb	6c43191d2fe28e307066d96dddd438836caaedd1
+++ packages/ixp4xx/ixp4xx-npe_2.3.2.bb	55465679e61e65694d073e2a9d8591a9a4c5ccf3
@@ -1,14 +1,14 @@ LICENSE = "Intel Public Licence"
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 LICENSE = "Intel Public Licence"
-PR = "r8"
+PR = "r0"
 DEPENDS = "ixp4xx-npe-native"
 
-# You need to download the IPL_ixp400NpeLibrary-2_3.zip file (without crypto) from:
+# You need to download the IPL_ixp400NpeLibrary-2_3_2.zip file (without crypto) from:
 # http://www.intel.com/design/network/products/npfamily/ixp400_current.htm
 # and put it in your downloads directory so bitbake will find it.
 # Make sure you *read* and accept the license - it is not a standard one.
 
-SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3.zip"
+SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.2.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3_2.zip"
 S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl"
 
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"


#
# mt diff -rf8b383b38cf0d8df1ccc5bccd2a776bc1bca1ae9 -re1f39a9d05343b3bb1b72d9e08bfe0c7fd20b15b
#
# 
# no changes
#