[OE-core] [PATCH V2 12/13] elfutils: 0.166 -> 0.168

2017-02-08 Thread Hongxu Jia
- Backport patches from debian to 0.168 and add US tags.

- Rebase 0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch to 
support libc musl

Signed-off-by: Hongxu Jia 
---
 .../elfcmp-fix-self-comparision.patch  |  41 --
 .../elfutils/elfutils-0.166/m68k_backend.diff  | 492 -
 .../elfutils/elfutils-0.166/uclibc-support.patch   | 128 
 ...de-alternatives-for-glibc-assumptions-hel.patch | 772 +
 ...m-Silence-Werror-maybe-uninitialized-fals.patch |   0
 .../0001-fix-a-stack-usage-warning.patch   |   0
 .../0001-remove-the-unneed-checking.patch  |   0
 .../aarch64_uio.patch  |   0
 ...ferences-between-mips-machine-identifiers.patch |  13 +-
 ...-support-for-mips64-abis-in-mips_retval.c.patch |   3 +
 .../0003-Add-mips-n64-relocation-format-hack.patch |  35 +-
 .../debian}/arm_backend.diff   |  55 +-
 .../debian}/hppa_backend.diff  |  63 +-
 .../elfutils/elfutils-0.168/debian/hurd_path.patch |  17 +
 .../elfutils-0.168/debian/ignore_strmerge.diff |  14 +
 .../debian}/kfreebsd_path.patch|  11 +-
 .../debian}/mips_backend.diff  |  75 +-
 .../debian}/mips_readelf_w.patch   |  11 +-
 .../debian}/testsuite-ignore-elflint.diff  |  17 +-
 .../fixheadercheck.patch   |   0
 .../shadow.patch   |   0
 .../{elfutils_0.166.bb => elfutils_0.168.bb}   |  29 +-
 22 files changed, 516 insertions(+), 1260 deletions(-)
 delete mode 100644 
meta/recipes-devtools/elfutils/elfutils-0.166/elfcmp-fix-self-comparision.patch
 delete mode 100644 
meta/recipes-devtools/elfutils/elfutils-0.166/m68k_backend.diff
 delete mode 100644 
meta/recipes-devtools/elfutils/elfutils-0.166/uclibc-support.patch
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168}/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch 
(47%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168}/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch 
(100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168}/0001-fix-a-stack-usage-warning.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168}/0001-remove-the-unneed-checking.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168}/aarch64_uio.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168/debian}/0001-Ignore-differences-between-mips-machine-identifiers.patch
 (78%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168/debian}/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch 
(98%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168/debian}/0003-Add-mips-n64-relocation-format-hack.patch (90%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168/debian}/arm_backend.diff (94%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168/debian}/hppa_backend.diff (95%)
 create mode 100644 
meta/recipes-devtools/elfutils/elfutils-0.168/debian/hurd_path.patch
 create mode 100644 
meta/recipes-devtools/elfutils/elfutils-0.168/debian/ignore_strmerge.diff
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168/debian}/kfreebsd_path.patch (60%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168/debian}/mips_backend.diff (92%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168/debian}/mips_readelf_w.patch (73%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168/debian}/testsuite-ignore-elflint.diff (70%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168}/fixheadercheck.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168}/shadow.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils_0.166.bb => elfutils_0.168.bb} 
(78%)

diff --git 
a/meta/recipes-devtools/elfutils/elfutils-0.166/elfcmp-fix-self-comparision.patch
 
b/meta/recipes-devtools/elfutils/elfutils-0.166/elfcmp-fix-self-comparision.patch
deleted file mode 100644
index 6c150bb..000
--- 
a/meta/recipes-devtools/elfutils/elfutils-0.166/elfcmp-fix-self-comparision.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 836a16fe5b5bab4a3afe2c991c104652775ce3a3 Mon Sep 17 00:00:00 2001
-From: David Abdurachmanov 
-Date: Mon, 11 Apr 2016 16:00:57 +0200
-Subject: elfcmp: fix self-comparison error with GCC 6
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Noticed with Fedora 24 Alpha, gcc (GCC) 6.0.0 20160406
-(Red Hat 6.0.0-0.20).
-
-elfcmp.c: In function ‘main’:
-elfcmp.c:364:199: error: self-comparison always evaluates
-to false [-Werror=tautological-compare]
-if (unlikely (name1 == NULL || name2 == NULL
-

[OE-core] [PATCH 13/13] elfutils: update homepage and upstream souce

2017-02-08 Thread Hongxu Jia
In git://sourceware.org/git/elfutils.git:

commit 1700fd25e6caf26663af2bd994d1d99fab9df59f
Author: Mark Wielaard 
Date:   Sat Dec 24 22:31:41 2016 +0100

http://elfutils.org/ is now hosted at http://sourceware.org/elfutils/

fedorahosted used to be our home, but we are now hosted at sourceware.

Change the elfutils project home to http://elfutils.org/
Point hosted services (email, release, git, bug tracker and web pages)
to https://sourceware.org/elfutils/

Move design notes from README to NOTES.
Add URLs for home, releases, bugs, git and mailinglist to README.

Make the --version output of all tools the same by using a common
print_version function and update the publicly shown copyright holder
to the elfutils developers.

Signed-off-by: Mark Wielaard 
--

Signed-off-by: Hongxu Jia 
---
 meta/recipes-devtools/elfutils/elfutils_0.168.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.168.bb 
b/meta/recipes-devtools/elfutils/elfutils_0.168.bb
index 96e895a..9557933 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.168.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.168.bb
@@ -1,12 +1,11 @@
 SUMMARY = "Utilities and libraries for handling compiled object files"
-HOMEPAGE = "https://fedorahosted.org/elfutils;
+HOMEPAGE = "https://sourceware.org/elfutils;
 SECTION = "base"
 LICENSE = "(GPLv3 & Elfutils-Exception)"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = "libtool bzip2 zlib virtual/libintl"
 DEPENDS_append_libc-musl = " argp-standalone fts "
-
-SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/${PV}/${BP}.tar.bz2;
+SRC_URI = "ftp://sourceware.org/pub/elfutils/${PV}/${BP}.tar.bz2;
 SRC_URI[md5sum] = "52adfa40758d0d39e5d5c57689bf38d6"
 SRC_URI[sha256sum] = 
"b88d07893ba1373c7dd69a7855974706d05377766568a7d9002706d5de72c276"
 
-- 
2.8.1

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


[OE-core] [PATCH 10/13] bash: 4.3.30 -> 4.4

2017-02-08 Thread Hongxu Jia
From: Zheng Ruoqin 

1) Upgrade bash from 4.3.30 to 4.4
2) Delete 1 patche below, since they are integrated upstream.
   fix-run-intl.patch
3) Modify 2 patches below to make it compatible with new version
   fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
   test-output.patch
4) Add 1 patche below to solve pkgconfig sanity error
   0001-patch-to-obtain-pkgconfig-sanity.patch

Signed-off-by: Zheng Ruoqin 
Signed-off-by: Hongxu Jia 
---
 .../0001-patch-to-obtain-pkgconfig-sanity.patch|  28 +
 ...roc-run-heredoc-run-execscript-run-test-f.patch | 137 ++---
 meta/recipes-extended/bash/bash/fix-run-intl.patch | 110 -
 meta/recipes-extended/bash/bash/test-output.patch  |  20 ++-
 meta/recipes-extended/bash/bash_4.3.30.bb  |  71 ---
 meta/recipes-extended/bash/bash_4.4.bb |  38 ++
 6 files changed, 92 insertions(+), 312 deletions(-)
 create mode 100644 
meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch
 delete mode 100644 meta/recipes-extended/bash/bash/fix-run-intl.patch
 delete mode 100644 meta/recipes-extended/bash/bash_4.3.30.bb
 create mode 100644 meta/recipes-extended/bash/bash_4.4.bb

diff --git 
a/meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch 
b/meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch
new file mode 100644
index 000..9b5e4ec
--- /dev/null
+++ 
b/meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch
@@ -0,0 +1,28 @@
+Subject: [PATCH] patch to obtain pkgconfig sanity
+
+Drop the paths from the pkgconfig file bash.pc.in which will cause pkgconfig 
sanity error below:
+ERROR: QA Issue: bash.pc failed sanity test (tmpdir) in path 
/yocto/work001/fnst/zrq/community/poky/build/tmp/work/i586-poky-linux/bash
/4.4-r0/sysroot-destdir/usr/lib/pkgconfig [pkgconfig]
+
+Upstream-Status: Pending
+
+Signed-off-by: Zheng Ruoqin 
+---
+ support/bash.pc.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/support/bash.pc.in b/support/bash.pc.in
+index 6009659..871fa9f 100644
+--- a/support/bash.pc.in
 b/support/bash.pc.in
+@@ -12,8 +12,6 @@ LOCAL_CFLAGS = @LOCAL_CFLAGS@
+ LOCAL_DEFS = @LOCAL_DEFS@
+ CCFLAGS = ${LOCAL_DEFS} ${LOCAL_CFLAGS}
+ 
+-CC = @CC@
+-SHOBJ_CC = @SHOBJ_CC@
+ SHOBJ_CFLAGS = @SHOBJ_CFLAGS@
+ SHOBJ_LD = @SHOBJ_LD@
+ SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@
+-- 
+2.7.4
+
diff --git 
a/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
 
b/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
index 7f099ae..d6beaff 100644
--- 
a/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
+++ 
b/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
@@ -20,150 +20,35 @@ the test suite should not be run as root
 Upstream-Status: Pending
 
 Signed-off-by: Hongxu Jia 
+Signed-off-by: Zheng Ruoqin 
 ---
- tests/coproc.right   |  5 +
- tests/coproc.tests   | 30 +-
- tests/heredoc.right  |  5 ++---
- tests/heredoc3.sub   |  3 ++-
- tests/run-execscript |  3 ++-
- tests/run-test   |  3 ++-
- 6 files changed, 34 insertions(+), 15 deletions(-)
+ tests/run-execscript | 3 ++-
+ tests/run-test   | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/tests/coproc.right b/tests/coproc.right
-index 6d9deaa..94b001c 100644
 a/tests/coproc.right
-+++ b/tests/coproc.right
-@@ -1,11 +1,8 @@
--84575
- 63 60
- a b c
--84577
- 63 60
- flop
--./coproc.tests: line 22: 84577 Terminated  coproc REFLECT { cat 
-; }
--84579
-+coproc.tests: REFLECT: status 143
- 63 60
- FOO
- 63 60
-diff --git a/tests/coproc.tests b/tests/coproc.tests
-index 8be3563..d347eb7 100644
 a/tests/coproc.tests
-+++ b/tests/coproc.tests
-@@ -1,6 +1,13 @@
-+: ${TMPDIR:=/tmp}
-+TMPOUT=${TMPDIR}/coproc-wait-$BASHPID
-+
- coproc { echo a b c; sleep 2; }
- 
--echo $COPROC_PID
-+case $COPROC_PID in
-+[0-9]*)   ;;
-+*)echo COPROC_PID not integer ;;
-+esac
-+
- echo ${COPROC[@]}
- 
- read LINE <&${COPROC[0]}
-@@ -10,7 +17,11 @@ wait $COPROC_PID
- 
- coproc REFLECT { cat - ; }
- 
--echo $REFLECT_PID
-+case $REFLECT_PID in
-+[0-9]*)   ;;
-+*)echo REFLECT_PID not integer ;;
-+esac
-+
- echo ${REFLECT[@]}
- 
- echo flop >&${REFLECT[1]}
-@@ -18,12 +29,21 @@ read LINE <&${REFLECT[0]}
- 
- echo $LINE
- 
--kill $REFLECT_PID
--wait $REFLECT_PID
-+{ sleep 1; kill $REFLECT_PID; } &
-+wait $REFLECT_PID >$TMPOUT 2>&1 || echo "coproc.tests: REFLECT: status $?"
-+grep 'Terminated.*coproc.*REFLECT' < $TMPOUT >/dev/null 2>&1 || {
-+  echo "coproc.tests: wait for REFLECT failed" >&2
-+}
-+rm -f $TMPOUT
-+exec 2>&1
- 
- coproc xcase -n -u
- 
--echo $COPROC_PID
-+case $COPROC_PID in

[OE-core] [PATCH V2 11/13] bash: update patches for 4.4

2017-02-08 Thread Hongxu Jia
- Update patches from upstream to 4.4

- Add ${PN}-loadable for loadable builtins which is new features in Bash 4.4
  --
   a.  `make install' now installs the example loadable builtins and a set of
   bash headers to use when developing new loadable builtins.

   b.  `enable -f' now attempts to call functions named BUILTIN_builtin_load 
when
   loading BUILTIN, and BUILTIN_builtin_unload when deleting it.  This 
allows
   loadable builtins to run initialization and cleanup code.

   c.  There is a new BASH_LOADABLES_PATH variable containing a list of 
directories
   where the `enable -f' command looks for shared objects containing 
loadable
   builtins.
   --

- The loadable builtins `uname' could not be parsed by rpmdeps correctly:
   --
   $ recipe-sysroot-native/usr/lib/rpm/bin/rpmdeps-oecore --macros \
   recipe-sysroot-native/usr/lib/rpm/macros --define '_rpmfc_magic_path \
   recipe-sysroot-native/usr/share/misc/magic.mgc' --rpmpopt \
   recipe-sysroot-native/usr/lib/rpm/rpmpopt 
packages-split/bash/usr/lib64/bash/uname

   |packages-split/bash/usr/lib64/bash/uname Provides: )(64bit
   |packages-split/bash/usr/lib64/bash/uname Provides: elf(buildid) = 
7186059a5a6b11ec38493b53072c3a62edf7e05c
   --

   The incorrected "Provides: )(64bit" could not be parsed by rpmbuild.
   --
   | DEBUG: Executing shell function BUILDSPEC
   | error: line 56: Dependency ")(64bit" must begin with alpha-numeric, '_' or 
'/': Provides: )(64bit
   | error: Package has no %description: bash-4.4-r0.core2_64
   --

Signed-off-by: Hongxu Jia 
---
 meta/recipes-extended/bash/bash_4.4.bb | 31 +++
 1 file changed, 31 insertions(+)

diff --git a/meta/recipes-extended/bash/bash_4.4.bb 
b/meta/recipes-extended/bash/bash_4.4.bb
index 16ff114..3cf24ac 100644
--- a/meta/recipes-extended/bash/bash_4.4.bb
+++ b/meta/recipes-extended/bash/bash_4.4.bb
@@ -10,6 +10,13 @@ SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \

${GNU_MIRROR}/bash/bash-4.4-patches/bash44-003;apply=yes;striplevel=0;name=patch003
 \

${GNU_MIRROR}/bash/bash-4.4-patches/bash44-004;apply=yes;striplevel=0;name=patch004
 \

${GNU_MIRROR}/bash/bash-4.4-patches/bash44-005;apply=yes;striplevel=0;name=patch005
 \
+   
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-006;apply=yes;striplevel=0;name=patch006
 \
+   
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-007;apply=yes;striplevel=0;name=patch007
 \
+   
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-008;apply=yes;striplevel=0;name=patch008
 \
+   
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-009;apply=yes;striplevel=0;name=patch009
 \
+   
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-010;apply=yes;striplevel=0;name=patch010
 \
+   
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-011;apply=yes;striplevel=0;name=patch011
 \
+   
${GNU_MIRROR}/bash/bash-4.4-patches/bash44-012;apply=yes;striplevel=0;name=patch012
 \
file://execute_cmd.patch;striplevel=0 \
file://mkbuiltins_have_stringize.patch \
file://build-tests.patch \
@@ -34,5 +41,29 @@ SRC_URI[patch004.md5sum] = "4557d674ab5831a5fa98052ab19edaf4"
 SRC_URI[patch004.sha256sum] = 
"ad080a30a4ac6c1273373617f29628cc320a35c8cd06913894794293dc52c8b3"
 SRC_URI[patch005.md5sum] = "cce96dd77cdd1d293beec10848f6cbb5"
 SRC_URI[patch005.sha256sum] = 
"221e4b725b770ad0bb6924df3f8d04f89eeca4558f6e4c777dfa93e967090529"
+SRC_URI[patch006.md5sum] = "d3379f8d8abce5c6ee338f931ad008d5"
+SRC_URI[patch006.sha256sum] = 
"6a8e2e2a6180d0f1ce39dcd651622fb6d2fd05db7c459f64ae42d667f1e344b8"
+SRC_URI[patch007.md5sum] = "ec38c76ca439ca7f9c178e9baede84fc"
+SRC_URI[patch007.sha256sum] = 
"de1ccc07b7bfc9e25243ad854f3bbb5d3ebf9155b0477df16aaf00a7b0d5edaf"
+SRC_URI[patch008.md5sum] = "e0ba18c1e3b94f905da9b5bf9d38b58b"
+SRC_URI[patch008.sha256sum] = 
"86144700465933636d7b945e89b77df95d3620034725be161ca0ca5a42e239ba"
+SRC_URI[patch009.md5sum] = "e952d4f44e612048930c559d90eb99bb"
+SRC_URI[patch009.sha256sum] = 
"0b6bdd1a18a0d20e330cc3bc71e048864e4a13652e29dc0ebf3918bea729343c"
+SRC_URI[patch010.md5sum] = "57b5b35955d68f9a09dbef6b86d2c782"
+SRC_URI[patch010.sha256sum] = 
"8465c6f2c56afe559402265b39d9e94368954930f9aa7f3dfa6d36dd66868e06"
+SRC_URI[patch011.md5sum] = "cc896e1fa696b93ded568e557e2392d5"
+SRC_URI[patch011.sha256sum] = 
"dd56426ef7d7295e1107c0b3d06c192eb9298f4023c202ca2ba6266c613d170d"
+SRC_URI[patch012.md5sum] = "fa47fbfa56fb7e9e5367f19a9df5fc9e"
+SRC_URI[patch012.sha256sum] = 
"fac271d2bf6372c9903e3b353cb9eda044d7fe36b5aab52f21f3f21cd6a2063e"
 
 BBCLASSEXTEND = "nativesdk"
+
+PACKAGE_BEFORE_PN += "${PN}-loadable"
+RDEPENDS_${PN}-loadable += "${PN}"
+FILES_${PN}-dev += "${libdir}/bash/Makefile.inc"
+FILES_${PN}-loadable += "${libdir}/bash/*"
+do_install_append_class-target () {
+   # Workaround do_package_write_rpm failure
+   rm 

[OE-core] [PATCH 06/13] rpcbind: 0.2.3 -> 0.2.4

2017-02-08 Thread Hongxu Jia
Drop obsolete patch
- 0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch

Drop backport patches:
- 0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
- cve-2015-7236.patch

Signed-off-by: Hongxu Jia 
---
 ...001-Avoid-use-of-glibc-sys-cdefs.h-header.patch | 221 -
 ...ly-Don-t-use-the-xp_auth-pointer-directly.patch |  43 
 .../rpcbind/rpcbind/cve-2015-7236.patch|  84 
 .../rpcbind/{rpcbind_0.2.3.bb => rpcbind_0.2.4.bb} |   7 +-
 4 files changed, 2 insertions(+), 353 deletions(-)
 delete mode 100644 
meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
 delete mode 100644 
meta/recipes-extended/rpcbind/rpcbind/0001-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch
 delete mode 100644 meta/recipes-extended/rpcbind/rpcbind/cve-2015-7236.patch
 rename meta/recipes-extended/rpcbind/{rpcbind_0.2.3.bb => rpcbind_0.2.4.bb} 
(87%)

diff --git 
a/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
 
b/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
deleted file mode 100644
index eeef9f1..000
--- 
a/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From 2a44d862233f2126581e290d568e1c8b8f2eb9f5 Mon Sep 17 00:00:00 2001
-From: Carlo Landmeter 
-Date: Thu, 19 Feb 2015 15:28:45 +
-Subject: [PATCH] Avoid use of glibc sys/cdefs.h header
-
-Upstream-Status: Pending

- src/check_bound.c  |2 +-
- src/pmap_svc.c |   10 +-
- src/rpcb_svc.c |   10 +-
- src/rpcb_svc_4.c   |   14 +++---
- src/rpcb_svc_com.c |   46 +++---
- src/rpcbind.c  |   12 ++--
- src/util.c |2 +-
- src/warmstart.c|4 ++--
- 8 files changed, 50 insertions(+), 50 deletions(-)
-
-diff --git a/src/check_bound.c b/src/check_bound.c
-index c70b845..5d21730 100644
 a/src/check_bound.c
-+++ b/src/check_bound.c
-@@ -70,7 +70,7 @@ static struct fdlist *fdhead;/* Link list of the 
check fd's */
- static struct fdlist *fdtail;
- static char *nullstring = "";
- 
--static bool_t check_bound __P((struct fdlist *, char *uaddr));
-+static bool_t check_bound (struct fdlist *, char *uaddr);
- 
- /*
-  * Returns 1 if the given address is bound for the given addr & transport
-diff --git a/src/pmap_svc.c b/src/pmap_svc.c
-index ad28b93..9c7d409 100644
 a/src/pmap_svc.c
-+++ b/src/pmap_svc.c
-@@ -60,11 +60,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 
Copyr 1984 Sun Micro";
- #include "rpcbind.h"
- #include "xlog.h"
- #include  /* svc_getcaller routine definition */
--static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t,
-- rpcprot_t));
--static bool_t pmapproc_change __P((struct svc_req *, SVCXPRT *, u_long));
--static bool_t pmapproc_getport __P((struct svc_req *, SVCXPRT *));
--static bool_t pmapproc_dump __P((struct svc_req *, SVCXPRT *));
-+static struct pmaplist *find_service_pmap (rpcprog_t, rpcvers_t,
-+ rpcprot_t);
-+static bool_t pmapproc_change (struct svc_req *, SVCXPRT *, u_long);
-+static bool_t pmapproc_getport (struct svc_req *, SVCXPRT *);
-+static bool_t pmapproc_dump (struct svc_req *, SVCXPRT *);
- 
- /*
-  * Called for all the version 2 inquiries.
-diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c
-index bd92201..6c7f7fe 100644
 a/src/rpcb_svc.c
-+++ b/src/rpcb_svc.c
-@@ -53,10 +53,10 @@
- #include "rpcbind.h"
- #include "xlog.h"
- 
--static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT 
*,
-- rpcvers_t));
--static void *rpcbproc_dump_3_local __P((void *, struct svc_req *, SVCXPRT *,
--  rpcvers_t));
-+static void *rpcbproc_getaddr_3_local (void *, struct svc_req *, SVCXPRT *,
-+ rpcvers_t);
-+static void *rpcbproc_dump_3_local (void *, struct svc_req *, SVCXPRT *,
-+  rpcvers_t);
- 
- /*
-  * Called by svc_getreqset. There is a separate server handle for
-@@ -75,7 +75,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp)
-   } argument;
-   char *result;
-   xdrproc_t xdr_argument, xdr_result;
--  void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
-+  void *(*local) (void *, struct svc_req *, SVCXPRT *, rpcvers_t);
-   rpcprog_t setprog = 0;
- 
-   rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc);
-diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c
-index b673452..6764c0a 100644
 a/src/rpcb_svc_4.c
-+++ b/src/rpcb_svc_4.c
-@@ -54,13 +54,13 @@
- #include "rpcbind.h"
- #include "xlog.h"
- 
--static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT 
*,
--

[OE-core] [PATCH V2 08/13] gpgme: 1.6.0 -> 1.8.0

2017-02-08 Thread Hongxu Jia
- Drop gpgme.pc, it is duplicated with pkgconfig.patch

- Rebase pkgconfig.patch to 1.8.0

- Split cmake config to ${PN}-dev

- Update LIC_FILES_CHKSUM, because copytright year changed.

- The libgpgme-pthread is obsolete by upstream;

- Add package libgpgcpp;

TODO: Do not remove gpgme-pthread.pc from pkgconfig.patch,
  the upstream explains:
  git://git.gnupg.org/gpgme.git
  commit 09b64554328445e99a8cc78fc34ea49c2ea2e7f9
  --
  libgpgme-pthread is removed but gpgme-config still supports
  --thread=pthread for compatibility with find scripts.
  --

Signed-off-by: Hongxu Jia 
---
 meta/recipes-support/gpgme/gpgme/gpgme.pc  | 10 --
 meta/recipes-support/gpgme/gpgme/pkgconfig.patch   | 42 +++---
 .../gpgme/{gpgme_1.6.0.bb => gpgme_1.8.0.bb}   | 20 +--
 3 files changed, 38 insertions(+), 34 deletions(-)
 delete mode 100644 meta/recipes-support/gpgme/gpgme/gpgme.pc
 rename meta/recipes-support/gpgme/{gpgme_1.6.0.bb => gpgme_1.8.0.bb} (67%)

diff --git a/meta/recipes-support/gpgme/gpgme/gpgme.pc 
b/meta/recipes-support/gpgme/gpgme/gpgme.pc
deleted file mode 100644
index 30a4d56..000
--- a/meta/recipes-support/gpgme/gpgme/gpgme.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: gpgme
-Description: GNU Privacy Guard Made Easy
-Version: 1.4.3
-Requires:
-Libs: -L${libdir} -lgpgme -lassuan -lgpg-error
-Cflags: -I${includedir}
diff --git a/meta/recipes-support/gpgme/gpgme/pkgconfig.patch 
b/meta/recipes-support/gpgme/gpgme/pkgconfig.patch
index e2f1f4f..341cabf 100644
--- a/meta/recipes-support/gpgme/gpgme/pkgconfig.patch
+++ b/meta/recipes-support/gpgme/gpgme/pkgconfig.patch
@@ -4,37 +4,50 @@ simpler and less error prone when cross compiling.
 Upstream-Status: Denied [Upstream not interested in pkg-config support]
 RP 2015/4/17
 
+Rebase to 1.8.0
+Signed-off-by: Hongxu Jia 
+---
+ configure.ac|   1 +
+ src/Makefile.am |   4 +-
+ src/gpgme-pthread.pc.in |  15 +++
+ src/gpgme.m4| 114 
+ src/gpgme.pc.in |  15 +++
+ 5 files changed, 42 insertions(+), 107 deletions(-)
+ create mode 100644 src/gpgme-pthread.pc.in
+ create mode 100644 src/gpgme.pc.in
+
 diff --git a/configure.ac b/configure.ac
-index 298a22b..c778b61 100644
+index 0a67b48..e402dd3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -622,6 +622,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
+@@ -875,6 +875,7 @@ AC_CONFIG_FILES(Makefile src/Makefile
  src/versioninfo.rc
  src/gpgme.h)
  AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config)
 +AC_CONFIG_FILES(src/gpgme.pc src/gpgme-pthread.pc)
- AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd])
- AC_OUTPUT
- 
+ AC_CONFIG_FILES(lang/cpp/Makefile lang/cpp/src/Makefile)
+ AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig-w32.cmake.in)
+ AC_CONFIG_FILES(lang/cpp/src/GpgmeppConfig.cmake.in)
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 58922f9..40d0dca 100644
+index ce6f1d4..5f38fee 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -20,11 +20,13 @@
+@@ -19,12 +19,14 @@
+ ## Process this file with automake to produce Makefile.in
  
- # Note: moc_kdpipeiodevice should actually be a dependecy below.
  EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \
--   gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp
-+   gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp 
gpgme.pc.in gpgme-pthread.pc.in
+-   gpgme.h.in versioninfo.rc.in gpgme.def
++   gpgme.h.in versioninfo.rc.in gpgme.def gpgme.pc.in 
gpgme-pthread.pc.in
  
  bin_SCRIPTS = gpgme-config
  m4datadir = $(datadir)/aclocal
  m4data_DATA = gpgme.m4
+ nodist_include_HEADERS = gpgme.h
 +pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfig_DATA = gpgme.pc gpgme-pthread.pc
- nodist_include_HEADERS = gpgme.h
  
  bin_PROGRAMS = gpgme-tool
+ 
 diff --git a/src/gpgme-pthread.pc.in b/src/gpgme-pthread.pc.in
 new file mode 100644
 index 000..980a48e
@@ -51,9 +64,9 @@ index 000..980a48e
 +host=@GPGME_CONFIG_HOST@
 +
 +Name: gpgme
-+Description: GnuPG Made Easy (GPGME) is a C language library that allows to 
addsupport for cryptography to a program (threaded version)
++Description: GnuPG Made Easy (GPGME) is a C language library that allows to 
addsupport for cryptography to a program (deprecated)
 +Version: @VERSION@
-+Libs: -L${libdir} -lgpgme-pthread -lpthread
++Libs: -L${libdir} -lgpgme -lpthread
 +Cflags: -I${includedir}
 +Requires: libassuan gpg-error
 diff --git a/src/gpgme.m4 b/src/gpgme.m4
@@ -277,3 +290,6 @@ index 000..b69539f
 +Cflags: -I${includedir}
 +Requires: libassuan gpg-error
 \ No newline at end of file
+-- 
+2.8.1
+
diff --git a/meta/recipes-support/gpgme/gpgme_1.6.0.bb 

[OE-core] [PATCH 07/13] gnupg: 2.1.14 -> 2.1.18

2017-02-08 Thread Hongxu Jia
Update LIC_FILES_CHKSUM md5 checksum, because "http" has been
changed to "https".

Signed-off-by: Hongxu Jia 
---
 meta/recipes-support/gnupg/{gnupg_2.1.14.bb => gnupg_2.1.18.bb} | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-support/gnupg/{gnupg_2.1.14.bb => gnupg_2.1.18.bb} (80%)

diff --git a/meta/recipes-support/gnupg/gnupg_2.1.14.bb 
b/meta/recipes-support/gnupg/gnupg_2.1.18.bb
similarity index 80%
rename from meta/recipes-support/gnupg/gnupg_2.1.14.bb
rename to meta/recipes-support/gnupg/gnupg_2.1.18.bb
index 5ea9b96..a0611aa 100644
--- a/meta/recipes-support/gnupg/gnupg_2.1.14.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.1.18.bb
@@ -1,8 +1,8 @@
 SUMMARY = "GNU Privacy Guard - encryption and signing tools (2.x)"
 HOMEPAGE = "http://www.gnupg.org/;
 LICENSE = "GPLv3 & LGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
-file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
+LIC_FILES_CHKSUM = "file://COPYING;md5=189af8afca6d6075ba6c9e0aa8077626 \
+file://COPYING.LIB;md5=a2b6bf2cb38ee52619e60f30a1fc7257"
 
 DEPENDS = "npth libassuan libksba zlib bzip2 readline libgcrypt"
 
@@ -16,8 +16,8 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://autogen.sh-fix-find-version-for-beta-checking.patch \
   "
 
-SRC_URI[md5sum] = "46cf0a42ffad6c2615cafd633580b2de"
-SRC_URI[sha256sum] = 
"9450dee9693b6a12bf0c374dae77b66c30f69ff8f35fc9266ab8dd76998eba42"
+SRC_URI[md5sum] = "c67f908b0b35c7ebc62144f362757e1e"
+SRC_URI[sha256sum] = 
"d04c6fab7e5562ce4b915b22020e34d4c1a256847690cf149842264fc7cef994"
 
 EXTRA_OECONF = "--disable-ldap \
--disable-ccid-driver \
-- 
2.8.1

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


[OE-core] [PATCH 03/13] libgcrypt: 1.7.3 -> 1.7.6

2017-02-08 Thread Hongxu Jia
Signed-off-by: Hongxu Jia 
---
 meta/recipes-support/libgcrypt/libgcrypt_1.7.3.bb | 4 
 meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.7.3.bb
 create mode 100644 meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb

diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.7.3.bb 
b/meta/recipes-support/libgcrypt/libgcrypt_1.7.3.bb
deleted file mode 100644
index ddd7c53..000
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.7.3.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require libgcrypt.inc
-
-SRC_URI[md5sum] = "bb5b00cb70b1215833857fd690080fbb"
-SRC_URI[sha256sum] = 
"c98470cf6a781f2af4bdfda710ad39f0f54b5044e8c43b878d4005737d6c213f"
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb 
b/meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb
new file mode 100644
index 000..da0a1fe
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb
@@ -0,0 +1,4 @@
+require libgcrypt.inc
+
+SRC_URI[md5sum] = "eac6d11999650e8a1493674c1bdbc7f8"
+SRC_URI[sha256sum] = 
"fc0aec7714d75d812b665bd510d66031b1b2ce8fa855cc2c02238c954ea36982"
-- 
2.8.1

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


[OE-core] [PATCH V2 09/13] libgpg-error: 1.25 -> 1.26

2017-02-08 Thread Hongxu Jia
- errorref.txt is part of the documentation so should be in PN-doc.

Signed-off-by: Hongxu Jia 
---
 .../libgpg-error/{libgpg-error_1.25.bb => libgpg-error_1.26.bb}  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libgpg-error/{libgpg-error_1.25.bb => 
libgpg-error_1.26.bb} (89%)

diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.25.bb 
b/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb
similarity index 89%
rename from meta/recipes-support/libgpg-error/libgpg-error_1.25.bb
rename to meta/recipes-support/libgpg-error/libgpg-error_1.26.bb
index d4ce224..87c4f51 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.25.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.26.bb
@@ -16,8 +16,8 @@ SRC_URI = 
"${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
file://pkgconfig.patch \
  "
 
-SRC_URI[md5sum] = "d9fa545922a5060cbfbd87464bc31686"
-SRC_URI[sha256sum] = 
"f628f75843433b38b05af248121beb7db5bd54bb2106f384edac39934261320c"
+SRC_URI[md5sum] = "97456709dbbcbb69354317ffe3e347cd"
+SRC_URI[sha256sum] = 
"4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69"
 
 BINCONFIG = "${bindir}/gpg-error-config"
 
@@ -50,5 +50,6 @@ do_install_append() {
 }
 
 FILES_${PN}-dev += "${bindir}/gpg-error"
+FILES_${PN}-doc += "${datadir}/libgpg-error/errorref.txt"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.8.1

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


[OE-core] [PATCH 04/13] ncurses: 6.0+20160625 -> 6.0+20161126

2017-02-08 Thread Hongxu Jia
Signed-off-by: Hongxu Jia 
---
 .../ncurses/{ncurses_6.0+20160625.bb => ncurses_6.0+20161126.bb}| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/ncurses/{ncurses_6.0+20160625.bb => 
ncurses_6.0+20161126.bb} (84%)

diff --git a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb 
b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
similarity index 84%
rename from meta/recipes-core/ncurses/ncurses_6.0+20160625.bb
rename to meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
index 6514613..7328e78 100644
--- a/meta/recipes-core/ncurses/ncurses_6.0+20160625.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.0+20161126.bb
@@ -4,7 +4,7 @@ SRC_URI += "file://tic-hang.patch \
 file://config.cache \
 "
 # commit id corresponds to the revision in package version
-SRCREV = "63dd558cb8e888d6fab5f00bbf7842736a2356b9"
+SRCREV = "3db0bd19cb50e3d9b4f2cf15b7a102fe11302068"
 S = "${WORKDIR}/git"
 EXTRA_OECONF += "--with-abi-version=5"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+(\+\d+)*)"
-- 
2.8.1

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


[OE-core] [PATCH V2 00/13] 11 packages upgrade

2017-02-08 Thread Hongxu Jia
Changed in V2:

- gpgme, drop gpgme-pthread and add gpgme-cpp

- libgpg-error, move errorref.txt to -doc

- bash, add loadable builtin and delete uname to
  workaround do_package_write_rpm failure.

- elfutils, addUS tags to debian patches.

//Hongxu

The following changes since commit a624cf7f95c8cf4ff764cc997fd1db4601b97dcc:

  oeqa/selftest/pkgdata: use m4 instead of bash (2017-02-07 14:50:10 +)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib hongxu/upgrade-20170208
  
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=hongxu/upgrade-20170208

Hongxu Jia (12):
  pax-utils: 1.1.6 -> 1.2.2
  socat: 1.7.3.1 -> 1.7.3.2
  libgcrypt: 1.7.3 -> 1.7.6
  ncurses: 6.0+20160625 -> 6.0+20161126
  man-pages: 4.08 -> 4.09
  rpcbind: 0.2.3 -> 0.2.4
  gnupg: 2.1.14 -> 2.1.18
  gpgme: 1.6.0 -> 1.8.0
  libgpg-error: 1.25 -> 1.26
  bash: update patches for 4.4
  elfutils: 0.166 -> 0.168
  elfutils: update homepage and upstream souce

Zheng Ruoqin (1):
  bash: 4.3.30 -> 4.4

 .../socat/{socat_1.7.3.1.bb => socat_1.7.3.2.bb}   |   4 +-
 ...ses_6.0+20160625.bb => ncurses_6.0+20161126.bb} |   2 +-
 .../elfcmp-fix-self-comparision.patch  |  41 --
 .../elfutils/elfutils-0.166/m68k_backend.diff  | 492 -
 .../elfutils/elfutils-0.166/uclibc-support.patch   | 128 
 ...de-alternatives-for-glibc-assumptions-hel.patch | 772 +
 ...m-Silence-Werror-maybe-uninitialized-fals.patch |   0
 .../0001-fix-a-stack-usage-warning.patch   |   0
 .../0001-remove-the-unneed-checking.patch  |   0
 .../aarch64_uio.patch  |   0
 ...ferences-between-mips-machine-identifiers.patch |  13 +-
 ...-support-for-mips64-abis-in-mips_retval.c.patch |   3 +
 .../0003-Add-mips-n64-relocation-format-hack.patch |  35 +-
 .../debian}/arm_backend.diff   |  55 +-
 .../debian}/hppa_backend.diff  |  63 +-
 .../elfutils/elfutils-0.168/debian/hurd_path.patch |  17 +
 .../elfutils-0.168/debian/ignore_strmerge.diff |  14 +
 .../debian}/kfreebsd_path.patch|  11 +-
 .../debian}/mips_backend.diff  |  75 +-
 .../debian}/mips_readelf_w.patch   |  11 +-
 .../debian}/testsuite-ignore-elflint.diff  |  17 +-
 .../fixheadercheck.patch   |   0
 .../shadow.patch   |   0
 .../{elfutils_0.166.bb => elfutils_0.168.bb}   |  34 +-
 .../{pax-utils_1.1.6.bb => pax-utils_1.2.2.bb} |   6 +-
 .../0001-patch-to-obtain-pkgconfig-sanity.patch|  28 +
 ...roc-run-heredoc-run-execscript-run-test-f.patch | 137 +---
 meta/recipes-extended/bash/bash/fix-run-intl.patch | 110 ---
 meta/recipes-extended/bash/bash/test-output.patch  |  20 +-
 meta/recipes-extended/bash/bash_4.3.30.bb  |  71 --
 meta/recipes-extended/bash/bash_4.4.bb |  69 ++
 .../{man-pages_4.08.bb => man-pages_4.09.bb}   |   4 +-
 ...001-Avoid-use-of-glibc-sys-cdefs.h-header.patch | 221 --
 ...ly-Don-t-use-the-xp_auth-pointer-directly.patch |  43 --
 .../rpcbind/rpcbind/cve-2015-7236.patch|  84 ---
 .../rpcbind/{rpcbind_0.2.3.bb => rpcbind_0.2.4.bb} |   7 +-
 .../gnupg/{gnupg_2.1.14.bb => gnupg_2.1.18.bb} |   8 +-
 meta/recipes-support/gpgme/gpgme/gpgme.pc  |  10 -
 meta/recipes-support/gpgme/gpgme/pkgconfig.patch   |  42 +-
 .../gpgme/{gpgme_1.6.0.bb => gpgme_1.8.0.bb}   |  20 +-
 meta/recipes-support/libgcrypt/libgcrypt_1.7.3.bb  |   4 -
 meta/recipes-support/libgcrypt/libgcrypt_1.7.6.bb  |   4 +
 .../{libgpg-error_1.25.bb => libgpg-error_1.26.bb} |   5 +-
 43 files changed, 701 insertions(+), 1979 deletions(-)
 rename meta/recipes-connectivity/socat/{socat_1.7.3.1.bb => socat_1.7.3.2.bb} 
(89%)
 rename meta/recipes-core/ncurses/{ncurses_6.0+20160625.bb => 
ncurses_6.0+20161126.bb} (84%)
 delete mode 100644 
meta/recipes-devtools/elfutils/elfutils-0.166/elfcmp-fix-self-comparision.patch
 delete mode 100644 
meta/recipes-devtools/elfutils/elfutils-0.166/m68k_backend.diff
 delete mode 100644 
meta/recipes-devtools/elfutils/elfutils-0.166/uclibc-support.patch
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168}/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch 
(47%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168}/0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch 
(100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168}/0001-fix-a-stack-usage-warning.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168}/0001-remove-the-unneed-checking.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168}/aarch64_uio.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.166 => 
elfutils-0.168/debian}/0001-Ignore-dif

[OE-core] [PATCH 05/13] man-pages: 4.08 -> 4.09

2017-02-08 Thread Hongxu Jia
Signed-off-by: Hongxu Jia 
---
 .../man-pages/{man-pages_4.08.bb => man-pages_4.09.bb}| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/man-pages/{man-pages_4.08.bb => 
man-pages_4.09.bb} (86%)

diff --git a/meta/recipes-extended/man-pages/man-pages_4.08.bb 
b/meta/recipes-extended/man-pages/man-pages_4.09.bb
similarity index 86%
rename from meta/recipes-extended/man-pages/man-pages_4.08.bb
rename to meta/recipes-extended/man-pages/man-pages_4.09.bb
index 8fc6cb0..55fc21e 100644
--- a/meta/recipes-extended/man-pages/man-pages_4.08.bb
+++ b/meta/recipes-extended/man-pages/man-pages_4.09.bb
@@ -7,8 +7,8 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://README;md5=8f2a3d43057d458e5066714980567a60"
 SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/Archive/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "88760ffa6cf92495327758b828850015"
-SRC_URI[sha256sum] = 
"1fa6529ab2784e7db2a498feb2c5307f4afb87dff0e3321e5964265e2e8433fd"
+SRC_URI[md5sum] = "9e3c7b12a5fecda9a717a4bcc0ae3a67"
+SRC_URI[sha256sum] = 
"5fac324cefce0fbfae0df6c06ef3f6d6ab5227b9aad2a94f8657a0e3901f9185"
 
 RDEPENDS_${PN} = "man"
 
-- 
2.8.1

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


[OE-core] [PATCH 02/13] socat: 1.7.3.1 -> 1.7.3.2

2017-02-08 Thread Hongxu Jia
Signed-off-by: Hongxu Jia 
---
 .../recipes-connectivity/socat/{socat_1.7.3.1.bb => socat_1.7.3.2.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/socat/{socat_1.7.3.1.bb => socat_1.7.3.2.bb} 
(89%)

diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.1.bb 
b/meta/recipes-connectivity/socat/socat_1.7.3.2.bb
similarity index 89%
rename from meta/recipes-connectivity/socat/socat_1.7.3.1.bb
rename to meta/recipes-connectivity/socat/socat_1.7.3.2.bb
index a579f1e..4dcb7b4 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.3.1.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.3.2.bb
@@ -18,8 +18,8 @@ SRC_URI = 
"http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
file://0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch \
 "
 
-SRC_URI[md5sum] = "334e46924f2b386299c9db2ac22bcd36"
-SRC_URI[sha256sum] = 
"d2da659540c38139f388e9437bfaae16bb458d174d056cb3228432a8f489fbaa"
+SRC_URI[md5sum] = "607a24c15bd2cb54e9328bfbbd3a1ae9"
+SRC_URI[sha256sum] = 
"e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251"
 
 inherit autotools
 
-- 
2.8.1

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


[OE-core] [PATCH 01/13] pax-utils: 1.1.6 -> 1.2.2

2017-02-08 Thread Hongxu Jia
Export GNULIB_OVERRIDES_WINT_T to fix compile failure
-
1099 make[4]: *** [printf-args.o] Error 1
1100 make[4]: *** Waiting for unfinished jobs
1101 In file included from 
../../../pax-utils-1.2.2/autotools/gnulib/printf-args.h:41:0,
1102  from 
../../../pax-utils-1.2.2/autotools/gnulib/printf-parse.h:29,
1103  from 
../../../pax-utils-1.2.2/autotools/gnulib/printf-parse.c:36:
1104 ./wchar.h:476:6: error: #if with no expression
1105  # if
1106   ^
1107 make[4]: *** [printf-parse.o] Error 1
-

Signed-off-by: Hongxu Jia 
---
 .../pax-utils/{pax-utils_1.1.6.bb => pax-utils_1.2.2.bb}| 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/pax-utils/{pax-utils_1.1.6.bb => 
pax-utils_1.2.2.bb} (86%)

diff --git a/meta/recipes-devtools/pax-utils/pax-utils_1.1.6.bb 
b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
similarity index 86%
rename from meta/recipes-devtools/pax-utils/pax-utils_1.1.6.bb
rename to meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
index 5cc5463..a032a22 100644
--- a/meta/recipes-devtools/pax-utils/pax-utils_1.1.6.bb
+++ b/meta/recipes-devtools/pax-utils/pax-utils_1.2.2.bb
@@ -10,11 +10,13 @@ LIC_FILES_CHKSUM = 
"file://COPYING;md5=eb723b61539feef013de476e68b5c50a"
 SRC_URI = "http://gentoo.osuosl.org/distfiles/pax-utils-${PV}.tar.xz \
 "
 
-SRC_URI[md5sum] = "96f56a5a10ed50f2448c5ccebd27764f"
-SRC_URI[sha256sum] = 
"f5436c517bea40f7035ec29a6f34034c739b943f2e3a080d76df5dfd7fd41b12"
+SRC_URI[md5sum] = "a580468318f0ff42edf4a8cd314cc942"
+SRC_URI[sha256sum] = 
"7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9"
 
 RDEPENDS_${PN} += "bash"
 
+export GNULIB_OVERRIDES_WINT_T = "0"
+
 do_configure_prepend() {
 touch ${S}/NEWS ${S}/AUTHORS ${S}/ChangeLog ${S}/README
 }
-- 
2.8.1

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


[OE-core] [PATCH] dhcp: Add choice for "with ddns" and "no ddns".

2017-02-08 Thread Li Zhou
Disable DNS update functionality can solve this issue:
dhcpd is listening on additional random ports.
To meet different requests, add a choice in dhcp's bb file:
"with ddns" version should add "ddns" to PACKAGECONFIG, and it is the
default;
"no ddns" version should set PACKAGECONFIG to be without "ddns".

Signed-off-by: Li Zhou 
---
 ...001-DDNS-disable-DNS-update-functionality.patch | 28 ++
 meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb   | 13 +++---
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 
meta/recipes-connectivity/dhcp/dhcp/0001-DDNS-disable-DNS-update-functionality.patch

diff --git 
a/meta/recipes-connectivity/dhcp/dhcp/0001-DDNS-disable-DNS-update-functionality.patch
 
b/meta/recipes-connectivity/dhcp/dhcp/0001-DDNS-disable-DNS-update-functionality.patch
new file mode 100644
index 000..881ca23
--- /dev/null
+++ 
b/meta/recipes-connectivity/dhcp/dhcp/0001-DDNS-disable-DNS-update-functionality.patch
@@ -0,0 +1,28 @@
+From 1d804738080d52c0977947c7271d2db49bd6f90d Mon Sep 17 00:00:00 2001
+From: Li Zhou 
+Date: Wed, 8 Feb 2017 10:02:59 +0800
+Subject: [PATCH] DDNS: disable DNS update functionality
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Li Zhou 
+---
+ includes/site.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/includes/site.h b/includes/site.h
+index abb66e4..cefc12e 100644
+--- a/includes/site.h
 b/includes/site.h
+@@ -121,7 +121,7 @@
+ 
+ /* Define this if you want DNS update functionality to be available. */
+ 
+-#define NSUPDATE
++/* #define NSUPDATE */
+ 
+ /* Define this if you want to enable the DHCP server attempting to
+find a nameserver to use for DDNS updates. */
+-- 
+1.9.1
+
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb 
b/meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb
index 678c29a..764ae09 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.5.bb
@@ -1,5 +1,14 @@
 require dhcp.inc
 
