From 32a5cba07cbc3efea4e2f8da40151b486a678d28 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Mon, 18 Sep 2017 17:58:33 +0200 Subject: Remove backported patchset after YP morty branch uprev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10959 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account --- meta-agl/recipes-core/glibc/.appends.core | 0 .../glibc/glibc/arm/local-arm-futex.diff | 23 ---------------------- meta-agl/recipes-core/glibc/glibc_2.2%.bbappend | 3 --- 3 files changed, 26 deletions(-) delete mode 100644 meta-agl/recipes-core/glibc/.appends.core delete mode 100644 meta-agl/recipes-core/glibc/glibc/arm/local-arm-futex.diff delete mode 100644 meta-agl/recipes-core/glibc/glibc_2.2%.bbappend 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 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 -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 " -- cgit 1.2.3-korg