[kobo][docker] support docker builds

Author: okay

.github/workflows/stable-release.yml

@@ -7,6 +7,7 @@ on:
       - build
       - stable
       - master
+      - kobo
 
 jobs:
   pre-release:
@@ -19,7 +20,9 @@ jobs:
 
 
       - name: "Build artifacts"
-        run: make docker
+        run: |
+          ARCH=arm make docker
+          ARCH=kobo make docker
 
       - name: "Declare vars"
         id: vars

.github/workflows/unstable-release.yml

@@ -1,6 +1,6 @@
 FROM ghcr.io/toltec-dev/python:v1.1
 
-RUN echo ""
+RUN echo "1"
 RUN pip3 install okp
 
 WORKDIR /rmkit

Dockerfile

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+
 default: build
 include src/common.make
 
@@ -76,8 +77,13 @@ docker_test:
 docker_install: docker
 	echo "Not implemented yet"
 
+# STRIP_BIN is always arm-linux-gnueabihf-strip for now
+strip: SHELL:=/bin/bash
+strip:
+	cd ${BUILD_DIR}; export GLOBIGNORE="*.o:*.h:*.sh"; ${STRIP_BIN} *
+
 ZIP_DEST="apps"
-bundle: $(APPS)
+bundle:
 	#BUILDING V: ${VERSION} ARCH: ${ARCH}
 	mkdir -p ${BUILD_DIR}/.${ZIP_DEST} 2>/dev/null || true
 	cp ${BUILD_DIR}/* ${BUILD_DIR}/.${ZIP_DEST}/

Makefile

@@ -1,11 +1,12 @@
 OUTDIR=artifacts
 PACKAGE="${1}"
+ARCH=${ARCH:-arm}
 mkdir ${OUTDIR}
 docker run -i --rm -v "${PWD}/${OUTDIR}:/mnt/artifacts" rmkit /bin/bash << COMMANDS
 mkdir -p src/build
-make ${PACKAGE}
-mkdir -p /mnt/artifacts/files/
-cp -r src/build/* /mnt/artifacts/files/
+ARCH=${ARCH} make ${PACKAGE}
+mkdir -p /mnt/artifacts/${ARCH}/
+cp -r src/build/* /mnt/artifacts/${ARCH}/
 chown -R $(id -u):$(id -u) /mnt/artifacts
 COMMANDS
 

scripts/build/docker_build.sh

@@ -1,14 +1,16 @@
 OUTDIR=artifacts
+ARCH=${ARCH:-arm}
 mkdir ${OUTDIR}
 docker run -i --rm -v "${PWD}/${OUTDIR}:/mnt/artifacts" rmkit /bin/bash << COMMANDS
 mkdir -p src/build
-make
-make bundle
-mkdir -p /mnt/artifacts/files/
-cp -r src/build/* /mnt/artifacts/files/
-rm /mnt/artifacts/files/stb.*
-rm /mnt/artifacts/files/release.*
-cp -r src/build/release.* /mnt/artifacts
+ARCH=${ARCH} make
+ARCH=${ARCH} make strip
+ARCH=${ARCH} make bundle
+mkdir -p /mnt/artifacts/${ARCH}/
+cp -r src/build/* /mnt/artifacts/${ARCH}/
+rm /mnt/artifacts/${ARCH}/stb.*
+rm /mnt/artifacts/${ARCH}/release.*
+cp -r src/build/release.* /mnt/artifacts/${ARCH}/
 chown -R $(id -u):$(id -u) /mnt/artifacts
 COMMANDS
 

scripts/build/docker_release.sh

@@ -2,6 +2,7 @@ HOST?=10.11.99.1
 ARCH?=arm
 CXX_BIN?=arm-linux-gnueabihf-g++
 CC_BIN?=arm-linux-gnueabihf-gcc
+STRIP_BIN?=arm-linux-gnueabihf-strip
 CPP_FLAGS=-pthread -lpthread -fdata-sections -ffunction-sections -Wl,--gc-sections
 
 # BUILD STUFF
@@ -16,6 +17,6 @@ RMKIT_IMPL="RMKIT_IMPLEMENTATION"
 OKP_FLAGS=-ig ${RMKIT_IMPL} -ns -ni -for -d ../.${APP}_cpp/ -o ../build/${EXE} ${FILES}
 
 # installation directory on remarkable
-DEST=/opt/bin/
+DEST?=/opt/bin/
 
 # vim: syntax=make