* [PATCH 2/3] cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL
2020-01-23 20:30 [PATCH 1/3] procps: enable optional systemd support Dan McGregor
@ 2020-01-23 20:30 ` Dan McGregor
2020-01-23 20:30 ` [PATCH 3/3] Allow customising buildhistory tags Dan McGregor
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Dan McGregor @ 2020-01-23 20:30 UTC (permalink / raw)
To: openembedded-core
From: Daniel McGregor <daniel.mcgregor@vecima.com>
cmake 3.12 introduced this environment variable. Prefer it to passing
PARALLEL_MAKE and PARALLEL_MAKEINST on the cmake command line, because
it gets passed to second stage cmake invocations while command-line
arguments do not (for example, multi-stage clang builds)
Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
---
meta/classes/cmake.bbclass | 5 +++--
meta/lib/oe/utils.py | 11 +++++++----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index a046daa6ea..d91cf20130 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -63,8 +63,9 @@ OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH"
EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}"
-EXTRA_OECMAKE_BUILD_prepend_task-compile = "${PARALLEL_MAKE} "
-EXTRA_OECMAKE_BUILD_prepend_task-install = "${PARALLEL_MAKEINST} "
+export CMAKE_BUILD_PARALLEL_LEVEL
+CMAKE_BUILD_PARALLEL_LEVEL_task-compile = "${@oe.utils.parallel_make(d, False)}"
+CMAKE_BUILD_PARALLEL_LEVEL_task-install = "${@oe.utils.parallel_make(d, True)}"
OECMAKE_TARGET_COMPILE ?= "all"
OECMAKE_TARGET_INSTALL ?= "install"
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 652b2be145..e350b05ddf 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -169,7 +169,7 @@ def any_distro_features(d, features, truevalue="1", falsevalue=""):
"""
return bb.utils.contains_any("DISTRO_FEATURES", features, truevalue, falsevalue, d)
-def parallel_make(d):
+def parallel_make(d, makeinst=False):
"""
Return the integer value for the number of parallel threads to use when
building, scraped out of PARALLEL_MAKE. If no parallelization option is
@@ -177,7 +177,10 @@ def parallel_make(d):
e.g. if PARALLEL_MAKE = "-j 10", this will return 10 as an integer.
"""
- pm = (d.getVar('PARALLEL_MAKE') or '').split()
+ if makeinst:
+ pm = (d.getVar('PARALLEL_MAKEINST') or '').split()
+ else:
+ pm = (d.getVar('PARALLEL_MAKE') or '').split()
# look for '-j' and throw other options (e.g. '-l') away
while pm:
opt = pm.pop(0)
@@ -192,7 +195,7 @@ def parallel_make(d):
return None
-def parallel_make_argument(d, fmt, limit=None):
+def parallel_make_argument(d, fmt, limit=None, makeinst=False):
"""
Helper utility to construct a parallel make argument from the number of
parallel threads specified in PARALLEL_MAKE.
@@ -205,7 +208,7 @@ def parallel_make_argument(d, fmt, limit=None):
e.g. if PARALLEL_MAKE = "-j 10", parallel_make_argument(d, "-n %d") will return
"-n 10"
"""
- v = parallel_make(d)
+ v = parallel_make(d, makeinst)
if v:
if limit:
v = min(limit, v)
--
2.24.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/3] Allow customising buildhistory tags
2020-01-23 20:30 [PATCH 1/3] procps: enable optional systemd support Dan McGregor
2020-01-23 20:30 ` [PATCH 2/3] cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL Dan McGregor
@ 2020-01-23 20:30 ` Dan McGregor
2020-01-23 21:02 ` ✗ patchtest: failure for "procps: enable optional system..." and 2 more Patchwork
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Dan McGregor @ 2020-01-23 20:30 UTC (permalink / raw)
To: openembedded-core
From: Daniel McGregor <daniel.mcgregor@vecima.com>
Allow setting custom buildhistory tag prefixes. This allows multiple
build directories to share one buildhistory git repository with multiple
worktrees.
Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
---
meta/classes/buildhistory.bbclass | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index affdf272d7..eb7295570d 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -40,6 +40,7 @@ BUILDHISTORY_SDK_FILES ?= "conf/local.conf conf/bblayers.conf conf/auto.conf con
BUILDHISTORY_COMMIT ?= "1"
BUILDHISTORY_COMMIT_AUTHOR ?= "buildhistory <buildhistory@${DISTRO}>"
BUILDHISTORY_PUSH_REPO ?= ""
+BUILDHISTORY_TAG ?= "build"
SSTATEPOSTINSTFUNCS_append = " buildhistory_emit_pkghistory"
# We want to avoid influencing the signatures of sstate tasks - first the function itself:
@@ -824,9 +825,9 @@ END
if [ ! -e .git ] ; then
git init -q
else
- git tag -f build-minus-3 build-minus-2 > /dev/null 2>&1 || true
- git tag -f build-minus-2 build-minus-1 > /dev/null 2>&1 || true
- git tag -f build-minus-1 > /dev/null 2>&1 || true
+ git tag -f ${BUILDHISTORY_TAG}-minus-3 ${BUILDHISTORY_TAG}-minus-2 > /dev/null 2>&1 || true
+ git tag -f ${BUILDHISTORY_TAG}-minus-2 ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true
+ git tag -f ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true
fi
check_git_config
--
2.24.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* ✗ patchtest: failure for "procps: enable optional system..." and 2 more
2020-01-23 20:30 [PATCH 1/3] procps: enable optional systemd support Dan McGregor
2020-01-23 20:30 ` [PATCH 2/3] cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL Dan McGregor
2020-01-23 20:30 ` [PATCH 3/3] Allow customising buildhistory tags Dan McGregor
@ 2020-01-23 21:02 ` Patchwork
2020-01-23 21:44 ` [PATCH v2 1/3] procps: enable optional systemd support Dan McGregor
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2020-01-23 21:02 UTC (permalink / raw)
To: danismostlikely; +Cc: openembedded-core
== Series Details ==
Series: "procps: enable optional system..." and 2 more
Revision: 1
URL : https://patchwork.openembedded.org/series/22252/
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 [3/3] Allow customising buildhistory tags
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>"
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
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v2 1/3] procps: enable optional systemd support
2020-01-23 20:30 [PATCH 1/3] procps: enable optional systemd support Dan McGregor
` (2 preceding siblings ...)
2020-01-23 21:02 ` ✗ patchtest: failure for "procps: enable optional system..." and 2 more Patchwork
@ 2020-01-23 21:44 ` Dan McGregor
2020-01-23 21:44 ` [PATCH v2 2/3] cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL Dan McGregor
2020-01-23 21:44 ` [PATCH v2 3/3] buildhistory: Allow customising buildhistory tags Dan McGregor
2020-01-23 22:02 ` ✗ patchtest: failure for "procps: enable optional system..." and 2 more (rev2) Patchwork
` (2 subsequent siblings)
6 siblings, 2 replies; 10+ messages in thread
From: Dan McGregor @ 2020-01-23 21:44 UTC (permalink / raw)
To: openembedded-core
From: Daniel McGregor <daniel.mcgregor@vecima.com>
procps includes support for listing the owning unit of a process, but
this support is disabled by default. Enable support using
a PACKAGECONFIG that depends on the systemd DISTRO_FEATURE.
Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
---
meta/recipes-extended/procps/procps_3.3.15.bb | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-extended/procps/procps_3.3.15.bb b/meta/recipes-extended/procps/procps_3.3.15.bb
index f240e54fd8..17abd96dca 100644
--- a/meta/recipes-extended/procps/procps_3.3.15.bb
+++ b/meta/recipes-extended/procps/procps_3.3.15.bb
@@ -24,6 +24,9 @@ S = "${WORKDIR}/procps-ng-${PV}"
EXTRA_OECONF = "--enable-skill --disable-modern-top"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
+PACKAGECONFIG[systemd] = "--with-systemd,--without-systemd,systemd"
+
do_install_append () {
install -d ${D}${base_bindir}
[ "${bindir}" != "${base_bindir}" ] && for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i; done
--
2.24.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 2/3] cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL
2020-01-23 21:44 ` [PATCH v2 1/3] procps: enable optional systemd support Dan McGregor
@ 2020-01-23 21:44 ` Dan McGregor
2020-01-23 21:44 ` [PATCH v2 3/3] buildhistory: Allow customising buildhistory tags Dan McGregor
1 sibling, 0 replies; 10+ messages in thread
From: Dan McGregor @ 2020-01-23 21:44 UTC (permalink / raw)
To: openembedded-core
From: Daniel McGregor <daniel.mcgregor@vecima.com>
cmake 3.12 introduced this environment variable. Prefer it to passing
PARALLEL_MAKE and PARALLEL_MAKEINST on the cmake command line, because
it gets passed to second stage cmake invocations while command-line
arguments do not (for example, multi-stage clang builds)
Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
---
meta/classes/cmake.bbclass | 5 +++--
meta/lib/oe/utils.py | 11 +++++++----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index a046daa6ea..d91cf20130 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -63,8 +63,9 @@ OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH"
EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}"
-EXTRA_OECMAKE_BUILD_prepend_task-compile = "${PARALLEL_MAKE} "
-EXTRA_OECMAKE_BUILD_prepend_task-install = "${PARALLEL_MAKEINST} "
+export CMAKE_BUILD_PARALLEL_LEVEL
+CMAKE_BUILD_PARALLEL_LEVEL_task-compile = "${@oe.utils.parallel_make(d, False)}"
+CMAKE_BUILD_PARALLEL_LEVEL_task-install = "${@oe.utils.parallel_make(d, True)}"
OECMAKE_TARGET_COMPILE ?= "all"
OECMAKE_TARGET_INSTALL ?= "install"
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 652b2be145..e350b05ddf 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -169,7 +169,7 @@ def any_distro_features(d, features, truevalue="1", falsevalue=""):
"""
return bb.utils.contains_any("DISTRO_FEATURES", features, truevalue, falsevalue, d)
-def parallel_make(d):
+def parallel_make(d, makeinst=False):
"""
Return the integer value for the number of parallel threads to use when
building, scraped out of PARALLEL_MAKE. If no parallelization option is
@@ -177,7 +177,10 @@ def parallel_make(d):
e.g. if PARALLEL_MAKE = "-j 10", this will return 10 as an integer.
"""
- pm = (d.getVar('PARALLEL_MAKE') or '').split()
+ if makeinst:
+ pm = (d.getVar('PARALLEL_MAKEINST') or '').split()
+ else:
+ pm = (d.getVar('PARALLEL_MAKE') or '').split()
# look for '-j' and throw other options (e.g. '-l') away
while pm:
opt = pm.pop(0)
@@ -192,7 +195,7 @@ def parallel_make(d):
return None
-def parallel_make_argument(d, fmt, limit=None):
+def parallel_make_argument(d, fmt, limit=None, makeinst=False):
"""
Helper utility to construct a parallel make argument from the number of
parallel threads specified in PARALLEL_MAKE.
@@ -205,7 +208,7 @@ def parallel_make_argument(d, fmt, limit=None):
e.g. if PARALLEL_MAKE = "-j 10", parallel_make_argument(d, "-n %d") will return
"-n 10"
"""
- v = parallel_make(d)
+ v = parallel_make(d, makeinst)
if v:
if limit:
v = min(limit, v)
--
2.24.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 3/3] buildhistory: Allow customising buildhistory tags
2020-01-23 21:44 ` [PATCH v2 1/3] procps: enable optional systemd support Dan McGregor
2020-01-23 21:44 ` [PATCH v2 2/3] cmake: prefer CMAKE_BUILD_PARALLEL_LEVEL Dan McGregor
@ 2020-01-23 21:44 ` Dan McGregor
1 sibling, 0 replies; 10+ messages in thread
From: Dan McGregor @ 2020-01-23 21:44 UTC (permalink / raw)
To: openembedded-core
From: Daniel McGregor <daniel.mcgregor@vecima.com>
Allow setting custom buildhistory tag prefixes. This allows multiple
build directories to share one buildhistory git repository with multiple
worktrees.
Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
---
meta/classes/buildhistory.bbclass | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index affdf272d7..eb7295570d 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -40,6 +40,7 @@ BUILDHISTORY_SDK_FILES ?= "conf/local.conf conf/bblayers.conf conf/auto.conf con
BUILDHISTORY_COMMIT ?= "1"
BUILDHISTORY_COMMIT_AUTHOR ?= "buildhistory <buildhistory@${DISTRO}>"
BUILDHISTORY_PUSH_REPO ?= ""
+BUILDHISTORY_TAG ?= "build"
SSTATEPOSTINSTFUNCS_append = " buildhistory_emit_pkghistory"
# We want to avoid influencing the signatures of sstate tasks - first the function itself:
@@ -824,9 +825,9 @@ END
if [ ! -e .git ] ; then
git init -q
else
- git tag -f build-minus-3 build-minus-2 > /dev/null 2>&1 || true
- git tag -f build-minus-2 build-minus-1 > /dev/null 2>&1 || true
- git tag -f build-minus-1 > /dev/null 2>&1 || true
+ git tag -f ${BUILDHISTORY_TAG}-minus-3 ${BUILDHISTORY_TAG}-minus-2 > /dev/null 2>&1 || true
+ git tag -f ${BUILDHISTORY_TAG}-minus-2 ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true
+ git tag -f ${BUILDHISTORY_TAG}-minus-1 > /dev/null 2>&1 || true
fi
check_git_config
--
2.24.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* ✗ patchtest: failure for "procps: enable optional system..." and 2 more (rev2)
2020-01-23 20:30 [PATCH 1/3] procps: enable optional systemd support Dan McGregor
` (3 preceding siblings ...)
2020-01-23 21:44 ` [PATCH v2 1/3] procps: enable optional systemd support Dan McGregor
@ 2020-01-23 22:02 ` Patchwork
2020-01-23 22:02 ` ✗ patchtest: failure for "procps: enable optional system..." and 2 more (rev3) Patchwork
2020-01-23 22:02 ` ✗ patchtest: failure for "procps: enable optional system..." and 2 more (rev4) Patchwork
6 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2020-01-23 22:02 UTC (permalink / raw)
To: danismostlikely; +Cc: openembedded-core
== Series Details ==
Series: "procps: enable optional system..." and 2 more (rev2)
Revision: 2
URL : https://patchwork.openembedded.org/series/22252/
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 [3/3] Allow customising buildhistory tags
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>"
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
^ permalink raw reply [flat|nested] 10+ messages in thread* ✗ patchtest: failure for "procps: enable optional system..." and 2 more (rev3)
2020-01-23 20:30 [PATCH 1/3] procps: enable optional systemd support Dan McGregor
` (4 preceding siblings ...)
2020-01-23 22:02 ` ✗ patchtest: failure for "procps: enable optional system..." and 2 more (rev2) Patchwork
@ 2020-01-23 22:02 ` Patchwork
2020-01-23 22:02 ` ✗ patchtest: failure for "procps: enable optional system..." and 2 more (rev4) Patchwork
6 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2020-01-23 22:02 UTC (permalink / raw)
To: danismostlikely; +Cc: openembedded-core
== Series Details ==
Series: "procps: enable optional system..." and 2 more (rev3)
Revision: 3
URL : https://patchwork.openembedded.org/series/22252/
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 fix Rebase your series on top of targeted branch
Targeted branch master (currently at 15049c610b)
* Patch [3/3] Allow customising buildhistory tags
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>"
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
^ permalink raw reply [flat|nested] 10+ messages in thread* ✗ patchtest: failure for "procps: enable optional system..." and 2 more (rev4)
2020-01-23 20:30 [PATCH 1/3] procps: enable optional systemd support Dan McGregor
` (5 preceding siblings ...)
2020-01-23 22:02 ` ✗ patchtest: failure for "procps: enable optional system..." and 2 more (rev3) Patchwork
@ 2020-01-23 22:02 ` Patchwork
6 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2020-01-23 22:02 UTC (permalink / raw)
To: danismostlikely; +Cc: openembedded-core
== Series Details ==
Series: "procps: enable optional system..." and 2 more (rev4)
Revision: 4
URL : https://patchwork.openembedded.org/series/22252/
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 fix Rebase your series on top of targeted branch
Targeted branch master (currently at 15049c610b)
* Patch [3/3] Allow customising buildhistory tags
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>"
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
^ permalink raw reply [flat|nested] 10+ messages in thread