Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-07 22:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds 2015-02-19 10:31:37 -08:00
commit 7734334337
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/kbuild/makefiles.txt
View File

@ -752,12 +752,12 @@ generated by kbuild are deleted all over the kernel src tree when
Additional files can be specified in kbuild makefiles by use of $(clean-files). Additional files can be specified in kbuild makefiles by use of $(clean-files).
Example: Example:
#drivers/pci/Makefile #lib/Makefile
clean-files := devlist.h classlist.h clean-files := crc32table.h
When executing "make clean", the two files "devlist.h classlist.h" will be 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 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: To delete a directory hierarchy use:
@ -765,9 +765,8 @@ To delete a directory hierarchy use:
#scripts/package/Makefile #scripts/package/Makefile
clean-dirs := $(objtree)/debian/ clean-dirs := $(objtree)/debian/
This will delete the directory debian, including all subdirectories. This will delete the directory debian in the toplevel directory, including all
Kbuild will assume the directories to be in the same relative path as the subdirectories.
Makefile if no absolute path is specified (path does not start with '/').
To exclude certain files from make clean, use the $(no-clean-files) variable. 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: This is only a special case used in the top level Kbuild file:

4
init/Kconfig
View File

@ -1290,8 +1290,8 @@ endif
config CC_OPTIMIZE_FOR_SIZE config CC_OPTIMIZE_FOR_SIZE
bool "Optimize for size" bool "Optimize for size"
help help
Enabling this option will pass "-Os" instead of "-O2" to gcc Enabling this option will pass "-Os" instead of "-O2" to
resulting in a smaller kernel. your compiler resulting in a smaller kernel.
If unsure, say N. If unsure, say N.

17
scripts/package/builddeb
View File

@ -217,9 +217,20 @@ else
fi fi
maintainer="$name <$email>" 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 # Generate a simple changelog template
cat <<EOF > debian/changelog cat <<EOF > debian/changelog
linux-upstream ($packageversion) unstable; urgency=low linux-upstream ($packageversion) $distribution; urgency=low
* Custom built Linux kernel. * Custom built Linux kernel.
@ -233,10 +244,10 @@ This is a packacked upstream version of the Linux kernel.
The sources may be found at most Linux ftp sites, including: The sources may be found at most Linux ftp sites, including:
ftp://ftp.kernel.org/pub/linux/kernel 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: 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 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 it under the terms of the GNU General Public License as published by