Re: [OE-core] [PATCH v4 6/8] acl: Use install instead of cp
You should explain in the commit message -why- you made the change. It's
already clear WHAT the change is, but not why you did it.
On 11/28/18 5:43 PM, Douglas Royds wrote:
> Signed-off-by: Douglas Royds
> ---
> meta/recipes-support/attr/acl_2.2.52.bb | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-support/attr/acl_2.2.52.bb
> b/meta/recipes-support/attr/acl_2.2.52.bb
> index 8b89de9b42..318308a009 100644
> --- a/meta/recipes-support/attr/acl_2.2.52.bb
> +++ b/meta/recipes-support/attr/acl_2.2.52.bb
> @@ -41,8 +41,8 @@ inherit ptest
>
> do_install_ptest() {
> tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
> - mkdir ${D}${PTEST_PATH}/include
> - cp ${S}/include/builddefs ${S}/include/buildmacros
> ${S}/include/buildrules ${D}${PTEST_PATH}/include/
> + install -d ${D}${PTEST_PATH}/include
> + install -m 644 ${S}/include/builddefs ${S}/include/buildmacros
> ${S}/include/buildrules ${D}${PTEST_PATH}/include/
> # Remove any build host references
> sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \
> -e 's:${HOSTTOOLS_DIR}/::g' \
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 8/8] attr: Strip build host paths and tool versions from ptest files
Using the new PTEST_BUILD_HOST_FILES mechanism.
Specifically remove reference to build host rpm version, if any.
Signed-off-by: Douglas Royds
---
meta/recipes-support/attr/attr.inc | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-support/attr/attr.inc
b/meta/recipes-support/attr/attr.inc
index 9fc0f33cce..cfa38a7196 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -29,6 +29,9 @@ ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN} = "setfattr"
ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr"
+PTEST_BUILD_HOST_FILES = "builddefs"
+PTEST_BUILD_HOST_PATTERN = "^RPM"
+
do_install_ptest() {
tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
mkdir ${D}${PTEST_PATH}/include
@@ -36,12 +39,6 @@ do_install_ptest() {
do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \
done
sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile
-
- # Remove any build host references
- sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \
- -e 's:${HOSTTOOLS_DIR}/::g' \
- -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
- -i ${D}${PTEST_PATH}/include/builddefs
}
RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle
perl-module-getopt-std perl-module-posix"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 6/8] acl: Use install instead of cp
Signed-off-by: Douglas Royds
---
meta/recipes-support/attr/acl_2.2.52.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/attr/acl_2.2.52.bb
b/meta/recipes-support/attr/acl_2.2.52.bb
index 8b89de9b42..318308a009 100644
--- a/meta/recipes-support/attr/acl_2.2.52.bb
+++ b/meta/recipes-support/attr/acl_2.2.52.bb
@@ -41,8 +41,8 @@ inherit ptest
do_install_ptest() {
tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
- mkdir ${D}${PTEST_PATH}/include
- cp ${S}/include/builddefs ${S}/include/buildmacros
${S}/include/buildrules ${D}${PTEST_PATH}/include/
+ install -d ${D}${PTEST_PATH}/include
+ install -m 644 ${S}/include/builddefs ${S}/include/buildmacros
${S}/include/buildrules ${D}${PTEST_PATH}/include/
# Remove any build host references
sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \
-e 's:${HOSTTOOLS_DIR}/::g' \
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 5/8] strace: Strip build host tool details from installed ptest Makefile
Adopt new PTEST_BUILD_HOST_PATTERN mechanism.
Signed-off-by: Douglas Royds
---
meta/recipes-devtools/strace/strace_4.25.bb | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/meta/recipes-devtools/strace/strace_4.25.bb
b/meta/recipes-devtools/strace/strace_4.25.bb
index 117ebfbf72..58f6cf6e30 100644
--- a/meta/recipes-devtools/strace/strace_4.25.bb
+++ b/meta/recipes-devtools/strace/strace_4.25.bb
@@ -32,6 +32,7 @@ EXTRA_OECONF += "--enable-mpers=no"
CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext"
TESTDIR = "tests"
+PTEST_BUILD_HOST_PATTERN =
"^(DEB_CHANGELOGTIME|RPM_CHANGELOGTIME|WARN_CFLAGS_FOR_BUILD)"
do_install_append() {
# We don't ship strace-graph here because it needs perl
@@ -46,16 +47,6 @@ do_install_ptest() {
oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B}
DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR}
install -m 755 ${S}/test-driver ${D}${PTEST_PATH}
install -m 644 ${B}/config.h ${D}${PTEST_PATH}
- sed -i -e '/^src/s/strace.*[1-9]/ptest/' \
- -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
- -e 's|${DEBUG_PREFIX_MAP}||g' \
- -e 's:${HOSTTOOLS_DIR}/::g' \
- -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
- -e 's:${RECIPE_SYSROOT}::g' \
- -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
- -e '/^DEB_CHANGELOGTIME/d' \
- -e '/^RPM_CHANGELOGTIME/d' \
- ${D}/${PTEST_PATH}/${TESTDIR}/Makefile
}
RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 7/8] acl: Strip build host tool details from installed ptest file
Adopt the PTEST_BUILD_HOST_FILES mechanism to strip build host paths from the
installed builddefs file. Also strip the record of the build host rpm version.
Signed-off-by: Douglas Royds
---
meta/recipes-support/attr/acl_2.2.52.bb | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-support/attr/acl_2.2.52.bb
b/meta/recipes-support/attr/acl_2.2.52.bb
index 318308a009..6bc77d868d 100644
--- a/meta/recipes-support/attr/acl_2.2.52.bb
+++ b/meta/recipes-support/attr/acl_2.2.52.bb
@@ -39,15 +39,12 @@ do_install_append() {
inherit ptest
+PTEST_BUILD_HOST_FILES = "builddefs"
+PTEST_BUILD_HOST_PATTERN = "^RPM"
do_install_ptest() {
tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
install -d ${D}${PTEST_PATH}/include
install -m 644 ${S}/include/builddefs ${S}/include/buildmacros
${S}/include/buildrules ${D}${PTEST_PATH}/include/
- # Remove any build host references
- sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \
- -e 's:${HOSTTOOLS_DIR}/::g' \
- -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
- -i ${D}${PTEST_PATH}/include/builddefs
}
RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle
perl-module-getopt-std perl-module-posix shadow"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 4/8] openssl: Strip perl version from installed ptest configdata.pm file
Signed-off-by: Douglas Royds
---
meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
index deeb865a6f..042e023de5 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
@@ -157,6 +157,7 @@ do_install_append_class-nativesdk () {
}
PTEST_BUILD_HOST_FILES += "configdata.pm"
+PTEST_BUILD_HOST_PATTERN = "perl_version ="
do_install_ptest () {
# Prune the build tree
rm -f ${B}/fuzz/*.* ${B}/test/*.*
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 0/8] ptest: Strip build host paths from any installed Makefile
Only one change from v1: Simplified commit acl: Use install instead of cp Douglas Royds (8): ptest: Reproducibility: Strip build host paths from any installed Makefile ptest: Optionally strip build host tool info from installed files openssl ptest: Strip build host paths from configdata.pm openssl: Strip perl version from installed ptest configdata.pm file strace: Strip build host tool details from installed ptest Makefile acl: Use install instead of cp acl: Strip build host tool details from installed ptest file attr: Strip build host paths and tool versions from ptest files meta/classes/ptest.bbclass | 18 ++ .../openssl/openssl_1.1.1a.bb | 2 ++ meta/recipes-devtools/strace/strace_4.25.bb| 11 +-- meta/recipes-support/attr/acl_2.2.52.bb| 11 --- meta/recipes-support/attr/attr.inc | 9 +++-- 5 files changed, 28 insertions(+), 23 deletions(-) -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 1/8] ptest: Reproducibility: Strip build host paths from any installed Makefile
A common pattern for ptest is to install a Makefile that provides a make check
target. These generated Makefiles are normally full of build host paths, to
hosttools, and to files and scripts within the source or build tree. They also
commonly include the CFLAGS and CPPFLAGS. None of these build host paths
can possibly work on-target, so stripping them has no effect on the success of
the resulting ptests.
Stripping the HOSTTOOLS_DIR has this effect, for instance:
-MKDIR_P = /home/douglas/workspace/upstream/build/tmp/hosttools/mkdir -p
+MKDIR_P = mkdir -p
The curious WORKDIR/*= pattern avoids non-parseable -fdebug-prefix-map patterns
in the CFLAGS by adding an arbitrary ".", eg:
-fdebug-prefix-map=.=/usr/src/debug/rsyslog/8.37.0-r0
In all other cases, we simply remove the WORKDIR, eg:
CPP = arm-tait-linux-gnueabi-gcc -E --sysroot=recipe-sysroot ...
Signed-off-by: Douglas Royds
---
meta/classes/ptest.bbclass | 13 +
1 file changed, 13 insertions(+)
diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass
index 9d8a79854a..fa518f6d45 100644
--- a/meta/classes/ptest.bbclass
+++ b/meta/classes/ptest.bbclass
@@ -3,6 +3,8 @@ DESCRIPTION_${PN}-ptest ?= "${DESCRIPTION} \
This package contains a test directory ${PTEST_PATH} for package test
purposes."
PTEST_PATH ?= "${libdir}/${BPN}/ptest"
+PTEST_BUILD_HOST_FILES ?= "Makefile"
+
FILES_${PN}-ptest = "${PTEST_PATH}"
SECTION_${PN}-ptest = "devel"
ALLOW_EMPTY_${PN}-ptest = "1"
@@ -45,6 +47,17 @@ do_install_ptest_base() {
fi
do_install_ptest
chown -R root:root ${D}${PTEST_PATH}
+
+# Strip build host paths from any installed Makefile
+for filename in ${PTEST_BUILD_HOST_FILES}; do
+for installed_ptest_file in $(find ${D}${PTEST_PATH} -type f -name
$filename); do
+bbnote "Stripping host paths from: $installed_ptest_file"
+sed -e 's#${HOSTTOOLS_DIR}/*##g' \
+-e 's#${WORKDIR}/*=#.=#g' \
+-e 's#${WORKDIR}/*##g' \
+-i $installed_ptest_file
+done
+done
}
do_configure_ptest_base[dirs] = "${B}"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 3/8] openssl ptest: Strip build host paths from configdata.pm
This file contains CC, CPP, CFLAGS, CXXFLAGS and the like.
Signed-off-by: Douglas Royds
---
meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
index 3629f7e6a1..deeb865a6f 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
@@ -156,6 +156,7 @@ do_install_append_class-nativesdk () {
sed 's|/usr/lib/ssl/|/usr/lib/ssl-1.1/|g' -i
${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
}
+PTEST_BUILD_HOST_FILES += "configdata.pm"
do_install_ptest () {
# Prune the build tree
rm -f ${B}/fuzz/*.* ${B}/test/*.*
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v4 2/8] ptest: Optionally strip build host tool info from installed files
Several packages (eg. acl, attr, openssl) install Makefiles or other build host
configuration files for ptest so that they can run `make check`, for instance.
These build host files commonly include paths and versions of build host tools,
(eg. rpm or perl) whose presence and version depends on the build host distro.
Optionally strip lines from installed PTEST_BUILD_HOST_FILES using an
extended regex pattern defined in PTEST_BUILD_HOST_PATTERN. This has no
effect on the on-target ptest.
Signed-off-by: Douglas Royds
---
meta/classes/ptest.bbclass | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass
index fa518f6d45..97865c9338 100644
--- a/meta/classes/ptest.bbclass
+++ b/meta/classes/ptest.bbclass
@@ -4,6 +4,7 @@ This package contains a test directory ${PTEST_PATH} for
package test purposes."
PTEST_PATH ?= "${libdir}/${BPN}/ptest"
PTEST_BUILD_HOST_FILES ?= "Makefile"
+PTEST_BUILD_HOST_PATTERN ?= ""
FILES_${PN}-ptest = "${PTEST_PATH}"
SECTION_${PN}-ptest = "devel"
@@ -56,6 +57,10 @@ do_install_ptest_base() {
-e 's#${WORKDIR}/*=#.=#g' \
-e 's#${WORKDIR}/*##g' \
-i $installed_ptest_file
+if [ -n "${PTEST_BUILD_HOST_PATTERN}" ]; then
+ sed -E '/${PTEST_BUILD_HOST_PATTERN}/d' \
+ -i $installed_ptest_file
+fi
done
done
}
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][thud][PATCH] layerindexlib: change LAYERSERIES_COMPAT to thud
Does this actually matter? The test cases, just care that the layer branch has
valid contents -- but they don't care what branch it's on.
--Mark
On 11/28/18 4:51 PM, Oleksandr Kravchuk wrote:
> Signed-off-by: Oleksandr Kravchuk
> ---
> bitbake/lib/layerindexlib/tests/restapi.py| 2 +-
> .../lib/layerindexlib/tests/testdata/build/conf/bblayers.conf | 2 +-
> .../lib/layerindexlib/tests/testdata/layer1/conf/layer.conf | 4 ++--
> .../lib/layerindexlib/tests/testdata/layer2/conf/layer.conf | 2 +-
> .../lib/layerindexlib/tests/testdata/layer3/conf/layer.conf | 2 +-
> .../lib/layerindexlib/tests/testdata/layer4/conf/layer.conf | 2 +-
> 6 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/bitbake/lib/layerindexlib/tests/restapi.py
> b/bitbake/lib/layerindexlib/tests/restapi.py
> index 58766950ce..4febd23609 100644
> --- a/bitbake/lib/layerindexlib/tests/restapi.py
> +++ b/bitbake/lib/layerindexlib/tests/restapi.py
> @@ -35,7 +35,7 @@ class LayerIndexWebRestApiTest(LayersTest):
> self.assertFalse(os.environ.get("BB_SKIP_NETTESTS") == "yes",
> msg="BB_SKIP_NETTESTS set, but we tried to test anyway")
> LayersTest.setUp(self)
> self.layerindex = layerindexlib.LayerIndex(self.d)
> -
> self.layerindex.load_layerindex('http://layers.openembedded.org/layerindex/api/;branch=sumo',
> load=['layerDependencies'])
> +
> self.layerindex.load_layerindex('http://layers.openembedded.org/layerindex/api/;branch=thud',
> load=['layerDependencies'])
>
> @skipIfNoNetwork()
> def test_layerindex_is_empty(self):
> diff --git
> a/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
> b/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
> index 40429b2f66..4f06ca7b70 100644
> --- a/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
> +++ b/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
> @@ -1,4 +1,4 @@
> -LAYERSERIES_CORENAMES = "sumo"
> +LAYERSERIES_CORENAMES = "thud"
>
> # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
> # changes incompatibly
> diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
> b/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
> index 966d531959..8e979e0c65 100644
> --- a/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
> +++ b/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
> @@ -7,11 +7,11 @@ BBFILE_COLLECTIONS += "core"
> BBFILE_PATTERN_core = "^${LAYERDIR}/"
> BBFILE_PRIORITY_core = "5"
>
> -LAYERSERIES_CORENAMES = "sumo"
> +LAYERSERIES_CORENAMES = "thud"
>
> # This should only be incremented on significant changes that will
> # cause compatibility issues with other layers
> LAYERVERSION_core = "11"
> -LAYERSERIES_COMPAT_core = "sumo"
> +LAYERSERIES_COMPAT_core = "thud"
>
> BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
> diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
> b/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
> index 7569d1c217..a59cdf3a45 100644
> --- a/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
> +++ b/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
> @@ -17,4 +17,4 @@ LAYERDEPENDS_networking-layer = "core"
> LAYERDEPENDS_networking-layer += "openembedded-layer"
> LAYERDEPENDS_networking-layer += "meta-python"
>
> -LAYERSERIES_COMPAT_networking-layer = "sumo"
> +LAYERSERIES_COMPAT_networking-layer = "thud"
> diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
> b/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
> index 7089071faf..321d51bee7 100644
> --- a/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
> +++ b/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
> @@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1"
>
> LAYERDEPENDS_meta-python = "core openembedded-layer"
>
> -LAYERSERIES_COMPAT_meta-python = "sumo"
> +LAYERSERIES_COMPAT_meta-python = "thud"
>
> LICENSE_PATH += "${LAYERDIR}/licenses"
> diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
> b/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
> index 6649ee0208..86f689491e 100644
> --- a/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
> +++ b/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
> @@ -19,4 +19,4 @@ LAYERVERSION_openembedded-layer = "1"
>
> LAYERDEPENDS_openembedded-layer = "core"
>
> -LAYERSERIES_COMPAT_openembedded-layer = "sumo"
> +LAYERSERIES_COMPAT_openembedded-layer = "thud"
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for layerindexlib: change LAYERSERIES_COMPAT to thud
== Series Details == Series: layerindexlib: change LAYERSERIES_COMPAT to thud Revision: 1 URL : https://patchwork.openembedded.org/series/15124/ 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[meta-oe,thud] layerindexlib: change LAYERSERIES_COMPAT to thud Issue Series sent to the wrong mailing list [test_target_mailing_list] Suggested fixCheck the project's README (meta-oe,thud) and send the patch to the indicated list * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch thud (currently at 4f22710f9a) 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] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines 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] [meta-oe][thud][PATCH] layerindexlib: change LAYERSERIES_COMPAT to thud
Signed-off-by: Oleksandr Kravchuk
---
bitbake/lib/layerindexlib/tests/restapi.py| 2 +-
.../lib/layerindexlib/tests/testdata/build/conf/bblayers.conf | 2 +-
.../lib/layerindexlib/tests/testdata/layer1/conf/layer.conf | 4 ++--
.../lib/layerindexlib/tests/testdata/layer2/conf/layer.conf | 2 +-
.../lib/layerindexlib/tests/testdata/layer3/conf/layer.conf | 2 +-
.../lib/layerindexlib/tests/testdata/layer4/conf/layer.conf | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/bitbake/lib/layerindexlib/tests/restapi.py
b/bitbake/lib/layerindexlib/tests/restapi.py
index 58766950ce..4febd23609 100644
--- a/bitbake/lib/layerindexlib/tests/restapi.py
+++ b/bitbake/lib/layerindexlib/tests/restapi.py
@@ -35,7 +35,7 @@ class LayerIndexWebRestApiTest(LayersTest):
self.assertFalse(os.environ.get("BB_SKIP_NETTESTS") == "yes",
msg="BB_SKIP_NETTESTS set, but we tried to test anyway")
LayersTest.setUp(self)
self.layerindex = layerindexlib.LayerIndex(self.d)
-
self.layerindex.load_layerindex('http://layers.openembedded.org/layerindex/api/;branch=sumo',
load=['layerDependencies'])
+
self.layerindex.load_layerindex('http://layers.openembedded.org/layerindex/api/;branch=thud',
load=['layerDependencies'])
@skipIfNoNetwork()
def test_layerindex_is_empty(self):
diff --git a/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
b/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
index 40429b2f66..4f06ca7b70 100644
--- a/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
+++ b/bitbake/lib/layerindexlib/tests/testdata/build/conf/bblayers.conf
@@ -1,4 +1,4 @@
-LAYERSERIES_CORENAMES = "sumo"
+LAYERSERIES_CORENAMES = "thud"
# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
# changes incompatibly
diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
b/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
index 966d531959..8e979e0c65 100644
--- a/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
+++ b/bitbake/lib/layerindexlib/tests/testdata/layer1/conf/layer.conf
@@ -7,11 +7,11 @@ BBFILE_COLLECTIONS += "core"
BBFILE_PATTERN_core = "^${LAYERDIR}/"
BBFILE_PRIORITY_core = "5"
-LAYERSERIES_CORENAMES = "sumo"
+LAYERSERIES_CORENAMES = "thud"
# This should only be incremented on significant changes that will
# cause compatibility issues with other layers
LAYERVERSION_core = "11"
-LAYERSERIES_COMPAT_core = "sumo"
+LAYERSERIES_COMPAT_core = "thud"
BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
b/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
index 7569d1c217..a59cdf3a45 100644
--- a/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
+++ b/bitbake/lib/layerindexlib/tests/testdata/layer2/conf/layer.conf
@@ -17,4 +17,4 @@ LAYERDEPENDS_networking-layer = "core"
LAYERDEPENDS_networking-layer += "openembedded-layer"
LAYERDEPENDS_networking-layer += "meta-python"
-LAYERSERIES_COMPAT_networking-layer = "sumo"
+LAYERSERIES_COMPAT_networking-layer = "thud"
diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
b/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
index 7089071faf..321d51bee7 100644
--- a/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
+++ b/bitbake/lib/layerindexlib/tests/testdata/layer3/conf/layer.conf
@@ -14,6 +14,6 @@ LAYERVERSION_meta-python = "1"
LAYERDEPENDS_meta-python = "core openembedded-layer"
-LAYERSERIES_COMPAT_meta-python = "sumo"
+LAYERSERIES_COMPAT_meta-python = "thud"
LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
b/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
index 6649ee0208..86f689491e 100644
--- a/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
+++ b/bitbake/lib/layerindexlib/tests/testdata/layer4/conf/layer.conf
@@ -19,4 +19,4 @@ LAYERVERSION_openembedded-layer = "1"
LAYERDEPENDS_openembedded-layer = "core"
-LAYERSERIES_COMPAT_openembedded-layer = "sumo"
+LAYERSERIES_COMPAT_openembedded-layer = "thud"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] recipeutils fixes for devtool
On Wednesday, 28 November 2018 5:16:13 PM NZDT Paul Eggleton wrote: > A couple of fixes for issues in the recipeutils module (which affect > devtool), a cleanup patch, and some additional related tests for > oe-selftest. Oops, patch 4/4 missed out the actual meta-selftest recipes that a few of the tests rely upon. Branch re-pushed and v2 of 4/4 sent. 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 v2 4/4] oe-selftest: add some tests for recipeutils module
Add some tests for functions in meta/lib/oe/recipeutils.py, in
particular for a few issues I've just fixed. I haven't added tests for
all of the functions - some of them are already being tested via devtool
in any case.
Signed-off-by: Paul Eggleton
---
.../python/python-async-test.inc | 16 +++
.../python/python3-async-test_0.6.2.bb| 2 +
.../recipeutils/recipeutils-test.inc | 5 +
.../recipeutils/recipeutils-test/anotherfile | 0
.../recipeutils/recipeutils-test/somefile | 0
.../recipeutils/recipeutils-test_1.2.bb | 13 ++
meta/lib/oeqa/selftest/cases/recipeutils.py | 135 ++
7 files changed, 171 insertions(+)
create mode 100644 meta-selftest/recipes-devtools/python/python-async-test.inc
create mode 100644
meta-selftest/recipes-devtools/python/python3-async-test_0.6.2.bb
create mode 100644 meta-selftest/recipes-test/recipeutils/recipeutils-test.inc
create mode 100644
meta-selftest/recipes-test/recipeutils/recipeutils-test/anotherfile
create mode 100644
meta-selftest/recipes-test/recipeutils/recipeutils-test/somefile
create mode 100644
meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
create mode 100644 meta/lib/oeqa/selftest/cases/recipeutils.py
diff --git a/meta-selftest/recipes-devtools/python/python-async-test.inc
b/meta-selftest/recipes-devtools/python/python-async-test.inc
new file mode 100644
index 000..c9602e8e52d
--- /dev/null
+++ b/meta-selftest/recipes-devtools/python/python-async-test.inc
@@ -0,0 +1,16 @@
+SUMMARY = "Python framework to process interdependent tasks in a pool of
workers"
+HOMEPAGE = "http://github.com/gitpython-developers/async";
+SECTION = "devel/python"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM =
"file://PKG-INFO;beginline=8;endline=8;md5=88df8e78b9edfd744953862179f2d14e"
+
+inherit pypi
+
+PYPI_PACKAGE = "async"
+
+SRC_URI[md5sum] = "9b06b5997de2154f3bc0273f80bcef6b"
+SRC_URI[sha256sum] =
"ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051"
+
+RDEPENDS_${PN} += "${PYTHON_PN}-threading"
+
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta-selftest/recipes-devtools/python/python3-async-test_0.6.2.bb
b/meta-selftest/recipes-devtools/python/python3-async-test_0.6.2.bb
new file mode 100644
index 000..22e241afb3c
--- /dev/null
+++ b/meta-selftest/recipes-devtools/python/python3-async-test_0.6.2.bb
@@ -0,0 +1,2 @@
+inherit setuptools3
+require python-async-test.inc
diff --git a/meta-selftest/recipes-test/recipeutils/recipeutils-test.inc
b/meta-selftest/recipes-test/recipeutils/recipeutils-test.inc
new file mode 100644
index 000..8490b902d75
--- /dev/null
+++ b/meta-selftest/recipes-test/recipeutils/recipeutils-test.inc
@@ -0,0 +1,5 @@
+SRC_URI =
"http://xorg.freedesktop.org/releases/individual/lib/libxshmfence-${PV}.tar.bz2";
+
+SRC_URI[md5sum] = "2e76899112c0f99e22f2fc775a7e"
+SRC_URI[sha256sum] =
"d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c"
+
diff --git
a/meta-selftest/recipes-test/recipeutils/recipeutils-test/anotherfile
b/meta-selftest/recipes-test/recipeutils/recipeutils-test/anotherfile
new file mode 100644
index 000..e69de29bb2d
diff --git a/meta-selftest/recipes-test/recipeutils/recipeutils-test/somefile
b/meta-selftest/recipes-test/recipeutils/recipeutils-test/somefile
new file mode 100644
index 000..e69de29bb2d
diff --git a/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
new file mode 100644
index 000..f6da97b2d43
--- /dev/null
+++ b/meta-selftest/recipes-test/recipeutils/recipeutils-test_1.2.bb
@@ -0,0 +1,13 @@
+SUMMARY = "Test recipe for recipeutils.patch_recipe()"
+
+require recipeutils-test.inc
+
+LICENSE = "Proprietary"
+
+DEPENDS += "virtual/libx11"
+
+BBCLASSEXTEND = "native nativesdk"
+
+SRC_URI += "file://somefile"
+
+SRC_URI_append = " file://anotherfile"
diff --git a/meta/lib/oeqa/selftest/cases/recipeutils.py
b/meta/lib/oeqa/selftest/cases/recipeutils.py
new file mode 100644
index 000..c7036c7f04e
--- /dev/null
+++ b/meta/lib/oeqa/selftest/cases/recipeutils.py
@@ -0,0 +1,135 @@
+import os
+import re
+import time
+import logging
+import bb.tinfoil
+
+from oeqa.selftest.case import OESelftestTestCase
+from oeqa.utils.commands import runCmd
+from oeqa.core.decorator.oeid import OETestID
+
+
+def setUpModule():
+global tinfoil
+tinfoil = bb.tinfoil.Tinfoil(tracking=True)
+tinfoil.prepare(config_only=False, quiet=2)
+
+
+def tearDownModule():
+tinfoil.shutdown()
+
+
+class RecipeUtilsTests(OESelftestTestCase):
+""" Tests for the recipeutils module functions """
+
+def test_patch_recipe_varflag(self):
+import oe.recipeutils
+rd = tinfoil.parse_recipe('python3-async-test')
+vals = {'SRC_URI[md5sum]': 'woot', 'LICENSE': 'something'}
+patches = oe.recipeutils.patch_recipe(rd, rd.getVar('FILE'), vals,
patch=True)
+
+expected_patch = """
[OE-core] ✗ patchtest: failure for ptest: Strip build host paths from any installed Makefile (rev4)
== Series Details == Series: ptest: Strip build host paths from any installed Makefile (rev4) Revision: 4 URL : https://patchwork.openembedded.org/series/15114/ 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: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at 21387613fe) 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] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines 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
Re: [OE-core] [PATCH 5/8] acl: Use install instead of cp
On 28/11/18 9:04 PM, Peter Kjellerstedt wrote: -Original Message- From: openembedded-core-boun...@lists.openembedded.org On Behalf Of Douglas Royds Sent: den 28 november 2018 05:53 To: openembedded-core@lists.openembedded.org Subject: [OE-core] [PATCH 5/8] acl: Use install instead of cp Also, hard-tabs begone Shell-code in OE-Core is expected to be indented using tabs, so don't do this. (For reference, OpenEmbedded uses four spaces to indent shell-code). Additionally, it makes it harder to see what you actually changed. Fair point. I shouldn't have muddled the two together. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 5/8] strace: Strip build host tool details from installed ptest Makefile
Adopt new PTEST_BUILD_HOST_PATTERN mechanism.
Signed-off-by: Douglas Royds
Signed-off-by: Richard Purdie
---
meta/recipes-devtools/strace/strace_4.25.bb | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/meta/recipes-devtools/strace/strace_4.25.bb
b/meta/recipes-devtools/strace/strace_4.25.bb
index 117ebfbf72..58f6cf6e30 100644
--- a/meta/recipes-devtools/strace/strace_4.25.bb
+++ b/meta/recipes-devtools/strace/strace_4.25.bb
@@ -32,6 +32,7 @@ EXTRA_OECONF += "--enable-mpers=no"
CFLAGS_append_libc-musl = " -Dsigcontext_struct=sigcontext"
TESTDIR = "tests"
+PTEST_BUILD_HOST_PATTERN =
"^(DEB_CHANGELOGTIME|RPM_CHANGELOGTIME|WARN_CFLAGS_FOR_BUILD)"
do_install_append() {
# We don't ship strace-graph here because it needs perl
@@ -46,16 +47,6 @@ do_install_ptest() {
oe_runmake -C ${TESTDIR} install-ptest BUILDDIR=${B}
DESTDIR=${D}${PTEST_PATH} TESTDIR=${TESTDIR}
install -m 755 ${S}/test-driver ${D}${PTEST_PATH}
install -m 644 ${B}/config.h ${D}${PTEST_PATH}
- sed -i -e '/^src/s/strace.*[1-9]/ptest/' \
- -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
- -e 's|${DEBUG_PREFIX_MAP}||g' \
- -e 's:${HOSTTOOLS_DIR}/::g' \
- -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
- -e 's:${RECIPE_SYSROOT}::g' \
- -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
- -e '/^DEB_CHANGELOGTIME/d' \
- -e '/^RPM_CHANGELOGTIME/d' \
- ${D}/${PTEST_PATH}/${TESTDIR}/Makefile
}
RDEPENDS_${PN}-ptest += "make coreutils grep gawk sed"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 6/8] acl: Use install instead of cp
Signed-off-by: Douglas Royds
---
meta/recipes-support/attr/acl_2.2.52.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/attr/acl_2.2.52.bb
b/meta/recipes-support/attr/acl_2.2.52.bb
index 8b89de9b42..318308a009 100644
--- a/meta/recipes-support/attr/acl_2.2.52.bb
+++ b/meta/recipes-support/attr/acl_2.2.52.bb
@@ -41,8 +41,8 @@ inherit ptest
do_install_ptest() {
tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
- mkdir ${D}${PTEST_PATH}/include
- cp ${S}/include/builddefs ${S}/include/buildmacros
${S}/include/buildrules ${D}${PTEST_PATH}/include/
+ install -d ${D}${PTEST_PATH}/include
+ install -m 644 ${S}/include/builddefs ${S}/include/buildmacros
${S}/include/buildrules ${D}${PTEST_PATH}/include/
# Remove any build host references
sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \
-e 's:${HOSTTOOLS_DIR}/::g' \
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 8/8] attr: Strip build host paths and tool versions from ptest files
Using the new PTEST_BUILD_HOST_FILES mechanism.
Specifically remove reference to build host rpm version, if any.
Signed-off-by: Douglas Royds
---
meta/recipes-support/attr/attr.inc | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-support/attr/attr.inc
b/meta/recipes-support/attr/attr.inc
index 9fc0f33cce..cfa38a7196 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -29,6 +29,9 @@ ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN} = "setfattr"
ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr"
+PTEST_BUILD_HOST_FILES = "builddefs"
+PTEST_BUILD_HOST_PATTERN = "^RPM"
+
do_install_ptest() {
tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
mkdir ${D}${PTEST_PATH}/include
@@ -36,12 +39,6 @@ do_install_ptest() {
do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \
done
sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile
-
- # Remove any build host references
- sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \
- -e 's:${HOSTTOOLS_DIR}/::g' \
- -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
- -i ${D}${PTEST_PATH}/include/builddefs
}
RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle
perl-module-getopt-std perl-module-posix"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 3/8] openssl ptest: Strip build host paths from configdata.pm
This file contains CC, CPP, CFLAGS, CXXFLAGS and the like.
Signed-off-by: Douglas Royds
Signed-off-by: Richard Purdie
---
meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
index 3629f7e6a1..deeb865a6f 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
@@ -156,6 +156,7 @@ do_install_append_class-nativesdk () {
sed 's|/usr/lib/ssl/|/usr/lib/ssl-1.1/|g' -i
${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
}
+PTEST_BUILD_HOST_FILES += "configdata.pm"
do_install_ptest () {
# Prune the build tree
rm -f ${B}/fuzz/*.* ${B}/test/*.*
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 7/8] acl: Strip build host tool details from installed ptest file
Adopt the PTEST_BUILD_HOST_FILES mechanism to strip build host paths from the
installed builddefs file. Also strip the record of the build host rpm version.
Signed-off-by: Douglas Royds
---
meta/recipes-support/attr/acl_2.2.52.bb | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-support/attr/acl_2.2.52.bb
b/meta/recipes-support/attr/acl_2.2.52.bb
index 318308a009..6bc77d868d 100644
--- a/meta/recipes-support/attr/acl_2.2.52.bb
+++ b/meta/recipes-support/attr/acl_2.2.52.bb
@@ -39,15 +39,12 @@ do_install_append() {
inherit ptest
+PTEST_BUILD_HOST_FILES = "builddefs"
+PTEST_BUILD_HOST_PATTERN = "^RPM"
do_install_ptest() {
tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
install -d ${D}${PTEST_PATH}/include
install -m 644 ${S}/include/builddefs ${S}/include/buildmacros
${S}/include/buildrules ${D}${PTEST_PATH}/include/
- # Remove any build host references
- sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \
- -e 's:${HOSTTOOLS_DIR}/::g' \
- -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
- -i ${D}${PTEST_PATH}/include/builddefs
}
RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle
perl-module-getopt-std perl-module-posix shadow"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 0/8] ptest: Strip build host paths from any installed Makefile
Only one change from v1: Simplified commit acl: Use install instead of cp Douglas Royds (8): ptest: Reproducibility: Strip build host paths from any installed Makefile ptest: Optionally strip build host tool info from installed files openssl ptest: Strip build host paths from configdata.pm openssl: Strip perl version from installed ptest configdata.pm file strace: Strip build host tool details from installed ptest Makefile acl: Use install instead of cp acl: Strip build host tool details from installed ptest file attr: Strip build host paths and tool versions from ptest files meta/classes/ptest.bbclass | 18 ++ .../openssl/openssl_1.1.1a.bb | 2 ++ meta/recipes-devtools/strace/strace_4.25.bb| 11 +-- meta/recipes-support/attr/acl_2.2.52.bb| 11 --- meta/recipes-support/attr/attr.inc | 9 +++-- 5 files changed, 28 insertions(+), 23 deletions(-) -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/8] ptest: Optionally strip build host tool info from installed files
Several packages (eg. acl, attr, openssl) install Makefiles or other build host
configuration files for ptest so that they can run `make check`, for instance.
These build host files commonly include paths and versions of build host tools,
(eg. rpm or perl) whose presence and version depends on the build host distro.
Optionally strip lines from installed PTEST_BUILD_HOST_FILES using an
extended regex pattern defined in PTEST_BUILD_HOST_PATTERN. This has no
effect on the on-target ptest.
Signed-off-by: Douglas Royds
Signed-off-by: Richard Purdie
---
meta/classes/ptest.bbclass | 5 +
1 file changed, 5 insertions(+)
diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass
index fa518f6d45..97865c9338 100644
--- a/meta/classes/ptest.bbclass
+++ b/meta/classes/ptest.bbclass
@@ -4,6 +4,7 @@ This package contains a test directory ${PTEST_PATH} for
package test purposes."
PTEST_PATH ?= "${libdir}/${BPN}/ptest"
PTEST_BUILD_HOST_FILES ?= "Makefile"
+PTEST_BUILD_HOST_PATTERN ?= ""
FILES_${PN}-ptest = "${PTEST_PATH}"
SECTION_${PN}-ptest = "devel"
@@ -56,6 +57,10 @@ do_install_ptest_base() {
-e 's#${WORKDIR}/*=#.=#g' \
-e 's#${WORKDIR}/*##g' \
-i $installed_ptest_file
+if [ -n "${PTEST_BUILD_HOST_PATTERN}" ]; then
+ sed -E '/${PTEST_BUILD_HOST_PATTERN}/d' \
+ -i $installed_ptest_file
+fi
done
done
}
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 4/8] openssl: Strip perl version from installed ptest configdata.pm file
Signed-off-by: Douglas Royds
Signed-off-by: Richard Purdie
---
meta/recipes-connectivity/openssl/openssl_1.1.1a.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
index deeb865a6f..042e023de5 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1a.bb
@@ -157,6 +157,7 @@ do_install_append_class-nativesdk () {
}
PTEST_BUILD_HOST_FILES += "configdata.pm"
+PTEST_BUILD_HOST_PATTERN = "perl_version ="
do_install_ptest () {
# Prune the build tree
rm -f ${B}/fuzz/*.* ${B}/test/*.*
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/8] ptest: Reproducibility: Strip build host paths from any installed Makefile
A common pattern for ptest is to install a Makefile that provides a make check
target. These generated Makefiles are normally full of build host paths, to
hosttools, and to files and scripts within the source or build tree. They also
commonly include the CFLAGS and CPPFLAGS. None of these build host paths
can possibly work on-target, so stripping them has no effect on the success of
the resulting ptests.
Stripping the HOSTTOOLS_DIR has this effect, for instance:
-MKDIR_P = /home/douglas/workspace/upstream/build/tmp/hosttools/mkdir -p
+MKDIR_P = mkdir -p
The curious WORKDIR/*= pattern avoids non-parseable -fdebug-prefix-map patterns
in the CFLAGS by adding an arbitrary ".", eg:
-fdebug-prefix-map=.=/usr/src/debug/rsyslog/8.37.0-r0
In all other cases, we simply remove the WORKDIR, eg:
CPP = arm-tait-linux-gnueabi-gcc -E --sysroot=recipe-sysroot ...
Signed-off-by: Douglas Royds
Signed-off-by: Richard Purdie
---
meta/classes/ptest.bbclass | 13 +
1 file changed, 13 insertions(+)
diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass
index 9d8a79854a..fa518f6d45 100644
--- a/meta/classes/ptest.bbclass
+++ b/meta/classes/ptest.bbclass
@@ -3,6 +3,8 @@ DESCRIPTION_${PN}-ptest ?= "${DESCRIPTION} \
This package contains a test directory ${PTEST_PATH} for package test
purposes."
PTEST_PATH ?= "${libdir}/${BPN}/ptest"
+PTEST_BUILD_HOST_FILES ?= "Makefile"
+
FILES_${PN}-ptest = "${PTEST_PATH}"
SECTION_${PN}-ptest = "devel"
ALLOW_EMPTY_${PN}-ptest = "1"
@@ -45,6 +47,17 @@ do_install_ptest_base() {
fi
do_install_ptest
chown -R root:root ${D}${PTEST_PATH}
+
+# Strip build host paths from any installed Makefile
+for filename in ${PTEST_BUILD_HOST_FILES}; do
+for installed_ptest_file in $(find ${D}${PTEST_PATH} -type f -name
$filename); do
+bbnote "Stripping host paths from: $installed_ptest_file"
+sed -e 's#${HOSTTOOLS_DIR}/*##g' \
+-e 's#${WORKDIR}/*=#.=#g' \
+-e 's#${WORKDIR}/*##g' \
+-i $installed_ptest_file
+done
+done
}
do_configure_ptest_base[dirs] = "${B}"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for ptest: Strip build host paths from any installed Makefile (rev3)
== Series Details == Series: ptest: Strip build host paths from any installed Makefile (rev3) Revision: 3 URL : https://patchwork.openembedded.org/series/15114/ 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: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at 21387613fe) 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] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines 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] Is python2 native broken in current eSDK?
Having baked an eSDK. Now I'm facing a problem with devtool and python2 native. The error occurs at least on the thud and on the master branch. Also the host distro seams not relevant. The same happens on Ubuntu 16.04, Ubuntu 18.04 and on Fedora 29 hosts. For example modifying and building bzip2 ends up with an error message: devtool build bzip2 NOTE: Starting bitbake server... ImportError: No module named site OpenEmbedded requires 'python' to be python v2 (>= 2.7.3), not python v3. Please upgrade your python v2. The failing lines of code are in the file: layers/poky/scripts/oe-buildenv-internal: py_v27_check=$() if [ "$py_v27_check" != "True" ]; then echo >&2 "OpenEmbedded requires 'python' to be python v2 (>= 2.7.3), not python v3." echo >&2 "Please upgrade your python v2." fi The check for python2 fails because of a wierd PYTHONPATH environment variable exported by devtool/bitbake. If I do something similar like bitbake does, the same error message is printed in another, clean shell: $ >= (2,7,3)' True $ python2 -c 'import sys; print sys.version_info' sys.version_info(major=2, minor=7, micro=15, releaselevel='final', serial=0) $ export PYTHONHOME=/home/user/temp/poky_sdk/buildtools/sysroots/x86_64-pokysdk-linux/usr/bin/../../usr $ python2 -c 'import sys; print sys.version_info >= (2,7,3)' ImportError: No module named site The processes spawned by devtool look like: /home/user/temp/poky_sdk/buildtools/sysroots/x86_64-pokysdk-linux/usr/bin/python3.5 /home/user/temp/poky_sdk/sysroots/x86_64-pokysdk-linux/usr/bin/devtool build bzip2 bash-c . /home/user/temp/poky_sdk/layers/poky/oe-init-build-env /home/user/temp/poky_sdk > /dev/null && script -e -q -c "bitbake bzip2:do_populate_sysroot bzip2:do_packagedata" /dev/null The . /home/user/temp/poky_sdk/layers/poky/oe-init-build-env is where the PYTHONHOME variable comes in. Any ideas? Have similar issues been seen else where? Thanks, Adrian -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 0/3] ptest: Strip build host paths from any installed Makefile
Only one change from v1: Simplified commit acl: Use install instead of cp Douglas Royds (3): acl: Use install instead of cp acl: Strip build host tool details from installed ptest file attr: Strip build host paths and tool versions from ptest files meta/recipes-support/attr/acl_2.2.52.bb | 11 --- meta/recipes-support/attr/attr.inc | 9 +++-- 2 files changed, 7 insertions(+), 13 deletions(-) -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/3] acl: Strip build host tool details from installed ptest file
Adopt the PTEST_BUILD_HOST_FILES mechanism to strip build host paths from the
installed builddefs file. Also strip the record of the build host rpm version.
Signed-off-by: Douglas Royds
---
meta/recipes-support/attr/acl_2.2.52.bb | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-support/attr/acl_2.2.52.bb
b/meta/recipes-support/attr/acl_2.2.52.bb
index 318308a009..6bc77d868d 100644
--- a/meta/recipes-support/attr/acl_2.2.52.bb
+++ b/meta/recipes-support/attr/acl_2.2.52.bb
@@ -39,15 +39,12 @@ do_install_append() {
inherit ptest
+PTEST_BUILD_HOST_FILES = "builddefs"
+PTEST_BUILD_HOST_PATTERN = "^RPM"
do_install_ptest() {
tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
install -d ${D}${PTEST_PATH}/include
install -m 644 ${S}/include/builddefs ${S}/include/buildmacros
${S}/include/buildrules ${D}${PTEST_PATH}/include/
- # Remove any build host references
- sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \
- -e 's:${HOSTTOOLS_DIR}/::g' \
- -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
- -i ${D}${PTEST_PATH}/include/builddefs
}
RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle
perl-module-getopt-std perl-module-posix shadow"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/3] acl: Use install instead of cp
Signed-off-by: Douglas Royds
---
meta/recipes-support/attr/acl_2.2.52.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/attr/acl_2.2.52.bb
b/meta/recipes-support/attr/acl_2.2.52.bb
index 8b89de9b42..318308a009 100644
--- a/meta/recipes-support/attr/acl_2.2.52.bb
+++ b/meta/recipes-support/attr/acl_2.2.52.bb
@@ -41,8 +41,8 @@ inherit ptest
do_install_ptest() {
tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
- mkdir ${D}${PTEST_PATH}/include
- cp ${S}/include/builddefs ${S}/include/buildmacros
${S}/include/buildrules ${D}${PTEST_PATH}/include/
+ install -d ${D}${PTEST_PATH}/include
+ install -m 644 ${S}/include/builddefs ${S}/include/buildmacros
${S}/include/buildrules ${D}${PTEST_PATH}/include/
# Remove any build host references
sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \
-e 's:${HOSTTOOLS_DIR}/::g' \
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 3/3] attr: Strip build host paths and tool versions from ptest files
Using the new PTEST_BUILD_HOST_FILES mechanism.
Specifically remove reference to build host rpm version, if any.
Signed-off-by: Douglas Royds
---
meta/recipes-support/attr/attr.inc | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-support/attr/attr.inc
b/meta/recipes-support/attr/attr.inc
index 9fc0f33cce..cfa38a7196 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -29,6 +29,9 @@ ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_${PN} = "setfattr"
ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr"
+PTEST_BUILD_HOST_FILES = "builddefs"
+PTEST_BUILD_HOST_PATTERN = "^RPM"
+
do_install_ptest() {
tar -c --exclude=ext test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
mkdir ${D}${PTEST_PATH}/include
@@ -36,12 +39,6 @@ do_install_ptest() {
do cp ${S}/include/$i ${D}${PTEST_PATH}/include/; \
done
sed -e 's|; @echo|; echo|' -i ${D}${PTEST_PATH}/test/Makefile
-
- # Remove any build host references
- sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \
- -e 's:${HOSTTOOLS_DIR}/::g' \
- -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
- -i ${D}${PTEST_PATH}/include/builddefs
}
RDEPENDS_${PN}-ptest = "attr coreutils perl-module-filehandle
perl-module-getopt-std perl-module-posix"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] scripts/runqemu: Improve lockfile handling for python with close_fd=True
On python versions with close_fds=True (python 3.2 onwards), the tap
device lockfile isn't passed to the child process.
Since this guards against use of an active interface, we really want this
here, so pass it in pass_fds. This means if the parent exits early, the child
still holds the lock, avoiding messages like:
runqemu - ERROR - Failed to run qemu: qemu-system-x86_64: could not configure
/dev/net/tun (tap0): Device or resource busy
Signed-off-by: Richard Purdie
---
scripts/runqemu | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index d25de42f27d..b5afa5883aa 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1220,7 +1220,7 @@ class BaseConfig(object):
cmd = "%s %s" % (self.qemu_opt, kernel_opts)
cmds = shlex.split(cmd)
logger.info('Running %s\n' % cmd)
-process = subprocess.Popen(cmds, stderr=subprocess.PIPE)
+process = subprocess.Popen(cmds, stderr=subprocess.PIPE,
pass_fds=[self.lock_descriptor.fileno()])
self.qemupid = process.pid
retcode = process.wait()
if retcode:
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] scripts/runqemu: Tidy up lock handling code
Various tweaks:
- Balance up the aquire/release functions
- Use debug messge for both acquiring and release message for consistency in
logs
- Use None instead of an empty string
- Reset the value of the field if we don't have the lock any more
Signed-off-by: Richard Purdie
---
scripts/runqemu | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index 3786646c5d7..d25de42f27d 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -220,7 +220,7 @@ class BaseConfig(object):
self.tcpserial_portnum = ''
self.custombiosdir = ''
self.lock = ''
-self.lock_descriptor = ''
+self.lock_descriptor = None
self.bitbake_e = ''
self.snapshot = False
self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs',
@@ -254,13 +254,17 @@ class BaseConfig(object):
logger.info(msg)
if self.lock_descriptor:
self.lock_descriptor.close()
+self.lock_descriptor = None
return False
return True
def release_lock(self):
-fcntl.flock(self.lock_descriptor, fcntl.LOCK_UN)
-self.lock_descriptor.close()
-os.remove(self.lock)
+if self.lock_descriptor:
+logger.debug("Releasing lockfile for tap device '%s'" % self.tap)
+fcntl.flock(self.lock_descriptor, fcntl.LOCK_UN)
+self.lock_descriptor.close()
+os.remove(self.lock)
+self.lock_descriptor = None
def get(self, key):
if key in self.d:
@@ -1237,9 +1241,7 @@ class BaseConfig(object):
cmd = 'sudo %s %s %s' % (self.qemuifdown, self.tap,
self.bindir_native)
logger.debug('Running %s' % cmd)
subprocess.check_call(cmd, shell=True)
-if self.lock_descriptor:
-logger.info("Releasing lockfile for tap device '%s'" % self.tap)
-self.release_lock()
+self.release_lock()
if self.nfs_running:
logger.info("Shutting down the userspace NFS server...")
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] licence: Add license file CC-BY-SA-4.0
On 28/11/18 at 10:45am, Burton, Ross wrote: >Your mail client has mangled the patch, can you resend this using >git-send-email? I used git-send-email for this, following the wiki[1]'s instructions. I am confused. I tried applying the change from the ml post both with `git am` and `patch` and could not get the error you mentioned. My apologies for the inconvenience, [1] http://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded -- Eric Chanudet -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] scripts/runqemu: Fix logic error causing failures with MACHINE from the environment
MACHINE=qemux86-64 oe-selftest -r
runqemu.RunqemuTests.test_boot_machine_slirp_qcow2
fails yet
oe-selftest -r runqemu.RunqemuTests.test_boot_machine_slirp_qcow2
with MACHINE in local.conf would work.
It turns out that:
runqemu slirp wic.qcow2 qemux86-64
works but:
MACHINE=qemux86-64 runqemu slirp wic.qcow2 qemux86-64
does not.
The reason are the misplaced return statements in runqemu, its skipping a block
of logic when MACHINE is set in the environment when it shouldn't. Fix this.
Signed-off-by: Richard Purdie
---
scripts/runqemu | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/scripts/runqemu b/scripts/runqemu
index c79be9a8461..3786646c5d7 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -475,14 +475,11 @@ class BaseConfig(object):
"Try 'runqemu help' on how to use it" %
\
(unknown_arg, arg))
# Check to make sure it is a valid machine
-if unknown_arg:
-if self.get('MACHINE') == unknown_arg:
-return
+if unknown_arg and self.get('MACHINE') != unknown_arg:
if self.get('DEPLOY_DIR_IMAGE'):
machine = os.path.basename(self.get('DEPLOY_DIR_IMAGE'))
if unknown_arg == machine:
self.set("MACHINE", machine)
-return
self.check_arg_machine(unknown_arg)
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] oeqa/utils/commands: Avoid log message duplication
Each time a runqemu() fails, the log handler would be left behind meaning messages from any subsequent run would be duplicated (or worse/more). This ensures we remove the handler regardless and means we no longer have the duplication. Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index e6a35d3d259..2e6a2289cd9 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py @@ -345,11 +345,11 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None, yield qemu finally: +targetlogger.removeHandler(handler) try: qemu.stop() except: pass -targetlogger.removeHandler(handler) def updateEnv(env_file): """ -- 2.17.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] oeqa/qemurunner: Remove resource python warnings
If runqemu fails it would leak an unclosed socket and file. Ensure we
close these in all cases to remove the resource warning.
Signed-off-by: Richard Purdie
---
meta/lib/oeqa/utils/qemurunner.py | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/utils/qemurunner.py
b/meta/lib/oeqa/utils/qemurunner.py
index 241d1eced88..409e86d4bcb 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -139,7 +139,7 @@ class QemuRunner:
def launch(self, launch_cmd, get_ip = True, qemuparams = None,
extra_bootparams = None, env = None):
try:
-threadsock, threadport = self.create_socket()
+self.threadsock, threadport = self.create_socket()
self.server_socket, self.serverport = self.create_socket()
except socket.error as msg:
self.logger.error("Failed to create listening socket: %s" % msg[1])
@@ -272,7 +272,7 @@ class QemuRunner:
self.logger.debug("Target IP: %s" % self.ip)
self.logger.debug("Server IP: %s" % self.server_ip)
-self.thread = LoggingThread(self.log, threadsock, self.logger)
+self.thread = LoggingThread(self.log, self.threadsock, self.logger)
self.thread.start()
if not self.thread.connection_established.wait(self.boottime):
self.logger.error("Didn't receive a console connection from qemu. "
@@ -381,13 +381,19 @@ class QemuRunner:
self.runqemu.stdin.close()
self.runqemu.stdout.close()
self.runqemu = None
+
if hasattr(self, 'server_socket') and self.server_socket:
self.server_socket.close()
self.server_socket = None
+if hasattr(self, 'threadsock') and self.threadsock:
+self.threadsock.close()
+self.threadsock = None
self.qemupid = None
self.ip = None
if os.path.exists(self.qemu_pidfile):
os.remove(self.qemu_pidfile)
+if self.monitorpipe:
+self.monitorpipe.close()
def stop_qemu_system(self):
if self.qemupid:
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] oeqa/utils/qemurunner: Fix python ResourceWarning for unclosed file
Fixes:
Stderr:
/media/build1/poky/meta/lib/oeqa/utils/qemurunner.py:381: ResourceWarning:
unclosed file <_io.BufferedWriter name=16>
self.runqemu = None
Signed-off-by: Richard Purdie
---
meta/lib/oeqa/utils/qemurunner.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/lib/oeqa/utils/qemurunner.py
b/meta/lib/oeqa/utils/qemurunner.py
index f9430340925..241d1eced88 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -378,6 +378,8 @@ class QemuRunner:
if self.runqemu.poll() is None:
self.logger.debug("Sending SIGKILL to runqemu")
os.killpg(os.getpgid(self.runqemu.pid), signal.SIGKILL)
+self.runqemu.stdin.close()
+self.runqemu.stdout.close()
self.runqemu = None
if hasattr(self, 'server_socket') and self.server_socket:
self.server_socket.close()
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] netbase: add entry to /etc/hosts according to /etc/hostname
On Wed, 2018-11-28 at 10:26 +, Burton, Ross wrote: > What if the hostname entry already exists? $sysconfdir instead of > hard-coding etc. > > I can't help but think a better solution would be to simply move > /etc/hosts to base-files, so it can be updated at the same time as > hostname. I'm torn on this as netbase is a much better fit for the hosts file and moving it would be a migration pain :( Your other points stand though... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] avahi: avoid depending on skipped package
Is Avahi actually useful without DBus?
This reminds me that I've been wanting to gut that recipe for a long time now...
Ross
On Wed, 28 Nov 2018 at 08:16, Jens Rehsack wrote:
>
> When built without D-Bus, libavahi-client is not build:
> Building libavahi-client: no (You need avahi-daemon and D-Bus!)
> which causes avahi-dev RDEPENDS failing when creating an image
> containing development-tools:
> * - nothing provides libavahi-client = 0.7-r0 needed by
> avahi-dev-0.7-r0.cortexa8hf-neon
>
> Signed-off-by: Jens Rehsack
> ---
> meta/recipes-connectivity/avahi/avahi_0.7.bb | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-connectivity/avahi/avahi_0.7.bb
> b/meta/recipes-connectivity/avahi/avahi_0.7.bb
> index 3d5f334a88..2e04d304c7 100644
> --- a/meta/recipes-connectivity/avahi/avahi_0.7.bb
> +++ b/meta/recipes-connectivity/avahi/avahi_0.7.bb
> @@ -38,7 +38,8 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
> FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*
> ${libdir}/girepository-1.0/Avahi*.typelib"
> FILES_avahi-utils = "${bindir}/avahi-*"
>
> -RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (=
> ${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})"
> +RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (=
> ${EXTENDPKGV})"
> +RDEPENDS_${PN}-dev += "${@["", " libavahi-client (=
> ${EXTENDPKGV})"][bb.utils.contains('PACKAGECONFIG', 'dbus', 1, 0, d)]}"
>
> RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns"
>
> --
> 2.17.1
>
> --
> ___
> 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 1/1] initrdscripts/init-live.sh: fix mounts w/ spaces fail to move to real rootfs
Hi, This was fixed in Thud (& master), but can we backport this 6f8f984ba363f764e83290b972ec31a90aad1603 to [sumo ... morty]? Link: http://git.openembedded.org/openembedded-core/commit/meta/recipes-core/initrdscripts/files/init-live.sh?h=thud&id=6f8f984ba363f764e83290b972ec31a90aad1603 Thanks - Arsalan -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot-tools: Improve build preparation
On Wed, Nov 28, 2018 at 8:58 AM Otavio Salvador wrote: > On Tue, Nov 27, 2018 at 6:49 PM Alexey Brodkin > wrote: > > On Tue, 2018-11-27 at 17:52 -0200, Otavio Salvador wrote: > > > On Tue, Nov 27, 2018 at 5:30 PM Otavio Salvador > > > wrote: > > > > On Tue, Nov 27, 2018 at 5:13 PM Alexey Brodkin > > > > wrote: > > > > > Even though we're not going to build here real U-Boot binary > > > > > it is still required to "configure" U-Boot to get get to the > > > > > tools building. > > > > > > > > > > We used to use "sandbox_defconfig" for that purpose but > > > > > since U-Boot v2018.11 it started to cause problems [1] due to [2]. > > > > > > > > > > So to have less dependencies let's create super minimalistic > > > > > configuration which is good enough to allow us to run "make tools". > > > > > > > > > > [1] > > > > > https://urldefense.proofpoint.com/v2/url?u=http-3A__errors.yoctoproject.org_Errors_Details_202185_&d=DwIBaQ&c=DPL6_X_6JkXFx7AXWqB0tg&r=lqdeeSSEes0GFDDl656eViXO7breS55ytWkhpk5R81I&m=6GBkAGgxs4IOh0rJ4joj36Xukb_msE_tdIIJQXh8Gbg&s=vuvAMfkM9WIKHek7mwuwSjWKKpUcKJ-zCcKypEfxCuw&e= > > > > > [2] > > > > > https://urldefense.proofpoint.com/v2/url?u=http-3A__git.denx.de_-3Fp-3Du-2Dboot.git-3Ba-3Dcommitdiff-3Bh-3Da4958a71017fb142542f977c843c5fce769fc6ea&d=DwIBaQ&c=DPL6_X_6JkXFx7AXWqB0tg&r=lqdeeSSEes0GFDDl656eViXO7breS55ytWkhpk5R81I&m=6GBkAGgxs4IOh0rJ4joj36Xukb_msE_tdIIJQXh8Gbg&s=GN4U6Of_hi-W_5CEu3RvRUIVEjgaNwnK8CarkwIly4Y&e= > > > > > > > > > > Signed-off-by: Alexey Brodkin > > > > > > > > To allow extended use, we need to enable CONFIG_FIT_SIGNATURE > > > > otherwise we won't have the support. > > > > > > > > See: > > > > > > > > # MXSImage needs LibSSL > > > > ifneq > > > > ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_ARMADA_39X)$(CONFIG_FIT_SIGNATURE),) > > > > HOSTLOADLIBES_mkimage += \ > > > > $(shell pkg-config --libs libssl libcrypto 2> /dev/null || > > > > echo "-lssl -lcrypto") > > > > > > > > If you do that, we can likely rely on this and avoid some extra tools > > > > packages (for example on meta-freescale). > > > > > > Looking at this, I am wondering if folowing wouldn't be a generic > > > solution capable of upstreaming: > > > > > > diff --git a/configs/nativetools_defconfig b/configs/nativetools_defconfig > > > new file mode 100644 > > > index 00..be69bdf43a > > > --- /dev/null > > > +++ b/configs/nativetools_defconfig > > > @@ -0,0 +1,3 @@ > > > +CONFIG_SYS_TEXT_BASE=0 > > > +CONFIG_FIT=y > > > +CONFIG_FIT_SIGNATURE=y > > > diff --git a/tools/Makefile b/tools/Makefile > > > index 3c0521f655..e916d0cebb 100644 > > > --- a/tools/Makefile > > > +++ b/tools/Makefile > > > @@ -124,7 +124,7 @@ fit_info-objs := $(dumpimage-mkimage-objs) > > > fit_info.o > > > fit_check_sign-objs := $(dumpimage-mkimage-objs) fit_check_sign.o > > > file2include-objs := file2include.o > > > > > > -ifneq ($(CONFIG_MX23)$(CONFIG_MX28),) > > > +ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),) > > > # Add CONFIG_MXS into host CFLAGS, so we can check whether or not > > > register > > > # the mxsimage support within tools/mxsimage.c . > > > HOSTCFLAGS_mxsimage.o += -DCONFIG_MXS > > > > So do you think there's a room for improvement in my patch for OE? > > Or before we get a missing part for tools/Makefile there's nothing more > > to be done in OE? > > You could use this attached patch (marking as Pending as it is still > RFC). It allow us to drop or 'mxsboot' recipe on meta-freescale, for > example. Now... with patch... -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 From 5731cafd83528f2d79476e6241f22d7f2618a364 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 27 Nov 2018 18:14:11 -0200 Subject: [PATCH] tools: add a generic config for native tools building Organization: O.S. Systems Software LTDA. The motivation for this is to allow distributions to distribute all possible tools in a generic way, avoiding the need of specific tools building for each machine. Especially on OpenEmbedded / Yocto Project ecosystem, it is very common each BSP to end providing their specific tools when they need to generate images for some SoC (e.g MX23 / MX28 in meta-freescale case). Using this, we can package the tools doing: $: make tools-only_defconfig $: make tools-only Series-to: u-boot Series-prefix: RFC Series-cc: Alexey Brodkin Series-cc: Peter Robinson Signed-off-by: Otavio Salvador --- configs/tools-only_defconfig | 3 +++ tools/Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 configs/tools-only_defconfig diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig new file mode 100644 index 00..be69bdf43a --- /dev/null +++ b/configs/tools-only_defconfig @@ -0,0 +1,3 @@ +CONFIG_SYS_TEXT_BASE=0 +CONFIG_FIT=y +CONFIG_FIT_SIGNATURE=y diff --git a/tools
Re: [OE-core] [PATCH] u-boot-tools: Improve build preparation
On Tue, Nov 27, 2018 at 6:49 PM Alexey Brodkin wrote: > On Tue, 2018-11-27 at 17:52 -0200, Otavio Salvador wrote: > > On Tue, Nov 27, 2018 at 5:30 PM Otavio Salvador > > wrote: > > > On Tue, Nov 27, 2018 at 5:13 PM Alexey Brodkin > > > wrote: > > > > Even though we're not going to build here real U-Boot binary > > > > it is still required to "configure" U-Boot to get get to the > > > > tools building. > > > > > > > > We used to use "sandbox_defconfig" for that purpose but > > > > since U-Boot v2018.11 it started to cause problems [1] due to [2]. > > > > > > > > So to have less dependencies let's create super minimalistic > > > > configuration which is good enough to allow us to run "make tools". > > > > > > > > [1] > > > > https://urldefense.proofpoint.com/v2/url?u=http-3A__errors.yoctoproject.org_Errors_Details_202185_&d=DwIBaQ&c=DPL6_X_6JkXFx7AXWqB0tg&r=lqdeeSSEes0GFDDl656eViXO7breS55ytWkhpk5R81I&m=6GBkAGgxs4IOh0rJ4joj36Xukb_msE_tdIIJQXh8Gbg&s=vuvAMfkM9WIKHek7mwuwSjWKKpUcKJ-zCcKypEfxCuw&e= > > > > [2] > > > > https://urldefense.proofpoint.com/v2/url?u=http-3A__git.denx.de_-3Fp-3Du-2Dboot.git-3Ba-3Dcommitdiff-3Bh-3Da4958a71017fb142542f977c843c5fce769fc6ea&d=DwIBaQ&c=DPL6_X_6JkXFx7AXWqB0tg&r=lqdeeSSEes0GFDDl656eViXO7breS55ytWkhpk5R81I&m=6GBkAGgxs4IOh0rJ4joj36Xukb_msE_tdIIJQXh8Gbg&s=GN4U6Of_hi-W_5CEu3RvRUIVEjgaNwnK8CarkwIly4Y&e= > > > > > > > > Signed-off-by: Alexey Brodkin > > > > > > To allow extended use, we need to enable CONFIG_FIT_SIGNATURE > > > otherwise we won't have the support. > > > > > > See: > > > > > > # MXSImage needs LibSSL > > > ifneq > > > ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_ARMADA_38X)$(CONFIG_ARMADA_39X)$(CONFIG_FIT_SIGNATURE),) > > > HOSTLOADLIBES_mkimage += \ > > > $(shell pkg-config --libs libssl libcrypto 2> /dev/null || > > > echo "-lssl -lcrypto") > > > > > > If you do that, we can likely rely on this and avoid some extra tools > > > packages (for example on meta-freescale). > > > > Looking at this, I am wondering if folowing wouldn't be a generic > > solution capable of upstreaming: > > > > diff --git a/configs/nativetools_defconfig b/configs/nativetools_defconfig > > new file mode 100644 > > index 00..be69bdf43a > > --- /dev/null > > +++ b/configs/nativetools_defconfig > > @@ -0,0 +1,3 @@ > > +CONFIG_SYS_TEXT_BASE=0 > > +CONFIG_FIT=y > > +CONFIG_FIT_SIGNATURE=y > > diff --git a/tools/Makefile b/tools/Makefile > > index 3c0521f655..e916d0cebb 100644 > > --- a/tools/Makefile > > +++ b/tools/Makefile > > @@ -124,7 +124,7 @@ fit_info-objs := $(dumpimage-mkimage-objs) fit_info.o > > fit_check_sign-objs := $(dumpimage-mkimage-objs) fit_check_sign.o > > file2include-objs := file2include.o > > > > -ifneq ($(CONFIG_MX23)$(CONFIG_MX28),) > > +ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),) > > # Add CONFIG_MXS into host CFLAGS, so we can check whether or not register > > # the mxsimage support within tools/mxsimage.c . > > HOSTCFLAGS_mxsimage.o += -DCONFIG_MXS > > So do you think there's a room for improvement in my patch for OE? > Or before we get a missing part for tools/Makefile there's nothing more > to be done in OE? You could use this attached patch (marking as Pending as it is still RFC). It allow us to drop or 'mxsboot' recipe on meta-freescale, for example. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] licence: Add license file CC-BY-SA-4.0
Your mail client has mangled the patch, can you resend this using
git-send-email?
Applying: licence: Add license file CC-BY-SA-4.0
error: git apply: bad git-diff - expected /dev/null on line 23
error: could not build fake ancestor
Patch failed at 0001 licence: Add license file CC-BY-SA-4.0
Ross
On Wed, 28 Nov 2018 at 00:00, Eric Chanudet wrote:
>
> Original legalcode.txt:
> https://creativecommons.org/licenses/by-sa/4.0/legalcode.txt
>
> Signed-off-by: Eric Chanudet
> ---
> meta/conf/licenses.conf | 2 +-
> meta/files/common-licenses/CC-BY-SA-4.0 | 428
> 2 files changed, 429 insertions(+), 1 deletion(-)
> create mode 100644 meta/files/common-licenses/CC-BY-SA-4.0
>
> diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
> index 90c486ebed..1058084d86 100644
> --- a/meta/conf/licenses.conf
> +++ b/meta/conf/licenses.conf
> @@ -12,7 +12,7 @@ SRC_DISTRIBUTE_LICENSES += "CC-BY-NC-3.0 CC-BY-NC-ND-1.0
> CC-BY-NC-ND-2.0"
> SRC_DISTRIBUTE_LICENSES += "CC-BY-NC-ND-2.5 CC-BY-NC-ND-3.0 CC-BY-NC-SA-1.0"
> SRC_DISTRIBUTE_LICENSES += "CC-BY-NC-SA-2.0 CC-BY-NC-SA-2.5 CC-BY-NC-SA-3.0"
> SRC_DISTRIBUTE_LICENSES += "CC-BY-ND-1.0 CC-BY-ND-2.0 CC-BY-ND-2.5
> CC-BY-ND-3.0"
> -SRC_DISTRIBUTE_LICENSES += "CC-BY-SA-1.0 CC-BY-SA-2.0 CC-BY-SA-2.5
> CC-BY-SA-3.0"
> +SRC_DISTRIBUTE_LICENSES += "CC-BY-SA-1.0 CC-BY-SA-2.0 CC-BY-SA-2.5
> CC-BY-SA-3.0 CC-BY-SA-4.0"
> SRC_DISTRIBUTE_LICENSES += "CDDL-1.0 CECILL-1.0 CECILL-2.0 CECILL-B CECILL-C"
> SRC_DISTRIBUTE_LICENSES += "ClArtistic CPAL-1.0 CPL-1.0 CUA-OPL-1.0 DSSSL"
> SRC_DISTRIBUTE_LICENSES += "ECL-1.0 ECL-2.0 eCos-2.0 EDL-1.0 EFL-1.0 EFL-2.0"
> diff --git a/meta/files/common-licenses/CC-BY-SA-4.0
> b/meta/files/common-licenses/CC-BY-SA-4.0
> new file mode 100644
> index 00..fe8dbc50fc
> --- /dev/null
> +++ b/meta/files/common-licenses/CC-BY-SA-4.0
> @@ -0,0 +1,428 @@
> +Attribution-ShareAlike 4.0 International
> +
> +===
> +
> +Creative Commons Corporation ("Creative Commons") is not a law firm and
> +does not provide legal services or legal advice. Distribution of
> +Creative Commons public licenses does not create a lawyer-client or
> +other relationship. Creative Commons makes its licenses and related
> +information available on an "as-is" basis. Creative Commons gives no
> +warranties regarding its licenses, any material licensed under their
> +terms and conditions, or any related information. Creative Commons
> +disclaims all liability for damages resulting from their use to the
> +fullest extent possible.
> +
> +Using Creative Commons Public Licenses
> +
> +Creative Commons public licenses provide a standard set of terms and
> +conditions that creators and other rights holders may use to share
> +original works of authorship and other material subject to copyright
> +and certain other rights specified in the public license below. The
> +following considerations are for informational purposes only, are not
> +exhaustive, and do not form part of our licenses.
> +
> + Considerations for licensors: Our public licenses are
> + intended for use by those authorized to give the public
> + permission to use material in ways otherwise restricted by
> + copyright and certain other rights. Our licenses are
> + irrevocable. Licensors should read and understand the terms
> + and conditions of the license they choose before applying it.
> + Licensors should also secure all rights necessary before
> + applying our licenses so that the public can reuse the
> + material as expected. Licensors should clearly mark any
> + material not subject to the license. This includes other CC-
> + licensed material, or material used under an exception or
> + limitation to copyright. More considerations for licensors:
> + wiki.creativecommons.org/Considerations_for_licensors
> +
> + Considerations for the public: By using one of our public
> + licenses, a licensor grants the public permission to use the
> + licensed material under specified terms and conditions. If
> + the licensor's permission is not necessary for any reason--for
> + example, because of any applicable exception or limitation to
> + copyright--then that use is not regulated by the license. Our
> + licenses grant only permissions under copyright and certain
> + other rights that a licensor has authority to grant. Use of
> + the licensed material may still be restricted for other
> + reasons, including because others have copyright or other
> + rights in the material. A licensor may make special requests,
> + such as asking that all changes be marked or described.
> + Although not required by our licenses, you are encouraged to
> + respect those requests where reasonable. More considerations
> + for the public:
> + wiki.creativecommons.org/Considerations_for_licensees
> +
> +
Re: [OE-core] [PATCH 1/1] netbase: add entry to /etc/hosts according to /etc/hostname
What if the hostname entry already exists? $sysconfdir instead of
hard-coding etc.
I can't help but think a better solution would be to simply move
/etc/hosts to base-files, so it can be updated at the same time as
hostname.
Ross
On Mon, 26 Nov 2018 at 06:51, Chen Qi wrote:
>
> We default hostname to ${MACHINE}, but it's not in /etc/hosts,
> resulting in commands like `hostname -f' failing due to lack
> of entry.
>
> So add entry to /etc/hosts according to /etc/hostname. We do
> this via pkg_postinst because hostname is set in base-files
> recipe.
>
> Signed-off-by: Chen Qi
> ---
> meta/recipes-core/netbase/netbase_5.4.bb | 9 +
> 1 file changed, 9 insertions(+)
>
> diff --git a/meta/recipes-core/netbase/netbase_5.4.bb
> b/meta/recipes-core/netbase/netbase_5.4.bb
> index 5ab0c58..384c430 100644
> --- a/meta/recipes-core/netbase/netbase_5.4.bb
> +++ b/meta/recipes-core/netbase/netbase_5.4.bb
> @@ -23,3 +23,12 @@ do_install () {
> }
>
> CONFFILES_${PN} = "${sysconfdir}/hosts"
> +
> +RDEPENDS_${PN} += "base-files"
> +
> +pkg_postinst_${PN} () {
> + if [ -s $D/etc/hostname ]; then
> + hostname=`cat $D/etc/hostname`
> + echo "127.0.1.1 $hostname" >> $D/etc/hosts
> + fi
> +}
> --
> 1.9.1
>
> --
> ___
> 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
[OE-core] [PATCH] arch-armv7*.inc: Add Cortex vfpv4-d16 support
Some ARM Cortex devices have the VFPv4-D16, but no NEON.
Signed-off-by: Phil Edworthy
---
The additional lines for vpfv4d16 are basically copies of the vpfv3d16 lines.
Tested with thud on Renesas RZ/N1 (Cortex A7 with VFPv4-D16, no NEON), also
applies to sumo.
---
meta/conf/machine/include/arm/arch-armv7a.inc | 32 +++---
meta/conf/machine/include/arm/arch-armv7ve.inc | 32 +++---
meta/conf/machine/include/arm/feature-arm-neon.inc | 3 ++
meta/conf/machine/include/arm/feature-arm-vfp.inc | 3 +-
4 files changed, 61 insertions(+), 9 deletions(-)
diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc
b/meta/conf/machine/include/arm/arch-armv7a.inc
index a2663d8..199e63f 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -10,13 +10,15 @@ require conf/machine/include/arm/arch-armv6.inc
require conf/machine/include/arm/feature-arm-neon.inc
# Little Endian base configs
-AVAILTUNES += "armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3
armv7at-vfpv3 armv7a-neon armv7at-neon armv7a-neon-vfpv4 armv7at-neon-vfpv4"
+AVAILTUNES += "armv7a armv7at armv7a-vfpv3d16 armv7at-vfpv3d16 armv7a-vfpv3
armv7at-vfpv3 armv7a-vfpv4d16 armv7at-vfpv4d16 armv7a-neon armv7at-neon
armv7a-neon-vfpv4 armv7at-neon-vfpv4"
ARMPKGARCH_tune-armv7a ?= "armv7a"
ARMPKGARCH_tune-armv7at?= "armv7a"
ARMPKGARCH_tune-armv7a-vfpv3d16?= "armv7a"
ARMPKGARCH_tune-armv7at-vfpv3d16 ?= "armv7a"
ARMPKGARCH_tune-armv7a-vfpv3 ?= "armv7a"
ARMPKGARCH_tune-armv7at-vfpv3 ?= "armv7a"
+ARMPKGARCH_tune-armv7a-vfpv4d16?= "armv7a"
+ARMPKGARCH_tune-armv7at-vfpv4d16 ?= "armv7a"
ARMPKGARCH_tune-armv7a-neon?= "armv7a"
ARMPKGARCH_tune-armv7at-neon ?= "armv7a"
ARMPKGARCH_tune-armv7a-neon-vfpv4 ?= "armv7a"
@@ -27,6 +29,8 @@ TUNE_FEATURES_tune-armv7a-vfpv3d16=
"${TUNE_FEATURES_tune-armv7a} vfpv3d16"
TUNE_FEATURES_tune-armv7at-vfpv3d16 = "${TUNE_FEATURES_tune-armv7at}
vfpv3d16"
TUNE_FEATURES_tune-armv7a-vfpv3 = "${TUNE_FEATURES_tune-armv7a-vfpv3d16}
vfpv3"
TUNE_FEATURES_tune-armv7at-vfpv3 =
"${TUNE_FEATURES_tune-armv7at-vfpv3d16} vfpv3"
+TUNE_FEATURES_tune-armv7a-vfpv4d16= "${TUNE_FEATURES_tune-armv7a} vfpv4d16"
+TUNE_FEATURES_tune-armv7at-vfpv4d16 = "${TUNE_FEATURES_tune-armv7at}
vfpv4d16"
TUNE_FEATURES_tune-armv7a-neon= "${TUNE_FEATURES_tune-armv7a} neon"
TUNE_FEATURES_tune-armv7at-neon = "${TUNE_FEATURES_tune-armv7at} neon"
TUNE_FEATURES_tune-armv7a-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7a-neon}
vfpv4"
@@ -37,19 +41,23 @@ PACKAGE_EXTRA_ARCHS_tune-armv7a-vfpv3d16=
"${PACKAGE_EXTRA_ARCHS_tune-armv7a
PACKAGE_EXTRA_ARCHS_tune-armv7at-vfpv3d16 =
"${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfpv3d16 armv7at2-vfpv3d16"
PACKAGE_EXTRA_ARCHS_tune-armv7a-vfpv3 =
"${PACKAGE_EXTRA_ARCHS_tune-armv7a-vfpv3d16} armv7a-vfpv3"
PACKAGE_EXTRA_ARCHS_tune-armv7at-vfpv3 =
"${PACKAGE_EXTRA_ARCHS_tune-armv7at-vfpv3d16} armv7a-vfpv3 armv7at2-vfpv3"
+PACKAGE_EXTRA_ARCHS_tune-armv7a-vfpv4d16=
"${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfpv4d16"
+PACKAGE_EXTRA_ARCHS_tune-armv7at-vfpv4d16 =
"${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfpv4d16 armv7at2-vfpv4d16"
PACKAGE_EXTRA_ARCHS_tune-armv7a-neon=
"${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-neon"
PACKAGE_EXTRA_ARCHS_tune-armv7at-neon =
"${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-neon armv7at2-neon"
PACKAGE_EXTRA_ARCHS_tune-armv7a-neon-vfpv4 =
"${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} armv7a-neon-vfpv4"
PACKAGE_EXTRA_ARCHS_tune-armv7at-neon-vfpv4 =
"${PACKAGE_EXTRA_ARCHS_tune-armv7at-neon} armv7a-neon-vfpv4 armv7at2-neon-vfpv4"
# HF Tunes
-AVAILTUNES += "armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16
armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4
armv7athf-neon-vfpv4"
+AVAILTUNES += "armv7ahf armv7athf armv7ahf-vfpv3d16 armv7athf-vfpv3d16
armv7ahf-vfpv3 armv7athf-vfpv3 armv7ahf-vfpv4d16 armv7athf-vfpv4d16
armv7ahf-neon armv7athf-neon armv7ahf-neon-vfpv4 armv7athf-neon-vfpv4"
ARMPKGARCH_tune-armv7ahf ?= "armv7a"
ARMPKGARCH_tune-armv7athf?= "armv7a"
ARMPKGARCH_tune-armv7ahf-vfpv3d16?= "armv7a"
ARMPKGARCH_tune-armv7athf-vfpv3d16 ?= "armv7a"
ARMPKGARCH_tune-armv7ahf-vfpv3 ?= "armv7a"
ARMPKGARCH_tune-armv7athf-vfpv3 ?= "armv7a"
+ARMPKGARCH_tune-armv7ahf-vfpv4d16?= "armv7a"
+ARMPKGARCH_tune-armv7athf-vfpv4d16 ?= "armv7a"
ARMPKGARCH_tune-armv7ahf-neon?= "armv7a"
ARMPKGARCH_tune-armv7athf-neon ?= "armv7a"
ARMPKGARCH_tune-armv7ahf-neon-vfpv4 ?= "armv7a"
@@ -60,6 +68,8 @@ TUNE_FEATURES_tune-armv7ahf-vfpv3d16=
"${TUNE_FEATURES_tune-armv7a-vfpv3d16}
TUNE_FEATURES_tune-armv7athf-vfpv3d16 =
"${TUNE_FEATURES_tune-armv7at-vfpv3d16} callconvention-hard"
TUNE_FEATURES_tune-armv7ahf-vfpv3 = "${TUNE_FEATURES_tune-armv7a-vfpv3}
callconventi
[OE-core] [PATCH] avahi: avoid depending on skipped package
When built without D-Bus, libavahi-client is not build:
Building libavahi-client: no (You need avahi-daemon and D-Bus!)
which causes avahi-dev RDEPENDS failing when creating an image
containing development-tools:
* - nothing provides libavahi-client = 0.7-r0 needed by
avahi-dev-0.7-r0.cortexa8hf-neon
Signed-off-by: Jens Rehsack
---
meta/recipes-connectivity/avahi/avahi_0.7.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-connectivity/avahi/avahi_0.7.bb
b/meta/recipes-connectivity/avahi/avahi_0.7.bb
index 3d5f334a88..2e04d304c7 100644
--- a/meta/recipes-connectivity/avahi/avahi_0.7.bb
+++ b/meta/recipes-connectivity/avahi/avahi_0.7.bb
@@ -38,7 +38,8 @@ FILES_libavahi-glib = "${libdir}/libavahi-glib.so.*"
FILES_libavahi-gobject = "${libdir}/libavahi-gobject.so.*
${libdir}/girepository-1.0/Avahi*.typelib"
FILES_avahi-utils = "${bindir}/avahi-*"
-RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (=
${EXTENDPKGV}) libavahi-client (= ${EXTENDPKGV})"
+RDEPENDS_${PN}-dev = "avahi-daemon (= ${EXTENDPKGV}) libavahi-core (=
${EXTENDPKGV})"
+RDEPENDS_${PN}-dev += "${@["", " libavahi-client (=
${EXTENDPKGV})"][bb.utils.contains('PACKAGECONFIG', 'dbus', 1, 0, d)]}"
RRECOMMENDS_avahi-daemon_append_libc-glibc = " libnss-mdns"
--
2.17.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/8] acl: Use install instead of cp
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org core-boun...@lists.openembedded.org> On Behalf Of Douglas Royds
> Sent: den 28 november 2018 05:53
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 5/8] acl: Use install instead of cp
>
> Also, hard-tabs begone
Shell-code in OE-Core is expected to be indented using tabs, so don't
do this. (For reference, OpenEmbedded uses four spaces to indent
shell-code). Additionally, it makes it harder to see what you actually
changed.
>
> Signed-off-by: Douglas Royds
> ---
> meta/recipes-support/attr/acl_2.2.52.bb | 24
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/meta/recipes-support/attr/acl_2.2.52.bb
> b/meta/recipes-support/attr/acl_2.2.52.bb
> index 8b89de9b42..260975d93e 100644
> --- a/meta/recipes-support/attr/acl_2.2.52.bb
> +++ b/meta/recipes-support/attr/acl_2.2.52.bb
> @@ -27,27 +27,27 @@ require ea-acl.inc
>
> # avoid RPATH hardcode to staging dir
> do_configure_append() {
> - sed -i ${S}/config.status -e
> s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\',
> - ${S}/config.status
> +sed -i ${S}/config.status -e s,^\\\(hardcode_into_libs=\\\).*$,\\1\'no\',
> +${S}/config.status
> }
>
> # libdir should point to .la
> do_install_append() {
> - sed -i ${D}${libdir}/libacl.la -e \
> - s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
> +sed -i ${D}${libdir}/libacl.la \
> +-e s,^libdir=\'${base_libdir}\'$,libdir=\'${libdir}\',
> }
>
> inherit ptest
>
> do_install_ptest() {
> - tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
> - mkdir ${D}${PTEST_PATH}/include
> - cp ${S}/include/builddefs ${S}/include/buildmacros
> ${S}/include/buildrules ${D}${PTEST_PATH}/include/
> - # Remove any build host references
> - sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \
> - -e 's:${HOSTTOOLS_DIR}/::g' \
> - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
> - -i ${D}${PTEST_PATH}/include/builddefs
> +tar -c --exclude=nfs test/ | ( cd ${D}${PTEST_PATH} && tar -xf - )
> +install -d ${D}${PTEST_PATH}/include
> +install -m 644 ${S}/include/builddefs ${S}/include/buildmacros
> ${S}/include/buildrules ${D}${PTEST_PATH}/include/
> +# Remove any build host references
> +sed -e "s:--sysroot=${STAGING_DIR_TARGET}::g" \
> +-e 's:${HOSTTOOLS_DIR}/::g' \
> +-e 's:${RECIPE_SYSROOT_NATIVE}::g' \
> +-i ${D}${PTEST_PATH}/include/builddefs
> }
>
> RDEPENDS_${PN}-ptest = "acl bash coreutils perl perl-module-filehandle
> perl-module-getopt-std perl-module-posix shadow"
> --
> 2.17.1
//Peter
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
