X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=modules%2Fapprox.mk;h=0847c0bf6036bb6a4b86c16a81d53dbfa7c1ae78;hb=26f60dd8e15bd0006b1db60984bf4b65f069f95f;hp=471cf31775277e12f8eaac67465dbf5b05399a5a;hpb=4fc67370f4e8f6dc720fd7a7cd110439acc3ad4b;p=blast

diff --git a/modules/approx.mk b/modules/approx.mk
index 471cf31..0847c0b 100644
--- a/modules/approx.mk
+++ b/modules/approx.mk
@@ -3,23 +3,33 @@ ${SOURCES}
 endef
 export approx_original_sources
 
+ifndef approxhost
+  approxhost := localhost
+endif
+
+approxrepos := main
+approxrepos += $(findstring contrib, ${SOURCES})
+approxrepos += $(findstring non-free-fimware, ${SOURCES})
+#approxrepos += $(findstring non-free, ${SOURCES})
+
 ifdef approx
   BOOTSTRAP := ${approx}
   define SOURCES =
-  deb ${approx} ${release} main
+  deb ${approx} ${release} ${approxrepos}
+  deb ${approx} ${release}-backports ${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 ${release} main
+  deb http://${approxhost}/debian ${release} ${approxrepos}
   endef
 endif
 
@@ -27,3 +37,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