[OE-core] meta-perl vs meta-cpan: [lib]module-build-perl-native

[Robert P. J. Day]

  about to go back and try to follow that thread about OE and perl
modules, but one question about quick and dirty workarounds ... i just
ran into the (inevitable) situation where the "standard" OE layers and
meta-cpan have different naming conventions for modules, as in:

  meta-perl:DEPENDS += "libmodule-build-perl-native
  meta-cpan:DEPENDS += "module-build-perl-native"

which finally bit me when i wanted to add to an image the one (the
*only* one) meta-perl recipe that contains:

$ grep -r "module-build-perl-native" *
meta-perl/recipes-perl/libhtml/libhtml-tree-perl_5.03.bb:DEPENDS += 
"libmodule-build-perl-native \
$

which clashed trying to install files into a shared area when those
files already exist, given that numerous recipes from meta-cpan
already contain:

  $ grep -hr "module-build-perl-native" *
  DEPENDS += "module-build-perl-native"
  DEPENDS += "module-build-perl-native"
  DEPENDS += "module-build-perl-native"
  DEPENDS += "module-build-perl-native"
  DEPENDS += "module-build-perl-native"
  DEPENDS += "module-build-perl-native"
  DEPENDS += "module-build-perl-native"
  DEPENDS += "module-build-perl-native"
  DEPENDS += "module-build-perl-native"
  DEPENDS += "module-build-perl-native"
  DEPENDS += "module-build-perl-native"
  DEPENDS += "module-build-perl-native"
  DEPENDS += "module-build-perl-native"
  $

i'm actually surprised there is just the one recipe that eventually
got me into trouble, and while i understand there's a long-term plan
to standardize this, what is the best short-term hack to get around
this? reproduce the recipe? .bbappend and override DEPENDS? blacklist
the one from meta-cpan and replace it?

  and in the long term, unless there's a common naming convention, how
can meta-cpan be listed as an OE layer at
https://layers.openembedded.org/layerindex/branch/master/layers/?

rday

-- 


Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca

Twitter:   http://twitter.com/rpjday
LinkedIn:   http://ca.linkedin.com/in/rpjday


-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.

[Kristian Amlie]

It will omit the given path from the resulting partition, and if the
given path ends in a slash, it will only delete the content, and keep
the directory.

Since mkfs only accepts whole directories as input, we need to copy
the rootfs directory to the workdir so that we can selectively delete
files from it.

Signed-off-by: Kristian Amlie 
---
 scripts/lib/wic/help.py  |  6 
 scripts/lib/wic/ksparser.py  |  1 +
 scripts/lib/wic/partition.py |  1 +
 scripts/lib/wic/plugins/source/rootfs.py | 51 +++-
 4 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py
index e5347ec..9dab670 100644
--- a/scripts/lib/wic/help.py
+++ b/scripts/lib/wic/help.py
@@ -715,6 +715,12 @@ DESCRIPTION
  partition table. It may be useful for
  bootloaders.
 
+ --exclude-path: This option is specific to wic. It excludes the given
+ absolute path from the resulting image. If the path
+ ends with a slash, only the content of the directory
+ is omitted, not the directory itself. This option only
+ has an effect with the rootfs source plugin.
+
  --extra-space: This option is specific to wic. It adds extra
 space after the space filled by the content
 of the partition. The final size can go
diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
index 0894e2b..17b97fd0 100644
--- a/scripts/lib/wic/ksparser.py
+++ b/scripts/lib/wic/ksparser.py
@@ -127,6 +127,7 @@ class KickStart():
 part.add_argument('mountpoint', nargs='?')
 part.add_argument('--active', action='store_true')
 part.add_argument('--align', type=int)
+part.add_argument('--exclude-path', nargs='+')
 part.add_argument("--extra-space", type=sizetype, default=10*1024)
 part.add_argument('--fsoptions', dest='fsopts')
 part.add_argument('--fstype')
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index ac4c836..cba78a5 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -45,6 +45,7 @@ class Partition():
 self.align = args.align
 self.disk = args.disk
 self.extra_space = args.extra_space
+self.exclude_path = args.exclude_path
 self.fsopts = args.fsopts
 self.fstype = args.fstype
 self.label = args.label
diff --git a/scripts/lib/wic/plugins/source/rootfs.py 
b/scripts/lib/wic/plugins/source/rootfs.py
index 425da8b..d97d99c 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -26,10 +26,11 @@
 #
 
 import os
+import shutil
 
 from wic import msger
 from wic.pluginbase import SourcePlugin
