[oe-commits] org.oe.dev merge of '0308024e7a88007651ed3a14db106a00b69b32a1'

oe commit oe at amethyst.openembedded.net
Sat Jul 26 10:27:16 UTC 2008 

merge of '0308024e7a88007651ed3a14db106a00b69b32a1'
     and '18c98c8c6d244da50f3f633a86903fd971aa0602'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 91a47e622b5c8c28247219a17c0f4fe751e9a7cd
ViewMTN: http://monotone.openembedded.org/revision/info/91a47e622b5c8c28247219a17c0f4fe751e9a7cd
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/eglibc/eglibc.inc
packages/eglibc/eglibc_svn.bb
packages/kexec/files/kexec-klibc.patch
packages/kexec/kexec-tools-static_1.101.bb
Diffs:

#
# mt diff -r0308024e7a88007651ed3a14db106a00b69b32a1 -r91a47e622b5c8c28247219a17c0f4fe751e9a7cd
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [f978a9c4326f1feb4b7e6b23a94f6b9ce18b90d1]
#    to [dc8efa6d25c6a10758cfbd9adac7dfb39da53d9e]
# 
# patch "packages/eglibc/eglibc.inc"
#  from [eef22ba34145bef9522d66a4eb30da587ba3e6a2]
#    to [08b9b1f3b71d0ea992ad8a5b349c51348b11f917]
# 
# patch "packages/eglibc/eglibc_svn.bb"
#  from [40ee7830b471a23f6a2b24acfbde31a644e4883e]
#    to [17bc96153f4c89522834fb62626b509064db5c9f]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	f978a9c4326f1feb4b7e6b23a94f6b9ce18b90d1
+++ conf/distro/include/sane-srcrevs.inc	dc8efa6d25c6a10758cfbd9adac7dfb39da53d9e
@@ -26,8 +26,8 @@ SRCREV_pn-eds-dbus ?= "659"
 SRCREV_pn-diversity-daemon ?= "277"
 SRCREV_pn-diversity-nav ?= "340"
 SRCREV_pn-eds-dbus ?= "659"
-SRCREV_pn-eglibc ?= "6229"
-SRCREV_pn-eglibc-initial ?= "6229"
+SRCREV_pn-eglibc ?= "6625"
+SRCREV_pn-eglibc-initial ?= "6625"
 SRCREV_pn-enlazar ?= "37"
 SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
============================================================
--- packages/eglibc/eglibc.inc	eef22ba34145bef9522d66a4eb30da587ba3e6a2
+++ packages/eglibc/eglibc.inc	08b9b1f3b71d0ea992ad8a5b349c51348b11f917
@@ -11,7 +11,10 @@ PROVIDES += "virtual/libintl virtual/lib
 #RDEPENDS += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
 PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES += "virtual/libintl virtual/libiconv"
-
+# We need this RRECOMMENDS because libc dlopens libgcc
+# and shlib mechanism can not detect it because its not
+# listed in the NEEDED field.
+RRECOMMENDS += "libgcc"
 inherit autotools
 
 LEAD_SONAME = "libc.so"
============================================================
--- packages/eglibc/eglibc_svn.bb	40ee7830b471a23f6a2b24acfbde31a644e4883e
+++ packages/eglibc/eglibc_svn.bb	17bc96153f4c89522834fb62626b509064db5c9f
@@ -3,7 +3,7 @@ PV = "2.8+svnr${SRCREV}"
 # DEFAULT_PREFERENCE = "-1"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
 PV = "2.8+svnr${SRCREV}"
-PR = "r7"
+PR = "r8"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
            file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
            file://etc/ld.so.conf \