+# If don't want DNS update functionality to be available becauses dhcpd will
+# be listening on additional random ports, please set PACKAGECONFIG to be
+# without ddns.
+PACKAGECONFIG ?= "ddns"
+PACKAGECONFIG[ddns] = ",,,"
+PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
+
+SITE_H_PATCH = "${@bb.utils.contains('PACKAGECONFIG', 'ddns', '', 
'file://0001-DDNS-disable-DNS-update-functionality.patch', d)}"
+
 SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
 file://link-with-lcrypto.patch \
 file://fixsepbuild.patch \
@@ -9,10 +18,8 @@ SRC_URI += 
"file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
 file://libxml2-configure-argument.patch \
 file://tweak-to-support-external-bind.patch \
 file://remove-dhclient-script-bash-dependency.patch \
+${SITE_H_PATCH} \
"
 
 SRC_URI[md5sum] = "2b5e5b2fa31c2e27e487039d86f83d3f"
 SRC_URI[sha256sum] = 
"eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954"
-
-PACKAGECONFIG ?= ""
-PACKAGECONFIG[bind-httpstats] = "--with-libxml2,--without-libxml2,libxml2"
-- 
1.9.1

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


Re: [OE-core] [PATCH v2] busybox: 1.24.1 -> 1.26.2

2017-02-08 Thread Andre McCurdy
On Thu, Feb 9, 2017 at 2:33 AM, zhengrq  wrote:
> 1) Upgrade busybox from 1.24.1 to 1.26.2
> 2) Delete 12 patches below, since they are integrated upstream.
> busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
> busybox/0001-libiproute-handle-table-ids-larger-than-255.patch
> busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch
> busybox/CVE-2016-2147.patch
> busybox/CVE-2016-2147_2.patch
> busybox/CVE-2016-2148.patch
> busybox/busybox-1.24.1-truncate-open-mode.patch
> busybox/busybox-1.24.1-unzip-regression.patch
> busybox/busybox-1.24.1-unzip.patch
> busybox/busybox-kbuild-race-fix-commit-d8e61bb.patch
> busybox/commit-applet_tables-fix-commit-0dddbc1.patch
> busybox/ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch
>
> 3) Modify 3 patches below to make it compatible with new version
> busybox/busybox-cross-menuconfig.patch
> busybox/busybox-udhcpc-no_deconfig.patch
> busybox/makefile-fix-backport.patch

You should also refresh and review the defconfig file to ensure that
any new configuration options are set appropriately (e.g. new applets
should typically be disabled).
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH v2] busybox: 1.24.1 -> 1.26.2

2017-02-08 Thread zhengrq
1) Upgrade busybox from 1.24.1 to 1.26.2
2) Delete 12 patches below, since they are integrated upstream.
busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
busybox/0001-libiproute-handle-table-ids-larger-than-255.patch
busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch
busybox/CVE-2016-2147.patch
busybox/CVE-2016-2147_2.patch
busybox/CVE-2016-2148.patch
busybox/busybox-1.24.1-truncate-open-mode.patch
busybox/busybox-1.24.1-unzip-regression.patch
busybox/busybox-1.24.1-unzip.patch
busybox/busybox-kbuild-race-fix-commit-d8e61bb.patch
busybox/commit-applet_tables-fix-commit-0dddbc1.patch
busybox/ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch

3) Modify 3 patches below to make it compatible with new version
busybox/busybox-cross-menuconfig.patch
busybox/busybox-udhcpc-no_deconfig.patch
busybox/makefile-fix-backport.patch

Signed-off-by: Zheng Ruoqin 
---
 ...e-the-behaviour-of-c-parameter-to-match-u.patch |  64 -
 ...biproute-handle-table-ids-larger-than-255.patch | 134 ---
 ...-n-flushes-pattern-space-terminates-early.patch |  72 ---
 .../busybox/busybox/CVE-2016-2147.patch|  57 
 .../busybox/busybox/CVE-2016-2147_2.patch  |  32 -
 .../busybox/busybox/CVE-2016-2148.patch|  74 ---
 .../busybox-1.24.1-truncate-open-mode.patch|  81 
 .../busybox/busybox-1.24.1-unzip-regression.patch  | 143 -
 .../busybox/busybox/busybox-1.24.1-unzip.patch | 118 -
 .../busybox/busybox/busybox-cross-menuconfig.patch |  70 +-
 .../busybox-kbuild-race-fix-commit-d8e61bb.patch   |  53 
 .../busybox/busybox-udhcpc-no_deconfig.patch   |  70 +-
 .../commit-applet_tables-fix-commit-0dddbc1.patch  |  61 -
 ...lem_on_mips64_n64_big_endian_musl_systems.patch |  90 -
 .../busybox/busybox/makefile-fix-backport.patch|  30 ++---
 .../{busybox_1.24.1.bb => busybox_1.26.2.bb}   |  16 +--
 16 files changed, 88 insertions(+), 1077 deletions(-)
 delete mode 100644 
meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/0001-libiproute-handle-table-ids-larger-than-255.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch
 delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-2147.patch
 delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-2147_2.patch
 delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-2148.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/busybox-1.24.1-truncate-open-mode.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip-regression.patch
 delete mode 100644 meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/busybox-kbuild-race-fix-commit-d8e61bb.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/commit-applet_tables-fix-commit-0dddbc1.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch
 rename meta/recipes-core/busybox/{busybox_1.24.1.bb => busybox_1.26.2.bb} (66%)

diff --git 
a/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
 
b/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
deleted file mode 100644
index 78520f0..000
--- 
a/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From e1d426fd65c00a6d01a10d85edf8a294ae8a2d2b Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko 
-Date: Sun, 24 Apr 2016 18:19:49 +0200
-Subject: [PATCH] flock: fix -c; improve error handling of fork+exec
-
-function old new   delta
-flock_main   254 334 +80
-
-Upstream-Status: Backport
-
-Signed-off-by: Denys Vlasenko 
-Signed-off-by: Maxin B. John 

- util-linux/flock.c | 19 +--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/util-linux/flock.c b/util-linux/flock.c
-index 05a747f..539a835 100644
 a/util-linux/flock.c
