fixed approx config for raspi

[blast] / modules / approx.mk

diff --git a/modules/approx.mk b/modules/approx.mk
index 8e4fd78f4e9a40f0f8a08c24fb8d41c39f133e38..b4be5c19958fba46c00c509f086fcfe0872e43e8 100644 (file)
--- a/modules/approx.mk
+++ b/modules/approx.mk
@@ -3,21 +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} ${release} main
+  deb ${approx} ${release} ${approxrepos}
   endef
 else ifdef raspi
-  BOOTSTRAP := http://localhost/raspbian
+  BOOTSTRAP := http://${approxhost}/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
+  BOOTSTRAP := http://${approxhost}/debian
   define SOURCES :=
-  deb http://localhost/debian ${release} main
+  deb http://${approxhost}/debian ${release} ${approxrepos}
   endef
 endif
 
@@ -25,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