[xenomai-images][PATCH 0/3] Fix Xenomai next build, update Isar, improve docs

[xenomai-images][PATCH 0/3] Fix Xenomai next build, update Isar, improve docs

[Jan Kiszka]

See patches for details.

Jan Kiszka (3):
  xenomai: Remove patches
  Update to latest Isar next
  Improve README, add COPYING

 COPYING                                            | 17 +++++++++
 README.md                                          | 21 ++++++++++-
 conf/layer.conf                                    |  2 +
 ...m-Update-isar-apt-prior-to-installing-bui.patch | 38 -------------------
 kas.yml                                            |  6 +--
 recipes-kernel/linux/linux-xenomai.inc             |  2 +-
 ...dd-config-folder-to-xenomai-kernel-source.patch | 28 --------------
 ...2-debian-Add-arm64-as-target-architecture.patch | 44 ----------------------
 ...03-debian-Enable-SMP-in-userspace-package.patch | 30 ---------------
 recipes-xenomai/xenomai/xenomai_next.bb            |  8 ++--
 10 files changed, 43 insertions(+), 153 deletions(-)
 create mode 100644 COPYING
 delete mode 100644 isar-patches/0001-linux-custom-Update-isar-apt-prior-to-installing-bui.patch
 delete mode 100644 recipes-xenomai/xenomai/files/0001-debian-Add-config-folder-to-xenomai-kernel-source.patch
 delete mode 100644 recipes-xenomai/xenomai/files/0002-debian-Add-arm64-as-target-architecture.patch
 delete mode 100644 recipes-xenomai/xenomai/files/0003-debian-Enable-SMP-in-userspace-package.patch

-- 
2.16.4

[xenomai-images][PATCH 1/3] xenomai: Remove patches

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

By now merged even into master.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 ...dd-config-folder-to-xenomai-kernel-source.patch | 28 --------------
 ...2-debian-Add-arm64-as-target-architecture.patch | 44 ----------------------
 ...03-debian-Enable-SMP-in-userspace-package.patch | 30 ---------------
 recipes-xenomai/xenomai/xenomai_next.bb            |  5 +--
 4 files changed, 1 insertion(+), 106 deletions(-)
 delete mode 100644 recipes-xenomai/xenomai/files/0001-debian-Add-config-folder-to-xenomai-kernel-source.patch
 delete mode 100644 recipes-xenomai/xenomai/files/0002-debian-Add-arm64-as-target-architecture.patch
 delete mode 100644 recipes-xenomai/xenomai/files/0003-debian-Enable-SMP-in-userspace-package.patch

diff --git a/recipes-xenomai/xenomai/files/0001-debian-Add-config-folder-to-xenomai-kernel-source.patch b/recipes-xenomai/xenomai/files/0001-debian-Add-config-folder-to-xenomai-kernel-source.patch
deleted file mode 100644
index d3de9c4..0000000
--- a/recipes-xenomai/xenomai/files/0001-debian-Add-config-folder-to-xenomai-kernel-source.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 07d87b9b2ca45f81024056720b28f6cdbcb3b9c7 Mon Sep 17 00:00:00 2001
-From: Jan Kiszka <jan.kiszka@siemens.com>
-Date: Tue, 6 Nov 2018 13:37:21 +0100
-Subject: [PATCH] debian: Add config folder to xenomai-kernel-source
-
-Meanwhile required for prepare-kernel.sh.
-
-Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
----
- debian/rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/debian/rules b/debian/rules
-index 8b871a4882..99ed8982ce 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -73,7 +73,7 @@ install: build
- 	cp debian/libxenomai1.lintian $(CURDIR)/debian/libxenomai1/usr/share/lintian/overrides/libxenomai1
- 	cp debian/libxenomai-dev.lintian $(CURDIR)/debian/libxenomai-dev/usr/share/lintian/overrides/libxenomai-dev
- 	mkdir -p $(CURDIR)/debian/xenomai-kernel-source/usr/src/xenomai-kernel-source $(CURDIR)/debian/xenomai-kernel-source/usr/share/doc/xenomai-kernel-source
--	cp -a kernel include scripts $(CURDIR)/debian/xenomai-kernel-source/usr/src/xenomai-kernel-source
-+	cp -a config kernel include scripts $(CURDIR)/debian/xenomai-kernel-source/usr/src/xenomai-kernel-source
- 
- # Build architecture-independent files here.
- binary-indep: build install
--- 
-2.16.4
-
diff --git a/recipes-xenomai/xenomai/files/0002-debian-Add-arm64-as-target-architecture.patch b/recipes-xenomai/xenomai/files/0002-debian-Add-arm64-as-target-architecture.patch
deleted file mode 100644
index fbcb344..0000000
--- a/recipes-xenomai/xenomai/files/0002-debian-Add-arm64-as-target-architecture.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From d8db92eb66ebd314d339a5faa5245b52ce093bef Mon Sep 17 00:00:00 2001
-From: Jan Kiszka <jan.kiszka@siemens.com>
-Date: Tue, 6 Nov 2018 16:34:17 +0100
-Subject: [PATCH] debian: Add arm64 as target architecture
-
-Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
----
- debian/control | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/debian/control b/debian/control
-index 3427987e15..477b16d9fd 100644
---- a/debian/control
-+++ b/debian/control
-@@ -8,7 +8,7 @@ Homepage: http://www.xenomai.org/
- 
- Package: xenomai-runtime
- Section: devel
--Architecture: amd64 arm armeb armel armhf i386 powerpc powerpcspe
-+Architecture: amd64 arm armeb armel armhf arm64 i386 powerpc powerpcspe
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Suggests: xenomai-kernel-source
- Replaces: xenomai
-@@ -45,7 +45,7 @@ Description: Source for Xenomai kernel-space support
- 
- Package: libxenomai1
- Section: libs
--Architecture: amd64 arm armeb armel armhf i386 powerpc powerpcspe
-+Architecture: amd64 arm armeb armel armhf arm64 i386 powerpc powerpcspe
- Depends: ${shlibs:Depends}, ${misc:Depends}
- Suggests: xenomai-kernel-source
- Replaces: xenomai
-@@ -61,7 +61,7 @@ Description: Shared libraries for Xenomai
- 
- Package: libxenomai-dev
- Section: libdevel
--Architecture: amd64 arm armeb armel armhf i386 powerpc powerpcspe
-+Architecture: amd64 arm armeb armel armhf arm64 i386 powerpc powerpcspe
- Depends: libxenomai1 (= ${binary:Version}), ${misc:Depends}
- Suggests: xenomai-kernel-source
- Replaces: xenomai
--- 
-2.16.4
-
diff --git a/recipes-xenomai/xenomai/files/0003-debian-Enable-SMP-in-userspace-package.patch b/recipes-xenomai/xenomai/files/0003-debian-Enable-SMP-in-userspace-package.patch
deleted file mode 100644
index 98632b4..0000000
--- a/recipes-xenomai/xenomai/files/0003-debian-Enable-SMP-in-userspace-package.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a4ec3f654a4be50aaf268c3a540e8b110ad2ded3 Mon Sep 17 00:00:00 2001
-From: Jan Kiszka <jan.kiszka@siemens.com>
-Date: Tue, 6 Nov 2018 18:59:47 +0100
-Subject: [PATCH] debian: Enable SMP in userspace package
-
-Hard to find a UP target these days, and we definitely want to be
-generic with Debian packages.
-
-Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
----
- debian/rules | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/debian/rules b/debian/rules
-index 99ed8982ce..883ae3ed8c 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -16,7 +16,8 @@ DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
- CONFIG_OPTS = --prefix=/usr \
-             --includedir=/usr/include/xenomai \
-             --mandir=/usr/share/man \
--	    --with-testdir=/usr/lib/xenomai/testsuite
-+            --with-testdir=/usr/lib/xenomai/testsuite \
-+            --enable-smp
- 
- ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
- 	CONFIG_OPTS += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
--- 
-2.16.4
-
diff --git a/recipes-xenomai/xenomai/xenomai_next.bb b/recipes-xenomai/xenomai/xenomai_next.bb
index 3541d2d..6bc43ac 100644
--- a/recipes-xenomai/xenomai/xenomai_next.bb
+++ b/recipes-xenomai/xenomai/xenomai_next.bb
@@ -12,10 +12,7 @@
 require xenomai.inc
 
 SRC_URI = " \
-    git://gitlab.denx.de/Xenomai/xenomai.git;protocol=https;branch=next \
-    file://0001-debian-Add-config-folder-to-xenomai-kernel-source.patch \
-    file://0002-debian-Add-arm64-as-target-architecture.patch \
-    file://0003-debian-Enable-SMP-in-userspace-package.patch"
+    git://gitlab.denx.de/Xenomai/xenomai.git;protocol=https;branch=next"
 SRCREV = "next"
 PV = "9999-next"
 
