Ignore:
Timestamp:
Feb 25, 2011, 9:26:54 PM (8 years ago)
Author:
bruno
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.9/mindi-busybox/Makefile.custom

    r1765 r2725  
    33# ==========================================================================
    44
    5 busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h $(srctree)/include/applets.h
     5busybox.links: $(srctree)/applets/busybox.mkll $(objtree)/include/autoconf.h include/applets.h
    66    $(Q)-$(SHELL) $^ >$@
    77
     
    1212ifeq ($(CONFIG_INSTALL_APPLET_HARDLINKS),y)
    1313INSTALL_OPTS:= --hardlinks
     14endif
     15ifeq ($(CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS),y)
     16ifeq ($(CONFIG_INSTALL_SH_APPLET_SYMLINK),y)
     17INSTALL_OPTS:= --sw-sh-sym
     18endif
     19ifeq ($(CONFIG_INSTALL_SH_APPLET_HARDLINK),y)
     20INSTALL_OPTS:= --sw-sh-hard
     21endif
     22ifeq ($(CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER),y)
     23INSTALL_OPTS:= --scriptwrapper
     24endif
    1425endif
    1526install: $(srctree)/applets/install.sh busybox busybox.links
     
    3647endif
    3748
     49# Not very elegant: copies testsuite to objdir...
     50# (cp -pPR is POSIX-compliant (cp -dpR or cp -a would not be))
     51.PHONY: check
     52.PHONY: test
    3853check test: busybox busybox.links
    39     bindir=$(objtree) srcdir=$(srctree)/testsuite SED="$(SED)" \
    40     $(SHELL) $(srctree)/testsuite/runtest $(if $(KBUILD_VERBOSE:0=),-v)
     54    test -d $(objtree)/testsuite || cp -pPR $(srctree)/testsuite $(objtree)
     55    bindir=$(objtree) srcdir=$(srctree)/testsuite \
     56    $(SHELL) -c "cd $(objtree)/testsuite && $(srctree)/testsuite/runtest $(if $(KBUILD_VERBOSE:0=),-v)"
    4157
    4258.PHONY: release
     
    4460    cd ..; \
    4561    rm -r -f busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION); \
    46     cp -a busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \
     62    cp -pPR busybox busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) && { \
    4763    find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \
    4864        -name .svn \
     65        -print \
     66        -exec rm -r -f {} \; ; \
     67    find busybox-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)/ -type d \
     68        -name .git \
    4969        -print \
    5070        -exec rm -r -f {} \; ; \
     
    80100.PHONY: stksizes
    81101stksizes: busybox_unstripped
    82     $(CROSS_COMPILE)objdump -d busybox_unstripped | $(srctree)/scripts/checkstack.pl $(ARCH)
     102    $(CROSS_COMPILE)objdump -d busybox_unstripped | $(srctree)/scripts/checkstack.pl $(ARCH) | uniq
    83103
    84104.PHONY: bigdata
    85105bigdata: busybox_unstripped
    86     $(CROSS_COMPILE)nm --size-sort busybox_unstripped | grep -vi ' [tr] '
     106    $(CROSS_COMPILE)nm --size-sort busybox_unstripped | grep -vi ' [trw] '
    87107
    88108# Documentation Targets
    89109.PHONY: doc
    90 doc: docs/busybox.pod docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html
     110doc: docs/busybox.pod docs/BusyBox.txt docs/busybox.1 docs/BusyBox.html
    91111
     112# FIXME: Doesn't belong here
     113       cmd_doc =
     114 quiet_cmd_doc = $(Q)echo "  DOC     $(@F)"
     115silent_cmd_doc =
     116disp_doc       = $($(quiet)cmd_doc)
     117
     118# sed adds newlines after "Options:" etc,
     119# this is needed in order to get good BusyBox.{1,txt,html}
    92120docs/busybox.pod: $(srctree)/docs/busybox_header.pod \
    93         $(srctree)/include/usage.h \
     121        include/usage.h \
    94122        $(srctree)/docs/busybox_footer.pod \
    95         $(srctree)/docs/autodocifier.pl
     123        applets/usage_pod
    96124    $(disp_doc)
    97125    $(Q)-mkdir -p docs
    98     $(Q)-( cat $(srctree)/docs/busybox_header.pod ; \
    99         $(srctree)/docs/autodocifier.pl $(srctree)/include/usage.h ; \
    100         cat $(srctree)/docs/busybox_footer.pod ; ) > docs/busybox.pod
     126    $(Q)-( \
     127        cat $(srctree)/docs/busybox_header.pod; \
     128        echo; \
     129        applets/usage_pod | sed 's/^[A-Za-z][A-Za-z ]*[a-z]:$$/&\n/'; \
     130        cat $(srctree)/docs/busybox_footer.pod; \
     131        ) > docs/busybox.pod
    101132
    102133docs/BusyBox.txt: docs/busybox.pod
     
    105136    $(Q)-pod2text $< > $@
    106137
    107 docs/BusyBox.1: docs/busybox.pod
     138docs/busybox.1: docs/busybox.pod
    108139    $(disp_doc)
    109140    $(Q)-mkdir -p docs
    110     $(Q)-pod2man --center=BusyBox --release="version $(VERSION)" \
    111         $< > $@
     141    $(Q)-pod2man --center=busybox --release="version $(KERNELVERSION)" $< > $@
    112142
    113143docs/BusyBox.html: docs/busybox.net/BusyBox.html
     
    119149docs/busybox.net/BusyBox.html: docs/busybox.pod
    120150    $(Q)-mkdir -p docs/busybox.net
    121     $(Q)-pod2html --noindex $< > \
    122         docs/busybox.net/BusyBox.html
     151    $(Q)-pod2html --noindex $< > $@
    123152    $(Q)-rm -f pod2htm*
    124153
Note: See TracChangeset for help on using the changeset viewer.