Browse Source

Merge pull request #5138 from kaspar030/pkg_unify_git_checkout

pkg: unify git checkout
pr/gpio
Martine Lenders 7 years ago
parent
commit
f0eaed7fb8
  1. 34
      pkg/Makefile.git
  2. 1
      pkg/ccn-lite/.gitignore
  3. 30
      pkg/ccn-lite/Makefile
  4. 2
      pkg/ccn-lite/Makefile.include
  5. 1
      pkg/cmsis-dsp/.gitignore
  6. 23
      pkg/cmsis-dsp/Makefile
  7. 2
      pkg/cmsis-dsp/Makefile.include
  8. 1
      pkg/libcoap/.gitignore
  9. 30
      pkg/libcoap/Makefile
  10. 2
      pkg/libcoap/Makefile.include
  11. 0
      pkg/libcoap/patches/0001-Add-RIOT-Makefile.patch
  12. 0
      pkg/libcoap/patches/0002-Add-config.h.patch
  13. 0
      pkg/libcoap/patches/0003-Remove-two-example-programs-in-root.patch
  14. 0
      pkg/libcoap/patches/0004-Eliminate-some-compiler-warnings-and-errors.patch
  15. 0
      pkg/libcoap/patches/0005-fix-old-style-function-declarations.patch
  16. 0
      pkg/libcoap/patches/0006-debug-do-not-misuse-NDEBUG.patch
  17. 0
      pkg/libcoap/patches/0007-fix-option-parsing-with-debug-enabled.patch
  18. 0
      pkg/libcoap/patches/0008-fix-debug-out-in-PDU-parsing.patch
  19. 0
      pkg/libcoap/patches/0009-delete-unused-function-check_opt_size.patch
  20. 1
      pkg/micro-ecc/.gitignore
  21. 29
      pkg/micro-ecc/Makefile
  22. 0
      pkg/micro-ecc/patches/0001-Add-RIOT-Makefile.patch
  23. 0
      pkg/micro-ecc/patches/0002-Include-RIOT-Hardware-RNG-interface.patch
  24. 0
      pkg/micro-ecc/patches/0003-Use-the-parameter-curve-instead-of-the-static-refere.patch
  25. 1
      pkg/microcoap/.gitignore
  26. 30
      pkg/microcoap/Makefile
  27. 2
      pkg/microcoap/Makefile.include
  28. 0
      pkg/microcoap/patches/0001-Remove-unneeded-.c-files.patch
  29. 0
      pkg/microcoap/patches/0002-Add-RIOT-Makefile.patch
  30. 0
      pkg/microcoap/patches/0003-change-flag-from-DEBUG-to-MICROCOAP_DEBUG.patch
  31. 0
      pkg/microcoap/patches/0004-increment_max_segments.patch
  32. 0
      pkg/microcoap/patches/0005-fix-uninitialized-variable.patch
  33. 1
      pkg/oonf_api/.gitignore
  34. 31
      pkg/oonf_api/Makefile
  35. 2
      pkg/oonf_api/Makefile.include
  36. 0
      pkg/oonf_api/patches/0001-add-RIOT-support.patch
  37. 0
      pkg/oonf_api/patches/0002-port-tests-to-riot.patch
  38. 0
      pkg/oonf_api/patches/0003-port-example-to-riot.patch
  39. 0
      pkg/oonf_api/patches/0004-fix-conflicting-types.patch
  40. 0
      pkg/oonf_api/patches/0005-only-define-container_of-when-necessary.patch
  41. 0
      pkg/oonf_api/patches/0006-if_index-is-not-used.patch
  42. 0
      pkg/oonf_api/patches/0007-Use-RIOT-s-container_of-implementation.patch
  43. 0
      pkg/oonf_api/patches/0008-Dissolve-enum-into-single-defines.patch
  44. 0
      pkg/oonf_api/patches/0009-Add-missing-include.patch
  45. 0
      pkg/oonf_api/patches/0010-Change-index-of-array-from-0-to-1.patch
  46. 0
      pkg/oonf_api/patches/0011-remove-error-array-subscript-has-type-char-Werror-ch.patch
  47. 1
      pkg/openwsn/.gitignore
  48. 27
      pkg/openwsn/Makefile
  49. 0
      pkg/openwsn/patches/0001-Add-RIOT-Makefiles.patch
  50. 0
      pkg/openwsn/patches/0002-Add-RIOT-adaption.patch
  51. 0
      pkg/openwsn/patches/0003-Fix-old-style-definitions.patch
  52. 0
      pkg/openwsn/patches/0004-provide-openserial-dummies.patch
  53. 0
      pkg/openwsn/patches/0005-fixes-to-RIOT-adaption.patch
  54. 22
      pkg/pkg.mk
  55. 1
      pkg/relic/.gitignore
  56. 43
      pkg/relic/Makefile
  57. 2
      pkg/relic/Makefile.include
  58. 0
      pkg/relic/patches/0001-fixed-signedness-of-counter-variable.patch
  59. 0
      pkg/relic/patches/0002-don-t-redefine-ALIGN.patch
  60. 0
      pkg/relic/patches/0003-require-only-CMake-version-2.8.patch
  61. 1
      pkg/wakaama/.gitignore
  62. 36
      pkg/wakaama/Makefile
  63. 0
      pkg/wakaama/patches/0001-changing-header-location.patch
  64. 0
      pkg/wakaama/patches/0002-defined-endianness.patch
  65. 0
      pkg/wakaama/patches/0003-fixed-warnings-in-er-coap-13.c.patch
  66. 0
      pkg/wakaama/patches/0004-fixed-warnings-in-packet.c.patch
  67. 0
      pkg/wakaama/patches/0005-fixed-warnings-in-tlv.c.patch
  68. 0
      pkg/wakaama/patches/0006-fixed-warnings-in-utils.c.patch
  69. 0
      pkg/wakaama/patches/0007-fixed-warnings-in-bootstrap.c.patch
  70. 0
      pkg/wakaama/patches/0008-fixed-warnings-in-objects.c.patch
  71. 0
      pkg/wakaama/patches/0009-fixed-errors-in-internals.h.patch
  72. 0
      pkg/wakaama/patches/0010-fixed-warnings-in-registration.c.patch

34
pkg/Makefile.git

@ -1,36 +1,10 @@
PKG_NAME= # name of the package
PKG_URL= # source url of the package e.g. a git repository
PKG_URL= # source url of the package's git repository
PKG_VERSION= # version of the package to use e.g. a git commit/ref
ifneq ($(RIOTBOARD),)
include $(RIOTBOARD)/Makefile.base
include $(RIOTBOARD)/$(BOARD)/Makefile.include
endif
.PHONY: all
.PHONY: all clean patch distclean
all: patch
all: download
$(MAKE) -C $(CURDIR)/$(PKG_NAME)
patch: $(CURDIR)/$(PKG_NAME)/Makefile
# Dependancy might be changed accordingly though we think the Makefile
# will be the first thing you want to change
#
# Here might not happen anything besides dependancy checks
$(CURDIR)/$(PKG_NAME)/Makefile: $(CURDIR)/$(PKG_NAME)
# Here you apply your patch.
$(foreach patch,$(shell ls [0-9][0-9][0-9][0-9]*.patch),cd "$<" && git am "$(patch)" || { git am --abort; exit 1; };)
$(PKG_NAME):
# Get PKG_VERSION of package from PKG_URL
git clone $(PKG_URL) $(PKG_NAME) && cd $(PKG_NAME) && git reset --hard $(PKG_VERSION)
clean::
# Reset package to checkout state.
cd $(CURDIR)/$(PKG_NAME) || true && \
git clean -x -f && \
git reset --hard $(PKG_VERSION)
distclean::
rm -rf $(CURDIR)/$(PKG_NAME)
include $(RIOTBASE)/pkg/pkg.mk

1
pkg/ccn-lite/.gitignore vendored

@ -1 +0,0 @@
/ccn-lite

30
pkg/ccn-lite/Makefile

