[oe-commits] org.oe.dev merge of '0f0d473a082d7b3643a49221ef58800654470d80'

[rwhitby commit]

merge of '0f0d473a082d7b3643a49221ef58800654470d80'
     and '8416ad85221db47c91cfb9a3991e6f564dc834f9'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 5fccef8cdf48e98699451989cae46658f134bbff
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5fccef8cdf48e98699451989cae46658f134bbff
Files:
1
conf/distro/include/slugos.inc
packages/linux/ixp4xx-kernel/2.6.21/defconfig
packages/linux/ixp4xx-kernel_2.6.21.6.bb
packages/tasks/task-slugos.bb
packages/openmoko-apps/openmoko-terminal_svn.bb
packages/pkgconfig/pkgconfig-native_0.22.bb
Diffs:

#
# mt diff -r0f0d473a082d7b3643a49221ef58800654470d80 -r5fccef8cdf48e98699451989cae46658f134bbff
#
# 
# 
# patch "conf/distro/include/slugos.inc"
#  from [e2b01734de8b2e6dca970ce26b4168e0b7fa033c]
#    to [dd3fea4cb57defe36baa89ffab3a41ff6fd04c71]
# 
# patch "packages/linux/ixp4xx-kernel/2.6.21/defconfig"
#  from [2066088fb6f08b47ace0f9b1b4755bc9ea14fed6]
#    to [b30e7150607fae97b5c6688d3f4ba07220c743ed]
# 
# patch "packages/linux/ixp4xx-kernel_2.6.21.6.bb"
#  from [4c21f111521b327915ac064d09fa63c6d1b1891b]
#    to [f2a691df6724055699f734d3ccbd5cd557658115]
# 
# patch "packages/tasks/task-slugos.bb"
#  from [b17910995413514e0b7ea24f7ea3468dd3c2d63e]
#    to [a87c962b09a3b4d79d70e7d24e3702d49e347f3c]
# 
============================================================
--- conf/distro/include/slugos.inc	e2b01734de8b2e6dca970ce26b4168e0b7fa033c
+++ conf/distro/include/slugos.inc	dd3fea4cb57defe36baa89ffab3a41ff6fd04c71
@@ -16,7 +16,7 @@
 #TARGET_OS "linux" or "linux-uclibc"
 
 # The following may be overridden to make sub-versions
-SLUGOS_VERSION = "4.4"
+SLUGOS_VERSION = "4.5"
 DISTRO_REVISION ?= ""
 DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 # For release (only):
============================================================
--- packages/linux/ixp4xx-kernel/2.6.21/defconfig	2066088fb6f08b47ace0f9b1b4755bc9ea14fed6
+++ packages/linux/ixp4xx-kernel/2.6.21/defconfig	b30e7150607fae97b5c6688d3f4ba07220c743ed
@@ -885,7 +885,7 @@ CONFIG_IXP4XX_QMGR=m
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=m
 CONFIG_IXP4XX_QMGR=m
-CONFIG_IXP4XX_NPE=m
+CONFIG_IXP4XX_NPE=y
 CONFIG_IXP4XX_NPE_FW_LOAD=y
 CONFIG_IXP4XX_NPE_FW_MTD=y
 CONFIG_IXP4XX_MAC=m
============================================================
--- packages/linux/ixp4xx-kernel_2.6.21.6.bb	4c21f111521b327915ac064d09fa63c6d1b1891b
+++ packages/linux/ixp4xx-kernel_2.6.21.6.bb	f2a691df6724055699f734d3ccbd5cd557658115
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "914"
+IXP4XX_KERNEL_SVN_REV = "915"
 #
 # The directory containing the patches to be applied is
 # specified below
============================================================
--- packages/tasks/task-slugos.bb	b17910995413514e0b7ea24f7ea3468dd3c2d63e
+++ packages/tasks/task-slugos.bb	a87c962b09a3b4d79d70e7d24e3702d49e347f3c
@@ -6,7 +6,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Task packages for the SlugOS distribution"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r12"
+PR = "r13"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALLOW_EMPTY = "1"
 
@@ -92,6 +92,9 @@ SLUGOS_STANDARD_RRECOMMENDS += "\
 
 # Add modules required for Network support
 SLUGOS_STANDARD_RRECOMMENDS += "\
+kernel-module-mii \
+kernel-module-ixp4xx-mac \
+kernel-module-ixp4xx-qmgr \
 kernel-module-via-velocity \
 "
 


#
# mt diff -r8416ad85221db47c91cfb9a3991e6f564dc834f9 -r5fccef8cdf48e98699451989cae46658f134bbff
#
# 
# 
# patch "packages/openmoko-apps/openmoko-terminal_svn.bb"
#  from [5b909c837b04c515be7224d5aac6d622a8c27550]
#    to [048f50ee60767a9080fbe91671ac0006d633b258]
# 
# patch "packages/pkgconfig/pkgconfig-native_0.22.bb"
#  from [fbbe71ce4ad53ae89ee9e30d2726443eaeb38ecd]
#    to [c5f805f586288da9b9111d6f554546a067473283]
# 
============================================================
--- packages/openmoko-apps/openmoko-terminal_svn.bb	5b909c837b04c515be7224d5aac6d622a8c27550
+++ packages/openmoko-apps/openmoko-terminal_svn.bb	048f50ee60767a9080fbe91671ac0006d633b258
@@ -1,7 +1,7 @@ RDEPENDS += "gtkterm2"
 DESCRIPTION = "The OpenMoko Command Line Console"
 SECTION = "openmoko/applications"
 RDEPENDS += "gtkterm2"
-PV = "1.0.0+svn${SRCDATE}"
+PV = "1.0.0"
 PR = "r1"
 
 inherit openmoko
============================================================
--- packages/pkgconfig/pkgconfig-native_0.22.bb	fbbe71ce4ad53ae89ee9e30d2726443eaeb38ecd
+++ packages/pkgconfig/pkgconfig-native_0.22.bb	c5f805f586288da9b9111d6f554546a067473283
@@ -1,7 +1,9 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 SECTION = "console/utils"
 require pkgconfig.inc
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
 
+DEFAULT_PREFERENCE = "-1"
+
 S = "${WORKDIR}/pkg-config-${PV}/"
 inherit native
 DEPENDS = ""