[gentoo-commits] proj/kde:master commit in: Documentation/maintainers/

["Dennis Schridde" <devurandom@gmx.net>]

commit:     8a3b621be420a888eb33355482aa54ab6088d504
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Tue Apr 10 12:56:36 2012 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Tue Apr 10 12:59:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8a3b621b

[Documentation/maintainers/sync-gentoo-overlay.sh] Bump to a new version

* Be much more automatic (i.e. user friendly)
* Use atomic moves to ensure the rsync dir does not change during a sync
* Ensure the rsync dir does not contain .svn folders and the like

---
 Documentation/maintainers/sync-gentoo-overlay.sh |  116 +++++++++++++++++-----
 1 files changed, 90 insertions(+), 26 deletions(-)

diff --git a/Documentation/maintainers/sync-gentoo-overlay.sh b/Documentation/maintainers/sync-gentoo-overlay.sh
index ea28c8e..3172dfa 100755
--- a/Documentation/maintainers/sync-gentoo-overlay.sh
+++ b/Documentation/maintainers/sync-gentoo-overlay.sh
@@ -2,20 +2,31 @@
 
 # Run this script via cronjob to update your overlay mirror
 
-OVERLAY_MIRROR_DIR=/var/gentoo/overlays
+GENTOO_MIRROR_DIR=/var/gentoo
+GENTOO_PORTAGE_DIR=/var/gentoo/portage
 
-# 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.
+# GENTOO_MIRROR_DIR must contain:
+#  * a directory overlay-repos/$overlay for each overlay you intend to mirror:
+#    It shall contain the checked out overlay repository.
+#    Git repositories must be named "overlay-repos/${overlay}.git".
+#    SVN repositories must contain a directory "overlay-repos/${overlay}/.svn".
+# Directories and files within OVERLAY_MIRROR_DIR that will be created by this script:
+#  * overlays/$overlay/ contains the overlays suitable to sync with rsync.
+#  * overlay-etc/$overlay/ contains a portage config necessary to generate the caches.
+#  * cache/ to store the intermediate 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=/your/portage/directory
-#    PORTDIR_OVERLAY=/path/to/your/mirror/dir/$overlay/repo
-#    FEATURES="${FEATURES} userpriv userfetch usersandbox usersync metadata-transfer"
-#  * a directory repo/ containing the checked out overlay repository
-# For speed reasons it is advisable to have a file etc/portage/modules containing:
-#    portdbapi.auxdbmodule = portage.cache.sqlite.database
+#  * etc/portage/ containing following files:
+#     * etc/portage/make.conf:
+#       PORTDIR=/your/portage/directory
+#       FEATURES="${FEATURES} userpriv userfetch usersandbox usersync metadata-transfer"
+#       NOCOLOR=true
+#     * etc/portage/modules:
+#       portdbapi.auxdbmodule = portage.cache.sqlite.database
+#       (for speed reasons)
+#    (files in this directory are not changed if they exist)
+
+PORTAGE_CONFIGROOT="${GENTOO_MIRROR_DIR}"
+PORTAGE_DEPCACHEDIR="${GENTOO_MIRROR_DIR}/cache"
 
 die() {
 	echo "USAGE: $0 <overlay>" 1>&2
@@ -26,36 +37,84 @@ die() {
 [[ "$1" ]] || die 'overlay'
 overlay="$1" ; shift
 
-overlay_name="$(< $OVERLAY_MIRROR_DIR/$overlay/repo/profiles/repo_name)"
-[[ "$overlay_name" ]] || die 'overlay_name'
+overlay_dir="${GENTOO_MIRROR_DIR}/overlays/${overlay}"
+overlay_repo_dir="${GENTOO_MIRROR_DIR}/overlay-repos/${overlay}"
 
-if [ -e "$OVERLAY_MIRROR_DIR/$overlay/repo/.svn" ] ; then
+if [ -e "${overlay_repo_dir}/.svn" ] ; then
 	type=svn
-elif [ -e "$OVERLAY_MIRROR_DIR/$overlay/repo/.git" ] ; then
+elif [ -e "${overlay_repo_dir}.git" ] ; then
 	type=git
+	overlay_repo_dir="${overlay_repo_dir}.git"
 else
 	die "Unable to determine overlay type for $overlay"
 fi
 
-cd $OVERLAY_MIRROR_DIR/$overlay/repo || cd "failed to cd to $OVERLAY_MIRROR_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=config:miscellany:use-commit-times=yes || die 'svn update failed'
+		svn cleanup "${overlay_repo_dir}" || die 'svn cleanup failed'
+		svn update --force "${overlay_repo_dir}" || die 'svn update failed'
+		;;
+	git)
+		git --git-dir="${overlay_repo_dir}" fetch || die 'git update failed'
+		;;
+	*)
+		die "Unsupported overlay type '$type' for $overlay"
+		;;
+esac
+
+mkdir -p "${GENTOO_MIRROR_DIR}/overlays" || die 'failed to create overlays/ dir'
+mkdir -p "${GENTOO_MIRROR_DIR}/etc/portage/" || die 'failed to create etc/portage/ dir'
+
+if [ -! -e "${GENTOO_MIRROR_DIR}/etc/portage/make.conf" ] ; then
+	cat <<- EOF > "${GENTOO_MIRROR_DIR}/etc/portage/make.conf"
+		PORTDIR=${GENTOO_PORTAGE_DIR}
+		FEATURES="\${FEATURES} userpriv userfetch usersandbox usersync metadata-transfer"
+		NOCOLOR=true
+	EOF
+fi
+if [ -! -e "${GENTOO_MIRROR_DIR}/etc/portage/modules" ] ; then
+	cat <<- EOF > "${GENTOO_MIRROR_DIR}/etc/portage/modules"
+		portdbapi.auxdbmodule = portage.cache.sqlite.database
+	EOF
+fi
+
+if [ -e "${overlay_dir}.tmp" ] ; then
+	echo 'Removing old export ...'
+	rm -fr "${overlay_dir}.tmp"
+fi
+
+echo 'Exporting overlay ...'
+case "$type" in
+	svn)
+		svn export --force --config-option=config:miscellany:use-commit-times=yes "${overlay_repo_dir}" "${overlay_dir}.tmp" || die 'svn export 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'
+		mkdir -p "${overlay_dir}.tmp" || die 'creating export dir failed'
+		git --git-dir="${overlay_repo_dir}" archive master | tar -x -C "${overlay_dir}.tmp" || die 'git export failed'
 		;;
 	*)
 		die "Unsupported overlay type '$type' for $overlay"
