From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7187242631035879424 X-Received: by 2002:a17:906:854f:b0:86b:a822:6615 with SMTP id h15-20020a170906854f00b0086ba8226615mr666708ejy.111.1673840222819; Sun, 15 Jan 2023 19:37:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:40cf:b0:488:1679:c417 with SMTP id z15-20020a05640240cf00b004881679c417ls1556014edb.1.-pod-prod-gmail; Sun, 15 Jan 2023 19:37:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXsXNxwuWVwt7dmxvOhdVCWCvzU5hwaDiHocuaIejEZSJ2mNAq3C9RL3L0DEmvuvK7vkzjR8 X-Received: by 2002:a05:6402:538f:b0:47c:4479:d60d with SMTP id ew15-20020a056402538f00b0047c4479d60dmr76851143edb.20.1673840221483; Sun, 15 Jan 2023 19:37:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673840221; cv=none; d=google.com; s=arc-20160816; b=SbIaqTs3i68dvROrMobgFbMWIU+tvi7npXNfXgfSxtK9CTaMEek2rKEDKfbwAQHI8I avsbwmcgcHCMRXcuRkMA4kFagS9ewJ5OhMncqyEy5AZlMVdnQLkuP9YWuos4H69dT4iH Sq6mVibkNqR7EA8OjW6lctpK0muQw23y0/bATYFCojSC88TZMZjlpxtUghsEQ9xt5oGK JhtRx1dpmERE0gsfdaR1q9aH6JGHa9Xh+scwso4LZu/d1cD5KadHbwK3Ca4ZnMQSG9/F YjvJRh7pYv4PEjWEpkEd163V5tZy6H5tIf6NeavFLzMyl2VUEEr8W8LZjbmznJ8UuHEs K/og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=Zem2NDa9zc/UV8kzTLu5ox256Tx4+iPPwUbQZnwLv64=; b=Z8LsVObJ7zjIHR4iFo/cgZyd69ZU1wY6KB+PLqr7eezH0Fpnns4sULvJhkguNMEXYr bTB0GJ7VriIvVKlHfsUzoqi5rJUqlWxBV3vMhOTqtRt80TdkhIXQcRIHEuwPLibgfzak 2IVF7xpTUUGzvL9jROpTre+ECY8BPuPS6kfAQ9LCkuS5EfgfHKEotCdN+EcUJxdQ9o9g 8i0DjneuOam+VkvSlcslBopyxa+gWnONcVUxnk2Tui3zq9QVce2QkuclOYYjE0085ZEi 4V3MKdDfll+7Q7AZGcAyuSNPBA/FO/COdfW2ZRa3t9ZdbuN9xSR8O1PyyyNQ+XjDnwxd aHTw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=F3+OP7Fn; spf=pass (google.com: domain of fm-72506-20230116033700f233e266feb6720447-vp7sei@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-20230116033700f233e266feb6720447-vP7sEI@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id u9-20020aa7d889000000b0048ebe118a43si1231469edq.1.2023.01.15.19.37.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Jan 2023 19:37:01 -0800 (PST) Received-SPF: pass (google.com: domain of fm-72506-20230116033700f233e266feb6720447-vp7sei@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=F3+OP7Fn; spf=pass (google.com: domain of fm-72506-20230116033700f233e266feb6720447-vp7sei@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-20230116033700f233e266feb6720447-vP7sEI@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20230116033700f233e266feb6720447 for ; Mon, 16 Jan 2023 04:37:01 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=Zem2NDa9zc/UV8kzTLu5ox256Tx4+iPPwUbQZnwLv64=; b=F3+OP7Fnyo7Y99PQymOgXFtfsykNAOgegWxxejjGPxWjfJsYZAuhe/sakX24ozXzxyUrte E6ErCMse+Wxc16qUiVm1HidHU89qqriyiveM2d0/i8cU1KUDHSbLYXTgXrmxSCflnFySmoIS UJq6Hkmd5Ucia5yO82LTUWuvNZLjA=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, daniel.bovensiepen@siemens.com, henning.schild@siemens.com, venkata.pyla@toshiba-tsip.com, Felix Moessbauer Subject: [PATCH v3 10/10] make custom linux-image bit-by-bit reproducible Date: Mon, 16 Jan 2023 03:35:52 +0000 Message-Id: <20230116033552.139048-11-felix.moessbauer@siemens.com> In-Reply-To: <20230116033552.139048-1-felix.moessbauer@siemens.com> References: <20230116033552.139048-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: ZjzbnMRlGnik This patch makes the build of custom linux kernels bit-by-bit reproducible. By that, we can remove the dh_strip_nondeterminism step, which significantly reduces the kernel build time. The implementation is similar to how upstream debian builds their kernel images and extracts all information from the changelog. As the DISTRIBUTOR field is not part of the changelog, we inject it via a bb variable which is defaulted to ISAR. Signed-off-by: Felix Moessbauer --- .../linux/files/debian/isar/build.tmpl | 1 + meta/recipes-kernel/linux/files/debian/rules.tmpl | 14 +++++++++++++- meta/recipes-kernel/linux/linux-custom.inc | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/files/debian/isar/build.tmpl b/meta/recipes-kernel/linux/files/debian/isar/build.tmpl index 94cfbe0..e7e0479 100644 --- a/meta/recipes-kernel/linux/files/debian/isar/build.tmpl +++ b/meta/recipes-kernel/linux/files/debian/isar/build.tmpl @@ -34,6 +34,7 @@ print_settings() { # --------------- # ARCH=${ARCH} # CROSS_COMPILE=${CROSS_COMPILE} +# KBUILD_BUILD_TIMESTAMP=${KBUILD_BUILD_TIMESTAMP} EOF } diff --git a/meta/recipes-kernel/linux/files/debian/rules.tmpl b/meta/recipes-kernel/linux/files/debian/rules.tmpl index 8063c49..e8ae3da 100755 --- a/meta/recipes-kernel/linux/files/debian/rules.tmpl +++ b/meta/recipes-kernel/linux/files/debian/rules.tmpl @@ -2,6 +2,11 @@ CROSS_COMPILE:=$(DEB_HOST_GNU_TYPE)- +MAINTAINER := $(shell sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p' debian/control) +DISTRIBUTOR := ${DISTRIBUTOR} +SOURCE_DATE := $(shell dpkg-parsechangelog -SDate) +SOURCE_DATE_UTC_ISO := $(shell date -u -d '$(SOURCE_DATE)' +%Y-%m-%d) + O:=$(CURDIR)/${KERNEL_BUILD_DIR} S:=$(CURDIR) deb_top_dir:=$(S)/debian @@ -14,7 +19,11 @@ isar_env=$(strip \ export MAKE='$(MAKE)' && \ export O='${O}' && \ export S='${S}' && \ - export CURDIR='$(CURDIR)' \ + export CURDIR='$(CURDIR)' && \ + export KBUILD_BUILD_TIMESTAMP='$(SOURCE_DATE)' && \ + export KBUILD_BUILD_VERSION_TIMESTAMP='$(DISTRIBUTOR) $(DEB_VERSION_UPSTREAM) ($(SOURCE_DATE_UTC_ISO))' && \ + export KBUILD_BUILD_USER='$(word 1,$(subst @, ,$(MAINTAINER)))' && \ + export KBUILD_BUILD_HOST='$(word 2,$(subst @, ,$(MAINTAINER)))' \ ) %: @@ -35,5 +44,8 @@ override_dh_auto_install: override_dh_auto_test: true +override_dh_strip_nondeterminism: + true + override_dh_strip: unset DEB_HOST_GNU_TYPE && dh_strip -Xvmlinu --no-automatic-dbgsym diff --git a/meta/recipes-kernel/linux/linux-custom.inc b/meta/recipes-kernel/linux/linux-custom.inc index 447d4e8..6c539c0 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc +++ b/meta/recipes-kernel/linux/linux-custom.inc @@ -12,6 +12,7 @@ CHANGELOG_V = "${PV}+${PR}" DESCRIPTION ?= "Custom kernel" MAINTAINER ?= "isar-users " +DISTRIBUTOR ?= "ISAR" KBUILD_DEPENDS ?= "build-essential:native, \ libelf-dev:native, \ @@ -79,6 +80,7 @@ TEMPLATE_VARS += " \ KERNEL_NAME_PROVIDED \ KERNEL_CONFIG_FRAGMENTS \ KCFLAGS \ + DISTRIBUTOR \ " inherit dpkg -- 2.34.1