* [PATCH 3/8] oe-publish-sdk: make cmd easier to read
From: Robert Yang @ 2016-11-17 6:19 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479363545.git.liezhi.yang@windriver.com>
The command was too long to read and maintain.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
scripts/oe-publish-sdk | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/scripts/oe-publish-sdk b/scripts/oe-publish-sdk
index 4fe8974..d95c623 100755
--- a/scripts/oe-publish-sdk
+++ b/scripts/oe-publish-sdk
@@ -113,10 +113,25 @@ def publish(args):
return ret
# Setting up the git repo
+ cmd_common = "if [ ! -e .git ]; then"
+ cmd_common += " git init .;"
+ cmd_common += " mv .git/hooks/post-update.sample .git/hooks/post-update;"
+ cmd_common += " echo '*.pyc\n*.pyo' > .gitignore;"
+ cmd_common += "fi;"
+ cmd_common += "git add -A .;"
+ cmd_common += "git config user.email 'oe@oe.oe' && git config user.name 'OE' && git commit -q -m 'init repo' || true;"
if not is_remote:
- cmd = 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; echo "*.pyc\n*.pyo" > .gitignore; fi; git add -A .; git config user.email "oe@oe.oe" && git config user.name "OE" && git commit -q -m "init repo" || true; git update-server-info' % (destination, destination)
+ cmd = "set -e;"
+ cmd += "mkdir -p %s/layers;" % destination
+ cmd += "cd %s/layers;" % destination
+ cmd += cmd_common
+ cmd += "git update-server-info"
else:
- cmd = "ssh %s 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; echo '*.pyc\n*.pyo' > .gitignore; fi; git add -A .; git config user.email 'oe@oe.oe' && git config user.name 'OE' && git commit -q -m \"init repo\" || true; git update-server-info'" % (host, destdir, destdir)
+ cmd = "ssh %s 'set -e;" % host
+ cmd += "mkdir -p %s/layers;" % destdir
+ cmd += "cd %s/layers;" % destdir
+ cmd += cmd_common
+ cmd += "git update-server-info'"
ret = subprocess.call(cmd, shell=True)
if ret == 0:
logger.info('SDK published successfully')
--
2.10.2
^ permalink raw reply related
* [PATCH 2/8] oeqa/sdkext/devtool.py: remove workspace/sources before running test cases
From: Robert Yang @ 2016-11-17 6:19 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479363545.git.liezhi.yang@windriver.com>
Fixed:
MACHINE = "qemux86-64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
$ bitbake core-image-minimal -cpopulate_sdk_ext
[snip]
ERROR: Source tree path /path/to/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/testsdkext/tc/workspace/sources/v4l2loopback-driver already exists and is not empty\n'
[snip]
This is because the test case will run twice
(environment-setup-core2-64-poky-linux and
environment-setup-x86-pokymllib32-linux), it would fail in the second
run, 'devtool reset' can not remove sources, so remove it before running
test cases.
[YOCTO #10647]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/lib/oeqa/sdkext/devtool.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/lib/oeqa/sdkext/devtool.py b/meta/lib/oeqa/sdkext/devtool.py
index 65f41f6..f101eb6 100644
--- a/meta/lib/oeqa/sdkext/devtool.py
+++ b/meta/lib/oeqa/sdkext/devtool.py
@@ -15,6 +15,9 @@ class DevtoolTest(oeSDKExtTest):
self.myapp_cmake_dst = os.path.join(self.tc.sdktestdir, "myapp_cmake")
shutil.copytree(self.myapp_cmake_src, self.myapp_cmake_dst)
+ # Clean sources dir to make "git clone" can run again
+ shutil.rmtree(os.path.join(self.tc.sdktestdir, "tc/workspace/sources"), True)
+
def _test_devtool_build(self, directory):
self._run('devtool add myapp %s' % directory)
try:
--
2.10.2
^ permalink raw reply related
* [PATCH 1/8] populate_sdk_ext.bbclass: install multilib targets as populate_sdk does
From: Robert Yang @ 2016-11-17 6:19 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479363545.git.liezhi.yang@windriver.com>
Fixed:
MACHINE = "qemux86-64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
$ bitbake core-image-minimal -cpopulate_sdk_ext
[snip]
Testing /buildarea/lyang1/test_po/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/testsdkext//tc/environment-setup-x86-pokymllib32-linux
test_cvs (oeqa.sdk.buildcvs.BuildCvsTest) ... FAIL
[snip]
It was failed because no lib32 toolchains.
The fixes include:
* Set SDK_TARGETS correctly
* Return multilib depends in get_ext_sdk_depends()
* Write information to all environment-setup-* scripts.
[YOCTO #10647]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/classes/populate_sdk_ext.bbclass | 61 ++++++++++++++++++++++-------------
1 file changed, 38 insertions(+), 23 deletions(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 26b5ca6..ce9c40a 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -39,7 +39,7 @@ SDK_LOCAL_CONF_BLACKLIST ?= "CONF_VERSION \
SDK_INHERIT_BLACKLIST ?= "buildhistory icecc"
SDK_UPDATE_URL ?= ""
-SDK_TARGETS ?= "${PN}"
+SDK_TARGETS ?= "${@multilib_pkg_extend(d, d.getVar('BPN', True))}"
def get_sdk_install_targets(d, images_only=False):
sdk_install_targets = ''
@@ -562,38 +562,52 @@ SDK_PRE_INSTALL_COMMAND_task-populate-sdk-ext = "${sdk_ext_preinst}"
sdk_ext_postinst() {
printf "\nExtracting buildtools...\n"
cd $target_sdk_dir
- env_setup_script="$target_sdk_dir/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"
- printf "buildtools\ny" | ./${SDK_BUILDTOOLS_INSTALLER} > buildtools.log || { printf 'ERROR: buildtools installation failed:\n' ; cat buildtools.log ; echo "printf 'ERROR: this SDK was not fully installed and needs reinstalling\n'" >> $env_setup_script ; exit 1 ; }
+ env_setup_scripts="`ls $target_sdk_dir/environment-setup-*`"
+ ./${SDK_BUILDTOOLS_INSTALLER} -d buildtools -y > buildtools.log
+ if [ $? -ne 0 ]; then
+ echo 'ERROR: buildtools installation failed:'
+ cat buildtools.log
+ for e in $env_setup_scripts; do
+ echo "echo 'ERROR: this SDK was not fully installed and needs reinstalling'" >> $e
+ done
+ exit 1
+ fi
# Delete the buildtools tar file since it won't be used again
rm -f ./${SDK_BUILDTOOLS_INSTALLER}
# We don't need the log either since it succeeded
rm -f buildtools.log
- # Make sure when the user sets up the environment, they also get
- # the buildtools-tarball tools in their path.
- echo ". $target_sdk_dir/buildtools/environment-setup*" >> $env_setup_script
-
- # Allow bitbake environment setup to be ran as part of this sdk.
- echo "export OE_SKIP_SDK_CHECK=1" >> $env_setup_script
+ for e in $env_setup_scripts; do
+ # Make sure when the user sets up the environment, they also get
+ # the buildtools-tarball tools in their path.
+ echo ". $target_sdk_dir/buildtools/environment-setup*" >> $e
- # A bit of another hack, but we need this in the path only for devtool
- # so put it at the end of $PATH.
- echo "export PATH=$target_sdk_dir/sysroots/${SDK_SYS}${bindir_nativesdk}:\$PATH" >> $env_setup_script
+ # Allow bitbake environment setup to be ran as part of this sdk.
+ echo "export OE_SKIP_SDK_CHECK=1" >> $e
- echo "printf 'SDK environment now set up; additionally you may now run devtool to perform development tasks.\nRun devtool --help for further details.\n'" >> $env_setup_script
-
- # Warn if trying to use external bitbake and the ext SDK together
- echo "(which bitbake > /dev/null 2>&1 && echo 'WARNING: attempting to use the extensible SDK in an environment set up to run bitbake - this may lead to unexpected results. Please source this script in a new shell session instead.') || true" >> $env_setup_script
+ # A bit of another hack, but we need this in the path only for devtool
+ # so put it at the end of $PATH.
+ echo "export PATH=$target_sdk_dir/sysroots/${SDK_SYS}${bindir_nativesdk}:\$PATH" >> $e
+ echo "printf 'SDK environment now set up; additionally you may now run devtool to perform development tasks.\nRun devtool --help for further details.\n'" >> $e
+ # Warn if trying to use external bitbake and the ext SDK together
+ echo "(which bitbake > /dev/null 2>&1 && echo 'WARNING: attempting to use the extensible SDK in an environment set up to run bitbake - this may lead to unexpected results. Please source this script in a new shell session instead.') || true" >> $e
+ done
if [ "$prepare_buildsystem" != "no" ]; then
- printf "Preparing build system...\n"
+ echo "Preparing build system..."
# dash which is /bin/sh on Ubuntu will not preserve the
# current working directory when first ran, nor will it set $1 when
# sourcing a script. That is why this has to look so ugly.
LOGFILE="$target_sdk_dir/preparing_build_system.log"
- sh -c ". buildtools/environment-setup* > $LOGFILE && cd $target_sdk_dir/`dirname ${oe_init_build_env_path}` && set $target_sdk_dir && . $target_sdk_dir/${oe_init_build_env_path} $target_sdk_dir >> $LOGFILE && python $target_sdk_dir/ext-sdk-prepare.py $LOGFILE '${SDK_INSTALL_TARGETS}'" || { echo "printf 'ERROR: this SDK was not fully installed and needs reinstalling\n'" >> $env_setup_script ; exit 1 ; }
- rm $target_sdk_dir/ext-sdk-prepare.py
+ sh -c ". buildtools/environment-setup* > $LOGFILE && cd $target_sdk_dir/`dirname ${oe_init_build_env_path}` && set $target_sdk_dir && . $target_sdk_dir/${oe_init_build_env_path} $target_sdk_dir >> $LOGFILE && python $target_sdk_dir/ext-sdk-prepare.py $LOGFILE '${SDK_INSTALL_TARGETS}'"
+ if [ $? -ne 0 ]; then
+ for e in $env_setup_scripts; do
+ echo "echo 'ERROR: this SDK was not fully installed and needs reinstalling'" >> $e
+ done
+ exit 1
+ fi
+ rm -f $target_sdk_dir/ext-sdk-prepare.py
fi
echo done
}
@@ -624,10 +638,11 @@ fakeroot python do_populate_sdk_ext() {
def get_ext_sdk_depends(d):
# Note: the deps varflag is a list not a string, so we need to specify expand=False
deps = d.getVarFlag('do_image_complete', 'deps', False)
- pn = d.getVar('PN', True)
- deplist = ['%s:%s' % (pn, dep) for dep in deps]
- for task in ['do_image_complete', 'do_rootfs', 'do_build']:
- deplist.extend((d.getVarFlag(task, 'depends', True) or '').split())
+ deplist = []
+ for pn in multilib_pkg_extend(d, d.getVar('BPN', True)).split():
+ deplist += ['%s:%s' % (pn, dep) for dep in deps]
+ for task in ['do_image_complete', 'do_rootfs', 'do_build']:
+ deplist.extend((d.getVarFlag(task, 'depends', True) or '').split())
return ' '.join(deplist)
python do_sdk_depends() {
--
2.10.2
^ permalink raw reply related
* [PATCH 0/8] Fixes for eSDK and testsdkext
From: Robert Yang @ 2016-11-17 6:19 UTC (permalink / raw)
To: openembedded-core
The following changes since commit a675b2c89e477af088faee9b3be96eae19a85f0b:
sanity.bbclass: fix logging of an error (2016-11-15 15:18:50 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/eSDK
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/eSDK
Robert Yang (8):
populate_sdk_ext.bbclass: install multilib targets as populate_sdk
does
oeqa/sdkext/devtool.py: remove workspace/sources before running test
cases
oe-publish-sdk: make cmd easier to read
oe-publish-sdk: add pyshtables.py to .gitignore
oeqa/sdkext/devtool.py: don't reset when the test is failed
oeqa/oetest.py: add hasLockedSig()
oeqa/sdkext/devtool.py: skip test_extend_autotools_recipe_creation
when no libxml2
oe/copy_buildsystem.py: add SDK_LAYERS_EXCLUDE_PATTERN
meta/classes/populate_sdk_ext.bbclass | 61 ++++++++++++++++++++++-------------
meta/lib/oe/copy_buildsystem.py | 18 +++++++++++
meta/lib/oeqa/oetest.py | 13 ++++++++
meta/lib/oeqa/sdkext/devtool.py | 13 ++++----
scripts/oe-publish-sdk | 19 +++++++++--
5 files changed, 93 insertions(+), 31 deletions(-)
--
2.10.2
^ permalink raw reply
* [PATCH] grub_git: set COMPATIBLE_HOST_armv7ve to null
From: Yi Zhao @ 2016-11-17 6:05 UTC (permalink / raw)
To: openembedded-core
When build nxp-ls10xx which enable hard-float, it try to force soft-float:
| checking if compiling with clang... no
| checking for options to compile assembly...
| checking whether -freg-struct-return works... yes
| checking for options to get soft-float... no
| configure: error: could not force soft-float
Set COMPATIBLE_HOST_armv7ve to null to skip the build.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
meta/recipes-bsp/grub/grub_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb
index 493b695..eb824cc 100644
--- a/meta/recipes-bsp/grub/grub_git.bb
+++ b/meta/recipes-bsp/grub/grub_git.bb
@@ -17,6 +17,7 @@ S = "${WORKDIR}/git"
COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)'
COMPATIBLE_HOST_armv7a = 'null'
+COMPATIBLE_HOST_armv7ve = 'null'
inherit autotools gettext texinfo
--
2.7.4
^ permalink raw reply related
* [PATCH] e2fsprogs: fix hardcoded path for ptest script
From: Yi Zhao @ 2016-11-17 5:27 UTC (permalink / raw)
To: openembedded-core
The hardcoded path would cause failure on mulitilib:
ls: cannot access '/usr/lib/e2fsprogs/ptest/test/[a-zA-Z]_*': No such file or directory
./test_script: line 34: /usr/lib/e2fsprogs/ptest/test/test_post: No such file or directory
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
index ef1ce58..77e8822 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
@@ -7,7 +7,7 @@ index 60cf655..ce220f1 100644
@echo "HTREE=y" >> test_one
@echo "QUOTA=y" >> test_one
- @echo "SRCDIR=@srcdir@" >> test_one
-+ @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_one
++ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one
@echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one
@cat $(srcdir)/test_one.in >> test_one
@chmod +x test_one
@@ -16,7 +16,7 @@ index 60cf655..ce220f1 100644
@echo "Creating test_script..."
@echo "#!/bin/sh" > test_script
- @echo "SRCDIR=@srcdir@" >> test_script
-+ @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_script
++ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_script
@cat $(srcdir)/test_script.in >> test_script
@chmod +x test_script
--
2.7.4
^ permalink raw reply related
* Re: Morty maintainer
From: Denys Dmytriyenko @ 2016-11-17 4:08 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
In-Reply-To: <1479296981.28508.18.camel@linuxfoundation.org>
On Wed, Nov 16, 2016 at 11:49:41AM +0000, Richard Purdie wrote:
> Armin has kindly volunteered to maintain the morty stable release
> branch and has already put together a great series.
>
> I don't want to overload Armin so if anyone else wants to step forward,
> let me know and we can discuss it. Right now its looking likely Armin
> will be the maintainer though (thanks Armin!).
I'd like to offer Armin my help with this task, as I'm not sure I'll be able
to completely replace him yet. Will that work?
--
Denys
^ permalink raw reply
* [PATCH V2] python3-numpy: upgrade to 1.11.2
From: Edwin Plauchu @ 2016-11-16 23:48 UTC (permalink / raw)
To: openembedded-core; +Cc: Edwin Plauchu
From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
It is a simultaneous upgrade for python 2 and 3 over numpy module.
Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
---
.../python-numpy/{python-numpy_1.11.1.bb => python-numpy_1.11.2.bb} | 4 ++--
.../python-numpy/{python3-numpy_1.11.0.bb => python3-numpy_1.11.2.bb} | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/python-numpy/{python-numpy_1.11.1.bb => python-numpy_1.11.2.bb} (95%)
rename meta/recipes-devtools/python-numpy/{python3-numpy_1.11.0.bb => python3-numpy_1.11.2.bb} (95%)
diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.11.1.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb
similarity index 95%
rename from meta/recipes-devtools/python-numpy/python-numpy_1.11.1.bb
rename to meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb
index c5af720..dafd7e2 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy_1.11.1.bb
+++ b/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb
@@ -73,8 +73,8 @@ do_compile_prepend_class-target() {
FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a"
-SRC_URI[md5sum] = "2f44a895a8104ffac140c3a70edbd450"
-SRC_URI[sha256sum] = "dc4082c43979cc856a2bf352a8297ea109ccb3244d783ae067eb2ee5b0d577cd"
+SRC_URI[md5sum] = "03bd7927c314c43780271bf1ab795ebc"
+SRC_URI[sha256sum] = "04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69"
# install what is needed for numpy.test()
RDEPENDS_${PN} = "python-unittest \
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.11.0.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb
similarity index 95%
rename from meta/recipes-devtools/python-numpy/python3-numpy_1.11.0.bb
rename to meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb
index 3cca223..c34df6f 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.11.0.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb
@@ -73,8 +73,8 @@ do_compile_prepend_class-target() {
FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a"
-SRC_URI[md5sum] = "bc56fb9fc2895aa4961802ffbdb31d0b"
-SRC_URI[sha256sum] = "a1d1268d200816bfb9727a7a27b78d8e37ecec2e4d5ebd33eb64e2789e0db43e"
+SRC_URI[md5sum] = "03bd7927c314c43780271bf1ab795ebc"
+SRC_URI[sha256sum] = "04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69"
# install what is needed for numpy.test()
RDEPENDS_${PN} = "python3-unittest \
--
2.9.3
^ permalink raw reply related
* [PATCH 3/3] bb-perf: plot histograms base on buildstats data
From: leonardo.sandoval.gonzalez @ 2016-11-16 23:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479244148.git.leonardo.sandoval.gonzalez@linux.intel.com>
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Scripts that produces script data to be consumed by gnuplot.
There are two possible plots depending if either the
-S parameter is present or not:
* without -S: Produces a histogram listing top N recipes/tasks versus
stats. The first stat defined in the -s parameter is the one taken
into account for ranking
* -S: Produces a histogram listing tasks versus stats. In this case,
the value of each stat is the sum for that particular stat in all recipes found.
Stats values are in descending order defined by the first stat defined on -s
EXAMPLES
1. Top recipes' tasks taking into account utime
$ buildstats-plot.sh -s utime | gnuplot -p
2. Tasks versus utime:stime
$ buildstats-plot.sh -s utime:stime -S | gnuplot -p
3. Tasks versus IO write_bytes:IO read_bytes
$ buildstats-plot.sh -s 'IO write_bytes:IO read_bytes' -S | gnuplot -p
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
---
scripts/contrib/bb-perf/buildstats-plot.sh | 157 +++++++++++++++++++++++++++++
1 file changed, 157 insertions(+)
create mode 100755 scripts/contrib/bb-perf/buildstats-plot.sh
diff --git a/scripts/contrib/bb-perf/buildstats-plot.sh b/scripts/contrib/bb-perf/buildstats-plot.sh
new file mode 100755
index 0000000..7e8ae04
--- /dev/null
+++ b/scripts/contrib/bb-perf/buildstats-plot.sh
@@ -0,0 +1,157 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) 2011, Intel Corporation.
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# DESCRIPTION
+#
+# Produces script data to be consumed by gnuplot. There are two possible plots
+# depending if either the -S parameter is present or not:
+#
+# * without -S: Produces a histogram listing top N recipes/tasks versus
+# stats. The first stat defined in the -s parameter is the one taken
+# into account for ranking
+# * -S: Produces a histogram listing tasks versus stats. In this case,
+# the value of each stat is the sum for that particular stat in all recipes found.
+# Stats values are in descending order defined by the first stat defined on -s
+#
+# EXAMPLES
+#
+# 1. Top recipes' tasks taking into account utime
+#
+# $ buildstats-plot.sh -s utime | gnuplot -p
+#
+# 2. Tasks versus utime:stime
+#
+# $ buildstats-plot.sh -s utime:stime -S | gnuplot -p
+#
+# 3. Tasks versus IO write_bytes:IO read_bytes
+#
+# $ buildstats-plot.sh -s 'IO write_bytes:IO read_bytes' -S | gnuplot -p
+#
+# AUTHORS
+# Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
+#
+
+set -o nounset
+set -o errexit
+
+BS_DIR="tmp/buildstats"
+N=10
+STATS="utime"
+SUM=""
+OUTDATA_FILE="$PWD/buildstats-plot.out"
+
+function usage {
+ CMD=$(basename $0)
+ cat <<EOM
+Usage: $CMD [-b buildstats_dir] [-t do_task]
+ -b buildstats The path where the folder resides
+ (default: "$BS_DIR")
+ -n N Top N recipes to display. Ignored if -S is present
+ (default: "$N")
+ -s stats The stats to be matched. If more that one stat, units
+ should be the same because data is plot as histogram.
+ (see buildstats.sh -h for all options) or any other defined
+ (build)stat separated by colons, i.e. stime:utime
+ (default: "$STATS")
+ -S Sum values for a particular stat for found recipes
+ -o Output data file.
+ (default: "$OUTDATA_FILE")
+ -h Display this help message
+EOM
+}
+
+# Parse and validate arguments
+while getopts "b:n:s:o:Sh" OPT; do
+ case $OPT in
+ b)
+ BS_DIR="$OPTARG"
+ ;;
+ n)
+ N="$OPTARG"
+ ;;
+ s)
+ STATS="$OPTARG"
+ ;;
+ S)
+ SUM="y"
+ ;;
+ o)
+ OUTDATA_FILE="$OPTARG"
+ ;;
+ h)
+ usage
+ exit 0
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+done
+
+# Get number of stats
+IFS=':'; statsarray=(${STATS}); unset IFS
+nstats=${#statsarray[@]}
+
+# Get script folder, use to run buildstats.sh
+CD=$(dirname $0)
+
+# Parse buildstats recipes to produce a single table
+OUTBUILDSTATS="$PWD/buildstats.log"
+$CD/buildstats.sh -H -s "$STATS" -H > $OUTBUILDSTATS
+
+# Get headers
+HEADERS=$(cat $OUTBUILDSTATS | sed -n -e '1s/ /-/g' -e '1s/:/ /gp')
+
+echo -e "set boxwidth 0.9 relative"
+echo -e "set style data histograms"
+echo -e "set style fill solid 1.0 border lt -1"
+echo -e "set xtics rotate by 45 right"
+
+# Get output data
+if [ -z "$SUM" ]; then
+ cat $OUTBUILDSTATS | sed -e '1d' | sort -k3 -n -r | head -$N > $OUTDATA_FILE
+ # include task at recipe column
+ sed -i -e "1i\
+${HEADERS}" $OUTDATA_FILE
+ echo -e "set title \"Top task/recipes\""
+ echo -e "plot for [COL=3:`expr 3 + ${nstats} - 1`] '${OUTDATA_FILE}' using COL:xtic(stringcolumn(1).' '.stringcolumn(2)) title columnheader(COL)"
+else
+
+ # Construct datatamash sum argument (sum 3 sum 4 ...)
+ declare -a sumargs
+ j=0
+ for i in `seq $nstats`; do
+ sumargs[j]=sum; j=$(( $j + 1 ))
+ sumargs[j]=`expr 3 + $i - 1`; j=$(( $j + 1 ))
+ done
+
+ # Do the processing with datamash
+ cat $OUTBUILDSTATS | sed -e '1d' | datamash -t ' ' -g1 ${sumargs[*]} | sort -k2 -n -r > $OUTDATA_FILE
+
+ # Include headers into resulted file, so we can include gnuplot xtics
+ HEADERS=$(echo $HEADERS | sed -e 's/recipe//1')
+ sed -i -e "1i\
+${HEADERS}" $OUTDATA_FILE
+
+ # Plot
+ echo -e "set title \"Sum stats values per task for all recipes\""
+ echo -e "plot for [COL=2:`expr 2 + ${nstats} - 1`] '${OUTDATA_FILE}' using COL:xtic(1) title columnheader(COL)"
+fi
+
--
2.1.4
^ permalink raw reply related
* [PATCH 2/3] scripts: Specify the stats to take into account
From: leonardo.sandoval.gonzalez @ 2016-11-16 23:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479244148.git.leonardo.sandoval.gonzalez@linux.intel.com>
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
There are many more stats on buildstats that 'Elapsed time', so make the script
more flexible to support all stats. Some cmd line examples:
$ buildstats.sh -s 'utime'
Buildstats' data covers proc's stats in different areas, including CPU times,
IO, program system resources and child program system resources. In order
to print values on each of these sets from command line, one can use the
following:
$ buildstats.sh -H -s 'TIME' | less
$ buildstats.sh -H -s 'IO' | less
and 'RUSAGE' and 'CHILD_RUSAGE' for program and program's child system
resources.
One more thing: The new version gives the same output as the old one,
just specifying the 'Elapsed time' as stat param:
$ buildstats.sh -s 'Elapsed time'
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
---
scripts/contrib/bb-perf/buildstats.sh | 99 +++++++++++++++++++++++++++++------
1 file changed, 82 insertions(+), 17 deletions(-)
diff --git a/scripts/contrib/bb-perf/buildstats.sh b/scripts/contrib/bb-perf/buildstats.sh
index 96158a9..8d7e248 100755
--- a/scripts/contrib/bb-perf/buildstats.sh
+++ b/scripts/contrib/bb-perf/buildstats.sh
@@ -18,24 +18,40 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
# DESCRIPTION
-# Given a 'buildstats' path (created by bitbake when setting
-# USER_CLASSES ?= "buildstats" on local.conf) and task names, outputs
-# '<task> <recipe> <elapsed time>' for all recipes. Elapsed times are in
-# seconds, and task should be given without the 'do_' prefix.
+# Given 'buildstats' data (generate by bitbake when setting
+# USER_CLASSES ?= "buildstats" on local.conf), task names and a stats values
+# (these are the ones preset on the buildstats files), outputs
+# '<task> <recipe> <value_1> <value_2> ... <value_n>'. The units are the ones
+# defined at buildstats, which in turn takes data from /proc/[pid] files
#
# Some useful pipelines
#
-# 1. Tasks with largest elapsed times
-# $ buildstats.sh -b <buildstats> | sort -k3 -n -r | head
+# 1. Tasks with largest stime (Amount of time that this process has been scheduled
+# in kernel mode) values
+# $ buildstats.sh -b <buildstats> -s stime | sort -k3 -n -r | head
#
-# 2. Min, max, sum per task (in needs GNU datamash)
-# $ buildstats.sh -b <buildstats> | datamash -t' ' -g1 min 3 max 3 sum 3 | sort -k4 -n -r
+# 2. Min, max, sum utime (Amount of time that this process has been scheduled
+# in user mode) per task (in needs GNU datamash)
+# $ buildstats.sh -b <buildstats> -s utime | datamash -t' ' -g1 min 3 max 3 sum 3 | sort -k4 -n -r
#
# AUTHORS
# Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
#
+
+# Stats, by type
+TIME="utime:stime:cutime:cstime"
+IO="IO wchar:IO write_bytes:IO syscr:IO read_bytes:IO rchar:IO syscw:IO cancelled_write_bytes"
+RUSAGE="rusage ru_utime:rusage ru_stime:rusage ru_maxrss:rusage ru_minflt:rusage ru_majflt:\
+rusage ru_inblock:rusage ru_oublock:rusage ru_nvcsw:rusage ru_nivcsw"
+
+CHILD_RUSAGE="Child rusage ru_utime:Child rusage ru_stime:Child rusage ru_maxrss:Child rusage ru_minflt:\
+Child rusage ru_majflt:Child rusage ru_inblock:Child rusage ru_oublock:Child rusage ru_nvcsw:\
+Child rusage ru_nivcsw"
+
BS_DIR="tmp/buildstats"
TASKS="compile:configure:fetch:install:patch:populate_lic:populate_sysroot:unpack"
+STATS="$TIME"
+HEADER="" # No header by default
function usage {
CMD=$(basename $0)
@@ -45,12 +61,20 @@ Usage: $CMD [-b buildstats_dir] [-t do_task]
(default: "$BS_DIR")
-t tasks The tasks to be computed
(default: "$TASKS")
+ -s stats The stats to be matched. Options: TIME, IO, RUSAGE, CHILD_RUSAGE
+ or any other defined buildstat separated by colons, i.e. stime:utime
+ (default: "$STATS")
+ Default stat sets:
+ TIME=$TIME
+ IO=$IO
+ RUSAGE=$RUSAGE
+ CHILD_RUSAGE=$CHILD_RUSAGE
-h Display this help message
EOM
}
# Parse and validate arguments
-while getopts "b:t:h" OPT; do
+while getopts "b:t:s:Hh" OPT; do
case $OPT in
b)
BS_DIR="$OPTARG"
@@ -58,6 +82,12 @@ while getopts "b:t:h" OPT; do
t)
TASKS="$OPTARG"
;;
+ s)
+ STATS="$OPTARG"
+ ;;
+ H)
+ HEADER="y"
+ ;;
h)
usage
exit 0
@@ -76,15 +106,50 @@ if [ ! -d "$BS_DIR" ]; then
exit 1
fi
-RECIPE_FIELD=1
-TIME_FIELD=4
+stats=""
+IFS=":"
+for stat in ${STATS}; do
+ case $stat in
+ TIME)
+ stats="${stats}:${TIME}"
+ ;;
+ IO)
+ stats="${stats}:${IO}"
+ ;;
+ RUSAGE)
+ stats="${stats}:${RUSAGE}"
+ ;;
+ CHILD_RUSAGE)
+ stats="${stats}:${CHILD_RUSAGE}"
+ ;;
+ *)
+ stats="${STATS}"
+ esac
+done
+
+# remove possible colon at the beginning
+stats="$(echo "$stats" | sed -e 's/^://1')"
+
+# Provide a header if required by the user
+[ -n "$HEADER" ] && { echo "task:recipe:$stats"; }
-tasks=(${TASKS//:/ })
-for task in "${tasks[@]}"; do
+for task in ${TASKS}; do
task="do_${task}"
- for file in $(find ${BS_DIR} -type f -name ${task}); do
- recipe=$(sed -n -e "/$task/p" ${file} | cut -d ':' -f${RECIPE_FIELD})
- time=$(sed -n -e "/$task/p" ${file} | cut -d ':' -f${TIME_FIELD} | cut -d ' ' -f2)
- echo "${task} ${recipe} ${time}"
+ for file in $(find ${BS_DIR} -type f -name ${task} | awk 'BEGIN{ ORS=""; OFS=":" } { print $0,"" }'); do
+ recipe="$(basename $(dirname $file))"
+ times=""
+ for stat in ${stats}; do
+ [ -z "$stat" ] && { echo "empty stats"; }
+ time=$(sed -n -e "s/^\($stat\): \\(.*\\)/\\2/p" $file)
+ # in case the stat is not present, set the value as NA
+ [ -z "$time" ] && { time="NA"; }
+ # Append it to times
+ if [ -z "$times" ]; then
+ times="${time}"
+ else
+ times="${times} ${time}"
+ fi
+ done
+ echo "${task} ${recipe} ${times}"
done
done
--
2.1.4
^ permalink raw reply related
* [PATCH 1/3] buildstats: Place 'Elapsed Time' stat into a single line
From: leonardo.sandoval.gonzalez @ 2016-11-16 23:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1479244148.git.leonardo.sandoval.gonzalez@linux.intel.com>
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
All lines except one (the one containing the 'Elapsed Time') follows the format
'stat: value'. Fix that so post parsing the stats is simpler.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
---
meta/classes/buildstats.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/buildstats.bbclass b/meta/classes/buildstats.bbclass
index 599a219..57ecc8f 100644
--- a/meta/classes/buildstats.bbclass
+++ b/meta/classes/buildstats.bbclass
@@ -80,8 +80,8 @@ def write_task_data(status, logfile, e, d):
with open(os.path.join(logfile), "a") as f:
elapsedtime = get_timedata("__timedata_task", d, e.time)
if elapsedtime:
- f.write(d.expand("${PF}: %s: Elapsed time: %0.2f seconds \n" %
- (e.task, elapsedtime)))
+ f.write(d.expand("${PF}: %s\n" % e.task))
+ f.write(d.expand("Elapsed time: %0.2f seconds\n" % elapsedtime))
cpu, iostats, resources, childres = get_process_cputime(os.getpid())
if cpu:
f.write("utime: %s\n" % cpu['utime'])
--
2.1.4
^ permalink raw reply related
* [PATCH 0/3] bb-perf: scripting to plot buildstats data
From: leonardo.sandoval.gonzalez @ 2016-11-16 23:05 UTC (permalink / raw)
To: openembedded-core
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
buildstats data has been mostly unexplored mainly due to the lack of tools
to digest this data. The script buildstats.sh has been re-designed to
be much more flexible and the new script buildstats-plot.sh uses the latter
to produce data to be consumed by gnuplot. The tools used are datamash (package
at least not available in opensuse, so source code needs to be compiled and
installed) and gnuplot, so both must be present before running them.
Some plots created by buildstats-plot.sh can be found at [1]
[1] https://wiki.yoctoproject.org/wiki/MortyBuildstats
The following changes since commit dc8508f609974cc99606b9042bfa7f870ce80228:
build-applance-image: Fix to use the release branch for morty (2016-10-26 11:11:10 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib lsandov1/buildstats-plot
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lsandov1/buildstats-plot
Leonardo Sandoval (3):
buildstats: Place 'Elapsed Time' stat into a single line
scripts: Specify the stats to take into account
bb-perf: plot histograms base on buildstats data
meta/classes/buildstats.bbclass | 4 +-
scripts/contrib/bb-perf/buildstats-plot.sh | 157 +++++++++++++++++++++++++++++
scripts/contrib/bb-perf/buildstats.sh | 99 ++++++++++++++----
3 files changed, 241 insertions(+), 19 deletions(-)
create mode 100755 scripts/contrib/bb-perf/buildstats-plot.sh
--
2.1.4
^ permalink raw reply
* Re: [PATCH] devtool: fix handling of unicode characters from subprocess stdout
From: Paul Eggleton @ 2016-11-16 22:21 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161116171420.GA66534@bwitkowx-mobl.ger.corp.intel.com>
On Wed, 16 Nov 2016 09:14:20 Stephano Cetola wrote:
> On 11/11, Burton, Ross wrote:
> > A reader is definitely the right thing here, but I'm wondering why this
> > needs to loop on single characters. As I understand it doing a read() on
> > a
> > reader wrapping stdout will read until it blocks (because the process
> > hasn't got anything to output) so result in less pointless iterating.
>
> I've tested this and it fixes the issue, and resolves this bug:
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=10649
>
> We may be able to stream this without blocking using
> Queue.get_nowait(). This could solve the looping issue as well, as
> you'd be looping over stdout.readline and placing that in the queue,
> rather than looping over each character.
FWIW I'd rather see this one merged and the issue fixed and we can optimise it
later, especially as the original version used a single-byte read.
Thanks Jiajie for fixing the issue I caused and Stephano for verifying.
Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply
* Re: ✗ patchtest: failure for python-git and 3 more upgrades
From: Paul Eggleton @ 2016-11-16 22:19 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <5248602.HLsnDvu2hn@peggleto-mobl.ger.corp.intel.com>
On Thu, 17 Nov 2016 11:03:21 Paul Eggleton wrote:
> On Wed, 16 Nov 2016 21:55:22 Patchwork wrote:
> > == Series Details ==
> >
> > Series: python-git and 3 more upgrades
> > Revision: 1
> > URL : https://patchwork.openembedded.org/series/3947/
> > 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 (series 3947, revision 1) by patchtest resulting in
> > the following failures:
> >
> >
> > * Patch [1/4] python*-git: upgrade to 2.1.0
> >
> > Issue Shortlog does not follow expected format
> >
> > [test_shortlog_format] Suggested fix Commit shortlog (first line of
> > commit message) should follow the format "<target>: <summary>"
>
> I guess our regex is being a bit strict here.
Sigh, this wasn't meant to go to the list. I guess by this and others that you
can see we're working on this though. It's about time we posted something
proper about it.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply
* Re: truncating quoted text in emails
From: Paul Eggleton @ 2016-11-16 22:17 UTC (permalink / raw)
To: Patrick Ohly; +Cc: openembedded-core
In-Reply-To: <1479310588.18151.22.camel@intel.com>
On Wed, 16 Nov 2016 16:36:28 Patrick Ohly wrote:
> While trying to follow patch reviews on this list I noticed that
> (subjectively?) quite a few replies completely quote the original email
> and then just add a few lines. That looks fine in GMail where the quoted
> text is folded, but not so much in mail readers where quoted text is
> unfolded (Evolution).
>
> A random example:
> http://lists.openembedded.org/pipermail/openembedded-core/2016-November/1288
> 61.html
>
> Not sure what the netiquette is for this list, but at least I would
> appreciate a bit more aggressive trimming in replies - thanks! ;-}
I completely agree. I really prefer not to have to wade through the entire
quoted text of a long patch email only to read something like "ACK" at the
end. (By all means quote specific parts that you want to respond to in
detail.)
Still, better to have some reply than no reply, I suppose.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply
* Re: ✗ patchtest: failure for python-git and 3 more upgrades
From: Paul Eggleton @ 2016-11-16 22:03 UTC (permalink / raw)
To: openembedded-core; +Cc: joshua.g.lock
In-Reply-To: <20161116215522.7692.73016@do.openembedded.org>
On Wed, 16 Nov 2016 21:55:22 Patchwork wrote:
> == Series Details ==
>
> Series: python-git and 3 more upgrades
> Revision: 1
> URL : https://patchwork.openembedded.org/series/3947/
> 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 (series 3947, revision 1) by patchtest resulting in
> the following failures:
>
>
> * Patch [1/4] python*-git: upgrade to 2.1.0
> Issue Shortlog does not follow expected format
> [test_shortlog_format] Suggested fix Commit shortlog (first line of
> commit message) should follow the format "<target>: <summary>"
I guess our regex is being a bit strict here.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply
* [PATCH] maintainers: Change maintainers for python(3) modules
From: Jose Lamego @ 2016-11-16 21:45 UTC (permalink / raw)
To: openembedded-core
Some packages with recipes for both python2 and python3
must be upgraded simultaneously to avoid version conflicts
due to common dependencies.
This change distributes responsibilities to provide
a single maintainer for related recipes.
Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
---
meta-poky/conf/distro/include/maintainers.inc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-poky/conf/distro/include/maintainers.inc b/meta-poky/conf/distro/include/maintainers.inc
index 54410aa..cdf5c72 100644
--- a/meta-poky/conf/distro/include/maintainers.inc
+++ b/meta-poky/conf/distro/include/maintainers.inc
@@ -624,7 +624,7 @@ RECIPE_MAINTAINER_pn-python-imaging = "Jose Lamego <jose.a.lamego@linux.intel.co
RECIPE_MAINTAINER_pn-python-mako = "Jose Lamego <jose.a.lamego@linux.intel.com>"
RECIPE_MAINTAINER_pn-python-native = "Alejandro Hernandez <alejandro.hernandez@linux.intel.com>"
RECIPE_MAINTAINER_pn-python-nose = "Jose Lamego <jose.a.lamego@linux.intel.com>"
-RECIPE_MAINTAINER_pn-python-numpy = "Jose Lamego <jose.a.lamego@linux.intel.com>"
+RECIPE_MAINTAINER_pn-python-numpy = "Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>"
RECIPE_MAINTAINER_pn-python-pexpect = "Jose Lamego <jose.a.lamego@linux.intel.com>"
RECIPE_MAINTAINER_pn-python-ptyprocess = "Jose Lamego <jose.a.lamego@linux.intel.com>"
RECIPE_MAINTAINER_pn-python-pycairo = "Jose Lamego <jose.a.lamego@linux.intel.com>"
@@ -633,7 +633,7 @@ RECIPE_MAINTAINER_pn-python-pygtk = "Jose Lamego <jose.a.lamego@linux.intel.com>
RECIPE_MAINTAINER_pn-python-pyrex = "Jose Lamego <jose.a.lamego@linux.intel.com>"
RECIPE_MAINTAINER_pn-python-scons = "Jose Lamego <jose.a.lamego@linux.intel.com>"
RECIPE_MAINTAINER_pn-python-scons-native = "Jose Lamego <jose.a.lamego@linux.intel.com>"
-RECIPE_MAINTAINER_pn-python-setuptools = "Jose Lamego <jose.a.lamego@linux.intel.com>"
+RECIPE_MAINTAINER_pn-python-setuptools = "Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>"
RECIPE_MAINTAINER_pn-python-six = "Jose Lamego <jose.a.lamego@linux.intel.com>"
RECIPE_MAINTAINER_pn-python-smartpm = "Jose Lamego <jose.a.lamego@linux.intel.com>"
RECIPE_MAINTAINER_pn-python-smmap = "Jose Lamego <jose.a.lamego@linux.intel.com>"
@@ -642,9 +642,9 @@ RECIPE_MAINTAINER_pn-python3-async = "Edwin Plauchu <edwin.plauchu.camacho@linux
RECIPE_MAINTAINER_pn-python3-dbus = "Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>"
RECIPE_MAINTAINER_pn-python3-distribute = "Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>"
RECIPE_MAINTAINER_pn-python3-docutils = "Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>"
-RECIPE_MAINTAINER_pn-python3-git = "Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>"
+RECIPE_MAINTAINER_pn-python3-git = "Jose Lamego <jose.a.lamego@linux.intel.com>"
RECIPE_MAINTAINER_pn-python3-gitdb = "Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>"
-RECIPE_MAINTAINER_pn-python3-mako = "Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>"
+RECIPE_MAINTAINER_pn-python3-mako = "Jose Lamego <jose.a.lamego@linux.intel.com>"
RECIPE_MAINTAINER_pn-python3-native = "Alejandro Hernandez <alejandro.hernandez@linux.intel.com>"
RECIPE_MAINTAINER_pn-python3-nose = "Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>"
RECIPE_MAINTAINER_pn-python3-numpy = "Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>"
--
1.9.1
^ permalink raw reply related
* [PATCH 4/4] python-scons*: upgrade to 2.5.1
From: Jose Lamego @ 2016-11-16 21:22 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1479331336-14097-1-git-send-email-jose.a.lamego@linux.intel.com>
Both python-scons and python-scons-native need to be upgraded to latest
upstream version.
This change was tested using qemux86 with core-image-sato.
Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
---
.../{python-scons-native_2.5.0.bb => python-scons-native_2.5.1.bb} | 0
.../python/{python-scons_2.5.0.bb => python-scons_2.5.1.bb} | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-scons-native_2.5.0.bb => python-scons-native_2.5.1.bb} (100%)
rename meta/recipes-devtools/python/{python-scons_2.5.0.bb => python-scons_2.5.1.bb} (78%)
diff --git a/meta/recipes-devtools/python/python-scons-native_2.5.0.bb b/meta/recipes-devtools/python/python-scons-native_2.5.1.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-scons-native_2.5.0.bb
rename to meta/recipes-devtools/python/python-scons-native_2.5.1.bb
diff --git a/meta/recipes-devtools/python/python-scons_2.5.0.bb b/meta/recipes-devtools/python/python-scons_2.5.1.bb
similarity index 78%
rename from meta/recipes-devtools/python/python-scons_2.5.0.bb
rename to meta/recipes-devtools/python/python-scons_2.5.1.bb
index 8543c41..3f43856 100644
--- a/meta/recipes-devtools/python/python-scons_2.5.0.bb
+++ b/meta/recipes-devtools/python/python-scons_2.5.1.bb
@@ -6,8 +6,8 @@ SRCNAME = "scons"
SRC_URI = "https://files.pythonhosted.org/packages/source/s/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-SRC_URI[md5sum] = "bda5530a70a41a7831d83c8b191c021e"
-SRC_URI[sha256sum] = "01f1b3d6023516a8e1b5e77799e5a82a23b32953b1102d339059ffeca8600493"
+SRC_URI[md5sum] = "3eac81e5e8206304a9b4683c57665aa4"
+SRC_URI[sha256sum] = "c8de85fc02ed1a687b1f2ac791eaa0c1707b4382a204f17d782b5b111b9fdf07"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/SCons/"
--
1.9.1
^ permalink raw reply related
* [PATCH 3/4] python-pexpect: upgrade to 4.2.1
From: Jose Lamego @ 2016-11-16 21:22 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1479331336-14097-1-git-send-email-jose.a.lamego@linux.intel.com>
python-pexpect needs to be upgraded to latest upstream version.
This change was tested using qemux86 with core-image-sato
Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
---
.../python/{python-pexpect_4.2.0.bb => python-pexpect_4.2.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-pexpect_4.2.0.bb => python-pexpect_4.2.1.bb} (81%)
diff --git a/meta/recipes-devtools/python/python-pexpect_4.2.0.bb b/meta/recipes-devtools/python/python-pexpect_4.2.1.bb
similarity index 81%
rename from meta/recipes-devtools/python/python-pexpect_4.2.0.bb
rename to meta/recipes-devtools/python/python-pexpect_4.2.1.bb
index 82e0fa8..95a0790 100644
--- a/meta/recipes-devtools/python/python-pexpect_4.2.0.bb
+++ b/meta/recipes-devtools/python/python-pexpect_4.2.1.bb
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1c7a725251880af8c6a148181665385b"
SRCNAME = "pexpect"
SRC_URI = "https://files.pythonhosted.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz"
-SRC_URI[md5sum] = "8071ec5df0f3d515daedafad672d1632"
-SRC_URI[sha256sum] = "bf6816b8cc8d301a499e7adf338828b39bc7548eb64dbed4dd410ed93d95f853"
+SRC_URI[md5sum] = "3694410001a99dff83f0b500a1ca1c95"
+SRC_URI[sha256sum] = "3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/pexpect"
--
1.9.1
^ permalink raw reply related
* [PATCH 2/4] python*-mako: upgrade to 1.0.6
From: Jose Lamego @ 2016-11-16 21:22 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1479331336-14097-1-git-send-email-jose.a.lamego@linux.intel.com>
Both python-mako and python3-mako need to be upgraded to latest upstream
version.
This change was tested using qemux86 with core-image-sato.
Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
---
meta/recipes-devtools/python/python-mako.inc | 4 ++--
.../python/{python-mako_1.0.4.bb => python-mako_1.0.6.bb} | 0
.../python/{python3-mako_1.0.4.bb => python3-mako_1.0.6.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-mako_1.0.4.bb => python-mako_1.0.6.bb} (100%)
rename meta/recipes-devtools/python/{python3-mako_1.0.4.bb => python3-mako_1.0.6.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-mako.inc b/meta/recipes-devtools/python/python-mako.inc
index 85ec217..10364db 100644
--- a/meta/recipes-devtools/python/python-mako.inc
+++ b/meta/recipes-devtools/python/python-mako.inc
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1bb21fa2d2f7a534c884b990430a6863"
SRC_URI = "https://files.pythonhosted.org/packages/source/M/Mako/Mako-${PV}.tar.gz"
-SRC_URI[md5sum] = "c5fc31a323dd4990683d2f2da02d4e20"
-SRC_URI[sha256sum] = "fed99dbe4d0ddb27a33ee4910d8708aca9ef1fe854e668387a9ab9a90cbf9059"
+SRC_URI[md5sum] = "a28e22a339080316b2acc352b9ee631c"
+SRC_URI[sha256sum] = "48559ebd872a8e77f92005884b3d88ffae552812cdf17db6768e5c3be5ebbe0d"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/mako/"
UPSTREAM_CHECK_REGEX = "/Mako/(?P<pver>(\d+[\.\-_]*)+)"
diff --git a/meta/recipes-devtools/python/python-mako_1.0.4.bb b/meta/recipes-devtools/python/python-mako_1.0.6.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-mako_1.0.4.bb
rename to meta/recipes-devtools/python/python-mako_1.0.6.bb
diff --git a/meta/recipes-devtools/python/python3-mako_1.0.4.bb b/meta/recipes-devtools/python/python3-mako_1.0.6.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-mako_1.0.4.bb
rename to meta/recipes-devtools/python/python3-mako_1.0.6.bb
--
1.9.1
^ permalink raw reply related
* [PATCH 1/4] python*-git: upgrade to 2.1.0
From: Jose Lamego @ 2016-11-16 21:22 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1479331336-14097-1-git-send-email-jose.a.lamego@linux.intel.com>
Both python-git and python3-git need to be upgraded to latest upstream
version.
This change was tested using qemux86 with core-image-sato.
Signed-off-by: Jose Lamego <jose.a.lamego@linux.intel.com>
---
meta/recipes-devtools/python/python-git.inc | 4 ++--
.../python/{python-git_2.0.7.bb => python-git_2.1.0.bb} | 0
.../python/{python3-git_2.0.7.bb => python3-git_2.1.0.bb} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/python/{python-git_2.0.7.bb => python-git_2.1.0.bb} (100%)
rename meta/recipes-devtools/python/{python3-git_2.0.7.bb => python3-git_2.1.0.bb} (100%)
diff --git a/meta/recipes-devtools/python/python-git.inc b/meta/recipes-devtools/python/python-git.inc
index 13c097a..ad41561 100644
--- a/meta/recipes-devtools/python/python-git.inc
+++ b/meta/recipes-devtools/python/python-git.inc
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183"
SRC_URI = "https://files.pythonhosted.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz"
-SRC_URI[md5sum] = "aa0ba9df0abe4c8f35dd7bb9be85d56e"
-SRC_URI[sha256sum] = "d8e7adaacceedd3d043e6cd2544f57dbe00c53fc26374880b7cea67f3188aa68"
+SRC_URI[md5sum] = "29b1fcf504d080dc7a5e630957e829d7"
+SRC_URI[sha256sum] = "3ebda1e6ff1ef68597e41dcd1b99c2a5ae902f4dc2b22ad3533cc89c32b42aad"
UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/GitPython/"
UPSTREAM_CHECK_REGEX = "/GitPython/(?P<pver>(\d+[\.\-_]*)+)"
diff --git a/meta/recipes-devtools/python/python-git_2.0.7.bb b/meta/recipes-devtools/python/python-git_2.1.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python-git_2.0.7.bb
rename to meta/recipes-devtools/python/python-git_2.1.0.bb
diff --git a/meta/recipes-devtools/python/python3-git_2.0.7.bb b/meta/recipes-devtools/python/python3-git_2.1.0.bb
similarity index 100%
rename from meta/recipes-devtools/python/python3-git_2.0.7.bb
rename to meta/recipes-devtools/python/python3-git_2.1.0.bb
--
1.9.1
^ permalink raw reply related
* [PATCH 0/4] python-git and 3 more upgrades
From: Jose Lamego @ 2016-11-16 21:22 UTC (permalink / raw)
To: openembedded-core
The following python recipes needed to be upgraded to latest upstream
version.
These changes were tested using qemux86 with core-image-sato.
Jose Lamego (4):
python*-git: upgrade to 2.1.0
python*-mako: upgrade to 1.0.6
python-pexpect: upgrade to 4.2.1
python-scons*: upgrade to 2.5.1
meta/recipes-devtools/python/python-git.inc | 4 ++--
.../python/{python-git_2.0.7.bb => python-git_2.1.0.bb} | 0
meta/recipes-devtools/python/python-mako.inc | 4 ++--
.../python/{python-mako_1.0.4.bb => python-mako_1.0.6.bb} | 0
.../python/{python-pexpect_4.2.0.bb => python-pexpect_4.2.1.bb} | 4 ++--
.../{python-scons-native_2.5.0.bb => python-scons-native_2.5.1.bb} | 0
.../python/{python-scons_2.5.0.bb => python-scons_2.5.1.bb} | 4 ++--
.../python/{python3-git_2.0.7.bb => python3-git_2.1.0.bb} | 0
.../python/{python3-mako_1.0.4.bb => python3-mako_1.0.6.bb} | 0
9 files changed, 8 insertions(+), 8 deletions(-)
rename meta/recipes-devtools/python/{python-git_2.0.7.bb => python-git_2.1.0.bb} (100%)
rename meta/recipes-devtools/python/{python-mako_1.0.4.bb => python-mako_1.0.6.bb} (100%)
rename meta/recipes-devtools/python/{python-pexpect_4.2.0.bb => python-pexpect_4.2.1.bb} (81%)
rename meta/recipes-devtools/python/{python-scons-native_2.5.0.bb => python-scons-native_2.5.1.bb} (100%)
rename meta/recipes-devtools/python/{python-scons_2.5.0.bb => python-scons_2.5.1.bb} (78%)
rename meta/recipes-devtools/python/{python3-git_2.0.7.bb => python3-git_2.1.0.bb} (100%)
rename meta/recipes-devtools/python/{python3-mako_1.0.4.bb => python3-mako_1.0.6.bb} (100%)
--
1.9.1
^ permalink raw reply
* Re: [PATCH v2 1/3] module.bbclass: use Module.symvers for dependants
From: Denys Dmytriyenko @ 2016-11-16 20:18 UTC (permalink / raw)
To: André Draszik; +Cc: openembedded-core
In-Reply-To: <20160818075626.15973-2-git@andred.net>
On Thu, Aug 18, 2016 at 08:56:24AM +0100, André Draszik wrote:
> When compiling multiple external kernel modules, where one
> depends on the other, there are two problems at the
> moment:
> 1) we get compile time warnings from the kernel build
> system due to missing symbols (from modpost).
> 2) Any modules generated are missing dependency
> information (in the .modinfo elf section) for any
> dependencies outside the current source tree and
> outside the kernel itself.
>
> This is expected, but the kernel build system has a way to
> deal with this - the dependent module is expected to
> specify KBUILD_EXTRA_SYMBOLS (as a space-separated list)
> to point to any and all Module.symvers of kernel modules
> that are dependencies.
>
> While 1) by itself is not really a big issue, 2) prevents
> the packaging process from generating cross-source tree
> package dependencies.
>
> As a first step to solve the missing dependencies in
> packages created, we:
> 1) install Module.symvers of all external kernel module
> builds (into a location that is automatically packaged
> into the -dev package)
> 2) make use of KBUILD_EXTRA_SYMBOLS and pass the location
> of all Module.symvers of all kernel-module-* packages
> we depend on
>
> This solves both problems mentioned above.
>
> Signed-off-by: André Draszik <git@andred.net>
> ---
> meta/classes/module.bbclass | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/meta/classes/module.bbclass b/meta/classes/module.bbclass
> index 01c9309..68e3d34 100644
> --- a/meta/classes/module.bbclass
> +++ b/meta/classes/module.bbclass
> @@ -8,6 +8,15 @@ EXTRA_OEMAKE += "KERNEL_SRC=${STAGING_KERNEL_DIR}"
>
> MODULES_INSTALL_TARGET ?= "modules_install"
>
> +python __anonymous () {
> + depends = d.getVar('DEPENDS', True)
> + extra_symbols = []
> + for dep in depends.split():
> + if dep.startswith("kernel-module-"):
> + extra_symbols.append("${STAGING_INCDIR}/" + dep + "/Module.symvers")
> + d.setVar('KBUILD_EXTRA_SYMBOLS', " ".join(extra_symbols))
> +}
> +
> module_do_compile() {
> unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
> oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \
> @@ -15,6 +24,7 @@ module_do_compile() {
> CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
> AR="${KERNEL_AR}" \
> O=${STAGING_KERNEL_BUILDDIR} \
> + KBUILD_EXTRA_SYMBOLS="${KBUILD_EXTRA_SYMBOLS}" \
> ${MAKE_TARGETS}
> }
>
> @@ -24,6 +34,11 @@ module_do_install() {
> CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
> O=${STAGING_KERNEL_BUILDDIR} \
> ${MODULES_INSTALL_TARGET}
> +
> + install -d -m0755 ${D}${includedir}/${BPN}
> + cp -a --no-preserve=ownership ${B}/Module.symvers ${D}${includedir}/${BPN}
Hmm, why is Module.symvers expected to be in the root of ${B}? This seems like
a very artificial assumption/requirement!
I have some out-of-tree modules with complicated hierarchies and it worked
fine so far until this change, because there were only 2 well defined
interfaces - make ${MAKE_TARGETS} and make ${MODULES_INSTALL_TARGET} - and
both of them know where the resulting module .ko resides deep inside ${B}
hierarchy.
I wonder if this should have been rolled into ${MODULES_INSTALL_TARGET}
step...
--
Denys
> + # it doesn't actually seem to matter which path is specified here
> + sed -e 's:${B}/::g' -i ${D}${includedir}/${BPN}/Module.symvers
> }
>
> EXPORT_FUNCTIONS do_compile do_install
> --
> 2.9.3
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply
* Re: [PATCH v2] libpcap: Update to version 1.8.1
From: Fabio Berton @ 2016-11-16 19:47 UTC (permalink / raw)
To: Martin Jansa; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <20161116194141.GC16451@jama>
[-- Attachment #1: Type: text/plain, Size: 15717 bytes --]
Hi Martin,
I'll look into this.
Thanks.
On Wed, Nov 16, 2016 at 5:41 PM, Martin Jansa <martin.jansa@gmail.com>
wrote:
> On Tue, Nov 08, 2016 at 09:52:48AM -0200, Fabio Berton wrote:
> > - Option --enable-canusb was removed on commit:
> > https://github.com/the-tcpdump-group/libpcap/commit/
> 93ca5ff7030aaf1219e1de05ec89a68384bfc50b
> > - Autotools class was improved and we can now stop aclocal from
> running at all.
> > - File configure.in was renamed to configure.ac, rework
> libpcap-pkgconfig-support
> > patch and do_configure_prepend task to use configure.ac file.
> >
> > Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> > ---
> > meta/recipes-connectivity/libpcap/libpcap.inc | 5 +-
> > .../libpcap/libpcap/aclocal.patch | 167
> ---------------------
> > .../libpcap/libpcap-pkgconfig-support.patch | 32 ++--
> > .../libpcap/{libpcap_1.7.4.bb => libpcap_1.8.1.bb} | 13 +-
> > 4 files changed, 25 insertions(+), 192 deletions(-)
> > delete mode 100644 meta/recipes-connectivity/
> libpcap/libpcap/aclocal.patch
> > rename meta/recipes-connectivity/libpcap/{libpcap_1.7.4.bb =>
> libpcap_1.8.1.bb} (67%)
> >
> > diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc
> b/meta/recipes-connectivity/libpcap/libpcap.inc
> > index 7b29a52..4453a9e 100644
> > --- a/meta/recipes-connectivity/libpcap/libpcap.inc
> > +++ b/meta/recipes-connectivity/libpcap/libpcap.inc
> > @@ -19,6 +19,7 @@ BINCONFIG = "${bindir}/pcap-config"
> > inherit autotools binconfig-disabled pkgconfig bluetooth
> >
> > EXTRA_OECONF = "--with-pcap=linux"
> > +EXTRA_AUTORECONF += "--exclude=aclocal"
> >
> > PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES',
> 'bluetooth', '${BLUEZ}', '', d)} \
> > ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6',
> 'ipv6', '', d)} \
> > @@ -26,7 +27,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES',
> 'bluetooth', '${BLUEZ
> > PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
> > # Add a dummy PACKAGECONFIG for bluez5 since it is not supported by
> libpcap.
> > PACKAGECONFIG[bluez5] = ",,"
> > -PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
> > PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
> > PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
>
> This version fails to build without ipv6 in PACKAGECONFIG with this
> error:
>
> | i586-oe-linux-gcc -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/sysroots/qemux86
> -I../libpcap-1.8.1 -fvisibility=hidden -fpic -I/OE/build/oe-core/tmp-glibc/
> work/i586-oe-linux/libpcap/1.8.1-r0/libpcap-1.8.1 -O2 -pipe -g
> -feliminate-unused-debug-types -fdebug-prefix-map=/OE/build/
> oe-core/tmp-glibc/work/i586-oe-linux/libpcap/1.8.1-r0=/usr/src/debug/libpcap/1.8.1-r0
> -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux=
> -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/sysroots/qemux86= -I.
> -DBUILDING_PCAP -DHAVE_CONFIG_H -D_U_="__attribute__((unused))"
> -I/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/libpcap/1.8.1-r0/libpcap-1.8.1
> -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/OE/build/
> oe-core/tmp-glibc/work/i586-oe-linux/libpcap/1.8.1-r0=/usr/src/debug/libpcap/1.8.1-r0
> -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux=
> -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/sysroots/qemux86= -c
> scanner.c
> | ../libpcap-1.8.1/gencode.c: In function 'pcap_compile':
> | ../libpcap-1.8.1/gencode.c:693:8: error: 'compiler_state_t {aka struct
> _compiler_state}' has no member named 'ai'
> | cstate.ai = NULL;
> | ^
> | ../libpcap-1.8.1/gencode.c: In function 'gen_gateway':
> | ../libpcap-1.8.1/gencode.c:4914:13: error: 'cstate' undeclared (first
> use in this function)
> | bpf_error(cstate, "direction applied to 'gateway'");
> | ^~~~~~
> | ../libpcap-1.8.1/gencode.c:4914:13: note: each undeclared identifier is
> reported only once for each function it appears in
> | config.status: creating pcap-config.tmp
> | make: *** [Makefile:478: gencode.o] Error 1
> | make: *** Waiting for unfinished jobs....
> | mv pcap-config.tmp pcap-config
> | chmod a+x pcap-config
>
> Version 1.7.4 was building fine without it.
>
> > PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
> > @@ -36,8 +36,5 @@ CFLAGS_prepend = "-I${S} "
> > CXXFLAGS_prepend = "-I${S} "
> >
> > do_configure_prepend () {
> > - if [ ! -e ${S}/acinclude.m4 ]; then
> > - cat ${S}/aclocal.m4 > ${S}/acinclude.m4
> > - fi
> > sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in
> > }
> > diff --git a/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch
> b/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch
> > deleted file mode 100644
> > index 2151982..0000000
> > --- a/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch
> > +++ /dev/null
> > @@ -1,167 +0,0 @@
> > -Upstream-Status: Inappropriate [configuration]
> > -
> > -diff -ruN libpcap-1.1.1-orig/aclocal.m4 libpcap-1.1.1/aclocal.m4
> > ---- libpcap-1.1.1-orig/aclocal.m4 2010-06-29 10:46:32.815117569 +0800
> > -+++ libpcap-1.1.1/aclocal.m4 2010-06-29 10:49:17.150149949 +0800
> > -@@ -37,7 +37,7 @@
> > - dnl AC_LBL_C_INIT. Now, we run AC_LBL_C_INIT_BEFORE_CC, AC_PROG_CC,
> > - dnl and AC_LBL_C_INIT at the top level.
> > - dnl
> > --AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC,
> > -+AC_DEFUN([AC_LBL_C_INIT_BEFORE_CC],
> > - [
> > - AC_BEFORE([$0], [AC_LBL_C_INIT])
> > - AC_BEFORE([$0], [AC_PROG_CC])
> > -@@ -90,7 +90,7 @@
> > - dnl LDFLAGS
> > - dnl LBL_CFLAGS
> > - dnl
> > --AC_DEFUN(AC_LBL_C_INIT,
> > -+AC_DEFUN([AC_LBL_C_INIT],
> > - [
> > - AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
> > - AC_BEFORE([$0], [AC_LBL_DEVEL])
> > -@@ -217,7 +217,7 @@
> > - dnl V_SONAME_OPT
> > - dnl V_RPATH_OPT
> > - dnl
> > --AC_DEFUN(AC_LBL_SHLIBS_INIT,
> > -+AC_DEFUN([AC_LBL_SHLIBS_INIT],
> > - [AC_PREREQ(2.50)
> > - if test "$GCC" = yes ; then
> > - #
> > -@@ -361,7 +361,7 @@
> > - # Make sure we use the V_CCOPT flags, because some of those might
> > - # disable inlining.
> > - #
> > --AC_DEFUN(AC_LBL_C_INLINE,
> > -+AC_DEFUN([AC_LBL_C_INLINE],
> > - [AC_MSG_CHECKING(for inline)
> > - save_CFLAGS="$CFLAGS"
> > - CFLAGS="$V_CCOPT"
> > -@@ -407,7 +407,7 @@
> > - dnl
> > - dnl AC_LBL_FIXINCLUDES
> > - dnl
> > --AC_DEFUN(AC_LBL_FIXINCLUDES,
> > -+AC_DEFUN([AC_LBL_FIXINCLUDES],
> > - [if test "$GCC" = yes ; then
> > - AC_MSG_CHECKING(for ANSI ioctl definitions)
> > - AC_CACHE_VAL(ac_cv_lbl_gcc_fixincludes,
> > -@@ -453,7 +453,7 @@
> > - dnl $2 (yacc appended)
> > - dnl $3 (optional flex and bison -P prefix)
> > - dnl
> > --AC_DEFUN(AC_LBL_LEX_AND_YACC,
> > -+AC_DEFUN([AC_LBL_LEX_AND_YACC],
> > - [AC_ARG_WITH(flex, [ --without-flex don't use flex])
> > - AC_ARG_WITH(bison, [ --without-bison don't use bison])
> > - if test "$with_flex" = no ; then
> > -@@ -506,7 +506,7 @@
> > - dnl
> > - dnl DECLWAITSTATUS (defined)
> > - dnl
> > --AC_DEFUN(AC_LBL_UNION_WAIT,
> > -+AC_DEFUN([AC_LBL_UNION_WAIT],
> > - [AC_MSG_CHECKING(if union wait is used)
> > - AC_CACHE_VAL(ac_cv_lbl_union_wait,
> > - AC_TRY_COMPILE([
> > -@@ -535,7 +535,7 @@
> > - dnl
> > - dnl HAVE_SOCKADDR_SA_LEN (defined)
> > - dnl
> > --AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN,
> > -+AC_DEFUN([AC_LBL_SOCKADDR_SA_LEN],
> > - [AC_MSG_CHECKING(if sockaddr struct has the sa_len member)
> > - AC_CACHE_VAL(ac_cv_lbl_sockaddr_has_sa_len,
> > - AC_TRY_COMPILE([
> > -@@ -560,7 +560,7 @@
> > - dnl
> > - dnl HAVE_SOCKADDR_STORAGE (defined)
> > - dnl
> > --AC_DEFUN(AC_LBL_SOCKADDR_STORAGE,
> > -+AC_DEFUN([AC_LBL_SOCKADDR_STORAGE],
> > - [AC_MSG_CHECKING(if sockaddr_storage struct exists)
> > - AC_CACHE_VAL(ac_cv_lbl_has_sockaddr_storage,
> > - AC_TRY_COMPILE([
> > -@@ -593,7 +593,7 @@
> > - dnl won't be using code that would use that member, or we wouldn't
> > - dnl compile in any case).
> > - dnl
> > --AC_DEFUN(AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1,
> > -+AC_DEFUN([AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1],
> > - [AC_MSG_CHECKING(if dl_hp_ppa_info_t struct has dl_module_id_1
> member)
> > - AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1,
> > - AC_TRY_COMPILE([
> > -@@ -619,7 +619,7 @@
> > - dnl
> > - dnl ac_cv_lbl_have_run_path (yes or no)
> > - dnl
> > --AC_DEFUN(AC_LBL_HAVE_RUN_PATH,
> > -+AC_DEFUN([AC_LBL_HAVE_RUN_PATH],
> > - [AC_MSG_CHECKING(for ${CC-cc} -R)
> > - AC_CACHE_VAL(ac_cv_lbl_have_run_path,
> > - [echo 'main(){}' > conftest.c
> > -@@ -644,7 +644,7 @@
> > - dnl
> > - dnl LBL_ALIGN (DEFINED)
> > - dnl
> > --AC_DEFUN(AC_LBL_UNALIGNED_ACCESS,
> > -+AC_DEFUN([AC_LBL_UNALIGNED_ACCESS],
> > - [AC_MSG_CHECKING(if unaligned accesses fail)
> > - AC_CACHE_VAL(ac_cv_lbl_unaligned_fail,
> > - [case "$host_cpu" in
> > -@@ -749,7 +749,7 @@
> > - dnl HAVE_OS_PROTO_H (defined)
> > - dnl os-proto.h (symlinked)
> > - dnl
> > --AC_DEFUN(AC_LBL_DEVEL,
> > -+AC_DEFUN([AC_LBL_DEVEL],
> > - [rm -f os-proto.h
> > - if test "${LBL_CFLAGS+set}" = set; then
> > - $1="$$1 ${LBL_CFLAGS}"
> > -@@ -886,7 +886,7 @@
> > - dnl statically and happen to have a libresolv.a lying around (and no
> > - dnl libnsl.a).
> > - dnl
> > --AC_DEFUN(AC_LBL_LIBRARY_NET, [
> > -+AC_DEFUN([AC_LBL_LIBRARY_NET], [
> > - # Most operating systems have gethostbyname() in the default
> searched
> > - # libraries (i.e. libc):
> > - # Some OSes (eg. Solaris) place it in libnsl
> > -@@ -909,7 +909,7 @@
> > - dnl Test for __attribute__
> > - dnl
> > -
> > --AC_DEFUN(AC_C___ATTRIBUTE__, [
> > -+AC_DEFUN([AC_C___ATTRIBUTE__], [
> > - AC_MSG_CHECKING(for __attribute__)
> > - AC_CACHE_VAL(ac_cv___attribute__, [
> > - AC_COMPILE_IFELSE(
> > -@@ -947,7 +947,7 @@
> > - dnl
> > - dnl -Scott Barron
> > - dnl
> > --AC_DEFUN(AC_LBL_TPACKET_STATS,
> > -+AC_DEFUN([AC_LBL_TPACKET_STATS],
> > - [AC_MSG_CHECKING(if if_packet.h has tpacket_stats defined)
> > - AC_CACHE_VAL(ac_cv_lbl_tpacket_stats,
> > - AC_TRY_COMPILE([
> > -@@ -976,7 +976,7 @@
> > - dnl doesn't have that member (which is OK, as either we won't be using
> > - dnl code that would use that member, or we wouldn't compile in any
> case).
> > - dnl
> > --AC_DEFUN(AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI,
> > -+AC_DEFUN([AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI],
> > - [AC_MSG_CHECKING(if tpacket_auxdata struct has tp_vlan_tci member)
> > - AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1,
> > - AC_TRY_COMPILE([
> > -@@ -1003,7 +1003,7 @@
> > - dnl
> > - dnl HAVE_DLPI_PASSIVE (defined)
> > - dnl
> > --AC_DEFUN(AC_LBL_DL_PASSIVE_REQ_T,
> > -+AC_DEFUN([AC_LBL_DL_PASSIVE_REQ_T],
> > - [AC_MSG_CHECKING(if dl_passive_req_t struct exists)
> > - AC_CACHE_VAL(ac_cv_lbl_has_dl_passive_req_t,
> > - AC_TRY_COMPILE([
> > diff --git a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
> b/meta/recipes-connectivity/libpcap/libpcap/libpcap-
> pkgconfig-support.patch
> > index b861513..afaa3be 100644
> > --- a/meta/recipes-connectivity/libpcap/libpcap/libpcap-
> pkgconfig-support.patch
> > +++ b/meta/recipes-connectivity/libpcap/libpcap/libpcap-
> pkgconfig-support.patch
> > @@ -1,25 +1,27 @@
> > -From 8887132e85892a72a84ca3878e60f254ad2ce939 Mon Sep 17 00:00:00 2001
> > -From: Joe MacDonald <joe_macdonald@mentor.com>
> > -Date: Tue, 24 Feb 2015 15:56:06 -0500
> > +From 2796129af52901dd68595e5e88a639308541def9 Mon Sep 17 00:00:00 2001
> > +From: Fabio Berton <fabio.berton@ossystems.com.br>
> > +Date: Thu, 3 Nov 2016 17:56:29 -0200
> > Subject: [PATCH] libpcap: pkgconfig support
> > +Organization: O.S. Systems Software LTDA.
> >
> > Adding basic structure to support pkg-config.
> >
> > Upstream-Status: Inappropriate [embedded specific]
> >
> > Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
> > +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> > ---
> > Makefile.in | 5 +++++
> > - configure.in | 1 +
> > + configure.ac | 1 +
> > libpcap.pc.in | 10 ++++++++++
> > 3 files changed, 16 insertions(+)
> > create mode 100644 libpcap.pc.in
> >
> > diff --git a/Makefile.in b/Makefile.in
> > -index 1c2d745..1f25faf 100644
> > +index e71d973..d7004ed 100644
> > --- a/Makefile.in
> > +++ b/Makefile.in
> > -@@ -60,6 +60,10 @@ V_RPATH_OPT = @V_RPATH_OPT@
> > +@@ -61,6 +61,10 @@ V_RPATH_OPT = @V_RPATH_OPT@
> > DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
> > PROG=libpcap
> >
> > @@ -30,19 +32,19 @@ index 1c2d745..1f25faf 100644
> > # Standard CFLAGS
> > FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
> >
> > -@@ -275,6 +279,7 @@ EXTRA_DIST = \
> > +@@ -286,6 +290,7 @@ EXTRA_DIST = \
> > lbl/os-solaris2.h \
> > lbl/os-sunos4.h \
> > lbl/os-ultrix4.h \
> > + libpcap.pc \
> > + missing/getopt.c \
> > + missing/getopt.h \
> > missing/snprintf.c \
> > - mkdep \
> > - msdos/bin2c.c \
> > -diff --git a/configure.in b/configure.in
> > -index 8f5c86b..fb51b35 100644
> > ---- a/configure.in
> > -+++ b/configure.in
> > -@@ -1700,6 +1700,7 @@ esac
> > +diff --git a/configure.ac b/configure.ac
> > +index da2f940..4fc67bf 100644
> > +--- a/configure.ac
> > ++++ b/configure.ac
> > +@@ -1805,6 +1805,7 @@ fi
> > AC_PROG_INSTALL
> >
> > AC_CONFIG_HEADER(config.h)
> > @@ -67,5 +69,5 @@ index 0000000..4f78ad8
> > +Libs: -L${libdir} -lpcap
> > +Cflags: -I${includedir}
> > --
> > -1.9.1
> > +2.1.4
> >
> > diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.7.4.bb
> b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
> > similarity index 67%
> > rename from meta/recipes-connectivity/libpcap/libpcap_1.7.4.bb
> > rename to meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
> > index 8d12b25..9072fe0 100644
> > --- a/meta/recipes-connectivity/libpcap/libpcap_1.7.4.bb
> > +++ b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
> > @@ -1,10 +1,11 @@
> > require libpcap.inc
> >
> > -SRC_URI += "file://aclocal.patch \
> > - file://libpcap-pkgconfig-support.patch \
> > - "
> > -SRC_URI[md5sum] = "b2e13142bbaba857ab1c6894aedaf547"
> > -SRC_URI[sha256sum] = "7ad3112187e88328b85e46dce7a9b9
> 49632af18ee74d97ffc3f2b41fe7f448b0"
> > +SRC_URI += " \
> > + file://libpcap-pkgconfig-support.patch \
> > +"
> > +
> > +SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"
> > +SRC_URI[sha256sum] = "673dbc69fdc3f5a86fb5759ab19899
> 039a8e5e6c631749e48dcd9c6f0c83541e"
> >
> > #
> > # make install doesn't cover the shared lib
> > @@ -13,7 +14,7 @@ SRC_URI[sha256sum] = "7ad3112187e88328b85e46dce7a9b9
> 49632af18ee74d97ffc3f2b41fe7
> >
> > do_configure_prepend () {
> > #remove hardcoded references to /usr/include
> > - sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i
> ${S}/configure.in
> > + sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i
> ${S}/configure.ac
> > }
> >
> > do_install_prepend () {
> > --
> > 2.1.4
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
>
[-- Attachment #2: Type: text/html, Size: 22168 bytes --]
^ permalink raw reply
* Re: [PATCH v2] libpcap: Update to version 1.8.1
From: Martin Jansa @ 2016-11-16 19:41 UTC (permalink / raw)
To: Fabio Berton; +Cc: openembedded-core
In-Reply-To: <1478605968-18575-1-git-send-email-fabio.berton@ossystems.com.br>
[-- Attachment #1: Type: text/plain, Size: 14711 bytes --]
On Tue, Nov 08, 2016 at 09:52:48AM -0200, Fabio Berton wrote:
> - Option --enable-canusb was removed on commit:
> https://github.com/the-tcpdump-group/libpcap/commit/93ca5ff7030aaf1219e1de05ec89a68384bfc50b
> - Autotools class was improved and we can now stop aclocal from running at all.
> - File configure.in was renamed to configure.ac, rework libpcap-pkgconfig-support
> patch and do_configure_prepend task to use configure.ac file.
>
> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> ---
> meta/recipes-connectivity/libpcap/libpcap.inc | 5 +-
> .../libpcap/libpcap/aclocal.patch | 167 ---------------------
> .../libpcap/libpcap-pkgconfig-support.patch | 32 ++--
> .../libpcap/{libpcap_1.7.4.bb => libpcap_1.8.1.bb} | 13 +-
> 4 files changed, 25 insertions(+), 192 deletions(-)
> delete mode 100644 meta/recipes-connectivity/libpcap/libpcap/aclocal.patch
> rename meta/recipes-connectivity/libpcap/{libpcap_1.7.4.bb => libpcap_1.8.1.bb} (67%)
>
> diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
> index 7b29a52..4453a9e 100644
> --- a/meta/recipes-connectivity/libpcap/libpcap.inc
> +++ b/meta/recipes-connectivity/libpcap/libpcap.inc
> @@ -19,6 +19,7 @@ BINCONFIG = "${bindir}/pcap-config"
> inherit autotools binconfig-disabled pkgconfig bluetooth
>
> EXTRA_OECONF = "--with-pcap=linux"
> +EXTRA_AUTORECONF += "--exclude=aclocal"
>
> PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
> ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
> @@ -26,7 +27,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ
> PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
> # Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap.
> PACKAGECONFIG[bluez5] = ",,"
> -PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
> PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
> PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
This version fails to build without ipv6 in PACKAGECONFIG with this
error:
| i586-oe-linux-gcc -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/sysroots/qemux86 -I../libpcap-1.8.1 -fvisibility=hidden -fpic -I/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/libpcap/1.8.1-r0/libpcap-1.8.1 -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/libpcap/1.8.1-r0=/usr/src/debug/libpcap/1.8.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/sysroots/qemux86= -I. -DBUILDING_PCAP -DHAVE_CONFIG_H -D_U_="__attribute__((unused))" -I/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/libpcap/1.8.1-r0/libpcap-1.8.1 -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/libpcap/1.8.1-r0=/usr/src/debug/libpcap/1.8.1-r0 -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/sysroots/x86_64-linux= -fdebug-prefix-map=/OE/build/oe-core/tmp-glibc/sysroots/qemux86= -c scanner.c
| ../libpcap-1.8.1/gencode.c: In function 'pcap_compile':
| ../libpcap-1.8.1/gencode.c:693:8: error: 'compiler_state_t {aka struct _compiler_state}' has no member named 'ai'
| cstate.ai = NULL;
| ^
| ../libpcap-1.8.1/gencode.c: In function 'gen_gateway':
| ../libpcap-1.8.1/gencode.c:4914:13: error: 'cstate' undeclared (first use in this function)
| bpf_error(cstate, "direction applied to 'gateway'");
| ^~~~~~
| ../libpcap-1.8.1/gencode.c:4914:13: note: each undeclared identifier is reported only once for each function it appears in
| config.status: creating pcap-config.tmp
| make: *** [Makefile:478: gencode.o] Error 1
| make: *** Waiting for unfinished jobs....
| mv pcap-config.tmp pcap-config
| chmod a+x pcap-config
Version 1.7.4 was building fine without it.
> PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
> @@ -36,8 +36,5 @@ CFLAGS_prepend = "-I${S} "
> CXXFLAGS_prepend = "-I${S} "
>
> do_configure_prepend () {
> - if [ ! -e ${S}/acinclude.m4 ]; then
> - cat ${S}/aclocal.m4 > ${S}/acinclude.m4
> - fi
> sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in
> }
> diff --git a/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch b/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch
> deleted file mode 100644
> index 2151982..0000000
> --- a/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch
> +++ /dev/null
> @@ -1,167 +0,0 @@
> -Upstream-Status: Inappropriate [configuration]
> -
> -diff -ruN libpcap-1.1.1-orig/aclocal.m4 libpcap-1.1.1/aclocal.m4
> ---- libpcap-1.1.1-orig/aclocal.m4 2010-06-29 10:46:32.815117569 +0800
> -+++ libpcap-1.1.1/aclocal.m4 2010-06-29 10:49:17.150149949 +0800
> -@@ -37,7 +37,7 @@
> - dnl AC_LBL_C_INIT. Now, we run AC_LBL_C_INIT_BEFORE_CC, AC_PROG_CC,
> - dnl and AC_LBL_C_INIT at the top level.
> - dnl
> --AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC,
> -+AC_DEFUN([AC_LBL_C_INIT_BEFORE_CC],
> - [
> - AC_BEFORE([$0], [AC_LBL_C_INIT])
> - AC_BEFORE([$0], [AC_PROG_CC])
> -@@ -90,7 +90,7 @@
> - dnl LDFLAGS
> - dnl LBL_CFLAGS
> - dnl
> --AC_DEFUN(AC_LBL_C_INIT,
> -+AC_DEFUN([AC_LBL_C_INIT],
> - [
> - AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
> - AC_BEFORE([$0], [AC_LBL_DEVEL])
> -@@ -217,7 +217,7 @@
> - dnl V_SONAME_OPT
> - dnl V_RPATH_OPT
> - dnl
> --AC_DEFUN(AC_LBL_SHLIBS_INIT,
> -+AC_DEFUN([AC_LBL_SHLIBS_INIT],
> - [AC_PREREQ(2.50)
> - if test "$GCC" = yes ; then
> - #
> -@@ -361,7 +361,7 @@
> - # Make sure we use the V_CCOPT flags, because some of those might
> - # disable inlining.
> - #
> --AC_DEFUN(AC_LBL_C_INLINE,
> -+AC_DEFUN([AC_LBL_C_INLINE],
> - [AC_MSG_CHECKING(for inline)
> - save_CFLAGS="$CFLAGS"
> - CFLAGS="$V_CCOPT"
> -@@ -407,7 +407,7 @@
> - dnl
> - dnl AC_LBL_FIXINCLUDES
> - dnl
> --AC_DEFUN(AC_LBL_FIXINCLUDES,
> -+AC_DEFUN([AC_LBL_FIXINCLUDES],
> - [if test "$GCC" = yes ; then
> - AC_MSG_CHECKING(for ANSI ioctl definitions)
> - AC_CACHE_VAL(ac_cv_lbl_gcc_fixincludes,
> -@@ -453,7 +453,7 @@
> - dnl $2 (yacc appended)
> - dnl $3 (optional flex and bison -P prefix)
> - dnl
> --AC_DEFUN(AC_LBL_LEX_AND_YACC,
> -+AC_DEFUN([AC_LBL_LEX_AND_YACC],
> - [AC_ARG_WITH(flex, [ --without-flex don't use flex])
> - AC_ARG_WITH(bison, [ --without-bison don't use bison])
> - if test "$with_flex" = no ; then
> -@@ -506,7 +506,7 @@
> - dnl
> - dnl DECLWAITSTATUS (defined)
> - dnl
> --AC_DEFUN(AC_LBL_UNION_WAIT,
> -+AC_DEFUN([AC_LBL_UNION_WAIT],
> - [AC_MSG_CHECKING(if union wait is used)
> - AC_CACHE_VAL(ac_cv_lbl_union_wait,
> - AC_TRY_COMPILE([
> -@@ -535,7 +535,7 @@
> - dnl
> - dnl HAVE_SOCKADDR_SA_LEN (defined)
> - dnl
> --AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN,
> -+AC_DEFUN([AC_LBL_SOCKADDR_SA_LEN],
> - [AC_MSG_CHECKING(if sockaddr struct has the sa_len member)
> - AC_CACHE_VAL(ac_cv_lbl_sockaddr_has_sa_len,
> - AC_TRY_COMPILE([
> -@@ -560,7 +560,7 @@
> - dnl
> - dnl HAVE_SOCKADDR_STORAGE (defined)
> - dnl
> --AC_DEFUN(AC_LBL_SOCKADDR_STORAGE,
> -+AC_DEFUN([AC_LBL_SOCKADDR_STORAGE],
> - [AC_MSG_CHECKING(if sockaddr_storage struct exists)
> - AC_CACHE_VAL(ac_cv_lbl_has_sockaddr_storage,
> - AC_TRY_COMPILE([
> -@@ -593,7 +593,7 @@
> - dnl won't be using code that would use that member, or we wouldn't
> - dnl compile in any case).
> - dnl
> --AC_DEFUN(AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1,
> -+AC_DEFUN([AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1],
> - [AC_MSG_CHECKING(if dl_hp_ppa_info_t struct has dl_module_id_1 member)
> - AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1,
> - AC_TRY_COMPILE([
> -@@ -619,7 +619,7 @@
> - dnl
> - dnl ac_cv_lbl_have_run_path (yes or no)
> - dnl
> --AC_DEFUN(AC_LBL_HAVE_RUN_PATH,
> -+AC_DEFUN([AC_LBL_HAVE_RUN_PATH],
> - [AC_MSG_CHECKING(for ${CC-cc} -R)
> - AC_CACHE_VAL(ac_cv_lbl_have_run_path,
> - [echo 'main(){}' > conftest.c
> -@@ -644,7 +644,7 @@
> - dnl
> - dnl LBL_ALIGN (DEFINED)
> - dnl
> --AC_DEFUN(AC_LBL_UNALIGNED_ACCESS,
> -+AC_DEFUN([AC_LBL_UNALIGNED_ACCESS],
> - [AC_MSG_CHECKING(if unaligned accesses fail)
> - AC_CACHE_VAL(ac_cv_lbl_unaligned_fail,
> - [case "$host_cpu" in
> -@@ -749,7 +749,7 @@
> - dnl HAVE_OS_PROTO_H (defined)
> - dnl os-proto.h (symlinked)
> - dnl
> --AC_DEFUN(AC_LBL_DEVEL,
> -+AC_DEFUN([AC_LBL_DEVEL],
> - [rm -f os-proto.h
> - if test "${LBL_CFLAGS+set}" = set; then
> - $1="$$1 ${LBL_CFLAGS}"
> -@@ -886,7 +886,7 @@
> - dnl statically and happen to have a libresolv.a lying around (and no
> - dnl libnsl.a).
> - dnl
> --AC_DEFUN(AC_LBL_LIBRARY_NET, [
> -+AC_DEFUN([AC_LBL_LIBRARY_NET], [
> - # Most operating systems have gethostbyname() in the default searched
> - # libraries (i.e. libc):
> - # Some OSes (eg. Solaris) place it in libnsl
> -@@ -909,7 +909,7 @@
> - dnl Test for __attribute__
> - dnl
> -
> --AC_DEFUN(AC_C___ATTRIBUTE__, [
> -+AC_DEFUN([AC_C___ATTRIBUTE__], [
> - AC_MSG_CHECKING(for __attribute__)
> - AC_CACHE_VAL(ac_cv___attribute__, [
> - AC_COMPILE_IFELSE(
> -@@ -947,7 +947,7 @@
> - dnl
> - dnl -Scott Barron
> - dnl
> --AC_DEFUN(AC_LBL_TPACKET_STATS,
> -+AC_DEFUN([AC_LBL_TPACKET_STATS],
> - [AC_MSG_CHECKING(if if_packet.h has tpacket_stats defined)
> - AC_CACHE_VAL(ac_cv_lbl_tpacket_stats,
> - AC_TRY_COMPILE([
> -@@ -976,7 +976,7 @@
> - dnl doesn't have that member (which is OK, as either we won't be using
> - dnl code that would use that member, or we wouldn't compile in any case).
> - dnl
> --AC_DEFUN(AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI,
> -+AC_DEFUN([AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI],
> - [AC_MSG_CHECKING(if tpacket_auxdata struct has tp_vlan_tci member)
> - AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1,
> - AC_TRY_COMPILE([
> -@@ -1003,7 +1003,7 @@
> - dnl
> - dnl HAVE_DLPI_PASSIVE (defined)
> - dnl
> --AC_DEFUN(AC_LBL_DL_PASSIVE_REQ_T,
> -+AC_DEFUN([AC_LBL_DL_PASSIVE_REQ_T],
> - [AC_MSG_CHECKING(if dl_passive_req_t struct exists)
> - AC_CACHE_VAL(ac_cv_lbl_has_dl_passive_req_t,
> - AC_TRY_COMPILE([
> diff --git a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch b/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
> index b861513..afaa3be 100644
> --- a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
> +++ b/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
> @@ -1,25 +1,27 @@
> -From 8887132e85892a72a84ca3878e60f254ad2ce939 Mon Sep 17 00:00:00 2001
> -From: Joe MacDonald <joe_macdonald@mentor.com>
> -Date: Tue, 24 Feb 2015 15:56:06 -0500
> +From 2796129af52901dd68595e5e88a639308541def9 Mon Sep 17 00:00:00 2001
> +From: Fabio Berton <fabio.berton@ossystems.com.br>
> +Date: Thu, 3 Nov 2016 17:56:29 -0200
> Subject: [PATCH] libpcap: pkgconfig support
> +Organization: O.S. Systems Software LTDA.
>
> Adding basic structure to support pkg-config.
>
> Upstream-Status: Inappropriate [embedded specific]
>
> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
> +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> ---
> Makefile.in | 5 +++++
> - configure.in | 1 +
> + configure.ac | 1 +
> libpcap.pc.in | 10 ++++++++++
> 3 files changed, 16 insertions(+)
> create mode 100644 libpcap.pc.in
>
> diff --git a/Makefile.in b/Makefile.in
> -index 1c2d745..1f25faf 100644
> +index e71d973..d7004ed 100644
> --- a/Makefile.in
> +++ b/Makefile.in
> -@@ -60,6 +60,10 @@ V_RPATH_OPT = @V_RPATH_OPT@
> +@@ -61,6 +61,10 @@ V_RPATH_OPT = @V_RPATH_OPT@
> DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
> PROG=libpcap
>
> @@ -30,19 +32,19 @@ index 1c2d745..1f25faf 100644
> # Standard CFLAGS
> FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
>
> -@@ -275,6 +279,7 @@ EXTRA_DIST = \
> +@@ -286,6 +290,7 @@ EXTRA_DIST = \
> lbl/os-solaris2.h \
> lbl/os-sunos4.h \
> lbl/os-ultrix4.h \
> + libpcap.pc \
> + missing/getopt.c \
> + missing/getopt.h \
> missing/snprintf.c \
> - mkdep \
> - msdos/bin2c.c \
> -diff --git a/configure.in b/configure.in
> -index 8f5c86b..fb51b35 100644
> ---- a/configure.in
> -+++ b/configure.in
> -@@ -1700,6 +1700,7 @@ esac
> +diff --git a/configure.ac b/configure.ac
> +index da2f940..4fc67bf 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -1805,6 +1805,7 @@ fi
> AC_PROG_INSTALL
>
> AC_CONFIG_HEADER(config.h)
> @@ -67,5 +69,5 @@ index 0000000..4f78ad8
> +Libs: -L${libdir} -lpcap
> +Cflags: -I${includedir}
> --
> -1.9.1
> +2.1.4
>
> diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.7.4.bb b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
> similarity index 67%
> rename from meta/recipes-connectivity/libpcap/libpcap_1.7.4.bb
> rename to meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
> index 8d12b25..9072fe0 100644
> --- a/meta/recipes-connectivity/libpcap/libpcap_1.7.4.bb
> +++ b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
> @@ -1,10 +1,11 @@
> require libpcap.inc
>
> -SRC_URI += "file://aclocal.patch \
> - file://libpcap-pkgconfig-support.patch \
> - "
> -SRC_URI[md5sum] = "b2e13142bbaba857ab1c6894aedaf547"
> -SRC_URI[sha256sum] = "7ad3112187e88328b85e46dce7a9b949632af18ee74d97ffc3f2b41fe7f448b0"
> +SRC_URI += " \
> + file://libpcap-pkgconfig-support.patch \
> +"
> +
> +SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"
> +SRC_URI[sha256sum] = "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e"
>
> #
> # make install doesn't cover the shared lib
> @@ -13,7 +14,7 @@ SRC_URI[sha256sum] = "7ad3112187e88328b85e46dce7a9b949632af18ee74d97ffc3f2b41fe7
>
> do_configure_prepend () {
> #remove hardcoded references to /usr/include
> - sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.in
> + sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.ac
> }
>
> do_install_prepend () {
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 169 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox