Karl's patches for cleanup and replacing need for local repo with apt-cacher.

config

@@ -15,10 +15,15 @@ set -ex
 # For kde download before anything libbogl-dev # Chris Fernandez
 
 ## UPSTREAM
-# Path to your local Ubuntu mirror
-MIRRORLOCAL=/srv/ubuntu-hardy/
+# Path to your Ubuntu dists tree. Note that the name is historical -
+# previously this *WAS* a local ubuntu mirror. With changes to builder,
+# this is now just the dists/ directory of the mirror (~40mb).
+MIRRORLOCAL=/srv/ubuntu-hardy-mirror/
 # Where to get updated upstream packages from. Currently only supports http
-MIRROR=http://127.0.0.1/ubuntu/
+# This should be configured to point at a local mirror (on your
+# network), or a local proxy (eg apt-cacher-ng). If using a proxy, you
+# should ensure that is configured to get its packages from a nearby mirror.
+MIRROR=http://127.0.0.1:3142/ubuntu.media.mit.edu/ubuntu/
 # Name of our upstreams release
 MIRRORDIST=hardy
 
@@ -141,16 +146,20 @@ GNOME_ICON_THEME_VERSION=1
 HUMAN_THEME_VERSION=1
 PSUTILS_VERSION=1
 SEAMONKEY_VERSION=1
-AUDACITY_VERSION=2
+AUDACITY_VERSION=1
 LIFEREA_VERSION=1
 KDEBASE_VERSION=1
 
 # PATHS
 WORKINGDIR=$BASEDIR/tmp
+
 # Where to put stuff for creating the livecd, and creating packages
 LIVECDDIR=$BASEDIR/livecd
 REPODST=$BASEDIR/$DISTRONAME_L
 
+# Overrides.
+OVERRIDEFILE=$REPODST/conf/override.$RELEASE
+
 # Space separated list of repo components. Put the default first.
 COMPONENTS="main universe"
 

do-update

@@ -19,6 +19,10 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
+if ! [ `which reprepro` ]; then
+	echo "Reprepro not in path, is it installed?"
+	exit 2
+fi
 
 . config
 

gen-audacity

@@ -29,6 +29,7 @@ apt-get source audacity$VERSION
 apt-get --yes build-dep audacity$VERSION
 
 # NOP
+cd audacity-*
 
 echo | dch -D $RELEASE -v $(sed  -n '1s#^.*(\(.*\)).*#\1'${DISTRONAME_L}${AUDACITY_VERSION}'#p' debian/changelog)  "Version bump after allowing the nyquist plugin back in."
 

gen-repo

@@ -4,9 +4,7 @@
 # Get distro information
 . config
 
-# Hard link Ubuntu mirror and $REPODST
 mkdir -p $REPODST/conf
-# cp -aul $MIRRORLOCAL/* $REPODST/
 
 cd $REPODST
 

get-upstream-dists

+#!/bin/bash
+#
+#    Copyright (C) 2012  Karl Goetz
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
+
+set -ex
+. config
+
+[ ! -d $MIRRORLOCAL/dists/ ] && mkdir -p $MIRRORLOCAL/dists/
+[ ! -d $WORKINGDIR/dists-download/ ] && mkdir -p $WORKINGDIR/dists-download/
+
+wget -q -c -m -np -nH --cut-dirs=3 -A "Packages.gz" -A "Sources.gz" -P$WORKINGDIR/dists-download \
+	$MIRROR/dists/$MIRRORDIST/
+
+rsync -a $WORKINGDIR/dists-download/$MIRRORDIST $MIRRORLOCAL/dists/
+find $MIRRORLOCAL/dists/ -name Packages.gz -exec gunzip -f {} \;
+find $MIRRORLOCAL/dists/ -name Sources.gz -exec gunzip -f {} \;
+
+rm -rf $WORKINGDIR/dists-download
+

tools/recover-reprepro.sh

 #!/bin/bash
+#
+#    Copyright (C) 2010 - 2012  Karl Goetz
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+#
 
-# Remove hard coding 'later'
+cd `dirname $0`/..
+. config
 
 # Manually uncomment this line after looking at what the script does.
 exit 1
 
 # Remove the package database(s)
-rm /srv/gnewsense/db/references.db
-rm /srv/gnewsense/db/packages.db
+rm $REPODST/db/references.db
+rm $REPODST/db/packages.db
 
 # Remove the dists files
-rm -r /srv/gnewsense/dists
+rm -r $REPODST/dists
 
-for component in main universe; do
-        find /srv/gnewsense/pool/$component -name *.deb -exec reprepro -Vb /srv/gnewsense --component $component includedeb deltah {} \;
-        find /srv/gnewsense/pool/$component -name *.udeb -exec reprepro -Vb /srv/gnewsense --component $component includeudeb deltah {} \;
-        find /srv/gnewsense/pool/$component -name *.dsc -exec reprepro -Vb /srv/gnewsense --component $component includedsc deltah {} \;
+for component in $COMPONENTS; do
+        find $REPODST/pool/$component -name *.deb -exec reprepro -Vb $REPODST --component $component includedeb deltah {} \;
+        find $REPODST/pool/$component -name *.udeb -exec reprepro -Vb $REPODST --component $component includeudeb deltah {} \;
+        find $REPODST/pool/$component -name *.dsc -exec reprepro -Vb $REPODST --component $component includedsc deltah {} \;
 done
 

tools/repush-old-release

@@ -32,7 +32,7 @@
 OLDDISTNAME="deltad"
 OLDDISTARCHES="i386"
 OLDREPOGPGKEY="91854607"
-OLDREPODST="/nfs/.sda3/gnewsense-sandbox/gnewsense-working-repo-deltad/gnewsense/"
+OLDREPODST="/nfs/.xvda3/gnewsense-sandbox/gnewsense-working-repo-deltad/gnewsense/"
 CURRENTREMOVEPACKAGES="/srv/builder/packages-to-remove"
 OLDRSYNCDST="us.archive.gnewsense.org:/data/pub/gnewsense-deltad"
 RSYNCOPTS="-va --exclude apt --exclude cdimage --exclude cdimage-bak --exclude conf --exclude db --exclude db.bak --exclude lists --exclude Packages* --exclude *deb --delete-excluded"