aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--layout.conf.new3
-rwxr-xr-xrsync-gen.sh2
-rwxr-xr-xsync-distfiles.sh6
3 files changed, 10 insertions, 1 deletions
diff --git a/layout.conf.new b/layout.conf.new
new file mode 100644
index 0000000..cb72f20
--- /dev/null
+++ b/layout.conf.new
@@ -0,0 +1,3 @@
+[structure]
+0=filename-hash BLAKE2B 8
+1=flat
diff --git a/rsync-gen.sh b/rsync-gen.sh
index 63701e7..bdedc5e 100755
--- a/rsync-gen.sh
+++ b/rsync-gen.sh
@@ -133,7 +133,7 @@ timelog___end "STAGEDIR_repo_gentoo RSYNC" | timelogger
# metadata tree is protected, so we need to repeat potentially-stale
# Manifests separately (I couldn't get any R-rules to work)
-find "${STAGEDIR_repo_gentoo}"/ '(' \
+find "${STAGEDIR_repo_gentoo}"/metadata '(' \
-name 'Manifest' -o -name 'Manifest.gz' -o -name 'Manifest.files.gz' \
')' -delete
diff --git a/sync-distfiles.sh b/sync-distfiles.sh
index 3037b56..302fb92 100755
--- a/sync-distfiles.sh
+++ b/sync-distfiles.sh
@@ -53,6 +53,12 @@ python2 /usr/bin/emirrordist \
--temp-dir=${DATADIR}/tmp/ \
--whitelist-from=${DATADIR}/tmp/whitelist-master.txt \
--distfiles-local=${DATADIR}/distfiles-local \
+ --symlinks \
+ --layout-conf=/usr/local/bin/mastermirror/layout.conf.new \
--mirror
+( cd ${DATADIR}/distfiles && find [0-9a-f][0-9a-f] -mindepth 1 ) |
+ sort > ${DATADIR}/INDEX.tmp &&
+ mv ${DATADIR}/INDEX.tmp ${DATADIR}/distfiles/INDEX
+
/bin/date -u '+%s' > ${DATADIR}/distfiles/timestamp.mirmon