New ability to specify volume labels in "dont_scan_dirs" token to

[refind] / mkdistrib

diff --git a/mkdistrib b/mkdistrib
index 4ce2c68c84b32c6c74c19eac9d988c7f1096501a..45fa0dfe4832a15f022343ebf139996d14e6ed79 100755 (executable)
--- a/mkdistrib
+++ b/mkdistrib
@@ -47,7 +47,7 @@ make clean
 # Prepare a place and copy files there....
 mkdir -p ../snapshots/$1/refind-$1/icons
 cp --preserve=timestamps icons/*icns ../snapshots/$1/refind-$1/icons/
-cp -a docs images keys include EfiLib libeg mok refind filesystems refind.spec install.sh mkrlconf.sh CREDITS.txt NEWS.txt BUILDING.txt COPYING.txt LICENSE.txt README.txt refind.inf Make.tiano Make.common Makefile refind.conf-sample ../snapshots/$1/refind-$1
+cp -a docs images keys include EfiLib libeg mok refind filesystems refind.spec install.sh mkrlconf.sh mvrefind.sh CREDITS.txt NEWS.txt BUILDING.txt COPYING.txt LICENSE.txt README.txt refind.inf Make.tiano Make.common Makefile refind.conf-sample ../snapshots/$1/refind-$1
 
 # Go there and prepare a souce code zip file....
 cd ../snapshots/$1/
@@ -56,7 +56,7 @@ zip -9r refind-src-$1.zip refind-$1
 # Build the IA32 binaries
 cd refind-$1
 ARCH=ia32 make -j4
-ARCH=ia32 make -j4 fs
+ARCH=ia32 make fs
 mkdir -p refind-bin-$1/refind/drivers_ia32
 cp --preserve=timestamps drivers_ia32/*_ia32.efi refind-bin-$1/refind/drivers_ia32/
 cp --preserve=timestamps filesystems/LICENSE*txt refind-bin-$1/refind/drivers_ia32/
@@ -66,7 +66,7 @@ cp refind/refind_ia32.efi $StartDir/
 # Build the X64 binaries
 make clean
 make -j4
-make -j4 fs
+make fs
 mkdir -p refind-bin-$1/refind/drivers_x64
 cp -a icons refind-bin-$1/refind/
 if [[ $SignIt == 1 ]] ; then
@@ -84,21 +84,26 @@ else
    cp refind/refind_x64.efi refind-bin-$1/refind/refind_x64.efi
 fi
 cp refind-bin-$1/refind/refind_x64.efi $StartDir
-cp -a docs keys COPYING.txt LICENSE.txt README.txt CREDITS.txt NEWS.txt install.sh mkrlconf.sh refind-bin-$1
+cp -a docs keys COPYING.txt LICENSE.txt README.txt CREDITS.txt NEWS.txt install.sh mkrlconf.sh mvrefind.sh refind-bin-$1
 
-# Prepare the final .zip file and clean up
-if [[ $SignIt == 1 ]] ; then
-   umount $KeysDir
-fi
+# Prepare the final .zip file
 zip -9r ../refind-bin-$1.zip refind-bin-$1
 cd ..
 rm -r refind-$1
 
-# Prepare the RPM files
+# Prepare the RPM & Debian package files
 cp refind-src-$1.zip ~/rpmbuild/SOURCES/
 rpmbuild -ba $StartDir/refind.spec
 mv ~/rpmbuild/RPMS/*/refind-$1* ./
 mv ~/rpmbuild/SRPMS/refind-$1* ./
+sudo alien --to-deb -k -c refind-$1*x86_64.rpm
+sudo chown rodsmith: refind*deb
+rm ~/rpmbuild/SOURCES/refind-src-$1.zip
+
+# Clean up
+if [[ $SignIt == 1 ]] ; then
+   umount $KeysDir
+fi
 
 # Finish
 cd $StartDir