[oe-commits] org.oe.dev merge of '3e8965009ac2c5ba88f4da142a27d3b08cceea4d'

[oe commit]

merge of '3e8965009ac2c5ba88f4da142a27d3b08cceea4d'
     and '624d58c48d06c252e55d2ebabdc8d9b58cbc7452'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: c82f6b3ded40fcd91957ccea8add289cec156e01
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c82f6b3ded40fcd91957ccea8add289cec156e01
Files:
1
packages/linux/fsg3-kernel_2.6.18.bb
conf/machine/fsg3be.conf
Diffs:

#
# mt diff -r3e8965009ac2c5ba88f4da142a27d3b08cceea4d -rc82f6b3ded40fcd91957ccea8add289cec156e01
#
# 
# no changes
# 


#
# mt diff -r624d58c48d06c252e55d2ebabdc8d9b58cbc7452 -rc82f6b3ded40fcd91957ccea8add289cec156e01
#
# 
# 
# add_file "packages/linux/fsg3-kernel_2.6.18.bb"
#  content [ce39fe5171bf38acd7aea7c3116494648d56f9b4]
# 
# patch "conf/machine/fsg3be.conf"
#  from [614fcd1196db4ea73e6ea013cbc9b15381004779]
#    to [0985b6fc93f5ebf67761f503ee5b6aaa1b35d3e2]
# 
============================================================
--- packages/linux/fsg3-kernel_2.6.18.bb	ce39fe5171bf38acd7aea7c3116494648d56f9b4
+++ packages/linux/fsg3-kernel_2.6.18.bb	ce39fe5171bf38acd7aea7c3116494648d56f9b4
@@ -0,0 +1,22 @@
+# Kernel for Freecom FSG-3
+#
+# This bitbake file pulls patches and the defconfig straight
+# from the NSLU2-Linux SVN repository. Information about this
+# repository can be found at:
+# http://trac.nslu2-linux.org/kernel/
+#
+# The revision that is pulled from SVN is specified below
+IXP4XX_KERNEL_SVN_REV = "898"
+#
+# The directory containing the patches to be applied is
+# specified below
+IXP4XX_KERNEL_PATCH_DIR = "2.6.18-fsg3"
+#
+# Increment the number below (i.e. the digits after PR) when
+# the changes in SVN between revisions include changes in the
+# patches applied to the kernel, rather than simply defconfig
+# changes
+PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
+
+require ixp4xx-kernel.inc
+require ixp4xx-kernel-svnpatch.inc
============================================================
--- conf/machine/fsg3be.conf	614fcd1196db4ea73e6ea013cbc9b15381004779
+++ conf/machine/fsg3be.conf	0985b6fc93f5ebf67761f503ee5b6aaa1b35d3e2
@@ -10,13 +10,14 @@ OVERRIDES = "local:${MACHINE}:ixp4xxbe:i
 
 OVERRIDES = "local:${MACHINE}:ixp4xxbe:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 
-require conf/machine/include/ixp4xx.conf
-
 # Match the vendor's latest kernel
-PREFERRED_VERSION_ixp4xx-kernel = "2.6.18"
+PREFERRED_PROVIDER_virtual/kernel ?= "fsg3-kernel"
+PREFERRED_VERSION_fsg3-kernel = "2.6.18"
 KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "gcc-cross-kernel-3.4.4"
 PREFERRED_VERSION_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "csl-arm-2005q3"
 
+require conf/machine/include/ixp4xx.conf
+
 # No room for jffs2 - the rootfs needs to be installed directly to disk
 IMAGE_FSTYPES = "tar.gz"