From a0fb82cc65e2ef4d6004e61aae0f35a0bf37a010 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Thu, 13 Sep 2007 00:39:23 +0200 Subject: [PATCH] [UBUNTU] cron.d: Various Ubuntu adaptions * Remove some Debian special-cases from 100syncarchive * Remove unused sync scripts for gnuab and etch-m68k * Fix 600prepare_newpkg --- cron.d/100syncarchive | 12 +----- cron.d/100syncarchive_gnuab | 33 --------------- cron.d/100syncarchive_m68k | 81 ------------------------------------- cron.d/600prepare_newpkg | 10 ++--- 4 files changed, 6 insertions(+), 130 deletions(-) delete mode 100755 cron.d/100syncarchive_gnuab delete mode 100755 cron.d/100syncarchive_m68k diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive index 5cb5af4..aa73217 100755 --- a/cron.d/100syncarchive +++ b/cron.d/100syncarchive @@ -21,9 +21,6 @@ then foo=\$arch_${dist//-/_} for arch in `eval echo $foo` do - test ! "$arch" = "kfreebsd-i386" || continue - test ! "$arch" = "kfreebsd-amd64" || continue - test ! "$arch" = "armel" || continue for part in ${parts} do echo retrieve Packages $dist/$part/$arch @@ -31,8 +28,6 @@ then (cd us/${dist}/${part}/binary-${arch} && wget -q -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz) done - #FIXME: no Contents files for p-u - test ! "$dist" = "experimental" || continue echo retrieve Contents $dist/$arch (cd us/${dist} && wget -q -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz) @@ -57,9 +52,6 @@ else foo=\$arch_${dist//-/_} for arch in `eval echo $foo` do - test ! "$arch" = "kfreebsd-i386" || continue - test ! "$arch" = "kfreebsd-amd64" || continue - test ! "$arch" = "armel" || continue for part in ${parts} do echo retrieve Packages $dist/$part/$arch @@ -67,8 +59,6 @@ else rsync -t ${localdir}/dists/${dist}/${part}/binary-${arch}/Packages.gz \ us/${dist}/${part}/binary-${arch}/Packages.gz done - #FIXME: no Contents files for p-u - test ! "$dist" = "experimental" || continue echo retrieve Contents $dist/$arch rsync -t ${localdir}/dists/${dist}/Contents-${arch}.gz \ us/${dist}/Contents-${arch}.gz @@ -85,7 +75,7 @@ fi # security archive # -for dist in sarge etch lenny +for dist in $dists do echo "retrieve Release(.gpg) $dist" test -d security/${dist} || mkdir -p security/${dist} diff --git a/cron.d/100syncarchive_gnuab b/cron.d/100syncarchive_gnuab deleted file mode 100755 index b42d165..0000000 --- a/cron.d/100syncarchive_gnuab +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/bash - -. `dirname $0`/../config.sh - -test -d ${archivedir} || mkdir -p ${archivedir} -cd ${archivedir} - -# Main archive -# -architectures="armel kfreebsd-i386 kfreebsd-amd64" - -for dist in sid experimental - do - echo "retrieve Release(.gpg) $dist" - test -d gnuab/${dist} || mkdir -p gnuab/${dist} - (cd gnuab/${dist} && - wget -q -N ${gnuab_ftpsite}/dists/${dist}/Release && - wget -q -N ${gnuab_ftpsite}/dists/${dist}/Release.gpg ) - - for arch in $architectures - do - for part in ${parts} main/debian-installer - do - echo retrieve Packages $dist/$part/$arch - test -d gnuab/${dist}/${part}/binary-${arch} || mkdir -p gnuab/${dist}/${part}/binary-${arch} - (cd gnuab/${dist}/${part}/binary-${arch} && - wget -q -N ${gnuab_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz) - done - echo retrieve Contents $dist/$arch - (cd gnuab/${dist} && - wget -q -N ${gnuab_ftpsite}/dists/${dist}/Contents-${arch}.gz) - done -done diff --git a/cron.d/100syncarchive_m68k b/cron.d/100syncarchive_m68k deleted file mode 100755 index f8aa4f5..0000000 --- a/cron.d/100syncarchive_m68k +++ /dev/null @@ -1,81 +0,0 @@ -#! /bin/bash - -. `dirname $0`/../config.sh - -test -d ${archivedir} || mkdir -p ${archivedir} -cd ${archivedir} - -# Main archive -# -arch=m68k -if [ -z "${localdir}" ] -then - echo using remote mirror - for dist in etch - do - echo "retrieve Release(.gpg) $dist" - test -d us/${dist}-${arch} || mkdir -p us/${dist}-${arch} - (cd us/${dist} && - wget -q -N ${ftpsite}/dists/${dist}-${arch}/Release && - wget -q -N ${ftpsite}/dists/${dist}-${arch}/Release.gpg ) - -# foo=\$arch_${dist//-/_} -# for arch in `eval echo $foo` -# do - for part in ${parts} - do - echo retrieve Packages $dist-${arch}/$part/$arch - test -d us/${dist}-${arch}/${part}/binary-${arch} || mkdir -p us/${dist}-${arch}/${part}/binary-${arch} - (cd us/${dist}-${arch}/${part}/binary-${arch} && - wget -q -N ${ftpsite}/dists/${dist}-${arch}/${part}/binary-${arch}/Packages.gz) - done - #FIXME: no Contents files for p-u - test ! "$dist" = "experimental" || continue - echo retrieve Contents $dist/$arch - (cd us/${dist}-${arch} && - wget -q -N ${ftpsite}/dists/${dist}-${arch}/Contents-${arch}.gz) -# done - for part in ${parts} - do - echo retrieve Sources $dist-${arch}/$part - test -d us/${dist}-${arch}/${part}/source || mkdir -p us/${dist}-${arch}/${part}/source - (cd us/${dist}-${arch}/${part}/source && - wget -q -N ${ftpsite}/dists/${dist}-${arch}/${part}/source/Sources.gz) - done - done -else - echo using local mirror - for dist in etch - do - echo "retrieve Releases(.gpg) $dist" - test -d us/${dist}-${arch} || mkdir -p us/${dist}-${arch} - (cd us/${dist}-${arch} && - rsync -t ${localdir}/dists/${dist}-${arch}/Release && - rsync -t ${localdir}/dists/${dist}-${arch}/Release.gpg ) - -# foo=\$arch_${dist//-/_} -# for arch in `eval echo $foo` -# do - for part in ${parts} - do - echo retrieve Packages $dist-${arch}/$part/$arch - test -d us/${dist}-${arch}/${part}/binary-${arch} || mkdir -p us/${dist}-${arch}/${part}/binary-${arch} - rsync -t ${localdir}/dists/${dist}-${arch}/${part}/binary-${arch}/Packages.gz \ - us/${dist}-${arch}/${part}/binary-${arch}/Packages.gz - done - #FIXME: no Contents files for p-u - test ! "$dist" = "experimental" || continue - echo retrieve Contents $dist-${arch}/$arch - rsync -t ${localdir}/dists/${dist}-${arch}/Contents-${arch}.gz \ - us/${dist}-${arch}/Contents-${arch}.gz -# done - for part in ${parts} - do - echo retrieve Sources $dist-${arch}/$part - test -d us/${dist}-${arch}/${part}/source || mkdir -p us/${dist}-${arch}/${part}/source - rsync -t ${localdir}/dists/${dist}-${arch}/${part}/source/Sources.gz \ - us/${dist}-${arch}/${part}/source/Sources.gz - done - done -fi - diff --git a/cron.d/600prepare_newpkg b/cron.d/600prepare_newpkg index bddf65b..f0188c0 100755 --- a/cron.d/600prepare_newpkg +++ b/cron.d/600prepare_newpkg @@ -5,11 +5,11 @@ packagesdir=${filesdir}/packages test -d ${packagesdir} || mkdir -p ${packagesdir} -LANG=C cat ${filesdir}/db/package_names_sid.txt \ - | sort | uniq > ${packagesdir}/package_names_sid.$(date -I) -LANG=C cat ${filesdir}/db/source_names_unstable.txt \ - | sort | uniq > ${packagesdir}/source_names_sid.$(date -I) +LANG=C cat ${filesdir}/db/package_names_gutsy.txt \ + | sort | uniq > ${packagesdir}/package_names_gutsy.$(date -I) +LANG=C cat ${filesdir}/db/source_names_gutsy.txt \ + | sort | uniq > ${packagesdir}/source_names_gutsy.$(date -I) cd $topdir -./bin/newpkg_info sid +./bin/newpkg_info gutsy -- 2.39.2