linux-yocto: consolidated pull request

linux kernel commit 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)] added ptrace_peeksiginfo_args to the exported kernel user api.

This leads to build errors such as:

| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:
| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args'
|  struct ptrace_peeksiginfo_args {
|         ^
| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,
|                  from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:
| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8: note: originally defined here
|  struct ptrace_peeksiginfo_args
|         ^
| make[2]: *** [process.o] Error 1

In files that include both the eglibc sys/ptrace.h and the linux kernel exported one.

We can avoid this by making the eglibc variant only declare its structure if PTRACE_PEEKSIGINFO has not been defined.

Signed-off-by Bruce Ashfield <[email protected]>

---
  ...ect-ptrace_peeksiginfo_args-from-redefint.patch |   55 ++++++++++++++++++++
  meta/recipes-core/eglibc/eglibc_2.18.bb            |    1 +
  2 files changed, 56 insertions(+)

create mode 100644 meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +16 -0

new file mode 100644
index 0000000..edf10fb
@@ -0,0 +1,55 @@
+From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <[email protected]>
+Date: Sat, 24 Aug 2013 23:51:06 -0400
+Subject: [PATCH] ptrace: protect ptrace_peeksiginfo_args from redefintion
+
+linux kernel commit 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)]
+added ptrace_peeksiginfo_args to the exported kernel user api.
+
+This leads to build errors such as:
+
+| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:
+| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args'
+|  struct ptrace_peeksiginfo_args {
+|         ^
+| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,
+|                  from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +29 -0

+
+Signed-off-by: Bruce Ashfield <[email protected]>
+---
+ libc/sysdeps/unix/sysv/linux/sys/ptrace.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h
+index 2b78565..7800d9a 100644
+--- a/sysdeps/unix/sysv/linux/sys/ptrace.h
++++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
+@@ -187,6 +187,7 @@ enum __ptrace_eventcodes
+   PTRAVE_EVENT_SECCOMP  = 7
+ };
+
++#ifndef PTRACE_PEEKSIGINFO
+ /* Arguments for PTRACE_PEEKSIGINFO.  */
+ struct ptrace_peeksiginfo_args
+ {
+@@ -194,6 +195,7 @@ struct ptrace_peeksiginfo_args
+   __uint32_t flags;	/* Flags for peeksiginfo.  */
+   __int32_t nr;		/* How many siginfos to take.  */
+ };
++#endif
+
+ enum __ptrace_peeksiginfo_flags
+ {
+--
+1.7.10.4
+

meta/recipes-core/eglibc/eglibc_2.18.bb +1 -0

index 17b651f..2257c21 100644
@@ -26,6 +26,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23
             file://tzselect-awk.patch \
             file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
             file://fix-tibetian-locales.patch \
+           file://0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch \
            "
  SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc"
  SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4"

kernel commit 24b9f5017 [[media] V4L: Remove deprecated image centering controls] removed the definitions of V4L2_CID_HCENTER and V4L2_CID_VCENTER after three years of depreciation.

The ioctl values are still free, and the case statement which processess them in v4l2 userspace falls through to the proper replacement. So in the short term, we can explicitly define them using the old absolute values, and everything will work.

Signed-off-by Bruce Ashfield <[email protected]>

---
  ...define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch |   45 ++++++++++++++++++++
  .../gstreamer/gst-plugins-good_0.10.31.bb          |    1 +
  2 files changed, 46 insertions(+)

create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch

meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch new file +3 -0

new file mode 100644
index 0000000..bd0de58
@@ -0,0 +1,45 @@
+From ccb01de8096a32d86d47b0d92ec3416c57ee4d25 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <[email protected]>
+Date: Thu, 22 Aug 2013 12:15:54 -0400

meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch new file +32 -0

+
+Signed-off-by: Bruce Ashfield <[email protected]>
+---
+ sys/v4l2/v4l2_calls.c |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
+index 309bfb6..3c64544 100644
+--- a/sys/v4l2/v4l2_calls.c
++++ b/sys/v4l2/v4l2_calls.c
+@@ -54,11 +54,16 @@
+ #include "gst/gst-i18n-plugin.h"
+
+ /* Those are ioctl calls */
++
++/* V4L2_CID_HCENTER has been removed from the mainline kernel, but
++   the ioctl space is still present. Since these values fall through
++   to their replacement, it is safe (in the short term) to re-use the
++    old values explictily */
+ #ifndef V4L2_CID_HCENTER
+-#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED
++#define V4L2_CID_HCENTER V4L2_CID_BASE+22
+ #endif
+ #ifndef V4L2_CID_VCENTER
+-#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED
++#define V4L2_CID_VCENTER V4L2_CID_BASE+23
+ #endif
+
+ GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
+--
+1.7.10.4
+

meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb +1 -0

index daffcf1..d18e155 100644
@@ -23,6 +23,7 @@ DEPENDS += "gst-plugins-base gconf cairo libpng zlib libid3tag flac \
  inherit gettext gconf
 
  SRC_URI += "file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch"
+SRC_URI += "file://0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch"
 
  EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcaca --disable-hal --without-check \
                   --disable-examples --disable-taglib"

Quoted 47 lines · Bruce Ashfield

kernel commit 24b9f5017 [[media] V4L: Remove deprecated image centering controls]
removed the definitions of V4L2_CID_HCENTER and V4L2_CID_VCENTER after three
years of depreciation.

The ioctl values are still free, and the case statement which processess them
in v4l2 userspace falls through to the proper replacement. So in the short
term, we can explicitly define them using the old absolute values, and everything
will work.

Signed-off-by Bruce Ashfield <[email protected]>

---
  ...define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch |   45
++++++++++++++++++++
  .../gstreamer/gst-plugins-good_0.10.31.bb          |    1 +
  2 files changed, 46 insertions(+)

create mode 100644
meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch

new file mode 100644
index 0000000..bd0de58
--- /dev/null
+++
b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch

meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch new file +4 -0

@@ -0,0 +1,45 @@
+From ccb01de8096a32d86d47b0d92ec3416c57ee4d25 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <[email protected]>
+Date: Thu, 22 Aug 2013 12:15:54 -0400
+Subject: [PATCH] v4l2_calls: define V4L2_CID_HCENTER and

V4L2_CID_VCENTER

(quoted diff) +2 -0

+
+kernel commit 24b9f5017 [[media] V4L: Remove deprecated image

centering controls]
+removed the definitions of V4L2_CID_HCENTER and V4L2_CID_VCENTER after three

(quoted diff) +2 -0

+years of depreciation.
+

Quoted 7 lines

+The ioctl values are still free, and the case statement which processess them
+in v4l2 userspace falls through to the proper replacement. So in the short
+term, we can explicitly define them using the old absolute values, and everything
+will work.

Missing Upstream-Status.

Regards,
Jonathan

Quoted 48 lines

meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch new file +32 -0

+
+Signed-off-by: Bruce Ashfield <[email protected]>
+---
+ sys/v4l2/v4l2_calls.c |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
+index 309bfb6..3c64544 100644
+--- a/sys/v4l2/v4l2_calls.c
++++ b/sys/v4l2/v4l2_calls.c
+@@ -54,11 +54,16 @@
+ #include "gst/gst-i18n-plugin.h"
+
+ /* Those are ioctl calls */
++
++/* V4L2_CID_HCENTER has been removed from the mainline kernel, but
++   the ioctl space is still present. Since these values fall through
++   to their replacement, it is safe (in the short term) to re-use the
++    old values explictily */
+ #ifndef V4L2_CID_HCENTER
+-#define V4L2_CID_HCENTER V4L2_CID_HCENTER_DEPRECATED
++#define V4L2_CID_HCENTER V4L2_CID_BASE+22
+ #endif
+ #ifndef V4L2_CID_VCENTER
+-#define V4L2_CID_VCENTER V4L2_CID_VCENTER_DEPRECATED
++#define V4L2_CID_VCENTER V4L2_CID_BASE+23
+ #endif
+
+ GST_DEBUG_CATEGORY_EXTERN (v4l2_debug);
+--
+1.7.10.4
+

diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb index daffcf1..d18e155 100644

meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb +0 -0

@@ -23,6 +23,7 @@ DEPENDS += "gst-plugins-base gconf cairo libpng zlib
 libid3tag flac \
  inherit gettext gconf
  SRC_URI +=

"file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch" +SRC_URI += "file://0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch"
EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2

--disable-libcaca --disable-hal --without-check \
                   --disable-examples --disable-taglib"

Quoted 78 lines · Bruce Ashfield

linux kernel commit 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)]
added ptrace_peeksiginfo_args to the exported kernel user api.

