From patchwork Mon Oct 5 20:49:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 7331661 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 D0CB69F302 for ; Mon, 5 Oct 2015 20:49:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF7B220685 for ; Mon, 5 Oct 2015 20:49:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7EFDF20684 for ; Mon, 5 Oct 2015 20:49:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752545AbbJEUto (ORCPT ); Mon, 5 Oct 2015 16:49:44 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:33385 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752539AbbJEUtn (ORCPT ); Mon, 5 Oct 2015 16:49:43 -0400 Received: from akpm3.mtv.corp.google.com (unknown [216.239.45.65]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 8BEE51498; Mon, 5 Oct 2015 20:49:42 +0000 (UTC) Date: Mon, 5 Oct 2015 13:49:42 -0700 From: Andrew Morton To: Riku Voipio Cc: mmarek , linux-kbuild , Kalle Valo , Ben Hutchings , Doug Smythies Subject: Re: [PATCH v2] builddeb: remove debian/files before build Message-Id: <20151005134942.2f648b39dd039e24fb613777@linux-foundation.org> In-Reply-To: References: <1442340712-8991-1-git-send-email-riku.voipio@linaro.org> <1442858954.3511.1.camel@decadent.org.uk> <87oagun1ax.fsf@kamboji.qca.qualcomm.com> <002801d0ff09$a23930f0$e6ab92d0$@net> X-Mailer: Sylpheed 3.4.1 (GTK+ 2.24.23; x86_64-pc-linux-gnu) Mime-Version: 1.0 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=unavailable 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 On Mon, 5 Oct 2015 15:39:40 +0300 Riku Voipio wrote: > On 5 October 2015 at 04:03, Doug Smythies wrote: > > On 2015.09.22 04:25 Kalle Valo wrote: > >> Ben Hutchings writes: > >>> On Tue, 2015-09-15 at 21:11 +0300, riku.voipio@linaro.org wrote: > >>>> From: Riku Voipio > >>>> > >>>> As debian/files keeps accumulating entries, the changes file > >>>> will end up growing indefinelty. Remove the file in clean > >>>> rule and before build starts. > >>>> > >>>> Signed-off-by: Riku Voipio > >>>> Reported-by: Doug Smythies > >>> [...] > >>> > >>> FWIW: > >>> > >>> Acked-by: Ben Hutchings > >> > >> Marek, this is a pretty annoying regression. Is it possible to get this > >> to 4.3? > > > > Perhaps I do not understand the process here, but having reported the issue > > within a day of kernel 4.3-rc1 being released, and then what seems to be an > > acceptable patch being suggested, and tested, with plenty of time to make > > into -rc2, why hasn't it been included yet (-rc4)? > > Hi Andrew, > > Could you pass this patch in your series, as the regression doesn't > seem to be getting through via the maintainer. It would be > embarrassing to have it in 4.3 since it was reported and fixed timely. > The patch is at: > > http://permalink.gmane.org/gmane.linux.kbuild.devel/13710 > > Tests and acks at: > > http://comments.gmane.org/gmane.linux.kbuild.devel/13710 I'm not subscribed to linux-kbuild and the browser won't do save-as-text, so I typed it all in again. Please check the below. I'll put this in my mainline-later queue, which means I'll send it Linuswards next week if it doesn't pop up in linux-next before then. The changelog doesn't actually describe this patch as a regression fix. It makes the patch look like a regular old bugfix. And the changelog doesn't describe the severity of the bug either. Please do pay attention to such details to guide others in deciding which kernel version(s) need fixing. From: Riku Voipio Subject: builddeb: remove debian/files before build As debian/files keeps accumulating entries, the changes file will end up growing indefinelty. Remove the file in clean rule and before build starts. 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 --- scripts/package/builddeb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN scripts/package/builddeb~a scripts/package/builddeb --- a/scripts/package/builddeb~a +++ a/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