* [PATCH 01/10] meta: builchroot: Preserve environment when calling dpkg-buildpackage
2018-11-05 6:52 [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Jan Kiszka
@ 2018-11-05 6:52 ` Jan Kiszka
2018-11-05 9:41 ` Henning Schild
2018-11-05 10:05 ` Henning Schild
2018-11-05 6:52 ` [PATCH 02/10] meta-isar: Remove remaining wheezy traces Jan Kiszka
` (10 subsequent siblings)
11 siblings, 2 replies; 24+ messages in thread
From: Jan Kiszka @ 2018-11-05 6:52 UTC (permalink / raw)
To: isar-users
From: Jan Kiszka <jan.kiszka@siemens.com>
This is required in order to allow recipes to pass variables down to the
rules file. E.g., u-boot-custom.inc makes use of this.
Fixes: be291cd991bd ("buildchroot: build debian packages as "builder" not "root"")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/recipes-devtools/buildchroot/files/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh
index d98eb2e..5855f29 100644
--- a/meta/recipes-devtools/buildchroot/files/build.sh
+++ b/meta/recipes-devtools/buildchroot/files/build.sh
@@ -17,4 +17,4 @@ done
# Build the package as user "builder"
chown -R builder:builder $1 # the sources
chown builder:builder $1/.. # the output
-su - builder -c "cd $1; dpkg-buildpackage -a$target_arch -d --source-option=-I"
+su - builder -p -c "cd $1; dpkg-buildpackage -a$target_arch -d --source-option=-I"
--
2.16.4
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 01/10] meta: builchroot: Preserve environment when calling dpkg-buildpackage
2018-11-05 6:52 ` [PATCH 01/10] meta: builchroot: Preserve environment when calling dpkg-buildpackage Jan Kiszka
@ 2018-11-05 9:41 ` Henning Schild
2018-11-05 9:46 ` Jan Kiszka
2018-11-05 10:05 ` Henning Schild
1 sibling, 1 reply; 24+ messages in thread
From: Henning Schild @ 2018-11-05 9:41 UTC (permalink / raw)
To: Jan Kiszka; +Cc: isar-users
Am Mon, 5 Nov 2018 07:52:01 +0100
schrieb "Jan Kiszka" <jan.kiszka@siemens.com>:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> This is required in order to allow recipes to pass variables down to
> the rules file. E.g., u-boot-custom.inc makes use of this.
Good catch! Will u-boot recipes fail to build or will the binaries just
be broken?
Henning
> Fixes: be291cd991bd ("buildchroot: build debian packages as "builder"
> not "root"") Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> meta/recipes-devtools/buildchroot/files/build.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/buildchroot/files/build.sh
> b/meta/recipes-devtools/buildchroot/files/build.sh index
> d98eb2e..5855f29 100644 ---
> a/meta/recipes-devtools/buildchroot/files/build.sh +++
> b/meta/recipes-devtools/buildchroot/files/build.sh @@ -17,4 +17,4 @@
> done # Build the package as user "builder"
> chown -R builder:builder $1 # the sources
> chown builder:builder $1/.. # the output
> -su - builder -c "cd $1; dpkg-buildpackage -a$target_arch -d
> --source-option=-I" +su - builder -p -c "cd $1; dpkg-buildpackage
> -a$target_arch -d --source-option=-I"
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 01/10] meta: builchroot: Preserve environment when calling dpkg-buildpackage
2018-11-05 9:41 ` Henning Schild
@ 2018-11-05 9:46 ` Jan Kiszka
0 siblings, 0 replies; 24+ messages in thread
From: Jan Kiszka @ 2018-11-05 9:46 UTC (permalink / raw)
To: Henning Schild; +Cc: isar-users
On 05.11.18 10:41, Henning Schild wrote:
> Am Mon, 5 Nov 2018 07:52:01 +0100
> schrieb "Jan Kiszka" <jan.kiszka@siemens.com>:
>
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> This is required in order to allow recipes to pass variables down to
>> the rules file. E.g., u-boot-custom.inc makes use of this.
>
> Good catch! Will u-boot recipes fail to build or will the binaries just
> be broken?
It fails to build because we pass the name of the defconfig and of the generated
u-boot binary down to the rules file this way.
Jan
>
> Henning
>
>> Fixes: be291cd991bd ("buildchroot: build debian packages as "builder"
>> not "root"") Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>> meta/recipes-devtools/buildchroot/files/build.sh | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-devtools/buildchroot/files/build.sh
>> b/meta/recipes-devtools/buildchroot/files/build.sh index
>> d98eb2e..5855f29 100644 ---
>> a/meta/recipes-devtools/buildchroot/files/build.sh +++
>> b/meta/recipes-devtools/buildchroot/files/build.sh @@ -17,4 +17,4 @@
>> done # Build the package as user "builder"
>> chown -R builder:builder $1 # the sources
>> chown builder:builder $1/.. # the output
>> -su - builder -c "cd $1; dpkg-buildpackage -a$target_arch -d
>> --source-option=-I" +su - builder -p -c "cd $1; dpkg-buildpackage
>> -a$target_arch -d --source-option=-I"
>
-
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 01/10] meta: builchroot: Preserve environment when calling dpkg-buildpackage
2018-11-05 6:52 ` [PATCH 01/10] meta: builchroot: Preserve environment when calling dpkg-buildpackage Jan Kiszka
2018-11-05 9:41 ` Henning Schild
@ 2018-11-05 10:05 ` Henning Schild
2018-11-05 10:16 ` [PATCH v2 " Jan Kiszka
2018-11-05 14:15 ` [PATCH " Baurzhan Ismagulov
1 sibling, 2 replies; 24+ messages in thread
From: Henning Schild @ 2018-11-05 10:05 UTC (permalink / raw)
To: Jan Kiszka; +Cc: isar-users
Am Mon, 5 Nov 2018 07:52:01 +0100
schrieb "Jan Kiszka" <jan.kiszka@siemens.com>:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> This is required in order to allow recipes to pass variables down to
> the rules file. E.g., u-boot-custom.inc makes use of this.
>
> Fixes: be291cd991bd ("buildchroot: build debian packages as "builder"
> not "root"") Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> meta/recipes-devtools/buildchroot/files/build.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/buildchroot/files/build.sh
> b/meta/recipes-devtools/buildchroot/files/build.sh index
> d98eb2e..5855f29 100644 ---
> a/meta/recipes-devtools/buildchroot/files/build.sh +++
> b/meta/recipes-devtools/buildchroot/files/build.sh @@ -17,4 +17,4 @@
> done # Build the package as user "builder"
> chown -R builder:builder $1 # the sources
> chown builder:builder $1/.. # the output
> -su - builder -c "cd $1; dpkg-buildpackage -a$target_arch -d
> --source-option=-I" +su - builder -p -c "cd $1; dpkg-buildpackage
> -a$target_arch -d --source-option=-I"
I guess the "-" ("-l") should be dropped as well once at it. We need
those features tested inside Isar!
Henning
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH v2 01/10] meta: builchroot: Preserve environment when calling dpkg-buildpackage
2018-11-05 10:05 ` Henning Schild
@ 2018-11-05 10:16 ` Jan Kiszka
2018-11-05 14:15 ` [PATCH " Baurzhan Ismagulov
1 sibling, 0 replies; 24+ messages in thread
From: Jan Kiszka @ 2018-11-05 10:16 UTC (permalink / raw)
To: Henning Schild, isar-users
From: Jan Kiszka <jan.kiszka@siemens.com>
This is required in order to allow recipes to pass variables down to the
rules file. E.g., u-boot-custom.inc makes use of this.
Fixes: be291cd991bd ("buildchroot: build debian packages as "builder" not "root"")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Changes in v2:
- drop "-", rather than adding "-p"
meta/recipes-devtools/buildchroot/files/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/buildchroot/files/build.sh b/meta/recipes-devtools/buildchroot/files/build.sh
index d98eb2e..66b1a77 100644
--- a/meta/recipes-devtools/buildchroot/files/build.sh
+++ b/meta/recipes-devtools/buildchroot/files/build.sh
@@ -17,4 +17,4 @@ done
# Build the package as user "builder"
chown -R builder:builder $1 # the sources
chown builder:builder $1/.. # the output
-su - builder -c "cd $1; dpkg-buildpackage -a$target_arch -d --source-option=-I"
+su builder -c "cd $1; dpkg-buildpackage -a$target_arch -d --source-option=-I"
--
2.16.4
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 01/10] meta: builchroot: Preserve environment when calling dpkg-buildpackage
2018-11-05 10:05 ` Henning Schild
2018-11-05 10:16 ` [PATCH v2 " Jan Kiszka
@ 2018-11-05 14:15 ` Baurzhan Ismagulov
2018-11-05 14:25 ` Jan Kiszka
2018-11-05 15:36 ` Henning Schild
1 sibling, 2 replies; 24+ messages in thread
From: Baurzhan Ismagulov @ 2018-11-05 14:15 UTC (permalink / raw)
To: isar-users
On Mon, Nov 05, 2018 at 11:05:36AM +0100, Henning Schild wrote:
> > -su - builder -c "cd $1; dpkg-buildpackage -a$target_arch -d
> > --source-option=-I" +su - builder -p -c "cd $1; dpkg-buildpackage
> > -a$target_arch -d --source-option=-I"
>
> I guess the "-" ("-l") should be dropped as well once at it. We need
> those features tested inside Isar!
What do you mean, should we add a certain use case to the CI?
With kind regards,
Baurzhan.
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 01/10] meta: builchroot: Preserve environment when calling dpkg-buildpackage
2018-11-05 14:15 ` [PATCH " Baurzhan Ismagulov
@ 2018-11-05 14:25 ` Jan Kiszka
2018-11-05 15:36 ` Henning Schild
1 sibling, 0 replies; 24+ messages in thread
From: Jan Kiszka @ 2018-11-05 14:25 UTC (permalink / raw)
To: isar-users
On 05.11.18 15:15, Baurzhan Ismagulov wrote:
> On Mon, Nov 05, 2018 at 11:05:36AM +0100, Henning Schild wrote:
>>> -su - builder -c "cd $1; dpkg-buildpackage -a$target_arch -d
>>> --source-option=-I" +su - builder -p -c "cd $1; dpkg-buildpackage
>>> -a$target_arch -d --source-option=-I"
>>
>> I guess the "-" ("-l") should be dropped as well once at it. We need
>> those features tested inside Isar!
>
> What do you mean, should we add a certain use case to the CI?
>
We could add the DE0-Nano-SoC I posted to CI as well. Then it might be worth
investing a bit in tuning down the defconfig, to shorten the build times of the
kernel. U-Boot is quick to build, though.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 01/10] meta: builchroot: Preserve environment when calling dpkg-buildpackage
2018-11-05 14:15 ` [PATCH " Baurzhan Ismagulov
2018-11-05 14:25 ` Jan Kiszka
@ 2018-11-05 15:36 ` Henning Schild
2018-11-06 10:53 ` Baurzhan Ismagulov
1 sibling, 1 reply; 24+ messages in thread
From: Henning Schild @ 2018-11-05 15:36 UTC (permalink / raw)
To: Baurzhan Ismagulov; +Cc: isar-users
Am Mon, 5 Nov 2018 15:15:47 +0100
schrieb Baurzhan Ismagulov <ibr@radix50.net>:
> On Mon, Nov 05, 2018 at 11:05:36AM +0100, Henning Schild wrote:
> > > -su - builder -c "cd $1; dpkg-buildpackage -a$target_arch -d
> > > --source-option=-I" +su - builder -p -c "cd $1; dpkg-buildpackage
> > > -a$target_arch -d --source-option=-I"
> >
> > I guess the "-" ("-l") should be dropped as well once at it. We need
> > those features tested inside Isar!
>
> What do you mean, should we add a certain use case to the CI?
Recently several features have been merged, none of which where/are
covered by CI. custom kernel/uboot, sdk, cache and maybe more
I remember how hard it was to get wic in a testable state, but i guess
it was worth it ... So new features should almost always come with
tests (if not always).
Henning
> With kind regards,
> Baurzhan.
>
--
Siemens AG
Corporate Technology
CT RDA IOT SES-DE
Otto-Hahn-Ring 6
81739 Muenchen, Germany
Mobile: +49 172 8378927
mailto: henning.schild@siemens.com
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 01/10] meta: builchroot: Preserve environment when calling dpkg-buildpackage
2018-11-05 15:36 ` Henning Schild
@ 2018-11-06 10:53 ` Baurzhan Ismagulov
0 siblings, 0 replies; 24+ messages in thread
From: Baurzhan Ismagulov @ 2018-11-06 10:53 UTC (permalink / raw)
To: isar-users
On Mon, Nov 05, 2018 at 04:36:08PM +0100, Henning Schild wrote:
> Recently several features have been merged, none of which where/are
> covered by CI. custom kernel/uboot, sdk, cache and maybe more
> I remember how hard it was to get wic in a testable state, but i guess
> it was worth it ... So new features should almost always come with
> tests (if not always).
Thanks for the clarification, I second this vision. For testing, we'd like to
define test case groups to execute always vs. before certain milestones. Seems
I have to prioritize rebasing my avocado testsuite patches over the current
next.
With kind regards,
Baurzhan.
^ permalink raw reply [flat|nested] 24+ messages in thread
* [PATCH 02/10] meta-isar: Remove remaining wheezy traces
2018-11-05 6:52 [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Jan Kiszka
2018-11-05 6:52 ` [PATCH 01/10] meta: builchroot: Preserve environment when calling dpkg-buildpackage Jan Kiszka
@ 2018-11-05 6:52 ` Jan Kiszka
2018-11-09 14:22 ` Baurzhan Ismagulov
2018-11-05 6:52 ` [PATCH 03/10] meta-isar: linux: Update mainline recipe to 4.19 Jan Kiszka
` (9 subsequent siblings)
11 siblings, 1 reply; 24+ messages in thread
From: Jan Kiszka @ 2018-11-05 6:52 UTC (permalink / raw)
To: isar-users
From: Jan Kiszka <jan.kiszka@siemens.com>
Support for wheezy was dropped long ago.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Supported_Configurations.md | 6 ++----
Tested_Status.md | 6 ++----
doc/user_manual.md | 1 -
meta-isar/conf/distro/debian-wheezy.conf | 11 -----------
meta-isar/conf/distro/debian-wheezy.list | 3 ---
meta-isar/conf/local.conf.sample | 1 -
meta-isar/conf/multiconfig/qemuarm-wheezy.conf | 23 -----------------------
7 files changed, 4 insertions(+), 47 deletions(-)
delete mode 100644 meta-isar/conf/distro/debian-wheezy.conf
delete mode 100644 meta-isar/conf/distro/debian-wheezy.list
delete mode 100644 meta-isar/conf/multiconfig/qemuarm-wheezy.conf
diff --git a/Supported_Configurations.md b/Supported_Configurations.md
index eeef37d..2281c1b 100644
--- a/Supported_Configurations.md
+++ b/Supported_Configurations.md
@@ -1,14 +1,13 @@
Supported Configurations
========================
-Release v0.6-beta
------------------
+Release v0.6
+------------
### Host System : debian-jessie-amd64
|Target System |Native Build |Cross Build |QEMU test |SDK Support |Notes |
|:--------------------:|:-----------:|:------------|:-----------:|:-----------:|:---------------------------:|
-| debian-wheezy-armhf |YES |NO |UNKNOWN |NO | not supported since 9fc721a |
| debian-jessie-i386 |YES |NO |YES |NO | |
| debian-jessie-amd64 |YES |NO |YES |NO | |
| debian-jessie-armhf |YES |NO |YES |NO | |
@@ -27,7 +26,6 @@ Release v0.6-beta
|Target System |Native Build |Cross Build |QEMU test |SDK Support |Notes |
|:--------------------:|:-----------:|:------------|:-----------:|:-----------:|:---------------------------:|
-| debian-wheezy-armhf |YES |UNKNOWN |UNKNOWN |NO | not supported since 9fc721a |
| debian-jessie-i386 |YES |UNKNOWN |YES |NO | |
| debian-jessie-amd64 |YES |YES |YES |NO | |
| debian-jessie-armhf |YES |YES |YES |NO | |
diff --git a/Tested_Status.md b/Tested_Status.md
index 7defd8f..33dd564 100644
--- a/Tested_Status.md
+++ b/Tested_Status.md
@@ -1,14 +1,13 @@
Tested Status
=============
-Release v0.6-beta
------------------
+Release v0.6
+------------
### Host System : debian-jessie-amd64
|Target System |Native Build |QEMU test |SDK Support |Version |
|:--------------------:|:-----------:|:-----------:|:-----------:|:------:|
-| debian-wheezy-armhf |PASSED |UNTESTED |NO |3cd5798 |
| debian-jessie-i386 |PASSED |PASSED |NO |422b0be |
| debian-jessie-amd64 |PASSED |PASSED |NO |422b0be |
| debian-jessie-armhf |PASSED |PASSED |NO |422b0be |
@@ -27,7 +26,6 @@ Release v0.6-beta
|Target System |Native Build |Cross Build |QEMU test |SDK Support |Version |
|:--------------------:|:-----------:|:------------|:-----------:|:-----------:|:------:|
-| debian-wheezy-armhf |PASSED |UNTESTED |UNTESTED |NO |3cd5798 |
| debian-jessie-i386 |PASSED |UNTESTED |PASSED |NO |96672c7 |
| debian-jessie-amd64 |PASSED |PASSED |PASSED |NO |96672c7 |
| debian-jessie-armhf |PASSED |PASSED |PASSED |NO |96672c7 |
diff --git a/doc/user_manual.md b/doc/user_manual.md
index 42bcd6b..0467d03 100644
--- a/doc/user_manual.md
+++ b/doc/user_manual.md
@@ -138,7 +138,6 @@ a single call. List all configurations in `conf/local.conf`:
```
BBMULTICONFIG = " \
- qemuarm-wheezy \
qemuarm-jessie \
qemuarm-stretch \
qemuarm-buster \
diff --git a/meta-isar/conf/distro/debian-wheezy.conf b/meta-isar/conf/distro/debian-wheezy.conf
deleted file mode 100644
index a5f52fc..0000000
--- a/meta-isar/conf/distro/debian-wheezy.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Debian wheezy distribution configuration
-#
-# This software is a part of ISAR.
-# Copyright (C) 2015-2016 ilbers GmbH
-
-require debian-common.conf
-
-DISTRO_APT_SOURCES += "conf/distro/debian-wheezy.list"
-DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
-DISTRO_KERNELS ?= "486 686-pae amd64 rt-686-pae rt-amd64 versatile vexpress \
- iop32x ixp4xx kirkwood mv78xx0 mx5 omap orion5x"
diff --git a/meta-isar/conf/distro/debian-wheezy.list b/meta-isar/conf/distro/debian-wheezy.list
deleted file mode 100644
index 0bfa98e..0000000
--- a/meta-isar/conf/distro/debian-wheezy.list
+++ /dev/null
@@ -1,3 +0,0 @@
-deb http://ftp.de.debian.org/debian wheezy main contrib non-free
-deb http://ftp.de.debian.org/debian wheezy-updates main contrib non-free
-deb http://security.debian.org wheezy/updates main contrib non-free
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index f3a960a..6a70d34 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -38,7 +38,6 @@ DISTRO_ARCH ??= "armhf"
#
# This sets the default multiple configurations used:
BBMULTICONFIG = " \
- qemuarm-wheezy \
qemuarm-jessie \
qemuarm-stretch \
qemuarm-buster \
diff --git a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf b/meta-isar/conf/multiconfig/qemuarm-wheezy.conf
deleted file mode 100644
index 19b9daa..0000000
--- a/meta-isar/conf/multiconfig/qemuarm-wheezy.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# This software is a part of ISAR.
-# Copyright (C) 2015-2017 ilbers GmbH
-#
-# This configuration file is a part of bitbake multiconfig. Bitbake combines
-# these settings with local.conf ones and start task execution with this
-# environment.
-
-# This sets the default machine to be qemuarm in this configuration:
-MACHINE ?= "qemuarm"
-
-# This sets the default distribution configuration:
-DISTRO ?= "debian-wheezy"
-DISTRO_ARCH ?= "armhf"
-
-KERNEL_NAME ?= "vexpress"
-
-QEMU_ROOTFS_DEV ?= "mmcblk0"
-
-QEMU_ARCH ?= "arm"
-QEMU_MACHINE ?= "vexpress-a9"
-QEMU_CPU ?= ""
-QEMU_DISK_ARGS ?= "-sd ##ROOTFS_IMAGE##"
--
2.16.4
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH 03/10] meta-isar: linux: Update mainline recipe to 4.19
2018-11-05 6:52 [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Jan Kiszka
2018-11-05 6:52 ` [PATCH 01/10] meta: builchroot: Preserve environment when calling dpkg-buildpackage Jan Kiszka
2018-11-05 6:52 ` [PATCH 02/10] meta-isar: Remove remaining wheezy traces Jan Kiszka
@ 2018-11-05 6:52 ` Jan Kiszka
2018-11-05 6:52 ` [PATCH 04/10] meta-isar: example-module: Only disable cross-compilation for Debian kernels Jan Kiszka
` (8 subsequent siblings)
11 siblings, 0 replies; 24+ messages in thread
From: Jan Kiszka @ 2018-11-05 6:52 UTC (permalink / raw)
To: isar-users
From: Jan Kiszka <jan.kiszka@siemens.com>
As the archive is omitting the sublevel version while the build rules
need this, we need some extra logic.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.../linux/{linux-mainline_4.14.18.bb => linux-mainline_4.19.0.bb} | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
rename meta-isar/recipes-kernel/linux/{linux-mainline_4.14.18.bb => linux-mainline_4.19.0.bb} (52%)
diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_4.14.18.bb b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb
similarity index 52%
rename from meta-isar/recipes-kernel/linux/linux-mainline_4.14.18.bb
rename to meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb
index fc465fd..b109f3c 100644
--- a/meta-isar/recipes-kernel/linux/linux-mainline_4.14.18.bb
+++ b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb
@@ -7,11 +7,13 @@
require recipes-kernel/linux/linux-custom.inc
+ARCHIVE_VERSION = "${@d.getVar('PV').strip('.0')}"
+
SRC_URI += " \
- https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
+ https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${ARCHIVE_VERSION}.tar.xz \
file://x86_64_defconfig"
-SRC_URI[sha256sum] = "866a94c1c38d923ae18e74b683d7a8a79b674ebdfe7f40f1a3be9a27d39fe354"
+SRC_URI[sha256sum] = "0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
-S = "${WORKDIR}/linux-${PV}"
+S = "${WORKDIR}/linux-${ARCHIVE_VERSION}"
KERNEL_DEFCONFIG_qemuamd64 = "x86_64_defconfig"
--
2.16.4
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH 04/10] meta-isar: example-module: Only disable cross-compilation for Debian kernels
2018-11-05 6:52 [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Jan Kiszka
` (2 preceding siblings ...)
2018-11-05 6:52 ` [PATCH 03/10] meta-isar: linux: Update mainline recipe to 4.19 Jan Kiszka
@ 2018-11-05 6:52 ` Jan Kiszka
2018-11-05 6:52 ` [PATCH 05/10] meta-isar: Add Terasic DE0-Nano-SoC as demonstration board Jan Kiszka
` (7 subsequent siblings)
11 siblings, 0 replies; 24+ messages in thread
From: Jan Kiszka @ 2018-11-05 6:52 UTC (permalink / raw)
To: isar-users
From: Jan Kiszka <jan.kiszka@siemens.com>
It's perfectly fine to cross-build this module with self-built kernels.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.../recipes-kernel/example-module/example-module.bb | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/meta-isar/recipes-kernel/example-module/example-module.bb b/meta-isar/recipes-kernel/example-module/example-module.bb
index 1a4554a..996b5e2 100644
--- a/meta-isar/recipes-kernel/example-module/example-module.bb
+++ b/meta-isar/recipes-kernel/example-module/example-module.bb
@@ -7,15 +7,18 @@
include recipes-kernel/linux-module/module.inc
-SRC_URI += "file://src"
-
-S = "${WORKDIR}/src"
-
-AUTOLOAD = "${PN}"
-
# Cross-compilation is not supported for the default Debian kernels.
# For example, package with kernel headers for ARM:
# linux-headers-armmp
# has hard dependencies from linux-compiler-gcc-4.8-arm, what
# conflicts with the host binaries.
-ISAR_CROSS_COMPILE = "0"
+python() {
+ if d.getVar('KERNEL_NAME') in ['armmp', 'arm64', 'rpi-rpfv', 'amd64', '686-pae']:
+ d.setVar('ISAR_CROSS_COMPILE', '0')
+}
+
+SRC_URI += "file://src"
+
+S = "${WORKDIR}/src"
+
+AUTOLOAD = "${PN}"
--
2.16.4
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH 05/10] meta-isar: Add Terasic DE0-Nano-SoC as demonstration board
2018-11-05 6:52 [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Jan Kiszka
` (3 preceding siblings ...)
2018-11-05 6:52 ` [PATCH 04/10] meta-isar: example-module: Only disable cross-compilation for Debian kernels Jan Kiszka
@ 2018-11-05 6:52 ` Jan Kiszka
2018-11-05 6:52 ` [PATCH 06/10] meta-isar: Add LeMaker HiKey board Jan Kiszka
` (6 subsequent siblings)
11 siblings, 0 replies; 24+ messages in thread
From: Jan Kiszka @ 2018-11-05 6:52 UTC (permalink / raw)
To: isar-users
From: Jan Kiszka <jan.kiszka@siemens.com>
This requires to build a recent U-Boot release as well as a kernel with
a DTB renaming patch so that U-Boot will find the corresponding device
tree.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta-isar/conf/local.conf.sample | 1 +
meta-isar/conf/machine/de0-nano-soc.conf | 18 ++++++++++
.../conf/multiconfig/de0-nano-soc-stretch.conf | 7 ++++
meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb | 11 ++++++
...fpga-Rename-socfpga_cyclone5_de0_-sockit-.patch | 41 ++++++++++++++++++++++
.../recipes-kernel/linux/linux-mainline_4.19.0.bb | 3 ++
.../scripts/lib/wic/canned-wks/de0-nano-soc.wks | 10 ++++++
7 files changed, 91 insertions(+)
create mode 100644 meta-isar/conf/machine/de0-nano-soc.conf
create mode 100644 meta-isar/conf/multiconfig/de0-nano-soc-stretch.conf
create mode 100644 meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb
create mode 100644 meta-isar/recipes-kernel/linux/files/0001-ARM-dts-socfpga-Rename-socfpga_cyclone5_de0_-sockit-.patch
create mode 100644 meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 6a70d34..45de252 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -49,6 +49,7 @@ BBMULTICONFIG = " \
qemuamd64-jessie \
qemuamd64-stretch \
bananapi-stretch \
+ de0-nano-soc-stretch \
qemuamd64-buster \
rpi-jessie \
"
diff --git a/meta-isar/conf/machine/de0-nano-soc.conf b/meta-isar/conf/machine/de0-nano-soc.conf
new file mode 100644
index 0000000..63b2cfb
--- /dev/null
+++ b/meta-isar/conf/machine/de0-nano-soc.conf
@@ -0,0 +1,18 @@
+#
+# Copyright (c) Siemens AG, 2018
+#
+# SPDX-License-Identifier: MIT
+
+DISTRO_ARCH ?= "armhf"
+
+KERNEL_NAME ?= "mainline"
+
+U_BOOT_CONFIG_de0-nano-soc = "socfpga_de0_nano_soc_defconfig"
+U_BOOT_BIN_de0-nano-soc = "u-boot-with-spl.sfp"
+
+IMAGE_TYPE ?= "wic-img"
+WKS_FILE ?= "de0-nano-soc"
+IMAGER_INSTALL += "u-boot-de0-nano-soc"
+IMAGER_BUILD_DEPS += "u-boot-de0-nano-soc"
+
+IMAGE_INSTALL += "u-boot-tools u-boot-script"
diff --git a/meta-isar/conf/multiconfig/de0-nano-soc-stretch.conf b/meta-isar/conf/multiconfig/de0-nano-soc-stretch.conf
new file mode 100644
index 0000000..6882493
--- /dev/null
+++ b/meta-isar/conf/multiconfig/de0-nano-soc-stretch.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) Siemens AG, 2018
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE = "de0-nano-soc"
+DISTRO = "debian-stretch"
diff --git a/meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb b/meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb
new file mode 100644
index 0000000..e0f756c
--- /dev/null
+++ b/meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb
@@ -0,0 +1,11 @@
+#
+# Copyright (c) Siemens AG, 2018
+#
+# SPDX-License-Identifier: MIT
+
+require recipes-bsp/u-boot/u-boot-custom.inc
+
+SRC_URI += " \
+ ftp://ftp.denx.de/pub/u-boot/u-boot-2018.09.tar.bz2 \
+ "
+SRC_URI[sha256sum] = "839bf23cfe8ce613a77e583a60375179d0ad324e92c82fbdd07bebf0fd142268"
diff --git a/meta-isar/recipes-kernel/linux/files/0001-ARM-dts-socfpga-Rename-socfpga_cyclone5_de0_-sockit-.patch b/meta-isar/recipes-kernel/linux/files/0001-ARM-dts-socfpga-Rename-socfpga_cyclone5_de0_-sockit-.patch
new file mode 100644
index 0000000..8eb602d
--- /dev/null
+++ b/meta-isar/recipes-kernel/linux/files/0001-ARM-dts-socfpga-Rename-socfpga_cyclone5_de0_-sockit-.patch
@@ -0,0 +1,41 @@
+From 202eb5481421040e115526b75317b5ca72584806 Mon Sep 17 00:00:00 2001
+From: Marek Vasut <marex@denx.de>
+Date: Wed, 29 Aug 2018 17:15:04 +0200
+Subject: [PATCH] ARM: dts: socfpga: Rename
+ socfpga_cyclone5_de0_{sockit,nano_soc}
+
+Rename DT source for DE0 Nano SoC . The board name is really DE0-Nano-SoC
+or Atlas SoC, and it is not to be confused with SoCkit board, which is a
+different one. Rename the DT source file to match the board name and to
+avoid this possible mixup with another different board.
+
+Signed-off-by: Marek Vasut <marex@denx.de>
+Cc: Dinh Nguyen <dinguyen@kernel.org>
+Cc: Jan Kiszka <jan.kiszka@siemens.com>
+Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
+---
+ arch/arm/boot/dts/Makefile | 2 +-
+ ...ocfpga_cyclone5_de0_sockit.dts => socfpga_cyclone5_de0_nano_soc.dts} | 0
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+ rename arch/arm/boot/dts/{socfpga_cyclone5_de0_sockit.dts => socfpga_cyclone5_de0_nano_soc.dts} (100%)
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index b5bd3de87c33..1036d396da83 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -892,7 +892,7 @@ dtb-$(CONFIG_ARCH_SOCFPGA) += \
+ socfpga_arria10_socdk_sdmmc.dtb \
+ socfpga_cyclone5_mcvevk.dtb \
+ socfpga_cyclone5_socdk.dtb \
+- socfpga_cyclone5_de0_sockit.dtb \
++ socfpga_cyclone5_de0_nano_soc.dtb \
+ socfpga_cyclone5_sockit.dtb \
+ socfpga_cyclone5_socrates.dtb \
+ socfpga_cyclone5_sodia.dtb \
+diff --git a/arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts b/arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts
+similarity index 100%
+rename from arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts
+rename to arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts
+--
+2.16.4
+
diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb
index b109f3c..e50e149 100644
--- a/meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb
+++ b/meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb
@@ -14,6 +14,9 @@ SRC_URI += " \
file://x86_64_defconfig"
SRC_URI[sha256sum] = "0c68f5655528aed4f99dae71a5b259edc93239fa899e2df79c055275c21749a1"
+SRC_URI_append_de0-nano-soc = " \
+ file://0001-ARM-dts-socfpga-Rename-socfpga_cyclone5_de0_-sockit-.patch"
+
S = "${WORKDIR}/linux-${ARCHIVE_VERSION}"
KERNEL_DEFCONFIG_qemuamd64 = "x86_64_defconfig"
diff --git a/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks b/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks
new file mode 100644
index 0000000..993a4ca
--- /dev/null
+++ b/meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks
@@ -0,0 +1,10 @@
+#
+# Copyright (c) Siemens AG, 2018
+#
+# SPDX-License-Identifier: MIT
+
+part --source rawcopy --sourceparams "file=/usr/lib/u-boot/de0-nano-soc/u-boot-with-spl.sfp" --system-id 0xa2 --align 1
+
+part / --source rootfs --ondisk mmcblk0 --fstype ext4 --label platform --align 1024 --active
+
+bootloader --append "rw rootwait"
--
2.16.4
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH 06/10] meta-isar: Add LeMaker HiKey board
2018-11-05 6:52 [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Jan Kiszka
` (4 preceding siblings ...)
2018-11-05 6:52 ` [PATCH 05/10] meta-isar: Add Terasic DE0-Nano-SoC as demonstration board Jan Kiszka
@ 2018-11-05 6:52 ` Jan Kiszka
2018-11-05 6:52 ` [PATCH 07/10] meta: linux-module: Fix arm64 cross-build Jan Kiszka
` (5 subsequent siblings)
11 siblings, 0 replies; 24+ messages in thread
From: Jan Kiszka @ 2018-11-05 6:52 UTC (permalink / raw)
To: isar-users
From: Jan Kiszka <jan.kiszka@siemens.com>
We are booting it via UEFI from SD card.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta-isar/conf/local.conf.sample | 1 +
meta-isar/conf/machine/hikey.conf | 14 ++++++++++++++
meta-isar/conf/multiconfig/hikey-stretch.conf | 7 +++++++
meta-isar/scripts/lib/wic/canned-wks/hikey.wks | 10 ++++++++++
4 files changed, 32 insertions(+)
create mode 100644 meta-isar/conf/machine/hikey.conf
create mode 100644 meta-isar/conf/multiconfig/hikey-stretch.conf
create mode 100644 meta-isar/scripts/lib/wic/canned-wks/hikey.wks
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index 45de252..ffcb7ab 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -50,6 +50,7 @@ BBMULTICONFIG = " \
qemuamd64-stretch \
bananapi-stretch \
de0-nano-soc-stretch \
+ hikey-stretch \
qemuamd64-buster \
rpi-jessie \
"
diff --git a/meta-isar/conf/machine/hikey.conf b/meta-isar/conf/machine/hikey.conf
new file mode 100644
index 0000000..09dfaf4
--- /dev/null
+++ b/meta-isar/conf/machine/hikey.conf
@@ -0,0 +1,14 @@
+#
+# Copyright (c) Siemens AG, 2018
+#
+# SPDX-License-Identifier: MIT
+
+DISTRO_ARCH = "arm64"
+
+KERNEL_NAME ?= "mainline"
+
+IMAGE_TYPE = "wic-img"
+WKS_FILE ?= "hikey"
+IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
+
+IMAGE_PREINSTALL_append = " firmware-ti-connectivity"
diff --git a/meta-isar/conf/multiconfig/hikey-stretch.conf b/meta-isar/conf/multiconfig/hikey-stretch.conf
new file mode 100644
index 0000000..5eed8b9
--- /dev/null
+++ b/meta-isar/conf/multiconfig/hikey-stretch.conf
@@ -0,0 +1,7 @@
+#
+# Copyright (c) Siemens AG, 2018
+#
+# SPDX-License-Identifier: MIT
+
+MACHINE = "hikey"
+DISTRO = "debian-stretch"
diff --git a/meta-isar/scripts/lib/wic/canned-wks/hikey.wks b/meta-isar/scripts/lib/wic/canned-wks/hikey.wks
new file mode 100644
index 0000000..1e82f8c
--- /dev/null
+++ b/meta-isar/scripts/lib/wic/canned-wks/hikey.wks
@@ -0,0 +1,10 @@
+#
+# Copyright (c) Siemens AG, 2018
+#
+# SPDX-License-Identifier: MIT
+
+part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk mmcblk1 --label efi --part-type EF00 --align 1024
+
+part / --source rootfs --ondisk mmcblk1 --fstype ext4 --label platform --align 1024 --use-uuid
+
+bootloader --ptable gpt --timeout=3
--
2.16.4
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH 07/10] meta: linux-module: Fix arm64 cross-build
2018-11-05 6:52 [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Jan Kiszka
` (5 preceding siblings ...)
2018-11-05 6:52 ` [PATCH 06/10] meta-isar: Add LeMaker HiKey board Jan Kiszka
@ 2018-11-05 6:52 ` Jan Kiszka
2018-11-05 6:52 ` [PATCH 08/10] wic: bootimg-efi-isar: Avoid append "None" to kernel command line Jan Kiszka
` (4 subsequent siblings)
11 siblings, 0 replies; 24+ messages in thread
From: Jan Kiszka @ 2018-11-05 6:52 UTC (permalink / raw)
To: isar-users
From: Jan Kiszka <jan.kiszka@siemens.com>
Fixes: 229ffe5c5a2a ("linux-module: Export ARCH and CROSS_COMPILE")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/recipes-kernel/linux-module/files/debian/rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux-module/files/debian/rules b/meta/recipes-kernel/linux-module/files/debian/rules
index 95206b7..49788da 100755
--- a/meta/recipes-kernel/linux-module/files/debian/rules
+++ b/meta/recipes-kernel/linux-module/files/debian/rules
@@ -16,7 +16,7 @@ export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)-
ifeq ($(DEB_HOST_GNU_CPU), arm)
export ARCH=arm
endif
-ifeq ($(DEB_HOST_GNU_CPU), arm64)
+ifeq ($(DEB_HOST_GNU_CPU), aarch64)
export ARCH=arm64
endif
ifneq (,$(findstring 86,$(DEB_HOST_GNU_CPU)))
--
2.16.4
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH 08/10] wic: bootimg-efi-isar: Avoid append "None" to kernel command line
2018-11-05 6:52 [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Jan Kiszka
` (6 preceding siblings ...)
2018-11-05 6:52 ` [PATCH 07/10] meta: linux-module: Fix arm64 cross-build Jan Kiszka
@ 2018-11-05 6:52 ` Jan Kiszka
2018-11-05 6:52 ` [PATCH 09/10] wic: bootimg-efi-isar: Make agnostic to partition order Jan Kiszka
` (3 subsequent siblings)
11 siblings, 0 replies; 24+ messages in thread
From: Jan Kiszka @ 2018-11-05 6:52 UTC (permalink / raw)
To: isar-users
From: Jan Kiszka <jan.kiszka@siemens.com>
If there is nothing to append, bootloader.append will be None. Avoid
that this is being stringified.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
index 9ce694d..38f6fc0 100644
--- a/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
+++ b/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
@@ -75,7 +75,7 @@ class BootimgEFIPlugin(SourcePlugin):
kernel = "/vmlinuz"
grubefi_conf += "linux %s root=%s rootwait %s\n" \
- % (kernel, creator.rootdev, bootloader.append)
+ % (kernel, creator.rootdev, bootloader.append or "")
initrd = "/initrd.img"
@@ -152,7 +152,7 @@ class BootimgEFIPlugin(SourcePlugin):
boot_conf += "title boot\n"
boot_conf += "linux %s\n" % kernel
boot_conf += "options LABEL=Boot root=%s %s\n" % \
- (creator.rootdev, bootloader.append)
+ (creator.rootdev, bootloader.append or "")
if initrd:
boot_conf += "initrd /%s\n" % initrd
--
2.16.4
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH 09/10] wic: bootimg-efi-isar: Make agnostic to partition order
2018-11-05 6:52 [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Jan Kiszka
` (7 preceding siblings ...)
2018-11-05 6:52 ` [PATCH 08/10] wic: bootimg-efi-isar: Avoid append "None" to kernel command line Jan Kiszka
@ 2018-11-05 6:52 ` Jan Kiszka
2018-11-05 6:52 ` [PATCH 10/10] image: Add install_image_deps to cache_base_repo dependencies Jan Kiszka
` (2 subsequent siblings)
11 siblings, 0 replies; 24+ messages in thread
From: Jan Kiszka @ 2018-11-05 6:52 UTC (permalink / raw)
To: isar-users
From: Jan Kiszka <jan.kiszka@siemens.com>
Replace the hard-coded assumptions about the partition order by the
exact partition number as wic has calculated it for us.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
index 38f6fc0..44ce399 100644
--- a/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
+++ b/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
@@ -44,7 +44,7 @@ class BootimgEFIPlugin(SourcePlugin):
name = 'bootimg-efi-isar'
@classmethod
- def do_configure_grubefi(cls, creator, cr_workdir):
+ def do_configure_grubefi(cls, creator, cr_workdir, bootpart):
"""
Create loader-specific (grub-efi) config
"""
@@ -69,7 +69,9 @@ class BootimgEFIPlugin(SourcePlugin):
grubefi_conf += "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1\n"
grubefi_conf += "default=boot\n"
grubefi_conf += "timeout=%s\n" % bootloader.timeout
- grubefi_conf += "set root='hd0,gpt2'\n"
+ for part in creator.parts:
+ if part.mountpoint == "/":
+ grubefi_conf += "set root='hd0,gpt%d'\n" % part.realnum
grubefi_conf += "menuentry 'boot'{\n"
kernel = "/vmlinuz"
@@ -90,7 +92,7 @@ class BootimgEFIPlugin(SourcePlugin):
cfg.close()
cfg = open("%s/hdd/boot/EFI/BOOT/grub-mkimage.cfg" % cr_workdir, "w")
- mkimage_conf = "set root='hd0,gpt1'\n"
+ mkimage_conf = "set root='hd0,gpt%d'\n" % bootpart.realnum
mkimage_conf += "set prefix=($root)/EFI/BOOT\n"
cfg.write(mkimage_conf)
cfg.close()
@@ -178,7 +180,7 @@ class BootimgEFIPlugin(SourcePlugin):
try:
if source_params['loader'] == 'grub-efi':
- cls.do_configure_grubefi(creator, cr_workdir)
+ cls.do_configure_grubefi(creator, cr_workdir, part)
elif source_params['loader'] == 'systemd-boot':
cls.do_configure_systemdboot(hdddir, creator, cr_workdir, source_params)
else:
--
2.16.4
^ permalink raw reply [flat|nested] 24+ messages in thread* [PATCH 10/10] image: Add install_image_deps to cache_base_repo dependencies
2018-11-05 6:52 [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Jan Kiszka
` (8 preceding siblings ...)
2018-11-05 6:52 ` [PATCH 09/10] wic: bootimg-efi-isar: Make agnostic to partition order Jan Kiszka
@ 2018-11-05 6:52 ` Jan Kiszka
2018-11-06 9:59 ` [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Maxim Yu. Osipov
2018-11-07 13:11 ` Maxim Yu. Osipov
11 siblings, 0 replies; 24+ messages in thread
From: Jan Kiszka @ 2018-11-05 6:52 UTC (permalink / raw)
To: isar-users
From: Jan Kiszka <jan.kiszka@siemens.com>
Otherwise we miss to the additional packages needed for the imager and
cannot rebuild the image offline.
Fixes: eb2973fc7805 ("image: Add cache_base_repo task")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/classes/image.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index ad19f3d..d033cf5 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -143,7 +143,7 @@ do_cache_base_repo() {
fi
}
-addtask cache_base_repo after do_rootfs
+addtask cache_base_repo after do_rootfs do_install_imager_deps
# Imager are expected to run natively, thus will use the target buildchroot.
ISAR_CROSS_COMPILE = "0"
--
2.16.4
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups
2018-11-05 6:52 [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Jan Kiszka
` (9 preceding siblings ...)
2018-11-05 6:52 ` [PATCH 10/10] image: Add install_image_deps to cache_base_repo dependencies Jan Kiszka
@ 2018-11-06 9:59 ` Maxim Yu. Osipov
2018-11-06 10:49 ` Baurzhan Ismagulov
2018-11-07 13:11 ` Maxim Yu. Osipov
11 siblings, 1 reply; 24+ messages in thread
From: Maxim Yu. Osipov @ 2018-11-06 9:59 UTC (permalink / raw)
To: Jan Kiszka, isar-users
On 11/5/18 9:52 AM, Jan Kiszka wrote:
> This brings two of the boards we demonstrated at ELC-E into the
> mainline. Along that, several details are fixed or improved,
> specifically around the grub-efi installation.
We need to discuss which boards have to present in isar mainline.
Should we include in isar (like in yocto) only several widespread
reference boards (like Raspberry Pis, BeagleBone Black etc) and support
for other boards should be shipped separately?
Or these HiKey and DE0 Nano SoC are declared as reference boards?
My concern is that growing number of supported boards in mainline will
soon litter the isar tree.
Regards,
Maxim.
> Includes a fix already posted yesterday as it depends on it.
>
> Jan
>
> PS: Seems we currently have some gpg key error with the buster targets.
> Didn't look into details yet, just got this from CI.
>
> Jan Kiszka (10):
> meta: builchroot: Preserve environment when calling dpkg-buildpackage
> meta-isar: Remove remaining wheezy traces
> meta-isar: linux: Update mainline recipe to 4.19
> meta-isar: example-module: Only disable cross-compilation for Debian
> kernels
> meta-isar: Add Terasic DE0-Nano-SoC as demonstration board
> meta-isar: Add LeMaker HiKey board
> meta: linux-module: Fix arm64 cross-build
> wic: bootimg-efi-isar: Avoid append "None" to kernel command line
> wic: bootimg-efi-isar: Make agnostic to partition order
> image: Add install_image_deps to cache_base_repo dependencies
>
> Supported_Configurations.md | 6 ++--
> Tested_Status.md | 6 ++--
> doc/user_manual.md | 1 -
> meta-isar/conf/distro/debian-wheezy.conf | 11 ------
> meta-isar/conf/distro/debian-wheezy.list | 3 --
> meta-isar/conf/local.conf.sample | 3 +-
> meta-isar/conf/machine/de0-nano-soc.conf | 18 ++++++++++
> meta-isar/conf/machine/hikey.conf | 14 ++++++++
> .../conf/multiconfig/de0-nano-soc-stretch.conf | 7 ++++
> meta-isar/conf/multiconfig/hikey-stretch.conf | 7 ++++
> meta-isar/conf/multiconfig/qemuarm-wheezy.conf | 23 ------------
> meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb | 11 ++++++
> .../example-module/example-module.bb | 17 +++++----
> ...fpga-Rename-socfpga_cyclone5_de0_-sockit-.patch | 41 ++++++++++++++++++++++
> .../recipes-kernel/linux/linux-mainline_4.14.18.bb | 17 ---------
> .../recipes-kernel/linux/linux-mainline_4.19.0.bb | 22 ++++++++++++
> .../scripts/lib/wic/canned-wks/de0-nano-soc.wks | 10 ++++++
> meta-isar/scripts/lib/wic/canned-wks/hikey.wks | 10 ++++++
> .../lib/wic/plugins/source/bootimg-efi-isar.py | 14 ++++----
> meta/classes/image.bbclass | 2 +-
> meta/recipes-devtools/buildchroot/files/build.sh | 2 +-
> .../recipes-kernel/linux-module/files/debian/rules | 2 +-
> 22 files changed, 167 insertions(+), 80 deletions(-)
> delete mode 100644 meta-isar/conf/distro/debian-wheezy.conf
> delete mode 100644 meta-isar/conf/distro/debian-wheezy.list
> create mode 100644 meta-isar/conf/machine/de0-nano-soc.conf
> create mode 100644 meta-isar/conf/machine/hikey.conf
> create mode 100644 meta-isar/conf/multiconfig/de0-nano-soc-stretch.conf
> create mode 100644 meta-isar/conf/multiconfig/hikey-stretch.conf
> delete mode 100644 meta-isar/conf/multiconfig/qemuarm-wheezy.conf
> create mode 100644 meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb
> create mode 100644 meta-isar/recipes-kernel/linux/files/0001-ARM-dts-socfpga-Rename-socfpga_cyclone5_de0_-sockit-.patch
> delete mode 100644 meta-isar/recipes-kernel/linux/linux-mainline_4.14.18.bb
> create mode 100644 meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb
> create mode 100644 meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks
> create mode 100644 meta-isar/scripts/lib/wic/canned-wks/hikey.wks
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups
2018-11-06 9:59 ` [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Maxim Yu. Osipov
@ 2018-11-06 10:49 ` Baurzhan Ismagulov
2018-11-06 10:51 ` Jan Kiszka
0 siblings, 1 reply; 24+ messages in thread
From: Baurzhan Ismagulov @ 2018-11-06 10:49 UTC (permalink / raw)
To: isar-users
On Tue, Nov 06, 2018 at 12:59:33PM +0300, Maxim Yu. Osipov wrote:
> We need to discuss which boards have to present in isar mainline.
>
> Should we include in isar (like in yocto) only several widespread reference
> boards (like Raspberry Pis, BeagleBone Black etc) and support for other
> boards should be shipped separately?
>
> Or these HiKey and DE0 Nano SoC are declared as reference boards?
>
> My concern is that growing number of supported boards in mainline will soon
> litter the isar tree.
I suggest to include this as is and look at the broader meta restructuring
discussion of the last weeks after that.
With kind regards,
Baurzhan.
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups
2018-11-06 10:49 ` Baurzhan Ismagulov
@ 2018-11-06 10:51 ` Jan Kiszka
0 siblings, 0 replies; 24+ messages in thread
From: Jan Kiszka @ 2018-11-06 10:51 UTC (permalink / raw)
To: isar-users
On 06.11.18 11:49, Baurzhan Ismagulov wrote:
> On Tue, Nov 06, 2018 at 12:59:33PM +0300, Maxim Yu. Osipov wrote:
>> We need to discuss which boards have to present in isar mainline.
>>
>> Should we include in isar (like in yocto) only several widespread reference
>> boards (like Raspberry Pis, BeagleBone Black etc) and support for other
>> boards should be shipped separately?
>>
>> Or these HiKey and DE0 Nano SoC are declared as reference boards?
>>
>> My concern is that growing number of supported boards in mainline will soon
>> litter the isar tree.
>
> I suggest to include this as is and look at the broader meta restructuring
> discussion of the last weeks after that.
Right, these boards should not be considered "core". They first of all help
testing more features of the core (meta). We may still decide to migrate
meta-isar into a separate repo or create some meta-isar-boards layer when things
start to grow.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups
2018-11-05 6:52 [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Jan Kiszka
` (10 preceding siblings ...)
2018-11-06 9:59 ` [PATCH 00/10] HiKey and DE0 Nano SoC boards, further improvements and cleanups Maxim Yu. Osipov
@ 2018-11-07 13:11 ` Maxim Yu. Osipov
11 siblings, 0 replies; 24+ messages in thread
From: Maxim Yu. Osipov @ 2018-11-07 13:11 UTC (permalink / raw)
To: Jan Kiszka, isar-users
On 11/5/18 9:52 AM, Jan Kiszka wrote:
> This brings two of the boards we demonstrated at ELC-E into the
> mainline. Along that, several details are fixed or improved,
> specifically around the grub-efi installation.
>
> Includes a fix already posted yesterday as it depends on it.
Series is applied to the 'next'.
Note:
The v2 of "01/10 meta: builchroot: Preserve environment when calling
dpkg-buildpackage" was applied.
Thanks,
Maxim.
> Jan
>
> PS: Seems we currently have some gpg key error with the buster targets.
> Didn't look into details yet, just got this from CI.
>
> Jan Kiszka (10):
> meta: builchroot: Preserve environment when calling dpkg-buildpackage
> meta-isar: Remove remaining wheezy traces
> meta-isar: linux: Update mainline recipe to 4.19
> meta-isar: example-module: Only disable cross-compilation for Debian
> kernels
> meta-isar: Add Terasic DE0-Nano-SoC as demonstration board
> meta-isar: Add LeMaker HiKey board
> meta: linux-module: Fix arm64 cross-build
> wic: bootimg-efi-isar: Avoid append "None" to kernel command line
> wic: bootimg-efi-isar: Make agnostic to partition order
> image: Add install_image_deps to cache_base_repo dependencies
>
> Supported_Configurations.md | 6 ++--
> Tested_Status.md | 6 ++--
> doc/user_manual.md | 1 -
> meta-isar/conf/distro/debian-wheezy.conf | 11 ------
> meta-isar/conf/distro/debian-wheezy.list | 3 --
> meta-isar/conf/local.conf.sample | 3 +-
> meta-isar/conf/machine/de0-nano-soc.conf | 18 ++++++++++
> meta-isar/conf/machine/hikey.conf | 14 ++++++++
> .../conf/multiconfig/de0-nano-soc-stretch.conf | 7 ++++
> meta-isar/conf/multiconfig/hikey-stretch.conf | 7 ++++
> meta-isar/conf/multiconfig/qemuarm-wheezy.conf | 23 ------------
> meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb | 11 ++++++
> .../example-module/example-module.bb | 17 +++++----
> ...fpga-Rename-socfpga_cyclone5_de0_-sockit-.patch | 41 ++++++++++++++++++++++
> .../recipes-kernel/linux/linux-mainline_4.14.18.bb | 17 ---------
> .../recipes-kernel/linux/linux-mainline_4.19.0.bb | 22 ++++++++++++
> .../scripts/lib/wic/canned-wks/de0-nano-soc.wks | 10 ++++++
> meta-isar/scripts/lib/wic/canned-wks/hikey.wks | 10 ++++++
> .../lib/wic/plugins/source/bootimg-efi-isar.py | 14 ++++----
> meta/classes/image.bbclass | 2 +-
> meta/recipes-devtools/buildchroot/files/build.sh | 2 +-
> .../recipes-kernel/linux-module/files/debian/rules | 2 +-
> 22 files changed, 167 insertions(+), 80 deletions(-)
> delete mode 100644 meta-isar/conf/distro/debian-wheezy.conf
> delete mode 100644 meta-isar/conf/distro/debian-wheezy.list
> create mode 100644 meta-isar/conf/machine/de0-nano-soc.conf
> create mode 100644 meta-isar/conf/machine/hikey.conf
> create mode 100644 meta-isar/conf/multiconfig/de0-nano-soc-stretch.conf
> create mode 100644 meta-isar/conf/multiconfig/hikey-stretch.conf
> delete mode 100644 meta-isar/conf/multiconfig/qemuarm-wheezy.conf
> create mode 100644 meta-isar/recipes-bsp/u-boot/u-boot_2018.09.bb
> create mode 100644 meta-isar/recipes-kernel/linux/files/0001-ARM-dts-socfpga-Rename-socfpga_cyclone5_de0_-sockit-.patch
> delete mode 100644 meta-isar/recipes-kernel/linux/linux-mainline_4.14.18.bb
> create mode 100644 meta-isar/recipes-kernel/linux/linux-mainline_4.19.0.bb
> create mode 100644 meta-isar/scripts/lib/wic/canned-wks/de0-nano-soc.wks
> create mode 100644 meta-isar/scripts/lib/wic/canned-wks/hikey.wks
>
--
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov
^ permalink raw reply [flat|nested] 24+ messages in thread