[PATCH cygport] Produce obsoletes: headers in .hint files

[PATCH cygport] Produce obsoletes: headers in .hint files

[Jon Turney]

Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk>
---
 lib/pkg_pkg.cygpart | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart
index 0dba03d..aa6f0e8 100644
--- a/lib/pkg_pkg.cygpart
+++ b/lib/pkg_pkg.cygpart
@@ -718,6 +718,11 @@ requires: ${pkg_bin_requires} ${!pkg_requires_var}
 sdesc: "${!pkg_summary_var:-${SUMMARY}}"
 ldesc: "${!pkg_description_var:-${DESCRIPTION:-${!pkg_summary_var:-${SUMMARY}}}}"
 _EOF
+			if [ -n "${!pkg_obsoletes_var}" ]
+			then
+				cat >> ${distdir}/${PN}/${distsubdir}/${pkg_name[${n}]}-${PVR}.hint <<-_EOF
+obsoletes: ${!pkg_obsoletes_var}
+			fi
 			if defined distsubdir
 			then
 				cat >> ${distdir}/${PN}/${distsubdir}/${pkg_name[${n}]}-${PVR}.hint <<-_EOF
@@ -788,6 +793,11 @@ ldesc: "This package contains files necessary for debugging the
 ${PN} package with gdb."
 ${pkg_tag}
 _EOF
+			if [ -n "${!dbg_obsoletes_var}" ]
+			then
+				cat >> ${distdir}/${PN}/${PN}-debuginfo/${PN}-debuginfo-${PVR}.hint <<-_EOF
+obsoletes: ${!dbg_obsoletes_var}
+			fi
 		fi
 
 		for obspkg in ${!dbg_obsoletes_var}
-- 
2.16.1

Re: [PATCH cygport] Produce obsoletes: headers in .hint files

[Yaakov Selkowitz]

[-- Attachment #1.1: Type: text/plain, Size: 817 bytes --]

On 2018-02-06 15:13, Jon Turney wrote:
>  lib/pkg_pkg.cygpart | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart
> index 0dba03d..aa6f0e8 100644
> --- a/lib/pkg_pkg.cygpart
> +++ b/lib/pkg_pkg.cygpart
> @@ -718,6 +718,11 @@ requires: ${pkg_bin_requires} ${!pkg_requires_var}
>  sdesc: "${!pkg_summary_var:-${SUMMARY}}"
>  ldesc: "${!pkg_description_var:-${DESCRIPTION:-${!pkg_summary_var:-${SUMMARY}}}}"
>  _EOF
> +			if [ -n "${!pkg_obsoletes_var}" ]
> +			then
> +				cat >> ${distdir}/${PN}/${distsubdir}/${pkg_name[${n}]}-${PVR}.hint <<-_EOF
> +obsoletes: ${!pkg_obsoletes_var}

This is missing the closing _EOF in both hunks.  (The testsuite did its
job though, and failed pretty badly.)  Pushed, with that change.

-- 
Yaakov


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH cygport] Produce obsoletes: headers in .hint files

[Jon Turney]

On 13/02/2018 06:30, Yaakov Selkowitz wrote:
> On 2018-02-06 15:13, Jon Turney wrote:
>>   lib/pkg_pkg.cygpart | 10 ++++++++++
>>   1 file changed, 10 insertions(+)
>>
>> diff --git a/lib/pkg_pkg.cygpart b/lib/pkg_pkg.cygpart
>> index 0dba03d..aa6f0e8 100644
>> --- a/lib/pkg_pkg.cygpart
>> +++ b/lib/pkg_pkg.cygpart
>> @@ -718,6 +718,11 @@ requires: ${pkg_bin_requires} ${!pkg_requires_var}
>>   sdesc: "${!pkg_summary_var:-${SUMMARY}}"
>>   ldesc: "${!pkg_description_var:-${DESCRIPTION:-${!pkg_summary_var:-${SUMMARY}}}}"
>>   _EOF
>> +			if [ -n "${!pkg_obsoletes_var}" ]
>> +			then
>> +				cat >> ${distdir}/${PN}/${distsubdir}/${pkg_name[${n}]}-${PVR}.hint <<-_EOF
>> +obsoletes: ${!pkg_obsoletes_var}
> 
> This is missing the closing _EOF in both hunks.  (The testsuite did its
> job though, and failed pretty badly.)  Pushed, with that change.

Thanks.

It seems I added the _EOF locally and forgot to check it in :(