[PATCH] dpkg-raw: empty "Depends:" line is not allowed in .deb

[PATCH] dpkg-raw: empty "Depends:" line is not allowed in .deb

[Henning Schild]

Apt-gat fails to install packages if the control-file contains a
"Depends:"-line without any packages listed.

  E: Problem parsing dependency Depends

So append that line to the control-file only if DEBIAN_DEPENDS was set
in the recipe. The user could still specify i.e. " " or anything
invalid, we do not check that. But now our default works.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
Reported-by: Claudius Heine <ch@denx.de>
---
 meta/classes/dpkg-raw.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass
index af62be4..1435e10 100644
--- a/meta/classes/dpkg-raw.bbclass
+++ b/meta/classes/dpkg-raw.bbclass
@@ -26,10 +26,15 @@ do_deb_package_prepare() {
 		Section: misc
 		Priority: optional
 		Maintainer: ${MAINTAINER}
-		Depends: `echo ${DEBIAN_DEPENDS} | tr '[:blank:]' ','`
 		Version: ${PV}+isar
 		Description: ${DESCRIPTION}
 	__EOF__
+	if [ ${DEBIAN_DEPENDS} != "" ]
+	then
+		echo -n Depends: >> ${D}/DEBIAN/control
+		echo ${DEBIAN_DEPENDS} | tr '[:blank:]' ',' >> \
+			${D}/DEBIAN/control
+	fi
 	for t in pre post
 	do
 		for a in inst rm
-- 
2.13.6

Re: [PATCH] dpkg-raw: empty "Depends:" line is not allowed in .deb

[Claudius Heine]

Hi Henning,

On 12/13/2017 01:51 PM, [ext] Henning Schild wrote:
> Apt-gat fails to install packages if the control-file contains a
> "Depends:"-line without any packages listed.
> 
>    E: Problem parsing dependency Depends
> 
> So append that line to the control-file only if DEBIAN_DEPENDS was set
> in the recipe. The user could still specify i.e. " " or anything
> invalid, we do not check that. But now our default works.

Nice, that works for me!

Thanks,
Claudius

> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> Reported-by: Claudius Heine <ch@denx.de>
> ---
>   meta/classes/dpkg-raw.bbclass | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass
> index af62be4..1435e10 100644
> --- a/meta/classes/dpkg-raw.bbclass
> +++ b/meta/classes/dpkg-raw.bbclass
> @@ -26,10 +26,15 @@ do_deb_package_prepare() {
>   		Section: misc
>   		Priority: optional
>   		Maintainer: ${MAINTAINER}
> -		Depends: `echo ${DEBIAN_DEPENDS} | tr '[:blank:]' ','`
>   		Version: ${PV}+isar
>   		Description: ${DESCRIPTION}
>   	__EOF__
> +	if [ ${DEBIAN_DEPENDS} != "" ]
> +	then
> +		echo -n Depends: >> ${D}/DEBIAN/control
> +		echo ${DEBIAN_DEPENDS} | tr '[:blank:]' ',' >> \
> +			${D}/DEBIAN/control
> +	fi
>   	for t in pre post
>   	do
>   		for a in inst rm
> 

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de

Re: [PATCH] dpkg-raw: empty "Depends:" line is not allowed in .deb

[Christian Storm]

> Apt-gat fails to install packages if the control-file contains a
> "Depends:"-line without any packages listed.
> 
>   E: Problem parsing dependency Depends
> 
> So append that line to the control-file only if DEBIAN_DEPENDS was set
> in the recipe. The user could still specify i.e. " " or anything
> invalid, we do not check that. But now our default works.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> Reported-by: Claudius Heine <ch@denx.de>
> ---
>  meta/classes/dpkg-raw.bbclass | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass
> index af62be4..1435e10 100644
> --- a/meta/classes/dpkg-raw.bbclass
> +++ b/meta/classes/dpkg-raw.bbclass
> @@ -26,10 +26,15 @@ do_deb_package_prepare() {
>  		Section: misc
>  		Priority: optional
>  		Maintainer: ${MAINTAINER}
> -		Depends: `echo ${DEBIAN_DEPENDS} | tr '[:blank:]' ','`

Just as a side note: This doesn't work for versioned dependencies
that should result in a line like, e.g.,
  Depends: libc6 (>= 2.14)
in DEBIAN/control.


Besten Gru�,
   Christian

-- 
Dr. Christian Storm
Siemens AG, Corporate Technology, CT RDA ITP SES-DE
Otto-Hahn-Ring 6, 81739 M�nchen, Germany

Re: [PATCH] dpkg-raw: empty "Depends:" line is not allowed in .deb

[Henning Schild]

Am Wed, 13 Dec 2017 14:35:20 +0100
schrieb "[ext] Christian Storm" <christian.storm@siemens.com>:

> > Apt-gat fails to install packages if the control-file contains a
> > "Depends:"-line without any packages listed.
> > 
> >   E: Problem parsing dependency Depends
> > 
> > So append that line to the control-file only if DEBIAN_DEPENDS was
> > set in the recipe. The user could still specify i.e. " " or anything
> > invalid, we do not check that. But now our default works.
> > 
> > Signed-off-by: Henning Schild <henning.schild@siemens.com>
> > Reported-by: Claudius Heine <ch@denx.de>
> > ---
> >  meta/classes/dpkg-raw.bbclass | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> > 
> > diff --git a/meta/classes/dpkg-raw.bbclass
> > b/meta/classes/dpkg-raw.bbclass index af62be4..1435e10 100644
> > --- a/meta/classes/dpkg-raw.bbclass
> > +++ b/meta/classes/dpkg-raw.bbclass
> > @@ -26,10 +26,15 @@ do_deb_package_prepare() {
> >  		Section: misc
> >  		Priority: optional
> >  		Maintainer: ${MAINTAINER}
> > -		Depends: `echo ${DEBIAN_DEPENDS} | tr '[:blank:]'
> > ','`  
> 
> Just as a side note: This doesn't work for versioned dependencies
> that should result in a line like, e.g.,
>   Depends: libc6 (>= 2.14)
> in DEBIAN/control.

Ah ok, that is the "tr". I just thought about dropping it, but that
might break existing recipes ...
What about "libc(>=2.14)" ?

Thanks, i will look into it.

Henning

> 
> Besten Gruß,
>    Christian
> 

Re: [PATCH] dpkg-raw: empty "Depends:" line is not allowed in .deb

[Claudius Heine]

Hi,

On 12/13/2017 02:35 PM, [ext] Christian Storm wrote:
>> Apt-gat fails to install packages if the control-file contains a
>> "Depends:"-line without any packages listed.
>>
>>    E: Problem parsing dependency Depends
>>
>> So append that line to the control-file only if DEBIAN_DEPENDS was set
>> in the recipe. The user could still specify i.e. " " or anything
>> invalid, we do not check that. But now our default works.
>>
>> Signed-off-by: Henning Schild <henning.schild@siemens.com>
>> Reported-by: Claudius Heine <ch@denx.de>
>> ---
>>   meta/classes/dpkg-raw.bbclass | 7 ++++++-
>>   1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass
>> index af62be4..1435e10 100644
>> --- a/meta/classes/dpkg-raw.bbclass
>> +++ b/meta/classes/dpkg-raw.bbclass
>> @@ -26,10 +26,15 @@ do_deb_package_prepare() {
>>   		Section: misc
>>   		Priority: optional
>>   		Maintainer: ${MAINTAINER}
>> -		Depends: `echo ${DEBIAN_DEPENDS} | tr '[:blank:]' ','`
> 
> Just as a side note: This doesn't work for versioned dependencies
> that should result in a line like, e.g.,
>    Depends: libc6 (>= 2.14)
> in DEBIAN/control.

Also stuff like that is not possible:

     Depends: tar | bsdtar, systemd

Maybe allow something like this:

     DEBIAN_DEPENDS = "'libc6 (>= 2.14)' 'tar | bsdtar' systemd"

But that would be a additional patch.

Cheers,
Claudius

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch@denx.de

[PATCH v2] dpkg-raw: empty "Depends:" line is not allowed in .deb

[Henning Schild]

Apt-gat fails to install packages if the control-file contains a
"Depends:"-line without any packages listed.

  E: Problem parsing dependency Depends

So append that line to the control-file only if DEBIAN_DEPENDS was set
in the recipe. The user could still specify i.e. " " or anything
invalid, we do not check that. But now our default works.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
Reported-by: Claudius Heine <ch@denx.de>
---
 meta/classes/dpkg-raw.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass
index af62be4..ecd5c7f 100644
--- a/meta/classes/dpkg-raw.bbclass
+++ b/meta/classes/dpkg-raw.bbclass
@@ -26,10 +26,15 @@ do_deb_package_prepare() {
 		Section: misc
 		Priority: optional
 		Maintainer: ${MAINTAINER}
-		Depends: `echo ${DEBIAN_DEPENDS} | tr '[:blank:]' ','`
 		Version: ${PV}+isar
 		Description: ${DESCRIPTION}
 	__EOF__
+	if [ "${DEBIAN_DEPENDS}" != "" ]
+	then
+		echo -n Depends: >> ${D}/DEBIAN/control
+		echo ${DEBIAN_DEPENDS} | tr '[:blank:]' ',' >> \
+			${D}/DEBIAN/control
+	fi
 	for t in pre post
 	do
 		for a in inst rm
-- 
2.13.6

Re: [PATCH] dpkg-raw: empty "Depends:" line is not allowed in .deb

[Henning Schild]

Am Wed, 13 Dec 2017 13:51:36 +0100
schrieb Henning Schild <henning.schild@siemens.com>:

> Apt-gat fails to install packages if the control-file contains a
> "Depends:"-line without any packages listed.
> 
>   E: Problem parsing dependency Depends
> 
> So append that line to the control-file only if DEBIAN_DEPENDS was set
> in the recipe. The user could still specify i.e. " " or anything
> invalid, we do not check that. But now our default works.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> Reported-by: Claudius Heine <ch@denx.de>
> ---
>  meta/classes/dpkg-raw.bbclass | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/dpkg-raw.bbclass
> b/meta/classes/dpkg-raw.bbclass index af62be4..1435e10 100644
> --- a/meta/classes/dpkg-raw.bbclass
> +++ b/meta/classes/dpkg-raw.bbclass
> @@ -26,10 +26,15 @@ do_deb_package_prepare() {
>  		Section: misc
>  		Priority: optional
>  		Maintainer: ${MAINTAINER}
> -		Depends: `echo ${DEBIAN_DEPENDS} | tr '[:blank:]'
> ','` Version: ${PV}+isar
>  		Description: ${DESCRIPTION}
>  	__EOF__
> +	if [ ${DEBIAN_DEPENDS} != "" ]

the condition is missing "" around DEBIAN_DEPENDS sending v2

> +	then
> +		echo -n Depends: >> ${D}/DEBIAN/control
> +		echo ${DEBIAN_DEPENDS} | tr '[:blank:]' ',' >> \
> +			${D}/DEBIAN/control
> +	fi
>  	for t in pre post
>  	do
>  		for a in inst rm

Re: [PATCH v2] dpkg-raw: empty "Depends:" line is not allowed in .deb

[Alexander Smirnov]

On 12/14/2017 08:34 PM, Henning Schild wrote:
> Apt-gat fails to install packages if the control-file contains a
> "Depends:"-line without any packages listed.
> 
>    E: Problem parsing dependency Depends
> 
> So append that line to the control-file only if DEBIAN_DEPENDS was set
> in the recipe. The user could still specify i.e. " " or anything
> invalid, we do not check that. But now our default works.
> 

Applied to next, thanks!