date:20200524

Re: [OE-core] [PATCH] file: add bzip2-replacement-native to DEPENDS to fix sstate issue

2020-05-24 Thread Richard Purdie

On Sun, 2020-05-24 at 12:04 +0200, Gregor Zatko wrote:
> From: Jan-Simon Moeller 
> 
> file-native when built on a Debian 10 host will embed a dependency to
> 'libbz2.so.1.0' (instead of 'libbz2.so.1'). This can cause issues
> when sharing the sstate between hosts e.g.:
> 
>  recipe-sysroot-native/usr/lib/rpm/rpmdeps:
>   error while loading shared libraries: libbz2.so.1.0: \
> cannot open shared object file: No such file or directory
> 
> To avoid this situation, let's add the bzip2-replacement-native to
> the
> file recipe's DEPENDS_class-native .
> 
> Details in https://bugzilla.yoctoproject.org/show_bug.cgi?id=13915 .
> 
> (From OE-Core rev: 4a996574464028bd5d57b90920d0887d1a81e9e9)
> 
> Signed-off-by: Jan-Simon Moeller 
> Signed-off-by: Richard Purdie 
> ---
>  meta/classes/sanity.bbclass | 6 ++
>  1 file changed, 6 insertions(+)

I think you've mixed up two different patches here, merging Jan-Simon's 
patch with your own inherit one...

Cheers,

Richard

> diff --git a/meta/classes/sanity.bbclass
> b/meta/classes/sanity.bbclass
> index 292c5591dd..e021b9d240 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -784,6 +784,12 @@ def check_sanity_everybuild(status, d):
>  if "." in paths or "./" in paths or "" in paths:
>  status.addresult("PATH contains '.', './' or '' (empty
> element), which will break the build, please remove this.\nParsed
> PATH is " + str(paths) + "\n")
>  
> +# Check whether 'inherit' directive is found (used for a class
> to inherit)
> +# in conf file it's supposed to be uppercase INHERIT
> +inherit = d.getVar('inherit')
> +if inherit:
> +status.addresult("Please don't use inherit directive in your
> local.conf. The directive is supposed to be used in classes and
> recipes only to inherit of bbclasses. Here INHERIT should be
> used.\n")
> +
>  # Check that the DISTRO is valid, if set
>  # need to take into account DISTRO renaming DISTRO
>  distro = d.getVar('DISTRO')

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138637): 
https://lists.openembedded.org/g/openembedded-core/message/138637
Mute This Topic: https://lists.openembedded.org/mt/74434698/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] ✗ patchtest: failure for 'inherit' directive may not be used in conf files as it's supposed to be used for the inheritance of classes. Correct form in conf file is INHERIT.

2020-05-24 Thread Patchwork

== Series Details ==

Series: 'inherit' directive may not be used in conf files as it's supposed to 
be used for the inheritance of classes. Correct form in conf file is INHERIT.
Revision: 1
URL   : https://patchwork.openembedded.org/series/24295/
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'inherit' directive may not be used in conf files as it's 
supposed to be used for the inheritance of classes. Correct form in conf file 
is INHERIT.
 Issue Shortlog does not follow expected format 
[test_shortlog_format] 
  Suggested fixCommit shortlog (first line of commit message) should follow 
the format ": "

* Patch'inherit' directive may not be used in conf files as it's 
supposed to be used for the inheritance of classes. Correct form in conf file 
is INHERIT.
 Issue Commit shortlog is too long [test_shortlog_length] 
  Suggested fixEdit shortlog so that it is 90 characters or less (currently 
147 characters)



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

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

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138642): 
https://lists.openembedded.org/g/openembedded-core/message/138642
Mute This Topic: https://lists.openembedded.org/mt/74434889/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH] sanity.bbclass: Detect and fail if 'inherit' is used in conf file

2020-05-24 Thread Gregor Zatko

Ok, thanks for the info.I shall read the guidelines again as I started
to contribute in the beginning of the year but was 3 months off then.
I'll add that next time.
On Sun, 2020-05-24 at 11:27 +0100, Paul Barker wrote:
> On Sun, 24 May 2020 at 11:24, Gregor Zatko  wrote:
> > 'inherit' directive may not be used in conf files as it's
> > supposedto be used for the inheritance of classes.Correct form in
> > conf file is INHERIT.
> > This commit adds:- a sanity check to find whether the wrong case
> > exists- fail the build if so- tell user about the difference in
> > directives
> > https://bugzilla.yoctoproject.org/show_bug.cgi?id=5426
> > 
> > Signed-off-by: Gregor Zatko ---
> > meta/classes/sanity.bbclass | 6 ++ 1 file changed, 6
> > insertions(+)
> > diff --git a/meta/classes/sanity.bbclass
> > b/meta/classes/sanity.bbclassindex 292c5591dd..e021b9d240 100644---
> > a/meta/classes/sanity.bbclass+++ b/meta/classes/sanity.bbclass@@
> > -784,6 +784,12 @@ def check_sanity_everybuild(status, d): if
> > "." in paths or "./" in paths or "" in
> > paths: status.addresult("PATH contains '.', './' or ''
> > (empty element), which will break the build, please remove
> > this.\nParsed PATH is " + str(paths) + "\n")
> > +# Check whether 'inherit' directive is found (used for a class
> > to inherit)+# in conf file it's supposed to be uppercase
> > INHERIT+inherit = d.getVar('inherit')+if
> > inherit:+status.addresult("Please don't use inherit
> > directive in your local.conf. The directive is supposed to be used
> > in classes and recipes only to inherit of bbclasses. Here INHERIT
> > should be used.\n")+ # Check that the DISTRO is valid, if
> > set # need to take into account DISTRO renaming
> > DISTRO distro = d.getVar('DISTRO')--2.26.2
> 
> From 
> https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded:Please
> substitute "PATCH" with "PATCH v2" if you are submitting arevised
> version after addressing feedback (or v3, v4 etc.).
> I've seen several versions of this patch today and it would be easy
> tolose track of which one is the latest if they arrive in
> someone'sinbox out-of-order.
> No need to re-send just for this but please add a version next time.
> Thanks,
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138641): 
https://lists.openembedded.org/g/openembedded-core/message/138641
Mute This Topic: https://lists.openembedded.org/mt/74426802/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH] sanity.bbclass: Detect and fail if 'inherit' is used in conf file