-+++ b/util-linux/flock.c
-@@ -57,7 +57,6 @@ int flock_main(int argc UNUSED_PARAM, char **argv)
-   /* If it is "flock FILE -c PROG", then -c isn't caught by getopt32:
-* we use "+" in order to support "flock -opt FILE PROG -with-opts",
-* we need to remove -c by hand.
--   * TODO: in upstream, -c 'PROG ARGS' means "run sh -c 'PROG ARGS'"
-*/
-   if (argv[0]
-&& argv[0][0] == '-'
-@@ -66,6 +65,9 @@ int 

[OE-core] ✗ patchtest: failure for "glibc-package: Avoid race ssta..." and 6 more

2017-02-08 Thread Patchwork
== Series Details ==

Series: "glibc-package: Avoid race ssta..." and 6 more
Revision: 1
URL   : https://patchwork.openembedded.org/series/5222/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Patch[5/7] openssl/fontconfig/bzip2: Use relative symlinks 
instead of absolute ones (using a new class)
 Issue Commit shortlog is too long [test_shortlog_length] 
  Suggested fixEdit shortlog so that it is 90 characters or less (currently 
92 characters)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

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


[OE-core] [PATCH 1/7] glibc-package: Avoid race sstate races with do_stash_locale

2017-02-08 Thread Richard Purdie
The change to make do_stash_locale an sstate task between do_install and
do_package has some unforeseen problems since the function deletes part of
${D} but may or may not run depending on whether the task is installed from
sstate.

This cleans up the current "pre packaging" function to be more deterministic
and result in the same set of files, whichever code path we end up reaching
that point by. Its not an ideal sitation but it should avoid the race
failures we've seen on some builds.

Signed-off-by: Richard Purdie 
---
 meta/recipes-core/glibc/glibc-package.inc | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-core/glibc/glibc-package.inc 
b/meta/recipes-core/glibc/glibc-package.inc
index 557b958..f0fc9c1 100644
--- a/meta/recipes-core/glibc/glibc-package.inc
+++ b/meta/recipes-core/glibc/glibc-package.inc
@@ -192,18 +192,23 @@ python do_stash_locale_setscene () {
 }
 addtask do_stash_locale_setscene
 
-PACKAGE_PREPROCESS_FUNCS += "glibc_package_preprocess"
-
-glibc_package_preprocess () {
+do_poststash_install_cleanup () {
+   # Remove all files which do_stash_locale would remove (mv)
+   # since that task could have come from sstate and not get run.
for i in ${bashscripts}; do
-   rm -f ${PKGD}${bindir}/$i
+   rm -f ${D}${bindir}/$i
done
-   rm -rf ${PKGD}/${localedir}
+   rm -f ${D}${bindir}/localedef
+   rm -rf ${D}${datadir}/i18n
+   rm -rf ${D}${libdir}/gconv
+   rm -rf ${D}/${localedir}
+   rm -rf ${D}${datadir}/locale
if [ "${libdir}" != "${exec_prefix}/lib" ]; then
# This dir only exists to hold locales
-   rm -rf ${PKGD}${exec_prefix}/lib
+   rm -rf ${D}${exec_prefix}/lib
fi
 }
+addtask do_poststash_install_cleanup after do_stash_locale do_install before 
do_populate_sysroot do_package
 
 pkg_postinst_nscd () {
if [ -z "$D" ]; then
-- 
2.7.4

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


[OE-core] [PATCH 6/7] sstate: Make absolute symlinks an error

2017-02-08 Thread Richard Purdie
The current relocation code is broken, at least in the native case. Fixing it
would mean trying pass in new data on sstate tasks about the relative 
positioning
of symlinks compared to the sstate relocation paths. Whilst we could do this,
right now I'm favouring making this an error and fixing the small number of
problematic recipes we have in OE-Core (3).

Signed-off-by: Richard Purdie 
---
 meta/classes/sstate.bbclass | 42 --
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index ada6fe5..bd9c2ae 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -583,29 +583,6 @@ python sstate_hardcode_path () {
 def sstate_package(ss, d):
 import oe.path
 
-def make_relative_symlink(path, outputpath, d):
-# Replace out absolute TMPDIR paths in symlinks with relative ones
-if not os.path.islink(path):
-return
-link = os.readlink(path)
-if not os.path.isabs(link):
-return
-if not link.startswith(tmpdir):
-return
-
-#base = os.path.relpath(link, os.path.dirname(path))
-
-depth = outputpath.rpartition(tmpdir)[2].count('/')
-base = link.partition(tmpdir)[2].strip()
-while depth > 1:
-base = "/.." + base
-depth -= 1
-base = "." + base
-
-bb.debug(2, "Replacing absolute path %s with relative path %s for %s" 
% (link, base, outputpath))
-os.remove(path)
-os.symlink(base, path)
-
 tmpdir = d.getVar('TMPDIR')
 
 sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['task'])
@@ -619,15 +596,20 @@ def sstate_package(ss, d):
 if d.getVar('SSTATE_SKIP_CREATION') == '1':
 continue
 srcbase = state[0].rstrip("/").rsplit('/', 1)[0]
+# Find and error for absolute symlinks. We could attempt to relocate 
but its not
+# clear where the symlink is relative to in this context. We could add 
that markup
+# to sstate tasks but there aren't many of these so better just avoid 
them entirely.
 for walkroot, dirs, files in os.walk(state[1]):
-for file in files:
+for file in files + dirs:
 srcpath = os.path.join(walkroot, file)
-dstpath = srcpath.replace(state[1], state[2])
-make_relative_symlink(srcpath, dstpath, d)
-for dir in dirs:
-srcpath = os.path.join(walkroot, dir)
-dstpath = srcpath.replace(state[1], state[2])
-make_relative_symlink(srcpath, dstpath, d)
+if not os.path.islink(srcpath):
+continue
+link = os.readlink(srcpath)
+if not os.path.isabs(link):
+continue
+if not link.startswith(tmpdir):
+continue
+bb.error("sstate found an absolute path symlink %s pointing at 
%s. Please replace this with a relative link." % (srcpath, link))
 bb.debug(2, "Preparing tree %s for packaging at %s" % (state[1], 
sstatebuild + state[0]))
 os.rename(state[1], sstatebuild + state[0])
 
-- 
2.7.4

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


[OE-core] [PATCH 7/7] nss: Fix nss-native so the checksum doesn't change with BUILD_ARCH

2017-02-08 Thread Richard Purdie
Switching between 32 and 64 bit BUILD_ARCH shows:

$ bitbake-diffsigs 
tmp-sstatesamehash*/stamps/*/nss-native/3.27.1-r0.do_compile.sigdata.*
basehash changed from 944cc4554a823ba966aeda0ac3d33b79 to 
2475db3659c248d81d0e4dadb3c1b4cd
Variable SITEINFO_BITS value changed from '32' to '64'

We shouldn't have this dependency and it would fail oe-selftest 
test_sstate_32_64_same_hash
if nss-native were included, therefore exclude it.

Signed-off-by: Richard Purdie 
---
 meta/recipes-support/nss/nss_3.27.1.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-support/nss/nss_3.27.1.bb 
b/meta/recipes-support/nss/nss_3.27.1.bb
index 9aad5bd..c89470f 100644
--- a/meta/recipes-support/nss/nss_3.27.1.bb
+++ b/meta/recipes-support/nss/nss_3.27.1.bb
@@ -107,6 +107,7 @@ do_compile() {
 OS_TEST=${OS_TEST} \
 RPATH="${RPATH}"
 }
+do_compile[vardepsexclude] += "SITEINFO_BITS"
 
 
 do_install_prepend_class-nativesdk() {
@@ -180,6 +181,7 @@ do_install() {
 install -m 755 -t ${D}/${bindir} $binary
 done
 }
+do_install[vardepsexclude] += "SITEINFO_BITS"
 
 do_install_append() {
 # Create empty .chk files for the NSS libraries at build time. They could
-- 
2.7.4

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


[OE-core] [PATCH 4/7] lib/oe/path: Add replace_absolute_symlinks function

2017-02-08 Thread Richard Purdie
We need a function to walk a directory and replace absolute symlinks with
relative ones. Add such a function to the path module of lib/oe.

It does this relative to the directory being walked for files.

Signed-off-by: Richard Purdie 
---
 meta/lib/oe/path.py | 21 +
 1 file changed, 21 insertions(+)

diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
index d468540..a2a50c5 100644
--- a/meta/lib/oe/path.py
+++ b/meta/lib/oe/path.py
@@ -50,6 +50,27 @@ def make_relative_symlink(path):
 os.remove(path)
 os.symlink(base, path)
 
+def replace_absolute_symlinks(basedir, d):
+"""
+Walk basedir looking for absolute symlinks and replacing them with 
relative ones.
+The absolute links are assumed to be relative to basedir
+(compared to make_relative_symlink above which tries to compute common 
ancestors
+using pattern matching instead)
+"""
+for walkroot, dirs, files in os.walk(basedir):
+for file in files + dirs:
+path = os.path.join(walkroot, file)
+if not os.path.islink(path):
+continue
+link = os.readlink(path)
+if not os.path.isabs(link):
+continue
+walkdir = os.path.dirname(path.rpartition(basedir)[2])
+base = os.path.relpath(link, walkdir)
+bb.debug(2, "Replacing absolute path %s with relative path %s" % 
(link, base))
+os.remove(path)
+os.symlink(base, path)
+
 def format_display(path, metadata):
 """ Prepare a path for display to the user. """
 rel = relative(metadata.getVar("TOPDIR"), path)
-- 
2.7.4

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


[OE-core] [PATCH 2/7] python3-native: Remove tests to save copying uneeded files around

2017-02-08 Thread Richard Purdie
Removing these nearly halves the python3-native disk footprint meaning
more optimal sysroot operations. We don't need these tests for anything.

Signed-off-by: Richard Purdie 
---
 meta/recipes-devtools/python/python3-native_3.5.2.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-devtools/python/python3-native_3.5.2.bb 
b/meta/recipes-devtools/python/python3-native_3.5.2.bb
index 7ac3942..bf4e686 100644
--- a/meta/recipes-devtools/python/python3-native_3.5.2.bb
+++ b/meta/recipes-devtools/python/python3-native_3.5.2.bb
@@ -98,4 +98,7 @@ do_install() {
for PYTHSCRIPT in `grep -rIl ${bindir}/${PN}/python 
${D}${bindir}/${PN}`; do
sed -i -e '1s|^#!.*|#!/usr/bin/env python3|' $PYTHSCRIPT
done
+
+   # Tests are large and we don't need them in the native sysroot
+   rm ${D}${libdir}/python${PYTHON_MAJMIN}/test -rf
 }
-- 
2.7.4

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


[OE-core] [PATCH 3/7] gcc-cross-initial: Remove unneeded temporary sysroot

2017-02-08 Thread Richard Purdie
We used to need to build gcc-cross-initial against a bare sysroot to avoid
contamination. With RSS, we no longer need to do this since the recipe sysroot
is already bare. We can therefore simply point at that and drop this code.

Signed-off-by: Richard Purdie 
---
 meta/recipes-devtools/gcc/gcc-cross-initial.inc | 13 +
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc 
b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index dd35681..5c0208a 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -24,7 +24,7 @@ EXTRA_OECONF = "\
 --enable-languages=c \
 --program-prefix=${TARGET_PREFIX} \
 --with-sysroot=/not/exist \
---with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \
+--with-build-sysroot=${STAGING_DIR_TARGET} \
 ${EXTRA_OECONF_INITIAL} \
 ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 
'--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
 ${EXTRA_OECONF_GCC_FLOAT} \
@@ -33,17 +33,6 @@ EXTRA_OECONF = "\
 
 EXTRA_OECONF += "--with-native-system-header-dir=${SYSTEMHEADERS}"
 
-GCCCROSS_BUILDSYSROOT = "${B}/tmpsysroot"
-
-do_configure_prepend () {
-   sysr=${GCCCROSS_BUILDSYSROOT}${target_includedir}
-   mkdir -p $sysr
-   for t in linux asm asm-generic; do
-   rm -f $sysr/$t
-   ln -s ${STAGING_DIR_TARGET}${target_includedir}/$t $sysr/
-   done
-}
-
 do_compile () {
 oe_runmake all-gcc configure-target-libgcc
 }
-- 
2.7.4

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


[OE-core] [PATCH 5/7] openssl/fontconfig/bzip2: Use relative symlinks instead of absolute ones (using a new class)

2017-02-08 Thread Richard Purdie
Absolute path symlinks are a bit of a pain for sstate and the native versions
of these recipes currently contain broken symlinks as a result. There are
only a small number of problematic recipes, at least in OE-Core, namely the
three here.

Rather than trying to make sstate handle this magically, which turns out to
be a harder problem than you'd first realise, simply make the symlinks relative
early in the process and avoid all the problems.

The alternative is adding new complexity to sstate which we could really
do without as without the complexity, you can't always tell where the
absolute symlink is relative to (due to prefixes used for native sstate).

Signed-off-by: Richard Purdie 
---
 meta/classes/relative_symlinks.bbclass| 5 +
 meta/recipes-connectivity/openssl/openssl.inc | 2 +-
 meta/recipes-extended/bzip2/bzip2_1.0.6.bb| 2 +-
 meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 meta/classes/relative_symlinks.bbclass

diff --git a/meta/classes/relative_symlinks.bbclass 
b/meta/classes/relative_symlinks.bbclass
new file mode 100644
index 000..3157737
--- /dev/null
+++ b/meta/classes/relative_symlinks.bbclass
@@ -0,0 +1,5 @@
+do_install[postfuncs] += "install_relative_symlinks"
+
+python install_relative_symlinks () {
+oe.path.replace_absolute_symlinks(d.getVar('D'), d)
+}
diff --git a/meta/recipes-connectivity/openssl/openssl.inc 
b/meta/recipes-connectivity/openssl/openssl.inc
index 5cca019..fc55925 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -30,7 +30,7 @@ export EX_LIBS = "-lgcc -ldl"
 export AS = "${CC} -c"
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
-inherit pkgconfig siteinfo multilib_header ptest
+inherit pkgconfig siteinfo multilib_header ptest relative_symlinks
 
 PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf"
 FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}"
diff --git a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb 
b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
index ef7bc89..0512a75 100644
--- a/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
+++ b/meta/recipes-extended/bzip2/bzip2_1.0.6.bb
@@ -25,7 +25,7 @@ PACKAGES =+ "libbz2"
 
 CFLAGS_append = " -fPIC -fpic -Winline -fno-strength-reduce 
-D_FILE_OFFSET_BITS=64"
 
-inherit autotools update-alternatives ptest
+inherit autotools update-alternatives ptest relative_symlinks
 
 ALTERNATIVE_PRIORITY = "100"
 ALTERNATIVE_${PN} = "bunzip2 bzcat"
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb 
b/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb
index 8616154..95b066c 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb
@@ -37,7 +37,7 @@ RREPLACES_fontconfig-utils = "libfontconfig-utils"
 RCONFLICTS_fontconfig-utils = "libfontconfig-utils"
 DEBIAN_NOAUTONAME_fontconfig-utils = "1"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig relative_symlinks
 
 FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig"
 
-- 
2.7.4

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


Re: [OE-core] [PATCH 3/3] python3-setuptools: Remove pth file creation at recipe level

2017-02-08 Thread Jose Lamego
Ping.

On 01/17/2017 09:42 AM, Jose Lamego wrote:
> Handling of installed eggs is now performed at the distutils3 bbclass.
> 
> This change removes the pth file creation at recipe level.
> 
> [YOCTO #8673]
> 
> Signed-off-by: Jose Lamego 
> ---
>  meta/recipes-devtools/python/python3-setuptools_31.0.0.bb | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb 
> b/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
> index 65af6f0..b37b381 100644
> --- a/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
> +++ b/meta/recipes-devtools/python/python3-setuptools_31.0.0.bb
> @@ -7,11 +7,8 @@ inherit distutils3
>  
>  DISTUTILS_INSTALL_ARGS += "--install-lib=${D}${PYTHON_SITEPACKAGES_DIR}"
>  
> -# The installer puts the wrong path in the setuptools.pth file.  Correct it.
>  do_install_append() {
> -rm ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
>  mv ${D}${bindir}/easy_install ${D}${bindir}/easy3_install
> -echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" > 
> ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth
>  }
>  
>  RDEPENDS_${PN} = "\
> 

-- 
Jose Lamego | OTC Embedded Platforms & Tools | GDC



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 2/3] python3-pip: Remove pth file creation at recipe level

2017-02-08 Thread Jose Lamego
Ping.

On 01/17/2017 09:42 AM, Jose Lamego wrote:
> Handling of installed eggs is now performed at the distutils3 bbclass.
> 
> This change removes the pth file creation at recipe level.
> 
> [YOCTO #8673]
> 
> Signed-off-by: Jose Lamego 
> ---
>  meta/recipes-devtools/python/python3-pip_9.0.1.bb | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/meta/recipes-devtools/python/python3-pip_9.0.1.bb 
> b/meta/recipes-devtools/python/python3-pip_9.0.1.bb
> index 6ac94bb..9dce107 100644
> --- a/meta/recipes-devtools/python/python3-pip_9.0.1.bb
> +++ b/meta/recipes-devtools/python/python3-pip_9.0.1.bb
> @@ -31,9 +31,6 @@ do_install_append() {
>  
>  # Install as pip3 and leave pip2 as default
>  rm ${D}/${bindir}/pip
> -
> -# Installed eggs need to be passed directly to the interpreter via a pth 
> file
> -echo "./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg" > 
> ${D}${PYTHON_SITEPACKAGES_DIR}/${SRCNAME}-${PV}.pth
>  }
>  
>  RDEPENDS_${PN} = "\
> 

-- 
Jose Lamego | OTC Embedded Platforms & Tools | GDC



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 1/3] distutils3.bbclass: add egg files/directories to python path

2017-02-08 Thread Jose Lamego
Ping.

On 01/17/2017 09:42 AM, Jose Lamego wrote:
> Packages that use .egg files or directories for installation may
> not be found when imported at the python3 interpreter.
> .egg files/directories path must be included in a .pth file to
> be appropriately included in python path.
> 
> This change looks for .egg files/directories in sitepackages
> and adds its path to a .pth file during package installation.
> It ensures that any new package that uses .egg files/recipes
> will be appropriately added to path by performing the check from
> the distutils3 class.
> 
> [YOCTO #8673]
> 
> Signed-off-by: Jose Lamego 
> ---
>  meta/classes/distutils3.bbclass | 10 ++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
> index a6720c5..f8e2e2e 100644
> --- a/meta/classes/distutils3.bbclass
> +++ b/meta/classes/distutils3.bbclass
> @@ -68,6 +68,16 @@ distutils3_do_install() {
>  mv -f ${D}${datadir}/share/* ${D}${datadir}/
>  rmdir ${D}${datadir}/share
>  fi
> +
> +# detect if .egg files/directories were created and add their
> +# path to a .pth file
> +SHORT_PN=$(echo "${PN}" | sed 's/${PYTHON_PN}-//g')
> +if test -e ${D}${PYTHON_SITEPACKAGES_DIR}/${SHORT_PN}*.egg; then
> +EGG_NAME=$(basename $(find ${D}${PYTHON_SITEPACKAGES_DIR}/ \
> +-name ${SHORT_PN}\*.egg))
> +echo "./${EGG_NAME}" > ${D}${PYTHON_SITEPACKAGES_DIR}/\
> +${SHORT_PN}.pth
> +fi
>  }
>  distutils3_do_install[vardepsexclude] = "MACHINE"
>  
> 

-- 
Jose Lamego | OTC Embedded Platforms & Tools | GDC



signature.asc
Description: OpenPGP digital signature
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [bitbake][PATCH] lib/bb/build.py: Raise proper KeyError if function does not exist

2017-02-08 Thread Paul Eggleton
Hi Mike,

On Wednesday, 8 February 2017 7:17:53 AM NZDT Mike Looijmans wrote:
> If one adds the following line to an image recipe without defining
> the function:
> ROOTFS_POSTPROCESS_COMMAND += "rootfs_funky_stuff;"
> bitbake will terminate with a cryptic error message:
> AttributeError: 'NoneType' object has no attribute 'get'
> 
> To inform the user of what bitbake wasn't able to find, raise a KeyError
> exception denoting the function name before that happens. This changes the
> message to the much more useful:
> KeyError: 'rootfs_funky_stuff'
> 
> Signed-off-by: Mike Looijmans 
> ---
>  lib/bb/build.py | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/lib/bb/build.py b/lib/bb/build.py
> index c4c8aeb..5bc18c1 100644
> --- a/lib/bb/build.py
> +++ b/lib/bb/build.py
> @@ -194,6 +194,8 @@ def exec_func(func, d, dirs = None,
> pythonexception=False): oldcwd = None
> 
>  flags = d.getVarFlags(func)
> +if flags is None:
> +raise KeyError(func)
>  cleandirs = flags.get('cleandirs')
>  if cleandirs:
>  for cdir in d.expand(cleandirs).split():

This should got to the bitbake-devel list.

Whilst I agree this is an improvement, since we're trying to print a more 
reasonable error message, wouldn't we be better off explicitly saying 
"Function %s not defined" or similar?

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH] sanity.bbclass: Add which to SANITY_REQUIRED_UTILITIES.

2017-02-08 Thread Philip Balister
Using docker with the Fedora 23 container exposed an issue with
the rpm-native configure step. If which is not present the configure
script fork bombs. After much pain, I tracked this to which not being
present in the default container. Add a check for which so others
do not have to have this experience.

Signed-off-by: Philip Balister 
---
 meta/classes/sanity.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 7bcceee..4ed501e 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -3,7 +3,7 @@
 #
 
 SANITY_REQUIRED_UTILITIES ?= "patch diffstat makeinfo git bzip2 tar \
-gzip gawk chrpath wget cpio perl file"
+gzip gawk chrpath wget cpio perl file which"
 
 def bblayers_conf_file(d):
 return os.path.join(d.getVar('TOPDIR'), 'conf/bblayers.conf')
-- 
2.7.4

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


Re: [OE-core] [morty][PATCH 0/2] Resolve gdb-cross-canadian dependency on imp

2017-02-08 Thread George McCollister
Any chance we can get this applied to morty?
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[OE-core] [PATCH 9/9] wic: remove unused argument scripts_path

2017-02-08 Thread Ed Bartosh
There is no need to pass scripts_path from main wic module
down the stack as it's not used there.

Removed scripts_path argument from DirectPlugin class
and wic_create function.

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/engine.py| 7 +++
 scripts/lib/wic/plugins/imager/direct.py | 2 +-
 scripts/wic  | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index e27598d..1aa8f65 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -145,8 +145,8 @@ def list_source_plugins():
 print("  %s" % plugin)
 
 
-def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir, native_sysroot,
-   scripts_path, options):
+def wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
+   native_sysroot, options):
 """
 Create image
 
@@ -155,7 +155,6 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, 
kernel_dir, native_sysroot,
 bootimg_dir - absolute path to the build's boot artifacts directory
 kernel_dir - absolute path to the build's kernel directory
 native_sysroot - absolute path to the build's native sysroots dir
-scripts_path - absolute path to /scripts dir
 image_output_dir - dirname to create for image
 options - wic command line options (debug, bmap, etc)
 
@@ -195,7 +194,7 @@ def wic_create(wks_file, rootfs_dir, bootimg_dir, 
kernel_dir, native_sysroot,
 msger.error('Unknown plugin: %s' % pname)
 
 plugin = plugin_class(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
-  native_sysroot, scripts_path, oe_builddir, options)
+  native_sysroot, oe_builddir, options)
 
 plugin.do_create()
 
diff --git a/scripts/lib/wic/plugins/imager/direct.py 
b/scripts/lib/wic/plugins/imager/direct.py
index c399d47..a9144e2 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -68,7 +68,7 @@ class DirectPlugin(ImagerPlugin):
 name = 'direct'
 
 def __init__(self, wks_file, rootfs_dir, bootimg_dir, kernel_dir,
- native_sysroot, scripts_path, oe_builddir, options):
+ native_sysroot, oe_builddir, options):
 try:
 self.ks = KickStart(wks_file)
 except KickStartError as err:
diff --git a/scripts/wic b/scripts/wic
index 8a959a0..1b7d7df 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -250,7 +250,7 @@ def wic_create_subcommand(args, usage_str):
 
 print("Creating image(s)...\n")
 engine.wic_create(wks_file, rootfs_dir, bootimg_dir, kernel_dir,
-  native_sysroot, scripts_path, options)
+  native_sysroot, options)
 
 
 def wic_list_subcommand(args, usage_str):
-- 
2.1.4

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


[OE-core] [PATCH 6/9] wic: make sure layout_partitions is called once

2017-02-08 Thread Ed Bartosh
Removed artificial _partitions_layed_out attribute and
unneeded call of layout_partitions method.

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/utils/partitionedfs.py | 12 
 1 file changed, 12 deletions(-)

diff --git a/scripts/lib/wic/utils/partitionedfs.py 
b/scripts/lib/wic/utils/partitionedfs.py
index fb5c0c2..5397bb7 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -46,7 +46,6 @@ class Image():
 self.partimages = []
 # Size of a sector used in calculations
 self.sector_size = SECTOR_SIZE
-self._partitions_layed_out = False
 self.native_sysroot = native_sysroot
 
 def _add_disk(self, disk_name):
@@ -58,8 +57,6 @@ class Image():
 # We already have this disk
 return
 
-assert not self._partitions_layed_out
-
 self.disks[disk_name] = \
 {'disk': None, # Disk object
  'numpart': 0, # Number of allocate partitions
@@ -90,8 +87,6 @@ class Image():
 # Converting kB to sectors for parted
 part.size_sec = part.disk_size * 1024 // self.sector_size
 
-assert not self._partitions_layed_out
-
 self.partitions.append(part)
 self._add_disk(part.disk)
 
@@ -102,11 +97,6 @@ class Image():
 
 msger.debug("Assigning %s partitions to disks" % ptable_format)
 
-if self._partitions_layed_out:
-return
-
-self._partitions_layed_out = True
-
 # Go through partitions in the order they are added in .ks file
 for num in range(len(self.partitions)):
 part = self.partitions[num]
@@ -219,8 +209,6 @@ class Image():
 disk = self.disks[dev]
 disk['disk'].create()
 
-self.layout_partitions()
-
 for dev in self.disks:
 disk = self.disks[dev]
 msger.debug("Initializing partition table for %s" % \
-- 
2.1.4

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


[OE-core] [PATCH 8/9] wic: direct: remove unused import

2017-02-08 Thread Ed Bartosh
Removed unused import of wic.errors module.

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/plugins/imager/direct.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/lib/wic/plugins/imager/direct.py 
b/scripts/lib/wic/plugins/imager/direct.py
index 7d6c59a..c399d47 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -34,7 +34,6 @@ from wic import msger
 from wic.ksparser import KickStart, KickStartError
 from wic.plugin import pluginmgr
 from wic.pluginbase import ImagerPlugin
-from wic.utils import errors
 from wic.utils.errors import CreatorError, ImageError
 from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd
 from wic.utils.partitionedfs import Image
@@ -102,7 +101,7 @@ class DirectPlugin(ImagerPlugin):
 self.assemble()
 self.finalize()
 self.print_info()
-except errors.CreatorError:
+except CreatorError:
 raise
 finally:
 self.cleanup()
-- 
2.1.4

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


[OE-core] [PATCH 7/9] wic: direct: remove unused plugin attributes

2017-02-08 Thread Ed Bartosh
Removed unused _disks, _disk_format and _disk_names
attributes from DirectPlugin class.

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/plugins/imager/direct.py | 4 
 1 file changed, 4 deletions(-)

diff --git a/scripts/lib/wic/plugins/imager/direct.py 
b/scripts/lib/wic/plugins/imager/direct.py
index 663655a..7d6c59a 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -90,9 +90,6 @@ class DirectPlugin(ImagerPlugin):
strftime("%Y%m%d%H%M"))
 self.workdir = tempfile.mkdtemp(dir=self.outdir, prefix='tmp.wic.')
 self._image = None
-self._disks = {}
-self._disk_format = "direct"
-self._disk_names = []
 self.ptable_format = self.ks.bootloader.ptable
 self.parts = self.ks.partitions
 
@@ -249,7 +246,6 @@ class DirectPlugin(ImagerPlugin):
 msger.debug("Adding disk %s as %s with size %s bytes" \
 % (disk_name, full_path, disk['min_size']))
 disk_obj = DiskImage(full_path, disk['min_size'])
-#self._disks[disk_name] = disk_obj
 self._image.add_disk(disk_name, disk_obj, disk_ids.get(disk_name))
 
 self._image.create()
-- 
2.1.4

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


[OE-core] [PATCH 5/9] wic: use the same partition object in direct and partitionedfs

2017-02-08 Thread Ed Bartosh
Partition attributes were copied to the dictionary in partitionedfs
code, which makes the code hard to follow.

Used partition object passed from direct.py module as is in
partitionedfs.

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/partition.py |   2 +
 scripts/lib/wic/plugins/imager/direct.py |   9 +-
 scripts/lib/wic/utils/partitionedfs.py   | 158 ++-
 3 files changed, 73 insertions(+), 96 deletions(-)

diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 69b369c..754ad75 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -38,12 +38,14 @@ class Partition():
 self.active = args.active
 self.align = args.align
 self.disk = args.disk
+self.device = None
 self.extra_space = args.extra_space
 self.fsopts = args.fsopts
 self.fstype = args.fstype
 self.label = args.label
 self.mountpoint = args.mountpoint
 self.no_table = args.no_table
+self.num = None
 self.overhead_factor = args.overhead_factor
 self.part_type = args.part_type
 self.rootfs_dir = args.rootfs_dir
diff --git a/scripts/lib/wic/plugins/imager/direct.py 
b/scripts/lib/wic/plugins/imager/direct.py
index 71ffc36..663655a 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -237,14 +237,7 @@ class DirectPlugin(ImagerPlugin):
 part.prepare(self, self.workdir, self.oe_builddir, self.rootfs_dir,
  self.bootimg_dir, self.kernel_dir, 
self.native_sysroot)
 
-
-self._image.add_partition(part.disk_size, part.disk,
-  part.mountpoint, part.source_file,
-  part.fstype, part.label,
-  fsopts=part.fsopts, boot=part.active,
-  align=part.align, no_table=part.no_table,
-  part_type=part.part_type, uuid=part.uuid,
-  system_id=part.system_id)
+self._image.add_partition(part)
 
 if fstab_path:
 shutil.move(fstab_path + ".orig", fstab_path)
diff --git a/scripts/lib/wic/utils/partitionedfs.py 
b/scripts/lib/wic/utils/partitionedfs.py
index b7ab1d5..fb5c0c2 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -71,47 +71,29 @@ class Image():
  'ptable_format': "msdos", # Partition table format
  'identifier': None} # Disk system identifier
 
-def add_disk(self, disk_name, disk_obj, identifier):
+def add_disk(self, name, disk_obj, identifier):
 """ Add a disk object which have to be partitioned. More than one disk
 can be added. In case of multiple disks, disk partitions have to be
 added for each disk separately with 'add_partition()". """
 
-self._add_disk(disk_name)
-self.disks[disk_name]['disk'] = disk_obj
-self.disks[disk_name]['identifier'] = identifier
+self._add_disk(name)
+self.disks[name]['disk'] = disk_obj
+self.disks[name]['identifier'] = identifier
 
-def add_partition(self, size, disk_name, mountpoint, source_file=None, 
fstype=None,
-  label=None, fsopts=None, boot=False, align=None, 
no_table=False,
-  part_type=None, uuid=None, system_id=None):
-""" Add the next partition. Partitions have to be added in the
-first-to-last order. """
-
-ks_pnum = len(self.partitions)
+def add_partition(self, part):
+"""
+Add the next partition. Partitions have to be added in the
+first-to-last order.
+"""
+part.ks_pnum = len(self.partitions)
 
 # Converting kB to sectors for parted
-size = size * 1024 // self.sector_size
-
-part = {'ks_pnum': ks_pnum, # Partition number in the KS file
-'size': size, # In sectors
-'mountpoint': mountpoint, # Mount relative to chroot
-'source_file': source_file, # partition contents
-'fstype': fstype, # Filesystem type
-'fsopts': fsopts, # Filesystem mount options
-'label': label, # Partition label
-'disk_name': disk_name, # physical disk name holding partition
-'device': None, # kpartx device node for partition
-'num': None, # Partition number
-'boot': boot, # Bootable flag
-'align': align, # Partition alignment
-'no_table' : no_table, # Partition does not appear in 
partition table
-'part_type' : part_type, # Partition type
-'uuid': uuid, # Partition UUID
-'system_id': system_id} # Partition system id
+part.size_sec = 

[OE-core] [PATCH 4/9] wic: direct: get rid of _get_parts getter

2017-02-08 Thread Ed Bartosh
Replaced _get_parts getter with direct attribute
access to self.parts

Removed code that implicitly created partition
if there are no partitions mentioned in .wks file

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/plugins/imager/direct.py | 36 +++-
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/scripts/lib/wic/plugins/imager/direct.py 
b/scripts/lib/wic/plugins/imager/direct.py
index ae420a6..71ffc36 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -94,6 +94,7 @@ class DirectPlugin(ImagerPlugin):
 self._disk_format = "direct"
 self._disk_names = []
 self.ptable_format = self.ks.bootloader.ptable
+self.parts = self.ks.partitions
 
 def do_create(self):
 """
@@ -140,7 +141,7 @@ class DirectPlugin(ImagerPlugin):
 with open(fstab_path) as fstab:
 fstab_lines = fstab.readlines()
 
-if self._update_fstab(fstab_lines, self._get_parts()):
+if self._update_fstab(fstab_lines, self.parts):
 shutil.copyfile(fstab_path, fstab_path + ".orig")
 
 with open(fstab_path, "w") as fstab:
@@ -179,22 +180,6 @@ class DirectPlugin(ImagerPlugin):
 """
 self.bootimg_dir = bootimg_dir
 
-def _get_parts(self):
-if not self.ks:
-raise CreatorError("Failed to get partition info, "
-   "please check your kickstart setting.")
-
-# Set a default partition if no partition is given out
-if not self.ks.partitions:
-partstr = "part / --size 1900 --ondisk sda --fstype=ext3"
-args = partstr.split()
-part = self.ks.parse(args[1:])
-if part not in self.ks.partitions:
-self.ks.partitions.append(part)
-
-# partitions list from kickstart file
-return self.ks.partitions
-
 def _full_path(self, path, name, extention):
 """ Construct full file path to a file we generate. """
 return os.path.join(path, "%s-%s.%s" % (self.name, name, extention))
@@ -208,12 +193,10 @@ class DirectPlugin(ImagerPlugin):
 filesystems from the artifacts directly and combine them into
 a partitioned image.
 """
-parts = self._get_parts()
-
 self._image = Image(self.native_sysroot)
 
 disk_ids = {}
-for num, part in enumerate(parts, 1):
+for num, part in enumerate(self.parts, 1):
 # as a convenience, set source to the boot partition source
 # instead of forcing it to be set via bootloader --source
 if not self.ks.bootloader.source and part.mountpoint == "/boot":
@@ -227,11 +210,11 @@ class DirectPlugin(ImagerPlugin):
 if part.disk not in disk_ids:
 disk_ids[part.disk] = int.from_bytes(os.urandom(4), 
'little')
 disk_id = disk_ids[part.disk]
-part.uuid = '%0x-%02d' % (disk_id, self._get_part_num(num, 
parts))
+part.uuid = '%0x-%02d' % (disk_id, self._get_part_num(num, 
self.parts))
 
 fstab_path = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR"))
 
-for part in parts:
+for part in self.parts:
 # get rootfs size from bitbake variable if it's not set in .ks file
 if not part.size:
 # and if rootfs name is specified for the partition
@@ -323,8 +306,6 @@ class DirectPlugin(ImagerPlugin):
 """
 msg = "The new image(s) can be found here:\n"
 
-parts = self._get_parts()
-
 for disk_name in self._image.disks:
 extension = "direct" + {"gzip": ".gz",
 "bzip2": ".bz2",
@@ -334,7 +315,7 @@ class DirectPlugin(ImagerPlugin):
 msg += '  %s\n\n' % full_path
 
 msg += 'The following build artifacts were used to create the 
image(s):\n'
-for part in parts:
+for part in self.parts:
 if part.rootfs_dir is None:
 continue
 if part.mountpoint == '/':
@@ -357,14 +338,13 @@ class DirectPlugin(ImagerPlugin):
 
 Assume partition order same as in wks
 """
-parts = self._get_parts()
-for num, part in enumerate(parts, 1):
+for num, part in enumerate(self.parts, 1):
 if part.mountpoint == "/":
 if part.uuid:
 return "PARTUUID=%s" % part.uuid
 else:
 suffix = 'p' if part.disk.startswith('mmcblk') else ''
-pnum = self._get_part_num(num, parts)
+pnum = self._get_part_num(num, self.parts)
 return "/dev/%s%s%-d" % (part.disk, suffix, pnum)
 
 def cleanup(self):
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org

[OE-core] [PATCH 3/9] wic: partitionedfs: rename __create_partition and __add_disk

2017-02-08 Thread Ed Bartosh
Renamed private methods with leading double underscores:
__create_partition -> _create_partition
__add_disk -> _add_disk

There is no point to have those names mangled, one underscore
is enough.

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/utils/partitionedfs.py | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/lib/wic/utils/partitionedfs.py 
b/scripts/lib/wic/utils/partitionedfs.py
index 2cfdf70..b7ab1d5 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -49,7 +49,7 @@ class Image():
 self._partitions_layed_out = False
 self.native_sysroot = native_sysroot
 
-def __add_disk(self, disk_name):
+def _add_disk(self, disk_name):
 """ Add a disk 'disk_name' to the internal list of disks. Note,
 'disk_name' is the name of the disk in the target system
 (e.g., sdb). """
@@ -76,7 +76,7 @@ class Image():
 can be added. In case of multiple disks, disk partitions have to be
 added for each disk separately with 'add_partition()". """
 
-self.__add_disk(disk_name)
+self._add_disk(disk_name)
 self.disks[disk_name]['disk'] = disk_obj
 self.disks[disk_name]['identifier'] = identifier
 
@@ -217,7 +217,7 @@ class Image():
 
 disk['min_size'] *= self.sector_size
 
-def __create_partition(self, device, parttype, fstype, start, size):
+def _create_partition(self, device, parttype, fstype, start, size):
 """ Create a partition on an image described by the 'device' object. 
"""
 
 # Start is included to the size so we need to substract one from the 
end.
@@ -272,9 +272,9 @@ class Image():
 # starts a sector before the first logical partition,
 # add a sector at the back, so that there is enough
 # room for all logical partitions.
-self.__create_partition(disk['disk'].device, "extended",
-None, part['start'] - 1,
-disk['offset'] - part['start'] + 1)
+self._create_partition(disk['disk'].device, "extended",
+   None, part['start'] - 1,
+   disk['offset'] - part['start'] + 1)
 
 if part['fstype'] == "swap":
 parted_fs_type = "linux-swap"
@@ -297,8 +297,8 @@ class Image():
 part['mountpoint'])
 part['size'] -= 1
 
-self.__create_partition(disk['disk'].device, part['type'],
-parted_fs_type, part['start'], 
part['size'])
+self._create_partition(disk['disk'].device, part['type'],
+   parted_fs_type, part['start'], part['size'])
 
 if part['part_type']:
 msger.debug("partition %d: set type UID to %s" % \
-- 
2.1.4

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


[OE-core] [PATCH 1/9] wic: partitionedfs: merged __format_disks and create

2017-02-08 Thread Ed Bartosh
Private method __format_disks is called only from create
method making the code less readable. Merged the code
into one method.

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/utils/partitionedfs.py | 15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/scripts/lib/wic/utils/partitionedfs.py 
b/scripts/lib/wic/utils/partitionedfs.py
index 5fc5765..08ae52f 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -238,7 +238,11 @@ class Image():
 
 return exec_native_cmd(cmd, self.native_sysroot)
 
-def __format_disks(self):
+def create(self):
+for dev in self.disks:
+disk = self.disks[dev]
+disk['disk'].create()
+
 self.layout_partitions()
 
 for dev in self.disks:
@@ -375,12 +379,3 @@ class Image():
 partimage = image_file + '.p%d' % part['num']
 os.rename(source, partimage)
 self.partimages.append(partimage)
-
-def create(self):
-for dev in self.disks:
-disk = self.disks[dev]
-disk['disk'].create()
-
-self.__format_disks()
-
-return
-- 
2.1.4

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


[OE-core] [PATCH 2/9] wic: partitionedfs: get rid of __add_partition

2017-02-08 Thread Ed Bartosh
3 lines long private method __add_partition is called only
from add_partition method. Merged them together to increase
readability.

Signed-off-by: Ed Bartosh 
---
 scripts/lib/wic/utils/partitionedfs.py | 14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/scripts/lib/wic/utils/partitionedfs.py 
b/scripts/lib/wic/utils/partitionedfs.py
index 08ae52f..2cfdf70 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -80,15 +80,6 @@ class Image():
 self.disks[disk_name]['disk'] = disk_obj
 self.disks[disk_name]['identifier'] = identifier
 
-def __add_partition(self, part):
-""" This is a helper function for 'add_partition()' which adds a
-partition to the internal list of partitions. """
-
-assert not self._partitions_layed_out
-
-self.partitions.append(part)
-self.__add_disk(part['disk_name'])
-
 def add_partition(self, size, disk_name, mountpoint, source_file=None, 
fstype=None,
   label=None, fsopts=None, boot=False, align=None, 
no_table=False,
   part_type=None, uuid=None, system_id=None):
@@ -117,7 +108,10 @@ class Image():
 'uuid': uuid, # Partition UUID
 'system_id': system_id} # Partition system id
 
-self.__add_partition(part)
+assert not self._partitions_layed_out
+
+self.partitions.append(part)
+self._add_disk(part['disk_name'])
 
 def layout_partitions(self, ptable_format="msdos"):
 """ Layout the partitions, meaning calculate the position of every
-- 
2.1.4

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


[OE-core] [PATCH 0/9] #10619: refactor wic codebase (continuation)

2017-02-08 Thread Ed Bartosh
Hi,

This patchset simplifies interfaces of DirectPlugin and underlying
set of APIs located in partitionedfs module. It also removes one of
two different structures for partitioning info.

The following changes since commit a624cf7f95c8cf4ff764cc997fd1db4601b97dcc:

  oeqa/selftest/pkgdata: use m4 instead of bash (2017-02-07 14:50:10 +)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib ed/wic/wip
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/wip

Ed Bartosh (9):
  wic: partitionedfs: merged __format_disks and create
  wic: partitionedfs: get rid of __add_partition
  wic: partitionedfs: rename __create_partition and __add_disk
  wic: direct: get rid of _get_parts getter
  wic: use the same partition object in direct and partitionedfs
  wic: make sure layout_partitions is called once
  wic: direct: remove unused plugin attributes
  wic: direct: remove unused import
  wic: remove unused argument scripts_path

 scripts/lib/wic/engine.py|   7 +-
 scripts/lib/wic/partition.py |   2 +
 scripts/lib/wic/plugins/imager/direct.py |  54 ++---
 scripts/lib/wic/utils/partitionedfs.py   | 197 ---
 scripts/wic  |   2 +-
 5 files changed, 95 insertions(+), 167 deletions(-)

--
Regards,
Ed

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


[OE-core] [PATCH] lttng-tools: no need to delete libxml.m4

2017-02-08 Thread Ross Burton
The configure.ac uses pkg-config now and this macro doesn't exist in the tarball
anymore, so remove the deletion.

Signed-off-by: Ross Burton 
---
 meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb | 5 -
 1 file changed, 5 deletions(-)

diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb 
b/meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb
index 741d884..4c11e5b 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.9.3.bb
@@ -50,11 +50,6 @@ FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
 INSANE_SKIP_${PN} = "libexec dev-so"
 INSANE_SKIP_${PN}-dbg = "libexec"
 
-do_configure_prepend () {
-# Delete a shipped m4 file that overrides our patched one
-rm -f ${S}/m4/libxml.m4
-}
-
 do_install_ptest () {
 for f in Makefile tests/Makefile tests/utils/utils.sh ; do
 install -D "${B}/$f" "${D}${PTEST_PATH}/$f"
-- 
2.8.1

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


[OE-core] [PATCH] libcap: Add gperf-native to depends

2017-02-08 Thread Khem Raj
Fixes
|  gperf_case_strncmp (register const char *s1, register const char *s2, 
register size_t n)
|   
  ^~
| ./_caps_output.gperf:96:53: error: unknown type name 'size_t'
|  __cap_hash_name (register const char *str, register size_t len)
|  ^~
| ./_caps_output.gperf:200:55: error: unknown type name 'size_t'
|  __cap_lookup_name (register const char *str, register size_t len)
|^~
| ./_caps_output.gperf:200:1: error: conflicting types for '__cap_lookup_name'
|  __cap_lookup_name (register const char *str, register size_t len)
|  ^
| ./_caps_output.gperf:33:29: note: previous declaration of '__cap_lookup_name' 
was here
|  const struct __cap_token_s *__cap_lookup_name(const char *, unsigned int);
|  ^
| cap_text.c: In function 'cap_to_name':
| cap_text.c:291:2: warning: ignoring return value of 'asprintf', declared with 
attribute warn_unused_result [-Wunused-result]
|   asprintf(, "%u", cap);
|   ^
| make[1]: *** [Makefile:63: cap_text.o] Error 1

Signed-off-by: Khem Raj 
---
 meta/recipes-support/libcap/libcap_2.25.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/libcap/libcap_2.25.bb 
b/meta/recipes-support/libcap/libcap_2.25.bb
index 7ced4be626..343aeb6c40 100644
--- a/meta/recipes-support/libcap/libcap_2.25.bb
+++ b/meta/recipes-support/libcap/libcap_2.25.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://sites.google.com/site/fullycapable/;
 LICENSE = "BSD | GPLv2"
 LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1"
 
-DEPENDS = "hostperl-runtime-native"
+DEPENDS = "hostperl-runtime-native gperf-native"
 
 SRC_URI = 
"${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz
 \

file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \
-- 
2.11.1

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


Re: [OE-core] [PATCH] zlib: update SRC_URI to fix fetching

2017-02-08 Thread Joshua Lock
On Fri, 2017-01-13 at 17:53 +0200, Alexander Kanavin wrote:
> On 01/13/2017 05:36 PM, Joshua Lock wrote:
> 
> > Running checkpkg on the autobuilders won't really help as the
> > autobuilders rely on the bitbake invocation returning a non-zero
> > exit
> > code to determine whether to mark the build step as failed, and
> > that's
> > not the case when checkpkg doesn't find an update version.
> > 
> > If we regularly run checkpkg on the autobuilders how should we
> > detect
> > that a SRC_URI change has caused the upstream version check to
> > fail?
> 
> - run bitbake -c checkpkg world
> - inspect tmp/log/checkpkg.csv for lines with 'UNKNOWN' upstream
> status, 
> make a list of recipes that have it
> - compare that list against a stored list of exceptions (currently
> it 
> would have about 32 entries), if the lists don't match exactly, the 
> upstream version check has failed.
> 
> All of this can be wrapped in poky/scripts/upstream-check-all
> perhaps.

Thanks, I've filed a bug to track implementing this feature:

https://bugzilla.yoctoproject.org/show_bug.cgi?id=11031

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


Re: [OE-core] [PATCH 1/3] go: Add recipes for golang compilers and tools

2017-02-08 Thread Burton, Ross
On 8 February 2017 at 14:07, Jussi Kukkonen 
wrote:

> On 8 February 2017 at 15:57, Gary Thomas  wrote:
>>
>> I agree - if ruby is OE-core worthy, go most certainly is.
>>
>
> webkit-gtk needs ruby-native as a build dependency. If that wasn't the
> case ruby would almost certainly not be in oe-core.
>

This: ruby was added from meta-ruby because we really wanted webkit and
ruby is a build dependency.  If webkit wasn't in oe-core then the ruby
runtime would likely still be in meta-ruby, where it was a great example of
a language layer.

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


[OE-core] [PATCH 3/6] oeqa.utils.git: support bare repos

2017-02-08 Thread Markus Lehtonen
[YOCTO #10582]

Signed-off-by: Markus Lehtonen 
---
 meta/lib/oeqa/utils/git.py | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/utils/git.py b/meta/lib/oeqa/utils/git.py
index 5dd90e0..e0cb3f0 100644
--- a/meta/lib/oeqa/utils/git.py
+++ b/meta/lib/oeqa/utils/git.py
@@ -16,12 +16,17 @@ class GitError(Exception):
 class GitRepo(object):
 """Class representing a Git repository clone"""
 def __init__(self, path, is_topdir=False):
-self.top_dir = self._run_git_cmd_at(['rev-parse', '--show-toplevel'],
-path)
 git_dir = self._run_git_cmd_at(['rev-parse', '--git-dir'], path)
 git_dir = git_dir if os.path.isabs(git_dir) else os.path.join(path, 
git_dir)
 self.git_dir = os.path.realpath(git_dir)
 
+if self._run_git_cmd_at(['rev-parse', '--is-bare-repository'], path) 
== 'true':
+self.bare = True
+self.top_dir = self.git_dir
+else:
+self.bare = False
+self.top_dir = self._run_git_cmd_at(['rev-parse', 
'--show-toplevel'],
+path)
 realpath = os.path.realpath(path)
 if is_topdir and realpath != self.top_dir:
 raise GitError("{} is not a Git top directory".format(realpath))
@@ -40,9 +45,12 @@ class GitRepo(object):
 return ret.output.strip()
 
 @staticmethod
-def init(path):
+def init(path, bare=False):
 """Initialize a new Git repository"""
-GitRepo._run_git_cmd_at('init', cwd=path)
+cmd = ['init']
+if bare:
+cmd.append('--bare')
+GitRepo._run_git_cmd_at(cmd, cwd=path)
 return GitRepo(path, is_topdir=True)
 
 def run_cmd(self, git_args, env_update=None):
-- 
2.10.2

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


Re: [OE-core] [PATCH 1/3] go: Add recipes for golang compilers and tools

2017-02-08 Thread Alexander Kanavin

On 02/08/2017 03:57 PM, Gary Thomas wrote:


FWIW I disagree. Go is a popular systems language and we're
increasingly supporting a wide-array of systems with OE
(from iot to ivi and beyond).

Go is already in wide enough use and duplicated in enough layers that
we would be doing folks a favour by including it
in OE-Core and our build/test cycle.


I agree - if ruby is OE-core worthy, go most certainly is.


Ruby is in oe-core only because it's needed by webkit.

As an oe-core maintainer, I think the bar for adding stuff to oe-core 
should be higher than "it's popular" or "various existing layers are 
causing duplication of effort and aren't cooperating". The more things 
we have to support, the less time there is to do a good job with any 
specific item.


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


[OE-core] [PATCH 5/6] build-perf-test-wrapper.sh: use oe-git-archive

2017-02-08 Thread Markus Lehtonen
Start to use the new helper script for archiving results data in Git.

[YOCTO #10582]

Signed-off-by: Markus Lehtonen 
---
 scripts/contrib/build-perf-test-wrapper.sh | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/contrib/build-perf-test-wrapper.sh 
b/scripts/contrib/build-perf-test-wrapper.sh
index a4c1929..7788bb1 100755
--- a/scripts/contrib/build-perf-test-wrapper.sh
+++ b/scripts/contrib/build-perf-test-wrapper.sh
@@ -48,8 +48,7 @@ while getopts "ha:c:C:w:" opt; do
 ;;
 c)  commitish=$OPTARG
 ;;
-C)  results_repo=`realpath "$OPTARG"`
-commit_results=("--commit-results" "$results_repo")
+C)  results_repo=`realpath -s "$OPTARG"`
 ;;
 w)  base_dir=`realpath "$OPTARG"`
 ;;
@@ -130,10 +129,17 @@ fi
 # Run actual test script
 oe-build-perf-test --out-dir "$results_dir" \
--globalres-file "$globalres_log" \
-   --lock-file "$base_dir/oe-build-perf.lock" \
-   "${commit_results[@]}" \
-   --commit-results-branch 
"{tester_host}/{git_branch}/$machine" \
-   --commit-results-tag 
"{tester_host}/{git_branch}/$machine/{git_commit_count}-g{git_commit}/{tag_num}"
+   --lock-file "$base_dir/oe-build-perf.lock"
+
+# Commit results to git
+if [ -n "$results_repo" ]; then
+echo -e "\nArchiving results in $results_repo"
+oe-git-archive \
+--git-dir "$results_repo" \
+--branch-name "{hostname}/{branch}/{machine}" \
+--tag-name 
"{hostname}/{branch}/{machine}/{commit_count}-g{commit}/{tag_number}" \
+"$results_dir"
+fi
 
 case $? in
 1)  echo "ERROR: oe-build-perf-test script failed!"
-- 
2.10.2

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


[OE-core] [PATCH 2/6] scripts: Implement oe-git-archive

2017-02-08 Thread Markus Lehtonen
A helper script for committing data to git and pushing it upstream. The
motivation for the script stems from the need to archiving QA test
results in git, but it could be used elsewhere, of course. The script
needs to be run under an initialized build environment because it
utilizes bitbake configuration information.

[YOCTO #10582]

Signed-off-by: Markus Lehtonen 
---
 scripts/oe-git-archive | 244 +
 1 file changed, 244 insertions(+)
 create mode 100755 scripts/oe-git-archive

diff --git a/scripts/oe-git-archive b/scripts/oe-git-archive
new file mode 100755
index 000..419332d
--- /dev/null
+++ b/scripts/oe-git-archive
@@ -0,0 +1,244 @@
+#!/usr/bin/python3
+#
+# Helper script for committing data to git and pushing upstream
+#
+# Copyright (c) 2017, Intel Corporation.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU General Public License,
+# version 2, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+import argparse
+import glob
+import json
+import logging
+import math
+import os
+import re
+import sys
+from collections import namedtuple, OrderedDict
+from datetime import datetime, timedelta, tzinfo
+from operator import attrgetter
+
+# Import oe and bitbake libs
+scripts_path = os.path.dirname(os.path.realpath(__file__))
+sys.path.append(os.path.join(scripts_path, 'lib'))
+import scriptpath
+scriptpath.add_bitbake_lib_path()
+scriptpath.add_oe_lib_path()
+
+from oeqa.utils.git import GitRepo, GitError
+from oeqa.utils.metadata import metadata_from_bb
+
+
+# Setup logging
+logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s")
+log = logging.getLogger()
+
+
+class ArchiveError(Exception):
+"""Internal error handling of this script"""
+
+
+def format_str(string, fields):
+"""Format string using the given fields (dict)"""
+try:
+return string.format(**fields)
+except KeyError as err:
+raise ArchiveError("Unable to expand string '{}': unknown field {} "
+   "(valid fields are: {})".format(
+   string, err, ', '.join(sorted(fields.keys()
+
+
+def init_git_repo(path, no_create):
+"""Initialize local Git repository"""
+path = os.path.abspath(path)
+if os.path.isfile(path):
+raise ArchiveError("Invalid Git repo at {}: path exists but is not a "
+   "directory".format(path))
+if not os.path.isdir(path) or not os.listdir(path):
+if no_create:
+raise ArchiveError("No git repo at {}, refusing to create "
+   "one".format(path))
+if not os.path.isdir(path):
+try:
+os.mkdir(path)
+except (FileNotFoundError, PermissionError) as err:
+raise ArchiveError("Failed to mkdir {}: {}".format(path, err))
+if not os.listdir(path):
+log.info("Initializing a new Git repo at %s", path)
+repo = GitRepo.init(path)
+try:
+repo = GitRepo(path, is_topdir=True)
+except GitError:
+raise ArchiveError("Non-empty directory that is not a Git repository "
+   "at {}\nPlease specify an existing Git repository, "
+   "an empty directory or a non-existing directory "
+   "path.".format(path))
+return repo
+
+
+def git_commit_data(repo, data_dir, branch, message):
+"""Commit data into a Git repository"""
+log.info("Committing data into to branch %s", branch)
+tmp_index = os.path.join(repo.git_dir, 'index.oe-git-archive')
+try:
+# Create new tree object from the data
+env_update = {'GIT_INDEX_FILE': tmp_index,
+  'GIT_WORK_TREE': os.path.abspath(data_dir)}
+repo.run_cmd('add .', env_update)
+tree = repo.run_cmd('write-tree', env_update)
+
+# Create new commit object from the tree
+parent = repo.rev_parse(branch)
+git_cmd = ['commit-tree', tree, '-m', message]
+if parent:
+git_cmd += ['-p', parent]
+commit = repo.run_cmd(git_cmd, env_update)
+
+# Update branch head
+git_cmd = ['update-ref', 'refs/heads/' + branch, commit]
+if parent:
+git_cmd.append(parent)
+repo.run_cmd(git_cmd)
+
+# Update current HEAD, if we're on branch 'branch'
+if repo.get_current_branch() == branch:
+log.info("Updating %s HEAD to latest commit", repo.top_dir)
+repo.run_cmd('reset --hard')
+
+return commit
+finally:
+if os.path.exists(tmp_index):
+

[OE-core] [PATCH 6/6] oe-build-perf-test: drop --commit-results

2017-02-08 Thread Markus Lehtonen
Drop support for committing results into Git repository. The
functionality was not directly related to testing and feels unnecessary
complication of the script. The functionality has been moved into a
separate oe-git-archive script.

[YOCTO #10582]

Signed-off-by: Markus Lehtonen 
---
 scripts/oe-build-perf-test | 104 -
 1 file changed, 104 deletions(-)

diff --git a/scripts/oe-build-perf-test b/scripts/oe-build-perf-test
index f3867ab..8950c32 100755
--- a/scripts/oe-build-perf-test
+++ b/scripts/oe-build-perf-test
@@ -33,7 +33,6 @@ import oeqa.buildperf
 from oeqa.buildperf import (BuildPerfTestLoader, BuildPerfTestResult,
 BuildPerfTestRunner, KernelDropCaches)
 from oeqa.utils.commands import runCmd
-from oeqa.utils.git import GitRepo, GitError
 from oeqa.utils.metadata import metadata_from_bb, write_metadata_file
 
 
@@ -74,31 +73,6 @@ def pre_run_sanity_check():
 return False
 return True
 
-def init_git_repo(path):
-"""Check/create Git repository where to store results"""
-path = os.path.abspath(path)
-if os.path.isfile(path):
-log.error("Invalid Git repo %s: path exists but is not a directory", 
path)
-return False
-if not os.path.isdir(path):
-try:
-os.mkdir(path)
-except (FileNotFoundError, PermissionError) as err:
-log.error("Failed to mkdir %s: %s", path, err)
-return False
-if not os.listdir(path):
-log.info("Initializing a new Git repo at %s", path)
-GitRepo.init(path)
-try:
-GitRepo(path, is_topdir=True)
-except GitError:
-log.error("No Git repository but a non-empty directory found at %s.\n"
-  "Please specify a Git repository, an empty directory or "
-  "a non-existing directory", path)
-return False
-return True
-
-
 def setup_file_logging(log_file):
 """Setup loggin to file"""
 log_dir = os.path.dirname(log_file)
@@ -118,68 +92,6 @@ def archive_build_conf(out_dir):
 shutil.copytree(src_dir, tgt_dir)
 
 
-def git_commit_results(repo_dir, results_dir, branch, tag, metadata):
-"""Commit results into a Git repository"""
-repo = GitRepo(repo_dir, is_topdir=True)
-distro_branch = metadata['layers']['meta']['branch']
-distro_commit = metadata['layers']['meta']['commit']
-distro_commit_count = metadata['layers']['meta']['commit_count']
-
-# Replace keywords
-branch = branch.format(git_branch=distro_branch,
-   tester_host=metadata['hostname'])
-
-log.info("Committing test results into %s %s", repo_dir, branch)
-tmp_index = os.path.join(repo_dir, '.git', 'index.oe-build-perf')
-try:
-# Create new commit object from the new results
-env_update = {'GIT_INDEX_FILE': tmp_index,
-  'GIT_WORK_TREE': results_dir}
-repo.run_cmd('add .', env_update)
-tree = repo.run_cmd('write-tree', env_update)
-parent = repo.rev_parse(branch)
-msg = "Results of {}:{}\n".format(distro_branch, distro_commit)
-git_cmd = ['commit-tree', tree, '-m', msg]
-if parent:
-git_cmd += ['-p', parent]
-commit = repo.run_cmd(git_cmd, env_update)
-
-# Update branch head
-git_cmd = ['update-ref', 'refs/heads/' + branch, commit]
-if parent:
-git_cmd.append(parent)
-repo.run_cmd(git_cmd)
-
-# Update current HEAD, if we're on branch 'branch'
-if repo.get_current_branch() == branch:
-log.info("Updating %s HEAD to latest commit", repo_dir)
-repo.run_cmd('reset --hard')
-
-# Create (annotated) tag
-if tag:
-# Find tags matching the pattern
-tag_keywords = dict(git_branch=distro_branch,
-git_commit=distro_commit,
-git_commit_count=distro_commit_count,
-tester_host=metadata['hostname'],
-tag_num='[0-9]{1,5}')
-tag_re = re.compile(tag.format(**tag_keywords) + '$')
-tag_keywords['tag_num'] = 0
-for existing_tag in repo.run_cmd('tag').splitlines():
-if tag_re.match(existing_tag):
-tag_keywords['tag_num'] += 1
-
-tag = tag.format(**tag_keywords)
-msg = "Test run #{} of {}:{}\n".format(tag_keywords['tag_num'],
-   distro_branch,
-   distro_commit)
-repo.run_cmd(['tag', '-a', '-m', msg, tag, commit])
-
-finally:
-if os.path.exists(tmp_index):
-os.unlink(tmp_index)
-
-
 def update_globalres_file(result_obj, filename, metadata):
 """Write results to globalres csv file"""
 # Map test names to time and size columns 

[OE-core] [PATCH 4/6] scripts/oe-git-archive: support creating bare repositories

2017-02-08 Thread Markus Lehtonen
[YOCTO #10582]

Signed-off-by: Markus Lehtonen 
---
 scripts/oe-git-archive | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/oe-git-archive b/scripts/oe-git-archive
index 419332d..117118b 100755
--- a/scripts/oe-git-archive
+++ b/scripts/oe-git-archive
@@ -55,7 +55,7 @@ def format_str(string, fields):
string, err, ', '.join(sorted(fields.keys()
 
 
-def init_git_repo(path, no_create):
+def init_git_repo(path, no_create, bare):
 """Initialize local Git repository"""
 path = os.path.abspath(path)
 if os.path.isfile(path):
@@ -72,7 +72,7 @@ def init_git_repo(path, no_create):
 raise ArchiveError("Failed to mkdir {}: {}".format(path, err))
 if not os.listdir(path):
 log.info("Initializing a new Git repo at %s", path)
-repo = GitRepo.init(path)
+repo = GitRepo.init(path, bare)
 try:
 repo = GitRepo(path, is_topdir=True)
 except GitError:
@@ -108,7 +108,7 @@ def git_commit_data(repo, data_dir, branch, message):
 repo.run_cmd(git_cmd)
 
 # Update current HEAD, if we're on branch 'branch'
-if repo.get_current_branch() == branch:
+if not repo.bare and repo.get_current_branch() == branch:
 log.info("Updating %s HEAD to latest commit", repo.top_dir)
 repo.run_cmd('reset --hard')
 
@@ -158,6 +158,9 @@ def parse_args(argv):
 parser.add_argument('--no-create', action='store_true',
 help="If GIT_DIR is not a valid Git repository, do not 
"
  "try to create one")
+parser.add_argument('--bare', action='store_true',
+help="Initialize a bare repository when creating a "
+ "new one")
 parser.add_argument('--push', '-p', nargs='?', default=False, const=True,
 help="Push to remote")
 parser.add_argument('--branch-name', '-b',
@@ -195,7 +198,7 @@ def main(argv=None):
 if not os.path.isdir(args.data_dir):
 raise ArchiveError("Not a directory: {}".format(args.data_dir))
 
-data_repo = init_git_repo(args.git_dir, args.no_create)
+data_repo = init_git_repo(args.git_dir, args.no_create, args.bare)
 
 # Get keywords to be used in tag and branch names and messages
 metadata = metadata_from_bb()
-- 
2.10.2

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


[OE-core] [PATCH 1/6] oeqa.utils.git: add git_dir property

2017-02-08 Thread Markus Lehtonen
[YOCTO #10582]

Signed-off-by: Markus Lehtonen 
---
 meta/lib/oeqa/utils/git.py | 4 
 1 file changed, 4 insertions(+)

diff --git a/meta/lib/oeqa/utils/git.py b/meta/lib/oeqa/utils/git.py
index ae85d27..5dd90e0 100644
--- a/meta/lib/oeqa/utils/git.py
+++ b/meta/lib/oeqa/utils/git.py
@@ -18,6 +18,10 @@ class GitRepo(object):
 def __init__(self, path, is_topdir=False):
 self.top_dir = self._run_git_cmd_at(['rev-parse', '--show-toplevel'],
 path)
+git_dir = self._run_git_cmd_at(['rev-parse', '--git-dir'], path)
+git_dir = git_dir if os.path.isabs(git_dir) else os.path.join(path, 
git_dir)
+self.git_dir = os.path.realpath(git_dir)
+
 realpath = os.path.realpath(path)
 if is_topdir and realpath != self.top_dir:
 raise GitError("{} is not a Git top directory".format(realpath))
-- 
2.10.2

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


[OE-core] [PATCH 0/6] Implement scripts/oe-git-archive

2017-02-08 Thread Markus Lehtonen
This patchset implements a helper script for committing data to git and pushing
it into an upstream repository. The new script re-uses some code from
oe-build-perf-test script (the code is eventually removed from
oe-build-perf-test in the last patch). The script supports flexible
(pattern-based) tag and branch naming, and, similarly flexible commit and tag
messages. It is also able to directly work with (local) bare repositories.

The first four patches implement the new script. The last two patches takes the
script in use in build performance testing scripts.

[YOCTO #10582]


The following changes since commit 68da6c98841f4450736ae170e443aa744c8b77eb:

  oeqa/selftest/pkgdata: use m4 instead of bash (2017-02-07 14:48:56 +)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib marquiz/fixes-10582
  
http://git.openembedded.org/openembedded-core-contrib/log/?h=marquiz/fixes-10582


Markus Lehtonen (6):
  oeqa.utils.git: add git_dir property
  scripts: Implement oe-git-archive
  oeqa.utils.git: support bare repos
  scripts/oe-git-archive: support creating bare repositories
  build-perf-test-wrapper.sh: use oe-git-archive
  oe-build-perf-test: drop --commit-results

 meta/lib/oeqa/utils/git.py |  20 ++-
 scripts/contrib/build-perf-test-wrapper.sh |  18 ++-
 scripts/oe-build-perf-test | 104 
 scripts/oe-git-archive | 247 +
 4 files changed, 275 insertions(+), 114 deletions(-)
 create mode 100755 scripts/oe-git-archive

-- 
2.10.2

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


Re: [OE-core] [PATCH 1/3] go: Add recipes for golang compilers and tools

2017-02-08 Thread Jussi Kukkonen
On 8 February 2017 at 15:57, Gary Thomas  wrote:
>
> I agree - if ruby is OE-core worthy, go most certainly is.
>

webkit-gtk needs ruby-native as a build dependency. If that wasn't the case
ruby would almost certainly not be in oe-core.

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


Re: [OE-core] [PATCH 1/3] go: Add recipes for golang compilers and tools

2017-02-08 Thread Richard Purdie
On Tue, 2017-02-07 at 17:35 +, Burton, Ross wrote:
> 
> On 7 February 2017 at 04:24, Khem Raj  wrote:
> > This is converging the recipes for go from
> > meta-virtualization and oe-meta-go
> > 
> I'm still of the opinion that this should be in meta-go, not oe-
> core...
> 
> (but totally agree that converging is essential)

I've just been reading the various responses.

The benefit of core would be that it would get included in some of the
core test builds/coverage and that we've have the maintainer structure
that core has to help ensure patches get merged, if that has been a
problem in the past.

The downside is more pressure onto the OE-Core maintainers in various
ways.

I would like to see the duplication removed and have one good solution
for it. If adding it to core is how we achieve that, great, I can work
with that (and we can always split it out again) but I'm open to other
ideas too, if they can work...

Cheers,

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


Re: [OE-core] [PATCH 1/3] go: Add recipes for golang compilers and tools

2017-02-08 Thread Gary Thomas

On 2017-02-08 14:53, Joshua Lock wrote:

On Tue, 2017-02-07 at 17:35 +, Burton, Ross wrote:


On 7 February 2017 at 04:24, Khem Raj > wrote:

This is converging the recipes for go from
meta-virtualization and oe-meta-go



I'm still of the opinion that this should be in meta-go, not oe-core...


FWIW I disagree. Go is a popular systems language and we're increasingly 
supporting a wide-array of systems with OE
(from iot to ivi and beyond).

Go is already in wide enough use and duplicated in enough layers that we would 
be doing folks a favour by including it
in OE-Core and our build/test cycle.


I agree - if ruby is OE-core worthy, go most certainly is.

--

Gary Thomas |  Consulting for the
MLB Associates  |Embedded world

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


Re: [OE-core] [PATCH 1/3] go: Add recipes for golang compilers and tools

2017-02-08 Thread Bruce Ashfield
On Wed, Feb 8, 2017 at 8:53 AM, Joshua Lock 
wrote:

> On Tue, 2017-02-07 at 17:35 +, Burton, Ross wrote:
>
>
> On 7 February 2017 at 04:24, Khem Raj  wrote:
>
> This is converging the recipes for go from
> meta-virtualization and oe-meta-go
>
>
> I'm still of the opinion that this should be in meta-go, not oe-core...
>
>
> FWIW I disagree. Go is a popular systems language and we're increasingly
> supporting a wide-array of systems with OE (from iot to ivi and beyond).
>
> Go is already in wide enough use and duplicated in enough layers that we
> would be doing folks a favour by including it in OE-Core and our build/test
> cycle.
>

I said as much during the oe developer meeting in Berlin last year as well.

I've done work in meta-virt out of necessity, as the cadence of the various
layers
was easily getting out of sync. The problem with 'language layers', is that
they
update based on the tools/packages/libs and not a system level use case.

Having something in oe-core forces that cadence of updates + QA that makes
it much easier to use as part of the eco system.

My Canadian 2 cents worth,

Bruce


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


-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH v2 3/3] rm_work.bbclass: clean up sooner

2017-02-08 Thread Mike Crowe
On Wednesday 08 February 2017 at 14:04:42 +0100, Patrick Ohly wrote:
> On Wed, 2017-02-08 at 11:50 +, Mike Crowe wrote:
> > On Friday 13 January 2017 at 15:52:33 +0100, Patrick Ohly wrote:
> > > The right solution is to inject do_rm_work before do_build and after
> > > all tasks of the recipe. Achieving that depends on the new bitbake
> > > bb.event.RecipeTaskPreProcess and bb.build.preceedtask().
> > 
> > We've run into trouble with this change. We have a number of custom
> > ancillary tasks that are used to generate source release files and run
> > package tests. No other tasks (including do_build) depend on these tasks
> > since they are run explicitly when required using bitbake -c; either
> > directly or via a recrdeptask.
> > 
> > Running a single task continues to work correctly - presumably this is
> > because the do_build task is not being run, so its dependencies (including
> > rm_work) aren't run either.
> > 
> > Running via the recrdeptask fails. This is because for any particular
> > recipe we end up depending on both do_build and the source release tasks.
> > There's nothing to stop do_rm_work running before (or even during!) one of
> > the source release tasks.
> 
> Can you show how you use recrdeptask and how you call bitbake to trigger
> those extra tasks, just for my understanding?

Certainly, we have a bbclass globally in INHERIT that contains:

 addtask source_release # potential fix here
 do_source_release() {
 :
 }

 addtask all_source_releases
 xx_do_all_source_releases() {
 :
 }

 do_all_source_releases[nostamp] = "1"
 do_all_source_releases[recrdeptask] += "do_all_source_releases 
do_source_release"

 addtask husk_recipe before do_source_release
 python xx_do_husk_recipe() {
...
 }

 (there's also another task similar to do_husk_recipe)

and in the particular recipe that has trouble with racing against rm_work:

 do_husk_recipe() {
# do stuff in ${WORKDIR}
 }
 addtask husk_recipe after do_populate_sysroot before do_source_release

there's also a source-release-world recipe that contains:

 DEPENDS = "our-image"

and we run:

 bitbake -c all_source_releases source-release-world

> I suppose it worked before because your tasks could depend on do_build
> without triggering do_rm_work, while now that is included.

I believe so.

> > It seems that we need to ensure that do_rm_work also needs to depend on our
> > ancillary tasks too, but only if they are being built. I'm unsure how this
> > can be done though. :(
> 
> How do you determine whether the tasks need to run? Does it depend on
> how bitbake is invoked or does it depend on specific properties of the
> recipe?

Running bitbake as above.

I think that I could fix this by changing:

 addtask source_release

to

 addtask source_release before do_rm_work

(and also fixing any other tasks that suffer from this problem)

but I was hoping that there was a better fix to rm_work.bbclass itself.

Thanks.

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


Re: [OE-core] [PATCH 1/3] go: Add recipes for golang compilers and tools

2017-02-08 Thread Joshua Lock
On Tue, 2017-02-07 at 17:35 +, Burton, Ross wrote:
> On 7 February 2017 at 04:24, Khem Raj  wrote:
> > This is converging the recipes for go from
> > 
> > meta-virtualization and oe-meta-go
> > 
> 
> I'm still of the opinion that this should be in meta-go, not oe-
> core...

FWIW I disagree. Go is a popular systems language and we're
increasingly supporting a wide-array of systems with OE (from iot to
ivi and beyond). 

Go is already in wide enough use and duplicated in enough layers that
we would be doing folks a favour by including it in OE-Core and our
build/test cycle.

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


Re: [OE-core] [PATCH 12/13] bash: update patches for 4.4

2017-02-08 Thread Burton, Ross
On 8 February 2017 at 03:17, Hongxu Jia  wrote:

> - Do not compile and install examples which caused
>   do_package_write_rpm failed.
>

Is it just uname that fails?  If so we can delete it from
do_install_append().

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


Re: [OE-core] [PATCH v2 3/3] rm_work.bbclass: clean up sooner

2017-02-08 Thread Patrick Ohly
On Wed, 2017-02-08 at 11:50 +, Mike Crowe wrote:
> On Friday 13 January 2017 at 15:52:33 +0100, Patrick Ohly wrote:
> > Having do_rm_work depend on do_build had one major disadvantage:
> > do_build depends on the do_build of other recipes, to ensure that
> > runtime dependencies also get built. The effect is that when work on a
> > recipe is complete and it could get cleaned up, do_rm_work still
> > doesn't run because it waits for those other recipes, thus leading to
> > more temporary disk space usage than really needed.
> > 
> > The right solution is to inject do_rm_work before do_build and after
> > all tasks of the recipe. Achieving that depends on the new bitbake
> > bb.event.RecipeTaskPreProcess and bb.build.preceedtask().
> 
> We've run into trouble with this change. We have a number of custom
> ancillary tasks that are used to generate source release files and run
> package tests. No other tasks (including do_build) depend on these tasks
> since they are run explicitly when required using bitbake -c; either
> directly or via a recrdeptask.
> 
> Running a single task continues to work correctly - presumably this is
> because the do_build task is not being run, so its dependencies (including
> rm_work) aren't run either.
> 
> Running via the recrdeptask fails. This is because for any particular
> recipe we end up depending on both do_build and the source release tasks.
> There's nothing to stop do_rm_work running before (or even during!) one of
> the source release tasks.

Can you show how you use recrdeptask and how you call bitbake to trigger
those extra tasks, just for my understanding?

I suppose it worked before because your tasks could depend on do_build
without triggering do_rm_work, while now that is included.

> It seems that we need to ensure that do_rm_work also needs to depend on our
> ancillary tasks too, but only if they are being built. I'm unsure how this
> can be done though. :(

How do you determine whether the tasks need to run? Does it depend on
how bitbake is invoked or does it depend on specific properties of the
recipe?

-- 
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


Re: [OE-core] [PATCH 1/3] go: Add recipes for golang compilers and tools

2017-02-08 Thread Matt Madison
On Tue, Feb 7, 2017 at 12:17 PM, Paul Eggleton
 wrote:
> On Tuesday, 7 February 2017 9:44:46 AM NZDT Khem Raj wrote:
>> On Tue, Feb 7, 2017 at 9:35 AM, Burton, Ross  wrote:
>> > On 7 February 2017 at 04:24, Khem Raj  wrote:
>> >> This is converging the recipes for go from
>> >> meta-virtualization and oe-meta-go
>> >
>> > I'm still of the opinion that this should be in meta-go, not oe-core...
>>
>> I think we have to make multiple layers agree on using one layer
>> I find atleast 3 which carry go recipes along with, if its in OE-Core
>> either these layers become redundant or layers which are housing go
>> recipes for
>> different purpose like meta-virtualization can then drop the compiler
>> recipes it will be easier from consolidation point of view.
>>
>> if we dont want to take it into OE-Core, we should create a new layer
>> meta-golang on yp git and then help request community to converge to
>> it, it still can be ignored by layers.
>
> Have we tried asking all of the various people involved if they'd mind working
> together? If not, I have my doubts as to whether putting it in OE-Core is
> going to entirely resolve the situation.

As the meta-golang maintainer, I'd be happy to help with converging, whether
it's a separate layer or pulled into OE-Core.

-Matt

>
> Cheers,
> Paul
>
> --
>
> Paul Eggleton
> Intel Open Source Technology Centre
> --
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 06/13] libgpg-error: 1.25 -> 1.26

2017-02-08 Thread Burton, Ross
packages/corei7-64-poky-linux/libgpg-error/libgpg-error: FILELIST: removed
"/usr/lib/libgpg-error.so.0.20.0", added
"/usr/share/libgpg-error/errorref.txt /usr/lib/libgpg-error.so.0.21.0"

errorref.txt is part of the documentation so should be in PN-doc.

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


Re: [OE-core] [PATCH 04/13] gpgme: 1.6.0 -> 1.8.0

2017-02-08 Thread Burton, Ross
Also looks like the gpgme-pthread library has entirely disappeared:

packages/corei7-64-poky-linux/gpgme/gpgme-pthread: FILELIST: removed all
items "/usr/lib/libgpgme-pthread.so.11 /usr/lib/libgpgme-pthread.so.11.14.0"
packages/corei7-64-poky-linux/gpgme/gpgme-pthread: PKGSIZE changed from
245371 to 0 (-100%)
packages/corei7-64-poky-linux/gpgme/gpgme-pthread: PKG changed from
libgpgme-pthread11 to gpgme-pthread [default] - may indicate debian
renaming failure

Ross

On 8 February 2017 at 12:20, Burton, Ross  wrote:

>
> On 8 February 2017 at 03:17, Hongxu Jia  wrote:
>
>> - Drop gpgme.pc, it is duplicated with pkgconfig.patch
>>
>> - Rebase pkgconfig.patch to 1.8.0
>>
>> - Split cmake config to ${PN}-dev
>>
>> - Update LIC_FILES_CHKSUM, because copytright year changed.
>>
>> Signed-off-by: Hongxu Jia 
>>
>
> I think we need to split out the C++ bindings to a separate library
> package:
>
> packages/corei7-64-poky-linux/gpgme/gpgme: RDEPENDS: added "libstdc++
> (['>= 6.3.0']) libgcc (['>= 6.3.0'])"
> packages/corei7-64-poky-linux/gpgme/gpgme: FILELIST: removed
> "/usr/lib/libgpgme.so.11.14.0", added "/usr/lib/libgpgme.so.11.17.0
> /usr/lib/libgpgmepp.so.6 /usr/lib/libgpgmepp.so.6.3.0"
>
> Maybe add a ${PN}-cpp package for the library?
>
> Ross
>
>
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


Re: [OE-core] [PATCH 04/13] gpgme: 1.6.0 -> 1.8.0

2017-02-08 Thread Burton, Ross
On 8 February 2017 at 03:17, Hongxu Jia  wrote:

> - Drop gpgme.pc, it is duplicated with pkgconfig.patch
>
> - Rebase pkgconfig.patch to 1.8.0
>
> - Split cmake config to ${PN}-dev
>
> - Update LIC_FILES_CHKSUM, because copytright year changed.
>
> Signed-off-by: Hongxu Jia 
>

I think we need to split out the C++ bindings to a separate library package:

packages/corei7-64-poky-linux/gpgme/gpgme: RDEPENDS: added "libstdc++ (['>=
6.3.0']) libgcc (['>= 6.3.0'])"
packages/corei7-64-poky-linux/gpgme/gpgme: FILELIST: removed
"/usr/lib/libgpgme.so.11.14.0", added "/usr/lib/libgpgme.so.11.17.0
/usr/lib/libgpgmepp.so.6 /usr/lib/libgpgmepp.so.6.3.0"

Maybe add a ${PN}-cpp package for the library?

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


Re: [OE-core] [PATCH v2 3/3] rm_work.bbclass: clean up sooner

2017-02-08 Thread Mike Crowe
On Friday 13 January 2017 at 15:52:33 +0100, Patrick Ohly wrote:
> Having do_rm_work depend on do_build had one major disadvantage:
> do_build depends on the do_build of other recipes, to ensure that
> runtime dependencies also get built. The effect is that when work on a
> recipe is complete and it could get cleaned up, do_rm_work still
> doesn't run because it waits for those other recipes, thus leading to
> more temporary disk space usage than really needed.
> 
> The right solution is to inject do_rm_work before do_build and after
> all tasks of the recipe. Achieving that depends on the new bitbake
> bb.event.RecipeTaskPreProcess and bb.build.preceedtask().

We've run into trouble with this change. We have a number of custom
ancillary tasks that are used to generate source release files and run
package tests. No other tasks (including do_build) depend on these tasks
since they are run explicitly when required using bitbake -c; either
directly or via a recrdeptask.

Running a single task continues to work correctly - presumably this is
because the do_build task is not being run, so its dependencies (including
rm_work) aren't run either.

Running via the recrdeptask fails. This is because for any particular
recipe we end up depending on both do_build and the source release tasks.
There's nothing to stop do_rm_work running before (or even during!) one of
the source release tasks.

> diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
> index 3516c7e..fda7bd6 100644
> --- a/meta/classes/rm_work.bbclass
> +++ b/meta/classes/rm_work.bbclass
> @@ -117,7 +107,13 @@ rm_work_rootfs () {
>  }
>  rm_work_rootfs[cleandirs] = "${WORKDIR}/rootfs"
>  
> -python () {
> +# We have to add the do_rmwork task already now, because all tasks are
> +# meant to be defined before the RecipeTaskPreProcess event triggers.
> +# The inject_rm_work event handler then merely changes task dependencies.
> +addtask do_rm_work
> +addhandler inject_rm_work
> +inject_rm_work[eventmask] = "bb.event.RecipeTaskPreProcess"
> +python inject_rm_work() {
>  if bb.data.inherits_class('kernel', d):
>  d.appendVar("RM_WORK_EXCLUDE", ' ' + d.getVar("PN"))
>  # If the recipe name is in the RM_WORK_EXCLUDE, skip the recipe.
> @@ -126,4 +122,17 @@ python () {
>  if pn in excludes:
>  d.delVarFlag('rm_work_rootfs', 'cleandirs')
>  d.delVarFlag('rm_work_populatesdk', 'cleandirs')
> +else:
> +# Inject do_rm_work into the tasks of the current recipe such that 
> do_build
> +# depends on it and that it runs after all other tasks that block 
> do_build,
> +# i.e. after all work on the current recipe is done. The reason for 
> taking
> +# this approach instead of making do_rm_work depend on do_build is 
> that
> +# do_build inherits additional runtime dependencies on
> +# other recipes and thus will typically run much later than 
> completion of
> +# work in the recipe itself.
> +deps = bb.build.preceedtask('do_build', True, d)
> +if 'do_build' in deps:
> +deps.remove('do_build')
> +# In practice, addtask() here merely updates the dependencies.
> +bb.build.addtask('do_rm_work', 'do_build', ' '.join(deps), d)
>  }

It seems that we need to ensure that do_rm_work also needs to depend on our
ancillary tasks too, but only if they are being built. I'm unsure how this
can be done though. :(

For the time being, I've reverted this patch in our tree and it seems to
have resolved the problem. I'd be very interested in knowing what the
correct solution would be.

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


[OE-core] State of bitbake world, Failed tasks 2017-02-07

2017-02-08 Thread Martin Jansa
== Number of issues - stats ==
{| class='wikitable'
!|Date   !!colspan='3'|Failed tasks 
!!colspan='6'|Failed depencencies!!|Signatures
!!colspan='12'|QA !!Comment
|-
||  ||qemuarm   ||qemux86   ||qemux86_64
||qemuarm||max||min ||qemux86||max||min ||all   ||already-stripped  
||libdir||textrel   ||build-deps||file-rdeps
||version-going-backwards   ||host-user-contaminated
||installed-vs-shipped  ||unknown-configure-option  ||symlink-to-sysroot
||invalid-pkgconfig ||pkgname   ||  
|-
||2017-02-07||99||102   ||104   ||N/A   ||N/A   ||N/A   ||N/A   ||N/A   
||N/A   ||0 ||0 ||0 ||2 ||0 
||5 ||314   ||0 ||2 ||0 
||0 ||0 ||0 ||  
|}

http://www.openembedded.org/wiki/Bitbake_World_Status

== Failed tasks 2017-02-07 ==

INFO: jenkins-job.sh-1.8.15 Complete log available at 
http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.report.20170208_013442.log

=== common (96) ===
* 
meta-browser/recipes-mozilla/firefox-addon/firefox-addon-webconverger_git.bb:do_install
* 
meta-openembedded/meta-efl/recipes-devtools/python/python-edbus_1.7.0.bb:do_configure
* meta-openembedded/meta-efl/recipes-efl/e17/exquisite_svn.bb:do_compile
* meta-openembedded/meta-efl/recipes-efl/efl/elementary_1.15.1.bb:do_compile
* meta-openembedded/meta-efl/recipes-efl/efl/libeweather_svn.bb:do_compile
* 
meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_0.26.bb:do_compile
* 
meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_4.8.0.bb:do_compile
* 
meta-openembedded/meta-gnome/recipes-apps/gnome-mplayer/gmtk_1.0.5.bb:do_configure
* 
meta-openembedded/meta-gnome/recipes-gnome/devilspie/devilspie2_0.33.bb:do_compile
* 
meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_2.32.0.bb:do_configure
* 
meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb:do_compile
* 
meta-openembedded/meta-gnome/recipes-gnome/gnome-mime-data/gnome-mime-data_2.18.0.bb:do_configure
* 
meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb:do_configure
* 
meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb:do_configure
* 
meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb:do_configure
* 
meta-openembedded/meta-gnome/recipes-gnome/libidl/libidl-native_0.8.14.bb:do_configure
* 
meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.3.0.bb:do_compile
* 
meta-openembedded/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb:do_compile
* 
meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.1.bb:do_compile
* 
meta-openembedded/meta-initramfs/recipes-kernel/kexec/kexec-tools-klibc_2.0.2.bb:do_configure
* 
meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb:do_compile
* 
meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.10.bb:do_configure
* 
meta-openembedded/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb:do_fetch
* 
meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb:do_compile
* 
meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb:do_configure
* 
meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb:do_compile
* 
meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb:do_configure
* 
meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb:do_configure
* 
meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb:do_compile
* 
meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.2.4.bb:do_compile
* 
meta-openembedded/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb:do_configure
* 
meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.14.0.bb:do_compile
* 
meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.2.4.bb:do_configure
* 
meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.2.6.bb:do_configure
* 
meta-openembedded/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb:do_compile
* 
meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb:do_compile
* 
meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb:do_compile
* 
meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.50.0.bb:do_configure
* 
meta-openembedded/meta-oe/recipes-devtools/geany/geany_1.29.bb:do_configure
* meta-openembedded/meta-oe/recipes-devtools/php/php_7.1.0.bb:do_install
* 

Re: [OE-core] ✗ patchtest: failure for 11 packages upgrade

2017-02-08 Thread Burton, Ross
On 8 February 2017 at 05:31, Hongxu Jia  wrote:

> The hurd_path.patch is cherry picked from debian which does
> not has "Upstream-Status: " and "Signed-off-by", so I
> think we could ignore this warning.
>
> Here is the upstream source of debian patch:
> http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutil
> s_0.168-0.2.debian.tar.xz
>
> You may suggest to add it to SRC_URI rather than picking up manually,
> but debian frequently upgrades miner version "-0.2", and which does not
> sync up with upstream elfutils, that's why I manually cherry pick.
>

I still think the patches need SoB/US tags.

The bash patch I can grab from the git branch, patches with "interesting"
encodings don't always work over email.

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


[OE-core] [PATCH V2 1/2] console-tools: fix string formatting issue

2017-02-08 Thread Chen Qi
Fix string formatting issue in console-tools. Otherwise, when compiling with
'-Wformat -Wformat-security -Werror=format-security', we would have compilation
error.

[YOCTO #9540]

Signed-off-by: Chen Qi 
---
 ...001-Fix-format-security-compilation-error.patch | 57 ++
 .../console-tools/console-tools_0.3.2.bb   |  1 +
 2 files changed, 58 insertions(+)
 create mode 100644 
meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch

diff --git 
a/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch
 
b/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch
new file mode 100644
index 000..6e72ec6
--- /dev/null
+++ 
b/meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch
@@ -0,0 +1,57 @@
+Subject: Fix 'format-security' compilation error.
+
+Upstream-Status: Pending
+
+Signed-off-by: Chen Qi 
+---
+ kbdtools/kbd_mode.c| 6 +++---
+ kbdtools/setmetamode.c | 2 +-
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/kbdtools/kbd_mode.c b/kbdtools/kbd_mode.c
+index 02dca38..8dbcd39 100644
+--- a/kbdtools/kbd_mode.c
 b/kbdtools/kbd_mode.c
+@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
+   /* report mode */
+   if (ioctl(fd, KDGKBMODE, )) 
+   {
+-fprintf(stderr, progname);
++fprintf(stderr, "%s", progname);
+ perror(_(": error reading keyboard mode\n"));
+ exit(1);
+   }
+@@ -151,7 +151,7 @@ int main(int argc, char *argv[])
+ kbd_rep.period = rate;
+ if (ioctl(fd, KDKBDREP, _rep))
+   {
+-  fprintf(stderr, progname);
++  fprintf(stderr, "%s", progname);
+   perror(_(": error setting keyboard repeat mode\n"));
+   exit(1);
+   }
+@@ -160,7 +160,7 @@ int main(int argc, char *argv[])
+   
+   if (ioctl(fd, KDSKBMODE, mode))
+ {
+-  fprintf(stderr, progname);
++  fprintf(stderr, "%s", progname);
+   perror(_(": error setting keyboard mode\n"));
+   exit(1);
+ }
+diff --git a/kbdtools/setmetamode.c b/kbdtools/setmetamode.c
+index 5bed945..0ba7676 100644
+--- a/kbdtools/setmetamode.c
 b/kbdtools/setmetamode.c
+@@ -42,7 +42,7 @@ void report(int meta)
+ default:
+   s = N_("Strange mode for Meta key?\n");
+ }
+-  printf(_(s));
++  printf("%s", _(s));
+ }
+ 
+ struct meta 
+-- 
+2.8.3
+
diff --git a/meta/recipes-core/console-tools/console-tools_0.3.2.bb 
b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
index 1db8414..286c2a4 100644
--- a/meta/recipes-core/console-tools/console-tools_0.3.2.bb
+++ b/meta/recipes-core/console-tools/console-tools_0.3.2.bb
@@ -16,6 +16,7 @@ SRC_URI = 
"${SOURCEFORGE_MIRROR}/lct/console-tools-${PV}.tar.gz \
file://no-dep-on-libfl.patch \

file://0001-kbdtools-Include-sys-types.h-for-u_char-and-u_short-.patch \
file://0001-Cover-the-else-with-__GLIBC__.patch \
+   file://0001-Fix-format-security-compilation-error.patch \
file://lcmessage.m4 \
file://Makevars"
 
-- 
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/2] Fix string formatting issue in console-tools

2017-02-08 Thread Chen Qi
The following changes since commit a624cf7f95c8cf4ff764cc997fd1db4601b97dcc:

  oeqa/selftest/pkgdata: use m4 instead of bash (2017-02-07 14:50:10 +)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib ChenQi/BUG9540
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/BUG9540

Chen Qi (2):
  console-tools: fix string formatting issue
  security_flags: enable string formatting check for console tools

 meta/conf/distro/include/security_flags.inc|  1 -
 ...001-Fix-format-security-compilation-error.patch | 57 ++
 .../console-tools/console-tools_0.3.2.bb   |  1 +
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 
meta/recipes-core/console-tools/console-tools-0.3.2/0001-Fix-format-security-compilation-error.patch

-- 
1.9.1

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


[OE-core] [PATCH V2 2/2] security_flags: enable string formatting check for console tools

2017-02-08 Thread Chen Qi
As we've fixed the string formatting issue in console-tools, we don't
need to override SECURITY_STRINGFORMAT for console-tools any more.

[YOCTO #9540]

Signed-off-by: Chen Qi 
---
 meta/conf/distro/include/security_flags.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/conf/distro/include/security_flags.inc 
b/meta/conf/distro/include/security_flags.inc
index eca835e..28e11bd 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -91,7 +91,6 @@ SECURITY_CFLAGS_pn-zlib = "${SECURITY_NO_PIE_CFLAGS}"
 
 # Recipes which fail to compile when elevating -Wformat-security to an error
 SECURITY_STRINGFORMAT_pn-busybox = ""
-SECURITY_STRINGFORMAT_pn-console-tools = ""
 SECURITY_STRINGFORMAT_pn-cmake = ""
 SECURITY_STRINGFORMAT_pn-expect = ""
 SECURITY_STRINGFORMAT_pn-gcc = ""
-- 
1.9.1

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


Re: [OE-core] [PATCH V2] bash: 4.3.30 -> 4.4

2017-02-08 Thread Zheng, Ruoqin
ping



-Original Message-
From: Zheng, Ruoqin/郑 若钦 
Sent: Monday, January 23, 2017 10:39 AM
To: openembedded-core@lists.openembedded.org
Cc: Zheng, Ruoqin/郑 若钦 
Subject: [OE-core] [PATCH V2] bash: 4.3.30 -> 4.4

1) Upgrade bash from 4.3.30 to 4.4
2) Delete 1 patche below, since they are integrated upstream.
   fix-run-intl.patch
