riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dist/tools: adapt tools that are built using pkg.mk

Browse Source
This commit is contained in:
Alexandre Abadie 2020-06-13 21:03:07 +02:00
parent f67cff2458
commit a0b042cdd4
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
12 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/tools/bossa-1.8/Makefile vendored
View File

@ -2,14 +2,16 @@ PKG_NAME = bossa
PKG_URL = https://github.com/shumatech/BOSSA PKG_URL = https://github.com/shumatech/BOSSA
PKG_VERSION = 26154375695f345491bba158d57177aa231d6765 PKG_VERSION = 26154375695f345491bba158d57177aa231d6765
PKG_LICENSE = BSD-3-Clause PKG_LICENSE = BSD-3-Clause
PKG_BUILDDIR = $(CURDIR)/bin
PKG_SOURCE_DIR = $(CURDIR)/bin
PKG_BUILD_OUT_OF_SOURCE = 0
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
all: all:
@echo "[INFO] compiling bossac from source now" @echo "[INFO] compiling bossac from source now"
@env -u CXX COMMON_CXXFLAGS="-std=c++11" $(MAKE) BINDIR=$(PKG_BUILDDIR) -C $(PKG_BUILDDIR) strip-bossac @env -u CXX COMMON_CXXFLAGS="-std=c++11" $(MAKE) BINDIR=$(PKG_BUILD_DIR) -C $(PKG_BUILD_DIR) strip-bossac
@mv $(PKG_BUILDDIR)/bossac $(CURDIR)/bossac @mv $(PKG_BUILD_DIR)/bossac $(CURDIR)/bossac
distclean:: distclean::
@rm -f $(CURDIR)/bossac @rm -f $(CURDIR)/bossac

8
dist/tools/bossa-1.9/Makefile vendored
View File

@ -2,14 +2,16 @@ PKG_NAME = bossa
PKG_URL = https://github.com/shumatech/BOSSA PKG_URL = https://github.com/shumatech/BOSSA
PKG_VERSION = 1.9.1 PKG_VERSION = 1.9.1
PKG_LICENSE = BSD-3-Clause PKG_LICENSE = BSD-3-Clause
PKG_BUILDDIR = $(CURDIR)/bin
PKG_SOURCE_DIR = $(CURDIR)/bin
PKG_BUILD_OUT_OF_SOURCE = 0
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
all: all:
@echo "[INFO] compiling bossac from source now" @echo "[INFO] compiling bossac from source now"
@env -u CXX COMMON_CXXFLAGS="-std=c++11" $(MAKE) BINDIR=$(PKG_BUILDDIR) -C $(PKG_BUILDDIR) strip-bossac @env -u CXX COMMON_CXXFLAGS="-std=c++11" $(MAKE) BINDIR=$(PKG_BUILD_DIR) -C $(PKG_BUILD_DIR) strip-bossac
@mv $(PKG_BUILDDIR)/bossac $(CURDIR)/bossac @mv $(PKG_BUILD_DIR)/bossac $(CURDIR)/bossac
distclean:: distclean::
@rm -f $(CURDIR)/bossac @rm -f $(CURDIR)/bossac

8
dist/tools/bossa-nrf52/Makefile vendored
View File

@ -2,14 +2,16 @@ PKG_NAME = bossa
PKG_URL = https://github.com/arduino/BOSSA PKG_URL = https://github.com/arduino/BOSSA
PKG_VERSION = 52e0a4a28721296e64083de7780b30580e0fad16 PKG_VERSION = 52e0a4a28721296e64083de7780b30580e0fad16
PKG_LICENSE = BSD-3-Clause PKG_LICENSE = BSD-3-Clause
PKG_BUILDDIR = $(CURDIR)/bin
PKG_SOURCE_DIR = $(CURDIR)/bin
PKG_BUILD_OUT_OF_SOURCE = 0
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
all: all:
@echo "[INFO] compiling bossac from source now" @echo "[INFO] compiling bossac from source now"
@env -u CXX COMMON_CXXFLAGS="-std=c++11" $(MAKE) BINDIR=$(PKG_BUILDDIR) -C $(PKG_BUILDDIR) strip-bossac @env -u CXX COMMON_CXXFLAGS="-std=c++11" $(MAKE) BINDIR=$(PKG_BUILD_DIR) -C $(PKG_BUILD_DIR) strip-bossac
@mv $(PKG_BUILDDIR)/bossac $(CURDIR)/bossac @mv $(PKG_BUILD_DIR)/bossac $(CURDIR)/bossac
distclean:: distclean::
@rm -f $(CURDIR)/bossac @rm -f $(CURDIR)/bossac

