From c50a198321a47f87821f55351d17c022c434d745 Mon Sep 17 00:00:00 2001 From: nosamad Date: Sun, 31 Mar 2019 20:26:09 +0200 Subject: [PATCH 1/5] fixes verbosity option when set through command line --- Makefile | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 49a896e..38f3679 100644 --- a/Makefile +++ b/Makefile @@ -24,8 +24,8 @@ OUT ?= $(PROJECT_ROOT)/.build UID ?= $(shell id -u) -CONTAINER_USER ?= $(UID) -CONTAINER_GROUP ?= $(shell id -g) +CONTAINER_USER ?= user +CONTAINER_GROUP ?= user CONTAINER_CGROUP_PARENT ?= HOST_CONTAINER ?= $(shell $(PROJECT_ROOT)/build/get_container_id.sh) @@ -97,7 +97,8 @@ CMAKEFLAGS += '-GNinja' BUILDSILENT := $(if $(BUILDVERBOSE),,1) $(BUILDSILENT)NINJAFLAGS += -v -DOCKER_RUNFLAGS += --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined +DOCKER_RUNFLAGS += --device /dev/fuse +DOCKER_RUNFLAGS += --cap-add SYS_ADMIN --security-opt apparmor:unconfined DOCKER_RUNFLAGS += --interactive DOCKER_RUNFLAGS += --rm @@ -118,10 +119,12 @@ DOCKER_BUILDARGS += OUT=$(CONTAINER_OUT) DOCKER_BUILDFLAGS += --rm DOCKER_BUILDFLAGS += $(addprefix --build-arg ,$(DOCKER_BUILDARGS)) +OUT_TARGETS += $(addprefix $(OUT)/,$(TARGETS)) + OUT_DIRS += $(OUT) OUT_DIRS += $(OUT)/docker OUT_DIRS += $(OUT)/src -OUT_DIRS += $(addprefix $(OUT)/,$(TARGETS)) +OUT_DIRS += $(addsuffix /usr/bin,$(OUT_TARGETS)) BUILD_TARGETS += $(addprefix build-,$(TARGETS)) CHECK_TARGETS += $(addprefix check-,$(TARGETS)) @@ -129,7 +132,7 @@ CLEAN_TARGETS += $(addprefix clean-,$(TARGETS)) RUN_TARGETS += $(addprefix run-,$(firstword $(TARGETS))) EXTRACT_TARGETS += $(patsubst $(OUT)/%.tar.gz,$(OUT)/src/%,$(FETCH_TARGETS)) DISCOVER_CC_TARGETS += $(addprefix discover-cc-,$(firstword $(TARGETS))) -RULE_TARGETS = $(addprefix $(OUT)/,$(addsuffix /rules.mk,$(TARGETS))) +RULE_TARGETS += $(addsuffix /rules.mk,$(OUT_TARGETS)) TARGETS := $(sort $(TARGETS)) @@ -151,21 +154,21 @@ container_run = $(DOCKER) run $(DOCKER_RUNFLAGS) $3 \ image_rule = \ $$(OUT)/docker/$1: $$(OUT)/docker/$1.dockerfile $$(EXTRACT_TARGETS) $$(PROJECT_ROOT)/Makefile; \ - $(SILENT)$$(call image,$1) + $$(SILENT)$$(call image,$1) image = \ $(call echo_if_silent,docker build $(call container_name,$1) $(OUT)) \ && $(DOCKER) build $(DOCKER_BUILDFLAGS) --iidfile $@ --file $< --tag $(call container_name,$1) $(OUT) configure_rule = \ - $$(OUT)/$1/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1; \ - $(SILENT)$$(call configure,$1) + $$(OUT)/$1/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1 | $$(OUT)/$1/usr/bin/gdb; \ + $$(SILENT)$$(call configure,$1) configure = \ $(call run,$1,sh -c 'cmake $(CMAKEFLAGS) $(CONTAINER_PROJECT_ROOT) && $(CONTAINER_PROJECT_ROOT)/build/discover_cc_settings.sh $(notdir $@) $(realpath $(dir $@))') \ && touch $(addprefix $(dir $@)/,include_dirs.txt) $@ build_rule = \ build-$1: $$(OUT)/$1/CMakeCache.txt; \ - $(SILENT)$$(call build,$1) + $$(SILENT)$$(call build,$1) build = $(call run,$1,ninja $(PARALLELMFLAGS) $(NINJAFLAGS) $(GOALS)) check_rule = \ @@ -173,28 +176,28 @@ check_rule = \ memcheck_rule = \ memcheck-$1: build-$1; \ - $(SILENT)$$(call memcheck,$1) + $$(SILENT)$$(call memcheck,$1) memcheck = $(call run,$1,ctest -T memcheck $(CTESTFLAGS)) run_rule = \ run-$1: $$(OUT)/docker/$1; \ - $(SILENT)$$(call run,$1,/bin/bash,--tty) || true + $$(SILENT)$$(call run,$1,bash,--tty) || true run = $(call echo_if_silent,TARGET=$1 $2) && $(call container_run,$1,$2,$3) clean_rule = \ clean-$1: ; \ - $(SILENT)-$$(call clean,$1) + $$(SILENT)-$$(call clean,$1) clean = rm -rf $(OUT)/$1 discover_cc_settings_rule = \ $$(OUT)/$1/include_dirs.txt: $$(OUT)/$1/CMakeCache.txt; \ - $(SILENT)$$(call discover_cc_settings,$1) + $$(SILENT)$$(call discover_cc_settings,$1) discover_cc_settings = \ $(call run,$1,$(CONTAINER_PROJECT_ROOT)/build/discover_cc_settings.sh $(notdir $<) $(realpath $(dir $<))) discover_cc_rule = \ discover-cc-$1: $$(OUT)/$1/include_dirs.txt; \ - $(SILENT)$$(call discover_cc,$1) + $$(SILENT)$$(call discover_cc,$1) discover_cc = cat $< # Rules @@ -259,7 +262,6 @@ debug-print-%: @printf '%s\n' '$*:' $($*) $(CHECK_TARGETS): GOALS := test -$(CHECK_TARGETS) $(MEMCHECK_TARGETS): CONTAINER_USER := user $(OUT)/docker/qemu-arm-static-$(QEMU_VERSION): $(SILENT) \ From 3934e0b48181695611f9527e7241e1106a26185b Mon Sep 17 00:00:00 2001 From: nosamad Date: Sun, 31 Mar 2019 21:24:26 +0200 Subject: [PATCH 2/5] adds support for build type and allows to run gdb in container --- .travis.yml | 10 ++++++---- Makefile | 24 +++++++++++++++--------- build/amd64-ubuntu-builder.dockerfile | 1 + build/arm32v7-ubuntu-builder.dockerfile | 1 + 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ddfa3e..7db3714 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,11 @@ env: - PARALLELMFLAGS="-j2" - PORTABLE_WORSPACE=1 matrix: - - MARCH=amd64 CHECK_TARGET=memcheck - - MARCH=arm32v7 CHECK_TARGET=check + - BUILDTYPE=Debug MARCH=amd64 CHECK_TARGET=memcheck + - BUILDTYPE=Release MARCH=amd64 CHECK_TARGET=memcheck + - BUILDTYPE=Debug MARCH=arm32v7 CHECK_TARGET=check + - BUILDTYPE=MinSizeRel MARCH=arm32v7 CHECK_TARGET=check before_script: -- make MARCH=$MARCH +- make BUILDTYPE=$BUILDTYPE MARCH=$MARCH script: -- make MARCH=$MARCH $CHECK_TARGET +- make BUILDTYPE=$BUILDTYPE MARCH=$MARCH $CHECK_TARGET diff --git a/Makefile b/Makefile index 38f3679..d0388e0 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ DOCKER_BUILDKIT ?= VERBOSE ?= BUILDVERBOSE ?= BUILDTARGET ?= +BUILDTYPE ?= Debug MARCH ?= $(call march,$(BUILDTARGET)) PROJECT_NAME ?= webfuse @@ -93,12 +94,17 @@ $(addprefix $(OUT)/docker/,$(UBUNTU_TARGETS)): CODENAME := $(UBUNTU_CODENAME) # Common rule target configuration CMAKEFLAGS += '-GNinja' +CMAKEFLAGS += '-DCMAKE_BUILD_TYPE=$(BUILDTYPE)' BUILDSILENT := $(if $(BUILDVERBOSE),,1) $(BUILDSILENT)NINJAFLAGS += -v DOCKER_RUNFLAGS += --device /dev/fuse -DOCKER_RUNFLAGS += --cap-add SYS_ADMIN --security-opt apparmor:unconfined +DOCKER_RUNFLAGS += --cap-add SYS_ADMIN +DOCKER_RUNFLAGS += --security-opt apparmor:unconfined + +DOCKER_RUNFLAGS += --cap-add SYS_PTRACE +DOCKER_RUNFLAGS += --security-opt seccomp=unconfined DOCKER_RUNFLAGS += --interactive DOCKER_RUNFLAGS += --rm @@ -124,7 +130,7 @@ OUT_TARGETS += $(addprefix $(OUT)/,$(TARGETS)) OUT_DIRS += $(OUT) OUT_DIRS += $(OUT)/docker OUT_DIRS += $(OUT)/src -OUT_DIRS += $(addsuffix /usr/bin,$(OUT_TARGETS)) +OUT_DIRS += $(addsuffix /$(BUILDTYPE),$(OUT_TARGETS)) BUILD_TARGETS += $(addprefix build-,$(TARGETS)) CHECK_TARGETS += $(addprefix check-,$(TARGETS)) @@ -148,7 +154,7 @@ $(HOST_CONTAINER)container_run_volumes += '$(realpath $(OUT)/$1):$(CONTAINER_OUT container_name = $(REGISTRY_PREFIX)$(subst -,/,$1)/$(PROJECT_NAME):$(VERSION) container_run = $(DOCKER) run $(DOCKER_RUNFLAGS) $3 \ $(addprefix --volume ,$(call container_run_volumes,$1)) \ - --workdir '$(CONTAINER_OUT)/$1' \ + --workdir '$(CONTAINER_OUT)/$1/$(BUILDTYPE)' \ $(call container_name,$1) \ $2 @@ -156,18 +162,18 @@ image_rule = \ $$(OUT)/docker/$1: $$(OUT)/docker/$1.dockerfile $$(EXTRACT_TARGETS) $$(PROJECT_ROOT)/Makefile; \ $$(SILENT)$$(call image,$1) image = \ - $(call echo_if_silent,docker build $(call container_name,$1) $(OUT)) \ + $(call echo_if_silent,TARGET=$1 docker build $(call container_name,$1) $(OUT)) \ && $(DOCKER) build $(DOCKER_BUILDFLAGS) --iidfile $@ --file $< --tag $(call container_name,$1) $(OUT) configure_rule = \ - $$(OUT)/$1/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1 | $$(OUT)/$1/usr/bin/gdb; \ + $$(OUT)/$1/$$(BUILDTYPE)/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1; \ $$(SILENT)$$(call configure,$1) configure = \ $(call run,$1,sh -c 'cmake $(CMAKEFLAGS) $(CONTAINER_PROJECT_ROOT) && $(CONTAINER_PROJECT_ROOT)/build/discover_cc_settings.sh $(notdir $@) $(realpath $(dir $@))') \ && touch $(addprefix $(dir $@)/,include_dirs.txt) $@ build_rule = \ - build-$1: $$(OUT)/$1/CMakeCache.txt; \ + build-$1: $$(OUT)/$1/$$(BUILDTYPE)/CMakeCache.txt; \ $$(SILENT)$$(call build,$1) build = $(call run,$1,ninja $(PARALLELMFLAGS) $(NINJAFLAGS) $(GOALS)) @@ -182,7 +188,7 @@ memcheck = $(call run,$1,ctest -T memcheck $(CTESTFLAGS)) run_rule = \ run-$1: $$(OUT)/docker/$1; \ $$(SILENT)$$(call run,$1,bash,--tty) || true -run = $(call echo_if_silent,TARGET=$1 $2) && $(call container_run,$1,$2,$3) +run = $(call echo_if_silent,TARGET=$1 BUILDTYPE=$(BUILDTYPE) $2) && $(call container_run,$1,$2,$3) clean_rule = \ clean-$1: ; \ @@ -190,13 +196,13 @@ clean_rule = \ clean = rm -rf $(OUT)/$1 discover_cc_settings_rule = \ - $$(OUT)/$1/include_dirs.txt: $$(OUT)/$1/CMakeCache.txt; \ + $$(OUT)/$1/$$(BUILDTYPE)/include_dirs.txt: $$(OUT)/$1/$$(BUILDTYPE)/CMakeCache.txt; \ $$(SILENT)$$(call discover_cc_settings,$1) discover_cc_settings = \ $(call run,$1,$(CONTAINER_PROJECT_ROOT)/build/discover_cc_settings.sh $(notdir $<) $(realpath $(dir $<))) discover_cc_rule = \ - discover-cc-$1: $$(OUT)/$1/include_dirs.txt; \ + discover-cc-$1: $$(OUT)/$1/$$(BUILDTYPE)/include_dirs.txt; \ $$(SILENT)$$(call discover_cc,$1) discover_cc = cat $< diff --git a/build/amd64-ubuntu-builder.dockerfile b/build/amd64-ubuntu-builder.dockerfile index 543b826..314cee1 100644 --- a/build/amd64-ubuntu-builder.dockerfile +++ b/build/amd64-ubuntu-builder.dockerfile @@ -11,6 +11,7 @@ RUN set -x \ ninja-build \ pkg-config \ rsync \ + gdb \ valgrind \ && rm -rf /var/lib/apt/lists/* diff --git a/build/arm32v7-ubuntu-builder.dockerfile b/build/arm32v7-ubuntu-builder.dockerfile index f605e0c..6e0c659 100644 --- a/build/arm32v7-ubuntu-builder.dockerfile +++ b/build/arm32v7-ubuntu-builder.dockerfile @@ -13,6 +13,7 @@ RUN set -x \ ninja-build \ pkg-config \ rsync \ + gdb \ && rm -rf /var/lib/apt/lists/* COPY src /usr/local/src From 59b0b4d0594f3898172721fee5c5b55855bac336 Mon Sep 17 00:00:00 2001 From: nosamad Date: Sun, 31 Mar 2019 21:33:35 +0200 Subject: [PATCH 3/5] adds missing toolchain headers to project --- .settings/language.settings.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index dc364b8..910ca28 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -2,7 +2,22 @@ - + + + + + + + + + + + + + + + + From f2880e1eae889f4a6b6b92d95c1f49f716c4adc8 Mon Sep 17 00:00:00 2001 From: nosamad Date: Mon, 1 Apr 2019 00:25:40 +0200 Subject: [PATCH 4/5] renames container macros --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index d0388e0..1caf7c0 100644 --- a/Makefile +++ b/Makefile @@ -148,22 +148,22 @@ echo_if_silent = VERBOSE=1 $(VERBOSE)echo_if_silent = echo $1 $(VERBOSE)SILENT := @ -$(HOST_CONTAINER)container_run_volumes += '$(realpath $(PROJECT_ROOT)):$(CONTAINER_PROJECT_ROOT):cached' -$(HOST_CONTAINER)container_run_volumes += '$(realpath $(OUT)/$1):$(CONTAINER_OUT)/$1:delegated' +$(HOST_CONTAINER)image_run_volumes += '$(realpath $(PROJECT_ROOT)):$(CONTAINER_PROJECT_ROOT):cached' +$(HOST_CONTAINER)image_run_volumes += '$(realpath $(OUT)/$1):$(CONTAINER_OUT)/$1:delegated' -container_name = $(REGISTRY_PREFIX)$(subst -,/,$1)/$(PROJECT_NAME):$(VERSION) -container_run = $(DOCKER) run $(DOCKER_RUNFLAGS) $3 \ - $(addprefix --volume ,$(call container_run_volumes,$1)) \ +image_name = $(REGISTRY_PREFIX)$(subst -,/,$1)/$(PROJECT_NAME):$(VERSION) +image_run = $(DOCKER) run $(DOCKER_RUNFLAGS) $3 \ + $(addprefix --volume ,$(call image_run_volumes,$1)) \ --workdir '$(CONTAINER_OUT)/$1/$(BUILDTYPE)' \ - $(call container_name,$1) \ + $(call image_name,$1) \ $2 image_rule = \ $$(OUT)/docker/$1: $$(OUT)/docker/$1.dockerfile $$(EXTRACT_TARGETS) $$(PROJECT_ROOT)/Makefile; \ $$(SILENT)$$(call image,$1) image = \ - $(call echo_if_silent,TARGET=$1 docker build $(call container_name,$1) $(OUT)) \ - && $(DOCKER) build $(DOCKER_BUILDFLAGS) --iidfile $@ --file $< --tag $(call container_name,$1) $(OUT) + $(call echo_if_silent,TARGET=$1 docker build $(call image_name,$1) $(OUT)) \ + && $(DOCKER) build $(DOCKER_BUILDFLAGS) --iidfile $@ --file $< --tag $(call image_name,$1) $(OUT) configure_rule = \ $$(OUT)/$1/$$(BUILDTYPE)/CMakeCache.txt: $$(PROJECT_ROOT)/CMakeLists.txt $$(OUT)/docker/$1; \ @@ -188,7 +188,7 @@ memcheck = $(call run,$1,ctest -T memcheck $(CTESTFLAGS)) run_rule = \ run-$1: $$(OUT)/docker/$1; \ $$(SILENT)$$(call run,$1,bash,--tty) || true -run = $(call echo_if_silent,TARGET=$1 BUILDTYPE=$(BUILDTYPE) $2) && $(call container_run,$1,$2,$3) +run = $(call echo_if_silent,TARGET=$1 BUILDTYPE=$(BUILDTYPE) $2) && $(call image_run,$1,$2,$3) clean_rule = \ clean-$1: ; \ From 0dc34df7a56ac427ff4022b20cb8ce71f0f4ae33 Mon Sep 17 00:00:00 2001 From: nosamad Date: Mon, 1 Apr 2019 00:31:53 +0200 Subject: [PATCH 5/5] adds gdbserver --- build/amd64-ubuntu-builder.dockerfile | 1 + build/arm32v7-ubuntu-builder.dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/build/amd64-ubuntu-builder.dockerfile b/build/amd64-ubuntu-builder.dockerfile index 314cee1..cace9f3 100644 --- a/build/amd64-ubuntu-builder.dockerfile +++ b/build/amd64-ubuntu-builder.dockerfile @@ -12,6 +12,7 @@ RUN set -x \ pkg-config \ rsync \ gdb \ + gdbserver \ valgrind \ && rm -rf /var/lib/apt/lists/* diff --git a/build/arm32v7-ubuntu-builder.dockerfile b/build/arm32v7-ubuntu-builder.dockerfile index 6e0c659..8eb36e7 100644 --- a/build/arm32v7-ubuntu-builder.dockerfile +++ b/build/arm32v7-ubuntu-builder.dockerfile @@ -14,6 +14,7 @@ RUN set -x \ pkg-config \ rsync \ gdb \ + gdbserver \ && rm -rf /var/lib/apt/lists/* COPY src /usr/local/src