diff mbox series

[ovs-dev,1/1] debian: Allow passing DEB_BUILD_OPTIONS.

Message ID 20240926072427.839944-1-roid@nvidia.com
State Changes Requested
Headers show
Series [ovs-dev,1/1] debian: Allow passing DEB_BUILD_OPTIONS. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test fail github build: failed

Commit Message

Roi Dayan Sept. 26, 2024, 7:24 a.m. UTC
Allow passing different DEB_BUILD_OPTIONS to make debian-deb.

Signed-off-by: Roi Dayan <roid@nvidia.com>
---
 debian/automake.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Eelco Chaudron Sept. 27, 2024, 11:38 a.m. UTC | #1
On 26 Sep 2024, at 9:24, Roi Dayan via dev wrote:

> Allow passing different DEB_BUILD_OPTIONS to make debian-deb.
>
> Signed-off-by: Roi Dayan <roid@nvidia.com>

Hi Roy,

Not sure if you noticed, but the robot failed to build you change, i.e. the github CI failed to build debian.

https://github.com/ovsrobot/ovs/actions/runs/11047719338

I’ll mark this patch, as needs a new revision for now.

Cheers,

Eelco


> ---
>  debian/automake.mk | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/debian/automake.mk b/debian/automake.mk
> index 7b2afafae1a2..ebdcb022b3ef 100644
> --- a/debian/automake.mk
> +++ b/debian/automake.mk
> @@ -113,6 +113,11 @@ CLEANFILES += debian/control
>  debian: debian/copyright debian/control
>  .PHONY: debian
>
> +if DPDK_NETDEV
> +	DEB_BUILD_OPTIONS ?= "nocheck parallel=`nproc`"
> +else
> +	DEB_BUILD_OPTIONS ?= "nocheck parallel=`nproc` nodpdk"
> +endif
>
>  debian-deb: debian
>  	@if test X"$(srcdir)" != X"$(top_builddir)"; then			\
> @@ -123,10 +128,5 @@ debian-deb: debian
>  	$(update_deb_copyright)
>  	$(update_deb_control)
>  	$(AM_V_GEN) fakeroot debian/rules clean
> -if DPDK_NETDEV
> -	$(AM_V_GEN) DEB_BUILD_OPTIONS="nocheck parallel=`nproc`" \
> +	$(AM_V_GEN) DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS}" \
>  		fakeroot debian/rules binary
> -else
> -	$(AM_V_GEN) DEB_BUILD_OPTIONS="nocheck parallel=`nproc` nodpdk" \
> -		fakeroot debian/rules binary
> -endif
> -- 
> 2.46.1
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Roi Dayan Sept. 29, 2024, 6:33 a.m. UTC | #2
On 27/09/2024 14:38, Eelco Chaudron wrote:
> 
> 
> On 26 Sep 2024, at 9:24, Roi Dayan via dev wrote:
> 
>> Allow passing different DEB_BUILD_OPTIONS to make debian-deb.
>>
>> Signed-off-by: Roi Dayan <roid@nvidia.com>
> 
> Hi Roy,
> 
> Not sure if you noticed, but the robot failed to build you change, i.e. the github CI failed to build debian.
> 
> https://github.com/ovsrobot/ovs/actions/runs/11047719338
> 
> I’ll mark this patch, as needs a new revision for now.
> 
> Cheers,
> 
> Eelco
> 
> 

Hi,

I didn't see any email from the robot. can't find it really.
thanks for the update. i'll check whats wrong as this should
be a very simple change that should not change anything unless
the robot indeed set DEB_BUILD_OPTIONS in its environment
before calling make, then the robot should probably be fixed.

Thanks,
Roi


>> ---
>>  debian/automake.mk | 12 ++++++------
>>  1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/debian/automake.mk b/debian/automake.mk
>> index 7b2afafae1a2..ebdcb022b3ef 100644
>> --- a/debian/automake.mk
>> +++ b/debian/automake.mk
>> @@ -113,6 +113,11 @@ CLEANFILES += debian/control
>>  debian: debian/copyright debian/control
>>  .PHONY: debian
>>
>> +if DPDK_NETDEV
>> +	DEB_BUILD_OPTIONS ?= "nocheck parallel=`nproc`"
>> +else
>> +	DEB_BUILD_OPTIONS ?= "nocheck parallel=`nproc` nodpdk"
>> +endif
>>
>>  debian-deb: debian
>>  	@if test X"$(srcdir)" != X"$(top_builddir)"; then			\
>> @@ -123,10 +128,5 @@ debian-deb: debian
>>  	$(update_deb_copyright)
>>  	$(update_deb_control)
>>  	$(AM_V_GEN) fakeroot debian/rules clean
>> -if DPDK_NETDEV
>> -	$(AM_V_GEN) DEB_BUILD_OPTIONS="nocheck parallel=`nproc`" \
>> +	$(AM_V_GEN) DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS}" \
>>  		fakeroot debian/rules binary
>> -else
>> -	$(AM_V_GEN) DEB_BUILD_OPTIONS="nocheck parallel=`nproc` nodpdk" \
>> -		fakeroot debian/rules binary
>> -endif
>> -- 
>> 2.46.1
>>
>> _______________________________________________
>> dev mailing list
>> dev@openvswitch.org
>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
Roi Dayan Sept. 29, 2024, 6:47 a.m. UTC | #3
On 29/09/2024 9:33, Roi Dayan wrote:
> 
> 
> On 27/09/2024 14:38, Eelco Chaudron wrote:
>>
>>
>> On 26 Sep 2024, at 9:24, Roi Dayan via dev wrote:
>>
>>> Allow passing different DEB_BUILD_OPTIONS to make debian-deb.
>>>
>>> Signed-off-by: Roi Dayan <roid@nvidia.com>
>>
>> Hi Roy,
>>
>> Not sure if you noticed, but the robot failed to build you change, i.e. the github CI failed to build debian.
>>
>> https://github.com/ovsrobot/ovs/actions/runs/11047719338
>>
>> I’ll mark this patch, as needs a new revision for now.
>>
>> Cheers,
>>
>> Eelco
>>
>>
> 
> Hi,
> 
> I didn't see any email from the robot. can't find it really.
> thanks for the update. i'll check whats wrong as this should
> be a very simple change that should not change anything unless
> the robot indeed set DEB_BUILD_OPTIONS in its environment
> before calling make, then the robot should probably be fixed.
> 
> Thanks,
> Roi
> 

It's very strange. the failure is from configure command trying
to find dpdk libs, but the command was with argument --with-dpdk=no.

So its in ./.ci/linux-build.sh and reaching configure call in line 80.

+ ./configure --with-dpdk=no

and failed before calling make debian command yet so the
change I did in target debian-deb should not affect anything yet.
any idea to help me here?

> 
>>> ---
>>>  debian/automake.mk | 12 ++++++------
>>>  1 file changed, 6 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/debian/automake.mk b/debian/automake.mk
>>> index 7b2afafae1a2..ebdcb022b3ef 100644
>>> --- a/debian/automake.mk
>>> +++ b/debian/automake.mk
>>> @@ -113,6 +113,11 @@ CLEANFILES += debian/control
>>>  debian: debian/copyright debian/control
>>>  .PHONY: debian
>>>
>>> +if DPDK_NETDEV
>>> +	DEB_BUILD_OPTIONS ?= "nocheck parallel=`nproc`"
>>> +else
>>> +	DEB_BUILD_OPTIONS ?= "nocheck parallel=`nproc` nodpdk"
>>> +endif
>>>
>>>  debian-deb: debian
>>>  	@if test X"$(srcdir)" != X"$(top_builddir)"; then			\
>>> @@ -123,10 +128,5 @@ debian-deb: debian
>>>  	$(update_deb_copyright)
>>>  	$(update_deb_control)
>>>  	$(AM_V_GEN) fakeroot debian/rules clean
>>> -if DPDK_NETDEV
>>> -	$(AM_V_GEN) DEB_BUILD_OPTIONS="nocheck parallel=`nproc`" \
>>> +	$(AM_V_GEN) DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS}" \
>>>  		fakeroot debian/rules binary
>>> -else
>>> -	$(AM_V_GEN) DEB_BUILD_OPTIONS="nocheck parallel=`nproc` nodpdk" \
>>> -		fakeroot debian/rules binary
>>> -endif
>>> -- 
>>> 2.46.1
>>>
>>> _______________________________________________
>>> dev mailing list
>>> dev@openvswitch.org
>>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>>
>
Roi Dayan Sept. 29, 2024, 6:50 a.m. UTC | #4
On 29/09/2024 9:47, Roi Dayan wrote:
> 
> 
> On 29/09/2024 9:33, Roi Dayan wrote:
>>
>>
>> On 27/09/2024 14:38, Eelco Chaudron wrote:
>>>
>>>
>>> On 26 Sep 2024, at 9:24, Roi Dayan via dev wrote:
>>>
>>>> Allow passing different DEB_BUILD_OPTIONS to make debian-deb.
>>>>
>>>> Signed-off-by: Roi Dayan <roid@nvidia.com>
>>>
>>> Hi Roy,
>>>
>>> Not sure if you noticed, but the robot failed to build you change, i.e. the github CI failed to build debian.
>>>
>>> https://github.com/ovsrobot/ovs/actions/runs/11047719338
>>>
>>> I’ll mark this patch, as needs a new revision for now.
>>>
>>> Cheers,
>>>
>>> Eelco
>>>
>>>
>>
>> Hi,
>>
>> I didn't see any email from the robot. can't find it really.
>> thanks for the update. i'll check whats wrong as this should
>> be a very simple change that should not change anything unless
>> the robot indeed set DEB_BUILD_OPTIONS in its environment
>> before calling make, then the robot should probably be fixed.
>>
>> Thanks,
>> Roi
>>
> 
> It's very strange. the failure is from configure command trying
> to find dpdk libs, but the command was with argument --with-dpdk=no.
> 
> So its in ./.ci/linux-build.sh and reaching configure call in line 80.
> 
> + ./configure --with-dpdk=no
> 
> and failed before calling make debian command yet so the
> change I did in target debian-deb should not affect anything yet.
> any idea to help me here?
> 

sorry my mistake didnt read the log correctly. i see the call to
make debian so checking whats wrong.

>>
>>>> ---
>>>>  debian/automake.mk | 12 ++++++------
>>>>  1 file changed, 6 insertions(+), 6 deletions(-)
>>>>
>>>> diff --git a/debian/automake.mk b/debian/automake.mk
>>>> index 7b2afafae1a2..ebdcb022b3ef 100644
>>>> --- a/debian/automake.mk
>>>> +++ b/debian/automake.mk
>>>> @@ -113,6 +113,11 @@ CLEANFILES += debian/control
>>>>  debian: debian/copyright debian/control
>>>>  .PHONY: debian
>>>>
>>>> +if DPDK_NETDEV
>>>> +	DEB_BUILD_OPTIONS ?= "nocheck parallel=`nproc`"
>>>> +else
>>>> +	DEB_BUILD_OPTIONS ?= "nocheck parallel=`nproc` nodpdk"
>>>> +endif
>>>>
>>>>  debian-deb: debian
>>>>  	@if test X"$(srcdir)" != X"$(top_builddir)"; then			\
>>>> @@ -123,10 +128,5 @@ debian-deb: debian
>>>>  	$(update_deb_copyright)
>>>>  	$(update_deb_control)
>>>>  	$(AM_V_GEN) fakeroot debian/rules clean
>>>> -if DPDK_NETDEV
>>>> -	$(AM_V_GEN) DEB_BUILD_OPTIONS="nocheck parallel=`nproc`" \
>>>> +	$(AM_V_GEN) DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS}" \
>>>>  		fakeroot debian/rules binary
>>>> -else
>>>> -	$(AM_V_GEN) DEB_BUILD_OPTIONS="nocheck parallel=`nproc` nodpdk" \
>>>> -		fakeroot debian/rules binary
>>>> -endif
>>>> -- 
>>>> 2.46.1
>>>>
>>>> _______________________________________________
>>>> dev mailing list
>>>> dev@openvswitch.org
>>>> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>>>
>>
>
diff mbox series

Patch

diff --git a/debian/automake.mk b/debian/automake.mk
index 7b2afafae1a2..ebdcb022b3ef 100644
--- a/debian/automake.mk
+++ b/debian/automake.mk
@@ -113,6 +113,11 @@  CLEANFILES += debian/control
 debian: debian/copyright debian/control
 .PHONY: debian
 
+if DPDK_NETDEV
+	DEB_BUILD_OPTIONS ?= "nocheck parallel=`nproc`"
+else
+	DEB_BUILD_OPTIONS ?= "nocheck parallel=`nproc` nodpdk"
+endif
 
 debian-deb: debian
 	@if test X"$(srcdir)" != X"$(top_builddir)"; then			\
@@ -123,10 +128,5 @@  debian-deb: debian
 	$(update_deb_copyright)
 	$(update_deb_control)
 	$(AM_V_GEN) fakeroot debian/rules clean
-if DPDK_NETDEV
-	$(AM_V_GEN) DEB_BUILD_OPTIONS="nocheck parallel=`nproc`" \
+	$(AM_V_GEN) DEB_BUILD_OPTIONS="${DEB_BUILD_OPTIONS}" \
 		fakeroot debian/rules binary
-else
-	$(AM_V_GEN) DEB_BUILD_OPTIONS="nocheck parallel=`nproc` nodpdk" \
-		fakeroot debian/rules binary
-endif