Commit c9e2a72f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  initramfs: Fix build break on symbol-prefixed archs
  initramfs: fix initramfs size calculation
  initramfs: generalize initramfs_data.xxx.S variants
  scripts/kallsyms: Enable error messages while hush up unnecessary warnings
  scripts/setlocalversion: update comment
  kbuild: Use a single clean rule for kernel and external modules
  kbuild: Do not run make clean in $(srctree)
  scripts/mod/modpost.c: fix commentary accordingly to last changes
  kbuild: Really don't clean bounds.h and asm-offsets.h
parents 9aca0e7c d63f6d1b

Documentation/kbuild/makefiles.txt

+7 −0
Original line number Diff line number Diff line
@@ -776,6 +776,13 @@ 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 '/').



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:



	Example:

		#Kbuild

		no-clean-files := $(bounds-file) $(offsets-file)



Usually kbuild descends down in subdirectories due to "obj-* := dir/",

but in the architecture makefiles where the kbuild infrastructure

is not sufficient this sometimes needs to be explicit.

Kbuild

+2 −2
Original line number Diff line number Diff line
@@ -95,5 +95,5 @@ PHONY += missing-syscalls 
missing-syscalls: scripts/checksyscalls.sh FORCE

	$(call cmd,syscalls)



# Delete all targets during make clean

clean-files := $(addprefix $(objtree)/,$(filter-out $(bounds-file) $(offsets-file),$(targets)))
 
# Keep these two files during make clean

no-clean-files := $(bounds-file) $(offsets-file)

Makefile

+13 −20
Original line number Diff line number Diff line
@@ -1137,21 +1137,13 @@ MRPROPER_FILES += .config .config.old .version .old_version \ 
#

clean: rm-dirs  := $(CLEAN_DIRS)

clean: rm-files := $(CLEAN_FILES)

clean-dirs      := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs) Documentation)

clean-dirs      := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation)



PHONY += $(clean-dirs) clean archclean

$(clean-dirs):

	$(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@)



clean: archclean $(clean-dirs)

	$(call cmd,rmdirs)

	$(call cmd,rmfiles)

	@find . $(RCS_FIND_IGNORE) \

		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \

		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \

		-o -name '*.symtypes' -o -name 'modules.order' \

		-o -name modules.builtin -o -name '.tmp_*.o.*' \

		-o -name '*.gcno' \) -type f -print | xargs rm -f

clean: archclean



# mrproper - Delete all generated files, including .config

#
@@ -1352,16 +1344,7 @@ $(clean-dirs): 
	$(Q)$(MAKE) $(clean)=$(patsubst _clean_%,%,$@)



clean:	rm-dirs := $(MODVERDIR)

clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers \

                   $(KBUILD_EXTMOD)/modules.order \

                   $(KBUILD_EXTMOD)/modules.builtin

clean: $(clean-dirs)

	$(call cmd,rmdirs)

	$(call cmd,rmfiles)

	@find $(KBUILD_EXTMOD) $(RCS_FIND_IGNORE) \

		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \

		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \

		-o -name '*.gcno' \) -type f -print | xargs rm -f

clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers



help:

	@echo  '  Building external modules.'
@@ -1378,6 +1361,16 @@ prepare: ; 
scripts: ;

endif # KBUILD_EXTMOD



clean: $(clean-dirs)

	$(call cmd,rmdirs)

	$(call cmd,rmfiles)

	@find $(or $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \

		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \

		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \

		-o -name '*.symtypes' -o -name 'modules.order' \

		-o -name modules.builtin -o -name '.tmp_*.o.*' \

		-o -name '*.gcno' \) -type f -print | xargs rm -f



# Generate tags for editors

# ---------------------------------------------------------------------------

quiet_cmd_tags = GEN     $@

include/asm-generic/vmlinux.lds.h

+2 −1
Original line number Diff line number Diff line
@@ -640,7 +640,8 @@ 
	. = ALIGN(4);							\

	VMLINUX_SYMBOL(__initramfs_start) = .;				\

	*(.init.ramfs)							\

	VMLINUX_SYMBOL(__initramfs_end) = .;

	. = ALIGN(8);							\

	*(.init.ramfs.info)

#else

#define INIT_RAM_FS

#endif

init/initramfs.c

+4 −5
Original line number Diff line number Diff line
@@ -483,7 +483,8 @@ static int __init retain_initrd_param(char *str) 
}

__setup("retain_initrd", retain_initrd_param);



extern char __initramfs_start[], __initramfs_end[];

extern char __initramfs_start[];

extern unsigned long __initramfs_size;

#include <linux/initrd.h>

#include <linux/kexec.h>
@@ -570,8 +571,7 @@ static void __init clean_rootfs(void) 


static int __init populate_rootfs(void)

{

	char *err = unpack_to_rootfs(__initramfs_start,

			 __initramfs_end - __initramfs_start);

	char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);

	if (err)

		panic(err);	/* Failed to decompress INTERNAL initramfs */

	if (initrd_start) {
@@ -585,8 +585,7 @@ static int __init populate_rootfs(void) 
			return 0;

		} else {

			clean_rootfs();

			unpack_to_rootfs(__initramfs_start,

				 __initramfs_end - __initramfs_start);

			unpack_to_rootfs(__initramfs_start, __initramfs_size);

		}

		printk(KERN_INFO "rootfs image is not initramfs (%s)"

				"; looks like an initrd\n", err);

CRA Git | Maintained and supported by SUSTech CRA and CCSE