X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=modules%2Fapprox.mk;h=e221b0381c0cc18a393b1c3a5b6bab0c0959f7e5;hb=88d37d0badc90c2185205353edc541c89975b3b8;hp=8e4fd78f4e9a40f0f8a08c24fb8d41c39f133e38;hpb=23d0b46966959d04e3d99010b22a24e36b73d6a7;p=blast

diff --git a/modules/approx.mk b/modules/approx.mk
index 8e4fd78..e221b03 100644
--- a/modules/approx.mk
+++ b/modules/approx.mk
@@ -3,21 +3,32 @@ ${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} ${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 ${release} main non-free firmware rpi
-  deb http://localhost/rpidebian ${release} 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
 
@@ -25,3 +36,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