[PATCH 0/5] systemd and nios2 fixes

[PATCH 0/5] systemd and nios2 fixes

[Khem Raj]

These patches address the useradd problem which was exposed
by the systemd useradd patch.

Additionally, few patches to help packages build with nios2

Khem Raj (3):
  useradd.bbclass: Strip trailing ';' in cmd params
  systemd: Create missing sysusers offline
  pixman: Fix build on arches not defining FE_INVALID exception

Marek Vasut (2):
  kernel: fitimage: Repair misuse of shell test command
  sysprof: Disable nios2 support

 meta/classes/kernel-fitimage.bbclass               |  2 +-
 meta/classes/useradd.bbclass                       |  2 +-
 .../packagegroup-core-tools-profile.bb             |  3 +-
 meta/recipes-core/systemd/systemd_229.bb           |  8 +++++-
 ...Check-for-FE_INVALID-definition-before-us.patch | 33 ++++++++++++++++++++++
 meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb    |  1 +
 6 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch

-- 
2.8.2

[PATCH 1/5] useradd.bbclass: Strip trailing '; ' in cmd params

[Khem Raj]

When there are more than 1 packages in a recipe requiring useradd
services, they are concatnated and a ';' is inserted just after
each of the users being added by the packages. A situation arises
in cases where this is controlled by PACKAGECONFIG then we add a
';' separator in the USERADD_PARAM value itself for each packagecofig
since we do not know which one will be picked, we end up in situation
where the final string returned from get_all_cmd_params() appears to be

a; ; b; c;

and then the logic which uses these cmds triggers with ';' as separator
but in this case it will fail after executing useradd 'a' because the next
cmd it will call will be just a whitespace

This is highlighted by the systemd patch to add more users as needed
by systemd 229 components.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/classes/useradd.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index ee402ac..ae27c01 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -203,7 +203,7 @@ def get_all_cmd_params(d, cmd_type):
     for pkg in useradd_packages.split():
         param = d.getVar(param_type % pkg, True)
         if param:
-            params.append(param)
+            params.append(param.rstrip(" ;"))
 
     return "; ".join(params)
 
-- 
2.8.2

Re: [PATCH 1/5] useradd.bbclass: Strip trailing '; ' in cmd params

[Khem Raj]

This fix was not sufficient and there has to be extra fix done to also
consider the case
when sysroot is created during image build time. I have updated it in
pull request here

http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/pu&id=642c6cf0b6a0371de476513162bd0cefa9c438b3

On Tue, May 17, 2016 at 9:40 PM, Khem Raj <raj.khem@gmail.com> wrote:
> When there are more than 1 packages in a recipe requiring useradd
> services, they are concatnated and a ';' is inserted just after
> each of the users being added by the packages. A situation arises
> in cases where this is controlled by PACKAGECONFIG then we add a
> ';' separator in the USERADD_PARAM value itself for each packagecofig
> since we do not know which one will be picked, we end up in situation
> where the final string returned from get_all_cmd_params() appears to be
>
> a; ; b; c;
>
> and then the logic which uses these cmds triggers with ';' as separator
> but in this case it will fail after executing useradd 'a' because the next
> cmd it will call will be just a whitespace
>
> This is highlighted by the systemd patch to add more users as needed
> by systemd 229 components.
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/classes/useradd.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
> index ee402ac..ae27c01 100644
> --- a/meta/classes/useradd.bbclass
> +++ b/meta/classes/useradd.bbclass
> @@ -203,7 +203,7 @@ def get_all_cmd_params(d, cmd_type):
>      for pkg in useradd_packages.split():
>          param = d.getVar(param_type % pkg, True)
>          if param:
> -            params.append(param)
> +            params.append(param.rstrip(" ;"))
>
>      return "; ".join(params)
>
> --
> 2.8.2
>

Re: [PATCH 1/5] useradd.bbclass: Strip trailing '; ' in cmd params

[Patrick Ohly]

On Wed, 2016-05-18 at 12:38 -0700, Khem Raj wrote:
> This fix was not sufficient and there has to be extra fix done to also
> consider the case
> when sysroot is created during image build time. I have updated it in
> pull request here
> 
> http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/pu&id=642c6cf0b6a0371de476513162bd0cefa9c438b3

That now fails for cases where the USERADD_PARAM ends in trailing white
space after the last valid opts. The reason is that the 'if test "x
$opts" = "x$remaining"; then break; fi' check does not get triggered
anymore, because $remaining has the trailing white space whereas "$opts"
does not.

I'm not sure what the best approach is in this case. Perhaps also strip
trailing whitespace from all assignments to $remaining?

The case were we see this is:
USERADD_PARAM_iot-rest-api-server="--system --home /var/lib/empty --no-create-home --shell /bin/false --gid restful restful "

The build then hangs because the useradd preinst loops forever.

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.

Re: [PATCH 1/5] useradd.bbclass: Strip trailing '; ' in cmd params

[Richard Purdie]

On Mon, 2016-05-23 at 10:07 +0200, Patrick Ohly wrote:
> On Wed, 2016-05-18 at 12:38 -0700, Khem Raj wrote:
> > This fix was not sufficient and there has to be extra fix done to
> > also
> > consider the case
> > when sysroot is created during image build time. I have updated it
> > in
> > pull request here
> > 
> > http://git.openembedded.org/openembedded-core-contrib/commit/?h=kra
> > j/pu&id=642c6cf0b6a0371de476513162bd0cefa9c438b3
> 
> That now fails for cases where the USERADD_PARAM ends in trailing
> white
> space after the last valid opts. The reason is that the 'if test "x
> $opts" = "x$remaining"; then break; fi' check does not get triggered
> anymore, because $remaining has the trailing white space whereas
> "$opts"
> does not.
> 
> I'm not sure what the best approach is in this case. Perhaps also
> strip
> trailing whitespace from all assignments to $remaining?
> 
> The case were we see this is:
> USERADD_PARAM_iot-rest-api-server="--system --home /var/lib/empty -
> -no-create-home --shell /bin/false --gid restful restful "
> 
> The build then hangs because the useradd preinst loops forever.

I've posted a patch which addresses this issue since its pretty nasty
for people to run into.

Cheers,

Richard

Re: [PATCH 1/5] useradd.bbclass: Strip trailing '; ' in cmd params

[Denys Dmytriyenko]

On Mon, May 23, 2016 at 10:35:05AM +0100, Richard Purdie wrote:
> On Mon, 2016-05-23 at 10:07 +0200, Patrick Ohly wrote:
> > On Wed, 2016-05-18 at 12:38 -0700, Khem Raj wrote:
> > > This fix was not sufficient and there has to be extra fix done to
> > > also
> > > consider the case
> > > when sysroot is created during image build time. I have updated it
> > > in
> > > pull request here
> > > 
> > > http://git.openembedded.org/openembedded-core-contrib/commit/?h=kra
> > > j/pu&id=642c6cf0b6a0371de476513162bd0cefa9c438b3
> > 
> > That now fails for cases where the USERADD_PARAM ends in trailing
> > white
> > space after the last valid opts. The reason is that the 'if test "x
> > $opts" = "x$remaining"; then break; fi' check does not get triggered
> > anymore, because $remaining has the trailing white space whereas
> > "$opts"
> > does not.
> > 
> > I'm not sure what the best approach is in this case. Perhaps also
> > strip
> > trailing whitespace from all assignments to $remaining?
> > 
> > The case were we see this is:
> > USERADD_PARAM_iot-rest-api-server="--system --home /var/lib/empty -
> > -no-create-home --shell /bin/false --gid restful restful "
> > 
> > The build then hangs because the useradd preinst loops forever.
> 
> I've posted a patch which addresses this issue since its pretty nasty
> for people to run into.

This now has been merged to krogoth and I get vsftpd preinst hanging forever - 
has everything related been picked up during backport or something got missed?

-- 
Denys

Re: [PATCH 1/5] useradd.bbclass: Strip trailing '; ' in cmd params

[Denys Dmytriyenko]

