fixed approx config for raspi

[blast] / modules / approx.mk

diff --git a/modules/approx.mk b/modules/approx.mk
index 05bda84badab938ea853b98b93fb71e69c260b17..b4be5c19958fba46c00c509f086fcfe0872e43e8 100644 (file)
--- a/modules/approx.mk
+++ b/modules/approx.mk
@@ -7,13 +7,17 @@ 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://${approxhost}/raspbian  stretch main non-free firmware rpi
   deb http://${approxhost}/rpidebian stretch main
@@ -21,9 +25,9 @@ else ifdef raspi
   deb http://${approxhost}/rpidebian buster main
   endef
 else
-  BOOTSTRAP := http://localhost/debian
+  BOOTSTRAP := http://${approxhost}/debian
   define SOURCES :=
-  deb http://${approxhost}/debian ${release} main
+  deb http://${approxhost}/debian ${release} ${approxrepos}
   endef
 endif