Preliminary updates for possible 2.7.1 release

3 files changed, 7 insertions, 17 deletions

diff --git a/ports/checkdups b/ports/checkdups
deleted file mode 100755
index 28ea4e7..0000000
--- a/ports/checkdups
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-echo "Checking for duplicate packages..."
-
-DUPS="`find . -name \"*.pkg.tar.gz\" | cut -d/ -f2- | cut -d# -f1 | uniq -d | cut -d/ -f-2`"
-
-if [ ! -z "$DUPS" ]
-then
-	echo "Duplicate(s) found:"
-	echo $DUPS
-fi
diff --git a/ports/gen-mirror b/ports/gen-mirror
index b769909..845f488 100755
--- a/ports/gen-mirror
+++ b/ports/gen-mirror
@@ -18,11 +18,12 @@ else
 	./gen-pkglist
 	echo "done."
 
-	mkdir -p "$1"/crux/{core,opt,xorg}
-	cp -v core/*/*.pkg.tar.gz "$1"/crux/core/
-	cp -v opt/*/*.pkg.tar.gz "$1"/crux/opt/
-	cp -v xorg/*/*.pkg.tar.gz "$1"/crux/xorg/
+	mkdir -p "$1"/crux/{core,opt,xorg,kernel}
+	cp -v core/*/*.pkg.tar.* "$1"/crux/core/
+	cp -v opt/*/*.pkg.tar.* "$1"/crux/opt/
+	cp -v xorg/*/*.pkg.tar.* "$1"/crux/xorg/
 	cp -v packages.lst MD5SUMS "$1"/crux/
+	cp -v ../kernel/linux-*.tar.* "$1"/crux/kernel/
 
 	echo "$1 is ready to upload to your netinst mirror."
 fi
diff --git a/ports/gen-pkglist b/ports/gen-pkglist
index 2b20c21..73da553 100755
--- a/ports/gen-pkglist
+++ b/ports/gen-pkglist
@@ -6,7 +6,7 @@ COLLECTIONS="core opt xorg"
 
 for COLL in $COLLECTIONS
 do
-	find $COLL -name "*.pkg.tar.gz" | sed -e 's|/| |g' >> packages.lst.$$
+	find $COLL -name "*.pkg.tar.gz" -o -name "*.pkg.tar.bz2" -o -name "*.pkg.tar.xz" | sed -e 's|/| |g' >> packages.lst.$$
 done
 sort < packages.lst.$$ > packages.lst
 rm -f packages.lst.$$
@@ -14,5 +14,5 @@ rm -f packages.lst.$$
 :>MD5SUMS
 for COLL in $COLLECTIONS
 do
-	md5sum ./$COLL/*/*.pkg.tar.gz >> MD5SUMS
+	md5sum ./$COLL/*/*.pkg.tar.* >> MD5SUMS
 done