* [cip-dev] [isar-cip-core][PATCH 0/3] ci fixes
@ 2020-08-31 9:21 Jan Kiszka
2020-08-31 9:21 ` [cip-dev] [isar-cip-core][PATCH 1/3] hihope-rzg2m: Align kas filename with machine name Jan Kiszka
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Jan Kiszka @ 2020-08-31 9:21 UTC (permalink / raw)
To: cip-dev; +Cc: Nobuhiro Iwamatsu
[-- Attachment #1: Type: text/plain, Size: 1027 bytes --]
This fixes ci, keeping the parallel build.
Obsoletes "ci: Fix hihope-rzg2m deployment".
Jan
Jan Kiszka (3):
hihope-rzg2m: Align kas filename with machine name
ci: Do not try to deploy the security image
linux-cip Switch to gitlab source and update to 4.19.140-cip33
.gitlab-ci.yml | 8 +++++---
kas/board/{rzg2m.yml => hihope-rzg2m.yml} | 0
recipes-kernel/linux/linux-cip-common.inc | 4 +++-
recipes-kernel/linux/linux-cip-rt-common.inc | 2 --
recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb | 2 +-
recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb | 2 +-
...-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} | 2 +-
recipes-kernel/linux/linux-cip_4.4.230-cip47.bb | 2 +-
8 files changed, 12 insertions(+), 10 deletions(-)
rename kas/board/{rzg2m.yml => hihope-rzg2m.yml} (100%)
rename recipes-kernel/linux/{linux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} (67%)
--
2.26.2
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5336): https://lists.cip-project.org/g/cip-dev/message/5336
Mute This Topic: https://lists.cip-project.org/mt/76530562/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 8+ messages in thread
* [cip-dev] [isar-cip-core][PATCH 1/3] hihope-rzg2m: Align kas filename with machine name
2020-08-31 9:21 [cip-dev] [isar-cip-core][PATCH 0/3] ci fixes Jan Kiszka
@ 2020-08-31 9:21 ` Jan Kiszka
2020-08-31 22:49 ` Nobuhiro Iwamatsu
2020-08-31 9:21 ` [cip-dev] [isar-cip-core][PATCH 2/3] ci: Do not try to deploy the security image Jan Kiszka
2020-08-31 9:21 ` [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33 Jan Kiszka
2 siblings, 1 reply; 8+ messages in thread
From: Jan Kiszka @ 2020-08-31 9:21 UTC (permalink / raw)
To: cip-dev; +Cc: Nobuhiro Iwamatsu
[-- Attachment #1: Type: text/plain, Size: 1096 bytes --]
From: Jan Kiszka <jan.kiszka@siemens.com>
This allows for fixing the extends-based CI build.
Fixes: 3510f8a66f80 ("ci: Rewrite using extends")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.gitlab-ci.yml | 4 ++--
kas/board/{rzg2m.yml => hihope-rzg2m.yml} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
rename kas/board/{rzg2m.yml => hihope-rzg2m.yml} (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af900de..cd25437 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,7 +57,7 @@ build:hihope-rzg2m-base:
extends:
- .build_base
variables:
- target: rzg2m
+ target: hihope-rzg2m
dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb
build:qemu-amd64-base:
@@ -97,6 +97,6 @@ build:hihope-rzg2m-test:
extends:
- .build_base
variables:
- target: rzg2m
+ target: hihope-rzg2m
extention: test
dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb
diff --git a/kas/board/rzg2m.yml b/kas/board/hihope-rzg2m.yml
similarity index 100%
rename from kas/board/rzg2m.yml
rename to kas/board/hihope-rzg2m.yml
--
2.26.2
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5339): https://lists.cip-project.org/g/cip-dev/message/5339
Mute This Topic: https://lists.cip-project.org/mt/76530565/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [cip-dev] [isar-cip-core][PATCH 2/3] ci: Do not try to deploy the security image
2020-08-31 9:21 [cip-dev] [isar-cip-core][PATCH 0/3] ci fixes Jan Kiszka
2020-08-31 9:21 ` [cip-dev] [isar-cip-core][PATCH 1/3] hihope-rzg2m: Align kas filename with machine name Jan Kiszka
@ 2020-08-31 9:21 ` Jan Kiszka
2020-08-31 22:51 ` Nobuhiro Iwamatsu
2020-08-31 9:21 ` [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33 Jan Kiszka
2 siblings, 1 reply; 8+ messages in thread
From: Jan Kiszka @ 2020-08-31 9:21 UTC (permalink / raw)
To: cip-dev; +Cc: Nobuhiro Iwamatsu
[-- Attachment #1: Type: text/plain, Size: 1194 bytes --]
From: Jan Kiszka <jan.kiszka@siemens.com>
This is not used, and the image is not available, so it breaks the
build.
Fixes: 3510f8a66f80 ("ci: Rewrite using extends")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.gitlab-ci.yml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd25437..0b0a771 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,7 @@ variables:
use_rt: enable
targz: enable
dtb: none
+ deploy: enable
stages:
- build
@@ -30,7 +31,7 @@ default:
- if [ "${extention}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extention}.yml"; fi;
- if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi;
- kas build ${base_yaml}
- - scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}
+ - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi
# base image
build:simatic-ipc227e-base:
@@ -68,6 +69,7 @@ build:qemu-amd64-base:
extention: security
use_rt: disable
targz: disable
+ deploy: disable
# test
build:simatic-ipc227e-test:
--
2.26.2
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5337): https://lists.cip-project.org/g/cip-dev/message/5337
Mute This Topic: https://lists.cip-project.org/mt/76530563/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33
2020-08-31 9:21 [cip-dev] [isar-cip-core][PATCH 0/3] ci fixes Jan Kiszka
2020-08-31 9:21 ` [cip-dev] [isar-cip-core][PATCH 1/3] hihope-rzg2m: Align kas filename with machine name Jan Kiszka
2020-08-31 9:21 ` [cip-dev] [isar-cip-core][PATCH 2/3] ci: Do not try to deploy the security image Jan Kiszka
@ 2020-08-31 9:21 ` Jan Kiszka
2020-08-31 23:03 ` Nobuhiro Iwamatsu
2 siblings, 1 reply; 8+ messages in thread
From: Jan Kiszka @ 2020-08-31 9:21 UTC (permalink / raw)
To: cip-dev; +Cc: Nobuhiro Iwamatsu
[-- Attachment #1: Type: text/plain, Size: 4288 bytes --]
From: Jan Kiszka <jan.kiszka@siemens.com>
The switch is needed as kernel.org snapshot tend to fail too often.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
recipes-kernel/linux/linux-cip-common.inc | 4 +++-
recipes-kernel/linux/linux-cip-rt-common.inc | 2 --
recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb | 2 +-
recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb | 2 +-
...inux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} | 2 +-
recipes-kernel/linux/linux-cip_4.4.230-cip47.bb | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
rename recipes-kernel/linux/{linux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} (67%)
diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc
index 0c76835..7e09090 100644
--- a/recipes-kernel/linux/linux-cip-common.inc
+++ b/recipes-kernel/linux/linux-cip-common.inc
@@ -20,10 +20,12 @@ def conditional(variable, checkvalue, truevalue, falsevalue, d):
require recipes-kernel/linux/linux-custom.inc
SRC_URI += " \
- https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \
+ https://gitlab.com/cip-project/cip-kernel/linux-cip/-/archive/v${PV}/linux-cip-v${PV}.tar.gz \
"
SRC_URI_append = " ${@conditional("USE_CIP_KERNEL_CONFIG", "1", \
"git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;destsuffix=cip-kernel-config;name=cip-kernel-config", \
"file://${KERNEL_DEFCONFIG}",d)}"
SRCREV_cip-kernel-config ?= "ca24d965adf77730caf1cd32bdfcffd69e369502"
+
+S = "${WORKDIR}/linux-cip-v${PV}"
diff --git a/recipes-kernel/linux/linux-cip-rt-common.inc b/recipes-kernel/linux/linux-cip-rt-common.inc
index d182358..dffb77b 100644
--- a/recipes-kernel/linux/linux-cip-rt-common.inc
+++ b/recipes-kernel/linux/linux-cip-rt-common.inc
@@ -13,8 +13,6 @@ require linux-cip-common.inc
SRC_URI += "file://preempt-rt.cfg"
-S = "${WORKDIR}/linux-cip-${PV}"
-
do_prepare_build_prepend() {
cat ${WORKDIR}/preempt-rt.cfg >> ${WORKDIR}/${KERNEL_DEFCONFIG}
}
diff --git a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb b/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
index 7414f23..820c1ab 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
@@ -11,4 +11,4 @@
require linux-cip-rt-common.inc
-SRC_URI[sha256sum] = "3c3e49c4ad0dae3de409d51a5b8f6df163f7cc54350764d7c019741947a383db"
+SRC_URI[sha256sum] = "b827f45b8f97b71b3917c84b43fd6593030d01ea7261d3be6c15a76250308743"
diff --git a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb b/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
index 8881071..e13fc14 100644
--- a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
+++ b/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
@@ -11,4 +11,4 @@
require linux-cip-rt-common.inc
-SRC_URI[sha256sum] = "d1ff83665455830129f9a2197000abbe7440d30e29b37504c82324c777f0ebf5"
+SRC_URI[sha256sum] = "e7a0c7b8e4d91f52cbc2ee17a546d1afbc5fcfed95ba44dd113e534fab3a157e"
diff --git a/recipes-kernel/linux/linux-cip_4.19.138-cip32.bb b/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
similarity index 67%
rename from recipes-kernel/linux/linux-cip_4.19.138-cip32.bb
rename to recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
index 59afd8e..9e958c0 100644
--- a/recipes-kernel/linux/linux-cip_4.19.138-cip32.bb
+++ b/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
@@ -11,4 +11,4 @@
require linux-cip-common.inc
-SRC_URI[sha256sum] = "6b4dce2ff494b9a4cab212af855b78048756dc6ea3f136e25552b0e832e93eb6"
+SRC_URI[sha256sum] = "f6a9aec6848a5897c90bafda5a9eba010c03d5d0cf99508adfb1cf7a2f4af9e5"
diff --git a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb b/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
index 2303d49..af49441 100644
--- a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
+++ b/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
@@ -11,4 +11,4 @@
require linux-cip-common.inc
-SRC_URI[sha256sum] = "8e91374801da67bc240b08cd0d61a1b528c23c870cf73ba33cc8f02198f6c531"
+SRC_URI[sha256sum] = "3ff33e497064ba8e7d9b5e1ee575c6a936154fa8216774782cbc0db2e4b71cdf"
--
2.26.2
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5338): https://lists.cip-project.org/g/cip-dev/message/5338
Mute This Topic: https://lists.cip-project.org/mt/76530564/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [cip-dev] [isar-cip-core][PATCH 1/3] hihope-rzg2m: Align kas filename with machine name
2020-08-31 9:21 ` [cip-dev] [isar-cip-core][PATCH 1/3] hihope-rzg2m: Align kas filename with machine name Jan Kiszka
@ 2020-08-31 22:49 ` Nobuhiro Iwamatsu
0 siblings, 0 replies; 8+ messages in thread
From: Nobuhiro Iwamatsu @ 2020-08-31 22:49 UTC (permalink / raw)
To: jan.kiszka, cip-dev
[-- Attachment #1: Type: text/plain, Size: 1705 bytes --]
Hi,
Thanks for fix this issue.
> -----Original Message-----
> From: Jan Kiszka [mailto:jan.kiszka@siemens.com]
> Sent: Monday, August 31, 2020 6:21 PM
> To: cip-dev@lists.cip-project.org
> Cc: iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT) <nobuhiro1.iwamatsu@toshiba.co.jp>
> Subject: [isar-cip-core][PATCH 1/3] hihope-rzg2m: Align kas filename with machine name
>
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> This allows for fixing the extends-based CI build.
>
> Fixes: 3510f8a66f80 ("ci: Rewrite using extends")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Best regards,
Nobuhiro
> ---
> .gitlab-ci.yml | 4 ++--
> kas/board/{rzg2m.yml => hihope-rzg2m.yml} | 0
> 2 files changed, 2 insertions(+), 2 deletions(-)
> rename kas/board/{rzg2m.yml => hihope-rzg2m.yml} (100%)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index af900de..cd25437 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -57,7 +57,7 @@ build:hihope-rzg2m-base:
> extends:
> - .build_base
> variables:
> - target: rzg2m
> + target: hihope-rzg2m
> dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb
>
> build:qemu-amd64-base:
> @@ -97,6 +97,6 @@ build:hihope-rzg2m-test:
> extends:
> - .build_base
> variables:
> - target: rzg2m
> + target: hihope-rzg2m
> extention: test
> dtb: renesas/r8a774a1-hihope-rzg2m-ex.dtb
> diff --git a/kas/board/rzg2m.yml b/kas/board/hihope-rzg2m.yml
> similarity index 100%
> rename from kas/board/rzg2m.yml
> rename to kas/board/hihope-rzg2m.yml
> --
> 2.26.2
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5342): https://lists.cip-project.org/g/cip-dev/message/5342
Mute This Topic: https://lists.cip-project.org/mt/76530565/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [cip-dev] [isar-cip-core][PATCH 2/3] ci: Do not try to deploy the security image
2020-08-31 9:21 ` [cip-dev] [isar-cip-core][PATCH 2/3] ci: Do not try to deploy the security image Jan Kiszka
@ 2020-08-31 22:51 ` Nobuhiro Iwamatsu
0 siblings, 0 replies; 8+ messages in thread
From: Nobuhiro Iwamatsu @ 2020-08-31 22:51 UTC (permalink / raw)
To: jan.kiszka, cip-dev
[-- Attachment #1: Type: text/plain, Size: 1824 bytes --]
Hi,
> -----Original Message-----
> From: Jan Kiszka [mailto:jan.kiszka@siemens.com]
> Sent: Monday, August 31, 2020 6:21 PM
> To: cip-dev@lists.cip-project.org
> Cc: iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT) <nobuhiro1.iwamatsu@toshiba.co.jp>
> Subject: [isar-cip-core][PATCH 2/3] ci: Do not try to deploy the security image
>
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> This is not used, and the image is not available, so it breaks the
> build.
>
> Fixes: 3510f8a66f80 ("ci: Rewrite using extends")
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
I checked this patch. The problem has been fixed.
Reviewed-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>
Best regards,
Nobuhiro
> ---
> .gitlab-ci.yml | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index cd25437..0b0a771 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -7,6 +7,7 @@ variables:
> use_rt: enable
> targz: enable
> dtb: none
> + deploy: enable
>
> stages:
> - build
> @@ -30,7 +31,7 @@ default:
> - if [ "${extention}" != "base" ]; then base_yaml="${base_yaml}:kas/opt/${extention}.yml"; fi;
> - if [ "${targz}" = "enable" ]; then base_yaml="${base_yaml}:kas/opt/targz-img.yml"; fi;
> - kas build ${base_yaml}
> - - scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}
> + - if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extention} ${dtb}; fi
>
> # base image
> build:simatic-ipc227e-base:
> @@ -68,6 +69,7 @@ build:qemu-amd64-base:
> extention: security
> use_rt: disable
> targz: disable
> + deploy: disable
>
> # test
> build:simatic-ipc227e-test:
> --
> 2.26.2
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5343): https://lists.cip-project.org/g/cip-dev/message/5343
Mute This Topic: https://lists.cip-project.org/mt/76530563/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33
2020-08-31 9:21 ` [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33 Jan Kiszka
@ 2020-08-31 23:03 ` Nobuhiro Iwamatsu
2020-09-01 11:39 ` Jan Kiszka
0 siblings, 1 reply; 8+ messages in thread
From: Nobuhiro Iwamatsu @ 2020-08-31 23:03 UTC (permalink / raw)
To: cip-dev
[-- Attachment #1: Type: text/plain, Size: 5174 bytes --]
Hi,
> -----Original Message-----
> From: cip-dev@lists.cip-project.org [mailto:cip-dev@lists.cip-project.org] On Behalf Of Jan Kiszka
> Sent: Monday, August 31, 2020 6:21 PM
> To: cip-dev@lists.cip-project.org
> Cc: iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT) <nobuhiro1.iwamatsu@toshiba.co.jp>
> Subject: [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33
>
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> The switch is needed as kernel.org snapshot tend to fail too often.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> recipes-kernel/linux/linux-cip-common.inc | 4 +++-
> recipes-kernel/linux/linux-cip-rt-common.inc | 2 --
> recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb | 2 +-
> recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb | 2 +-
> ...inux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} | 2 +-
> recipes-kernel/linux/linux-cip_4.4.230-cip47.bb | 2 +-
> 6 files changed, 7 insertions(+), 7 deletions(-)
> rename recipes-kernel/linux/{linux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} (67%)
>
> diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc
> index 0c76835..7e09090 100644
> --- a/recipes-kernel/linux/linux-cip-common.inc
> +++ b/recipes-kernel/linux/linux-cip-common.inc
> @@ -20,10 +20,12 @@ def conditional(variable, checkvalue, truevalue, falsevalue, d):
> require recipes-kernel/linux/linux-custom.inc
>
> SRC_URI += " \
> - https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \
> + https://gitlab.com/cip-project/cip-kernel/linux-cip/-/archive/v${PV}/linux-cip-v${PV}.tar.gz \
I thought it would be good to use a URL as a variable and overwrite it.
Is it difficult because the hash of the file changes depending on the mirror?
> "
>
> SRC_URI_append = " ${@conditional("USE_CIP_KERNEL_CONFIG", "1", \
>
> "git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;destsuffix=cip-kernel-config;name=c
> ip-kernel-config", \
> "file://${KERNEL_DEFCONFIG}",d)}"
> SRCREV_cip-kernel-config ?= "ca24d965adf77730caf1cd32bdfcffd69e369502"
> +
> +S = "${WORKDIR}/linux-cip-v${PV}"
> diff --git a/recipes-kernel/linux/linux-cip-rt-common.inc b/recipes-kernel/linux/linux-cip-rt-common.inc
> index d182358..dffb77b 100644
> --- a/recipes-kernel/linux/linux-cip-rt-common.inc
> +++ b/recipes-kernel/linux/linux-cip-rt-common.inc
> @@ -13,8 +13,6 @@ require linux-cip-common.inc
>
> SRC_URI += "file://preempt-rt.cfg"
>
> -S = "${WORKDIR}/linux-cip-${PV}"
> -
> do_prepare_build_prepend() {
> cat ${WORKDIR}/preempt-rt.cfg >> ${WORKDIR}/${KERNEL_DEFCONFIG}
> }
> diff --git a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
> b/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
> index 7414f23..820c1ab 100644
> --- a/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
> +++ b/recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb
> @@ -11,4 +11,4 @@
>
> require linux-cip-rt-common.inc
>
> -SRC_URI[sha256sum] = "3c3e49c4ad0dae3de409d51a5b8f6df163f7cc54350764d7c019741947a383db"
> +SRC_URI[sha256sum] = "b827f45b8f97b71b3917c84b43fd6593030d01ea7261d3be6c15a76250308743"
> diff --git a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
> b/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
> index 8881071..e13fc14 100644
> --- a/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
> +++ b/recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb
> @@ -11,4 +11,4 @@
>
> require linux-cip-rt-common.inc
>
> -SRC_URI[sha256sum] = "d1ff83665455830129f9a2197000abbe7440d30e29b37504c82324c777f0ebf5"
> +SRC_URI[sha256sum] = "e7a0c7b8e4d91f52cbc2ee17a546d1afbc5fcfed95ba44dd113e534fab3a157e"
> diff --git a/recipes-kernel/linux/linux-cip_4.19.138-cip32.bb b/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
> similarity index 67%
> rename from recipes-kernel/linux/linux-cip_4.19.138-cip32.bb
> rename to recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
> index 59afd8e..9e958c0 100644
> --- a/recipes-kernel/linux/linux-cip_4.19.138-cip32.bb
> +++ b/recipes-kernel/linux/linux-cip_4.19.140-cip33.bb
> @@ -11,4 +11,4 @@
>
> require linux-cip-common.inc
>
> -SRC_URI[sha256sum] = "6b4dce2ff494b9a4cab212af855b78048756dc6ea3f136e25552b0e832e93eb6"
> +SRC_URI[sha256sum] = "f6a9aec6848a5897c90bafda5a9eba010c03d5d0cf99508adfb1cf7a2f4af9e5"
> diff --git a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb b/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
> index 2303d49..af49441 100644
> --- a/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
> +++ b/recipes-kernel/linux/linux-cip_4.4.230-cip47.bb
> @@ -11,4 +11,4 @@
>
> require linux-cip-common.inc
>
> -SRC_URI[sha256sum] = "8e91374801da67bc240b08cd0d61a1b528c23c870cf73ba33cc8f02198f6c531"
> +SRC_URI[sha256sum] = "3ff33e497064ba8e7d9b5e1ee575c6a936154fa8216774782cbc0db2e4b71cdf"
> --
> 2.26.2
Best regards,
Nobuhiro
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5344): https://lists.cip-project.org/g/cip-dev/message/5344
Mute This Topic: https://lists.cip-project.org/mt/76530564/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33
2020-08-31 23:03 ` Nobuhiro Iwamatsu
@ 2020-09-01 11:39 ` Jan Kiszka
0 siblings, 0 replies; 8+ messages in thread
From: Jan Kiszka @ 2020-09-01 11:39 UTC (permalink / raw)
To: cip-dev, Nobuhiro Iwamatsu
[-- Attachment #1: Type: text/plain, Size: 2394 bytes --]
On 01.09.20 01:03, Nobuhiro Iwamatsu wrote:
> Hi,
>
>> -----Original Message-----
>> From: cip-dev@lists.cip-project.org [mailto:cip-dev@lists.cip-project.org] On Behalf Of Jan Kiszka
>> Sent: Monday, August 31, 2020 6:21 PM
>> To: cip-dev@lists.cip-project.org
>> Cc: iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT) <nobuhiro1.iwamatsu@toshiba.co.jp>
>> Subject: [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33
>>
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> The switch is needed as kernel.org snapshot tend to fail too often.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>> recipes-kernel/linux/linux-cip-common.inc | 4 +++-
>> recipes-kernel/linux/linux-cip-rt-common.inc | 2 --
>> recipes-kernel/linux/linux-cip-rt_4.19.135-cip31-rt13.bb | 2 +-
>> recipes-kernel/linux/linux-cip-rt_4.4.231-cip47-rt30.bb | 2 +-
>> ...inux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} | 2 +-
>> recipes-kernel/linux/linux-cip_4.4.230-cip47.bb | 2 +-
>> 6 files changed, 7 insertions(+), 7 deletions(-)
>> rename recipes-kernel/linux/{linux-cip_4.19.138-cip32.bb => linux-cip_4.19.140-cip33.bb} (67%)
>>
>> diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc
>> index 0c76835..7e09090 100644
>> --- a/recipes-kernel/linux/linux-cip-common.inc
>> +++ b/recipes-kernel/linux/linux-cip-common.inc
>> @@ -20,10 +20,12 @@ def conditional(variable, checkvalue, truevalue, falsevalue, d):
>> require recipes-kernel/linux/linux-custom.inc
>>
>> SRC_URI += " \
>> - https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \
>> + https://gitlab.com/cip-project/cip-kernel/linux-cip/-/archive/v${PV}/linux-cip-v${PV}.tar.gz \
>
> I thought it would be good to use a URL as a variable and overwrite it.
> Is it difficult because the hash of the file changes depending on the mirror?
Yes, unfortunately. gitlab packages differently (under a different
directory) than korg. That prevents simply providing one as a fallback
mirror of the other, at least when pulling tarballs rather than full git
trees.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
[-- Attachment #2: Type: text/plain, Size: 419 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#5348): https://lists.cip-project.org/g/cip-dev/message/5348
Mute This Topic: https://lists.cip-project.org/mt/76530564/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-09-01 11:39 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-31 9:21 [cip-dev] [isar-cip-core][PATCH 0/3] ci fixes Jan Kiszka
2020-08-31 9:21 ` [cip-dev] [isar-cip-core][PATCH 1/3] hihope-rzg2m: Align kas filename with machine name Jan Kiszka
2020-08-31 22:49 ` Nobuhiro Iwamatsu
2020-08-31 9:21 ` [cip-dev] [isar-cip-core][PATCH 2/3] ci: Do not try to deploy the security image Jan Kiszka
2020-08-31 22:51 ` Nobuhiro Iwamatsu
2020-08-31 9:21 ` [cip-dev] [isar-cip-core][PATCH 3/3] linux-cip Switch to gitlab source and update to 4.19.140-cip33 Jan Kiszka
2020-08-31 23:03 ` Nobuhiro Iwamatsu
2020-09-01 11:39 ` Jan Kiszka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).