Hinzugefügt:

[ipfire-2.x.git] / src / scripts / make-packages.sh

diff --git a/src/scripts/make-packages.sh b/src/scripts/make-packages.sh
index 8cd040e7e58e8d0abbd13b1f8063cb841d16c917..7964aaf74dcfa0f5c0b23c90be68dd5854ebd8c3 100755 (executable)
--- a/src/scripts/make-packages.sh
+++ b/src/scripts/make-packages.sh
@@ -3,7 +3,7 @@
 ##                                                           ##
 ## Make packages                                             ##
 ##                                                           ##
-## (c) www.ipfire.org - GPL                                  ##
+## (c) www.ipfire.org - GPL    v2                            ##
 ##                                                           ##
 ########################################################
 echo "`date -u '+%b %e %T'`: Packing $1" | tee -a $LOGFILE
@@ -13,13 +13,21 @@ cd / && mkdir -p /paks/$1
 #
 cp -f /usr/src/src/paks/$1/{,un}install.sh /paks/$1
 chmod 755 /paks/$1/{,un}install.sh
-tar cfz /paks/$1/files.tgz --files=/usr/src/src/paks/$1/ROOTFILES --exclude='#*'
-tar cfz /paks/$1/conf.tgz  --files=/usr/src/src/paks/$1/CONFFILES --exclude='#*'
-cd /paks/$1 && tar cfz ../$2.tar.gz files.tgz conf.tgz install.sh uninstall.sh && cd ..
-md5sum $2.tar.gz >> $2.tar.gz.md5
 
-## Clean up!
-#
-rm -rf /paks/$1
+# This tar+untar+tar is for removing files compressed twice
+tar cvf /paks/$1/filestmp.tar --files=/usr/src/src/paks/$1/ROOTFILES --exclude='#*'
+tar cvf /paks/$1/conftmp.tar  --files=/usr/src/src/paks/$1/CONFFILES --exclude='#*'
+
+mkdir -p /paks/$1/ROOT /paks/$1/CONF
+tar xvf /paks/$1/filestmp.tar -C /paks/$1/ROOT
+tar xvf /paks/$1/conftmp.tar -C /paks/$1/CONF
+rm -f /paks/$1/{files,conf}tmp.tar
+cd /paks/$1/ROOT && tar cvfz /paks/$1/files.tgz *
+cd /paks/$1/CONF && tar cvfz /paks/$1/conf.tgz *
+
+cd /paks/$1 && tar cvfz ../$2.tar.gz files.tgz conf.tgz install.sh uninstall.sh
+cd .. && md5sum $2.tar.gz >> $2.tar.gz.md5
+
+rm -fr /paks/$1
 
 exit 0
\ No newline at end of file