This leads to build errors such as:

| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:
| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8:
error: redefinition of 'struct ptrace_peeksiginfo_args'

|  struct ptrace_peeksiginfo_args {
|         ^
| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,
| from
/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:
| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8:
note: originally defined here

|  struct ptrace_peeksiginfo_args
|         ^
| make[2]: *** [process.o] Error 1

In files that include both the eglibc sys/ptrace.h and the linux kernel exported
one.

We can avoid this by making the eglibc variant only declare its structure if PTRACE_PEEKSIGINFO
has not been defined.

Signed-off-by Bruce Ashfield <[email protected]>

---
  ...ect-ptrace_peeksiginfo_args-from-redefint.patch |   55
++++++++++++++++++++
  meta/recipes-core/eglibc/eglibc_2.18.bb            |    1 +
  2 files changed, 56 insertions(+)

create mode 100644
meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

diff --git a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file mode 100644
index 0000000..edf10fb
--- /dev/null
+++
b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +6 -0

@@ -0,0 +1,55 @@
+From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <[email protected]>
+Date: Sat, 24 Aug 2013 23:51:06 -0400
+Subject: [PATCH] ptrace: protect ptrace_peeksiginfo_args from redefintion
+
+linux kernel commit 84c751bd [ptrace: add ability to retrieve signals

without removing from a queue (v4)]

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +5 -0

+added ptrace_peeksiginfo_args to the exported kernel user api.
+
+This leads to build errors such as:
+
+| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:
+| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8:
error: redefinition of 'struct ptrace_peeksiginfo_args'

+|  struct ptrace_peeksiginfo_args {
+|         ^
+| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,
+| from
/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:
+| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8:
note: originally defined here

+|  struct ptrace_peeksiginfo_args
+|         ^
+| make[2]: *** [process.o] Error 1

(quoted diff) +2 -0

+
+In files that include both the eglibc sys/ptrace.h and the linux kernel

Quoted 6 lines

exported

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +3 -0

+one.
+
+We can avoid this by making the eglibc variant only declare its structure

if PTRACE_PEEKSIGINFO
+has not been defined.

Missing Upstream-Status.

Regards,
Jonathan

Quoted 39 lines

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +7 -0

+
+Signed-off-by: Bruce Ashfield <[email protected]>
+---
+ libc/sysdeps/unix/sysv/linux/sys/ptrace.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h

b/sysdeps/unix/sysv/linux/sys/ptrace.h

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +22 -0

+index 2b78565..7800d9a 100644
+--- a/sysdeps/unix/sysv/linux/sys/ptrace.h
++++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
+@@ -187,6 +187,7 @@ enum __ptrace_eventcodes
+   PTRAVE_EVENT_SECCOMP  = 7
+ };
+
++#ifndef PTRACE_PEEKSIGINFO
+ /* Arguments for PTRACE_PEEKSIGINFO.  */
+ struct ptrace_peeksiginfo_args
+ {
+@@ -194,6 +195,7 @@ struct ptrace_peeksiginfo_args
+   __uint32_t flags;   /* Flags for peeksiginfo.  */
+   __int32_t nr;               /* How many siginfos to take.  */
+ };
++#endif
+
+ enum __ptrace_peeksiginfo_flags
+ {
+--
+1.7.10.4
+

meta/recipes-core/eglibc/eglibc_2.18.bb +0 -0

index 17b651f..2257c21 100644
@@ -26,6 +26,7 @@ SRC_URI =

"http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23

             file://tzselect-awk.patch \

Quoted 8 lines

file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
             file://fix-tibetian-locales.patch \
+
file://0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch \
            "

SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc" SRC_URI[sha256sum] =
"15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4"

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

linux kernel commit 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)] added ptrace_peeksiginfo_args to the exported kernel user api.

