From f8494c57c9bd1b480a1088e78e25758592296da3 Mon Sep 17 00:00:00 2001 From: Sam Ford <1584702+samford@users.noreply.github.com> Date: Tue, 2 Feb 2021 09:08:11 -0500 Subject: [PATCH 1/2] Revert versioned formula renaming --- Aliases/arm-gcc-bin | 2 +- .../{arm-gcc-bin@10-2020-q4-major.rb => arm-gcc-bin@10.rb} | 2 +- Formula/{arm-gcc-bin@8-2019-q3-update.rb => arm-gcc-bin@8.rb} | 2 +- Formula/{arm-gcc-bin@9-2020-q2-update.rb => arm-gcc-bin@9.rb} | 2 +- formula_renames.json | 4 ---- 5 files changed, 4 insertions(+), 8 deletions(-) rename Formula/{arm-gcc-bin@10-2020-q4-major.rb => arm-gcc-bin@10.rb} (92%) rename Formula/{arm-gcc-bin@8-2019-q3-update.rb => arm-gcc-bin@8.rb} (93%) rename Formula/{arm-gcc-bin@9-2020-q2-update.rb => arm-gcc-bin@9.rb} (93%) delete mode 100644 formula_renames.json diff --git a/Aliases/arm-gcc-bin b/Aliases/arm-gcc-bin index b98a149..b207886 120000 --- a/Aliases/arm-gcc-bin +++ b/Aliases/arm-gcc-bin @@ -1 +1 @@ -../Formula/arm-gcc-bin@10-2020-q4-major.rb \ No newline at end of file +../Formula/arm-gcc-bin@10.rb \ No newline at end of file diff --git a/Formula/arm-gcc-bin@10-2020-q4-major.rb b/Formula/arm-gcc-bin@10.rb similarity index 92% rename from Formula/arm-gcc-bin@10-2020-q4-major.rb rename to Formula/arm-gcc-bin@10.rb index dbd3754..d3dd9ce 100644 --- a/Formula/arm-gcc-bin@10-2020-q4-major.rb +++ b/Formula/arm-gcc-bin@10.rb @@ -1,4 +1,4 @@ -class ArmGccBinAT102020Q4Major < Formula +class ArmGccBinAT10 < Formula desc "Pre-built GNU toolchain for Arm Cortex-M and Cortex-R processors" homepage "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm" url "https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-mac.tar.bz2" diff --git a/Formula/arm-gcc-bin@8-2019-q3-update.rb b/Formula/arm-gcc-bin@8.rb similarity index 93% rename from Formula/arm-gcc-bin@8-2019-q3-update.rb rename to Formula/arm-gcc-bin@8.rb index d167064..2a5c5d6 100644 --- a/Formula/arm-gcc-bin@8-2019-q3-update.rb +++ b/Formula/arm-gcc-bin@8.rb @@ -1,4 +1,4 @@ -class ArmGccBinAT82019Q3Update < Formula +class ArmGccBinAT8 < Formula desc "Pre-built GNU toolchain for Arm Cortex-M and Cortex-R processors" homepage "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm" url "https://developer.arm.com/-/media/Files/downloads/gnu-rm/8-2019q3/RC1.1/gcc-arm-none-eabi-8-2019-q3-update-mac.tar.bz2" diff --git a/Formula/arm-gcc-bin@9-2020-q2-update.rb b/Formula/arm-gcc-bin@9.rb similarity index 93% rename from Formula/arm-gcc-bin@9-2020-q2-update.rb rename to Formula/arm-gcc-bin@9.rb index b1f3e1b..8c3824c 100644 --- a/Formula/arm-gcc-bin@9-2020-q2-update.rb +++ b/Formula/arm-gcc-bin@9.rb @@ -1,4 +1,4 @@ -class ArmGccBinAT92020Q2Update < Formula +class ArmGccBinAT9 < Formula desc "Pre-built GNU toolchain for Arm Cortex-M and Cortex-R processors" homepage "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm" url "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-mac.tar.bz2" diff --git a/formula_renames.json b/formula_renames.json deleted file mode 100644 index b6e52fa..0000000 --- a/formula_renames.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "arm-gcc-bin@8": "arm-gcc-bin@8-2019-q3-update", - "arm-gcc-bin@9": "arm-gcc-bin@9-2020-q2-update" -} From 05f39155cfd64df5c43bb0a4bd41ba23ce21fb46 Mon Sep 17 00:00:00 2001 From: Sam Ford <1584702+samford@users.noreply.github.com> Date: Tue, 2 Feb 2021 09:08:45 -0500 Subject: [PATCH 2/2] Remove arm-gcc-bin@9-2019-q4-major --- Formula/arm-gcc-bin@9-2019-q4-major.rb | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 Formula/arm-gcc-bin@9-2019-q4-major.rb diff --git a/Formula/arm-gcc-bin@9-2019-q4-major.rb b/Formula/arm-gcc-bin@9-2019-q4-major.rb deleted file mode 100644 index cfd214c..0000000 --- a/Formula/arm-gcc-bin@9-2019-q4-major.rb +++ /dev/null @@ -1,17 +0,0 @@ -class ArmGccBinAT92019Q4Major < Formula - desc "Pre-built GNU toolchain for Arm Cortex-M and Cortex-R processors" - homepage "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm" - url "https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-mac.tar.bz2" - version "9-2019-q4-major" - sha256 "1249f860d4155d9c3ba8f30c19e7a88c5047923cea17e0d08e633f12408f01f0" - - keg_only <<~EOS - it may interfere with another version of arm-gcc-bin. - This is useful if you want to have multiple versions installed - EOS - - def install - bin.install Dir["bin/*"] - prefix.install Dir["arm-none-eabi", "lib", "share"] - end -end