Skip to content

Commit a061a91

Browse files
authored
Merge pull request #1 from sandeepmistry/osx
Change Makefile for compatibility with OS X
2 parents 5962df2 + 05530b7 commit a061a91

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "ARM_CMSIS"]
2-
path = module
2+
path = CMSIS
33
url = [email protected]:ARM-software/CMSIS.git

module renamed to CMSIS

Submodule CMSIS updated from 0000000 to 8c0e1a9

Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ PACKAGE_VERSION := 4.5.0
3030

3131
# -----------------------------------------------------------------------------
3232
# packaging specific
33-
PACKAGE_FOLDER := module
33+
PACKAGE_FOLDER := CMSIS
3434

3535
ifeq (postpackaging,$(findstring $(MAKECMDGOALS),postpackaging))
3636
PACKAGE_FILENAME=$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2
@@ -49,16 +49,15 @@ endif
4949
all: clean print_info
5050
@echo ----------------------------------------------------------
5151
@echo "Packaging module."
52-
tar --transform "s|module|$(PACKAGE_NAME)-$(PACKAGE_VERSION)|g" \
53-
--exclude=./.gitattributes \
52+
tar --exclude=./.gitattributes \
5453
--exclude=./.travis.yml \
5554
--exclude=CMSIS/index.html \
5655
--exclude=CMSIS/Documentation \
5756
--exclude=CMSIS/Pack \
5857
--exclude=CMSIS/Utilities \
5958
--exclude=CMSIS/DSP_Lib/Examples \
6059
--exclude=Device/ARM/Documents \
61-
--exclude-vcs \
60+
--exclude=.git \
6261
-cjf "$(PACKAGE_NAME)-$(PACKAGE_VERSION).tar.bz2" "$(PACKAGE_FOLDER)"
6362
$(MAKE) --no-builtin-rules postpackaging -C .
6463
@echo ----------------------------------------------------------

extras/package_index.json.template

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,42 @@
55
[
66
{
77
"host": "i686-mingw32",
8-
"url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
8+
"url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
99
"archiveFileName": "%%FILENAME%%",
1010
"checksum": "SHA-256:%%CHECKSUM%%",
1111
"size": "%%SIZE%%"
1212
},
1313
{
1414
"host": "x86_64-apple-darwin",
15-
"url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
15+
"url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
1616
"archiveFileName": "%%FILENAME%%",
1717
"checksum": "SHA-256:%%CHECKSUM%%",
1818
"size": "%%SIZE%%"
1919
},
2020
{
2121
"host": "x86_64-pc-linux-gnu",
22-
"url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
22+
"url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
2323
"archiveFileName": "%%FILENAME%%",
2424
"checksum": "SHA-256:%%CHECKSUM%%",
2525
"size": "%%SIZE%%"
2626
},
2727
{
2828
"host": "i686-pc-linux-gnu",
29-
"url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
29+
"url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
3030
"archiveFileName": "%%FILENAME%%",
3131
"checksum": "SHA-256:%%CHECKSUM%%",
3232
"size": "%%SIZE%%"
3333
},
3434
{
3535
"host": "arm-linux-gnueabihf",
36-
"url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
36+
"url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
3737
"archiveFileName": "%%FILENAME%%",
3838
"checksum": "SHA-256:%%CHECKSUM%%",
3939
"size": "%%SIZE%%"
4040
},
4141
{
4242
"host": "all",
43-
"url": "https://github.com/sam-geek/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
43+
"url": "https://github.com/arduino/ArduinoModule-CMSIS/releases/download/v%%VERSION%%/%%FILENAME%%",
4444
"archiveFileName": "%%FILENAME%%",
4545
"checksum": "SHA-256:%%CHECKSUM%%",
4646
"size": "%%SIZE%%"

0 commit comments

Comments
 (0)