On Wed, Sep 28, 2016 at 08:59:23PM -0400, Denys Dmytriyenko wrote:
> On Mon, May 23, 2016 at 10:35:05AM +0100, Richard Purdie wrote:
> > On Mon, 2016-05-23 at 10:07 +0200, Patrick Ohly wrote:
> > > On Wed, 2016-05-18 at 12:38 -0700, Khem Raj wrote:
> > > > This fix was not sufficient and there has to be extra fix done to
> > > > also
> > > > consider the case
> > > > when sysroot is created during image build time. I have updated it
> > > > in
> > > > pull request here
> > > > 
> > > > http://git.openembedded.org/openembedded-core-contrib/commit/?h=kra
> > > > j/pu&id=642c6cf0b6a0371de476513162bd0cefa9c438b3
> > > 
> > > That now fails for cases where the USERADD_PARAM ends in trailing
> > > white
> > > space after the last valid opts. The reason is that the 'if test "x
> > > $opts" = "x$remaining"; then break; fi' check does not get triggered
> > > anymore, because $remaining has the trailing white space whereas
> > > "$opts"
> > > does not.
> > > 
> > > I'm not sure what the best approach is in this case. Perhaps also
> > > strip
> > > trailing whitespace from all assignments to $remaining?
> > > 
> > > The case were we see this is:
> > > USERADD_PARAM_iot-rest-api-server="--system --home /var/lib/empty -
> > > -no-create-home --shell /bin/false --gid restful restful "
> > > 
> > > The build then hangs because the useradd preinst loops forever.
> > 
> > I've posted a patch which addresses this issue since its pretty nasty
> > for people to run into.
> 
> This now has been merged to krogoth and I get vsftpd preinst hanging forever - 
> has everything related been picked up during backport or something got missed?

Ok, it seems this change hasn't been picked up:

http://cgit.openembedded.org/openembedded-core/commit/meta/classes/useradd.bbclass?id=d6241e4c94a0a72acfc57e96a59918c0b2146d65

-- 
Denys

Re: [PATCH 1/5] useradd.bbclass: Strip trailing '; ' in cmd params

[Denys Dmytriyenko]

On Wed, Sep 28, 2016 at 09:07:19PM -0400, Denys Dmytriyenko wrote:
> On Wed, Sep 28, 2016 at 08:59:23PM -0400, Denys Dmytriyenko wrote:
> > On Mon, May 23, 2016 at 10:35:05AM +0100, Richard Purdie wrote:
> > > On Mon, 2016-05-23 at 10:07 +0200, Patrick Ohly wrote:
> > > > On Wed, 2016-05-18 at 12:38 -0700, Khem Raj wrote:
> > > > > This fix was not sufficient and there has to be extra fix done to
> > > > > also
> > > > > consider the case
> > > > > when sysroot is created during image build time. I have updated it
> > > > > in
> > > > > pull request here
> > > > > 
> > > > > http://git.openembedded.org/openembedded-core-contrib/commit/?h=kra
> > > > > j/pu&id=642c6cf0b6a0371de476513162bd0cefa9c438b3
> > > > 
> > > > That now fails for cases where the USERADD_PARAM ends in trailing
> > > > white
> > > > space after the last valid opts. The reason is that the 'if test "x
> > > > $opts" = "x$remaining"; then break; fi' check does not get triggered
> > > > anymore, because $remaining has the trailing white space whereas
> > > > "$opts"
> > > > does not.
> > > > 
> > > > I'm not sure what the best approach is in this case. Perhaps also
> > > > strip
> > > > trailing whitespace from all assignments to $remaining?
> > > > 
> > > > The case were we see this is:
> > > > USERADD_PARAM_iot-rest-api-server="--system --home /var/lib/empty -
> > > > -no-create-home --shell /bin/false --gid restful restful "
> > > > 
> > > > The build then hangs because the useradd preinst loops forever.
> > > 
> > > I've posted a patch which addresses this issue since its pretty nasty
> > > for people to run into.
> > 
> > This now has been merged to krogoth and I get vsftpd preinst hanging forever - 
> > has everything related been picked up during backport or something got missed?
> 
> Ok, it seems this change hasn't been picked up:
> 
> http://cgit.openembedded.org/openembedded-core/commit/meta/classes/useradd.bbclass?id=d6241e4c94a0a72acfc57e96a59918c0b2146d65

Ok, this fixes my problem with vsftpd - I sent a patch to backport this commit 
into krogoth.

-- 
Denys

[PATCH 2/5] systemd: Create missing sysusers offline

[Khem Raj]

Some system users which are needed by systemd components were missing
create these users knobbed with relevant packageconfig

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/systemd/systemd_229.bb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd_229.bb b/meta/recipes-core/systemd/systemd_229.bb
index c23c749..a2d35f8 100644
--- a/meta/recipes-core/systemd/systemd_229.bb
+++ b/meta/recipes-core/systemd/systemd_229.bb
@@ -319,10 +319,16 @@ PACKAGES =+ "\
 SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)}"
 SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
 
-USERADD_PACKAGES = "${PN}"
+USERADD_PACKAGES = "${PN} ${PN}-extra-utils"
 USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-gateway;', '', d)}"
+USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '--system -d / -M --shell /bin/nologin systemd-journal-remote;', '', d)}"
+USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '--system -d / -M --shell /bin/nologin systemd-journal-upload;', '', d)}"
 USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /bin/nologin systemd-timesync;', '', d)}"
+USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /bin/nologin systemd-network;', '', d)}"
+USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}"
+USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /bin/nologin systemd-resolve;', '', d)}"
 GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal"
+USERADD_PARAM_${PN}-extra-utils += "--system -d / -M --shell /bin/nologin systemd-bus-proxy;"
 
 FILES_${PN}-analyze = "${bindir}/systemd-analyze"
 
-- 
2.8.2

Re: [PATCH 2/5] systemd: Create missing sysusers offline

[Richard Purdie]

On Tue, 2016-05-17 at 21:40 -0700, Khem Raj wrote:
> Some system users which are needed by systemd components were missing
> create these users knobbed with relevant packageconfig
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  meta/recipes-core/systemd/systemd_229.bb | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)

This looks better but there do appear to still be problems:

https://autobuilder.yoctoproject.org/main/builders/nightly-qa-systemd/b
uilds/776/steps/Running%20Sanity%20Tests/logs/stdio

and

https://autobuilder.yoctoproject.org/main/builders/nightly-qa-systemd/b
uilds/776/steps/Running%20Sanity%20Tests_2/logs/stdio

Cheers,

Richard

Re: [PATCH 2/5] systemd: Create missing sysusers offline

[Richard Purdie]

On Thu, 2016-05-19 at 08:36 +0100, Richard Purdie wrote:
> On Tue, 2016-05-17 at 21:40 -0700, Khem Raj wrote:
> > Some system users which are needed by systemd components were
> > missing
> > create these users knobbed with relevant packageconfig
> > 
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> >  meta/recipes-core/systemd/systemd_229.bb | 8 +++++++-
> >  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> This looks better but there do appear to still be problems:
> 
> https://autobuilder.yoctoproject.org/main/builders/nightly-qa-systemd
> /b
> uilds/776/steps/Running%20Sanity%20Tests/logs/stdio
> 
> and
> 
> https://autobuilder.yoctoproject.org/main/builders/nightly-qa-systemd
> /b
> uilds/776/steps/Running%20Sanity%20Tests_2/logs/stdio


Just seen your other email. I'll queue the revised patch in the next 
-next build.

Cheers,

Richard

Re: [PATCH 2/5] systemd: Create missing sysusers offline

[Enrico Joerns]

Hi,

On 05/19/2016 10:02 AM, Richard Purdie wrote:
> On Thu, 2016-05-19 at 08:36 +0100, Richard Purdie wrote:
>> On Tue, 2016-05-17 at 21:40 -0700, Khem Raj wrote:
>>> Some system users which are needed by systemd components were
>>> missing
>>> create these users knobbed with relevant packageconfig
>>>
>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>> ---
>>>   meta/recipes-core/systemd/systemd_229.bb | 8 +++++++-
>>>   1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> This looks better but there do appear to still be problems:
>>
>> https://autobuilder.yoctoproject.org/main/builders/nightly-qa-systemd
>> /b
>> uilds/776/steps/Running%20Sanity%20Tests/logs/stdio
>>
>> and
>>
>> https://autobuilder.yoctoproject.org/main/builders/nightly-qa-systemd
>> /b
>> uilds/776/steps/Running%20Sanity%20Tests_2/logs/stdio
>

I just stumbled over this issue when building systemd with networkd 
enabled in krogoth release.
Shouldn't this patch be backported to krogoth as well?

Regards, Enrico

-- 
Pengutronix e.K.                           | Enrico Jörns                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5080 |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH 2/5] systemd: Create missing sysusers offline

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 1198 bytes --]


