diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-07-17 13:06:03 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-07-17 13:06:03 +0200 |
| commit | d67f86a2f06f6c63094fae8b24fa3bf27cda1e93 (patch) | |
| tree | 8d7ab734f77b802a1e4bd13dfae4eb522178c028 | |
| parent | df32848d8e59cfcda5b12d7949236384a74545db (diff) | |
| parent | 2935e29e404fd79c326f2095715fa24184c35a43 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
| -rw-r--r-- | recipes/binutils/binutils-2.18/binutils-section-in-segment.patch | 30 | ||||
| -rw-r--r-- | recipes/binutils/binutils_2.18.bb | 3 | ||||
| -rw-r--r-- | recipes/bluez/bluez4.inc | 3 |
3 files changed, 34 insertions, 2 deletions
diff --git a/recipes/binutils/binutils-2.18/binutils-section-in-segment.patch b/recipes/binutils/binutils-2.18/binutils-section-in-segment.patch new file mode 100644 index 0000000000..7e95b0a6dd --- /dev/null +++ b/recipes/binutils/binutils-2.18/binutils-section-in-segment.patch @@ -0,0 +1,30 @@ +2007-11-28 Nathan Sidwell <nathan@codesourcery.com> + + Issue #2297 + include/elf/ + * internal.h (ELF_IS_SECTION_IN_SEGMENT): Adjust to cope with + segments at the end of memory. + +Index: include/elf/internal.h +=================================================================== +--- include/elf/internal.h (revision 187336) ++++ include/elf/internal.h (working copy) +@@ -280,11 +280,12 @@ struct elf_segment_map + || ((bfd_vma) sec_hdr->sh_offset >= segment->p_offset \ + && (sec_hdr->sh_offset + ELF_SECTION_SIZE(sec_hdr, segment) \ + <= segment->p_offset + segment->p_filesz))) \ +- /* SHF_ALLOC sections must have VMAs within the segment. */ \ ++ /* SHF_ALLOC sections must have VMAs within the segment. Be \ ++ careful about segments right at the end of memory. */ \ + && ((sec_hdr->sh_flags & SHF_ALLOC) == 0 \ + || (sec_hdr->sh_addr >= segment->p_vaddr \ +- && (sec_hdr->sh_addr + ELF_SECTION_SIZE(sec_hdr, segment) \ +- <= segment->p_vaddr + segment->p_memsz)))) ++ && (sec_hdr->sh_addr - segment->p_vaddr \ ++ + ELF_SECTION_SIZE(sec_hdr, segment) <= segment->p_memsz)))) + + /* Decide if the given sec_hdr is in the given segment in file. */ + #define ELF_IS_SECTION_IN_SEGMENT_FILE(sec_hdr, segment) \ + +--------------040206010003050401040204-- + diff --git a/recipes/binutils/binutils_2.18.bb b/recipes/binutils/binutils_2.18.bb index 87214644db..159d97f981 100644 --- a/recipes/binutils/binutils_2.18.bb +++ b/recipes/binutils/binutils_2.18.bb @@ -1,4 +1,4 @@ -INC_PR = "r6" +INC_PR = "r7" PR = "${INC_PR}.1" require binutils.inc @@ -15,6 +15,7 @@ SRC_URI = "\ file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \ file://binutils-uclibc-gas-needs-libm.patch;patch=1 \ file://binutils-x86_64_i386_biarch.patch;patch=1 \ + file://binutils-section-in-segment.patch;patch=1;pnum=0 \ " # powerpc patches diff --git a/recipes/bluez/bluez4.inc b/recipes/bluez/bluez4.inc index d34cdb9d6b..431faf6152 100644 --- a/recipes/bluez/bluez4.inc +++ b/recipes/bluez/bluez4.inc @@ -4,10 +4,11 @@ PRIORITY = "optional" DEPENDS = "gst-plugins-base alsa-lib virtual/libusb0 dbus-glib" HOMEPAGE = "http://www.bluez.org" LICENSE = "GPL" -INC_PR = "r1" +INC_PR = "r2" # For angstrom we want this to replace at least bluez-libs PROVIDES_append_angstrom = " bluez-utils-dbus bluez-utils bluez-libs" +RPROVIDES_bluez4-dev_angstrom = "bluez-libs-dev" SRC_URI = "\ http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ |