Skip to content

Commit 8e360aa

Browse files
committed
pkg: clarify that current download target is only for git
1 parent f0eaed7 commit 8e360aa

File tree

11 files changed

+16
-14
lines changed

11 files changed

+16
-14
lines changed

pkg/Makefile.git

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PKG_VERSION= # version of the package to use e.g. a git commit/ref
44

55
.PHONY: all
66

7-
all: download
7+
all: git-download
88
$(MAKE) -C $(CURDIR)/$(PKG_NAME)
99

1010
include $(RIOTBASE)/pkg/pkg.mk

pkg/ccn-lite/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PKG_VERSION=39b1406c11de9de364220909488eebabe7e81613
66

77
export RIOT_CFLAGS = ${CFLAGS} ${INCLUDES}
88

9-
all: download
9+
all: git-download
1010
"$(MAKE)" -BC $(PKG_BUILDDIR)/src lib-ccn-lite.a
1111
"$(MAKE)" -BC $(PKG_BUILDDIR)/src lib-ccn-lite-utils.a
1212
cp $(PKG_BUILDDIR)/src/lib-ccn-lite.a ${BINDIR}/ccn-lite.a

pkg/cmsis-dsp/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ endif
88

99
.PHONY: all
1010

11-
all: download
11+
all: git-download
1212
$(MAKE) -C $(PKG_BUILDDIR)
1313

1414
include $(RIOTBASE)/pkg/pkg.mk

pkg/libcoap/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ endif
99

1010
.PHONY: all
1111

12-
all: download
12+
all: git-download
1313
"$(MAKE)" -C $(PKG_BUILDDIR)
1414

1515
include $(RIOTBASE)/pkg/pkg.mk

pkg/micro-ecc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ endif
99

1010
.PHONY: all
1111

12-
all: download
12+
all: git-download
1313
make -C $(PKG_BUILDDIR)
1414

1515
include $(RIOTBASE)/pkg/pkg.mk

pkg/microcoap/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ endif
99

1010
.PHONY: all
1111

12-
all: download
12+
all: git-download
1313
"$(MAKE)" -C $(PKG_BUILDDIR)
1414

1515
include $(RIOTBASE)/pkg/pkg.mk

pkg/oonf_api/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ MODULE:=$(PKG_NAME)
1111

1212
.PHONY: all
1313

14-
all: download
14+
all: git-download
1515
"$(MAKE)" -C $(PKG_BUILDDIR)
1616
"$(MAKE)" $(BINDIR)$(MODULE).a
1717

pkg/openwsn/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PKG_VERSION=ff25e5d0ae5d344ed793a724d60532fb917bf1f8
44

55
.PHONY: all
66

7-
all: download
7+
all: git-download
88
"$(MAKE)" -C $(PKG_DIR)
99

1010
include $(RIOTBASE)/pkg/pkg.mk

pkg/pkg.mk

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
PKG_DIR?=$(CURDIR)
55
PKG_BUILDDIR?=$(BINDIR)/pkg/$(PKG_NAME)
66

7-
download: $(PKG_BUILDDIR)/.downloaded
7+
.PHONY: git-download
88

9-
$(PKG_BUILDDIR)/.downloaded:
9+
git-download: $(PKG_BUILDDIR)/.git-downloaded
10+
11+
$(PKG_BUILDDIR)/.git-downloaded:
1012
mkdir -p $(PKG_BUILDDIR)
1113
$(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_BUILDDIR)"
1214
if test -d "$(PKG_DIR)"/patches; then \
1315
git -C "$(PKG_BUILDDIR)" am --ignore-whitespace "$(PKG_DIR)"/patches/*.patch; \
14-
fi
15-
touch $(PKG_BUILDDIR)/.downloaded
16+
fi
17+
touch $@
1618

1719
clean::
1820
@echo "Cleaning package $(PKG_NAME)..."

pkg/relic/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $(PKG_BUILDDIR)/comp-options.cmake: fix_source
1919
$(PKG_BUILDDIR)/Makefile: $(PKG_BUILDDIR)/comp-options.cmake
2020
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) .
2121

22-
fix_source: download
22+
fix_source: git-download
2323
./fix-util_print_wo_args.sh $(PKG_BUILDDIR)
2424
./fix-old-style-definitions.sh $(PKG_BUILDDIR)
2525

pkg/wakaama/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PKG_VERSION=69a32cfae39f66fe4eec4cc8d1cd48ced7ad447c
77
all: patch
88
"$(MAKE)" -C $(PKG_BUILDDIR)/riotbuild
99

10-
patch: download
10+
patch: git-download
1111
mkdir -p "$(PKG_BUILDDIR)/riotbuild"
1212
cp $(PKG_BUILDDIR)/core/*.c $(PKG_BUILDDIR)/core/*.h $(PKG_BUILDDIR)/riotbuild
1313
cp $(PKG_BUILDDIR)/core/er-coap-13/*.c $(PKG_TEMP_DIR)/core/er-coap-13/*.h $(PKG_BUILDDIR)/riotbuild

0 commit comments

Comments
 (0)