diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-07-16 01:10:01 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-07-16 01:10:01 +0200 |
| commit | 8ab88fbe02de8f7f241eb520aa990cb2e0e585fb (patch) | |
| tree | ed507e4ac20b4fbdb5683771e946b63c7218c9fc | |
| parent | 37f0dfb1669f41576cf1097847569b98242ab7bb (diff) | |
| parent | d95821c6675f9ea14b841ea130d06b75c0d3d289 (diff) | |
| download | openembedded-8ab88fbe02de8f7f241eb520aa990cb2e0e585fb.tar.gz | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
| -rw-r--r-- | recipes/eglibc/eglibc_2.9.bb | 3 | ||||
| -rw-r--r-- | recipes/eglibc/files/eglibc_adjust_begin_insertion.patch | 13 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig | 9 |
3 files changed, 18 insertions, 7 deletions
diff --git a/recipes/eglibc/eglibc_2.9.bb b/recipes/eglibc/eglibc_2.9.bb index b3786d3c1d..7ab481580a 100644 --- a/recipes/eglibc/eglibc_2.9.bb +++ b/recipes/eglibc/eglibc_2.9.bb @@ -4,11 +4,12 @@ DEPENDS += "gperf-native" DEFAULT_PREFERENCE = "1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.9" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SVN_REV="7430" EGLIBC_BRANCH="eglibc-2_9" SRC_URI = "svn://svn.eglibc.org/branches;module=eglibc-2_9;rev=${SVN_REV};proto=svn \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ + file://eglibc_adjust_begin_insertion.patch;patch=1 \ file://etc/ld.so.conf \ file://generate-supported.mk" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" diff --git a/recipes/eglibc/files/eglibc_adjust_begin_insertion.patch b/recipes/eglibc/files/eglibc_adjust_begin_insertion.patch new file mode 100644 index 0000000000..8f05cc0cab --- /dev/null +++ b/recipes/eglibc/files/eglibc_adjust_begin_insertion.patch @@ -0,0 +1,13 @@ +Index: libc/elf/Makefile +=================================================================== +--- libc.orig/elf/Makefile 2009-07-15 14:37:34.000000000 -0700 ++++ libc/elf/Makefile 2009-07-15 14:37:47.000000000 -0700 +@@ -305,7 +305,7 @@ + $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 | \ + LC_ALL=C \ + sed -e '/^=========/,/^=========/!d;/^=========/d' \ +- -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ ++ -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ + > $@.lds + $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ + $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \ diff --git a/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig index 4f6a96b35b..6665ec90ea 100644 --- a/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig +++ b/recipes/linux/linux-2.6.29+2.6.30-rc4/tx25/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.30-rc4 -# Wed Jul 15 22:10:40 2009 +# Wed Jul 15 23:22:41 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -469,7 +469,7 @@ CONFIG_MTD_CFI_I2=y # CONFIG_MTD_DOC2001 is not set # CONFIG_MTD_DOC2001PLUS is not set CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_VERIFY_WRITE=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set # CONFIG_MTD_NAND_ECC_SMC is not set # CONFIG_MTD_NAND_MUSEUM_IDS is not set # CONFIG_MTD_NAND_GPIO is not set @@ -809,10 +809,7 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_LOGO is not set # CONFIG_SOUND is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y |