From b626ce387be9db5df9e5af21fcf80223d8e9401c Mon Sep 17 00:00:00 2001
From: Edileuton Henrique de Oliveira <eho09@c3sl.ufpr.br>
Date: Thu, 29 Aug 2013 16:13:43 -0300
Subject: [PATCH] build: Fix corrupted package error in the update package
Signed-off-by: Edileuton Henrique de Oliveira <eho09@c3sl.ufpr.br>
---
build/Makefile | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/build/Makefile b/build/Makefile
index bbc85aa..8345317 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -23,7 +23,7 @@ VERSION = 1.4.1
BASE = ..
BUILD = build
-PACKAGE = $(BUILD)/SEED2
+PACKAGE = $(BUILD)/SEED2-run
CC = gcc
CFLAGS = -g -O2 -m32 -static -Wall
@@ -49,7 +49,7 @@ clean:
#######################
# BUILD WGET
-# #######################
+########################
$(BUILD)/$(WGET).tar.gz:
@mkdir -p $(BUILD)
@@ -135,20 +135,18 @@ $(BUILD)/.md5summed: $(BUILD)/.backedup
@touch $@
proinfodata-$(VERSION)-update.run: $(BUILD)/.md5summed
- 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
+ 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_UPDATE_SIZE)/g; \
- s/FILE=/FILE=\"$@\"/g; \
- s/MD5_CHECK=/MD5_CHECK=\"$(shell cat $(BUILD)/SEED2.tgz.md5sum)\"/g" \
- bootstraps/bootstrap-update.sh > "$@"
- cat $(BUILD)/SEED2.tgz >> "$@"
-
+ s/FILE=/FILE=\"$@\"/g; \
+ s/MD5_CHECK=/MD5_CHECK=\"$$(md5sum $(PACKAGE).tgz | awk '{print $$1}')\"/g" \
+ bootstraps/bootstrap-update.sh > "$@"
+ cat $(BUILD)/SEED2-run.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" \
+ s/MD5_CHECK=/MD5_CHECK=\"$$(md5sum $(PACKAGE).tgz | awk '{print $$1}')\"/g" \
bootstraps/bootstrap-install.sh > "$@"
cat $(BUILD)/SEED2.tgz >> "$@"
--
GitLab