-from wic.utils.oe.misc import get_bitbake_var
+from wic.utils.oe.misc import get_bitbake_var, exec_cmd
 
 class RootfsPlugin(SourcePlugin):
 """
@@ -78,6 +79,54 @@ class RootfsPlugin(SourcePlugin):
 
 real_rootfs_dir = cls.__get_rootfs_dir(rootfs_dir)
 
+# Handle excluded paths.
+if part.exclude_path is not None:
+# We need a new rootfs directory we can delete files from. Copy to
+# workdir.
+new_rootfs = os.path.join(cr_workdir, "rootfs")
+
+if os.path.lexists(new_rootfs):
+shutil.rmtree(os.path.join(new_rootfs))
+
+if os.stat(real_rootfs_dir).st_dev == os.stat(cr_workdir).st_dev:
+# Optimization if both directories are on the same file system:
+# copy using hardlinks.
+cp_args = "-al"
+else:
+cp_args = "-a"
+exec_cmd("cp %s %s %s" % (cp_args, real_rootfs_dir, new_rootfs))
+
+real_rootfs_dir = new_rootfs
+
+for orig_path in part.exclude_path:
+path = orig_path
+if not os.path.isabs(path):
+msger.error("Must be absolute: --exclude-path=%s" % 
orig_path)
+
+while os.path.isabs(path):
+path = path[1:]
+
+# Disallow '..', because doing so could be quite disastrous
+# (we will delete the directory).
+remaining = path
+while True:
+(head, tail) = os.path.split(remaining)
+if tail == '..':
+msger.error("'..' not allowed: --exclude-path=%s" % 
orig_path)
+elif head == "":
+break
+remaining = head
+
+full_path = os.path.join(new_rootfs, path)
+
+if path.endswith(os.sep):
+# Delete content only.
+for entry in os.listdir(full_path):
+shutil.rmtree(os.path.join(full_path, entry))
+  

Re: [OE-core] [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.

[Patrick Ohly]

Hi!

Wow, that was fast :-)

On Fri, 2016-11-25 at 11:15 +0100, Kristian Amlie wrote:
> +if os.stat(real_rootfs_dir).st_dev ==
> os.stat(cr_workdir).st_dev:
> +# Optimization if both directories are on the same
> file system:
> +# copy using hardlinks.
> +cp_args = "-al"
> +else:
> +cp_args = "-a"
> +exec_cmd("cp %s %s %s" % (cp_args, real_rootfs_dir,
> new_rootfs))

Not a full review (I'll leave that to Ed), just one thing which caught
my eye: when the rootfs contains xattrs, they get lost here.

Use oe.path.copyhardlinktree() instead, it also does the hardlinking
trick.

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.



-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] YAPQ: OE recipe for Perl module Crypt::OpenSSL::X509?

[Robert P. J. Day]

  (side note: if there's a better place to ask about
finding/tweaking/writing perl modules for an OE image, let me know.
i've almost cleared my list of essential perl recipes, just a couple
more i need pretty badly, so a couple more posts coming.)

  for my qemuppc image, i need a (obviously cross-compiled version of)
Crypt::OpenSSL::X509, which i can see at CPAN:

  https://metacpan.org/pod/Crypt::OpenSSL::X509

which has absolutely no hope of being cross-compiled based on the
boilerplate recipe i threw together:

  $ make libcrypt-openssl-x509-perl
  ... snip ...
  | cc1: error: include location "/usr/include/openssl" is unsafe for
  cross-compilation [-Werror=poison-system-directories]
  | cc1: all warnings being treated as errors
  | Makefile:346: recipe for target 'X509.o' failed
  | make: *** [X509.o] Error 1
  | ERROR: oe_runmake failed
  ... snip ...

not at all surprising given this in Makefile.PL:

  ... snip ...
  requires_external_cc();
inc '-I/usr/include/openssl -I/usr/local/include/ssl 
-I/usr/local/ssl/include';
libs '-L/usr/lib -L/usr/local/lib -L/usr/local/ssl/lib -lcrypto';
... snip ...

so, clearly, i need to hack that source to support cross-compilation;
i guess i can find another module to use as a template and take it
from there, so two questions:

  1) i'm willing to take a stab at rewriting that source to support
 cross-compiling (for the educational experience), any
 recommendation for a well-written reference module to use as a
 starting point?

  2) if someone already *has* such a recipe, hey, i'm more than happy
 to use it, but i'll still take the time to figure out how to
 write things like that properly.

  any assistance gratefully accepted. one more perl question coming
...

rday

p.s. i'm still poring over jens rehsack's guide to cross compiling
perl:

http://www.netbsd.org/~sno/talks/nrpm/Cross-Compiling-For-Perl-Hackers-Handout.pdf

because, you know, copious free time. :-P

-- 


Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca

Twitter:   http://twitter.com/rpjday
LinkedIn:   http://ca.linkedin.com/in/rpjday


-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] YAPQ: Perl RPM2 module versus rpm's PACKAGECONFIG[perl]?

[Robert P. J. Day]

  ok, this should be the last perl issue i have for a bit ... the last
OE perl module i was after was RPM2 (Perl bindings for the RPM Package
Manager API):

  https://metacpan.org/pod/RPM2

but a side question -- i can see the OE rpm recipe file, including
this snippet:

 # Perl modules are not built, but they could be enabled fairly easily
 # the perl module creation and installation would need to be patched.
 # (currently has host perl contamination issues)
 WITH_PERL = "--with-perl --without-perlembed --without-perl-urpm"
 WITHOUT_PERL = "--without-perl --without-perl-urpm"
 PACKAGECONFIG[perl] = "${WITH_PERL},${WITHOUT_PERL},perl,"

so ...

  1) i know nothing about RPM2's API, is that the same as what i would
 get from rpm being PACKAGECONFIG'ed with perl?

  2) in any event, is rpm's PACKAGECONFIG[perl] still broken so that i
 can't use it, anyway?

that's about it.

rday

-- 


Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca

Twitter:   http://twitter.com/rpjday
LinkedIn:   http://ca.linkedin.com/in/rpjday


-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] ltp: 20160126 -> 20160920

[huangqy]

From: Huang Qiyu 

1)Upgrade ltp from 20160126 to 20160920. 2)Delete some
 patches, since they are integrated upstream.
 0001-ltp-Don-t-link-against-libfl.patch
 0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
 0007-replace-SIGCLD-with-SIGCHLD.patch
 0009-Guard-error.h-with-__GLIBC__.patch
 0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
 0013-include-fcntl.h-for-getting-O_-definitions.patch
 0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
 0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
 0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
 0017-replace-sigval_t-with-union-sigval.patch
 0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
 0022-include-sys-types.h.patch
 0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
 0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
 0029-trace_shed-Fix-build-with-musl.patch
 0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
 0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
 0032-regen.sh-Include-asm-unistd.h-explicitly.patch
 0035-fix-test_proc_kill-hang.patch 3)Modify one patch, since the data has
 been changed. 0011-Rename-sigset-variable-to-sigset1.patch 4)Add some new
 patches. 0001-Define-__SIGRTMIN-and-__SIGRTMAX-on-musl.patch
 0002-initialize-recursive-mutex-in-a-portable-way.patch
 0003-lapi-Use-sig_t-instead-of-sighandler_t.patch
 0004-rt_sigaction-rt_sigprocmark-Replace-SA_NOMASK-with-S.patch
 0005-Fix-test_proc_kill-hanging.patch
 0006-Remove-unused-__BEGIN_DECLS-and-__END_DECLS.patch

Signed-off-by: Wang Xin 
Signed-off-by: Huang Qiyu 
---
 .../ltp/0001-ltp-Don-t-link-against-libfl.patch|  30 --
 ...sendfile-Use-off64_t-instead-of-__off64_t.patch |  31 --
 .../ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch | 394 -
 .../ltp/0009-Guard-error.h-with-__GLIBC__.patch| 270 --
 .../0011-Rename-sigset-variable-to-sigset1.patch   |  60 ++--
 ...fsstress.c-Replace-__int64_t-with-int64_t.patch | 351 --
 ...nclude-fcntl.h-for-getting-O_-definitions.patch |  67 
 ...ing-Include-sys-types.h-for-pid_t-definit.patch |  56 ---
 ...015-mincore01-Rename-PAGESIZE-to-pagesize.patch |  64 
 ...Change-header-from-ustat.h-to-sys-ustat.h.patch |  45 ---
 .../0017-replace-sigval_t-with-union-sigval.patch  |  88 -
 ...lace-canonicalize_file_name-with-realpath.patch |  32 --
 .../ltp/ltp/0022-include-sys-types.h.patch |  29 --
 ...sconf01-Use-_SC_2_C_VERSION-conditionally.patch |  29 --
 ...n.h-Use-sighandler_t-instead-of-__sighand.patch |  43 ---
 .../ltp/0029-trace_shed-Fix-build-with-musl.patch  |  32 --
 ...READ_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch |  33 --
 ...age-size-offset-as-per-page-size-alignmen.patch |  33 --
 ...-regen.sh-Include-asm-unistd.h-explicitly.patch |  30 --
 .../ltp/ltp/0035-fix-test_proc_kill-hang.patch |  23 --
 meta/recipes-extended/ltp/ltp_20160126.bb  | 118 --
 21 files changed, 30 insertions(+), 1828 deletions(-)
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0001-ltp-Don-t-link-against-libfl.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0006-sendfile-Use-off64_t-instead-of-__off64_t.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0007-replace-SIGCLD-with-SIGCHLD.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0009-Guard-error.h-with-__GLIBC__.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0012-fsstress.c-Replace-__int64_t-with-int64_t.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0013-include-fcntl.h-for-getting-O_-definitions.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0014-hyperthreading-Include-sys-types.h-for-pid_t-definit.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0015-mincore01-Rename-PAGESIZE-to-pagesize.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0016-ustat-Change-header-from-ustat.h-to-sys-ustat.h.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0017-replace-sigval_t-with-union-sigval.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0019-tomoyo-Replace-canonicalize_file_name-with-realpath.patch
 delete mode 100644 meta/recipes-extended/ltp/ltp/0022-include-sys-types.h.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0027-sysconf01-Use-_SC_2_C_VERSION-conditionally.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0029-trace_shed-Fix-build-with-musl.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0030-lib-Use-PTHREAD_MUTEX_RECURSIVE-in-place-of-PTHREAD_.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0031-vma03-fix-page-size-offset-as-per-page-size-alignmen.patch
 delete mode 100644 
meta/recipes-extended/ltp/ltp/0032-regen.sh-Include-asm-unistd.h-explicitly.patch
 delete mode 100644 
meta/recipes-extend

Re: [OE-core] [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.

[Kristian Amlie]

On 25/11/16 11:33, Patrick Ohly wrote:
> On Fri, 2016-11-25 at 11:15 +0100, Kristian Amlie wrote:
>> +if os.stat(real_rootfs_dir).st_dev ==
>> os.stat(cr_workdir).st_dev:
>> +# Optimization if both directories are on the same
>> file system:
>> +# copy using hardlinks.
>> +cp_args = "-al"
>> +else:
>> +cp_args = "-a"
>> +exec_cmd("cp %s %s %s" % (cp_args, real_rootfs_dir,
>> new_rootfs))
> 
> Not a full review (I'll leave that to Ed), just one thing which caught
> my eye: when the rootfs contains xattrs, they get lost here.
> 
> Use oe.path.copyhardlinktree() instead, it also does the hardlinking
> trick.

Thanks, that's a good tip! I'll include that in the next patchset.

-- 
Kristian
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.

[Maciej Borzęcki]

On Fri, Nov 25, 2016 at 11:15 AM, Kristian Amlie
 wrote:
> It will omit the given path from the resulting partition, and if the
> given path ends in a slash, it will only delete the content, and keep
> the directory.
>
> Since mkfs only accepts whole directories as input, we need to copy
> the rootfs directory to the workdir so that we can selectively delete
> files from it.
>
> Signed-off-by: Kristian Amlie 
> ---
>  scripts/lib/wic/help.py  |  6 
>  scripts/lib/wic/ksparser.py  |  1 +
>  scripts/lib/wic/partition.py |  1 +
>  scripts/lib/wic/plugins/source/rootfs.py | 51 
> +++-
>  4 files changed, 58 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/lib/wic/help.py b/scripts/lib/wic/help.py
> index e5347ec..9dab670 100644
> --- a/scripts/lib/wic/help.py
> +++ b/scripts/lib/wic/help.py
> @@ -715,6 +715,12 @@ DESCRIPTION
>   partition table. It may be useful for
>   bootloaders.
>
> + --exclude-path: This option is specific to wic. It excludes the 
> given
> + absolute path from the resulting image. If the path
> + ends with a slash, only the content of the directory
> + is omitted, not the directory itself. This option 
> only
> + has an effect with the rootfs source plugin.
> +
>   --extra-space: This option is specific to wic. It adds extra
>  space after the space filled by the content
>  of the partition. The final size can go
> diff --git a/scripts/lib/wic/ksparser.py b/scripts/lib/wic/ksparser.py
> index 0894e2b..17b97fd0 100644
> --- a/scripts/lib/wic/ksparser.py
> +++ b/scripts/lib/wic/ksparser.py
> @@ -127,6 +127,7 @@ class KickStart():
>  part.add_argument('mountpoint', nargs='?')
>  part.add_argument('--active', action='store_true')
>  part.add_argument('--align', type=int)
> +part.add_argument('--exclude-path', nargs='+')
>  part.add_argument("--extra-space", type=sizetype, default=10*1024)
>  part.add_argument('--fsoptions', dest='fsopts')
>  part.add_argument('--fstype')
> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
> index ac4c836..cba78a5 100644
> --- a/scripts/lib/wic/partition.py
> +++ b/scripts/lib/wic/partition.py
> @@ -45,6 +45,7 @@ class Partition():
>  self.align = args.align
>  self.disk = args.disk
>  self.extra_space = args.extra_space
> +self.exclude_path = args.exclude_path
>  self.fsopts = args.fsopts
>  self.fstype = args.fstype
>  self.label = args.label
> diff --git a/scripts/lib/wic/plugins/source/rootfs.py 
> b/scripts/lib/wic/plugins/source/rootfs.py
> index 425da8b..d97d99c 100644
> --- a/scripts/lib/wic/plugins/source/rootfs.py
> +++ b/scripts/lib/wic/plugins/source/rootfs.py
> @@ -26,10 +26,11 @@
>  #
>
>  import os
> +import shutil
>
>  from wic import msger
>  from wic.pluginbase import SourcePlugin
> -from wic.utils.oe.misc import get_bitbake_var
> +from wic.utils.oe.misc import get_bitbake_var, exec_cmd
>
>  class RootfsPlugin(SourcePlugin):
>  """
> @@ -78,6 +79,54 @@ class RootfsPlugin(SourcePlugin):
>
>  real_rootfs_dir = cls.__get_rootfs_dir(rootfs_dir)
>
> +# Handle excluded paths.
> +if part.exclude_path is not None:
> +# We need a new rootfs directory we can delete files from. Copy 
> to
> +# workdir.
> +new_rootfs = os.path.join(cr_workdir, "rootfs")
> +
> +if os.path.lexists(new_rootfs):
> +shutil.rmtree(os.path.join(new_rootfs))
> +
> +if os.stat(real_rootfs_dir).st_dev == os.stat(cr_workdir).st_dev:
> +# Optimization if both directories are on the same file 
> system:
> +# copy using hardlinks.
> +cp_args = "-al"
> +else:
> +cp_args = "-a"
> +exec_cmd("cp %s %s %s" % (cp_args, real_rootfs_dir, new_rootfs))
> +
> +real_rootfs_dir = new_rootfs
> +
> +for orig_path in part.exclude_path:
> +path = orig_path
> +if not os.path.isabs(path):
> +msger.error("Must be absolute: --exclude-path=%s" % 
> orig_path)
> +
> +while os.path.isabs(path):
> +path = path[1:]
> +
> +# Disallow '..', because doing so could be quite disastrous
> +# (we will delete the directory).
> +remaining = path
> +while True:
> +(head, tail) = os.path.split(remaining)
> +if tail == '..':
> +msger.error("'..' not allowed: --exclude-path=%s" % 
> orig_path)
> +elif head == "":
> +break
> +remain

