From patchwork Thu Dec 14 13:33:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 848544 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GjueMJr3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yyDzn429Rz9s7B for ; Fri, 15 Dec 2017 00:33:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752574AbdLNNdp (ORCPT ); Thu, 14 Dec 2017 08:33:45 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:46002 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752432AbdLNNdm (ORCPT ); Thu, 14 Dec 2017 08:33:42 -0500 Received: by mail-wm0-f65.google.com with SMTP id 9so11311363wme.4; Thu, 14 Dec 2017 05:33:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=rVjOc6imG413ws/5R2tww1+nBW/tI7aaAE7s7drGYcQ=; b=GjueMJr3m/96LxId8efqrCfENmK3N4QzDNsI63EQ2HclbPgAEelBMx5Qktc3DNFJzo sJKk3s/rPzkJ4o/gmlBz2BS+/yOz9yfdpIjwpzoNRIYdIjVQwhogL1Mcki7AadyKFgxi f9ganPBG5jlqArIR8z/5tyaDB9bMTb4hr6wsiWOprvALbzP0s0INDDHCSkDTYNa9lcsf nD1KhEGsts8KUSX4BaAymXaqbBN5Z3RkGf+87b9Y98CUFUGXXEKsHABddX079oil19Aa 13KcJqRwtwNrGp2MUJlpFPnFBBOe4d9tgFNsa7cacVcTld7jo/GBVNItW2EK5xDvU7iN Ay5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=rVjOc6imG413ws/5R2tww1+nBW/tI7aaAE7s7drGYcQ=; b=hKaz8PWt57qOFr5dO9hLnDE+T3c3suur2cMvAjDXsdI7tF+gvrWplLgKiFLmg2gj4z WfMkq/wvnilKdjD4KS+8/CM44Gw6sGe8akLKP0sbdpLKUL+gc7EOAV4MLHqRqm9eqqWR UVtM3J43KYnVFWbx9s6zY8EC2OoEpFqib4H9foIWrYwC8aRkyjYT+jjyjEBPlCDiOvrV kQD7tlLMl6cOL6H2ou+03BLvKsfHFOwrAEIokPwGI6IjqFiii6VEfzu/am9ICeQGwXVi elEwToX/pPY4uJbebgg/aFtXY2xfx6Wunlth4tAc3rCzamac6a5dcTrlYd0K3veMnfFC 72xg== X-Gm-Message-State: AKGB3mIN/eFQiWAxrYzGtze5KHr+T6XnMzoD5HQU8HowW5FtJgkydRsp RoVsBNLZ6qkwasbTOQAXna0= X-Google-Smtp-Source: ACJfBouZ47LkShiJLyVfXfL7Q4NZUX0tP1sJAsfRP0fjt7CCobs+sD9WbjqE75je8ucYA3psVJSwcw== X-Received: by 10.28.110.24 with SMTP id j24mr2113528wmc.100.1513258420854; Thu, 14 Dec 2017 05:33:40 -0800 (PST) Received: from localhost (p200300E41F200F003F65F430A8AE2E44.dip0.t-ipconnect.de. [2003:e4:1f20:f00:3f65:f430:a8ae:2e44]) by smtp.gmail.com with ESMTPSA id y78sm1680248wrb.51.2017.12.14.05.33.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 05:33:40 -0800 (PST) From: Thierry Reding To: Johannes Berg Cc: "David S . Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] wireless: Always rewrite generated files from scratch Date: Thu, 14 Dec 2017 14:33:38 +0100 Message-Id: <20171214133338.10551-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.15.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thierry Reding Currently the certs C code generation appends to the generated files, which is most likely a leftover from commit 715a12334764 ("wireless: don't write C files on failures"). This causes duplicate code in the generated files if the certificates have their timestamps modified between builds and thereby trigger the generation rules. Fixes: 715a12334764 ("wireless: don't write C files on failures") Signed-off-by: Thierry Reding --- Based on next-20171214 net/wireless/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/wireless/Makefile b/net/wireless/Makefile index d7d6cb00c47b..b662be3422e1 100644 --- a/net/wireless/Makefile +++ b/net/wireless/Makefile @@ -43,7 +43,7 @@ $(obj)/shipped-certs.c: $(wildcard $(srctree)/$(src)/certs/*.x509) echo "$$allf"; \ echo '};'; \ echo 'unsigned int shipped_regdb_certs_len = sizeof(shipped_regdb_certs);'; \ - ) >> $@) + ) > $@) $(obj)/extra-certs.c: $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%) \ $(wildcard $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%)/*.x509) @@ -66,4 +66,4 @@ $(obj)/extra-certs.c: $(CONFIG_CFG80211_EXTRA_REGDB_KEYDIR:"%"=%) \ echo "$$allf"; \ echo '};'; \ echo 'unsigned int extra_regdb_certs_len = sizeof(extra_regdb_certs);'; \ - ) >> $@) + ) > $@)