| Message ID | 20211216133617.3403412-3-Vijaikumar_Kanagarajan@mentor.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | Drop Stretch support | expand |
On 16.12.21 14:36, Vijai Kumar K wrote: > Stretch in now dropped. The conditional includes for buster is now not > needed. Those includes are applicable to buster as well as bullseye. > > Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> > --- > .../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > index a4d67fe..51aacfe 100644 > --- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > +++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > @@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck" > # modify for debian buster build > SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch" > > -# disable documentation due to missing packages in debian buster > -# disable create filesystem due to missing symbols in debian buster > -# disable webserver due to missing symbols in debian buster > -SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \ > - pkg.swupdate.nocreatefs \ > - pkg.swupdate.nowebserver " > +# disable documentation due to missing packages > +# disable create filesystem due to missing symbols > +# disable webserver due to missing symbols > +SWUPDATE_BUILD_PROFILES_append = " nodoc \ > + pkg.swupdate.nocreatefs \ > + pkg.swupdate.nowebserver " > # In debian buster the git-compression defaults to gz and does not detect other > # compression formats. > GBP_EXTRA_OPTIONS += "--git-compression=xz" > So these things were actually broken for bullseye so far? Jan
On 12/16/21 14:38, Jan Kiszka via lists.cip-project.org wrote: > On 16.12.21 14:36, Vijai Kumar K wrote: >> Stretch in now dropped. The conditional includes for buster is now not >> needed. Those includes are applicable to buster as well as bullseye. >> >> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> >> --- >> .../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------ >> 1 file changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb >> index a4d67fe..51aacfe 100644 >> --- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb >> +++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb >> @@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck" >> # modify for debian buster build >> SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch" >> >> -# disable documentation due to missing packages in debian buster >> -# disable create filesystem due to missing symbols in debian buster >> -# disable webserver due to missing symbols in debian buster >> -SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \ >> - pkg.swupdate.nocreatefs \ >> - pkg.swupdate.nowebserver " >> +# disable documentation due to missing packages >> +# disable create filesystem due to missing symbols >> +# disable webserver due to missing symbols >> +SWUPDATE_BUILD_PROFILES_append = " nodoc \ >> + pkg.swupdate.nocreatefs \ >> + pkg.swupdate.nowebserver " >> # In debian buster the git-compression defaults to gz and does not detect other >> # compression formats. >> GBP_EXTRA_OPTIONS += "--git-compression=xz" >> > > So these things were actually broken for bullseye so far? From my testing only the option nodoc is necessary for bullseye. Quirin > > Jan > >
> -----Original Message----- > From: Jan Kiszka <jan.kiszka@siemens.com> > Sent: 16 December 2021 19:09 > To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; cip- > dev@lists.cip-project.org > Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional > includes for buster > > On 16.12.21 14:36, Vijai Kumar K wrote: > > Stretch in now dropped. The conditional includes for buster is now not > > needed. Those includes are applicable to buster as well as bullseye. > > > > Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> > > --- > > .../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > > b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > > index a4d67fe..51aacfe 100644 > > --- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > > +++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > > @@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck" > > # modify for debian buster build > > SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar- > debian-buster.patch" > > > > -# disable documentation due to missing packages in debian buster -# > > disable create filesystem due to missing symbols in debian buster -# > > disable webserver due to missing symbols in debian buster > > -SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \ > > - pkg.swupdate.nocreatefs \ > > - pkg.swupdate.nowebserver " > > +# disable documentation due to missing packages # disable create > > +filesystem due to missing symbols # disable webserver due to missing > > +symbols SWUPDATE_BUILD_PROFILES_append = " nodoc \ > > + pkg.swupdate.nocreatefs \ > > + pkg.swupdate.nowebserver " > > # In debian buster the git-compression defaults to gz and does not > > detect other # compression formats. > > GBP_EXTRA_OPTIONS += "--git-compression=xz" > > > > So these things were actually broken for bullseye so far? Yes. Atleast, the nodoc is needed because of sphinx dependency issue in bullseye. Thanks, Vijai Kumar K > > Jan > > -- > Siemens AG, T RDA IOT > Corporate Competence Center Embedded Linux
On 16.12.21 15:23, Kanagarajan, Vijaikumar wrote: > > >> -----Original Message----- >> From: Jan Kiszka <jan.kiszka@siemens.com> >> Sent: 16 December 2021 19:09 >> To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; cip- >> dev@lists.cip-project.org >> Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional >> includes for buster >> >> On 16.12.21 14:36, Vijai Kumar K wrote: >>> Stretch in now dropped. The conditional includes for buster is now not >>> needed. Those includes are applicable to buster as well as bullseye. >>> >>> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> >>> --- >>> .../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------ >>> 1 file changed, 6 insertions(+), 6 deletions(-) >>> >>> diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb >>> b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb >>> index a4d67fe..51aacfe 100644 >>> --- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb >>> +++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb >>> @@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck" >>> # modify for debian buster build >>> SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar- >> debian-buster.patch" >>> >>> -# disable documentation due to missing packages in debian buster -# >>> disable create filesystem due to missing symbols in debian buster -# >>> disable webserver due to missing symbols in debian buster >>> -SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \ >>> - pkg.swupdate.nocreatefs \ >>> - pkg.swupdate.nowebserver " >>> +# disable documentation due to missing packages # disable create >>> +filesystem due to missing symbols # disable webserver due to missing >>> +symbols SWUPDATE_BUILD_PROFILES_append = " nodoc \ >>> + pkg.swupdate.nocreatefs \ >>> + pkg.swupdate.nowebserver " >>> # In debian buster the git-compression defaults to gz and does not >>> detect other # compression formats. >>> GBP_EXTRA_OPTIONS += "--git-compression=xz" >>> >> >> So these things were actually broken for bullseye so far? > > Yes. Atleast, the nodoc is needed because of sphinx dependency issue in bullseye. > Quirin just told me that only nodoc is needed for all. Dropping this patch again (keeping 1/2 though). Please send a v3 which does that, ie. adds a _bullseye profile and keeps the existing buster one. Jan
On 12/16/21 15:23, Kanagarajan, Vijaikumar via lists.cip-project.org wrote: > > >> -----Original Message----- >> From: Jan Kiszka <jan.kiszka@siemens.com> >> Sent: 16 December 2021 19:09 >> To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; cip- >> dev@lists.cip-project.org >> Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional >> includes for buster >> >> On 16.12.21 14:36, Vijai Kumar K wrote: >>> Stretch in now dropped. The conditional includes for buster is now not >>> needed. Those includes are applicable to buster as well as bullseye. >>> >>> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> >>> --- >>> .../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------ >>> 1 file changed, 6 insertions(+), 6 deletions(-) >>> >>> diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb >>> b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb >>> index a4d67fe..51aacfe 100644 >>> --- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb >>> +++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb >>> @@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck" >>> # modify for debian buster build >>> SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar- >> debian-buster.patch" >>> >>> -# disable documentation due to missing packages in debian buster -# >>> disable create filesystem due to missing symbols in debian buster -# >>> disable webserver due to missing symbols in debian buster >>> -SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \ >>> - pkg.swupdate.nocreatefs \ >>> - pkg.swupdate.nowebserver " >>> +# disable documentation due to missing packages # disable create >>> +filesystem due to missing symbols # disable webserver due to missing >>> +symbols SWUPDATE_BUILD_PROFILES_append = " nodoc \ >>> + pkg.swupdate.nocreatefs \ >>> + pkg.swupdate.nowebserver " >>> # In debian buster the git-compression defaults to gz and does not >>> detect other # compression formats. >>> GBP_EXTRA_OPTIONS += "--git-compression=xz" >>> >> >> So these things were actually broken for bullseye so far? > > Yes. Atleast, the nodoc is needed because of sphinx dependency issue in bullseye. > > Thanks, > Vijai Kumar K > The flags `pkg.swupdate.nocreatefs` and `pkg.swupdate.nowebserver` are for Debian Buster. A build for Debian Bullseye can use the webserver and createfs option as the are active in the Debian provided package on salsa. Only `nodoc` needs to applied to buster and bullseye. Quirin
> -----Original Message----- > From: Jan Kiszka <jan.kiszka@siemens.com> > Sent: 16 December 2021 21:27 > To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; cip- > dev@lists.cip-project.org; Quirin Gylstorff <quirin.gylstorff@siemens.com> > Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional > includes for buster > > On 16.12.21 15:23, Kanagarajan, Vijaikumar wrote: > > > > > >> -----Original Message----- > >> From: Jan Kiszka <jan.kiszka@siemens.com> > >> Sent: 16 December 2021 19:09 > >> To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; > cip- > >> dev@lists.cip-project.org > >> Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional > >> includes for buster > >> > >> On 16.12.21 14:36, Vijai Kumar K wrote: > >>> Stretch in now dropped. The conditional includes for buster is now > >>> not needed. Those includes are applicable to buster as well as bullseye. > >>> > >>> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> > >>> --- > >>> .../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------ > >>> 1 file changed, 6 insertions(+), 6 deletions(-) > >>> > >>> diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > >>> b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > >>> index a4d67fe..51aacfe 100644 > >>> --- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > >>> +++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > >>> @@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck" > >>> # modify for debian buster build > >>> SRC_URI_append_buster = " > >>> file://0009-debian-prepare-build-for-isar- > >> debian-buster.patch" > >>> > >>> -# disable documentation due to missing packages in debian buster -# > >>> disable create filesystem due to missing symbols in debian buster -# > >>> disable webserver due to missing symbols in debian buster > >>> -SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \ > >>> - pkg.swupdate.nocreatefs \ > >>> - pkg.swupdate.nowebserver " > >>> +# disable documentation due to missing packages # disable create > >>> +filesystem due to missing symbols # disable webserver due to > >>> +missing symbols SWUPDATE_BUILD_PROFILES_append = " nodoc \ > >>> + pkg.swupdate.nocreatefs \ > >>> + pkg.swupdate.nowebserver " > >>> # In debian buster the git-compression defaults to gz and does not > >>> detect other # compression formats. > >>> GBP_EXTRA_OPTIONS += "--git-compression=xz" > >>> > >> > >> So these things were actually broken for bullseye so far? > > > > Yes. Atleast, the nodoc is needed because of sphinx dependency issue in > bullseye. > > > > Quirin just told me that only nodoc is needed for all. > > Dropping this patch again (keeping 1/2 though). Please send a v3 which does > that, ie. adds a _bullseye profile and keeps the existing buster one. Ok. Will resend v3 of this particular patch. Thanks, Vijai Kumar K > > Jan > > -- > Siemens AG, T RDA IOT > Corporate Competence Center Embedded Linux
> -----Original Message----- > From: Kanagarajan, Vijaikumar > Sent: 16 December 2021 21:30 > To: 'Jan Kiszka' <jan.kiszka@siemens.com>; cip-dev@lists.cip-project.org; > Quirin Gylstorff <quirin.gylstorff@siemens.com> > Subject: RE: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional > includes for buster > > > > > -----Original Message----- > > From: Jan Kiszka <jan.kiszka@siemens.com> > > Sent: 16 December 2021 21:27 > > To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; cip- > > dev@lists.cip-project.org; Quirin Gylstorff > > <quirin.gylstorff@siemens.com> > > Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop conditional > > includes for buster > > > > On 16.12.21 15:23, Kanagarajan, Vijaikumar wrote: > > > > > > > > >> -----Original Message----- > > >> From: Jan Kiszka <jan.kiszka@siemens.com> > > >> Sent: 16 December 2021 19:09 > > >> To: Kanagarajan, Vijaikumar <Vijaikumar_Kanagarajan@mentor.com>; > > cip- > > >> dev@lists.cip-project.org > > >> Subject: Re: [isar-cip-core][PATCH v2 2/2] swupdate: Drop > > >> conditional includes for buster > > >> > > >> On 16.12.21 14:36, Vijai Kumar K wrote: > > >>> Stretch in now dropped. The conditional includes for buster is now > > >>> not needed. Those includes are applicable to buster as well as bullseye. > > >>> > > >>> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> > > >>> --- > > >>> .../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++----- > - > > >>> 1 file changed, 6 insertions(+), 6 deletions(-) > > >>> > > >>> diff --git > > >>> a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > > >>> b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > > >>> index a4d67fe..51aacfe 100644 > > >>> --- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > > >>> +++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb > > >>> @@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross > nocheck" > > >>> # modify for debian buster build > > >>> SRC_URI_append_buster = " > > >>> file://0009-debian-prepare-build-for-isar- > > >> debian-buster.patch" > > >>> > > >>> -# disable documentation due to missing packages in debian buster > > >>> -# disable create filesystem due to missing symbols in debian > > >>> buster -# disable webserver due to missing symbols in debian > > >>> buster -SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \ > > >>> - pkg.swupdate.nocreatefs \ > > >>> - pkg.swupdate.nowebserver " > > >>> +# disable documentation due to missing packages # disable create > > >>> +filesystem due to missing symbols # disable webserver due to > > >>> +missing symbols SWUPDATE_BUILD_PROFILES_append = " nodoc \ > > >>> + pkg.swupdate.nocreatefs \ > > >>> + pkg.swupdate.nowebserver " > > >>> # In debian buster the git-compression defaults to gz and does > > >>> not detect other # compression formats. > > >>> GBP_EXTRA_OPTIONS += "--git-compression=xz" > > >>> > > >> > > >> So these things were actually broken for bullseye so far? > > > > > > Yes. Atleast, the nodoc is needed because of sphinx dependency issue > > > in > > bullseye. > > > > > > > Quirin just told me that only nodoc is needed for all. > > > > Dropping this patch again (keeping 1/2 though). Please send a v3 which > > does that, ie. adds a _bullseye profile and keeps the existing buster one. > > Ok. Will resend v3 of this particular patch. V3 of this patch available here. https://lists.cip-project.org/g/cip-dev/message/7165 Thanks, Vijai Kumar K > > Thanks, > Vijai Kumar K > > > > > Jan > > > > -- > > Siemens AG, T RDA IOT > > Corporate Competence Center Embedded Linux
diff --git a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb index a4d67fe..51aacfe 100644 --- a/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb +++ b/recipes-core/swupdate/swupdate_2021.04-1+debian-gbp.bb @@ -44,12 +44,12 @@ SWUPDATE_BUILD_PROFILES += "cross nocheck" # modify for debian buster build SRC_URI_append_buster = " file://0009-debian-prepare-build-for-isar-debian-buster.patch" -# disable documentation due to missing packages in debian buster -# disable create filesystem due to missing symbols in debian buster -# disable webserver due to missing symbols in debian buster -SWUPDATE_BUILD_PROFILES_append_buster = " nodoc \ - pkg.swupdate.nocreatefs \ - pkg.swupdate.nowebserver " +# disable documentation due to missing packages +# disable create filesystem due to missing symbols +# disable webserver due to missing symbols +SWUPDATE_BUILD_PROFILES_append = " nodoc \ + pkg.swupdate.nocreatefs \ + pkg.swupdate.nowebserver " # In debian buster the git-compression defaults to gz and does not detect other # compression formats. GBP_EXTRA_OPTIONS += "--git-compression=xz"
Stretch in now dropped. The conditional includes for buster is now not needed. Those includes are applicable to buster as well as bullseye. Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> --- .../swupdate/swupdate_2021.04-1+debian-gbp.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)