* [v2 PATCH 0/7] linux-yocto: consolidated pull request
@ 2013-08-25 5:16 Bruce Ashfield
2013-08-25 5:16 ` [PATCH 1/7] kern-tools: usability, bug fixes and no guilt Bruce Ashfield
` (6 more replies)
0 siblings, 7 replies; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-25 5:16 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
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.patch
--
1.7.10.4
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 1/7] kern-tools: usability, bug fixes and no guilt
2013-08-25 5:16 [v2 PATCH 0/7] linux-yocto: consolidated pull request Bruce Ashfield
@ 2013-08-25 5:16 ` Bruce Ashfield
2013-08-25 5:16 ` [PATCH 2/7] guilt: update to latest git version Bruce Ashfield
` (5 subsequent siblings)
6 siblings, 0 replies; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-25 5:16 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
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"
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/classes/kernel-yocto.bbclass | 2 ++
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index d513ad2..fcc00e3 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -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)
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index c414fed..cda2659 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -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
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 2/7] guilt: update to latest git version
2013-08-25 5:16 [v2 PATCH 0/7] linux-yocto: consolidated pull request Bruce Ashfield
2013-08-25 5:16 ` [PATCH 1/7] kern-tools: usability, bug fixes and no guilt Bruce Ashfield
@ 2013-08-25 5:16 ` Bruce Ashfield
2013-08-25 5:16 ` [PATCH 3/7] linux-libc-headers: update to v3.10 Bruce Ashfield
` (4 subsequent siblings)
6 siblings, 0 replies; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-25 5:16 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
Uprev 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.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
.../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 --------------------
| 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%)
diff --git a/meta/recipes-devtools/guilt/files/guilt-import-commit.patch b/meta/recipes-devtools/guilt/files/guilt-import-commit.patch
deleted file mode 100644
index bd746c5..0000000
--- a/meta/recipes-devtools/guilt/files/guilt-import-commit.patch
+++ /dev/null
@@ -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 <bruce.ashfield@windriver.com>
-
----
- 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
diff --git a/meta/recipes-devtools/guilt/files/guilt-init.patch b/meta/recipes-devtools/guilt/files/guilt-init.patch
deleted file mode 100644
index 1583346..0000000
--- a/meta/recipes-devtools/guilt/files/guilt-init.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-guilt: allow previously initialized branches to be re-initialized
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-
----
- 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"
diff --git a/meta/recipes-devtools/guilt/files/guilt-pop.patch b/meta/recipes-devtools/guilt/files/guilt-pop.patch
deleted file mode 100644
index 9c05427..0000000
--- a/meta/recipes-devtools/guilt/files/guilt-pop.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-guilt: pop and delete tags
-
-Add support for popping to a tag and the ability to delete
-a tag while popping from the tree
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-
----
- guilt-pop | 28 ++++++++++++++++++++++++++--
- 1 file changed, 26 insertions(+), 2 deletions(-)
-
---- a/guilt-pop
-+++ b/guilt-pop
-@@ -17,6 +17,13 @@ while [ $# -gt 0 ]; do
- -n)
- num=t
- ;;
-+ -t|--t)
-+ tag=$2
-+ shift
-+ ;;
-+ -d|--d) # can only be used with --t
-+ delete_tag=t
-+ ;;
- *)
- break
- ;;
-@@ -24,7 +31,7 @@ while [ $# -gt 0 ]; do
- shift
- done
-
--# "guilt-pop" or "guilt-pop foo" or "guilt-pop -n foo"
-+# "guilt-pop" or "guilt-pop foo" or "guilt-pop -n foo" or "guilt-pop -t <tag>"
- if [ -z "$all" ] && [ $# -gt 1 ]; then
- usage
- fi
-@@ -44,12 +51,26 @@ fi
- patch="$1"
- [ ! -z "$all" ] && patch="-a"
-
-+
-+# tag processing will just roll into another one of
-+# the pop types, number or patch name
-+if [ ! -z "$tag" ]; then
-+ git-rev-list HEAD ^$tag > /dev/null 2>/dev/null
-+ if [ $? -eq 0 ]; then
-+ revs="`git-rev-list HEAD ^$tag`"
-+ num=`echo "$revs" | wc -l`
-+ patch=$num
-+ else
-+ echo "Cannot find tag $tag";
-+ exit 0
-+ fi
-+fi
-+
- if [ ! -s "$applied" ]; then
- disp "No patches applied."
- exit 0
- elif [ "$patch" = "-a" ]; then
- # we are supposed to pop all patches
--
- sidx=`wc -l < $applied`
- eidx=0
- elif [ ! -z "$num" ]; then
-@@ -96,3 +117,6 @@ pop_many_patches `git rev-parse refs/pat
- p=`get_top`
- [ ! -z "$p" ] && disp "Now at $p." || disp "All patches popped."
-
-+if [ ! -z "$delete_tag" ]; then
-+ git tag -d $tag
-+fi;
diff --git a/meta/recipes-devtools/guilt/files/guilt-push-no-series.patch b/meta/recipes-devtools/guilt/files/guilt-push-no-series.patch
deleted file mode 100644
index 3446f10..0000000
--- a/meta/recipes-devtools/guilt/files/guilt-push-no-series.patch
+++ /dev/null
@@ -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 <paul.gortmaker@windriver.com>
-
----
-
- 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
diff --git a/meta/recipes-devtools/guilt/files/guilt-push.patch b/meta/recipes-devtools/guilt/files/guilt-push.patch
deleted file mode 100644
index 5ec290b..0000000
--- a/meta/recipes-devtools/guilt/files/guilt-push.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-guilt: add support for pushing and tagging
-
-It can be handy to push AND tag at the same time.
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-
----
-
- guilt-push | 16 +++++++++++++++-
- 1 file changed, 15 insertions(+), 1 deletion(-)
-
---- a/guilt-push
-+++ b/guilt-push
-@@ -19,7 +19,11 @@ while [ $# -gt 0 ]; do
- -n)
- num=t
- ;;
-- *)
-+ -t|--t)
-+ tag=$2
-+ shift
-+ ;;
-+ *)
- break
- ;;
- esac
-@@ -126,3 +130,13 @@ do
- fi
- done
-
-+ret=$?
-+if [ $ret -ne 0 ]; then
-+ exit $ret
-+fi
-+
-+# if a tag was specified, tag the tree now.
-+if [ -n "$tag" ]; then
-+ git-rev-parse HEAD > "$GIT_DIR/refs/tags/$tag"
-+fi
-+
diff --git a/meta/recipes-devtools/guilt/files/guilt-set-git_exec_path.patch b/meta/recipes-devtools/guilt/files/guilt-set-git_exec_path.patch
deleted file mode 100644
index a40ec6f..0000000
--- a/meta/recipes-devtools/guilt/files/guilt-set-git_exec_path.patch
+++ /dev/null
@@ -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 <bruce.ashfield@windriver.com>
-
----
- 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
diff --git a/meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch b/meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch
deleted file mode 100644
index 579d9bc..0000000
--- a/meta/recipes-devtools/guilt/files/guilt-update-supported-git-versions-to-1.8.x.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d7fb5d4e159071b6255181fcf436300038fe9e6c Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@windriver.com>
-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 <bruce.ashfield@windriver.com>
----
- 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
-
diff --git a/meta/recipes-devtools/guilt/files/guilt.patch b/meta/recipes-devtools/guilt/files/guilt.patch
deleted file mode 100644
index 8e5b61e..0000000
--- a/meta/recipes-devtools/guilt/files/guilt.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-guilt: enhanced patch queue management
-
-guilt prefers to track the status and series of patches
-under .git/patches. But this location doesn't allow the
-status of a quilt queue to be committed to a secondary
-repository and later restored.
-
-This change does three things:
-
- - allows GUILT_BASE to be changed (with a default to "wrs")
- - allows shadow tracking of the patches (for rebase)
- - enhances the header detection and creation of patches
- as they are pushed onto the tree.
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-
----
- guilt | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 159 insertions(+), 24 deletions(-)
-
---- a/guilt
-+++ b/guilt
-@@ -153,14 +153,16 @@ get_branch()
-
- verify_branch()
- {
-- [ ! -d "$GIT_DIR/patches" ] &&
-+ [ ! -d "$GUILT_DIR" ] &&
- die "Patches directory doesn't exist, try guilt-init"
-- [ ! -d "$GIT_DIR/patches/$branch" ] &&
-+ [ ! -d "$GUILT_DIR/$branch" ] &&
- die "Branch $branch is not initialized, try guilt-init"
-- [ ! -f "$GIT_DIR/patches/$branch/series" ] &&
-+ [ ! -f "$GUILT_DIR/$branch/series" ] &&
- die "Branch $branch does not have a series file"
-- [ ! -f "$GIT_DIR/patches/$branch/status" ] &&
-+ [ ! -f "$GUILT_DIR/$branch/status" ] &&
- die "Branch $branch does not have a status file"
-+ [ -f "$GUILT_DIR/$branch/applied" ] &&
-+ die "Warning: Branch $branch has 'applied' file - guilt is not compatible with stgit"
- [ -f "$GIT_DIR/patches/$branch/applied" ] &&
- die "Warning: Branch $branch has 'applied' file - guilt is not compatible with stgit"
- }
-@@ -339,6 +341,17 @@ BEGIN{}
- '
- }
-
-+# usage: do_get_only_patch patchfile
-+# similar to do_get_patch except everything leading up to
-+# the first diff line and after the last chunk are removed
-+do_get_only_patch()
-+{
-+ cat "$1" | awk '
-+BEGIN{}
-+/^(diff )/,/^(-- |END{})/
-+' | sed '/^-- *$/D'
-+}
-+
- # usage: do_get_header patchfile
- do_get_header()
- {
-@@ -352,8 +365,13 @@ do_get_header()
- BEGIN{skip=0}
- /^Subject:/ && (NR==1){print substr($0, 10); next}
- /^From:/{skip=1; next}
-+/^Author:/{skip=1; next}
-+/^Date:/{skip=1; next}
-+/^commit/{skip=1; next}
- /^[ \t\f\n\r\v]*$/ && (skip==1){skip=0; next}
- /^(diff |---$|--- )/{exit}
-+/^diff --git/{exit}
-+/^Index: /{exit}
- {print $0}
- END{}
- '
-@@ -415,6 +433,15 @@ series_insert_patch()
- mv "$series.tmp" "$series"
- }
-
-+series_append_patch()
-+{
-+ # unlike series_insert_patch, which inserts the passed
-+ # patch after the current top patch, this function always
-+ # appends the patch to the series
-+
-+ echo $1 >> "$series"
-+}
-+
- # usage: series_remove_patch <patchname>
- series_remove_patch()
- {
-@@ -473,8 +500,7 @@ remove_patch_refs()
- # usage: pop_many_patches <commitish> <number of patches>
- pop_many_patches()
- {
-- assert_head_check
--
-+ head_check "`tail -1 < "$applied" | cut -d: -f 1`"
- (
- cd_to_toplevel
-
-@@ -508,50 +534,149 @@ remove_ref()
- )
- }
-
-+prep_patch()
-+{
-+ patch=$1;
-+ tgt=$2;
-+
-+ if test -f $patch; then
-+ case $patch in
-+ *.gz) gzip -dc $patch > $tgt ;;
-+ *.bz2) bzip2 -dc $patch > $tgt ;;
-+ *) cp $patch $tgt ;;
-+ esac;
-+ fi;
-+}
-+
- # usage: commit patchname parent
- commit()
- {
- (
- TMP_MSG=`get_tmp_file msg`
-+ TMP_PATCH=`get_tmp_file patch`
-+ TMP_PATCH_OUT=`get_tmp_file patch_out`
-+ TMP_INFO=`get_tmp_file info`
-
- p="$GUILT_DIR/$branch/$1"
- pname="$1"
-+ prep_patch "$p" "$TMP_PATCH"
-+ p=$TMP_PATCH
-+
- cd_to_toplevel
-
- git diff-files --name-only | (while read n; do git update-index "$n" ; done)
-
-+ # borrowed from git-am
-+ header_type=git
-+ git mailinfo "$TMP_MSG" "$TMP_PATCH_OUT" \
-+ <"$p" >"$TMP_INFO";
-+
-+ # skip pine's internal folder data
-+ grep '^Author: Mail System Internal Data$' \
-+ <"$TMP_INFO" >/dev/null
-+
-+ git stripspace < "$TMP_MSG" > "$TMP_MSG.clean"
-+ mv "$TMP_MSG.clean" "$TMP_MSG"
-+ git stripspace < "$TMP_INFO" > "$TMP_INFO.clean"
-+ mv "$TMP_INFO.clean" "$TMP_INFO"
-+
-+ # If mailinfo couldn't get something , try another way
- # grab a commit message out of the patch
-- do_get_header "$p" > "$TMP_MSG"
-+ if [ ! -s "$TMP_MSG" ] || [ ! -s "$TMP_INFO" ]; then
-+ do_get_header "$p" > "$TMP_MSG"
-+ header_type=guilt
-+ fi
-
-- # make a default commit message if patch doesn't contain one
-- [ ! -s "$TMP_MSG" ] && echo "patch $pname" > "$TMP_MSG"
-+ # last try: make a default commit message if patch doesn't contain one
-+ [ ! -s "$TMP_MSG" ] && echo "auto_msg: patch $pname" > "$TMP_MSG"
-
-- # extract a From line from the patch header, and set
-- # GIT_AUTHOR_{NAME,EMAIL}
-- author_str=`sed -n -e '/^From:/ { s/^From: //; p; q; }; /^(diff |---$|--- )/ q' "$p"`
-- if [ ! -z "$author_str" ]; then
-+
-+ if [ "$header_type" = "guilt" ]; then
-+
-+ # extract a From line from the patch header, and set
-+ # GIT_AUTHOR_{NAME,EMAIL}
-+ author_str=`sed -n -e '/^From:/ { s/^From: //; p; q }; /^(diff |---)/ q' "$p"`
-+ if [ ! -z "$author_str" ]; then
- GIT_AUTHOR_NAME=`echo $author_str | sed -e 's/ *<.*$//'`
- export GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME:-" "}"
- export GIT_AUTHOR_EMAIL="`echo $author_str | sed -e 's/[^<]*//'`"
-- fi
-+ fi
-+
-+
-+ # check in the patch for a subject
-+ SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$p")"
-+ if [ -z "$SUBJECT" ]; then
-+ # if we can't find a subject in the patch, then let's construct
-+ # one from the header of the patch itself
-+ SUBJECT=`cat "$TMP_MSG" | head -n 1`
-+ if [ ${#SUBJECT} -gt 60 ]; then
-+ SUBJECT=${SUBJECT: -60}
-+ fi
-+ fi
-+
-+ if [ -z "$SUBJECT" ]; then
-+ # if we are *still* without a subject, then just use
-+ # the patch name
-+ SUBJECT=`echo $1 | sed 's%^patch *%%'`
-+
-+ if [ ${#SUBJECT} -gt 60 ]; then
-+ SUBJECT=${SUBJECT: -60}
-+ fi
-+ fi
-
-- # must strip nano-second part otherwise git gets very
-- # confused, and makes up strange timestamps from the past
-- # (chances are it decides to interpret it as a unix
-- # timestamp).
-- export GIT_AUTHOR_DATE="`stat -c %y "$p" | sed -e '
-+ SUBJECT=`echo $SUBJECT | sed s'%^ *%%'`
-+
-+ if [ ! -z "$SUBJECT" ]; then
-+ echo "$SUBJECT" >> $TMP_MSG.subject
-+ echo "" >> $TMP_MSG.subject
-+ cat "$TMP_MSG" >> $TMP_MSG.subject
-+ mv "$TMP_MSG.subject" "$TMP_MSG"
-+ fi
-+
-+ # must strip nano-second part otherwise git gets very
-+ # confused, and makes up strange timestamps from the past
-+ # (chances are it decides to interpret it as a unix
-+ # timestamp).
-+ export GIT_AUTHOR_DATE="`stat -c %y "$p" | sed -e '\
- s/^\([0-9]\{4\}\)-\([0-9]\{2\}\)-\([0-9]\{2\}\) \([0-9]\{2\}\):\([0-9]\{2\}\):\([0-9]\{2\}\)\.[0-9]* \(.*\)$/\1-\2-\3 \4:\5:\6 \7/'`"
-- export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
-+ export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
-+ else
-+ # using git headers, closely related to git-am
-+
-+ GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$TMP_INFO")"
-+ GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$TMP_INFO")"
-+ GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$TMP_INFO")"
-+ if test -z "$GIT_AUTHOR_EMAIL"
-+ then
-+ echo "Warning: patch does not have a valid e-mail address."
-+ GIT_AUTHOR_EMAIL=$GIT_AUTHOR_NAME
-+ fi
-+
-+ SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$TMP_INFO")"
-+ if [ ! -z "$SUBJECT" ]; then
-+ echo "$SUBJECT" >> $TMP_MSG.subject
-+ echo "" >> $TMP_MSG.subject
-+ cat "$TMP_MSG" >> $TMP_MSG.subject
-+ mv "$TMP_MSG.subject" "$TMP_MSG"
-+ fi
-+ export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
-+ fi
-
- # commit
- treeish=`git write-tree`
- commitish=`git commit-tree $treeish -p $2 < "$TMP_MSG"`
-+ if [ ! $? -eq 0 ]; then
-+ echo "ERROR. Could not commit tree"
-+ git-reset --hard HEAD^
-+ exit 1
-+ fi
- git update-ref HEAD $commitish
-
- # mark patch as applied
- git update-ref "refs/patches/$branch/$pname" HEAD
-
-- rm -f "$TMP_MSG"
-+ rm -f "$TMP_MSG" "$TMP_LOG" "$TMP_PATCH" "$TMP_INFO" "$TMP_PATCH_OUT"
-+
- )
- }
-
-@@ -568,7 +693,7 @@ push_patch()
- bail_action="$2"
- reject="--reject"
-
-- assert_head_check
-+ head_check "`tail -1 < "$applied" | cut -d: -f 1`"
- cd_to_toplevel
-
- # apply the patch if and only if there is something to apply
-@@ -671,7 +796,7 @@ refresh_patch()
- # incldiffstat
- __refresh_patch()
- {
-- assert_head_check
-+ head_check "`tail -1 < "$applied" | cut -d: -f 1`"
-
- (
- TMP_DIFF=`get_tmp_file diff`
-@@ -711,6 +836,10 @@ __refresh_patch()
-
- head -n "-$N" < "$applied" > "$applied.tmp"
- mv "$applied.tmp" "$applied"
-+
-+ # update the shadow status.
-+ ref=`cat $GIT_DIR/refs/tags/${branch}_top`
-+ echo "$ref:$1" >> $applied_shadow
- )
- }
-
-@@ -791,7 +920,12 @@ diffstat=`git config --bool guilt.diffst
- # The following gets run every time this file is source'd
- #
-
--GUILT_DIR="$GIT_DIR/patches"
-+
-+# GUILT_DIR="$GIT_DIR/patches"
-+if [ -z "$GUILT_BASE" ]; then
-+ GUILT_BASE=wrs
-+fi
-+GUILT_DIR="$GUILT_BASE/patches"
-
- branch=`get_branch`
-
-@@ -814,6 +948,7 @@ fi
- # very useful files
- series="$GUILT_DIR/$branch/series"
- applied="$GUILT_DIR/$branch/status"
-+applied_shadow="$GUILT_DIR/$branch/shadow_status"
- guards_file="$GUILT_DIR/$branch/guards"
-
- # determine a pager to use for anything interactive (fall back to more)
diff --git a/meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch b/meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch
deleted file mode 100644
index fa7dd8a..0000000
--- a/meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-guilt: improve the generation of an automatic header
-
-Patches that do not have a proper header are encountered when generating
-a tree. This improves the detection of these patches and generates a sane
-header so the eventual commit will be coherent
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-
----
-
- guilt | 24 ++++++++++++++++++------
- 1 file changed, 18 insertions(+), 6 deletions(-)
-
---- a/guilt
-+++ b/guilt
-@@ -591,7 +591,12 @@ commit()
- fi
-
- # last try: make a default commit message if patch doesn't contain one
-- [ ! -s "$TMP_MSG" ] && echo "auto_msg: patch $pname" > "$TMP_MSG"
-+ if [ ! -s "$TMP_MSG" ]; then
-+ echo "auto_msg: importing `basename $pname`" > "$TMP_MSG"
-+ echo "" >> "$TMP_MSG"
-+ echo "This is an automatic import of patch $pname, no headers were" >> "$TMP_MSG"
-+ echo "detected and a default message was constructed" >> "$TMP_MSG"
-+ fi
-
-
- if [ "$header_type" = "guilt" ]; then
-@@ -599,12 +604,14 @@ commit()
- # extract a From line from the patch header, and set
- # GIT_AUTHOR_{NAME,EMAIL}
- author_str=`sed -n -e '/^From:/ { s/^From: //; p; q }; /^(diff |---)/ q' "$p"`
-- if [ ! -z "$author_str" ]; then
-- GIT_AUTHOR_NAME=`echo $author_str | sed -e 's/ *<.*$//'`
-- export GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME:-" "}"
-- export GIT_AUTHOR_EMAIL="`echo $author_str | sed -e 's/[^<]*//'`"
-+ if [ -z "$author_str" ]; then
-+ author_str="auto commit <unknown@unknown>"
- fi
-
-+ GIT_AUTHOR_NAME=`echo $author_str | sed -e 's/ *<.*$//'`
-+ export GIT_AUTHOR_NAME="${GIT_AUTHOR_NAME:-" "}"
-+ export GIT_AUTHOR_EMAIL="`echo $author_str | sed -e 's/[^<]*//'`"
-+
-
- # check in the patch for a subject
- SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$p")"
-@@ -615,6 +622,11 @@ commit()
- if [ ${#SUBJECT} -gt 60 ]; then
- SUBJECT=${SUBJECT: -60}
- fi
-+
-+ # remove the line from the tmp msg
-+ mv "$TMP_MSG" "$TMP_MSG.work"
-+ cat "$TMP_MSG.work" | grep -v -E ".*$SUBJECT.*" > "$TMP_MSG"
-+ rm "$TMP_MSG.work"
- fi
-
- if [ -z "$SUBJECT" ]; then
-@@ -629,7 +641,7 @@ commit()
-
- SUBJECT=`echo $SUBJECT | sed s'%^ *%%'`
-
-- if [ ! -z "$SUBJECT" ]; then
-+ if [ -n "$SUBJECT" ]; then
- echo "$SUBJECT" >> $TMP_MSG.subject
- echo "" >> $TMP_MSG.subject
- cat "$TMP_MSG" >> $TMP_MSG.subject
diff --git a/meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch b/meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch
deleted file mode 100644
index c912397..0000000
--- a/meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-guilt: allow operation outside of git repos
-
-Sometimes guilt is sourced when there isn't a containing git repository.
-Some of the git commands that are always called will report errors
-unecesarility in this scenario. This adds a variable that will inhibit
-those problematic calls
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by <bruce.ashfield@windriver.com>
-
----
-
- guilt | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-
---- a/guilt
-+++ b/guilt
-@@ -23,7 +23,9 @@ esac
- # we change directories ourselves
- SUBDIRECTORY_OK=1
-
--. "$(git --exec-path)/git-sh-setup"
-+if [ -z "$DO_NOT_USE_GITREPO_COMMANDS" ]; then
-+ . "$(git --exec-path)/git-sh-setup"
-+fi
-
- #
- # Git version check
-@@ -921,14 +923,15 @@ diffstat=`git config --bool guilt.diffst
- # The following gets run every time this file is source'd
- #
-
--
- # GUILT_DIR="$GIT_DIR/patches"
- if [ -z "$GUILT_BASE" ]; then
- GUILT_BASE=wrs
- fi
- GUILT_DIR="$GUILT_BASE/patches"
-
--branch=`get_branch`
-+if [ -z "$DO_NOT_USE_GITREPO_COMMANDS" ]; then
-+ branch=`get_branch`
-+fi
-
- # most of the time we want to verify that the repo's branch has been
- # initialized, but every once in a blue moon (e.g., we want to run guilt-init),
diff --git a/meta/recipes-devtools/guilt/files/optional_head_check.patch b/meta/recipes-devtools/guilt/files/optional_head_check.patch
deleted file mode 100644
index 01e1d02..0000000
--- a/meta/recipes-devtools/guilt/files/optional_head_check.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-guilt: allow guilt-push to opt out of head checking
-
-Depending on the method used to construct a tree, it is entirely
-possible that branches are not only made up of guilt created commits.
-This mixed mode is valid, and in particular is valid when applying
-patches to a tree.
-
-In the default mode of operation, you will see a warning such as
-this when working on a branch:
-
-Expected HEAD commit dbd5861f81a92b8b329561f94b8575c7ee6768b6
- got 3e8e6f6bd9f1772b91fc1fe9949f541d0560b487
-
-This looks severe, but is harmless during tree construction,
-since even if the HEAD commit was expected, you can still run into
-issues pushing a patch. This is particularly seen when templates are
-adding patches to a kernel.
-
-To make this look less ominous, we make the head check for patch
-pushing opt-in. Which means that by default, you'll no longer see
-this warning if you work with a mixed mode branch during tree
-construction.
-
-Other modes such as pop or refresh can run into problems when
-the HEAD commit isn't tracked or expected, so they should remained
-checked.
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-
----
- guilt | 3 +++
- guilt-push | 3 +++
- 2 files changed, 6 insertions(+)
-
---- a/guilt
-+++ b/guilt
-@@ -417,6 +417,9 @@ head_check()
- return 0 ;;
- esac
-
-+ # If do_head_check isn't set, bail, we are "opt-in"
-+ [ -z "$do_head_check" ] && return 0
-+
- if [ "`git rev-parse refs/heads/$branch`" != "`git rev-parse $1`" ]; then
- disp "Expected HEAD commit $1" >&2
- disp " got `git rev-parse refs/heads/$branch`" >&2
---- a/guilt-push
-+++ b/guilt-push
-@@ -23,6 +23,9 @@ while [ $# -gt 0 ]; do
- tag=$2
- shift
- ;;
-+ --head_check)
-+ do_head_check=t
-+ ;;
- *)
- break
- ;;
diff --git a/meta/recipes-devtools/guilt/files/uninstall_force.patch b/meta/recipes-devtools/guilt/files/uninstall_force.patch
deleted file mode 100644
index 8f7cea1..0000000
--- a/meta/recipes-devtools/guilt/files/uninstall_force.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-guilt: force removal when uninstalling
-
-Upstream-Status: Inappropriate [oe-specific]
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-
---- a/uninstall.orig
-+++ b/uninstall
-@@ -12,4 +12,4 @@
-
- shift
-
--(cd $PRE; rm "$@")
-+(cd $PRE; rm -f "$@")
diff --git a/meta/recipes-devtools/guilt/guilt-native_0.33.bb b/meta/recipes-devtools/guilt/guilt-native_git.bb
similarity index 45%
rename from meta/recipes-devtools/guilt/guilt-native_0.33.bb
rename to meta/recipes-devtools/guilt/guilt-native_git.bb
index d4dd616..9c75c3c 100644
--- a/meta/recipes-devtools/guilt/guilt-native_0.33.bb
+++ b/meta/recipes-devtools/guilt/guilt-native_git.bb
@@ -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"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 3/7] linux-libc-headers: update to v3.10
2013-08-25 5:16 [v2 PATCH 0/7] linux-yocto: consolidated pull request Bruce Ashfield
2013-08-25 5:16 ` [PATCH 1/7] kern-tools: usability, bug fixes and no guilt Bruce Ashfield
2013-08-25 5:16 ` [PATCH 2/7] guilt: update to latest git version Bruce Ashfield
@ 2013-08-25 5:16 ` Bruce Ashfield
2013-08-25 5:16 ` [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion Bruce Ashfield
` (3 subsequent siblings)
6 siblings, 0 replies; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-25 5:16 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
Now 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.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
| 7 +++++++
| 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
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index aa0db25..fb41d5e 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -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}"
--git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
new file mode 100644
index 0000000..eb04367
--- /dev/null
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
@@ -0,0 +1,7 @@
+require linux-libc-headers.inc
+
+PR = "r0"
+
+SRC_URI[md5sum] = "72d0a9b3e60cd86fabcd3f24b1708944"
+SRC_URI[sha256sum] = "46c9e55e1fddf40813b8d697d5645037a8e2af5c1a8dff52b3fe82b5021582b8"
+
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.8.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.8.bb
deleted file mode 100644
index 5672bd4..0000000
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.8.bb
+++ /dev/null
@@ -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"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
2013-08-25 5:16 [v2 PATCH 0/7] linux-yocto: consolidated pull request Bruce Ashfield
` (2 preceding siblings ...)
2013-08-25 5:16 ` [PATCH 3/7] linux-libc-headers: update to v3.10 Bruce Ashfield
@ 2013-08-25 5:16 ` Bruce Ashfield
2013-08-25 6:35 ` Jonathan Liu
2013-08-26 0:46 ` Khem Raj
2013-08-25 5:16 ` [PATCH 5/7] gst-plugins-good: fix 3.10 libc-headers build failure Bruce Ashfield
` (2 subsequent siblings)
6 siblings, 2 replies; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-25 5:16 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
linux kernel commit 84c751bd [ptrace: add ability to retrieve signals without removing from a queue (v4)]
added ptrace_peeksiginfo_args to the exported kernel user api.
This leads to build errors such as:
| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:66:0:
| /poky-master/build/tmp/sysroots/qemux86/usr/include/linux/ptrace.h:58:8: error: redefinition of 'struct ptrace_peeksiginfo_args'
| struct ptrace_peeksiginfo_args {
| ^
| In file included from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/defs.h:159:0,
| from /poky-master/build/tmp/work/i586-poky-linux/strace/4.8-r0/strace-4.8/process.c:37:
| /poky-master/build/tmp/sysroots/qemux86/usr/include/sys/ptrace.h:191:8: note: originally defined here
| struct ptrace_peeksiginfo_args
| ^
| make[2]: *** [process.o] Error 1
In files that include both the eglibc sys/ptrace.h and the linux kernel exported
one.
We can avoid this by making the eglibc variant only declare its structure if PTRACE_PEEKSIGINFO
has not been defined.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
...ect-ptrace_peeksiginfo_args-from-redefint.patch | 55 ++++++++++++++++++++
meta/recipes-core/eglibc/eglibc_2.18.bb | 1 +
2 files changed, 56 insertions(+)
create mode 100644 meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
new file mode 100644
index 0000000..edf10fb
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
@@ -0,0 +1,55 @@
+From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+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 <bruce.ashfield@windriver.com>
+---
+ 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
+
diff --git a/meta/recipes-core/eglibc/eglibc_2.18.bb b/meta/recipes-core/eglibc/eglibc_2.18.bb
index 17b651f..2257c21 100644
--- a/meta/recipes-core/eglibc/eglibc_2.18.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.18.bb
@@ -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
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 5/7] gst-plugins-good: fix 3.10 libc-headers build failure
2013-08-25 5:16 [v2 PATCH 0/7] linux-yocto: consolidated pull request Bruce Ashfield
` (3 preceding siblings ...)
2013-08-25 5:16 ` [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion Bruce Ashfield
@ 2013-08-25 5:16 ` Bruce Ashfield
2013-08-25 6:36 ` Jonathan Liu
2013-08-25 5:16 ` [PATCH 6/7] linux-yocto: introduce v3.10 Bruce Ashfield
2013-08-25 5:16 ` [PATCH 7/7] linux-yocto: remove 3.8 recipes Bruce Ashfield
6 siblings, 1 reply; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-25 5:16 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
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 <bruce.ashfield@windriver.com>
---
...define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch | 45 ++++++++++++++++++++
.../gstreamer/gst-plugins-good_0.10.31.bb | 1 +
2 files changed, 46 insertions(+)
create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
new file mode 100644
index 0000000..bd0de58
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
@@ -0,0 +1,45 @@
+From ccb01de8096a32d86d47b0d92ec3416c57ee4d25 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+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 <bruce.ashfield@windriver.com>
+---
+ 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
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
@@ -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"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 6/7] linux-yocto: introduce v3.10
2013-08-25 5:16 [v2 PATCH 0/7] linux-yocto: consolidated pull request Bruce Ashfield
` (4 preceding siblings ...)
2013-08-25 5:16 ` [PATCH 5/7] gst-plugins-good: fix 3.10 libc-headers build failure Bruce Ashfield
@ 2013-08-25 5:16 ` Bruce Ashfield
2013-08-25 5:16 ` [PATCH 7/7] linux-yocto: remove 3.8 recipes Bruce Ashfield
6 siblings, 0 replies; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-25 5:16 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
Introduce 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.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
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
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
new file mode 100644
index 0000000..4139be8
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
@@ -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)}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
new file mode 100644
index 0000000..1c2ad37
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
@@ -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 = ""
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
new file mode 100644
index 0000000..ea6ad2a
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -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)}"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* [PATCH 7/7] linux-yocto: remove 3.8 recipes
2013-08-25 5:16 [v2 PATCH 0/7] linux-yocto: consolidated pull request Bruce Ashfield
` (5 preceding siblings ...)
2013-08-25 5:16 ` [PATCH 6/7] linux-yocto: introduce v3.10 Bruce Ashfield
@ 2013-08-25 5:16 ` Bruce Ashfield
2013-08-26 2:30 ` Saul Wold
6 siblings, 1 reply; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-25 5:16 UTC (permalink / raw)
To: richard.purdie; +Cc: openembedded-core
With the introduction of the 3.10 linux-yocto tree, 3.4 being the previous
LTSI kernel, and no reference BSPs using 3.8 as their reference BSP it
3.8 is no longer supported or required.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
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
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
deleted file mode 100644
index 647ace6..0000000
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
+++ /dev/null
@@ -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)}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb
deleted file mode 100644
index 06d6b12..0000000
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb
+++ /dev/null
@@ -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 = ""
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.8.bb b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
deleted file mode 100644
index 790e3e3..0000000
--- a/meta/recipes-kernel/linux/linux-yocto_3.8.bb
+++ /dev/null
@@ -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)}"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 24+ messages in thread
* Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
2013-08-25 5:16 ` [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion Bruce Ashfield
@ 2013-08-25 6:35 ` Jonathan Liu
2013-08-25 14:22 ` Bruce Ashfield
2013-08-26 0:46 ` Khem Raj
1 sibling, 1 reply; 24+ messages in thread
From: Jonathan Liu @ 2013-08-25 6:35 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: openembedded-core
On 25/08/2013 3:16 PM, Bruce Ashfield wrote:
> 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 <bruce.ashfield@windriver.com>
> ---
> ...ect-ptrace_peeksiginfo_args-from-redefint.patch | 55 ++++++++++++++++++++
> meta/recipes-core/eglibc/eglibc_2.18.bb | 1 +
> 2 files changed, 56 insertions(+)
> create mode 100644 meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>
> diff --git a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
> new file mode 100644
> index 0000000..edf10fb
> --- /dev/null
> +++ b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
> @@ -0,0 +1,55 @@
> +From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
> +From: Bruce Ashfield <bruce.ashfield@windriver.com>
> +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.
Missing Upstream-Status.
Regards,
Jonathan
> +
> +Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> +---
> + 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
> +
> diff --git a/meta/recipes-core/eglibc/eglibc_2.18.bb b/meta/recipes-core/eglibc/eglibc_2.18.bb
> index 17b651f..2257c21 100644
> --- a/meta/recipes-core/eglibc/eglibc_2.18.bb
> +++ b/meta/recipes-core/eglibc/eglibc_2.18.bb
> @@ -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"
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 5/7] gst-plugins-good: fix 3.10 libc-headers build failure
2013-08-25 5:16 ` [PATCH 5/7] gst-plugins-good: fix 3.10 libc-headers build failure Bruce Ashfield
@ 2013-08-25 6:36 ` Jonathan Liu
2013-08-25 14:20 ` Bruce Ashfield
0 siblings, 1 reply; 24+ messages in thread
From: Jonathan Liu @ 2013-08-25 6:36 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: openembedded-core
On 25/08/2013 3:16 PM, Bruce Ashfield wrote:
> 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 <bruce.ashfield@windriver.com>
> ---
> ...define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch | 45 ++++++++++++++++++++
> .../gstreamer/gst-plugins-good_0.10.31.bb | 1 +
> 2 files changed, 46 insertions(+)
> create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
>
> diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
> new file mode 100644
> index 0000000..bd0de58
> --- /dev/null
> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
> @@ -0,0 +1,45 @@
> +From ccb01de8096a32d86d47b0d92ec3416c57ee4d25 Mon Sep 17 00:00:00 2001
> +From: Bruce Ashfield <bruce.ashfield@windriver.com>
> +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.
Missing Upstream-Status.
Regards,
Jonathan
> +
> +Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> +---
> + 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
> --- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
> @@ -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"
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 5/7] gst-plugins-good: fix 3.10 libc-headers build failure
2013-08-25 6:36 ` Jonathan Liu
@ 2013-08-25 14:20 ` Bruce Ashfield
0 siblings, 0 replies; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-25 14:20 UTC (permalink / raw)
To: Jonathan Liu; +Cc: openembedded-core
On 13-08-25 2:36 AM, Jonathan Liu wrote:
> On 25/08/2013 3:16 PM, Bruce Ashfield wrote:
>> 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 <bruce.ashfield@windriver.com>
>> ---
>> ...define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch | 45
>> ++++++++++++++++++++
>> .../gstreamer/gst-plugins-good_0.10.31.bb | 1 +
>> 2 files changed, 46 insertions(+)
>> create mode 100644
>> meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
>>
>>
>> diff --git
>> a/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
>> b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
>>
>> new file mode 100644
>> index 0000000..bd0de58
>> --- /dev/null
>> +++
>> b/meta/recipes-multimedia/gstreamer/gst-plugins-good-0.10.31/0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch
>>
>> @@ -0,0 +1,45 @@
>> +From ccb01de8096a32d86d47b0d92ec3416c57ee4d25 Mon Sep 17 00:00:00 2001
>> +From: Bruce Ashfield <bruce.ashfield@windriver.com>
>> +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.
> 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
>
> Regards,
> Jonathan
>> +
>> +Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>> +---
>> + 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
>> --- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
>> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
>> @@ -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"
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
2013-08-25 6:35 ` Jonathan Liu
@ 2013-08-25 14:22 ` Bruce Ashfield
0 siblings, 0 replies; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-25 14:22 UTC (permalink / raw)
To: Jonathan Liu; +Cc: Patches and discussions about the oe-core layer
On Sun, Aug 25, 2013 at 2:35 AM, Jonathan Liu <net147@gmail.com> wrote:
> On 25/08/2013 3:16 PM, Bruce Ashfield wrote:
>>
>> 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 <bruce.ashfield@windriver.com>
>> ---
>> ...ect-ptrace_peeksiginfo_args-from-redefint.patch | 55
>> ++++++++++++++++++++
>> meta/recipes-core/eglibc/eglibc_2.18.bb | 1 +
>> 2 files changed, 56 insertions(+)
>> create mode 100644
>> meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>
>> diff --git
>> a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>> b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>> new file mode 100644
>> index 0000000..edf10fb
>> --- /dev/null
>> +++
>> b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>> @@ -0,0 +1,55 @@
>> +From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
>> +From: Bruce Ashfield <bruce.ashfield@windriver.com>
>> +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.
>
> 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
>
> Regards,
> Jonathan
>
>> +
>> +Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>> +---
>> + 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
>> +
>> diff --git a/meta/recipes-core/eglibc/eglibc_2.18.bb
>> b/meta/recipes-core/eglibc/eglibc_2.18.bb
>> index 17b651f..2257c21 100644
>> --- a/meta/recipes-core/eglibc/eglibc_2.18.bb
>> +++ b/meta/recipes-core/eglibc/eglibc_2.18.bb
>> @@ -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"
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
2013-08-25 5:16 ` [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion Bruce Ashfield
2013-08-25 6:35 ` Jonathan Liu
@ 2013-08-26 0:46 ` Khem Raj
2013-08-26 0:54 ` Bruce Ashfield
1 sibling, 1 reply; 24+ messages in thread
From: Khem Raj @ 2013-08-26 0:46 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer
Hi Bruce
On Sat, Aug 24, 2013 at 10:16 PM, Bruce Ashfield
<bruce.ashfield@windriver.com> wrote:
> 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.
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.
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
> ...ect-ptrace_peeksiginfo_args-from-redefint.patch | 55 ++++++++++++++++++++
> meta/recipes-core/eglibc/eglibc_2.18.bb | 1 +
> 2 files changed, 56 insertions(+)
> create mode 100644 meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>
> diff --git a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
> new file mode 100644
> index 0000000..edf10fb
> --- /dev/null
> +++ b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
> @@ -0,0 +1,55 @@
> +From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
> +From: Bruce Ashfield <bruce.ashfield@windriver.com>
> +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 <bruce.ashfield@windriver.com>
> +---
> + 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
> +
> diff --git a/meta/recipes-core/eglibc/eglibc_2.18.bb b/meta/recipes-core/eglibc/eglibc_2.18.bb
> index 17b651f..2257c21 100644
> --- a/meta/recipes-core/eglibc/eglibc_2.18.bb
> +++ b/meta/recipes-core/eglibc/eglibc_2.18.bb
> @@ -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
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
2013-08-26 0:46 ` Khem Raj
@ 2013-08-26 0:54 ` Bruce Ashfield
2013-08-26 2:14 ` Bruce Ashfield
0 siblings, 1 reply; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-26 0:54 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On 13-08-25 8:46 PM, Khem Raj wrote:
> Hi Bruce
>
> On Sat, Aug 24, 2013 at 10:16 PM, Bruce Ashfield
> <bruce.ashfield@windriver.com> wrote:
>> 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.
>
> 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
>
>
>>
>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>> ---
>> ...ect-ptrace_peeksiginfo_args-from-redefint.patch | 55 ++++++++++++++++++++
>> meta/recipes-core/eglibc/eglibc_2.18.bb | 1 +
>> 2 files changed, 56 insertions(+)
>> create mode 100644 meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>
>> diff --git a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>> new file mode 100644
>> index 0000000..edf10fb
>> --- /dev/null
>> +++ b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>> @@ -0,0 +1,55 @@
>> +From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
>> +From: Bruce Ashfield <bruce.ashfield@windriver.com>
>> +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 <bruce.ashfield@windriver.com>
>> +---
>> + 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
>> +
>> diff --git a/meta/recipes-core/eglibc/eglibc_2.18.bb b/meta/recipes-core/eglibc/eglibc_2.18.bb
>> index 17b651f..2257c21 100644
>> --- a/meta/recipes-core/eglibc/eglibc_2.18.bb
>> +++ b/meta/recipes-core/eglibc/eglibc_2.18.bb
>> @@ -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
>>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
2013-08-26 0:54 ` Bruce Ashfield
@ 2013-08-26 2:14 ` Bruce Ashfield
2013-08-26 2:39 ` Bruce Ashfield
0 siblings, 1 reply; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-26 2:14 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On 13-08-25 8:54 PM, Bruce Ashfield wrote:
> On 13-08-25 8:46 PM, Khem Raj wrote:
>> Hi Bruce
>>
>> On Sat, Aug 24, 2013 at 10:16 PM, Bruce Ashfield
>> <bruce.ashfield@windriver.com> wrote:
>>> 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.
>>
>> 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
> 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
>
>
>>
>>
>>>
>>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>>> ---
>>> ...ect-ptrace_peeksiginfo_args-from-redefint.patch | 55
>>> ++++++++++++++++++++
>>> meta/recipes-core/eglibc/eglibc_2.18.bb | 1 +
>>> 2 files changed, 56 insertions(+)
>>> create mode 100644
>>> meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>>
>>>
>>> diff --git
>>> a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>> b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>>
>>> new file mode 100644
>>> index 0000000..edf10fb
>>> --- /dev/null
>>> +++
>>> b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>>
>>> @@ -0,0 +1,55 @@
>>> +From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
>>> +From: Bruce Ashfield <bruce.ashfield@windriver.com>
>>> +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 <bruce.ashfield@windriver.com>
>>> +---
>>> + 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
>>> +
>>> diff --git a/meta/recipes-core/eglibc/eglibc_2.18.bb
>>> b/meta/recipes-core/eglibc/eglibc_2.18.bb
>>> index 17b651f..2257c21 100644
>>> --- a/meta/recipes-core/eglibc/eglibc_2.18.bb
>>> +++ b/meta/recipes-core/eglibc/eglibc_2.18.bb
>>> @@ -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
>>>
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 7/7] linux-yocto: remove 3.8 recipes
2013-08-25 5:16 ` [PATCH 7/7] linux-yocto: remove 3.8 recipes Bruce Ashfield
@ 2013-08-26 2:30 ` Saul Wold
2013-08-26 2:32 ` Bruce Ashfield
0 siblings, 1 reply; 24+ messages in thread
From: Saul Wold @ 2013-08-26 2:30 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: openembedded-core
On 08/24/2013 10:16 PM, Bruce Ashfield wrote:
> 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!
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
> 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
>
> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
> deleted file mode 100644
> index 647ace6..0000000
> --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
> +++ /dev/null
> @@ -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)}"
> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb
> deleted file mode 100644
> index 06d6b12..0000000
> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb
> +++ /dev/null
> @@ -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 = ""
> diff --git a/meta/recipes-kernel/linux/linux-yocto_3.8.bb b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
> deleted file mode 100644
> index 790e3e3..0000000
> --- a/meta/recipes-kernel/linux/linux-yocto_3.8.bb
> +++ /dev/null
> @@ -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)}"
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 7/7] linux-yocto: remove 3.8 recipes
2013-08-26 2:30 ` Saul Wold
@ 2013-08-26 2:32 ` Bruce Ashfield
2013-08-26 4:10 ` Saul Wold
0 siblings, 1 reply; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-26 2:32 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
On Sun, Aug 25, 2013 at 10:30 PM, Saul Wold <sgw@linux.intel.com> wrote:
> On 08/24/2013 10:16 PM, Bruce Ashfield wrote:
>>
>> 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
>
> Dropping this for now, also your meta-yocto-bsp added 3.10, but did not
> remove 3.8.bbappend further causing problems.
>
>
> Sau!
>
>
>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>> ---
>> 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
>>
>> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
>> b/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
>> deleted file mode 100644
>> index 647ace6..0000000
>> --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
>> +++ /dev/null
>> @@ -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)}"
>> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb
>> b/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb
>> deleted file mode 100644
>> index 06d6b12..0000000
>> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb
>> +++ /dev/null
>> @@ -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 = ""
>> diff --git a/meta/recipes-kernel/linux/linux-yocto_3.8.bb
>> b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
>> deleted file mode 100644
>> index 790e3e3..0000000
>> --- a/meta/recipes-kernel/linux/linux-yocto_3.8.bb
>> +++ /dev/null
>> @@ -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)}"
>>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
2013-08-26 2:14 ` Bruce Ashfield
@ 2013-08-26 2:39 ` Bruce Ashfield
2013-08-26 2:46 ` Bruce Ashfield
0 siblings, 1 reply; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-26 2:39 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On Sun, Aug 25, 2013 at 10:14 PM, Bruce Ashfield
<bruce.ashfield@windriver.com> wrote:
> On 13-08-25 8:54 PM, Bruce Ashfield wrote:
>>
>> On 13-08-25 8:46 PM, Khem Raj wrote:
>>>
>>> Hi Bruce
>>>
>>> On Sat, Aug 24, 2013 at 10:16 PM, Bruce Ashfield
>>> <bruce.ashfield@windriver.com> wrote:
>>>>
>>>> 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.
>>>
>>>
>>> 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! :)
... 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
>
> Bruce
>
>
>> 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
>>
>>
>>>
>>>
>>>>
>>>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>>>> ---
>>>> ...ect-ptrace_peeksiginfo_args-from-redefint.patch | 55
>>>> ++++++++++++++++++++
>>>> meta/recipes-core/eglibc/eglibc_2.18.bb | 1 +
>>>> 2 files changed, 56 insertions(+)
>>>> create mode 100644
>>>>
>>>> meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>>>
>>>>
>>>> diff --git
>>>>
>>>> a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>>>
>>>> b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>>>
>>>> new file mode 100644
>>>> index 0000000..edf10fb
>>>> --- /dev/null
>>>> +++
>>>>
>>>> b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>>>
>>>> @@ -0,0 +1,55 @@
>>>> +From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
>>>> +From: Bruce Ashfield <bruce.ashfield@windriver.com>
>>>> +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 <bruce.ashfield@windriver.com>
>>>> +---
>>>> + 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
>>>> +
>>>> diff --git a/meta/recipes-core/eglibc/eglibc_2.18.bb
>>>> b/meta/recipes-core/eglibc/eglibc_2.18.bb
>>>> index 17b651f..2257c21 100644
>>>> --- a/meta/recipes-core/eglibc/eglibc_2.18.bb
>>>> +++ b/meta/recipes-core/eglibc/eglibc_2.18.bb
>>>> @@ -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
>>>>
>>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
2013-08-26 2:39 ` Bruce Ashfield
@ 2013-08-26 2:46 ` Bruce Ashfield
2013-08-26 17:28 ` Khem Raj
0 siblings, 1 reply; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-26 2:46 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On Sun, Aug 25, 2013 at 10:39 PM, Bruce Ashfield
<bruce.ashfield@gmail.com> wrote:
> On Sun, Aug 25, 2013 at 10:14 PM, Bruce Ashfield
> <bruce.ashfield@windriver.com> wrote:
>> On 13-08-25 8:54 PM, Bruce Ashfield wrote:
>>>
>>> On 13-08-25 8:46 PM, Khem Raj wrote:
>>>>
>>>> Hi Bruce
>>>>
>>>> On Sat, Aug 24, 2013 at 10:16 PM, Bruce Ashfield
>>>> <bruce.ashfield@windriver.com> wrote:
>>>>>
>>>>> 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.
>>>>
>>>>
>>>> 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! :)
>
>
> ... 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
>
> Bruce
>
>>
>> Bruce
>>
>>
>>> 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
>>>
>>>
>>>>
>>>>
>>>>>
>>>>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>>>>> ---
>>>>> ...ect-ptrace_peeksiginfo_args-from-redefint.patch | 55
>>>>> ++++++++++++++++++++
>>>>> meta/recipes-core/eglibc/eglibc_2.18.bb | 1 +
>>>>> 2 files changed, 56 insertions(+)
>>>>> create mode 100644
>>>>>
>>>>> meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>>>>
>>>>>
>>>>> diff --git
>>>>>
>>>>> a/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>>>>
>>>>> b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>>>>
>>>>> new file mode 100644
>>>>> index 0000000..edf10fb
>>>>> --- /dev/null
>>>>> +++
>>>>>
>>>>> b/meta/recipes-core/eglibc/eglibc-2.18/0001-ptrace-protect-ptrace_peeksiginfo_args-from-redefint.patch
>>>>>
>>>>> @@ -0,0 +1,55 @@
>>>>> +From b5fe604678ffc7e0d6c2704a73d22f99b24a6d25 Mon Sep 17 00:00:00 2001
>>>>> +From: Bruce Ashfield <bruce.ashfield@windriver.com>
>>>>> +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 <bruce.ashfield@windriver.com>
>>>>> +---
>>>>> + 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
>>>>> +
>>>>> diff --git a/meta/recipes-core/eglibc/eglibc_2.18.bb
>>>>> b/meta/recipes-core/eglibc/eglibc_2.18.bb
>>>>> index 17b651f..2257c21 100644
>>>>> --- a/meta/recipes-core/eglibc/eglibc_2.18.bb
>>>>> +++ b/meta/recipes-core/eglibc/eglibc_2.18.bb
>>>>> @@ -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
>>>>>
>>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end"
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 7/7] linux-yocto: remove 3.8 recipes
2013-08-26 2:32 ` Bruce Ashfield
@ 2013-08-26 4:10 ` Saul Wold
0 siblings, 0 replies; 24+ messages in thread
From: Saul Wold @ 2013-08-26 4:10 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer
On 08/25/2013 07:32 PM, Bruce Ashfield wrote:
> On Sun, Aug 25, 2013 at 10:30 PM, Saul Wold <sgw@linux.intel.com> wrote:
>> On 08/24/2013 10:16 PM, Bruce Ashfield wrote:
>>>
>>> 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.
>
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!
> Cheers,
>
> Bruce
>
>>
>> Dropping this for now, also your meta-yocto-bsp added 3.10, but did not
>> remove 3.8.bbappend further causing problems.
>>
>>
>> Sau!
>>
>>
>>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>>> ---
>>> 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
>>>
>>> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
>>> b/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
>>> deleted file mode 100644
>>> index 647ace6..0000000
>>> --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
>>> +++ /dev/null
>>> @@ -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)}"
>>> diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb
>>> b/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb
>>> deleted file mode 100644
>>> index 06d6b12..0000000
>>> --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb
>>> +++ /dev/null
>>> @@ -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 = ""
>>> diff --git a/meta/recipes-kernel/linux/linux-yocto_3.8.bb
>>> b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
>>> deleted file mode 100644
>>> index 790e3e3..0000000
>>> --- a/meta/recipes-kernel/linux/linux-yocto_3.8.bb
>>> +++ /dev/null
>>> @@ -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)}"
>>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
2013-08-26 2:46 ` Bruce Ashfield
@ 2013-08-26 17:28 ` Khem Raj
2013-08-26 17:59 ` Bruce Ashfield
0 siblings, 1 reply; 24+ messages in thread
From: Khem Raj @ 2013-08-26 17:28 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer
On Aug 25, 2013, at 7:46 PM, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> 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.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
2013-08-26 17:28 ` Khem Raj
@ 2013-08-26 17:59 ` Bruce Ashfield
2013-08-26 21:16 ` Khem Raj
0 siblings, 1 reply; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-26 17:59 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On Mon, Aug 26, 2013 at 1:28 PM, Khem Raj <raj.khem@gmail.com> wrote:
>
> On Aug 25, 2013, at 7:46 PM, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
>> 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.
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
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
2013-08-26 17:59 ` Bruce Ashfield
@ 2013-08-26 21:16 ` Khem Raj
2013-08-26 21:27 ` Bruce Ashfield
0 siblings, 1 reply; 24+ messages in thread
From: Khem Raj @ 2013-08-26 21:16 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer
On Aug 26, 2013, at 10:59 AM, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> On Mon, Aug 26, 2013 at 1:28 PM, Khem Raj <raj.khem@gmail.com> wrote:
>>
>> On Aug 25, 2013, at 7:46 PM, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>>
>>> 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.
>
> 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.
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
>
> Bruce
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end"
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion
2013-08-26 21:16 ` Khem Raj
@ 2013-08-26 21:27 ` Bruce Ashfield
0 siblings, 0 replies; 24+ messages in thread
From: Bruce Ashfield @ 2013-08-26 21:27 UTC (permalink / raw)
To: Khem Raj; +Cc: Patches and discussions about the oe-core layer
On Mon, Aug 26, 2013 at 5:16 PM, Khem Raj <raj.khem@gmail.com> wrote:
>
> On Aug 26, 2013, at 10:59 AM, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>
>> On Mon, Aug 26, 2013 at 1:28 PM, Khem Raj <raj.khem@gmail.com> wrote:
>>>
>>> On Aug 25, 2013, at 7:46 PM, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>>>
>>>> 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.
>>
>> 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.
>
> 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
>
>
>>
>> Bruce
>>
>>
>>
>> --
>> "Thou shalt not follow the NULL pointer, for chaos and madness await
>> thee at its end"
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2013-08-26 21:27 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-25 5:16 [v2 PATCH 0/7] linux-yocto: consolidated pull request Bruce Ashfield
2013-08-25 5:16 ` [PATCH 1/7] kern-tools: usability, bug fixes and no guilt Bruce Ashfield
2013-08-25 5:16 ` [PATCH 2/7] guilt: update to latest git version Bruce Ashfield
2013-08-25 5:16 ` [PATCH 3/7] linux-libc-headers: update to v3.10 Bruce Ashfield
2013-08-25 5:16 ` [PATCH 4/7] eglibc: ptrace: protect ptrace_peeksiginfo_args from redefintion Bruce Ashfield
2013-08-25 6:35 ` Jonathan Liu
2013-08-25 14:22 ` Bruce Ashfield
2013-08-26 0:46 ` Khem Raj
2013-08-26 0:54 ` Bruce Ashfield
2013-08-26 2:14 ` Bruce Ashfield
2013-08-26 2:39 ` Bruce Ashfield
2013-08-26 2:46 ` Bruce Ashfield
2013-08-26 17:28 ` Khem Raj
2013-08-26 17:59 ` Bruce Ashfield
2013-08-26 21:16 ` Khem Raj
2013-08-26 21:27 ` Bruce Ashfield
2013-08-25 5:16 ` [PATCH 5/7] gst-plugins-good: fix 3.10 libc-headers build failure Bruce Ashfield
2013-08-25 6:36 ` Jonathan Liu
2013-08-25 14:20 ` Bruce Ashfield
2013-08-25 5:16 ` [PATCH 6/7] linux-yocto: introduce v3.10 Bruce Ashfield
2013-08-25 5:16 ` [PATCH 7/7] linux-yocto: remove 3.8 recipes Bruce Ashfield
2013-08-26 2:30 ` Saul Wold
2013-08-26 2:32 ` Bruce Ashfield
2013-08-26 4:10 ` Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.