Re: [OE-core] [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.

[Kristian Amlie]

On 25/11/16 13:28, Maciej Borzęcki wrote:
> On Fri, Nov 25, 2016 at 11:15 AM, Kristian Amlie
>> +# Disallow '..', because doing so could be quite disastrous
>> +# (we will delete the directory).
>> +remaining = path
>> +while True:
>> +(head, tail) = os.path.split(remaining)
>> +if tail == '..':
>> +msger.error("'..' not allowed: --exclude-path=%s" % 
>> orig_path)
>> +elif head == "":
>> +break
>> +remaining = head
> 
> Why not do this instead?
> 
> if '..' in path:
> msger.error("'..' not allowed: --exclude-path=%s" % orig_path)
> 

Because '..' can be part of a longer file name. Not overly likely, but
not impossible either.

-- 
Kristian
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] mount bindir confusion

[Jack Mitchell]

Does anyone have any input on where mount.* utils should be placed in 
the filesystem. I have the following binaries installed


mount: /usr/sbin/mount.exfat /usr/sbin/mount.exfat-fuse 
/bin/mount.util-linux /bin/mount /sbin/mount.fuse /sbin/mount.exfat 
/sbin/mount.cifs


Due to some being in /usr/sbin and /sbin the mount utility can't find 
the extensions when you try to call it in the following manner:


