Add sdcard build to release builds
- Fix up multistrapping for local builds to read
RELEASE_NAME variable
Change-Id: I6f8df56391be0dddee8a33e18112905f1601b446
diff --git a/dist.mk b/dist.mk
index 78880dd..3233faf 100644
--- a/dist.mk
+++ b/dist.mk
@@ -23,6 +23,9 @@
DIST_BASENAME := enterprise-$(RELEASE_NAME)-$(DATESTAMP)
DIST_ZIPNAME := $(DISTDIR)/$(DIST_BASENAME).zip
DIST_SHA256NAME := $(DISTDIR)/$(DIST_BASENAME).sha256
+DIST_SD_BASENAME:= enterprise-$(RELEASE_NAME)-flashcard-$(DATESTAMP)
+DIST_SD_ZIPNAME := $(DISTDIR)/$(DIST_SD_BASENAME).zip
+DIST_SD_SHA256NAME := $(DISTDIR)/$(DIST_SD_BASENAME).sha256
DIST_FILES := \
$(PRODUCT_OUT)/boot_arm64.img \
@@ -36,12 +39,18 @@
$(ROOTDIR)/board/flash.sh \
$(ROOTDIR)/board/README
+DIST_SD_FILES := \
+ $(PRODUCT_OUT)/flashcard_arm64.img
+
package-images: $(DIST_ZIPNAME)
sign-images: $(DIST_SHA256NAME)
+package-sd-image: $(DIST_SD_ZIPNAME)
+sign-sd-image: $(DIST_SD_SHA256NAME)
dirs:
mkdir -p $(PRODUCT_OUT)/obj/DIST
mkdir -p $(PRODUCT_OUT)/obj/DIST/$(DIST_BASENAME)
+ mkdir -p $(PRODUCT_OUT)/obj/DIST/$(DIST_SD_BASENAME)
mkdir -p $(DISTDIR)
$(DIST_ZIPNAME): $(DIST_FILES) dirs
@@ -51,4 +60,11 @@
$(DIST_SHA256NAME): $(DIST_ZIPNAME) | dirs
sha256sum $(DIST_ZIPNAME) > $(DIST_SHA256NAME)
-.PHONY:: package-images sign-images dirs
+$(DIST_SD_ZIPNAME): $(DIST_SD_FILES) dirs
+ cp $(DIST_SD_FILES) $(PRODUCT_OUT)/obj/DIST/$(DIST_SD_BASENAME)
+ pushd $(PRODUCT_OUT)/obj/DIST; zip -9r $(DIST_SD_ZIPNAME) $(DIST_SD_BASENAME); popd
+
+$(DIST_SD_SHA256NAME): $(DIST_SD_ZIPNAME) | dirs
+ sha256sum $(DIST_SD_ZIPNAME) > $(DIST_SD_SHA256NAME)
+
+.PHONY:: package-images sign-images package-sd-image sign-sd-image dirs
diff --git a/multistrap-jenkins.conf b/multistrap-jenkins.conf
deleted file mode 100644
index 43fc4bd..0000000
--- a/multistrap-jenkins.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-[General]
-arch=USERSPACE_ARCH
-cleanup=true
-unpack=true
-bootstrap=main bsp edgetpu
-aptsources=main bsp edgetpu
-noauth=true
-
-[main]
-packages=MAIN_PACKAGES
-source=https://mendel-linux.org/apt/RELEASE_NAME
-suite=RELEASE_NAME
-
-[bsp]
-packages=
-source=https://mendel-linux.org/apt/RELEASE_NAME-bsp-enterprise
-suite=RELEASE_NAME
-
-[edgetpu]
-packages=
-source=https://packages.cloud.google.com/apt
-suite=coral-edgetpu-stable
diff --git a/multistrap.conf b/multistrap.conf
index 787e8f9..43fc4bd 100644
--- a/multistrap.conf
+++ b/multistrap.conf
@@ -8,13 +8,13 @@
[main]
packages=MAIN_PACKAGES
-source=https://mendel-linux.org/apt/eagle
-suite=eagle
+source=https://mendel-linux.org/apt/RELEASE_NAME
+suite=RELEASE_NAME
[bsp]
packages=
-source=https://mendel-linux.org/apt/eagle-bsp-enterprise
-suite=eagle
+source=https://mendel-linux.org/apt/RELEASE_NAME-bsp-enterprise
+suite=RELEASE_NAME
[edgetpu]
packages=
