Date   

[isar-cip-core][PATCH v3 2/4] swupdate: use libubootenv

Quirin Gylstorff
 

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

libubootenv provides hardware independent access to u-boot environments.
This change conflicts with u-boot tools < 10.2019.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
classes/swupdate-config.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/swupdate-config.bbclass b/classes/swupdate-config.bbclass
index 208d240..dd0317f 100644
--- a/classes/swupdate-config.bbclass
+++ b/classes/swupdate-config.bbclass
@@ -46,8 +46,8 @@ KFEATURE_ubi[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_ubi.snippet"
KFEATURE_DEPS[ubi] = "mtd"

KFEATURE_u-boot = ""
-KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "u-boot-${MACHINE}-dev"
-KFEATURE_u-boot[DEBIAN_DEPENDS] = "u-boot-tools"
+KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "libubootenv-dev"
+KFEATURE_u-boot[DEBIAN_DEPENDS] = "libubootenv-tool, u-boot-tools"
KFEATURE_u-boot[DEPENDS] = "${U_BOOT}"
KFEATURE_u-boot[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_u-boot.snippet"

--
2.20.1


[isar-cip-core][PATCH v3 0/4] Updates & Fixes

Quirin Gylstorff
 

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>


- Update Kernel releases
- Update ISAR to current HEAD of next

- fix swupdate cross-compile
- use libubootenv for swupdate & u-boot this works only with upstream u-boot-tools
newer than 2019.10. The isar build is fixed with commit e77d030ed0ac5b122aa7b798131062946cb36699.

Changes V2:
- fix recipe name, add missing rt
Changes V3:
- fix recipe name, replace . with -

Quirin Gylstorff (4):
swupdate: enable cross-compile by setting PKG_CONFIG_PATH
swupdate: use libubootenv
update linux kernels
kas: update ISAR

classes/swupdate-config.bbclass | 6 +++---
kas-cip.yml | 2 +-
recipes-core/swupdate/files/debian/rules.tmpl | 1 +
recipes-core/swupdate/swupdate.bb | 2 +-
...35-cip31-rt13.bb => linux-cip-rt_4.19.160-cip39-rt17.bb} | 4 ++--
...231-cip47-rt30.bb => linux-cip-rt_4.4.244-cip51-rt32.bb} | 4 ++--
...ux-cip_4.19.140-cip33.bb => linux-cip_4.19.165-cip41.bb} | 4 ++--
...inux-cip_4.4.230-cip47.bb => linux-cip_4.4.249-cip53.bb} | 4 ++--
8 files changed, 14 insertions(+), 13 deletions(-)
rename recipes-kernel/linux/{linux-cip-rt_4.19.135-cip31-rt13.bb => linux-cip-rt_4.19.160-cip39-rt17.bb} (54%)
rename recipes-kernel/linux/{linux-cip-rt_4.4.231-cip47-rt30.bb => linux-cip-rt_4.4.244-cip51-rt32.bb} (54%)
rename recipes-kernel/linux/{linux-cip_4.19.140-cip33.bb => linux-cip_4.19.165-cip41.bb} (53%)
rename recipes-kernel/linux/{linux-cip_4.4.230-cip47.bb => linux-cip_4.4.249-cip53.bb} (53%)

--
2.20.1


Re: Starting 5.10.y branch?

Nobuhiro Iwamatsu
 

Hi Pavel,

-----Original Message-----
From: Pavel Machek [mailto:pavel@denx.de]
Sent: Wednesday, January 20, 2021 3:21 AM
To: masashi.kudo@cybertrust.co.jp; iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT)
<nobuhiro1.iwamatsu@toshiba.co.jp>; cip-dev@lists.cip-project.org
Subject: Starting 5.10.y branch?

Hi!

I believe the next step with 5.10.y is to create linux-5.10.y-cip
branch at kernel.org. I'd propose to start with whatever is newest
stable at the moment, so probably 5.10.8 or 5.10.9. Is it okay for me
to do that?
I don’t have a opinion about this.
Please do this.


Next steps probably are:

* Verify mirroring to gitlab
This is done automatically.

* Put required .gitlab-ci.yml
* Gather test results
I think these need to be tested first. Some kernel configs are already supported, so it's easy to check the operation.


Best regards,
Nobuhiro


Re: Starting 5.10.y branch?

masashi.kudo@cybertrust.co.jp <masashi.kudo@...>
 

Hi, Pavel-san,

Thanks for your offer. Yes, please do so!

Best regards,
--
M. Kudo

-----Original Message-----
From: Pavel Machek <pavel@denx.de>
Sent: Wednesday, January 20, 2021 3:21 AM
To: 工藤 雅司(CTJ OSS事業推進室) <masashi.kudo@cybertrust.co.jp>;
nobuhiro1.iwamatsu@toshiba.co.jp; cip-dev@lists.cip-project.org
Subject: Starting 5.10.y branch?

Hi!