#
# mt diff -r18c98c8c6d244da50f3f633a86903fd971aa0602 -r91a47e622b5c8c28247219a17c0f4fe751e9a7cd
#
#
#
# patch "packages/kexec/files/kexec-klibc.patch"
#  from [0c778df2238eb4e8880f42f1cbad2044a8dadd87]
#    to [c40f0d603ea5a1cbe3bd3cd0d383db0415b7e9ee]
# 
# patch "packages/kexec/kexec-tools-static_1.101.bb"
#  from [631b2a5ebad7343ec05c584ae17b033dec44c0f7]
#    to [bfde2acd1dce8182c6df19630026d692fb77fb5d]
#
============================================================
--- packages/kexec/files/kexec-klibc.patch	0c778df2238eb4e8880f42f1cbad2044a8dadd87
+++ packages/kexec/files/kexec-klibc.patch	c40f0d603ea5a1cbe3bd3cd0d383db0415b7e9ee
@@ -1,7 +1,7 @@ Index: kexec-tools-1.101/kexec/arch/arm/
 Index: kexec-tools-1.101/kexec/arch/arm/kexec-elf-rel-arm.c
 ===================================================================
---- kexec-tools-1.101.orig/kexec/arch/arm/kexec-elf-rel-arm.c	2008-02-22 20:45:15.907610333 +0100
-+++ kexec-tools-1.101/kexec/arch/arm/kexec-elf-rel-arm.c	2008-02-22 20:45:27.508612989 +0100
+--- kexec-tools-1.101.orig/kexec/arch/arm/kexec-elf-rel-arm.c	2008-02-24 14:15:46.934825202 +0100
++++ kexec-tools-1.101/kexec/arch/arm/kexec-elf-rel-arm.c	2008-02-24 14:15:47.014827381 +0100
 @@ -1,5 +1,5 @@
  #include <stdio.h>
 -#include <elf.h>
@@ -11,9 +11,20 @@ Index: kexec-tools-1.101/kexec/arch/arm/
  
 Index: kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c
 ===================================================================
---- kexec-tools-1.101.orig/kexec/arch/arm/kexec-zImage-arm.c	2008-02-22 20:45:15.959611260 +0100
-+++ kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c	2008-02-22 20:45:27.508612989 +0100
-@@ -110,13 +110,13 @@
+--- kexec-tools-1.101.orig/kexec/arch/arm/kexec-zImage-arm.c	2008-02-24 14:15:46.982825391 +0100
++++ kexec-tools-1.101/kexec/arch/arm/kexec-zImage-arm.c	2008-07-26 01:58:20.838624318 +0200
+@@ -2,6 +2,10 @@
+  * - 08/21/2007 ATAG support added by Uli Luckas <u.luckas at road.de>
+  *
+  */
++
++/* work around for linux header files */
++#define __deprecated
++
+ #define _GNU_SOURCE
+ #include <stdio.h>
+ #include <string.h>
+@@ -110,13 +114,13 @@
  	}
  
  	fread(buf, sizeof(buf[1]), BOOT_PARAMS_SIZE, fp);
@@ -31,8 +42,8 @@ Index: kexec-tools-1.101/kexec/ifdown.c
  }
 Index: kexec-tools-1.101/kexec/ifdown.c
 ===================================================================
---- kexec-tools-1.101.orig/kexec/ifdown.c	2004-06-09 20:55:31.000000000 +0200
-+++ kexec-tools-1.101/kexec/ifdown.c	2008-02-22 20:45:27.508612989 +0100
+--- kexec-tools-1.101.orig/kexec/ifdown.c	2008-02-24 14:15:34.025828340 +0100
++++ kexec-tools-1.101/kexec/ifdown.c	2008-02-24 14:15:47.014827381 +0100
 @@ -14,7 +14,7 @@
  #include <sys/ioctl.h>
  #include <sys/socket.h>
@@ -44,8 +55,8 @@ Index: kexec-tools-1.101/purgatory/Makef
  #include <netinet/in.h>
 Index: kexec-tools-1.101/purgatory/Makefile
 ===================================================================