mount -t exfat /dev/sda1 /mnt

So, what would be the preferable solution? Move mount to a different 
location, move the other mount helpers to where mount is, or create 
symlinks for the helpers to where mount is?


In ArchLinux which I'm currently using at install time everything from 
util-linux in /bin /sbin is moved to the /usr/bin /usr/sbin. Is this the 
way forward as I've heard some talk before of a merged /usr.


Cheers,
Jack.
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] meta: remove True option to getVarFlag calls

[Joshua Lock]

getVarFlag() now defaults to expanding by default, thus remove the
True option from getVarFlag() calls with a regex search and
replace.

Search made with the following regex:
getVarFlag ?\(( ?[^,()]*, ?[^,()]*), True\)

Signed-off-by: Joshua Lock 
---
 meta/classes/archiver.bbclass  | 28 ++--
 meta/classes/blacklist.bbclass |  2 +-
 meta/classes/compress_doc.bbclass  | 14 +++---
 meta/classes/devshell.bbclass  |  4 ++--
 meta/classes/externalsrc.bbclass   |  2 +-
 meta/classes/image-buildinfo.bbclass   |  2 +-
 meta/classes/image.bbclass |  4 ++--
 meta/classes/license.bbclass   | 16 
 meta/classes/package.bbclass   |  4 ++--
 meta/classes/package_rpm.bbclass   |  6 +++---
 meta/classes/package_tar.bbclass   |  2 +-
 meta/classes/packagefeed-stability.bbclass |  2 +-
 meta/classes/populate_sdk_ext.bbclass  |  4 ++--
 meta/classes/rootfs_ipk.bbclass|  2 +-
 meta/classes/rootfs_rpm.bbclass|  2 +-
 meta/classes/sstate.bbclass| 14 +++---
 meta/classes/testexport.bbclass|  2 +-
 meta/classes/typecheck.bbclass |  2 +-
 meta/classes/update-alternatives.bbclass   | 14 +++---
 meta/classes/utility-tasks.bbclass |  6 +++---
 meta/lib/oe/data.py|  2 +-
 meta/lib/oe/packagegroup.py|  4 ++--
 meta/lib/oe/sstatesig.py   |  2 +-
 scripts/lib/recipetool/append.py   |  6 +++---
 scripts/verify-bashisms|  2 +-
 25 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 30215ae..3e3c382 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -73,9 +73,9 @@ python () {
 bb.debug(1, 'archiver: %s is excluded, covered by gcc-source' % pn)
 return
 
-ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True)
-ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata', True)
-ar_recipe = d.getVarFlag('ARCHIVER_MODE', 'recipe', True)
+ar_src = d.getVarFlag('ARCHIVER_MODE', 'src')
+ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata')
+ar_recipe = d.getVarFlag('ARCHIVER_MODE', 'recipe')
 
 if ar_src == "original":
 d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_ar_original' 
