1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

dist/tools/*: adapt to new state file targets

Prepare for handling pkg state with files. So it requires having the
path defined before declaring targets. In addition, it cleans up the
old git-download target.
This commit is contained in:
Gaëtan Harter 2019-10-02 12:47:02 +02:00 committed by Bas Stottelaar
parent ca5d13cc2a
commit f08116f3ce
7 changed files with 17 additions and 38 deletions

View File

@ -4,14 +4,12 @@ PKG_VERSION = 26154375695f345491bba158d57177aa231d6765
PKG_LICENSE = BSD-3-Clause
PKG_BUILDDIR = $(CURDIR)/bin
.PHONY: all
include $(RIOTBASE)/pkg/pkg.mk
all: git-download
all:
@echo "[INFO] compiling bossac from source now"
@env -u CXX COMMON_CXXFLAGS="-std=c++11" $(MAKE) BINDIR=$(PKG_BUILDDIR) -C $(PKG_BUILDDIR) strip-bossac
@mv $(PKG_BUILDDIR)/bossac $(CURDIR)/bossac
distclean::
@rm -f $(CURDIR)/bossac
include $(RIOTBASE)/pkg/pkg.mk

View File

@ -4,13 +4,11 @@ PKG_VERSION=4f5d490bfffc7fd10855e513e6e88be5a9a3f789
PKG_LICENSE=BSD-3-Clause
PKG_BUILDDIR=$(CURDIR)/bin
.PHONY: all
include $(RIOTBASE)/pkg/pkg.mk
all: git-download
all:
# 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
# be built cleanly for the native platform.
env -i PATH="$(PATH)" TERM="$(TERM)" "$(MAKE)" -C "$(PKG_BUILDDIR)"
mv $(PKG_BUILDDIR)/edbg .
include $(RIOTBASE)/pkg/pkg.mk

View File

@ -4,11 +4,9 @@ PKG_VERSION=82f59179b1b35fcd8b6d188453b283599ea70518
PKG_LICENSE=ISC
PKG_BUILDDIR=$(CURDIR)/bin
.PHONY: all
include $(RIOTBASE)/pkg/pkg.mk
all: git-download
all:
cp $(PKG_BUILDDIR)/kconfiglib.py $(PKG_BUILDDIR)/menuconfig.py \
$(PKG_BUILDDIR)/genconfig.py $(PKG_BUILDDIR)/examples/merge_config.py \
.
include $(RIOTBASE)/pkg/pkg.mk

View File

@ -4,6 +4,8 @@ PKG_VERSION = 9b99a3be9a26635b93aec8fa2ed744e8c49e7262
PKG_LICENSE = EPL-1.0
PKG_BUILDDIR = $(CURDIR)/bin
include $(RIOTBASE)/pkg/pkg.mk
# set default configuration file
RSMB_CFG ?= $(CURDIR)/config.cnf
@ -14,9 +16,7 @@ GITCACHE ?= $(RIOTTOOLS)/git/git-cache
$(info $(RIOTBASE))
.PHONY: all clean
all: git-download
all:
# 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
# mosquitto_rsmb can be built cleanly for the host platform.
@ -32,5 +32,3 @@ clean::
@rm -f $(CURDIR)/mosquitto_rsmb
@rm -f $(CURDIR)/Messages.1.*
@rm -f $(CURDIR)/FFDC.CWNAN.*.dmp
include $(RIOTBASE)/pkg/pkg.mk

View File

@ -4,16 +4,16 @@ PKG_VERSION = b9f8db3b352804392b02b42475fc42874ac8bf04
PKG_LICENSE = GPL-2
PKG_BUILDDIR = bin
include $(RIOTBASE)/pkg/pkg.mk
# Building it requires some dependencies, on ubuntu:
#
# sudo apt-get install libusb-dev libusb-1.0-0-dev libudev-dev
all: git-download
all:
@echo "[INFO] compiling pic32prog from source now"
@env -i PATH=$(PATH) TERM=$(TERM) make -C $(PKG_BUILDDIR)
@mv $(PKG_BUILDDIR)/pic32prog pic32prog
distclean::
@rm -f pic32prog
include $(RIOTBASE)/pkg/pkg.mk

View File

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

View File

@ -2,17 +2,8 @@ PKG_NAME=teensy-loader-cli
PKG_LICENSE=GPL-3
PKG_BUILDDIR=$(CURDIR)/bin
# resolv build host in a hacky way
UNAME=$(shell uname)
TARGET=WINDOWS
ifeq ("$(UNAME)","Linux")
TARGET=LINUX
else ifeq ("$(UNAME)","Darwin")
TARGET=MACOSX
endif
# get sources from repository
ifeq ("$(TARGET)","MACOSX")
ifeq ($(OS),Darwin)
# hacked version to make it work on MACOSX
PKG_URL=https://github.com/alswl/teensy_loader_cli.git
PKG_VERSION=9c16bb0add3ba847df5509328ad6bd5bc09d9ecd
@ -21,10 +12,8 @@ else
PKG_VERSION=76921edbdd81ae99b869b104404c16c06b0a266f
endif
.PHONY: all
include $(RIOTBASE)/pkg/pkg.mk
all: git-download
all:
env -i PATH=$(PATH) TERM=$(TERM) "$(MAKE)" -C $(PKG_BUILDDIR)
mv $(PKG_BUILDDIR)/teensy_loader_cli ./teensy_loader
include $(RIOTBASE)/pkg/pkg.mk