@ -1,31 +1,15 @@
PKG_NAME=ccn-lite
PKG_URL=https://github.com/OlegHahm/ccn-lite/
PKG_VERSION=39b1406c11de9de364220909488eebabe7e81613
PKG_DIR=$(CURDIR)/$(PKG_NAME)
.PHONY: all clean distclean
.PHONY: all
export RIOT_CFLAGS = ${CFLAGS} ${INCLUDES}
all: $(PKG_DIR)/Makefile
"$(MAKE)" -BC $(PKG_DIR)/src lib-ccn-lite.a
"$(MAKE)" -BC $(PKG_DIR)/src lib-ccn-lite-utils.a
cp $(PKG_DIR)/src/lib-ccn-lite.a ${BINDIR}/ccn-lite.a
cp $(PKG_DIR)/src/lib-ccn-lite-utils.a ${BINDIR}/ccn-lite-utils.a
all: download
"$(MAKE)" -BC $(PKG_BUILDDIR)/src lib-ccn-lite.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-utils.a ${BINDIR}/ccn-lite-utils.a
$(PKG_DIR)/Makefile: $(PKG_DIR)/.git/config
$(PKG_DIR)/.git/config:
test -d "$(PKG_DIR)" || $(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_DIR)"
clean::
@echo "Cleaning up CCN-Lite package..."
@cd "$(PKG_DIR)" 2> /dev/null > /dev/null && \
git clean -x -f && \
git reset --hard "$(PKG_VERSION)"
distclean::
rm -rf "$(PKG_DIR)"
Makefile.include:
@true
include $(RIOTBASE)/pkg/pkg.mk

2
pkg/ccn-lite/Makefile.include

@ -1,2 +1,2 @@
INCLUDES += -I$(RIOTPKG)/ccn-lite -I$(RIOTPKG)/ccn-lite/ccn-lite/src
INCLUDES += -I$(RIOTPKG)/ccn-lite -I$(BINDIR)/pkg/ccn-lite/src
INCLUDES += -I$(RIOTBASE)/sys/posix/include

1
pkg/cmsis-dsp/.gitignore vendored

@ -1 +0,0 @@
/cmsis-dsp

23
pkg/cmsis-dsp/Makefile

@ -1,29 +1,14 @@
PKG_NAME=cmsis-dsp
PKG_URL=https://github.com/gebart/CMSIS-DSP.git
PKG_VERSION=v1.4.5a-riot1
PKG_DIR=$(CURDIR)/$(PKG_NAME)
ifneq ($(RIOTBASE),)
include $(RIOTBASE)/Makefile.base
endif
.PHONY: all clean patch distclean
.PHONY: all
all: $(PKG_DIR)/Makefile
$(MAKE) -C $(CURDIR)/$(PKG_NAME)
all: download
$(MAKE) -C $(PKG_BUILDDIR)
$(PKG_DIR)/Makefile: $(PKG_DIR)/.git/config
@
$(PKG_DIR)/.git/config:
test -d "$(PKG_DIR)" || $(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_DIR)"
clean::
@echo "Cleaning up $(PKG_NAME) package..."
@-cd "$(PKG_DIR)" 2> /dev/null > /dev/null && \
git clean -x -f && \
git am --abort && \
git reset --hard "$(PKG_VERSION)"
distclean::
rm -rf "$(PKG_DIR)"
include $(RIOTBASE)/pkg/pkg.mk

2
pkg/cmsis-dsp/Makefile.include

@ -1 +1 @@
INCLUDES += -I$(RIOTPKG)/cmsis-dsp/cmsis-dsp/include
INCLUDES += -I$(BINDIR)/pkg/cmsis-dsp/include

1
pkg/libcoap/.gitignore vendored

@ -1 +0,0 @@
/libcoap

30
pkg/libcoap/Makefile

@ -1,37 +1,15 @@
PKG_NAME=libcoap
PKG_URL=https://github.com/obgm/libcoap
PKG_VERSION=ef41ce5d02d64cec0751882ae8fd95f6c32bc018
PKG_DIR=$(CURDIR)/$(PKG_NAME)
ifneq ($(RIOTBASE),)
INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \
-I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include
endif
.PHONY: all clean patch reset
.PHONY: all
all: patch
"$(MAKE)" -C $(PKG_DIR)
all: download
"$(MAKE)" -C $(PKG_BUILDDIR)
patch: $(PKG_DIR)/Makefile
$(PKG_DIR)/Makefile: $(PKG_DIR)/.git/config
cd "$(PKG_DIR)" && git am --ignore-whitespace "$(CURDIR)"/*.patch
$(PKG_DIR)/.git/config:
test -d "$(PKG_DIR)" || $(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_DIR)"
clean::
@echo "Cleaning up libcoap package..."
@cd "$(PKG_DIR)" 2> /dev/null > /dev/null && \
git clean -x -f && \
git am --abort && \
git reset --hard "$(PKG_VERSION)" && \
$(MAKE) patch || true
distclean::
rm -rf "$(PKG_DIR)"
Makefile.include:
@true
include $(RIOTBASE)/pkg/pkg.mk

2
pkg/libcoap/Makefile.include

@ -1,3 +1,3 @@
INCLUDES += -I$(RIOTPKG)/libcoap/libcoap \
INCLUDES += -I$(BINDIR)/pkg/libcoap \
-I$(RIOTBASE)/sys/posix/include \
-I$(RIOTBASE)/sys/net/include

0
pkg/libcoap/0001-Add-RIOT-Makefile.patch → pkg/libcoap/patches/0001-Add-RIOT-Makefile.patch

0
pkg/libcoap/0002-Add-config.h.patch → pkg/libcoap/patches/0002-Add-config.h.patch

0
pkg/libcoap/0003-Remove-two-example-programs-in-root.patch → pkg/libcoap/patches/0003-Remove-two-example-programs-in-root.patch

0
pkg/libcoap/0004-Eliminate-some-compiler-warnings-and-errors.patch → pkg/libcoap/patches/0004-Eliminate-some-compiler-warnings-and-errors.patch

0
pkg/libcoap/0005-fix-old-style-function-declarations.patch → pkg/libcoap/patches/0005-fix-old-style-function-declarations.patch

0
pkg/libcoap/0006-debug-do-not-misuse-NDEBUG.patch → pkg/libcoap/patches/0006-debug-do-not-misuse-NDEBUG.patch

0
pkg/libcoap/0007-fix-option-parsing-with-debug-enabled.patch → pkg/libcoap/patches/0007-fix-option-parsing-with-debug-enabled.patch

0
pkg/libcoap/0008-fix-debug-out-in-PDU-parsing.patch → pkg/libcoap/patches/0008-fix-debug-out-in-PDU-parsing.patch

0
pkg/libcoap/0009-delete-unused-function-check_opt_size.patch → pkg/libcoap/patches/0009-delete-unused-function-check_opt_size.patch

1
pkg/micro-ecc/.gitignore vendored

@ -1 +0,0 @@
/micro-ecc

29
pkg/micro-ecc/Makefile

@ -1,38 +1,15 @@
PKG_NAME=micro-ecc
PKG_URL=https://github.com/kmackay/micro-ecc.git
PKG_VERSION=b6c0cdbe7d20af48b0c2a909a66ff00b093d1542
PKG_DIR=$(CURDIR)
PKG_BUILDDIR=$(BINDIR)/pkg/$(PKG_NAME)
ifneq ($(RIOTBASE),)
INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \
-I$(RIOTBASE)/sys/posix/include
endif
MODULE:=$(shell basename $(CURDIR))
.PHONY: all
.PHONY: all clean patch reset
all: patch
all: download
make -C $(PKG_BUILDDIR)
make $(BINDIR)$(MODULE).a
patch: $(PKG_BUILDDIR)/Makefile
$(PKG_BUILDDIR)/Makefile: $(PKG_BUILDDIR)
cd $(PKG_BUILDDIR) && \
for patch in $(PKG_DIR)/[0-9][0-9][0-9][0-9]*.patch; do git am "$${patch}" || { git am --abort; exit 1; }; done
touch $(PKG_BUILDDIR)/Makefile
$(PKG_BUILDDIR):
mkdir -p $(BINDIR)/pkg && \
$(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_BUILDDIR)"
clean::
rm -Rf $(PKG_BUILDDIR)
distclean::
rm -rf $(PKG_BUILDDIR)
#$(BINDIR)$(MODULE).a: $(BINDIR)micro-ecc_*.a
# mkdir -p $(BINDIR)$(MODULE); cd $(BINDIR)$(MODULE); for var in $?; do ar -x $$var; done; ar -r -c -s $(BINDIR)$(MODULE).a *.o
include $(RIOTBASE)/pkg/pkg.mk

0
pkg/micro-ecc/0001-Add-RIOT-Makefile.patch → pkg/micro-ecc/patches/0001-Add-RIOT-Makefile.patch

0
pkg/micro-ecc/0002-Include-RIOT-Hardware-RNG-interface.patch → pkg/micro-ecc/patches/0002-Include-RIOT-Hardware-RNG-interface.patch

0
pkg/micro-ecc/0003-Use-the-parameter-curve-instead-of-the-static-refere.patch → pkg/micro-ecc/patches/0003-Use-the-parameter-curve-instead-of-the-static-refere.patch

1
pkg/microcoap/.gitignore vendored

@ -1 +0,0 @@
/microcoap

30
pkg/microcoap/Makefile

@ -1,37 +1,15 @@
PKG_NAME=microcoap
PKG_URL=git://github.com/1248/microcoap.git
PKG_VERSION=9cb1dcda2182a8dca8483b230cda8b591a924c82
PKG_DIR=$(CURDIR)/$(PKG_NAME)
ifneq ($(RIOTBASE),)
INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \
-I$(RIOTBASE)/sys/posix/include
endif
.PHONY: all clean patch reset
.PHONY: all
all: patch
"$(MAKE)" -C $(PKG_DIR)
all: download
"$(MAKE)" -C $(PKG_BUILDDIR)
patch: $(PKG_DIR)/Makefile
$(PKG_DIR)/Makefile: $(PKG_DIR)/.git/config
cd "$(PKG_DIR)" && git am --ignore-whitespace "$(CURDIR)"/*.patch
$(PKG_DIR)/.git/config:
test -d "$(PKG_DIR)" || $(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_DIR)"
clean::
@echo "Cleaning up $(PKG_NAME) package..."
@cd "$(PKG_DIR)" 2> /dev/null > /dev/null && \
git clean -x -f && \
git am --abort && \
git reset --hard "$(PKG_VERSION)" && \
$(MAKE) patch || true
distclean::
rm -rf "$(PKG_DIR)"
Makefile.include:
@true
include $(RIOTBASE)/pkg/pkg.mk

2
pkg/microcoap/Makefile.include

@ -1 +1 @@
INCLUDES += -I$(RIOTPKG)/microcoap/microcoap
INCLUDES += -I$(BINDIR)/pkg/microcoap

0
pkg/microcoap/0001-Remove-unneeded-.c-files.patch → pkg/microcoap/patches/0001-Remove-unneeded-.c-files.patch

0
pkg/microcoap/0002-Add-RIOT-Makefile.patch → pkg/microcoap/patches/0002-Add-RIOT-Makefile.patch

0
pkg/microcoap/0003-change-flag-from-DEBUG-to-MICROCOAP_DEBUG.patch → pkg/microcoap/patches/0003-change-flag-from-DEBUG-to-MICROCOAP_DEBUG.patch

0
pkg/microcoap/0004-increment_max_segments.patch → pkg/microcoap/patches/0004-increment_max_segments.patch

0
pkg/microcoap/0005-fix-uninitialized-variable.patch → pkg/microcoap/patches/0005-fix-uninitialized-variable.patch

1
pkg/oonf_api/.gitignore vendored

@ -1 +0,0 @@
/oonf_api

31
pkg/oonf_api/Makefile

@ -1,42 +1,21 @@
PKG_NAME=oonf_api
PKG_URL=https://github.com/OLSR/OONF.git
PKG_VERSION=v0.3.0
PKG_DIR=$(CURDIR)/$(PKG_NAME)
ifneq ($(RIOTBASE),)
INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \
-I$(RIOTBASE)/sys/posix/include
endif
MODULE:=$(shell basename $(CURDIR))
MODULE:=$(PKG_NAME)
.PHONY: all clean patch reset
.PHONY: all
all: patch
"$(MAKE)" -C $(PKG_DIR)
all: download
"$(MAKE)" -C $(PKG_BUILDDIR)
"$(MAKE)" $(BINDIR)$(MODULE).a
patch: $(PKG_DIR)/Makefile
$(PKG_DIR)/Makefile: $(PKG_DIR)/.git/config
cd "$(PKG_DIR)" && git am --ignore-whitespace "$(CURDIR)"/*.patch
$(PKG_DIR)/.git/config:
test -d "$(PKG_DIR)" || $(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_DIR)"
clean::
@echo "Cleaning up oonf_api package..."
@cd "$(PKG_DIR)" 2> /dev/null > /dev/null && \
git clean -x -f && \
git am --abort && \
git reset --hard "$(PKG_VERSION)" && \
$(MAKE) patch || true
distclean::
rm -rf $(PKG_DIR)
$(BINDIR)$(MODULE).a: $(BINDIR)oonf_*.a
mkdir -p $(BINDIR)$(MODULE); cd $(BINDIR)$(MODULE); for var in $?; do ar -x $$var; done; ar -r -c -s $(BINDIR)$(MODULE).a *.o
Makefile.include:
@true
include $(RIOTBASE)/pkg/pkg.mk

2
pkg/oonf_api/Makefile.include

@ -1 +1 @@
INCLUDES += -I$(RIOTPKG)/oonf_api/oonf_api/src-api
INCLUDES += -I$(BINDIR)/pkg/oonf_api/src-api

0
pkg/oonf_api/0001-add-RIOT-support.patch → pkg/oonf_api/patches/0001-add-RIOT-support.patch

0
pkg/oonf_api/0002-port-tests-to-riot.patch → pkg/oonf_api/patches/0002-port-tests-to-riot.patch

0
pkg/oonf_api/0003-port-example-to-riot.patch → pkg/oonf_api/patches/0003-port-example-to-riot.patch

0
pkg/oonf_api/0004-fix-conflicting-types.patch → pkg/oonf_api/patches/0004-fix-conflicting-types.patch

0
pkg/oonf_api/0005-only-define-container_of-when-necessary.patch → pkg/oonf_api/patches/0005-only-define-container_of-when-necessary.patch

0
pkg/oonf_api/0006-if_index-is-not-used.patch → pkg/oonf_api/patches/0006-if_index-is-not-used.patch

0
pkg/oonf_api/0007-Use-RIOT-s-container_of-implementation.patch → pkg/oonf_api/patches/0007-Use-RIOT-s-container_of-implementation.patch

0
pkg/oonf_api/0008-Dissolve-enum-into-single-defines.patch → pkg/oonf_api/patches/0008-Dissolve-enum-into-single-defines.patch

0
pkg/oonf_api/0009-Add-missing-include.patch → pkg/oonf_api/patches/0009-Add-missing-include.patch

0
pkg/oonf_api/0010-Change-index-of-array-from-0-to-1.patch → pkg/oonf_api/patches/0010-Change-index-of-array-from-0-to-1.patch

0
pkg/oonf_api/0011-remove-error-array-subscript-has-type-char-Werror-ch.patch → pkg/oonf_api/patches/0011-remove-error-array-subscript-has-type-char-Werror-ch.patch

1
pkg/openwsn/.gitignore vendored

@ -1 +0,0 @@
/openwsn

27
pkg/openwsn/Makefile

@ -1,31 +1,10 @@
PKG_NAME=openwsn
PKG_URL=https://github.com/openwsn-berkeley/openwsn-fw.git
PKG_VERSION=ff25e5d0ae5d344ed793a724d60532fb917bf1f8
PKG_DIR=$(CURDIR)/$(PKG_NAME)
.PHONY: all clean patch reset
.PHONY: all
all: patch
all: download
"$(MAKE)" -C $(PKG_DIR)
patch: $(PKG_DIR)/Makefile
$(PKG_DIR)/Makefile: $(PKG_DIR)/.git/config
cd "$(PKG_DIR)" && git am --ignore-whitespace $(CURDIR)/*.patch
$(PKG_DIR)/.git/config:
test -d "$(PKG_DIR)" || $(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_DIR)"
clean::
@echo "Cleaning up OpenWSN package..."
@cd "$(PKG_DIR)" 2> /dev/null > /dev/null && \
git clean -x -f && \
git am --abort ; \
git reset --hard "$(PKG_VERSION)" && \
$(MAKE) patch || true
distclean::
rm -rf "$(PKG_DIR)"
Makefile.include:
@true
include $(RIOTBASE)/pkg/pkg.mk

0
pkg/openwsn/0001-Add-RIOT-Makefiles.patch → pkg/openwsn/patches/0001-Add-RIOT-Makefiles.patch

0
pkg/openwsn/0002-Add-RIOT-adaption.patch → pkg/openwsn/patches/0002-Add-RIOT-adaption.patch

0
pkg/openwsn/0003-Fix-old-style-definitions.patch → pkg/openwsn/patches/0003-Fix-old-style-definitions.patch

0
pkg/openwsn/0004-provide-openserial-dummies.patch → pkg/openwsn/patches/0004-provide-openserial-dummies.patch

0
pkg/openwsn/0005-fixes-to-RIOT-adaption.patch → pkg/openwsn/patches/0005-fixes-to-RIOT-adaption.patch

22
pkg/pkg.mk

@ -0,0 +1,22 @@
#
# Include this file if your Package needs to be checked out by git
#
PKG_DIR?=$(CURDIR)
PKG_BUILDDIR?=$(BINDIR)/pkg/$(PKG_NAME)
download: $(PKG_BUILDDIR)/.downloaded
$(PKG_BUILDDIR)/.downloaded:
mkdir -p $(PKG_BUILDDIR)
$(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_BUILDDIR)"
if test -d "$(PKG_DIR)"/patches; then \
git -C "$(PKG_BUILDDIR)" am --ignore-whitespace "$(PKG_DIR)"/patches/*.patch; \
fi
touch $(PKG_BUILDDIR)/.downloaded
clean::
@echo "Cleaning package $(PKG_NAME)..."
rm -rf "$(PKG_BUILDDIR)"
distclean::
rm -rf "$(PKG_BUILDDIR)"

1
pkg/relic/.gitignore vendored

@ -1 +0,0 @@
/relic

43
pkg/relic/Makefile

@ -1,39 +1,28 @@
RELIC_URL=http://github.com/relic-toolkit/relic.git
RELIC_BRANCH=cdcfaeef101d18c3231c3b46359c519dd72682e8
PKG_NAME=relic
PKG_URL=$(RELIC_URL)
PKG_VERSION=$(RELIC_BRANCH)
PKG_DIR=$(CURDIR)/$(PKG_NAME)
PKG_URL=http://github.com/relic-toolkit/relic.git
PKG_VERSION=cdcfaeef101d18c3231c3b46359c519dd72682e8
ifneq ($(RIOTBASE),)
INCLUDES += -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/sys/net/include \
-I$(RIOTBASE)/sys/posix/include -I$(RIOTBASE)/sys/posix/pnet/include
endif
.PHONY: all clean reset
all: $(PKG_DIR)/Makefile
"$(MAKE)" -C $(PKG_DIR) && \
cp $(PKG_DIR)/lib/librelic_s.a $(BINDIR)$(PKG_NAME).a
.PHONY: all
$(PKG_DIR)/comp-options.cmake: $(PKG_DIR)/.git/config
cd "$(PKG_DIR)" && perl ../generate-cmake-xcompile.perl > comp-options.cmake
all: $(PKG_BUILDDIR)/Makefile
"$(MAKE)" -C $(PKG_BUILDDIR) && \
cp $(PKG_BUILDDIR)/lib/librelic_s.a $(BINDIR)$(PKG_NAME).a
$(PKG_DIR)/Makefile: $(PKG_DIR)/comp-options.cmake
cd "$(PKG_DIR)" && 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) .
$(PKG_DIR)/.git/config:
test -d "$(PKG_DIR)" || $(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_DIR)"
cd "$(PKG_DIR)" && git am --ignore-whitespace $(CURDIR)/*.patch
./fix-util_print_wo_args.sh .
./fix-old-style-definitions.sh .
$(PKG_BUILDDIR)/comp-options.cmake: fix_source
cd "$(PKG_BUILDDIR)" && perl $(PKG_DIR)/generate-cmake-xcompile.perl > comp-options.cmake
clean::
@echo "Cleaning up relic package..."
rm -rf "$(PKG_DIR)"
$(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) .
distclean::
rm -rf "$(PKG_DIR)"
fix_source: download
./fix-util_print_wo_args.sh $(PKG_BUILDDIR)
./fix-old-style-definitions.sh $(PKG_BUILDDIR)
Makefile.include:
@true
clean::
@rm -rf $(BINDIR)$(PKG_NAME).a
include $(RIOTBASE)/pkg/pkg.mk

2
pkg/relic/Makefile.include

@ -1 +1 @@
INCLUDES += -I$(RIOTPKG)/relic/relic/include
INCLUDES += -I$(BINDIR)/pkg/relic/include

0
pkg/relic/0001-fixed-signedness-of-counter-variable.patch → pkg/relic/patches/0001-fixed-signedness-of-counter-variable.patch

0
pkg/relic/0002-don-t-redefine-ALIGN.patch → pkg/relic/patches/0002-don-t-redefine-ALIGN.patch

0
pkg/relic/0003-require-only-CMake-version-2.8.patch → pkg/relic/patches/0003-require-only-CMake-version-2.8.patch

1
pkg/wakaama/.gitignore vendored

@ -1 +0,0 @@
/wakaama

36
pkg/wakaama/Makefile

@ -1,36 +1,18 @@
PKG_NAME=wakaama
PKG_URL=git://github.com/eclipse/wakaama.git
PKG_VERSION=69a32cfae39f66fe4eec4cc8d1cd48ced7ad447c
PKG_DIR=$(CURDIR)/$(PKG_NAME)
PKG_TEMP_DIR=$(CURDIR)/temp
.PHONY: all clean patch
.PHONY: all
all: patch
"$(MAKE)" -C $(PKG_DIR)
"$(MAKE)" -C $(PKG_BUILDDIR)/riotbuild
patch: $(PKG_DIR)/Makefile
patch: download
mkdir -p "$(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
$(PKG_DIR)/Makefile: $(PKG_TEMP_DIR)/.git/config
echo 'include $$(RIOTBASE)/Makefile.base' > $(PKG_DIR)/Makefile
echo 'MODULE:=wakaama' > $(PKG_BUILDDIR)/riotbuild/Makefile
echo 'include $$(RIOTBASE)/Makefile.base' >> $(PKG_BUILDDIR)/riotbuild/Makefile
$(PKG_TEMP_DIR)/.git/config:
test -d "$(PKG_TEMP_DIR)" || $(GITCACHE) clone "$(PKG_URL)" "$(PKG_VERSION)" "$(PKG_TEMP_DIR)" ; \
mkdir -p "$(PKG_DIR)" ; \
cp $(PKG_TEMP_DIR)/core/*.c $(PKG_TEMP_DIR)/core/*.h $(PKG_DIR); \
cp $(PKG_TEMP_DIR)/core/er-coap-13/*.c $(PKG_TEMP_DIR)/core/er-coap-13/*.h $(PKG_DIR); \
rm -Rf "$(PKG_TEMP_DIR)"
clean::
@echo "Cleaning up $(PKG_NAME) package..."
@cd "$(PKG_DIR)" 2> /dev/null > /dev/null && \
git clean -x -f && \
git am --abort && \
git reset --hard "$(PKG_VERSION)" && \
$(MAKE) patch || true
distclean::
rm -rf "$(PKG_DIR)"
Makefile.include:
@true
include $(RIOTBASE)/pkg/pkg.mk

0
pkg/wakaama/0001-changing-header-location.patch → pkg/wakaama/patches/0001-changing-header-location.patch

0
pkg/wakaama/0002-defined-endianness.patch → pkg/wakaama/patches/0002-defined-endianness.patch

0
pkg/wakaama/0003-fixed-warnings-in-er-coap-13.c.patch → pkg/wakaama/patches/0003-fixed-warnings-in-er-coap-13.c.patch

0
pkg/wakaama/0004-fixed-warnings-in-packet.c.patch → pkg/wakaama/patches/0004-fixed-warnings-in-packet.c.patch

0
pkg/wakaama/0005-fixed-warnings-in-tlv.c.patch → pkg/wakaama/patches/0005-fixed-warnings-in-tlv.c.patch

0
pkg/wakaama/0006-fixed-warnings-in-utils.c.patch → pkg/wakaama/patches/0006-fixed-warnings-in-utils.c.patch

0
pkg/wakaama/0007-fixed-warnings-in-bootstrap.c.patch → pkg/wakaama/patches/0007-fixed-warnings-in-bootstrap.c.patch

0
pkg/wakaama/0008-fixed-warnings-in-objects.c.patch → pkg/wakaama/patches/0008-fixed-warnings-in-objects.c.patch

0
pkg/wakaama/0009-fixed-errors-in-internals.h.patch → pkg/wakaama/patches/0009-fixed-errors-in-internals.h.patch

0
pkg/wakaama/0010-fixed-warnings-in-registration.c.patch → pkg/wakaama/patches/0010-fixed-warnings-in-registration.c.patch

Loading…
Cancel
Save