X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=modules%2Fapprox.mk;h=f7541d7d231d3cde159a4882e0101d9a4d4240d8;hb=8f6632a5c86f893dc95502d91b1012d7749e6799;hp=009e445908aad7ecdedc522294adf49d6ea97ede;hpb=94825873e9d1651ddd885049306cb44319bf9f41;p=blast

diff --git a/modules/approx.mk b/modules/approx.mk
index 009e445..f7541d7 100644
--- a/modules/approx.mk
+++ b/modules/approx.mk
@@ -3,27 +3,31 @@ ${SOURCES}
 endef
 export approx_original_sources
 
+ifndef approxhost
+  approxhost := localhost
+endif
+
+approxrepos := main
+approxrepos += $(findstring contrib, ${SOURCES})
+approxrepos += $(findstring non-free, ${SOURCES})
+
 ifdef approx
   BOOTSTRAP := ${approx}
   define SOURCES =
-  deb ${approx} stretch main
-  deb ${approx} buster main
-  deb ${approx} ${release} main
+  deb ${approx} ${release} ${approxrepos}
   endef
 else ifdef raspi
   BOOTSTRAP := http://localhost/raspbian
   define SOURCES :=
-  deb http://localhost/raspbian  stretch main non-free firmware rpi
-  deb http://localhost/rpidebian stretch main
-  deb http://localhost/raspbian  buster main non-free firmware rpi
-  deb http://localhost/rpidebian buster main
+  deb http://${approxhost}/raspbian  stretch main non-free firmware rpi
+  deb http://${approxhost}/rpidebian stretch main
+  deb http://${approxhost}/raspbian  buster main non-free firmware rpi
+  deb http://${approxhost}/rpidebian buster main
   endef
 else
   BOOTSTRAP := http://localhost/debian
   define SOURCES :=
-  deb http://localhost/debian stretch main
-  deb http://localhost/debian buster main
-  deb http://localhost/debian ${release} main
+  deb http://${approxhost}/debian ${release} ${approxrepos}
   endef
 endif
 
@@ -31,3 +35,4 @@ endif
 _config: _approx_restore_sources
 _approx_restore_sources: ${CFGROOT}
 	printf '%s\n' "$${approx_original_sources}" >"$${CFGROOT}/etc/apt/sources.list"
+	-chroot "$${CFGROOT}" apt-get update