* [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images
@ 2023-12-21 16:37 Clara Kowalsky
2023-12-21 16:37 ` [xenomai-images][PATCH v2 1/7] linux-xenomai: Rename linux-xenomai to linux-xenomai-3 Clara Kowalsky
` (7 more replies)
0 siblings, 8 replies; 14+ messages in thread
From: Clara Kowalsky @ 2023-12-21 16:37 UTC (permalink / raw)
To: xenomai, rpm; +Cc: jan.kiszka, Clara Kowalsky
Hi all,
this is the second version of the series for adding xenomai-4/evl build support to xenomai-images.
Thank you Jan for your comments so far.
Best regards,
Clara
Clara Kowalsky (7):
linux-xenomai: Rename linux-xenomai to linux-xenomai-3
xenomai-3: Mark xenomai 3 specific configs
xenomai-4: Enable kernel build
xenomai-4: Add evl userspace
ci: Rename xenomai 3 files
ci: Add xenomai-4 test cases
kconfig: Add build options for evl
.gitlab-ci.yml | 14 ++++-
Kconfig | 62 +++++++++++++++++++
ci/xenomai_3_1_x.yml | 2 +-
ci/xenomai_3_2_x.yml | 8 +--
...nel_4_19.yml => xenomai_3_kernel_4_19.yml} | 0
...nel_5_10.yml => xenomai_3_kernel_5_10.yml} | 0
...nel_5_15.yml => xenomai_3_kernel_5_15.yml} | 0
...ernel_5_4.yml => xenomai_3_kernel_5_4.yml} | 0
...ernel_6_1.yml => xenomai_3_kernel_6_1.yml} | 0
ci/{xenomai_next.yml => xenomai_3_next.yml} | 8 +--
...t_compat.yml => xenomai_3_next_compat.yml} | 0
ci/xenomai_4_kernel_6_1.yml | 17 +++++
ci/xenomai_4_kernel_6_6.yml | 17 +++++
ci/xenomai_4_master.yml | 20 ++++++
ci/xenomai_4_next.yml | 20 ++++++
ci/xenomai_4_r46.yml | 20 ++++++
ci/xenomai_4_stable.yml | 20 ++++++
conf/distro/include/xenomai-version.inc | 2 +-
conf/distro/xenomai-demo.conf | 3 +-
opt-libevl-master.yml | 19 ++++++
opt-libevl-next.yml | 20 ++++++
opt-libevl-r46.yml | 19 ++++++
opt-libevl-stable.yml | 19 ++++++
opt-linux-4.19.yml | 2 +-
opt-linux-4.4.yml | 2 +-
opt-linux-5.10.yml | 2 +-
opt-linux-5.15.yml | 2 +-
opt-linux-5.4.yml | 2 +-
opt-linux-6.1.yml | 2 +-
opt-linux-latest-4.19.yml | 2 +-
opt-linux-latest-4.4.yml | 2 +-
opt-linux-latest-5.10.yml | 2 +-
opt-linux-latest-5.15.yml | 2 +-
opt-linux-latest-5.4.yml | 2 +-
opt-linux-latest-6.1.yml | 2 +-
opt-linux-latest.yml | 2 +-
opt-xen4-linux-latest-6.1.yml | 18 ++++++
opt-xen4-linux-latest-6.6.yml | 18 ++++++
opt-xenomai-3.0.x.yml | 2 +
opt-xenomai-3.1.x.yml | 2 +
opt-xenomai-3.2.x.yml | 2 +
opt-xenomai-next.yml | 2 +
recipes-core/images/demo-image.bb | 10 +--
recipes-kernel/linux/files/xen4.cfg | 3 +
...etail.inc => linux-xenomai-3-dovetail.inc} | 2 +-
recipes-kernel/linux/linux-xenomai-3.inc | 33 ++++++++++
...enomai_4.19.bb => linux-xenomai-3_4.19.bb} | 2 +-
...-xenomai_4.4.bb => linux-xenomai-3_4.4.bb} | 2 +-
...enomai_5.10.bb => linux-xenomai-3_5.10.bb} | 2 +-
...enomai_5.15.bb => linux-xenomai-3_5.15.bb} | 2 +-
...-xenomai_5.4.bb => linux-xenomai-3_5.4.bb} | 2 +-
...-xenomai_6.1.bb => linux-xenomai-3_6.1.bb} | 2 +-
...ai_latest.bb => linux-xenomai-3_latest.bb} | 4 +-
recipes-kernel/linux/linux-xenomai-4.inc | 24 +++++++
recipes-kernel/linux/linux-xenomai-4_6.1.bb | 14 +++++
recipes-kernel/linux/linux-xenomai-4_6.6.bb | 14 +++++
recipes-kernel/linux/linux-xenomai.inc | 19 ------
recipes-xenomai/libevl/files/debian/compat | 1 +
.../libevl/files/debian/control.tmpl | 10 +++
recipes-xenomai/libevl/files/debian/rules | 7 +++
recipes-xenomai/libevl/libevl_master.bb | 47 ++++++++++++++
recipes-xenomai/libevl/libevl_next.bb | 1 +
recipes-xenomai/libevl/libevl_r46.bb | 46 ++++++++++++++
recipes-xenomai/libevl/libevl_r47.bb | 1 +
64 files changed, 551 insertions(+), 57 deletions(-)
rename ci/{kernel_4_19.yml => xenomai_3_kernel_4_19.yml} (100%)
rename ci/{kernel_5_10.yml => xenomai_3_kernel_5_10.yml} (100%)
rename ci/{kernel_5_15.yml => xenomai_3_kernel_5_15.yml} (100%)
rename ci/{kernel_5_4.yml => xenomai_3_kernel_5_4.yml} (100%)
rename ci/{kernel_6_1.yml => xenomai_3_kernel_6_1.yml} (100%)
rename ci/{xenomai_next.yml => xenomai_3_next.yml} (66%)
rename ci/{xenomai_next_compat.yml => xenomai_3_next_compat.yml} (100%)
create mode 100644 ci/xenomai_4_kernel_6_1.yml
create mode 100644 ci/xenomai_4_kernel_6_6.yml
create mode 100644 ci/xenomai_4_master.yml
create mode 100644 ci/xenomai_4_next.yml
create mode 100644 ci/xenomai_4_r46.yml
create mode 100644 ci/xenomai_4_stable.yml
create mode 100644 opt-libevl-master.yml
create mode 100644 opt-libevl-next.yml
create mode 100644 opt-libevl-r46.yml
create mode 100644 opt-libevl-stable.yml
create mode 100644 opt-xen4-linux-latest-6.1.yml
create mode 100644 opt-xen4-linux-latest-6.6.yml
create mode 100644 recipes-kernel/linux/files/xen4.cfg
rename recipes-kernel/linux/{linux-xenomai-dovetail.inc => linux-xenomai-3-dovetail.inc} (86%)
create mode 100644 recipes-kernel/linux/linux-xenomai-3.inc
rename recipes-kernel/linux/{linux-xenomai_4.19.bb => linux-xenomai-3_4.19.bb} (93%)
rename recipes-kernel/linux/{linux-xenomai_4.4.bb => linux-xenomai-3_4.4.bb} (92%)
rename recipes-kernel/linux/{linux-xenomai_5.10.bb => linux-xenomai-3_5.10.bb} (76%)
rename recipes-kernel/linux/{linux-xenomai_5.15.bb => linux-xenomai-3_5.15.bb} (76%)
rename recipes-kernel/linux/{linux-xenomai_5.4.bb => linux-xenomai-3_5.4.bb} (92%)
rename recipes-kernel/linux/{linux-xenomai_6.1.bb => linux-xenomai-3_6.1.bb} (76%)
rename recipes-kernel/linux/{linux-xenomai_latest.bb => linux-xenomai-3_latest.bb} (97%)
create mode 100644 recipes-kernel/linux/linux-xenomai-4.inc
create mode 100644 recipes-kernel/linux/linux-xenomai-4_6.1.bb
create mode 100644 recipes-kernel/linux/linux-xenomai-4_6.6.bb
create mode 100644 recipes-xenomai/libevl/files/debian/compat
create mode 100644 recipes-xenomai/libevl/files/debian/control.tmpl
create mode 100755 recipes-xenomai/libevl/files/debian/rules
create mode 100644 recipes-xenomai/libevl/libevl_master.bb
create mode 120000 recipes-xenomai/libevl/libevl_next.bb
create mode 100644 recipes-xenomai/libevl/libevl_r46.bb
create mode 120000 recipes-xenomai/libevl/libevl_r47.bb
--
2.39.2
^ permalink raw reply [flat|nested] 14+ messages in thread
* [xenomai-images][PATCH v2 1/7] linux-xenomai: Rename linux-xenomai to linux-xenomai-3
2023-12-21 16:37 [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images Clara Kowalsky
@ 2023-12-21 16:37 ` Clara Kowalsky
2023-12-21 16:37 ` [xenomai-images][PATCH v2 2/7] xenomai-3: Mark xenomai 3 specific configs Clara Kowalsky
` (6 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Clara Kowalsky @ 2023-12-21 16:37 UTC (permalink / raw)
To: xenomai, rpm; +Cc: jan.kiszka, Clara Kowalsky
In preparation for the integration of EVL, files are renamed. Shared
parts for xenomai-3 and EVL are placed into linux-xenomai.inc.
Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
---
conf/distro/include/xenomai-version.inc | 2 +-
opt-linux-4.19.yml | 2 +-
opt-linux-4.4.yml | 2 +-
opt-linux-5.10.yml | 2 +-
opt-linux-5.15.yml | 2 +-
opt-linux-5.4.yml | 2 +-
opt-linux-6.1.yml | 2 +-
opt-linux-latest-4.19.yml | 2 +-
opt-linux-latest-4.4.yml | 2 +-
opt-linux-latest-5.10.yml | 2 +-
opt-linux-latest-5.15.yml | 2 +-
opt-linux-latest-5.4.yml | 2 +-
opt-linux-latest-6.1.yml | 2 +-
opt-linux-latest.yml | 2 +-
...etail.inc => linux-xenomai-3-dovetail.inc} | 2 +-
recipes-kernel/linux/linux-xenomai-3.inc | 33 +++++++++++++++++++
...enomai_4.19.bb => linux-xenomai-3_4.19.bb} | 2 +-
...-xenomai_4.4.bb => linux-xenomai-3_4.4.bb} | 2 +-
...enomai_5.10.bb => linux-xenomai-3_5.10.bb} | 2 +-
...enomai_5.15.bb => linux-xenomai-3_5.15.bb} | 2 +-
...-xenomai_5.4.bb => linux-xenomai-3_5.4.bb} | 2 +-
...-xenomai_6.1.bb => linux-xenomai-3_6.1.bb} | 2 +-
...ai_latest.bb => linux-xenomai-3_latest.bb} | 2 +-
recipes-kernel/linux/linux-xenomai.inc | 19 -----------
24 files changed, 55 insertions(+), 41 deletions(-)
rename recipes-kernel/linux/{linux-xenomai-dovetail.inc => linux-xenomai-3-dovetail.inc} (86%)
create mode 100644 recipes-kernel/linux/linux-xenomai-3.inc
rename recipes-kernel/linux/{linux-xenomai_4.19.bb => linux-xenomai-3_4.19.bb} (93%)
rename recipes-kernel/linux/{linux-xenomai_4.4.bb => linux-xenomai-3_4.4.bb} (92%)
rename recipes-kernel/linux/{linux-xenomai_5.10.bb => linux-xenomai-3_5.10.bb} (76%)
rename recipes-kernel/linux/{linux-xenomai_5.15.bb => linux-xenomai-3_5.15.bb} (76%)
rename recipes-kernel/linux/{linux-xenomai_5.4.bb => linux-xenomai-3_5.4.bb} (92%)
rename recipes-kernel/linux/{linux-xenomai_6.1.bb => linux-xenomai-3_6.1.bb} (76%)
rename recipes-kernel/linux/{linux-xenomai_latest.bb => linux-xenomai-3_latest.bb} (98%)
diff --git a/conf/distro/include/xenomai-version.inc b/conf/distro/include/xenomai-version.inc
index a8d40ed..7ca8201 100644
--- a/conf/distro/include/xenomai-version.inc
+++ b/conf/distro/include/xenomai-version.inc
@@ -22,7 +22,7 @@ XENOMAI_3_2_KERNEL_VERSION = "5.10%"
# If PREFERRED_VERSION_xenomai contains any item from XENOMAI_3_0_VERSION_LIST use
# XENOMAI_3_0_KERNEL_VERSION. Same for the other XENOMAI_*_VERSION_LIST.
-PREFERRED_VERSION_linux-xenomai ?= \
+PREFERRED_VERSION_linux-xenomai-3 ?= \
"${@bb.utils.contains_any('PREFERRED_VERSION_xenomai', \
'${XENOMAI_3_0_VERSION_LIST}', '${XENOMAI_3_0_KERNEL_VERSION}', \
bb.utils.contains_any('PREFERRED_VERSION_xenomai', \
diff --git a/opt-linux-4.19.yml b/opt-linux-4.19.yml
index d5fa5ef..93e09c3 100644
--- a/opt-linux-4.19.yml
+++ b/opt-linux-4.19.yml
@@ -14,4 +14,4 @@ header:
local_conf_header:
linux-xenomai-version: |
- PREFERRED_VERSION_linux-xenomai = "4.19%"
+ PREFERRED_VERSION_linux-xenomai-3 = "4.19%"
diff --git a/opt-linux-4.4.yml b/opt-linux-4.4.yml
index 2b9dd14..12e8822 100644
--- a/opt-linux-4.4.yml
+++ b/opt-linux-4.4.yml
@@ -14,4 +14,4 @@ header:
local_conf_header:
linux-xenomai-version: |
- PREFERRED_VERSION_linux-xenomai = "4.4%"
+ PREFERRED_VERSION_linux-xenomai-3 = "4.4%"
diff --git a/opt-linux-5.10.yml b/opt-linux-5.10.yml
index ae3b30d..b401b94 100644
--- a/opt-linux-5.10.yml
+++ b/opt-linux-5.10.yml
@@ -14,4 +14,4 @@ header:
local_conf_header:
linux-xenomai-version: |
- PREFERRED_VERSION_linux-xenomai = "5.10%"
+ PREFERRED_VERSION_linux-xenomai-3 = "5.10%"
diff --git a/opt-linux-5.15.yml b/opt-linux-5.15.yml
index c7447e9..4977d19 100644
--- a/opt-linux-5.15.yml
+++ b/opt-linux-5.15.yml
@@ -14,4 +14,4 @@ header:
local_conf_header:
linux-xenomai-version: |
- PREFERRED_VERSION_linux-xenomai = "5.15%"
+ PREFERRED_VERSION_linux-xenomai-3 = "5.15%"
diff --git a/opt-linux-5.4.yml b/opt-linux-5.4.yml
index 2fb586e..46f25a5 100644
--- a/opt-linux-5.4.yml
+++ b/opt-linux-5.4.yml
@@ -14,4 +14,4 @@ header:
local_conf_header:
linux-xenomai-version: |
- PREFERRED_VERSION_linux-xenomai = "5.4%"
+ PREFERRED_VERSION_linux-xenomai-3 = "5.4%"
diff --git a/opt-linux-6.1.yml b/opt-linux-6.1.yml
index fb0df24..00e5f0f 100644
--- a/opt-linux-6.1.yml
+++ b/opt-linux-6.1.yml
@@ -14,4 +14,4 @@ header:
local_conf_header:
linux-xenomai-version: |
- PREFERRED_VERSION_linux-xenomai = "6.1%"
+ PREFERRED_VERSION_linux-xenomai-3 = "6.1%"
diff --git a/opt-linux-latest-4.19.yml b/opt-linux-latest-4.19.yml
index 78f4a43..717cebe 100644
--- a/opt-linux-latest-4.19.yml
+++ b/opt-linux-latest-4.19.yml
@@ -14,5 +14,5 @@ header:
local_conf_header:
linux-xenomai-latest: |
- PREFERRED_VERSION_linux-xenomai = "9999-%"
+ PREFERRED_VERSION_linux-xenomai-3 = "9999-%"
LATEST_GIT_BRANCH = "4.19"
diff --git a/opt-linux-latest-4.4.yml b/opt-linux-latest-4.4.yml
index 113ba76..8476d5d 100644
--- a/opt-linux-latest-4.4.yml
+++ b/opt-linux-latest-4.4.yml
@@ -14,5 +14,5 @@ header:
local_conf_header:
linux-xenomai-latest: |
- PREFERRED_VERSION_linux-xenomai = "9999-%"
+ PREFERRED_VERSION_linux-xenomai-3 = "9999-%"
LATEST_GIT_BRANCH = "4.4"
diff --git a/opt-linux-latest-5.10.yml b/opt-linux-latest-5.10.yml
index a6bb221..ebb8003 100644
--- a/opt-linux-latest-5.10.yml
+++ b/opt-linux-latest-5.10.yml
@@ -14,5 +14,5 @@ header:
local_conf_header:
linux-xenomai-version: |
- PREFERRED_VERSION_linux-xenomai = "9999-%"
+ PREFERRED_VERSION_linux-xenomai-3 = "9999-%"
LATEST_GIT_BRANCH = "5.10"
diff --git a/opt-linux-latest-5.15.yml b/opt-linux-latest-5.15.yml
index 02e1a61..ab7d7fc 100644
--- a/opt-linux-latest-5.15.yml
+++ b/opt-linux-latest-5.15.yml
@@ -14,5 +14,5 @@ header:
local_conf_header:
linux-xenomai-version: |
- PREFERRED_VERSION_linux-xenomai = "9999-%"
+ PREFERRED_VERSION_linux-xenomai-3 = "9999-%"
LATEST_GIT_BRANCH = "5.15"
diff --git a/opt-linux-latest-5.4.yml b/opt-linux-latest-5.4.yml
index d3164e3..cdd91fe 100644
--- a/opt-linux-latest-5.4.yml
+++ b/opt-linux-latest-5.4.yml
@@ -14,5 +14,5 @@ header:
local_conf_header:
linux-xenomai-version: |
- PREFERRED_VERSION_linux-xenomai = "9999-%"
+ PREFERRED_VERSION_linux-xenomai-3 = "9999-%"
LATEST_GIT_BRANCH = "5.4"
diff --git a/opt-linux-latest-6.1.yml b/opt-linux-latest-6.1.yml
index c5eecd8..2298727 100644
--- a/opt-linux-latest-6.1.yml
+++ b/opt-linux-latest-6.1.yml
@@ -14,5 +14,5 @@ header:
local_conf_header:
linux-xenomai-version: |
- PREFERRED_VERSION_linux-xenomai = "9999-%"
+ PREFERRED_VERSION_linux-xenomai-3 = "9999-%"
LATEST_GIT_BRANCH = "6.1"
diff --git a/opt-linux-latest.yml b/opt-linux-latest.yml
index 4f4dd3b..0ba2808 100644
--- a/opt-linux-latest.yml
+++ b/opt-linux-latest.yml
@@ -14,5 +14,5 @@ header:
local_conf_header:
linux-xenomai-version: |
- PREFERRED_VERSION_linux-xenomai = "9999-%"
+ PREFERRED_VERSION_linux-xenomai-3 = "9999-%"
LATEST_GIT_BRANCH = "latest"
diff --git a/recipes-kernel/linux/linux-xenomai-dovetail.inc b/recipes-kernel/linux/linux-xenomai-3-dovetail.inc
similarity index 86%
rename from recipes-kernel/linux/linux-xenomai-dovetail.inc
rename to recipes-kernel/linux/linux-xenomai-3-dovetail.inc
index 05d775e..a8612ba 100644
--- a/recipes-kernel/linux/linux-xenomai-dovetail.inc
+++ b/recipes-kernel/linux/linux-xenomai-3-dovetail.inc
@@ -9,7 +9,7 @@
# SPDX-License-Identifier: MIT
#
-require recipes-kernel/linux/linux-xenomai.inc
+require recipes-kernel/linux/linux-xenomai-3.inc
SRC_URI += "git://source.denx.de/xenomai/linux-dovetail.git;protocol=https;nobranch=1"
diff --git a/recipes-kernel/linux/linux-xenomai-3.inc b/recipes-kernel/linux/linux-xenomai-3.inc
new file mode 100644
index 0000000..01923aa
--- /dev/null
+++ b/recipes-kernel/linux/linux-xenomai-3.inc
@@ -0,0 +1,33 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2018-2023
+#
+# Authors:
+# Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require recipes-kernel/linux/linux-xenomai.inc
+
+XENOMAI_DEBUG ?= "0"
+
+SRC_URI += "${@'file://common_nodbg.cfg' if d.getVar('XENOMAI_DEBUG') == '0' else ''}"
+SRC_URI += "file://rules.tmpl"
+
+DEPENDS += "xenomai-kernel-source"
+KBUILD_DEPENDS += "xenomai-kernel-source:native"
+
+TEMPLATE_FILES += "rules.tmpl"
+
+dpkg_runbuild:prepend() {
+ bbplain $(printf "linux-xenomai-3-%s: Building revision %.20s\n" \
+ ${PV} ${LINUX_COMMIT})
+}
+
+do_prepare_debian_rules() {
+ mv ${WORKDIR}/debian/rules ${WORKDIR}/debian/rules.isar
+ mv ${WORKDIR}/rules ${WORKDIR}/debian/rules
+}
+addtask prepare_debian_rules after do_transform_template before do_dpkg_build
diff --git a/recipes-kernel/linux/linux-xenomai_4.19.bb b/recipes-kernel/linux/linux-xenomai-3_4.19.bb
similarity index 93%
rename from recipes-kernel/linux/linux-xenomai_4.19.bb
rename to recipes-kernel/linux/linux-xenomai-3_4.19.bb
index 249ffb4..e6c56ca 100644
--- a/recipes-kernel/linux/linux-xenomai_4.19.bb
+++ b/recipes-kernel/linux/linux-xenomai-3_4.19.bb
@@ -9,7 +9,7 @@
# SPDX-License-Identifier: MIT
#
-require recipes-kernel/linux/linux-xenomai.inc
+require recipes-kernel/linux/linux-xenomai-3.inc
SRC_URI:append:amd64 = " git://github.com/xenomai-ci/ipipe-x86.git;protocol=https;nobranch=1"
SRCREV:amd64 ?= "ipipe-core-4.19.266-cip86-x86-25"
diff --git a/recipes-kernel/linux/linux-xenomai_4.4.bb b/recipes-kernel/linux/linux-xenomai-3_4.4.bb
similarity index 92%
rename from recipes-kernel/linux/linux-xenomai_4.4.bb
rename to recipes-kernel/linux/linux-xenomai-3_4.4.bb
index 2b32ae3..09ba2a7 100644
--- a/recipes-kernel/linux/linux-xenomai_4.4.bb
+++ b/recipes-kernel/linux/linux-xenomai-3_4.4.bb
@@ -9,7 +9,7 @@
# SPDX-License-Identifier: MIT
#
-require recipes-kernel/linux/linux-xenomai.inc
+require recipes-kernel/linux/linux-xenomai-3.inc
SRC_URI:append:amd64 = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1"
SRCREV:amd64 ?= "ipipe-core-4.4.302-cip71-x86-35"
diff --git a/recipes-kernel/linux/linux-xenomai_5.10.bb b/recipes-kernel/linux/linux-xenomai-3_5.10.bb
similarity index 76%
rename from recipes-kernel/linux/linux-xenomai_5.10.bb
rename to recipes-kernel/linux/linux-xenomai-3_5.10.bb
index 986060d..9b01708 100644
--- a/recipes-kernel/linux/linux-xenomai_5.10.bb
+++ b/recipes-kernel/linux/linux-xenomai-3_5.10.bb
@@ -9,6 +9,6 @@
# SPDX-License-Identifier: MIT
#
-require recipes-kernel/linux/linux-xenomai-dovetail.inc
+require recipes-kernel/linux/linux-xenomai-3-dovetail.inc
SRCREV ?= "v5.10.161-dovetail1"
diff --git a/recipes-kernel/linux/linux-xenomai_5.15.bb b/recipes-kernel/linux/linux-xenomai-3_5.15.bb
similarity index 76%
rename from recipes-kernel/linux/linux-xenomai_5.15.bb
rename to recipes-kernel/linux/linux-xenomai-3_5.15.bb
index 63865eb..9c5ba27 100644
--- a/recipes-kernel/linux/linux-xenomai_5.15.bb
+++ b/recipes-kernel/linux/linux-xenomai-3_5.15.bb
@@ -9,6 +9,6 @@
# SPDX-License-Identifier: MIT
#
-require recipes-kernel/linux/linux-xenomai-dovetail.inc
+require recipes-kernel/linux/linux-xenomai-3-dovetail.inc
SRCREV ?= "v5.15.85-dovetail1"
diff --git a/recipes-kernel/linux/linux-xenomai_5.4.bb b/recipes-kernel/linux/linux-xenomai-3_5.4.bb
similarity index 92%
rename from recipes-kernel/linux/linux-xenomai_5.4.bb
rename to recipes-kernel/linux/linux-xenomai-3_5.4.bb
index 7796cd3..827cba5 100644
--- a/recipes-kernel/linux/linux-xenomai_5.4.bb
+++ b/recipes-kernel/linux/linux-xenomai-3_5.4.bb
@@ -9,7 +9,7 @@
# SPDX-License-Identifier: MIT
#
-require recipes-kernel/linux/linux-xenomai.inc
+require recipes-kernel/linux/linux-xenomai-3.inc
SRC_URI:append:amd64 = " git://github.com/xenomai-ci/ipipe-x86.git;protocol=https;nobranch=1"
SRCREV:amd64 ?= "ipipe-core-5.4.228-x86-12"
diff --git a/recipes-kernel/linux/linux-xenomai_6.1.bb b/recipes-kernel/linux/linux-xenomai-3_6.1.bb
similarity index 76%
rename from recipes-kernel/linux/linux-xenomai_6.1.bb
rename to recipes-kernel/linux/linux-xenomai-3_6.1.bb
index d9655e0..1b41692 100644
--- a/recipes-kernel/linux/linux-xenomai_6.1.bb
+++ b/recipes-kernel/linux/linux-xenomai-3_6.1.bb
@@ -9,6 +9,6 @@
# SPDX-License-Identifier: MIT
#
-require recipes-kernel/linux/linux-xenomai-dovetail.inc
+require recipes-kernel/linux/linux-xenomai-3-dovetail.inc
SRCREV ?= "v6.1.11-dovetail1"
diff --git a/recipes-kernel/linux/linux-xenomai_latest.bb b/recipes-kernel/linux/linux-xenomai-3_latest.bb
similarity index 98%
rename from recipes-kernel/linux/linux-xenomai_latest.bb
rename to recipes-kernel/linux/linux-xenomai-3_latest.bb
index e5348c6..adda9b5 100644
--- a/recipes-kernel/linux/linux-xenomai_latest.bb
+++ b/recipes-kernel/linux/linux-xenomai-3_latest.bb
@@ -10,7 +10,7 @@
# SPDX-License-Identifier: MIT
#
-require recipes-kernel/linux/linux-xenomai.inc
+require recipes-kernel/linux/linux-xenomai-3.inc
PV = "9999-g${LINUX_COMMIT}"
diff --git a/recipes-kernel/linux/linux-xenomai.inc b/recipes-kernel/linux/linux-xenomai.inc
index ca63fea..03ec04f 100644
--- a/recipes-kernel/linux/linux-xenomai.inc
+++ b/recipes-kernel/linux/linux-xenomai.inc
@@ -15,19 +15,11 @@ FILESPATH =. "${LAYERDIR_xenomai}/recipes-kernel/linux/files:"
XENOMAI_DEFCONFIG = "${DISTRO_ARCH}_defconfig"
KERNEL_DEFCONFIG ?= "${XENOMAI_DEFCONFIG}"
-XENOMAI_DEBUG ?= "0"
SRC_URI += "${@'file://${KERNEL_DEFCONFIG}' if d.getVar('KERNEL_DEFCONFIG') == d.getVar('XENOMAI_DEFCONFIG') else ''}"
-SRC_URI += "${@'file://common_nodbg.cfg' if d.getVar('XENOMAI_DEBUG') == '0' else ''}"
-SRC_URI += "file://rules.tmpl"
S = "${WORKDIR}/git"
-DEPENDS += "xenomai-kernel-source"
-KBUILD_DEPENDS += "xenomai-kernel-source:native"
-
-TEMPLATE_FILES += "rules.tmpl"
-
def get_commit(d):
try:
return bb.fetch2.get_srcrev(d).strip('AUTOINC+')
@@ -35,14 +27,3 @@ def get_commit(d):
return ""
LINUX_COMMIT ?= "${@get_commit(d)}"
-
-dpkg_runbuild:prepend() {
- bbplain $(printf "linux-xenomai-%s: Building revision %.20s\n" \
- ${PV} ${LINUX_COMMIT})
-}
-
-do_prepare_debian_rules() {
- mv ${WORKDIR}/debian/rules ${WORKDIR}/debian/rules.isar
- mv ${WORKDIR}/rules ${WORKDIR}/debian/rules
-}
-addtask prepare_debian_rules after do_transform_template before do_dpkg_build
--
2.39.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [xenomai-images][PATCH v2 2/7] xenomai-3: Mark xenomai 3 specific configs
2023-12-21 16:37 [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images Clara Kowalsky
2023-12-21 16:37 ` [xenomai-images][PATCH v2 1/7] linux-xenomai: Rename linux-xenomai to linux-xenomai-3 Clara Kowalsky
@ 2023-12-21 16:37 ` Clara Kowalsky
2024-01-04 12:38 ` Jan Kiszka
2023-12-21 16:37 ` [xenomai-images][PATCH v2 3/7] xenomai-4: Enable kernel build Clara Kowalsky
` (5 subsequent siblings)
7 siblings, 1 reply; 14+ messages in thread
From: Clara Kowalsky @ 2023-12-21 16:37 UTC (permalink / raw)
To: xenomai, rpm; +Cc: jan.kiszka, Clara Kowalsky
In preparation for the integration of EVL, a xenomai-3 override is
added.
Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
---
conf/distro/xenomai-demo.conf | 2 +-
opt-xenomai-3.0.x.yml | 2 ++
opt-xenomai-3.1.x.yml | 2 ++
opt-xenomai-3.2.x.yml | 2 ++
opt-xenomai-next.yml | 2 ++
recipes-core/images/demo-image.bb | 8 ++++----
recipes-kernel/linux/linux-xenomai-3_latest.bb | 2 +-
7 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/conf/distro/xenomai-demo.conf b/conf/distro/xenomai-demo.conf
index c99669d..d96cdaf 100644
--- a/conf/distro/xenomai-demo.conf
+++ b/conf/distro/xenomai-demo.conf
@@ -16,7 +16,7 @@ include conf/distro/include/xenomai-version.inc
HOST_DISTRO ?= "debian-bookworm"
-KERNEL_NAME = "xenomai"
+KERNEL_NAME:xenomai3 = "xenomai-3"
WKS_FILE = "${MACHINE}.wks"
diff --git a/opt-xenomai-3.0.x.yml b/opt-xenomai-3.0.x.yml
index 4559de8..35714b1 100644
--- a/opt-xenomai-3.0.x.yml
+++ b/opt-xenomai-3.0.x.yml
@@ -15,3 +15,5 @@ header:
local_conf_header:
xenomai-3-0-x: |
PREFERRED_VERSION_xenomai = "stable-3.0.x"
+ xenomai-3_override: |
+ OVERRIDES .= ":xenomai3"
diff --git a/opt-xenomai-3.1.x.yml b/opt-xenomai-3.1.x.yml
index 2479e96..c5417d7 100644
--- a/opt-xenomai-3.1.x.yml
+++ b/opt-xenomai-3.1.x.yml
@@ -15,3 +15,5 @@ header:
local_conf_header:
xenomai-3-1-x: |
PREFERRED_VERSION_xenomai = "stable-3.1.x"
+ xenomai-3_override: |
+ OVERRIDES .= ":xenomai3"
diff --git a/opt-xenomai-3.2.x.yml b/opt-xenomai-3.2.x.yml
index 1abcef9..54d0e9a 100644
--- a/opt-xenomai-3.2.x.yml
+++ b/opt-xenomai-3.2.x.yml
@@ -15,3 +15,5 @@ header:
local_conf_header:
xenomai-3-2-x: |
PREFERRED_VERSION_xenomai = "stable-3.2.x"
+ xenomai-3_override: |
+ OVERRIDES .= ":xenomai3"
diff --git a/opt-xenomai-next.yml b/opt-xenomai-next.yml
index ba0b2da..9d74ed0 100644
--- a/opt-xenomai-next.yml
+++ b/opt-xenomai-next.yml
@@ -15,3 +15,5 @@ header:
local_conf_header:
xenomai-latest: |
PREFERRED_VERSION_xenomai = "next"
+ xenomai-3_override: |
+ OVERRIDES .= ":xenomai3"
diff --git a/recipes-core/images/demo-image.bb b/recipes-core/images/demo-image.bb
index 540583b..db7e2c7 100644
--- a/recipes-core/images/demo-image.bb
+++ b/recipes-core/images/demo-image.bb
@@ -33,7 +33,7 @@ def get_testsuite_package_names(d):
# Install gdb only for older stable releases. Enables gdb tests and avoids a
# arch missmatch for compat builds on newer releases.
-IMAGE_PREINSTALL += "${@ 'gdb' if not has_testsuite_package(d) else '' }"
+IMAGE_PREINSTALL:append:xenomai3 = " ${@ 'gdb' if not has_testsuite_package(d) else '' }"
IMAGE_PREINSTALL += " \
bash-completion less vim nano man \
@@ -41,7 +41,7 @@ IMAGE_PREINSTALL += " \
iw wireless-tools wpasupplicant dbus \
lsb-release"
-IMAGE_INSTALL += "xenomai-runtime xenomai-runtime-dbgsym"
-IMAGE_INSTALL += "${@get_testsuite_package_names(d)}"
-IMAGE_INSTALL += "libxenomai1-dbgsym"
+IMAGE_INSTALL:append:xenomai3 = " xenomai-runtime xenomai-runtime-dbgsym"
+IMAGE_INSTALL:append:xenomai3 = " ${@get_testsuite_package_names(d)}"
+IMAGE_INSTALL:append:xenomai3 = " libxenomai1-dbgsym"
IMAGE_INSTALL += "customizations sshd-regen-keys expand-on-first-boot"
diff --git a/recipes-kernel/linux/linux-xenomai-3_latest.bb b/recipes-kernel/linux/linux-xenomai-3_latest.bb
index adda9b5..a9c223a 100644
--- a/recipes-kernel/linux/linux-xenomai-3_latest.bb
+++ b/recipes-kernel/linux/linux-xenomai-3_latest.bb
@@ -72,6 +72,6 @@ GIT_BRANCH:arm64 = "${@ \
else d.getVar('LATEST_KERNEL_BRANCH') }"
SRC_URI += "${GIT_REPO};protocol=https;branch=${GIT_BRANCH}"
-SRCREV = "${AUTOREV}"
+SRCREV:xenomai3 = "${AUTOREV}"
SRC_URI:append:beagle-bone-black = " ${@ 'file://bbb_4.4.cfg' if is_xeno_3_0(d) else '' }"
--
2.39.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [xenomai-images][PATCH v2 3/7] xenomai-4: Enable kernel build
2023-12-21 16:37 [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images Clara Kowalsky
2023-12-21 16:37 ` [xenomai-images][PATCH v2 1/7] linux-xenomai: Rename linux-xenomai to linux-xenomai-3 Clara Kowalsky
2023-12-21 16:37 ` [xenomai-images][PATCH v2 2/7] xenomai-3: Mark xenomai 3 specific configs Clara Kowalsky
@ 2023-12-21 16:37 ` Clara Kowalsky
2024-01-04 12:40 ` Jan Kiszka
2024-01-04 13:51 ` Jan Kiszka
2023-12-21 16:37 ` [xenomai-images][PATCH v2 4/7] xenomai-4: Add evl userspace Clara Kowalsky
` (4 subsequent siblings)
7 siblings, 2 replies; 14+ messages in thread
From: Clara Kowalsky @ 2023-12-21 16:37 UTC (permalink / raw)
To: xenomai, rpm; +Cc: jan.kiszka, Clara Kowalsky
This permits to build the linux-evl kernel v6.1 and v6.6.
Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
---
conf/distro/xenomai-demo.conf | 1 +
opt-xen4-linux-latest-6.1.yml | 18 ++++++++++++++++
opt-xen4-linux-latest-6.6.yml | 18 ++++++++++++++++
recipes-kernel/linux/files/xen4.cfg | 3 +++
recipes-kernel/linux/linux-xenomai-4.inc | 24 +++++++++++++++++++++
recipes-kernel/linux/linux-xenomai-4_6.1.bb | 14 ++++++++++++
recipes-kernel/linux/linux-xenomai-4_6.6.bb | 14 ++++++++++++
7 files changed, 92 insertions(+)
create mode 100644 opt-xen4-linux-latest-6.1.yml
create mode 100644 opt-xen4-linux-latest-6.6.yml
create mode 100644 recipes-kernel/linux/files/xen4.cfg
create mode 100644 recipes-kernel/linux/linux-xenomai-4.inc
create mode 100644 recipes-kernel/linux/linux-xenomai-4_6.1.bb
create mode 100644 recipes-kernel/linux/linux-xenomai-4_6.6.bb
diff --git a/conf/distro/xenomai-demo.conf b/conf/distro/xenomai-demo.conf
index d96cdaf..db5a5df 100644
--- a/conf/distro/xenomai-demo.conf
+++ b/conf/distro/xenomai-demo.conf
@@ -17,6 +17,7 @@ include conf/distro/include/xenomai-version.inc
HOST_DISTRO ?= "debian-bookworm"
KERNEL_NAME:xenomai3 = "xenomai-3"
+KERNEL_NAME:xenomai4 = "xenomai-4"
WKS_FILE = "${MACHINE}.wks"
diff --git a/opt-xen4-linux-latest-6.1.yml b/opt-xen4-linux-latest-6.1.yml
new file mode 100644
index 0000000..a71cf92
--- /dev/null
+++ b/opt-xen4-linux-latest-6.1.yml
@@ -0,0 +1,18 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2023
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+ version: 10
+
+local_conf_header:
+ linux-xenomai-version: |
+ PREFERRED_VERSION_linux-xenomai-4 = "6.1"
+ LATEST_GIT_BRANCH = "6.1"
diff --git a/opt-xen4-linux-latest-6.6.yml b/opt-xen4-linux-latest-6.6.yml
new file mode 100644
index 0000000..5710222
--- /dev/null
+++ b/opt-xen4-linux-latest-6.6.yml
@@ -0,0 +1,18 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2023
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+ version: 10
+
+local_conf_header:
+ linux-xenomai-version: |
+ PREFERRED_VERSION_linux-xenomai-4 = "6.6"
+ LATEST_GIT_BRANCH = "6.6"
diff --git a/recipes-kernel/linux/files/xen4.cfg b/recipes-kernel/linux/files/xen4.cfg
new file mode 100644
index 0000000..0460249
--- /dev/null
+++ b/recipes-kernel/linux/files/xen4.cfg
@@ -0,0 +1,3 @@
+CONFIG_EVL=y
+CONFIG_EVL_SCHED_QUOTA=y
+CONFIG_EVL_SCHED_TP=y
\ No newline at end of file
diff --git a/recipes-kernel/linux/linux-xenomai-4.inc b/recipes-kernel/linux/linux-xenomai-4.inc
new file mode 100644
index 0000000..d91d618
--- /dev/null
+++ b/recipes-kernel/linux/linux-xenomai-4.inc
@@ -0,0 +1,24 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2018-2023
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require recipes-kernel/linux/linux-xenomai.inc
+
+KERNEL_LIBC_DEV_DEPLOY = "1"
+
+SRC_URI += "file://xen4.cfg"
+
+SRC_URI += "git://source.denx.de/Xenomai/xenomai4/linux-evl.git;protocol=https;nobranch=1"
+PV ?= "${@d.getVar('SRCREV').strip('-')[0].lstrip('v')}+"
+
+dpkg_runbuild:prepend() {
+ bbplain $(printf "linux-xenomai-4-%s: Building revision %.20s\n" \
+ ${PV} ${LINUX_COMMIT})
+}
diff --git a/recipes-kernel/linux/linux-xenomai-4_6.1.bb b/recipes-kernel/linux/linux-xenomai-4_6.1.bb
new file mode 100644
index 0000000..89683dc
--- /dev/null
+++ b/recipes-kernel/linux/linux-xenomai-4_6.1.bb
@@ -0,0 +1,14 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2021-2023
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require recipes-kernel/linux/linux-xenomai-4.inc
+
+SRCREV ?= "v6.1.y-evl-rebase"
diff --git a/recipes-kernel/linux/linux-xenomai-4_6.6.bb b/recipes-kernel/linux/linux-xenomai-4_6.6.bb
new file mode 100644
index 0000000..0ce145e
--- /dev/null
+++ b/recipes-kernel/linux/linux-xenomai-4_6.6.bb
@@ -0,0 +1,14 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2021-2023
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require recipes-kernel/linux/linux-xenomai-4.inc
+
+SRCREV ?= "v6.6-evl-rebase"
--
2.39.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [xenomai-images][PATCH v2 4/7] xenomai-4: Add evl userspace
2023-12-21 16:37 [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images Clara Kowalsky
` (2 preceding siblings ...)
2023-12-21 16:37 ` [xenomai-images][PATCH v2 3/7] xenomai-4: Enable kernel build Clara Kowalsky
@ 2023-12-21 16:37 ` Clara Kowalsky
2024-01-04 12:41 ` Jan Kiszka
2024-01-04 14:57 ` Jan Kiszka
2023-12-21 16:37 ` [xenomai-images][PATCH v2 5/7] ci: Rename xenomai 3 files Clara Kowalsky
` (3 subsequent siblings)
7 siblings, 2 replies; 14+ messages in thread
From: Clara Kowalsky @ 2023-12-21 16:37 UTC (permalink / raw)
To: xenomai, rpm; +Cc: jan.kiszka, Clara Kowalsky
The libevl recipe allows building the evl userspace.
Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
---
opt-libevl-master.yml | 19 ++++++++
opt-libevl-next.yml | 20 ++++++++
opt-libevl-r46.yml | 19 ++++++++
opt-libevl-stable.yml | 19 ++++++++
recipes-core/images/demo-image.bb | 2 +
recipes-xenomai/libevl/files/debian/compat | 1 +
.../libevl/files/debian/control.tmpl | 10 ++++
recipes-xenomai/libevl/files/debian/rules | 7 +++
recipes-xenomai/libevl/libevl_master.bb | 47 +++++++++++++++++++
recipes-xenomai/libevl/libevl_next.bb | 1 +
recipes-xenomai/libevl/libevl_r46.bb | 46 ++++++++++++++++++
recipes-xenomai/libevl/libevl_r47.bb | 1 +
12 files changed, 192 insertions(+)
create mode 100644 opt-libevl-master.yml
create mode 100644 opt-libevl-next.yml
create mode 100644 opt-libevl-r46.yml
create mode 100644 opt-libevl-stable.yml
create mode 100644 recipes-xenomai/libevl/files/debian/compat
create mode 100644 recipes-xenomai/libevl/files/debian/control.tmpl
create mode 100755 recipes-xenomai/libevl/files/debian/rules
create mode 100644 recipes-xenomai/libevl/libevl_master.bb
create mode 120000 recipes-xenomai/libevl/libevl_next.bb
create mode 100644 recipes-xenomai/libevl/libevl_r46.bb
create mode 120000 recipes-xenomai/libevl/libevl_r47.bb
diff --git a/opt-libevl-master.yml b/opt-libevl-master.yml
new file mode 100644
index 0000000..a3fb14f
--- /dev/null
+++ b/opt-libevl-master.yml
@@ -0,0 +1,19 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2023
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+ version: 10
+
+local_conf_header:
+ libevl-version: |
+ PREFERRED_VERSION_libevl = "master"
+ xenomai-4_override: |
+ OVERRIDES .= ":xenomai4"
diff --git a/opt-libevl-next.yml b/opt-libevl-next.yml
new file mode 100644
index 0000000..5e22d43
--- /dev/null
+++ b/opt-libevl-next.yml
@@ -0,0 +1,20 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2023
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+ version: 10
+
+local_conf_header:
+ libevl-version: |
+ PREFERRED_VERSION_libevl = "next"
+ xenomai-4_override: |
+ OVERRIDES .= ":xenomai4"
+
diff --git a/opt-libevl-r46.yml b/opt-libevl-r46.yml
new file mode 100644
index 0000000..53d15f0
--- /dev/null
+++ b/opt-libevl-r46.yml
@@ -0,0 +1,19 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2023
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+ version: 10
+
+local_conf_header:
+ libevl-version: |
+ PREFERRED_VERSION_libevl = "r46"
+ xenomai-4_override: |
+ OVERRIDES .= ":xenomai4"
diff --git a/opt-libevl-stable.yml b/opt-libevl-stable.yml
new file mode 100644
index 0000000..d9ce4a1
--- /dev/null
+++ b/opt-libevl-stable.yml
@@ -0,0 +1,19 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2023
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+ version: 10
+
+local_conf_header:
+ libevl-version: |
+ PREFERRED_VERSION_libevl = "r47"
+ xenomai-4_override: |
+ OVERRIDES .= ":xenomai4"
diff --git a/recipes-core/images/demo-image.bb b/recipes-core/images/demo-image.bb
index db7e2c7..e19a038 100644
--- a/recipes-core/images/demo-image.bb
+++ b/recipes-core/images/demo-image.bb
@@ -44,4 +44,6 @@ IMAGE_PREINSTALL += " \
IMAGE_INSTALL:append:xenomai3 = " xenomai-runtime xenomai-runtime-dbgsym"
IMAGE_INSTALL:append:xenomai3 = " ${@get_testsuite_package_names(d)}"
IMAGE_INSTALL:append:xenomai3 = " libxenomai1-dbgsym"
+IMAGE_INSTALL:append:xenomai4 = " libevl"
+
IMAGE_INSTALL += "customizations sshd-regen-keys expand-on-first-boot"
diff --git a/recipes-xenomai/libevl/files/debian/compat b/recipes-xenomai/libevl/files/debian/compat
new file mode 100644
index 0000000..f599e28
--- /dev/null
+++ b/recipes-xenomai/libevl/files/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/recipes-xenomai/libevl/files/debian/control.tmpl b/recipes-xenomai/libevl/files/debian/control.tmpl
new file mode 100644
index 0000000..9880ee9
--- /dev/null
+++ b/recipes-xenomai/libevl/files/debian/control.tmpl
@@ -0,0 +1,10 @@
+Source: ${PN}
+Section: misc
+Priority: optional
+Standards-Version: 3.9.6
+Maintainer: Xenomai project <xenomai@lists.linux.dev>
+Build-Depends: ${DEBIAN_BUILD_DEPENDS}
+
+Package: libevl
+Architecture: ${DISTRO_ARCH}
+Description: ${DESCRIPTION}
diff --git a/recipes-xenomai/libevl/files/debian/rules b/recipes-xenomai/libevl/files/debian/rules
new file mode 100755
index 0000000..9d9670e
--- /dev/null
+++ b/recipes-xenomai/libevl/files/debian/rules
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+
+override_dh_fixperms:
+ dh_fixperms
+
+%:
+ dh $@ --buildsystem=meson
diff --git a/recipes-xenomai/libevl/libevl_master.bb b/recipes-xenomai/libevl/libevl_master.bb
new file mode 100644
index 0000000..d5ad572
--- /dev/null
+++ b/recipes-xenomai/libevl/libevl_master.bb
@@ -0,0 +1,47 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2018-2023
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+inherit dpkg
+
+CHANGELOG_V = "9999-${PV}"
+SRCREV = "${AUTOREV}"
+
+SRC_URI = " \
+ git://source.denx.de/Xenomai/xenomai4/libevl.git;protocol=https;branch=${PV} \
+ file://debian \
+ "
+
+DEPENDS="linux-xenomai-4"
+
+S = "${WORKDIR}/git"
+
+def get_commit(d):
+ try:
+ return bb.fetch2.get_srcrev(d).strip('AUTOINC+')
+ except bb.fetch2.FetchError:
+ return ""
+
+COMMIT="${@get_commit(d)}"
+
+DESCRIPTION ?= "install libevl libraries and tools"
+DEBIAN_BUILD_DEPENDS ?= "debhelper (>= 10), meson, linux-libc-dev"
+
+TEMPLATE_FILES = "debian/control.tmpl"
+TEMPLATE_VARS += "DEBIAN_BUILD_DEPENDS"
+
+do_prepare_build[cleandirs] += "${S}/debian"
+do_prepare_build() {
+ cp -r ${WORKDIR}/debian ${S}
+ deb_add_changelog
+
+ bbplain $(printf "libevl-%s: Building revision %.20s\n" \
+ ${PV} ${COMMIT})
+}
diff --git a/recipes-xenomai/libevl/libevl_next.bb b/recipes-xenomai/libevl/libevl_next.bb
new file mode 120000
index 0000000..85ab518
--- /dev/null
+++ b/recipes-xenomai/libevl/libevl_next.bb
@@ -0,0 +1 @@
+libevl_master.bb
\ No newline at end of file
diff --git a/recipes-xenomai/libevl/libevl_r46.bb b/recipes-xenomai/libevl/libevl_r46.bb
new file mode 100644
index 0000000..a8bc597
--- /dev/null
+++ b/recipes-xenomai/libevl/libevl_r46.bb
@@ -0,0 +1,46 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2018-2023
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+inherit dpkg
+
+CHANGELOG_V = "9999-${PV}"
+
+SRC_URI = " \
+ git://source.denx.de/Xenomai/xenomai4/libevl.git;protocol=https;branch=master;tag=${PV} \
+ file://debian \
+ "
+
+DEPENDS="linux-xenomai-4"
+
+S = "${WORKDIR}/git"
+
+def get_commit(d):
+ try:
+ return bb.fetch2.get_srcrev(d).strip('AUTOINC+')
+ except bb.fetch2.FetchError:
+ return ""
+
+COMMIT="${@get_commit(d)}"
+
+DESCRIPTION ?= "install libevl libraries and tools"
+DEBIAN_BUILD_DEPENDS ?= "debhelper (>= 10), meson, linux-libc-dev"
+
+TEMPLATE_FILES = "debian/control.tmpl"
+TEMPLATE_VARS += "DEBIAN_BUILD_DEPENDS"
+
+do_prepare_build[cleandirs] += "${S}/debian"
+do_prepare_build() {
+ cp -r ${WORKDIR}/debian ${S}
+ deb_add_changelog
+
+ bbplain $(printf "libevl-%s: Building revision %.20s\n" \
+ ${PV} ${COMMIT})
+}
diff --git a/recipes-xenomai/libevl/libevl_r47.bb b/recipes-xenomai/libevl/libevl_r47.bb
new file mode 120000
index 0000000..54ca27a
--- /dev/null
+++ b/recipes-xenomai/libevl/libevl_r47.bb
@@ -0,0 +1 @@
+libevl_r46.bb
\ No newline at end of file
--
2.39.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [xenomai-images][PATCH v2 5/7] ci: Rename xenomai 3 files
2023-12-21 16:37 [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images Clara Kowalsky
` (3 preceding siblings ...)
2023-12-21 16:37 ` [xenomai-images][PATCH v2 4/7] xenomai-4: Add evl userspace Clara Kowalsky
@ 2023-12-21 16:37 ` Clara Kowalsky
2023-12-21 16:37 ` [xenomai-images][PATCH v2 6/7] ci: Add xenomai-4 test cases Clara Kowalsky
` (2 subsequent siblings)
7 siblings, 0 replies; 14+ messages in thread
From: Clara Kowalsky @ 2023-12-21 16:37 UTC (permalink / raw)
To: xenomai, rpm; +Cc: jan.kiszka, Clara Kowalsky
The files for xenomai 3 obtain a corresponding name change.
Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
---
.gitlab-ci.yml | 14 +++++++++++++-
ci/xenomai_3_1_x.yml | 2 +-
ci/xenomai_3_2_x.yml | 8 ++++----
ci/{kernel_4_19.yml => xenomai_3_kernel_4_19.yml} | 0
ci/{kernel_5_10.yml => xenomai_3_kernel_5_10.yml} | 0
ci/{kernel_5_15.yml => xenomai_3_kernel_5_15.yml} | 0
ci/{kernel_5_4.yml => xenomai_3_kernel_5_4.yml} | 0
ci/{kernel_6_1.yml => xenomai_3_kernel_6_1.yml} | 0
ci/{xenomai_next.yml => xenomai_3_next.yml} | 8 ++++----
...i_next_compat.yml => xenomai_3_next_compat.yml} | 0
10 files changed, 22 insertions(+), 10 deletions(-)
rename ci/{kernel_4_19.yml => xenomai_3_kernel_4_19.yml} (100%)
rename ci/{kernel_5_10.yml => xenomai_3_kernel_5_10.yml} (100%)
rename ci/{kernel_5_15.yml => xenomai_3_kernel_5_15.yml} (100%)
rename ci/{kernel_5_4.yml => xenomai_3_kernel_5_4.yml} (100%)
rename ci/{kernel_6_1.yml => xenomai_3_kernel_6_1.yml} (100%)
rename ci/{xenomai_next.yml => xenomai_3_next.yml} (66%)
rename ci/{xenomai_next_compat.yml => xenomai_3_next_compat.yml} (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e4f1df..1120f20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,4 +48,16 @@ next:
extends: .parent
trigger:
include:
- - local: '/ci/xenomai_next.yml'
+ - local: '/ci/xenomai_3_next.yml'
+
+xen4-master:
+ extends: .parent
+ trigger:
+ include:
+ - local: '/ci/xenomai_4_master.yml'
+
+xen4-next:
+ extends: .parent
+ trigger:
+ include:
+ - local: '/ci/xenomai_4_next.yml'
diff --git a/ci/xenomai_3_1_x.yml b/ci/xenomai_3_1_x.yml
index b6f0010..07735d2 100644
--- a/ci/xenomai_3_1_x.yml
+++ b/ci/xenomai_3_1_x.yml
@@ -11,7 +11,7 @@
include:
- local: '/ci/gitlab-ci-base.yml'
- - local: '/ci/kernel_4_19.yml'
+ - local: '/ci/xenomai_3_kernel_4_19.yml'
variables:
XENOMAI_BUILD_OPTION: ":opt-xenomai-3.1.x.yml"
diff --git a/ci/xenomai_3_2_x.yml b/ci/xenomai_3_2_x.yml
index 781eec8..bb2ebe7 100644
--- a/ci/xenomai_3_2_x.yml
+++ b/ci/xenomai_3_2_x.yml
@@ -11,10 +11,10 @@
include:
- local: '/ci/gitlab-ci-base.yml'
- - local: '/ci/kernel_4_19.yml'
- - local: '/ci/kernel_5_4.yml'
- - local: '/ci/kernel_5_10.yml'
- - local: '/ci/kernel_5_15.yml'
+ - local: '/ci/xenomai_3_kernel_4_19.yml'
+ - local: '/ci/xenomai_3_kernel_5_4.yml'
+ - local: '/ci/xenomai_3_kernel_5_10.yml'
+ - local: '/ci/xenomai_3_kernel_5_15.yml'
- local: '/ci/xenomai_3_2_x_compat.yml'
variables:
diff --git a/ci/kernel_4_19.yml b/ci/xenomai_3_kernel_4_19.yml
similarity index 100%
rename from ci/kernel_4_19.yml
rename to ci/xenomai_3_kernel_4_19.yml
diff --git a/ci/kernel_5_10.yml b/ci/xenomai_3_kernel_5_10.yml
similarity index 100%
rename from ci/kernel_5_10.yml
rename to ci/xenomai_3_kernel_5_10.yml
diff --git a/ci/kernel_5_15.yml b/ci/xenomai_3_kernel_5_15.yml
similarity index 100%
rename from ci/kernel_5_15.yml
rename to ci/xenomai_3_kernel_5_15.yml
diff --git a/ci/kernel_5_4.yml b/ci/xenomai_3_kernel_5_4.yml
similarity index 100%
rename from ci/kernel_5_4.yml
rename to ci/xenomai_3_kernel_5_4.yml
diff --git a/ci/kernel_6_1.yml b/ci/xenomai_3_kernel_6_1.yml
similarity index 100%
rename from ci/kernel_6_1.yml
rename to ci/xenomai_3_kernel_6_1.yml
diff --git a/ci/xenomai_next.yml b/ci/xenomai_3_next.yml
similarity index 66%
rename from ci/xenomai_next.yml
rename to ci/xenomai_3_next.yml
index b611e60..0ee3767 100644
--- a/ci/xenomai_next.yml
+++ b/ci/xenomai_3_next.yml
@@ -11,10 +11,10 @@
include:
- local: '/ci/gitlab-ci-base.yml'
- - local: '/ci/kernel_5_10.yml'
- - local: '/ci/kernel_5_15.yml'
- - local: '/ci/kernel_6_1.yml'
- - local: '/ci/xenomai_next_compat.yml'
+ - local: '/ci/xenomai_3_kernel_5_10.yml'
+ - local: '/ci/xenomai_3_kernel_5_15.yml'
+ - local: '/ci/xenomai_3_kernel_6_1.yml'
+ - local: '/ci/xenomai_3_next_compat.yml'
variables:
XENOMAI_BUILD_OPTION: ":opt-xenomai-next.yml"
diff --git a/ci/xenomai_next_compat.yml b/ci/xenomai_3_next_compat.yml
similarity index 100%
rename from ci/xenomai_next_compat.yml
rename to ci/xenomai_3_next_compat.yml
--
2.39.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [xenomai-images][PATCH v2 6/7] ci: Add xenomai-4 test cases
2023-12-21 16:37 [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images Clara Kowalsky
` (4 preceding siblings ...)
2023-12-21 16:37 ` [xenomai-images][PATCH v2 5/7] ci: Rename xenomai 3 files Clara Kowalsky
@ 2023-12-21 16:37 ` Clara Kowalsky
2023-12-21 16:37 ` [xenomai-images][PATCH v2 7/7] kconfig: Add build options for evl Clara Kowalsky
2024-01-04 16:14 ` [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images Jan Kiszka
7 siblings, 0 replies; 14+ messages in thread
From: Clara Kowalsky @ 2023-12-21 16:37 UTC (permalink / raw)
To: xenomai, rpm; +Cc: jan.kiszka, Clara Kowalsky
Test cases are added for the linux-evl kernel v6.1 and v6.6.
Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
---
ci/xenomai_4_kernel_6_1.yml | 17 +++++++++++++++++
ci/xenomai_4_kernel_6_6.yml | 17 +++++++++++++++++
ci/xenomai_4_master.yml | 20 ++++++++++++++++++++
ci/xenomai_4_next.yml | 20 ++++++++++++++++++++
ci/xenomai_4_r46.yml | 20 ++++++++++++++++++++
ci/xenomai_4_stable.yml | 20 ++++++++++++++++++++
6 files changed, 114 insertions(+)
create mode 100644 ci/xenomai_4_kernel_6_1.yml
create mode 100644 ci/xenomai_4_kernel_6_6.yml
create mode 100644 ci/xenomai_4_master.yml
create mode 100644 ci/xenomai_4_next.yml
create mode 100644 ci/xenomai_4_r46.yml
create mode 100644 ci/xenomai_4_stable.yml
diff --git a/ci/xenomai_4_kernel_6_1.yml b/ci/xenomai_4_kernel_6_1.yml
new file mode 100644
index 0000000..7f96611
--- /dev/null
+++ b/ci/xenomai_4_kernel_6_1.yml
@@ -0,0 +1,17 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2022-2023
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+build-6.1:qemu-amd64:
+ extends: .build:qemu-amd64
+ variables:
+ LINUX_BUILD_OPTION: ":opt-xen4-linux-latest-6.1.yml"
+ KERNEL_VERSION: "6.1"
+ LATEST_KERNEL_VERSION: "6.1"
diff --git a/ci/xenomai_4_kernel_6_6.yml b/ci/xenomai_4_kernel_6_6.yml
new file mode 100644
index 0000000..b29ab71
--- /dev/null
+++ b/ci/xenomai_4_kernel_6_6.yml
@@ -0,0 +1,17 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2022-2023
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+build-6.6:qemu-amd64:
+ extends: .build:qemu-amd64
+ variables:
+ LINUX_BUILD_OPTION: ":opt-xen4-linux-latest-6.6.yml"
+ KERNEL_VERSION: "6.6"
+ LATEST_KERNEL_VERSION: "6.6"
diff --git a/ci/xenomai_4_master.yml b/ci/xenomai_4_master.yml
new file mode 100644
index 0000000..9af0aa7
--- /dev/null
+++ b/ci/xenomai_4_master.yml
@@ -0,0 +1,20 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2019 - 2022
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+include:
+ - local: '/ci/gitlab-ci-base.yml'
+ - local: '/ci/xenomai_4_kernel_6_1.yml'
+ - local: '/ci/xenomai_4_kernel_6_6.yml'
+
+variables:
+ XENOMAI_BUILD_OPTION: ":opt-libevl-master.yml"
+ XENOMAI_VERSION: "master"
+ BUILD_IDENTIFIER: "xen4-${XENOMAI_VERSION}_kernel-${KERNEL_VERSION}"
diff --git a/ci/xenomai_4_next.yml b/ci/xenomai_4_next.yml
new file mode 100644
index 0000000..9c6ec2e
--- /dev/null
+++ b/ci/xenomai_4_next.yml
@@ -0,0 +1,20 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2019 - 2022
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+include:
+ - local: '/ci/gitlab-ci-base.yml'
+ - local: '/ci/xenomai_4_kernel_6_1.yml'
+ - local: '/ci/xenomai_4_kernel_6_6.yml'
+
+variables:
+ XENOMAI_BUILD_OPTION: ":opt-libevl-next.yml"
+ XENOMAI_VERSION: "next"
+ BUILD_IDENTIFIER: "xen4-${XENOMAI_VERSION}_kernel-${KERNEL_VERSION}"
diff --git a/ci/xenomai_4_r46.yml b/ci/xenomai_4_r46.yml
new file mode 100644
index 0000000..c3f3469
--- /dev/null
+++ b/ci/xenomai_4_r46.yml
@@ -0,0 +1,20 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2019 - 2022
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+include:
+ - local: '/ci/gitlab-ci-base.yml'
+ - local: '/ci/xenomai_4_kernel_6_1.yml'
+ - local: '/ci/xenomai_4_kernel_6_6.yml'
+
+variables:
+ XENOMAI_BUILD_OPTION: ":opt-libevl-r46.yml"
+ XENOMAI_VERSION: "r46"
+ BUILD_IDENTIFIER: "xen4-${XENOMAI_VERSION}_kernel-${KERNEL_VERSION}"
diff --git a/ci/xenomai_4_stable.yml b/ci/xenomai_4_stable.yml
new file mode 100644
index 0000000..c6b1b07
--- /dev/null
+++ b/ci/xenomai_4_stable.yml
@@ -0,0 +1,20 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2019 - 2022
+#
+# Authors:
+# Clara Kowalsky <clara.kowalsky@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+include:
+ - local: '/ci/gitlab-ci-base.yml'
+ - local: '/ci/xenomai_4_kernel_6_1.yml'
+ - local: '/ci/xenomai_4_kernel_6_6.yml'
+
+variables:
+ XENOMAI_BUILD_OPTION: ":opt-libevl-stable.yml"
+ XENOMAI_VERSION: "stable"
+ BUILD_IDENTIFIER: "xen4-${XENOMAI_VERSION}_kernel-${KERNEL_VERSION}"
--
2.39.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [xenomai-images][PATCH v2 7/7] kconfig: Add build options for evl
2023-12-21 16:37 [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images Clara Kowalsky
` (5 preceding siblings ...)
2023-12-21 16:37 ` [xenomai-images][PATCH v2 6/7] ci: Add xenomai-4 test cases Clara Kowalsky
@ 2023-12-21 16:37 ` Clara Kowalsky
2024-01-04 16:14 ` [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images Jan Kiszka
7 siblings, 0 replies; 14+ messages in thread
From: Clara Kowalsky @ 2023-12-21 16:37 UTC (permalink / raw)
To: xenomai, rpm; +Cc: jan.kiszka, Clara Kowalsky
Options are included to build the linux-evl kernel v6.1 and v6.6.
Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
---
Kconfig | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/Kconfig b/Kconfig
index 953634e..65a9c2f 100644
--- a/Kconfig
+++ b/Kconfig
@@ -58,6 +58,20 @@ config KAS_INCLUDE_TARGET
choice
prompt "Xenomai version"
+ default XENOMAI3
+
+config XENOMAI3
+ bool "Xenomai 3"
+
+config XENOMAI4
+ bool "Xenomai 4 / EVL"
+
+endchoice
+
+if XENOMAI3
+
+choice
+ prompt "Xenomai 3 subversion"
default XENOMAI_3_2
config XENOMAI_LATEST
@@ -183,3 +197,51 @@ config COMPAT
config KAS_INCLUDE_COMPAT
string
default "opt-compat.yml" if COMPAT
+
+endif # if XENOMAI3
+
+if XENOMAI4
+
+choice
+ prompt "Kernel version"
+ default LINUX_XEN4_6_1_LATEST
+
+config LINUX_XEN4_6_1_LATEST
+ bool "Head of 6.1 Linux-evl branch"
+
+config LINUX_XEN4_6_6_LATEST
+ bool "Head of 6.6 Linux-evl branch"
+
+endchoice
+
+config KAS_INCLUDE_LINUX_XEN4
+ string
+ default "opt-xen4-linux-latest-6.1.yml" if LINUX_XEN4_6_1_LATEST
+ default "opt-xen4-linux-latest-6.6.yml" if LINUX_XEN4_6_6_LATEST
+
+choice
+ prompt "Libevl version"
+ default LIBEVL_MASTER
+
+config LIBEVL_MASTER
+ bool "Head of master branch"
+
+config LIBEVL_NEXT
+ bool "Head of next branch"
+
+config LIBEVL_STABLE
+ bool "Latest tag"
+
+config LIBEVL_R46
+ bool "Latest release"
+
+endchoice
+
+config KAS_INCLUDE_LIBEVL
+ string
+ default "opt-libevl-master.yml" if LIBEVL_MASTER
+ default "opt-libevl-next.yml" if LIBEVL_NEXT
+ default "opt-libevl-stable.yml" if LIBEVL_STABLE
+ default "opt-libevl-r46.yml" if LIBEVL_R46
+
+endif # if XENOMAI4
--
2.39.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [xenomai-images][PATCH v2 2/7] xenomai-3: Mark xenomai 3 specific configs
2023-12-21 16:37 ` [xenomai-images][PATCH v2 2/7] xenomai-3: Mark xenomai 3 specific configs Clara Kowalsky
@ 2024-01-04 12:38 ` Jan Kiszka
0 siblings, 0 replies; 14+ messages in thread
From: Jan Kiszka @ 2024-01-04 12:38 UTC (permalink / raw)
To: Clara Kowalsky, xenomai, rpm
On 21.12.23 17:37, Clara Kowalsky wrote:
> In preparation for the integration of EVL, a xenomai-3 override is
> added.
>
> Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
> ---
> conf/distro/xenomai-demo.conf | 2 +-
> opt-xenomai-3.0.x.yml | 2 ++
> opt-xenomai-3.1.x.yml | 2 ++
> opt-xenomai-3.2.x.yml | 2 ++
> opt-xenomai-next.yml | 2 ++
> recipes-core/images/demo-image.bb | 8 ++++----
> recipes-kernel/linux/linux-xenomai-3_latest.bb | 2 +-
> 7 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/conf/distro/xenomai-demo.conf b/conf/distro/xenomai-demo.conf
> index c99669d..d96cdaf 100644
> --- a/conf/distro/xenomai-demo.conf
> +++ b/conf/distro/xenomai-demo.conf
> @@ -16,7 +16,7 @@ include conf/distro/include/xenomai-version.inc
>
> HOST_DISTRO ?= "debian-bookworm"
>
> -KERNEL_NAME = "xenomai"
> +KERNEL_NAME:xenomai3 = "xenomai-3"
>
> WKS_FILE = "${MACHINE}.wks"
>
> diff --git a/opt-xenomai-3.0.x.yml b/opt-xenomai-3.0.x.yml
> index 4559de8..35714b1 100644
> --- a/opt-xenomai-3.0.x.yml
> +++ b/opt-xenomai-3.0.x.yml
> @@ -15,3 +15,5 @@ header:
> local_conf_header:
> xenomai-3-0-x: |
> PREFERRED_VERSION_xenomai = "stable-3.0.x"
> + xenomai-3_override: |
> + OVERRIDES .= ":xenomai3"
> diff --git a/opt-xenomai-3.1.x.yml b/opt-xenomai-3.1.x.yml
> index 2479e96..c5417d7 100644
> --- a/opt-xenomai-3.1.x.yml
> +++ b/opt-xenomai-3.1.x.yml
> @@ -15,3 +15,5 @@ header:
> local_conf_header:
> xenomai-3-1-x: |
> PREFERRED_VERSION_xenomai = "stable-3.1.x"
> + xenomai-3_override: |
> + OVERRIDES .= ":xenomai3"
> diff --git a/opt-xenomai-3.2.x.yml b/opt-xenomai-3.2.x.yml
> index 1abcef9..54d0e9a 100644
> --- a/opt-xenomai-3.2.x.yml
> +++ b/opt-xenomai-3.2.x.yml
> @@ -15,3 +15,5 @@ header:
> local_conf_header:
> xenomai-3-2-x: |
> PREFERRED_VERSION_xenomai = "stable-3.2.x"
> + xenomai-3_override: |
> + OVERRIDES .= ":xenomai3"
> diff --git a/opt-xenomai-next.yml b/opt-xenomai-next.yml
> index ba0b2da..9d74ed0 100644
> --- a/opt-xenomai-next.yml
> +++ b/opt-xenomai-next.yml
> @@ -15,3 +15,5 @@ header:
> local_conf_header:
> xenomai-latest: |
> PREFERRED_VERSION_xenomai = "next"
> + xenomai-3_override: |
> + OVERRIDES .= ":xenomai3"
> diff --git a/recipes-core/images/demo-image.bb b/recipes-core/images/demo-image.bb
> index 540583b..db7e2c7 100644
> --- a/recipes-core/images/demo-image.bb
> +++ b/recipes-core/images/demo-image.bb
> @@ -33,7 +33,7 @@ def get_testsuite_package_names(d):
>
> # Install gdb only for older stable releases. Enables gdb tests and avoids a
> # arch missmatch for compat builds on newer releases.
> -IMAGE_PREINSTALL += "${@ 'gdb' if not has_testsuite_package(d) else '' }"
> +IMAGE_PREINSTALL:append:xenomai3 = " ${@ 'gdb' if not has_testsuite_package(d) else '' }"
>
> IMAGE_PREINSTALL += " \
> bash-completion less vim nano man \
> @@ -41,7 +41,7 @@ IMAGE_PREINSTALL += " \
> iw wireless-tools wpasupplicant dbus \
> lsb-release"
>
> -IMAGE_INSTALL += "xenomai-runtime xenomai-runtime-dbgsym"
> -IMAGE_INSTALL += "${@get_testsuite_package_names(d)}"
> -IMAGE_INSTALL += "libxenomai1-dbgsym"
> +IMAGE_INSTALL:append:xenomai3 = " xenomai-runtime xenomai-runtime-dbgsym"
> +IMAGE_INSTALL:append:xenomai3 = " ${@get_testsuite_package_names(d)}"
> +IMAGE_INSTALL:append:xenomai3 = " libxenomai1-dbgsym"
> IMAGE_INSTALL += "customizations sshd-regen-keys expand-on-first-boot"
> diff --git a/recipes-kernel/linux/linux-xenomai-3_latest.bb b/recipes-kernel/linux/linux-xenomai-3_latest.bb
> index adda9b5..a9c223a 100644
> --- a/recipes-kernel/linux/linux-xenomai-3_latest.bb
> +++ b/recipes-kernel/linux/linux-xenomai-3_latest.bb
> @@ -72,6 +72,6 @@ GIT_BRANCH:arm64 = "${@ \
> else d.getVar('LATEST_KERNEL_BRANCH') }"
>
> SRC_URI += "${GIT_REPO};protocol=https;branch=${GIT_BRANCH}"
> -SRCREV = "${AUTOREV}"
> +SRCREV:xenomai3 = "${AUTOREV}"
Why do we need to override here, in a xenomai-3-only recipe?
Jan
>
> SRC_URI:append:beagle-bone-black = " ${@ 'file://bbb_4.4.cfg' if is_xeno_3_0(d) else '' }"
--
Siemens AG, Technology
Linux Expert Center
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [xenomai-images][PATCH v2 3/7] xenomai-4: Enable kernel build
2023-12-21 16:37 ` [xenomai-images][PATCH v2 3/7] xenomai-4: Enable kernel build Clara Kowalsky
@ 2024-01-04 12:40 ` Jan Kiszka
2024-01-04 13:51 ` Jan Kiszka
1 sibling, 0 replies; 14+ messages in thread
From: Jan Kiszka @ 2024-01-04 12:40 UTC (permalink / raw)
To: Clara Kowalsky, xenomai, rpm
On 21.12.23 17:37, Clara Kowalsky wrote:
> This permits to build the linux-evl kernel v6.1 and v6.6.
>
> Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
> ---
> conf/distro/xenomai-demo.conf | 1 +
> opt-xen4-linux-latest-6.1.yml | 18 ++++++++++++++++
> opt-xen4-linux-latest-6.6.yml | 18 ++++++++++++++++
> recipes-kernel/linux/files/xen4.cfg | 3 +++
> recipes-kernel/linux/linux-xenomai-4.inc | 24 +++++++++++++++++++++
> recipes-kernel/linux/linux-xenomai-4_6.1.bb | 14 ++++++++++++
> recipes-kernel/linux/linux-xenomai-4_6.6.bb | 14 ++++++++++++
> 7 files changed, 92 insertions(+)
> create mode 100644 opt-xen4-linux-latest-6.1.yml
> create mode 100644 opt-xen4-linux-latest-6.6.yml
> create mode 100644 recipes-kernel/linux/files/xen4.cfg
> create mode 100644 recipes-kernel/linux/linux-xenomai-4.inc
> create mode 100644 recipes-kernel/linux/linux-xenomai-4_6.1.bb
> create mode 100644 recipes-kernel/linux/linux-xenomai-4_6.6.bb
>
> diff --git a/conf/distro/xenomai-demo.conf b/conf/distro/xenomai-demo.conf
> index d96cdaf..db5a5df 100644
> --- a/conf/distro/xenomai-demo.conf
> +++ b/conf/distro/xenomai-demo.conf
> @@ -17,6 +17,7 @@ include conf/distro/include/xenomai-version.inc
> HOST_DISTRO ?= "debian-bookworm"
>
> KERNEL_NAME:xenomai3 = "xenomai-3"
> +KERNEL_NAME:xenomai4 = "xenomai-4"
>
> WKS_FILE = "${MACHINE}.wks"
>
> diff --git a/opt-xen4-linux-latest-6.1.yml b/opt-xen4-linux-latest-6.1.yml
> new file mode 100644
> index 0000000..a71cf92
> --- /dev/null
> +++ b/opt-xen4-linux-latest-6.1.yml
> @@ -0,0 +1,18 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> + version: 10
We are at 14 by now.
> +
> +local_conf_header:
> + linux-xenomai-version: |
> + PREFERRED_VERSION_linux-xenomai-4 = "6.1"
> + LATEST_GIT_BRANCH = "6.1"
> diff --git a/opt-xen4-linux-latest-6.6.yml b/opt-xen4-linux-latest-6.6.yml
> new file mode 100644
> index 0000000..5710222
> --- /dev/null
> +++ b/opt-xen4-linux-latest-6.6.yml
> @@ -0,0 +1,18 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> + version: 10
> +
> +local_conf_header:
> + linux-xenomai-version: |
> + PREFERRED_VERSION_linux-xenomai-4 = "6.6"
> + LATEST_GIT_BRANCH = "6.6"
> diff --git a/recipes-kernel/linux/files/xen4.cfg b/recipes-kernel/linux/files/xen4.cfg
> new file mode 100644
> index 0000000..0460249
> --- /dev/null
> +++ b/recipes-kernel/linux/files/xen4.cfg
> @@ -0,0 +1,3 @@
> +CONFIG_EVL=y
> +CONFIG_EVL_SCHED_QUOTA=y
> +CONFIG_EVL_SCHED_TP=y
> \ No newline at end of file
> diff --git a/recipes-kernel/linux/linux-xenomai-4.inc b/recipes-kernel/linux/linux-xenomai-4.inc
> new file mode 100644
> index 0000000..d91d618
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-xenomai-4.inc
> @@ -0,0 +1,24 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2018-2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +require recipes-kernel/linux/linux-xenomai.inc
> +
> +KERNEL_LIBC_DEV_DEPLOY = "1"
> +
> +SRC_URI += "file://xen4.cfg"
> +
> +SRC_URI += "git://source.denx.de/Xenomai/xenomai4/linux-evl.git;protocol=https;nobranch=1"
> +PV ?= "${@d.getVar('SRCREV').strip('-')[0].lstrip('v')}+"
> +
> +dpkg_runbuild:prepend() {
> + bbplain $(printf "linux-xenomai-4-%s: Building revision %.20s\n" \
> + ${PV} ${LINUX_COMMIT})
> +}
> diff --git a/recipes-kernel/linux/linux-xenomai-4_6.1.bb b/recipes-kernel/linux/linux-xenomai-4_6.1.bb
> new file mode 100644
> index 0000000..89683dc
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-xenomai-4_6.1.bb
> @@ -0,0 +1,14 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2021-2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +require recipes-kernel/linux/linux-xenomai-4.inc
> +
> +SRCREV ?= "v6.1.y-evl-rebase"
> diff --git a/recipes-kernel/linux/linux-xenomai-4_6.6.bb b/recipes-kernel/linux/linux-xenomai-4_6.6.bb
> new file mode 100644
> index 0000000..0ce145e
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-xenomai-4_6.6.bb
> @@ -0,0 +1,14 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2021-2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +require recipes-kernel/linux/linux-xenomai-4.inc
> +
> +SRCREV ?= "v6.6-evl-rebase"
Jan
--
Siemens AG, Technology
Linux Expert Center
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [xenomai-images][PATCH v2 4/7] xenomai-4: Add evl userspace
2023-12-21 16:37 ` [xenomai-images][PATCH v2 4/7] xenomai-4: Add evl userspace Clara Kowalsky
@ 2024-01-04 12:41 ` Jan Kiszka
2024-01-04 14:57 ` Jan Kiszka
1 sibling, 0 replies; 14+ messages in thread
From: Jan Kiszka @ 2024-01-04 12:41 UTC (permalink / raw)
To: Clara Kowalsky, xenomai, rpm
On 21.12.23 17:37, Clara Kowalsky wrote:
> The libevl recipe allows building the evl userspace.
>
> Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
> ---
> opt-libevl-master.yml | 19 ++++++++
> opt-libevl-next.yml | 20 ++++++++
> opt-libevl-r46.yml | 19 ++++++++
> opt-libevl-stable.yml | 19 ++++++++
> recipes-core/images/demo-image.bb | 2 +
> recipes-xenomai/libevl/files/debian/compat | 1 +
> .../libevl/files/debian/control.tmpl | 10 ++++
> recipes-xenomai/libevl/files/debian/rules | 7 +++
> recipes-xenomai/libevl/libevl_master.bb | 47 +++++++++++++++++++
> recipes-xenomai/libevl/libevl_next.bb | 1 +
> recipes-xenomai/libevl/libevl_r46.bb | 46 ++++++++++++++++++
> recipes-xenomai/libevl/libevl_r47.bb | 1 +
> 12 files changed, 192 insertions(+)
> create mode 100644 opt-libevl-master.yml
> create mode 100644 opt-libevl-next.yml
> create mode 100644 opt-libevl-r46.yml
> create mode 100644 opt-libevl-stable.yml
> create mode 100644 recipes-xenomai/libevl/files/debian/compat
> create mode 100644 recipes-xenomai/libevl/files/debian/control.tmpl
> create mode 100755 recipes-xenomai/libevl/files/debian/rules
> create mode 100644 recipes-xenomai/libevl/libevl_master.bb
> create mode 120000 recipes-xenomai/libevl/libevl_next.bb
> create mode 100644 recipes-xenomai/libevl/libevl_r46.bb
> create mode 120000 recipes-xenomai/libevl/libevl_r47.bb
>
> diff --git a/opt-libevl-master.yml b/opt-libevl-master.yml
> new file mode 100644
> index 0000000..a3fb14f
> --- /dev/null
> +++ b/opt-libevl-master.yml
> @@ -0,0 +1,19 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> + version: 10
> +
> +local_conf_header:
> + libevl-version: |
> + PREFERRED_VERSION_libevl = "master"
> + xenomai-4_override: |
> + OVERRIDES .= ":xenomai4"
> diff --git a/opt-libevl-next.yml b/opt-libevl-next.yml
> new file mode 100644
> index 0000000..5e22d43
> --- /dev/null
> +++ b/opt-libevl-next.yml
> @@ -0,0 +1,20 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> + version: 10
> +
> +local_conf_header:
> + libevl-version: |
> + PREFERRED_VERSION_libevl = "next"
> + xenomai-4_override: |
> + OVERRIDES .= ":xenomai4"
> +
".git/rebase-apply/patch:77: new blank line at EOF."
Jan
> diff --git a/opt-libevl-r46.yml b/opt-libevl-r46.yml
> new file mode 100644
> index 0000000..53d15f0
> --- /dev/null
> +++ b/opt-libevl-r46.yml
> @@ -0,0 +1,19 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> + version: 10
> +
> +local_conf_header:
> + libevl-version: |
> + PREFERRED_VERSION_libevl = "r46"
> + xenomai-4_override: |
> + OVERRIDES .= ":xenomai4"
> diff --git a/opt-libevl-stable.yml b/opt-libevl-stable.yml
> new file mode 100644
> index 0000000..d9ce4a1
> --- /dev/null
> +++ b/opt-libevl-stable.yml
> @@ -0,0 +1,19 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> + version: 10
> +
> +local_conf_header:
> + libevl-version: |
> + PREFERRED_VERSION_libevl = "r47"
> + xenomai-4_override: |
> + OVERRIDES .= ":xenomai4"
> diff --git a/recipes-core/images/demo-image.bb b/recipes-core/images/demo-image.bb
> index db7e2c7..e19a038 100644
> --- a/recipes-core/images/demo-image.bb
> +++ b/recipes-core/images/demo-image.bb
> @@ -44,4 +44,6 @@ IMAGE_PREINSTALL += " \
> IMAGE_INSTALL:append:xenomai3 = " xenomai-runtime xenomai-runtime-dbgsym"
> IMAGE_INSTALL:append:xenomai3 = " ${@get_testsuite_package_names(d)}"
> IMAGE_INSTALL:append:xenomai3 = " libxenomai1-dbgsym"
> +IMAGE_INSTALL:append:xenomai4 = " libevl"
> +
> IMAGE_INSTALL += "customizations sshd-regen-keys expand-on-first-boot"
> diff --git a/recipes-xenomai/libevl/files/debian/compat b/recipes-xenomai/libevl/files/debian/compat
> new file mode 100644
> index 0000000..f599e28
> --- /dev/null
> +++ b/recipes-xenomai/libevl/files/debian/compat
> @@ -0,0 +1 @@
> +10
> diff --git a/recipes-xenomai/libevl/files/debian/control.tmpl b/recipes-xenomai/libevl/files/debian/control.tmpl
> new file mode 100644
> index 0000000..9880ee9
> --- /dev/null
> +++ b/recipes-xenomai/libevl/files/debian/control.tmpl
> @@ -0,0 +1,10 @@
> +Source: ${PN}
> +Section: misc
> +Priority: optional
> +Standards-Version: 3.9.6
> +Maintainer: Xenomai project <xenomai@lists.linux.dev>
> +Build-Depends: ${DEBIAN_BUILD_DEPENDS}
> +
> +Package: libevl
> +Architecture: ${DISTRO_ARCH}
> +Description: ${DESCRIPTION}
> diff --git a/recipes-xenomai/libevl/files/debian/rules b/recipes-xenomai/libevl/files/debian/rules
> new file mode 100755
> index 0000000..9d9670e
> --- /dev/null
> +++ b/recipes-xenomai/libevl/files/debian/rules
> @@ -0,0 +1,7 @@
> +#!/usr/bin/make -f
> +
> +override_dh_fixperms:
> + dh_fixperms
> +
> +%:
> + dh $@ --buildsystem=meson
> diff --git a/recipes-xenomai/libevl/libevl_master.bb b/recipes-xenomai/libevl/libevl_master.bb
> new file mode 100644
> index 0000000..d5ad572
> --- /dev/null
> +++ b/recipes-xenomai/libevl/libevl_master.bb
> @@ -0,0 +1,47 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2018-2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +inherit dpkg
> +
> +CHANGELOG_V = "9999-${PV}"
> +SRCREV = "${AUTOREV}"
> +
> +SRC_URI = " \
> + git://source.denx.de/Xenomai/xenomai4/libevl.git;protocol=https;branch=${PV} \
> + file://debian \
> + "
> +
> +DEPENDS="linux-xenomai-4"
> +
> +S = "${WORKDIR}/git"
> +
> +def get_commit(d):
> + try:
> + return bb.fetch2.get_srcrev(d).strip('AUTOINC+')
> + except bb.fetch2.FetchError:
> + return ""
> +
> +COMMIT="${@get_commit(d)}"
> +
> +DESCRIPTION ?= "install libevl libraries and tools"
> +DEBIAN_BUILD_DEPENDS ?= "debhelper (>= 10), meson, linux-libc-dev"
> +
> +TEMPLATE_FILES = "debian/control.tmpl"
> +TEMPLATE_VARS += "DEBIAN_BUILD_DEPENDS"
> +
> +do_prepare_build[cleandirs] += "${S}/debian"
> +do_prepare_build() {
> + cp -r ${WORKDIR}/debian ${S}
> + deb_add_changelog
> +
> + bbplain $(printf "libevl-%s: Building revision %.20s\n" \
> + ${PV} ${COMMIT})
> +}
> diff --git a/recipes-xenomai/libevl/libevl_next.bb b/recipes-xenomai/libevl/libevl_next.bb
> new file mode 120000
> index 0000000..85ab518
> --- /dev/null
> +++ b/recipes-xenomai/libevl/libevl_next.bb
> @@ -0,0 +1 @@
> +libevl_master.bb
> \ No newline at end of file
> diff --git a/recipes-xenomai/libevl/libevl_r46.bb b/recipes-xenomai/libevl/libevl_r46.bb
> new file mode 100644
> index 0000000..a8bc597
> --- /dev/null
> +++ b/recipes-xenomai/libevl/libevl_r46.bb
> @@ -0,0 +1,46 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2018-2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +inherit dpkg
> +
> +CHANGELOG_V = "9999-${PV}"
> +
> +SRC_URI = " \
> + git://source.denx.de/Xenomai/xenomai4/libevl.git;protocol=https;branch=master;tag=${PV} \
> + file://debian \
> + "
> +
> +DEPENDS="linux-xenomai-4"
> +
> +S = "${WORKDIR}/git"
> +
> +def get_commit(d):
> + try:
> + return bb.fetch2.get_srcrev(d).strip('AUTOINC+')
> + except bb.fetch2.FetchError:
> + return ""
> +
> +COMMIT="${@get_commit(d)}"
> +
> +DESCRIPTION ?= "install libevl libraries and tools"
> +DEBIAN_BUILD_DEPENDS ?= "debhelper (>= 10), meson, linux-libc-dev"
> +
> +TEMPLATE_FILES = "debian/control.tmpl"
> +TEMPLATE_VARS += "DEBIAN_BUILD_DEPENDS"
> +
> +do_prepare_build[cleandirs] += "${S}/debian"
> +do_prepare_build() {
> + cp -r ${WORKDIR}/debian ${S}
> + deb_add_changelog
> +
> + bbplain $(printf "libevl-%s: Building revision %.20s\n" \
> + ${PV} ${COMMIT})
> +}
> diff --git a/recipes-xenomai/libevl/libevl_r47.bb b/recipes-xenomai/libevl/libevl_r47.bb
> new file mode 120000
> index 0000000..54ca27a
> --- /dev/null
> +++ b/recipes-xenomai/libevl/libevl_r47.bb
> @@ -0,0 +1 @@
> +libevl_r46.bb
> \ No newline at end of file
--
Siemens AG, Technology
Linux Expert Center
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [xenomai-images][PATCH v2 3/7] xenomai-4: Enable kernel build
2023-12-21 16:37 ` [xenomai-images][PATCH v2 3/7] xenomai-4: Enable kernel build Clara Kowalsky
2024-01-04 12:40 ` Jan Kiszka
@ 2024-01-04 13:51 ` Jan Kiszka
1 sibling, 0 replies; 14+ messages in thread
From: Jan Kiszka @ 2024-01-04 13:51 UTC (permalink / raw)
To: Clara Kowalsky, xenomai, rpm
On 21.12.23 17:37, Clara Kowalsky wrote:
> This permits to build the linux-evl kernel v6.1 and v6.6.
>
> Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
> ---
> conf/distro/xenomai-demo.conf | 1 +
> opt-xen4-linux-latest-6.1.yml | 18 ++++++++++++++++
> opt-xen4-linux-latest-6.6.yml | 18 ++++++++++++++++
> recipes-kernel/linux/files/xen4.cfg | 3 +++
> recipes-kernel/linux/linux-xenomai-4.inc | 24 +++++++++++++++++++++
> recipes-kernel/linux/linux-xenomai-4_6.1.bb | 14 ++++++++++++
> recipes-kernel/linux/linux-xenomai-4_6.6.bb | 14 ++++++++++++
> 7 files changed, 92 insertions(+)
> create mode 100644 opt-xen4-linux-latest-6.1.yml
> create mode 100644 opt-xen4-linux-latest-6.6.yml
> create mode 100644 recipes-kernel/linux/files/xen4.cfg
> create mode 100644 recipes-kernel/linux/linux-xenomai-4.inc
> create mode 100644 recipes-kernel/linux/linux-xenomai-4_6.1.bb
> create mode 100644 recipes-kernel/linux/linux-xenomai-4_6.6.bb
>
> diff --git a/conf/distro/xenomai-demo.conf b/conf/distro/xenomai-demo.conf
> index d96cdaf..db5a5df 100644
> --- a/conf/distro/xenomai-demo.conf
> +++ b/conf/distro/xenomai-demo.conf
> @@ -17,6 +17,7 @@ include conf/distro/include/xenomai-version.inc
> HOST_DISTRO ?= "debian-bookworm"
>
> KERNEL_NAME:xenomai3 = "xenomai-3"
> +KERNEL_NAME:xenomai4 = "xenomai-4"
>
> WKS_FILE = "${MACHINE}.wks"
>
> diff --git a/opt-xen4-linux-latest-6.1.yml b/opt-xen4-linux-latest-6.1.yml
> new file mode 100644
> index 0000000..a71cf92
> --- /dev/null
> +++ b/opt-xen4-linux-latest-6.1.yml
> @@ -0,0 +1,18 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> + version: 10
> +
> +local_conf_header:
> + linux-xenomai-version: |
> + PREFERRED_VERSION_linux-xenomai-4 = "6.1"
> + LATEST_GIT_BRANCH = "6.1"
> diff --git a/opt-xen4-linux-latest-6.6.yml b/opt-xen4-linux-latest-6.6.yml
> new file mode 100644
> index 0000000..5710222
> --- /dev/null
> +++ b/opt-xen4-linux-latest-6.6.yml
> @@ -0,0 +1,18 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> + version: 10
> +
> +local_conf_header:
> + linux-xenomai-version: |
> + PREFERRED_VERSION_linux-xenomai-4 = "6.6"
> + LATEST_GIT_BRANCH = "6.6"
> diff --git a/recipes-kernel/linux/files/xen4.cfg b/recipes-kernel/linux/files/xen4.cfg
> new file mode 100644
> index 0000000..0460249
> --- /dev/null
> +++ b/recipes-kernel/linux/files/xen4.cfg
> @@ -0,0 +1,3 @@
> +CONFIG_EVL=y
> +CONFIG_EVL_SCHED_QUOTA=y
> +CONFIG_EVL_SCHED_TP=y
> \ No newline at end of file
> diff --git a/recipes-kernel/linux/linux-xenomai-4.inc b/recipes-kernel/linux/linux-xenomai-4.inc
> new file mode 100644
> index 0000000..d91d618
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-xenomai-4.inc
> @@ -0,0 +1,24 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2018-2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +require recipes-kernel/linux/linux-xenomai.inc
> +
> +KERNEL_LIBC_DEV_DEPLOY = "1"
> +
> +SRC_URI += "file://xen4.cfg"
> +
> +SRC_URI += "git://source.denx.de/Xenomai/xenomai4/linux-evl.git;protocol=https;nobranch=1"
> +PV ?= "${@d.getVar('SRCREV').strip('-')[0].lstrip('v')}+"
> +
> +dpkg_runbuild:prepend() {
> + bbplain $(printf "linux-xenomai-4-%s: Building revision %.20s\n" \
> + ${PV} ${LINUX_COMMIT})
> +}
> diff --git a/recipes-kernel/linux/linux-xenomai-4_6.1.bb b/recipes-kernel/linux/linux-xenomai-4_6.1.bb
> new file mode 100644
> index 0000000..89683dc
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-xenomai-4_6.1.bb
> @@ -0,0 +1,14 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2021-2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +require recipes-kernel/linux/linux-xenomai-4.inc
> +
> +SRCREV ?= "v6.1.y-evl-rebase"
> diff --git a/recipes-kernel/linux/linux-xenomai-4_6.6.bb b/recipes-kernel/linux/linux-xenomai-4_6.6.bb
> new file mode 100644
> index 0000000..0ce145e
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-xenomai-4_6.6.bb
> @@ -0,0 +1,14 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2021-2023
> +#
> +# Authors:
> +# Clara Kowalsky <clara.kowalsky@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +require recipes-kernel/linux/linux-xenomai-4.inc
> +
> +SRCREV ?= "v6.6-evl-rebase"
This is v6.6.y-evl-rebase by now.
But we should rather introduce a linux-xenomai-4_latest.bb to track the
tree heads and reference a concrete release here and in
linux-xenomai-4_6.1.bb, just like we do for xenomai 3.
Jan
--
Siemens AG, Technology
Linux Expert Center
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [xenomai-images][PATCH v2 4/7] xenomai-4: Add evl userspace
2023-12-21 16:37 ` [xenomai-images][PATCH v2 4/7] xenomai-4: Add evl userspace Clara Kowalsky
2024-01-04 12:41 ` Jan Kiszka
@ 2024-01-04 14:57 ` Jan Kiszka
1 sibling, 0 replies; 14+ messages in thread
From: Jan Kiszka @ 2024-01-04 14:57 UTC (permalink / raw)
To: Clara Kowalsky, xenomai, rpm
On 21.12.23 17:37, Clara Kowalsky wrote:
> The libevl recipe allows building the evl userspace.
>
> Signed-off-by: Clara Kowalsky <clara.kowalsky@siemens.com>
> ---
> opt-libevl-master.yml | 19 ++++++++
> opt-libevl-next.yml | 20 ++++++++
> opt-libevl-r46.yml | 19 ++++++++
> opt-libevl-stable.yml | 19 ++++++++
> recipes-core/images/demo-image.bb | 2 +
> recipes-xenomai/libevl/files/debian/compat | 1 +
> .../libevl/files/debian/control.tmpl | 10 ++++
> recipes-xenomai/libevl/files/debian/rules | 7 +++
> recipes-xenomai/libevl/libevl_master.bb | 47 +++++++++++++++++++
> recipes-xenomai/libevl/libevl_next.bb | 1 +
> recipes-xenomai/libevl/libevl_r46.bb | 46 ++++++++++++++++++
> recipes-xenomai/libevl/libevl_r47.bb | 1 +
I think there is still some duplication here, given this diff:
--- recipes-xenomai/libevl/libevl_master.bb 2024-01-04 14:51:22.575483937 +0100
+++ recipes-xenomai/libevl/libevl_r46.bb 2024-01-04 14:51:22.579483931 +0100
@@ -12,10 +12,9 @@
inherit dpkg
CHANGELOG_V = "9999-${PV}"
-SRCREV = "${AUTOREV}"
SRC_URI = " \
- git://source.denx.de/Xenomai/xenomai4/libevl.git;protocol=https;branch=${PV} \
+ git://source.denx.de/Xenomai/xenomai4/libevl.git;protocol=https;branch=master;tag=${PV} \
file://debian \
"
Jan
--
Siemens AG, Technology
Linux Expert Center
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images
2023-12-21 16:37 [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images Clara Kowalsky
` (6 preceding siblings ...)
2023-12-21 16:37 ` [xenomai-images][PATCH v2 7/7] kconfig: Add build options for evl Clara Kowalsky
@ 2024-01-04 16:14 ` Jan Kiszka
7 siblings, 0 replies; 14+ messages in thread
From: Jan Kiszka @ 2024-01-04 16:14 UTC (permalink / raw)
To: Clara Kowalsky, xenomai, rpm
On 21.12.23 17:37, Clara Kowalsky wrote:
> Hi all,
>
> this is the second version of the series for adding xenomai-4/evl build support to xenomai-images.
> Thank you Jan for your comments so far.
>
This looks quite good already!
We need an Isar update to pull the sbuild patch for x86. For non-x86,
ie. cross, we need some tuning of the Debian rules in fact (headers are
in /usr/$(DEB_HOST_GNU_TYPE)/include). That's best done in the
debianization, not in libevl. A first arm64 version just passed local
testing in qemu.
Jan
--
Siemens AG, Technology
Linux Expert Center
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2024-01-04 16:14 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-21 16:37 [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images Clara Kowalsky
2023-12-21 16:37 ` [xenomai-images][PATCH v2 1/7] linux-xenomai: Rename linux-xenomai to linux-xenomai-3 Clara Kowalsky
2023-12-21 16:37 ` [xenomai-images][PATCH v2 2/7] xenomai-3: Mark xenomai 3 specific configs Clara Kowalsky
2024-01-04 12:38 ` Jan Kiszka
2023-12-21 16:37 ` [xenomai-images][PATCH v2 3/7] xenomai-4: Enable kernel build Clara Kowalsky
2024-01-04 12:40 ` Jan Kiszka
2024-01-04 13:51 ` Jan Kiszka
2023-12-21 16:37 ` [xenomai-images][PATCH v2 4/7] xenomai-4: Add evl userspace Clara Kowalsky
2024-01-04 12:41 ` Jan Kiszka
2024-01-04 14:57 ` Jan Kiszka
2023-12-21 16:37 ` [xenomai-images][PATCH v2 5/7] ci: Rename xenomai 3 files Clara Kowalsky
2023-12-21 16:37 ` [xenomai-images][PATCH v2 6/7] ci: Add xenomai-4 test cases Clara Kowalsky
2023-12-21 16:37 ` [xenomai-images][PATCH v2 7/7] kconfig: Add build options for evl Clara Kowalsky
2024-01-04 16:14 ` [xenomai-images][PATCH v2 0/7] Add evl support to xenomai-images Jan Kiszka
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.