summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-09-18 17:58:33 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-09-24 16:24:44 +0000
commit32a5cba07cbc3efea4e2f8da40151b486a678d28 (patch)
treec2cf0ab14e1adf4f0fdcb54f1c5925c2595d83ea
parent3f197b63e5836db3c07e7130236d9eb3730c105b (diff)
Remove backported patchset after YP morty branch uprev
This change removes our bbappend for glibc_2.2 as poky incorporated such a change in the morty branch. This reverts https://gerrit.automotivelinux.org/gerrit/#/c/6339/ . Change-Id: Ib026b15f9700b591d1fae60b939568f4ddc6684e Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10959 Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org> ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
-rw-r--r--meta-agl/recipes-core/glibc/.appends.core0
-rw-r--r--meta-agl/recipes-core/glibc/glibc/arm/local-arm-futex.diff23
-rw-r--r--meta-agl/recipes-core/glibc/glibc_2.2%.bbappend3
3 files changed, 0 insertions, 26 deletions
diff --git a/meta-agl/recipes-core/glibc/.appends.core b/meta-agl/recipes-core/glibc/.appends.core
deleted file mode 100644
index e69de29bb..000000000
--- a/meta-agl/recipes-core/glibc/.appends.core
+++ /dev/null
diff --git a/meta-agl/recipes-core/glibc/glibc/arm/local-arm-futex.diff b/meta-agl/recipes-core/glibc/glibc/arm/local-arm-futex.diff
deleted file mode 100644
index c6b9d53a1..000000000
--- a/meta-agl/recipes-core/glibc/glibc/arm/local-arm-futex.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Lie about futex_atomic_cmpxchg_inatomic kernel support.
- In past versions of glibc, we incorrectly assumed all ARM kernels
- in all configurations supported futex_atomic_cmpxchg_inatomic. This
- was clearly a lie, however it was a lie that we relied on, because
- the fallback implementation appears to not play nicely with certain
- applications like pulseaudio. Restore the lie for kernels > 2.6.32
- and plug our ears and scream "LA LA LA" about how wrong this is.
-Author: Adam Conrad <adconrad@ubuntu.com>
-Bug-Ubuntu: https://launchpad.net/bugs/1436162
-Bug-Debian: https://bugs.debian.org/788799
-Last-Update: 2015-03-25
-
---- a/sysdeps/unix/sysv/linux/arm/kernel-features.h
-+++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h
-@@ -22,7 +22,7 @@
- /* The ARM kernel before 3.14.3 may or may not support
- futex_atomic_cmpxchg_inatomic, depending on kernel
- configuration. */
--#if __LINUX_KERNEL_VERSION < 0x030E03
-+#if __LINUX_KERNEL_VERSION < 0x020620
- # undef __ASSUME_REQUEUE_PI
- # undef __ASSUME_SET_ROBUST_LIST
- #endif
diff --git a/meta-agl/recipes-core/glibc/glibc_2.2%.bbappend b/meta-agl/recipes-core/glibc/glibc_2.2%.bbappend
deleted file mode 100644
index 0868a2c7d..000000000
--- a/meta-agl/recipes-core/glibc/glibc_2.2%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI_append_arm = " file://arm/local-arm-futex.diff "