3) Modify 2 patches below to make it compatible with new version
   fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
   test-output.patch
4) Add 1 patche below to solve pkgconfig sanity error
   0001-patch-to-obtain-pkgconfig-sanity.patch

Signed-off-by: Zheng Ruoqin 
---
 .../0001-patch-to-obtain-pkgconfig-sanity.patch|  28 +
 ...roc-run-heredoc-run-execscript-run-test-f.patch | 137 ++--- 
 meta/recipes-extended/bash/bash/fix-run-intl.patch | 110 -  
meta/recipes-extended/bash/bash/test-output.patch  |  20 ++-
 meta/recipes-extended/bash/bash_4.3.30.bb  |  71 ---
 meta/recipes-extended/bash/bash_4.4.bb |  38 ++
 6 files changed, 92 insertions(+), 312 deletions(-)  create mode 100644 
meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch
 delete mode 100644 meta/recipes-extended/bash/bash/fix-run-intl.patch
 delete mode 100644 meta/recipes-extended/bash/bash_4.3.30.bb
 create mode 100644 meta/recipes-extended/bash/bash_4.4.bb

diff --git 
a/meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch 
b/meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-sanity.patch
new file mode 100644
index 000..9b5e4ec
--- /dev/null
+++ b/meta/recipes-extended/bash/bash/0001-patch-to-obtain-pkgconfig-san
+++ ity.patch
@@ -0,0 +1,28 @@
+Subject: [PATCH] patch to obtain pkgconfig sanity
+
+Drop the paths from the pkgconfig file bash.pc.in which will cause pkgconfig 
sanity error below:
+ERROR: QA Issue: bash.pc failed sanity test (tmpdir) in path 
/yocto/work001/fnst/zrq/community/poky/build/tmp/work/i586-poky-linux/bash
/4.4-r0/sysroot-destdir/usr/lib/pkgconfig [pkgconfig]
+
+Upstream-Status: Pending
+
+Signed-off-by: Zheng Ruoqin 
+---
+ support/bash.pc.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/support/bash.pc.in b/support/bash.pc.in index 
+6009659..871fa9f 100644
+--- a/support/bash.pc.in
 b/support/bash.pc.in
+@@ -12,8 +12,6 @@ LOCAL_CFLAGS = @LOCAL_CFLAGS@  LOCAL_DEFS = 
+@LOCAL_DEFS@  CCFLAGS = ${LOCAL_DEFS} ${LOCAL_CFLAGS}
+ 
+-CC = @CC@
+-SHOBJ_CC = @SHOBJ_CC@
+ SHOBJ_CFLAGS = @SHOBJ_CFLAGS@
+ SHOBJ_LD = @SHOBJ_LD@
+ SHOBJ_LDFLAGS = @SHOBJ_LDFLAGS@
+--
+2.7.4
+
diff --git 
a/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
 
b/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
index 7f099ae..d6beaff 100644
--- 
a/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch
+++ b/meta/recipes-extended/bash/bash/fix-run-coproc-run-heredoc-run-exe
+++ cscript-run-test-f.patch
@@ -20,150 +20,35 @@ the test suite should not be run as root
 Upstream-Status: Pending
 
 Signed-off-by: Hongxu Jia 
+Signed-off-by: Zheng Ruoqin 
 ---
- tests/coproc.right   |  5 +
- tests/coproc.tests   | 30 +-
- tests/heredoc.right  |  5 ++---
- tests/heredoc3.sub   |  3 ++-
- tests/run-execscript |  3 ++-
- tests/run-test   |  3 ++-
- 6 files changed, 34 insertions(+), 15 deletions(-)
+ tests/run-execscript | 3 ++-
+ tests/run-test   | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/tests/coproc.right b/tests/coproc.right -index 6d9deaa..94b001c 
100644
 a/tests/coproc.right