This leads to build errors such as:

| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:
| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args'
|  struct ptrace_peeksiginfo_args {
|         ^
| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,
|                  from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:
| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8: note: originally defined here
|  struct ptrace_peeksiginfo_args
|         ^
| make[2]: *** [process.o] Error 1

In files that include both the eglibc sys/ptrace.h and the linux kernel exported one.

We can avoid this by making the eglibc variant only declare its structure if PTRACE_PEEKSIGINFO has not been defined.

Signed-off-by Bruce Ashfield <[email protected]>

---
 ...ect-ptrace_peeksiginfo_args-from-redefint.patch |   55 ++++++++++++++++++++
 meta/recipes-core/eglibc/eglibc_2.18.bb            |    1 +
 2 files changed, 56 insertions(+)
 create mode 100644 meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +55 -0

new file mode 100644
index 0000000..edf10fb
@@ -0,0 +1,55 @@
+From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <[email protected]>
+Date: Sat, 24 Aug 2013 23:51:06 -0400
+Subject: [PATCH] ptrace: protect ptrace_peeksiginfo_args from redefintion
+
+linux kernel commit 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)]
+added ptrace_peeksiginfo_args to the exported kernel user api.
+
+This leads to build errors such as:
+
+| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:
+| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args'
+|  struct ptrace_peeksiginfo_args {
+|         ^
+| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,
+|                  from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:
+| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8: note: originally defined here
+|  struct ptrace_peeksiginfo_args
+|         ^
+| make[2]: *** [process.o] Error 1
+
+In files that include both the eglibc sys/ptrace.h and the linux kernel exported
+one.
+
+We can avoid this by making the eglibc variant only declare its structure if PTRACE_PEEKSIGINFO
+has not been defined.
+
+Signed-off-by: Bruce Ashfield <[email protected]>
+---
+ libc/sysdeps/unix/sysv/linux/sys/ptrace.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h
+index 2b78565..7800d9a 100644
+--- a/sysdeps/unix/sysv/linux/sys/ptrace.h
++++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
+@@ -187,6 +187,7 @@ enum __ptrace_eventcodes
+   PTRAVE_EVENT_SECCOMP  = 7
+ };
+
++#ifndef PTRACE_PEEKSIGINFO
+ /* Arguments for PTRACE_PEEKSIGINFO.  */
+ struct ptrace_peeksiginfo_args
+ {
+@@ -194,6 +195,7 @@ struct ptrace_peeksiginfo_args
+   __uint32_t flags;   /* Flags for peeksiginfo.  */
+   __int32_t nr;               /* How many siginfos to take.  */
+ };
++#endif
+
+ enum __ptrace_peeksiginfo_flags
+ {
+--
+1.7.10.4
+

meta/recipes-core/eglibc/eglibc_2.18.bb +1 -1

index 17b651f..2257c21 100644
@@ -26,6 +26,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23
            file://tzselect-awk.patch \
            file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
            file://fix-tibetian-locales.patch \
+           file://0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch \
           "
 SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc"
 SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4"
--

1.7.10.4

Hi Bruce

Quoted 19 lines · Bruce Ashfield

linux kernel commit 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)] added ptrace_peeksiginfo_args to the exported kernel user api.

This leads to build errors such as:

| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:
| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args'
|  struct ptrace_peeksiginfo_args {
|         ^
| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,
|                  from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:
| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8: note: originally defined here
|  struct ptrace_peeksiginfo_args
|         ^
| make[2]: *** [process.o] Error 1

In files that include both the eglibc sys/ptrace.h and the linux kernel exported one.

Quoted 2 lines

We can avoid this by making the eglibc variant only declare its structure if PTRACE_PEEKSIGINFO has not been defined.

The problem is there however we need not fix it in eglibc thats wrong place to fix it. The right place to fix it is affected application which seems so mix glibc and kernel interfaces. It should try to not mix kernel and glibc interfaces. This patch as such is not appropriate.

Quoted 86 lines

Signed-off-by Bruce Ashfield <[email protected]>

---
  ...ect-ptrace_peeksiginfo_args-from-redefint.patch |   55 ++++++++++++++++++++
  meta/recipes-core/eglibc/eglibc_2.18.bb            |    1 +
  2 files changed, 56 insertions(+)

create mode 100644 meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +55 -0

new file mode 100644
index 0000000..edf10fb
@@ -0,0 +1,55 @@
+From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <[email protected]>
+Date: Sat, 24 Aug 2013 23:51:06 -0400
+Subject: [PATCH] ptrace: protect ptrace_peeksiginfo_args from redefintion
+
+linux kernel commit 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)]
+added ptrace_peeksiginfo_args to the exported kernel user api.
+
+This leads to build errors such as:
+
+| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:
+| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args'
+|  struct ptrace_peeksiginfo_args {
+|         ^
+| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,
+|                  from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:
+| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8: note: originally defined here
+|  struct ptrace_peeksiginfo_args
+|         ^
+| make[2]: *** [process.o] Error 1
+
+In files that include both the eglibc sys/ptrace.h and the linux kernel exported
+one.
+
+We can avoid this by making the eglibc variant only declare its structure if PTRACE_PEEKSIGINFO
+has not been defined.
+
+Signed-off-by: Bruce Ashfield <[email protected]>
+---
+ libc/sysdeps/unix/sysv/linux/sys/ptrace.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h
+index 2b78565..7800d9a 100644
+--- a/sysdeps/unix/sysv/linux/sys/ptrace.h
++++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
+@@ -187,6 +187,7 @@ enum __ptrace_eventcodes
+   PTRAVE_EVENT_SECCOMP  = 7
+ };
+
++#ifndef PTRACE_PEEKSIGINFO
+ /* Arguments for PTRACE_PEEKSIGINFO.  */
+ struct ptrace_peeksiginfo_args
+ {
+@@ -194,6 +195,7 @@ struct ptrace_peeksiginfo_args
+   __uint32_t flags;   /* Flags for peeksiginfo.  */
+   __int32_t nr;               /* How many siginfos to take.  */
+ };
++#endif
+
+ enum __ptrace_peeksiginfo_flags
+ {
+--
+1.7.10.4
+

meta/recipes-core/eglibc/eglibc_2.18.bb +1 -1

index 17b651f..2257c21 100644
@@ -26,6 +26,7 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23
             file://tzselect-awk.patch \
             file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
             file://fix-tibetian-locales.patch \
+           file://0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch \
            "
  SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc"
  SRC_URI[sha256sum] = "15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4"
--

1.7.10.4

Quoted 39 lines · Khem Raj

Hi Bruce

Quoted 34 lines · Bruce Ashfield

linux kernel commit 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)]
added ptrace_peeksiginfo_args to the exported kernel user api.

