Pakfire laedt die Listen jetzt besser und hat eine veraenderte Oberflaeche bekommen.

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

diff --git a/lfs/Config b/lfs/Config
index a19a70234255e8ee60043332c9e732cd1c02e861..6266b1f14599365ff5495e4bb76ba21cf69641c0 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -15,7 +15,6 @@
 #
 URL_IPFIRE  = http://source.ipfire.org/othersrc
 URL_TOOLCHAIN = http://source.ipfire.org/toolchain
-URL_IPCOP   = http://ipcop.ath.cx
 
 # Default compiler optimizations.
 #
@@ -70,10 +69,10 @@ define PREBUILD
        if [ -f $(DIR_SRC)/linux-$(KVER) ]; then \
                if [ "$(SMP)" = "" ]; then \
                        cd $(DIR_SRC)/linux-$(KVER) && \
-                               sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))+' Makefile; \
+                               sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire+' Makefile; \
                else \
                        cd $(DIR_SRC)/linux-$(KVER) && \
-                               sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-smp+' Makefile; \
+                               sed -i -e 's+^EXTRAVERSION.*$$+EXTRAVERSION\ =\ $(word 4,$(subst ., .,$(KVER)))-ipfire-smp+' Makefile; \
                fi; \
        fi
 endef
@@ -106,7 +105,7 @@ define POSTBUILD
                else LFS_SCRIPT=$(firstword $(MAKEFILE_LIST)); \
                fi; \
                echo $(LFS_SCRIPT); \
-               ROOTFILE=`find $(DIR_SRC)/config/rootfiles/common -maxdepth 1 -type f -name $$LFS_SCRIPT`; \
+               ROOTFILE=`find $(DIR_SRC)/config/rootfiles/common $(DIR_SRC)/config/rootfiles/packages -maxdepth 1 -type f -name $$LFS_SCRIPT`; \
                if [ "$$ROOTFILE" = "" ]; then \
                        ROOTFILE=`find $(DIR_SRC)/config/rootfiles/ver_$(IPFVER) -type f -name $$LFS_SCRIPT`; \
                fi; \
@@ -157,22 +156,21 @@ endef
 
 define PAK
        # Bringing the files to their right place.
-       @rm -rf /install/packages/package /tmp/* /packagetmp.tar
-       @mkdir -p /install/packages/package
-       @cp -f /usr/src/src/paks/$(PROG)/{,un}install.sh /install/packages/package
-       @cp -f /usr/src/src/paks/$(PROG)/update.sh /install/packages/package
-       @cp -f /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES
-       @chmod 755 /install/packages/package/{,un}install.sh
-       cd / && tar --create --directory=/ --files-from=/install/packages/package/ROOTFILES \
-               --file=/packagetmp.tar --exclude='#*'
-       cd / && tar -x -C /tmp -f /packagetmp.tar
-       @rm -f /packagetmp.tar
-       -cd /tmp && tar cjvf /install/packages/package/files.tbz2 *
-       @cd / && rm -rf /tmp/*
-       @cd /install/packages/package && cat ROOTFILES | grep -v "#" > ROOTFILES
-       cd /install/packages/package && tar cfj ../$(PROG)-$(VER)-$(PAK_VER).ipfire \
-                       files.tbz2 install.sh uninstall.sh update.sh ROOTFILES
        @rm -rf /install/packages/package
+       @mkdir -p /install/packages/package
+       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; \
+       else \
+               cp -f /usr/src/src/paks/default/{,un}install.sh /usr/src/src/paks/default/update.sh \
+               /install/packages/package; \
+       fi
+       sed -e "s/KVER/$(KVER)/g" < /usr/src/config/rootfiles/packages/$(PROG) > /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='#*'
+       -cat /install/packages/package/ROOTFILES | grep -v "#" > /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 \
                        -e s/VER/$(VER)/g \
                        -e s/RELEASE/$(PAK_VER)/g \