---- kexec-tools-1.101.orig/purgatory/Makefile	2005-01-08 23:36:32.000000000 +0100
-+++ kexec-tools-1.101/purgatory/Makefile	2008-02-22 20:45:27.516611391 +0100
+--- kexec-tools-1.101.orig/purgatory/Makefile	2008-02-24 14:15:34.037827479 +0100
++++ kexec-tools-1.101/purgatory/Makefile	2008-02-24 14:15:47.022825503 +0100
 @@ -13,7 +13,7 @@
  
  PCFLAGS += $(call cc-option, -ffreestanding)
@@ -57,8 +68,8 @@ Index: kexec-tools-1.101/kexec/kexec-elf
  PURGATORY_C_SRCS:= 
 Index: kexec-tools-1.101/kexec/kexec-elf-rel.c
 ===================================================================
---- kexec-tools-1.101.orig/kexec/kexec-elf-rel.c	2005-01-13 14:04:21.000000000 +0100
-+++ kexec-tools-1.101/kexec/kexec-elf-rel.c	2008-02-22 20:45:27.524612027 +0100
+--- kexec-tools-1.101.orig/kexec/kexec-elf-rel.c	2008-02-24 14:15:34.025828340 +0100
++++ kexec-tools-1.101/kexec/kexec-elf-rel.c	2008-02-24 14:15:47.030825302 +0100
 @@ -4,7 +4,7 @@
  #include <stdio.h>
  #include <errno.h>
@@ -70,8 +81,8 @@ Index: kexec-tools-1.101/kexec/kexec-sys
  #include "kexec-elf.h"
 Index: kexec-tools-1.101/kexec/kexec-syscall.h
 ===================================================================
---- kexec-tools-1.101.orig/kexec/kexec-syscall.h	2008-02-22 20:45:15.923611048 +0100
-+++ kexec-tools-1.101/kexec/kexec-syscall.h	2008-02-22 20:45:27.524612027 +0100
+--- kexec-tools-1.101.orig/kexec/kexec-syscall.h	2008-02-24 14:15:46.950825917 +0100
++++ kexec-tools-1.101/kexec/kexec-syscall.h	2008-02-24 14:15:47.030825302 +0100
 @@ -2,7 +2,7 @@
  #define KEXEC_SYSCALL_H
  
@@ -116,8 +127,8 @@ Index: kexec-tools-1.101/kexec/kexec.c
  
 Index: kexec-tools-1.101/kexec/kexec.c
 ===================================================================
---- kexec-tools-1.101.orig/kexec/kexec.c	2008-02-22 20:45:15.923611048 +0100
-+++ kexec-tools-1.101/kexec/kexec.c	2008-02-22 20:45:38.847612035 +0100
+--- kexec-tools-1.101.orig/kexec/kexec.c	2008-02-24 14:15:46.950825917 +0100
++++ kexec-tools-1.101/kexec/kexec.c	2008-07-26 01:58:53.545624148 +0200
 @@ -29,9 +29,7 @@
  #include <unistd.h>
  #include <fcntl.h>
@@ -134,7 +145,7 @@ Index: kexec-tools-1.101/kexec/kexec.c
  }
  
 -#if HAVE_ZLIB_H
-+#if 1 
++#if 1
  char *slurp_decompress_file(const char *filename, off_t *r_size)
  {
  	gzFile fp;
============================================================
--- packages/kexec/kexec-tools-static_1.101.bb	631b2a5ebad7343ec05c584ae17b033dec44c0f7
+++ packages/kexec/kexec-tools-static_1.101.bb	bfde2acd1dce8182c6df19630026d692fb77fb5d
@@ -1,7 +1,7 @@ require kexec-tools.inc
 # the binaries are statical linked against klibc
 require kexec-tools.inc
 
-PR = "r3"
+PR = "r4"
 DEPENDS = "klibc"
 
 SRC_URI += "file://kexec-klibc.patch;patch=1"

More information about the Openembedded-commits mailing list