2
dist/tools/cc2538-bsl/Makefile vendored
View File

@ -7,4 +7,4 @@ PKG_BUILDDIR=$(CURDIR)/bin
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
all: all:
cp $(PKG_BUILDDIR)/cc2538-bsl.py . cp $(PKG_SOURCE_DIR)/cc2538-bsl.py .

8
dist/tools/edbg/Makefile vendored
View File

@ -2,7 +2,9 @@ PKG_NAME=edbg
PKG_URL=https://github.com/ataradov/edbg PKG_URL=https://github.com/ataradov/edbg
PKG_VERSION=99d15460fcff723f73b16c29c8ca14bff4b33b20 PKG_VERSION=99d15460fcff723f73b16c29c8ca14bff4b33b20
PKG_LICENSE=BSD-3-Clause PKG_LICENSE=BSD-3-Clause
PKG_BUILDDIR=$(CURDIR)/bin
PKG_SOURCE_DIR = $(CURDIR)/bin
PKG_BUILD_OUT_OF_SOURCE = 0
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
@ -10,5 +12,5 @@ all:
# Start edbg build in a clean environment, so variables set by RIOT's build process # Start edbg build in a clean environment, so variables set by RIOT's build process
# for cross compiling a specific target platform are reset and edbg can # for cross compiling a specific target platform are reset and edbg can
# be built cleanly for the native platform. # be built cleanly for the native platform.
env -i PATH="$(PATH)" TERM="$(TERM)" "$(MAKE)" -C "$(PKG_BUILDDIR)" env -i PATH="$(PATH)" TERM="$(TERM)" "$(MAKE)" -C "$(PKG_BUILD_DIR)"
mv $(PKG_BUILDDIR)/edbg . mv $(PKG_BUILD_DIR)/edbg .

2
dist/tools/flatc/.gitignore vendored
View File

@ -1,2 +1,2 @@
flatc flatc
bin bin/

15
dist/tools/flatc/Makefile vendored
View File

@ -1,16 +1,13 @@
PKG_NAME=flatc PKG_NAME=flatbuffers
PKG_URL=https://github.com/google/flatbuffers PKG_URL=https://github.com/google/flatbuffers
PKG_VERSION=9e7e8cbe9f675123dd41b7c62868acad39188cae PKG_VERSION=9e7e8cbe9f675123dd41b7c62868acad39188cae
PKG_LICENSE=Apache2.0 PKG_LICENSE=Apache2.0
PKG_BUILDDIR=$(CURDIR)/bin
FLATC_SOURCE_DIR = $(PKG_BUILDDIR)
FLATC_BUILD_DIR = $(PKG_BUILDDIR)/build
# manually set some RIOT env vars, so this Makefile can be called stand-alone # manually set some RIOT env vars, so this Makefile can be called stand-alone
RIOTBASE ?= $(CURDIR)/../../.. RIOTBASE ?= $(CURDIR)/../../..
RIOTTOOLS ?= $(CURDIR)/.. RIOTTOOLS ?= $(CURDIR)/..
PKGDIRBASE ?= $(RIOTBASE)/build/pkg
PKG_BUILD_DIR ?= $(CURDIR)/bin
CMAKE_OPTIONS = \ CMAKE_OPTIONS = \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
@ -26,9 +23,9 @@ endif
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
all: all:
@env -i PATH="$(PATH)" cmake -G "Unix Makefiles" $(CMAKE_OPTIONS) -H"$(FLATC_SOURCE_DIR)" -B"$(FLATC_BUILD_DIR)" @env -i PATH="$(PATH)" cmake -G "Unix Makefiles" $(CMAKE_OPTIONS) -H"$(PKG_SOURCE_DIR)" -B"$(PKG_BUILD_DIR)"
"$(MAKE)" -C "$(FLATC_BUILD_DIR)" "$(MAKE)" -C "$(PKG_BUILD_DIR)"
@mv "$(FLATC_BUILD_DIR)"/flatc $(CURDIR)/flatc @mv "$(PKG_BUILD_DIR)"/flatc $(CURDIR)/flatc
distclean:: distclean::
@rm -f $(CURDIR)/flatc @rm -f $(CURDIR)/flatc

