Re: [PATCH 3/3] deb_add_changelog: use SOURCE_DATE_EPOCH

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

On 09.01.23 06:14, Felix Moessbauer wrote:
> In case the SOURCE_DATE_EPOCH bb variable is set, use that value
> both for the auto-generated changelog as well as when appending to
> an existing changelog.
> 
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  meta/classes/debianize.bbclass | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclass
> index 3531421..49ae0dd 100644
> --- a/meta/classes/debianize.bbclass
> +++ b/meta/classes/debianize.bbclass
> @@ -14,7 +14,7 @@ MAINTAINER ??= "Unknown maintainer <unknown@example.com>"
>  
>  deb_add_changelog() {
>  	changelog_v="${CHANGELOG_V}"
> -	timestamp=3600
> +	timestamp=${@ d.getVar('SOURCE_DATE_EPOCH', True) or '3600' }
>  	# we have a changelog and that is not autogenerated
>  	# (when autogenerated, changelog.orig is empty)
>  	if [ -f ${S}/debian/changelog ] && [ -s ${WORKDIR}/changelog.orig ]; then
> @@ -23,9 +23,11 @@ deb_add_changelog() {
>  		fi
>  		orig_version=$(dpkg-parsechangelog -l ${WORKDIR}/changelog.orig -S Version)
>  		changelog_v=$(echo "${changelog_v}" | sed 's/<orig-version>/'${orig_version}'/')
> -		orig_date=$(dpkg-parsechangelog -l ${WORKDIR}/changelog.orig -S Date)
> -		orig_seconds=$(date --date="${orig_date}" +'%s')
> -		timestamp=$(expr ${orig_seconds} + 42)
> +		if [ -z "${SOURCE_DATE_EPOCH}" ]; then
> +			orig_date=$(dpkg-parsechangelog -l ${WORKDIR}/changelog.orig -S Date)
> +			orig_seconds=$(date --date="${orig_date}" +'%s')
> +			timestamp=$(expr ${orig_seconds} + 42)
> +		fi
>  	fi
>  
>  	date=$(LANG=C date -R -d @${timestamp})
> @@ -42,7 +44,6 @@ EOF
>  	# prepend our entry to the original changelog
>  	echo >> ${S}/debian/changelog
>  	cat ${WORKDIR}/changelog.orig >> ${S}/debian/changelog
> -	fi

This hunk should go into patch 1, I suspect...

Jan

>  
>  	if [ -f ${WORKDIR}/changelog ]; then
>  		latest_version=$(dpkg-parsechangelog -l ${WORKDIR}/changelog -S Version)

-- 
Siemens AG, Technology
Competence Center Embedded Linux