I believe the next step with 5.10.y is to create linux-5.10.y-cip branch at kernel.org.
I'd propose to start with whatever is newest stable at the moment, so probably
5.10.8 or 5.10.9. Is it okay for me to do that?

Next steps probably are:

* Verify mirroring to gitlab
* Put required .gitlab-ci.yml
* Gather test results

Best regards,
Pavel

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


Starting 5.10.y branch?

Pavel Machek
 

Hi!

I believe the next step with 5.10.y is to create linux-5.10.y-cip
branch at kernel.org. I'd propose to start with whatever is newest
stable at the moment, so probably 5.10.8 or 5.10.9. Is it okay for me
to do that?

Next steps probably are:

* Verify mirroring to gitlab
* Put required .gitlab-ci.yml
* Gather test results

Best regards,
Pavel

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


Re: [isar-cip-core][PATCH v2 3/4] update linux kernels

Chris Paterson
 

Hello,

From: cip-dev@lists.cip-project.org <cip-dev@lists.cip-project.org> On
Behalf Of Jan Kiszka via lists.cip-project.org
Sent: 18 January 2021 17:45

On 18.01.21 16:06, Quirin Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
....135-cip31-rt13.bb => linux-cip-rt_4.19.160-cip39-rt17.bb} | 4 ++--
...4.231-cip47-rt30.bb => linux-cip-rt_4.4.244.cip51-rt32.bb} | 4 ++--
...inux-cip_4.19.140-cip33.bb => linux-cip_4.19.165-cip41.bb} | 4 ++--
...{linux-cip_4.4.230-cip47.bb => linux-cip_4.4.249-cip53.bb} | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
rename recipes-kernel/linux/{linux-cip-rt_4.19.135-cip31-rt13.bb => linux-
cip-rt_4.19.160-cip39-rt17.bb} (54%)
rename recipes-kernel/linux/{linux-cip-rt_4.4.231-cip47-rt30.bb => linux-
cip-rt_4.4.244.cip51-rt32.bb} (54%)
This is where the issue is.
The new filename is using a '.' instead of a '-'.
i.e.
- linux-cip-rt_4.4.244.cip51-rt32.bb
+ linux-cip-rt_4.4.244-cip51-rt32.bb

Kind regards, Chris

rename recipes-kernel/linux/{linux-cip_4.19.140-cip33.bb => linux-
cip_4.19.165-cip41.bb} (53%)
rename recipes-kernel/linux/{linux-cip_4.4.230-cip47.bb => linux-
cip_4.4.249-cip53.bb} (53%)

diff --git a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
b/recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb
similarity index 54%
rename from recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
rename to recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb
index 820c1ab..3c0aea5 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-rt-common.inc

-SRC_URI[sha256sum] =
"b827f45b8f97b71b3917c84b43fd6593030d01ea7261d3be6c15a76250308743"
+SRC_URI[sha256sum] =
"c2e0f50670c298aed94c35628caf4ddf0eefc20d2f17e0a5f024bf4d99a38460"
diff --git a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
b/recipes-kernel/linux/linux-cip-rt_4.4.244.cip51-rt32.bb
similarity index 54%
rename from recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
rename to recipes-kernel/linux/linux-cip-rt_4.4.244.cip51-rt32.bb
index e13fc14..6679144 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.4.244.cip51-rt32.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-rt-common.inc

-SRC_URI[sha256sum] =
"e7a0c7b8e4d91f52cbc2ee17a546d1afbc5fcfed95ba44dd113e534fab3a157e"
+SRC_URI[sha256sum] =
"070dc2084d2a64c1c8d64382978ec01ed7875b012401d09f37428a9c8c52b9c3"
diff --git a/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb b/recipes-
kernel/linux/linux-cip_4.19.165-cip41.bb
similarity index 53%
rename from recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
rename to recipes-kernel/linux/linux-cip_4.19.165-cip41.bb
index 9e958c0..f19b4c3 100644
--- a/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
+++ b/recipes-kernel/linux/linux-cip_4.19.165-cip41.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-common.inc

-SRC_URI[sha256sum] =
"f6a9aec6848a5897c90bafda5a9eba010c03d5d0cf99508adfb1cf7a2f4af9e5"
+SRC_URI[sha256sum] =
"c1404d0a0a1ba71656c237d6d606714d34364814dc9a3998add93fe1749cb27d"
diff --git a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb b/recipes-
kernel/linux/linux-cip_4.4.249-cip53.bb
similarity index 53%
rename from recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
rename to recipes-kernel/linux/linux-cip_4.4.249-cip53.bb
index af49441..03b1a04 100644
--- a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
+++ b/recipes-kernel/linux/linux-cip_4.4.249-cip53.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-common.inc

-SRC_URI[sha256sum] =
"3ff33e497064ba8e7d9b5e1ee575c6a936154fa8216774782cbc0db2e4b71cdf"
+SRC_URI[sha256sum] =
"f8a6eba35572da13c81fec6c2d451db8f75b0ab4a5b6b80113523fbb035bf384"

Something is still broken, see
https://jpn01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab
.com%2Fcip-project%2Fcip-core%2Fisar-cip-core%2F-
%2Fjobs%2F970301333&amp;data=04%7C01%7Cchris.paterson2%40renesas.
com%7C28b00c4b88d546dfe5c208d8bbd8c261%7C53d82571da1947e49cb4625
a166a4a2a%7C0%7C0%7C637465886945464208%7CUnknown%7CTWFpbGZsb
3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0
%3D%7C1000&amp;sdata=60fmWcwX%2FRGooW3onB1r%2FdJlkuwQXiAo9o
xY5Idr1vg%3D&amp;reserved=0
and
https://jpn01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitlab
.com%2Fcip-project%2Fcip-core%2Fisar-cip-core%2F-
%2Fjobs%2F970301342&amp;data=04%7C01%7Cchris.paterson2%40renesas.
com%7C28b00c4b88d546dfe5c208d8bbd8c261%7C53d82571da1947e49cb4625
a166a4a2a%7C0%7C0%7C637465886945464208%7CUnknown%7CTWFpbGZsb
3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0
%3D%7C1000&amp;sdata=GAcUIsBs9yp9%2B3mtcmoRTXmRDM8VwW3bE%
2F1hEWMpl%2Bg%3D&amp;reserved=0.

Pulling this patch out of next for now.

Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


Re: [isar-cip-core][PATCH v2 3/4] update linux kernels

Jan Kiszka
 

On 18.01.21 16:06, Quirin Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
....135-cip31-rt13.bb => linux-cip-rt_4.19.160-cip39-rt17.bb} | 4 ++--
...4.231-cip47-rt30.bb => linux-cip-rt_4.4.244.cip51-rt32.bb} | 4 ++--
...inux-cip_4.19.140-cip33.bb => linux-cip_4.19.165-cip41.bb} | 4 ++--
...{linux-cip_4.4.230-cip47.bb => linux-cip_4.4.249-cip53.bb} | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
rename recipes-kernel/linux/{linux-cip-rt_4.19.135-cip31-rt13.bb => linux-cip-rt_4.19.160-cip39-rt17.bb} (54%)
rename recipes-kernel/linux/{linux-cip-rt_4.4.231-cip47-rt30.bb => linux-cip-rt_4.4.244.cip51-rt32.bb} (54%)
rename recipes-kernel/linux/{linux-cip_4.19.140-cip33.bb => linux-cip_4.19.165-cip41.bb} (53%)
rename recipes-kernel/linux/{linux-cip_4.4.230-cip47.bb => linux-cip_4.4.249-cip53.bb} (53%)

diff --git a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb b/recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb
similarity index 54%
rename from recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
rename to recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb
index 820c1ab..3c0aea5 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-rt-common.inc

-SRC_URI[sha256sum] = "b827f45b8f97b71b3917c84b43fd6593030d01ea7261d3be6c15a76250308743"
+SRC_URI[sha256sum] = "c2e0f50670c298aed94c35628caf4ddf0eefc20d2f17e0a5f024bf4d99a38460"
diff --git a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb b/recipes-kernel/linux/linux-cip-rt_4.4.244.cip51-rt32.bb
similarity index 54%
rename from recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
rename to recipes-kernel/linux/linux-cip-rt_4.4.244.cip51-rt32.bb
index e13fc14..6679144 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.4.244.cip51-rt32.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-rt-common.inc

-SRC_URI[sha256sum] = "e7a0c7b8e4d91f52cbc2ee17a546d1afbc5fcfed95ba44dd113e534fab3a157e"
+SRC_URI[sha256sum] = "070dc2084d2a64c1c8d64382978ec01ed7875b012401d09f37428a9c8c52b9c3"
diff --git a/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb b/recipes-kernel/linux/linux-cip_4.19.165-cip41.bb
similarity index 53%
rename from recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
rename to recipes-kernel/linux/linux-cip_4.19.165-cip41.bb
index 9e958c0..f19b4c3 100644
--- a/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
+++ b/recipes-kernel/linux/linux-cip_4.19.165-cip41.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-common.inc

-SRC_URI[sha256sum] = "f6a9aec6848a5897c90bafda5a9eba010c03d5d0cf99508adfb1cf7a2f4af9e5"
+SRC_URI[sha256sum] = "c1404d0a0a1ba71656c237d6d606714d34364814dc9a3998add93fe1749cb27d"
diff --git a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb b/recipes-kernel/linux/linux-cip_4.4.249-cip53.bb
similarity index 53%
rename from recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
rename to recipes-kernel/linux/linux-cip_4.4.249-cip53.bb
index af49441..03b1a04 100644
--- a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
+++ b/recipes-kernel/linux/linux-cip_4.4.249-cip53.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-common.inc

-SRC_URI[sha256sum] = "3ff33e497064ba8e7d9b5e1ee575c6a936154fa8216774782cbc0db2e4b71cdf"
+SRC_URI[sha256sum] = "f8a6eba35572da13c81fec6c2d451db8f75b0ab4a5b6b80113523fbb035bf384"