-+++ b/tests/coproc.right
-@@ -1,11 +1,8 @@
--84575
- 63 60
- a b c
--84577
- 63 60
- flop
--./coproc.tests: line 22: 84577 Terminated  coproc REFLECT { cat 
-; }
--84579
-+coproc.tests: REFLECT: status 143
- 63 60
- FOO
- 63 60
-diff --git a/tests/coproc.tests b/tests/coproc.tests -index 8be3563..d347eb7 
100644
 a/tests/coproc.tests
-+++ b/tests/coproc.tests
-@@ -1,6 +1,13 @@
-+: ${TMPDIR:=/tmp}
-+TMPOUT=${TMPDIR}/coproc-wait-$BASHPID
-+
- coproc { echo a b c; sleep 2; }
-
--echo $COPROC_PID
-+case $COPROC_PID in
-+[0-9]*)   ;;
-+*)echo COPROC_PID not integer ;;
-+esac
-+
- echo ${COPROC[@]}
-
- read LINE <&${COPROC[0]}
-@@ -10,7 +17,11 @@ wait $COPROC_PID
-
- coproc REFLECT { cat - ; }
-
--echo $REFLECT_PID
-+case $REFLECT_PID in
-+[0-9]*)   ;;
-+*)echo REFLECT_PID not integer ;;
-+esac
-+
- echo ${REFLECT[@]}
-
- echo flop >&${REFLECT[1]}
-@@ -18,12 +29,21 @@ read LINE <&${REFLECT[0]}
-
- echo $LINE
-
--kill $REFLECT_PID
--wait $REFLECT_PID
-+{ sleep 1; kill $REFLECT_PID; } &
-+wait $REFLECT_PID >$TMPOUT 2>&1 || echo "coproc.tests: REFLECT: status $?"
-+grep 'Terminated.*coproc.*REFLECT' < $TMPOUT >/dev/null 2>&1 || {
-+  

Re: [OE-core] (morty) Python exception during rootfs

2017-02-08 Thread Patrick Ohly
On Tue, 2017-02-07 at 17:08 +0100, Mike Looijmans wrote:
> Found it. A rootfs post-process function was misspelled, and that caused it.
> 
> I'll make a patch to improve the error message here, to make it just say that 
> it cannot find "func".

I already fixed that in bitbake master, see commit 25df3db5 "build.py:
avoid exception when function is not defined". Sorry, only now saw your
original email.

-- 
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


Re: [OE-core] [PATCH] elfutils: 0.166->0.168

2017-02-08 Thread Zheng, Ruoqin
ping


From: openembedded-core-boun...@lists.openembedded.org 
[mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Zheng, 
Ruoqin
Sent: Wednesday, January 25, 2017 9:52 AM
To: Jussi Kukkonen 
Cc: Patches and discussions about the oe-core layer 

Subject: Re: [OE-core] [PATCH] elfutils: 0.166->0.168

Hi Jussi
   I really used git rename to produce 0.166 to 0.168 patch, but it did not 
work on last patch 
0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch.
   I guess it’s  because I used a different way from the original author. I 
used git format-patch, maybe he used patch -Naur?

   The original patch fixed 73 files, and the index of each file is:

  Index: elfutils-0.166/libelf/elf_getarsym.c
===
--- elfutils-0.166.orig/libelf/elf_getarsym.c
+++ elfutils-0.166/libelf/elf_getarsym.c

And my new patch here is like
 diff --git a/libelf/elf_getarsym.c b/libelf/elf_getarsym.c
index 42ed0d1..6e7a3d5 100644
--- a/libelf/elf_getarsym.c
+++ b/libelf/elf_getarsym.c
@@ -303,7 +303,7 @@ elf_getarsym (Elf *elf, size_t *ptr)

  arsym[cnt].as_hash = _dl_elf_hash (str_data);

   I also found that the order of fixed files is different from original 
patch. So git check these changes and consider the difference is big enough to 
produce a new file?

Zheng


From: Jussi Kukkonen [mailto:jussi.kukko...@intel.com]
Sent: Tuesday, January 24, 2017 4:50 PM
To: Zheng, Ruoqin/郑 若钦 
>
Cc: Patches and discussions about the oe-core layer 
>
Subject: Re: [OE-core] [PATCH] elfutils: 0.166->0.168



On 24 January 2017 at 09:13, Zheng Ruoqin 
> wrote:
1) Upgrade elfutils from 0.166 to 0.168
2) Delete 1 patch below to make it compatible with new version
elfcmp-fix-self-comparision.patch
3) Modify 4 patches below to make it compatible with new version
elfutils-0.166/hppa_backend.diff -> elfutils-0.168/hppa_backend.diff
elfutils-0.166/mips_backend.diff -> elfutils-0.168/mips_backend.diff
elfutils-0.166/m68k_backend.diff -> elfutils-0.168/m68k_backend.diff

