Re: [OE-core] [PATCH v2 1/1] multilib.bbclass: fix faulty redefinition of STAGING_KERNEL_DIR
Hi,
Just realized this change was never merged into master, so see
this as a friendly reminder about this change-set (might have been lost
in the flood of changes in this time-frame). Not the most common use
case I guess, but would be good to finally get rid of the problem. If
you have any concerns about the change, please let me know. The solution
was briefly discussed with Richard on irc a couple of month ago, but if
someone thinks this should be solved in some other way, please initiate
a discussion :)
BR Petter
2017-05-15 06:17 skrev Petter Mabäcker:
> Due to the problem fixed in
> '56c677a multilib: Move redefinition
of STAGING_DIR_KERNEL'
> STAGING_KERNEL_DIR must be redefined for lib32
in multilib.bbclass.
> However this redefinition expanded
STAGING_KERNEL_DIR to an absolute
> path. This unconsciously added the
TMPDIR path in the sstate object,
> causing packages depended on
STAGING_KERNEL_DIR being rebuild if the
> TMPDIR was changed.
>
> Solve
this by forcing the unexpanded TMPDIR variable to remain in the
>
beginning of STAGING_DIR_KERNEL (as default). Since TMPDIR is included
in
> BB_HASHBASE_WHITELIST, the sstate object will not be depended on
the
> expanded path anymore.
>
> Signed-off-by: Petter Mabäcker
<pet...@technux.se>
> ---
> meta/classes/multilib.bbclass | 4 +++-
> 1
file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git
a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
> index
ab04597..816f54e 100644
> --- a/meta/classes/multilib.bbclass
> +++
b/meta/classes/multilib.bbclass
> @@ -4,7 +4,9 @@ python
multilib_virtclass_handler () {
> if cls != "multilib" or not variant:
>
return
>
> - e.data.setVar('STAGING_KERNEL_DIR',
e.data.getVar('STAGING_KERNEL_DIR'))
> + localdata =
bb.data.createCopy(e.data)
> + localdata.delVar('TMPDIR')
> +
e.data.setVar('STAGING_KERNEL_DIR',
localdata.getVar('STAGING_KERNEL_DIR'))
>
> # There should only be one
kernel in multilib configs
> # We also skip multilib setup for module
packages.
> --
> 1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 0/1] multilib.bbclass: fix faulty redefinition of STAGING_KERNEL_DIR
Realized that http://lists.openembedded.org/pipermail/openembedded-core/2016-December/130003.html change set never was merged, trying this again. (Rebased to handle '3c59b1b meta: remove True option to getVarFlag calls') The following changes since commit 5d301e9f19048b4cd0d5f702860e318c85f1c037: python*-git: Upgrade to version 2.1.3 (2017-05-12 08:51:10 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib epetmab/staging_kernel_dir_02 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=epetmab/staging_kernel_dir_02 Petter Mabäcker (1): multilib.bbclass: fix faulty redefinition of STAGING_KERNEL_DIR meta/classes/multilib.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/1] multilib.bbclass: fix faulty redefinition of STAGING_KERNEL_DIR
Due to the problem fixed in
'56c677a multilib: Move redefinition of STAGING_DIR_KERNEL'
STAGING_KERNEL_DIR must be redefined for lib32 in multilib.bbclass.
However this redefinition expanded STAGING_KERNEL_DIR to an absolute
path. This unconsciously added the TMPDIR path in the sstate object,
causing packages depended on STAGING_KERNEL_DIR being rebuild if the
TMPDIR was changed.
Solve this by forcing the unexpanded TMPDIR variable to remain in the
beginning of STAGING_DIR_KERNEL (as default). Since TMPDIR is included in
BB_HASHBASE_WHITELIST, the sstate object will not be depended on the
expanded path anymore.
Signed-off-by: Petter Mabäcker <pet...@technux.se>
---
meta/classes/multilib.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index ab04597..816f54e 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -4,7 +4,9 @@ python multilib_virtclass_handler () {
if cls != "multilib" or not variant:
return
-e.data.setVar('STAGING_KERNEL_DIR', e.data.getVar('STAGING_KERNEL_DIR'))
+localdata = bb.data.createCopy(e.data)
+localdata.delVar('TMPDIR')
+e.data.setVar('STAGING_KERNEL_DIR', localdata.getVar('STAGING_KERNEL_DIR'))
# There should only be one kernel in multilib configs
# We also skip multilib setup for module packages.
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] multilib.bbclass: fix faulty redefinition of STAGING_KERNEL_DIR
Due to the problem fixed in
'56c677a multilib: Move redefinition of STAGING_DIR_KERNEL'
STAGING_KERNEL_DIR must be redefined for lib32 in multilib.bbclass.
However this redefinition expanded STAGING_KERNEL_DIR to an absolute
path. This unconsciously added the TMPDIR path in the sstate object,
causing packages depended on STAGING_KERNEL_DIR being rebuild if the
TMPDIR was changed.
Solve this by forcing the unexpanded TMPDIR variable to remain in the
beginning of STAGING_DIR_KERNEL (as default). Since TMPDIR is included in
BB_HASHBASE_WHITELIST, the sstate object will not be depended on the
expanded path anymore.
Signed-off-by: Petter Mabäcker <pet...@technux.se>
---
meta/classes/multilib.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index d5a3128..eba666d 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -4,7 +4,9 @@ python multilib_virtclass_handler () {
if cls != "multilib" or not variant:
return
-e.data.setVar('STAGING_KERNEL_DIR', e.data.getVar('STAGING_KERNEL_DIR',
True))
+localdata = bb.data.createCopy(e.data)
+localdata.delVar('TMPDIR')
+e.data.setVar('STAGING_KERNEL_DIR', localdata.getVar('STAGING_KERNEL_DIR',
True))
# There should only be one kernel in multilib configs
# We also skip multilib setup for module packages.
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] multilib.bbclass: fix faulty redefinition of STAGING_KERNEL_DIR
The following changes since commit 36e178a62f04e7f2611b26964efe46b9af97189a: linux-yocto: Update genericx86* SRCREVs for linux-yocto 4.8 (2016-12-09 08:54:07 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib petmab/staging_dir_kernel_fix http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/staging_dir_kernel_fix Petter Mabäcker (1): multilib.bbclass: fix faulty redefinition of STAGING_KERNEL_DIR meta/classes/multilib.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] base.bbclass wipe ${S} before unpacking source
Hi Markus,
>From my point of view it looks good, and all feedback
from v2 of the patch seems to have been handled as well.
BR
Petter
Petter Mabäcker
Technux
<pet...@technux.se>
www.technux.se
2016-05-10 09:56 skrev Markus
Lehtonen:
> Ping,
>
> Any comments on this one?
>
> Discussion on v2
of the patch:
>
http://lists.openembedded.org/pipermail/openembedded-core/2016-March/119295.html
[2]
>
> Cheers,
> Markus
>
> On 22/03/16 18:47, "Markus Lehtonen"
<openembedded-core-boun...@lists.openembedded.org on behalf of
markus.lehto...@linux.intel.com> wrote:
>
>> Make sure that we have a
pristine source tree after do_unpack. [YOCTO #9064] Signed-off-by:
Markus Lehtonen <markus.lehto...@linux.intel.com> ---
meta/classes/base.bbclass | 12 ++-- 1 file changed, 2
insertions(+), 10 deletions(-) diff --git a/meta/classes/base.bbclass
b/meta/classes/base.bbclass index e066dc9..2acb2b6 100644 ---
a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -133,23
+133,15 @@ python base_do_fetch() { addtask unpack after do_fetch
do_unpack[dirs] = "${WORKDIR}" +do_unpack[cleandirs] = "${@d.getVar('S',
True) if d.getVar('S', True) != d.getVar('WORKDIR', True) else
os.path.join(d.getVar('S', True), 'patches')}" python base_do_unpack() {
src_uri = (d.getVar('SRC_URI', True) or "").split() if len(src_uri) ==
0: return - rootdir = d.getVar('WORKDIR', True) - - # Ensure that we
cleanup ${S}/patches - # TODO: Investigate if we can remove - # the
entire ${S} in this case. - s_dir = d.getVar('S', True) - p_dir =
os.path.join(s_dir, 'patches') - bb.utils.remove(p_dir, True) - try:
fetcher = bb.fetch2.Fetch(src_uri, d) - fetcher.unpack(rootdir) +
fetcher.unpack(d.getVar('WORKDIR', True)) except
bb.fetch2.BBFetchException as e: raise bb.build.FuncFailed(e) } -- 2.6.2
-- ___ Openembedded-core
mailing list Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core [1]
Links:
--
[1]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[2]
http://lists.openembedded.org/pipermail/openembedded-core/2016-March/119295.html
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Wipe ${S} before unpacking sources
2016-02-23 12:36 skrev Markus Lehtonen:
> It would seem reasonable
that do_unpack() always results in a pristine source
> tree. This patch
causes ${S} to be removed before unpacking sources.
>
> I didn't quite
understand what kind of "investigation" the following code
> comment in
do_unpack() was referring to:
> # TODO: Investigate if we can remove
> #
the entire ${S} in this case.
> What kind of special cases might we
have? At least qemux86 core-image-sato
> builds fine for me.
The text
isn't referring to any investigation already done. But me and Paul
Eggleton discussed this matter (removing entire ${S}, not just
{$S}/patches) within the scope of another bug. But since this wasn't
really the scope for that bug, the TODO was added instead. And happily
you have done the investigation and it's seems like ${S} might be able
to be removed in this case, after all :)
So please go ahead and you can
remove that TODO comment within the scope of this patch, since if this
change gets merged it's not relevant anymore..
BR Petter
> [YOCTO
#9064] Markus Lehtonen (1): base.bbclass wipe ${S} before unpacking
source meta/classes/base.bbclass | 8 +++- 1 file changed, 3
insertions(+), 5 deletions(-) -- 2.6.2
See inline comments.
Petter
Mabäcker
Technux <pet...@technux.se>
www.technux.se
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2]: readline fixes
The following changes since commit 1b25a70991589ed1f123015c16ee4806c46e3199:
yocto-project-qs, ref-manual, poky.ent: CentOS Package updates (2015-11-18
16:42:22 +)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib petmab/bug8451
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug8451
Petter Mabäcker (2):
readline: prepare for readline6.3 upstream patches
readline: apply missing upstream patches
.../readline/{files => readline-6.3}/norpath.patch | 0
.../readline-6.3/readline-cve-2014-2524.patch | 43 --
.../readline-6.3/readline-dispatch-multikey.patch | 32
meta/recipes-core/readline/readline.inc| 5 +--
meta/recipes-core/readline/readline_6.3.bb | 30 ++-
5 files changed, 29 insertions(+), 81 deletions(-)
rename meta/recipes-core/readline/{files => readline-6.3}/norpath.patch (100%)
delete mode 100644
meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch
delete mode 100644
meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] readline: apply missing upstream patches
Some readline-6.3 upstream patches was missing. Also ensure that the
upstream patches are applied in the same way as in readline-5.2.
Remove 'readline-dispatch-multikey.patch' and
'readline-cve-2014-2524.patch' since they are already included in
upstream patches 'readline63-002' and 'readline63-003'.
[YOCTO #8451]
Signed-off-by: Petter Mabäcker <pet...@technux.se>
---
.../readline-6.3/readline-cve-2014-2524.patch | 43 --
.../readline-6.3/readline-dispatch-multikey.patch | 32
meta/recipes-core/readline/readline_6.3.bb | 31 ++--
3 files changed, 27 insertions(+), 79 deletions(-)
delete mode 100644
meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch
delete mode 100644
meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch
diff --git
a/meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch
b/meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch
deleted file mode 100644
index 98a9d81..000
--- a/meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-readline: Security Advisory - readline - CVE-2014-2524
-
-Upstream-Status: Backport
-
-Signed-off-by: Yue Tao <yue@windriver.com>
-
- READLINE PATCH REPORT
- =
-
-Readline-Release: 6.3
-Patch-ID: readline63-003
-
-Bug-Reported-by:
-Bug-Reference-ID:
-Bug-Reference-URL:
-
-Bug-Description:
-
-There are debugging functions in the readline release that are theoretically
-exploitable as security problems. They are not public functions, but have
-global linkage.
-
-Patch (apply with `patch -p0'):
-
-*** ../readline-6.3/util.c 2013-09-02 13:36:12.0 -0400
util.c 2014-03-20 10:25:53.0 -0400
-***
-*** 477,480
479,483
- }
-
-+ #if defined (DEBUG)
- #if defined (USE_VARARGS)
- static FILE *_rl_tracefp;
-***
-*** 539,542
542,546
- }
- #endif
-+ #endif /* DEBUG */
-
-
-
diff --git
a/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch
b/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch
deleted file mode 100644
index 54d1ac6..000
--- a/meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 8ef852a5be72c75e17f2510bea52455f809b56ce Mon Sep 17 00:00:00 2001
-From: Chet Ramey <chet.ra...@case.edu>
-Date: Fri, 28 Mar 2014 14:07:42 -0400
-Subject: [PATCH 04/10] Readline-6.3 patch 2
-
-Fixes multi-key issue identified in this thread:
-http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html
-
-Upstream-Status: Backport
-
-Signed-off-by: Saul Wold <s...@linux.intel.com>
- readline.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/readline.c b/readline.c
-index eb4eae3..abb29a0 100644
a/readline.c
-+++ b/readline.c
-@@ -744,7 +744,8 @@ _rl_dispatch_callback (cxt)
- r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags &
KSEQ_SUBSEQ));
-
- RL_CHECK_SIGNALS ();
-- if (r == 0) /* success! */
-+ /* We only treat values < 0 specially to simulate recursion. */
-+ if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or
failure! */
- {
- _rl_keyseq_chain_dispose ();
- RL_UNSETSTATE (RL_STATE_MULTIKEY);
---
-1.8.3.1
-
diff --git a/meta/recipes-core/readline/readline_6.3.bb
b/meta/recipes-core/readline/readline_6.3.bb
index dbb9f0a..8ec7c4a 100644
--- a/meta/recipes-core/readline/readline_6.3.bb
+++ b/meta/recipes-core/readline/readline_6.3.bb
@@ -1,11 +1,34 @@
require readline.inc
-SRC_URI += "file://configure-fix.patch \
+SRC_URI +=
"${GNU_MIRROR}/readline/readline-6.3-patches/readline63-001;name=patch1;apply=yes;striplevel=0
\
+
${GNU_MIRROR}/readline/readline-6.3-patches/readline63-002;name=patch2;apply=yes;striplevel=0
\
+
${GNU_MIRROR}/readline/readline-6.3-patches/readline63-003;name=patch3;apply=yes;striplevel=0
\
+
${GNU_MIRROR}/readline/readline-6.3-patches/readline63-004;name=patch4;apply=yes;striplevel=0
\
+
${GNU_MIRROR}/readline/readline-6.3-patches/readline63-005;name=patch5;apply=yes;striplevel=0
\
+
${GNU_MIRROR}/readline/readline-6.3-patches/readline63-006;name=patch6;apply=yes;striplevel=0
\
+
${GNU_MIRROR}/readline/readline-6.3-patches/readline63-007;name=patch7;apply=yes;striplevel=0
\
+
${GNU_MIRROR}/readline/readline-6.3-patches/readline63-008;name=patch8;apply=yes;striplevel=0
\
+file://configure-fix.patch \
file://config-dirent-symbols.patch \
-file://norpath.patch \
-file://readline-cve-2014-2524.patch;striplevel=0 \
-file://readline-dispatch-multikey
Re: [OE-core] [PATCH 0/2]: readline fixes
Hi all,
I can see that I missed the [OE-core] tag in this
patch-serie... Please ignore this patchset and I will send up a proper
one shortly.
BR Petter
Petter Mabäcker
Technux
<pet...@technux.se>
www.technux.se
2015-11-24 10:50 skrev Petter
Mabäcker:
> The following changes since commit
1b25a70991589ed1f123015c16ee4806c46e3199:
>
> yocto-project-qs,
ref-manual, poky.ent: CentOS Package updates (2015-11-18 16:42:22
+)
>
> are available in the git repository at:
>
>
git://git.yoctoproject.org/poky-contrib petmab/bug8451
>
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug8451
[1]
>
> Petter Mabäcker (2):
> readline: prepare for readline6.3
upstream patches
> readline: apply missing upstream patches
>
>
.../readline/{files => readline-6.3}/norpath.patch | 0
>
.../readline-6.3/readline-cve-2014-2524.patch | 43
--
>
.../readline-6.3/readline-dispatch-multikey.patch | 32
> meta/recipes-core/readline/readline.inc | 5 +--
>
meta/recipes-core/readline/readline_6.3.bb | 30 ++-
> 5
files changed, 29 insertions(+), 81 deletions(-)
> rename
meta/recipes-core/readline/{files => readline-6.3}/norpath.patch
(100%)
> delete mode 100644
meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch
>
delete mode 100644
meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch
Links:
--
[1]
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug8451
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] readline: prepare for readline6.3 upstream patches
Upstream patches are always preferred to be applied first (before
integration patches). In order to apply readline-6.3 specific upstream
patches in a preferred order we need to apply the integration-patches
at the end in the 6.3 specific recipe (this is already the case
for readline-5.2).
Also take the oppertunity to move 'norpath.patch' to readline-6.3 dir
since this patch is not shared between the 5.2 and 6.3 recipe.
[YOCTO #8451]
Signed-off-by: Petter Mabäcker <pet...@technux.se>
---
meta/recipes-core/readline/{files => readline-6.3}/norpath.patch | 0
meta/recipes-core/readline/readline.inc | 5 +
meta/recipes-core/readline/readline_6.3.bb | 5 -
3 files changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-core/readline/{files => readline-6.3}/norpath.patch (100%)
diff --git a/meta/recipes-core/readline/files/norpath.patch
b/meta/recipes-core/readline/readline-6.3/norpath.patch
similarity index 100%
rename from meta/recipes-core/readline/files/norpath.patch
rename to meta/recipes-core/readline/readline-6.3/norpath.patch
diff --git a/meta/recipes-core/readline/readline.inc
b/meta/recipes-core/readline/readline.inc
index 3f662c3..30892e1 100644
--- a/meta/recipes-core/readline/readline.inc
+++ b/meta/recipes-core/readline/readline.inc
@@ -11,10 +11,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS += "ncurses"
-SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive \
- file://configure-fix.patch \
- file://config-dirent-symbols.patch \
- file://norpath.patch"
+SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive"
inherit autotools texinfo
diff --git a/meta/recipes-core/readline/readline_6.3.bb
b/meta/recipes-core/readline/readline_6.3.bb
index fc362ae..dbb9f0a 100644
--- a/meta/recipes-core/readline/readline_6.3.bb
+++ b/meta/recipes-core/readline/readline_6.3.bb
@@ -1,6 +1,9 @@
require readline.inc
-SRC_URI += "file://readline-cve-2014-2524.patch;striplevel=0 \
+SRC_URI += "file://configure-fix.patch \
+file://config-dirent-symbols.patch \
+file://norpath.patch \
+file://readline-cve-2014-2524.patch;striplevel=0 \
file://readline-dispatch-multikey.patch"
SRC_URI[archive.md5sum] = "33c8fb279e981274f485fd91da77e94a"
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/2]: readline fixes
Hi again
It seems it was the cc mail send-pull-request sent me
that fooled me (the tag was missing there)... But everyrhing seems to be
in order so plz go ahead and review this serie after all =)
Sorry for
the confusion..
Petter Mabäcker
Technux
<pet...@technux.se>
www.technux.se
2015-11-24 11:00 skrev Petter
Mabäcker:
> Hi all,
>
> I can see that I missed the [OE-core] tag in
this patch-serie... Please ignore this patchset and I will send up a
proper one shortly.
>
> BR Petter
>
> Petter Mabäcker
>
> Technux
<pet...@technux.se>
> www.technux.se
>
> 2015-11-24 10:50 skrev Petter
Mabäcker:
>
>> The following changes since commit
1b25a70991589ed1f123015c16ee4806c46e3199:
>>
>> yocto-project-qs,
ref-manual, poky.ent: CentOS Package updates (2015-11-18 16:42:22
+)
>>
>> are available in the git repository at:
>>
>>
git://git.yoctoproject.org/poky-contrib petmab/bug8451
>>
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug8451
[1]
>>
>> Petter Mabäcker (2):
>> readline: prepare for readline6.3
upstream patches
>> readline: apply missing upstream patches
>>
>>
.../readline/{files => readline-6.3}/norpath.patch | 0
>>
.../readline-6.3/readline-cve-2014-2524.patch | 43
--
>>
.../readline-6.3/readline-dispatch-multikey.patch | 32
>> meta/recipes-core/readline/readline.inc | 5 +--
>>
meta/recipes-core/readline/readline_6.3.bb | 30 ++-
>> 5
files changed, 29 insertions(+), 81 deletions(-)
>> rename
meta/recipes-core/readline/{files => readline-6.3}/norpath.patch
(100%)
>> delete mode 100644
meta/recipes-core/readline/readline-6.3/readline-cve-2014-2524.patch
>>
delete mode 100644
meta/recipes-core/readline/readline-6.3/readline-dispatch-multikey.patch
Links:
--
[1]
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug8451
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] create-pull-request: handle empty ODIR
The following changes since commit 1b25a70991589ed1f123015c16ee4806c46e3199: yocto-project-qs, ref-manual, poky.ent: CentOS Package updates (2015-11-18 16:42:22 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib petmab/fix_empty_odir http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/fix_empty_odir Petter Mabäcker (1): create-pull-request: handle empty ODIR scripts/create-pull-request | 8 1 file changed, 8 insertions(+) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] create-pull-request: handle empty ODIR
In some situations you might end-up with an empty ODIR (pull-xx/). The most common reason is that you have applied your patches on 'master' branch (or you are by mistake standing on the 'master' branch), this will result in the default behavior that 'git format-patch' will try to diff master..master. Solve this by aborting the script with a proper error code and message if ODIR is empty after the 'git format-patch' call (that is expected to generate the cover-letter and patches). Signed-off-by: Petter Mabäcker <pet...@technux.se> --- scripts/create-pull-request | 8 1 file changed, 8 insertions(+) diff --git a/scripts/create-pull-request b/scripts/create-pull-request index 19ba588..a3744cc 100755 --- a/scripts/create-pull-request +++ b/scripts/create-pull-request @@ -185,6 +185,14 @@ fi # Generate the patches and cover letter git format-patch $extraopts -M40 --subject-prefix="$PREFIX" -n -o $ODIR --thread=shallow --cover-letter $RELATIVE_TO..$COMMIT_ID > /dev/null +if [ -z "$(ls -A $ODIR 2> /dev/null)" ]; then +echo "ERROR: $ODIR is empty, no cover letter and patches was generated!" +echo " This is most likely due to that \$RRELATIVE_TO..\$COMMIT_ID" +echo " ($RELATIVE_TO..$COMMIT_ID) don't contain any differences." +rmdir $ODIR +exit 1 +fi + [ -n "$RELDIR" ] && cd $pdir # Customize the cover letter -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] readline: Security Advisory - readline - CVE-2014-2524
2015-10-08 06:31 skrev Marko Lindqvist: > On 6 October 2015 at 17:08, Burton, Ross <ross.bur...@intel.com> wrote: > >> On 6 October 2015 at 14:43, Petter Mabäcker <pet...@technux.se> wrote: >> >>> Great. As you will notice also when formatted properly it will not apply due to that readline63-001 and readline63-002 isn't applied so 'patchlevel' is incorrect. That makes me wondering what the patching strategy is? In my opinion we should consider adding the official readline-6.3 patches as well. Should I add a bug report for that or leave it as is (depending on the strategy...)? >> Adding the rest of the patches would have been a sensible thing to do. Right now, we're frozen as we're about to release 2.0, but a bug or patches post-release would be much appreciated. Ross > > The strategy I introduced in 30a38ea1ee933fb134a5ee9000298703cab93692 > was not to add the patches, but to fetch them as upstream source. > That was dropped when readline was updated to 6.3 (maybe there was no > patches for it at the time): > 66bc6f4127e88db18e260c71d181aecfd58c7999 > > - ML Hello Marko, When looking at the dates for the 6.3 integration my guess is that no patches existed for 6.3 yet (compared to the dates for the patches..). I will give it a try to use your 5.2 strategy when applying the 6.3 patches to make it looks the same for both versions. Thanks for pointing this out! BR Petter Petter Mabäcker Technux <pet...@technux.se> www.technux.se -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] readline: Security Advisory - readline - CVE-2014-2524
2015-10-08 04:13 skrev Kang Kai: > On 2015年10月06日 23:30, Petter Mabäcker wrote: > >> 2015-10-06 16:08 skrev Burton, Ross: >> >>> On 6 October 2015 at 14:43, Petter Mabäcker <pet...@technux.se> wrote: >>> >>>> Great. As you will notice also when formatted properly it will not apply due to that readline63-001 and readline63-002 isn't applied so 'patchlevel' is incorrect. That makes me wondering what the patching strategy is? In my opinion we should consider adding the official readline-6.3 patches as well. Should I add a bug report for that or leave it as is (depending on the strategy...)? >>> >>> Adding the rest of the patches would have been a sensible thing to do. Right now, we're frozen as we're about to release 2.0, but a bug or patches post-release would be much appreciated. >>> >>> Ross >> >> I have created a defect and assigned myself (https://bugzilla.yoctoproject.org/show_bug.cgi?id=8451 [1]) and will send something up when the normal integration is open again. >> >> BR Petter > > Sorry for late reply that we had The National Day vacation. I can help for this defect if you please. It's OK, I can send something up for this. See the discussion with Marko within the same thread about a recommended way forward (http://lists.openembedded.org/pipermail/openembedded-core/2015-October/111353.html). If you have any requirements for the verification of the bug please update the bug report with this info. BR Petter > -- > Regards, > Neil | Kai Kang Petter Mabäcker Technux <pet...@technux.se> www.technux.se Links: -- [1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=8451 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] readline: Security Advisory - readline - CVE-2014-2524
2015-10-06 16:08 skrev Burton, Ross: > On 6 October 2015 at 14:43, Petter Mabäcker <pet...@technux.se> wrote: > >> Great. As you will notice also when formatted properly it will not apply due to that readline63-001 and readline63-002 isn't applied so 'patchlevel' is incorrect. That makes me wondering what the patching strategy is? In my opinion we should consider adding the official readline-6.3 patches as well. Should I add a bug report for that or leave it as is (depending on the strategy...)? > > Adding the rest of the patches would have been a sensible thing to do. Right now, we're frozen as we're about to release 2.0, but a bug or patches post-release would be much appreciated. > > Ross I have created a defect and assigned myself (https://bugzilla.yoctoproject.org/show_bug.cgi?id=8451) and will send something up when the normal integration is open again. BR Petter -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] readline: Security Advisory - readline - CVE-2014-2524
Hi Kai, I played around with the new meta-security-isafw layer and the cve-check-tool. In readline the cve CVE-2014-2524 is marked as 'missing' by the framework and I was confused to start with, since I saw that this commit was included. But after looking at the actual patch I realized that it only contains a report and not the patch itself. My question is if that is with purpose and due to some decision that the CVE isn't really causing any harm or if it's by mistake? BR Petter Petter Mabäcker Technux <pet...@technux.se> www.technux.se 2014-10-16 11:48 skrev Kai Kang: > The _rl_tropen function in util.c in GNU readline before 6.3 patch 3 > allows local users to create or overwrite arbitrary files via a symlink > attack on a /var/tmp/rltrace.[PID] file. > > http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-2524 [1] > > Signed-off-by: Yue Tao <yue@windriver.com> > Signed-off-by: Kai Kang <kai.k...@windriver.com> > --- > .../readline/readline-6.3/readline63-003 | 43 ++ > meta/recipes-core/readline/readline_6.3.bb | 2 + > 2 files changed, 45 insertions(+) > create mode 100644 meta/recipes-core/readline/readline-6.3/readline63-003 > > diff --git a/meta/recipes-core/readline/readline-6.3/readline63-003 b/meta/recipes-core/readline/readline-6.3/readline63-003 > new file mode 100644 > index 000..98a9d81 > --- /dev/null > +++ b/meta/recipes-core/readline/readline-6.3/readline63-003 > @@ -0,0 +1,43 @@ > +readline: Security Advisory - readline - CVE-2014-2524 > + > +Upstream-Status: Backport > + > +Signed-off-by: Yue Tao <yue@windriver.com> > + > + READLINE PATCH REPORT > + = > + > +Readline-Release: 6.3 > +Patch-ID: readline63-003 > + > +Bug-Reported-by: > +Bug-Reference-ID: > +Bug-Reference-URL: > + > +Bug-Description: > + > +There are debugging functions in the readline release that are theoretically > +exploitable as security problems. They are not public functions, but have > +global linkage. > + > +Patch (apply with `patch -p0'): > + > +*** ../readline-6.3/util.c 2013-09-02 13:36:12.0 -0400 > +--- util.c 2014-03-20 10:25:53.0 -0400 > +*** > +*** 477,480 > +--- 479,483 > + } > + > ++ #if defined (DEBUG) > + #if defined (USE_VARARGS) > + static FILE *_rl_tracefp; > +*** > +*** 539,542 > +--- 542,546 > + } > + #endif > ++ #endif /* DEBUG */ > + > + > + > diff --git a/meta/recipes-core/readline/readline_6.3.bb b/meta/recipes-core/readline/readline_6.3.bb > index aa30f66..2ae73ea 100644 > --- a/meta/recipes-core/readline/readline_6.3.bb > +++ b/meta/recipes-core/readline/readline_6.3.bb > @@ -1,5 +1,7 @@ > require readline.inc > > +SRC_URI_append = " file://readline63-003" > + > SRC_URI[archive.md5sum] = "33c8fb279e981274f485fd91da77e94a" > SRC_URI[archive.sha256sum] = "56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" > > -- > 1.9.1 Links: -- [1] http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-2524 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] readline: Security Advisory - readline - CVE-2014-2524
2015-10-06 14:58 skrev Burton, Ross: > On 6 October 2015 at 12:23, Petter Mabäcker <pet...@technux.se> wrote: > >> The patch must be applied by something/someone.. For example Debian solves it by doing their own .diff patch (http://http.debian.net/debian/pool/main/r/readline6/readline6_6.3-8.debian.tar.xz [1]). I can send a suggestion about how to solve this in a proper way. > > Whoops, the file wasn't renamed to .patch and even after being renamed, it isn't actually a properly formatted patch. I'll fix this up now. Great. As you will notice also when formatted properly it will not apply due to that readline63-001 and readline63-002 isn't applied so 'patchlevel' is incorrect. That makes me wondering what the patching strategy is? In my opinion we should consider adding the official readline-6.3 patches as well. Should I add a bug report for that or leave it as is (depending on the strategy...)? BR Petter > Thanks for noticing! > > Ross Links: -- [1] http://http.debian.net/debian/pool/main/r/readline6/readline6_6.3-8.debian.tar.xz -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] readline: Security Advisory - readline - CVE-2014-2524
Petter Mabäcker Technux <pet...@technux.se> www.technux.se 2015-10-06 12:06 skrev Burton, Ross: > On 6 October 2015 at 09:11, Petter Mabäcker <pet...@technux.se> wrote: > >> I played around with the new meta-security-isafw layer and the cve-check-tool. In readline the cve CVE-2014-2524 is marked as 'missing' by the framework and I was confused to start with, since I saw that this commit was included. But after looking at the actual patch I realized that it only contains a report and not the patch itself. My question is if that is with purpose and due to some decision that the CVE isn't really causing any harm or if it's by mistake? > > As can be seen at http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00057.html [1] the CVE patch is simply adding a #if defined (DEBUG), which is in the patch included in oe-core master as readline-6.3/readline63-003. > > The tool is probably reporting it as missing as -- if i recall correctly -- it identifies CVE patches by filename. > > Ross Hi Ross, That is correct that the isafw layer assumes that it's named *cve*.patch in order to understand that it's patched in a separate step. But what I really meant was that the file readline63-003 just contains information about the CVE and how to patch the source. It will never be applied on the source, it is just copied to the WORKDIR. $ pwd ~BUILDDIR/tmp/work/core2-64-poky-linux/readline/6.3-r0 $ls build configure-fix.patch norpath.patch readline63-003 temp config-dirent-symbols.patch configure.sstate readline-6.3 readline-dispatch-multikey.patch $ grep DEBUG readline-6.3/util.c $ echo $? 1 The patch must be applied by something/someone.. For example Debian solves it by doing their own .diff patch (http://http.debian.net/debian/pool/main/r/readline6/readline6_6.3-8.debian.tar.xz). I can send a suggestion about how to solve this in a proper way. BR Petter Links: -- [1] http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00057.html -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] kernel-yocto: fix machine_srcrev check in do_patch
The following changes since commit 0aaa67a790ab211b35eed58173efa115ceb6e243: oeqa/bbtests: Fix to ensure DL_DIR is set (2015-07-08 13:09:28 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib petmab/fix_faulty_srcrev_check http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/fix_faulty_srcrev_check Petter Mabäcker (1): kernel-yocto: fix machine_srcrev check in do_patch meta/classes/kernel-yocto.bbclass | 10 ++ 1 file changed, 10 insertions(+) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] kernel-yocto: fix machine_srcrev check in do_patch
do_patch is currently doing checks with machine_srcrev without initiate
it which leads to below (additional debug added):
DEBUG: Executing shell function do_patch
.
.
.
+ [ 0 -ne 0 ]
+ [ != AUTOINC ]
+ git rev-parse --verify ~0
fatal: Needed a single revision
+ git merge-base HEAD
usage: git merge-base [-a|--all] commit commit...
or: git merge-base [-a|--all] --octopus commit...
or: git merge-base --independent commit...
or: git merge-base --is-ancestor commit commit
or: git merge-base --fork-point ref [commit]
-a, --all output all common ancestors
--octopus find ancestors for a single n-way merge
--independent list revs not reachable from others
--is-ancestor is the first one ancestor of the other?
--fork-point find where commit forked from reflog of ref
+ [ = ]
+ set +x
DEBUG: Shell function do_patch finished
Only reason it works today is because 'rev-parse/merge-base' with empty
machine_srcrev
will result in false positive. Solve this by adding a similar non-empty check
and
use SRCREV as fallback as in 'do_kernel_metadata'
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/classes/kernel-yocto.bbclass | 10 ++
1 file changed, 10 insertions(+)
diff --git a/meta/classes/kernel-yocto.bbclass
b/meta/classes/kernel-yocto.bbclass
index 6fd025e..fb14926 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -168,6 +168,16 @@ do_patch() {
# check to see if the specified SRCREV is reachable from the final
branch.
# if it wasn't something wrong has happened, and we should error.
+ machine_srcrev=${SRCREV_machine}
+ if [ -z ${machine_srcrev} ]; then
+ # fallback to SRCREV if a non machine_meta tree is being built
+ machine_srcrev=${SRCREV}
+ # if SRCREV cannot be reached something is wrong.
+ if [ -z ${machine_srcrev} ]; then
+ bbfatal Neither SRCREV_machine or SRCREV was
specified!
+ fi
+ fi
+
if [ ${machine_srcrev} != AUTOINC ]; then
if ! [ $(git rev-parse --verify ${machine_srcrev}~0) = $(git
merge-base ${machine_srcrev} HEAD) ]; then
bberror SRCREV ${machine_srcrev} was specified, but is
not reachable
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] base.bbclass: detect when S has been set incorrectly
No code changes since the RFC version, besides a rebase against latest yocto changes. The following changes since commit 10837473b27aa1708866eb2b1b5701daa984e94e: libxml2: Backport fix for CVE introduced entity issues (2015-01-15 16:55:17 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib petmab/bug5627 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug5627 Petter Mabäcker (5): base.bbclass: detect when S has been set incorrectly makedevs: set and handle S in a proper way lsof: handle S in a proper way xorg-minimal-fonts: set and handle S in a proper way meta: set proper S value meta/classes/base.bbclass | 17 + meta/recipes-bsp/alsa-state/alsa-state.bb | 2 ++ meta/recipes-bsp/hostap/hostap-conf_1.0.bb | 2 ++ meta/recipes-bsp/keymaps/keymaps_1.0.bb | 2 ++ meta/recipes-connectivity/connman/connman-conf.bb | 2 ++ meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb | 2 ++ meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb| 2 ++ meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb | 2 ++ .../initrdscripts/initramfs-framework_1.0.bb| 2 ++ .../initrdscripts/initramfs-live-boot_1.0.bb| 2 ++ .../initramfs-live-install-efi-testfs_1.0.bb| 2 ++ .../initrdscripts/initramfs-live-install-efi_1.0.bb | 2 ++ .../initrdscripts/initramfs-live-install-testfs_1.0.bb | 2 ++ .../initrdscripts/initramfs-live-install_1.0.bb | 2 ++ meta/recipes-core/initscripts/initscripts_1.0.bb| 2 ++ meta/recipes-core/systemd/systemd-systemctl-native.bb | 2 ++ meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 2 +- meta/recipes-core/udev/udev-extraconf_1.1.bb| 2 ++ meta/recipes-devtools/makedevs/makedevs_1.0.1.bb| 6 ++ meta/recipes-devtools/opkg/opkg-collateral.bb | 2 ++ .../recipes-devtools/run-postinsts/run-postinsts_1.0.bb | 2 ++ meta/recipes-extended/lsof/lsof_4.88.bb | 7 +++ meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb | 2 ++ meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 4 +++- .../xorg-xserver/xserver-xf86-config_0.1.bb | 2 ++ .../modutils-initscripts/modutils-initscripts.bb| 3 +++ meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb | 2 ++ meta/recipes-support/ptest-runner/ptest-runner_1.0.bb | 2 ++ 28 files changed, 73 insertions(+), 10 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] lsof: handle S in a proper way
Since lsof are doing two unpacks and S should be set to match
the second unpack of an internal archive, we should let the build
system know that we are aware of this.
Solve this by temporarily set S like lsof are doing with SRC_URI.
[YOCTO #5627]
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-extended/lsof/lsof_4.88.bb | 7 +++
1 file changed, 7 insertions(+)
diff --git a/meta/recipes-extended/lsof/lsof_4.88.bb
b/meta/recipes-extended/lsof/lsof_4.88.bb
index a96b06e..0e49f92 100644
--- a/meta/recipes-extended/lsof/lsof_4.88.bb
+++ b/meta/recipes-extended/lsof/lsof_4.88.bb
@@ -15,9 +15,16 @@ S = ${WORKDIR}/lsof_${PV}_src
LIC_FILES_CHKSUM =
file://${S}/00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a
python do_unpack () {
+# temporarily change S for unpack
+# of lsof_${PV}
+s = d.getVar('S')
+d.setVar('S', '${WORKDIR}/lsof_${PV}')
bb.build.exec_func('base_do_unpack', d)
+# temporarily change SRC_URI for unpack
+# of lsof_${PV}_src
src_uri = d.getVar('SRC_URI')
d.setVar('SRC_URI', '${LOCALSRC}')
+d.setVar('S', s)
bb.build.exec_func('base_do_unpack', d)
d.setVar('SRC_URI', src_uri)
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] base.bbclass: detect when S has been set incorrectly
Currently base.bbclass is creating S if it's not created by unpacking
an archive or fetching a repository. If we avoid creating S we can detect
when S hasn't been set correctly, since it will not exist. Then we can tell
the user that they should set S to a proper value, instead of just failing
with odd errors in later tasks.
Besides removing the auto-creation of S this change will introduce a warning
if S is set incorrectly. The reason for not display an error and return
is due to all external layers that might have recipes that will fail otherwise
and that might be a bit to hard to start with. So use a warning until people
have had a chance to cleanup affected recipes.
[YOCTO #5627]
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/classes/base.bbclass | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index de50be1..789af3b 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -113,7 +113,6 @@ python base_do_fetch() {
addtask unpack after do_fetch
do_unpack[dirs] = ${WORKDIR}
-do_unpack[cleandirs] = ${S}/patches
python base_do_unpack() {
src_uri = (d.getVar('SRC_URI', True) or ).split()
if len(src_uri) == 0:
@@ -121,11 +120,21 @@ python base_do_unpack() {
rootdir = d.getVar('WORKDIR', True)
+# Ensure that we cleanup ${S}/patches
+# TODO: Investigate if we can remove
+# the entire ${S} in this case.
+s_dir = d.getVar('S', True)
+p_dir = os.path.join(s_dir, 'patches')
+bb.utils.remove(p_dir, True)
+
try:
fetcher = bb.fetch2.Fetch(src_uri, d)
fetcher.unpack(rootdir)
except bb.fetch2.BBFetchException as e:
raise bb.build.FuncFailed(e)
+
+if not os.path.exists(s_dir):
+bb.warn(%s ('S') don't exist, you must set 'S' to a proper value %
s_dir)
}
def pkgarch_mapping(d):
@@ -220,7 +229,7 @@ CONFIGURESTAMPFILE = ${WORKDIR}/configure.sstate
CLEANBROKEN = 0
addtask configure after do_patch
-do_configure[dirs] = ${S} ${B}
+do_configure[dirs] = ${B}
do_configure[deptask] = do_populate_sysroot
base_do_configure() {
if [ -n ${CONFIGURESTAMPFILE} -a -e ${CONFIGURESTAMPFILE} ]; then
@@ -238,7 +247,7 @@ base_do_configure() {
}
addtask compile after do_configure
-do_compile[dirs] = ${S} ${B}
+do_compile[dirs] = ${B}
base_do_compile() {
if [ -e Makefile -o -e makefile -o -e GNUmakefile ]; then
oe_runmake || die make failed
@@ -248,7 +257,7 @@ base_do_compile() {
}
addtask install after do_compile
-do_install[dirs] = ${D} ${S} ${B}
+do_install[dirs] = ${D} ${B}
# Remove and re-create ${D} so that is it guaranteed to be empty
do_install[cleandirs] = ${D}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] xorg-minimal-fonts: set and handle S in a proper way
After removal of auto-creating S we must ensure that all recipes are
using a proper value for S. Also do some minor adjustment after changing
value of S.
[YOCTO #5627]
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
index 3688685..bee500b 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
@@ -15,13 +15,15 @@ PR = r2
inherit allarch
+S = ${WORKDIR}/misc
+
PACKAGES = ${PN}
FILES_${PN} = ${libdir}/X11/ ${datadir}/fonts/X11/
RDEPENDS_${PN} += font-alias
do_install() {
install -d ${D}/${datadir}/fonts/X11/misc
- install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/
+ install -m 0644 ${S}/* ${D}/${datadir}/fonts/X11/misc/
install -d ${D}/${libdir}/X11
ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] makedevs: set and handle S in a proper way
After removal of auto-creating S we must ensure that all recipes are
using a proper value for S. Also do some cleanup of code not needed
after changing value of S.
[YOCTO #5627]
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-devtools/makedevs/makedevs_1.0.1.bb | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
index dd9bea2..92d5870 100644
--- a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
+++ b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
@@ -5,11 +5,9 @@ SECTION = base
SRC_URI = file://makedevs.c \
file://COPYING.patch
-FILES_${PN}_append_class-nativesdk = ${datadir}
+S = ${WORKDIR}
-do_configure() {
- install -m 0644 ${WORKDIR}/makedevs.c ${S}/
-}
+FILES_${PN}_append_class-nativesdk = ${datadir}
do_compile() {
${CC} ${CFLAGS} ${LDFLAGS} -o ${S}/makedevs ${S}/makedevs.c
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] meta: set proper S value
After removal of auto-creating S we must ensure that all recipes are
using a proper value for S.
Fix all recipes that only need to set S equals to WORKDIR.
[YOCTO #5627]
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-bsp/alsa-state/alsa-state.bb | 2 ++
meta/recipes-bsp/hostap/hostap-conf_1.0.bb | 2 ++
meta/recipes-bsp/keymaps/keymaps_1.0.bb| 2 ++
meta/recipes-connectivity/connman/connman-conf.bb | 2 ++
meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb | 2 ++
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb | 2 ++
meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb | 2 ++
meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 2 ++
meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb | 2 ++
.../initrdscripts/initramfs-live-install-efi-testfs_1.0.bb | 2 ++
meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb | 2 ++
meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb | 2 ++
meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb | 2 ++
meta/recipes-core/initscripts/initscripts_1.0.bb | 2 ++
meta/recipes-core/systemd/systemd-systemctl-native.bb | 2 ++
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 2 +-
meta/recipes-core/udev/udev-extraconf_1.1.bb | 2 ++
meta/recipes-devtools/opkg/opkg-collateral.bb | 2 ++
meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | 2 ++
meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb | 2 ++
meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb | 2 ++
meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb | 3 +++
meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb| 2 ++
meta/recipes-support/ptest-runner/ptest-runner_1.0.bb | 2 ++
24 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb
b/meta/recipes-bsp/alsa-state/alsa-state.bb
index 17c2d00..d0f7bb3 100644
--- a/meta/recipes-bsp/alsa-state/alsa-state.bb
+++ b/meta/recipes-bsp/alsa-state/alsa-state.bb
@@ -18,6 +18,8 @@ SRC_URI = \
file://alsa-state-init \
+S = ${WORKDIR}
+
# As the recipe doesn't inherit systemd.bbclass, we need to set this variable
# manually to avoid unnecessary postinst/preinst generated.
python __anonymous() {
diff --git a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
index e2c7cc0..e1d4c54 100644
--- a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
+++ b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
@@ -10,6 +10,8 @@ SRC_URI = file://hostap_cs.modalias \
inherit allarch
+S = ${WORKDIR}
+
do_compile() {
}
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
index 925161b..5793a76 100644
--- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
+++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
@@ -26,6 +26,8 @@ SRC_URI = file://keymap.sh \
INITSCRIPT_NAME = keymap.sh
INITSCRIPT_PARAMS = start 01 S .
+S = ${WORKDIR}
+
do_install () {
# Only install the script if 'sysvinit' is in DISTRO_FEATURES
# THe ulitity this script provides could be achieved by
systemd-vconsole-setup.service
diff --git a/meta/recipes-connectivity/connman/connman-conf.bb
b/meta/recipes-connectivity/connman/connman-conf.bb
index af72640..2358d9d 100644
--- a/meta/recipes-connectivity/connman/connman-conf.bb
+++ b/meta/recipes-connectivity/connman/connman-conf.bb
@@ -9,6 +9,8 @@ SRC_URI_append_qemuall = file://wired.config \
PR = r2
+S = ${WORKDIR}
+
PACKAGE_ARCH = ${MACHINE_ARCH}
FILES_${PN} = ${localstatedir}/* ${libdir}/*
diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
index 68b83d0..51a76b4 100644
--- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
+++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
@@ -12,6 +12,8 @@ SRC_URI = file://host-peer \
inherit allarch useradd
+S = ${WORKDIR}
+
do_install() {
install -d ${D}${sysconfdir}/ppp/peers
install -m 0644 ${WORKDIR}/host-peer ${D}${sysconfdir}/ppp/peers/host
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
index 3d88506..733ae41 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
@@ -16,6 +16,8 @@ SRC_URI = file://copyright \
file://interfaces \
file://nfsroot
+S = ${WORKDIR}
+
do_install () {
install -d ${D}${sysconfdir}/init.d \
${D}${sysconfdir}/network
Re: [OE-core] [RFC PATCH 1/5] base.bbclass: detect when S has been set incorrectly
On 01/12/2015 04:53 PM, Paul Eggleton wrote:
Hi Petter,
On Saturday 10 January 2015 15:40:10 Petter Mabäcker wrote:
Currently base.bbclass is creating S if it's not created by unpacking
an archive or fetching a repository. If we avoid creating S we can detect
when S hasn't been set correctly, since it will not exist. Then we can tell
the user that they should set S to a proper value, instead of just failing
with odd errors in later tasks.
Besides removing the auto-creation of S this change will introduce a warning
if S is set incorrectly. The reason for not display an error and return is
due to all external layers that might have recipes that will fail otherwise
and that might be a bit to hard to start with. So use a warning until
people have had a chance to cleanup affected recipes.
[YOCTO #5627]
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/classes/base.bbclass | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index de50be1..789af3b 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -113,7 +113,6 @@ python base_do_fetch() {
addtask unpack after do_fetch
do_unpack[dirs] = ${WORKDIR}
-do_unpack[cleandirs] = ${S}/patches
python base_do_unpack() {
src_uri = (d.getVar('SRC_URI', True) or ).split()
if len(src_uri) == 0:
@@ -121,11 +120,21 @@ python base_do_unpack() {
rootdir = d.getVar('WORKDIR', True)
+# Ensure that we cleanup ${S}/patches
+# TODO: Investigate if we can remove
+# the entire ${S} in this case.
+s_dir = d.getVar('S', True)
+p_dir = os.path.join(s_dir, 'patches')
+bb.utils.remove(p_dir, True)
+
try:
fetcher = bb.fetch2.Fetch(src_uri, d)
fetcher.unpack(rootdir)
except bb.fetch2.BBFetchException as e:
raise bb.build.FuncFailed(e)
+
+if not os.path.exists(s_dir):
+bb.warn(%s ('S') don't exist, you must set 'S' to a proper value
% s_dir) }
def pkgarch_mapping(d):
@@ -220,7 +229,7 @@ CONFIGURESTAMPFILE = ${WORKDIR}/configure.sstate
CLEANBROKEN = 0
addtask configure after do_patch
-do_configure[dirs] = ${S} ${B}
+do_configure[dirs] = ${B}
do_configure[deptask] = do_populate_sysroot
base_do_configure() {
if [ -n ${CONFIGURESTAMPFILE} -a -e ${CONFIGURESTAMPFILE} ]; then
@@ -238,7 +247,7 @@ base_do_configure() {
}
addtask compile after do_configure
-do_compile[dirs] = ${S} ${B}
+do_compile[dirs] = ${B}
base_do_compile() {
if [ -e Makefile -o -e makefile -o -e GNUmakefile ]; then
oe_runmake || die make failed
@@ -248,7 +257,7 @@ base_do_compile() {
}
addtask install after do_compile
-do_install[dirs] = ${D} ${S} ${B}
+do_install[dirs] = ${D} ${B}
# Remove and re-create ${D} so that is it guaranteed to be empty
do_install[cleandirs] = ${D}
This looks reasonable to me; however I'm sure I recall Chris talking about
some kind of complication with this issue a year or so ago - Chris do you
remember what that was about?
Cheers,
Paul
Ok, I will wait and see if Chris remembers anything sneaky about this. I
have run quite some tests without seeing any problems so far. Perhaps it
was about removing ${S} instead of just ${S}/patches in do_unpack ?
Because I think there have been some discussions about that in the past.
I also did some test with that in the scope of 'bug 5627', but it is far
more complex to do such a chance, a lot of recipes didn't liked that at
all =/ It seems more correct to really wipe entire ${S} in that case,
but I guess it have to wait..
BR,
Petter
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH 1/5] base.bbclass: detect when S has been set incorrectly
Currently base.bbclass is creating S if it's not created by unpacking
an archive or fetching a repository. If we avoid creating S we can detect
when S hasn't been set correctly, since it will not exist. Then we can tell
the user that they should set S to a proper value, instead of just failing
with odd errors in later tasks.
Besides removing the auto-creation of S this change will introduce a warning
if S is set incorrectly. The reason for not display an error and return
is due to all external layers that might have recipes that will fail otherwise
and that might be a bit to hard to start with. So use a warning until people
have had a chance to cleanup affected recipes.
[YOCTO #5627]
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/classes/base.bbclass | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index de50be1..789af3b 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -113,7 +113,6 @@ python base_do_fetch() {
addtask unpack after do_fetch
do_unpack[dirs] = ${WORKDIR}
-do_unpack[cleandirs] = ${S}/patches
python base_do_unpack() {
src_uri = (d.getVar('SRC_URI', True) or ).split()
if len(src_uri) == 0:
@@ -121,11 +120,21 @@ python base_do_unpack() {
rootdir = d.getVar('WORKDIR', True)
+# Ensure that we cleanup ${S}/patches
+# TODO: Investigate if we can remove
+# the entire ${S} in this case.
+s_dir = d.getVar('S', True)
+p_dir = os.path.join(s_dir, 'patches')
+bb.utils.remove(p_dir, True)
+
try:
fetcher = bb.fetch2.Fetch(src_uri, d)
fetcher.unpack(rootdir)
except bb.fetch2.BBFetchException as e:
raise bb.build.FuncFailed(e)
+
+if not os.path.exists(s_dir):
+bb.warn(%s ('S') don't exist, you must set 'S' to a proper value %
s_dir)
}
def pkgarch_mapping(d):
@@ -220,7 +229,7 @@ CONFIGURESTAMPFILE = ${WORKDIR}/configure.sstate
CLEANBROKEN = 0
addtask configure after do_patch
-do_configure[dirs] = ${S} ${B}
+do_configure[dirs] = ${B}
do_configure[deptask] = do_populate_sysroot
base_do_configure() {
if [ -n ${CONFIGURESTAMPFILE} -a -e ${CONFIGURESTAMPFILE} ]; then
@@ -238,7 +247,7 @@ base_do_configure() {
}
addtask compile after do_configure
-do_compile[dirs] = ${S} ${B}
+do_compile[dirs] = ${B}
base_do_compile() {
if [ -e Makefile -o -e makefile -o -e GNUmakefile ]; then
oe_runmake || die make failed
@@ -248,7 +257,7 @@ base_do_compile() {
}
addtask install after do_compile
-do_install[dirs] = ${D} ${S} ${B}
+do_install[dirs] = ${D} ${B}
# Remove and re-create ${D} so that is it guaranteed to be empty
do_install[cleandirs] = ${D}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH 3/5] lsof: handle S in a proper way
Since lsof are doing two unpacks and S should be set to match
the second unpack of an internal archive, we should let the build
system know that we are aware of this.
Solve this by temporarily set S like lsof are doing with SRC_URI.
[YOCTO #5627]
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-extended/lsof/lsof_4.88.bb | 7 +++
1 file changed, 7 insertions(+)
diff --git a/meta/recipes-extended/lsof/lsof_4.88.bb
b/meta/recipes-extended/lsof/lsof_4.88.bb
index a96b06e..0e49f92 100644
--- a/meta/recipes-extended/lsof/lsof_4.88.bb
+++ b/meta/recipes-extended/lsof/lsof_4.88.bb
@@ -15,9 +15,16 @@ S = ${WORKDIR}/lsof_${PV}_src
LIC_FILES_CHKSUM =
file://${S}/00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a
python do_unpack () {
+# temporarily change S for unpack
+# of lsof_${PV}
+s = d.getVar('S')
+d.setVar('S', '${WORKDIR}/lsof_${PV}')
bb.build.exec_func('base_do_unpack', d)
+# temporarily change SRC_URI for unpack
+# of lsof_${PV}_src
src_uri = d.getVar('SRC_URI')
d.setVar('SRC_URI', '${LOCALSRC}')
+d.setVar('S', s)
bb.build.exec_func('base_do_unpack', d)
d.setVar('SRC_URI', src_uri)
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH 5/5] meta: set proper S value
After removal of auto-creating S we must ensure that all recipes are
using a proper value for S.
Fix all recipes that only need to set S equals to WORKDIR.
[YOCTO #5627]
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-bsp/alsa-state/alsa-state.bb | 2 ++
meta/recipes-bsp/hostap/hostap-conf_1.0.bb | 2 ++
meta/recipes-bsp/keymaps/keymaps_1.0.bb| 2 ++
meta/recipes-connectivity/connman/connman-conf.bb | 2 ++
meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb | 2 ++
meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb | 2 ++
meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb | 2 ++
meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 2 ++
meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb | 2 ++
.../initrdscripts/initramfs-live-install-efi-testfs_1.0.bb | 2 ++
meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb | 2 ++
meta/recipes-core/initrdscripts/initramfs-live-install-testfs_1.0.bb | 2 ++
meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb | 2 ++
meta/recipes-core/initscripts/initscripts_1.0.bb | 2 ++
meta/recipes-core/systemd/systemd-systemctl-native.bb | 2 ++
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 2 +-
meta/recipes-core/udev/udev-extraconf_1.1.bb | 2 ++
meta/recipes-devtools/opkg/opkg-collateral.bb | 2 ++
meta/recipes-devtools/run-postinsts/run-postinsts_1.0.bb | 2 ++
meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb | 2 ++
meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb | 2 ++
meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb | 3 +++
meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb| 2 ++
meta/recipes-support/ptest-runner/ptest-runner_1.0.bb | 2 ++
24 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/alsa-state/alsa-state.bb
b/meta/recipes-bsp/alsa-state/alsa-state.bb
index 17c2d00..d0f7bb3 100644
--- a/meta/recipes-bsp/alsa-state/alsa-state.bb
+++ b/meta/recipes-bsp/alsa-state/alsa-state.bb
@@ -18,6 +18,8 @@ SRC_URI = \
file://alsa-state-init \
+S = ${WORKDIR}
+
# As the recipe doesn't inherit systemd.bbclass, we need to set this variable
# manually to avoid unnecessary postinst/preinst generated.
python __anonymous() {
diff --git a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
index e2c7cc0..e1d4c54 100644
--- a/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
+++ b/meta/recipes-bsp/hostap/hostap-conf_1.0.bb
@@ -10,6 +10,8 @@ SRC_URI = file://hostap_cs.modalias \
inherit allarch
+S = ${WORKDIR}
+
do_compile() {
}
diff --git a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
index 925161b..5793a76 100644
--- a/meta/recipes-bsp/keymaps/keymaps_1.0.bb
+++ b/meta/recipes-bsp/keymaps/keymaps_1.0.bb
@@ -26,6 +26,8 @@ SRC_URI = file://keymap.sh \
INITSCRIPT_NAME = keymap.sh
INITSCRIPT_PARAMS = start 01 S .
+S = ${WORKDIR}
+
do_install () {
# Only install the script if 'sysvinit' is in DISTRO_FEATURES
# THe ulitity this script provides could be achieved by
systemd-vconsole-setup.service
diff --git a/meta/recipes-connectivity/connman/connman-conf.bb
b/meta/recipes-connectivity/connman/connman-conf.bb
index af72640..2358d9d 100644
--- a/meta/recipes-connectivity/connman/connman-conf.bb
+++ b/meta/recipes-connectivity/connman/connman-conf.bb
@@ -9,6 +9,8 @@ SRC_URI_append_qemuall = file://wired.config \
PR = r2
+S = ${WORKDIR}
+
PACKAGE_ARCH = ${MACHINE_ARCH}
FILES_${PN} = ${localstatedir}/* ${libdir}/*
diff --git a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
index 68b83d0..51a76b4 100644
--- a/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
+++ b/meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb
@@ -12,6 +12,8 @@ SRC_URI = file://host-peer \
inherit allarch useradd
+S = ${WORKDIR}
+
do_install() {
install -d ${D}${sysconfdir}/ppp/peers
install -m 0644 ${WORKDIR}/host-peer ${D}${sysconfdir}/ppp/peers/host
diff --git a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
index 3d88506..733ae41 100644
--- a/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
+++ b/meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb
@@ -16,6 +16,8 @@ SRC_URI = file://copyright \
file://interfaces \
file://nfsroot
+S = ${WORKDIR}
+
do_install () {
install -d ${D}${sysconfdir}/init.d \
${D}${sysconfdir}/network
[OE-core] [RFC PATCH 2/5] makedevs: set and handle S in a proper way
After removal of auto-creating S we must ensure that all recipes are
using a proper value for S. Also do some cleanup of code not needed
after changing value of S.
[YOCTO #5627]
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-devtools/makedevs/makedevs_1.0.1.bb | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
index dd9bea2..92d5870 100644
--- a/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
+++ b/meta/recipes-devtools/makedevs/makedevs_1.0.1.bb
@@ -5,11 +5,9 @@ SECTION = base
SRC_URI = file://makedevs.c \
file://COPYING.patch
-FILES_${PN}_append_class-nativesdk = ${datadir}
+S = ${WORKDIR}
-do_configure() {
- install -m 0644 ${WORKDIR}/makedevs.c ${S}/
-}
+FILES_${PN}_append_class-nativesdk = ${datadir}
do_compile() {
${CC} ${CFLAGS} ${LDFLAGS} -o ${S}/makedevs ${S}/makedevs.c
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH 0/5] base.bbclass: detect when S has been set incorrectly
From: Peter Mabacker pet...@technux.se This is my proposed solution for [YOCTO #5627]. I'm will gratefully recieve feedback regarding especially the removal of auto-create 'S' in base.bbclass and if 'S' not set to a proper value, should generate a warning or error. I have chosen a warning (at least to start with). Since a lot of recipes have faulty $S (for example S=WORKDIR/$PN (default) instead of S=WORKDIR), you might assume that a lot of external layers have recipes with this problem as well and display an error and abort might be a bit to hard. At least until people have had the chance to clean this up. So the suggestion is to start with a warning and consider changing this to error later on (in 1.9?). The following changes since commit 876370419a50264a28feb4278f8c465b0019e709: bitbake: toaster: implementation of project page (2015-01-08 22:34:38 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib petmab/bug5627 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug5627 Petter Mabäcker (5): base.bbclass: detect when S has been set incorrectly makedevs: set and handle S in a proper way lsof: handle S in a proper way xorg-minimal-fonts: set and handle S in a proper way meta: set proper S value meta/classes/base.bbclass | 17 + meta/recipes-bsp/alsa-state/alsa-state.bb | 2 ++ meta/recipes-bsp/hostap/hostap-conf_1.0.bb | 2 ++ meta/recipes-bsp/keymaps/keymaps_1.0.bb | 2 ++ meta/recipes-connectivity/connman/connman-conf.bb | 2 ++ meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb | 2 ++ meta/recipes-core/init-ifupdown/init-ifupdown_1.0.bb| 2 ++ meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb | 2 ++ .../initrdscripts/initramfs-framework_1.0.bb| 2 ++ .../initrdscripts/initramfs-live-boot_1.0.bb| 2 ++ .../initramfs-live-install-efi-testfs_1.0.bb| 2 ++ .../initrdscripts/initramfs-live-install-efi_1.0.bb | 2 ++ .../initrdscripts/initramfs-live-install-testfs_1.0.bb | 2 ++ .../initrdscripts/initramfs-live-install_1.0.bb | 2 ++ meta/recipes-core/initscripts/initscripts_1.0.bb| 2 ++ meta/recipes-core/systemd/systemd-systemctl-native.bb | 2 ++ meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 2 +- meta/recipes-core/udev/udev-extraconf_1.1.bb| 2 ++ meta/recipes-devtools/makedevs/makedevs_1.0.1.bb| 6 ++ meta/recipes-devtools/opkg/opkg-collateral.bb | 2 ++ .../recipes-devtools/run-postinsts/run-postinsts_1.0.bb | 2 ++ meta/recipes-extended/lsof/lsof_4.88.bb | 7 +++ meta/recipes-extended/shadow/shadow-securetty_4.2.1.bb | 2 ++ meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 4 +++- .../xorg-xserver/xserver-xf86-config_0.1.bb | 2 ++ .../modutils-initscripts/modutils-initscripts.bb| 3 +++ meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb | 2 ++ meta/recipes-support/ptest-runner/ptest-runner_1.0.bb | 2 ++ 28 files changed, 73 insertions(+), 10 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC PATCH 4/5] xorg-minimal-fonts: set and handle S in a proper way
After removal of auto-creating S we must ensure that all recipes are
using a proper value for S. Also do some minor adjustment after changing
value of S.
[YOCTO #5627]
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
index 3688685..bee500b 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
@@ -15,13 +15,15 @@ PR = r2
inherit allarch
+S = ${WORKDIR}/misc
+
PACKAGES = ${PN}
FILES_${PN} = ${libdir}/X11/ ${datadir}/fonts/X11/
RDEPENDS_${PN} += font-alias
do_install() {
install -d ${D}/${datadir}/fonts/X11/misc
- install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/
+ install -m 0644 ${S}/* ${D}/${datadir}/fonts/X11/misc/
install -d ${D}/${libdir}/X11
ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s
}
--
1.9.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 02/13] dbus: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-core/dbus/dbus-test_1.6.18.bb |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/dbus/dbus-test_1.6.18.bb
b/meta/recipes-core/dbus/dbus-test_1.6.18.bb
index 9ea0f4d..6ec9dfe 100644
--- a/meta/recipes-core/dbus/dbus-test_1.6.18.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.6.18.bb
@@ -23,7 +23,7 @@ SRC_URI[md5sum] = b02e9c95027a416987b81f9893831061
SRC_URI[sha256sum] =
7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd
S=${WORKDIR}/dbus-${PV}
-FILESPATH = ${FILE_DIRNAME}/dbus
+FILESEXTRAPATHS =. ${FILE_DIRNAME}/dbus:
inherit autotools pkgconfig gettext ptest
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 03/13] gstreamer: remove unused FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in gstreamer no FILESPATH additions are currently needed so
instead it should be removed.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-multimedia/gstreamer/gst-plugins.inc |2 --
.../gstreamer/gstreamer1.0-plugins.inc |2 --
2 files changed, 4 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index b2d3d3c..2697609 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -6,8 +6,6 @@ DEPENDS = gstreamer
inherit autotools pkgconfig
-FILESPATH =. ${FILE_DIRNAME}/gst-plugins:
-
SRC_URI = http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2;
GSTREAMER_DEBUG ?= --disable-debug
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
index 4ab8ea8..687aa2f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
@@ -6,8 +6,6 @@ DEPENDS = gstreamer1.0
inherit autotools pkgconfig
-FILESPATH =. ${FILE_DIRNAME}/gst-plugins:
-
GSTREAMER_1_0_DEBUG ?= --disable-debug
GSTREAMER_1_0_GIT_BRANCH ?= master
EXTRA_OECONF = --disable-valgrind ${GSTREAMER_1_0_DEBUG} --disable-examples
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 09/13] gcc: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-devtools/gcc/gcc-4.8.inc |4 ++--
meta/recipes-devtools/gcc/gcc-4.9.inc |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc
b/meta/recipes-devtools/gcc/gcc-4.8.inc
index 42b4212..aa822cf 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -8,7 +8,7 @@ PV = 4.8.2
BINV = 4.8.2
-FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.8' ], d)}
+FILESEXTRAPATHS =. ${FILE_DIRNAME}/gcc-4.8:
DEPENDS =+ mpfr gmp libmpc zlib
NATIVEDEPS = mpfr-native gmp-native libmpc-native zlib-native
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
- file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8
+ file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8
SRC_URI = ${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://0002-uclibc-conf.patch \
diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc
b/meta/recipes-devtools/gcc/gcc-4.9.inc
index 865ec47..a409430 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
@@ -8,7 +8,7 @@ PV = 4.9.0
BINV = 4.9.0
-FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.9' ], d)}
+FILESEXTRAPATHS =. ${FILE_DIRNAME}/gcc-4.9:
DEPENDS =+ mpfr gmp libmpc zlib
NATIVEDEPS = mpfr-native gmp-native libmpc-native zlib-native
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
- file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8
+ file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8
SRC_URI = ${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 00/13] Remove usage of FILESPATH
v2 of the changeset.
Fixes [YOCTO #4497]
We extend the search path in a number of recipes by setting FILESPATH,
which is not really desirable since the manner in which we have done it
can make the recipe harder to bbappend (and we explicitly advise modifying
FILESPATH this in the manual).
The following changes since commit 646b089c38623cebe4a6b22c6798d21453fe5257:
bitbake: toaster: modify SQL data type constraints (2014-05-08 16:18:12 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib petmab/bug/4497_v3
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug/4497_v3
Petter Mabäcker (13):
systemtap: remove usage of FILESPATH
dbus: remove usage of FILESPATH
gstreamer: remove unused FILESPATH
trace-cmd: refactoring recipe
xorg-lib: remove usage of FILESPATH
mesa: remove usage of FILESPATH
qemu: remove unused FILESPATH
linuxdoc-tools: remove usage of FILESPATH
gcc: remove usage of FILESPATH
python: remove usage of FILESPATH
u-boot: remove unused FILESPATH
uclibc: remove usage of FILESPATH
eglibc: remove usage of FILESPATH
meta/recipes-bsp/u-boot/u-boot.inc |1 -
meta/recipes-core/dbus/dbus-test_1.6.18.bb |2 +-
.../fix_for_centos_5.8.patch |0
.../eglibc/cross-localedef-native_2.19.bb |3 +--
meta/recipes-core/eglibc/eglibc_2.19.bb|4 +---
meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb |2 +-
meta/recipes-core/uclibc/uclibc-git.inc|4 ++--
meta/recipes-devtools/gcc/gcc-4.8.inc |4 ++--
meta/recipes-devtools/gcc/gcc-4.9.inc |4 ++--
.../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb |3 ---
.../disable_dvips_doc.patch|0
.../disable_sgml2rtf.patch |0
.../disable_tex_doc.patch |0
.../disable_txt_doc.patch |0
.../recipes-devtools/python/python-native_2.7.3.bb |2 +-
.../python/python-pygobject_2.28.3.bb |1 -
.../qemu/nativesdk-qemu-helper_1.0.bb |1 -
meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb|2 +-
meta/recipes-graphics/xorg-lib/libx11.inc |2 +-
.../systemtap/systemtap-uprobes_git.bb |2 ++
meta/recipes-kernel/systemtap/systemtap_git.inc|2 --
.../kernelshark-fix-syntax-error-of-shell.patch|0
meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb | 18 --
meta/recipes-kernel/trace-cmd/trace-cmd.inc| 14 ++
meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb | 16
meta/recipes-multimedia/gstreamer/gst-plugins.inc |2 --
.../gstreamer/gstreamer1.0-plugins.inc |2 --
27 files changed, 37 insertions(+), 54 deletions(-)
rename meta/recipes-core/eglibc/{eglibc-2.19 =
cross-localedef-native-2.19}/fix_for_centos_5.8.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_dvips_doc.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_sgml2rtf.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_tex_doc.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_txt_doc.patch (100%)
rename meta/recipes-kernel/trace-cmd/{trace-cmd =
kernelshark}/kernelshark-fix-syntax-error-of-shell.patch (100%)
create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd.inc
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 11/13] u-boot: remove unused FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in u-boot no FILESPATH additions are currently needed so
instead it should be removed.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-bsp/u-boot/u-boot.inc |1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc
b/meta/recipes-bsp/u-boot/u-boot.inc
index cb50949..d826a40 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -65,7 +65,6 @@ do_install () {
}
FILES_${PN} = /boot ${sysconfdir}
-FILESPATH =. ${FILE_DIRNAME}/u-boot-git/${MACHINE}:
do_deploy () {
install -d ${DEPLOYDIR}
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 10/13] python: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the
path. Don't migrate paths that already exist in base FILESPATH to
FILESEXTRAPATHS.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../recipes-devtools/python/python-native_2.7.3.bb |2 +-
.../python/python-pygobject_2.28.3.bb |1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb
b/meta/recipes-devtools/python/python-native_2.7.3.bb
index 0c66d27..b2a36b4 100644
--- a/meta/recipes-devtools/python/python-native_2.7.3.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
@@ -21,7 +21,7 @@ SRC_URI += \
S = ${WORKDIR}/Python-${PV}
-FILESPATH = ${FILE_DIRNAME}/python-native/:${FILE_DIRNAME}/python/
+FILESEXTRAPATHS =. ${FILE_DIRNAME}/${PN}:
inherit native
diff --git a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
index 9dbe47c..2e65b38 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
@@ -16,7 +16,6 @@ SRC_URI[md5sum] = aa64900b274c4661a5c32e52922977f9
SRC_URI[sha256sum] =
7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6
S = ${WORKDIR}/pygobject-${PV}
-FILESPATH = ${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files
EXTRA_OECONF += --disable-introspection
PARALLEL_MAKEINST =
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 12/13] uclibc: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-core/uclibc/uclibc-git.inc |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/uclibc/uclibc-git.inc
b/meta/recipes-core/uclibc/uclibc-git.inc
index 0649aca..69e834d 100644
--- a/meta/recipes-core/uclibc/uclibc-git.inc
+++ b/meta/recipes-core/uclibc/uclibc-git.inc
@@ -2,7 +2,7 @@ SRCREV=5eddde8f094ef52dca06695cc598e3b2556dcccb
PV = 0.9.33+git${SRCPV}
-FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}
+FILESEXTRAPATHS =. ${FILE_DIRNAME}/uclibc-git:
SRC_URI = git://uclibc.org/uClibc.git;branch=master \
file://uClibc.machine \
@@ -24,6 +24,6 @@ SRC_URI = git://uclibc.org/uClibc.git;branch=master \
file://0001-Add-eventfd_read-and-eventfd_write.patch \
file://0002-wire-setns-syscall.patch \
file://0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch \
-file://0004-Add-clock_adjtime-syscall.patch \
+ file://0004-Add-clock_adjtime-syscall.patch \
S = ${WORKDIR}/git
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 06/13] mesa: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Also remove unused filespath addition.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
index 8c7d8e8..2acc21d 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
@@ -2,7 +2,7 @@ require mesa_${PV}.bb
SUMMARY += (OpenGL only, no EGL/GLES)
-FILESPATH = ${@base_set_filespath([${FILE_DIRNAME}/mesa-${PV},
${FILE_DIRNAME}/mesa], d)}
+FILESEXTRAPATHS =. ${FILE_DIRNAME}/mesa:
PROVIDES = virtual/libgl virtual/mesa
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 07/13] qemu: remove unused FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in nativesdk-qemu-helper no FILESPATH additions are currently needed so
instead it should be removed.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../qemu/nativesdk-qemu-helper_1.0.bb |1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
index fe03b82..51d1c59 100644
--- a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
+++ b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
@@ -3,7 +3,6 @@ LICENSE = GPLv2
RDEPENDS_${PN} = nativesdk-qemu
PR = r9
-FILESPATH = ${FILE_DIRNAME}/qemu-helper
LIC_FILES_CHKSUM =
file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999 \
file://${COREBASE}/scripts/runqemu;endline=18;md5=77fbe442a88b1bcdc29c3ba67733b21b
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 01/13] systemtap: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../systemtap/systemtap-uprobes_git.bb |2 ++
meta/recipes-kernel/systemtap/systemtap_git.inc|2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
index ab9acba..4d2bec4 100644
--- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
@@ -11,6 +11,8 @@ ALLOW_EMPTY_${PN} = 1
inherit module-base gettext
+FILESEXTRAPATHS =. ${FILE_DIRNAME}/systemtap:
+
FILES_${PN} += ${datadir}/systemtap/runtime/uprobes
EXTRA_OEMAKE =
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc
b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 78439c1..717d66f 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -8,8 +8,6 @@ SRC_URI = git://sourceware.org/git/systemtap.git \
file://obsolete_automake_macros.patch \
-FILESPATH = ${FILE_DIRNAME}/systemtap
-
# systemtap doesn't support mips
COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64).*-linux'
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 04/13] trace-cmd: refactoring recipe
Fixes [YOCTO #4497]
Refactoring recipe to avoid duplicated entries in trace-cmd and
kernelshark bb-files. Also remove usage of FILESPATH and split package
unique patches into separate dirs.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../kernelshark-fix-syntax-error-of-shell.patch|0
meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb | 18 --
meta/recipes-kernel/trace-cmd/trace-cmd.inc| 14 ++
meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb | 16
4 files changed, 22 insertions(+), 26 deletions(-)
rename meta/recipes-kernel/trace-cmd/{trace-cmd =
kernelshark}/kernelshark-fix-syntax-error-of-shell.patch (100%)
create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd.inc
diff --git
a/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
b/meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch
similarity index 100%
rename from
meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
rename to
meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
index d61097d..e64abe2 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
@@ -1,28 +1,18 @@
SUMMARY = Graphical trace viewer for Ftrace
LICENSE = GPLv2
+
+require trace-cmd.inc
+
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e
-SRCREV = 7055ffd37beeb44714e86a4abc703f7e175a0db5
-PR = r3
-PV = 1.2+git${SRCPV}
-
DEPENDS = gtk+
RDEPENDS_${PN} = trace-cmd
-inherit pkgconfig pythonnative
-
-SRC_URI = git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
\
- file://addldflags.patch \
- file://make-docs-optional.patch \
- file://blktrace-api-compatibility.patch \
- file://kernelshark-fix-syntax-error-of-shell.patch
-S = ${WORKDIR}/git
+SRC_URI_append = file://kernelshark-fix-syntax-error-of-shell.patch
EXTRA_OEMAKE = 'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui
-FILESPATH = ${FILE_DIRNAME}/trace-cmd
-
do_install() {
oe_runmake CC=${CC} AR=${AR} prefix=${prefix} DESTDIR=${D}
install_gui
rm -rf ${D}${datadir}/trace-cmd
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd.inc
b/meta/recipes-kernel/trace-cmd/trace-cmd.inc
new file mode 100644
index 000..fb8c5fa
--- /dev/null
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd.inc
@@ -0,0 +1,14 @@
+SRCREV = 7055ffd37beeb44714e86a4abc703f7e175a0db5
+PR = r3
+PV = 1.2+git${SRCPV}
+
+inherit pkgconfig pythonnative
+
+FILESEXTRAPATHS =. ${FILE_DIRNAME}/trace-cmd:
+
+SRC_URI = git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
\
+ file://addldflags.patch \
+ file://make-docs-optional.patch \
+ file://blktrace-api-compatibility.patch \
+
+S = ${WORKDIR}/git
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
index a0c823b..6f3319d 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
@@ -1,26 +1,18 @@
SUMMARY = User interface to Ftrace
LICENSE = GPLv2 LGPLv2.1
+
+require trace-cmd.inc
+
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \
file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
file://trace-input.c;beginline=5;endine=8;md5=6ad47cc2b03385d8456771eec5eeea0b
-SRCREV = 7055ffd37beeb44714e86a4abc703f7e175a0db5
-PR = r3
-PV = 1.2+git${SRCPV}
-
-inherit pkgconfig pythonnative
-
-SRC_URI = git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
\
- file://addldflags.patch \
- file://make-docs-optional.patch \
- file://blktrace-api-compatibility.patch \
- file://trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch \
+SRC_URI_append =
file://trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch \
file://trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch \
file://trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch \
file://trace-cmd-fix-syntax-error-of-shell.patch \
-S = ${WORKDIR}/git
EXTRA_OEMAKE = 'prefix=${prefix}'
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 13/13] eglibc: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder
to bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
If possible try to use any of the default FILESPATH dirs.
Also remove superfluous comment and do minor indentation fix.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../fix_for_centos_5.8.patch |0
.../eglibc/cross-localedef-native_2.19.bb |3 +--
meta/recipes-core/eglibc/eglibc_2.19.bb|4 +---
meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb |2 +-
4 files changed, 3 insertions(+), 6 deletions(-)
rename meta/recipes-core/eglibc/{eglibc-2.19 =
cross-localedef-native-2.19}/fix_for_centos_5.8.patch (100%)
diff --git a/meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch
b/meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch
similarity index 100%
rename from meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch
rename to
meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch
diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
index 3ce0e1d..1c13eb8 100644
--- a/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
+++ b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
@@ -13,8 +13,7 @@ LIC_FILES_CHKSUM =
file://${LIC_DIR}/LICENSES;md5=e9a558e243b36d3209f380deb394b
inherit native
inherit autotools
-# pick up an eglibc patch
-FILESPATH = ${FILE_DIRNAME}/eglibc-${PV}
+FILESEXTRAPATHS =. ${FILE_DIRNAME}/${P}:
SRC_URI =
http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25243.tar.bz2
\
file://fix_for_centos_5.8.patch;patchdir=.. \
diff --git a/meta/recipes-core/eglibc/eglibc_2.19.bb
b/meta/recipes-core/eglibc/eglibc_2.19.bb
index 8f09676..1ddce82 100644
--- a/meta/recipes-core/eglibc/eglibc_2.19.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.19.bb
@@ -24,7 +24,7 @@ SRC_URI =
http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25
file://0001-R_ARM_TLS_DTPOFF32.patch \
file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
file://fix-tibetian-locales.patch \
- file://ppce6500-32b_slow_ieee754_sqrt.patch \
+ file://ppce6500-32b_slow_ieee754_sqrt.patch \
SRC_URI[md5sum] = 197836c2ba42fb146e971222647198dd
SRC_URI[sha256sum] =
baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c
@@ -49,8 +49,6 @@ TARGET_CPPFLAGS = -I${STAGING_DIR_TARGET}${includedir}
GLIBC_BROKEN_LOCALES = _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER
bn_BD te_IN es_CR.ISO-8859-1
-FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}',
'${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}
-
#
# For now, we will skip building of a gcc package if it is a uclibc one
# and our build is not a uclibc one, and we skip a glibc one if our build
diff --git a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
index 75ffbf6..7c34635 100644
--- a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
+++ b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
@@ -16,7 +16,7 @@ SRC_URI = file://ldconfig-native-2.12.1.tar.bz2 \
PR = r2
-FILESPATH = ${FILE_DIRNAME}/${PN}-${PV}/
+FILESEXTRAPATHS =. ${FILE_DIRNAME}/${P}:
inherit native
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 05/13] xorg-lib: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-graphics/xorg-lib/libx11.inc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc
b/meta/recipes-graphics/xorg-lib/libx11.inc
index e07d42d..b04eafb 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -8,7 +8,7 @@ require xorg-lib-common.inc
inherit siteinfo
-FILESPATH = ${FILE_DIRNAME}/libx11
+FILESEXTRAPATHS =. ${FILE_DIRNAME}/libx11:
PE = 1
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv3 08/13] linuxdoc-tools: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb |3 ---
.../disable_dvips_doc.patch|0
.../disable_sgml2rtf.patch |0
.../disable_tex_doc.patch |0
.../disable_txt_doc.patch |0
5 files changed, 3 deletions(-)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_dvips_doc.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_sgml2rtf.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_tex_doc.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_txt_doc.patch (100%)
diff --git
a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
index fce4178..ed6ab73 100644
--- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
+++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=077ef64ec3ac257fb0d786531cf26931
DEPENDS = groff-native openjade-native
-
SRC_URI =
${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.orig.tar.gz \
file://disable_sgml2rtf.patch \
file://disable_txt_doc.patch \
@@ -15,8 +14,6 @@ SRC_URI =
${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.orig.tar.
SRC_URI[md5sum] = 1d13d500918a7a145b0edc2f16f61dd1
SRC_URI[sha256sum] =
7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101
-FILESPATH = ${FILE_DIRNAME}/linuxdoc-tools-native/
-
inherit autotools-brokensep native
do_configure () {
diff --git
a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch
b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch
similarity index 100%
rename from
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch
rename to
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch
diff --git
a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch
similarity index 100%
rename from
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
rename to
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch
diff --git
a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch
b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch
similarity index 100%
rename from
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch
rename to
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch
diff --git
a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch
b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch
similarity index 100%
rename from
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch
rename to
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2 01/13] systemtap: remove usage of FILESPATH
On 05/11/2014 02:13 PM, Richard Purdie wrote:
On Sun, 2014-05-11 at 00:31 +0200, pet...@technux.se wrote:
2014-05-10 18:58 skrev Khem Raj:
On Sat, May 10, 2014 at 1:05 AM, Petter Mabäcker pet...@technux.se
wrote:
+FILESEXTRAPATHS_prepend := ${THISDIR}/systemtap:
would something like
FILESEXTRAPATHS =. ${FILE_DIRNAME}/systemtap:
avoid the prepend and immediate evaluation
I guess someone with deep bitbake knowledge can answer this better. But
as far as I understand, you should always use immediate evaluation when
using THISDIR, to be extra safe. Not sure if it's more safe to use
FILE_DIRNAME if you want to avoid immediate expanding when using
FILESEXTRAPATHS?
The bitbake documentations says:
The operators _append and _prepend differ from the operators .=
and =. in that they are deferred until after parsing completes rather
than being immediately applied.
Not sure if above means that =. will also immediately expand
variables or not?
They're not.
Personally I have always used FILESEXTRAPATHS_prepend :=
${THISDIR}/somename: like the yocto documentation recommends. But
sure if you can avoid immediate expanding in FILESEXTRPATHS, that would
mean a tiny optimization. In that case perhaps the documentation should
be updated as well. Looking in meta-layer both methods seems to be used.
What Khem means is that in the case we know we're in the .bb file
directory, we can use FILE_DIRNAME instead of using :=.
Why? FILE_DIRNAME is defined as:
conf/bitbake.conf:FILE_DIRNAME = ${@os.path.dirname(d.getVar('FILE'))}
FILE will point to the .bb file.
Cheers,
Richard
Ok, that makes sense. I will send up a new changeset using this method
instead.
BR,
Petter
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 05/13] xorg-lib: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-graphics/xorg-lib/libx11.inc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc
b/meta/recipes-graphics/xorg-lib/libx11.inc
index e07d42d..6c45828 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -8,7 +8,7 @@ require xorg-lib-common.inc
inherit siteinfo
-FILESPATH = ${FILE_DIRNAME}/libx11
+FILESEXTRAPATHS_prepend := ${THISDIR}/libx11:
PE = 1
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 01/13] systemtap: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../systemtap/systemtap-uprobes_git.bb |2 ++
meta/recipes-kernel/systemtap/systemtap_git.inc|2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
index ab9acba..7d76b52 100644
--- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
@@ -11,6 +11,8 @@ ALLOW_EMPTY_${PN} = 1
inherit module-base gettext
+FILESEXTRAPATHS_prepend := ${THISDIR}/systemtap:
+
FILES_${PN} += ${datadir}/systemtap/runtime/uprobes
EXTRA_OEMAKE =
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc
b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 78439c1..717d66f 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -8,8 +8,6 @@ SRC_URI = git://sourceware.org/git/systemtap.git \
file://obsolete_automake_macros.patch \
-FILESPATH = ${FILE_DIRNAME}/systemtap
-
# systemtap doesn't support mips
COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64).*-linux'
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 00/13] Remove usage of FILESPATH
v2 of the changeset.
Fixes [YOCTO #4497]
We extend the search path in a number of recipes by setting FILESPATH,
which is not really desirable since the manner in which we have done it
can make the recipe harder to bbappend (and we explicitly advise modifying
FILESPATH this in the manual).
The following changes since commit 646b089c38623cebe4a6b22c6798d21453fe5257:
bitbake: toaster: modify SQL data type constraints (2014-05-08 16:18:12 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib petmab/bug/4497_v2
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug/4497_v2
Petter Mabäcker (13):
systemtap: remove usage of FILESPATH
dbus: remove usage of FILESPATH
gstreamer: remove unused FILESPATH
trace-cmd: refactoring recipe
xorg-lib: remove usage of FILESPATH
mesa: remove usage of FILESPATH
qemu: remove unused FILESPATH
linuxdoc-tools: remove usage of FILESPATH
gcc: remove usage of FILESPATH
python: remove usage of FILESPATH
u-boot: remove unused FILESPATH
uclibc: remove usage of FILESPATH
eglibc: remove usage of FILESPATH
meta/recipes-bsp/u-boot/u-boot.inc |1 -
meta/recipes-core/dbus/dbus-test_1.6.18.bb |2 +-
.../fix_for_centos_5.8.patch |0
.../eglibc/cross-localedef-native_2.19.bb |3 +--
meta/recipes-core/eglibc/eglibc_2.19.bb|4 +---
meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb |2 +-
meta/recipes-core/uclibc/uclibc-git.inc|4 ++--
meta/recipes-devtools/gcc/gcc-4.8.inc |4 ++--
meta/recipes-devtools/gcc/gcc-4.9.inc |4 ++--
.../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb |3 ---
.../disable_dvips_doc.patch|0
.../disable_sgml2rtf.patch |0
.../disable_tex_doc.patch |0
.../disable_txt_doc.patch |0
.../recipes-devtools/python/python-native_2.7.3.bb |2 +-
.../python/python-pygobject_2.28.3.bb |1 -
.../qemu/nativesdk-qemu-helper_1.0.bb |1 -
meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb|2 +-
meta/recipes-graphics/xorg-lib/libx11.inc |2 +-
.../systemtap/systemtap-uprobes_git.bb |2 ++
meta/recipes-kernel/systemtap/systemtap_git.inc|2 --
.../kernelshark-fix-syntax-error-of-shell.patch|0
meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb | 18 --
meta/recipes-kernel/trace-cmd/trace-cmd.inc| 14 ++
meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb | 16
meta/recipes-multimedia/gstreamer/gst-plugins.inc |2 --
.../gstreamer/gstreamer1.0-plugins.inc |2 --
27 files changed, 37 insertions(+), 54 deletions(-)
rename meta/recipes-core/eglibc/{eglibc-2.19 =
cross-localedef-native-2.19}/fix_for_centos_5.8.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_dvips_doc.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_sgml2rtf.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_tex_doc.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_txt_doc.patch (100%)
rename meta/recipes-kernel/trace-cmd/{trace-cmd =
kernelshark}/kernelshark-fix-syntax-error-of-shell.patch (100%)
create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd.inc
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 02/13] dbus: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-core/dbus/dbus-test_1.6.18.bb |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/dbus/dbus-test_1.6.18.bb
b/meta/recipes-core/dbus/dbus-test_1.6.18.bb
index 9ea0f4d..bff1a46 100644
--- a/meta/recipes-core/dbus/dbus-test_1.6.18.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.6.18.bb
@@ -23,7 +23,7 @@ SRC_URI[md5sum] = b02e9c95027a416987b81f9893831061
SRC_URI[sha256sum] =
7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd
S=${WORKDIR}/dbus-${PV}
-FILESPATH = ${FILE_DIRNAME}/dbus
+FILESEXTRAPATHS_prepend := ${THISDIR}/dbus:
inherit autotools pkgconfig gettext ptest
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 04/13] trace-cmd: refactoring recipe
Fixes [YOCTO #4497]
Refactoring recipe to avoid duplicated entries in trace-cmd and
kernelshark bb-files. Also remove usage of FILESPATH and split package
unique patches into separate dirs.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../kernelshark-fix-syntax-error-of-shell.patch|0
meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb | 18 --
meta/recipes-kernel/trace-cmd/trace-cmd.inc| 14 ++
meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb | 16
4 files changed, 22 insertions(+), 26 deletions(-)
rename meta/recipes-kernel/trace-cmd/{trace-cmd =
kernelshark}/kernelshark-fix-syntax-error-of-shell.patch (100%)
create mode 100644 meta/recipes-kernel/trace-cmd/trace-cmd.inc
diff --git
a/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
b/meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch
similarity index 100%
rename from
meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
rename to
meta/recipes-kernel/trace-cmd/kernelshark/kernelshark-fix-syntax-error-of-shell.patch
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
index d61097d..e64abe2 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
@@ -1,28 +1,18 @@
SUMMARY = Graphical trace viewer for Ftrace
LICENSE = GPLv2
+
+require trace-cmd.inc
+
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e
-SRCREV = 7055ffd37beeb44714e86a4abc703f7e175a0db5
-PR = r3
-PV = 1.2+git${SRCPV}
-
DEPENDS = gtk+
RDEPENDS_${PN} = trace-cmd
-inherit pkgconfig pythonnative
-
-SRC_URI = git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
\
- file://addldflags.patch \
- file://make-docs-optional.patch \
- file://blktrace-api-compatibility.patch \
- file://kernelshark-fix-syntax-error-of-shell.patch
-S = ${WORKDIR}/git
+SRC_URI_append = file://kernelshark-fix-syntax-error-of-shell.patch
EXTRA_OEMAKE = 'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui
-FILESPATH = ${FILE_DIRNAME}/trace-cmd
-
do_install() {
oe_runmake CC=${CC} AR=${AR} prefix=${prefix} DESTDIR=${D}
install_gui
rm -rf ${D}${datadir}/trace-cmd
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd.inc
b/meta/recipes-kernel/trace-cmd/trace-cmd.inc
new file mode 100644
index 000..2c8d83d
--- /dev/null
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd.inc
@@ -0,0 +1,14 @@
+SRCREV = 7055ffd37beeb44714e86a4abc703f7e175a0db5
+PR = r3
+PV = 1.2+git${SRCPV}
+
+inherit pkgconfig pythonnative
+
+FILESEXTRAPATHS_prepend := ${THISDIR}/trace-cmd:
+
+SRC_URI = git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
\
+ file://addldflags.patch \
+ file://make-docs-optional.patch \
+ file://blktrace-api-compatibility.patch \
+
+S = ${WORKDIR}/git
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
index a0c823b..6f3319d 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd_1.2.bb
@@ -1,26 +1,18 @@
SUMMARY = User interface to Ftrace
LICENSE = GPLv2 LGPLv2.1
+
+require trace-cmd.inc
+
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \
file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
file://trace-input.c;beginline=5;endine=8;md5=6ad47cc2b03385d8456771eec5eeea0b
-SRCREV = 7055ffd37beeb44714e86a4abc703f7e175a0db5
-PR = r3
-PV = 1.2+git${SRCPV}
-
-inherit pkgconfig pythonnative
-
-SRC_URI = git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
\
- file://addldflags.patch \
- file://make-docs-optional.patch \
- file://blktrace-api-compatibility.patch \
- file://trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch \
+SRC_URI_append =
file://trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch \
file://trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch \
file://trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch \
file://trace-cmd-fix-syntax-error-of-shell.patch \
-S = ${WORKDIR}/git
EXTRA_OEMAKE = 'prefix=${prefix}'
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 10/13] python: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the
path. Don't migrate paths that already exist in base FILESPATH to
FILESEXTRAPATHS.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../recipes-devtools/python/python-native_2.7.3.bb |2 +-
.../python/python-pygobject_2.28.3.bb |1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb
b/meta/recipes-devtools/python/python-native_2.7.3.bb
index 0c66d27..4949546 100644
--- a/meta/recipes-devtools/python/python-native_2.7.3.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
@@ -21,7 +21,7 @@ SRC_URI += \
S = ${WORKDIR}/Python-${PV}
-FILESPATH = ${FILE_DIRNAME}/python-native/:${FILE_DIRNAME}/python/
+FILESEXTRAPATHS_prepend := ${THISDIR}/${PN}:
inherit native
diff --git a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
index 9dbe47c..2e65b38 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
@@ -16,7 +16,6 @@ SRC_URI[md5sum] = aa64900b274c4661a5c32e52922977f9
SRC_URI[sha256sum] =
7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6
S = ${WORKDIR}/pygobject-${PV}
-FILESPATH = ${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files
EXTRA_OECONF += --disable-introspection
PARALLEL_MAKEINST =
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 07/13] qemu: remove unused FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in nativesdk-qemu-helper no FILESPATH additions are currently needed so
instead it should be removed.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../qemu/nativesdk-qemu-helper_1.0.bb |1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
index fe03b82..51d1c59 100644
--- a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
+++ b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
@@ -3,7 +3,6 @@ LICENSE = GPLv2
RDEPENDS_${PN} = nativesdk-qemu
PR = r9
-FILESPATH = ${FILE_DIRNAME}/qemu-helper
LIC_FILES_CHKSUM =
file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999 \
file://${COREBASE}/scripts/runqemu;endline=18;md5=77fbe442a88b1bcdc29c3ba67733b21b
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 03/13] gstreamer: remove unused FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in gstreamer no FILESPATH additions are currently needed so
instead it should be removed.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-multimedia/gstreamer/gst-plugins.inc |2 --
.../gstreamer/gstreamer1.0-plugins.inc |2 --
2 files changed, 4 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index b2d3d3c..2697609 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -6,8 +6,6 @@ DEPENDS = gstreamer
inherit autotools pkgconfig
-FILESPATH =. ${FILE_DIRNAME}/gst-plugins:
-
SRC_URI = http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2;
GSTREAMER_DEBUG ?= --disable-debug
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
index 4ab8ea8..687aa2f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
@@ -6,8 +6,6 @@ DEPENDS = gstreamer1.0
inherit autotools pkgconfig
-FILESPATH =. ${FILE_DIRNAME}/gst-plugins:
-
GSTREAMER_1_0_DEBUG ?= --disable-debug
GSTREAMER_1_0_GIT_BRANCH ?= master
EXTRA_OECONF = --disable-valgrind ${GSTREAMER_1_0_DEBUG} --disable-examples
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 09/13] gcc: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-devtools/gcc/gcc-4.8.inc |4 ++--
meta/recipes-devtools/gcc/gcc-4.9.inc |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc
b/meta/recipes-devtools/gcc/gcc-4.8.inc
index 42b4212..fe20b12 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -8,7 +8,7 @@ PV = 4.8.2
BINV = 4.8.2
-FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.8' ], d)}
+FILESEXTRAPATHS_prepend := ${THISDIR}/gcc-4.8:
DEPENDS =+ mpfr gmp libmpc zlib
NATIVEDEPS = mpfr-native gmp-native libmpc-native zlib-native
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
- file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8
+ file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8
SRC_URI = ${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://0002-uclibc-conf.patch \
diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc
b/meta/recipes-devtools/gcc/gcc-4.9.inc
index 865ec47..5d46bdf 100644
--- a/meta/recipes-devtools/gcc/gcc-4.9.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.9.inc
@@ -8,7 +8,7 @@ PV = 4.9.0
BINV = 4.9.0
-FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.9' ], d)}
+FILESEXTRAPATHS_prepend := ${THISDIR}/gcc-4.9:
DEPENDS =+ mpfr gmp libmpc zlib
NATIVEDEPS = mpfr-native gmp-native libmpc-native zlib-native
@@ -19,7 +19,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
- file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8
+ file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8
SRC_URI = ${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 08/13] linuxdoc-tools: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb |3 ---
.../disable_dvips_doc.patch|0
.../disable_sgml2rtf.patch |0
.../disable_tex_doc.patch |0
.../disable_txt_doc.patch |0
5 files changed, 3 deletions(-)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_dvips_doc.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_sgml2rtf.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_tex_doc.patch (100%)
rename meta/recipes-devtools/linuxdoc-tools/{linuxdoc-tools-native =
linuxdoc-tools}/disable_txt_doc.patch (100%)
diff --git
a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
index fce4178..ed6ab73 100644
--- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
+++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=077ef64ec3ac257fb0d786531cf26931
DEPENDS = groff-native openjade-native
-
SRC_URI =
${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.orig.tar.gz \
file://disable_sgml2rtf.patch \
file://disable_txt_doc.patch \
@@ -15,8 +14,6 @@ SRC_URI =
${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.orig.tar.
SRC_URI[md5sum] = 1d13d500918a7a145b0edc2f16f61dd1
SRC_URI[sha256sum] =
7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101
-FILESPATH = ${FILE_DIRNAME}/linuxdoc-tools-native/
-
inherit autotools-brokensep native
do_configure () {
diff --git
a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch
b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch
similarity index 100%
rename from
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_dvips_doc.patch
rename to
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch
diff --git
a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch
similarity index 100%
rename from
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_sgml2rtf.patch
rename to
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch
diff --git
a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch
b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch
similarity index 100%
rename from
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_tex_doc.patch
rename to
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch
diff --git
a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch
b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch
similarity index 100%
rename from
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native/disable_txt_doc.patch
rename to
meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 06/13] mesa: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Also remove unused filespath addition.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
index 8c7d8e8..9059207 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
@@ -2,7 +2,7 @@ require mesa_${PV}.bb
SUMMARY += (OpenGL only, no EGL/GLES)
-FILESPATH = ${@base_set_filespath([${FILE_DIRNAME}/mesa-${PV},
${FILE_DIRNAME}/mesa], d)}
+FILESEXTRAPATHS_prepend := ${THISDIR}/mesa:
PROVIDES = virtual/libgl virtual/mesa
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 11/13] u-boot: remove unused FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in u-boot no FILESPATH additions are currently needed so
instead it should be removed.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-bsp/u-boot/u-boot.inc |1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc
b/meta/recipes-bsp/u-boot/u-boot.inc
index cb50949..d826a40 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -65,7 +65,6 @@ do_install () {
}
FILES_${PN} = /boot ${sysconfdir}
-FILESPATH =. ${FILE_DIRNAME}/u-boot-git/${MACHINE}:
do_deploy () {
install -d ${DEPLOYDIR}
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2 12/13] uclibc: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-core/uclibc/uclibc-git.inc |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/uclibc/uclibc-git.inc
b/meta/recipes-core/uclibc/uclibc-git.inc
index 0649aca..4790852 100644
--- a/meta/recipes-core/uclibc/uclibc-git.inc
+++ b/meta/recipes-core/uclibc/uclibc-git.inc
@@ -2,7 +2,7 @@ SRCREV=5eddde8f094ef52dca06695cc598e3b2556dcccb
PV = 0.9.33+git${SRCPV}
-FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-git' ], d)}
+FILESEXTRAPATHS_prepend := ${THISDIR}/uclibc-git:
SRC_URI = git://uclibc.org/uClibc.git;branch=master \
file://uClibc.machine \
@@ -24,6 +24,6 @@ SRC_URI = git://uclibc.org/uClibc.git;branch=master \
file://0001-Add-eventfd_read-and-eventfd_write.patch \
file://0002-wire-setns-syscall.patch \
file://0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch \
-file://0004-Add-clock_adjtime-syscall.patch \
+ file://0004-Add-clock_adjtime-syscall.patch \
S = ${WORKDIR}/git
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/13] Remove usage of FILESPATH
Fixes [YOCTO #4497]
We extend the search path in a number of recipes by setting FILESPATH,
which is not really desirable since the manner in which we have done it
can make the recipe harder to bbappend (and we explicitly advise modifying
FILESPATH this in the manual). These should be changed to use FILESEXTRAPATHS
to extend the path instead or use a default FILESPATH (e.g. BP, BPN or files).
The following changes since commit 7b78c364b7de901f97cd8dbe56d5e02f545bf3d3:
cleanup-workdir: Fix crosssdk reference after addition of PN (2014-05-05
09:05:42 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib petmab/bug/4497
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug/4497
Petter Mabäcker (13):
systemtap: remove usage of FILESPATH
dbus: remove usage of FILESPATH
gstreamer: remove unused FILESPATH
trace-cmd: remove usage of FILESPATH
xorg-lib: remove usage of FILESPATH
mesa: remove usage of FILESPATH
qemu: remove unused FILESPATH
linuxdoc-tools: remove usage of FILESPATH
gcc: remove usage of FILESPATH
python: remove usage of FILESPATH
u-boot: remove unused FILESPATH
uclibc: remove usage of FILESPATH
eglibc: remove usage of FILESPATH
meta/recipes-bsp/u-boot/u-boot.inc |1 -
meta/recipes-core/dbus/dbus-test_1.6.18.bb |2 +-
.../fix_for_centos_5.8.patch |0
.../eglibc/cross-localedef-native_2.19.bb |3 +--
meta/recipes-core/eglibc/eglibc_2.19.bb|4 +---
meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb |2 +-
.../0001-Add-eventfd_read-and-eventfd_write.patch |0
...nt.c-wtent.c-move-functions-from-utxent.c.patch |0
...1-atexit_old-Do-not-add-it-to-shared-libc.patch |0
...brt-Use-nodefaultlibs-instead-of-nostdlib.patch |0
...-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch |0
...rk-Hide-pthread_atfork-in-shared-versions.patch |0
.../0002-wire-setns-syscall.patch |0
...tl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch |0
.../0004-Add-clock_adjtime-syscall.patch |0
.../{uclibc-git = files}/argp-headers.patch |0
.../{uclibc-git = files}/argp-support.patch |0
.../compile-arm-fork-with-O2.patch |0
.../uclibc/{uclibc-git = files}/locale.cfg|0
.../uclibc/{uclibc-git = files}/obstack.cfg |0
.../uclibc/{uclibc-git = files}/orign_path.patch |0
.../{uclibc-git = files}/powerpc_copysignl.patch |0
.../remove_attribute_optimize_Os.patch |0
.../uclibc/{uclibc-git = files}/uClibc.distro |0
.../uclibc/{uclibc-git = files}/uClibc.machine|0
.../uclibc_enable_log2_test.patch |0
meta/recipes-core/uclibc/uclibc-git.inc|4 +---
meta/recipes-devtools/gcc/gcc-4.8.inc |2 +-
.../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb |3 +--
.../recipes-devtools/python/python-native_2.7.3.bb |2 +-
.../python/python-pygobject_2.28.3.bb |2 +-
.../qemu/nativesdk-qemu-helper_1.0.bb |1 -
meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb|2 +-
meta/recipes-graphics/xorg-lib/libx11.inc |2 +-
.../{systemtap = files}/docproc-build-fix.patch |0
.../obsolete_automake_macros.patch |0
meta/recipes-kernel/systemtap/systemtap_git.inc|2 --
.../{trace-cmd = files}/addldflags.patch |0
.../blktrace-api-compatibility.patch |0
.../kernelshark-fix-syntax-error-of-shell.patch|0
.../{trace-cmd = files}/make-docs-optional.patch |0
...dd-checks-for-invalid-pointers-to-fix-seg.patch |0
...o-not-call-stop_threads-if-doing-latency-.patch |0
...etting-plugin-to-nop-clears-data-before-i.patch |0
.../trace-cmd-fix-syntax-error-of-shell.patch |0
meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb |2 --
meta/recipes-multimedia/gstreamer/gst-plugins.inc |2 --
.../gstreamer/gstreamer1.0-plugins.inc |2 --
48 files changed, 11 insertions(+), 27 deletions(-)
rename meta/recipes-core/eglibc/{eglibc-2.19 =
cross-localedef-native-2.19}/fix_for_centos_5.8.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0001-Add-eventfd_read-and-eventfd_write.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0001-atexit_old-Do-not-add-it-to-shared-libc.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch (100%)
rename
[OE-core] [PATCH 01/13] systemtap: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. All current patches in systemtap are shared, move them to
files dir instead, since it's included in base FILESPATH.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../{systemtap = files}/docproc-build-fix.patch |0
.../obsolete_automake_macros.patch |0
meta/recipes-kernel/systemtap/systemtap_git.inc|2 --
3 files changed, 2 deletions(-)
rename meta/recipes-kernel/systemtap/{systemtap =
files}/docproc-build-fix.patch (100%)
rename meta/recipes-kernel/systemtap/{systemtap =
files}/obsolete_automake_macros.patch (100%)
diff --git a/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
b/meta/recipes-kernel/systemtap/files/docproc-build-fix.patch
similarity index 100%
rename from meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch
rename to meta/recipes-kernel/systemtap/files/docproc-build-fix.patch
diff --git
a/meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
b/meta/recipes-kernel/systemtap/files/obsolete_automake_macros.patch
similarity index 100%
rename from
meta/recipes-kernel/systemtap/systemtap/obsolete_automake_macros.patch
rename to meta/recipes-kernel/systemtap/files/obsolete_automake_macros.patch
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc
b/meta/recipes-kernel/systemtap/systemtap_git.inc
index c280313..0d68dd1 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -8,8 +8,6 @@ SRC_URI = git://sourceware.org/git/systemtap.git \
file://obsolete_automake_macros.patch \
-FILESPATH = ${FILE_DIRNAME}/systemtap
-
# systemtap doesn't support mips
COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64).*-linux'
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/13] qemu: remove unused FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in nativesdk-qemu-helper no FILESPATH additions are currently needed so
instead it should be removed.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../qemu/nativesdk-qemu-helper_1.0.bb |1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
index fe03b82..51d1c59 100644
--- a/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
+++ b/meta/recipes-devtools/qemu/nativesdk-qemu-helper_1.0.bb
@@ -3,7 +3,6 @@ LICENSE = GPLv2
RDEPENDS_${PN} = nativesdk-qemu
PR = r9
-FILESPATH = ${FILE_DIRNAME}/qemu-helper
LIC_FILES_CHKSUM =
file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999 \
file://${COREBASE}/scripts/runqemu;endline=18;md5=77fbe442a88b1bcdc29c3ba67733b21b
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/13] uclibc: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Current patchdir in uclibc are shared, rename them to
files instead, since it's included in base FILESPATH.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../0001-Add-eventfd_read-and-eventfd_write.patch |0
...nt.c-wtent.c-move-functions-from-utxent.c.patch |0
...1-atexit_old-Do-not-add-it-to-shared-libc.patch |0
...brt-Use-nodefaultlibs-instead-of-nostdlib.patch |0
...-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch |0
...rk-Hide-pthread_atfork-in-shared-versions.patch |0
.../0002-wire-setns-syscall.patch |0
...tl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch |0
.../0004-Add-clock_adjtime-syscall.patch |0
.../{uclibc-git = files}/argp-headers.patch |0
.../{uclibc-git = files}/argp-support.patch |0
.../compile-arm-fork-with-O2.patch |0
.../uclibc/{uclibc-git = files}/locale.cfg|0
.../uclibc/{uclibc-git = files}/obstack.cfg |0
.../uclibc/{uclibc-git = files}/orign_path.patch |0
.../{uclibc-git = files}/powerpc_copysignl.patch |0
.../remove_attribute_optimize_Os.patch |0
.../uclibc/{uclibc-git = files}/uClibc.distro |0
.../uclibc/{uclibc-git = files}/uClibc.machine|0
.../uclibc_enable_log2_test.patch |0
meta/recipes-core/uclibc/uclibc-git.inc|4 +---
21 files changed, 1 insertion(+), 3 deletions(-)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0001-Add-eventfd_read-and-eventfd_write.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0001-atexit_old-Do-not-add-it-to-shared-libc.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0001-nptl-arm-Move-aeabi_read_tp-to-uclibc_nonshared.a.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0001-nptl-atfork-Hide-pthread_atfork-in-shared-versions.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0002-wire-setns-syscall.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0003-fcntl.h-Define-F_SETPIPE_SZ-and-F_GETPIPE_SZ.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/0004-Add-clock_adjtime-syscall.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git = files}/argp-headers.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git = files}/argp-support.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/compile-arm-fork-with-O2.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git = files}/locale.cfg (100%)
rename meta/recipes-core/uclibc/{uclibc-git = files}/obstack.cfg (100%)
rename meta/recipes-core/uclibc/{uclibc-git = files}/orign_path.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git = files}/powerpc_copysignl.patch
(100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/remove_attribute_optimize_Os.patch (100%)
rename meta/recipes-core/uclibc/{uclibc-git = files}/uClibc.distro (100%)
rename meta/recipes-core/uclibc/{uclibc-git = files}/uClibc.machine (100%)
rename meta/recipes-core/uclibc/{uclibc-git =
files}/uclibc_enable_log2_test.patch (100%)
diff --git
a/meta/recipes-core/uclibc/uclibc-git/0001-Add-eventfd_read-and-eventfd_write.patch
b/meta/recipes-core/uclibc/files/0001-Add-eventfd_read-and-eventfd_write.patch
similarity index 100%
rename from
meta/recipes-core/uclibc/uclibc-git/0001-Add-eventfd_read-and-eventfd_write.patch
rename to
meta/recipes-core/uclibc/files/0001-Add-eventfd_read-and-eventfd_write.patch
diff --git
a/meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch
b/meta/recipes-core/uclibc/files/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch
similarity index 100%
rename from
meta/recipes-core/uclibc/uclibc-git/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch
rename to
meta/recipes-core/uclibc/files/0001-Revert-utent.c-wtent.c-move-functions-from-utxent.c.patch
diff --git
a/meta/recipes-core/uclibc/uclibc-git/0001-atexit_old-Do-not-add-it-to-shared-libc.patch
b/meta/recipes-core/uclibc/files/0001-atexit_old-Do-not-add-it-to-shared-libc.patch
similarity index 100%
rename from
meta/recipes-core/uclibc/uclibc-git/0001-atexit_old-Do-not-add-it-to-shared-libc.patch
rename to
meta/recipes-core/uclibc/files/0001-atexit_old-Do-not-add-it-to-shared-libc.patch
diff --git
a/meta/recipes-core/uclibc/uclibc-git/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch
b/meta/recipes-core/uclibc/files/0001-librt-Use-nodefaultlibs-instead-of-nostdlib.patch
similarity index 100%
rename from
meta/recipes-core/uclibc/uclibc-git/0001-librt-Use
[OE-core] [PATCH 06/13] mesa: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Avoid using files dir in mesa, since current patchdirs are only shared
between some of the bb-files. Also remove unused filespath addition.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
index 8c7d8e8..9059207 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
@@ -2,7 +2,7 @@ require mesa_${PV}.bb
SUMMARY += (OpenGL only, no EGL/GLES)
-FILESPATH = ${@base_set_filespath([${FILE_DIRNAME}/mesa-${PV},
${FILE_DIRNAME}/mesa], d)}
+FILESEXTRAPATHS_prepend := ${THISDIR}/mesa:
PROVIDES = virtual/libgl virtual/mesa
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/13] dbus: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Avoid using filesdir in dbus, since current patchdirs are only shared
between some of the dbus bb-files.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-core/dbus/dbus-test_1.6.18.bb |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/dbus/dbus-test_1.6.18.bb
b/meta/recipes-core/dbus/dbus-test_1.6.18.bb
index 9ea0f4d..bff1a46 100644
--- a/meta/recipes-core/dbus/dbus-test_1.6.18.bb
+++ b/meta/recipes-core/dbus/dbus-test_1.6.18.bb
@@ -23,7 +23,7 @@ SRC_URI[md5sum] = b02e9c95027a416987b81f9893831061
SRC_URI[sha256sum] =
7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd
S=${WORKDIR}/dbus-${PV}
-FILESPATH = ${FILE_DIRNAME}/dbus
+FILESEXTRAPATHS_prepend := ${THISDIR}/dbus:
inherit autotools pkgconfig gettext ptest
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/13] u-boot: remove unused FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in u-boot no FILESPATH additions are currently needed so
instead it should be removed.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-bsp/u-boot/u-boot.inc |1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc
b/meta/recipes-bsp/u-boot/u-boot.inc
index cb50949..d826a40 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -65,7 +65,6 @@ do_install () {
}
FILES_${PN} = /boot ${sysconfdir}
-FILESPATH =. ${FILE_DIRNAME}/u-boot-git/${MACHINE}:
do_deploy () {
install -d ${DEPLOYDIR}
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/13] xorg-lib: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Avoid using files dir in xorg-lib, since current patchdirs are only shared
between some of the bb-files.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-graphics/xorg-lib/libx11.inc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc
b/meta/recipes-graphics/xorg-lib/libx11.inc
index e07d42d..6c45828 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -8,7 +8,7 @@ require xorg-lib-common.inc
inherit siteinfo
-FILESPATH = ${FILE_DIRNAME}/libx11
+FILESEXTRAPATHS_prepend := ${THISDIR}/libx11:
PE = 1
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/13] gstreamer: remove unused FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in gstreamer no FILESPATH additions are currently needed so
instead it should be removed.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-multimedia/gstreamer/gst-plugins.inc |2 --
.../gstreamer/gstreamer1.0-plugins.inc |2 --
2 files changed, 4 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index b2d3d3c..2697609 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -6,8 +6,6 @@ DEPENDS = gstreamer
inherit autotools pkgconfig
-FILESPATH =. ${FILE_DIRNAME}/gst-plugins:
-
SRC_URI = http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2;
GSTREAMER_DEBUG ?= --disable-debug
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
index 4ab8ea8..687aa2f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
@@ -6,8 +6,6 @@ DEPENDS = gstreamer1.0
inherit autotools pkgconfig
-FILESPATH =. ${FILE_DIRNAME}/gst-plugins:
-
GSTREAMER_1_0_DEBUG ?= --disable-debug
GSTREAMER_1_0_GIT_BRANCH ?= master
EXTRA_OECONF = --disable-valgrind ${GSTREAMER_1_0_DEBUG} --disable-examples
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/13] linuxdoc-tools: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
index fce4178..4f908c3 100644
--- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
+++ b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=077ef64ec3ac257fb0d786531cf26931
DEPENDS = groff-native openjade-native
+FILESEXTRAPATHS_prepend := ${THISDIR}/linuxdoc-tools-native:
SRC_URI =
${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.orig.tar.gz \
file://disable_sgml2rtf.patch \
@@ -15,8 +16,6 @@ SRC_URI =
${DEBIAN_MIRROR}/main/l/linuxdoc-tools/linuxdoc-tools_${PV}.orig.tar.
SRC_URI[md5sum] = 1d13d500918a7a145b0edc2f16f61dd1
SRC_URI[sha256sum] =
7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101
-FILESPATH = ${FILE_DIRNAME}/linuxdoc-tools-native/
-
inherit autotools-brokensep native
do_configure () {
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/13] gcc: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-devtools/gcc/gcc-4.8.inc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.8.inc
b/meta/recipes-devtools/gcc/gcc-4.8.inc
index 42b4212..bce9b81 100644
--- a/meta/recipes-devtools/gcc/gcc-4.8.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.8.inc
@@ -8,7 +8,7 @@ PV = 4.8.2
BINV = 4.8.2
-FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.8' ], d)}
+FILESEXTRAPATHS_prepend := ${THISDIR}/gcc-4.8:
DEPENDS =+ mpfr gmp libmpc zlib
NATIVEDEPS = mpfr-native gmp-native libmpc-native zlib-native
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/13] eglibc: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder
to bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
If possible try to use any of the default FILESPATH dirs.
Also remove superfluous comment and do minor indentation fix.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../fix_for_centos_5.8.patch |0
.../eglibc/cross-localedef-native_2.19.bb |3 +--
meta/recipes-core/eglibc/eglibc_2.19.bb|4 +---
meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb |2 +-
4 files changed, 3 insertions(+), 6 deletions(-)
rename meta/recipes-core/eglibc/{eglibc-2.19 =
cross-localedef-native-2.19}/fix_for_centos_5.8.patch (100%)
diff --git a/meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch
b/meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch
similarity index 100%
rename from meta/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch
rename to
meta/recipes-core/eglibc/cross-localedef-native-2.19/fix_for_centos_5.8.patch
diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
index 3ce0e1d..87b5a6d 100644
--- a/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
+++ b/meta/recipes-core/eglibc/cross-localedef-native_2.19.bb
@@ -13,8 +13,7 @@ LIC_FILES_CHKSUM =
file://${LIC_DIR}/LICENSES;md5=e9a558e243b36d3209f380deb394b
inherit native
inherit autotools
-# pick up an eglibc patch
-FILESPATH = ${FILE_DIRNAME}/eglibc-${PV}
+FILESEXTRAPATHS_prepend := ${THISDIR}/${P}:
SRC_URI =
http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25243.tar.bz2
\
file://fix_for_centos_5.8.patch;patchdir=.. \
diff --git a/meta/recipes-core/eglibc/eglibc_2.19.bb
b/meta/recipes-core/eglibc/eglibc_2.19.bb
index 8f09676..1ddce82 100644
--- a/meta/recipes-core/eglibc/eglibc_2.19.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.19.bb
@@ -24,7 +24,7 @@ SRC_URI =
http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25
file://0001-R_ARM_TLS_DTPOFF32.patch \
file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
file://fix-tibetian-locales.patch \
- file://ppce6500-32b_slow_ieee754_sqrt.patch \
+ file://ppce6500-32b_slow_ieee754_sqrt.patch \
SRC_URI[md5sum] = 197836c2ba42fb146e971222647198dd
SRC_URI[sha256sum] =
baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c
@@ -49,8 +49,6 @@ TARGET_CPPFLAGS = -I${STAGING_DIR_TARGET}${includedir}
GLIBC_BROKEN_LOCALES = _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER
bn_BD te_IN es_CR.ISO-8859-1
-FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}',
'${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}
-
#
# For now, we will skip building of a gcc package if it is a uclibc one
# and our build is not a uclibc one, and we skip a glibc one if our build
diff --git a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
index d7bc444..5d42572 100644
--- a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
+++ b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
@@ -14,7 +14,7 @@ SRC_URI = file://ldconfig-native-2.12.1.tar.bz2 \
PR = r2
-FILESPATH = ${FILE_DIRNAME}/${PN}-${PV}/
+FILESEXTRAPATHS_prepend := ${THISDIR}/${P}:
inherit native
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/13] trace-cmd: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. All current patches in trace-cmd are shared, move them to
files instead, since it's included in base FILESPATH.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../{trace-cmd = files}/addldflags.patch |0
.../blktrace-api-compatibility.patch |0
.../kernelshark-fix-syntax-error-of-shell.patch|0
.../{trace-cmd = files}/make-docs-optional.patch |0
...dd-checks-for-invalid-pointers-to-fix-seg.patch |0
...o-not-call-stop_threads-if-doing-latency-.patch |0
...etting-plugin-to-nop-clears-data-before-i.patch |0
.../trace-cmd-fix-syntax-error-of-shell.patch |0
meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb |2 --
9 files changed, 2 deletions(-)
rename meta/recipes-kernel/trace-cmd/{trace-cmd = files}/addldflags.patch
(100%)
rename meta/recipes-kernel/trace-cmd/{trace-cmd =
files}/blktrace-api-compatibility.patch (100%)
rename meta/recipes-kernel/trace-cmd/{trace-cmd =
files}/kernelshark-fix-syntax-error-of-shell.patch (100%)
rename meta/recipes-kernel/trace-cmd/{trace-cmd =
files}/make-docs-optional.patch (100%)
rename meta/recipes-kernel/trace-cmd/{trace-cmd =
files}/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch (100%)
rename meta/recipes-kernel/trace-cmd/{trace-cmd =
files}/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch (100%)
rename meta/recipes-kernel/trace-cmd/{trace-cmd =
files}/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch (100%)
rename meta/recipes-kernel/trace-cmd/{trace-cmd =
files}/trace-cmd-fix-syntax-error-of-shell.patch (100%)
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
b/meta/recipes-kernel/trace-cmd/files/addldflags.patch
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
rename to meta/recipes-kernel/trace-cmd/files/addldflags.patch
diff --git
a/meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch
b/meta/recipes-kernel/trace-cmd/files/blktrace-api-compatibility.patch
similarity index 100%
rename from
meta/recipes-kernel/trace-cmd/trace-cmd/blktrace-api-compatibility.patch
rename to meta/recipes-kernel/trace-cmd/files/blktrace-api-compatibility.patch
diff --git
a/meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
b/meta/recipes-kernel/trace-cmd/files/kernelshark-fix-syntax-error-of-shell.patch
similarity index 100%
rename from
meta/recipes-kernel/trace-cmd/trace-cmd/kernelshark-fix-syntax-error-of-shell.patch
rename to
meta/recipes-kernel/trace-cmd/files/kernelshark-fix-syntax-error-of-shell.patch
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch
b/meta/recipes-kernel/trace-cmd/files/make-docs-optional.patch
similarity index 100%
rename from meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch
rename to meta/recipes-kernel/trace-cmd/files/make-docs-optional.patch
diff --git
a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch
b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch
similarity index 100%
rename from
meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch
rename to
meta/recipes-kernel/trace-cmd/files/trace-cmd-Add-checks-for-invalid-pointers-to-fix-seg.patch
diff --git
a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch
b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch
similarity index 100%
rename from
meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch
rename to
meta/recipes-kernel/trace-cmd/files/trace-cmd-Do-not-call-stop_threads-if-doing-latency-.patch
diff --git
a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch
b/meta/recipes-kernel/trace-cmd/files/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch
similarity index 100%
rename from
meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch
rename to
meta/recipes-kernel/trace-cmd/files/trace-cmd-Setting-plugin-to-nop-clears-data-before-i.patch
diff --git
a/meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch
b/meta/recipes-kernel/trace-cmd/files/trace-cmd-fix-syntax-error-of-shell.patch
similarity index 100%
rename from
meta/recipes-kernel/trace-cmd/trace-cmd/trace-cmd-fix-syntax-error-of-shell.patch
rename to
meta/recipes-kernel/trace-cmd/files/trace-cmd-fix-syntax-error-of-shell.patch
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
b/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
index d61097d..291c068 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_1.2.bb
+++ b/meta/recipes-kernel
[OE-core] [PATCH 10/13] python: remove usage of FILESPATH
Fixes [YOCTO #4497]
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the
path. Don't migrate paths that already exist in base FILESPATH to
FILESEXTRAPATHS (e.g. BPN, BP and files).
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../recipes-devtools/python/python-native_2.7.3.bb |2 +-
.../python/python-pygobject_2.28.3.bb |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/python/python-native_2.7.3.bb
b/meta/recipes-devtools/python/python-native_2.7.3.bb
index 0c66d27..4949546 100644
--- a/meta/recipes-devtools/python/python-native_2.7.3.bb
+++ b/meta/recipes-devtools/python/python-native_2.7.3.bb
@@ -21,7 +21,7 @@ SRC_URI += \
S = ${WORKDIR}/Python-${PV}
-FILESPATH = ${FILE_DIRNAME}/python-native/:${FILE_DIRNAME}/python/
+FILESEXTRAPATHS_prepend := ${THISDIR}/${PN}:
inherit native
diff --git a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
index 9dbe47c..691666c 100644
--- a/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
+++ b/meta/recipes-devtools/python/python-pygobject_2.28.3.bb
@@ -16,7 +16,7 @@ SRC_URI[md5sum] = aa64900b274c4661a5c32e52922977f9
SRC_URI[sha256sum] =
7da88c169a56efccc516cebd9237da3fe518a343095a664607b368fe21df95b6
S = ${WORKDIR}/pygobject-${PV}
-FILESPATH = ${FILE_DIRNAME}/python-pygobject:${FILE_DIRNAME}/files
+FILESEXTRAPATHS_prepend := ${THISDIR}/${PN}:
EXTRA_OECONF += --disable-introspection
PARALLEL_MAKEINST =
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] x-load: remove recipe
From: Petter Mabacker pet...@technux.se
x-load has been superseded by u-boot SPL for all cortex based TI SoCs.
For legacy boards meta-ti layer (that contains a maintained recipe)
should be used instead.
Signed-off-by: Petter Mabacker pet...@technux.se
---
.../x-load/x-load-git/beagleboard/name.patch | 18 -
meta/recipes-bsp/x-load/x-load.inc | 40
meta/recipes-bsp/x-load/x-load_git.bb | 21 --
3 files changed, 79 deletions(-)
delete mode 100644 meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
delete mode 100644 meta/recipes-bsp/x-load/x-load.inc
delete mode 100644 meta/recipes-bsp/x-load/x-load_git.bb
diff --git a/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
b/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
deleted file mode 100644
index 29c26a9..000
--- a/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/Makefile
-===
git.orig/Makefile
-+++ git/Makefile
-@@ -225,8 +225,9 @@ omap3evm_config : unconfig
- overo_config :unconfig
- @$(MKCONFIG) $(@:_config=) arm omap3 overo
-
--omap3530beagle_config :unconfig
-- @$(MKCONFIG) $(@:_config=) arm omap3 omap3530beagle
-+beagleboard_config :unconfig
-+ @$(MKCONFIG) omap3530beagle arm omap3 omap3530beagle
-+ @./mkconfig omap3530beagle arm omap3 omap3530beagle
-
- #
- ## OMAP4 (ARM-CortexA9) Systems
diff --git a/meta/recipes-bsp/x-load/x-load.inc
b/meta/recipes-bsp/x-load/x-load.inc
deleted file mode 100644
index 05d5ff0..000
--- a/meta/recipes-bsp/x-load/x-load.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SUMMARY = First level bootloader for OMAP SoCs
-SECTION = bootloaders
-LICENSE = GPL
-
-inherit deploy
-
-DEPENDS =
-
-PARALLEL_MAKE=
-
-EXTRA_OEMAKE = CROSS_COMPILE=${TARGET_PREFIX}
-
-XLOAD_MACHINE ?= ${MACHINE}_config
-
-XLOAD_IMAGE ?= x-load-${MACHINE}-${PV}-${PR}.bin.ift
-XLOAD_SYMLINK ?= x-load-${MACHINE}.bin.ift
-MLO_IMAGE ?= MLO-${MACHINE}-${PV}-${PR}
-MLO_SYMLINK ?= MLO-${MACHINE}
-
-do_compile () {
- unset LDFLAGS
- unset CFLAGS
- unset CPPFLAGS
- oe_runmake distclean
- oe_runmake ${XLOAD_MACHINE}
- oe_runmake ift
-}
-
-do_deploy () {
- install ${S}/x-load.bin.ift ${DEPLOYDIR}/${XLOAD_IMAGE}
- install ${S}/x-load.bin.ift ${DEPLOYDIR}/${MLO_IMAGE}
-
- cd ${DEPLOYDIR}
- rm -f ${XLOAD_SYMLINK}
- ln -sf ${XLOAD_IMAGE} ${XLOAD_SYMLINK}
- rm -f ${MLO_SYMLINK}
- ln -sf ${MLO_IMAGE} ${MLO_SYMLINK}
-}
-addtask deploy before do_build after do_compile
-
diff --git a/meta/recipes-bsp/x-load/x-load_git.bb
b/meta/recipes-bsp/x-load/x-load_git.bb
deleted file mode 100644
index 65dc85c..000
--- a/meta/recipes-bsp/x-load/x-load_git.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-require x-load.inc
-
-FILESPATH = ${FILE_DIRNAME}/x-load-git/${MACHINE}:${FILE_DIRNAME}/x-load-git/
-
-LICENSE = GPLv2+
-LIC_FILES_CHKSUM =
file://README;beginline=1;endline=25;md5=ef08d08cb99057bbb5b9d6d0c5a4396f
-
-SRCREV = 9f94c6577e3a018b6b75cbe39f32bb331871f915
-PV = 1.5.0+git${SRCPV}
-
-#SRC_URI = git://www.sakoman.net/git/x-load-omap3.git;branch=master
-#SRC_URI = git://gitorious.org/x-load-omap3/mainline.git;branch=master
-SRC_URI = git://gitorious.org/x-loader/x-loader.git;branch=master
-
-SRC_URI_append_beagleboard = file://name.patch
-
-S = ${WORKDIR}/git
-
-PACKAGE_ARCH = ${MACHINE_ARCH}
-
-COMPATIBLE_MACHINE = (beagleboard|omap3evm|overo)
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] x-load: remove recipe
From: Petter Mabacker pet...@technux.se Proposal to remove x-load recipe, after discussion on oe mailing list. The conclusion was that X-load shouldn't be used anymore, it has been superseded by u-boot SPL for all cortex based TI SoCs. For legacy boards meta-ti layer has a maintained recipe of x-load that should be used instead. The following changes since commit 7b78c364b7de901f97cd8dbe56d5e02f545bf3d3: cleanup-workdir: Fix crosssdk reference after addition of PN (2014-05-05 09:05:42 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib petmab/remove_xload http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/remove_xload Petter Mabacker (1): x-load: remove recipe .../x-load/x-load-git/beagleboard/name.patch | 18 - meta/recipes-bsp/x-load/x-load.inc | 40 meta/recipes-bsp/x-load/x-load_git.bb | 21 -- 3 files changed, 79 deletions(-) delete mode 100644 meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch delete mode 100644 meta/recipes-bsp/x-load/x-load.inc delete mode 100644 meta/recipes-bsp/x-load/x-load_git.bb -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] x-load: fix broken beaglebone support and FILEPATHS usage
The following changes since commit c446d4edca3b4edfcdee48247391bfb306aab4c2: default-distrovars.inc: Add libgcc-initial to the GPLv3 whitelist (same as libgcc) (2014-04-25 18:00:38 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib petmab/fix_xload http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/fix_xload Petter Mabäcker (2): x-load: fix broken beaglebone support x-load: remove usage of FILESPATH .../x-load/x-load-git/beagleboard/name.patch | 18 -- .../0001-Change-omap3530beagle-target-name.patch | 37 meta/recipes-bsp/x-load/x-load_git.bb |6 ++-- 3 files changed, 39 insertions(+), 22 deletions(-) delete mode 100644 meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch create mode 100644 meta/recipes-bsp/x-load/x-load/beaglebone/0001-Change-omap3530beagle-target-name.patch -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] x-load: fix broken beaglebone support
When beagleboard was renamed to beaglebone, some parts in x-load was
missed. This caused x-load to fail when building it for beaglebone target.
Also use this commit to re-create the beaglebone patch name.patch using
git-format and write a proper patch description.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../x-load/x-load-git/beagleboard/name.patch | 18 --
.../0001-Change-omap3530beagle-target-name.patch | 37
meta/recipes-bsp/x-load/x-load_git.bb |4 +--
3 files changed, 39 insertions(+), 20 deletions(-)
delete mode 100644 meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
create mode 100644
meta/recipes-bsp/x-load/x-load-git/beaglebone/0001-Change-omap3530beagle-target-name.patch
diff --git a/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
b/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
deleted file mode 100644
index 29c26a9..000
--- a/meta/recipes-bsp/x-load/x-load-git/beagleboard/name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: git/Makefile
-===
git.orig/Makefile
-+++ git/Makefile
-@@ -225,8 +225,9 @@ omap3evm_config : unconfig
- overo_config :unconfig
- @$(MKCONFIG) $(@:_config=) arm omap3 overo
-
--omap3530beagle_config :unconfig
-- @$(MKCONFIG) $(@:_config=) arm omap3 omap3530beagle
-+beagleboard_config :unconfig
-+ @$(MKCONFIG) omap3530beagle arm omap3 omap3530beagle
-+ @./mkconfig omap3530beagle arm omap3 omap3530beagle
-
- #
- ## OMAP4 (ARM-CortexA9) Systems
diff --git
a/meta/recipes-bsp/x-load/x-load-git/beaglebone/0001-Change-omap3530beagle-target-name.patch
b/meta/recipes-bsp/x-load/x-load-git/beaglebone/0001-Change-omap3530beagle-target-name.patch
new file mode 100644
index 000..2d4195b
--- /dev/null
+++
b/meta/recipes-bsp/x-load/x-load-git/beaglebone/0001-Change-omap3530beagle-target-name.patch
@@ -0,0 +1,37 @@
+From 36642d018667950027fd6cbcc98cfa12b2c81ad1 Mon Sep 17 00:00:00 2001
+From: Petter Mabacker pet...@technux.se
+Date: Fri, 25 Apr 2014 16:44:31 +0200
+Subject: [PATCH] Change omap3530beagle target name
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Support the usage of ${MACHINE}_config as proper target name for
+beaglebone.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Petter Mabäcker pet...@technux.se
+---
+ Makefile |5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1930db5..1410dae 100644
+--- a/Makefile
b/Makefile
+@@ -222,8 +222,9 @@ omap3evm_config : unconfig
+ overo_config :unconfig
+ @$(MKCONFIG) $(@:_config=) arm omap3 overo
+
+-omap3530beagle_config :unconfig
+- @$(MKCONFIG) $(@:_config=) arm omap3 omap3530beagle
++beaglebone_config :unconfig
++ @$(MKCONFIG) omap3530beagle arm omap3 omap3530beagle
++ @./mkconfig omap3530beagle arm omap3 omap3530beagle
+
+ igep0020_config :unconfig
+ @$(MKCONFIG) $(@:_config=) arm omap3 igep0020
+--
+1.7.9.5
+
diff --git a/meta/recipes-bsp/x-load/x-load_git.bb
b/meta/recipes-bsp/x-load/x-load_git.bb
index 65dc85c..5112349 100644
--- a/meta/recipes-bsp/x-load/x-load_git.bb
+++ b/meta/recipes-bsp/x-load/x-load_git.bb
@@ -12,10 +12,10 @@ PV = 1.5.0+git${SRCPV}
#SRC_URI = git://gitorious.org/x-load-omap3/mainline.git;branch=master
SRC_URI = git://gitorious.org/x-loader/x-loader.git;branch=master
-SRC_URI_append_beagleboard = file://name.patch
+SRC_URI_append_beaglebone =
file://0001-Change-omap3530beagle-target-name.patch
S = ${WORKDIR}/git
PACKAGE_ARCH = ${MACHINE_ARCH}
-COMPATIBLE_MACHINE = (beagleboard|omap3evm|overo)
+COMPATIBLE_MACHINE = (beaglebone|omap3evm|overo)
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] x-load: remove usage of FILESPATH
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in x-load a better solution is to use a path that exists in
FILESPATH by default.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
.../0001-Change-omap3530beagle-target-name.patch |0
meta/recipes-bsp/x-load/x-load_git.bb |2 --
2 files changed, 2 deletions(-)
rename meta/recipes-bsp/x-load/{x-load-git =
x-load}/beaglebone/0001-Change-omap3530beagle-target-name.patch (100%)
diff --git
a/meta/recipes-bsp/x-load/x-load-git/beaglebone/0001-Change-omap3530beagle-target-name.patch
b/meta/recipes-bsp/x-load/x-load/beaglebone/0001-Change-omap3530beagle-target-name.patch
similarity index 100%
rename from
meta/recipes-bsp/x-load/x-load-git/beaglebone/0001-Change-omap3530beagle-target-name.patch
rename to
meta/recipes-bsp/x-load/x-load/beaglebone/0001-Change-omap3530beagle-target-name.patch
diff --git a/meta/recipes-bsp/x-load/x-load_git.bb
b/meta/recipes-bsp/x-load/x-load_git.bb
index 5112349..e5d9400 100644
--- a/meta/recipes-bsp/x-load/x-load_git.bb
+++ b/meta/recipes-bsp/x-load/x-load_git.bb
@@ -1,7 +1,5 @@
require x-load.inc
-FILESPATH = ${FILE_DIRNAME}/x-load-git/${MACHINE}:${FILE_DIRNAME}/x-load-git/
-
LICENSE = GPLv2+
LIC_FILES_CHKSUM =
file://README;beginline=1;endline=25;md5=ef08d08cb99057bbb5b9d6d0c5a4396f
--
1.7.9.5
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] cdrtools-native: remove unused FILESPATH
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in cdrtools no FILESPATH additions are currently needed so
instead it should be removed.
---
.../cdrtools/cdrtools-native_3.01a17.bb|2 --
1 file changed, 2 deletions(-)
diff --git a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb
b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb
index 38de407..71b86aa 100644
--- a/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb
+++ b/meta/recipes-devtools/cdrtools/cdrtools-native_3.01a17.bb
@@ -16,8 +16,6 @@ S = ${WORKDIR}/cdrtools-3.01
inherit native
-FILESPATH = ${FILE_DIRNAME}/cdrtools-native/
-
do_install() {
make install GMAKE_NOWARN=true INS_BASE=${prefix} DESTDIR=${D}
}
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] cdrtools-native: remove unused FILESPATH
The following changes since commit 17aa50645015a149298e78a175bbd3cbf171df22: classes/package: set SUMMARY in do_split_packages() (2014-01-02 22:39:24 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib petmab/bug/4497 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug/4497 Petter Mabäcker (1): cdrtools-native: remove unused FILESPATH .../cdrtools/cdrtools-native_3.01a17.bb|2 -- 1 file changed, 2 deletions(-) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] clutter: remove usage of FILESPATH
Usage of FILESPATH is discouraged, since it can make recipes harder to
bbappend. Instead FILESEXTRAPATHS should be used to extend the path.
However in clutter the default paths solves the problem if we
put all patches in ${BP} directory instead.
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/classes/clutter.bbclass |1 -
.../enable_tests.patch |0
.../fix-wayland-deps.patch |0
.../cogl-1.14.patch|0
.../enable-tests.patch |0
.../fix-build-dir.patch|0
.../fix-test-includes.patch|0
7 files changed, 1 deletion(-)
rename meta/recipes-graphics/clutter/{clutter-1.14 =
clutter-1.0-1.14.4}/enable_tests.patch (100%)
rename meta/recipes-graphics/clutter/{clutter-1.14 =
clutter-1.0-1.14.4}/fix-wayland-deps.patch (100%)
rename meta/recipes-graphics/clutter/{clutter-gst-1.6 =
clutter-gst-1.0-1.6.0}/cogl-1.14.patch (100%)
rename meta/recipes-graphics/clutter/{clutter-gst =
clutter-gst-1.0-1.6.0}/enable-tests.patch (100%)
rename meta/recipes-graphics/mx/{mx-1.4 =
mx-1.0-1.4.7+gitAUTOINC+9b1db6b806}/fix-build-dir.patch (100%)
rename meta/recipes-graphics/mx/{mx =
mx-1.0-1.4.7+gitAUTOINC+9b1db6b806}/fix-test-includes.patch (100%)
diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass
index 66a49bc..167407d 100644
--- a/meta/classes/clutter.bbclass
+++ b/meta/classes/clutter.bbclass
@@ -11,7 +11,6 @@ def get_real_name(n):
VERMINOR = ${@get_minor_dir(${PV})}
REALNAME = ${@get_real_name(${BPN})}
-FILESPATH = ${@base_set_filespath([${FILE_DIRNAME}/${REALNAME}-${PV},
${FILE_DIRNAME}/${REALNAME}-${VERMINOR}, ${FILE_DIRNAME}/${REALNAME},
${FILE_DIRNAME}/files], d)}
CLUTTER_SRC_FTP =
${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive
diff --git a/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch
b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch
similarity index 100%
rename from meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch
rename to meta/recipes-graphics/clutter/clutter-1.0-1.14.4/enable_tests.patch
diff --git a/meta/recipes-graphics/clutter/clutter-1.14/fix-wayland-deps.patch
b/meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch
similarity index 100%
rename from meta/recipes-graphics/clutter/clutter-1.14/fix-wayland-deps.patch
rename to
meta/recipes-graphics/clutter/clutter-1.0-1.14.4/fix-wayland-deps.patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch
b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch
similarity index 100%
rename from meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch
rename to meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/cogl-1.14.patch
diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch
b/meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch
similarity index 100%
rename from meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch
rename to meta/recipes-graphics/clutter/clutter-gst-1.0-1.6.0/enable-tests.patch
diff --git a/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
b/meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-build-dir.patch
similarity index 100%
rename from meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch
rename to
meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-build-dir.patch
diff --git a/meta/recipes-graphics/mx/mx/fix-test-includes.patch
b/meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-test-includes.patch
similarity index 100%
rename from meta/recipes-graphics/mx/mx/fix-test-includes.patch
rename to
meta/recipes-graphics/mx/mx-1.0-1.4.7+gitAUTOINC+9b1db6b806/fix-test-includes.patch
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] clutter: remove usage of FILESPATH
This is a first changeset of trying to remove usage if FILESPATH (Bug 4497).
I like the solution to always use ${P} or ${BP} (even if the recipe is alone),
since that will (at least hopefully) force you to go through the file and/or
patches
when bumping a recipe to a newer version. One of the cons with this is of
course that
you more easily can miss re-create the patches-directory to reflect the new
version
but this should result in a build error (since the patch should exist in
SRC_URI...).
Especially review the parts where I have moved patches located in both
${PN} and $PN-something into just ${P}.
BR,
Petter
The following changes since commit faf8f8660fae26a14578738b642fdeb08bcb9d54:
build-appliance: Update SRCREV for release (2013-10-11 23:13:07 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib petmab/bug/4497
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug/4497
Petter Mabäcker (1):
clutter: remove usage of FILESPATH
meta/classes/clutter.bbclass |1 -
.../enable_tests.patch |0
.../fix-wayland-deps.patch |0
.../cogl-1.14.patch|0
.../enable-tests.patch |0
.../fix-build-dir.patch|0
.../fix-test-includes.patch|0
7 files changed, 1 deletion(-)
rename meta/recipes-graphics/clutter/{clutter-1.14 =
clutter-1.0-1.14.4}/enable_tests.patch (100%)
rename meta/recipes-graphics/clutter/{clutter-1.14 =
clutter-1.0-1.14.4}/fix-wayland-deps.patch (100%)
rename meta/recipes-graphics/clutter/{clutter-gst-1.6 =
clutter-gst-1.0-1.6.0}/cogl-1.14.patch (100%)
rename meta/recipes-graphics/clutter/{clutter-gst =
clutter-gst-1.0-1.6.0}/enable-tests.patch (100%)
rename meta/recipes-graphics/mx/{mx-1.4 =
mx-1.0-1.4.7+gitAUTOINC+9b1db6b806}/fix-build-dir.patch (100%)
rename meta/recipes-graphics/mx/{mx =
mx-1.0-1.4.7+gitAUTOINC+9b1db6b806}/fix-test-includes.patch (100%)
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] remake: fix insufficient gettext dependency
By default when inheriting gettext, gettext-minimal-native is added as
a dependency for native. The bb-file for remake use 'autopoint' (not
included in gettext-minimal-native). When building remake-native it
will result in a failure in do_configure for all cases when gettext (or
gettext-native) is not build from some other recipes, before building
'remake-native'.
This is solved by adding a build-dependency to gettext-native in
remake-native.
Fixes [YOCTO #4385]
Signed-off-by: Petter Mabäcker pet...@technux.se
---
meta/recipes-devtools/remake/remake_git.bb |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/remake/remake_git.bb
b/meta/recipes-devtools/remake/remake_git.bb
index 13d8ce9..405c69f 100644
--- a/meta/recipes-devtools/remake/remake_git.bb
+++ b/meta/recipes-devtools/remake/remake_git.bb
@@ -1,4 +1,4 @@
-PR = r0
+PR = r1
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://tests/COPYING;md5=d32239bcb673463ab874e80d47fae504 \
@@ -12,6 +12,10 @@ S = ${WORKDIR}/git
PV = 3.82+dbg-0.9+git${SRCPV}
DEPENDS += readline
+# Need to add gettext-native dependency to remake-native.
+# By default only gettext-minimal-native is added
+# when inherit gettext.
+DEPENDS_class-native += gettext-native
PROVIDES += make
do_configure_prepend() {
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] remake: fix insufficient gettext dependency
The following changes since commit 3dee534f1e25109e0bdb681de0746c336f4b8840: lib/oeqa: fix dependecy check (2013-07-16 10:04:17 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib petmab/bug/4385 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=petmab/bug/4385 Petter Mabäcker (1): remake: fix insufficient gettext dependency meta/recipes-devtools/remake/remake_git.bb |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