7
dist/tools/kconfiglib/Makefile vendored
View File

@ -2,15 +2,14 @@ PKG_NAME=kconfiglib
PKG_URL=https://github.com/ulfalizer/Kconfiglib PKG_URL=https://github.com/ulfalizer/Kconfiglib
PKG_VERSION=82f59179b1b35fcd8b6d188453b283599ea70518 PKG_VERSION=82f59179b1b35fcd8b6d188453b283599ea70518
PKG_LICENSE=ISC PKG_LICENSE=ISC
PKG_BUILDDIR=$(CURDIR)/bin
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
all: all:
$(Q)cp $(PKG_BUILDDIR)/kconfiglib.py $(PKG_BUILDDIR)/menuconfig.py \ $(Q)cp $(PKG_SOURCE_DIR)/kconfiglib.py $(PKG_SOURCE_DIR)/menuconfig.py \
$(PKG_BUILDDIR)/genconfig.py $(PKG_BUILDDIR)/examples/merge_config.py \ $(PKG_SOURCE_DIR)/genconfig.py $(PKG_SOURCE_DIR)/examples/merge_config.py \
. .
remove: remove:
$(Q)$(RM) -r $(PKG_BUILDDIR) kconfiglib.py menuconfig.py genconfig.py \ $(Q)$(RM) -r $(PKG_SOURCE_DIR) kconfiglib.py menuconfig.py genconfig.py \
merge_config.py merge_config.py

18
dist/tools/mosquitto_rsmb/Makefile vendored
View File

@ -2,32 +2,34 @@ PKG_NAME = mosquitto_rsmb
PKG_URL = https://github.com/eclipse/mosquitto.rsmb PKG_URL = https://github.com/eclipse/mosquitto.rsmb
PKG_VERSION = 9b99a3be9a26635b93aec8fa2ed744e8c49e7262 PKG_VERSION = 9b99a3be9a26635b93aec8fa2ed744e8c49e7262
PKG_LICENSE = EPL-1.0 PKG_LICENSE = EPL-1.0
PKG_BUILDDIR = $(CURDIR)/bin
# set default configuration file
RSMB_CFG ?= $(CURDIR)/config.cnf
# manually set some RIOT env vars, so this Makefile can be called stand-alone # manually set some RIOT env vars, so this Makefile can be called stand-alone
RIOTBASE ?= $(CURDIR)/../../.. RIOTBASE ?= $(CURDIR)/../../..
RIOTTOOLS ?= $(CURDIR)/.. RIOTTOOLS ?= $(CURDIR)/..
PKG_SOURCE_DIR = $(CURDIR)/bin
PKG_BUILD_OUT_OF_SOURCE = 0
# Include pkg.mk after setting RIOTBASE otherwise it is not found when this # Include pkg.mk after setting RIOTBASE otherwise it is not found when this
# Makefile is called stand-alone # Makefile is called stand-alone
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
# set default configuration file
RSMB_CFG ?= $(CURDIR)/config.cnf
all: all:
# Start mosquitto_rsmb build in a clean environment, so variables set by RIOT's # Start mosquitto_rsmb build in a clean environment, so variables set by RIOT's
# build process for cross compiling a specific target platform are reset and # build process for cross compiling a specific target platform are reset and
# mosquitto_rsmb can be built cleanly for the host platform. # mosquitto_rsmb can be built cleanly for the host platform.
env -i PATH=$(PATH) TERM=$(TERM) "$(MAKE)" -C $(PKG_BUILDDIR)/rsmb/src env -i PATH=$(PATH) TERM=$(TERM) "$(MAKE)" -C $(PKG_BUILD_DIR)/rsmb/src
cp $(PKG_BUILDDIR)/rsmb/src/broker_mqtts $(CURDIR)/mosquitto_rsmb cp $(PKG_BUILD_DIR)/rsmb/src/broker_mqtts $(CURDIR)/mosquitto_rsmb
cp $(PKG_BUILDDIR)/rsmb/src/Messages.1.* $(CURDIR)/ cp $(PKG_BUILD_DIR)/rsmb/src/Messages.1.* $(CURDIR)/
run: run:
@$(CURDIR)/mosquitto_rsmb $(RSMB_CFG) @$(CURDIR)/mosquitto_rsmb $(RSMB_CFG)
clean:: clean::
@rm -rf $(CURDIR)/bin @rm -rf $(PKG_BUILD_DIR)
@rm -f $(CURDIR)/mosquitto_rsmb @rm -f $(CURDIR)/mosquitto_rsmb
@rm -f $(CURDIR)/Messages.1.* @rm -f $(CURDIR)/Messages.1.*
@rm -f $(CURDIR)/FFDC.CWNAN.*.dmp @rm -f $(CURDIR)/FFDC.CWNAN.*.dmp

6
dist/tools/pic32prog/Makefile vendored
View File

@ -4,6 +4,8 @@ PKG_VERSION = b9f8db3b352804392b02b42475fc42874ac8bf04
PKG_LICENSE = GPL-2 PKG_LICENSE = GPL-2
PKG_BUILDDIR = bin PKG_BUILDDIR = bin
PKG_SOURCE_DIR = $(CURDIR)/bin
PKG_BUILD_OUT_OF_SOURCE = 0
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
# Building it requires some dependencies, on ubuntu: # Building it requires some dependencies, on ubuntu:
@ -12,8 +14,8 @@ include $(RIOTBASE)/pkg/pkg.mk
all: all:
@echo "[INFO] compiling pic32prog from source now" @echo "[INFO] compiling pic32prog from source now"
@env -i PATH=$(PATH) TERM=$(TERM) make -C $(PKG_BUILDDIR) @env -i PATH=$(PATH) TERM=$(TERM) make -C $(PKG_BUILD_DIR)
@mv $(PKG_BUILDDIR)/pic32prog pic32prog @mv $(PKG_BUILD_DIR)/pic32prog pic32prog
distclean:: distclean::
@rm -f pic32prog @rm -f pic32prog

6
dist/tools/setsid/Makefile vendored
View File

@ -4,12 +4,14 @@ PKG_VERSION = e5b851df41591021baf5cf88d4e41572baf8e08b
PKG_LICENSE = BSD-2-Clause PKG_LICENSE = BSD-2-Clause
PKG_BUILDDIR = $(CURDIR)/bin PKG_BUILDDIR = $(CURDIR)/bin
PKG_SOURCE_DIR = $(CURDIR)/bin
PKG_BUILD_OUT_OF_SOURCE = 0
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
all: all:
@echo "[INFO] compiling setsid from source now" @echo "[INFO] compiling setsid from source now"
$(MAKE) BINDIR=$(PKG_BUILDDIR) -C $(PKG_BUILDDIR) $(MAKE) BINDIR=$(PKG_BUILDDIR) -C $(PKG_SOURCE_DIR)
@mv $(PKG_BUILDDIR)/setsid $(CURDIR)/setsid @mv $(PKG_SOURCE_DIR)/setsid $(CURDIR)/setsid
distclean:: distclean::
@rm -f $(CURDIR)/setsid @rm -f $(CURDIR)/setsid

7
dist/tools/teensy-loader-cli/Makefile vendored
View File

@ -1,6 +1,5 @@
PKG_NAME=teensy-loader-cli PKG_NAME=teensy-loader-cli
PKG_LICENSE=GPL-3 PKG_LICENSE=GPL-3
PKG_BUILDDIR=$(CURDIR)/bin
# get sources from repository # get sources from repository
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
@ -12,8 +11,10 @@ else
PKG_VERSION=76921edbdd81ae99b869b104404c16c06b0a266f PKG_VERSION=76921edbdd81ae99b869b104404c16c06b0a266f
endif endif
PKG_SOURCE_DIR = $(CURDIR)/bin
PKG_BUILD_OUT_OF_SOURCE = 0
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
all: all:
env -i PATH=$(PATH) TERM=$(TERM) "$(MAKE)" -C $(PKG_BUILDDIR) env -i PATH=$(PATH) TERM=$(TERM) "$(MAKE)" -C $(PKG_SOURCE_DIR)
mv $(PKG_BUILDDIR)/teensy_loader_cli ./teensy_loader mv $(PKG_SOURCE_DIR)/teensy_loader_cli ./teensy_loader