X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=docs%2FREADME.stable-point-release;h=0248d164f9a7319831ff86673a92dca85089c9fc;hb=c8b7bf4e2ae6e1e495aeaf63c0193e4c766bef77;hp=a280bec62e744605d4afb48797e53a297345d92e;hpb=e3072cd35534e3807eb6e884b06e7fdea8a81b44;p=dak.git

diff --git a/docs/README.stable-point-release b/docs/README.stable-point-release
index a280bec6..0248d164 100644
--- a/docs/README.stable-point-release
+++ b/docs/README.stable-point-release
@@ -3,11 +3,9 @@ Rough Guide to doing Stable Point Releases in Debian
 
 - sudo to dak
 - bash:
-suite=stable
 suitename=jessie
-pusuite=proposed-updates
-oldrev=8.1
-newrev=8.2
+newrev=8.5
+
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 . "${configdir}/common"
@@ -15,22 +13,39 @@ export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 umask 022
 export LANG=C
 export LC_ALL=C
+
+suite=$(psql -qAtc "SELECT suite_name FROM suite WHERE codename='${suitename}'")
+oldrev=$(psql -qAtc "SELECT version FROM suite WHERE codename='${suitename}'")
+case "${suite}" in
+  stable)    pusuite=proposed-updates ;;
+  oldstable) pusuite=oldstable-proposed-updates ;;
+  *)         pusuite=INVALID ;;
+esac
+
+echo "Point release for ${suite} (${suitename}); old version: ${oldrev}, new: ${newrev}"
+echo "Updates come from ${pusuite}"
+
 pg_timestamp pre_${suite}_${newrev}
 cd ~
-mkdir -p ${suite}_${newrev}
-cd ${suite}_${newrev}
+mkdir -p ${suitename}_${newrev}
+cd ${suitename}_${newrev}
 dak control-suite -l ${pusuite} > ${pusuite}.list
 dak control-suite -l ${suite} > ${suite}.list
 
 - ask SRMs if there is anything to be skipped from this release. If so
   edit ${pusuite}.list (and later the Changelog too)
 - bash:
-skip="squid3 icedove php5"
+# skip: list of *source* packages to skip, whitespace seperated
+skip=""
 if [ -n "${skip}" ]; then
   mv ${pusuite}.list ${pusuite}.list.ori
   grep -vFf <(dak ls -f heidi -S -s ${pusuite} ${skip}) ${pusuite}.list.ori > ${pusuite}.list
 fi
-dak make-changelog -s ${pusuite} -b ${suite} | cat - ${ftpdir}/dists/${suite}/ChangeLog | sponge ${ftpdir}/dists/${suite}/ChangeLog
+
+tmpfile=$(mktemp -p "${TMPDIR}" changelog.XXXXXX)
+dak make-changelog -s ${pusuite} -b ${suite} | cat - ${ftpdir}/dists/${suite}/ChangeLog > ${tmpfile}
+chmod 0644 ${tmpfile}
+mv ${tmpfile} ${ftpdir}/dists/${suite}/ChangeLog
 if [ -n "${skip}" ]; then
   $EDITOR ${ftpdir}/dists/${suite}/ChangeLog
 fi
@@ -44,25 +59,38 @@ pumorguedir="${base}/morgue/queues/$(date +%Y/%m)"
 mkdir -p "${pumorguedir}"
 cd ${ftpdir}/dists/${pusuite}
 mv -t "${pumorguedir}" -n -- *.changes
+if [ -n "${skip}" ]; then
+    for pack in ${skip}; do
+        mv -t "${ftpdir}/dists/${pusuite}" ${pumorguedir}/${pack}*.changes
+    done
+fi
 
-- -r0 additions?
-  For example new d-i. If so:
-cd ~/${suite}_${newrev}
-cp /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/${suitename}-r0-additions.cs .
-dak control-suite --add ${suitename}-r0 < ${suitename}-r0-additions.cs
-
-- sync with stable RM if there is any propup needed. do it, if so:
-cp /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/propups.unstable .
-dak control-suite --force --add unstable <propups.unstable
-cp /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/propups.testing .
-dak control-suite --force --add testing <propups.testing
+# do r0 and propups, if any
+cd ~/${suitename}_${newrev}
+if [[ -f /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/${suitename}-r0-additions.cs ]]; then
+    cp /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/${suitename}-r0-additions.cs .
+    dak control-suite --add ${suitename}-r0 < ${suitename}-r0-additions.cs
+fi
+if [[ -f /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/propups.unstable ]]; then
+    cp /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/propups.unstable .
+    dak control-suite --force --add unstable <propups.unstable
+fi
+if [[ -f /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/propups.testing ]]; then
+    cp /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/propups.testing .
+    dak control-suite --force --add testing <propups.testing
+fi
 
 - ask rms if they have RMs to do.
+# dak rm -s ${suite} -R -p -d ### -m '###' ###
+- Copy in entries from /srv/ftp.debian.org/web/removals.txt:
+# $EDITOR ${ftpdir}/dists/${suite}/ChangeLog
+
 - and then check if they have a d-i update. if so, bash:
