[kobo][build] update ARCH=arm to ARCH=rm, since we now support kobo

Author: okay

.github/workflows/stable-release.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: "Build artifacts"
         run: |
-          ARCH=arm make docker
+          ARCH=rm make docker
           ARCH=kobo make docker
 
       - name: "Declare vars"

Makefile

@@ -56,8 +56,8 @@ lint: $(LINT_APPS)
 dev: export ARCH=dev
 dev: default
 
-arm: export ARCH=arm
-arm: default
+rm: export ARCH=rm
+rm: default
 
 x86: export ARCH=x86
 x86: default

scripts/build/docker_build.sh

@@ -1,6 +1,6 @@
 OUTDIR=artifacts
 PACKAGE="${1}"
-ARCH=${ARCH:-arm}
+ARCH=${ARCH:-rm}
 mkdir ${OUTDIR}
 docker run -i --rm -v "${PWD}/${OUTDIR}:/mnt/artifacts" rmkit /bin/bash << COMMANDS
 mkdir -p src/build

scripts/build/docker_release.sh

@@ -1,5 +1,5 @@
 OUTDIR=artifacts
-ARCH=${ARCH:-arm}
+ARCH=${ARCH:-rm}
 mkdir ${OUTDIR}
 docker run -i --rm -v "${PWD}/${OUTDIR}:/mnt/artifacts" rmkit /bin/bash << COMMANDS
 mkdir -p src/build

src/actions.make

@@ -9,10 +9,10 @@ ifeq ($(ARCH),x86)
 	make compile_x86
 else ifeq ($(ARCH),kobo)
 	make compile_kobo
-else ifeq ($(ARCH),arm)
-	make compile_arm
-else ifeq ($(ARCH),arm-dev)
-	make compile_arm_fast
+else ifeq ($(ARCH),rm)
+	make compile_remarkable
+else ifeq ($(ARCH),rm-dev)
+	make compile_remarkable_fast
 else ifeq ($(ARCH),dev)
 	make compile_dev
 else
@@ -29,16 +29,16 @@ 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}
 
-compile_arm: ../build/stb.arm.o
-compile_arm: export CPP_FLAGS += -O2
-compile_arm: export OKP_FLAGS += ../build/stb.arm.o
-compile_arm:
+compile_remarkable: ../build/stb.arm.o
+compile_remarkable: export CPP_FLAGS += -O2
+compile_remarkable: export OKP_FLAGS += ../build/stb.arm.o
+compile_remarkable:
 	CXX=${CXX_BIN} okp ${OKP_FLAGS} -- -D"REMARKABLE=1" -D${RMKIT_IMPL} ${CPP_FLAGS}
 
-compile_arm_fast: ../build/stb.arm.o
-compile_arm_fast: export CPP_FLAGS += -O0 -g
-compile_arm_fast: export OKP_FLAGS += ../build/stb.arm.o
-compile_arm_fast:
+compile_remarkable_fast: ../build/stb.arm.o
+compile_remarkable_fast: export CPP_FLAGS += -O0 -g
+compile_remarkable_fast: export OKP_FLAGS += ../build/stb.arm.o
+compile_remarkable_fast:
 	CXX=${CXX_BIN} okp ${OKP_FLAGS} -- -D"REMARKABLE=1" -D${RMKIT_IMPL} ${CPP_FLAGS}
 
 compile_dev: ../build/stb.x86.o
@@ -91,7 +91,7 @@ run: compile copy
 	ssh root@${HOST} systemctl stop xochitl
 	ssh root@${HOST} ${DEST}/${EXE}
 
-test: export ARCH=arm
+test: export ARCH=rm
 test: copy
 	HOST=${HOST} bash scripts/run_app_arm.sh ${EXE} || true
 

src/common.make

@@ -1,5 +1,5 @@
 HOST?=10.11.99.1
-ARCH?=arm
+ARCH?=rm
 CXX_BIN?=arm-linux-gnueabihf-g++
 CC_BIN?=arm-linux-gnueabihf-gcc
 STRIP_BIN?=arm-linux-gnueabihf-strip