Updates / fixes for 2.2r3
This commit is contained in:
parent
b312b89f7f
commit
94e83b3913
16
update-cd
16
update-cd
|
@ -10,7 +10,7 @@
|
||||||
#
|
#
|
||||||
# Configuration goes here.
|
# Configuration goes here.
|
||||||
# Where is your mirror?
|
# Where is your mirror?
|
||||||
MIRROR=${MIRROR:-/debian}
|
MIRROR=${MIRROR:-/scratch/debian}
|
||||||
|
|
||||||
# If you have a non-US mirror, where is it? Leave blank if you don't have one.
|
# If you have a non-US mirror, where is it? Leave blank if you don't have one.
|
||||||
NONUS=${NONUS:-$MIRROR/non-US}
|
NONUS=${NONUS:-$MIRROR/non-US}
|
||||||
|
@ -19,7 +19,7 @@ NONUS=${NONUS:-$MIRROR/non-US}
|
||||||
NONFREE=1
|
NONFREE=1
|
||||||
|
|
||||||
# What release version is this?
|
# What release version is this?
|
||||||
VER=2.2r2
|
VER=2.2r3
|
||||||
|
|
||||||
# Path to use with mkisofs/mkhybrid
|
# Path to use with mkisofs/mkhybrid
|
||||||
MKISOFS=${MKISOFS:-"mkhybrid"}
|
MKISOFS=${MKISOFS:-"mkhybrid"}
|
||||||
|
@ -36,11 +36,11 @@ OUT=/scratch/debian-cd
|
||||||
# Location of the diff file to use to determine the changes. If you leave
|
# Location of the diff file to use to determine the changes. If you leave
|
||||||
# this blank, we'll try to determine the changes from the ChangeLog files,
|
# this blank, we'll try to determine the changes from the ChangeLog files,
|
||||||
# which is probably less accurate.
|
# which is probably less accurate.
|
||||||
DIFF=~/r2.diff
|
DIFF=/wibble #~/r2.diff
|
||||||
|
|
||||||
REL=Debian"$VER"
|
REL=Debian"$VER"
|
||||||
CLOG=dists/$REL/ChangeLog
|
CLOG=dists/potato/ChangeLog
|
||||||
NUCLOG=dists/$REL/non-US/ChangeLog
|
NUCLOG=dists/potato/non-US/ChangeLog
|
||||||
UPD=$TDIR/potato-update
|
UPD=$TDIR/potato-update
|
||||||
DATE=`date +%Y%m%d`
|
DATE=`date +%Y%m%d`
|
||||||
BASEDIR=`pwd`
|
BASEDIR=`pwd`
|
||||||
|
@ -79,7 +79,7 @@ cd $MIRROR
|
||||||
echo Creating main-section list
|
echo Creating main-section list
|
||||||
|
|
||||||
if [ -e $DIFF ] ; then
|
if [ -e $DIFF ] ; then
|
||||||
grep -v non-US ~/r2.diff >$UPD/list
|
grep -v non-US $DIFF >$UPD/list
|
||||||
else
|
else
|
||||||
egrep -e ^dists.*\\.deb$ -e ^dists.*\\.gz$ -e ^dists.*\\.dsc$ $CLOG >$UPD/list
|
egrep -e ^dists.*\\.deb$ -e ^dists.*\\.gz$ -e ^dists.*\\.dsc$ $CLOG >$UPD/list
|
||||||
fi
|
fi
|
||||||
|
@ -97,7 +97,7 @@ if [ "$NONUS"x != ""x ] ; then
|
||||||
echo Creating non-US list
|
echo Creating non-US list
|
||||||
cd $NONUS
|
cd $NONUS
|
||||||
if [ -e $DIFF ] ; then
|
if [ -e $DIFF ] ; then
|
||||||
grep non-US ~/r2.diff >$UPD/nu-list
|
grep non-US $DIFF >$UPD/nu-list
|
||||||
else
|
else
|
||||||
egrep -e ^dists.*\\.deb$ -e ^dists.*\\.gz$ -e ^dists.*\\.dsc$ $NUCLOG | sed 's?^stable?dists/potato?g' > $UPD/nu-list
|
egrep -e ^dists.*\\.deb$ -e ^dists.*\\.gz$ -e ^dists.*\\.dsc$ $NUCLOG | sed 's?^stable?dists/potato?g' > $UPD/nu-list
|
||||||
fi
|
fi
|
||||||
|
@ -174,6 +174,7 @@ do
|
||||||
echo $ARCH
|
echo $ARCH
|
||||||
ARCH=$ARCH $scanpackages scan CD1
|
ARCH=$ARCH $scanpackages scan CD1
|
||||||
ARCH=$ARCH $scanpackages -noPackages.cd install CD1
|
ARCH=$ARCH $scanpackages -noPackages.cd install CD1
|
||||||
|
rm -f CD1/*.Packages*
|
||||||
done
|
done
|
||||||
|
|
||||||
for ARCH in $ARCH2
|
for ARCH in $ARCH2
|
||||||
|
@ -181,6 +182,7 @@ do
|
||||||
echo $ARCH
|
echo $ARCH
|
||||||
ARCH=$ARCH $scanpackages scan CD2
|
ARCH=$ARCH $scanpackages scan CD2
|
||||||
ARCH=$ARCH $scanpackages -noPackages.cd install CD2
|
ARCH=$ARCH $scanpackages -noPackages.cd install CD2
|
||||||
|
rm -f CD2/*.Packages*
|
||||||
done
|
done
|
||||||
|
|
||||||
echo Creating Sources files
|
echo Creating Sources files
|
||||||
|
|
Loading…
Reference in New Issue