r2739 - trunk/scripts
Andres Salomon
dilinger-guest@costa.debian.org
Sun, 20 Mar 2005 00:28:07 +0100
Author: dilinger-guest
Date: 2005-03-20 00:28:07 +0100 (Sun, 20 Mar 2005)
New Revision: 2739
Modified:
trunk/scripts/prune-non-free
Log:
cleanups
Modified: trunk/scripts/prune-non-free
===================================================================
--- trunk/scripts/prune-non-free 2005-03-19 23:23:20 UTC (rev 2738)
+++ trunk/scripts/prune-non-free 2005-03-19 23:28:07 UTC (rev 2739)
@@ -110,11 +110,6 @@
end
end
-#def die(errno, errstr)
-# $stderr.puts "Error: #{errstr}"
-# exit(errno)
-#end
-
def tmpdir
tf = Tempfile.new('prune')
FileUtils.rm_f(tf.path)
@@ -276,54 +271,10 @@
# Tar up the kernel source trees
pack("kernel-source-#{version}_#{version}.orig.tar.gz", free_dir)
-##FileUtils.rm_rf(free_dir)
+FileUtils.rm_rf(free_dir)
pack("kernel-source-nonfree-#{version}_#{version}.orig.tar.gz", nonfree_dir)
-##FileUtils.rm_rf(nonfree_dir)
+FileUtils.rm_rf(nonfree_dir)
-###for f in $FILES; do
-### file=$(basename $f)
-### dir=$(dirname $f)
-### ##mv $free/$f $nonfree
-### if [ "${f%%.c}" != "$f" ]; then
-### x=$(grep ${file%%.c}.o $free/$dir/Makefile || true)
-### eval "${file%%.c}_mf='$x'"
-### fi
-###done
-###
-###for f in $FILES; do
-### file=$(basename $f)
-### mf_frag=$(eval echo \$${file%%.c}_mf)
-### echo "mf_frag: $mf_frag"
-### if [ ! -z "$mf_frag" ]; then
-### x=$(eval echo ${file%%.c}_mf)
-### echo $file: $(eval echo \$${file%%.c}_mf)
-### fi
-###done
-###
-###exit 0
-###
-###mf="kernel-source-nonfree-$version-$version/Makefile"
-###echo "DIR ?= /usr/src/linux" > $mf
-###for f in $FILES; do
-### if [ "${f%%.c}" != "$f" ]; then
-###
-### fi
-###
-###obj-m := tg3.o
-###
-###all:
-### $(MAKE) -C $(DIR) M=$(CURDIR) modules
-###
-### clean:
-### $(MAKE) -C $(DIR) M=$(CURDIR) clean
-###
-
-#release=$(dpkg-parsechangelog | sed -n 's/^Version: \?\([0-9\.]\+\)-[0-9]\+$/\1/p')
-#grep -h '^X' debian/patches/series/2.6.* | while read x file; do
-# echo "Deleting $file"
-# rm -f $file
-#done
-
# Upstream deletes our debian directory. Bastards.
#sed -i 's#^.*/debian/$##' scripts/package/Makefile