2020-05-24 Thread Paul Barker

On Sat, 23 May 2020 at 21:27, Gregor Zatko  wrote:
>
> 'inherit' directive may not be used in conf files as it's supposed
> to be used for the inheritance of classes.
> Correct form in conf file is INHERIT.
>
> This commit adds:
> - a sanity check to find whether the wrong case exists
> - fail the build if so
> - tell user about the difference in directives
>
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=5426
>
> Signed-off-by: Gregor Zatko 
> ---
>  meta/classes/sanity.bbclass | 48 +
>  1 file changed, 27 insertions(+), 21 deletions(-)
>
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index 292c5591dd..b6b3d0c71d 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -25,7 +25,7 @@ def sanity_conf_update(fn, lines, version_var_name, 
> new_version):
>  with open(fn, "w") as f:
>  f.write(''.join(lines))
>
> -# Functions added to this variable MUST throw a NotImplementedError 
> exception unless
> +# Functions added to this variable MUST throw a NotImplementedError 
> exception unless
>  # they successfully changed the config version in the config file. Exceptions
>  # are used since exec_func doesn't handle return values.
>  BBLAYERS_CONF_UPDATE_FUNCS += " \
> @@ -42,13 +42,13 @@ python oecore_update_localconf() {
>  current_conf  = d.getVar('CONF_VERSION')
>  conf_version =  d.getVar('LOCALCONF_VERSION')
>
> -failmsg = """Your version of local.conf was generated from an 
> older/newer version of
> -local.conf.sample and there have been updates made to this file. Please 
> compare the two
> +failmsg = """Your version of local.conf was generated from an 
> older/newer version of
> +local.conf.sample and there have been updates made to this file. Please 
> compare the two
>  files and merge any changes before continuing.
>
>  Matching the version numbers will remove this message.
>
> -\"${SANITY_DIFF_TOOL} conf/local.conf ${SANITY_LOCALCONF_SAMPLE}\"
> +\"${SANITY_DIFF_TOOL} conf/local.conf ${SANITY_LOCALCONF_SAMPLE}\"
>
>  is a good way to visualise the changes."""
>  failmsg = d.expand(failmsg)
> @@ -62,13 +62,13 @@ python oecore_update_siteconf() {
>  current_sconf = d.getVar('SCONF_VERSION')
>  sconf_version = d.getVar('SITE_CONF_VERSION')
>
> -failmsg = """Your version of site.conf was generated from an older 
> version of
> -site.conf.sample and there have been updates made to this file. Please 
> compare the two
> +failmsg = """Your version of site.conf was generated from an older 
> version of
> +site.conf.sample and there have been updates made to this file. Please 
> compare the two
>  files and merge any changes before continuing.
>
>  Matching the version numbers will remove this message.
>
> -\"${SANITY_DIFF_TOOL} conf/site.conf ${SANITY_SITECONF_SAMPLE}\"
> +\"${SANITY_DIFF_TOOL} conf/site.conf ${SANITY_SITECONF_SAMPLE}\"
>
>  is a good way to visualise the changes."""
>  failmsg = d.expand(failmsg)
> @@ -85,7 +85,7 @@ python oecore_update_bblayers() {
>
>  failmsg = """Your version of bblayers.conf has the wrong LCONF_VERSION 
> (has ${LCONF_VERSION}, expecting ${LAYER_CONF_VERSION}).
>  Please compare your file against bblayers.conf.sample and merge any changes 
> before continuing.
> -"${SANITY_DIFF_TOOL} conf/bblayers.conf ${SANITY_BBLAYERCONF_SAMPLE}"
> +"${SANITY_DIFF_TOOL} conf/bblayers.conf ${SANITY_BBLAYERCONF_SAMPLE}"
>
>  is a good way to visualise the changes."""
>  failmsg = d.expand(failmsg)
> @@ -182,7 +182,7 @@ def raise_sanity_error(msg, d, network_error=False):
>  bb.fatal(""" OE-core's config sanity checker detected a potential 
> misconfiguration.
>  Either fix the cause of this error or at your own risk disable the 
> checker (see sanity.conf).
>  Following is the list of potential problems / advisories:
> -
> +
>  %s""" % msg)
>
>  # Check flags associated with a tuning.
> @@ -538,7 +538,7 @@ def check_wsl(d):
>  def check_gcc_version(sanity_data):
>  from distutils.version import LooseVersion
>  import subprocess
> -
> +
>  build_cc, version = oe.utils.get_host_compiler_version(sanity_data)
>  if build_cc.strip() == "gcc":
>  if LooseVersion(version) < LooseVersion("6.0"):
> @@ -561,7 +561,7 @@ def check_tar_version(sanity_data):
>  return None
>
>  # We use git parameters and functionality only found in 1.7.8 or later
> -# The kernel tools assume git >= 1.8.3.1 (verified needed > 1.7.9.5) see 
> #6162
> +# The kernel tools assume git >= 1.8.3.1 (verified needed > 1.7.9.5) see 
> #6162
>  # The git fetcher also had workarounds for git < 1.7.9.2 which we've dropped
>  def check_git_version(sanity_data):
>  from distutils.version import LooseVersion
> @@ -644,7 +644,7 @@ def check_sanity_sstate_dir_change(sstate_dir, data):
>
>  def check_sanity_version_change(status, d):
>  # Sanity checks to be done when SANITY_VERSION or NATIVELSBSTRING changes
> -# In other

[OE-core] [PATCH] file: add bzip2-replacement-native to DEPENDS to fix sstate issue

2020-05-24 Thread Gregor Zatko

From: Jan-Simon Moeller 

file-native when built on a Debian 10 host will embed a dependency to
'libbz2.so.1.0' (instead of 'libbz2.so.1'). This can cause issues
when sharing the sstate between hosts e.g.:

 recipe-sysroot-native/usr/lib/rpm/rpmdeps:
  error while loading shared libraries: libbz2.so.1.0: \
cannot open shared object file: No such file or directory

To avoid this situation, let's add the bzip2-replacement-native to the
file recipe's DEPENDS_class-native .

Details in https://bugzilla.yoctoproject.org/show_bug.cgi?id=13915 .

(From OE-Core rev: 4a996574464028bd5d57b90920d0887d1a81e9e9)

Signed-off-by: Jan-Simon Moeller 
Signed-off-by: Richard Purdie 
---
 meta/classes/sanity.bbclass | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 292c5591dd..e021b9d240 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -784,6 +784,12 @@ def check_sanity_everybuild(status, d):
 if "." in paths or "./" in paths or "" in paths:
 status.addresult("PATH contains '.', './' or '' (empty element), which 
will break the build, please remove this.\nParsed PATH is " + str(paths) + "\n")
 
+# Check whether 'inherit' directive is found (used for a class to inherit)
+# in conf file it's supposed to be uppercase INHERIT
+inherit = d.getVar('inherit')
+if inherit:
+status.addresult("Please don't use inherit directive in your 
local.conf. The directive is supposed to be used in classes and recipes only to 
inherit of bbclasses. Here INHERIT should be used.\n")
+
 # Check that the DISTRO is valid, if set
 # need to take into account DISTRO renaming DISTRO
 distro = d.getVar('DISTRO')
-- 
2.26.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138636): 
https://lists.openembedded.org/g/openembedded-core/message/138636
Mute This Topic: https://lists.openembedded.org/mt/74434698/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] 'inherit' directive may not be used in conf files as it's supposed to be used for the inheritance of classes. Correct form in conf file is INHERIT.

2020-05-24 Thread Gregor Zatko

This commit adds:
- a sanity check to find whether the wrong case exists
- fail the build if so
- tell user about the difference in directives

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

Signed-off-by: Gregor Zatko 
---
 meta/classes/sanity.bbclass | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 292c5591dd..e021b9d240 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -784,6 +784,12 @@ def check_sanity_everybuild(status, d):
 if "." in paths or "./" in paths or "" in paths:
 status.addresult("PATH contains '.', './' or '' (empty element), which 
will break the build, please remove this.\nParsed PATH is " + str(paths) + "\n")
 
+# Check whether 'inherit' directive is found (used for a class to inherit)
+# in conf file it's supposed to be uppercase INHERIT
+inherit = d.getVar('inherit')
+if inherit:
+status.addresult("Please don't use inherit directive in your 
local.conf. The directive is supposed to be used in classes and recipes only to 
inherit of bbclasses. Here INHERIT should be used.\n")
+
 # Check that the DISTRO is valid, if set
 # need to take into account DISTRO renaming DISTRO
 distro = d.getVar('DISTRO')
-- 
2.26.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138638): 
https://lists.openembedded.org/g/openembedded-core/message/138638
Mute This Topic: https://lists.openembedded.org/mt/74434832/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] sanity.bbclass: Detect and fail if 'inherit' is used in conf file

2020-05-24 Thread Gregor Zatko

'inherit' directive may not be used in conf files as it's supposed
to be used for the inheritance of classes.
Correct form in conf file is INHERIT.

This commit adds:
- a sanity check to find whether the wrong case exists
- fail the build if so
- tell user about the difference in directives

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

Signed-off-by: Gregor Zatko 
---
 meta/classes/sanity.bbclass | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 292c5591dd..e021b9d240 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -784,6 +784,12 @@ def check_sanity_everybuild(status, d):
 if "." in paths or "./" in paths or "" in paths:
 status.addresult("PATH contains '.', './' or '' (empty element), which 
will break the build, please remove this.\nParsed PATH is " + str(paths) + "\n")
 
+# Check whether 'inherit' directive is found (used for a class to inherit)
+# in conf file it's supposed to be uppercase INHERIT
+inherit = d.getVar('inherit')
+if inherit:
+status.addresult("Please don't use inherit directive in your 
local.conf. The directive is supposed to be used in classes and recipes only to 
inherit of bbclasses. Here INHERIT should be used.\n")
+
 # Check that the DISTRO is valid, if set
 # need to take into account DISTRO renaming DISTRO
 distro = d.getVar('DISTRO')
-- 
2.26.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138639): 
https://lists.openembedded.org/g/openembedded-core/message/138639
Mute This Topic: https://lists.openembedded.org/mt/74426802/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH] sanity.bbclass: Detect and fail if 'inherit' is used in conf file

2020-05-24 Thread Paul Barker

On Sun, 24 May 2020 at 11:24, Gregor Zatko  wrote:
>
> 'inherit' directive may not be used in conf files as it's supposed
> to be used for the inheritance of classes.
> Correct form in conf file is INHERIT.
>
> This commit adds:
> - a sanity check to find whether the wrong case exists
> - fail the build if so
> - tell user about the difference in directives
>
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=5426
>
> Signed-off-by: Gregor Zatko 
> ---
>  meta/classes/sanity.bbclass | 6 ++
>  1 file changed, 6 insertions(+)
>
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index 292c5591dd..e021b9d240 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -784,6 +784,12 @@ def check_sanity_everybuild(status, d):
>  if "." in paths or "./" in paths or "" in paths:
>  status.addresult("PATH contains '.', './' or '' (empty element), 
> which will break the build, please remove this.\nParsed PATH is " + 
> str(paths) + "\n")
>
> +# Check whether 'inherit' directive is found (used for a class to 
> inherit)
> +# in conf file it's supposed to be uppercase INHERIT
> +inherit = d.getVar('inherit')
> +if inherit:
> +status.addresult("Please don't use inherit directive in your 
> local.conf. The directive is supposed to be used in classes and recipes only 
> to inherit of bbclasses. Here INHERIT should be used.\n")
> +
>  # Check that the DISTRO is valid, if set
>  # need to take into account DISTRO renaming DISTRO
>  distro = d.getVar('DISTRO')
> --
> 2.26.2

>From https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded:
Please substitute "PATCH" with "PATCH v2" if you are submitting a
revised version after addressing feedback (or v3, v4 etc.).

I've seen several versions of this patch today and it would be easy to
lose track of which one is the latest if they arrive in someone's
inbox out-of-order.

No need to re-send just for this but please add a version next time.

Thanks,

-- 
Paul Barker
Konsulko Group
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138640): 
https://lists.openembedded.org/g/openembedded-core/message/138640
Mute This Topic: https://lists.openembedded.org/mt/74426802/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH] strace: upgrade 5.5 -> 5.6

2020-05-24 Thread Richard Purdie

On Sat, 2020-05-23 at 19:05 +0800, zhengruoqin wrote:
> Signed-off-by: Zheng Ruoqin 
> ---
>  meta/recipes-devtools/strace/{strace_5.5.bb => strace_5.6.bb} | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-devtools/strace/{strace_5.5.bb => strace_5.6.bb} (92%)
> 
> diff --git a/meta/recipes-devtools/strace/strace_5.5.bb 
> b/meta/recipes-devtools/strace/strace_5.6.bb
> similarity index 92%
> rename from meta/recipes-devtools/strace/strace_5.5.bb
> rename to meta/recipes-devtools/strace/strace_5.6.bb
> index ae552da028..5015e87b22 100644
> --- a/meta/recipes-devtools/strace/strace_5.5.bb
> +++ b/meta/recipes-devtools/strace/strace_5.6.bb
> @@ -15,8 +15,8 @@ SRC_URI = 
> "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
> file://uintptr_t.patch \
> file://0001-strace-fix-reproducibilty-issues.patch \
> "
> -SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9"
> -SRC_URI[sha256sum] = 
> "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff"
> +SRC_URI[md5sum] = "f8e0394d4e537b3faadf0a72f5d1d17e"
> +SRC_URI[sha256sum] = 
> "189968eeae06ed9e20166ec55a830943c84374676a457c9fe010edc7541f1b01"
>  
>  inherit autotools ptest

Fails on musl qemux86:

https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/1938

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138643): 
https://lists.openembedded.org/g/openembedded-core/message/138643
Mute This Topic: https://lists.openembedded.org/mt/74413658/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream

2020-05-24 Thread Richard Purdie

On Sat, 2020-05-23 at 21:12 +0200, Gregor Zatko wrote:
> From: Gregor Zatko 
> 
> Until now a Debian package has been used as a source.
> This change just switches it to project's upstream.
> 
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270
> 
> Signed-off-by: Gregor Zatko 
> ---
>  .../docbook-xml-update-catalog.xml.patch  | 515 --
>  .../docbook-xml/docbook-xml-dtd4_4.5.bb   |  65 ++-
>  2 files changed, 36 insertions(+), 544 deletions(-)
>  delete mode 100644 
> meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch

Unfortunately test builds failed:

https://autobuilder.yoctoproject.org/typhoon/#/builders/23/builds/2176

Cheers,

Richard

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138644): 
https://lists.openembedded.org/g/openembedded-core/message/138644
Mute This Topic: https://lists.openembedded.org/mt/74423806/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] initramfs-framework/udev: umount /run/media/XXX

2020-05-24 Thread hongxu

In initramfs-framework, before swith_root rootfs, if udev have time to
run (before being killed), it will invoke hook mount.sh (which is provided
by udev-extraconf) to mount /run/media/XXX.

Release the mounted disk after udev being killed.

Signed-off-by: Hongxu Jia 
---
 meta/recipes-core/initrdscripts/initramfs-framework/udev | 5 +
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/udev 
b/meta/recipes-core/initrdscripts/initramfs-framework/udev
index 4898b89246..8b62080c68 100644
--- a/meta/recipes-core/initrdscripts/initramfs-framework/udev
+++ b/meta/recipes-core/initrdscripts/initramfs-framework/udev
@@ -8,6 +8,11 @@ udev_shutdown_hook_handler() {
if [ "$status" = "pre" ] && [ "$module" = "finish" ]; then
udevadm settle
killall `basename $_UDEV_DAEMON` 2>/dev/null
+
+   # Umount other media which is mounted by udev
+   for dir in `awk '/\/dev.* \/run\/media/{print $2}' 
/proc/mounts`; do
+   umount $dir
+   done
fi
 }
 
-- 
2.18.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138651): 
https://lists.openembedded.org/g/openembedded-core/message/138651
Mute This Topic: https://lists.openembedded.org/mt/74450071/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH] u-boot: change ${PN} to u-boot when install/deploy u-boot-init-env

