From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SBnFR-00063K-OF for garchives@archives.gentoo.org; Sun, 25 Mar 2012 13:12:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0718FE0521; Sun, 25 Mar 2012 13:12:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A1A7EE0521 for ; Sun, 25 Mar 2012 13:12:33 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B59081B4048 for ; Sun, 25 Mar 2012 13:12:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 76BAAE5402 for ; Sun, 25 Mar 2012 13:12:31 +0000 (UTC) From: "Dennis Schridde" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dennis Schridde" Message-ID: <1332679288.e9c06ede98ea694f1271599b63cc2c5844e26e53.devurandom@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: Documentation/maintainers/ X-VCS-Repository: proj/kde X-VCS-Files: Documentation/maintainers/metadata-mirror-update.sh Documentation/maintainers/metadata-sync Documentation/maintainers/sync-gentoo-overlay.sh Documentation/maintainers/sync-metadata.sh X-VCS-Directories: Documentation/maintainers/ X-VCS-Committer: devurandom X-VCS-Committer-Name: Dennis Schridde X-VCS-Revision: e9c06ede98ea694f1271599b63cc2c5844e26e53 X-VCS-Branch: master Date: Sun, 25 Mar 2012 13:12:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8a55630a-149d-4f3c-9a57-cfe01d22db40 X-Archives-Hash: b81e84e21d23bce27121d2e3cc27102f commit: e9c06ede98ea694f1271599b63cc2c5844e26e53 Author: Dennis Schridde gmx net> AuthorDate: Sun Mar 25 12:41:28 2012 +0000 Commit: Dennis Schridde gmx net> CommitDate: Sun Mar 25 12:41:28 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3De9c06ede [Documentation/maintainers] New versions of my metadata mirror scripts sync-gentoo-overlay.sh supports mirroring a complete overlay via rsync, which helps in keeping the metadata-cache and the ebuilds in sync. --- .../maintainers/metadata-mirror-update.sh | 51 --------------= - Documentation/maintainers/metadata-sync | 12 ---- Documentation/maintainers/sync-gentoo-overlay.sh | 67 ++++++++++++++= ++++++ Documentation/maintainers/sync-metadata.sh | 12 ++++ 4 files changed, 79 insertions(+), 63 deletions(-) diff --git a/Documentation/maintainers/metadata-mirror-update.sh b/Docume= ntation/maintainers/metadata-mirror-update.sh deleted file mode 100755 index fc2b7b7..0000000 --- a/Documentation/maintainers/metadata-mirror-update.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -# Run this script via cronjob to update your metadata mirror - -METADATA_MIRROR_DIR=3D/path/to/your/mirror/dir - -# METADATA_MIRROR_DIR must contain: -# * a folder $overlay/ for each overlay you intent to mirror. -# * a folder cache/ to store the cache of all overlays. -# (so it is not mixed with the cache of your system portage-trees) -# METADATA_MIRROR_DIR/$overlay/ must contain: -# * a file etc/make.conf with following contents: -# PORTDIR=3D/your/portage/directory -# PORTDIR_OVERLAY=3D/path/to/your/mirror/dir/$overlay/repo -# FEATURES=3D"${FEATURES} userpriv userfetch usersandbox usersync met= adata-transfer" -# * a directory repo/ containing the checked out repository you want to= create metadata from. -# For speed reasons it is advisable to have a file etc/portage/modules c= ontaining: -# portdbapi.auxdbmodule =3D portage.cache.sqlite.database - -die() { - echo "USAGE: $0 " 1>&2 - echo "ERROR: $@" 1>&2 - exit 255 -} - -[[ "$1" ]] || die 'overlay' -overlay=3D"$1" ; shift - -if [ -e "$METADATA_MIRROR_DIR/$overlay/repo/.svn" ] ; then - type=3Dsvn -elif [ -e "$METADATA_MIRROR_DIR/$overlay/repo/.git" ] ; then - type=3Dgit -else - die "Unable to determine overlay type for $overlay" -fi - -cd $METADATA_MIRROR_DIR/$overlay/repo || cd "failed to cd to $METADATA_M= IRROR_DIR/$overlay/repo" - -case "$type" in - svn) - svn cleanup && svn update --force --config-option=3Dconfig:miscellany:= use-commit-times=3Dyes || die 'svn update failed' - ;; - git) - git pull || die 'git update failed' - /usr/local/bin/git-set-file-times || die 'setting file times failed' - ;; - *) - die "Unsupported overlay type '$type' for $overlay" -esac - -exec egencache --config-root=3D$METADATA_MIRROR_DIR/$overlay/ --cache-di= r=3D$METADATA_MIRROR_DIR/cache/ --repo=3D$overlay --update diff --git a/Documentation/maintainers/metadata-sync b/Documentation/main= tainers/metadata-sync deleted file mode 100755 index cd0c0fe..0000000 --- a/Documentation/maintainers/metadata-sync +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# Contact: devurandom -METADATA_MIRROR=3Drsync://gentoo.kynes.de:800/gentoo-metadata-kde/ - -if [[ "$(basename $(pwd))" =3D=3D "Documentation" ]] ; then - echo "Syncing KDE overlay metadata ..." - exec rsync --quiet --recursive --times --compress --delete-delay $METAD= ATA_MIRROR ../metadata/cache/ -else - echo "ERROR: This script is meant to be run from within Documentation/ = !" - exit 255 -fi diff --git a/Documentation/maintainers/sync-gentoo-overlay.sh b/Documenta= tion/maintainers/sync-gentoo-overlay.sh new file mode 100755 index 0000000..ea28c8e --- /dev/null +++ b/Documentation/maintainers/sync-gentoo-overlay.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +# Run this script via cronjob to update your overlay mirror + +OVERLAY_MIRROR_DIR=3D/var/gentoo/overlays + +# OVERLAY_MIRROR_DIR must contain: +# * a folder $overlay/ for each overlay you intent to mirror. +# * a folder cache/ to store the cache of all overlays. +# (so it is not mixed with the cache of your system portage-trees) +# OVERLAY_MIRROR_DIR/$overlay/ must contain: +# * a file etc/make.conf with following contents: +# PORTDIR=3D/your/portage/directory +# PORTDIR_OVERLAY=3D/path/to/your/mirror/dir/$overlay/repo +# FEATURES=3D"${FEATURES} userpriv userfetch usersandbox usersync met= adata-transfer" +# * a directory repo/ containing the checked out overlay repository +# For speed reasons it is advisable to have a file etc/portage/modules c= ontaining: +# portdbapi.auxdbmodule =3D portage.cache.sqlite.database + +die() { + echo "USAGE: $0 " 1>&2 + echo "ERROR: $@" 1>&2 + exit 1 +} + +[[ "$1" ]] || die 'overlay' +overlay=3D"$1" ; shift + +overlay_name=3D"$(< $OVERLAY_MIRROR_DIR/$overlay/repo/profiles/repo_name= )" +[[ "$overlay_name" ]] || die 'overlay_name' + +if [ -e "$OVERLAY_MIRROR_DIR/$overlay/repo/.svn" ] ; then + type=3Dsvn +elif [ -e "$OVERLAY_MIRROR_DIR/$overlay/repo/.git" ] ; then + type=3Dgit +else + die "Unable to determine overlay type for $overlay" +fi + +cd $OVERLAY_MIRROR_DIR/$overlay/repo || cd "failed to cd to $OVERLAY_MIR= ROR_DIR/$overlay/repo" + +echo 'Updating overlay ...' +case "$type" in + svn) + [ -e metadata/layout.conf ] && svn revert metadata/layout.conf + svn cleanup || die 'svn cleanup failed' + svn update --force --config-option=3Dconfig:miscellany:use-commit-time= s=3Dyes || die 'svn update failed' + ;; + git) + [ -e metadata/layout.conf ] && git checkout metadata/layout.conf + git pull || die 'git update failed' + /usr/local/bin/git-set-file-times || die 'setting file times failed' + ;; + *) + die "Unsupported overlay type '$type' for $overlay" +esac + +export PORTAGE_CONFIGROOT=3D$OVERLAY_MIRROR_DIR/$overlay PORTAGE_DEPCACH= EDIR=3D$OVERLAY_MIRROR_DIR/cache + +echo 'Enforcing full manifests ...' +#sed -e 's/^thin-manifests.*/thin-manifests =3D false/' -i metadata/layo= ut.conf || die 'patching layout.conf failed' + +echo 'Generating manifests ...' +#repoman manifest || die 'generating manifests failed' + +echo 'Generating metadata caches ...' +egencache --config-root=3D$PORTAGE_CONFIGROOT --cache-dir=3D$PORTAGE_DE= PCACHEDIR --repo=3D$overlay_name --update diff --git a/Documentation/maintainers/sync-metadata.sh b/Documentation/m= aintainers/sync-metadata.sh new file mode 100755 index 0000000..d02fee4 --- /dev/null +++ b/Documentation/maintainers/sync-metadata.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Contact: devurandom +METADATA_MIRROR=3Drsync://gentoo.kynes.de:800/gentoo-overlay-kde/metadat= a/cache/ + +if [[ "$(basename $(pwd))" !=3D "Documentation" ]] ; then + echo "ERROR: This script is meant to be run from within Documentation/ = !" + exit 1 +fi + +echo "Syncing KDE overlay metadata ..." +exec rsync --quiet --recursive --times --compress --delete-delay $METADA= TA_MIRROR ../metadata/cache/