On Thu, 2021-12-09 at 09:43 +0000, Bezdeka, Florian via Xenomai wrote:
> On Thu, 2021-12-09 at 09:42 +0000, Bezdeka, Florian via Xenomai wrote:
> > On Thu, 2021-12-09 at 08:36 +0100, Uladzimir Bely via Xenomai wrote:
> > > These patch is required to build Isar from 'ubely/sbuild' branch,
> > > e.g. refspec: 37a71e72c7b8e9ae7e9f6a402ecdc6ff66eab8c4
> > 
> > We're using that, so why do we need to patch? Is that related to the
>        ^- not

The cover letter (which made it into my junk folder) explains that. I
fear that SBUILD stuff is going to break nearly all downstream layers
when xenomai-images is affected as well. So the question of "no way to
prevent downstream layers to break?" still stands.

> 
> > new SBUILD feature in ISAR? No way to handle that without breaking many
> > downstream layers?
> > 
> > > 
> > > Signed-off-by: Uladzimir Bely <ub...@ilbers.de>
> > > ---
> > >  recipes-kernel/linux/linux-xenomai.inc | 14 ++++++++------
> > >  recipes-xenomai/xenomai/xenomai.inc    |  4 +---
> > >  2 files changed, 9 insertions(+), 9 deletions(-)
> > > 
> > > diff --git a/recipes-kernel/linux/linux-xenomai.inc 
> > > b/recipes-kernel/linux/linux-xenomai.inc
> > > index 1852bf6..d68c7a1 100644
> > > --- a/recipes-kernel/linux/linux-xenomai.inc
> > > +++ b/recipes-kernel/linux/linux-xenomai.inc
> > > @@ -28,7 +28,7 @@ def get_commit(d):
> > >  
> > >  LINUX_COMMIT ?= "${@get_commit(d)}"
> > >  
> > > -dpkg_runbuild_prepend() {
> > > +dpkg_configure_kernel_append() {
> > >   case ${DISTRO_ARCH} in
> > >   armhf)
> > >           ARCH=arm
> > > @@ -46,9 +46,11 @@ dpkg_runbuild_prepend() {
> > >   bbplain $(printf "linux-xenomai-%s: Building revision %.20s\n" \
> > >                    ${PV} ${LINUX_COMMIT})
> > >  
> > > - 
> > > ${BUILDCHROOT_DIR}/usr/src/xenomai-kernel-source/scripts/prepare-kernel.sh
> > >  \
> > > -         --linux=${BUILDCHROOT_DIR}/${PP}/${PPS} --arch=$ARCH \
> > > -         --outpatch=${WORKDIR}/xenomai-kernel.patch
> > > - patch -d ${BUILDCHROOT_DIR}/${PP}/${PPS} \
> > > -         -p1 -i ${WORKDIR}/xenomai-kernel.patch
> > > +    SBUILD_PREBUILD="${SBUILD_PREBUILD} &&                          \
> > > +        touch /home/builder/${PN}/file.touch &&                     \
> > 
> > Where does this paths come from? Looks kas or even kas-container
> > related.
> > 
> > > +        /usr/src/xenomai-kernel-source/scripts/prepare-kernel.sh    \
> > > +            --linux=%p --arch=${ARCH}                               \
> > > +            --outpatch=/home/builder/${PN}/xenomai-kernel.patch &&  \
> > > +        patch -d %p -p1 -i /home/builder/${PN}/xenomai-kernel.patch \
> > > +    "
> > >  }
> > > diff --git a/recipes-xenomai/xenomai/xenomai.inc 
> > > b/recipes-xenomai/xenomai/xenomai.inc
> > > index 8f13767..454dd7b 100644
> > > --- a/recipes-xenomai/xenomai/xenomai.inc
> > > +++ b/recipes-xenomai/xenomai/xenomai.inc
> > > @@ -41,7 +41,5 @@ do_prepare_build() {
> > >  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"
> > > +    SBUILD_PREBUILD="cd %p; scripts/bootstrap"
> > >  }
> > 
> 

Reply via email to