* [PATCH] dpkg-source: Drop -I filter
@ 2023-10-12 11:19 Jan Kiszka
2023-10-12 12:27 ` Jan Kiszka
0 siblings, 1 reply; 6+ messages in thread
From: Jan Kiszka @ 2023-10-12 11:19 UTC (permalink / raw)
To: isar-users; +Cc: Anton Mikanovich
From: Jan Kiszka <jan.kiszka@siemens.com>
This is a regression of 38b832ad8248 which added this while factoring
out this step. However, some packages may break over this, e.g. the
edk2-standalonemm-rpmb recipe in isar-cip-core.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/classes/dpkg-source.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-source.bbclass
index 1f4f8164..a86b4635 100644
--- a/meta/classes/dpkg-source.bbclass
+++ b/meta/classes/dpkg-source.bbclass
@@ -12,7 +12,7 @@ do_dpkg_source() {
if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}"
fi
- sh -c "cd ${WORKDIR}; dpkg-source -I -b ${PPS}"
+ sh -c "cd ${WORKDIR}; dpkg-source -b ${PPS}"
}
addtask dpkg_source after do_prepare_build before do_dpkg_build
--
2.35.3
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dpkg-source: Drop -I filter
2023-10-12 11:19 [PATCH] dpkg-source: Drop -I filter Jan Kiszka
@ 2023-10-12 12:27 ` Jan Kiszka
2023-10-26 10:21 ` MOESSBAUER, Felix
0 siblings, 1 reply; 6+ messages in thread
From: Jan Kiszka @ 2023-10-12 12:27 UTC (permalink / raw)
To: isar-users; +Cc: Anton Mikanovich
On 12.10.23 13:19, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> This is a regression of 38b832ad8248 which added this while factoring
> out this step. However, some packages may break over this, e.g. the
> edk2-standalonemm-rpmb recipe in isar-cip-core.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> meta/classes/dpkg-source.bbclass | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-source.bbclass
> index 1f4f8164..a86b4635 100644
> --- a/meta/classes/dpkg-source.bbclass
> +++ b/meta/classes/dpkg-source.bbclass
> @@ -12,7 +12,7 @@ do_dpkg_source() {
> if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
> export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}"
> fi
> - sh -c "cd ${WORKDIR}; dpkg-source -I -b ${PPS}"
> + sh -c "cd ${WORKDIR}; dpkg-source -b ${PPS}"
> }
> addtask dpkg_source after do_prepare_build before do_dpkg_build
>
That said, we can also think about re-introducing it, but it would need
some control in recipe hands. Would be work on top in any case.
Jan
--
Siemens AG, Technology
Linux Expert Center
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dpkg-source: Drop -I filter
2023-10-12 12:27 ` Jan Kiszka
@ 2023-10-26 10:21 ` MOESSBAUER, Felix
2023-10-26 13:55 ` Anton Mikanovich
2023-10-26 14:02 ` Jan Kiszka
0 siblings, 2 replies; 6+ messages in thread
From: MOESSBAUER, Felix @ 2023-10-26 10:21 UTC (permalink / raw)
To: isar-users, Kiszka, Jan; +Cc: amikan
On Thu, 2023-10-12 at 14:27 +0200, 'Jan Kiszka' via isar-users wrote:
> On 12.10.23 13:19, 'Jan Kiszka' via isar-users wrote:
> > From: Jan Kiszka <jan.kiszka@siemens.com>
> >
> > This is a regression of 38b832ad8248 which added this while
> > factoring
> > out this step. However, some packages may break over this, e.g. the
> > edk2-standalonemm-rpmb recipe in isar-cip-core.
> >
> > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> > ---
> > meta/classes/dpkg-source.bbclass | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-
> > source.bbclass
> > index 1f4f8164..a86b4635 100644
> > --- a/meta/classes/dpkg-source.bbclass
> > +++ b/meta/classes/dpkg-source.bbclass
> > @@ -12,7 +12,7 @@ do_dpkg_source() {
> > if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
> > export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}"
> > fi
> > - sh -c "cd ${WORKDIR}; dpkg-source -I -b ${PPS}"
> > + sh -c "cd ${WORKDIR}; dpkg-source -b ${PPS}"
> > }
> > addtask dpkg_source after do_prepare_build before do_dpkg_build
> >
>
> That said, we can also think about re-introducing it, but it would
> need
> some control in recipe hands. Would be work on top in any case.
There are more things that break with the original patch:
First, we do not generate a debian/source/format, which defaults to 1.0
which is an ancient version. Second, when setting this correctly to 3.0
(native), we cannot include any non soversioned binaries into the
source archive (--include-binaries does not work for native packages).
This unfortunately breaks many packages at our side containing
proprietary stuff (like GPU drivers).
Best regards,
Felix
>
> Jan
>
> --
> Siemens AG, Technology
> Linux Expert Center
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dpkg-source: Drop -I filter
2023-10-26 10:21 ` MOESSBAUER, Felix
@ 2023-10-26 13:55 ` Anton Mikanovich
2023-10-26 14:02 ` Jan Kiszka
1 sibling, 0 replies; 6+ messages in thread
From: Anton Mikanovich @ 2023-10-26 13:55 UTC (permalink / raw)
To: MOESSBAUER, Felix, isar-users, Kiszka, Jan
Hello Felix,
Can you provide some example recipe that was building ok before 38b832ad and
was broken by it?
We've never generate debian/source/format before, and it looks like more
debianization issue then source package building problem.
26/10/2023 13:21, MOESSBAUER, Felix wrote:
> There are more things that break with the original patch:
>
> First, we do not generate a debian/source/format, which defaults to 1.0
> which is an ancient version. Second, when setting this correctly to 3.0
> (native), we cannot include any non soversioned binaries into the
> source archive (--include-binaries does not work for native packages).
> This unfortunately breaks many packages at our side containing
> proprietary stuff (like GPU drivers).
>
> Best regards,
> Felix
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dpkg-source: Drop -I filter
2023-10-26 10:21 ` MOESSBAUER, Felix
2023-10-26 13:55 ` Anton Mikanovich
@ 2023-10-26 14:02 ` Jan Kiszka
2023-10-26 14:56 ` MOESSBAUER, Felix
1 sibling, 1 reply; 6+ messages in thread
From: Jan Kiszka @ 2023-10-26 14:02 UTC (permalink / raw)
To: MOESSBAUER, Felix (T CED INW-CN), isar-users; +Cc: amikan
On 26.10.23 12:21, MOESSBAUER, Felix (T CED INW-CN) wrote:
> On Thu, 2023-10-12 at 14:27 +0200, 'Jan Kiszka' via isar-users wrote:
>> On 12.10.23 13:19, 'Jan Kiszka' via isar-users wrote:
>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>
>>> This is a regression of 38b832ad8248 which added this while
>>> factoring
>>> out this step. However, some packages may break over this, e.g. the
>>> edk2-standalonemm-rpmb recipe in isar-cip-core.
>>>
>>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>>> ---
>>> meta/classes/dpkg-source.bbclass | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-
>>> source.bbclass
>>> index 1f4f8164..a86b4635 100644
>>> --- a/meta/classes/dpkg-source.bbclass
>>> +++ b/meta/classes/dpkg-source.bbclass
>>> @@ -12,7 +12,7 @@ do_dpkg_source() {
>>> if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
>>> export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}"
>>> fi
>>> - sh -c "cd ${WORKDIR}; dpkg-source -I -b ${PPS}"
>>> + sh -c "cd ${WORKDIR}; dpkg-source -b ${PPS}"
>>> }
>>> addtask dpkg_source after do_prepare_build before do_dpkg_build
>>>
>>
>> That said, we can also think about re-introducing it, but it would
>> need
>> some control in recipe hands. Would be work on top in any case.
>
> There are more things that break with the original patch:
>
> First, we do not generate a debian/source/format, which defaults to 1.0
> which is an ancient version. Second, when setting this correctly to 3.0
> (native), we cannot include any non soversioned binaries into the
> source archive (--include-binaries does not work for native packages).
> This unfortunately breaks many packages at our side containing
> proprietary stuff (like GPU drivers).
>
Doesn't this pattern help here?
https://gitlab.com/cip-project/cip-core/isar-cip-core/-/commit/d6ebec910bd65b18d0a33abbcf7b57e1ffb8454d
Jan
--
Siemens AG, Technology
Linux Expert Center
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] dpkg-source: Drop -I filter
2023-10-26 14:02 ` Jan Kiszka
@ 2023-10-26 14:56 ` MOESSBAUER, Felix
0 siblings, 0 replies; 6+ messages in thread
From: MOESSBAUER, Felix @ 2023-10-26 14:56 UTC (permalink / raw)
To: isar-users, Kiszka, Jan; +Cc: amikan
On Thu, 2023-10-26 at 16:02 +0200, Jan Kiszka wrote:
> On 26.10.23 12:21, MOESSBAUER, Felix (T CED INW-CN) wrote:
> > On Thu, 2023-10-12 at 14:27 +0200, 'Jan Kiszka' via isar-users
> > wrote:
> > > On 12.10.23 13:19, 'Jan Kiszka' via isar-users wrote:
> > > > From: Jan Kiszka <jan.kiszka@siemens.com>
> > > >
> > > > This is a regression of 38b832ad8248 which added this while
> > > > factoring
> > > > out this step. However, some packages may break over this, e.g.
> > > > the
> > > > edk2-standalonemm-rpmb recipe in isar-cip-core.
> > > >
> > > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> > > > ---
> > > > meta/classes/dpkg-source.bbclass | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/meta/classes/dpkg-source.bbclass
> > > > b/meta/classes/dpkg-
> > > > source.bbclass
> > > > index 1f4f8164..a86b4635 100644
> > > > --- a/meta/classes/dpkg-source.bbclass
> > > > +++ b/meta/classes/dpkg-source.bbclass
> > > > @@ -12,7 +12,7 @@ do_dpkg_source() {
> > > > if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then
> > > > export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}"
> > > > fi
> > > > - sh -c "cd ${WORKDIR}; dpkg-source -I -b ${PPS}"
> > > > + sh -c "cd ${WORKDIR}; dpkg-source -b ${PPS}"
> > > > }
> > > > addtask dpkg_source after do_prepare_build before
> > > > do_dpkg_build
> > > >
> > >
> > > That said, we can also think about re-introducing it, but it
> > > would
> > > need
> > > some control in recipe hands. Would be work on top in any case.
> >
> > There are more things that break with the original patch:
> >
> > First, we do not generate a debian/source/format, which defaults to
> > 1.0
> > which is an ancient version. Second, when setting this correctly to
> > 3.0
> > (native), we cannot include any non soversioned binaries into the
> > source archive (--include-binaries does not work for native
> > packages).
> > This unfortunately breaks many packages at our side containing
> > proprietary stuff (like GPU drivers).
> >
>
> Doesn't this pattern help here?
> https://gitlab.com/cip-project/cip-core/isar-cip-core/-/commit/d6ebec910bd65b18d0a33abbcf7b57e1ffb8454d
Ok, it is more complicated than expected:
When removing the -I by setting DPKG_SOURCE_EXTRA_ARGS, this ONLY works
when not setting the source/format to "3.0 (native)". When setting the
source format to "3.0 (native)", the -I switch anyways has no effect
and the binaries are missing. It also does not help to add them to the
"include-binaries" file. When not providing this file, we get the
following warning, but it works, as the fallback is format version 1.0.
This definitely needs a second thought.
dpkg-source: warning: no source format specified in
debian/source/format, see dpkg-source(1)
dpkg-source: info: using source format '1.0'
Felix
>
> Jan
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-10-26 14:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-12 11:19 [PATCH] dpkg-source: Drop -I filter Jan Kiszka
2023-10-12 12:27 ` Jan Kiszka
2023-10-26 10:21 ` MOESSBAUER, Felix
2023-10-26 13:55 ` Anton Mikanovich
2023-10-26 14:02 ` Jan Kiszka
2023-10-26 14:56 ` MOESSBAUER, Felix
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox