Skip to content

Commit 8f7bd6c

Browse files
authored
Merge pull request #66 from technobly/rattboi/update-docker
Update Dockerfile distro to Arch w/ newer arm-gcc (10.1)
2 parents 55c7629 + c82644e commit 8f7bd6c

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

code/veccart/Dockerfile

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
FROM ubuntu:18.04
2-
LABEL Description="A clone of the i2c-tiny-usb based upon STM32 and libopencm3"
1+
FROM archlinux:20200605
2+
LABEL Description="STM32 and libopencm3"
33

4-
RUN DEBIAN_FRONTEND=noninteractive apt-get update -y -q \
5-
&& apt-get install -y -q sudo make python git-core \
6-
&& apt-get install -y -q software-properties-common \
7-
&& add-apt-repository ppa:team-gcc-arm-embedded/ppa \
8-
&& apt-get update
9-
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gcc-arm-embedded
4+
RUN pacman -Syu --noconfirm \
5+
&& pacman -S make git python --noconfirm \
6+
&& pacman -S arm-none-eabi-gcc arm-none-eabi-binutils arm-none-eabi-newlib --noconfirm
107

118
WORKDIR /build
129
RUN git clone https://github.com/libopencm3/libopencm3.git \
1310
&& cd libopencm3 \
14-
&& git checkout f7a952c41a815572622f137881af6160730a3768 \
15-
&& make
11+
&& git checkout 90753950bbe10e87b8caabfb0bd6e1d195bb24b8 \
12+
&& TARGETS=stm32/f4 make
1613

1714
WORKDIR /build/veccart

code/veccart/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ TOOLCHAIN_DIR=../libopencm3
6262
CFLAGS += -O3 -g -Wextra -Wshadow -Wimplicit-function-declaration -Wredundant-decls \
6363
-Wmissing-prototypes -Wstrict-prototypes -fno-common -ffunction-sections -fdata-sections \
6464
-MD -Wall -Wundef -I$(TOOLCHAIN_DIR)/include $(ARCH_FLAGS)
65+
ASFLAGS += $(ARCH_FLAGS)
6566

6667
LDSCRIPT = stm32f411rct6.ld
6768
#../libopencm3/lib/lib$(LIBNAME).ld

0 commit comments

Comments
 (0)