[PATCH] debianize: Add placeholder for original version to CHANGELOG_V

[PATCH] debianize: Add placeholder for original version to CHANGELOG_V

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

This allows to append to the latest upstream version when using an
unpinned source version. The format of the placeholder is
"<orig-version>".

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/debianize.bbclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass
index da43a4e2..d317caf6 100644
--- a/meta/classes/debianize.bbclass
+++ b/meta/classes/debianize.bbclass
@@ -11,6 +11,9 @@ DESCRIPTION ?= "must not be empty"
 MAINTAINER ?= "Unknown maintainer <unknown@example.com>"
 
 deb_add_changelog() {
+	orig_version=$(dpkg-parsechangelog -l ${S}/debian/changelog | grep "Version:" | cut -d' ' -f2)
+	changelog_v=$(echo "${CHANGELOG_V}" | sed 's/<orig-version>/'${orig_version}'/')
+
 	timestamp=$(find ${S}/ -type f -not -path "${S}/debian/*" -printf "%T@\n"|sort -n -r|head -n 1)
 	if [ -n "${timestamp}" ]; then
 		date=$(LANG=C date -R -d @${timestamp})
@@ -18,7 +21,7 @@ deb_add_changelog() {
 		date=$(LANG=C date -R)
 	fi
 	cat <<EOF > ${S}/debian/changelog
-${PN} (${CHANGELOG_V}) UNRELEASED; urgency=low
+${PN} (${changelog_v}) UNRELEASED; urgency=low
 
   * generated by Isar
 
@@ -26,7 +29,7 @@ ${PN} (${CHANGELOG_V}) UNRELEASED; urgency=low
 EOF
 	if [ -f ${WORKDIR}/changelog ]; then
 		if head -1 "${WORKDIR}"/changelog | \
-			grep -q -e "^${PN} (${CHANGELOG_V})"
+			grep -q -e "^${PN} (${changelog_v})"
 		then
 			# entry for our version already there, use unmodified
 			rm ${S}/debian/changelog
-- 
2.16.4

Re: [PATCH] debianize: Add placeholder for original version to CHANGELOG_V

[Henning Schild]

On Thu, 23 Apr 2020 15:54:47 +0200
Jan Kiszka <jan.kiszka@siemens.com> wrote:

> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This allows to append to the latest upstream version when using an
> unpinned source version. The format of the placeholder is
> "<orig-version>".
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  meta/classes/debianize.bbclass | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/debianize.bbclass
> b/meta/classes/debianize.bbclass index da43a4e2..d317caf6 100644
> --- a/meta/classes/debianize.bbclass
> +++ b/meta/classes/debianize.bbclass
> @@ -11,6 +11,9 @@ DESCRIPTION ?= "must not be empty"
>  MAINTAINER ?= "Unknown maintainer <unknown@example.com>"
>  
>  deb_add_changelog() {
> +	orig_version=$(dpkg-parsechangelog -l ${S}/debian/changelog
> | grep "Version:" | cut -d' ' -f2)

-S Version, no grep no cut

> +	changelog_v=$(echo "${CHANGELOG_V}" | sed
> 's/<orig-version>/'${orig_version}'/') +
>  	timestamp=$(find ${S}/ -type f -not -path "${S}/debian/*"
> -printf "%T@\n"|sort -n -r|head -n 1) if [ -n "${timestamp}" ]; then
>  		date=$(LANG=C date -R -d @${timestamp})
> @@ -18,7 +21,7 @@ deb_add_changelog() {
>  		date=$(LANG=C date -R)
>  	fi
>  	cat <<EOF > ${S}/debian/changelog
> -${PN} (${CHANGELOG_V}) UNRELEASED; urgency=low
> +${PN} (${changelog_v}) UNRELEASED; urgency=low
>  
>    * generated by Isar
>  
> @@ -26,7 +29,7 @@ ${PN} (${CHANGELOG_V}) UNRELEASED; urgency=low
>  EOF
>  	if [ -f ${WORKDIR}/changelog ]; then
>  		if head -1 "${WORKDIR}"/changelog | \
> -			grep -q -e "^${PN} (${CHANGELOG_V})"
> +			grep -q -e "^${PN} (${changelog_v})"
>  		then
>  			# entry for our version already there, use
> unmodified rm ${S}/debian/changelog

I am afraid that calling this many times will create many entries with
ever longer unique versions.

Henning

Re: [PATCH] debianize: Add placeholder for original version to CHANGELOG_V

[Jan Kiszka]

On 23.04.20 16:40, Henning Schild wrote:
> On Thu, 23 Apr 2020 15:54:47 +0200
> Jan Kiszka <jan.kiszka@siemens.com> wrote:
> 
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> This allows to append to the latest upstream version when using an
>> unpinned source version. The format of the placeholder is
>> "<orig-version>".
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>   meta/classes/debianize.bbclass | 7 +++++--
>>   1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/classes/debianize.bbclass
>> b/meta/classes/debianize.bbclass index da43a4e2..d317caf6 100644
>> --- a/meta/classes/debianize.bbclass
>> +++ b/meta/classes/debianize.bbclass
>> @@ -11,6 +11,9 @@ DESCRIPTION ?= "must not be empty"
>>   MAINTAINER ?= "Unknown maintainer <unknown@example.com>"
>>   
>>   deb_add_changelog() {
>> +	orig_version=$(dpkg-parsechangelog -l ${S}/debian/changelog
>> | grep "Version:" | cut -d' ' -f2)
> 
> -S Version, no grep no cut

Ah! Was looking for that but missed it.

> 
>> +	changelog_v=$(echo "${CHANGELOG_V}" | sed
>> 's/<orig-version>/'${orig_version}'/') +
>>   	timestamp=$(find ${S}/ -type f -not -path "${S}/debian/*"
>> -printf "%T@\n"|sort -n -r|head -n 1) if [ -n "${timestamp}" ]; then
>>   		date=$(LANG=C date -R -d @${timestamp})
>> @@ -18,7 +21,7 @@ deb_add_changelog() {
>>   		date=$(LANG=C date -R)
>>   	fi
>>   	cat <<EOF > ${S}/debian/changelog
>> -${PN} (${CHANGELOG_V}) UNRELEASED; urgency=low
>> +${PN} (${changelog_v}) UNRELEASED; urgency=low
>>   
>>     * generated by Isar
>>   
>> @@ -26,7 +29,7 @@ ${PN} (${CHANGELOG_V}) UNRELEASED; urgency=low
>>   EOF
>>   	if [ -f ${WORKDIR}/changelog ]; then
>>   		if head -1 "${WORKDIR}"/changelog | \
>> -			grep -q -e "^${PN} (${CHANGELOG_V})"
>> +			grep -q -e "^${PN} (${changelog_v})"
>>   		then
>>   			# entry for our version already there, use
>> unmodified rm ${S}/debian/changelog
> 
> I am afraid that calling this many times will create many entries with
> ever longer unique versions.

That is true. We need to preserve the original changelog_v, if any, and 
use that as reference for the check.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux