From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6672760539324612608 X-Received: by 2002:a19:3809:: with SMTP id f9mr284051lfa.1.1553623131664; Tue, 26 Mar 2019 10:58:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9d52:: with SMTP id y18ls2493626ljj.13.gmail; Tue, 26 Mar 2019 10:58:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqx7q6nrGXOLQuS0c/3vvQIpk35vD9eT16uH1684PFcEeg+9Blm2wQwS8pi4haRr8LcGqYzc X-Received: by 2002:a2e:9e0d:: with SMTP id e13mr263030ljk.21.1553623131017; Tue, 26 Mar 2019 10:58:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553623131; cv=none; d=google.com; s=arc-20160816; b=UiIH8kXiaiGLEN8NcnkbOmEDyOHFkBrri9TIz+F6+363Te2k5YypLSdnIFi16ZYg7J 2molO5LeiSpdTqqfM5iz6wbFjz9w1sEirwQc0Y3+9JwVEMttoEJJVIXElbygYivjvVeZ mYpJPEJM2Jxs+QOdFzMMuPY5yK/b3atvxHva11AzUmxPaOYbN7+whygPFMfi1izB5WVn DHbwX5gMf/0LoyU1WmA4csn/g2DsyRsJ2oYvEoet+mHfffiOC7xWFPFLnGlH4Ao7ZrDA V4NYldpkfitJ6IpCD0uY8trEpQ0u5XUbUsmf3Ww4DtbKHpL0Ykg/X0oitq8LNa28H7Gt 3f5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:cc:to; bh=F2unU33Qb0viGMfIaP6uUk2Mlv3c/wR96MRcxLj7xtE=; b=WU7zeqmqG6/5EgzQ92i3QA8e+RSxjtcqJysjRNfVV0NiqjSfGm+Hh7EZmwHpochsuW 5bY24sRZZCO85zol8Y30NMluz29hVIzQrjfvpaRhLz48B2L/33/Ih0y0Dp/rod6SSgdn Bu00sdQgIs8nHjLBmDWmhVFwzhC8qGXsTWHrz61ymTVzZHD+eJTgI6Sy73VqpASWoEhF VtBqqs/Y13RlXf4Mm0lF128N/dFIWQRWuxUv0Nkr6WUTAT/c6tq8qAvIrIF7RW5Bk2IO WS+cVh8AU6ffGVP40J2VK0jUf8TXXw6HsdiEDsooF0Brfc3DZGQiWDTRwXWLQPruAshZ XdNA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id f10si738730ljk.2.2019.03.26.10.58.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 10:58:51 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x2QHwoNf023451 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 26 Mar 2019 18:58:50 +0100 Received: from [167.87.3.153] ([167.87.3.153]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x2QHwnQN022904; Tue, 26 Mar 2019 18:58:49 +0100 To: isar-users Cc: "Jin, Le" From: Jan Kiszka Subject: [PATCH] Use generated changelog for customized u-boot Message-ID: Date: Tue, 26 Mar 2019 18:58:49 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: JxzLLxv1/ng0 From: "Le Jin" 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 [Jan: rebased] Signed-off-by: Jan Kiszka --- 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 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