Allow different repos for different releases
authorDaniel Abrecht <public@danielabrecht.ch>
Wed, 13 Mar 2019 18:40:36 +0000 (19:40 +0100)
committerDaniel Abrecht <public@danielabrecht.ch>
Wed, 13 Mar 2019 18:40:36 +0000 (19:40 +0100)
chroot-build-helper/makefile
config/defaults.mk
src/make-helper-functions.mk

index 529c3a79ecac56a18a784d869fd91c985bdc3717..7a469e17f4db592eeb4f623cfb24a480eea4d8ae 100644 (file)
@@ -79,7 +79,7 @@ clean-repo: clean-repo@flash-kernel
 reset-repo: reset-repo@flash-kernel
 
 clean-buildenv:
-       $(SETUPBUILDENV) uexec rm -rf "$(CURDIR)/build-env/"
+       $(SETUPBUILDENV) uexec rm -rf "$(CURDIR)/build-env/$(RELEASE)"
 
 clean-build:
        rm -rf bin/$(RELEASE)
index 11a47cc673b8dd09d2ae5eef1e83a81838a400e0..1e18a716711ab58ae077c4df7724bdd1a39a4f57 100644 (file)
@@ -4,6 +4,15 @@ RELEASE = ascii
 REPO = http://pkgmaster.devuan.org/merged/
 CHROOT_REPO = $(REPO)
 
+REPO-devuan = http://pkgmaster.devuan.org/merged/
+REPO-debian = http://deb.debian.org/debian
+
+REPO-ascii = $(REPO-devuan)
+REPO-beowulf = $(REPO-devuan)
+
+REPO-stretch = $(REPO-debian)
+REPO-buster = $(REPO-debian)
+
 IMAGE_NAME = devuan-$(RELEASE)-librem5-$(BOARD)-base.img
 
 CROSS_COMPILER = aarch64-linux-gnu-
index 96d33a9b27869925178bb586ea7963980a6b56eb..c4e08930cae934c57f4fcef3bde18447a8aca01d 100644 (file)
@@ -27,6 +27,14 @@ ifeq ($(shell test -e "$(project_root)/config/userdefined.mk" && echo -n yes),ye
 include $(project_root)/config/userdefined.mk
 endif
 
+ifdef REPO-$(RELEASE)
+  REPO = $(REPO-$(RELEASE))
+endif
+
+ifdef CHROOT_REPO-$(RELEASE)
+  CHROOT_REPO = $(CHROOT_REPO-$(RELEASE))
+endif
+
 CONFIG_VARS := $(sort $(filter-out $(VARS_OLD) VARS_OLD,$(subst %,,$(subst *,,$(.VARIABLES)))))
 IMGSIZE := $(shell echo "$(IMGSIZE)" | sed 's/\s*//g')
 export $(CONFIG_VARS)