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

Merge pull request #5154 from authmillenon/pkg/enh/allow-for-non-git-repos

Browse Source 
pkg: clarify that current `download` target is only for git
This commit is contained in:
Kaspar Schleiser 2016-03-24 18:23:25 +01:00
commit bd8d1dd28c
11 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/Makefile.git
View File

@ -4,7 +4,7 @@ PKG_VERSION= # version of the package to use e.g. a git commit/ref
.PHONY: all .PHONY: all
all: download all: git-download
$(MAKE) -C $(CURDIR)/$(PKG_NAME) $(MAKE) -C $(CURDIR)/$(PKG_NAME)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk

2
pkg/ccn-lite/Makefile
View File

@ -6,7 +6,7 @@ PKG_VERSION=39b1406c11de9de364220909488eebabe7e81613
export RIOT_CFLAGS = ${CFLAGS} ${INCLUDES} export RIOT_CFLAGS = ${CFLAGS} ${INCLUDES}
all: download all: git-download
"$(MAKE)" -BC $(PKG_BUILDDIR)/src lib-ccn-lite.a "$(MAKE)" -BC $(PKG_BUILDDIR)/src lib-ccn-lite.a
"$(MAKE)" -BC $(PKG_BUILDDIR)/src lib-ccn-lite-utils.a "$(MAKE)" -BC $(PKG_BUILDDIR)/src lib-ccn-lite-utils.a
cp $(PKG_BUILDDIR)/src/lib-ccn-lite.a ${BINDIR}/ccn-lite.a cp $(PKG_BUILDDIR)/src/lib-ccn-lite.a ${BINDIR}/ccn-lite.a

2
pkg/cmsis-dsp/Makefile
View File

@ -8,7 +8,7 @@ endif
.PHONY: all .PHONY: all
all: download all: git-download
$(MAKE) -C $(PKG_BUILDDIR) $(MAKE) -C $(PKG_BUILDDIR)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk

2
pkg/libcoap/Makefile
View File

@ -9,7 +9,7 @@ endif
.PHONY: all .PHONY: all
all: download all: git-download
"$(MAKE)" -C $(PKG_BUILDDIR) "$(MAKE)" -C $(PKG_BUILDDIR)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk

2
pkg/micro-ecc/Makefile
View File

@ -9,7 +9,7 @@ endif
.PHONY: all .PHONY: all
all: download all: git-download
make -C $(PKG_BUILDDIR) make -C $(PKG_BUILDDIR)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk

2
pkg/microcoap/Makefile
View File

@ -9,7 +9,7 @@ endif
.PHONY: all .PHONY: all
all: download all: git-download
"$(MAKE)" -C $(PKG_BUILDDIR) "$(MAKE)" -C $(PKG_BUILDDIR)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk

2
pkg/oonf_api/Makefile
View File

@ -11,7 +11,7 @@ MODULE:=$(PKG_NAME)
.PHONY: all .PHONY: all
all: download all: git-download
"$(MAKE)" -C $(PKG_BUILDDIR) "$(MAKE)" -C $(PKG_BUILDDIR)
"$(MAKE)" $(BINDIR)$(MODULE).a "$(MAKE)" $(BINDIR)$(MODULE).a

2
pkg/openwsn/Makefile
View File

@ -4,7 +4,7 @@ PKG_VERSION=ff25e5d0ae5d344ed793a724d60532fb917bf1f8
.PHONY: all .PHONY: all
all: download all: git-download
"$(MAKE)" -C $(PKG_DIR) "$(MAKE)" -C $(PKG_DIR)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk

8
pkg/pkg.mk
View File

@ -4,15 +4,17 @@
PKG_DIR?=$(CURDIR) PKG_DIR?=$(CURDIR)
PKG_BUILDDIR?=$(BINDIR)/pkg/$(PKG_NAME) PKG_BUILDDIR?=$(BINDIR)/pkg/$(PKG_NAME)
download: $(PKG_BUILDDIR)/.downloaded .PHONY: git-download
$(PKG_BUILDDIR)/.downloaded: git-download: $(PKG_BUILDDIR)/.git-downloaded
$(PKG_BUILDDIR)/.git-downloaded:
mkdir -p $(PKG_BUILDDIR) mkdir -p $(PKG_BUILDDIR)
$(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_BUILDDIR)" $(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_BUILDDIR)"
if test -d "$(PKG_DIR)"/patches; then \ if test -d "$(PKG_DIR)"/patches; then \
git -C "$(PKG_BUILDDIR)" am --ignore-whitespace "$(PKG_DIR)"/patches/*.patch; \ git -C "$(PKG_BUILDDIR)" am --ignore-whitespace "$(PKG_DIR)"/patches/*.patch; \
fi fi
touch $(PKG_BUILDDIR)/.downloaded touch $@
clean:: clean::
@echo "Cleaning package $(PKG_NAME)..." @echo "Cleaning package $(PKG_NAME)..."

2
pkg/relic/Makefile
View File

@ -19,7 +19,7 @@ $(PKG_BUILDDIR)/comp-options.cmake: fix_source
$(PKG_BUILDDIR)/Makefile: $(PKG_BUILDDIR)/comp-options.cmake $(PKG_BUILDDIR)/Makefile: $(PKG_BUILDDIR)/comp-options.cmake
cd "$(PKG_BUILDDIR)" && COMP="$(filter-out -Werror=old-style-definition -Werror=strict-prototypes, $(CFLAGS) ) " cmake -DCMAKE_TOOLCHAIN_FILE=comp-options.cmake -DCHECK=off -DTESTS=0 -DBENCH=0 -DSHLIB=off -Wno-dev $(RELIC_CONFIG_FLAGS) . cd "$(PKG_BUILDDIR)" && COMP="$(filter-out -Werror=old-style-definition -Werror=strict-prototypes, $(CFLAGS) ) " cmake -DCMAKE_TOOLCHAIN_FILE=comp-options.cmake -DCHECK=off -DTESTS=0 -DBENCH=0 -DSHLIB=off -Wno-dev $(RELIC_CONFIG_FLAGS) .
fix_source: download fix_source: git-download
./fix-util_print_wo_args.sh $(PKG_BUILDDIR) ./fix-util_print_wo_args.sh $(PKG_BUILDDIR)
./fix-old-style-definitions.sh $(PKG_BUILDDIR) ./fix-old-style-definitions.sh $(PKG_BUILDDIR)

2
pkg/wakaama/Makefile
View File

@ -7,7 +7,7 @@ PKG_VERSION=69a32cfae39f66fe4eec4cc8d1cd48ced7ad447c
all: patch all: patch
"$(MAKE)" -C $(PKG_BUILDDIR)/riotbuild "$(MAKE)" -C $(PKG_BUILDDIR)/riotbuild
patch: download patch: git-download
mkdir -p "$(PKG_BUILDDIR)/riotbuild" mkdir -p "$(PKG_BUILDDIR)/riotbuild"
cp $(PKG_BUILDDIR)/core/*.c $(PKG_BUILDDIR)/core/*.h $(PKG_BUILDDIR)/riotbuild cp $(PKG_BUILDDIR)/core/*.c $(PKG_BUILDDIR)/core/*.h $(PKG_BUILDDIR)/riotbuild
cp $(PKG_BUILDDIR)/core/er-coap-13/*.c $(PKG_TEMP_DIR)/core/er-coap-13/*.h $(PKG_BUILDDIR)/riotbuild cp $(PKG_BUILDDIR)/core/er-coap-13/*.c $(PKG_TEMP_DIR)/core/er-coap-13/*.h $(PKG_BUILDDIR)/riotbuild