Fixed streamripper lfs

[people/pmueller/ipfire-2.x.git] / lfs / Config

diff --git a/lfs/Config b/lfs/Config
index 39fd5eafcf9dab3f782d1f4d3eca87660f8c8c4f..86c5fdf0a79bd457a50fd7436bcd8dc2fda724d5 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -156,13 +156,13 @@ endif
 
 define CHECK
        @echo -e "$(MESSAGE)Check: $($(notdir $@))"
-       wget -T 120 -t 1 --spider -nv $($(notdir $@)) -O /dev/null
+       wget -T 120 -t 1 --spider -nv -U "IPFireSourceGrabber/2.x" $($(notdir $@)) -O /dev/null
        @touch $(DIR_CHK)/$(notdir $@)
 endef
 
 define LOAD
        @echo -e "$(MESSAGE)Download: $($(notdir $@))"
-       wget -T 60 -t 1 -c -nv $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@)
+       wget -T 60 -t 1 -c -nv -U "IPFireSourceGrabber/2.x" $($(notdir $@)) -O $(DIR_TMP)/$(notdir $@)
        [ "$($(notdir $@)_MD5)" = `md5sum $(DIR_TMP)/$(notdir $@) | awk '{ print $$1 }'` ] # detect page not found answer
        mv $(DIR_TMP)/$(notdir $@) $(DIR_DL)
 endef
@@ -177,7 +177,7 @@ endef
 define PAK
        # Bringing the files to their right place.
        @rm -rf /install/packages/package
-       @mkdir -p /install/packages/package
+       @mkdir -p /install/packages/package/tmp
        if [ -e "/usr/src/src/paks/$(PROG)" ]; then \
                cp -f /usr/src/src/paks/$(PROG)/{,un}install.sh /usr/src/src/paks/$(PROG)/update.sh \
                /install/packages/package; \
@@ -188,11 +188,16 @@ define PAK
        cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
        sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES
        chmod 755 /install/packages/package/{{,un}install,update}.sh
-       cd / && tar cf /install/packages/package/files --files-from=/install/packages/package/ROOTFILES --exclude='#*' \
+       cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \
                --preserve --numeric-owner
-       if grep -q '#' < /install/packages/package/ROOTFILES; then \
-               cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES; \
-       fi
+       # Double tar to remove double files
+       tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \
+               --preserve --numeric-owner
+       rm -f /install/packages/package/files.tmp
+       cd /install/packages/package/tmp/ && tar -c --preserve --numeric-owner -f /install/packages/package/files *             
+       rm -r /install/packages/package/tmp
+       -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp
+       mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES
        cd /install/packages/package && tar cf ../$(PROG)-$(VER)-$(PAK_VER).ipfire --files-from=/usr/src/src/paks/files
        rm -rf /install/packages/package
        sed -e s/NAME/$(PROG)/g \