[v2] builddeb: remove debian/files before build

Commit Message

Riku Voipio Sept. 15, 2015, 6:11 p.m. UTC

From: Riku Voipio <[e-mail]>

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 <[e-mail]>
Reported-by: Doug Smythies <[e-mail]>
---
 scripts/package/builddeb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Kalle Valo Sept. 15, 2015, 6:21 p.m. UTC | #1

<[e-mail]> writes:

> From: Riku Voipio <[e-mail]>
>
> 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 <[e-mail]>
> Reported-by: Doug Smythies <[e-mail]>

Thanks, I had the same problem and this fixed it.

Tested-by: Kalle Valo <[e-mail]>

But it would be nice to have a fixes line to point out what commit this
fixes:

Fixes: 3716001bcb7f ("deb-pkg: add source package")

Doug Smythies Sept. 15, 2015, 7:11 p.m. UTC | #2

On 2015.09.15 11:22 Kalle Valo wrote:
> <[e-mail]> writes:
>> From: Riku Voipio <[e-mail]>
>>
>> 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 <[e-mail]>
>> Reported-by: Doug Smythies <[e-mail]>

> Thanks, I had the same problem and this fixed it.
> Tested-by: Kalle Valo <[e-mail]>

I tested also. Thanks.

For an incremental compile, where only one source file
has changed, the time went from 7 minutes and 47 seconds
to 4 minutes and 33 seconds on my test server.
And the spew of warnings and such are gone.

For reference a clean compile typically takes about
23 minutes.

The overhead for making the .changes file is now on the
order of 2 to 4 seconds.

Obviously, results will vary widely for others, depending
on their hardware.


--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Riku Voipio Sept. 16, 2015, 6:55 a.m. UTC | #3

On 15 September 2015 at 22:11, Doug Smythies <[e-mail]> wrote:
> On 2015.09.15 11:22 Kalle Valo wrote:
>> <[e-mail]> writes:
>>> From: Riku Voipio <[e-mail]>
>>>
>>> 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 <[e-mail]>
>>> Reported-by: Doug Smythies <[e-mail]>

>> Thanks, I had the same problem and this fixed it.
>> Tested-by: Kalle Valo <[e-mail]>

> I tested also. Thanks.

Michal, can you get this as fix for 4.3, since this is a regression?

Riku

> For an incremental compile, where only one source file
> has changed, the time went from 7 minutes and 47 seconds
> to 4 minutes and 33 seconds on my test server.
> And the spew of warnings and such are gone.
>
> For reference a clean compile typically takes about
> 23 minutes.
>
> The overhead for making the .changes file is now on the
> order of 2 to 4 seconds.
>
> Obviously, results will vary widely for others, depending
> on their hardware.
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Ben Hutchings Sept. 21, 2015, 6:09 p.m. UTC | #4

On Tue, 2015-09-15 at 21:11 +0300, [e-mail] wrote:
> From: Riku Voipio <[e-mail]>
> 
> 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 <[e-mail]>
> Reported-by: Doug Smythies <[e-mail]>
[...]

FWIW:

Acked-by: Ben Hutchings <[e-mail]>

Ben.

Kalle Valo Sept. 22, 2015, 11:25 a.m. UTC | #5

Ben Hutchings <[e-mail]> writes:

> On Tue, 2015-09-15 at 21:11 +0300, [e-mail] wrote:
>> From: Riku Voipio <[e-mail]>
>> 
>> 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 <[e-mail]>
>> Reported-by: Doug Smythies <[e-mail]>
> [...]
>
> FWIW:
>
> Acked-by: Ben Hutchings <[e-mail]>

Marek, this is a pretty annoying regression. Is it possible to get this
to 4.3?

Doug Smythies Oct. 5, 2015, 1:03 a.m. UTC | #6

On 2015.09.22 04:25 Kalle Valo wrote:
> Ben Hutchings <[e-mail]> writes:
>> On Tue, 2015-09-15 at 21:11 +0300, [e-mail] wrote:
>>> From: Riku Voipio <[e-mail]>
>>> 
>>> 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 <[e-mail]>
>>> Reported-by: Doug Smythies <[e-mail]>
>> [...]
>>
>> FWIW:
>>
>> Acked-by: Ben Hutchings <[e-mail]>
>
> 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)?


--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Riku Voipio Oct. 5, 2015, 12:39 p.m. UTC | #7

On 5 October 2015 at 04:03, Doug Smythies <[e-mail]> wrote:
> On 2015.09.22 04:25 Kalle Valo wrote:
>> Ben Hutchings <[e-mail]> writes:
>>> On Tue, 2015-09-15 at 21:11 +0300, [e-mail] wrote:
>>>> From: Riku Voipio <[e-mail]>
>>>>
>>>> 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 <[e-mail]>
>>>> Reported-by: Doug Smythies <[e-mail]>
>>> [...]
>>>
>>> FWIW:
>>>
>>> Acked-by: Ben Hutchings <[e-mail]>
>>
>> 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


Riku
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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