diff options
| -rw-r--r-- | boa.mk | 55 | ||||
| -rw-r--r-- | busybox.mk | 18 |
2 files changed, 28 insertions, 45 deletions
@@ -4,13 +4,15 @@ TARGETS_CLEAN += boa_clean TARGETS_MRPROPER += boa_mrproper TARGETS_DISTCLEAN += boa_distclean +BOA_VERSION=0.94.12pre1 + # Don't alter below this line unless you (think) you know # what you are doing! Danger, Danger! +BOA_URI=http://www.boa.org +BOA_SOURCE=boa-$(BOA_VERSION).tar.gz BOA_DIR=$(BASE_DIR)/${shell basename $(BOA_SOURCE) .tar.gz} BOA_WORKDIR=$(BASE_DIR)/boa_workdir -BOA_URI=http://www.boa.org -BOA_SOURCE=boa-0.94.12pre1.tar.gz IMAGE_SIZE += +100 @@ -23,48 +25,31 @@ $(BOA_DIR)/.unpacked: $(SOURCE_DIR)/$(BOA_SOURCE) tar -xzf $(SOURCE_DIR)/$(BOA_SOURCE) touch $(BOA_DIR)/.unpacked -$(BOA_WORKDIR)/Makefile: uclibc $(BOA_DIR)/.unpacked +$(BOA_WORKDIR)/Makefile: $(TARGET_CC) $(BOA_DIR)/.unpacked mkdir -p $(BOA_WORKDIR) if [ -f $(SOURCE_DIR)/boa-config.site-$(ARCH) ]; then \ (cd $(BOA_WORKDIR) && CONFIG_SITE=$(SOURCE_DIR)/boa-config.site-$(ARCH) CC=$(TARGET_CC) $(BOA_DIR)/src/configure); \ else \ (cd $(BOA_WORKDIR) && CC=$(TARGET_CC) $(BOA_DIR)/src/configure); \ fi - -$(BOA_WORKDIR)/.built: $(BOA_WORKDIR)/Makefile touch $(BOA_WORKDIR)/.depend + touch $(BOA_WORKDIR)/.unpacked + +$(BOA_WORKDIR)/boa $(BOA_WORKDIR)/boa_indexer: $(BOA_WORKDIR)/Makefile make VPATH=$(BOA_DIR)/src/ -C $(BOA_WORKDIR) - (cd $(BOA_WORKDIR) && strip --strip-all boa boa_indexer) - touch $(BOA_WORKDIR)/.built - -boa_install_dirs = /usr/sbin /etc/boa /usr/lib/boa /var/www /usr/lib/cgi-bin - -TARGET_DIRS = $(foreach dir,$(boa_install_dirs),$(TARGET_DIR)/$(dir)) -$(TARGET_DIRS): - mkdir -p $@ - -boa: $(BOA_WORKDIR)/.built $(TARGET_DIRS) - @A=`cksum $(TARGET_DIR)/usr/sbin/boa 2>/dev/null | awk '{ print $$1 }'`; \ - B=`cksum $(BOA_WORKDIR)/boa 2>/dev/null | awk '{ print $$1 }'`; \ - if [ "$$A" != "$$B" ] ; then \ - cp -f $(BOA_WORKDIR)/boa $(TARGET_DIR)/usr/sbin/boa ; \ - fi; - @A=`cksum $(TARGET_DIR)/usr/lib/boa/boa_indexer 2>/dev/null | awk '{ print $$1 }'`; \ - B=`cksum $(BOA_WORKDIR)/boa_indexer 2>/dev/null | awk '{ print $$1 }'`; \ - if [ "$$A" != "$$B" ] ; then \ - cp -f $(BOA_WORKDIR)/boa_indexer $(TARGET_DIR)/usr/lib/boa/boa_indexer ; \ - fi; - @A=`cksum $(TARGET_DIR)/etc/boa/boa.conf 2>/dev/null | awk '{ print $$1 }'`; \ - B=`cksum $(SOURCE_DIR)/boa.conf 2>/dev/null | awk '{ print $$1 }'`; \ - if [ "$$A" != "$$B" ] ; then \ - cp -f $(SOURCE_DIR)/boa.conf $(TARGET_DIR)/etc/boa ; \ - fi; - @A=`cksum $(TARGET_DIR)/etc/mime.types 2>/dev/null | awk '{ print $$1 }'`; \ - B=`cksum $(SOURCE_DIR)/mime.types 2>/dev/null | awk '{ print $$1 }'`; \ - if [ "$$A" != "$$B" ] ; then \ - cp -f $(SOURCE_DIR)/mime.types $(TARGET_DIR)/etc/mime.types ; \ - fi; +$(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/boa $(BOA_WORKDIR)/boa_indexer + mkdir -p $(TARGET_DIR)/usr/sbin + cp -f $(BOA_WORKDIR)/boa $(TARGET_DIR)/usr/sbin/boa + mkdir -p $(TARGET_DIR)/usr/lib/boa + cp -f $(BOA_WORKDIR)/boa_indexer $(TARGET_DIR)/usr/lib/boa/boa_indexer + mkdir -p $(TARGET_DIR)/etc/boa + cp -f $(SOURCE_DIR)/boa.conf $(TARGET_DIR)/etc/boa + cp -f $(SOURCE_DIR)/mime.types $(TARGET_DIR)/etc/mime.types + strip --strip-all $(TARGET_DIR)/usr/sbin/boa $(TARGET_DIR)/usr/lib/boa/boa_indexer + touch $(BOA_WORKDIR)/.installed + +boa: $(BOA_WORKDIR)/.installed boa_clean: @if [ -d $(BOA_WORKDIR)/Makefile ] ; then \ diff --git a/busybox.mk b/busybox.mk index 5d0ed241d..c784ae93e 100644 --- a/busybox.mk +++ b/busybox.mk @@ -3,13 +3,15 @@ TARGETS_CLEAN += busybox_clean TARGETS_MRPROPER += busybox_mrproper TARGETS_DISTCLEAN += busybox_distclean +BUSYBOX_VERSION=0.60.2 + # Don't alter below this line unless you (think) you know # what you are doing! Danger, Danger! +BUSYBOX_URI=http://www.busybox.net/downloads/ +BUSYBOX_SOURCE=busybox-$(BUSYBOX_VERSION).tar.gz BUSYBOX_DIR=$(BASE_DIR)/${shell basename $(BUSYBOX_SOURCE) .tar.gz} BUSYBOX_WORKDIR=$(BASE_DIR)/busybox_workdir -BUSYBOX_URI=http://www.busybox.net/downloads/ -BUSYBOX_SOURCE=busybox-0.60.2.tar.gz IMAGE_SIZE += +500 @@ -38,18 +40,14 @@ $(BUSYBOX_WORKDIR)/.config: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_WORKDIR)/Config.h touch $(BUSYBOX_WORKDIR)/.config -$(BUSYBOX_WORKDIR)/busybox: uclibc $(BUSYBOX_WORKDIR)/.config +$(BUSYBOX_WORKDIR)/busybox: $(TARGET_CC) $(BUSYBOX_WORKDIR)/.config make CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_WORKDIR) $(TARGET_DIR)/bin/busybox: $(BUSYBOX_WORKDIR)/busybox - @A=`cksum $(TARGET_DIR)/bin/busybox 2>/dev/null | awk '{ print $$1 }'`; \ - B=`cksum $(BUSYBOX_WORKDIR)/busybox 2>/dev/null | awk '{ print $$1 }'`; \ - if [ "$$A" != "$$B" ] ; then \ - make CROSS="$(TARGET_CROSS)" PREFIX=$(TARGET_DIR) \ - -C $(BUSYBOX_WORKDIR) install; \ - fi; + make CROSS="$(TARGET_CROSS)" PREFIX=$(TARGET_DIR) \ + -C $(BUSYBOX_WORKDIR) install -busybox: uclibc $(TARGET_DIR)/bin/busybox +busybox: $(TARGET_DIR)/bin/busybox busybox_clean: @if [ -d $(BUSYBOX_WORKDIR)/Makefile ] ; then \ |