Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Porting on debian 10, i386 #33

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
endif()

include( ExternalProject )
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Werror -Wparentheses -Wno-array-bounds -Wno-unused-result -std=gnu99 -D_DEFAULT_SOURCE")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe -Werror -Wno-error=cpp -Wparentheses -Wno-array-bounds -Wno-unused-result -std=gnu99 -D_DEFAULT_SOURCE")


if(DEFINED ENABLE_CODE_COVERAGE)
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/echo run with: docker build . -f
# -*- coding: utf-8 -*-

FROM arm32v7/debian:stretch
FROM arm32v7/debian:buster
ENV target_debian_arch armhf

LABEL maintainer="Philippe Coval <philippe.coval@silabs.com>"
Expand All @@ -10,8 +10,6 @@ ENV DEBIAN_FRONTEND noninteractive

RUN echo "# log: Setup system" \
&& set -x \
&& sed -e 's|\(http://\)\(.*\)\(.debian.org\)|\1archive\3|g' -i /etc/apt/sources.list \
&& sed -e 's|stretch-updates|stretch-proposed-updates|g' -i /etc/apt/sources.list \
&& apt-get update -y \
&& apt-get install -y sudo make \
&& date -u
Expand All @@ -22,7 +20,7 @@ WORKDIR ${workdir}
COPY helper.mk ${workdir}
RUN echo "# log: Install ${project}" \
&& set -x \
&& ./helper.mk setup/debian/stretch \
&& ./helper.mk setup/debian/buster\
&& date -u

COPY . ${workdir}
Expand Down
7 changes: 6 additions & 1 deletion helper.mk
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,12 @@ setup/debian/stretch: /etc/apt/sources.list /etc/os-release
${sudo} apt-get update
${sudo} apt-get install -y ${packages}

setup/debian: setup/debian/stretch
setup/debian/buster: /etc/apt/sources.list /etc/os-release
grep 'VERSION="10 (buster)"' /etc/os-release
${sudo} apt-get update
${sudo} apt-get install -y ${packages}

setup/debian: setup/debian/buster
echo "# $@"

setup: setup/debian
Expand Down