Beta5 / Core20

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

diff --git a/lfs/updater b/lfs/updater
index f9d4cb5f060b802b05192c914d79d3faf7a890c9..611c7398d221c58f8ad3d5f8a42bf2fe6f392f7e 100644 (file)
--- a/lfs/updater
+++ b/lfs/updater
@@ -54,13 +54,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        mkdir -p /install/updater
        mkdir -p /install/packages
 
-       find $(DIR_SRC)/config/rootfiles/updater/filelists -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
+       find $(DIR_SRC)/config/rootfiles/updater/filelists/* -maxdepth 1 | xargs cat >> /tmp/ROOTFILES
        sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
        tar -c -C / --files-from=/tmp/ROOTFILES \
                -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
                --exclude='proc/*' --exclude='tmp/ROOTFILES'
        mv -f /tmp/ROOTFILES /install/updater/ROOTFILES
-       tar -x -C /tmp -f /$(SNAME).tar
+       tar --preserve --numeric-owner -x  -C /tmp -f /$(SNAME).tar
        rm -f /$(SNAME).tar
        cd /tmp && tar cf /install/updater/files * && rm -rf *
        cat /install/updater/ROOTFILES | grep -v "#" > /install/updater/ROOTFILES.tmp
@@ -70,13 +70,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Other files
        cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
        chmod 755 /install/updater/update.sh
-       cd /install/updater && tar cf /install/packages/core-upgrade-2.1-16.ipfire \
+       cd /install/updater && tar cf /install/packages/core-upgrade-2.1-20.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/16/g" \
+               -e "s/RELEASE/20/g" \
                -e "s/DEPS/$(DEPS)/g" \
-               -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-16.ipfire | awk '{ print $$5 }'`/g" \
-               < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-15
+               -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-20.ipfire | awk '{ print $$5 }'`/g" \
+               < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-20