Geändert:

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

diff --git a/src/scripts/make-packages.sh b/src/scripts/make-packages.sh
index e4b6847ded9de0998ae1f42e96623fb1dba79e48..c48ede91caac5a96d263fc3b73081b27ac617c9d 100755 (executable)
--- a/src/scripts/make-packages.sh
+++ b/src/scripts/make-packages.sh
@@ -7,7 +7,7 @@
 ##                                                           ##
 ########################################################
 echo "`date -u '+%b %e %T'`: Packing $1" | tee -a $LOGFILE
-cd / && mkdir -p /paks/$1
+cd / && mkdir -p /paks/$1/ROOT
 
 ## Copy install.sh/uninstall.sh to pak-dir and make executeable
 #
@@ -15,17 +15,12 @@ cp -f /usr/src/src/paks/$1/{,un}install.sh /paks/$1
 chmod 755 /paks/$1/{,un}install.sh
 
 # This tar+untar+tar is for removing files compressed twice
-tar cfv /paks/$1/filestmp.tar --files=/usr/src/src/paks/$1/ROOTFILES --exclude='#*'
-tar cfv /paks/$1/conftmp.tar --files=/usr/src/src/paks/$1/CONFFILES --exclude='#*'
+tar -c -C / --files-from=/usr/src/src/paks/$1/ROOTFILES -f /paks/$1/filestmp.tar --exclude='#*'
+tar -x -C /paks/$1/ROOT -f /paks/$1/filestmp.tar
+rm -f /paks/$1/filestmp.tar
+cd /paks/$1/ROOT && tar zcf /paks/$1/files.tgz *
 
-mkdir -p /paks/$1/ROOT /paks/$1/CONF
-tar xfv /paks/$1/filestmp.tar -C /paks/$1/ROOT
-tar xfv /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 /paks/$1 && tar cvfz ../$2.tar.gz files.tgz install.sh uninstall.sh
 cd .. && md5sum $2.tar.gz > $2.tar.gz.md5
 
 rm -fr /paks/$1