[xenomai-images][PATCH v2] recipes-xenomai: Add recipes for all major branches

Jan Kiszka jan.kiszka at siemens.com
Tue Aug 13 16:29:27 CEST 2019


On 13.08.19 13:43, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff at siemens.com>
> 
> For testing it should be possible to switch between different
> xenomai versions. Select the version by adding the
> following line to kas.yml with:
>    xenomai-version: |
>      PREFERRED_VERSION_xenomai = "<version>"
>   e.g. the latest master branch with:
>    xenomai-version: |
>      PREFERRED_VERSION_xenomai = "master"
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff at siemens.com>
> ---
> Changes:
> v2:
>   - fix identation
>   - move functions to xenomai.inc
>   - use bitbake to get commitid
>   - add enable-smp to stable
>   - remove AUTOINC from version - feature is not yet available in ISAR
> 
>   kas.yml                                   |  2 ++
>   recipes-xenomai/xenomai/xenomai.inc       | 25 +++++++++++++++++++++++
>   recipes-xenomai/xenomai/xenomai_3.0.9.bb  | 20 ++++++++++++++++++
>   recipes-xenomai/xenomai/xenomai_master.bb | 19 +++++++++++++++++
>   recipes-xenomai/xenomai/xenomai_next.bb   | 10 ++-------
>   recipes-xenomai/xenomai/xenomai_stable.bb | 20 ++++++++++++++++++
>   6 files changed, 88 insertions(+), 8 deletions(-)
>   create mode 100644 recipes-xenomai/xenomai/xenomai_3.0.9.bb
>   create mode 100644 recipes-xenomai/xenomai/xenomai_master.bb
>   create mode 100644 recipes-xenomai/xenomai/xenomai_stable.bb
> 
> diff --git a/kas.yml b/kas.yml
> index 3694bcc..2bf62d4 100644
> --- a/kas.yml
> +++ b/kas.yml
> @@ -35,3 +35,5 @@ local_conf_header:
>       CONF_VERSION = "1"
>     cross: |
>       ISAR_CROSS_COMPILE = "1"
> +  xenomai-version: |
> +    PREFERRED_VERSION_xenomai = "stable"
> diff --git a/recipes-xenomai/xenomai/xenomai.inc b/recipes-xenomai/xenomai/xenomai.inc
> index 5559829..e7a2901 100644
> --- a/recipes-xenomai/xenomai/xenomai.inc
> +++ b/recipes-xenomai/xenomai/xenomai.inc
> @@ -13,6 +13,8 @@ inherit dpkg
>   
>   PROVIDES += "xenomai-kernel-source xenomai-runtime"
>   
> +# use bitbake get_srcrev to get the current commit id
> +COMMIT="${@bb.fetch2.get_srcrev(d).strip('AUTOINC+')}"
>   do_prepare_build() {
>   	# The xenomai-kernel-source package is supposed to be generic, but we
>   	# build it per architecture in Isar, and those packages happen to be
> @@ -20,3 +22,26 @@ do_prepare_build() {
>   	# target architecture to avoid conflicts.
>   	sudo sed -i 's/Architecture: all/Architecture: any/' ${S}/debian/control
>   }
> +
> +# this function is only necessary for stable as long as
> +# "debian: Add config folder to xenomai-kernel-source" and
> +# "debian: Enable SMP in userspace package"
> +# are not part of the stable branch
> +do_prepare_stable_for_build() {
> +    # Enable smp for userspace packages
> +    sudo sed -i \
> +    's/--with-testdir=\/usr\/lib\/xenomai\/testsuite/--with-testdir=\/usr\/lib\/xenomai\/testsuite \\\n\t    --enable-smp/' \
> +    ${S}/debian/rules
> +    # The xenomai-kernel-source package is supposed to contain the config
> +    # directory. But the rules files does not copy the folder to /usr/src
> +    sudo sed -i 's/cp -a kernel include scripts/cp -a config kernel include scripts/' ${S}/debian/rules
> +}

Why not carring the patch files instead? Both apply cleanly to stable. Will also 
push them soon.

> +
> +
> +dpkg_runbuild_prepend() {
> +    bbplain $(printf "xenomai-%s: Building revision %.20s\n" \
> +                     ${PV} ${COMMIT})
> +
> +    sudo chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \
> +        sh -c "cd ${PP}/${PPS}; scripts/bootstrap"
> +}
> \ No newline at end of file

Would be nice to have. You can take one from...

> diff --git a/recipes-xenomai/xenomai/xenomai_3.0.9.bb b/recipes-xenomai/xenomai/xenomai_3.0.9.bb
> new file mode 100644
> index 0000000..6fb3ff8
> --- /dev/null
> +++ b/recipes-xenomai/xenomai/xenomai_3.0.9.bb
> @@ -0,0 +1,20 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2019
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff at siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +require xenomai.inc
> +SRC_URI = " \
> +    git://gitlab.denx.de/Xenomai/xenomai.git;protocol=https;branch=stable/v3.0.x;tag=v${PV} \
> +    "
> +S = "${WORKDIR}/git"
> +
> +addtask prepare_stable_for_build before do_prepare_build after do_patch
> +
> +

...here where there are enough at the end. ;)

> diff --git a/recipes-xenomai/xenomai/xenomai_master.bb b/recipes-xenomai/xenomai/xenomai_master.bb
> new file mode 100644
> index 0000000..d95ede6
> --- /dev/null
> +++ b/recipes-xenomai/xenomai/xenomai_master.bb
> @@ -0,0 +1,19 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2019
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff at siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +require xenomai.inc
> +
> +SRC_URI = " \
> +    git://gitlab.denx.de/Xenomai/xenomai.git;protocol=https;branch=master"
> +SRCREV = "${AUTOREV}"
> +PV = "master"
> +S = "${WORKDIR}/git"
> +
> diff --git a/recipes-xenomai/xenomai/xenomai_next.bb b/recipes-xenomai/xenomai/xenomai_next.bb
> index 72e5758..e216124 100644
> --- a/recipes-xenomai/xenomai/xenomai_next.bb
> +++ b/recipes-xenomai/xenomai/xenomai_next.bb
> @@ -13,15 +13,9 @@ require xenomai.inc
>   
>   SRC_URI = " \
>       git://gitlab.denx.de/Xenomai/xenomai.git;protocol=https;branch=next"
> -SRCREV = "next"
> -PV = "9999-next"
> +SRCREV = "${AUTOREV}"
> +PV = "next"
>   
>   S = "${WORKDIR}/git"
>   
> -dpkg_runbuild_prepend() {
> -    bbplain $(printf "xenomai-next: Building revision %.12s\n" \
> -                     $(cat ${S}/.git/refs/heads/next))
>   
> -    sudo chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \
> -        sh -c "cd ${PP}/${PPS}; scripts/bootstrap"
> -}
> diff --git a/recipes-xenomai/xenomai/xenomai_stable.bb b/recipes-xenomai/xenomai/xenomai_stable.bb
> new file mode 100644
> index 0000000..bb77ec9
> --- /dev/null
> +++ b/recipes-xenomai/xenomai/xenomai_stable.bb
> @@ -0,0 +1,20 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2019
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff at siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +require xenomai.inc
> +
> +SRC_URI = " \
> +    git://gitlab.denx.de/Xenomai/xenomai.git;protocol=https;branch=stable/v3.0.x"
> +SRCREV = "${AUTOREV}"
> +PV = "stable"
> +S = "${WORKDIR}/git"
> +
> +addtask prepare_stable_for_build before do_prepare_build after do_patch
> 

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux



More information about the Xenomai mailing list