* [isar-cip-core][PATCH v3 1/6] Add cip-core-image-kernelci
2022-01-27 17:12 [isar-cip-core][PATCH v3 0/6] Add cip-core-image-kernelci building and uploading system Jan Kiszka
@ 2022-01-27 17:12 ` Jan Kiszka
2022-01-27 17:12 ` [isar-cip-core][PATCH v3 2/6] Add dmesg filter needed for lava test result Jan Kiszka
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Jan Kiszka @ 2022-01-27 17:12 UTC (permalink / raw)
To: cip-dev; +Cc: Alice Ferrazzi
From: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
This image is currently used by KernelCI production for testing purpose.
The purpose of this image is that KernelCI need to be able to autologin
without password and to detect the login shell using special characters.
Currently added are the default settings used by KernelCI images.
Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
kas/opt/kernelci.yml | 16 +++++++++
.../images/cip-core-image-kernelci.bb | 16 +++++++++
.../files/99-silent-printk.conf | 1 +
.../kernelci-customizations/files/ethernet | 23 +++++++++++++
.../kernelci-customizations/files/postinst | 34 +++++++++++++++++++
.../kernelci-customizations.bb | 34 +++++++++++++++++++
6 files changed, 124 insertions(+)
create mode 100644 kas/opt/kernelci.yml
create mode 100644 recipes-core/images/cip-core-image-kernelci.bb
create mode 100644 recipes-core/kernelci-customizations/files/99-silent-printk.conf
create mode 100644 recipes-core/kernelci-customizations/files/ethernet
create mode 100644 recipes-core/kernelci-customizations/files/postinst
create mode 100644 recipes-core/kernelci-customizations/kernelci-customizations.bb
diff --git a/kas/opt/kernelci.yml b/kas/opt/kernelci.yml
new file mode 100644
index 0000000..9c67864
--- /dev/null
+++ b/kas/opt/kernelci.yml
@@ -0,0 +1,16 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Toshiba Corporation, 2020
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+# Venkata Pyla <venkata.pyla@toshiba-tsip.com>
+# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
+#
+# SPDX-License-Identifier: MIT
+#
+header:
+ version: 10
+
+target: cip-core-image-kernelci
diff --git a/recipes-core/images/cip-core-image-kernelci.bb b/recipes-core/images/cip-core-image-kernelci.bb
new file mode 100644
index 0000000..479c14c
--- /dev/null
+++ b/recipes-core/images/cip-core-image-kernelci.bb
@@ -0,0 +1,16 @@
+#
+# A reference image for KernelCI
+#
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+inherit image
+
+DESCRIPTION = "CIP Core image for KernelCI"
+
+IMAGE_INSTALL += "kernelci-customizations"
diff --git a/recipes-core/kernelci-customizations/files/99-silent-printk.conf b/recipes-core/kernelci-customizations/files/99-silent-printk.conf
new file mode 100644
index 0000000..ad24d3a
--- /dev/null
+++ b/recipes-core/kernelci-customizations/files/99-silent-printk.conf
@@ -0,0 +1 @@
+kernel.printk = 3 4 1 3
diff --git a/recipes-core/kernelci-customizations/files/ethernet b/recipes-core/kernelci-customizations/files/ethernet
new file mode 100644
index 0000000..fa47d1a
--- /dev/null
+++ b/recipes-core/kernelci-customizations/files/ethernet
@@ -0,0 +1,23 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+#
+# Authors:
+# Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+allow-hotplug eth0
+allow-hotplug enp0s2
+allow-hotplug enp2s0
+
+# used on BBB
+iface eth0 inet dhcp
+
+# used on qemu-amd64
+iface enp0s2 inet dhcp
+
+# used on simatic-ipc227e
+iface enp2s0 inet dhcp
diff --git a/recipes-core/kernelci-customizations/files/postinst b/recipes-core/kernelci-customizations/files/postinst
new file mode 100644
index 0000000..7ae30e8
--- /dev/null
+++ b/recipes-core/kernelci-customizations/files/postinst
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+# Jan Kiszka <jan.kiszka@siemens.com>
+# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+echo "CIP Core Demo & Test Image" > /etc/issue
+
+# permit root login without password
+echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
+echo "PermitEmptyPasswords yes" >> /etc/ssh/sshd_config
+passwd root -d
+
+# serial getty service for autologin
+mkdir -p /etc/systemd/system/serial-getty@.service.d/
+echo "[Service]" > /etc/systemd/system/serial-getty@.service.d/override.conf
+echo "ExecStart=" >> /etc/systemd/system/serial-getty@.service.d/override.conf
+echo "ExecStart=-/sbin/agetty --autologin root --keep-baud 115200,38400,9600 %I $TERM" >> /etc/systemd/system/serial-getty@.service.d/override.conf
+
+# set the profile for KernelCI
+echo "PS1='\$(pwd) # '" > /root/.profile
+echo "cd /" >> /root/.profile
+
+HOSTNAME=demo
+echo "$HOSTNAME" > /etc/hostname
+echo "127.0.0.1 $HOSTNAME" >> /etc/hosts
diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb
new file mode 100644
index 0000000..dca0891
--- /dev/null
+++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb
@@ -0,0 +1,34 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2019
+# Copyright (c) Cybertrust Japan Co., Ltd., 2021
+#
+# Authors:
+# Jan Kiszka <jan.kiszka@siemens.com>
+# Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+inherit dpkg-raw
+
+DESCRIPTION = "CIP Core image demo & customizations"
+
+SRC_URI = " \
+ file://postinst \
+ file://ethernet \
+ file://99-silent-printk.conf"
+
+DEPENDS += "sshd-regen-keys"
+
+DEBIAN_DEPENDS = " \
+ ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys"
+
+do_install() {
+ install -v -d ${D}/etc/network/interfaces.d
+ install -v -m 644 ${WORKDIR}/ethernet ${D}/etc/network/interfaces.d/
+
+ install -v -d ${D}/etc/sysctl.d
+ install -v -m 644 ${WORKDIR}/99-silent-printk.conf ${D}/etc/sysctl.d/
+}
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [isar-cip-core][PATCH v3 2/6] Add dmesg filter needed for lava test result
2022-01-27 17:12 [isar-cip-core][PATCH v3 0/6] Add cip-core-image-kernelci building and uploading system Jan Kiszka
2022-01-27 17:12 ` [isar-cip-core][PATCH v3 1/6] Add cip-core-image-kernelci Jan Kiszka
@ 2022-01-27 17:12 ` Jan Kiszka
2022-01-27 17:12 ` [isar-cip-core][PATCH v3 3/6] Add script deploy-kernelci.py for upload the cip-core-image-kernelci Jan Kiszka
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Jan Kiszka @ 2022-01-27 17:12 UTC (permalink / raw)
To: cip-dev; +Cc: Alice Ferrazzi
From: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
KernelCI is using a dmesg filter script for checking dmesg
logs result with lava.
Adding the script to the cip-core-image-kernelci.
Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
[Jan: restore actual installation]
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.../kernelci-customizations/files/dmesg.sh | 23 +++++++++++++++++++
.../kernelci-customizations.bb | 4 ++++
2 files changed, 27 insertions(+)
create mode 100644 recipes-core/kernelci-customizations/files/dmesg.sh
diff --git a/recipes-core/kernelci-customizations/files/dmesg.sh b/recipes-core/kernelci-customizations/files/dmesg.sh
new file mode 100644
index 0000000..3b096e1
--- /dev/null
+++ b/recipes-core/kernelci-customizations/files/dmesg.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+if [ "$KERNELCI_LAVA" = "y" ]; then
+ alias test-result='lava-test-case'
+else
+ alias test-result='echo'
+fi
+
+for level in crit alert emerg; do
+ dmesg --level=$level --notime -x -k > dmesg.$level
+ test -s dmesg.$level && res=fail || res=pass
+ count=$(cat dmesg.$level | wc -l)
+ cat dmesg.$level
+ test-result \
+ $level \
+ --result $res \
+ --measurement $count \
+ --units lines
+done
+
+exit 0
diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb
index dca0891..df4257c 100644
--- a/recipes-core/kernelci-customizations/kernelci-customizations.bb
+++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb
@@ -18,6 +18,7 @@ DESCRIPTION = "CIP Core image demo & customizations"
SRC_URI = " \
file://postinst \
file://ethernet \
+ file://dmesg.sh \
file://99-silent-printk.conf"
DEPENDS += "sshd-regen-keys"
@@ -31,4 +32,7 @@ do_install() {
install -v -d ${D}/etc/sysctl.d
install -v -m 644 ${WORKDIR}/99-silent-printk.conf ${D}/etc/sysctl.d/
+
+ install -v -d ${D}/opt/kernelci
+ install -v -m 744 ${WORKDIR}/dmesg.sh ${D}/opt/kernelci/
}
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [isar-cip-core][PATCH v3 3/6] Add script deploy-kernelci.py for upload the cip-core-image-kernelci
2022-01-27 17:12 [isar-cip-core][PATCH v3 0/6] Add cip-core-image-kernelci building and uploading system Jan Kiszka
2022-01-27 17:12 ` [isar-cip-core][PATCH v3 1/6] Add cip-core-image-kernelci Jan Kiszka
2022-01-27 17:12 ` [isar-cip-core][PATCH v3 2/6] Add dmesg filter needed for lava test result Jan Kiszka
@ 2022-01-27 17:12 ` Jan Kiszka
2022-09-01 10:54 ` Jan Kiszka
2022-01-27 17:12 ` [isar-cip-core][PATCH v3 4/6] enable cip-core-image-kernelci Jan Kiszka
` (2 subsequent siblings)
5 siblings, 1 reply; 10+ messages in thread
From: Jan Kiszka @ 2022-01-27 17:12 UTC (permalink / raw)
To: cip-dev; +Cc: Alice Ferrazzi
From: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
The cip-core-image-kernelci need to be uploaded to the KernelCI
production storage for been used by KernelCI.
This script use the KernelCI API for uploading the
cip-core-image-kernelci to the production storage.
The images are uploaded in the following link:
https://storage.kernelci.org/images/rootfs/cip/
Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
scripts/deploy-kernelci.py | 55 ++++++++++++++++++++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100755 scripts/deploy-kernelci.py
diff --git a/scripts/deploy-kernelci.py b/scripts/deploy-kernelci.py
new file mode 100755
index 0000000..5a8adca
--- /dev/null
+++ b/scripts/deploy-kernelci.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import subprocess
+import requests
+import os
+import sys
+import time
+from urllib.parse import urljoin
+
+cdate=time.strftime("%Y%m%d")
+api="https://api.kernelci.org/upload"
+token=os.getenv("KERNELCI_TOKEN")
+
+release=sys.argv[1]
+target=sys.argv[2]
+extension=sys.argv[3]
+
+rootfs_filename="cip-core-image-kernelci-cip-core-"+release+"-"+target+".tar.gz"
+initrd_filename="cip-core-image-kernelci-cip-core-"+release+"-"+target+"-initrd.img"
+initrd_gz_filename="cip-core-image-kernelci-cip-core-"+release+"-"+target+"-initrd.img.gz"
+
+input_dir="build/tmp/deploy/images/"+target
+upload_path="/images/rootfs/cip/"+cdate+"/"+target+"/"
+upload_path_latest="/images/rootfs/cip/latest/"+target+"/"
+rootfs=input_dir+"/"+rootfs_filename
+initrd=input_dir+"/"+initrd_filename
+
+def upload_file(api, token, path, input_file, input_filename):
+ headers = {
+ 'Authorization': token,
+ }
+ data = {
+ 'path': path,
+ }
+ files = {
+ 'file': (input_filename, open(input_file, 'rb').read()),
+ }
+ url = urljoin(api, 'upload')
+ resp = requests.post(url, headers=headers, data=data, files=files)
+ resp.raise_for_status()
+
+if os.path.exists(rootfs) and os.path.exists(initrd):
+ print("uploading rootfs to KernelCI")
+ upload_file(api, token, upload_path, rootfs, rootfs_filename)
+ print("uploading initrd to KernelCI")
+ upload_file(api, token, upload_path, initrd, initrd_gz_filename)
+ print("uploaded to: https://storage.kernelci.org"+upload_path)
+
+ # Upload latest
+ print("uploading rootfs to KernelCI CIP latest")
+ upload_file(api, token, upload_path_latest, rootfs, rootfs_filename)
+ print("uploading initrd to KernelCI CIP latest")
+ upload_file(api, token, upload_path_latest, initrd, initrd_gz_filename)
+ print("uploaded to: https://storage.kernelci.org"+upload_path_latest)
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [isar-cip-core][PATCH v3 3/6] Add script deploy-kernelci.py for upload the cip-core-image-kernelci
2022-01-27 17:12 ` [isar-cip-core][PATCH v3 3/6] Add script deploy-kernelci.py for upload the cip-core-image-kernelci Jan Kiszka
@ 2022-09-01 10:54 ` Jan Kiszka
2022-09-02 15:27 ` Alice Ferrazzi
[not found] ` <1711151143769181.21591@lists.cip-project.org>
0 siblings, 2 replies; 10+ messages in thread
From: Jan Kiszka @ 2022-09-01 10:54 UTC (permalink / raw)
To: cip-dev, Alice Ferrazzi
On 27.01.22 18:12, Jan Kiszka wrote:
> From: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
>
> The cip-core-image-kernelci need to be uploaded to the KernelCI
> production storage for been used by KernelCI.
> This script use the KernelCI API for uploading the
> cip-core-image-kernelci to the production storage.
> The images are uploaded in the following link:
> https://storage.kernelci.org/images/rootfs/cip/
>
> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> scripts/deploy-kernelci.py | 55 ++++++++++++++++++++++++++++++++++++++
> 1 file changed, 55 insertions(+)
> create mode 100755 scripts/deploy-kernelci.py
>
> diff --git a/scripts/deploy-kernelci.py b/scripts/deploy-kernelci.py
> new file mode 100755
> index 0000000..5a8adca
> --- /dev/null
> +++ b/scripts/deploy-kernelci.py
> @@ -0,0 +1,55 @@
> +#!/usr/bin/env python3
> +# -*- coding: utf-8 -*-
> +
> +import subprocess
> +import requests
> +import os
> +import sys
> +import time
> +from urllib.parse import urljoin
> +
> +cdate=time.strftime("%Y%m%d")
> +api="https://api.kernelci.org/upload"
> +token=os.getenv("KERNELCI_TOKEN")
> +
> +release=sys.argv[1]
> +target=sys.argv[2]
> +extension=sys.argv[3]
Just stumbled over these:
We do not use "extension" (it's always "kernelci"), that's an easy
cleanup. But more important, we also pass the dtb while we do not push
it to kernelci - by intention?
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [isar-cip-core][PATCH v3 3/6] Add script deploy-kernelci.py for upload the cip-core-image-kernelci
2022-09-01 10:54 ` Jan Kiszka
@ 2022-09-02 15:27 ` Alice Ferrazzi
[not found] ` <1711151143769181.21591@lists.cip-project.org>
1 sibling, 0 replies; 10+ messages in thread
From: Alice Ferrazzi @ 2022-09-02 15:27 UTC (permalink / raw)
To: Jan Kiszka; +Cc: cip-dev
> We do not use "extension" (it's always "kernelci"), that's an easy
> cleanup. But more important, we also pass the dtb while we do not push
> it to kernelci - by intention?
I don't think changing extension to static name "kernelci" is useful.
about dtb you are right. currently I don't remember if it was intentional.
probably would be useful to upload also the dtb and we can than try to
find a way of make KernelCI work with the generated dtb.
Thanks,
Alicef
--
======================================
Cybertrust Japan Co.,Ltd.
Alice Ferrazzi
alice.ferrazzi@miraclelinux.com
======================================
^ permalink raw reply [flat|nested] 10+ messages in thread[parent not found: <1711151143769181.21591@lists.cip-project.org>]
* Re: [cip-dev] [isar-cip-core][PATCH v3 3/6] Add script deploy-kernelci.py for upload the cip-core-image-kernelci
[not found] ` <1711151143769181.21591@lists.cip-project.org>
@ 2022-09-03 7:59 ` Alice Ferrazzi
0 siblings, 0 replies; 10+ messages in thread
From: Alice Ferrazzi @ 2022-09-03 7:59 UTC (permalink / raw)
To: cip-dev; +Cc: Jan Kiszka
On Sat, Sep 3, 2022 at 12:35 AM Alice Ferrazzi via
lists.cip-project.org
<alice.ferrazzi=miraclelinux.com@lists.cip-project.org> wrote:
>
> > We do not use "extension" (it's always "kernelci"), that's an easy
> > cleanup. But more important, we also pass the dtb while we do not push
> > it to kernelci - by intention?
>
> I don't think changing extension to static name "kernelci" is useful.
> about dtb you are right. currently I don't remember if it was intentional.
> probably would be useful to upload also the dtb and we can than try to
> find a way of make KernelCI work with the generated dtb.
>
I was looking again the script and extension variable is actually not
used anymore,
I thought from your text to just replace it with a static "kernelci" variable.
Works for me to remove it.
Thanks,
Alicef
--
======================================
Cybertrust Japan Co.,Ltd.
Alice Ferrazzi
alice.ferrazzi@miraclelinux.com
======================================
^ permalink raw reply [flat|nested] 10+ messages in thread
* [isar-cip-core][PATCH v3 4/6] enable cip-core-image-kernelci
2022-01-27 17:12 [isar-cip-core][PATCH v3 0/6] Add cip-core-image-kernelci building and uploading system Jan Kiszka
` (2 preceding siblings ...)
2022-01-27 17:12 ` [isar-cip-core][PATCH v3 3/6] Add script deploy-kernelci.py for upload the cip-core-image-kernelci Jan Kiszka
@ 2022-01-27 17:12 ` Jan Kiszka
2022-01-27 17:12 ` [isar-cip-core][PATCH v3 5/6] customizations: Factor out a common.inc Jan Kiszka
2022-01-27 17:12 ` [isar-cip-core][PATCH v3 6/6] kernelci-customizations: Reuse common customizations Jan Kiszka
5 siblings, 0 replies; 10+ messages in thread
From: Jan Kiszka @ 2022-01-27 17:12 UTC (permalink / raw)
To: cip-dev; +Cc: Alice Ferrazzi
From: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
enable CIP core image KernelCI to be built with gitlab pipeline
and uploaded to the KernelCI storage using KernelCI API.
enable cip-core-image-kernelci to be built for amd64, arm and arm64.
Signed-off-by: Alice Ferrazzi <alice.ferrazzi@miraclelinux.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.gitlab-ci.yml | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e9cbc60..c06c783 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,6 +9,7 @@ variables:
targz: disable
dtb: none
deploy: enable
+ deploy_kernelci: disable
stages:
- build
@@ -38,6 +39,7 @@ default:
- echo "Building ${base_yaml}"
- kas build ${base_yaml}
- if [ "${deploy}" = "enable" ]; then scripts/deploy-cip-core.sh ${release} ${target} ${extension} ${dtb} ${CI_COMMIT_REF_SLUG}; fi
+ - if [ "${deploy_kernelci}" = "enable" ]; then scripts/deploy-kernelci.py ${release} ${target} ${extension} ${dtb}; fi
# base image
build:simatic-ipc227e-base:
@@ -77,6 +79,18 @@ build:qemu-amd64-base:
wic_targz: disable
targz: enable
+build:qemu-amd64-base-kernelci:
+ extends:
+ - .build_base
+ variables:
+ target: qemu-amd64
+ extension: kernelci
+ use_rt: disable
+ wic_targz: disable
+ targz: enable
+ deploy: disable
+ deploy_kernelci: enable
+
build:qemu-arm64-base:
extends:
- .build_base
@@ -87,6 +101,18 @@ build:qemu-arm64-base:
wic_targz: disable
targz: enable
+build:qemu-arm64-base-kernelci:
+ extends:
+ - .build_base
+ variables:
+ target: qemu-arm64
+ extension: kernelci
+ use_rt: disable
+ wic_targz: disable
+ targz: enable
+ deploy: disable
+ deploy_kernelci: enable
+
build:qemu-arm-base:
extends:
- .build_base
@@ -97,6 +123,18 @@ build:qemu-arm-base:
wic_targz: disable
targz: enable
+build:qemu-arm-base-kernelci:
+ extends:
+ - .build_base
+ variables:
+ target: qemu-arm
+ extension: kernelci
+ use_rt: disable
+ wic_targz: disable
+ targz: enable
+ deploy: disable
+ deploy_kernelci: enable
+
# test
build:simatic-ipc227e-test:
extends:
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [isar-cip-core][PATCH v3 5/6] customizations: Factor out a common.inc
2022-01-27 17:12 [isar-cip-core][PATCH v3 0/6] Add cip-core-image-kernelci building and uploading system Jan Kiszka
` (3 preceding siblings ...)
2022-01-27 17:12 ` [isar-cip-core][PATCH v3 4/6] enable cip-core-image-kernelci Jan Kiszka
@ 2022-01-27 17:12 ` Jan Kiszka
2022-01-27 17:12 ` [isar-cip-core][PATCH v3 6/6] kernelci-customizations: Reuse common customizations Jan Kiszka
5 siblings, 0 replies; 10+ messages in thread
From: Jan Kiszka @ 2022-01-27 17:12 UTC (permalink / raw)
To: cip-dev; +Cc: Alice Ferrazzi
From: Jan Kiszka <jan.kiszka@siemens.com>
This can be re-used by other customization recipes.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.../{customizations.bb => common.inc} | 4 +--
recipes-core/customizations/customizations.bb | 27 ++-----------------
2 files changed, 4 insertions(+), 27 deletions(-)
copy recipes-core/customizations/{customizations.bb => common.inc} (90%)
diff --git a/recipes-core/customizations/customizations.bb b/recipes-core/customizations/common.inc
similarity index 90%
copy from recipes-core/customizations/customizations.bb
copy to recipes-core/customizations/common.inc
index d302b4a..d3eb7b8 100644
--- a/recipes-core/customizations/customizations.bb
+++ b/recipes-core/customizations/common.inc
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019-2022
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -11,7 +11,7 @@
inherit dpkg-raw
-DESCRIPTION = "CIP Core image demo & customizations"
+FILESPATH_append := ":${FILE_DIRNAME}/files"
SRC_URI = " \
file://postinst \
diff --git a/recipes-core/customizations/customizations.bb b/recipes-core/customizations/customizations.bb
index d302b4a..96e88dd 100644
--- a/recipes-core/customizations/customizations.bb
+++ b/recipes-core/customizations/customizations.bb
@@ -1,7 +1,7 @@
#
# CIP Core, generic profile
#
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019-2022
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -9,29 +9,6 @@
# SPDX-License-Identifier: MIT
#
-inherit dpkg-raw
+require common.inc
DESCRIPTION = "CIP Core image demo & customizations"
-
-SRC_URI = " \
- file://postinst \
- file://ethernet \
- file://99-silent-printk.conf"
-
-WIRELESS_FIRMWARE_PACKAGE ?= ""
-INSTALL_WIRELESS_TOOLS ??= "0"
-
-DEPENDS += "sshd-regen-keys"
-
-DEBIAN_DEPENDS = " \
- ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys \
- ${@(', iw, wireless-regdb, ' + d.getVar('WIRELESS_FIRMWARE_PACKAGE')) \
- if d.getVar('INSTALL_WIRELESS_TOOLS') == '1' else ''}"
-
-do_install() {
- install -v -d ${D}/etc/network/interfaces.d
- install -v -m 644 ${WORKDIR}/ethernet ${D}/etc/network/interfaces.d/
-
- install -v -d ${D}/etc/sysctl.d
- install -v -m 644 ${WORKDIR}/99-silent-printk.conf ${D}/etc/sysctl.d/
-}
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [isar-cip-core][PATCH v3 6/6] kernelci-customizations: Reuse common customizations
2022-01-27 17:12 [isar-cip-core][PATCH v3 0/6] Add cip-core-image-kernelci building and uploading system Jan Kiszka
` (4 preceding siblings ...)
2022-01-27 17:12 ` [isar-cip-core][PATCH v3 5/6] customizations: Factor out a common.inc Jan Kiszka
@ 2022-01-27 17:12 ` Jan Kiszka
5 siblings, 0 replies; 10+ messages in thread
From: Jan Kiszka @ 2022-01-27 17:12 UTC (permalink / raw)
To: cip-dev; +Cc: Alice Ferrazzi
From: Jan Kiszka <jan.kiszka@siemens.com>
We can share most of the customization steps for kernelci with the
common recipe. This comes with the theoretical risk that changes to the
latter will break the former but has the larger benefit of avoiding
duplications and gaining support for new boards etc. automatically.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.../files/99-silent-printk.conf | 1 -
.../kernelci-customizations/files/ethernet | 23 -------------------
.../kernelci-customizations.bb | 23 ++++---------------
3 files changed, 4 insertions(+), 43 deletions(-)
delete mode 100644 recipes-core/kernelci-customizations/files/99-silent-printk.conf
delete mode 100644 recipes-core/kernelci-customizations/files/ethernet
diff --git a/recipes-core/kernelci-customizations/files/99-silent-printk.conf b/recipes-core/kernelci-customizations/files/99-silent-printk.conf
deleted file mode 100644
index ad24d3a..0000000
--- a/recipes-core/kernelci-customizations/files/99-silent-printk.conf
+++ /dev/null
@@ -1 +0,0 @@
-kernel.printk = 3 4 1 3
diff --git a/recipes-core/kernelci-customizations/files/ethernet b/recipes-core/kernelci-customizations/files/ethernet
deleted file mode 100644
index fa47d1a..0000000
--- a/recipes-core/kernelci-customizations/files/ethernet
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2019
-#
-# Authors:
-# Jan Kiszka <jan.kiszka@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-allow-hotplug eth0
-allow-hotplug enp0s2
-allow-hotplug enp2s0
-
-# used on BBB
-iface eth0 inet dhcp
-
-# used on qemu-amd64
-iface enp0s2 inet dhcp
-
-# used on simatic-ipc227e
-iface enp2s0 inet dhcp
diff --git a/recipes-core/kernelci-customizations/kernelci-customizations.bb b/recipes-core/kernelci-customizations/kernelci-customizations.bb
index df4257c..91ad929 100644
--- a/recipes-core/kernelci-customizations/kernelci-customizations.bb
+++ b/recipes-core/kernelci-customizations/kernelci-customizations.bb
@@ -11,28 +11,13 @@
# SPDX-License-Identifier: MIT
#
-inherit dpkg-raw
+require recipes-core/customizations/common.inc
-DESCRIPTION = "CIP Core image demo & customizations"
+DESCRIPTION = "CIP Core KernelCI image customizations"
-SRC_URI = " \
- file://postinst \
- file://ethernet \
- file://dmesg.sh \
- file://99-silent-printk.conf"
-
-DEPENDS += "sshd-regen-keys"
-
-DEBIAN_DEPENDS = " \
- ifupdown, isc-dhcp-client, net-tools, iputils-ping, ssh, sshd-regen-keys"
-
-do_install() {
- install -v -d ${D}/etc/network/interfaces.d
- install -v -m 644 ${WORKDIR}/ethernet ${D}/etc/network/interfaces.d/
-
- install -v -d ${D}/etc/sysctl.d
- install -v -m 644 ${WORKDIR}/99-silent-printk.conf ${D}/etc/sysctl.d/
+SRC_URI += "file://dmesg.sh"
+do_install_append() {
install -v -d ${D}/opt/kernelci
install -v -m 744 ${WORKDIR}/dmesg.sh ${D}/opt/kernelci/
}
--
2.31.1
^ permalink raw reply related [flat|nested] 10+ messages in thread