linux-yocto: consolidated pull request
v2 cover linux-yocto: consolidated pull request
Richard/Saul,
I managed to find enough time to turn around some fixes ..
This series completely replaces the one that I had sent before. It fixes the two issues that Saul reported: a patch issue with the 3.8 arm BSPs and the ptrace.h related build failures from the 3.10 libc-headers
Changes since v1:
- Fixed the strace build issue with eglibc's ptrace and the kernel's ptrace conflicting
- Remove the linux-yocto-3.8 recipes, since the routerstation pro is
now bumped to 3.10.
- updated kern tools commit to fix the 3.8 patching issues
Take a special look at the eglibc patch. It does work, and passed a full build here. It also protects anyone using a new kernel, and not just linux-yocto users. I don't normally patch c libraries .. but I made an exception this time :)
Cheers,
Bruce
The original email follows:
-------------
Here's my consolidated set of changes that represent the biggest chunk of work for the Yocto 1.5 release. The obvious change is that the 3.10 kernel is now the latest linux-yocto kernel (and linux-yocto-dev will mark on). I've built and booted core-image-sato for all the oe-core qemu machines.
3.10 also the latest LTSI and will be updated with that content when it becomes available.
Other features of the 3.10 kernel include:
- refreshed -rt support
- refreshed yaffs2, aufs3
- cryptodev
- bfs, edf, and OCF staged features
- scrubbed and updated meta data for v3.10
- improved tools support for meta data updates and queue maintenance
- patch carry forward from all previous linux-yocto kernels and configuration.
I've also tested linux-yocto-rt and linux-yocto-tiny for the new, shiny tree.
I've also bumped the linux-libc-headers to 3.10 and have fixed gst-plugins-good to adapt to a changed #define in the exported headers.
Other parts of this update include an uprev of guilt, and in fact, a restoration of "normal" guil operations, since the kernel tree is now manipulated and maintained via a smaller, more contained script. This was necessary for both usability reasons and the fact that all of guilts protections were being removed for the kernel's use .. which makes you ask the quesetion "why use it". It was time for a change.
The patches are pretty self explanitory and all contain detailed long logs .. but the summary is:
[PATCH 1/5] kern-tools: usability, bug fixes and no guilt [PATCH 2/5] guilt: update to latest git version
[PATCH 3/5] linux-libc-headers: update to v3.10
[PATCH 4/5] gst-plugins-good: fix 3.10 libc-headers build failure [PATCH 5/5] linux-yocto: introduce v3.10
** There is one pending activity. As part of thsi update to 3.10, we want to move to the 3.4 and 3.10 kernel, dropping 3.8 support. But the routerstationpro BSP is still using it as its preferred version. I'm a one man show on this update, and I wasn't able to get the 100+ patches ported to 3.10 AND get this update out before the M4 cutoff.
** I'm still attempting to udpate all the reference boards, and once done, I'll send a follow up patch.
** Please test, I've done my best, but things can slip through. We'll work issues in the stabilization period.
Cheers,
Bruce
The following changes since commit b467b99a5d25efe5eadfb07dbecba608575256ac:
linux-yocto: switch genericx86 to use common-pc (2013-08-24 09:37:49 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
Bruce Ashfield (7):
kern-tools: usability, bug fixes and no guilt
guilt: update to latest git version
linux-libc-headers: update to v3.10
eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
gst-plugins-good: fix 3.10 libc-headers build failure
linux-yocto: introduce v3.10
linux-yocto: remove 3.8 recipes
meta/classes/kernel-yocto.bbclass | 2 +
meta/conf/distro/include/tcmode-default.inc | 2 +-
...ect-ptrace_peeksiginfo_args-from-redefint.patch | 55 ++++
meta/recipes-core/eglibc/eglibc_2.18.bb | 1 +
.../guilt/files/guilt-import-commit.patch | 96 ------
meta/recipes-devtools/guilt/files/guilt-init.patch | 25 --
meta/recipes-devtools/guilt/files/guilt-pop.patch | 73 -----
.../guilt/files/guilt-push-no-series.patch | 29 --
meta/recipes-devtools/guilt/files/guilt-push.patch | 42 ---
.../guilt/files/guilt-set-git_exec_path.patch | 29 --
...lt-update-supported-git-versions-to-1.8.x.patch | 28 --
meta/recipes-devtools/guilt/files/guilt.patch | 319 --------------------
.../guilt/files/improve_auto_header_gen.patch | 71 -----
.../files/make_git_commands_conditional.patch | 48 ---
.../guilt/files/optional_head_check.patch | 60 ----
.../guilt/files/uninstall_force.patch | 14 -
.../{guilt-native_0.33.bb => guilt-native_git.bb} | 21 +-
.../kern-tools/kern-tools-native_git.bb | 6 +-
.../linux-libc-headers/linux-libc-headers_3.10.bb | 7 +
.../linux-libc-headers/linux-libc-headers_3.8.bb | 8 -
...inux-yocto-rt_3.8.bb => linux-yocto-rt_3.10.bb} | 16 +-
...-yocto-tiny_3.8.bb => linux-yocto-tiny_3.10.bb} | 9 +-
.../{linux-yocto_3.8.bb => linux-yocto_3.10.bb} | 21 +-
...define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch | 45 +++
.../gstreamer/gst-plugins-good_0.10.31.bb | 1 +
25 files changed, 143 insertions(+), 885 deletions(-)
create mode 100644 meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-import-commit.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-init.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-pop.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-push-no-series.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-push.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-set-git_exec_path.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt.patch
delete mode 100644 meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch
delete mode 100644 meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch
delete mode 100644 meta/recipes-devtools/guilt/files/optional_head_check.patch
delete mode 100644 meta/recipes-devtools/guilt/files/uninstall_force.patch
rename meta/recipes-devtools/guilt/{guilt-native_0.33.bb => guilt-native_git.bb} (45%)
create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.8.bb
rename meta/recipes-kernel/linux/{linux-yocto-rt_3.8.bb => linux-yocto-rt_3.10.bb} (68%)
rename meta/recipes-kernel/linux/{linux-yocto-tiny_3.8.bb => linux-yocto-tiny_3.10.bb} (56%)
rename meta/recipes-kernel/linux/{linux-yocto_3.8.bb => linux-yocto_3.10.bb} (45%)
create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patchSignature · 1 line
1.7.10.4
PATCH v2 1/7 kern-tools: usability, bug fixes and no guilt
Updating the kern-tools SRCREV to pick up the following fixes:
60a894e kgit-s2q: add proper commit ID handling for mixed am/apply usage 3b08257 kgit-s2q: delete pruning of path support.
c5868b4 kgit-s2q: Restore implicit exit status to "git apply" section 1bd00b9 kgit-scc: mask warnings from cleanup phase 5
bb75299 kgit-s2q: fix commit warp when running "git am --abort" ef9571b kgit-scc: cleanup git rebase-apply dir
fdb7d21 kgit-scc: ensure treegen stops if a meta series fails 008987b config: add kconfig cleaning options
69ff569 kgit-s2q: strip blank lines and comments
e7b4540 kgit-init: disable garbage collection on a new tree 417eaed kgit-s2q: delete old LTSI patch dir finding code 21f2200 kgit-scc: better error checking on resume
ad5084c kern-tools: use .meta as meta data container
1deb5d8 kgit-meta: don't push patches without a series file eb431a1 kgit-s2q: aid patch reject resolution via helper scripts f859c40 kgit-s2q: only use patch annotations when explicitly asked 333ae18 kgit: speed patch application by batching patches bf6991d kgit: teach tools about non-default meta dirs bcfc712 kgit-s2q: usability improvements
cb28803 kgit-s2q: fix patch prefix stripping.
37f40e1 kgit-s2q: warn/exit with error if patch not in series f4704d2 kgit-s2q: consistent rm usage
e11819c kgit-s2q: standardize on use of git mailinfo
36a5eda kgit: remove guilt dependency
c461a4f spp/scc: export mark commands to meta-series
5311162 updateme: ensure that generated features are only used once 4f7a263 kgit-checkpoint: clear .gitignore for meta branch 21ee6f2 updateme: enforce a matching machine
b08749d kgit-scc: remove -meta files after consruction
These are bug fixes, usability changes as well as the removal of the guilt dependency. During the uprev of the guilt package, the amount of circumvention of the typical guilt workflow and checks meant that using it as a series -> branch manager was no longer appropriate. As a result a new tools kgit-s2q (series 2 queue) was created based on git-quiltimport, git am, and the LTSI tree generation scripts.
The result is better series to branch validation, faster application and a simpler management model. This tool is backwards compatible with any tree previously constructed with guilt. We are now "guilt free"
--- meta/classes/kernel-yocto.bbclass | 2 ++ meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-)
meta/classes/kernel-yocto.bbclass +2 -0
@@ -262,6 +262,8 @@ python do_kernel_configcheck() { # set the default to 'meta'. Otherwise, kconf_check is not passed a valid # meta-series for processing kmeta = d.getVar( "KMETA", True ) or "meta" + if not os.path.exists(kmeta): + kmeta = "." + kmeta pathprefix = "export PATH=%s:%s; " % (d.getVar('PATH', True), "${S}/scripts/util/") cmd = d.expand("cd ${S}; kconf_check -config- %s/meta-series ${S} ${B}" % kmeta)
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +3 -3
@@ -2,11 +2,11 @@ DESCRIPTION = "Scripts and utilities for managing Yocto branched kernels." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70cd5f52972f8884b80743d" -DEPENDS = "git-native guilt-native" +DEPENDS = "git-native" -SRCREV = "fbcdcb8e23c38352b46235598f34d7b345f458f1" +SRCREV = "b5d6ae0f6bae16fedce15c0c9040912335783589" PR = "r12" -PV = "0.1+git${SRCPV}" +PV = "0.2+git${SRCPV}" inherit native
Signature · 1 line
1.7.10.4
PATCH v2 2/7 guilt: update to latest git version
In reply to Bruce AshfieldUprev guilt to the latest guilt version from its upstream repository. As part of the uprev all of the previous changes required for the yocto kernel tools to use git to manipulate series files have been dropped. These changes were specific to circumventing parts of guilt's internal santiy checking to allow specific Yocto kernel manipluation of sub-series files.
Since the kernel tools no longer need guilt, we can use an up to date and nearly pure upstream version of guilt.
---
.../guilt/files/guilt-import-commit.patch | 96 ------
meta/recipes-devtools/guilt/files/guilt-init.patch | 25 --
meta/recipes-devtools/guilt/files/guilt-pop.patch | 73 -----
.../guilt/files/guilt-push-no-series.patch | 29 --
meta/recipes-devtools/guilt/files/guilt-push.patch | 42 ---
.../guilt/files/guilt-set-git_exec_path.patch | 29 --
...lt-update-supported-git-versions-to-1.8.x.patch | 28 --
meta/recipes-devtools/guilt/files/guilt.patch | 319 --------------------
.../guilt/files/improve_auto_header_gen.patch | 71 -----
.../files/make_git_commands_conditional.patch | 48 ---
.../guilt/files/optional_head_check.patch | 60 ----
.../guilt/files/uninstall_force.patch | 14 -
.../{guilt-native_0.33.bb => guilt-native_git.bb} | 21 +-
13 files changed, 6 insertions(+), 849 deletions(-)
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-import-commit.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-init.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-pop.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-push-no-series.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-push.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-set-git_exec_path.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch
delete mode 100644 meta/recipes-devtools/guilt/files/guilt.patch
delete mode 100644 meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch
delete mode 100644 meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch
delete mode 100644 meta/recipes-devtools/guilt/files/optional_head_check.patch
delete mode 100644 meta/recipes-devtools/guilt/files/uninstall_force.patch
rename meta/recipes-devtools/guilt/{guilt-native_0.33.bb => guilt-native_git.bb} (45%)meta/recipes-devtools/guilt/files/guilt-import-commit.patch deleted +0 -96
@@ -1,96 +0,0 @@ -guilt: import commits via git format-patch - -Rather than attempting to process commits directly, it -is preferable to try dumping the change via git format-patch -to take advantage of the proper header/subject/from lines that -are generated. - -If patches cannot be exported, fall back to importing -commits via a more custom method. - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Bruce Ashfield <[email protected]> - ---- - guilt-import-commit | 40 +++++++++++++++++++++++++++++----------- - 1 file changed, 29 insertions(+), 11 deletions(-) - ---- a/guilt-import-commit -+++ b/guilt-import-commit -@@ -20,46 +20,64 @@ fi - disp "About to begin conversion..." >&2 - disp "Current head: `cat $GIT_DIR/refs/heads/$branch`" >&2 - -+# try git-format-patch first, if it fails fall back to internal -+# methods. -+patches=`git-format-patch -o $GUILT_DIR/$branch $rhash` -+if [ -z "$patches" ]; then -+ need_custom_patches="1" -+fi -+ - for rev in `git rev-list $rhash`; do -+ if [ ! -z "$need_custom_patches" ]; then - s=`git log --pretty=oneline -1 $rev | cut -c 42-` - - fname=`echo $s | sed -e "s/&/and/g" -e "s/[ :]/_/g" -e "s,[/\\],-,g" \ -- -e "s/['\\[{}]//g" -e 's/]//g' -e 's/\*/-/g' \ -+ -e "s/['\\()<>[{}]//g" -e 's/]//g' -e 's/\*/-/g' \ - -e 's/\?/-/g' | tr A-Z a-z` - -- disp "Converting `echo $rev | cut -c 1-8` as $fname" -+ disp "Converting `echo $rev | cut -c 1-8` as $fname.patch" - - mangle_prefix=1 - fname_base=$fname -- while [ -f "$GUILT_DIR/$branch/$fname" ]; do -+ while [ -f "$GUILT_DIR/$branch/$fname.patch" ]; do - fname="$fname_base-$mangle_prefix" - mangle_prefix=`expr $mangle_prefix + 1` -- disp "Patch under that name exists...trying '$fname'" -+ disp "Patch under that name exists...trying '$fname.patch'" - done - - ( - do_make_header $rev - echo "" - git diff --binary $rev^..$rev -- ) > $GUILT_DIR/$branch/$fname -+ ) > $GUILT_DIR/$branch/$fname.patch - - # FIXME: grab the GIT_AUTHOR_DATE from the commit object and set the - # timestamp on the patch - -- # insert the patch name into the series file -- series_insert_patch $fname -+ patches="$patches $fname.patch" -+ fi - -- # Only reset if the commit was on this branch -- if head_check $rev 2> /dev/null; then -+ # Only reset if the commit was on this branch -+ if head_check $rev 2> /dev/null; then - # BEWARE: "git reset" ahead! Is there a way to verify that - # we really created a patch? - We don't want to lose any - # history. - git reset --hard $rev^ > /dev/null -- elif [ -z "$warned" ]; then -+ elif [ -z "$warned" ]; then - disp "Warning: commit $rev is not the HEAD...preserving commit" >&2 - disp "Warning: (this message is displayed only once)" >&2 - warned=t -- fi -+ fi -+done -+ -+rpatches=`echo "$patches" | sed 's% %\n%g' | tac` -+for patch in $rpatches; do -+ -+ iname=`echo $patch | sed s%$GUILT_DIR/$branch/%%` -+ echo "Inserting $iname" -+ -+ # insert the patch name into the series file -+ series_insert_patch $iname - done - - disp "Done." >&2
meta/recipes-devtools/guilt/files/guilt-init.patch deleted +0 -25
@@ -1,25 +0,0 @@ -guilt: allow previously initialized branches to be re-initialized - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Bruce Ashfield <[email protected]> - ---- - guilt-init | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/guilt-init -+++ b/guilt-init -@@ -20,9 +20,9 @@ while case $# in 0) break ;; esac; do - shift - done - --if [ -d "$GUILT_DIR/$branch" ]; then -- die "Branch $branch appears to be already initialized (GIT_DIR=$GIT_DIR)" --fi -+# if [ -d "$GUILT_DIR/$branch" ]; then -+# die "Branch $branch appears to be already initialized (GIT_DIR=$GIT_DIR)" -+# fi - - [ ! -d "$GUILT_DIR" ] && mkdir "$GUILT_DIR" - mkdir -p "$GUILT_DIR/$branch"
meta/recipes-devtools/guilt/files/guilt-pop.patch deleted +0 -73
73 lines not on this page · raw message
meta/recipes-devtools/guilt/files/guilt-push-no-series.patch deleted +0 -29
@@ -1,29 +0,0 @@ -guilt-push: Avoid duplicate hits in a series - -If a series file becomes mangled and a patch name appears in there -more than once, then the guilt-push will fail a horrible and -incomprehensible death. Make it fail in a sensible way. - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Paul Gortmaker <[email protected]> - ---- - - guilt-push | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/guilt-push -+++ b/guilt-push -@@ -90,6 +90,11 @@ else - if [ -z "$eidx" ]; then - die "Patch $patch is not in the series or is guarded." - fi -+ -+ matches=`echo $eidx | wc -w` -+ if [ $matches -gt 1 ]; then -+ die "Patch $patch is in the series multiple times" -+ fi - fi - - # make sure that there are no unapplied changes
meta/recipes-devtools/guilt/files/guilt-push.patch deleted +0 -42
42 lines not on this page · raw message
meta/recipes-devtools/guilt/files/guilt-set-git_exec_path.patch deleted +0 -29
@@ -1,29 +0,0 @@ -guilt: set GIT_EXEC_PATH in guilt wrapper - -git has the habit of tracking the directory where it was -installed. If you build git, relocate git and then remove -the old directory --exec-path will return that original -(now non-existent) directory. We insist that git and -guilt be in the same directory to ensure they are matched, -so we use the environment variable GIT_EXEC_PATH to -force the issue. - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Bruce Ashfield <[email protected]> - ---- - guilt | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/guilt -+++ b/guilt -@@ -23,6 +23,8 @@ esac - # we change directories ourselves - SUBDIRECTORY_OK=1 - -+export GIT_EXEC_PATH=`dirname $0`/../libexec/git-core -+ - if [ -z "$DO_NOT_USE_GITREPO_COMMANDS" ]; then - . "$(git --exec-path)/git-sh-setup" - fi
meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From d7fb5d4e159071b6255181fcf436300038fe9e6c Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <[email protected]> -Date: Wed, 16 Jan 2013 20:48:11 -0500 -Subject: [PATCH] guilt: update supported git versions to 1.8.x - -guilt errors on the new 1.8.x git series, when it shouldn't, since -1.8.x works fine with the existing guilt version. - -Signed-off-by: Bruce Ashfield <[email protected]> ---- - guilt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/guilt b/guilt -index 346f929..6505653 100755 ---- a/guilt -+++ b/guilt -@@ -37,6 +37,7 @@ case "$gitver" in - 1.5.*) ;; # git config - 1.6.*) ;; # git config - 1.7.*) ;; # git config -+ 1.8.*) ;; # git config - *) die "Unsupported version of git ($gitver)" ;; - esac - --- -1.7.10.4 -
meta/recipes-devtools/guilt/files/guilt.patch deleted +0 -319
319 lines not on this page · raw message
meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch deleted +0 -71
71 lines not on this page · raw message
meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch deleted +0 -48
48 lines not on this page · raw message
meta/recipes-devtools/guilt/files/optional_head_check.patch deleted +0 -60
60 lines not on this page · raw message
meta/recipes-devtools/guilt/files/uninstall_force.patch deleted +0 -14
@@ -1,14 +0,0 @@ -guilt: force removal when uninstalling - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Bruce Ashfield <[email protected]> - ---- a/uninstall.orig -+++ b/uninstall -@@ -12,4 +12,4 @@ - - shift - --(cd $PRE; rm "$@") -+(cd $PRE; rm -f "$@")
meta/recipes-devtools/guilt/guilt-native_git.bb renamed from meta/recipes-devtools/guilt/guilt-native_0.33.bb +6 -15
@@ -3,24 +3,15 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b6f3400dc1a01cebafe8a52b3f344135" -PV = "0.33" -PR = "r4" - inherit native -SRC_URI = "http://ftp.de.debian.org/debian/pool/main/g/guilt/guilt_${PV}.orig.tar.gz\ - file://guilt-push.patch \ - file://guilt-pop.patch \ - file://guilt.patch \ - file://guilt-init.patch \ - file://guilt-import-commit.patch \ - file://uninstall_force.patch \ - file://guilt-push-no-series.patch \ - file://make_git_commands_conditional.patch \ - file://improve_auto_header_gen.patch \ +SRC_URI = "git://repo.or.cz/guilt.git \ file://guilt-bash.patch \ - file://guilt-update-supported-git-versions-to-1.8.x.patch \ - file://optional_head_check.patch" + " + +SRCREV="c2a5bae511c6d5354aa4e1cb59069c31df2b8eeb" + +S="${WORKDIR}/git" SRC_URI[md5sum] = "d800c5e0743d90543ef51d797a626e09" SRC_URI[sha256sum] = "64dfe6af1e924030f71163f3aa12cd846c80901d6ff8ef267ea35bb0752b4ba9"
Signature · 1 line
1.7.10.4
PATCH v2 3/7 linux-libc-headers: update to v3.10
In reply to Bruce AshfieldNow that the 3.10 kernel has been released we can bump the libc-headers to that version and remove the 3.8 variant. Userspace compatibility is maintained through kernel versions, we also make the single 3.10 version the toolchain default.
--- meta/conf/distro/include/tcmode-default.inc | 2 +- .../linux-libc-headers/linux-libc-headers_3.10.bb | 7 +++++++ .../linux-libc-headers/linux-libc-headers_3.8.bb | 8 -------- 3 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb delete mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.8.bb
meta/conf/distro/include/tcmode-default.inc +1 -1
@@ -22,7 +22,7 @@ SDKGCCVERSION ?= "${GCCVERSION}" BINUVERSION ?= "2.23.2" EGLIBCVERSION ?= "2.18" UCLIBCVERSION ?= "0.9.33+git%" -LINUXLIBCVERSION ?= "3.8" +LINUXLIBCVERSION ?= "3.10" PREFERRED_VERSION_gcc ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-cross ?= "${GCCVERSION}"
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb new file +7 -0
@@ -0,0 +1,7 @@ +require linux-libc-headers.inc + +PR = "r0" + +SRC_URI[md5sum] = "72d0a9b3e60cd86fabcd3f24b1708944" +SRC_URI[sha256sum] = "46c9e55e1fddf40813b8d697d5645037a8e2af5c1a8dff52b3fe82b5021582b8" +
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.8.bb deleted +0 -8
@@ -1,8 +0,0 @@ -require linux-libc-headers.inc - -SRC_URI += "file://scripts-Makefile.headersinst-install-headers-from-sc.patch" - -PR = "r0" - -SRC_URI[md5sum] = "fcd1d2e60e1033c935a13ef81c89ea2d" -SRC_URI[sha256sum] = "fce774b5313e73949cb35f128e91e7b2ccd7fa2438abc5cff69267e504395a45"
Signature · 1 line
1.7.10.4
PATCH v2 4/7 eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
In reply to Bruce Ashfieldlinux 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 1In 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.
--- ...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
@@ -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 -0
@@ -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"
Signature · 1 line
1.7.10.4
Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
Quoted 51 lines · Bruce Ashfield
linux kernel commit
84c751bd[ptrace: add ability to retrieve signals without removing from a queue (v4)] addedptrace_peeksiginfo_argsto 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 1In files that include both the eglibc
sys/ptrace.hand the linux kernel exported one.We can avoid this by making the eglibc variant only declare its structure if
PTRACE_PEEKSIGINFOhas 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.patchmeta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +16
-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)] +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 line 26
Quoted 10 lines
meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +10
-0+| /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.
Missing Upstream-Status.
Regards,
Jonathan
Quoted 41 lines
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@@ -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"
Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
Quoted 79 lines · Jonathan Liu
Quoted 78 lines · Bruce Ashfield
linux kernel commit
84c751bd[ptrace: add ability to retrieve signals without removing from a queue (v4)]
addedptrace_peeksiginfo_argsto 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 'structptrace_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 1In files that include both the eglibc
sys/ptrace.hand 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.patchdiff --git
a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patchb/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patchnew file mode 100644
index 0000000..edf10fb
---/dev/null
+++b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patchmeta/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 signalswithout 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 'structptrace_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 8 lines
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 structureif
PTRACE_PEEKSIGINFO
+has not been defined.Missing Upstream-Status.
Thanks for the double check, but I'm not the one to tag this with an upstream status. My opinion on the applicability of this to eglibc is largely irrelevant.
Cheers,
Bruce
Quoted 57 lines
Regards,
JonathanQuoted 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.hmeta/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@@ -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
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
In reply to Bruce AshfieldHi Bruce
Quoted 16 lines · Bruce Ashfield
linux kernel commit
84c751bd[ptrace: add ability to retrieve signals without removing from a queue (v4)] addedptrace_peeksiginfo_argsto 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 5 lines
In files that include both the eglibc
sys/ptrace.hand the linux kernel exported one.We can avoid this by making the eglibc variant only declare its structure if
PTRACE_PEEKSIGINFOhas 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 84 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.patchmeta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +55
-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)] +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@@ -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
Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
Quoted 23 lines · Khem Raj
Hi Bruce
Quoted 19 lines · Bruce Ashfield
linux kernel commit
84c751bd[ptrace: add ability to retrieve signals without removing from a queue (v4)] addedptrace_peeksiginfo_argsto 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 1In files that include both the eglibc
sys/ptrace.hand the linux kernel exported one.
Quoted 8 lines
Quoted 2 lines
We can avoid this by making the eglibc variant only declare its structure if
PTRACE_PEEKSIGINFOhas 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.
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 86 lines
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.patchmeta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch new file +55
-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)] +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@@ -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
Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
Quoted 40 lines · Bruce Ashfield
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)]
addedptrace_peeksiginfo_argsto 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 'structptrace_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 1In files that include both the eglibc
sys/ptrace.hand 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 7 lines
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
s/insistence/suggestion/
That came out a bit to strong! :)
Bruce
Quoted 131 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.handlinux/ptrace.hin 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.patchdiff --git
a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patchb/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patchnew file mode 100644
index 0000000..edf10fb
---/dev/null
+++b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patchmeta/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 fromredefintion
(quoted diff) +2
-0+ +linux kernel commit 84c751bd [ptrace: add ability to retrievesignals 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 'structptrace_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 linuxkernel 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 itsstructure if
PTRACE_PEEKSIGINFOmeta/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.hmeta/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@@ -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
Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
Quoted 55 lines · Bruce Ashfield
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)]
addedptrace_peeksiginfo_argsto 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 'structptrace_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 1Quoted 7 lines
In files that include both the eglibc
sys/ptrace.hand 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 6 lines
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! :)
... 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 147 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.handlinux/ptrace.hin 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.patchdiff --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.patchnew file mode 100644
index 0000000..edf10fb
---/dev/null
+++
b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patchmeta/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 fromredefintion
(quoted diff) +2
-0+ +linux kernel commit 84c751bd [ptrace: add ability to retrievesignals 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 'structptrace_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 linuxkernel 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 itsstructure if
PTRACE_PEEKSIGINFOmeta/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.hmeta/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@@ -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
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
Quoted 60 lines · Bruce Ashfield
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)]
addedptrace_peeksiginfo_argsto 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 'structptrace_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 1Quoted 7 lines
In files that include both the eglibc
sys/ptrace.hand 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 8 lines
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!
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.
Bruce
Quoted 156 lines
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.handlinux/ptrace.hin 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.patchdiff --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.patchnew file mode 100644
index 0000000..edf10fb
---/dev/null
+++
b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patchmeta/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 fromredefintion
(quoted diff) +2
-0+ +linux kernel commit 84c751bd [ptrace: add ability to retrievesignals 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 'structptrace_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 linuxkernel 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 itsstructure if
PTRACE_PEEKSIGINFOmeta/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.hmeta/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@@ -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.4Quoted 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"
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
Quoted 9 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 :)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.
Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
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"
Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
Quoted 25 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.
Quoted 7 lines
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.
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 8 lines
Bruce
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
Quoted 32 lines · Khem Raj
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 7 lines
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
Typically I just ask for bugzilla entries to track the fixes in a situation like this. At a high enough priority that they block a release. That gets everyone's attention :)
Bruce
Quoted 11 lines
Quoted 10 lines
Bruce
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
PATCH v2 5/7 gst-plugins-good: fix 3.10 libc-headers build failure
In reply to Bruce Ashfieldkernel 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.
--- ...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 +45 -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 + +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]> +--- + 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
@@ -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"
Signature · 1 line
1.7.10.4
Re: [PATCH 5/7] gst-plugins-good: fix 3.10 libc-headers build failure
Quoted 25 lines · Bruce Ashfield
kernel commit
24b9f5017[[media] V4L: Remove deprecated image centering controls] removed the definitions ofV4L2_CID_HCENTERandV4L2_CID_VCENTERafter 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.patchmeta/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@@ -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 line 13
Quoted 10 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 +10
-0+Subject: [PATCH] v4l2_calls: define V4L2_CID_HCENTER and V4L2_CID_VCENTER + +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.
Missing Upstream-Status.
Regards,
Jonathan
Quoted 44 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 +meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb +1
-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"
Re: [PATCH 5/7] gst-plugins-good: fix 3.10 libc-headers build failure
Quoted 48 lines · Jonathan Liu
Quoted 47 lines · Bruce Ashfield
kernel commit
24b9f5017[[media] V4L: Remove deprecated image centering controls]
removed the definitions ofV4L2_CID_HCENTERandV4L2_CID_VCENTERafter 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.patchdiff --git
a/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patchb/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patchnew 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.patchmeta/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 imagecentering controls]
+removed the definitions ofV4L2_CID_HCENTERandV4L2_CID_VCENTERafter three(quoted diff) +2
-0+years of depreciation. +
Quoted 8 lines
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.
The patch is RFC, and I'm really doing in on behalf of khem .. so honestly, I knew this wasn't in the patch and it wasn't on the top of my list when sending it out at 1:30 AM. I don't use them in kernel
changes, so they aren't in my typical workflow.
Saul or Richard can add the status if they take the patch.
Cheers,
Bruce
Quoted 52 lines
Regards,
JonathanQuoted 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"
PATCH v2 6/7 linux-yocto: introduce v3.10
In reply to Bruce AshfieldIntroduce the 3.10 kernel. This is based on the 3.10.9 upstream kernel and replaces the 3.8 recipes, which will be removed once all reference boards have been updated.
3.10 also the latest LTSI and will be updated with that content when it becomes available.
Other features of the 3.10 kernel include:
- refreshed -rt support
- refreshed yaffs2, aufs3
- cryptodev
- bfs, edf, and OCF staged features
- scrubbed and updated meta data for v3.10
- improved tools support for meta data updates and queue maintenance
- patch carry forward from all previous linux-yocto kernels and configuration.
This kernel has been built and boot tested on all qemu machines and architectures.
--- meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 30 ++++++++++++++++++++ meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 25 ++++++++++++++++ meta/recipes-kernel/linux/linux-yocto_3.10.bb | 30 ++++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb create mode 100644 meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb create mode 100644 meta/recipes-kernel/linux/linux-yocto_3.10.bb
meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb new file +30 -0
@@ -0,0 +1,30 @@ +require recipes-kernel/linux/linux-yocto.inc + +KBRANCH = "standard/preempt-rt/base" +KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" + +SRCREV_machine ?= "77c5842818867366c3d08ca1dec19dc43aee0e91" +SRCREV_machine_qemuppc ?= "7be83bc1124d2a2c75f99df94baaf718659722ea" +SRCREV_meta ?= "1b9b113837f353fd94148beb6bd00a3b7b35d01d" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" + +LINUX_VERSION ?= "3.10.9" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +KMETA = "meta" + +LINUX_KERNEL_TYPE = "preempt-rt" + +# 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.10.bb new file +25 -0
@@ -0,0 +1,25 @@ +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.10.9" + +KMETA = "meta" + +SRCREV_machine ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" +SRCREV_meta ?= "1b9b113837f353fd94148beb6bd00a3b7b35d01d" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.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.10.bb new file +30 -0
@@ -0,0 +1,30 @@ +require recipes-kernel/linux/linux-yocto.inc + +KBRANCH_DEFAULT = "standard/base" +KBRANCH = "${KBRANCH_DEFAULT}" + +SRCREV_machine_qemuarm ?= "8675d3d0a3c17135f70ef474d5c362397c02e62a" +SRCREV_machine_qemumips ?= "992b743b905edd21d3a4a27c92b5c6a9e44d7d73" +SRCREV_machine_qemuppc ?= "09388c3572e26c78b34554e46e077f12be7b2401" +SRCREV_machine_qemux86 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" +SRCREV_machine_qemux86-64 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" +SRCREV_machine_qemumips64 ?= "203679cb23c752fdcbc0180a55a81728d7462561" +SRCREV_machine ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0" +SRCREV_meta ?= "1b9b113837f353fd94148beb6bd00a3b7b35d01d" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" + +LINUX_VERSION ?= "3.10.9" + +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)}"
Signature · 1 line
1.7.10.4
PATCH v2 7/7 linux-yocto: remove 3.8 recipes
In reply to Bruce AshfieldWith 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.
--- 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
@@ -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
@@ -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
@@ -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)}"
Signature · 1 line
1.7.10.4
Re: [PATCH 7/7] linux-yocto: remove 3.8 recipes
Quoted 4 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 116 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
-30@@ -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@@ -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@@ -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)}"
Re: [PATCH 7/7] linux-yocto: remove 3.8 recipes
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@@ -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.sccfeatures/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@@ -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@@ -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
Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"
Re: [PATCH 7/7] linux-yocto: remove 3.8 recipes
Quoted 10 lines · Bruce Ashfield
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.
Quoted 7 lines
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.
I understand, but I don't have those other bits and it blocks building on the Autobuilder, which would in turn block my ability to test and accept this complete patch set for 1.5.
I want to get this tested and in tomorrow if possible and then content with what comes in overnight also!
Thanks for understanding
Sau!
Quoted 148 lines
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@@ -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.sccfeatures/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@@ -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@@ -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