From patchwork Tue Oct 6 07:05:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 7333311 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CEA1B9F2F7 for ; Tue, 6 Oct 2015 07:05:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CFE342035E for ; Tue, 6 Oct 2015 07:05:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C93320680 for ; Tue, 6 Oct 2015 07:05:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751740AbbJFHFj (ORCPT ); Tue, 6 Oct 2015 03:05:39 -0400 Received: from mail-lb0-f169.google.com ([209.85.217.169]:35420 "EHLO mail-lb0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751821AbbJFHFi (ORCPT ); Tue, 6 Oct 2015 03:05:38 -0400 Received: by lbwr8 with SMTP id r8so70527044lbw.2 for ; Tue, 06 Oct 2015 00:05:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to; bh=xPVQFwyxPnYJAthOKSkUOg9knLp2aftQr6STIxew3Bs=; b=mHbt7oaPjYsEMfv8a2iUOuzWq2XFXaGCz2/ZJN98YSLOzvvgh+tYw8BtlTC7nlrRFs OZxI5rYMDkSQGN6H6JzPgTgVQ/28wVt4IRvqHRhjy8XcFKDnAtU5fuavBPubOVnR2AzM uDNTt3ST1q/WkMom6hyo/W2e0KgbGIy60MHRiRwTdTeBITWZBspNPQvY/RTSNJwFfqVu /6xi1u2afIZRgCC9QkJMsudz8MH5U6AIsNMavd4qDZl65MttwyltuAZ3eLHPvX1amYBU ESQN3dCrJmtJENZG56hdXeCzy//46jgsrl2/DOQMp4Rb7gghkmYgHnZ+C1z/phaWsNq7 5F2Q== X-Gm-Message-State: ALoCoQnXcEdhGHFEMd6fJzdRcmVfGtcckcpsBFXNLS3nJrtFuRfYezniy8tlwIvB9eAIH29TP0RE X-Received: by 10.112.13.161 with SMTP id i1mr13674649lbc.96.1444115136242; Tue, 06 Oct 2015 00:05:36 -0700 (PDT) Received: from beaming.lan (91-157-211-52.elisa-laajakaista.fi. [91.157.211.52]) by smtp.gmail.com with ESMTPSA id xt10sm4897587lbb.9.2015.10.06.00.05.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Oct 2015 00:05:35 -0700 (PDT) From: riku.voipio@linaro.org To: linux-kbuild@vger.kernel.org, mmarek@suse.cz, akpm@linux-foundation.org Cc: Riku Voipio , maximilian attems , Chris J Arges Subject: [PATCH v3] builddeb: remove debian/files before build Date: Tue, 6 Oct 2015 10:05:32 +0300 Message-Id: <1444115132-12863-1-git-send-email-riku.voipio@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <20151005134942.2f648b39dd039e24fb613777@linux-foundation.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Riku Voipio Commit 3716001bcb7f added the ability to create a debian changelog file. This exposed that previously the builddeb script hasn't cleared debian/files between builds. As debian/files keeps accumulating entries, the changes file will end up growing indefinelty. With outdated entries in debian/files, builddeb script will exit with failure. This regression impacts those who use "make deb-pkg" target to build kernel into a .deb package and never use "make mrproper" or other means to clean kernel tree from generated directories. To fix the regression, remove debian/files before starting build and in the generated clean rule. Fixes: 3716001bcb7f ("deb-pkg: add source package") Signed-off-by: Riku Voipio Reported-by: Doug Smythies Tested-by: Doug Smythies Tested-by: Kalle Valo Acked-by: Ben Hutchings Cc: Michal Marek Cc: maximilian attems Cc: Chris J Arges Signed-off-by: Andrew Morton --- v3: improved commit message scripts/package/builddeb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 0cd46e1..b967e4f 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -115,7 +115,7 @@ esac BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $KCONFIG_CONFIG || true)" # Setup the directory structure -rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" +rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir" "$dbg_dir" $objtree/debian/files mkdir -m 755 -p "$tmpdir/DEBIAN" mkdir -p "$tmpdir/lib" "$tmpdir/boot" mkdir -p "$fwdir/lib/firmware/$version/" @@ -408,7 +408,7 @@ binary-arch: \$(MAKE) KDEB_SOURCENAME=${sourcename} KDEB_PKGVERSION=${packageversion} bindeb-pkg clean: - rm -rf debian/*tmp + rm -rf debian/*tmp debian/files mv debian/ debian.backup # debian/ might be cleaned away \$(MAKE) clean mv debian.backup debian