[PATCH] Use generated changelog for customized u-boot

[PATCH] Use generated changelog for customized u-boot

[Jan Kiszka]

From: "Le Jin" <le.jin@siemens.com>

Current timestamp in changelog for customized u-boot recipe
is hard coded. This will cause a wrong build timestamp in the binary. So
replace it with generated changelog.

Signed-off-by: Le Jin <le.jin@siemens.com>
[Jan: rebased]
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/recipes-bsp/u-boot/files/debian/changelog.tmpl | 5 -----
 meta/recipes-bsp/u-boot/u-boot-custom.inc           | 5 +++--
 2 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 meta/recipes-bsp/u-boot/files/debian/changelog.tmpl

diff --git a/meta/recipes-bsp/u-boot/files/debian/changelog.tmpl b/meta/recipes-bsp/u-boot/files/debian/changelog.tmpl
deleted file mode 100644
index 6e59e06..0000000
--- a/meta/recipes-bsp/u-boot/files/debian/changelog.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-${PN} (${PV}) unstable; urgency=low
-
-  * Generated package.
-
- -- ISAR project <isar-users@googlegroups.com>  Tue, 6 Feb 2018 00:00:00 +0000
diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
index b3eab46..baf46c6 100644
--- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
@@ -17,13 +17,14 @@ SRC_URI += "file://debian/"
 
 BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
 
-TEMPLATE_FILES = "debian/changelog.tmpl \
-                  debian/control.tmpl"
+TEMPLATE_FILES = "debian/control.tmpl"
 TEMPLATE_VARS += "MACHINE BUILD_DEPENDS"
 
 do_prepare_build() {
     cp -r ${WORKDIR}/debian ${S}/
 
+    deb_add_changelog
+
     echo "${U_BOOT_BIN} /usr/lib/u-boot/${MACHINE}" > \
         ${S}/debian/u-boot-${MACHINE}.install
 
-- 
2.16.4

Re: [PATCH] Use generated changelog for customized u-boot

[Maxim Yu. Osipov]

On 3/26/19 6:58 PM, Jan Kiszka wrote:
> From: "Le Jin" <le.jin@siemens.com>
> 
> Current timestamp in changelog for customized u-boot recipe
> is hard coded. This will cause a wrong build timestamp in the binary. So
> replace it with generated changelog.

Applied to the 'next'.

Thanks,
Maxim.

> Signed-off-by: Le Jin <le.jin@siemens.com>
> [Jan: rebased]
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   meta/recipes-bsp/u-boot/files/debian/changelog.tmpl | 5 -----
>   meta/recipes-bsp/u-boot/u-boot-custom.inc           | 5 +++--
>   2 files changed, 3 insertions(+), 7 deletions(-)
>   delete mode 100644 meta/recipes-bsp/u-boot/files/debian/changelog.tmpl
> 
> diff --git a/meta/recipes-bsp/u-boot/files/debian/changelog.tmpl b/meta/recipes-bsp/u-boot/files/debian/changelog.tmpl
> deleted file mode 100644
> index 6e59e06..0000000
> --- a/meta/recipes-bsp/u-boot/files/debian/changelog.tmpl
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -${PN} (${PV}) unstable; urgency=low
> -
> -  * Generated package.
> -
> - -- ISAR project <isar-users@googlegroups.com>  Tue, 6 Feb 2018 00:00:00 +0000
> diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> index b3eab46..baf46c6 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc
> @@ -17,13 +17,14 @@ SRC_URI += "file://debian/"
>   
>   BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git"
>   
> -TEMPLATE_FILES = "debian/changelog.tmpl \
> -                  debian/control.tmpl"
> +TEMPLATE_FILES = "debian/control.tmpl"
>   TEMPLATE_VARS += "MACHINE BUILD_DEPENDS"
>   
>   do_prepare_build() {
>       cp -r ${WORKDIR}/debian ${S}/
>   
> +    deb_add_changelog
> +
>       echo "${U_BOOT_BIN} /usr/lib/u-boot/${MACHINE}" > \
>           ${S}/debian/u-boot-${MACHINE}.install
>   
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov