From 9d2daa5ad2cdeca55555accd11ea59ee372bc0c3 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 7 Jan 2015 18:46:08 +0100
Subject: pkgupdate.sh: split out shared functions, rework mirroring

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
---
 bin/functions.sh | 403 +++++++++++++++++++++++++++++++++++++++++++++++
 pkgupdate.sh     | 464 ++-----------------------------------------------------
 2 files changed, 416 insertions(+), 451 deletions(-)
 create mode 100755 bin/functions.sh

diff --git a/bin/functions.sh b/bin/functions.sh
new file mode 100755
index 0000000..93275ae
--- /dev/null
+++ b/bin/functions.sh
@@ -0,0 +1,403 @@
+#DL_URL="https://downloads.openwrt.org/barrier_breaker/14.07"
+#DL_URL="file:///BB/sync/barrier_breaker/14.07"
+DL_URL="openwrt@downloads.openwrt.org:barrier_breaker/14.07"
+UL_URL="openwrt@downloads.openwrt.org:barrier_breaker/14.07"
+
+IDENT="$HOME/.ssh/id_rsa_openwrt_rsync"
+
+PATTERN_SDK="OpenWrt-SDK-*.tar.bz2"
+PATTERN_FEED="Packages.gz"
+
+CACHE_DIR="$HOME/relman/.cache"
+
+N="
+"
+
+call_rsync() {
+	LC_ALL=C rsync ${IDENT+-e "ssh -i $IDENT"} "$@"
+}
+
+mirror_rsync() {
+	if [ ! -d "$CACHE_DIR/mirror" ] || [ $do_update -gt 0 -a ! -e "$CACHE_DIR/.mirrored" ]; then
+		mkdir -p "$CACHE_DIR/mirror"
+		call_rsync -avz --delete -m \
+			--include='*/' --include="**/$PATTERN_SDK" --include="**/$PATTERN_FEED" --exclude='*' \
+			"$DL_URL/" "$CACHE_DIR/mirror/"
+
+		touch "$CACHE_DIR/.mirrored"
+	fi
+}
+
+mirror_http() {
+	if [ ! -d "$CACHE_DIR/mirror" ] || [ $do_update -gt 0 -a ! -e "$CACHE_DIR/.mirrored" ]; then
+		mkdir -p "$CACHE_DIR/mirror"
+		lftp -e "open $DL_URL/ && mirror -P 2 -vvv --use-cache --only-newer --no-empty-dirs --delete -I '$PATTERN_SDK' -I '$PATTERN_FEED' -x logs/ . $CACHE_DIR/mirror/ && exit"
+		touch "$CACHE_DIR/.mirrored"
+	fi
+}
+
+mirror_file() {
+	if [ ! -d "$CACHE_DIR/mirror" ] || [ $do_update -gt 0 -a ! -e "$CACHE_DIR/.mirrored" ]; then
+		mkdir -p "$CACHE_DIR/mirror"
+		rsync -av --delete -m \
+			--include='*/' --include="**/$PATTERN_SDK" --include="**/$PATTERN_FEED" --exclude='*' \
+			"${DL_URL#file:}/" "$CACHE_DIR/mirror/"
+
+		touch "$CACHE_DIR/.mirrored"
+	fi
+}
+
+fetch_remote_targets() {
+	local target
+
+	if [ -n "$use_targets" ]; then
+		for target in $use_targets; do
+			echo "$target"
+		done
+		return 0
+	fi
+
+	find "$CACHE_DIR/mirror/" -type f -name "$PATTERN_SDK" -printf "%h\n" | while read target; do
+		echo "${target##*/mirror/}"
+	done | sort -u
+	return 0
+}
+
+fetch_remote_feeds() {
+	local feed target="$1"
+
+	find "$CACHE_DIR/mirror/$target/" -type f -name "$PATTERN_FEED" -printf "%h\n" | while read feed; do
+		echo "${feed##*/}"
+	done | sort -u
+	return 0
+}
+
+fetch_remote_index() {
+	local target feed
+
+	echo "Fetching remote package indizes..."
+
+	case "$DL_URL" in
+		file:*)
+			mirror_file
+		;;
+		http:*|https:*|ftp:*)
+			mirror_http
+		;;
+		*)
+			mirror_rsync
+		;;
+	esac
+
+	fetch_remote_targets | while read target; do
+		echo -n "* $target:"
+		fetch_remote_feeds "$target" | while read feed; do
+			if [ ! -s "$CACHE_DIR/repo-remote/$target/packages/$feed/Packages.gz" ]; then
+				echo -n " $feed"
+				mkdir -p "$CACHE_DIR/repo-remote/$target/packages/$feed"
+				cp -a "$CACHE_DIR/mirror/$target/packages/$feed/Packages.gz" \
+					"$CACHE_DIR/repo-remote/$target/packages/$feed/Packages.gz"
+			fi
+		done
+		echo ""
+	done
+}
+
+prepare_sdk() {
+	local target="$1"
+
+	if [ ! -d "$CACHE_DIR/sdk/$target/.git" ]; then
+		echo " * [$slot:$target] Initializing SDK"
+
+		local sdk
+		for sdk in "$CACHE_DIR/mirror/$target/"$PATTERN_SDK; do
+			if [ ! -f "$sdk" ]; then
+				echo " * [$slot:$target] $sdk - MISSING!"
+				exit 0
+			fi
+		done
+
+		rm -rf "$CACHE_DIR/sdk/$target"
+		mkdir -p "$CACHE_DIR/sdk/$target"
+		tar --strip-components=1 -C "$CACHE_DIR/sdk/$target" -xjf "$sdk"
+
+		mkdir -p "$CACHE_DIR/dl"
+		rm -rf "$CACHE_DIR/sdk/$target/dl"
+		ln -sf "$CACHE_DIR/dl" "$CACHE_DIR/sdk/$target/dl"
+
+		mkdir -p "$CACHE_DIR/feeds"
+		rm -rf "$CACHE_DIR/sdk/$target/feeds"
+		ln -sf "$CACHE_DIR/feeds" "$CACHE_DIR/sdk/$target/feeds"
+
+		(
+			cd "$CACHE_DIR/sdk/$target"
+			git init .
+			find . -maxdepth 1 | xargs git add
+			git commit -m "Snapshot"
+		) >/dev/null
+	elif [ $do_clean -gt 0 ]; then
+		echo " * [$slot:$target] Resetting SDK"
+
+		(
+			cd "$CACHE_DIR/sdk/$target"
+			git reset --hard HEAD
+			git clean -f -d
+		) >/dev/null
+	fi
+}
+
+find_pkg_dependant_sources() {
+	local pkg
+
+	find_pkg_dependant_ipks "$@" | while read pkg; do
+		sed -ne "s!^package-\$(CONFIG_PACKAGE_${pkg}) += .\+/!!p" "$CACHE_DIR/sdk/$target/tmp/.packagedeps"
+	done | sort -u
+}
+
+find_pkg_dependant_ipks() {
+	local target="$1" pkg="$2" deps="" dep
+
+	if [ $do_dependants -gt 0 ]; then
+		for dep in $(zcat "$CACHE_DIR/repo-remote/$target/packages"/*/Packages.gz | \
+			grep -B2 -E "^Depends:.* ${pkg%%:*}(,|\$)" | sed -ne 's!^Package: !!p'); do
+			deps="$deps$N$dep"
+		done
+	fi
+
+	echo "${pkg%%:*}$deps" | sort -u
+}
+
+find_source_provided_pkgs() {
+	local pkg="$1"
+
+	find "$CACHE_DIR/repo-remote/" -name Packages.gz | xargs zcat | \
+		grep -B3 -E "^Source: (.+/)?$pkg\$" | sed -ne 's!^Package: !!p' | \
+		sort -u
+}
+
+install_sdk_feeds() {
+	local pkg feed target="$1"; shift
+
+	echo " * [$slot:$target] Installing packages"
+
+	(
+		flock -x 8
+
+		cd "$CACHE_DIR/sdk/$target"
+
+		if [ ! -s "feeds.conf" ]; then
+			if ! grep -sq " base " "feeds.conf.default"; then
+				sed -e '/oldpackages/ { p; s!oldpackages!base!; s!packages.git!openwrt.git! }' \
+					feeds.conf.default > feeds.conf
+			else
+				cp feeds.conf.default feeds.conf
+			fi
+		fi
+
+		./scripts/feeds update >/dev/null
+
+		echo " * [$slot:$target] feeds install"
+		for pkg in "$@"; do
+			case "$pkg" in
+				*:*) feed="${pkg#*:}"; pkg="${pkg%%:*}" ;;
+				*) feed="" ;;
+			esac
+
+			find_pkg_dependant_ipks "$target" "$pkg" | while read pkg; do
+				#echo " * [$slot:$target] feeds install $pkg"
+				#./scripts/feeds install ${feed:+ -p "$feed"} "$pkg" >/dev/null
+				echo "$pkg"
+			done
+		done | sort -u | xargs ./scripts/feeds install >/dev/null
+
+		sed -i -e "/CONFIG_PACKAGE_/d" .config
+		echo "CONFIG_ALL=y" >> .config
+		make defconfig >/dev/null
+	) 8>"$CACHE_DIR/feeds.lock" 2>/dev/null
+}
+
+compile_sdk_packages() {
+	local pkg feed target="$1"; shift
+
+	echo " * [$slot:$target] Compiling packages"
+
+	for pkg in "$@"; do
+		find_pkg_dependant_sources "$target" "$pkg"
+	done | sort -u | while read pkg; do
+		echo " * [$slot:$target] make package/$pkg/download"
+		(
+			flock -x 9
+
+			cd "$CACHE_DIR/sdk/$target"
+			if ! make "package/$pkg/download" >/dev/null 2>/dev/null; then
+				echo " * [$slot:$target] make package/$pkg/download - FAILED!"
+			fi
+		) 9>"$CACHE_DIR/download.lock" 2>/dev/null
+
+		echo " * [$slot:$target] make package/$pkg/compile"
+		(
+			cd "$CACHE_DIR/sdk/$target"
+			if ! make "package/$pkg/compile" IGNORE_ERRORS=y >/dev/null 2>/dev/null; then
+				echo " * [$slot:$target] make package/$pkg/compile - FAILED!"
+			fi
+		)
+	done
+
+	for pkg in "$@"; do
+		find_pkg_dependant_ipks "$target" "$pkg"
+	done | sort -u | while read pkg; do
+		for pkg in "$CACHE_DIR/sdk/$target/bin"/*/packages/*/"${pkg}"_[^_]*_[^_]*.ipk; do
+			if [ -s "$pkg" ]; then
+				feed="${pkg%/*}"; feed="${feed##*/}"
+				mkdir -p "$CACHE_DIR/repo-local/$target/packages/$feed"
+				cp -a "$pkg" "$CACHE_DIR/repo-local/$target/packages/$feed/"
+			else
+				echo " * [$slot:$target] $pkg - MISSING!"
+			fi
+		done
+	done
+}
+
+find_remote_pkg_feed() {
+	local feed target="$1" pkg="$2"
+
+	for feed in $(fetch_remote_feeds "$target"); do
+		if zcat "$CACHE_DIR/repo-remote/$target/packages/$feed/Packages.gz" | grep -qE "^Package: ${pkg%%:*}\$"; then
+			echo "$feed"
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+find_local_pkg_feed() {
+	local feed file target="$1" pkg="$2"
+
+	for feed in $(fetch_remote_feeds "$target"); do
+		for file in "$CACHE_DIR/repo-local/$target/packages/$feed/${pkg%%:*}"_[^_]*_[^_]*.ipk; do
+			if [ -s "$file" ]; then
+				echo "$feed"
+				return 0
+			fi
+		done
+	done
+
+	return 1
+}
+
+patch_index_cmd() {
+	local target="$1" feed="$2"; shift; shift
+	local idir="$CACHE_DIR/repo-remote/$target/packages/$feed"
+	local odir="$CACHE_DIR/repo-local/$target/packages/$feed"
+
+	if [ ! -s "$odir/Packages" ]; then
+		mkdir -p "$odir"
+		zcat "$idir/Packages.gz" > "$odir/Packages"
+	fi
+
+	./bin/patch-index.pl --index "$odir/Packages" "$@" > "$odir/Packages.$$"
+
+	mv "$odir/Packages.$$" "$odir/Packages"
+}
+
+patch_indexes() {
+	local target="$1" feed pkg dir; shift
+
+	echo " * [$slot:$target] Patching repository index"
+
+	for pkg in "$@"; do
+		find_pkg_dependant_ipks "$target" "$pkg" | while read pkg; do
+			feed="$(find_remote_pkg_feed "$target" "$pkg")"
+			[ -n "$feed" ] && patch_index_cmd "$target" "$feed" \
+				--remove "${pkg%%:*}"
+
+			feed="$(find_local_pkg_feed "$target" "$pkg")"
+			[ -n "$feed" ] && patch_index_cmd "$target" "$feed" \
+				--add "$CACHE_DIR/repo-local/$target/packages/$feed/${pkg%%:*}"_*.ipk
+		done
+	done
+
+	for feed in $(fetch_remote_feeds "$target"); do
+		dir="$CACHE_DIR/repo-local/$target/packages/$feed"
+		if [ -s "$dir/Packages" ]; then
+			gzip -c -9 "$dir/Packages" > "$dir/Packages.gz"
+		fi
+	done
+}
+
+rsync_delete_remote() {
+	local target="$1" feed name pkg dep include line; shift
+
+	for feed in $(fetch_remote_feeds "$target"); do
+		include=""
+
+		for pkg in "$@"; do
+			for dep in $(find_pkg_dependant_ipks "$target" "$pkg"); do
+				name="$(zcat "$CACHE_DIR/repo-remote/$target/packages/$feed/Packages.gz" | \
+					sed -ne "s/Filename: \\(${dep%%:*}_.\\+\\.ipk\\)\$/\1/p")"
+
+				include="${include:+$include }${name:+--include=$name}"
+			done
+		done
+
+		if [ -n "$include" ]; then
+			mkdir -p "$CACHE_DIR/empty"
+			call_rsync -rv --delete $include --exclude="*" "$CACHE_DIR/empty/" "${UL_URL#file:}/$target/packages/$feed/" 2>&1 | \
+				grep "deleting " | while read line; do
+					echo " * [$slot:$target] rsync: $line"
+				done
+		fi
+	done
+}
+
+rsync_files() {
+	local target="$1" line; shift
+
+	case "$UL_URL" in
+		http:*|https:*|ftp:*)
+			echo "* HTTP/FTP upload not supported!"
+			exit 0
+		;;
+	esac
+
+	echo " * [$slot:$target] Syncing files"
+
+	rsync_delete_remote "$target" "$@"
+	call_rsync -rv "$CACHE_DIR/repo-local/$target/packages/" "${UL_URL#file:}/$target/packages/" 2>&1 | \
+		grep "/" | while read line; do
+			echo " * [$slot:$target] rsync: $line"
+		done
+}
+
+run_jobs() {
+	local targets=$(fetch_remote_targets)
+	local target slot count job
+
+	#echo "* Compiling packages"
+
+	for slot in $(seq 0 $((num_jobs-1))); do (
+		count=1; for target in $targets; do
+			if [ $((count++ % $num_jobs)) -eq $slot ]; then
+				if [ $do_build -gt 0 ]; then
+					prepare_sdk "$target"
+					install_sdk_feeds "$target" "$@"
+					compile_sdk_packages "$target" "$@"
+				fi
+
+				if [ $do_index -gt 0 ]; then
+					patch_indexes "$target" "$@"
+				fi
+
+				if [ $do_rsync -gt 0 ]; then
+					rsync_files "$target" "$@"
+				fi
+			fi
+		done
+	) & done
+
+	for job in $(jobs -p); do
+		wait "$job"
+		echo "* Job $job completed"
+	done
+}
diff --git a/pkgupdate.sh b/pkgupdate.sh
index 91cd134..4513a6d 100755
--- a/pkgupdate.sh
+++ b/pkgupdate.sh
@@ -1,32 +1,6 @@
 #!/bin/bash
 
-
-#DL_URL="https://downloads.openwrt.org/barrier_breaker/14.07"
-#DL_URL="file:///BB/sync/barrier_breaker/14.07"
-DL_URL="openwrt@downloads.openwrt.org:barrier_breaker/14.07"
-UL_URL="openwrt@downloads.openwrt.org:barrier_breaker/14.07"
-
-IDENT="/home/jow/.ssh/id_rsa_openwrt_rsync"
-
-N="
-"
-
-tmp="/home/jow/relman/.cache"
-
-mkdir -p "$tmp"
-
-call_rsync() {
-	LC_ALL=C rsync ${IDENT+-e "ssh -i $IDENT"} "$@"
-}
-
-cache_rsync_files() {
-	if [ ! -d "$tmp/rsync" ] || [ $do_update -gt 0 -a ! -e "$tmp/.rsync-updated" ]; then
-		mkdir -p "$tmp/rsync"
-		touch "$tmp/.rsync-updated"
-		call_rsync -avz --delete -m --include='*/' --include='**/Packages.gz' --include='**/OpenWrt-SDK-*.tar.bz2' --exclude='*' \
-			"$DL_URL/" "$tmp/rsync/" >/dev/null 2>/dev/null
-	fi
-}
+. ./bin/functions.sh
 
 terminate() {
 	local jobs="$(jobs -p)"
@@ -37,425 +11,6 @@ terminate() {
 	exit 1
 }
 
-fetch_remote() {
-	case "$1" in
-		file:*)
-			cat "${1#file:}"
-		;;
-		http:*|https:*|ftp:*)
-			wget -qO- "$1"
-		;;
-		*)
-			cache_rsync_files
-			cat "$tmp/rsync${1#$DL_URL}"
-		;;
-	esac
-}
-
-fetch_remote_dirlist() {
-	local entry
-
-	case "$1" in
-		file:*)
-			/bin/ls -1 "${1#file:}" | while read entry; do
-				if [ -d "${1#file:}/$entry" ]; then
-					echo "$entry"
-				fi
-			done
-		;;
-		http:*|https:*|ftp:*)
-			wget -qO- "$1" | sed -ne 's,^<a href="\(.\+\)/".\+$,\1,p'
-		;;
-		*)
-			cache_rsync_files
-			/bin/ls -1 "$tmp/rsync${1#$DL_URL}" | while read entry; do
-				if [ -d "$tmp/rsync${1#$DL_URL}/$entry" ]; then
-					echo "$entry"
-				fi
-			done
-		;;
-	esac
-}
-
-fetch_remote_filelist() {
-	local entry
-
-	case "$1" in
-		file:*)
-			/bin/ls -1 "${1#file:}" | while read entry; do
-				if [ -f "${1#file:}/$entry" ]; then
-					echo "$entry"
-				fi
-			done
-		;;
-		http:*|https:*|ftp:*)
-			wget -qO- "$1" | sed -ne 's,^<a href="\(.\+[^/]\)".\+$,\1,p'
-		;;
-		*)
-			cache_rsync_files
-			/bin/ls -1 "$tmp/rsync${1#$DL_URL}" | while read entry; do
-				if [ -f "$tmp/rsync${1#$DL_URL}/$entry" ]; then
-					echo "$entry"
-				fi
-			done
-		;;
-	esac
-}
-
-fetch_remote_targets() {
-	local target subtarget
-
-	if [ -n "$use_targets" ]; then
-		for target in $use_targets; do
-			echo "$target"
-		done
-		return 0
-	fi
-
-	if [ ! -s "$tmp/targets.lst" ]; then
-		fetch_remote_dirlist "$DL_URL" | while read target; do
-			[ "$target" = "logs" ] && continue
-			fetch_remote_dirlist "$DL_URL/$target" | while read subtarget; do
-				echo "$target/$subtarget" >> "$tmp/targets.lst"
-			done
-		done
-	fi
-
-	cat "$tmp/targets.lst"
-	return 0
-}
-
-fetch_remote_feeds() {
-	local target
-
-	if [ ! -s "$tmp/feeds.lst" ]; then
-		fetch_remote_targets | while read target; do
-			fetch_remote_dirlist "$DL_URL/$target/packages" > "$tmp/feeds.lst"
-			break
-		done
-	fi
-
-	cat "$tmp/feeds.lst"
-	return 0
-}
-
-fetch_remote_index() {
-	local target feed
-
-	echo "Fetching remote package indizes..."
-
-	fetch_remote_targets | while read target; do
-		fetch_remote_feeds | while read feed; do
-			if [ ! -s "$tmp/repo-remote/$target/packages/$feed/Packages.gz" ]; then
-				echo " * $target $feed"
-				mkdir -p "$tmp/repo-remote/$target/packages/$feed"
-				fetch_remote "$DL_URL/$target/packages/$feed/Packages.gz" \
-					> "$tmp/repo-remote/$target/packages/$feed/Packages.gz"
-			fi
-		done
-	done
-}
-
-fetch_remote_sdk() {
-	local target="$1" sdk
-
-	if [ ! -s "$tmp/repo-remote/$target/sdk.tar.bz2" ]; then
-		fetch_remote_filelist "$DL_URL/$target" | while read sdk; do
-			case "$sdk" in OpenWrt-SDK-*.tar.bz2)
-				echo " * [$slot:$target] Fetching $sdk"
-				mkdir -p "$tmp/repo-remote/$target"
-				fetch_remote "$DL_URL/$target/$sdk" > "$tmp/repo-remote/$target/sdk.tar.bz2"
-			;; esac
-		done
-	fi
-}
-
-prepare_sdk() {
-	local target="$1"
-
-	if [ ! -d "$tmp/sdk/$target/.git" ]; then
-		echo " * [$slot:$target] Initializing SDK"
-
-		fetch_remote_sdk "$target"
-
-		rm -rf "$tmp/sdk/$target"
-		mkdir -p "$tmp/sdk/$target"
-		tar --strip-components=1 -C "$tmp/sdk/$target" -xjf "$tmp/repo-remote/$target/sdk.tar.bz2"
-
-		mkdir -p "$tmp/dl"
-		rm -rf "$tmp/sdk/$target/dl"
-		ln -sf "$tmp/dl" "$tmp/sdk/$target/dl"
-
-		mkdir -p "$tmp/feeds"
-		rm -rf "$tmp/sdk/$target/feeds"
-		ln -sf "$tmp/feeds" "$tmp/sdk/$target/feeds"
-
-		(
-			cd "$tmp/sdk/$target"
-			git init .
-			find . -maxdepth 1 | xargs git add
-			git commit -m "Snapshot"
-		) >/dev/null
-	elif [ $do_clean -gt 0 ]; then
-		echo " * [$slot:$target] Resetting SDK"
-
-		(
-			cd "$tmp/sdk/$target"
-			git reset --hard HEAD
-			git clean -f -d
-		) >/dev/null
-	fi
-}
-
-find_pkg_dependant_sources() {
-	local pkg
-
-	find_pkg_dependant_ipks "$@" | while read pkg; do
-		sed -ne "s!^package-\$(CONFIG_PACKAGE_${pkg}) += .\+/!!p" "$tmp/sdk/$target/tmp/.packagedeps"
-	done | sort -u
-}
-
-find_pkg_dependant_ipks() {
-	local target="$1" pkg="$2" deps="" dep
-
-	if [ $do_dependants -gt 0 ]; then
-		for dep in $(zcat "$tmp/repo-remote/$target/packages"/*/Packages.gz | \
-			grep -B2 -E "^Depends:.* ${pkg%%:*}(,|\$)" | sed -ne 's!^Package: !!p'); do
-			deps="$deps$N$dep"
-		done
-	fi
-
-	echo "${pkg%%:*}$deps" | sort -u
-}
-
-find_source_provided_pkgs() {
-	local pkg="$1"
-
-	find "$tmp/repo-remote/" -name Packages.gz | xargs zcat | \
-		grep -B3 -E "^Source: (.+/)?$pkg\$" | sed -ne 's!^Package: !!p' | \
-		sort -u
-}
-
-install_sdk_feeds() {
-	local pkg feed target="$1"; shift
-
-	echo " * [$slot:$target] Installing packages"
-
-	(
-		flock -x 8
-
-		cd "$tmp/sdk/$target"
-
-		if [ ! -s "feeds.conf" ]; then
-			if ! grep -sq " base " "feeds.conf.default"; then
-				sed -e '/oldpackages/ { p; s!oldpackages!base!; s!packages.git!openwrt.git! }' \
-					feeds.conf.default > feeds.conf
-			else
-				cp feeds.conf.default feeds.conf
-			fi
-		fi
-
-		./scripts/feeds update >/dev/null
-
-		echo " * [$slot:$target] feeds install"
-		for pkg in "$@"; do
-			case "$pkg" in
-				*:*) feed="${pkg#*:}"; pkg="${pkg%%:*}" ;;
-				*) feed="" ;;
-			esac
-
-			find_pkg_dependant_ipks "$target" "$pkg" | while read pkg; do
-				#echo " * [$slot:$target] feeds install $pkg"
-				#./scripts/feeds install ${feed:+ -p "$feed"} "$pkg" >/dev/null
-				echo "$pkg"
-			done
-		done | sort -u | xargs ./scripts/feeds install >/dev/null
-
-		sed -i -e "/CONFIG_PACKAGE_/d" .config
-		echo "CONFIG_ALL=y" >> .config
-		make defconfig >/dev/null
-	) 8>"$tmp/feeds.lock" 2>/dev/null
-}
-
-compile_sdk_packages() {
-	local pkg feed target="$1"; shift
-
-	echo " * [$slot:$target] Compiling packages"
-
-	for pkg in "$@"; do
-		find_pkg_dependant_sources "$target" "$pkg"
-	done | sort -u | while read pkg; do
-		echo " * [$slot:$target] make package/$pkg/download"
-		(
-			flock -x 9
-
-			cd "$tmp/sdk/$target"
-			if ! make "package/$pkg/download" >/dev/null 2>/dev/null; then
-				echo " * [$slot:$target] make package/$pkg/download - FAILED!"
-			fi
-		) 9>"$tmp/download.lock" 2>/dev/null
-
-		echo " * [$slot:$target] make package/$pkg/compile"
-		(
-			cd "$tmp/sdk/$target"
-			if ! make "package/$pkg/compile" IGNORE_ERRORS=y >/dev/null 2>/dev/null; then
-				echo " * [$slot:$target] make package/$pkg/compile - FAILED!"
-			fi
-		)
-	done
-
-	for pkg in "$@"; do
-		find_pkg_dependant_ipks "$target" "$pkg"
-	done | sort -u | while read pkg; do
-		for pkg in "$tmp/sdk/$target/bin"/*/packages/*/"${pkg}"_[^_]*_[^_]*.ipk; do
-			if [ -s "$pkg" ]; then
-				feed="${pkg%/*}"; feed="${feed##*/}"
-				mkdir -p "$tmp/repo-local/$target/packages/$feed"
-				cp -a "$pkg" "$tmp/repo-local/$target/packages/$feed/"
-			else
-				echo " * [$slot:$target] $pkg - MISSING!"
-			fi
-		done
-	done
-}
-
-find_remote_pkg_feed() {
-	local feed target="$1" pkg="$2"
-
-	while read feed; do
-		if zcat "$tmp/repo-remote/$target/packages/$feed/Packages.gz" | grep -qE "^Package: ${pkg%%:*}\$"; then
-			echo "$feed"
-			return 0
-		fi
-	done < "$tmp/feeds.lst"
-
-	return 1
-}
-
-find_local_pkg_feed() {
-	local feed file target="$1" pkg="$2"
-
-	while read feed; do
-		for file in "$tmp/repo-local/$target/packages/$feed/${pkg%%:*}"_[^_]*_[^_]*.ipk; do
-			if [ -s "$file" ]; then
-				echo "$feed"
-				return 0
-			fi
-		done
-	done < "$tmp/feeds.lst"
-
-	return 1
-}
-
-patch_index_cmd() {
-	local target="$1" feed="$2"; shift; shift
-	local idir="$tmp/repo-remote/$target/packages/$feed"
-	local odir="$tmp/repo-local/$target/packages/$feed"
-
-	if [ ! -s "$odir/Packages" ]; then
-		mkdir -p "$odir"
-		zcat "$idir/Packages.gz" > "$odir/Packages"
-	fi
-
-	./bin/patch-index.pl --index "$odir/Packages" "$@" > "$odir/Packages.$$"
-
-	mv "$odir/Packages.$$" "$odir/Packages"
-}
-
-patch_indexes() {
-	local target="$1" feed pkg dir; shift
-
-	echo " * [$slot:$target] Patching repository index"
-
-	for pkg in "$@"; do
-		find_pkg_dependant_ipks "$target" "$pkg" | while read pkg; do
-			feed="$(find_remote_pkg_feed "$target" "$pkg")"
-			[ -n "$feed" ] && patch_index_cmd "$target" "$feed" \
-				--remove "${pkg%%:*}"
-
-			feed="$(find_local_pkg_feed "$target" "$pkg")"
-			[ -n "$feed" ] && patch_index_cmd "$target" "$feed" \
-				--add "$tmp/repo-local/$target/packages/$feed/${pkg%%:*}"_*.ipk
-		done
-	done
-
-	while read feed; do
-		dir="$tmp/repo-local/$target/packages/$feed"
-		if [ -s "$dir/Packages" ]; then
-			gzip -c -9 "$dir/Packages" > "$dir/Packages.gz"
-		fi
-	done < "$tmp/feeds.lst"
-}
-
-rsync_delete_remote() {
-	local target="$1" feed name pkg dep include line; shift
-
-	while read feed; do
-		include=""
-
-		for pkg in "$@"; do
-			for dep in $(find_pkg_dependant_ipks "$target" "$pkg"); do
-				name="$(zcat "$tmp/repo-remote/$target/packages/$feed/Packages.gz" | \
-					sed -ne "s/Filename: \\(${dep%%:*}_.\\+\\.ipk\\)\$/\1/p")"
-
-				include="${include:+$include }${name:+--include=$name}"
-			done
-		done
-
-		if [ -n "$include" ]; then
-			mkdir -p "$tmp/empty"
-			call_rsync -rv --delete $include --exclude="*" "$tmp/empty/" "$UL_URL/$target/packages/$feed/" 2>&1 | \
-				grep "deleting " | while read line; do
-					echo " * [$slot:$target] rsync: $line"
-				done
-		fi
-	done < "$tmp/feeds.lst"
-}
-
-rsync_files() {
-	local target="$1" line; shift
-
-	echo " * [$slot:$target] Syncing files"
-
-	rsync_delete_remote "$target" "$@"
-	call_rsync -rv "$tmp/repo-local/$target/packages/" "$UL_URL/$target/packages/" 2>&1 | \
-		grep "/" | while read line; do
-			echo " * [$slot:$target] rsync: $line"
-		done
-}
-
-run_jobs() {
-	local targets=$(fetch_remote_targets)
-	local target slot count job
-
-	#echo "* Compiling packages"
-
-	for slot in $(seq 0 $((num_jobs-1))); do (
-		count=1; for target in $targets; do
-			if [ $((count++ % $num_jobs)) -eq $slot ]; then
-				if [ $do_build -gt 0 ]; then
-					prepare_sdk "$target"
-					install_sdk_feeds "$target" "$@"
-					compile_sdk_packages "$target" "$@"
-				fi
-
-				if [ $do_index -gt 0 ]; then
-					patch_indexes "$target" "$@"
-				fi
-
-				if [ $do_rsync -gt 0 ]; then
-					rsync_files "$target" "$@"
-				fi
-			fi
-		done
-	) & done
-
-	for job in $(jobs -p); do
-		wait "$job"
-		echo "* Job $job completed"
-	done
-}
-
 trap terminate INT TERM
 
 do_clean=0
