From: Riku Voipio <riku.voipio@xxxxxxxxxx>
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 <riku.voipio@xxxxxxxxxx>
Reported-by: Doug Smythies <dsmythies@xxxxxxxxx>
Tested-by: Doug Smythies <dsmythies@xxxxxxxxx>
Tested-by: Kalle Valo <kvalo@xxxxxxxxxxxxxx>
Acked-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Cc: Michal Marek <mmarek@xxxxxxx>
Cc: maximilian attems <maks@xxxxxxx>
Cc: Chris J Arges <chris.j.arges@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
