diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 14:05:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 14:05:15 -0400 |
| commit | 2a2ed2db353d949c06b6ef8b6913f65b39111eab (patch) | |
| tree | d835c3dd101da91089c3bdf51c8632e84be37232 /usr/Makefile | |
| parent | 972d19e837833b93466c6f6a8ef2a7d653000aa3 (diff) | |
| parent | 070b98bfda3d27269519067c1c67eaef695f3e0c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (40 commits)
kbuild: trivial fixes in Makefile
kbuild: adding symbols in Kconfig and defconfig to TAGS
kbuild: replace abort() with exit(1)
kbuild: support for %.symtypes files
kbuild: fix silentoldconfig recursion
kbuild: add option for stripping modules while installing them
kbuild: kill some false positives from modpost
kbuild: export-symbol usage report generator
kbuild: fix make -rR breakage
kbuild: append -dirty for updated but uncommited changes
kbuild: append git revision for all untagged commits
kbuild: fix module.symvers parsing in modpost
kbuild: ignore make's built-in rules & variables
kbuild: bugfix with initramfs
kbuild: modpost build fix
kbuild: check license compatibility when building modules
kbuild: export-type enhancement to modpost.c
kbuild: add dependency on kernel.release to the package targets
kbuild: `make kernelrelease' speedup
kconfig: KCONFIG_OVERWRITECONFIG
...
Diffstat (limited to 'usr/Makefile')
| -rw-r--r-- | usr/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/Makefile b/usr/Makefile index 19d74e6f2685..e93824269da2 100644 --- a/usr/Makefile +++ b/usr/Makefile | |||
| @@ -21,8 +21,7 @@ ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \ | |||
| 21 | $(CONFIG_INITRAMFS_SOURCE),-d) | 21 | $(CONFIG_INITRAMFS_SOURCE),-d) |
| 22 | ramfs-args := \ | 22 | ramfs-args := \ |
| 23 | $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \ | 23 | $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \ |
| 24 | $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID)) \ | 24 | $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID)) |
| 25 | $(ramfs-input) | ||
| 26 | 25 | ||
| 27 | # .initramfs_data.cpio.gz.d is used to identify all files included | 26 | # .initramfs_data.cpio.gz.d is used to identify all files included |
| 28 | # in initramfs and to detect if any files are added/removed. | 27 | # in initramfs and to detect if any files are added/removed. |