From 09a339eefda41ada0ef0d60bb4d508f17dc203df Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Wed, 8 Dec 2021 19:06:15 +0900 Subject: [PATCH 1/5] use gcc -dumpmachine , instead of uname -m beacuase uname -m returns host architecutre within docker environment so if you run arm7v compile on docker/arm64, it returns aarch64, that confusis ros build farm https://build.ros.org/job/Nbin_ufhf_uFhf__euslisp__ubuntu_focal_armhf__binary/ --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 22a379208..4c3e20e59 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,12 @@ ifneq ($(GCC_MACHINE),) ifeq ($(GCC_MACHINE),i686-linux-gnu) MACHINE=x86 endif + ifeq ($(GCC_MACHINE),aarch64-linux-gnu) + MACHINE=aarch64 + endif + ifeq ($(GCC_MACHINE),arm-linux-gnueabihf) + MACHINE=armv7 + endif endif ifeq ($(MACHINE),) MACHINE=$(shell uname -m) From 1c4669e45512a97a064b72dcbc0b0bcf32d6a508 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Wed, 8 Dec 2021 22:20:41 +0900 Subject: [PATCH 2/5] run apt-get update with in doc workflow --- .github/workflows/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 5314e5c12..96fc799b5 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -62,6 +62,7 @@ jobs: shell: bash run: | set -x + sudo apt-get update sudo apt-get install -y -qq git make gcc g++ libjpeg-dev libxext-dev libx11-dev libgl1-mesa-dev libglu1-mesa-dev libpq-dev libpng-dev xfonts-100dpi xfonts-75dpi pkg-config libbullet-dev make sudo apt-get install -y -qq texlive-binaries texlive-lang-cjk texlive-lang-japanese poppler-utils nkf latex2html From d88372085a51e390e6c22fcc21be8faa22092c45 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Wed, 8 Dec 2021 23:12:59 +0900 Subject: [PATCH 3/5] set MACHINE= when compile irteus --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4c3e20e59..efa27b903 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,7 @@ eus-installed: eus cd eus/lisp && ln -sf $(MAKEFILE) Makefile && $(MAKE) eus0 eus1 eus2 eusg eusx eusgl eus irteus-installed: eus-installed - cd irteus; $(MAKE) + cd irteus; $(MAKE) MACHINE=$(MACHINE) clean: -rm -f bashrc.eus manual.pdf jmanual.pdf From e61dff96744df7d50fb9f3edee5771d952e15444 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Wed, 8 Dec 2021 23:14:25 +0900 Subject: [PATCH 4/5] use debug eus --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index efa27b903..9dbebeb7d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ all: eus-installed irteus-installed manuals bashrc.eus -GIT_EUSURL ?= http://github.com/euslisp/EusLisp -GIT_EUSBRANCH ?= master +GIT_EUSURL ?= http://github.com/k-okada/EusLisp +GIT_EUSBRANCH ?= armhf_focal EUSC_PATCH=eus.c_CUSTUM_EUSDIR.patch From 98ee688419c1aa41f2b6a6ff898873312d8ce2d2 Mon Sep 17 00:00:00 2001 From: Kei Okada Date: Wed, 8 Dec 2021 23:14:57 +0900 Subject: [PATCH 5/5] add osrf/ubuntu_armhf:bionic, osrf/ubuntu_armhf:focal --- .github/workflows/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 96fc799b5..6eda17f4a 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -23,6 +23,8 @@ jobs: - DOCKER_IMAGE: debian:stretch - DOCKER_IMAGE: osrf/ubuntu_armhf:trusty - DOCKER_IMAGE: osrf/ubuntu_armhf:xenial + - DOCKER_IMAGE: osrf/ubuntu_armhf:bionic + - DOCKER_IMAGE: osrf/ubuntu_armhf:focal - DOCKER_IMAGE: osrf/ubuntu_arm64:trusty - DOCKER_IMAGE: osrf/ubuntu_arm64:xenial - DOCKER_IMAGE: osrf/ubuntu_arm64:bionic