From a92a5aee8dafe76cd0605d82521b0bd2b35c5204 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Sun, 21 May 2017 19:11:10 +0200
Subject: [PATCH] apt caching proof of concept

---
 apt-cache/Packages.gz | Bin 0 -> 29 bytes
 config                |   7 +++--
 zlibs/bootstrap       |   2 --
 zlibs/helpers         |  60 ++++++++++++++++++++++++++++++++++++++++--
 zlibs/iso             |   1 -
 zlibs/sysconf         |   2 ++
 6 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 apt-cache/Packages.gz

diff --git a/apt-cache/Packages.gz b/apt-cache/Packages.gz
new file mode 100644
index 0000000000000000000000000000000000000000..743bcb193a99e17aeb746502e0185c07f8ebf534
GIT binary patch
literal 29
dcmb2|=HR$}OfiyyIUq4PJ25@An1PuA1^{<K1^WO1

literal 0
HcmV?d00001

diff --git a/config b/config
index 5d69023..ca7c948 100644
--- a/config
+++ b/config
@@ -20,15 +20,18 @@
 ## libdevuansdk configuration
 
 vars+=(release version mirror section blend_name image_name vm_name)
-vars+=(arch earch)
+vars+=(arch earch aptcachedir APT_CACHE)
 vars+=(usercredentials rootcredentials)
 
 arrs+=(core_packages base_packages purge_packages blend_packages)
 
+## enable local apt cache
+APT_CACHE=1
+aptcachedir="$LIBPATH/apt-cache"
 
 os="devuan"
 release="jessie"
-version="1.0.0-RC2"
+version="1.0.0"
 mirror="http://auto.mirror.devuan.org/merged"
 section="main"
 
diff --git a/zlibs/bootstrap b/zlibs/bootstrap
index 3e0b544..2cb0774 100644
--- a/zlibs/bootstrap
+++ b/zlibs/bootstrap
@@ -100,7 +100,6 @@ apt-get --yes --force-yes install ${core_packages}
 apt-get --yes --force-yes install ${base_packages}
 apt-get --yes --force-yes purge  ${purge_packages}
 apt-get --yes --force-yes autoremove
-apt-get clean
 
 rm -f /debconf.set
 rm -f /etc/ssh/ssh_host_*
@@ -174,7 +173,6 @@ done
 apt-get --yes --force-yes upgrade
 apt-get --yes --force-yes install ${extra_packages}
 apt-get --yes --force-yes autoremove
-apt-get clean
 EOF
 
 	chroot-script -d postunpack || zerr
diff --git a/zlibs/helpers b/zlibs/helpers
index 6c0d61f..5be1093 100644
--- a/zlibs/helpers
+++ b/zlibs/helpers
@@ -60,6 +60,7 @@ build_iso_dist() {
 	iso_write_isolinux_cfg  || { zerr; wrapup }
 	#[[ $INSTALLER = 1 ]] && iso_setup_installer || zerr
 	blend_postinst          || { zerr; wrapup }
+	fill_apt_cache          || { zerr; wrapup }
 	iso_squash_strap        || { zerr; wrapup }
 	iso_xorriso_build       || { zerr; wrapup }
 }
@@ -257,7 +258,6 @@ for deb in ${custom_deb_packages}; do
 done
 cd /
 apt-get autoremove
-apt-get clean
 rm -rf /debs
 EOF
 	chroot-script install-debs
@@ -269,6 +269,7 @@ chroot-script() {
 	ckreq || return 1
 
 	mkdir -p "$R/log"
+
 	case "x$1" in
 		x-d)
 			local script="$2"
@@ -278,6 +279,7 @@ chroot-script() {
 			## logging
 			sudo sed -i "$strapdir/$script" \
 				-e 's@#!/bin/sh@#!/bin/sh\'$'\nset -x ; exec 2>/'$script'.log@'
+
 			notice "chrooting to execute $script..."
 			sudo chmod +x  "$strapdir/$script"    || zerr
 			sudo -E chroot "$strapdir" "/$script" || zerr
@@ -288,15 +290,18 @@ chroot-script() {
 			;;
 		*)
 			local script="$1"
+			[[ "$APT_CACHE" = 1 ]] && { aptcache on "$strapdir/mnt"  || zerr }
 
 			## logging
 			sudo sed -i "$strapdir/$script" \
 				-e 's@#!/bin/sh@#!/bin/sh\'$'\nset -x ; exec 2>/'$script'.log@'
 
 			notice "chrooting to execute $script..."
-			sudo chmod +x  "$strapdir/$script" || zerr
+			sudo chmod +x  "$strapdir/$script"    || zerr
 			sudo -E chroot "$strapdir" "/$script" || zerr
 			sudo mv -f "$strapdir/${script}.log" "$R/log/"
+
+			[[ "$APT_CACHE" = 1 ]] && { aptcache off "$strapdir/mnt" || zerr }
 			;;
 	esac
 
@@ -352,6 +357,57 @@ blend_postinst() {
 	return 0
 }
 
+aptcache() {
+	fn aptcache "$*"
+	req=(aptcachedir watdo werdo APT_CACHE)
+	local watdo="$1"
+	local werdo="$2"
+	ckreq || return 1
+
+	[[ $APT_CACHE = 1 ]] || return 0
+
+	case "$watdo" in
+		on)
+			act "mounting local apt cache"
+			sudo mount -o bind "$aptcachedir" "$werdo" || zerr
+			;;
+		off)
+			act "umounting local apt cache"
+			sudo umount "$werdo" || zerr
+			;;
+	esac
+}
+
+fill_apt_cache() {
+	fn fill_apt_cache
+	req=(strapdir APT_CACHE)
+	ckreq || return 1
+
+	[[ $APT_CACHE = 1 ]] || return 0
+
+	notice "filling local apt cache"
+
+	cat <<EOF | sudo tee ${strapdir}/fill-apt-cache >/dev/null
+#!/bin/sh
+
+# NOTE: do we need apt update or does it read the remote(s)?
+apt-get update
+apt-get install dpkg-dev
+
+cp -afv /var/cache/apt/archives/*.deb /mnt
+cd /mnt
+dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
+cd -
+
+apt-get purge dpkg-dev
+
+sed -i -e "@deb file:/mnt@d" /etc/apt/sources.list
+apt-get update
+
+EOF
+	chroot-script fill-apt-cache || zerr
+}
+
 silly() {
 	fn silly "$@"
 	local arg1="$1"
diff --git a/zlibs/iso b/zlibs/iso
index 15a24e2..3d68322 100644
--- a/zlibs/iso
+++ b/zlibs/iso
@@ -33,7 +33,6 @@ iso_prepare_strap() {
 apt-get update
 apt-get --yes --force-yes install dialog live-boot live-boot-initramfs-tools
 apt-get --yes --force-yes autoremove
-apt-get clean
 EOF
 
 	chroot-script -d isoprep    || zerr
diff --git a/zlibs/sysconf b/zlibs/sysconf
index df8d551..aa2e32e 100644
--- a/zlibs/sysconf
+++ b/zlibs/sysconf
@@ -118,6 +118,8 @@ conf_print_sourceslist() {
 	ckreq || return 1
 
 	cat <<EOF
+deb file:/mnt ./
+
 ## package repositories
 deb ${mirror} ${release} ${section}
 deb ${mirror} ${release}-updates ${section}