% pn)
@@ -104,7 +104,7 @@ python () {
 d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_ar_recipe' % 
pn)
 
 # Output the srpm package
-ar_srpm = d.getVarFlag('ARCHIVER_MODE', 'srpm', True)
+ar_srpm = d.getVarFlag('ARCHIVER_MODE', 'srpm')
 if ar_srpm == "1":
 if d.getVar('PACKAGES') != '' and d.getVar('IMAGE_PKGTYPE') == 'rpm':
 d.appendVarFlag('do_deploy_archives', 'depends', ' 
%s:do_package_write_rpm' % pn)
@@ -127,7 +127,7 @@ python do_ar_original() {
 
 import shutil, tarfile, tempfile
 
-if d.getVarFlag('ARCHIVER_MODE', 'src', True) != "original":
+if d.getVarFlag('ARCHIVER_MODE', 'src') != "original":
 return
 
 ar_outdir = d.getVar('ARCHIVER_OUTDIR')
@@ -191,7 +191,7 @@ python do_ar_original() {
 
 python do_ar_patched() {
 
-if d.getVarFlag('ARCHIVER_MODE', 'src', True) != 'patched':
+if d.getVarFlag('ARCHIVER_MODE', 'src') != 'patched':
 return
 
 # Get the ARCHIVER_OUTDIR before we reset the WORKDIR
@@ -206,7 +206,7 @@ python do_ar_configured() {
 import shutil
 
 ar_outdir = d.getVar('ARCHIVER_OUTDIR')
-if d.getVarFlag('ARCHIVER_MODE', 'src', True) == 'configured':
+if d.getVarFlag('ARCHIVER_MODE', 'src') == 'configured':
 bb.note('Archiving the configured source...')
 pn = d.getVar('PN')
 # "gcc-source-${PV}" recipes don't have "do_configure"
@@ -226,12 +226,12 @@ python do_ar_configured() {
 bb.build.exec_func('do_kernel_configme', d)
 if bb.data.inherits_class('cmake', d):
 bb.build.exec_func('do_generate_toolchain_file', d)
-prefuncs = d.getVarFlag('do_configure', 'prefuncs', True)
+prefuncs = d.getVarFlag('do_configure', 'prefuncs')
 for func in (prefuncs or '').split():
 if func != "sysroot_cleansstate":
 bb.build.exec_func(func, d)
 bb.build.exec_func('do_configure', d)
-postfuncs = d.getVarFlag('do_configure', 'postfuncs', True)
+postfuncs = d.getVarFlag('do_configure', 'postfuncs')
 for func in (postfuncs or '').split():
 if func != "do_qa_configure":
 bb.build.exec_func(func, d)
@@ -283,7 +283,7 @@ def create_diff_gz(d, src_orig, src, ar_outdir):
 # exclude.
 src_patched = src + '.patched'
 oe.path.copyhardlinktree(src, src_patched)
-for i in d.getVarFlag('ARCHIVER_MODE', 'diff-exclude', True).split():
+for i 

Re: [OE-core] [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.

[Ed Bartosh]

On Fri, Nov 25, 2016 at 01:07:34PM +0100, Kristian Amlie wrote:
> On 25/11/16 11:33, Patrick Ohly wrote:
> > On Fri, 2016-11-25 at 11:15 +0100, Kristian Amlie wrote:
> >> +if os.stat(real_rootfs_dir).st_dev ==
> >> os.stat(cr_workdir).st_dev:
> >> +# Optimization if both directories are on the same
> >> file system:
> >> +# copy using hardlinks.
> >> +cp_args = "-al"
> >> +else:
> >> +cp_args = "-a"
> >> +exec_cmd("cp %s %s %s" % (cp_args, real_rootfs_dir,
> >> new_rootfs))
> > 
> > Not a full review (I'll leave that to Ed), just one thing which caught
> > my eye: when the rootfs contains xattrs, they get lost here.
> > 
> > Use oe.path.copyhardlinktree() instead, it also does the hardlinking
> > trick.
> 
> Thanks, that's a good tip! I'll include that in the next patchset.
> 

Thank you for so fast implementation!

Sorry for not answering on original e-mail. I've lost it somehow.

My comments so far:

What's the reason of insisting that path must be absolute?
May be it's just me, but I find it a bit scaring to use absolute path in .wks
The patch is relative to the rootfs directory from my point of view.

It also looks quite strange in the code to insist on absolute path
+if not os.path.isabs(path):
+msger.error("Must be absolute: --exclude-path=%s" %

and then immediately making it relative:
+
+while os.path.isabs(path):
+path = path[1:]


I know, this is just a matter of taste, but I'd not use brackets around
head, tail here. They're redundant and the code looks better without
them from my point of view.
+(head, tail) = os.path.split(remaining)

This causes rmtree to throw NotADirectoryError on files:
+for entry in os.listdir(full_path):
+shutil.rmtree(os.path.join(full_path, entry))

--
Regards,
Ed
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v1] wic: Add --exclude-path option to rootfs source plugin.

[Ed Bartosh]

On Fri, Nov 25, 2016 at 01:35:53PM +0100, Kristian Amlie wrote:
> On 25/11/16 13:28, Maciej Borzęcki wrote:
> > On Fri, Nov 25, 2016 at 11:15 AM, Kristian Amlie
> >> +# Disallow '..', because doing so could be quite 
> >> disastrous
> >> +# (we will delete the directory).
> >> +remaining = path
> >> +while True:
> >> +(head, tail) = os.path.split(remaining)
> >> +if tail == '..':
> >> +msger.error("'..' not allowed: --exclude-path=%s" 
> >> % orig_path)
> >> +elif head == "":
> >> +break
> >> +remaining = head
> > 
> > Why not do this instead?
> > 
> > if '..' in path:
> > msger.error("'..' not allowed: --exclude-path=%s" % orig_path)
> > 
would "'/..' in path" or something similar work?

--
Regards,
Ed
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH][morty] lib/oe/qa: handle binaries with segments outside the first 4kb

[Ross Burton]

The ELF parser was assuming that the segment tables are in the first 4kb of the
binary.  Whilst this generally appears to be the case, there have been instances
where the segment table is elsewhere (offset 2MB, in this sample I have).  Solve
this problem by mmap()ing the file instead.

Also clean up the code a little whilst chasing the problem.

Signed-off-by: Ross Burton 
---
 meta/lib/oe/qa.py | 82 +++
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index fbe719d..22d76dc 100644
--- a/meta/lib/oe/qa.py
+++ b/meta/lib/oe/qa.py
@@ -1,4 +1,4 @@
-import os, struct
+import os, struct, mmap
 
 class NotELFFileError(Exception):
 pass
@@ -23,9 +23,9 @@ class ELFFile:
 EV_CURRENT   = 1
 
 # possible values for EI_DATA
-ELFDATANONE  = 0
-ELFDATA2LSB  = 1
-ELFDATA2MSB  = 2
+EI_DATA_NONE  = 0
+EI_DATA_LSB  = 1
+EI_DATA_MSB  = 2
 
 PT_INTERP = 3
 
@@ -34,51 +34,46 @@ class ELFFile:
 #print "'%x','%x' %s" % (ord(expectation), ord(result), self.name)
 raise NotELFFileError("%s is not an ELF" % self.name)
 
-def __init__(self, name, bits = 0):
+def __init__(self, name):
 self.name = name
-self.bits = bits
 self.objdump_output = {}
 
-def open(self):
-if not os.path.isfile(self.name):
-raise NotELFFileError("%s is not a normal file" % self.name)
+# Context Manager functions to close the mmap explicitly
+def __enter__(self):
+return self
+
+def __exit__(self, exc_type, exc_value, traceback):
+self.data.close()
 
+def open(self):
 with open(self.name, "rb") as f:
-# Read 4k which should cover most of the headers we're after
-self.data = f.read(4096)
+try:
+self.data = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
+except ValueError:
+# This means the file is empty
+raise NotELFFileError("%s is empty" % self.name)
 
+# Check the file has the minimum number of ELF table entries
 if len(self.data) < ELFFile.EI_NIDENT + 4:
 raise NotELFFileError("%s is not an ELF" % self.name)
 
+# ELF header
 self.my_assert(self.data[0], 0x7f)
 self.my_assert(self.data[1], ord('E'))
 self.my_assert(self.data[2], ord('L'))
 self.my_assert(self.data[3], ord('F'))
-if self.bits == 0:
-if self.data[ELFFile.EI_CLASS] == ELFFile.ELFCLASS32:
-self.bits = 32
-elif self.data[ELFFile.EI_CLASS] == ELFFile.ELFCLASS64:
-self.bits = 64
-else:
-# Not 32-bit or 64.. lets assert
-raise NotELFFileError("ELF but not 32 or 64 bit.")
-elif self.bits == 32:
-self.my_assert(self.data[ELFFile.EI_CLASS], ELFFile.ELFCLASS32)
-elif self.bits == 64:
-self.my_assert(self.data[ELFFile.EI_CLASS], ELFFile.ELFCLASS64)
+if self.data[ELFFile.EI_CLASS] == ELFFile.ELFCLASS32:
+self.bits = 32
+elif self.data[ELFFile.EI_CLASS] == ELFFile.ELFCLASS64:
+self.bits = 64
 else:
-raise NotELFFileError("Must specify unknown, 32 or 64 bit size.")
+# Not 32-bit or 64.. lets assert
+raise NotELFFileError("ELF but not 32 or 64 bit.")
 self.my_assert(self.data[ELFFile.EI_VERSION], ELFFile.EV_CURRENT)
 
-self.sex = self.data[ELFFile.EI_DATA]
-if self.sex == ELFFile.ELFDATANONE:
-raise NotELFFileError("self.sex == ELFDATANONE")
-elif self.sex == ELFFile.ELFDATA2LSB:
-self.sex = "<"
-elif self.sex == ELFFile.ELFDATA2MSB:
-self.sex = ">"
-else:
-raise NotELFFileError("Unknown self.sex")
+self.endian = self.data[ELFFile.EI_DATA]
+if self.endian not in (ELFFile.EI_DATA_LSB, ELFFile.EI_DATA_MSB):
+raise NotELFFileError("Unexpected EI_DATA %x" % self.endian)
 
 def osAbi(self):
 return self.data[ELFFile.EI_OSABI]
@@ -90,16 +85,20 @@ class ELFFile:
 return self.bits
 
 def isLittleEndian(self):
-return self.sex == "<"
+return self.endian == ELFFile.EI_DATA_LSB
 
 def isBigEndian(self):
-return self.sex == ">"
+return self.endian == ELFFile.EI_DATA_MSB
+
+def getStructEndian(self):
+return {ELFFile.EI_DATA_LSB: "<",
+ELFFile.EI_DATA_MSB: ">"}[self.endian]
 
 def getShort(self, offset):
-return struct.unpack_from(self.sex+"H", self.data, offset)[0]
+return struct.unpack_from(self.getStructEndian() + "H", self.data, 
offset)[0]
 
 def getWord(self, offset):
-return struct.unpack_from(self.sex+"i", self.data, offset)[0]
+return struct.unpack_from(self.getStructEndian() + "i", self.data, 
offset)[0]
 

Re: [OE-core] [PATCH v3] rootfs: Modify RPM installation

[Burton, Ross]

On 24 November 2016 at 10:49, David Vincent  wrote:

> -self._setup_dbg_rootfs(['/etc/rpm', '/var/lib/rpm',
> '/var/lib/smart'])
> +self._setup_dbg_rootfs(['/etc/rpm', rpm_libdir,
> '/var/lib/smart'])
>

Can we extend the un-hardcoding so this uses ${localstatedir}/lib/smart,
and rpmlibdir also uses ${localstatedir}?

Also current master lets you not bother passing True to d.getVar() as that
is the default now.

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v3] rootfs: Modify RPM installation

[Mark Hatle]

On 11/25/16 12:17 PM, Burton, Ross wrote:
> 
> On 24 November 2016 at 10:49, David Vincent  > wrote:
> 
> -self._setup_dbg_rootfs(['/etc/rpm', '/var/lib/rpm', 
> '/var/lib/smart'])
> +self._setup_dbg_rootfs(['/etc/rpm', rpm_libdir, 
> '/var/lib/smart'])
> 
> 
> Can we extend the un-hardcoding so this uses ${localstatedir}/lib/smart, and
> rpmlibdir also uses ${localstatedir}?

The value for the rpm directory is hard coded into the configuration file.
Anything we do outside of that MUST match.  Inspect the rpm macros file for the
matching value.  (This is why /var/lib/rpm was hard coded in the past.)

As for smart, I don't remember the rules offhand, so someone will need to figure
out if it's variable (compile time) or hard coded.

--Mark

> Also current master lets you not bother passing True to d.getVar() as that is
> the default now.
> 
> Ross
> 
> 

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] ltp: 20160126 -> 20160920

[Burton, Ross]

On 25 November 2016 at 19:58, huangqy  wrote:

>  meta/recipes-extended/ltp/ltp_20160126.bb  | 118 --
>

You forgot to add the new recipe to the git commit, so all this patch has
is you deleting the old version.

Ross
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] scripts.send-pull-request: Avoid multiple chain headers

[Jose Lamego]

When creating a patch set with cover letter using the
send-pull-request script, both the "In-Reply-To" and "References"
headers are appended twice in patch 2 and subsequent.

This change appends only one header pointing to very first patch
in series or to cover letter if available.

[Yocto #10718]

Signed-off-by: Jose Lamego 
---
 scripts/send-pull-request | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/send-pull-request b/scripts/send-pull-request
index 575549d..a660c37 100755
--- a/scripts/send-pull-request
+++ b/scripts/send-pull-request
@@ -162,7 +162,7 @@ PATCHES=$(echo $PDIR/*.patch)
 if [ $AUTO_CL -eq 1 ]; then
# Send the cover letter to every recipient, both specified as well as
# harvested. Then remove it from the patches list.
-   eval "git send-email $GIT_TO $GIT_CC $GIT_EXTRA_CC --confirm=always 
--no-chain-reply-to --suppress-cc=all $CL"
+   eval "git send-email $GIT_TO $GIT_CC $GIT_EXTRA_CC --confirm=always 
--no-thread --suppress-cc=all $CL"
if [ $? -eq 1 ]; then
echo "ERROR: failed to send cover-letter with automatic 
recipients."
exit 1
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH][morty 2/2] Revert "epiphany: remove unnecessary libwnck3 dependency"

[Randy MacLeod]

Armin,

Probably a US Thanksgiving glitch but...

Morty needs both these patches to have an, err build epiphany.

I don't see a commit on morty or the non-existent morty-next.
What's the plan?

../Randy



Is there a plan to
On 2016-11-22 12:55 PM, Ross Burton wrote:

This version of epiphany still needs libwnck3.

This reverts commit fb5c4f181176710a4cfb3c875b5edb4e5aa5df73.

Signed-off-by: Ross Burton 
---
 meta/recipes-gnome/epiphany/epiphany_3.20.3.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb 
b/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
index 9115892..eba480b 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
@@ -2,10 +2,11 @@ SUMMARY = "WebKit based web browser for GNOME"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"

-DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates avahi 
libnotify gcr \
+DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates avahi 
libnotify gcr libwnck3 \
   gsettings-desktop-schemas gnome-desktop3 libxml2-native 
intltool-native"

 inherit gnomebase gsettings distro_features_check upstream-version-is-even
+# libwnck3 is x11 only
 REQUIRED_DISTRO_FEATURES = "x11"

 SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch"
@@ -21,3 +22,4 @@ do_configure_prepend() {
 FILES_${PN} += "${datadir}/appdata ${datadir}/dbus-1 
${datadir}/gnome-shell/search-providers"
 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
 RRECOMMENDS_${PN} = "ca-certificates"
+




--
# Randy MacLeod. SMTS, Linux, Wind River
Direct: 613.963.1350 | 350 Terry Fox Drive, Suite 200, Ottawa, ON, 
Canada, K2K 2W5

--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] ruby: upgrade to 2.3.1

[Edwin Plauchu]

From: Edwin Plauchu 

Signed-off-by: Edwin Plauchu 
---
 meta/recipes-devtools/ruby/ruby.inc | 2 +-
 meta/recipes-devtools/ruby/{ruby_2.2.5.bb => ruby_2.3.1.bb} | 6 --
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/ruby/{ruby_2.2.5.bb => ruby_2.3.1.bb} (86%)

diff --git a/meta/recipes-devtools/ruby/ruby.inc 
b/meta/recipes-devtools/ruby/ruby.inc
index fde67e9..f38ebb0 100644
--- a/meta/recipes-devtools/ruby/ruby.inc
+++ b/meta/recipes-devtools/ruby/ruby.inc
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "\
 file://COPYING;md5=837b32593517ae48b9c3b5c87a5d288c \
 file://BSDL;md5=19aaf65c88a40b508d17ae4be539c4b5\
 file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263\
-file://LEGAL;md5=c440adb575ba4e6e2344c2630b6a5584\
+file://LEGAL;md5=78e8a29b8cc93e042990dbbb5572b1e1\
 "
 
 DEPENDS = "ruby-native zlib openssl tcl libyaml db gdbm readline"
diff --git a/meta/recipes-devtools/ruby/ruby_2.2.5.bb 
b/meta/recipes-devtools/ruby/ruby_2.3.1.bb
similarity index 86%
rename from meta/recipes-devtools/ruby/ruby_2.2.5.bb
rename to meta/recipes-devtools/ruby/ruby_2.3.1.bb
index 5a64582..299383a 100644
--- a/meta/recipes-devtools/ruby/ruby_2.2.5.bb
+++ b/meta/recipes-devtools/ruby/ruby_2.3.1.bb
@@ -1,7 +1,7 @@
 require ruby.inc
 
-SRC_URI[md5sum] = "bd8e349d4fb2c75d90817649674f94be"
-SRC_URI[sha256sum] = 
"30c4b31697a4ca4ea0c8db8ad30cf45e6690a0f09687e5d483c933c03ca335e3"
+SRC_URI[md5sum] = "0d896c2e7fd54f722b399f407e48a4c6"
+SRC_URI[sha256sum] = 
"b87c738cb2032bf4920fef8e3864dc5cf8eae9d89d8d523ce0236945c5797dcd"
 
 # it's unknown to configure script, but then passed to extconf.rb
 # maybe it's not really needed as we're hardcoding the result with
@@ -15,6 +15,8 @@ PACKAGECONFIG[valgrind] = "--with-valgrind=yes, 
--with-valgrind=no, valgrind"
 PACKAGECONFIG[gpm] = "--with-gmp=yes, --with-gmp=no, gmp"
 PACKAGECONFIG[ipv6] = ",--enable-wide-getaddrinfo,"
 
+EXTRA_AUTORECONF += "--exclude=aclocal"
+
 EXTRA_OECONF = "\
 --disable-versioned-paths \
 --disable-rpath \
-- 
2.9.3

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH][morty 2/2] Revert "epiphany: remove unnecessary libwnck3 dependency"

[akuster808]

On 11/25/2016 04:06 PM, Randy MacLeod wrote:

Armin,

Probably a US Thanksgiving glitch but...

Morty needs both these patches to have an, err build epiphany.

I don't see a commit on morty or the non-existent morty-next.
What's the plan?


I will take a look and do the needful. Thanks for the pointer.

- armin


../Randy



Is there a plan to
On 2016-11-22 12:55 PM, Ross Burton wrote:

This version of epiphany still needs libwnck3.

This reverts commit fb5c4f181176710a4cfb3c875b5edb4e5aa5df73.

Signed-off-by: Ross Burton 
---
 meta/recipes-gnome/epiphany/epiphany_3.20.3.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb 
b/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb

index 9115892..eba480b 100644
--- a/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
+++ b/meta/recipes-gnome/epiphany/epiphany_3.20.3.bb
@@ -2,10 +2,11 @@ SUMMARY = "WebKit based web browser for GNOME"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = 
"file://COPYING;md5=751419260aa954499f7abaabaa882bbe"


-DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates 
avahi libnotify gcr \
+DEPENDS = "libsoup-2.4 webkitgtk gtk+3 iso-codes ca-certificates 
avahi libnotify gcr libwnck3 \
gsettings-desktop-schemas gnome-desktop3 libxml2-native 
intltool-native"


 inherit gnomebase gsettings distro_features_check 
upstream-version-is-even

+# libwnck3 is x11 only
 REQUIRED_DISTRO_FEATURES = "x11"

 SRC_URI += "file://0001-yelp.m4-drop-the-check-for-itstool.patch"
@@ -21,3 +22,4 @@ do_configure_prepend() {
 FILES_${PN} += "${datadir}/appdata ${datadir}/dbus-1 
${datadir}/gnome-shell/search-providers"

 RDEPENDS_${PN} = "iso-codes adwaita-icon-theme"
 RRECOMMENDS_${PN} = "ca-certificates"
+






--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core