Something is still broken, see
https://gitlab.com/cip-project/cip-core/isar-cip-core/-/jobs/970301333
and https://gitlab.com/cip-project/cip-core/isar-cip-core/-/jobs/970301342.

Pulling this patch out of next for now.

Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


Re: [isar-cip-core][PATCH v2 0/4] Updates & Fixes

Jan Kiszka
 

On 18.01.21 16:06, Quirin Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>


- Update Kernel releases
- Update ISAR to current HEAD of next

- fix swupdate cross-compile
- use libubootenv for swupdate & u-boot this works only with upstream u-boot-tools
newer than 2019.10. The isar build is fixed with commit e77d030ed0ac5b122aa7b798131062946cb36699.

Changes V2:
- fix recipe name, add missing rt

Quirin Gylstorff (4):
swupdate: enable cross-compile by setting PKG_CONFIG_PATH
swupdate: use libubootenv
update linux kernels
kas: update ISAR

classes/swupdate-config.bbclass | 6 +++---
kas-cip.yml | 2 +-
recipes-core/swupdate/files/debian/rules.tmpl | 1 +
recipes-core/swupdate/swupdate.bb | 2 +-
...35-cip31-rt13.bb => linux-cip-rt_4.19.160-cip39-rt17.bb} | 4 ++--
...231-cip47-rt30.bb => linux-cip-rt_4.4.244.cip51-rt32.bb} | 4 ++--
...ux-cip_4.19.140-cip33.bb => linux-cip_4.19.165-cip41.bb} | 4 ++--
...inux-cip_4.4.230-cip47.bb => linux-cip_4.4.249-cip53.bb} | 4 ++--
8 files changed, 14 insertions(+), 13 deletions(-)
rename recipes-kernel/linux/{linux-cip-rt_4.19.135-cip31-rt13.bb => linux-cip-rt_4.19.160-cip39-rt17.bb} (54%)
rename recipes-kernel/linux/{linux-cip-rt_4.4.231-cip47-rt30.bb => linux-cip-rt_4.4.244.cip51-rt32.bb} (54%)
rename recipes-kernel/linux/{linux-cip_4.19.140-cip33.bb => linux-cip_4.19.165-cip41.bb} (53%)
rename recipes-kernel/linux/{linux-cip_4.4.230-cip47.bb => linux-cip_4.4.249-cip53.bb} (53%)
Thanks, applied.

Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


Re: [isar-cip-core][RFC 0/1] Move root password

Jan Kiszka
 

On 18.01.21 11:37, Quirin Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

If you use isar-cip-core downstream the root user in kas-cip.yml
can set the root password in a production image. Avoid this by moving
the user and password to cip-core-image.

Should we rename the cip-core-image to cip-core-image-demo to
clarify the indented use?
Not necessarily. A downstream user could still include or bbappend
cip-core-image while overwriting the password variable.


cip-core-image-security now requires cip-core-image as base. We could
move the content of cip-core-image-security to a include to fasilitate
the usage downstream.
Fine with me - except that the patch does two things in one: move the
password AND also base the security on top of the core image. Split up
please.

Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


[isar-cip-core][PATCH v2 4/4] kas: update ISAR

Quirin Gylstorff
 

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
kas-cip.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kas-cip.yml b/kas-cip.yml
index f50cd6c..9514083 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -22,7 +22,7 @@ repos:

isar:
url: https://github.com/ilbers/isar.git
- refspec: 76eac233f1b1d0d117b3f05b3dec8a6da1cdf4c7
+ refspec: cd1327a47a7b00df98eded582aaf5b1ebdd45628
layers:
meta:
patches:
--
2.20.1


[isar-cip-core][PATCH v2 2/4] swupdate: use libubootenv

Quirin Gylstorff
 

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

libubootenv provides hardware independent access to u-boot environments.
This change conflicts with u-boot tools < 10.2019.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
classes/swupdate-config.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/swupdate-config.bbclass b/classes/swupdate-config.bbclass
index 208d240..dd0317f 100644
--- a/classes/swupdate-config.bbclass
+++ b/classes/swupdate-config.bbclass
@@ -46,8 +46,8 @@ KFEATURE_ubi[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_ubi.snippet"
KFEATURE_DEPS[ubi] = "mtd"

KFEATURE_u-boot = ""
-KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "u-boot-${MACHINE}-dev"
-KFEATURE_u-boot[DEBIAN_DEPENDS] = "u-boot-tools"
+KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "libubootenv-dev"
+KFEATURE_u-boot[DEBIAN_DEPENDS] = "libubootenv-tool, u-boot-tools"
KFEATURE_u-boot[DEPENDS] = "${U_BOOT}"
KFEATURE_u-boot[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_u-boot.snippet"

--
2.20.1


[isar-cip-core][PATCH v2 3/4] update linux kernels

Quirin Gylstorff
 

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
....135-cip31-rt13.bb => linux-cip-rt_4.19.160-cip39-rt17.bb} | 4 ++--
...4.231-cip47-rt30.bb => linux-cip-rt_4.4.244.cip51-rt32.bb} | 4 ++--
...inux-cip_4.19.140-cip33.bb => linux-cip_4.19.165-cip41.bb} | 4 ++--
...{linux-cip_4.4.230-cip47.bb => linux-cip_4.4.249-cip53.bb} | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
rename recipes-kernel/linux/{linux-cip-rt_4.19.135-cip31-rt13.bb => linux-cip-rt_4.19.160-cip39-rt17.bb} (54%)
rename recipes-kernel/linux/{linux-cip-rt_4.4.231-cip47-rt30.bb => linux-cip-rt_4.4.244.cip51-rt32.bb} (54%)
rename recipes-kernel/linux/{linux-cip_4.19.140-cip33.bb => linux-cip_4.19.165-cip41.bb} (53%)
rename recipes-kernel/linux/{linux-cip_4.4.230-cip47.bb => linux-cip_4.4.249-cip53.bb} (53%)

diff --git a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb b/recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb
similarity index 54%
rename from recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
rename to recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb
index 820c1ab..3c0aea5 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-rt-common.inc

-SRC_URI[sha256sum] = "b827f45b8f97b71b3917c84b43fd6593030d01ea7261d3be6c15a76250308743"
+SRC_URI[sha256sum] = "c2e0f50670c298aed94c35628caf4ddf0eefc20d2f17e0a5f024bf4d99a38460"
diff --git a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb b/recipes-kernel/linux/linux-cip-rt_4.4.244.cip51-rt32.bb
similarity index 54%
rename from recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
rename to recipes-kernel/linux/linux-cip-rt_4.4.244.cip51-rt32.bb
index e13fc14..6679144 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.4.244.cip51-rt32.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-rt-common.inc

-SRC_URI[sha256sum] = "e7a0c7b8e4d91f52cbc2ee17a546d1afbc5fcfed95ba44dd113e534fab3a157e"
+SRC_URI[sha256sum] = "070dc2084d2a64c1c8d64382978ec01ed7875b012401d09f37428a9c8c52b9c3"
diff --git a/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb b/recipes-kernel/linux/linux-cip_4.19.165-cip41.bb
similarity index 53%
rename from recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
rename to recipes-kernel/linux/linux-cip_4.19.165-cip41.bb
index 9e958c0..f19b4c3 100644
--- a/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
+++ b/recipes-kernel/linux/linux-cip_4.19.165-cip41.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-common.inc

-SRC_URI[sha256sum] = "f6a9aec6848a5897c90bafda5a9eba010c03d5d0cf99508adfb1cf7a2f4af9e5"
+SRC_URI[sha256sum] = "c1404d0a0a1ba71656c237d6d606714d34364814dc9a3998add93fe1749cb27d"
diff --git a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb b/recipes-kernel/linux/linux-cip_4.4.249-cip53.bb
similarity index 53%
rename from recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
rename to recipes-kernel/linux/linux-cip_4.4.249-cip53.bb
index af49441..03b1a04 100644
--- a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
+++ b/recipes-kernel/linux/linux-cip_4.4.249-cip53.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-common.inc

-SRC_URI[sha256sum] = "3ff33e497064ba8e7d9b5e1ee575c6a936154fa8216774782cbc0db2e4b71cdf"
+SRC_URI[sha256sum] = "f8a6eba35572da13c81fec6c2d451db8f75b0ab4a5b6b80113523fbb035bf384"
--
2.20.1


[isar-cip-core][PATCH v2 0/4] Updates & Fixes

Quirin Gylstorff
 

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>


- Update Kernel releases
- Update ISAR to current HEAD of next

- fix swupdate cross-compile
- use libubootenv for swupdate & u-boot this works only with upstream u-boot-tools
newer than 2019.10. The isar build is fixed with commit e77d030ed0ac5b122aa7b798131062946cb36699.

Changes V2:
- fix recipe name, add missing rt

Quirin Gylstorff (4):
swupdate: enable cross-compile by setting PKG_CONFIG_PATH
swupdate: use libubootenv
update linux kernels
kas: update ISAR

classes/swupdate-config.bbclass | 6 +++---
kas-cip.yml | 2 +-
recipes-core/swupdate/files/debian/rules.tmpl | 1 +
recipes-core/swupdate/swupdate.bb | 2 +-
...35-cip31-rt13.bb => linux-cip-rt_4.19.160-cip39-rt17.bb} | 4 ++--
...231-cip47-rt30.bb => linux-cip-rt_4.4.244.cip51-rt32.bb} | 4 ++--
...ux-cip_4.19.140-cip33.bb => linux-cip_4.19.165-cip41.bb} | 4 ++--
...inux-cip_4.4.230-cip47.bb => linux-cip_4.4.249-cip53.bb} | 4 ++--
8 files changed, 14 insertions(+), 13 deletions(-)
rename recipes-kernel/linux/{linux-cip-rt_4.19.135-cip31-rt13.bb => linux-cip-rt_4.19.160-cip39-rt17.bb} (54%)
rename recipes-kernel/linux/{linux-cip-rt_4.4.231-cip47-rt30.bb => linux-cip-rt_4.4.244.cip51-rt32.bb} (54%)
rename recipes-kernel/linux/{linux-cip_4.19.140-cip33.bb => linux-cip_4.19.165-cip41.bb} (53%)
rename recipes-kernel/linux/{linux-cip_4.4.230-cip47.bb => linux-cip_4.4.249-cip53.bb} (53%)

--
2.20.1


[isar-cip-core][PATCH v2 1/4] swupdate: enable cross-compile by setting PKG_CONFIG_PATH

Quirin Gylstorff
 

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

If cross compiling should be used the configuration path
for pkgconfig needs to be adapted for the target architecture.

Add pkg-config as build dependency.

Fix typo in swupdate.bb.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
classes/swupdate-config.bbclass | 2 +-
recipes-core/swupdate/files/debian/rules.tmpl | 1 +
recipes-core/swupdate/swupdate.bb | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/swupdate-config.bbclass b/classes/swupdate-config.bbclass
index 42f0654..208d240 100644
--- a/classes/swupdate-config.bbclass
+++ b/classes/swupdate-config.bbclass
@@ -15,7 +15,7 @@ inherit kconfig-snippets

BUILD_DEB_DEPENDS = " \
zlib1g-dev, debhelper, libconfig-dev, libarchive-dev, \
- python-sphinx:native, dh-systemd, libsystemd-dev, libssl-dev"
+ python-sphinx:native, dh-systemd, libsystemd-dev, libssl-dev, pkg-config"

KFEATURE_lua = ""
KFEATURE_lua[BUILD_DEB_DEPENDS] = "liblua5.3-dev"
diff --git a/recipes-core/swupdate/files/debian/rules.tmpl b/recipes-core/swupdate/files/debian/rules.tmpl
index 54cca57..ec83a88 100755
--- a/recipes-core/swupdate/files/debian/rules.tmpl
+++ b/recipes-core/swupdate/files/debian/rules.tmpl
@@ -2,6 +2,7 @@

ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
+export PKG_CONFIG_PATH=/usr/lib/$(DEB_HOST_GNU_TYPE)/pkgconfig
export CC=$(DEB_HOST_GNU_TYPE)-gcc
export LD=$(DEB_HOST_GNU_TYPE)-gcc
endif
diff --git a/recipes-core/swupdate/swupdate.bb b/recipes-core/swupdate/swupdate.bb
index dd02cc2..b4d64fe 100644
--- a/recipes-core/swupdate/swupdate.bb
+++ b/recipes-core/swupdate/swupdate.bb
@@ -8,7 +8,7 @@
#
# SPDX-License-Identifier: MIT

-hDESCRIPTION = "swupdate utility for software updates"
+DESCRIPTION = "swupdate utility for software updates"
HOMEPAGE= "https://github.com/sbabic/swupdate"
LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
--
2.20.1


Re: [isar-cip-core][PATCH 2/4] swupdate: use libubootenv

Quirin Gylstorff
 

On 1/18/21 3:10 PM, [ext] Quirin Gylstorff wrote:
On 1/18/21 12:23 PM, Jan Kiszka wrote:
On 18.01.21 11:35, Q. Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

libubootenv provides hardware independent access to u-boot environments.
This change conflicts with u-boot tools < 10.2019.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
  classes/swupdate-config.bbclass | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/swupdate-config.bbclass b/classes/swupdate-config.bbclass
