[oe-commits] org.oe.dev merge of '42f9a5d8cedd5c5de2a24d72c0f84b019e7a5246'

thesing commit oe at amethyst.openembedded.net
Fri Mar 28 00:14:42 UTC 2008


merge of '42f9a5d8cedd5c5de2a24d72c0f84b019e7a5246'
     and 'c474f6f48b0333b791017b2d12c15831e6d2b873'

Author: thesing at openembedded.org
Branch: org.openembedded.dev
Revision: 19f950ca4a0d912a0ac8680d3b82d52f11fc2cd0
ViewMTN: http://monotone.openembedded.org/revision/info/19f950ca4a0d912a0ac8680d3b82d52f11fc2cd0
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
packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch
classes/kernel.bbclass
conf/distro/mamona.conf
packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch
packages/linux/linux-rp_2.6.24.bb
packages/linux/linux.inc
packages/meta/slugos-packages.bb
Diffs:

#
# mt diff -r42f9a5d8cedd5c5de2a24d72c0f84b019e7a5246 -r19f950ca4a0d912a0ac8680d3b82d52f11fc2cd0
#
#
#
# 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]
# 
# add_file "packages/linux/linux-rp-2.6.24/sharpsl-rc-r2.patch"
#  content [f62d8545ea16f4caf506219c894df3a90724b5c2]
# 
# patch "classes/kernel.bbclass"
#  from [3d9c1ef4fa8d40322fcc47b667ab1a78c47dcac8]
#    to [b6e05ecebbfd152cbd0c654bcea62bbcf8f18352]
# 
# patch "conf/distro/mamona.conf"
#  from [9cbafb2b9adc44908a472e8fbc349a0b5c6177de]
#    to [fd683d8ddd62359322234b247211b416f546a004]
# 
# patch "packages/linux/linux-rp-2.6.24/sharpsl-rc-r1.patch"
#  from [555dcdc80fa0d4419bbeaa955328961258cf607e]
#    to [c1ba9d58f22e96a7d5fd27cd59af335284d4de5c]
# 
# patch "packages/linux/linux-rp_2.6.24.bb"
#  from [4602e42d1a1b946ad9f574e563090ce4e132a0ab]
#    to [d6d6154abb7e12ee339a56d8159976202d70a192]
# 
# patch "packages/linux/linux.inc"
#  from [0321f5531f3d38ef343c01b13c7416df2e74e8ce]
#    to [05a28f69ba86f2b970e011440a9296697b6e57d8]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [96a0237d409dd80df2eaf35848783c759498d425]
#    to [f72a5746db26eeb3651f9bc8be05f02450d39c48]
#
============================================================
--- 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%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rc474f6f48b0333b791017b2d12c15831e6d2b873 -r19f950ca4a0d912a0ac8680d3b82d52f11fc2cd0
#
#
#
# patch "packages/linux/linux-rp_2.6.24.bb"
#  from [5daa3c30b673211ee04cc9d19ae14faecaebad4e]
#    to [d6d6154abb7e12ee339a56d8159976202d70a192]
#
============================================================
--- packages/linux/linux-rp_2.6.24.bb	5daa3c30b673211ee04cc9d19ae14faecaebad4e
+++ packages/linux/linux-rp_2.6.24.bb	d6d6154abb7e12ee339a56d8159976202d70a192
@@ -58,6 +58,7 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/
            file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
            file://binutils-buildid-arm.patch;patch=1 \
            file://versatile-armv6.patch;patch=1 \
+	   file://htcuni.patch;patch=1 \
            file://defconfig-c7x0 \
            file://defconfig-hx2000 \
            file://defconfig-collie \
@@ -74,7 +75,6 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/
 # FIXMEs before made default	   
 # ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack
 
-# file://htcuni.patch;patch=1 \
 
 # Add this to enable pm debug code (useful with a serial lead)
 #  ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1






More information about the Openembedded-commits mailing list