Skip to content

Commit 2f501f3

Browse files
committed
Remove arm-gcc target
Moved to https://github.com/stm32duino/arm-none-eabi-gcc Signed-off-by: Frederic.Pillon <[email protected]>
1 parent 6bf5c26 commit 2f501f3

File tree

3 files changed

+1
-178
lines changed

3 files changed

+1
-178
lines changed

STM32/src/Makefile

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -30,28 +30,11 @@ ifeq (postpackaging_tools,$(findstring $(MAKECMDGOALS),postpackaging_tools))
3030
PACKAGE_MAC_SIZE := $(firstword $(shell wc -c "$(PACKAGE_MAC_FILENAME)"))
3131
endif
3232

33-
ifeq (postpackaging_arm-gcc,$(findstring $(MAKECMDGOALS),postpackaging_arm-gcc))
34-
PACKAGE_WIN_FILENAME=$(PACKAGE_FILENAME)-$(PACKAGE_VERSION)-windows.tar.bz2
35-
PACKAGE_LINUX32_FILENAME=$(PACKAGE_FILENAME)-$(PACKAGE_VERSION)-linux32.tar.bz2
36-
PACKAGE_LINUX64_FILENAME=$(PACKAGE_FILENAME)-$(PACKAGE_VERSION)-linux64.tar.bz2
37-
PACKAGE_MAC_FILENAME=$(PACKAGE_FILENAME)-$(PACKAGE_VERSION)-mac.tar.bz2
38-
39-
PACKAGE_WIN_CHKSUM := $(firstword $(shell shasum -a 256 "$(DOWNLOAD_PATH)/$(PACKAGE_WIN_FILENAME)"))
40-
PACKAGE_LINUX32_CHKSUM := $(firstword $(shell shasum -a 256 "$(DOWNLOAD_PATH)/$(PACKAGE_LINUX32_FILENAME)"))
41-
PACKAGE_LINUX64_CHKSUM := $(firstword $(shell shasum -a 256 "$(DOWNLOAD_PATH)/$(PACKAGE_LINUX64_FILENAME)"))
42-
PACKAGE_MAC_CHKSUM := $(firstword $(shell shasum -a 256 "$(DOWNLOAD_PATH)/$(PACKAGE_MAC_FILENAME)"))
43-
44-
PACKAGE_WIN_SIZE := $(firstword $(shell wc -c "$(DOWNLOAD_PATH)/$(PACKAGE_WIN_FILENAME)"))
45-
PACKAGE_LINUX32_SIZE := $(firstword $(shell wc -c "$(DOWNLOAD_PATH)/$(PACKAGE_LINUX32_FILENAME)"))
46-
PACKAGE_LINUX64_SIZE := $(firstword $(shell wc -c "$(DOWNLOAD_PATH)/$(PACKAGE_LINUX64_FILENAME)"))
47-
PACKAGE_MAC_SIZE := $(firstword $(shell wc -c "$(DOWNLOAD_PATH)/$(PACKAGE_MAC_FILENAME)"))
48-
endif
49-
5033
# -----------------------------------------------------------------------------
5134

5235
.PHONY: all clean tools print_info postpackaging
5336

54-
all: core tools arm-gcc
37+
all: core tools
5538

5639
core: PACKAGE_NAME := STM32
5740
core: PACKAGE_FOLDER := Arduino_Core_STM32
@@ -115,21 +98,6 @@ tools: clean print_info
11598
$(MAKE) PACKAGE_NAME=$(PACKAGE_NAME) PACKAGE_VERSION=$(PACKAGE_VERSION) --no-builtin-rules postpackaging_tools -C .
11699
@echo ----------------------------------------------------------
117100