@@ -508,6 +63,12 @@ $0 {-a|-c|-i|-r} [-j jobs] -p package [-p package ...]
   -t target
      Restrict operation to given targets.
 
+  -D
+     Print download URL and exit.
+
+  -U
+     Print upload URL and exit.
+
 	EOT
 	exit 1
 }
@@ -537,14 +98,15 @@ done
 
 if [ $do_clean -gt 0 ]; then
 	echo "* Purging local cache"
-	rm -rf "$tmp/repo-local"
+	rm -rf "$CACHE_DIR/repo-local"
 fi
 
-if [ $do_update -gt 0 ] || [ ! -s "$tmp/targets.lst" ]; then
+if [ $do_update -gt 0 ] || [ ! -d "$CACHE_DIR/mirror" ]; then
+	mkdir -p "$CACHE_DIR"
 	echo "* Preparing metadata"
-	rm -f "$tmp/targets.lst" "$tmp/feeds.lst" "$tmp/.rsync-updated"
-	rm -rf "$tmp/repo-remote"/*/*/packages
-	fetch_remote_index >/dev/null
+	rm -f "$CACHE_DIR/.mirrored"
+	rm -rf "$CACHE_DIR/repo-remote"/*/*/packages
+	fetch_remote_index
 fi
 
 if [ -n "$use_sources" ]; then
-- 
cgit v1.2.3