diff --git a/build/Makefile b/build/Makefile index 53ae934db8758bec076af9a2d5c9a4c6e098e21c..f7fbf8076d511d87d6c6d15c1b838ccac57ba29f 100644 --- a/build/Makefile +++ b/build/Makefile @@ -23,7 +23,7 @@ VERSION = 1.4.0 BASE = .. BUILD = build -PACKAGE = $(BUILD)/SEED2-run +PACKAGE = $(BUILD)/SEED2 CC = gcc CFLAGS = -g -O2 -m32 -static -Wall @@ -33,10 +33,14 @@ WGET_VERSION = 1.13.4 WGET_URL = http://gnu.c3sl.ufpr.br/ftp/wget/wget-$(WGET_VERSION).tar.gz WGET = wget-$(WGET_VERSION) -BOOTSTRAP_SIZE = $(shell echo $$(( `wc -l bootstraps/bootstrap-update.sh | cut -d' ' -f1` + 1 ))) +BOOTSTRAP_INSTALL_SIZE = $(shell echo $$(( `wc -l bootstraps/bootstrap-install.sh | cut -d' ' -f1` + 1 ))) + +BOOTSTRAP_UPDATE_SIZE = $(shell echo $$(( `wc -l bootstraps/bootstrap-update.sh | cut -d' ' -f1` + 1 ))) all: proinfodata-$(VERSION)-update.run +install: proinfodata-$(VERSION)-install.run + clean: @rm -rf $(BUILD) cd $(BASE)/client; make clean @@ -105,9 +109,12 @@ $(BUILD)/.package: $(BUILD)/$(WGET)/src/wget $(BASE)/client/bin/client $(BASE)/c cp -ar "$(BASE)/client/bin/client" "$(PACKAGE)/client/bin/" @mkdir -p "$(PACKAGE)/client/conf" echo "$(VERSION)" > "$(PACKAGE)/client/conf/version" - cp -a "$(BUILD)/$(WGET)/src/wget" "$(PACKAGE)/bin/" + @if ! test -z $(INEP); then \ + echo "$(INEP)" > "$(PACKAGE)/client/conf/inep"; \ + fi + cp -a "$(BUILD)/$(WGET)/src/wget" "$(PACKAGE)/bin/" @touch $@ - + $(BUILD)/.backedup: $(BUILD)/.package rm -rf "$(PACKAGE)/.backup" mkdir -p "$(PACKAGE)/.backup" @@ -128,10 +135,20 @@ $(BUILD)/.md5summed: $(BUILD)/.backedup @touch $@ proinfodata-$(VERSION)-update.run: $(BUILD)/.md5summed - tar -C $(BUILD) -cvzf $(BUILD)/SEED2-run.tgz SEED2-run - md5sum $(BUILD)/SEED2-run.tgz | awk '{print $$1}' > $(BUILD)/SEED2-run.tgz.md5sum - sed "s/BOOTSTRAP_LINES=/BOOTSTRAP_LINES=$(BOOTSTRAP_SIZE)/g; \ + rm -rf "$(PACKAGE)/client/conf/inep" + tar -C $(BUILD) -cvzf $(BUILD)/SEED2.tgz SEED2 + md5sum $(BUILD)/SEED2.tgz | awk '{print $$1}' > $(BUILD)/SEED2.tgz.md5sum + sed "s/BOOTSTRAP_LINES=/BOOTSTRAP_LINES=$(BOOTSTRAP_UPDATE_SIZE)/g; \ s/FILE=/FILE=\"$@\"/g; \ - s/MD5_CHECK=/MD5_CHECK=\"$(shell cat $(BUILD)/SEED2-run.tgz.md5sum)\"/g" \ + s/MD5_CHECK=/MD5_CHECK=\"$(shell cat $(BUILD)/SEED2.tgz.md5sum)\"/g" \ bootstraps/bootstrap-update.sh > "$@" - cat $(BUILD)/SEED2-run.tgz >> "$@" + cat $(BUILD)/SEED2.tgz >> "$@" + + +proinfodata-$(VERSION)-install.run: $(BUILD)/.md5summed + tar -C $(BUILD) -cvzf $(BUILD)/SEED2.tgz SEED2 + md5sum $(BUILD)/SEED2.tgz | awk '{print $$1}' > $(BUILD)/SEED2.tgz.md5sum + sed "s/BOOTSTRAP_LINES=/BOOTSTRAP_LINES=$(BOOTSTRAP_INSTALL_SIZE)/g; \ + s/MD5_CHECK=/MD5_CHECK=\"$$(md5sum $(BUILD)/SEED2.tgz | awk '{print $$1}')\"/g" \ + bootstraps/bootstrap-install.sh > "$@" + cat $(BUILD)/SEED2.tgz >> "$@"