118-
arm-gcc: PACKAGE_NAME := arm-none-eabi-gcc
119-
arm-gcc: PACKAGE_FOLDER := $(DOWNLOAD_PATH)
120-
arm-gcc: PACKAGE_FILENAME := gcc-arm-none-eabi
121-
arm-gcc: PACKAGE_VERSION := $(shell ./github_cli.sh)
122-
arm-gcc: clean print_info
123-
@echo ----------------------------------------------------------
124-
@echo "Packaging $@..."
125-
@[ -d $(DOWNLOAD_PATH) ] || mkdir $(DOWNLOAD_PATH)
126-
@cd $(DOWNLOAD_PATH); wget https://github.com/stm32duino/$(PACKAGE_NAME)/releases/download/$(PACKAGE_VERSION)/$(PACKAGE_FILENAME)-$(PACKAGE_VERSION)-linux32.tar.bz2
127-
@cd $(DOWNLOAD_PATH); wget https://github.com/stm32duino/$(PACKAGE_NAME)/releases/download/$(PACKAGE_VERSION)/$(PACKAGE_FILENAME)-$(PACKAGE_VERSION)-linux64.tar.bz2
128-
@cd $(DOWNLOAD_PATH); wget https://github.com/stm32duino/$(PACKAGE_NAME)/releases/download/$(PACKAGE_VERSION)/$(PACKAGE_FILENAME)-$(PACKAGE_VERSION)-mac.tar.bz2
129-
@cd $(DOWNLOAD_PATH); wget https://github.com/stm32duino/$(PACKAGE_NAME)/releases/download/$(PACKAGE_VERSION)/$(PACKAGE_FILENAME)-$(PACKAGE_VERSION)-windows.tar.bz2
130-
$(MAKE) PACKAGE_NAME=$(PACKAGE_NAME) PACKAGE_VERSION=$(PACKAGE_VERSION) PACKAGE_FILENAME=$(PACKAGE_FILENAME) --no-builtin-rules postpackaging_arm-gcc -C .
131-
@echo ----------------------------------------------------------
132-
133101
clean:
134102
@echo ----------------------------------------------------------
135103
@echo Cleanup
@@ -171,19 +139,3 @@ postpackaging_tools:
171139
@cat templates/package_tools_index.json | sed s/%%PACKAGENAME%%/$(PACKAGE_NAME)/ | sed s/%%VERSION%%/$(PACKAGE_VERSION)/ | sed s/%%FILENAMEWIN%%/$(PACKAGE_WIN_FILENAME)/ | sed s/%%CHECKSUMWIN%%/$(PACKAGE_WIN_CHKSUM)/ | sed s/%%SIZEWIN%%/$(PACKAGE_WIN_SIZE)/ | sed s/%%FILENAMEMAC%%/$(PACKAGE_MAC_FILENAME)/ | sed s/%%CHECKSUMMAC%%/$(PACKAGE_MAC_CHKSUM)/ | sed s/%%SIZEMAC%%/$(PACKAGE_MAC_SIZE)/ | sed s/%%FILENAMELINUX%%/$(PACKAGE_LINUX_FILENAME)/ | sed s/%%CHECKSUMLINUX%%/$(PACKAGE_LINUX_CHKSUM)/ | sed s/%%SIZELINUX%%/$(PACKAGE_LINUX_SIZE)/ > package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json
172140
@mv $(PACKAGE_WIN_FILENAME) $(PACKAGE_LINUX_FILENAME) $(PACKAGE_MAC_FILENAME) $(TOOLS_PATH)/
173141
@echo "package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json created"
174-
175-
postpackaging_arm-gcc:
176-
@echo "PACKAGE_WIN_FILENAME = $(PACKAGE_WIN_FILENAME)"
177-
@echo "PACKAGE_WIN_SIZE = $(PACKAGE_WIN_SIZE)"
178-
@echo "PACKAGE_WIN_CHKSUM = $(PACKAGE_WIN_CHKSUM)"
179-
@echo "PACKAGE_LINUX32_FILENAME = $(PACKAGE_LINUX32_FILENAME)"
180-
@echo "PACKAGE_LINUX32_SIZE = $(PACKAGE_LINUX32_SIZE)"
181-
@echo "PACKAGE_LINUX32_CHKSUM = $(PACKAGE_LINUX32_CHKSUM)"
182-
@echo "PACKAGE_LINUX64_FILENAME = $(PACKAGE_LINUX64_FILENAME)"
183-
@echo "PACKAGE_LINUX64_SIZE = $(PACKAGE_LINUX64_SIZE)"
184-
@echo "PACKAGE_LINUX64_CHKSUM = $(PACKAGE_LINUX64_CHKSUM)"
185-
@echo "PACKAGE_MAC_FILENAME = $(PACKAGE_MAC_FILENAME)"
186-
@echo "PACKAGE_MAC_SIZE = $(PACKAGE_MAC_SIZE)"
187-
@echo "PACKAGE_MAC_CHKSUM = $(PACKAGE_MAC_CHKSUM)"
188-
@cat templates/package_arm_index.json | sed s/%%PACKAGENAME%%/$(PACKAGE_NAME)/ | sed s/%%VERSION%%/$(PACKAGE_VERSION)/ | sed s/%%FILENAMEWIN%%/$(PACKAGE_WIN_FILENAME)/ | sed s/%%CHECKSUMWIN%%/$(PACKAGE_WIN_CHKSUM)/ | sed s/%%SIZEWIN%%/$(PACKAGE_WIN_SIZE)/ | sed s/%%FILENAMEMAC%%/$(PACKAGE_MAC_FILENAME)/ | sed s/%%CHECKSUMMAC%%/$(PACKAGE_MAC_CHKSUM)/ | sed s/%%SIZEMAC%%/$(PACKAGE_MAC_SIZE)/ | sed s/%%FILENAMELINUX64%%/$(PACKAGE_LINUX64_FILENAME)/ | sed s/%%CHECKSUMLINUX64%%/$(PACKAGE_LINUX64_CHKSUM)/ | sed s/%%SIZELINUX64%%/$(PACKAGE_LINUX64_SIZE)/ | sed s/%%FILENAMELINUX32%%/$(PACKAGE_LINUX32_FILENAME)/ | sed s/%%CHECKSUMLINUX32%%/$(PACKAGE_LINUX32_CHKSUM)/ | sed s/%%SIZELINUX32%%/$(PACKAGE_LINUX32_SIZE)/ > package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json
189-
@echo "package_$(PACKAGE_NAME)_$(PACKAGE_VERSION)_index.json created"

STM32/src/github_cli.sh

Lines changed: 0 additions & 94 deletions
This file was deleted.

STM32/src/templates/package_arm_index.json

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)