-- 
2.16.4

[xenomai-images][PATCH 2/3] Update to latest Isar next

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

This allows to drop the local patch, requires to set uid:gid on chroot
and set LAYERSERIES_COMPAT_xenomai.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 conf/layer.conf                                    |  2 ++
 ...m-Update-isar-apt-prior-to-installing-bui.patch | 38 ----------------------
 kas.yml                                            |  6 +---
 recipes-kernel/linux/linux-xenomai.inc             |  2 +-
 recipes-xenomai/xenomai/xenomai_next.bb            |  3 +-
 5 files changed, 6 insertions(+), 45 deletions(-)
 delete mode 100644 isar-patches/0001-linux-custom-Update-isar-apt-prior-to-installing-bui.patch

diff --git a/conf/layer.conf b/conf/layer.conf
index d4fb919..f665993 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -18,4 +18,6 @@ BBFILE_COLLECTIONS += "xenomai"
 BBFILE_PATTERN_xenomai = "^${LAYERDIR}/"
 BBFILE_PRIORITY_xenomai = "6"
 
+LAYERSERIES_COMPAT_xenomai = "next"
+
 LAYERDIR_xenomai = "${LAYERDIR}"
diff --git a/isar-patches/0001-linux-custom-Update-isar-apt-prior-to-installing-bui.patch b/isar-patches/0001-linux-custom-Update-isar-apt-prior-to-installing-bui.patch
deleted file mode 100644
index 5953ae8..0000000
--- a/isar-patches/0001-linux-custom-Update-isar-apt-prior-to-installing-bui.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1951178503036e47931e5bccbab241c11e949c52 Mon Sep 17 00:00:00 2001
-From: Jan Kiszka <jan.kiszka@siemens.com>
-Date: Tue, 6 Nov 2018 09:43:22 +0100
-Subject: [PATCH] linux-custom: Update isar-apt prior to installing build deps
-
-Some of them may have been built by a recipe.
-
-Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
----
- meta/recipes-kernel/linux/linux-custom.inc | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
-index e9a68fd..d9b2935 100644
---- a/meta/recipes-kernel/linux/linux-custom.inc
-+++ b/meta/recipes-kernel/linux/linux-custom.inc
-@@ -27,11 +27,18 @@ KERNEL_DEBIAN_DEPENDS ?= "initramfs-tools | linux-initramfs-tool, kmod, linux-ba
- KERNEL_HEADERS_DEBIAN_DEPENDS ?= "libc6, libssl1.1"
- 
- do_install_builddeps() {
-+	dpkg_do_mounts
- 	E="${@ bb.utils.export_proxies(d)}"
-+	sudo -E chroot ${BUILDCHROOT_DIR} \
-+		apt-get update \
-+			-o Dir::Etc::sourcelist="sources.list.d/isar-apt.list" \
-+			-o Dir::Etc::sourceparts="-" \
-+			-o APT::Get::List-Cleanup="0"
- 	sudo -E chroot ${BUILDCHROOT_DIR} \
- 		apt-get install \
- 			-y -o Debug::pkgProblemResolver=yes \
- 			--no-install-recommends ${KBUILD_DEPENDS}
-+	dpkg_undo_mounts
- }
- 
- addtask install_builddeps after do_prepare_build before do_build
--- 
-2.16.4
-
diff --git a/kas.yml b/kas.yml
index 4bbfcaa..2af48a6 100644
--- a/kas.yml
+++ b/kas.yml
@@ -19,14 +19,10 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar
-    refspec: be291cd991bd64051f5e34af24b04feddaaea48c
+    refspec: 1e24c4b477142925834eee29a4b5cdb317599a29
     layers:
       meta:
       meta-isar:
-    patches:
-      fixes:
-        repo: xenomai
-        path: isar-patches/0001-linux-custom-Update-isar-apt-prior-to-installing-bui.patch
 
 bblayers_conf_header:
   standard: |
diff --git a/recipes-kernel/linux/linux-xenomai.inc b/recipes-kernel/linux/linux-xenomai.inc
index 07747f7..d93e614 100644
--- a/recipes-kernel/linux/linux-xenomai.inc
+++ b/recipes-kernel/linux/linux-xenomai.inc
@@ -34,7 +34,7 @@ dpkg_runbuild_prepend() {
 		exit 1
 	esac
 
-	sudo chroot ${BUILDCHROOT_DIR} \
+	sudo chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \
 		/usr/src/xenomai-kernel-source/scripts/prepare-kernel.sh \
 			--linux=${PP}/${PPS} --arch=$ARCH
 }
diff --git a/recipes-xenomai/xenomai/xenomai_next.bb b/recipes-xenomai/xenomai/xenomai_next.bb
index 6bc43ac..72e5758 100644
--- a/recipes-xenomai/xenomai/xenomai_next.bb
+++ b/recipes-xenomai/xenomai/xenomai_next.bb
@@ -22,5 +22,6 @@ dpkg_runbuild_prepend() {
     bbplain $(printf "xenomai-next: Building revision %.12s\n" \
                      $(cat ${S}/.git/refs/heads/next))
 
-    sudo chroot ${BUILDCHROOT_DIR} sh -c "cd ${PP}/${PPS}; scripts/bootstrap"
+    sudo chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \
+        sh -c "cd ${PP}/${PPS}; scripts/bootstrap"
 }
-- 
2.16.4

[xenomai-images][PATCH 3/3] Improve README, add COPYING

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Refer to Xenomai upstream for community and contribution. Add a
top-level COPYING with the MIT license and explain the licensing scheme
also in the README.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 COPYING   | 17 +++++++++++++++++
 README.md | 21 +++++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 COPYING

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..89de354
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/README.md b/README.md
index ae07de9..44d056d 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
 # Xenomai Demonstration and Test Images
 
 This generates a number of bootable image for virtual and real targets in order
-to run the Xenomai real-time system, for evaluation or testing purposes. The
-layer may also be used to build real applications on top.
+to run the [Xenomai](https://www.xenomai.org) real-time system, for evaluation
+or testing purposes. The layer may also be used to build real applications on
+top.
 
 The build system used for this is [Isar](https://github.com/ilbers/isar), an
 image generator that assembles Debian binaries or builds individual packages
@@ -34,3 +35,19 @@ Physical targets will generate read-to-boot images under
 
     dd if=build/tmp/deploy/images/ebsy-image-base-long-life-ebsy-simatic-ipc227e.wic.img \
        of=/dev/<medium-device> bs=1M status=progress
+
+## Community Resources
+
+See [Xenomai project](https://www.xenomai.org/).
+
+Contributions are always welcome. They follow the same
+[process](https://gitlab.denx.de/Xenomai/xenomai/blob/master/CONTRIBUTING.md)
+that Xenomai is using as well. Please tag you patches additional with
+"[xenomai-images]" to indicate which repository they are targeting.
+
+## License
+
+Unless otherwise stated in the respective file, files in this layer are
+provided under the MIT license, see COPYING file. Patches (files ending with
+.patch) are licensed according to their target project and file, typically
+GPLv2.
-- 
2.16.4

[xenomai-images][PATCH 4/3] README: Fix image path

[Jan Kiszka]

Copy&paste mistake, plus outdated path structure by now.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 44d056d..f7efbe4 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ installed.
 Physical targets will generate read-to-boot images under
 `build/tmp/deploy/images/`. To flash, e.g., the HiKey image to an SD card, run
 
-    dd if=build/tmp/deploy/images/ebsy-image-base-long-life-ebsy-simatic-ipc227e.wic.img \
+    dd if=build/tmp/deploy/images/hikey/demo-image-hikey-xenomai-demo-hikey.wic.img \
        of=/dev/<medium-device> bs=1M status=progress
 
 ## Community Resources
-- 
2.16.4

[xenomai-images][PATCH v2 2/3] Update to latest Isar next

[Jan Kiszka]

This allows to drop the local patch, requires to set uid:gid on chroot
and set LAYERSERIES_COMPAT_xenomai. Also, image deployment paths
changed.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Changes in v2:
 - also account for image deployment patch change

That means: It's now even tested, at least partially...

 conf/layer.conf                                    |  2 ++
 ...m-Update-isar-apt-prior-to-installing-bui.patch | 38 ----------------------
 kas.yml                                            |  6 +---
 recipes-kernel/linux/linux-xenomai.inc             |  2 +-
 recipes-xenomai/xenomai/xenomai_next.bb            |  3 +-
 start-qemu.sh                                      |  2 +-
 6 files changed, 7 insertions(+), 46 deletions(-)
 delete mode 100644 isar-patches/0001-linux-custom-Update-isar-apt-prior-to-installing-bui.patch

diff --git a/conf/layer.conf b/conf/layer.conf
index d4fb919..f665993 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -18,4 +18,6 @@ BBFILE_COLLECTIONS += "xenomai"
 BBFILE_PATTERN_xenomai = "^${LAYERDIR}/"
 BBFILE_PRIORITY_xenomai = "6"
 
+LAYERSERIES_COMPAT_xenomai = "next"
+
 LAYERDIR_xenomai = "${LAYERDIR}"
diff --git a/isar-patches/0001-linux-custom-Update-isar-apt-prior-to-installing-bui.patch b/isar-patches/0001-linux-custom-Update-isar-apt-prior-to-installing-bui.patch
deleted file mode 100644
index 5953ae8..0000000
--- a/isar-patches/0001-linux-custom-Update-isar-apt-prior-to-installing-bui.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1951178503036e47931e5bccbab241c11e949c52 Mon Sep 17 00:00:00 2001
-From: Jan Kiszka <jan.kiszka@siemens.com>
-Date: Tue, 6 Nov 2018 09:43:22 +0100
-Subject: [PATCH] linux-custom: Update isar-apt prior to installing build deps
-
-Some of them may have been built by a recipe.
-
-Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
----
- meta/recipes-kernel/linux/linux-custom.inc | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc
-index e9a68fd..d9b2935 100644
---- a/meta/recipes-kernel/linux/linux-custom.inc
-+++ b/meta/recipes-kernel/linux/linux-custom.inc
-@@ -27,11 +27,18 @@ KERNEL_DEBIAN_DEPENDS ?= "initramfs-tools | linux-initramfs-tool, kmod, linux-ba
- KERNEL_HEADERS_DEBIAN_DEPENDS ?= "libc6, libssl1.1"
- 
- do_install_builddeps() {
-+	dpkg_do_mounts
- 	E="${@ bb.utils.export_proxies(d)}"
-+	sudo -E chroot ${BUILDCHROOT_DIR} \
-+		apt-get update \
-+			-o Dir::Etc::sourcelist="sources.list.d/isar-apt.list" \
-+			-o Dir::Etc::sourceparts="-" \
-+			-o APT::Get::List-Cleanup="0"
- 	sudo -E chroot ${BUILDCHROOT_DIR} \
- 		apt-get install \
- 			-y -o Debug::pkgProblemResolver=yes \
- 			--no-install-recommends ${KBUILD_DEPENDS}
-+	dpkg_undo_mounts
- }
- 
- addtask install_builddeps after do_prepare_build before do_build
--- 
-2.16.4
-
diff --git a/kas.yml b/kas.yml
index 4bbfcaa..2af48a6 100644
--- a/kas.yml
+++ b/kas.yml
@@ -19,14 +19,10 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar
-    refspec: be291cd991bd64051f5e34af24b04feddaaea48c
+    refspec: 1e24c4b477142925834eee29a4b5cdb317599a29
     layers:
       meta:
       meta-isar:
-    patches:
-      fixes:
-        repo: xenomai
-        path: isar-patches/0001-linux-custom-Update-isar-apt-prior-to-installing-bui.patch
 
 bblayers_conf_header:
   standard: |
diff --git a/recipes-kernel/linux/linux-xenomai.inc b/recipes-kernel/linux/linux-xenomai.inc
index 07747f7..d93e614 100644
--- a/recipes-kernel/linux/linux-xenomai.inc
+++ b/recipes-kernel/linux/linux-xenomai.inc
@@ -34,7 +34,7 @@ dpkg_runbuild_prepend() {
 		exit 1
 	esac
 
-	sudo chroot ${BUILDCHROOT_DIR} \
+	sudo chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \
 		/usr/src/xenomai-kernel-source/scripts/prepare-kernel.sh \
 			--linux=${PP}/${PPS} --arch=$ARCH
 }
diff --git a/recipes-xenomai/xenomai/xenomai_next.bb b/recipes-xenomai/xenomai/xenomai_next.bb
index 6bc43ac..72e5758 100644
--- a/recipes-xenomai/xenomai/xenomai_next.bb
+++ b/recipes-xenomai/xenomai/xenomai_next.bb
@@ -22,5 +22,6 @@ dpkg_runbuild_prepend() {
     bbplain $(printf "xenomai-next: Building revision %.12s\n" \
                      $(cat ${S}/.git/refs/heads/next))
 
-    sudo chroot ${BUILDCHROOT_DIR} sh -c "cd ${PP}/${PPS}; scripts/bootstrap"
+    sudo chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} \
+        sh -c "cd ${PP}/${PPS}; scripts/bootstrap"
 }
diff --git a/start-qemu.sh b/start-qemu.sh
index 0daf69c..c56c234 100755
--- a/start-qemu.sh
+++ b/start-qemu.sh
@@ -57,7 +57,7 @@ case "$1" in
 		;;
 esac
 
-IMAGE_PREFIX="$(dirname $0)/build/tmp/deploy/images/demo-image-qemu-${DISTRO_ARCH}-xenomai-demo-qemu-${DISTRO_ARCH}"
+IMAGE_PREFIX="$(dirname $0)/build/tmp/deploy/images/qemu-${DISTRO_ARCH}/demo-image-qemu-${DISTRO_ARCH}-xenomai-demo-qemu-${DISTRO_ARCH}"
 IMAGE_FILE=$(ls ${IMAGE_PREFIX}.ext4.img)
 
 KERNEL_FILE=$(ls ${IMAGE_PREFIX}.vmlinuz* | tail -1)
-- 
2.16.4