Bump to version 1.22.1

[platform/upstream/busybox.git] / Makefile.custom

diff --git a/Makefile.custom b/Makefile.custom
index e4a616f..8c95ef2 100644 (file)
--- a/Makefile.custom
+++ b/Makefile.custom
@@ -2,8 +2,13 @@
 # Build system
 # ==========================================================================
 
-busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h $(srctree)/include/applets.h
-       $(Q)-$(SHELL) $^ >$@
+busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h include/applets.h
+       $(Q)-$(SHELL) $^ > $@
+
+busybox.cfg.suid: $(srctree)/applets/busybox.mksuid $(objtree)/include/autoconf.h include/applets.h
+       $(Q)-SUID="yes" $(SHELL) $^ > $@
+busybox.cfg.nosuid: $(srctree)/applets/busybox.mksuid $(objtree)/include/autoconf.h include/applets.h
+       $(Q)-SUID="DROP" $(SHELL) $^ > $@
 
 .PHONY: install
 ifeq ($(CONFIG_INSTALL_APPLET_SYMLINKS),y)
@@ -47,10 +52,11 @@ ifneq ($(strip $(DO_INSTALL_LIBS)),n)
 endif
 
 # Not very elegant: copies testsuite to objdir...
+# (cp -pPR is POSIX-compliant (cp -dpR or cp -a would not be))
 .PHONY: check
 .PHONY: test
 check test: busybox busybox.links
-       test -d $(objtree)/testsuite || cp -a $(srctree)/testsuite $(objtree)
+       test -d $(objtree)/testsuite || cp -pPR $(srctree)/testsuite $(objtree)
        bindir=$(objtree) srcdir=$(srctree)/testsuite \
        $(SHELL) -c "cd $(objtree)/testsuite && $(srctree)/testsuite/runtest $(if $(KBUILD_VERBOSE:0=),-v)"
 
@@ -58,11 +64,19 @@ check test: busybox busybox.links
 release: distclean
        cd ..; \
        rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \
-       cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \
+       cp -pPR busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \
        find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \
                -name .svn \
                -print \
                -exec rm -r -f {} \; ; \
+       find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \
+               -name .git \
+               -print \
+               -exec rm -r -f {} \; ; \
+       find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \
+               -name .gitignore \
+               -print \
+               -exec rm -f {} \; ; \
        find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type f \
                -name .\#* \
                -print \
@@ -98,32 +112,42 @@ stksizes: busybox_unstripped
 
 .PHONY: bigdata
 bigdata: busybox_unstripped
-       $(CROSS_COMPILE)nm --size-sort busybox_unstripped | grep -vi ' [tr] '
+       $(CROSS_COMPILE)nm --size-sort busybox_unstripped | grep -vi ' [trw] '
 
 # Documentation Targets
 .PHONY: doc
-doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
+doc: docs/busybox.pod docs/BusyBox.txt docs/busybox.1 docs/BusyBox.html
+
+# FIXME: Doesn't belong here
+       cmd_doc =
+ quiet_cmd_doc = $(Q)echo "  DOC     $(@F)"
+silent_cmd_doc =
+disp_doc       = $($(quiet)cmd_doc)
 
+# sed adds newlines after "Options:" etc,
+# this is needed in order to get good BusyBox.{1,txt,html}
 docs/busybox.pod: $(srctree)/docs/busybox_header.pod \
-               $(srctree)/include/usage.h \
+               include/usage.h \
                $(srctree)/docs/busybox_footer.pod \
-               $(srctree)/docs/autodocifier.pl
+               applets/usage_pod
        $(disp_doc)
        $(Q)-mkdir -p docs
-       $(Q)-( cat $(srctree)/docs/busybox_header.pod ; \
-           $(srctree)/docs/autodocifier.pl $(srctree)/include/usage.h ; \
-           cat $(srctree)/docs/busybox_footer.pod ; ) > docs/busybox.pod
+       $(Q)-( \
+           cat $(srctree)/docs/busybox_header.pod; \
+           echo; \
+           applets/usage_pod | sed 's/^[A-Za-z][A-Za-z ]*[a-z]:$$/&\n/'; \
+           cat $(srctree)/docs/busybox_footer.pod; \
+           ) > docs/busybox.pod
 
 docs/BusyBox.txt: docs/busybox.pod
        $(disp_doc)
        $(Q)-mkdir -p docs
        $(Q)-pod2text $< > $@
 
-docs/BusyBox.1: docs/busybox.pod
+docs/busybox.1: docs/busybox.pod
        $(disp_doc)
        $(Q)-mkdir -p docs
-       $(Q)-pod2man --center=BusyBox --release="version $(VERSION)" \
-               $< > $@
+       $(Q)-pod2man --center=busybox --release="version $(KERNELVERSION)" $< > $@
 
 docs/BusyBox.html: docs/busybox.net/BusyBox.html
        $(disp_doc)
@@ -133,8 +157,7 @@ docs/BusyBox.html: docs/busybox.net/BusyBox.html
 
 docs/busybox.net/BusyBox.html: docs/busybox.pod
        $(Q)-mkdir -p docs/busybox.net
-       $(Q)-pod2html --noindex $< > \
-           docs/busybox.net/BusyBox.html
+       $(Q)-pod2html --noindex $< > $@
        $(Q)-rm -f pod2htm*
 
 # documentation, cross-reference