/[magellan-source]/tags/mkinitrd-6_2_0/Makefile

Diff of /tags/mkinitrd-6_2_0/Makefile

Parent Directory | Revision Log | View Patch Patch

-revision 532 by niro,
Sat Sep  1 22:45:15 2007 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 1
  VERSION = 1
- PATCHLEVEL = 4
+ PATCHLEVEL = 16
- SUBLEVEL = 2
+ SUBLEVEL = 1
  EXTRAVERSION =
  NAME = Unnamed
 Line 142 
 VPATH		:= $(srctree)$(if $(KBUILD_EXTMOD
  export srctree objtree VPATH TOPDIR
- # SUBARCH tells the usermode build what the underlying arch is.  That is set
- # first, and if a usermode build is happening, the "ARCH=um" on the command
- # line overrides the setting of ARCH below.  If a native build is happening,
- # then ARCH is assigned, getting whatever value it gets normally, and
- # SUBARCH is subsequently ignored.
- SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
- 				  -e s/arm.*/arm/ -e s/sa110/arm/ \
- 				  -e s/s390x/s390/ -e s/parisc64/parisc/ \
- 				  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ )
  # Cross compiling and selecting different set of gcc/bin-utils
  # ---------------------------------------------------------------------------
  #
-Line 172 
 SUBARCH := $(shell uname -m | sed -e s/i
+Line 161 
 SUBARCH := $(shell uname -m | sed -e s/i
  # Default value for CROSS_COMPILE is not to prefix executables
  # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
- ARCH		?= $(SUBARCH)
+ CROSS_COMPILE ?=
- CROSS_COMPILE	?=
+ # bbox: we may have CONFIG_CROSS_COMPILER_PREFIX in .config,
+ # and it has not been included yet... thus using an awkward syntax.
+ ifeq ($(CROSS_COMPILE),)
+ CROSS_COMPILE := $(shell grep ^CONFIG_CROSS_COMPILER_PREFIX .config 2>/dev/null)
+ CROSS_COMPILE := $(subst CONFIG_CROSS_COMPILER_PREFIX=,,$(CROSS_COMPILE))
+ CROSS_COMPILE := $(subst ",,$(CROSS_COMPILE))
+ #")
+ endif
+ # SUBARCH tells the usermode build what the underlying arch is.  That is set
+ # first, and if a usermode build is happening, the "ARCH=um" on the command
+ # line overrides the setting of ARCH below.  If a native build is happening,
+ # then ARCH is assigned, getting whatever value it gets normally, and
+ # SUBARCH is subsequently ignored.
+ ifneq ($(CROSS_COMPILE),)
+ SUBARCH := $(shell echo $(CROSS_COMPILE) | cut -d- -f1)
+ else
+ SUBARCH := $(shell uname -m)
+ endif
+ SUBARCH := $(shell echo $(SUBARCH) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+ 					 -e s/arm.*/arm/ -e s/sa110/arm/ \
+ 					 -e s/s390x/s390/ -e s/parisc64/parisc/ \
+ 					 -e s/ppc.*/powerpc/ -e s/mips.*/mips/ )
+ ARCH ?= $(SUBARCH)
  # Architecture as present in compile.h
  UTS_MACHINE := $(ARCH)
-Line 183 
 CONFIG_SHELL := $(shell if [ -x "$$BASH"
+Line 197 
 CONFIG_SHELL := $(shell if [ -x "$$BASH"
  	  else if [ -x /bin/bash ]; then echo /bin/bash; \
  	  else echo sh; fi ; fi)
- HOSTCC  	= gcc
- HOSTCXX  	= g++
- HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
- HOSTCXXFLAGS	= -O2
  # 	Decide whether to build built-in, modular, or both.
  #	Normally, just do built-in.
-Line 262 
 export quiet Q KBUILD_VERBOSE
+Line 271 
 export quiet Q KBUILD_VERBOSE
  # Look for make include files relative to root of kernel src
  MAKEFLAGS += --include-dir=$(srctree)
+ HOSTCC  	= gcc
+ HOSTCXX  	= g++
+ HOSTCFLAGS	:=
+ HOSTCXXFLAGS	:=
  # We need some generic definitions
  include $(srctree)/scripts/Kbuild.include
+ HOSTCFLAGS	+= $(call hostcc-option,-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer,)
+ HOSTCXXFLAGS	+= -O2
  # For maximum performance (+ possibly random breakage, uncomment
  # the following)
-Line 299 
 AFLAGS_KERNEL	=
+Line 315 
 AFLAGS_KERNEL	=
  # Use LINUXINCLUDE when you must reference the include/ directory.
  # Needed to be compatible with the O= option
- CFLAGS		:=
+ CFLAGS		:= $(CFLAGS)
- CPPFLAGS	:=
+ # Added only to final link stage of busybox binary
- AFLAGS		:=
+ CFLAGS_busybox	:= $(CFLAGS_busybox)
+ CPPFLAGS	:= $(CPPFLAGS)
+ AFLAGS		:= $(AFLAGS)
+ LDFLAGS		:= $(LDFLAGS)
+ LDLIBS		:=
  # Read KERNELRELEASE from .kernelrelease (if it exists)
  KERNELRELEASE = $(shell cat .kernelrelease 2> /dev/null)
-Line 315 
 export	VERSION PATCHLEVEL SUBLEVEL KERNE
+Line 335 
 export	VERSION PATCHLEVEL SUBLEVEL KERNE
  export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
  export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
  export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
+ export FLTFLAGS
  # When compiling out-of-tree modules, put MODVERDIR in the module
  # tree rather than in the kernel tree. The kernel tree might
-Line 337 
 scripts_basic:
+Line 358 
 scripts_basic:
  # To avoid any implicit rule to kick in, define an empty command.
  scripts/basic/%: scripts_basic ;
+ # bbox: we have helpers in applets/
+ # we depend on scripts_basic, since scripts/basic/fixdep
+ # must be built before any other host prog
+ PHONY += applets_dir
+ applets_dir: scripts_basic
+ 	$(Q)$(MAKE) $(build)=applets
+ applets/%: applets_dir ;
  PHONY += outputmakefile
  # outputmakefile generates a Makefile in the output directory, if using a
  # separate output directory. This allows convenient use of make in the
-Line 356 
 endif
+Line 386 
 endif
  # of make so .config is not included in this case either (for *config).
  no-dot-config-targets := clean mrproper distclean \
- 			 cscope TAGS tags help %docs check%
+ 			 cscope TAGS tags help %docs
+ #bbox# check% is removed from above
  config-targets := 0
  mixed-targets  := 0
-Line 435 
 libs-y		:= \
+Line 466 
 libs-y		:= \
  		libbb/ \
  		libpwdgrp/ \
  		loginutils/ \
+ 		mailutils/ \
  		miscutils/ \
  		modutils/ \
  		networking/ \
  		networking/libiproute/ \
  		networking/udhcp/ \
+ 		printutils/ \
  		procps/ \
  		runit/ \
+ 		selinux/ \
  		shell/ \
  		sysklogd/ \
  		util-linux/ \
+ 		util-linux/volume_id/ \
  endif # KBUILD_EXTMOD
-Line 480 
 endif
+Line 515 
 endif
  # The all: target is the default when no target is given on the
  # command line.
  # This allow a user to issue only 'make' to build a kernel including modules
- # Defaults busybox but it is usually overriden in the arch makefile
+ # Defaults busybox but it is usually overridden in the arch makefile
- all: busybox
+ all: busybox doc
  -include $(srctree)/arch/$(ARCH)/Makefile
-Line 489 
 all: busybox
+Line 524 
 all: busybox
  #bbox# NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
  CHECKFLAGS += $(NOSTDINC_FLAGS)
- # warn about C99 declaration after statement
- CFLAGS += $(call cc-option,-Wdeclaration-after-statement,)
- # disable pointer signedness warnings in gcc 4.0
- CFLAGS += $(call cc-option,-Wno-pointer-sign,)
  # Default kernel image to build when no specific target is given.
  # KBUILD_IMAGE may be overruled on the commandline or
  # set in the environment
-Line 561 
 busybox-all  := $(core-y) $(libs-y)
+Line 590 
 busybox-all  := $(core-y) $(libs-y)
  # Rule to link busybox - also used during CONFIG_KALLSYMS
  # May be overridden by arch/$(ARCH)/Makefile
  quiet_cmd_busybox__ ?= LINK    $@
-       cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \
+       cmd_busybox__ ?= $(srctree)/scripts/trylink \
-       -o $@ \
+       "$@" \
-       -Wl,--warn-common -Wl,--sort-common \
+       "$(CC)" \
-       -Wl,--start-group $(busybox-all) -Wl,--end-group
+       "$(CFLAGS) $(CFLAGS_busybox)" \
+       "$(LDFLAGS) $(EXTRA_LDFLAGS)" \
+       "$(core-y)" \
+       "$(libs-y)" \
+       "$(LDLIBS)"
  # Generate System.map
  quiet_cmd_sysmap = SYSMAP
-Line 671 
 busybox_unstripped: $(busybox-all) FORCE
+Line 704 
 busybox_unstripped: $(busybox-all) FORCE
  	$(Q)rm -f .old_version
  busybox: busybox_unstripped
+ ifeq ($(SKIP_STRIP),y)
+ 	$(Q)cp $< $@
+ else
  	$(Q)$(STRIP) -s --remove-section=.note --remove-section=.comment \
  		busybox_unstripped -o $@
+ # strip is confused by PIE executable and does not set exec bits
+ 	$(Q)chmod a+x $@
+ endif
  # The actual objects are generated when descending,
  # make sure no implicit rule kicks in
-Line 715 
 localver = $(subst $(space),, \
+Line 754 
 localver = $(subst $(space),, \
  # Currently, only git is supported.
  # Other SCMs can edit scripts/setlocalversion and add the appropriate
  # checks as needed.
- ifdef CONFIG_LOCALVERSION_AUTO
+ ifdef _BB_DISABLED_CONFIG_LOCALVERSION_AUTO
  	_localver-auto = $(shell $(CONFIG_SHELL) \
  	                  $(srctree)/scripts/setlocalversion $(srctree))
  	localver-auto  = $(LOCALVERSION)$(_localver-auto)
-Line 748 
 PHONY += prepare-all
+Line 787 
 PHONY += prepare-all
  # 2) Create the include2 directory, used for the second asm symlink
  prepare3: .kernelrelease
  ifneq ($(KBUILD_SRC),)
- 	@echo '  Using $(srctree) as source for kernel'
+ 	@echo '  Using $(srctree) as source for busybox'
  	$(Q)if [ -f $(srctree)/.config ]; then \
  		echo "  $(srctree) is not clean, please run 'make mrproper'";\
  		echo "  in the '$(srctree)' directory.";\
-Line 767 
 ifneq ($(KBUILD_MODULES),)
+Line 806 
 ifneq ($(KBUILD_MODULES),)
  	$(Q)rm -f $(MODVERDIR)/*
  endif
- archprepare: prepare1 scripts_basic
+ archprepare: prepare1 scripts_basic applets_dir
  prepare0: archprepare FORCE
  	$(Q)$(MAKE) $(build)=.
-Line 828 
 depend dep:
+Line 867 
 depend dep:
  # ---------------------------------------------------------------------------
  # Modules
- ifdef CONFIG_MODULES
+ ifdef _BB_DISABLED_CONFIG_MODULES
  # 	By default, build modules as well
-Line 904 
 endif # CONFIG_MODULES
+Line 943 
 endif # CONFIG_MODULES
  # make distclean Remove editor backup files, patch leftover files and the like
  # Directories & files removed with 'make clean'
- CLEAN_DIRS  += $(MODVERDIR)
+ CLEAN_DIRS  += $(MODVERDIR) _install 0_lib
- CLEAN_FILES +=	busybox* System.map \
+ CLEAN_FILES +=	busybox busybox_unstripped* busybox.links \
+                 System.map .kernelrelease \
                  .tmp_kallsyms* .tmp_version .tmp_busybox* .tmp_System.map
  # Directories & files removed with 'make mrproper'
-Line 914 
 MRPROPER_FILES += .config .config.old in
+Line 954 
 MRPROPER_FILES += .config .config.old in
  		  include/autoconf.h \
  		  include/bbconfigopts.h \
  		  include/usage_compressed.h \
- 		  .kernelrelease Module.symvers tags TAGS cscope*
+ 		  include/applet_tables.h \
+ 		  applets/usage \
+ 		  .kernelrelease Module.symvers tags TAGS cscope* \
+ 		  busybox_old
  # clean - Delete most, but leave enough to build external modules
  #
-Line 930 
 clean: archclean $(clean-dirs)
+Line 973 
 clean: archclean $(clean-dirs)
  	$(call cmd,rmdirs)
  	$(call cmd,rmfiles)
  	@find . $(RCS_FIND_IGNORE) \
- 	 	\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
+ 		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
  		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \
  		-type f -print | xargs rm -f
+ PHONY += doc-clean
+ doc-clean: rm-files := docs/busybox.pod \
+ 		  docs/BusyBox.html docs/BusyBox.1 docs/BusyBox.txt
+ doc-clean:
+ 	$(call cmd,rmfiles)
  # mrproper - Delete all generated files, including .config
  #
  mrproper: rm-dirs  := $(wildcard $(MRPROPER_DIRS))
-Line 954 
 PHONY += distclean
+Line 1003 
 PHONY += distclean
  distclean: mrproper
  	@find $(srctree) $(RCS_FIND_IGNORE) \
- 	 	\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
+ 		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
  		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
- 	 	-o -name '.*.rej' -o -size 0 \
+ 		-o -name '.*.rej' -o -name '*.tmp' -o -size 0 \
  		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
  		-type f -print | xargs rm -f
-Line 1060 
 clean:	rm-dirs := $(MODVERDIR)
+Line 1109 
 clean:	rm-dirs := $(MODVERDIR)
  clean: $(clean-dirs)
  	$(call cmd,rmdirs)
  	@find $(KBUILD_EXTMOD) $(RCS_FIND_IGNORE) \
- 	 	\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
+ 		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
  		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \) \
  		-type f -print | xargs rm -f

 Legend:



Removed from v.532
 


changed lines


 
Added in v.984
 Legend:



Removed from v.532
 


changed lines


 
Added in v.984
-Removed from v.532
+Added in v.984