X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcore-updates;h=b40de13e06efffb68c984fc34e74c6d9c5132116;hb=eff2dbf8336c3935535a5f5565bfc27c4fccd4bb;hp=9d242eea398f549a8e9ac7cb59458b4442b46e49;hpb=13704e5b1c27dee12c68daf48adb663f12b6f14d;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/core-updates b/lfs/core-updates
index 9d242eea3..b40de13e0 100644
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -49,18 +49,47 @@ CORE = $(patsubst $(DIR_SRC)/config/rootfiles/%,%,$(wildcard $(DIR_SRC)/config/r
 
 $(TARGET) : $(CORE)
 
+.PHONY:
 core/%:
 	rm -rf /install/packages/package
 	mkdir -p /install/packages/package
 	eval $$(cat /usr/src/config/rootfiles/$@/meta)
-	cp -f /usr/src/config/rootfiles/$@/update.sh /install/packages/package
-	cp -f /usr/src/config/rootfiles/$@/files /install/packages/package/ROOTFILES
-	sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES
+
+	#Generate ROOTFILES from filelists
+	$(DIR_SRC)/src/scripts/archive.files \
+		$(DIR_SRC)/config/rootfiles/$@/filelists \
+		$(DIR_SRC)/config/rootfiles/$@/files \
+		$(DIR_SRC)/config/rootfiles/$@/files.$(MACHINE) \
+		> /tmp/ROOTFILES.tmp
+
+	#remove excluded files from ROOTFILES
+	grep -f $(DIR_SRC)/config/rootfiles/$@/exclude -v /tmp/ROOTFILES.tmp > /tmp/ROOTFILES
+	rm -rf /tmp/ROOTFILES.tmp
+	
+	#Change KVER to Kernelversion
+	sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
+
+	#Remove doubled files with tar/untar/tar to save space
+	tar -c -C / --files-from=/tmp/ROOTFILES \
+		-f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
+		--exclude='proc/*' --exclude='tmp/ROOTFILES' \
+		--exclude-from=$(DIR_SRC)/config/rootfiles/$@/exclude
+	mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES
+	tar -p --numeric-owner -x  -C /tmp -f /$(SNAME).tar
+	rm -f /$(SNAME).tar
+	cd /tmp && tar cJf /install/packages/package/files.tar.xz * && rm -rf *
+	cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp
+	rm /install/packages/package/ROOTFILES
+	mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES
+
+	#build package
+	cp -f $(DIR_SRC)/config/rootfiles/$@/update.sh /install/packages/package
 	chmod 755 /install/packages/package/update.sh
-	cd / && tar cf /install/packages/package/files --files-from=/install/packages/package/ROOTFILES --exclude='#*'
-	-cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES
+	#Change xxxKVERxxx to Kernelversion
+	sed -e "s/xxxKVERxxx/$(KVER)/g" -i /install/packages/package/update.sh
+
 	cd /install/packages/package && tar cf ../core-upgrade-$(VERSION)-$$(basename $@).ipfire \
-		update.sh files ROOTFILES
+		update.sh files.tar.xz ROOTFILES
 	rm -rf /install/packages/package
 	sed -e "s/NAME/core-upgrade/g" \
 		-e "s/VER/$(VERSION)/g" \