Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/Makefile

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/Makefile (modified) (28 diffs)

branches/2.2.9/mindi-busybox/Makefile

@@ -1 +1 @@
 VERSION = 1
-PATCHLEVEL = 7
+PATCHLEVEL = 18
 SUBLEVEL = 3
-EXTRAVERSION = -rPBREV
+EXTRAVERSION =
 NAME = Unnamed
 
@@ -142 +142 @@
 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
@@ -173 +162 @@
 # 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
@@ -303 +317 @@
 # Needed to be compatible with the O= option
 CFLAGS      := $(CFLAGS)
+# Added only to final link stage of busybox binary
+CFLAGS_busybox  := $(CFLAGS_busybox)
 CPPFLAGS    := $(CPPFLAGS)
 AFLAGS      := $(AFLAGS)
@@ -342 +358 @@
 # To avoid any implicit rule to kick in, define an empty command.
 scripts/basic/%: scripts_basic ;
+
+# This target generates Kbuild's and Config.in's from *.c files
+PHONY += gen_build_files
+gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c)
+    $(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree)
+
+# 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 gen_build_files
+    $(Q)$(MAKE) $(build)=applets
+
+applets/%: applets_dir ;
 
 PHONY += outputmakefile
@@ -362 +392 @@
 
 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
@@ -403 +434 @@
 export KBUILD_DEFCONFIG
 
-config %config: scripts_basic outputmakefile FORCE
+config: scripts_basic outputmakefile gen_build_files FORCE
+    $(Q)mkdir -p include
+    $(Q)$(MAKE) $(build)=scripts/kconfig $@
+    $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
+
+%config: scripts_basic outputmakefile gen_build_files FORCE
     $(Q)mkdir -p include
     $(Q)$(MAKE) $(build)=scripts/kconfig $@
@@ -416 +452 @@
 # Additional helpers built in scripts/
 # Carefully list dependencies so we do not try to build scripts twice
-# in parrallel
+# in parallel
 PHONY += scripts
-scripts: scripts_basic include/config/MARKER
+scripts: gen_build_files scripts_basic include/config/MARKER
     $(Q)$(MAKE) $(build)=$(@)
 
@@ -429 +465 @@
 libs-y      := \
         archival/ \
-        archival/libunarchive/ \
+        archival/libarchive/ \
         console-tools/ \
         coreutils/ \
@@ -438 +474 @@
         findutils/ \
         init/ \
-        ipsvd/ \
         libbb/ \
         libpwdgrp/ \
         loginutils/ \
+        mailutils/ \
         miscutils/ \
         modutils/ \
@@ -447 +483 @@
         networking/libiproute/ \
         networking/udhcp/ \
+        printutils/ \
         procps/ \
         runit/ \
@@ -453 +490 @@
         sysklogd/ \
         util-linux/ \
+        util-linux/volume_id/ \
 
 endif # KBUILD_EXTMOD
@@ -477 +515 @@
 # If kconfig.d is missing then we are probarly in a cleaned tree so
 # we execute the config step to be sure to catch updated Kconfig files
-include/autoconf.h: .kconfig.d .config
+include/autoconf.h: .kconfig.d .config $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) | gen_build_files
     $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
+
+include/usage.h: gen_build_files
 
 else
@@ -489 +529 @@
 # This allow a user to issue only 'make' to build a kernel including modules
 # Defaults busybox but it is usually overridden in the arch makefile
-all: busybox
+all: busybox doc
 
 -include $(srctree)/arch/$(ARCH)/Makefile
@@ -496 +536 @@
 #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.
@@ -569 +603 @@
 # May be overridden by arch/$(ARCH)/Makefile
 quiet_cmd_busybox__ ?= LINK    $@
-      cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \
-      -o $@ -Wl,-Map -Wl,$@.map \
-      -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \
-      -Wl,--start-group $(busybox-all) -Wl,--end-group \
-      $(LDLIBS)
+      cmd_busybox__ ?= $(srctree)/scripts/trylink \
+      "$@" \
+      "$(CC)" \
+      "$(CFLAGS) $(CFLAGS_busybox)" \
+      "$(LDFLAGS) $(EXTRA_LDFLAGS)" \
+      "$(core-y)" \
+      "$(libs-y)" \
+      "$(LDLIBS)"
 
 # Generate System.map
@@ -685 +722 @@
     $(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
 
@@ -728 +767 @@
 # 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))
@@ -780 +819 @@
 endif
 
-archprepare: prepare1 scripts_basic
+archprepare: prepare1 scripts_basic applets_dir
 
 prepare0: archprepare FORCE
@@ -804 +843 @@
 #   Split autoconf.h into include/linux/config/*
 quiet_cmd_gen_bbconfigopts = GEN     include/bbconfigopts.h
-      cmd_gen_bbconfigopts = $(srctree)/scripts/mkconfigs > include/bbconfigopts.h
+      cmd_gen_bbconfigopts = $(srctree)/scripts/mkconfigs include/bbconfigopts.h include/bbconfigopts_bz2.h
 quiet_cmd_split_autoconf   = SPLIT   include/autoconf.h -> include/config/*
       cmd_split_autoconf   = scripts/basic/split-include include/autoconf.h include/config
@@ -841 +880 @@
 # Modules
 
-ifdef CONFIG_MODULES
+ifdef _BB_DISABLED_CONFIG_MODULES
 
 #   By default, build modules as well
@@ -917 +956 @@
 
 # Directories & files removed with 'make clean'
-CLEAN_DIRS  += $(MODVERDIR)
-CLEAN_FILES +=  busybox* System.map .kernelrelease \
+CLEAN_DIRS  += $(MODVERDIR) _install 0_lib
+CLEAN_FILES +=  busybox busybox_unstripped* busybox.links \
+                System.map .kernelrelease \
                 .tmp_kallsyms* .tmp_version .tmp_busybox* .tmp_System.map
 
@@ -927 +967 @@
           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
@@ -943 +986 @@
     $(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
@@ -960 +1009 @@
     $(call cmd,rmdirs)
     $(call cmd,rmfiles)
+    @find -name Config.src | sed 's/.src$$/.in/' | xargs -r rm -f
+    @find -name Kbuild.src | sed 's/.src$$//' | xargs -r rm -f
 
 # distclean
@@ -967 +1018 @@
 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
@@ -1073 +1124 @@
     $(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
@@ -1240 +1291 @@
 
 # Modules
-/ %/: prepare scripts FORCE
+%/: prepare scripts FORCE
     $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
     $(build)=$(build-dir)
+/: prepare scripts FORCE
+    $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+    $(build)=$(build-dir)
+
 %.ko: prepare scripts FORCE
     $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \