[kobo] add Dockerfile for kobo

the Docker image uses kobo env from koxtoolchain

Author: okay

Diff for: Dockerfile.kobo

@@ -0,0 +1,30 @@
+FROM ghcr.io/toltec-dev/python:v1.1
+
+RUN pip3 install okp
+
+WORKDIR /opt/
+RUN apt update
+RUN apt-get install -y wget unzip git
+RUN wget https://github.com/koreader/koxtoolchain/releases/download/2021.12/kobo.zip
+RUN unzip kobo.zip
+RUN tar -xvzf kobo.tar.gz
+RUN rm kobo.zip kobo.tar.gz
+ 
+ARG NGCONFIG="arm-kobo-linux-gnueabihf"
+ARG CHOST="arm-linux-gnueabihf"
+
+ENV ARCH=arm \
+    CHOST="$CHOST" \
+    CROSS_COMPILE="$CHOST-" \
+    PATH="$PATH:/opt/x-tools/$NGCONFIG/bin" \
+    PKG_CONFIG_LIBDIR="/opt/x-tools/$NGCONFIG/$NGCONFIG/sysroot/usr/lib/pkgconfig:/opt/x-tools/$NGCONFIG/$NGCONFIG/sysroot/lib/pkgconfig:/opt/x-tools/$NGCONFIG/$NGCONFIG/sysroot/opt/lib/pkgconfig" \
+    PKG_CONFIG_SYSROOT_DIR="/opt/x-tools/$NGCONFIG/$NGCONFIG/sysroot" \
+    SYSROOT="/opt/x-tools/$NGCONFIG/$NGCONFIG/sysroot" \
+    NGCONFIG="$NGCONFIG" \
+    TARGET_PREFIX="$CHOST"
+
+WORKDIR /rmkit/
+COPY . /rmkit/
+RUN rm src/build -fr
+
+# vim: syntax=dockerfile

Diff for: Makefile

@@ -11,6 +11,7 @@ INSTALL_APPS=$(foreach app, $(APPS), install_$(app))
 RESIM_APPS=$(foreach app, $(APPS), resim_$(app))
 RUN_APPS=$(foreach app, $(APPS), run_$(app))
 DOCKER_APPS=$(foreach app, $(APPS), $(app)_docker)
+DOCKERBUILD=rmkit:${TARGET}
 
 SHA=$(shell git rev-parse --short HEAD)
 
@@ -27,7 +28,7 @@ $(RUN_APPS): %: rmkit.h
 	cd src/$(@:run_%=%) && make run
 
 $(DOCKER_APPS): %:
-	docker build --tag rmkit:latest .
+	docker build --tag ${DOCKERBUILD} . -f ${DOCKERFILE}
 	bash scripts/build/docker_build.sh $(@:%_docker=%)
 
 $(CLEAN_APPS): %:
@@ -47,7 +48,10 @@ install: rmkit.h dest_dir
 
 clean:
 	$(foreach app, $(APPS), cd src/${app} && make clean; cd ${ROOT}; )
-	rm src/build/*
+	rm src/build/* 2>/dev/null || true
+ifdef FBINK
+	cd src/vendor/FBInk/ && make distclean
+endif
 
 default: build
 
@@ -67,14 +71,14 @@ rmkit.h:
 	cd src/rmkit && make
 
 docker:
-	docker build --tag rmkit:latest .
+	docker build --tag ${DOCKERBUILD} . -f ${DOCKERFILE}
 	bash scripts/build/docker_release.sh
 ifeq ($(ARCH),kobo)
 	bash scripts/build/build_kobo_root.sh
 endif
 
 docker_test:
-	docker build --tag rmkit:latest .
+	docker build --tag ${DOCKERBUILD} . -f ${DOCKERFILE}
 	bash scripts/build/docker_test.sh
 
 docker_install: docker

Diff for: scripts/build/docker_build.sh

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

Diff for: scripts/build/docker_release.sh

@@ -1,11 +1,16 @@
 OUTDIR=artifacts
 TARGET=${TARGET:-rm}
+FBINK=${FBINK}
+
 mkdir ${OUTDIR}
 docker run -i --rm -v "${PWD}/${OUTDIR}:/mnt/artifacts" rmkit /bin/bash << COMMANDS
+cd /rmkit/
 mkdir -p src/build
-TARGET=${TARGET} make
-TARGET=${TARGET} make strip
-TARGET=${TARGET} make bundle
+echo "CURRENT DIR IS"
+pwd
+FBINK=${FBINK} TARGET=${TARGET} make
+FBINK=${FBINK} TARGET=${TARGET} make strip
+FBINK=${FBINK} TARGET=${TARGET} make bundle
 mkdir -p /mnt/artifacts/${TARGET}/
 cp -r src/build/* /mnt/artifacts/${TARGET}/
 rm /mnt/artifacts/${TARGET}/stb.*

Diff for: src/actions.make

@@ -23,7 +23,9 @@ endif
 ifdef FBINK
 CPP_FLAGS+=-L${ROOT_DIR}/src/vendor/FBInk/Release -l:libfbink.a -D"RMKIT_FBINK=1"
 libfbink:
-	cd ../vendor/FBInk/ && BITMAP=1 make staticlib
+	git submodule init
+	git submodule update
+	cd ${SRC_DIR}/vendor/FBInk/ && BITMAP=1 make staticlib
 else
 libfbink:
 	echo "Skipping FBInk compilation"
@@ -32,7 +34,7 @@ endif
 clean-default:
 	rm ${SRC_DIR}/build/${EXE}
 compile_kobo: ../build/stb.arm.o libfbink
-compile_kobo: export CPP_FLAGS += -O2 -static -static-libstdc++ -static-libgcc 
+compile_kobo: export CPP_FLAGS += -O2 -static -static-libstdc++ -static-libgcc
 compile_kobo: export OKP_FLAGS += ../build/stb.arm.o
 compile_kobo:
 	CXX=${CXX_BIN} okp ${OKP_FLAGS} -- -D"KOBO=1" -D${RMKIT_IMPL} ${CPP_FLAGS}

Diff for: src/common.make

@@ -5,6 +5,7 @@ CXX_BIN?=arm-linux-gnueabihf-g++
 CC_BIN?=arm-linux-gnueabihf-gcc
 STRIP_BIN?=arm-linux-gnueabihf-strip
 CPP_FLAGS=-ldl -pthread -lpthread -fdata-sections -ffunction-sections -Wl,--gc-sections
+DOCKERFILE?=Dockerfile
 
 # BUILD STUFF
 ROOT=${PWD}