From patchwork Wed Jan 22 07:32:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1227039 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 482cYX0nXgz9sRR; Wed, 22 Jan 2020 18:32:15 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iuAUk-0007nm-LF; Wed, 22 Jan 2020 07:32:10 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iuAUi-0007ng-Td for kernel-team@lists.ubuntu.com; Wed, 22 Jan 2020 07:32:08 +0000 Received: from mail-wr1-f70.google.com ([209.85.221.70]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iuAUi-0003fs-JB for kernel-team@lists.ubuntu.com; Wed, 22 Jan 2020 07:32:08 +0000 Received: by mail-wr1-f70.google.com with SMTP id u18so2626189wrn.11 for ; Tue, 21 Jan 2020 23:32:08 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=a2dxQpVmlfbVE+R/AVM5mwUb5eNk4ukSSR63VgkR/6E=; b=Tk0Jjw2b0WPDt55hgiKme5N5udDa+mNxNAr24wGNeWdSndjCdcc/fEiowSrOGLoTnH 4hVURW5d82Xep9WY07iKgnr7vQbvmlLcsS3DI7y07dJqKTFUkFsNGOsX/HacAhlXtwiY GRGS5/Fc0UsaPvSQW0QqijSpkdJ86RGLeE3eoP9FvfSxjqSDz5psjU8Xdvl2B9sJmNAL hQqJvYoX7wI79eKDsK21DNNft9PjOiSWMgibeM1aVZCqJSItIYarzW8PLAGCG2HJmk+/ /XS3tdvHAZK75t6CPKVwbv7fssVi0117dOIbjNHd0f0hjr3oZ6TLZCvNJeJWIbNQT+jQ 5p3A== X-Gm-Message-State: APjAAAXUecvxTA+WLSSUQqebu3W1nLAk0MgoOHfPwckDa+mHPk1AVvbZ XKFuZCU987gwJctv/l19HoUBK1OBAvfM9Eiei1O4muWWJVv6/rTjL0jQlk0Pi+yc3np5zKv/QAR RwiKPCqicWOd36hrSxZJ/94qy+LbJle328MhQr+2SAQ== X-Received: by 2002:adf:f052:: with SMTP id t18mr9119706wro.192.1579678328051; Tue, 21 Jan 2020 23:32:08 -0800 (PST) X-Google-Smtp-Source: APXvYqyZc2CYWEUud9RsQbqJr7keD5lx999pgFJx/uxFa+JtrNZyEl9HrGeVNQeqW2GrdMdeK7CjEQ== X-Received: by 2002:adf:f052:: with SMTP id t18mr9119672wro.192.1579678327771; Tue, 21 Jan 2020 23:32:07 -0800 (PST) Received: from gollum.fritz.box ([81.221.209.144]) by smtp.gmail.com with ESMTPSA id f1sm57525750wro.85.2020.01.21.23.32.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2020 23:32:07 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][B/D/E/F - ALL TREES][PATCH] UBUNTU: [Packaging] Fix config file assembly Date: Wed, 22 Jan 2020 08:32:06 +0100 Message-Id: <20200122073206.22045-1-juergh@canonical.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Commit 'UBUNTU: [Packaging] dkms -- switch to a consistent build prefix length and strip' introduced a helper tool fix-filenames which was added as a prerequisite to the $(stampdir)/stamp-prepare-tree-% rule. This rule generates the config file by concatenating all prereqs together (cat $^ ...) including the fix-filenames binary blob which results in warnings like: scripts/kconfig/conf --silentoldconfig Kconfig .config:8536:warning: unexpected data: ^?ELF^B^A^A .config:8073:warning: unexpected data: .config:8537:warning: unexpected data: .config:8538:warning: unexpected data: .config:8539:warning: unexpected data: This is certainly not what we want, fix it. Ignore: yes Signed-off-by: Juerg Haefliger Acked-by: Stefan Bader Acked-by: Seth Forshee --- debian/rules.d/2-binary-arch.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index a15d7921a682..684eaa55d40c 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -30,7 +30,7 @@ $(stampdir)/stamp-prepare-tree-%: $(commonconfdir)/config.common.$(family) $(arc touch $(builddir)/build-$*/ubuntu-build [ "$(do_full_source)" != 'true' ] && true || \ rsync -a --exclude debian --exclude debian.master --exclude $(DEBIAN) * $(builddir)/build-$* - cat $^ | sed -e 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(raw_kernelversion)"/' > $(builddir)/build-$*/.config + cat $(wordlist 1,3,$^) | sed -e 's/.*CONFIG_VERSION_SIGNATURE.*/CONFIG_VERSION_SIGNATURE="Ubuntu $(release)-$(revision)-$* $(raw_kernelversion)"/' > $(builddir)/build-$*/.config find $(builddir)/build-$* -name "*.ko" | xargs rm -f $(build_cd) $(kmake) $(build_O) -j1 syncconfig prepare scripts touch $@