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

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.custom (modified) (7 diffs)

branches/2.2.9/mindi-busybox/Makefile.custom

@@ -3 +3 @@
 # ==========================================================================
 
-busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h $(srctree)/include/applets.h
+busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h include/applets.h
     $(Q)-$(SHELL) $^ >$@
 
@@ -12 +12 @@
 ifeq ($(CONFIG_INSTALL_APPLET_HARDLINKS),y)
 INSTALL_OPTS:= --hardlinks
+endif
+ifeq ($(CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS),y)
+ifeq ($(CONFIG_INSTALL_SH_APPLET_SYMLINK),y)
+INSTALL_OPTS:= --sw-sh-sym
+endif
+ifeq ($(CONFIG_INSTALL_SH_APPLET_HARDLINK),y)
+INSTALL_OPTS:= --sw-sh-hard
+endif
+ifeq ($(CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER),y)
+INSTALL_OPTS:= --scriptwrapper
+endif
 endif
 install: $(srctree)/applets/install.sh busybox busybox.links
@@ -36 +47 @@
 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
-    bindir=$(objtree) srcdir=$(srctree)/testsuite SED="$(SED)" \
-    $(SHELL) $(srctree)/testsuite/runtest $(if $(KBUILD_VERBOSE:0=),-v)
+    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)"
 
 .PHONY: release
@@ -44 +60 @@
     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 {} \; ; \
@@ -80 +100 @@
 .PHONY: stksizes
 stksizes: busybox_unstripped
-    $(CROSS_COMPILE)objdump -d busybox_unstripped | $(srctree)/scripts/checkstack.pl $(ARCH)
+    $(CROSS_COMPILE)objdump -d busybox_unstripped | $(srctree)/scripts/checkstack.pl $(ARCH) | uniq
 
 .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
@@ -105 +136 @@
     $(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
@@ -119 +149 @@
 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*