diff mbox

builddeb: remove debian/files before build

Message ID 1442323587-21086-1-git-send-email-riku.voipio@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Riku Voipio Sept. 15, 2015, 1:26 p.m. UTC
From: Riku Voipio <riku.voipio@linaro.org>

As debian/files keeps accumulating entries, the changelog
will end up growing indefinelty. Remove the file in clean
rule and before build starts.

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Reported-by: Doug Smythies <dsmythies@telus.net>
---
 scripts/package/builddeb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Ben Hutchings Sept. 15, 2015, 2:26 p.m. UTC | #1
On Tue, 2015-09-15 at 16:26 +0300, riku.voipio@linaro.org wrote:
> From: Riku Voipio <riku.voipio@linaro.org>
> 
> As debian/files keeps accumulating entries, the changelog

The changes file, not the changelog.

> will end up growing indefinelty. Remove the file in clean
> rule and before build starts.
> 
> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
> Reported-by: Doug Smythies <dsmythies@telus.net>
> ---
>  scripts/package/builddeb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index 0cd46e1..c9357df 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 files

debian/files, not just files.

Ben.

>  	mv debian/ debian.backup # debian/ might be cleaned away
>  	\$(MAKE) clean
>  	mv debian.backup debian

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

Patch

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 0cd46e1..c9357df 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 files
 	mv debian/ debian.backup # debian/ might be cleaned away
 	\$(MAKE) clean
 	mv debian.backup debian