-# set dioldver to "empty" if there is no old to remove
-diver=20150422+deb8u2
+diver=20150422+deb8u4
 dak copy-installer -s ${pusuite} -d ${suite} ${diver}
-dioldver=20150422+deb8u1
+
+# set dioldver to "empty" if there is no old to remove
+dioldver=20150422+deb8u3+b1
 if [ "${dioldver}" != "empty" ]; then
     cd $ftpdir/dists/${suite}/main
     for iarch in $(dak admin s-a list-arch ${suite}); do
@@ -100,9 +128,15 @@ date_short=$(date "+%a, %d %b %Y")
 sed -e "1i======================================\n${date_short} - Debian ${newrev} released\n======================================" -i ChangeLog
 sed -e "/^${suite}/ s/Debian ${oldrev}/Debian ${newrev}/" -i ../README
 sed -e "s/Debian ${oldrev}/Debian ${newrev}/g; /Debian ${newrev}/ s/released .*\\./released ${date_long}./" -i ../../README
-sed -e "s/Debian ${oldrev}/Debian ${newrev}/g; /Debian ${newrew}/ s/released .*\\./released ${date_long}./; /meta name=\"Modified\"/ s/content=\".*\"/content=\"${date_iso}\"/" -i ../../README.html
+sed -e "s/Debian ${oldrev}/Debian ${newrev}/g; /Debian ${newrev}/ s/released .*\\./released ${date_long}./; /meta name=\"Modified\"/ s/content=\".*\"/content=\"${date_iso}\"/" -i ../../README.html
 
 # Inspect changes. Regular expressions might be a bit fragile.
+for f in README README.html dists/README dists/${suite}/ChangeLog; do
+  diff -u ${mirrordir}/ftp-master/${f} ${ftpdir}/${f}
+done
+
+# If changes are needed:
+cd ${ftpdir}/dists/${suite}
 $EDITOR ChangeLog ../README ../../README ../../README.html
 rm -f -- ./*~ ../*~ ../../*~
 
@@ -128,10 +162,13 @@ dak dominate --force -s ${suite}
 dak cruft-report -s ${suite}
 - if cruft was removed: go back to run dominate again
 
+- if cruft was removed: update changelog from /srv/ftp.debian.org/web/removals.txt:
+# $EDITOR ${ftpdir}/dists/${suite}/ChangeLog
+
 - Let SRM see if all is ok
 
 - then:
-dak generate-packages-sources2 --force -s ${suite} && dak contents generate -f -s ${suite} -a ftp-master
+dak generate-packages-sources2 --force -s ${suite},${pusuite} && dak contents generate -f -s ${suite} -a ftp-master
 
 - For wheezy: update main/i18n/Index
 if [[ ${suitename} == wheezy ]]; then
@@ -142,31 +179,19 @@ fi
 dak generate-releases -f -s ${suite} ${pusuite}
 # Remove InRelease: Release can be signed by both ftpmaster & stable release keys
 rm ${ftpdir}/dists/${suite}/InRelease
-
-- have the SRMs sign it and put the signature in.
 cd ${ftpdir}/dists/${suite}
-cat /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/Release.gpg >> Release.gpg
-gpg --no-default-keyring --keyring /usr/share/keyrings/debian-archive-keyring.gpg --trust-model=always --verify Release.gpg Release
-
-- Check if a mirror push is needed or next dinstall is enough. for a push
-o if so, bash:
-
-TRACEFILE="${ftpdir}/project/trace/ftp-master.debian.org"
-DATE_SERIAL=$(date +"%Y%m%d01")
-FILESOAPLUS1=$(awk '/serial/ { print $3+1 }' ${TRACEFILE} )
-if [ "$DATE_SERIAL" -gt "$FILESOAPLUS1" ]; then
-    SERIAL="$DATE_SERIAL"
-else
-    SERIAL="$FILESOAPLUS1"
-fi
-date -u > ${TRACEFILE}
-echo "Using dak v1" >> ${TRACEFILE}
-echo "Running on host: $(hostname -f)" >> ${TRACEFILE}
-echo "Archive serial: ${SERIAL}" >> ${TRACEFILE}
-cd ${mirrordir}
-rsync -aH --link-dest ${ftpdir} --delete --delete-after --ignore-errors ${ftpdir}/. .
-date -u > /srv/ftp.debian.org/web/mirrorstart
-echo "Using dak v1" >> /srv/ftp.debian.org/web/mirrorstart
-echo "Running on host $(hostname -f)" >> /srv/ftp.debian.org/web/mirrorstart
-sudo -H -u archvsync /home/archvsync/runmirrors > ~dak/runmirrors.log 2>&1 &
-
+while :; do
+    if [[ -f /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/Release-${newrev}.gpg ]]; then
+        cat /srv/release.debian.org/www/${suitename}/${newrev%%.*}/${newrev}/Release-${newrev}.gpg >> Release.gpg
+        gpg --no-default-keyring --keyring /usr/share/keyrings/debian-archive-keyring.gpg --trust-model=always --verify Release.gpg Release
+        break
+    else
+        sleep 10
+        continue
+    fi
+done
+echo "Done"
+
+- Check if a mirror push is needed or next dinstall is enough. for a push, bash:
+cd
+${configdir}/cronscript mirror