Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull misc kbuild changes from Michal Marek: "Just a few non-critical kbuild changes: - builddeb adds the actual distribution name in the changelog - documentation fixes" * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild: trivial - fix the help doc of CONFIG_CC_OPTIMIZE_FOR_SIZE kbuild: Update documentation of clean-files and clean-dirs builddeb: Try to determine distribution builddeb: Update year and git repository URL in debian/copyright

Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull misc kbuild changes from Michal Marek: "Just a few non-critical kbuild changes: - builddeb adds the actual distribution name in the changelog - documentation fixes" * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild: trivial - fix the help doc of CONFIG_CC_OPTIMIZE_FOR_SIZE kbuild: Update documentation of clean-files and clean-dirs builddeb: Try to determine distribution builddeb: Update year and git repository URL in debian/copyright
Linus Torvalds
2 parents 27a22ee4c7 31a4af7f7d
Showing 3 changed files Side-by-side Diff
Documentation/kbuild/makefiles.txt
init/Kconfig
scripts/package/builddeb
@@ -752,12 +752,12 @@
 Additional files can be specified in kbuild makefiles by use of $(clean-files).
  
 	Example:
-		#drivers/pci/Makefile
-		clean-files := devlist.h classlist.h
+		#lib/Makefile
+		clean-files := crc32table.h
  
 When executing "make clean", the two files "devlist.h classlist.h" will be
 deleted. Kbuild will assume files to be in the same relative directory as the
-Makefile except if an absolute path is specified (path starting with '/').
+Makefile, except if prefixed with $(objtree).
  
 To delete a directory hierarchy use:
  
@@ -765,9 +765,8 @@
 		#scripts/package/Makefile
 		clean-dirs := $(objtree)/debian/
  
-This will delete the directory debian, including all subdirectories.
-Kbuild will assume the directories to be in the same relative path as the
-Makefile if no absolute path is specified (path does not start with '/').
+This will delete the directory debian in the toplevel directory, including all
+subdirectories.
  
 To exclude certain files from make clean, use the $(no-clean-files) variable.
 This is only a special case used in the top level Kbuild file:
@@ -1290,8 +1290,8 @@
 config CC_OPTIMIZE_FOR_SIZE
 	bool "Optimize for size"
 	help
-	  Enabling this option will pass "-Os" instead of "-O2" to gcc
-	  resulting in a smaller kernel.
+	  Enabling this option will pass "-Os" instead of "-O2" to
+	  your compiler resulting in a smaller kernel.
  
 	  If unsure, say N.
  
@@ -217,9 +217,20 @@
 fi
 maintainer="$name <$email>"
  
+# Try to determine distribution
+if [ -n "$KDEB_CHANGELOG_DIST" ]; then
+        distribution=$KDEB_CHANGELOG_DIST
+elif distribution=$(lsb_release -cs 2>/dev/null) && [ -n "$distribution" ]; then
+        : # nothing to do in this case
+else
+        distribution="unstable"
+        echo >&2 "Using default distribution of 'unstable' in the changelog"
+        echo >&2 "Install lsb-release or set \$KDEB_CHANGELOG_DIST explicitly"
+fi
+
 # Generate a simple changelog template
 cat <<EOF > debian/changelog
-linux-upstream ($packageversion) unstable; urgency=low
+linux-upstream ($packageversion) $distribution; urgency=low
  
   * Custom built Linux kernel.
  
  
@@ -233,10 +244,10 @@
 The sources may be found at most Linux ftp sites, including:
 ftp://ftp.kernel.org/pub/linux/kernel
  
-Copyright: 1991 - 2009 Linus Torvalds and others.
+Copyright: 1991 - 2015 Linus Torvalds and others.
  
 The git repository for mainline kernel development is at:
-git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
...	...	@@ -752,12 +752,12 @@
752	752	Additional files can be specified in kbuild makefiles by use of $(clean-files).
753	753
754	754	Example:
755		- #drivers/pci/Makefile
756		- clean-files := devlist.h classlist.h
	755	+ #lib/Makefile
	756	+ clean-files := crc32table.h
757	757
758	758	When executing "make clean", the two files "devlist.h classlist.h" will be
759	759	deleted. Kbuild will assume files to be in the same relative directory as the
760		-Makefile except if an absolute path is specified (path starting with '/').
	760	+Makefile, except if prefixed with $(objtree).
761	761
762	762	To delete a directory hierarchy use:
763	763
...	...	@@ -765,9 +765,8 @@
765	765	#scripts/package/Makefile
766	766	clean-dirs := $(objtree)/debian/
767	767
768		-This will delete the directory debian, including all subdirectories.
769		-Kbuild will assume the directories to be in the same relative path as the
770		-Makefile if no absolute path is specified (path does not start with '/').
	768	+This will delete the directory debian in the toplevel directory, including all
	769	+subdirectories.
771	770
772	771	To exclude certain files from make clean, use the $(no-clean-files) variable.
773	772	This is only a special case used in the top level Kbuild file:
...	...	@@ -1290,8 +1290,8 @@
1290	1290	config CC_OPTIMIZE_FOR_SIZE
1291	1291	bool "Optimize for size"
1292	1292	help
1293		- Enabling this option will pass "-Os" instead of "-O2" to gcc
1294		- resulting in a smaller kernel.
	1293	+ Enabling this option will pass "-Os" instead of "-O2" to
	1294	+ your compiler resulting in a smaller kernel.
1295	1295
1296	1296	If unsure, say N.
1297	1297
...	...	@@ -217,9 +217,20 @@
217	217	fi
218	218	maintainer="$name <$email>"
219	219
	220	+# Try to determine distribution
	221	+if [ -n "$KDEB_CHANGELOG_DIST" ]; then
	222	+ distribution=$KDEB_CHANGELOG_DIST
	223	+elif distribution=$(lsb_release -cs 2>/dev/null) && [ -n "$distribution" ]; then
	224	+ : # nothing to do in this case
	225	+else
	226	+ distribution="unstable"
	227	+ echo >&2 "Using default distribution of 'unstable' in the changelog"
	228	+ echo >&2 "Install lsb-release or set \$KDEB_CHANGELOG_DIST explicitly"
	229	+fi
	230	+
220	231	# Generate a simple changelog template
221	232	cat <<EOF > debian/changelog
222		-linux-upstream ($packageversion) unstable; urgency=low
	233	+linux-upstream ($packageversion) $distribution; urgency=low
223	234
224	235	* Custom built Linux kernel.
225	236
226	237
...	...	@@ -233,10 +244,10 @@
233	244	The sources may be found at most Linux ftp sites, including:
234	245	ftp://ftp.kernel.org/pub/linux/kernel
235	246
236		-Copyright: 1991 - 2009 Linus Torvalds and others.
	247	+Copyright: 1991 - 2015 Linus Torvalds and others.
237	248
238	249	The git repository for mainline kernel development is at:
239		-git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
	250	+git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
240	251
241	252	This program is free software; you can redistribute it and/or modify
242	253	it under the terms of the GNU General Public License as published by