Re: [PATCH] meta/debianize: do not create compat file when new style is in control

[Jan Kiszka <jan.kiszka@siemens.com>]

On 13.07.21 23:22, Henning Schild wrote:
> Am Tue, 13 Jul 2021 16:09:33 +0200
> schrieb Henning Schild <henning.schild@siemens.com>:
> 
>> The modern way to set the compat level is a Build-Depends on
>> debhelper-compat, in which case a compat file must not exist.
>>
>> So if there is a control file using that new way, skip the creation
>> of a compat file.
>>
>> Reported-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
>> Signed-off-by: Henning Schild <henning.schild@siemens.com>
>> ---
>>  meta/classes/debianize.bbclass | 6 +++++-
>>  1 file changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/debianize.bbclass
>> b/meta/classes/debianize.bbclass index dad1cb48fa40..878aaca89543
>> 100644 --- a/meta/classes/debianize.bbclass
>> +++ b/meta/classes/debianize.bbclass
>> @@ -89,7 +89,11 @@ deb_debianize() {
>>  	if [ -f ${WORKDIR}/compat ]; then
>>  		install -v -m 644 ${WORKDIR}/compat
>> ${S}/debian/compat else
>> -		deb_create_compat
>> +		# new style compat level could be in control
>> +		# do not create a compat file in that case
>> +		if ! grep "debhelper-compat" ${WORKDIR}/control; then
> 
> In fact we would also need to look for that in DEBIAN_BUILD_DEPENDS
> 

Maybe just reorder so that DEBIAN_BUILD_DEPENDS is already merged into a
generated control file.

Jan

> will send a v2.
> 
> Henning
> 
>> +			deb_create_compat
>> +		fi
>>  	fi
>>  	# create the control-file if there is no control-file in
>> WORKDIR if [ -f ${WORKDIR}/control ]; then
> 

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux