[oe-commits] org.oe.dev merge of '5042c98815b59089f6a52790f0dba3c831b5590d'

thesing commit oe at amethyst.openembedded.net
Thu Mar 27 18:48:17 UTC 2008


merge of '5042c98815b59089f6a52790f0dba3c831b5590d'
     and 'd1dfc5df9769c50ec5328454ab737f091f6c573f'

Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: e8194e4192e392d230ab779c662314391f3e6ef0
ViewMTN: http://monotone.openembedded.org/revision/info/e8194e4192e392d230ab779c662314391f3e6ef0
Files:
1
packages/binutils/binutils-2.16.1
packages/glibc/glibc-2.3.6
packages/binutils/binutils-2.16.1/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch
packages/binutils/binutils-cross_2.16.1.bb
packages/binutils/binutils_2.16.1.bb
packages/glibc/glibc-2.3.6/glibc-2.3.6-allow-gcc-4.1-powerpc32-initfini.s.patch
packages/glibc/glibc-2.3.6/glibc-2.3.6-bind-already-defined-on-powerpc.patch
packages/glibc/glibc-2.3.6/glibc-2.3.6-linuxthreads-allow-gcc-4.1-powerpc32-initfini.s.patch
packages/glibc/glibc-2.3.6/late-install-loop-break.patch
packages/glibc/glibc-initial_2.3.6.bb
packages/glibc/glibc-intermediate_2.3.6.bb
packages/glibc/glibc_2.3.6.bb
classes/kernel.bbclass
packages/linux/LAB-kernel_2.6.13-hh2.bb
packages/linux/LAB-kernel_cvs.bb
packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb
packages/linux/compulab-pxa270_2.6.16.bb
packages/linux/devkitidp-pxa255_2.6.19.bb
packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
packages/linux/gumstix-linux.inc
packages/linux/ixp4xx-kernel.inc
packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
packages/linux/linux-bd-neon-2.6_2.6.22.bb
packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
packages/linux/linux-efika_2.6.20.20.bb
packages/linux/linux-efika_2.6.20.bb
packages/linux/linux-efika_2.6.21+git.bb
packages/linux/linux-gumstix_2.6.15.bb
packages/linux/linux-hackndev-2.6_git.bb
packages/linux/linux-handhelds-2.6.inc
packages/linux/linux-jlime-jornada6xx_2.6.11.bb
packages/linux/linux-jlime-jornada6xx_2.6.17.bb
packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
packages/linux/linux-jlime-jornada7xx_2.6.17.bb
packages/linux/linux-jlime-jornada7xx_2.6.18.bb
packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
packages/linux/linux-ks8695_2.6.16.bb
packages/linux/linux-linkstationarm_2.6.12.bb
packages/linux/linux-linkstationppc_2.6.21-rc5.bb
packages/linux/linux-ml403-mvista-2.6.x_git.bb
packages/linux/linux-ml403-slab-2.6.x_git.bb
packages/linux/linux-mtx-1_2.4.27.bb
packages/linux/linux-mtx-2_2.4.27.bb
packages/linux/linux-mtx-3_2.6.15.4.bb
packages/linux/linux-mtx-3_2.6.15.bb
packages/linux/linux-navman_2.6.18.bb
packages/linux/linux-nokia800.inc
packages/linux/linux-omap-2.6_2.6.9-omap1.bb
packages/linux/linux-palm-omap1_2.6.22-omap1.bb
packages/linux/linux-rp-2.6.24/defconfig-collie
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.24.bb
packages/linux/linux-sequoia_2.6.21.bb
packages/linux/linux-smdk2440_2.6.20+git.bb
packages/linux/linux-smdk2443_2.6.20+git.bb
packages/linux/linux-storcenter_2.6.12.6.bb
packages/linux/linux-storcenter_2.6.15.7.bb
packages/linux/linux-sun4cdm_2.4.26.bb
packages/linux/linux-tornado-omap2_2.6.16.16.bb
packages/linux/linux-turbostation_2.6.20.2.bb
packages/linux/linux-wrt_2.4.20.bb
packages/linux/linux-wrt_2.4.30.bb
packages/linux/linux-x86_2.6.20.bb
packages/linux/linux-xxs1500_2.4.21.bb
packages/linux/linux.inc
packages/linux/logicpd-pxa270_2.6.17-rc5.bb
packages/linux/logicpd-pxa270_2.6.19.2.bb
packages/linux/mainstone-kernel_2.6.11.bb
packages/linux/mx21ads-kernel_2.6.19rc6.bb
packages/linux/mx31ads-kernel_2.6.19rc6.bb
packages/linux/netbook-pro-kernel_2.6.17.bb
packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
packages/linux/triton-kernel_2.6.11.bb
packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
packages/linux/xanadux-un-2.6_2.6.12.bb
Diffs:

#
# mt diff -r5042c98815b59089f6a52790f0dba3c831b5590d -re8194e4192e392d230ab779c662314391f3e6ef0
#
#
#
# add_dir "packages/binutils/binutils-2.16.1"
# 
# add_dir "packages/glibc/glibc-2.3.6"
# 
# add_file "packages/binutils/binutils-2.16.1/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch"
#  content [50130f1fdf5d978a3bee936e70c39ddb0851b87b]
# 
# add_file "packages/binutils/binutils-cross_2.16.1.bb"
#  content [0b3c910b27afd69a5dfc2e1f76115ac7aca711cf]
# 
# add_file "packages/binutils/binutils_2.16.1.bb"
#  content [1c9dfbf91c25005a841b0536de33d9458e9d2f08]
# 
# add_file "packages/glibc/glibc-2.3.6/glibc-2.3.6-allow-gcc-4.1-powerpc32-initfini.s.patch"
#  content [b679752efb74a868a4c844e90c996c3a825e6e2c]
# 
# add_file "packages/glibc/glibc-2.3.6/glibc-2.3.6-bind-already-defined-on-powerpc.patch"
#  content [8417c8508a63dc7f723b6a5428fefe0c8654be91]
# 
# add_file "packages/glibc/glibc-2.3.6/glibc-2.3.6-linuxthreads-allow-gcc-4.1-powerpc32-initfini.s.patch"
#  content [fd5afa3eb39bb90dbf6476da0722f53ecb1f576c]
# 
# add_file "packages/glibc/glibc-2.3.6/late-install-loop-break.patch"
#  content [64dec2b12719edc4cc40e25f01f97b059508b2f0]
# 
# add_file "packages/glibc/glibc-initial_2.3.6.bb"
#  content [ca2be8d4be097f344adaa820ba2ceed272ec1171]
# 
# add_file "packages/glibc/glibc-intermediate_2.3.6.bb"
#  content [face2eec3f85b30a268476cd29a8dde1f6472a6c]
# 
# add_file "packages/glibc/glibc_2.3.6.bb"
#  content [3826e28e6ca2febf5082e9e7b8b5a369ff9d48f9]
#
============================================================
--- packages/binutils/binutils-2.16.1/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch	50130f1fdf5d978a3bee936e70c39ddb0851b87b
+++ packages/binutils/binutils-2.16.1/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch	50130f1fdf5d978a3bee936e70c39ddb0851b87b
@@ -0,0 +1,31 @@
+# strip (and objcopy) fail to set the error code if there is no
+# output file name and the rename of the stripped (or copied) file
+# fails, yet the command fails to do anything.  This fixes both
+# objcopy and strip.
+#
+# modification by bero: Ported to 2.16.91.0.6
+#
+#Signed-off-by: John Bowler <jbowler at acm.org>
+#Signed-off-by: Bernhard Rosenkraenzer <bero at arklinux.org>
+--- binutils-2.16.91.0.6/binutils/objcopy.c.ark	2006-03-11 15:59:07.000000000 +0100
++++ binutils-2.16.91.0.6/binutils/objcopy.c	2006-03-11 15:59:45.000000000 +0100
+@@ -2593,7 +2593,8 @@
+ 	  if (preserve_dates)
+ 	    set_times (tmpname, &statbuf);
+ 	  if (output_file == NULL)
+-	    smart_rename (tmpname, argv[i], preserve_dates);
++	    if(smart_rename (tmpname, argv[i], preserve_dates))
++              hold_status = 1;
+ 	  status = hold_status;
+ 	}
+       else
+@@ -3184,7 +3185,8 @@
+ 	{
+ 	  if (preserve_dates)
+ 	    set_times (tmpname, &statbuf);
+-	  smart_rename (tmpname, input_filename, preserve_dates);
++	  if (smart_rename (tmpname, input_filename, preserve_dates))
++            status = 1;
+ 	}
+       else
+ 	unlink (tmpname);
============================================================
--- packages/binutils/binutils-cross_2.16.1.bb	0b3c910b27afd69a5dfc2e1f76115ac7aca711cf
+++ packages/binutils/binutils-cross_2.16.1.bb	0b3c910b27afd69a5dfc2e1f76115ac7aca711cf
@@ -0,0 +1,3 @@
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
+require binutils_${PV}.bb
+require binutils-cross.inc
============================================================
--- packages/binutils/binutils_2.16.1.bb	1c9dfbf91c25005a841b0536de33d9458e9d2f08
+++ packages/binutils/binutils_2.16.1.bb	1c9dfbf91c25005a841b0536de33d9458e9d2f08
@@ -0,0 +1,14 @@
+
+CROSSTOOL_PATCH_URL = "http://www.kegel.com/crosstool/crosstool-0.43/patches/binutils-2.16.1/"
+SRC_URI = \
+    "${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
+     ${CROSSTOOL_PATCH_URL}bfd-hash-tweak.patch;patch=1 \
+     ${CROSSTOOL_PATCH_URL}binutils-2.15-psignal.patch;patch=1 \
+     ${CROSSTOOL_PATCH_URL}binutils-skip-comments.patch;patch=1 \
+     ${CROSSTOOL_PATCH_URL}callahan.patch;patch=1 \
+     ${CROSSTOOL_PATCH_URL}cross-gprof.patch;patch=1 \
+     ${CROSSTOOL_PATCH_URL}stabs-tweak.patch;patch=1 \
+     file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1"
+
+
+require binutils.inc
============================================================
--- packages/glibc/glibc-2.3.6/glibc-2.3.6-allow-gcc-4.1-powerpc32-initfini.s.patch	b679752efb74a868a4c844e90c996c3a825e6e2c
+++ packages/glibc/glibc-2.3.6/glibc-2.3.6-allow-gcc-4.1-powerpc32-initfini.s.patch	b679752efb74a868a4c844e90c996c3a825e6e2c
@@ -0,0 +1,28 @@
+fixes
+
+{BUILD_DIR}/build-glibc/csu/crtn.o: In function "dummy":
+{BUILD_DIR}/build-glibc/csu/crtn.S:14: multiple definition of "dummy"
+{BUILD_DIR}/build-glibc/csu/crti.o:{BUILD_DIR}/build-glibc/csu/crti.S:33: first defined here
+{BUILD_DIR}/build-glibc/csu/crtn.o: In function "_init":
+{BUILD_DIR}/build-glibc/csu/crtn.S:30: multiple definition of "_init"
+{BUILD_DIR}/build-glibc/csu/crti.o:{BUILD_DIR}/build-glibc/csu/crti.S:65: first defined here
+{BUILD_DIR}/build-glibc/csu/crtn.o: In function "_fini":
+{BUILD_DIR}/build-glibc/csu/crtn.S:25: multiple definition of "_fini"
+{BUILD_DIR}/build-glibc/csu/crti.o:{BUILD_DIR}/build-glibc/csu/crti.S:38: first defined here
+{BUILD_DIR}/build-glibc/csu/crti.o: In function "_fini":
+{BUILD_DIR}/build-glibc/csu/crti.S:(.init+0x20): undefined reference to "i_am_not_a_leaf"
+{BUILD_DIR}/build-glibc/csu/crtn.o: In function "_fini":
+{BUILD_DIR}/build-glibc/csu/crtn.S:(.init+0x40): undefined reference to "i_am_not_a_leaf"
+{BUILD_DIR}/build-glibc/csu/crtn.S:(.init+0x44): undefined reference to "i_am_not_a_leaf"
+
+--- glibc-2.3.6/sysdeps/powerpc/powerpc32/Makefile.org  2006-08-21 19:03:01.000000000 -0700
++++ glibc-2.3.6/sysdeps/powerpc/powerpc32/Makefile      2006-08-21 19:03:19.000000000 -0700
+@@ -21,7 +21,7 @@
+ ifneq ($(elf),no)
+ # The initfini generation code doesn't work in the presence of -fPIC, so
+ # we use -fpic instead which is much better.
+-CFLAGS-initfini.s = -g0 -fpic -O1
++CFLAGS-initfini.s = -g0 -fpic -O1 $(fno-unit-at-a-time)
+
+ # There is no benefit to using sdata for these objects, and the user
+ # of the library should be able to control what goes into sdata.
============================================================
--- packages/glibc/glibc-2.3.6/glibc-2.3.6-bind-already-defined-on-powerpc.patch	8417c8508a63dc7f723b6a5428fefe0c8654be91
+++ packages/glibc/glibc-2.3.6/glibc-2.3.6-bind-already-defined-on-powerpc.patch	8417c8508a63dc7f723b6a5428fefe0c8654be91
@@ -0,0 +1,65 @@
+Fixes "Error: symbol `__bind' is already defined" error when building for PowerPC
+
+Patch taken from http://bugs.debian.org/343571
+
+
+--- x/sysdeps/powerpc/powerpc32/fpu/s_lround.S	2004-06-30 17:29:12.000000000 -0500
++++ x/sysdeps/powerpc/powerpc32/fpu/s_lround.S	2005-11-18 16:48:11.000000000 -0600
+@@ -88,7 +79,6 @@
+ 	b	.L9
+ 	END (__lround)
+ 
+-strong_alias (__lround, __lround)
+ weak_alias (__lround, lround)
+ 
+ strong_alias (__lround, __lroundf)
+--- x/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S	2005-12-16 01:04:21.000000000 -0600
++++ x/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S	2005-12-16 01:06:26.000000000 -0600
+@@ -42,7 +42,11 @@
+ #define stackblock 20
+ 
+ #ifndef __socket
+-#define __socket P(__,socket)
++# ifndef NO_WEAK_ALIAS
++#  define __socket P(__,socket)
++# else
++#  define __socket socket
++# endif
+ #endif
+ 
+ 	.text
+@@ -116,4 +120,6 @@
+ 
+ PSEUDO_END (__socket)
+ 
++#ifndef NO_WEAK_ALIAS
+ weak_alias (__socket, socket)
++#endif
+--- x/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S	2005-12-16 01:08:45.000000000 -0600
++++ x/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S	2005-12-16 01:09:32.000000000 -0600
+@@ -41,12 +41,12 @@
+ 
+ #define stackblock 80 /* offset to socket parm area.  */
+ 
+-#ifndef socket
+-/* If this is just socket.S leave it alone! */
+-#else
+ #ifndef __socket
+-#define __socket P(__,socket)
+-#endif
++# ifndef NO_WEAK_ALIAS
++#  define __socket P(__,socket)
++# else
++#  define __socket socket
++# endif
+ #endif
+ 
+ 	.text
+@@ -120,4 +120,6 @@
+ 	cfi_endproc
+ PSEUDO_END (__socket)
+ 
++#ifndef NO_WEAK_ALIAS
+ weak_alias (__socket, socket)
++#endif
+
============================================================
--- packages/glibc/glibc-2.3.6/glibc-2.3.6-linuxthreads-allow-gcc-4.1-powerpc32-initfini.s.patch	fd5afa3eb39bb90dbf6476da0722f53ecb1f576c
+++ packages/glibc/glibc-2.3.6/glibc-2.3.6-linuxthreads-allow-gcc-4.1-powerpc32-initfini.s.patch	fd5afa3eb39bb90dbf6476da0722f53ecb1f576c
@@ -0,0 +1,28 @@
+fixes
+
+{BUILD_DIR}/build-glibc/linuxthreads/crtn.o: In function "dummy":
+{BUILD_DIR}/build-glibc/linuxthreads/crtn.S:14: multiple definition of "dummy"
+{BUILD_DIR}/build-glibc/linuxthreads/crti.o:{BUILD_DIR}/build-glibc/linuxthreads/crti.S:33: first defined here
+{BUILD_DIR}/build-glibc/linuxthreads/crtn.o: In function "_fini":
+{BUILD_DIR}/build-glibc/linuxthreads/crtn.S:30: multiple definition of "_fini"
+{BUILD_DIR}/build-glibc/linuxthreads/crti.o:{BUILD_DIR}/build-glibc/linuxthreads/crti.S:65: first defined here
+{BUILD_DIR}/build-glibc/linuxthreads/crtn.o: In function "_init":
+{BUILD_DIR}/build-glibc/linuxthreads/crtn.S:23: multiple definition of "_init"
+{BUILD_DIR}/build-glibc/linuxthreads/crti.o:{BUILD_DIR}/build-glibc/linuxthreads/crti.S:37: first defined here
+{BUILD_DIR}/build-glibc/linuxthreads/crti.o: In function "_fini":
+{BUILD_DIR}/build-glibc/linuxthreads/crti.S:(.text+0x70): undefined reference to "i_am_not_a_leaf"
+{BUILD_DIR}/build-glibc/linuxthreads/crtn.o: In function "_fini":
+{BUILD_DIR}/build-glibc/linuxthreads/crtn.S:(.text+0x38): undefined reference to "i_am_not_a_leaf"
+collect2: ld returned 1 exit status
+
+--- glibc-2.3.6/linuxthreads/sysdeps/powerpc/Makefile.org      2003-02-17 20:33:17.000000000 +0000
++++ glibc-2.3.6/linuxthreads/sysdeps/powerpc/Makefile  2007-04-04 16:26:01.969067632 +0100
+@@ -1,6 +1,6 @@
+ ifeq ($(subdir):$(elf),linuxthreads:yes)
+ # See CFLAGS-initfini.s above; this is the same code.
+-CFLAGS-pt-initfini.s = -g0 -fpic -O1
++CFLAGS-pt-initfini.s = -g0 -fpic -O1 $(fno-unit-at-a-time)
+ endif
+ ifeq ($(subdir),csu)
+ gen-as-const-headers += tcb-offsets.sym
+
============================================================
--- packages/glibc/glibc-2.3.6/late-install-loop-break.patch	64dec2b12719edc4cc40e25f01f97b059508b2f0
+++ packages/glibc/glibc-2.3.6/late-install-loop-break.patch	64dec2b12719edc4cc40e25f01f97b059508b2f0
@@ -0,0 +1,29 @@
+--- glibc-2.3.6/Makerules	Sat Sep  8 22:59:54 2007
++++ glibc-2.3.6/Makerules	Sun Sep  9 01:04:29 2007
+@@ -154,26 +154,6 @@
+ common-before-compile = $(before-compile)
+ endif
+ 
+-ifndef subdir
+-# If a makefile needs to do something conditional on something that
+-# can only be figured out from headers, write a FOO.make.c input
+-# file that uses cpp contructs and contains @@@ LINE @@@ for each LINE
+-# to emit in the generated makefile, and use -include $(common-objpfx)FOO.make.
+-#
+-# We only generate these in the top-level makefile, to avoid any weirdness
+-# from subdir-specific makefile tweaks creeping in on an update.
+-$(common-objpfx)%.make: $(..)%.make.c $(..)Makerules $(common-before-compile)
+-	rm -f $@T $@.dT
+-	(echo '# Generated from $*.make.c by Makerules.'; \
+-	 $(CC) $(CFLAGS) $(CPPFLAGS) -E $< \
+-	       -MD -MP -MT '$$(common-objpfx)$*.make' -MF $@.dT \
+-	 | sed -n '/@@@/{s/@@@[	 ]*\(.*\)@@@/\1/;s/[	 ]*$$//p;}'; \
+-	 echo 'common-generated += $(@F)'; \
+-	 sed $(sed-remove-objpfx) $(sed-remove-dotdot) $@.dT; \
+-	 rm -f $@.dT) > $@T
+-	mv -f $@T $@
+-endif
+-
+ ifdef subdir
+ sed-remove-dotdot := -e 's@  *\.\.\/\([^ 	\]*\)@ $$(..)\1 at g' \
+ 		     -e 's@^\.\.\/\([^ 	\]*\)@$$(..)\1 at g'
============================================================
--- packages/glibc/glibc-initial_2.3.6.bb	ca2be8d4be097f344adaa820ba2ceed272ec1171
+++ packages/glibc/glibc-initial_2.3.6.bb	ca2be8d4be097f344adaa820ba2ceed272ec1171
@@ -0,0 +1,4 @@
+require glibc_${PV}.bb
+require glibc-initial.inc
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-${PV}', '${FILE_DIRNAME}/glibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
============================================================
--- packages/glibc/glibc-intermediate_2.3.6.bb	face2eec3f85b30a268476cd29a8dde1f6472a6c
+++ packages/glibc/glibc-intermediate_2.3.6.bb	face2eec3f85b30a268476cd29a8dde1f6472a6c
@@ -0,0 +1,2 @@
+require glibc_${PV}.bb
+require glibc-intermediate.inc
============================================================
--- packages/glibc/glibc_2.3.6.bb	3826e28e6ca2febf5082e9e7b8b5a369ff9d48f9
+++ packages/glibc/glibc_2.3.6.bb	3826e28e6ca2febf5082e9e7b8b5a369ff9d48f9
@@ -0,0 +1,89 @@
+require glibc.inc
+
+#FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/glibc-2.3.6', '${FILE_DIRNAME}/orig/glibc', '${FILE_DIRNAME}/orig/files', '${FILE_DIRNAME}/orig' ], d)}"
+
+GLIBC_ADDONS ?= "linuxthreads"
+
+#           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-cygwin.patch;patch=1
+
+CROSSTOOL_PATCH_URL = "http://www.kegel.com/crosstool/crosstool-0.43/patches/glibc-2.3.6/"
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
+           ftp://ftp.gnu.org/pub/gnu/glibc/glibc-linuxthreads-${PV}.tar.bz2 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-sh-lowlevellock.patch;patch=1 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.5-sh-memset.patch;patch=1 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-allow-gcc-4.0-arm.patch;patch=1 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-allow-gcc-4.0-elf.patch;patch=1 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-configure-apple-as.patch;patch=1 \
+           ${CROSSTOOL_PATCH_URL}glibc-2.3.6-fix-pr631.patch;patch=1 \
+           ${CROSSTOOL_PATCH_URL}glibc-fp-byteorder.patch;patch=1 \
+           ${CROSSTOOL_PATCH_URL}glibc-mips-bootstrap-gcc-header-install.patch;patch=1 \
+           ${CROSSTOOL_PATCH_URL}make-install-lib-all.patch;patch=1 \
+           ${CROSSTOOL_PATCH_URL}maybe/glibc-2.3.6-allow-gcc-4.0-powerpc32.patch;patch=1 \
+           file://glibc-2.3.6-bind-already-defined-on-powerpc.patch;patch=1 \
+           file://glibc-2.3.6-allow-gcc-4.1-powerpc32-initfini.s.patch;patch=1 \
+           file://glibc-2.3.6-linuxthreads-allow-gcc-4.1-powerpc32-initfini.s.patch;patch=1 \
+           file://late-install-loop-break.patch \
+	   \
+           file://etc/ld.so.conf \
+	   file://generate-supported.mk"
+
+S = "${WORKDIR}/glibc-${PV}"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
+	        --without-cvs --disable-profile --disable-debug --without-gd \
+		--enable-clocale=gnu \
+	        --enable-add-ons=${GLIBC_ADDONS} \
+		--with-headers=${STAGING_INCDIR} \
+		${GLIBC_EXTRA_OECONF}"
+
+EXTRA_OECONF += "${@get_glibc_fpu_setting(bb, d)}"
+
+glibc_do_unpack () {
+        mv "${WORKDIR}/linuxthreads" "${WORKDIR}/linuxthreads_db" "${S}/"
+}
+
+python do_unpack () {
+        bb.build.exec_func('base_do_unpack', d)
+        bb.build.exec_func('glibc_do_unpack', d)
+}
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
+# version check and doesn't really help with anything
+	if [ -z "`which rpcgen`" ]; then
+		echo "rpcgen not found.  Install glibc-devel."
+		exit 1
+	fi
+	(cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+	CPPFLAGS="" oe_runconf
+}
+
+rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
+	  yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
+	  rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
+
+do_compile () {
+	# this really is arm specific
+	touch ${S}/sysdeps/arm/framestate.c
+	# -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
+	unset LDFLAGS
+	base_do_compile
+	(
+		cd ${S}/sunrpc/rpcsvc
+		for r in ${rpcsvc}; do
+			h=`echo $r|sed -e's,\.x$,.h,'`
+			rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
+		done
+	)
+}
+
+do_stage_prepend() {
+	( cd ${S} ; patch -p1 < ${WORKDIR}/late-install-loop-break.patch )
+}
+
+require glibc-stage.inc
+
+require glibc-package.bbclass


#
# mt diff -rd1dfc5df9769c50ec5328454ab737f091f6c573f -re8194e4192e392d230ab779c662314391f3e6ef0
#
#
#
# patch "classes/kernel.bbclass"
#  from [34b802297a875fd3c77c50d0aac3270b57374764]
#    to [3d9c1ef4fa8d40322fcc47b667ab1a78c47dcac8]
# 
# patch "packages/linux/LAB-kernel_2.6.13-hh2.bb"
#  from [21b2c94a538b886075cdc74ca6cbd4087628ced1]
#    to [28ea3e5bdb0e329d0c047f9ff0685c292844491d]
# 
# patch "packages/linux/LAB-kernel_cvs.bb"
#  from [85c1fa63bcdd31dc57b94a7a4cd03e467fa9a727]
#    to [94042d4ed2425296a9139beb61c2723435173e2f]
# 
# patch "packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb"
#  from [95b4838142802f9a9d5f2e61083b8c8443be384a]
#    to [ab4fc0c38024f9ace0889aa825738e86c6453157]
# 
# patch "packages/linux/compulab-pxa270_2.6.16.bb"
#  from [4694fb75afe6c5d1011a87d7d09c2782c995d519]
#    to [fa86f15440d0479a564c2773414e1d2c76c7e920]
# 
# patch "packages/linux/devkitidp-pxa255_2.6.19.bb"
#  from [ddf60a124917dd197f6cf08a76fb02087ce033eb]
#    to [6f4563aedfe64b87c82b6dc7c0d6e90fdacc8cab]
# 
# patch "packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb"
#  from [1b6e37dd7b8a233d87a5541a13384e0b92f09551]
#    to [5031c9fb4373c6f949b0c85bbda5305e227dfdb5]
# 
# patch "packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb"
#  from [a452af7d69c3d884966354e28c8547c6bcb16b6b]
#    to [acd4c53c81aaf43edc2f230f348f69eda3f70e43]
# 
# patch "packages/linux/gumstix-linux.inc"
#  from [acaefbd2b36224f66b5c0a9bd39662ebd6ee39eb]
#    to [cc9aa9d293625e691bf43518593347e53526502f]
# 
# patch "packages/linux/ixp4xx-kernel.inc"
#  from [7fdde9d51b8e3fe0cc0eb9518098902d6281e3da]
#    to [1c543d21550db4363f5a641dde67e2ad1e97ceba]
# 
# patch "packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb"
#  from [05eaab60785d5e05e846f30e1b3fa346b7af411e]
#    to [4c819243042158bd1a4c87bf8c36344ea96d3045]
# 
# patch "packages/linux/linux-bd-neon-2.6_2.6.22.bb"
#  from [457d040120a5884806bf1ae597512aa6e951e1fa]
#    to [a2bfe10ed6b0e5bdd5aaa2f2019de3b615446e6d]
# 
# patch "packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb"
#  from [9854e7470109cece86c7335b8261fa4a6c33df31]
#    to [65d32086c4f2a2fd71ffdc217f0beb3c9bf80190]
# 
# patch "packages/linux/linux-efika_2.6.20.20.bb"
#  from [01117a66cc290abe28c789551dafbdaadaf2e6df]
#    to [1b3165d039493374e1176f8516664086f9960c04]
# 
# patch "packages/linux/linux-efika_2.6.20.bb"
#  from [26eb3e8b2f654dac6975e04c0e7c078417623da6]
#    to [447aa0867df1051856747635b708dc10d80ae07d]
# 
# patch "packages/linux/linux-efika_2.6.21+git.bb"
#  from [1d96763c1bba903c9753ae5d85530485bea1668d]
#    to [30b2f23a4a0e7e68bc130053fa9b6f609f21478c]
# 
# patch "packages/linux/linux-gumstix_2.6.15.bb"
#  from [5e35bf29285ac1fbc0b075f0367bc1a8d88b3b3b]
#    to [a9dcc2306672c2a32d8248a651f08f6309ecb346]
# 
# patch "packages/linux/linux-hackndev-2.6_git.bb"
#  from [64dc1851d5ce9033729f0f42a60d0fd078db1f7e]
#    to [b62689b2d0b627662ac88b31cc5e0ca3e70a2988]
# 
# patch "packages/linux/linux-handhelds-2.6.inc"
#  from [6ee762ca50690741aee1b59934653c4e6899f3ff]
#    to [88d8c2ee941dcc1d6b1d1003d133b9150a967b3a]
# 
# patch "packages/linux/linux-jlime-jornada6xx_2.6.11.bb"
#  from [e5690ef11fcf56b6afea05914a8d0cc43fdd8ddd]
#    to [8701602e073cfec86ea4b730e72843960b581eff]
# 
# patch "packages/linux/linux-jlime-jornada6xx_2.6.17.bb"
#  from [1812cd357f386bde56fd123ad05f999bfbfc523f]
#    to [c3b6a4ec701ddf7c906f5c56d41787d0eae6b7e0]
# 
# patch "packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb"
#  from [d8e50205bd984595d687ef8c1029648c350148b2]
#    to [8cb1c02737fccfbd18ef9b7e890f9f9152132b3a]
# 
# patch "packages/linux/linux-jlime-jornada7xx_2.6.17.bb"
#  from [118cea8f14b2829631e191683adac8664625d2dc]
#    to [e033eb2983af7d03a9ac98af426feca0ec65bad3]
# 
# patch "packages/linux/linux-jlime-jornada7xx_2.6.18.bb"
#  from [90de1d3f21ac6715b8d8969408329c528a928370]
#    to [d7409d15e42998b92eb516f4caeed2ede1a369ce]
# 
# patch "packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb"
#  from [6677636ce3a207ec5a71b92b00c6a6b00c6164e3]
#    to [1f4de47323d653696880f2063c3bbb9419734bca]
# 
# patch "packages/linux/linux-ks8695_2.6.16.bb"
#  from [e5f8049819e2048b2ea04c0f1163f86c9d33187e]
#    to [a151e37da5f5309a73cb8f2f647cb9dd18c360a5]
# 
# patch "packages/linux/linux-linkstationarm_2.6.12.bb"
#  from [5c531f3ff8db593954394d2cd7b0bbf6d5f3c034]
#    to [113c3c15631bdfc1219de00a1f0dbb210dfb7276]
# 
# patch "packages/linux/linux-linkstationppc_2.6.21-rc5.bb"
#  from [679383825421e632b5d7cc7a4a1a719a3b8a403a]
#    to [82fcf0dff9227ba332678ca82a21ad7ce515d204]
# 
# patch "packages/linux/linux-ml403-mvista-2.6.x_git.bb"
#  from [1627e847f526fa7073747ec037b61f626f96352f]
#    to [8efa468a1f3367d18a20c3260f90ada47a76f98d]
# 
# patch "packages/linux/linux-ml403-slab-2.6.x_git.bb"
#  from [5030af659ba81e0fd39cabcfe458111ae1646763]
#    to [1dedc8ec0ccb14b25d9979db1e4af75c63668f9a]
# 
# patch "packages/linux/linux-mtx-1_2.4.27.bb"
#  from [5aa527007e73fd6ebd969c021abff9f8573dd189]
#    to [e8855b47883bee538c1e4684e6b9f9dc3e08ef95]
# 
# patch "packages/linux/linux-mtx-2_2.4.27.bb"
#  from [478bed2951d5bfe4a59968087493fe96a1428770]
#    to [a11f8e9e2f3b400405bc1d4c54e6c4c39230bccc]
# 
# patch "packages/linux/linux-mtx-3_2.6.15.4.bb"
#  from [a34093b088a5da3a33502d715235b1e1171292de]
#    to [ad810bd1e8c7703133e23ecb7babf7af0673ec51]
# 
# patch "packages/linux/linux-mtx-3_2.6.15.bb"
#  from [d7111648056223fa630144eb7ea690dde9d02136]
#    to [3fe52943fbf0066681c0d6374c516fc5f119b194]
# 
# patch "packages/linux/linux-navman_2.6.18.bb"
#  from [170d50b807364f5b39aaf8a74d85700e2d5ef059]
#    to [7222348b888446c23fe8b1cebabd4b5f8f3ebce0]
# 
# patch "packages/linux/linux-nokia800.inc"
#  from [c099bf50d2367d56a7a7f92d7972a909ef3f1c8b]
#    to [e115eb464fd01dc9fb6240cf410d23831cdb0c3f]
# 
# patch "packages/linux/linux-omap-2.6_2.6.9-omap1.bb"
#  from [0fc02f33bb0974e2ef2525856bf1a22ed9a550c0]
#    to [16a16b7a279d8e82b110426ced8e7a09e343504f]
# 
# patch "packages/linux/linux-palm-omap1_2.6.22-omap1.bb"
#  from [09c462b9df4a65761d04ae252b5156bbe024c54a]
#    to [6d3623af6e48ee147a8cf8e33bd7c3f9bf501ad7]
# 
# patch "packages/linux/linux-rp-2.6.24/defconfig-collie"
#  from [9b2c70575288716c8ab9954a8ffba6ab29a2bea6]
#    to [c20ffc7ca88bd60b7372555603e25cf2b03abc9b]
# 
# patch "packages/linux/linux-rp.inc"
#  from [955d75bfe07f7f78a1bb382972543be8f55ae216]
#    to [8efe110a0206f0bcff50da5554603214a407b8fe]
# 
# patch "packages/linux/linux-rp_2.6.24.bb"
#  from [9e6dea22aa706ffd224579092a86fb5572432109]
#    to [51870430d0959e153e5ae362218b6f4167e36568]
# 
# patch "packages/linux/linux-sequoia_2.6.21.bb"
#  from [5dc8ca7fe3e92accabff7e6dc3d9d28540f8839b]
#    to [d413717f8bcba9bb60c8c1a6428744aadfda32fa]
# 
# patch "packages/linux/linux-smdk2440_2.6.20+git.bb"
#  from [c6bddc2c20ea68b01d4e8457000fdb982a675840]
#    to [c1a3ee438ab00d04db3a09863dd5d44c44d509a2]
# 
# patch "packages/linux/linux-smdk2443_2.6.20+git.bb"
#  from [43c2952116b3749fac68666c3f67f36bf48154fe]
#    to [d1486129501571f3ec91eb5d75702829a1bf928e]
# 
# patch "packages/linux/linux-storcenter_2.6.12.6.bb"
#  from [2d88bee5909e832293186264642aaaa6f6d15e7d]
#    to [aebb2189821031a5a3dee099c03be9c702721041]
# 
# patch "packages/linux/linux-storcenter_2.6.15.7.bb"
#  from [c8d13191b10ec42a45a1dac552bc747a241b24ad]
#    to [f4a0cbe23d6cb597b8fadc822741c3743ac8af83]
# 
# patch "packages/linux/linux-sun4cdm_2.4.26.bb"
#  from [dfbb8a3b7ce6381ef53c89ac9cc012925ee2d088]
#    to [cb7b79292f0df562d042c5d11e26f4f9f3b1684f]
# 
# patch "packages/linux/linux-tornado-omap2_2.6.16.16.bb"
#  from [a735d9e07c77baf8fa31bb48cda83957ab6af590]
#    to [2abc45d9ddbe360fdd17e53fa7dd355e2edf56d5]
# 
# patch "packages/linux/linux-turbostation_2.6.20.2.bb"
#  from [abd711d81a65da03e4199ceaf85703d9c052a26b]
#    to [7897027767e57ffa7b287bcb8ffd5846e74e6fb2]
# 
# patch "packages/linux/linux-wrt_2.4.20.bb"
#  from [ce82a3361914a1863ec5646e35eb6492f5babb69]
#    to [e74b100f98b6d06e1178e06ac84707dc3ea720ca]
# 
# patch "packages/linux/linux-wrt_2.4.30.bb"
#  from [fe9df0285b627d50369b865bce0ec5e3c3756664]
#    to [e6fb2a6757c20d6db3711f1c4b100d280955766e]
# 
# patch "packages/linux/linux-x86_2.6.20.bb"
#  from [373dff7be9a2cb86fd01661a2204fcbebf1c8427]
#    to [c3d12343d14667cacd6610f043b0754e84524af5]
# 
# patch "packages/linux/linux-xxs1500_2.4.21.bb"
#  from [50ad158a5e60cb7c35b3482d7433fb7b8edf6a9f]
#    to [4c3804df17204b8a2d8c9cfeecb854c9fd442b7e]
# 
# patch "packages/linux/linux.inc"
#  from [eeaa90a02ec1d98a0a19b42de93dd613867bea9b]
#    to [0321f5531f3d38ef343c01b13c7416df2e74e8ce]
# 
# patch "packages/linux/logicpd-pxa270_2.6.17-rc5.bb"
#  from [9fab46f9b5a54dc6a7f752e4fefaff2e81d1f54d]
#    to [9a2aa6a59d9c5a88fb3c8f6d2799f1770f5c1639]
# 
# patch "packages/linux/logicpd-pxa270_2.6.19.2.bb"
#  from [3e9ccae6c92fe9092727de6d7d781be339abbb88]
#    to [9fbc51193472073bf35723abf0347dacb07f96ba]
# 
# patch "packages/linux/mainstone-kernel_2.6.11.bb"
#  from [d5a9b182d8e86b8f4b7b579cdfcfe40bf7616703]
#    to [6b6f689b5f536ee641091f47d602e47e356dcf95]
# 
# patch "packages/linux/mx21ads-kernel_2.6.19rc6.bb"
#  from [eb89e283bb375e8deefb9398a9f77334e4b32a4d]
#    to [77940b31b7200a1e72b9b0131f0a42bbf0a79b4d]
# 
# patch "packages/linux/mx31ads-kernel_2.6.19rc6.bb"
#  from [3c6294ce239293d9c65f68e973f7ea4a89f122aa]
#    to [4d45821e3959cca1cf0ec3e7c014bc8541d57f7d]
# 
# patch "packages/linux/netbook-pro-kernel_2.6.17.bb"
#  from [adcec4915e8ffc89681f8dd32ddca0cbcaed2d47]
#    to [7adc49fa49c65c4f9d8ff3246f89df9f5cc5f455]
# 
# patch "packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb"
#  from [34b1ac44c6acbb17f968621b1dc6ca57af533195]
#    to [43e599a840242fc71bf6e07c1e9a30fb453567b6]
# 
# patch "packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc"
#  from [3b48e835c5b6a538db140840202ca3abd2bf5296]
#    to [7d99efacb78551a1709a390b5a5b38d64a30a994]
# 
# patch "packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb"
#  from [bb5224a41360e3207277481ecfb4e71d69378231]
#    to [20b80c2dc893e51e0475ad80fa6428e95fd12bc3]
# 
# patch "packages/linux/triton-kernel_2.6.11.bb"
#  from [5c76121264ec80611a8d410d965dadb3d129cee5]
#    to [a8a4f6fce50a1cb7d5bbb6ef284ee7a8eab0140f]
# 
# patch "packages/linux/unslung-kernel_2.4.22.l2.3r63.bb"
#  from [b5e796a22c471b4d8a343f091cd2a3b7e4dc99f5]
#    to [9e8b7c52d9946060acebb173f83742c8f44247dd]
# 
# patch "packages/linux/xanadux-un-2.6_2.6.12.bb"
#  from [a63c9825f09a1bef04ed41c2ab3d9783328c0776]
#    to [c78078aec8a4746eb843f76fd4c63d0875560a6f]
#
============================================================
--- classes/kernel.bbclass	34b802297a875fd3c77c50d0aac3270b57374764
+++ classes/kernel.bbclass	3d9c1ef4fa8d40322fcc47b667ab1a78c47dcac8
@@ -3,6 +3,19 @@ DEPENDS += "virtual/${TARGET_PREFIX}depm
 PROVIDES += "virtual/kernel"
 DEPENDS += "virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules"
 
+KERNEL_IMAGETYPE ?= "zImage"
+
+python __anonymous () {
+
+    import bb
+    
+    kerneltype = bb.data.getVar('KERNEL_IMAGETYPE', d, 1) or ''
+    if kerneltype == 'uImage':
+    	depends = bb.data.getVar("DEPENDS", d, 1)
+    	depends = "%s u-boot-mkimage-native" % depends
+    	bb.data.setVar("DEPENDS", depends, d)
+}
+
 inherit kernel-arch
 
 PACKAGES_DYNAMIC += "kernel-module-*"
@@ -10,11 +23,6 @@ export CROSS_COMPILE = "${TARGET_PREFIX}
 
 export OS = "${TARGET_OS}"
 export CROSS_COMPILE = "${TARGET_PREFIX}"
-KERNEL_IMAGETYPE ?= "zImage"
-# Base filename under which users see built kernel (i.e. deploy name)
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
-# Symlink  basename pointing to the most recently built kernel for a machine
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}" 
 
 KERNEL_PRIORITY = "${@bb.data.getVar('PV',d,1).split('-')[0].split('.')[-1]}"
 
@@ -51,6 +59,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 # kernels are generally machine specific
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+# U-Boot support
+UBOOT_ENTRYPOINT ?= "20008000"
+
 kernel_do_compile() {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
 	oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}"
@@ -438,13 +449,47 @@ do_sizecheck() {
 # Support checking the kernel size since some kernels need to reside in partitions
 # with a fixed length or there is a limit in transferring the kernel to memory
 do_sizecheck() {
-        if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
-            size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
-            if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
-                    rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
-                    die  "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
-            fi
-        fi
+	if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
+        	size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
+        	if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
+                	rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
+                	die  "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular."
+        	fi
+    	fi
 }
 
 addtask sizecheck before do_install after do_compile
+
+KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
+KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
+
+do_deploy() {
+	install -d ${DEPLOY_DIR_IMAGE}
+	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
+	tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
+
+	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
+		if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
+			${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
+			uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+			rm -f linux.bin
+		else
+			${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
+			rm -f linux.bin.gz
+			gzip -9 linux.bin
+			uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+			rm -f linux.bin.gz
+		fi
+		package_stagefile_shell ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+	fi
+
+	cd ${DEPLOY_DIR_IMAGE}
+	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
+	ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
+        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.bin
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_package after do_install
============================================================
--- packages/linux/LAB-kernel_2.6.13-hh2.bb	21b2c94a538b886075cdc74ca6cbd4087628ced1
+++ packages/linux/LAB-kernel_2.6.13-hh2.bb	28ea3e5bdb0e329d0c047f9ff0685c292844491d
@@ -26,12 +26,5 @@ do_configure() {
         yes '' | oe_runmake oldconfig
 }
 
+KERNEL_IMAGE_BASE__NAME = "LAB-image-${MACHINE}-${DATETIME}.bin"
+KERNEL_IMAGE_SYMLINK_NAME = "LAB-image-${MACHINE}"
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/LAB-image-${MACHINE}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
============================================================
--- packages/linux/LAB-kernel_cvs.bb	85c1fa63bcdd31dc57b94a7a4cd03e467fa9a727
+++ packages/linux/LAB-kernel_cvs.bb	94042d4ed2425296a9139beb61c2723435173e2f
@@ -51,19 +51,13 @@ do_configure() {
         yes '' | oe_runmake oldconfig
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/LAB-image-${MACHINE}
+KERNEL_IMAGE_BASE_NAME = "LAB-image-${MACHINE}-${DATETIME}.bin"
+KERNEL_IMAGE_SYMLINK_NAME =  "LAB-image-${MACHINE}^"
 
+do_deploy_append() {
 	# Generate the HTC flavor, which must be a multiple of 512 bytes long.
 	cat ${WORKDIR}/greatwall_header arch/${ARCH}/boot/${KERNE%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list