From: Jan Kiszka <jan.kiszka@siemens.com>
To: Florian Bezdeka <florian.bezdeka@siemens.com>, xenomai@lists.linux.dev
Subject: Re: [xenomai-images][PATCH v3 07/10] xenomai-4: Add evl userspace
Date: Wed, 10 Jan 2024 11:43:34 +0100 [thread overview]
Message-ID: <8842c65f-3932-45fa-8361-9ebc119f2882@siemens.com> (raw)
In-Reply-To: <ecf1a4f2e7e2c73c68bba8734cb994d6f2d66971.camel@siemens.com>
On 10.01.24 10:03, Florian Bezdeka wrote:
> On Wed, 2024-01-10 at 05:45 +0100, Jan Kiszka wrote:
>> @@ -0,0 +1,40 @@
>> +From b4447250c7fff6940c1bb6f0308da617bebaa643 Mon Sep 17 00:00:00 2001
>> +From: Jan Kiszka <jan.kiszka@siemens.com>
>> +Date: Tue, 2 Jan 2024 14:01:19 +0100
>> +Subject: [PATCH] meson: setup-uapi: Take Debian multiarch into account
>> +
>> +Check also the Debian multiarch include path for the chosen architecture
>> +so that we can support (self-built) linux-libc-dev packages that contain
>> +the evl headers.
>> +
>> +Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> +---
>> + meson/setup-uapi.sh | 12 +++++++++++-
>> + 1 file changed, 11 insertions(+), 1 deletion(-)
>> +
>> +diff --git a/meson/setup-uapi.sh b/meson/setup-uapi.sh
>> +index f2d0774..633c5ed 100644
>> +--- a/meson/setup-uapi.sh
>> ++++ b/meson/setup-uapi.sh
>> +@@ -17,7 +17,17 @@ if test -r $UAPI/Kbuild; then
>> + link_dir $UAPI/arch/$ARCH/include/uapi/asm/evl asm
>> + link_dir $UAPI/include/uapi/asm-generic .
>> + else
>> ++ DEB_HOST_ARCH=$ARCH
>> ++ if [ "$DEB_HOST_ARCH" = "x86" ]; then
>> ++ DEB_HOST_ARCH=amd64
>> ++ fi
>> ++ DEB_HOST_MULTIARCH=$( \
>> ++ dpkg-architecture -q DEB_HOST_MULTIARCH -a $DEB_HOST_ARCH 2>/dev/null)
>> + link_dir $UAPI/evl .
>> +- link_dir $UAPI/asm/evl asm
>> ++ if [ -d $UAPI/$DEB_HOST_MULTIARCH/asm/evl ]; then
>> ++ link_dir $UAPI/$DEB_HOST_MULTIARCH/asm/evl asm
>> ++ else
>> ++ link_dir $UAPI/asm/evl asm
>> ++ fi
>> + link_dir $UAPI/asm-generic .
>> + fi
>> +--
>> +2.35.3
>> +
>> 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..36eb68c
>> --- /dev/null
>> +++ b/recipes-xenomai/libevl/files/debian/control.tmpl
>> @@ -0,0 +1,11 @@
>> +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}
>> +Depends: ${shlibs:Depends}
>> diff --git a/recipes-xenomai/libevl/files/debian/rules b/recipes-xenomai/libevl/files/debian/rules
>> new file mode 100755
>> index 0000000..9c9148f
>> --- /dev/null
>> +++ b/recipes-xenomai/libevl/files/debian/rules
>
> Wouldn't it make sense to move the debianization into evl like we have
> it for Xenomai as well? In addition it would follow the "upstream
> first" again.
>
> I think it has some value if someone can run dpkg-buildpackage on evl
> and doesn't have to use xenomai-images for building packages.
>
Yes, may be worth it. This one here is likely not yet complete. E.g., it
lacks a proper split-up into multiple binary packages (lib, tools,
testing etc.).
Jan
--
Siemens AG, Technology
Linux Expert Center
next prev parent reply other threads:[~2024-01-10 10:43 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-10 4:45 [xenomai-images][PATCH v3 00/10] Add evl support to xenomai-images Jan Kiszka
2024-01-10 4:45 ` [xenomai-images][PATCH v3 01/10] Add Isar patch to permit linux-libc-dev upgrades in the sbuild environment Jan Kiszka
2024-01-10 9:00 ` Florian Bezdeka
2024-01-10 9:04 ` Jan Kiszka
2024-01-10 4:45 ` [xenomai-images][PATCH v3 02/10] Replace incorrect string strip method with replace Jan Kiszka
2024-01-10 4:45 ` [xenomai-images][PATCH v3 03/10] Factor out print-revision class Jan Kiszka
2024-01-10 4:45 ` [xenomai-images][PATCH v3 04/10] linux-xenomai: Rename linux-xenomai to linux-xenomai-3 Jan Kiszka
2024-01-10 4:45 ` [xenomai-images][PATCH v3 05/10] xenomai-3: Mark xenomai 3 specific configs Jan Kiszka
2024-01-10 4:45 ` [xenomai-images][PATCH v3 06/10] xenomai-4: Enable kernel build Jan Kiszka
2024-01-10 4:45 ` [xenomai-images][PATCH v3 07/10] xenomai-4: Add evl userspace Jan Kiszka
2024-01-10 9:03 ` Florian Bezdeka
2024-01-10 10:43 ` Jan Kiszka [this message]
2024-01-10 4:46 ` [xenomai-images][PATCH v3 08/10] kconfig: Add build options for evl Jan Kiszka
2024-01-10 4:46 ` [xenomai-images][PATCH v3 09/10] ci: Rename xenomai 3 files Jan Kiszka
2024-01-10 4:46 ` [xenomai-images][PATCH v3 10/10] ci: Prepare for xenomai-4 test cases 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=8842c65f-3932-45fa-8361-9ebc119f2882@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=florian.bezdeka@siemens.com \
--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).