index 208d240..dd0317f 100644
--- a/classes/swupdate-config.bbclass
+++ b/classes/swupdate-config.bbclass
@@ -46,8 +46,8 @@ KFEATURE_ubi[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_ubi.snippet"
  KFEATURE_DEPS[ubi] = "mtd"
  KFEATURE_u-boot = ""
-KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "u-boot-${MACHINE}-dev"
-KFEATURE_u-boot[DEBIAN_DEPENDS] = "u-boot-tools"
+KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "libubootenv-dev"
+KFEATURE_u-boot[DEBIAN_DEPENDS] = "libubootenv-tool, u-boot-tools"
  KFEATURE_u-boot[DEPENDS] = "${U_BOOT}"
  KFEATURE_u-boot[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_u-boot.snippet"
The isar version we have at this point already supports that?
Yes, since one next e77d030ed0ac5b122aa7b798131062946cb36699.
Isar supports libubootenv since e77d030ed0ac5b122aa7b798131062946cb36699
cip-core since 683866e2b0c5113b849ef82cf206b3bb5c6e3e30

Quirin


Re: [isar-cip-core][PATCH 2/4] swupdate: use libubootenv

Quirin Gylstorff
 

On 1/18/21 12:23 PM, Jan Kiszka wrote:
On 18.01.21 11:35, Q. Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

libubootenv provides hardware independent access to u-boot environments.
This change conflicts with u-boot tools < 10.2019.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
classes/swupdate-config.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/swupdate-config.bbclass b/classes/swupdate-config.bbclass
index 208d240..dd0317f 100644
--- a/classes/swupdate-config.bbclass
+++ b/classes/swupdate-config.bbclass
@@ -46,8 +46,8 @@ KFEATURE_ubi[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_ubi.snippet"
KFEATURE_DEPS[ubi] = "mtd"
KFEATURE_u-boot = ""
-KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "u-boot-${MACHINE}-dev"
-KFEATURE_u-boot[DEBIAN_DEPENDS] = "u-boot-tools"
+KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "libubootenv-dev"
+KFEATURE_u-boot[DEBIAN_DEPENDS] = "libubootenv-tool, u-boot-tools"
KFEATURE_u-boot[DEPENDS] = "${U_BOOT}"
KFEATURE_u-boot[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_u-boot.snippet"
The isar version we have at this point already supports that?
Yes, since one next e77d030ed0ac5b122aa7b798131062946cb36699.
Jan
Quirin


Re: [isar-cip-core][PATCH 3/4] update linux kernels

Jan Kiszka
 

On 18.01.21 11:35, Q. Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
....135-cip31-rt13.bb => linux-cip-rt_4.19.160-cip39-rt17.bb} | 4 ++--
...inux-cip_4.19.140-cip33.bb => linux-cip_4.19.165-cip41.bb} | 4 ++--
..._4.4.231-cip47-rt30.bb => linux-cip_4.4.244-cip51-rt32.bb} | 4 ++--
...{linux-cip_4.4.230-cip47.bb => linux-cip_4.4.249-cip53.bb} | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
rename recipes-kernel/linux/{linux-cip-rt_4.19.135-cip31-rt13.bb => linux-cip-rt_4.19.160-cip39-rt17.bb} (54%)
rename recipes-kernel/linux/{linux-cip_4.19.140-cip33.bb => linux-cip_4.19.165-cip41.bb} (53%)
rename recipes-kernel/linux/{linux-cip-rt_4.4.231-cip47-rt30.bb => linux-cip_4.4.244-cip51-rt32.bb} (54%)
rename recipes-kernel/linux/{linux-cip_4.4.230-cip47.bb => linux-cip_4.4.249-cip53.bb} (53%)

diff --git a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb b/recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb
similarity index 54%
rename from recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
rename to recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb
index 820c1ab..3c0aea5 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.19.160-cip39-rt17.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-rt-common.inc

-SRC_URI[sha256sum] = "b827f45b8f97b71b3917c84b43fd6593030d01ea7261d3be6c15a76250308743"
+SRC_URI[sha256sum] = "c2e0f50670c298aed94c35628caf4ddf0eefc20d2f17e0a5f024bf4d99a38460"
diff --git a/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb b/recipes-kernel/linux/linux-cip_4.19.165-cip41.bb
similarity index 53%
rename from recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
rename to recipes-kernel/linux/linux-cip_4.19.165-cip41.bb
index 9e958c0..f19b4c3 100644
--- a/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
+++ b/recipes-kernel/linux/linux-cip_4.19.165-cip41.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-common.inc

-SRC_URI[sha256sum] = "f6a9aec6848a5897c90bafda5a9eba010c03d5d0cf99508adfb1cf7a2f4af9e5"
+SRC_URI[sha256sum] = "c1404d0a0a1ba71656c237d6d606714d34364814dc9a3998add93fe1749cb27d"
diff --git a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb b/recipes-kernel/linux/linux-cip_4.4.244-cip51-rt32.bb
similarity index 54%
rename from recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
rename to recipes-kernel/linux/linux-cip_4.4.244-cip51-rt32.bb
index e13fc14..6679144 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
+++ b/recipes-kernel/linux/linux-cip_4.4.244-cip51-rt32.bb
You lost one "-rt" in the file name.

Jan

@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-rt-common.inc

-SRC_URI[sha256sum] = "e7a0c7b8e4d91f52cbc2ee17a546d1afbc5fcfed95ba44dd113e534fab3a157e"
+SRC_URI[sha256sum] = "070dc2084d2a64c1c8d64382978ec01ed7875b012401d09f37428a9c8c52b9c3"
diff --git a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb b/recipes-kernel/linux/linux-cip_4.4.249-cip53.bb
similarity index 53%
rename from recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
rename to recipes-kernel/linux/linux-cip_4.4.249-cip53.bb
index af49441..03b1a04 100644
--- a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
+++ b/recipes-kernel/linux/linux-cip_4.4.249-cip53.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,4 +11,4 @@

require linux-cip-common.inc

-SRC_URI[sha256sum] = "3ff33e497064ba8e7d9b5e1ee575c6a936154fa8216774782cbc0db2e4b71cdf"
+SRC_URI[sha256sum] = "f8a6eba35572da13c81fec6c2d451db8f75b0ab4a5b6b80113523fbb035bf384"

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


Re: [isar-cip-core][PATCH 2/4] swupdate: use libubootenv

Jan Kiszka
 

On 18.01.21 11:35, Q. Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

libubootenv provides hardware independent access to u-boot environments.
This change conflicts with u-boot tools < 10.2019.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
classes/swupdate-config.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/swupdate-config.bbclass b/classes/swupdate-config.bbclass
index 208d240..dd0317f 100644
--- a/classes/swupdate-config.bbclass
+++ b/classes/swupdate-config.bbclass
@@ -46,8 +46,8 @@ KFEATURE_ubi[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_ubi.snippet"
KFEATURE_DEPS[ubi] = "mtd"

KFEATURE_u-boot = ""
-KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "u-boot-${MACHINE}-dev"
-KFEATURE_u-boot[DEBIAN_DEPENDS] = "u-boot-tools"
+KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "libubootenv-dev"
+KFEATURE_u-boot[DEBIAN_DEPENDS] = "libubootenv-tool, u-boot-tools"
KFEATURE_u-boot[DEPENDS] = "${U_BOOT}"
KFEATURE_u-boot[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_u-boot.snippet"

The isar version we have at this point already supports that?

Jan

--
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


[isar-cip-core][RFC 1/1] image: Move root password

Quirin Gylstorff
 

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

If cip-core is used upstream there is the possibility that the
root password is not set to a new value. Avoid this by moving the
password setting to the image.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
kas-cip.yml | 4 ----
recipes-core/images/cip-core-image-security.bb | 3 +++
recipes-core/images/cip-core-image.bb | 8 +++++++-
recipes-core/security-customizations/files/postinst | 6 ------
4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/kas-cip.yml b/kas-cip.yml
index 9514083..f2ed22e 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -41,7 +41,3 @@ local_conf_header:
CONF_VERSION = "1"
cross: |
ISAR_CROSS_COMPILE = "1"
- root_password: |
- USERS += "root"
- # 'root'
- USER_root[password] = "oC3wEGl799tZU"
diff --git a/recipes-core/images/cip-core-image-security.bb b/recipes-core/images/cip-core-image-security.bb
index 61ddc39..23219cb 100644
--- a/recipes-core/images/cip-core-image-security.bb
+++ b/recipes-core/images/cip-core-image-security.bb
@@ -11,6 +11,9 @@

inherit image

+# for customization and root password
+require recipes-core/images/cip-core-image.bb
+
DESCRIPTION = "CIP Core image including security packages"

IMAGE_INSTALL += "security-customizations"
diff --git a/recipes-core/images/cip-core-image.bb b/recipes-core/images/cip-core-image.bb
index 2cecde3..0f62edd 100644
--- a/recipes-core/images/cip-core-image.bb
+++ b/recipes-core/images/cip-core-image.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019 - 2021
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,6 +11,7 @@

inherit image
inherit image_uuid
+
ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags --dirty --always --match 'v[0-9].[0-9]*'"
DESCRIPTION = "CIP Core image"

@@ -19,3 +20,8 @@ IMAGE_INSTALL += "customizations"
# for swupdate
SWU_DESCRIPTION ??= "swupdate"
include ${SWU_DESCRIPTION}.inc
+
+# add root user and set passwort
+USERS += "root"
+# 'root'
+USER_root[password] = "oC3wEGl799tZU"
diff --git a/recipes-core/security-customizations/files/postinst b/recipes-core/security-customizations/files/postinst
index 3699ba2..682ceec 100644
--- a/recipes-core/security-customizations/files/postinst
+++ b/recipes-core/security-customizations/files/postinst
@@ -4,12 +4,6 @@
# Security Package configurations
#

-echo "CIP Core Security Image (login: root/root)" > /etc/issue
-
-HOSTNAME=demo
-echo "$HOSTNAME" > /etc/hostname
-echo "127.0.0.1 $HOSTNAME" >> /etc/hosts
-
# CR1.7: Strength of password-based authentication
# Pam configuration to enforce password strength
PAM_PWD_FILE="/etc/pam.d/common-password"
--
2.20.1


[isar-cip-core][RFC 0/1] Move root password

Quirin Gylstorff
 

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

If you use isar-cip-core downstream the root user in kas-cip.yml
can set the root password in a production image. Avoid this by moving
the user and password to cip-core-image.

Should we rename the cip-core-image to cip-core-image-demo to
clarify the indented use?

cip-core-image-security now requires cip-core-image as base. We could
move the content of cip-core-image-security to a include to fasilitate
the usage downstream.

Quirin Gylstorff (1):
image: Move root password

kas-cip.yml | 4 ----
recipes-core/images/cip-core-image-security.bb | 3 +++
recipes-core/images/cip-core-image.bb | 8 +++++++-
recipes-core/security-customizations/files/postinst | 6 ------
4 files changed, 10 insertions(+), 11 deletions(-)

--
2.20.1

1361 - 1380 of 7474