2020-05-24 Thread Denys Dmytriyenko

On Sun, May 24, 2020 at 06:17:51PM +0200, Ming Liu wrote:
> From: Ming Liu 
> 
> It's really inconvenient to have ${PN} as part of the name of
> u-boot-init-env, for instance, in BSP layers, it could be u-boot-fslc,
> u-boot-qoriq, u-boot-toradex, and so on.
> 
> Considerring there is only one virtual/bootloader for a build, we could
> replace ${PN} with u-boot to not have to distinguish different names
> when accessing it.

Have you tried git log?
Have you heard of multi-stage bootloaders and chain-loading?
Assumption that there's a single u-boot per platform built is long since 
outdated - please don't break other's use cases for a tiny bit of convenience.

A better approach here would be:
1. make it completely optional to build/install/deploy this u-boot-initial-env
2. make it fully configurable with vars like UBOOT_BINARY, SPL_BINARY, 
UBOOT_ELF. UBOOT_ENV, etc.

-- 
Denys


> Signed-off-by: Ming Liu 
> ---
>  meta/recipes-bsp/u-boot/u-boot.inc | 28 ++--
>  1 file changed, 14 insertions(+), 14 deletions(-)
> 
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc 
> b/meta/recipes-bsp/u-boot/u-boot.inc
> index 80f828df52..188e5295cf 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -156,10 +156,10 @@ do_install () {
>  ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
> ${D}/boot/${UBOOT_BINARY}
>  
>  # Install the uboot-initial-env
> -install -D -m 644 
> ${B}/${config}/u-boot-initial-env-${type} 
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> -ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}
> -ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
> ${D}/${sysconfdir}/${PN}-initial-env-${type}
> -ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
> ${D}/${sysconfdir}/${PN}-initial-env
> +install -D -m 644 
> ${B}/${config}/u-boot-initial-env-${type} 
> ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> +ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
> ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}
> +ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
> ${D}/${sysconfdir}/u-boot-initial-env-${type}
> +ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
> ${D}/${sysconfdir}/u-boot-initial-env
>  fi
>  done
>  unset  j
> @@ -170,9 +170,9 @@ do_install () {
>  ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
>  
>  # Install the uboot-initial-env
> -install -D -m 644 ${B}/u-boot-initial-env 
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
> -ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} 
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}
> -ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} 
> ${D}/${sysconfdir}/${PN}-initial-env
> +install -D -m 644 ${B}/u-boot-initial-env 
> ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${PV}-${PR}
> +ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} 
> ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}
> +ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} 
> ${D}/${sysconfdir}/u-boot-initial-env
>  fi
>  
>  if [ -n "${UBOOT_ELF}" ]
> @@ -245,7 +245,7 @@ PACKAGE_BEFORE_PN += "${PN}-env"
>  
>  RPROVIDES_${PN}-env += "u-boot-default-env"
>  FILES_${PN}-env = " \
> -${sysconfdir}/${PN}-initial-env* \
> +${sysconfdir}/u-boot-initial-env* \
>  ${sysconfdir}/fw_env.config \
>  "
>  
> @@ -269,10 +269,10 @@ do_deploy () {
>  ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
> ${UBOOT_BINARY}
>  
>  # Deploy the uboot-initial-env
> -install -D -m 644 
> ${B}/${config}/u-boot-initial-env-${type} 
> ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> +install -D -m 644 
> ${B}/${config}/u-boot-initial-env-${type} 
> ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
>  cd ${DEPLOYDIR}
> -ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
> ${PN}-initial-env-${MACHINE}-${type}
> -ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
> ${PN}-initial-env-${type}
> +ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
> u-boot-initial-env-${MACHINE}-${type}
> +ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
> u-boot-initial-env-${type}
>  fi
>  done
>  unset  j
> @@ -287,10 +287,10 @@ do_deploy () {
>  ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
>  
>  # Deploy the uboot-initial-env
> -install -D -m 644 ${B}/u-boot-initial-env 
>

[OE-core] [PATCH] u-boot: change ${PN} to u-boot when install/deploy u-boot-init-env

2020-05-24 Thread Ming Liu

From: Ming Liu 

It's really inconvenient to have ${PN} as part of the name of
u-boot-init-env, for instance, in BSP layers, it could be u-boot-fslc,
u-boot-qoriq, u-boot-toradex, and so on.

Considerring there is only one virtual/bootloader for a build, we could
replace ${PN} with u-boot to not have to distinguish different names
when accessing it.

Signed-off-by: Ming Liu 
---
 meta/recipes-bsp/u-boot/u-boot.inc | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc 
b/meta/recipes-bsp/u-boot/u-boot.inc
index 80f828df52..188e5295cf 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -156,10 +156,10 @@ do_install () {
 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${D}/boot/${UBOOT_BINARY}
 
 # Install the uboot-initial-env
-install -D -m 644 
${B}/${config}/u-boot-initial-env-${type} 
${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
-ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}
-ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${D}/${sysconfdir}/${PN}-initial-env-${type}
-ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${D}/${sysconfdir}/${PN}-initial-env
+install -D -m 644 
${B}/${config}/u-boot-initial-env-${type} 
${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
+ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}
+ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${D}/${sysconfdir}/u-boot-initial-env-${type}
+ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${D}/${sysconfdir}/u-boot-initial-env
 fi
 done
 unset  j
@@ -170,9 +170,9 @@ do_install () {
 ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
 
 # Install the uboot-initial-env
-install -D -m 644 ${B}/u-boot-initial-env 
${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
-ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} 
${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}
-ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} 
${D}/${sysconfdir}/${PN}-initial-env
+install -D -m 644 ${B}/u-boot-initial-env 
${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${PV}-${PR}
+ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} 
${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}
+ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} 
${D}/${sysconfdir}/u-boot-initial-env
 fi
 
 if [ -n "${UBOOT_ELF}" ]
@@ -245,7 +245,7 @@ PACKAGE_BEFORE_PN += "${PN}-env"
 
 RPROVIDES_${PN}-env += "u-boot-default-env"
 FILES_${PN}-env = " \
-${sysconfdir}/${PN}-initial-env* \
+${sysconfdir}/u-boot-initial-env* \
 ${sysconfdir}/fw_env.config \
 "
 
@@ -269,10 +269,10 @@ do_deploy () {
 ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${UBOOT_BINARY}
 
 # Deploy the uboot-initial-env
-install -D -m 644 
${B}/${config}/u-boot-initial-env-${type} 
${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
+install -D -m 644 
${B}/${config}/u-boot-initial-env-${type} 
${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
 cd ${DEPLOYDIR}
-ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${PN}-initial-env-${MACHINE}-${type}
-ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${PN}-initial-env-${type}
+ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
u-boot-initial-env-${MACHINE}-${type}
+ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
u-boot-initial-env-${type}
 fi
 done
 unset  j
@@ -287,10 +287,10 @@ do_deploy () {
 ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
 
 # Deploy the uboot-initial-env
-install -D -m 644 ${B}/u-boot-initial-env 
${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
+install -D -m 644 ${B}/u-boot-initial-env 
${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR}
 cd ${DEPLOYDIR}
-ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} 
${PN}-initial-env-${MACHINE}
-ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} ${PN}-initial-env
+ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} 
u-boot-initial-env-${MACHINE}
+ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} u-boot-initial-env
 fi
 
 if [ -e ${WORKDIR}/fw_env.config ] ; then
-- 
2.26.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138645):

[OE-core] [PATCH] u-boot.inc: fix some inconsistent coding style

2020-05-24 Thread Ming Liu

From: Ming Liu 

Signed-off-by: Ming Liu 
---
 meta/recipes-bsp/u-boot/u-boot.inc | 44 ++
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc 
b/meta/recipes-bsp/u-boot/u-boot.inc
index 80f828df52..718435f13f 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -91,19 +91,19 @@ do_configure () {
 }
 
 do_compile () {
-   if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then
-   sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' 
${S}/config.mk
-   fi
+if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then
+sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk
+fi
 
-   unset LDFLAGS
-   unset CFLAGS
-   unset CPPFLAGS
+unset LDFLAGS
+unset CFLAGS
+unset CPPFLAGS
 
-   if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
-   then
-   echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
-   echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
-   fi
+if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
+then
+echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
+echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
+fi
 
 if [ -n "${UBOOT_CONFIG}" ]
 then
@@ -130,16 +130,15 @@ do_compile () {
 unset k
 fi
 done
-unset  j
+unset j
 done
-unset  i
+unset i
 else
 oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET}
 
 # Generate the uboot-initial-env
 oe_runmake -C ${S} O=${B} u-boot-initial-env
 fi
-
 }
 
 do_install () {
@@ -162,9 +161,9 @@ do_install () {
 ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${D}/${sysconfdir}/${PN}-initial-env
 fi
 done
-unset  j
+unset j
 done
-unset  i
+unset i
 else
 install -D -m 644 ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
 ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
@@ -219,9 +218,9 @@ do_install () {
  ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} 
${D}/boot/${SPL_BINARYNAME}
 fi
 done
-unset  j
+unset j
 done
-unset  i
+unset i
 else
 install -m 644 ${B}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
 ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARYNAME}
@@ -238,7 +237,6 @@ do_install () {
 then
 install -Dm 0644 ${UBOOT_EXTLINUX_CONFIG} 
${D}/${UBOOT_EXTLINUX_INSTALL_DIR}/${UBOOT_EXTLINUX_CONF_NAME}
 fi
-
 }
 
 PACKAGE_BEFORE_PN += "${PN}-env"
@@ -275,9 +273,9 @@ do_deploy () {
 ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${PN}-initial-env-${type}
 fi
 done
-unset  j
+unset j
 done
-unset  i
+unset i
 else
 install -D -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
 
@@ -346,9 +344,9 @@ do_deploy () {
 ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} 
${DEPLOYDIR}/${SPL_SYMLINK}
 fi
 done
-unset  j
+unset j
 done
-unset  i
+unset i
 else
 install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
 rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK}
-- 
2.26.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138646): 
https://lists.openembedded.org/g/openembedded-core/message/138646
Mute This Topic: https://lists.openembedded.org/mt/74440057/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[OE-core] [PATCH] at-spi2-atk: dont inherit features_check

2020-05-24 Thread Ming Liu

From: Ming Liu 

In commit be18dabd:
[ at-spi2: Make X11 support truly optional ]

REQUIRED_DISTRO_FEATURES was dropped, so it does not have to inherit
features_check.bbclass.

Signed-off-by: Ming Liu 
---
 meta/recipes-support/atk/at-spi2-atk_2.34.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-support/atk/at-spi2-atk_2.34.2.bb 
b/meta/recipes-support/atk/at-spi2-atk_2.34.2.bb
index 107d312d14..02a4d4712c 100644
--- a/meta/recipes-support/atk/at-spi2-atk_2.34.2.bb
+++ b/meta/recipes-support/atk/at-spi2-atk_2.34.2.bb
@@ -9,7 +9,7 @@ SRC_URI[archive.sha256sum] = 
"901323cee0eef05c01ec4dee06c701aeeca81a314a7d60216f
 DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core libxml2"
 
 GNOMEBASEBUILDCLASS = "meson"
-inherit gnomebase features_check upstream-version-is-even
+inherit gnomebase upstream-version-is-even
 
 PACKAGES =+ "${PN}-gnome ${PN}-gtk2"
 
-- 
2.26.2

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#138647): 
https://lists.openembedded.org/g/openembedded-core/message/138647
Mute This Topic: https://lists.openembedded.org/mt/74440068/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [OE-core] [PATCH] u-boot: change ${PN} to u-boot when install/deploy u-boot-init-env

2020-05-24 Thread Konrad Weihmann

I know of a project which requires building multiple u-boot-versions 
within a single run (secure and not-secure) so this hardcoding esp. of 
the DEPLOY fragments doesn't work there and may lead to completely 
nondeterministic outputs in the DEPLOY dir.
If you could extract the currently hardcoded file name to a var, which 
then could be overridden for the specific context, the patch could 
really be helpful


On 24.05.20 18:17, Ming Liu wrote:

From: Ming Liu 

It's really inconvenient to have ${PN} as part of the name of
u-boot-init-env, for instance, in BSP layers, it could be u-boot-fslc,
u-boot-qoriq, u-boot-toradex, and so on.

Considerring there is only one virtual/bootloader for a build, we could
replace ${PN} with u-boot to not have to distinguish different names
when accessing it.

Signed-off-by: Ming Liu 
---
  meta/recipes-bsp/u-boot/u-boot.inc | 28 ++--
  1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot.inc 
b/meta/recipes-bsp/u-boot/u-boot.inc
index 80f828df52..188e5295cf 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -156,10 +156,10 @@ do_install () {
  ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${D}/boot/${UBOOT_BINARY}
  
  # Install the uboot-initial-env

-install -D -m 644 
${B}/${config}/u-boot-initial-env-${type} 
${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
-ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}
-ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${D}/${sysconfdir}/${PN}-initial-env-${type}
-ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${D}/${sysconfdir}/${PN}-initial-env
+install -D -m 644 
${B}/${config}/u-boot-initial-env-${type} 
${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
+ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}
+ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${D}/${sysconfdir}/u-boot-initial-env-${type}
+ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${D}/${sysconfdir}/u-boot-initial-env
  fi
  done
  unset  j
@@ -170,9 +170,9 @@ do_install () {
  ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
  
  # Install the uboot-initial-env

-install -D -m 644 ${B}/u-boot-initial-env 
${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
-ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} 
${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}
-ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR} 
${D}/${sysconfdir}/${PN}-initial-env
+install -D -m 644 ${B}/u-boot-initial-env 
${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${PV}-${PR}
+ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} 
${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}
+ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR} 
${D}/${sysconfdir}/u-boot-initial-env
  fi
  
  if [ -n "${UBOOT_ELF}" ]

@@ -245,7 +245,7 @@ PACKAGE_BEFORE_PN += "${PN}-env"
  
  RPROVIDES_${PN}-env += "u-boot-default-env"

  FILES_${PN}-env = " \
-${sysconfdir}/${PN}-initial-env* \
+${sysconfdir}/u-boot-initial-env* \
  ${sysconfdir}/fw_env.config \
  "
  
@@ -269,10 +269,10 @@ do_deploy () {

  ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} 
${UBOOT_BINARY}
  
  # Deploy the uboot-initial-env

-install -D -m 644 
${B}/${config}/u-boot-initial-env-${type} 
${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
+install -D -m 644 
${B}/${config}/u-boot-initial-env-${type} 
${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
  cd ${DEPLOYDIR}
-ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${PN}-initial-env-${MACHINE}-${type}
-ln -sf ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} 
${PN}-initial-env-${type}
+ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
u-boot-initial-env-${MACHINE}-${type}
+ln -sf u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} 
u-boot-initial-env-${type}
  fi
  done
  unset  j
@@ -287,10 +287,10 @@ do_deploy () {
  ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
  
  # Deploy the uboot-initial-env

-install -D -m 644 ${B}/u-boot-initial-env 
${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
+install -D -m 644 ${B}/u-boot-initial-env 
${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR}
  cd ${DEPLOYDIR}
-ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}

Re: [OE-core] [PATCH] u-boot: change ${PN} to u-boot when install/deploy u-boot-init-env

2020-05-24 Thread Ming Liu

Yes, that is a very good suggestion, will do that in V2.

//Ming Liu

I know of a project which requires building multiple u-boot-versions
> within a single run (secure and not-secure) so this hardcoding esp. of
> the DEPLOY fragments doesn't work there and may lead to completely
> nondeterministic outputs in the DEPLOY dir.
> If you could extract the currently hardcoded file name to a var, which
> then could be overridden for the specific context, the patch could
> really be helpful
>
> On 24.05.20 18:17, Ming Liu wrote:
> > From: Ming Liu 
> >
> > It's really inconvenient to have ${PN} as part of the name of
> > u-boot-init-env, for instance, in BSP layers, it could be u-boot-fslc,
> > u-boot-qoriq, u-boot-toradex, and so on.
> >
> > Considerring there is only one virtual/bootloader for a build, we could
> > replace ${PN} with u-boot to not have to distinguish different names
> > when accessing it.
> >
> > Signed-off-by: Ming Liu 
> > ---
> >   meta/recipes-bsp/u-boot/u-boot.inc | 28 ++--
> >   1 file changed, 14 insertions(+), 14 deletions(-)
> >
> > diff --git a/meta/recipes-bsp/u-boot/u-boot.inc
> b/meta/recipes-bsp/u-boot/u-boot.inc
> > index 80f828df52..188e5295cf 100644
> > --- a/meta/recipes-bsp/u-boot/u-boot.inc
> > +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> > @@ -156,10 +156,10 @@ do_install () {
> >   ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
> ${D}/boot/${UBOOT_BINARY}
> >
> >   # Install the uboot-initial-env
> > -install -D -m 644
> ${B}/${config}/u-boot-initial-env-${type}
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> > -ln -sf
> ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${type}
> > -ln -sf
> ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env-${type}
> > -ln -sf
> ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env
> > +install -D -m 644
> ${B}/${config}/u-boot-initial-env-${type}
> ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> > +ln -sf
> u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${type}
> > +ln -sf
> u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/u-boot-initial-env-${type}
> > +ln -sf
> u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${D}/${sysconfdir}/u-boot-initial-env
> >   fi
> >   done
> >   unset  j
> > @@ -170,9 +170,9 @@ do_install () {
> >   ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
> >
> >   # Install the uboot-initial-env
> > -install -D -m 644 ${B}/u-boot-initial-env
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}-${PV}-${PR}
> > -ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env-${MACHINE}
> > -ln -sf ${PN}-initial-env-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/${PN}-initial-env
> > +install -D -m 644 ${B}/u-boot-initial-env
> ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}-${PV}-${PR}
> > +ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/u-boot-initial-env-${MACHINE}
> > +ln -sf u-boot-initial-env-${MACHINE}-${PV}-${PR}
> ${D}/${sysconfdir}/u-boot-initial-env
> >   fi
> >
> >   if [ -n "${UBOOT_ELF}" ]
> > @@ -245,7 +245,7 @@ PACKAGE_BEFORE_PN += "${PN}-env"
> >
> >   RPROVIDES_${PN}-env += "u-boot-default-env"
> >   FILES_${PN}-env = " \
> > -${sysconfdir}/${PN}-initial-env* \
> > +${sysconfdir}/u-boot-initial-env* \
> >   ${sysconfdir}/fw_env.config \
> >   "
> >
> > @@ -269,10 +269,10 @@ do_deploy () {
> >   ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX}
> ${UBOOT_BINARY}
> >
> >   # Deploy the uboot-initial-env
> > -install -D -m 644
> ${B}/${config}/u-boot-initial-env-${type}
> ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> > +install -D -m 644
> ${B}/${config}/u-boot-initial-env-${type}
> ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> >   cd ${DEPLOYDIR}
> > -ln -sf
> ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR}
> ${PN}-initial-env-${MACHINE}-${type}
> > -ln -sf
> ${PN}-initial-env-${MACHINE}-${type}-${PV}-${PR} ${PN}-initial-env-${type}
> > +ln -sf
> u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR}
> u-boot-initial-env-${MACHINE}-${type}
> > +ln -sf
> u-boot-initial-env-${MACHINE}-${type}-${PV}-${PR} u-boot-initial-env-${type}
> >   fi
> >   done
> >   unset  j
> > @@ -287,10 +287,10 @@ do_deploy () {
> >   ln -sf

Re: [OE-core] [PATCH] file: add bzip2-replacement-native to DEPENDS to fix sstate issue

[OE-core] ✗ patchtest: failure for 'inherit' directive may not be used in conf files as it's supposed to be used for the inheritance of classes. Correct form in conf file is INHERIT.

Re: [OE-core] [PATCH] sanity.bbclass: Detect and fail if 'inherit' is used in conf file

Re: [OE-core] [PATCH] sanity.bbclass: Detect and fail if 'inherit' is used in conf file

[OE-core] [PATCH] file: add bzip2-replacement-native to DEPENDS to fix sstate issue

[OE-core] [PATCH] 'inherit' directive may not be used in conf files as it's supposed to be used for the inheritance of classes. Correct form in conf file is INHERIT.

[OE-core] [PATCH] sanity.bbclass: Detect and fail if 'inherit' is used in conf file

Re: [OE-core] [PATCH] sanity.bbclass: Detect and fail if 'inherit' is used in conf file

Re: [OE-core] [PATCH] strace: upgrade 5.5 -> 5.6

Re: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream

[OE-core] [PATCH] initramfs-framework/udev: umount /run/media/XXX

Re: [OE-core] [PATCH] u-boot: change ${PN} to u-boot when install/deploy u-boot-init-env

[OE-core] [PATCH] u-boot: change ${PN} to u-boot when install/deploy u-boot-init-env

[OE-core] [PATCH] u-boot.inc: fix some inconsistent coding style

[OE-core] [PATCH] at-spi2-atk: dont inherit features_check

Re: [OE-core] [PATCH] u-boot: change ${PN} to u-boot when install/deploy u-boot-init-env

Re: [OE-core] [PATCH] u-boot: change ${PN} to u-boot when install/deploy u-boot-init-env

17 matches

Site Navigation

Mail list logo

Footer information