aboutsummaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorNickolay <nickolay@protei.ru>2006-06-09 13:24:14 -0400
committerSam Ravnborg <sam@mars.ravnborg.org>2006-06-10 03:07:04 -0400
commitff5417107b7615fcef772cabcb717f4a715ffadc (patch)
tree80141c25462524a559764df128016584cce8cf6c /usr
parent6449bd621ba51ef652ac5bda632eeabbc18dd296 (diff)
kbuild: bugfix with initramfs
This patch fix double inclusion of ramfs-input. Signed-off-by: Nickolay Vinogradov <nickolay@protei.ru> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'usr')
-rw-r--r--usr/Makefile3
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)
22ramfs-args := \ 22ramfs-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.