This leads to build errors such as:

| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:

| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8:
error: redefinition of 'struct ptrace_peeksiginfo_args'

|  struct ptrace_peeksiginfo_args {
|         ^
| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,

| from
/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:

| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8:
note: originally defined here

|  struct ptrace_peeksiginfo_args
|         ^
| make[2]: *** [process.o] Error 1

In files that include both the eglibc sys/ptrace.h and the linux kernel exported
one.

We can avoid this by making the eglibc variant only declare its structure if PTRACE_PEEKSIGINFO
has not been defined.

Quoted 5 lines

The problem is there however we need not fix it in eglibc thats wrong place to fix it. The right place to fix it is affected application which seems so mix glibc and kernel interfaces. It should try to not mix kernel and glibc interfaces. This patch as such is not appropriate.

My insistence is that this go in in the mean time, otherwise the 3.10

kernel headers miss the M4 cutoff and basically the whole release.

I'm certainly not going to have the time and cycles to fix individual applications, so our choices boil down to taking this change, rolling back to the 3.8 headers, or waiting for individual package maintainers to update their packages to work with the 3.10 headers.

I personally don't see the harm in this change, since these applications have always had this mix of both sys/ptrace.h and linux/ptrace.h in the past, now doesn't seem like the time to fix them.

Cheers,

Bruce

Quoted 114 lines

Quoted 114 lines

Signed-off-by Bruce Ashfield <[email protected]>

---
  ...ect-ptrace_peeksiginfo_args-from-redefint.patch |   55
++++++++++++++++++++
  meta/recipes-core/eglibc/eglibc_2.18.bb            |    1 +
  2 files changed, 56 insertions(+)

create mode 100644
meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

diff --git a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

new file mode 100644
index 0000000..edf10fb
--- /dev/null
+++
b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +4 -0

@@ -0,0 +1,55 @@
+From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <[email protected]>
+Date: Sat, 24 Aug 2013 23:51:06 -0400
+Subject: [PATCH] ptrace: protect ptrace_peeksiginfo_args from

redefintion

(quoted diff) +2 -0

+
+linux kernel commit 84c751bd [ptrace: add ability to retrieve

signals without removing from a queue (v4)]

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +5 -0

+added ptrace_peeksiginfo_args to the exported kernel user api.
+
+This leads to build errors such as:
+
+| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:

+| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8:
error: redefinition of 'struct ptrace_peeksiginfo_args'

+|  struct ptrace_peeksiginfo_args {
+|         ^
+| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,

+| from
/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:

+| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8:
note: originally defined here

+|  struct ptrace_peeksiginfo_args
+|         ^
+| make[2]: *** [process.o] Error 1

(quoted diff) +2 -0

+
+In files that include both the eglibc sys/ptrace.h and the linux

kernel exported

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +3 -0

+one.
+
+We can avoid this by making the eglibc variant only declare its

structure if PTRACE_PEEKSIGINFO

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +8 -0

+has not been defined.
+
+Signed-off-by: Bruce Ashfield <[email protected]>
+---
+ libc/sysdeps/unix/sysv/linux/sys/ptrace.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h

b/sysdeps/unix/sysv/linux/sys/ptrace.h

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +22 -0

+index 2b78565..7800d9a 100644
+--- a/sysdeps/unix/sysv/linux/sys/ptrace.h
++++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
+@@ -187,6 +187,7 @@ enum __ptrace_eventcodes
+   PTRAVE_EVENT_SECCOMP  = 7
+ };
+
++#ifndef PTRACE_PEEKSIGINFO
+ /* Arguments for PTRACE_PEEKSIGINFO.  */
+ struct ptrace_peeksiginfo_args
+ {
+@@ -194,6 +195,7 @@ struct ptrace_peeksiginfo_args
+   __uint32_t flags;   /* Flags for peeksiginfo.  */
+   __int32_t nr;               /* How many siginfos to take.  */
+ };
++#endif
+
+ enum __ptrace_peeksiginfo_flags
+ {
+--
+1.7.10.4
+

meta/recipes-core/eglibc/eglibc_2.18.bb +0 -0

index 17b651f..2257c21 100644
@@ -26,6 +26,7 @@ SRC_URI =

"http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23

             file://tzselect-awk.patch \

file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
             file://fix-tibetian-locales.patch \
+
file://0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch \
            "

SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc" SRC_URI[sha256sum] =
"15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4" --
1.7.10.4

With the introduction of the 3.10 linux-yocto tree, 3.4 being the previous LTSI kernel, and no reference BSPs using 3.8 as their reference BSP it 3.8 is no longer supported or required.

Signed-off-by Bruce Ashfield <[email protected]>

---
  meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb   |   30 --------------------
  meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb |   26 -----------------
  meta/recipes-kernel/linux/linux-yocto_3.8.bb      |   31 ---------------------
  3 files changed, 87 deletions(-)

delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.8.bb

meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb deleted +0 -30

deleted file mode 100644
index 647ace6..0000000
@@ -1,30 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-KBRANCH = "standard/preempt-rt/base"
-KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
-
-LINUX_VERSION ?= "3.8.13"
-LINUX_KERNEL_TYPE = "preempt-rt"
-
-KMETA = "meta"
-
-SRCREV_machine ?= "4fb187301ca153d496b2a96293dffde34d3b1a56"
-SRCREV_machine_qemuppc ?= "547c4ea570933ab7ece9f10d2c46875b460cd337"
-SRCREV_meta ?= "e7f42a416a60499db3771181357b29b3b3c424cc"
-
-PR = "${INC_PR}.1"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
-
-# Omit broken machines from COMPATIBLE_MACHINE
-#   qemuppc hangs at boot
-#   qemumips panics at boot
-COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)"
-
-# Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
-KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
-KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
-KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"

meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb deleted +0 -26

deleted file mode 100644
index 06d6b12..0000000
@@ -1,26 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-# We need lzma (as CONFIG_KERNEL_LZMA=y)
-DEPENDS += "xz-native"
-
-KBRANCH_DEFAULT = "standard/tiny/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
-LINUX_KERNEL_TYPE = "tiny"
-KCONFIG_MODE = "--allnoconfig"
-
-LINUX_VERSION ?= "3.8.13"
-
-KMETA = "meta"
-
-SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_meta ?= "e7f42a416a60499db3771181357b29b3b3c424cc"
-
-PR = "${INC_PR}.1"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
-
-COMPATIBLE_MACHINE = "(qemux86)"
-
-# Functionality flags
-KERNEL_FEATURES = ""

meta/recipes-kernel/linux/linux-yocto_3.8.bb deleted +0 -31

deleted file mode 100644
index 790e3e3..0000000
@@ -1,31 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-KBRANCH_DEFAULT = "standard/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
-
-SRCREV_machine_qemuarm ?= "aa76cc28408376814752bd36fb0dcf0e25aa5ba3"
-SRCREV_machine_qemumips  ?= "aa0affda03c955678b26b2fb586f1d9505127871"
-SRCREV_machine_qemumips64 ?= "077bff22c9951db6b35470ba17b1df2f2a91fefb"
-SRCREV_machine_qemuppc ?= "698eada61d9385b42dd117858b943655b565084b"
-SRCREV_machine_qemux86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_machine_qemux86-64 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_meta ?= "e7f42a416a60499db3771181357b29b3b3c424cc"
-
-SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-
-LINUX_VERSION ?= "3.8.13"
-
-PR = "${INC_PR}.2"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-KMETA = "meta"
-
-COMPATIBLE_MACHINE = "qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"
-
-# Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
-KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
-KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
-KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}"

