updater now create core-update-2.1-15

[ipfire-2.x.git] / lfs / updater

diff --git a/lfs/updater b/lfs/updater
index f559d13741bfbe4c7cc407563727ed8b4e946c14..e22cd3c95b94e27565f72e6389c38bfa62ae69fa 100644 (file)
--- a/lfs/updater
+++ b/lfs/updater
@@ -47,10 +47,13 @@ md5 :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        rm -rf /install/updater /tmp/*
+       eval $$(cat /usr/src/config/rootfiles/updater/meta)
 
        # Compress files of filelists 
        # Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
        mkdir -p /install/updater
+       mkdir -p /install/packages
+
        find $(DIR_SRC)/config/rootfiles/updater/filelists -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
        sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
        tar -c -C / --files-from=/tmp/ROOTFILES \
@@ -59,11 +62,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        mv -f /tmp/ROOTFILES /install/updater/ROOTFILES
        tar -x -C /tmp -f /$(SNAME).tar
        rm -f /$(SNAME).tar
-       cd /tmp && tar jcf /install/updater/files.ipfire * && rm -rf *
+       cd /tmp && tar cf /install/updater/files * && rm -rf *
+       cat /install/updater/ROOTFILES | grep -v "#" > /install/updater/ROOTFILES.tmp
+       rm /install/updater/ROOTFILES
+       mv /install/updater/ROOTFILES.tmp /install/updater/ROOTFILES
 
        # Other files
        cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
        chmod 755 /install/updater/update.sh
-       cd /install/updater && tar jcf ../images/updater-$(SNAME)-$(VERSION).tar.bz2 \
-               update.sh files.ipfire ROOTFILES
+       cd /install/updater && tar cf /install/packages/core-upgrade-2.1-15.ipfire \
+               update.sh files ROOTFILES
        rm -rf /install/updater
+
+       sed -e "s/NAME/core-upgrade/g" \
+               -e "s/VER/2.1/g" \
+               -e "s/RELEASE/15/g" \
+               -e "s/DEPS/$(DEPS)/g" \
+               -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-15.ipfire | awk '{ print $$5 }'`/g" \
+               < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-15