From: Clara Kowalsky <clara.kowalsky@siemens.com>
To: xenomai@lists.linux.dev, rpm@xenomai.org
Cc: jan.kiszka@siemens.com, Clara Kowalsky <clara.kowalsky@siemens.com>
Subject: [xenomai-images][PATCH v2 2/7] xenomai-3: Mark xenomai 3 specific configs
Date: Thu, 21 Dec 2023 17:37:38 +0100 [thread overview]
Message-ID: <20231221163743.2923801-3-clara.kowalsky@siemens.com> (raw)
In-Reply-To: <20231221163743.2923801-1-clara.kowalsky@siemens.com>
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
next prev parent reply other threads:[~2023-12-21 16:38 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2024-01-04 12:38 ` [xenomai-images][PATCH v2 2/7] xenomai-3: Mark xenomai 3 specific configs 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231221163743.2923801-3-clara.kowalsky@siemens.com \
--to=clara.kowalsky@siemens.com \
--cc=jan.kiszka@siemens.com \
--cc=rpm@xenomai.org \
--cc=xenomai@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).