elfutils-0.166/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch 
-> 
elfutils-0.168/0001-build-Provide-alternatives-for-glibc-assumptions-hel.patch

The last one is now showing as one removed and one added patch. Please use git 
rename detection to make it more readable:

$ git config diff.renames copies

Thanks,
  Jussi


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


Re: [OE-core] [PATCH] busybox: 1.24.1 -> 1.26.2

2017-02-08 Thread Zheng, Ruoqin
ping


-Original Message-
From: Zheng, Ruoqin/郑 若钦 
Sent: Monday, January 23, 2017 10:41 AM
To: openembedded-core@lists.openembedded.org
Cc: Zheng, Ruoqin/郑 若钦 
Subject: [OE-core] [PATCH] busybox: 1.24.1 -> 1.26.2

1) Upgrade busybox from 1.24.1 to 1.26.2
2) Delete 12 patches below, since they are integrated upstream.
busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
busybox/0001-libiproute-handle-table-ids-larger-than-255.patch
busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch
busybox/CVE-2016-2147.patch
busybox/CVE-2016-2147_2.patch
busybox/CVE-2016-2148.patch
busybox/busybox-1.24.1-truncate-open-mode.patch
busybox/busybox-1.24.1-unzip-regression.patch
busybox/busybox-1.24.1-unzip.patch
busybox/busybox-kbuild-race-fix-commit-d8e61bb.patch
busybox/commit-applet_tables-fix-commit-0dddbc1.patch
busybox/ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch
3) Modify 3 patches below to make it compatible with new version
busybox/busybox-cross-menuconfig.patch
busybox/busybox-udhcpc-no_deconfig.patch
busybox/makefile-fix-backport.patch

Signed-off-by: Zheng Ruoqin 
---
 ...e-the-behaviour-of-c-parameter-to-match-u.patch |  73 ---
 ...biproute-handle-table-ids-larger-than-255.patch | 134 ---
 ...-n-flushes-pattern-space-terminates-early.patch |  72 ---
 .../busybox/busybox/CVE-2016-2147.patch|  57 
 .../busybox/busybox/CVE-2016-2147_2.patch  |  32 -
 .../busybox/busybox/CVE-2016-2148.patch|  74 ---
 .../busybox-1.24.1-truncate-open-mode.patch|  81 
 .../busybox/busybox-1.24.1-unzip-regression.patch  | 143 -
 .../busybox/busybox/busybox-1.24.1-unzip.patch | 118 -
 .../busybox/busybox/busybox-cross-menuconfig.patch |  70 +-
 .../busybox-kbuild-race-fix-commit-d8e61bb.patch   |  53 
 .../busybox/busybox-udhcpc-no_deconfig.patch   |  70 +-
 .../commit-applet_tables-fix-commit-0dddbc1.patch  |  61 -
 ...lem_on_mips64_n64_big_endian_musl_systems.patch |  90 -
 .../busybox/busybox/makefile-fix-backport.patch|  30 ++---
 .../{busybox_1.24.1.bb => busybox_1.26.2.bb}   |  16 +--
 16 files changed, 88 insertions(+), 1086 deletions(-)
 delete mode 100644 
meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/0001-libiproute-handle-table-ids-larger-than-255.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/0001-sed-fix-sed-n-flushes-pattern-space-terminates-early.patch
 delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-2147.patch
 delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-2147_2.patch
 delete mode 100644 meta/recipes-core/busybox/busybox/CVE-2016-2148.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/busybox-1.24.1-truncate-open-mode.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip-regression.patch
 delete mode 100644 meta/recipes-core/busybox/busybox/busybox-1.24.1-unzip.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/busybox-kbuild-race-fix-commit-d8e61bb.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/commit-applet_tables-fix-commit-0dddbc1.patch
 delete mode 100644 
meta/recipes-core/busybox/busybox/ip_fix_problem_on_mips64_n64_big_endian_musl_systems.patch
 rename meta/recipes-core/busybox/{busybox_1.24.1.bb => busybox_1.26.2.bb} (66%)

diff --git 
a/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
 
b/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
deleted file mode 100644
index 8bcbd73..000
--- 
a/meta/recipes-core/busybox/busybox/0001-flock-update-the-behaviour-of-c-parameter-to-match-u.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 198f18addf1d814c2fefcb492f3b9fbd221669bb Mon Sep 17 00:00:00 2001
-From: "Maxin B. John" 
-Date: Wed, 20 Apr 2016 18:24:45 +0300
-Subject: [PATCH] flock: update the behaviour of -c parameter to match upstream
-
-In upstream, -c 'PROG ARGS' means "run sh -c 'PROG ARGS'"
-
-function old new   delta
-flock_main   286 377 +91
-.rodata   155849  155890 +41
-
-Upstream-Status: Submitted
-[ http://lists.busybox.net/pipermail/busybox/2016-April/084142.html ]
-
-Signed-off-by: Maxin B. John 

- util-linux/flock.c | 20 ++--
- 1 file changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/util-linux/flock.c b/util-linux/flock.c
-index 05a747f..c85a25d 100644
 a/util-linux/flock.c
-+++ b/util-linux/flock.c
-@@ -20,6