Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Backport update-cd update

This commit is contained in:
Steve McIntyre 2015-02-07 23:23:53 +00:00
parent 356b050c12
commit 0e52bd4b1b
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -12,6 +12,8 @@ debian-cd (3.1.13-deb7u1) UNRELEASED; urgency=low
+ tools/apt-selection: pass APT::Architectures:: when calling apt; + tools/apt-selection: pass APT::Architectures:: when calling apt;
otherwise if we're running on a multi-arch system apt will break otherwise if we're running on a multi-arch system apt will break
+ Factor out the xorriso version-checking code + Factor out the xorriso version-checking code
+ update-cd: if we're doing torrents, make sure we include update CD
checksums in bt-$type too
-- Steve McIntyre <93sam@debian.org> Mon, 17 June 2013 15:44:32 +0100 -- Steve McIntyre <93sam@debian.org> Mon, 17 June 2013 15:44:32 +0100

9
update-cd
View File

@ -33,6 +33,9 @@ MKISOFS="$PWD/../genisoimage -jigdo-template-compress bzip2 -r -checksum_algorit
# Use JTE extensions to mkisofs to make jigdo files? # Use JTE extensions to mkisofs to make jigdo files?
JTE=1 JTE=1
# Set up torrents too?
BT=1
# The working directory to use. MUST be on the same partition as the mirror. # The working directory to use. MUST be on the same partition as the mirror.
TDIR=/org/cdbuilder.debian.org/src/deb-cd/tmp/wheezy-update/cd-work TDIR=/org/cdbuilder.debian.org/src/deb-cd/tmp/wheezy-update/cd-work
@ -141,6 +144,7 @@ make_cd () {
ISODIR=$OUT/$THISARCH/iso-$TYPE ISODIR=$OUT/$THISARCH/iso-$TYPE
JIGDODIR=$OUT/$THISARCH/jigdo-$TYPE JIGDODIR=$OUT/$THISARCH/jigdo-$TYPE
LISTDIR=$OUT/$THISARCH/list-$TYPE LISTDIR=$OUT/$THISARCH/list-$TYPE
BTDIR=$OUT/$THISARCH/bt-$TYPE
if [ ! -d ${ISODIR} ] ; then if [ ! -d ${ISODIR} ] ; then
mkdir -p ${ISODIR} mkdir -p ${ISODIR}
@ -151,6 +155,9 @@ make_cd () {
if [ ! -d ${LISTDIR} ] ; then if [ ! -d ${LISTDIR} ] ; then
mkdir -p ${LISTDIR} mkdir -p ${LISTDIR}
fi fi
if [ $BT = 1 ] && [ ! -d ${BTDIR} ] ; then
mkdir -p ${BTDIR}
fi
if [ $JTE = 1 ] ; then if [ $JTE = 1 ] ; then
set +e set +e
@ -180,6 +187,7 @@ make_cd () {
awk '/Image Hex MD5Sum/ {print $5}'` awk '/Image Hex MD5Sum/ {print $5}'`
echo "$MD5 ${BASENAME}.iso" >> ${JIGDODIR}/MD5SUMS.update echo "$MD5 ${BASENAME}.iso" >> ${JIGDODIR}/MD5SUMS.update
echo "$MD5 ${BASENAME}.iso" >> ${ISODIR}/MD5SUMS.update echo "$MD5 ${BASENAME}.iso" >> ${ISODIR}/MD5SUMS.update
[ $BT = 1 ] && echo "$MD5 ${BASENAME}.iso" >> ${BTDIR}/MD5SUMS.update
for SHA_SIZE in 1 256 512; do for SHA_SIZE in 1 256 512; do
SHA=`cat ${JIGDODIR}/${BASENAME}.jigdo | \ SHA=`cat ${JIGDODIR}/${BASENAME}.jigdo | \
awk "/Image Hex SHA${SHA_SIZE}Sum/ {print \\$5}"` awk "/Image Hex SHA${SHA_SIZE}Sum/ {print \\$5}"`
@ -189,6 +197,7 @@ make_cd () {
fi fi
echo "$SHA ${BASENAME}.iso" >> ${JIGDODIR}/SHA${SHA_SIZE}SUMS.update echo "$SHA ${BASENAME}.iso" >> ${JIGDODIR}/SHA${SHA_SIZE}SUMS.update
echo "$SHA ${BASENAME}.iso" >> ${ISODIR}/SHA${SHA_SIZE}SUMS.update echo "$SHA ${BASENAME}.iso" >> ${ISODIR}/SHA${SHA_SIZE}SUMS.update
[ $BT = 1 ] && echo "$SHA ${BASENAME}.iso" >> ${BTDIR}/SHA${SHA_SIZE}SUMS.update
done done
gzip -9 ${JIGDODIR}/${BASENAME}.jigdo gzip -9 ${JIGDODIR}/${BASENAME}.jigdo
mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo mv ${JIGDODIR}/${BASENAME}.jigdo.gz ${JIGDODIR}/${BASENAME}.jigdo