X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=lfs%2Fcore-updates;h=b40de13e06efffb68c984fc34e74c6d9c5132116;hb=3fb3a3b02188ac7e74bbbb882083f6aeba1923f0;hp=f7f50cf5d9f502d2301deeaa70545c87e9d36e37;hpb=d7501a96b72a4c0d2602230cf6cb7a17fa39b8fe;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/core-updates b/lfs/core-updates
index f7f50cf5d..b40de13e0 100644
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -49,13 +49,18 @@ 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)
 
-	#Generate ROOTFILES from filelists	
-	find $(DIR_SRC)/config/rootfiles/$@/filelists/* -maxdepth 1 | xargs cat >> /tmp/ROOTFILES.tmp
+	#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
@@ -63,7 +68,7 @@ core/%:
 	
 	#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/*' \
@@ -72,7 +77,7 @@ core/%:
 	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 cf /install/packages/package/files * && rm -rf *
+	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
@@ -80,8 +85,11 @@ core/%:
 	#build package
 	cp -f $(DIR_SRC)/config/rootfiles/$@/update.sh /install/packages/package
 	chmod 755 /install/packages/package/update.sh
+	#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" \