Quoted 5 lines · Bruce Ashfield

With the introduction of the 3.10 linux-yocto tree, 3.4 being the previous LTSI kernel, and no reference BSPs using 3.8 as their reference BSP it 3.8 is no longer supported or required.

This make both the atom-pc and new genericx86 BSP unbuildable since they are 3.8 based still.

Dropping this for now, also your meta-yocto-bsp added 3.10, but did not remove 3.8.bbappend further causing problems.

Sau!

Quoted 127 lines

Signed-off-by Bruce Ashfield <[email protected]>

---
  meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb   |   30
--------------------
  meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb |   26
-----------------
  meta/recipes-kernel/linux/linux-yocto_3.8.bb      |   31
---------------------
  3 files changed, 87 deletions(-)

delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.8.bb

meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb deleted +0 -18

deleted file mode 100644
index 647ace6..0000000
@@ -1,30 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-KBRANCH = "standard/preempt-rt/base"
-KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
-
-LINUX_VERSION ?= "3.8.13"
-LINUX_KERNEL_TYPE = "preempt-rt"
-
-KMETA = "meta"
-
-SRCREV_machine ?= "4fb187301ca153d496b2a96293dffde34d3b1a56"
-SRCREV_machine_qemuppc ?= "547c4ea570933ab7ece9f10d2c46875b460cd337"
-SRCREV_meta ?= "e7f42a416a60499db3771181357b29b3b3c424cc"
-
-PR = "${INC_PR}.1"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI =

"git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"

meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb deleted +0 -8

-
-# Omit broken machines from COMPATIBLE_MACHINE
-#   qemuppc hangs at boot
-#   qemumips panics at boot
-COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)"
-
-# Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc

features/taskstats/taskstats.scc"

meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb deleted +0 -4

-KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
-KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
-KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32",

" cfg/x32.scc", "" ,d)}"

meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb deleted +0 -21

deleted file mode 100644
index 06d6b12..0000000
@@ -1,26 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-# We need lzma (as CONFIG_KERNEL_LZMA=y)
-DEPENDS += "xz-native"
-
-KBRANCH_DEFAULT = "standard/tiny/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
-LINUX_KERNEL_TYPE = "tiny"
-KCONFIG_MODE = "--allnoconfig"
-
-LINUX_VERSION ?= "3.8.13"
-
-KMETA = "meta"
-
-SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_meta ?= "e7f42a416a60499db3771181357b29b3b3c424cc"
-
-PR = "${INC_PR}.1"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI =

"git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"

meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb deleted +0 -5

-
-COMPATIBLE_MACHINE = "(qemux86)"
-
-# Functionality flags
-KERNEL_FEATURES = ""

meta/recipes-kernel/linux/linux-yocto_3.8.bb deleted +0 -15

deleted file mode 100644
index 790e3e3..0000000
@@ -1,31 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-KBRANCH_DEFAULT = "standard/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
-
-SRCREV_machine_qemuarm ?= "aa76cc28408376814752bd36fb0dcf0e25aa5ba3"
-SRCREV_machine_qemumips  ?= "aa0affda03c955678b26b2fb586f1d9505127871"
-SRCREV_machine_qemumips64 ?= "077bff22c9951db6b35470ba17b1df2f2a91fefb"
-SRCREV_machine_qemuppc ?= "698eada61d9385b42dd117858b943655b565084b"
-SRCREV_machine_qemux86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_machine_qemux86-64 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_meta ?= "e7f42a416a60499db3771181357b29b3b3c424cc"
-
-SRC_URI =

"git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

meta/recipes-kernel/linux/linux-yocto_3.8.bb deleted +0 -9

-
-LINUX_VERSION ?= "3.8.13"
-
-PR = "${INC_PR}.2"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-KMETA = "meta"
-
-COMPATIBLE_MACHINE =

"qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"

meta/recipes-kernel/linux/linux-yocto_3.8.bb deleted +0 -7

-
-# Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
-KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
-KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
-KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32",

Quoted 2 lines

" cfg/x32.scc", "" ,d)}"

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Quoted 54 lines · Bruce Ashfield