+		;;
 esac
 
-export PORTAGE_CONFIGROOT=$OVERLAY_MIRROR_DIR/$overlay PORTAGE_DEPCACHEDIR=$OVERLAY_MIRROR_DIR/cache
+cd "${overlay_dir}.tmp" || die "failed to cd to ${overlay_dir}.tmp"
+
+overlay_name="$(< profiles/repo_name)"
+[[ "$overlay_name" ]] || die 'overlay_name'
+
+overlay_configroot="${GENTOO_MIRROR_DIR}/overlay-etc/${overlay}"
+mkdir -p "${overlay_configroot}/etc/portage" || die 'creating overlay configroot failed'
+cat <<- EOF > "${overlay_configroot}/etc/portage/make.conf" || die 'creating overlay make.conf failed'
+	source ${PORTAGE_CONFIGROOT}/etc/portage/make.conf
+	PORTDIR_OVERLAY=${overlay_dir}.tmp
+EOF
+ln -sfn "${PORTAGE_CONFIGROOT}/etc/portage/modules" "${overlay_configroot}/etc/portage/" || die 'creating overlay modules symlink failed'
+
+PORTAGE_CONFIGROOT="${overlay_configroot}"
+PORTDIR_OVERLAY="${overlay_dir}.tmp"
+
+export PORTAGE_CONFIGROOT PORTAGE_DEPCACHEDIR PORTDIR_OVERLAY
 
 echo 'Enforcing full manifests ...'
 #sed -e 's/^thin-manifests.*/thin-manifests = false/' -i metadata/layout.conf || die 'patching layout.conf failed'
@@ -64,4 +123,9 @@ echo 'Generating manifests ...'
 #repoman manifest || die 'generating manifests failed'
 
 echo 'Generating metadata caches ...'
-egencache  --config-root=$PORTAGE_CONFIGROOT --cache-dir=$PORTAGE_DEPCACHEDIR --repo=$overlay_name --update
+egencache --config-root="${PORTAGE_CONFIGROOT}" --cache-dir="${PORTAGE_DEPCACHEDIR}" --portdir-overlay="${PORTDIR_OVERLAY}" --repo=$overlay_name --update || die 'generating metadata caches failed'
+
+echo 'Moving export into place ...'
+mv -T "${overlay_dir}" "${overlay_dir}.old"
+mv -T "${overlay_dir}.tmp" "${overlay_dir}" || die 'moving export failed'
+rm -fr "${overlay_dir}.old"