> On Jun 17, 2016, at 2:32 AM, Enrico Joerns <ejo@pengutronix.de> wrote:
> 
> Hi,
> 
> On 05/19/2016 10:02 AM, Richard Purdie wrote:
>> On Thu, 2016-05-19 at 08:36 +0100, Richard Purdie wrote:
>>> On Tue, 2016-05-17 at 21:40 -0700, Khem Raj wrote:
>>>> Some system users which are needed by systemd components were
>>>> missing
>>>> create these users knobbed with relevant packageconfig
>>>> 
>>>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>>>> ---
>>>>  meta/recipes-core/systemd/systemd_229.bb | 8 +++++++-
>>>>  1 file changed, 7 insertions(+), 1 deletion(-)
>>> 
>>> This looks better but there do appear to still be problems:
>>> 
>>> https://autobuilder.yoctoproject.org/main/builders/nightly-qa-systemd
>>> /b
>>> uilds/776/steps/Running%20Sanity%20Tests/logs/stdio
>>> 
>>> and
>>> 
>>> https://autobuilder.yoctoproject.org/main/builders/nightly-qa-systemd
>>> /b
>>> uilds/776/steps/Running%20Sanity%20Tests_2/logs/stdio
>> 
> 
> I just stumbled over this issue when building systemd with networkd enabled in krogoth release.
> Shouldn't this patch be backported to krogoth as well?


I think yes. Feel free to send a request to krogoth maintainer.

[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]

[PATCH 3/5] pixman: Fix build on arches not defining FE_INVALID exception

[Khem Raj]

Nios2 e.g. only supports round to nearest in glibc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...Check-for-FE_INVALID-definition-before-us.patch | 33 ++++++++++++++++++++++
 meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb    |  1 +
 2 files changed, 34 insertions(+)
 create mode 100644 meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch

diff --git a/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch b/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch
new file mode 100644
index 0000000..782c1db
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch
@@ -0,0 +1,33 @@
+From 0ccd906b904d21536d5ab41c6196760e3e5d72cb Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 17 May 2016 17:30:00 -0700
+Subject: [PATCH] test/utils: Check for FE_INVALID definition before use
+
+Some architectures e.g. nios2 do not support all exceptions
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+Upstream-Status: Submitted
+
+ test/utils.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/utils.c b/test/utils.c
+index f8e42a5..fe32b1e 100644
+--- a/test/utils.c
++++ b/test/utils.c
+@@ -978,9 +978,11 @@ enable_invalid_exceptions (void)
+ {
+ #ifdef HAVE_FENV_H
+ #ifdef HAVE_FEENABLEEXCEPT
++#ifdef FE_INVALID
+     feenableexcept (FE_INVALID);
+ #endif
+ #endif
++#endif
+ }
+ 
+ void *
+-- 
+2.8.2
+
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb b/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
index 87da5c2..c4ca621 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb
@@ -32,6 +32,7 @@ EXTRA_OECONF_class-nativesdk = "--disable-gtk"
 SRC_URI += "\
             file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \
 	    file://asm_include.patch \
+	    file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \
 "
 
 SRC_URI[md5sum] = "002a4fcb644ddfcb4b0e4191576a0d59"
-- 
2.8.2

[PATCH 4/5] kernel: fitimage: Repair misuse of shell test command

[Khem Raj]

From: Marek Vasut <marex@denx.de>

The kernel fitImage must be amended with signature if and only if
UBOOT_SIGN_ENABLE = 1 . In the current case, the UBOOT_SIGN_ENABLE
could be either 0 (default) or 1 , which test -n always correctly
interprets as non-empty string, thus always true. This does not
match the logic above though, so replace the test with check which
passed only for UBOOT_SIGN_ENABLE = 1 .

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Yannick Gicquel <yannick.gicquel@iot.bzh>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/kernel-fitimage.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 809bd4d..298eda2 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -250,7 +250,7 @@ do_assemble_fitimage() {
 		#
 		# Step 5: Sign the image and add public key to U-Boot dtb
 		#
-		if test -n "${UBOOT_SIGN_ENABLE}"; then
+		if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then
 			uboot-mkimage \
 				${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
 				-F -k "${UBOOT_SIGN_KEYDIR}" \
-- 
2.8.2

[PATCH 5/5] sysprof: Disable nios2 support

[Khem Raj]

From: Marek Vasut <marex@denx.de>

sysprof does not support nios2 yet, so disable it.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Ley Foon Tan <lftan@altera.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Ross Burton <ross.burton@intel.com>
Cc: Thomas Chou <thomas@wytron.com.tw>
Cc: Walter Goossens <waltergoossens@home.nl>
---
 meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 5a8ee58..55e9c6f 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -11,8 +11,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
 
 PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}"
-# sysprof doesn't support aarch64
+# sysprof doesn't support aarch64 and nios2
 PROFILE_TOOLS_X_aarch64 = ""
+PROFILE_TOOLS_X_nios2 = ""
 PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}"
 
 RRECOMMENDS_${PN} = "\
-- 
2.8.2