Quoted 50 lines · Khem Raj

Hi Bruce

Quoted 31 lines · Bruce Ashfield

linux kernel commit 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)]
added ptrace_peeksiginfo_args to the exported kernel user api.

This leads to build errors such as:

| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:

| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8:
error: redefinition of 'struct ptrace_peeksiginfo_args'

|  struct ptrace_peeksiginfo_args {
|         ^
| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,

| from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:

| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8:
note: originally defined here

|  struct ptrace_peeksiginfo_args
|         ^
| make[2]: *** [process.o] Error 1

Quoted 7 lines

In files that include both the eglibc sys/ptrace.h and the linux kernel exported
one.

We can avoid this by making the eglibc variant only declare its structure if PTRACE_PEEKSIGINFO
has not been defined.

The problem is there however we need not fix it in eglibc thats wrong place to fix it. The right place to fix it is affected application which seems so mix glibc and kernel interfaces. It should try to not mix kernel and glibc interfaces. This patch as such is not appropriate.

Quoted 1 line

My insistence is that this go in in the mean time, otherwise the 3.10

s/insistence/suggestion/

That came out a bit to strong! :)

Bruce

Quoted 126 lines

kernel headers miss the M4 cutoff and basically the whole release.

I'm certainly not going to have the time and cycles to fix individual applications, so our choices boil down to taking this change, rolling back to the 3.8 headers, or waiting for individual package maintainers to update their packages to work with the 3.10 headers.

I personally don't see the harm in this change, since these applications have always had this mix of both sys/ptrace.h and linux/ptrace.h in the past, now doesn't seem like the time to fix them.

Cheers,

Bruce

Quoted 110 lines

Quoted 110 lines

Signed-off-by Bruce Ashfield <[email protected]>

---
  ...ect-ptrace_peeksiginfo_args-from-redefint.patch |   55
++++++++++++++++++++
  meta/recipes-core/eglibc/eglibc_2.18.bb            |    1 +
  2 files changed, 56 insertions(+)

create mode 100644

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

diff --git

a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

new file mode 100644
index 0000000..edf10fb
--- /dev/null
+++

b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +4 -0

@@ -0,0 +1,55 @@
+From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <[email protected]>
+Date: Sat, 24 Aug 2013 23:51:06 -0400
+Subject: [PATCH] ptrace: protect ptrace_peeksiginfo_args from

redefintion

(quoted diff) +2 -0

+
+linux kernel commit 84c751bd [ptrace: add ability to retrieve

signals without removing from a queue (v4)]

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +5 -0

+added ptrace_peeksiginfo_args to the exported kernel user api.
+
+This leads to build errors such as:
+
+| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:

+| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8:
error: redefinition of 'struct ptrace_peeksiginfo_args'

+|  struct ptrace_peeksiginfo_args {
+|         ^
+| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,

+| from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:

+| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8:
note: originally defined here

+|  struct ptrace_peeksiginfo_args
+|         ^
+| make[2]: *** [process.o] Error 1

(quoted diff) +2 -0

+
+In files that include both the eglibc sys/ptrace.h and the linux

kernel exported

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +3 -0

+one.
+
+We can avoid this by making the eglibc variant only declare its

structure if PTRACE_PEEKSIGINFO

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +8 -0

+has not been defined.
+
+Signed-off-by: Bruce Ashfield <[email protected]>
+---
+ libc/sysdeps/unix/sysv/linux/sys/ptrace.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h

b/sysdeps/unix/sysv/linux/sys/ptrace.h

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +22 -0

+index 2b78565..7800d9a 100644
+--- a/sysdeps/unix/sysv/linux/sys/ptrace.h
++++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
+@@ -187,6 +187,7 @@ enum __ptrace_eventcodes
+   PTRAVE_EVENT_SECCOMP  = 7
+ };
+
++#ifndef PTRACE_PEEKSIGINFO
+ /* Arguments for PTRACE_PEEKSIGINFO.  */
+ struct ptrace_peeksiginfo_args
+ {
+@@ -194,6 +195,7 @@ struct ptrace_peeksiginfo_args
+   __uint32_t flags;   /* Flags for peeksiginfo.  */
+   __int32_t nr;               /* How many siginfos to take.  */
+ };
++#endif
+
+ enum __ptrace_peeksiginfo_flags
+ {
+--
+1.7.10.4
+

meta/recipes-core/eglibc/eglibc_2.18.bb +0 -0

index 17b651f..2257c21 100644
@@ -26,6 +26,7 @@ SRC_URI =

"http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23

             file://tzselect-awk.patch \

Quoted 12 lines

Quoted 11 lines

Quoted 11 lines

file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
             file://fix-tibetian-locales.patch \
+
file://0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch \
            "

SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc" SRC_URI[sha256sum] =
"15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4" --
1.7.10.4

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Quoted 58 lines · Bruce Ashfield

Quoted 55 lines · Bruce Ashfield

Quoted 45 lines · Khem Raj

Hi Bruce

Quoted 31 lines · Bruce Ashfield

linux kernel commit 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)]
added ptrace_peeksiginfo_args to the exported kernel user api.

This leads to build errors such as:

| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:

| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8:
error: redefinition of 'struct ptrace_peeksiginfo_args'

|  struct ptrace_peeksiginfo_args {
|         ^
| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,

| from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:

| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8:
note: originally defined here

|  struct ptrace_peeksiginfo_args
|         ^
| make[2]: *** [process.o] Error 1

Quoted 7 lines

In files that include both the eglibc sys/ptrace.h and the linux kernel exported
one.

We can avoid this by making the eglibc variant only declare its structure if PTRACE_PEEKSIGINFO
has not been defined.

Quoted 5 lines

The problem is there however we need not fix it in eglibc thats wrong place to fix it. The right place to fix it is affected application which seems so mix glibc and kernel interfaces. It should try to not mix kernel and glibc interfaces. This patch as such is not appropriate.

My insistence is that this go in in the mean time, otherwise the 3.10

Quoted 3 lines

s/insistence/suggestion/

That came out a bit to strong! :)

... and I should point out that the fix I have in this patch also requires a particular
include order. So by all definitions .. it is temporary!

Bruce

Quoted 143 lines

Bruce

Quoted 126 lines

kernel headers miss the M4 cutoff and basically the whole release.

I'm certainly not going to have the time and cycles to fix individual applications, so our choices boil down to taking this change, rolling back to the 3.8 headers, or waiting for individual package maintainers to update their packages to work with the 3.10 headers.

I personally don't see the harm in this change, since these applications have always had this mix of both sys/ptrace.h and linux/ptrace.h in the past, now doesn't seem like the time to fix them.

Cheers,

Bruce

Quoted 110 lines

Quoted 110 lines

Signed-off-by Bruce Ashfield <[email protected]>

---
  ...ect-ptrace_peeksiginfo_args-from-redefint.patch |   55
++++++++++++++++++++
  meta/recipes-core/eglibc/eglibc_2.18.bb            |    1 +
  2 files changed, 56 insertions(+)

create mode 100644

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

diff --git

a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

new file mode 100644
index 0000000..edf10fb
--- /dev/null
+++

b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +4 -0

@@ -0,0 +1,55 @@
+From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <[email protected]>
+Date: Sat, 24 Aug 2013 23:51:06 -0400
+Subject: [PATCH] ptrace: protect ptrace_peeksiginfo_args from

redefintion

(quoted diff) +2 -0

+
+linux kernel commit 84c751bd [ptrace: add ability to retrieve

signals without removing from a queue (v4)]

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +5 -0

+added ptrace_peeksiginfo_args to the exported kernel user api.
+
+This leads to build errors such as:
+
+| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:

+| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8:
error: redefinition of 'struct ptrace_peeksiginfo_args'

+|  struct ptrace_peeksiginfo_args {
+|         ^
+| In file included from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,

+| from

/poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:

+| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8:
note: originally defined here

+|  struct ptrace_peeksiginfo_args
+|         ^
+| make[2]: *** [process.o] Error 1

(quoted diff) +2 -0

+
+In files that include both the eglibc sys/ptrace.h and the linux

kernel exported

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +3 -0

+one.
+
+We can avoid this by making the eglibc variant only declare its

structure if PTRACE_PEEKSIGINFO

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +8 -0

+has not been defined.
+
+Signed-off-by: Bruce Ashfield <[email protected]>
+---
+ libc/sysdeps/unix/sysv/linux/sys/ptrace.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h

b/sysdeps/unix/sysv/linux/sys/ptrace.h

meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +22 -0

+index 2b78565..7800d9a 100644
+--- a/sysdeps/unix/sysv/linux/sys/ptrace.h
++++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
+@@ -187,6 +187,7 @@ enum __ptrace_eventcodes
+   PTRAVE_EVENT_SECCOMP  = 7
+ };
+
++#ifndef PTRACE_PEEKSIGINFO
+ /* Arguments for PTRACE_PEEKSIGINFO.  */
+ struct ptrace_peeksiginfo_args
+ {
+@@ -194,6 +195,7 @@ struct ptrace_peeksiginfo_args
+   __uint32_t flags;   /* Flags for peeksiginfo.  */
+   __int32_t nr;               /* How many siginfos to take.  */
+ };
++#endif
+
+ enum __ptrace_peeksiginfo_flags
+ {
+--
+1.7.10.4
+

meta/recipes-core/eglibc/eglibc_2.18.bb +0 -0

index 17b651f..2257c21 100644
@@ -26,6 +26,7 @@ SRC_URI =

"http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr23

             file://tzselect-awk.patch \

Quoted 12 lines

Quoted 11 lines

Quoted 11 lines

file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
             file://fix-tibetian-locales.patch \
+
file://0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch \
            "

SRC_URI[md5sum] = "b395b021422a027d89884992e91734fc" SRC_URI[sha256sum] =
"15f564b45dc5dd65faf0875579e3447961ae61e876933384ae05d19328539ad4" --
1.7.10.4

Quoted 4 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"

Quoted 8 lines · Saul Wold

Quoted 5 lines · Bruce Ashfield

With the introduction of the 3.10 linux-yocto tree, 3.4 being the previous LTSI kernel, and no reference BSPs using 3.8 as their reference BSP it 3.8 is no longer supported or required.

This make both the atom-pc and new genericx86 BSP unbuildable since they are 3.8 based still.

That was already discussed in detail. Darren was to follow up with changes for the genericx86 BSP to move to 3.10 .. it won't ever be supported on 3.8. Same with the atom-pc. It wasn't my change to make, so I don't have it in my series.

Everyone shall be warned, whether you drop that part of the change or not, the 3.8 kernel is no longer supported.

Cheers,

Bruce

Quoted 141 lines

Dropping this for now, also your meta-yocto-bsp added 3.10, but did not remove 3.8.bbappend further causing problems.

Sau!

Quoted 127 lines

Signed-off-by Bruce Ashfield <[email protected]>

---
   meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb   |   30
--------------------
   meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb |   26
-----------------
   meta/recipes-kernel/linux/linux-yocto_3.8.bb      |   31
---------------------
   3 files changed, 87 deletions(-)

delete mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb delete mode 100644 meta/recipes-kernel/linux/linux-yocto_3.8.bb

meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb deleted +0 -18

deleted file mode 100644
index 647ace6..0000000
@@ -1,30 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-KBRANCH = "standard/preempt-rt/base"
-KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
-
-LINUX_VERSION ?= "3.8.13"
-LINUX_KERNEL_TYPE = "preempt-rt"
-
-KMETA = "meta"
-
-SRCREV_machine ?= "4fb187301ca153d496b2a96293dffde34d3b1a56"
-SRCREV_machine_qemuppc ?= "547c4ea570933ab7ece9f10d2c46875b460cd337"
-SRCREV_meta ?= "e7f42a416a60499db3771181357b29b3b3c424cc"
-
-PR = "${INC_PR}.1"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI =

"git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"

meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb deleted +0 -8

-
-# Omit broken machines from COMPATIBLE_MACHINE
-#   qemuppc hangs at boot
-#   qemumips panics at boot
-COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm)"
-
-# Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc

features/taskstats/taskstats.scc"

meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb deleted +0 -4

-KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
-KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
-KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32",

" cfg/x32.scc", "" ,d)}"

meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb deleted +0 -21

deleted file mode 100644
index 06d6b12..0000000
@@ -1,26 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-# We need lzma (as CONFIG_KERNEL_LZMA=y)
-DEPENDS += "xz-native"
-
-KBRANCH_DEFAULT = "standard/tiny/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
-LINUX_KERNEL_TYPE = "tiny"
-KCONFIG_MODE = "--allnoconfig"
-
-LINUX_VERSION ?= "3.8.13"
-
-KMETA = "meta"
-
-SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_meta ?= "e7f42a416a60499db3771181357b29b3b3c424cc"
-
-PR = "${INC_PR}.1"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-SRC_URI =

"git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"

meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb deleted +0 -5

-
-COMPATIBLE_MACHINE = "(qemux86)"
-
-# Functionality flags
-KERNEL_FEATURES = ""

meta/recipes-kernel/linux/linux-yocto_3.8.bb deleted +0 -15

deleted file mode 100644
index 790e3e3..0000000
@@ -1,31 +0,0 @@
-require recipes-kernel/linux/linux-yocto.inc
-
-KBRANCH_DEFAULT = "standard/base"
-KBRANCH = "${KBRANCH_DEFAULT}"
-
-SRCREV_machine_qemuarm ?= "aa76cc28408376814752bd36fb0dcf0e25aa5ba3"
-SRCREV_machine_qemumips  ?= "aa0affda03c955678b26b2fb586f1d9505127871"
-SRCREV_machine_qemumips64 ?= "077bff22c9951db6b35470ba17b1df2f2a91fefb"
-SRCREV_machine_qemuppc ?= "698eada61d9385b42dd117858b943655b565084b"
-SRCREV_machine_qemux86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_machine_qemux86-64 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_meta ?= "e7f42a416a60499db3771181357b29b3b3c424cc"
-
-SRC_URI =

"git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"

meta/recipes-kernel/linux/linux-yocto_3.8.bb deleted +0 -9

-
-LINUX_VERSION ?= "3.8.13"
-
-PR = "${INC_PR}.2"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-
-KMETA = "meta"
-
-COMPATIBLE_MACHINE =

"qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64"

meta/recipes-kernel/linux/linux-yocto_3.8.bb deleted +0 -7

-
-# Functionality flags
-KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
-KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}"
-KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
-KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc"
-KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32",

Quoted 2 lines

" cfg/x32.scc", "" ,d)}"

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

A final (maybe .. hopefully!?) thought on this. Do drop this change, but give me a
few minutes to remove the offending structure from linux-libc-headers_3.10. That will also protect all users of yocto, regardless of the kernel unless they provide
their own libc-headers .. and then they are on their own :)

That leaves the c library alone, and should buy us time to fix the offending apps.

Quoted 7 lines · Bruce Ashfield

A final (maybe .. hopefully!?) thought on this. Do drop this change, but give me a
few minutes to remove the offending structure from linux-libc-headers_3.10. That will also protect all users of yocto, regardless of the kernel unless they provide
their own libc-headers .. and then they are on their own :)

Quoted 2 lines

That leaves the c library alone, and should buy us time to fix the offending apps.

this is not again the correct place to fix it. since you will back this out say later when all apps are fixed anyway. If we need to keep it I would rather have the app builds failing and keep it enabled and it should not be the guy who is doing the kernel headers upgrade to fix the whole ecosystem either. So add the headers by all means and leave the old headers in there until the apps work correctly with new headers.

Quoted 10 lines · Khem Raj

Quoted 7 lines · Bruce Ashfield

A final (maybe .. hopefully!?) thought on this. Do drop this change, but give me a
few minutes to remove the offending structure from linux-libc-headers_3.10. That will also protect all users of yocto, regardless of the kernel unless they provide
their own libc-headers .. and then they are on their own :)

Quoted 8 lines

Quoted 2 lines

That leaves the c library alone, and should buy us time to fix the offending apps.

this is not again the correct place to fix it. since you will back this out say later when all apps are fixed anyway. If we need to keep it I would rather have the app builds failing and keep it enabled and it should not be the guy who is doing the kernel headers upgrade to fix the whole ecosystem either. So add the headers by all means and leave the old headers in there until the apps work correctly with new headers.

Whether or not to allow the apps to break, that's a call for Saul and Richard. For
now, this fix works in all cases, and I'm able to build and boot with the 3.10 kernel and matching headers.

Given that we are about to hit the M4 freeze, I'd prefer this in now, and the apps
fixed later. We need to get mileage with the matching headers and kernel.

I think this is a good compromise for the time being, we've had far nastier hacks in
the libc-headers in the past.

Bruce

Signature · 2 lines

"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

Quoted 29 lines · Bruce Ashfield

Quoted 10 lines · Khem Raj

Quoted 7 lines · Bruce Ashfield

A final (maybe .. hopefully!?) thought on this. Do drop this change, but give me a
few minutes to remove the offending structure from linux-libc-headers_3.10. That will also protect all users of yocto, regardless of the kernel unless they provide
their own libc-headers .. and then they are on their own :)

Quoted 8 lines

Quoted 2 lines

That leaves the c library alone, and should buy us time to fix the offending apps.

this is not again the correct place to fix it. since you will back this out say later when all apps are fixed anyway. If we need to keep it I would rather have the app builds failing and keep it enabled and it should not be the guy who is doing the kernel headers upgrade to fix the whole ecosystem either. So add the headers by all means and leave the old headers in there until the apps work correctly with new headers.

Whether or not to allow the apps to break, that's a call for Saul and Richard. For
now, this fix works in all cases, and I'm able to build and boot with the 3.10 kernel and matching headers.

Given that we are about to hit the M4 freeze, I'd prefer this in now, and the apps
fixed later. We need to get mileage with the matching headers and kernel.

Quoted 3 lines

I think this is a good compromise for the time being, we've had far nastier hacks in
the libc-headers in the past.

It would make it harder to fix this problem in the app if we work is around this way :) while I see the your urgency of making 3.10 defaults. I don't think we should rush it but thats just me

Quoted 10 lines

Bruce

--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"