commit:     d3dada415b7703daf674fb33caaa51ce00505ef8
Author:     David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Wed Jul  5 13:43:22 2023 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jul  5 13:43:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d3dada41

dev-embedded/esp-idf: add 5.1

Signed-off-by: David Roman <davidroman96 <AT> gmail.com>

 dev-embedded/esp-idf/Manifest                      |   7 +
 dev-embedded/esp-idf/esp-idf-5.1.ebuild            | 164 +++++++++++++++++++++
 .../esp-idf/files/pyparsing-esp-idf-5.1.patch      |  37 +++++
 3 files changed, 208 insertions(+)

diff --git a/dev-embedded/esp-idf/Manifest b/dev-embedded/esp-idf/Manifest
index 0f413d12e..3c1f2b2b1 100644
--- a/dev-embedded/esp-idf/Manifest
+++ b/dev-embedded/esp-idf/Manifest
@@ -1,7 +1,14 @@
 DIST esp-idf-5.0.2.zip 1000558879 BLAKE2B 
6127dfb7f78261060b4981e414fea95a4ef7162bb3da11cf53aeb6504396d9e0958044dd66ba1329e87004fd1149c41a86638b4f7a6c3a9d7236fc908961818d
 SHA512 
c58013a5597c00c2ee1c8ae8814b18365f5949b5d834b1fccbee3dce944561d9f2c4296aad578cfc5d79fcd5f86cfa6a5024ff1472305d08ab65e6634be65f05
+DIST esp-idf-5.1.zip 1062080629 BLAKE2B 
78df1d6abfdde5731499422c6d05e0cdf0d6c46b73f6e7a6b94f61c5bb66ddfeffffe9a1f5dba5996397141ca2dc3372fbca5b915b828bb30069d8d711f7858b
 SHA512 
85cc37a910398cb82fca4ff6257d23c28a993cf7deb3f7e34129513cd89e8a495ec7b38d3a206482489ffe4996d800a2742fd6c69cc5ce425b4d0522d19d9592
 DIST openocd-esp32-linux-amd64-0.11.0-esp32-20221026.tar.gz 2051435 BLAKE2B 
59fd510cf3c12514791fa85b76d81722685add64f0a690793b52c5d41101c727fefe064727b148577c3fc522ffae79e8f632d34f300a9543377027579b9cea70
 SHA512 
f8296460efa3d43b23a51c81a840a2e7c13272fa213770bfdb269decd23a3571be9c4ff4be6647d87e56e156284952d9a8c92b24244eaa6996fae18497ce15f8
+DIST openocd-esp32-linux-amd64-0.12.0-esp32-20230419.tar.gz 2126949 BLAKE2B 
ae53bf574c60a7f004b49946f03fe936fefeee2574bf47ac71b2144d066e77e64190889b3650e39010aaf568fef13e05dc773355f1b7f59f547b181346c78080
 SHA512 
3a7f0e2ff4e68d203847271b1b95fc9c9581adf5d4f503cdc20770985f2b8b59d39f358e46d0d7358e8c94c8ff1437c4747579e02dd92b7a07a0ba23a885d191
+DIST riscv32-esp-elf-12.2.0_20230208-x86_64-linux-gnu.tar.xz 131410024 BLAKE2B 
6961ddad1570aa69cbe7a4b1cd6722831d725b83a2d865b5babeea9b2d1762e4dda3cf35bdd4c5137758e15267a229136439387ff72577d5d558a924cd6161aa
 SHA512 
dd0a95408fb487d444cb2c1efc9a0d21404eba2080b16cd9958dd9a9d22c5bf36f3c5e0309b082a226b39e4aeaf9a07ac89af740e2d5c01f85147d26dff7d233
 DIST riscv32-esp-elf-gcc11_2_0-esp-2022r1-linux-amd64.tar.xz 110107900 BLAKE2B 
70688adf6eb613f6d0a3700d5730882b7ff9dec110cbc4157c822dfe1d2abfe21f902e52c695ed410fef39f9c03dfffa3b9c7effac04464dfce4e8b0dcf88814
 SHA512 
cf7443e1480456fbf5d0824d4745740d8f5e5858c403e70b3931adfa582816c2e0c53c53dc51d493809d9e6780077bc1b1fae51bc146ba1b6272dc3554c1fedb
 DIST xtensa-esp-elf-gdb-11.2_20220823-x86_64-linux-gnu.tar.gz 26947336 BLAKE2B 
4970451c7b61df0158294bad456a86718631d24cd73efdd4523de6afcba3f780dd54c07549effc6ab3a0838044b3eb2b817346fc11f8a5ad70f827587e65fdbc
 SHA512 
9532d3cd3c82142c65504e641a68cd836ad1642200e4a512ade62380b149d23ddfa0dccdd339825fdf5a3c55107717a21382469bcf19103113f624a2960ca247
+DIST xtensa-esp-elf-gdb-12.1_20221002-x86_64-linux-gnu.tar.gz 32006939 BLAKE2B 
3963f402f65a1503d4fcef0b68c8efcd1f17407809f77a5b76da03e89a0fdd47cd06545ab958aa444fc2ce822b20b4e7c88d921de723bae81bd74bd93a34e047
 SHA512 
013641d87729f7387a29afac0715a1fc1012edf88092e1dd51682df07730ab71c511f6824c77f52b17c06dca1a04a85c157730da80d1e5cb61bc6dcbe48e199e
+DIST xtensa-esp32-elf-12.2.0_20230208-x86_64-linux-gnu.tar.xz 67006496 BLAKE2B 
343803d0511f8fd5d382221b57c68d964565e36bbd397d5ee5747f75224498db306120c10b7d664c2d0449888d5fa6c1aa423f5681097f06810c257c922d83aa
 SHA512 
6bba61d3f05a08cb0e0f238c60af1b69caeb950e598849aa1edea6e4e95838938c1006afee8d19ea0533d9747342cb57b9010f52500db8a38b13987bea3a827a
 DIST xtensa-esp32-elf-gcc11_2_0-esp-2022r1-linux-amd64.tar.xz 64781328 BLAKE2B 
7216df8a7a88f73f9beac705aa4a7703a8215301afb4c9ca64c9d16a2fafb574a06079d2e5288b2784e4cd3e5e8e2b3d03708e21c42bc48a30abb06199207616
 SHA512 
72cd2e5d3168d1ada66c53428ddec1ee47785fc9720e9c1b4aacc41021e59335a8e2d07cc14b064b1f3ea9c01bd747b7cdff69ff83e5586bf1abb4acf5986508
+DIST xtensa-esp32s2-elf-12.2.0_20230208-x86_64-linux-gnu.tar.xz 64374532 
BLAKE2B 
7fe7c185e4561e34981615a3b7b96998cc11c473166bf54c2db57eecd617ab2c6c94c62fe6bc632e821cc98cf3e82d6f2b35a9210b56245442b1c6206b135617
 SHA512 
5381167aff6a2d023fb5b210dc092b610d72ae00484dae17d7c4e016bda9d457e597698895fcd2de755e6a86b9af2b2c5ca993cf89f12c3570f223671f6144da
 DIST xtensa-esp32s2-elf-gcc11_2_0-esp-2022r1-linux-amd64.tar.xz 51546516 
BLAKE2B 
f4f4bc5bc138f181819416f0b3b4a67270588f827afd64693da4caf8c1a100a04787aa23cfafedb535e5c26aea7af51ad9e08316a0abba99d5549fb62e73aae5
 SHA512 
72071cb911eb62eff22d46b98f3ac6af87c1b0af4adc036e7f093e24987048c388a689138627ce1a721b93ef9a63a4a6046cbcc91f92e033b5330e4aacf746ea
+DIST xtensa-esp32s3-elf-12.2.0_20230208-x86_64-linux-gnu.tar.xz 67512340 
BLAKE2B 
10859b0fbb1f8c2e3c229e4f87ccac00dda4f1f54827a556772badf2dd85b04c6cf50a79cc89f80a2596fc7fb7253e5750158e5499ab2c4062717de50d04473c
 SHA512 
c23f35f01a938e96ff85bd06fd25db929be3027ab1cd0d57f2c3c355b7abb1d2629f193deae2dfa2f2684faf2c516f96029be28e230dc73b70ea935121ab62ba
 DIST xtensa-esp32s3-elf-gcc11_2_0-esp-2022r1-linux-amd64.tar.xz 51899328 
BLAKE2B 
9ea6e702345fe158d5bbf8c86fffa11faaa4e74f58ab0ad22ba7c2e46fe41bb06897b6e2912852564b19d773642b23ad897a9f0655eb020a354a2d98c3296d97
 SHA512 
54afc2a307489d719d72c1a9506b325b1152395e87fa8fa78d90b79bc827625e23f86aa104e02f78fc1f074d191b552de5c1853a52ba1ccadae93865c58f5873

diff --git a/dev-embedded/esp-idf/esp-idf-5.1.ebuild 
b/dev-embedded/esp-idf/esp-idf-5.1.ebuild
new file mode 100644
index 000000000..e78cefd0e
--- /dev/null
+++ b/dev-embedded/esp-idf/esp-idf-5.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_11 )
+
+VER="12.2.0_20230208"
+
+CROSSTOOL_URL="https://github.com/espressif/crosstool-NG/releases/download/esp-${VER}";
+
+inherit python-single-r1
+
+DESCRIPTION="Espressif IoT Development Framework"
+HOMEPAGE="https://www.espressif.com/";
+
+#      
https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-linux-amd64-2.28.51-esp-20191205.tar.gz
+SRC_URI="https://dl.espressif.com/github_assets/espressif/${PN}/releases/download/v${PV}/${PN}-v${PV}.zip
 -> ${P}.zip
+       
https://github.com/espressif/openocd-esp32/releases/download/v0.12.0-esp32-20230419/openocd-esp32-linux-amd64-0.12.0-esp32-20230419.tar.gz
+       
https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v12.1_20221002/xtensa-esp-elf-gdb-12.1_20221002-x86_64-linux-gnu.tar.gz";
+SRC_URI+=" esp32? ( 
${CROSSTOOL_URL}/xtensa-esp32-elf-${VER}-x86_64-linux-gnu.tar.xz )"
+SRC_URI+=" esp32s2? ( 
${CROSSTOOL_URL}/xtensa-esp32s2-elf-${VER}-x86_64-linux-gnu.tar.xz )"
+SRC_URI+=" esp32s3? ( 
${CROSSTOOL_URL}/xtensa-esp32s3-elf-${VER}-x86_64-linux-gnu.tar.xz )"
+SRC_URI+=" riscv32? ( 
${CROSSTOOL_URL}/riscv32-esp-elf-${VER}-x86_64-linux-gnu.tar.xz )"
+
+#https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-linux-amd64.tar.gz
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+IUSE="+esp32 esp32s2 esp32s3 riscv32"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+SLOT="0"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="
+       ${PYTHON_DEPS}
+       dev-embedded/esptool[${PYTHON_SINGLE_USEDEP}]
+
+       $(python_gen_cond_dep '
+               dev-python/click[${PYTHON_USEDEP}]
+               dev-python/bitstring[${PYTHON_USEDEP}]
+               dev-python/construct[${PYTHON_USEDEP}]
+               dev-python/ecdsa[${PYTHON_USEDEP}]
+               dev-python/future[${PYTHON_USEDEP}]
+               dev-python/kconfiglib[${PYTHON_USEDEP}]
+               dev-python/pyelftools[${PYTHON_USEDEP}]
+               dev-python/pyparsing[${PYTHON_USEDEP}]
+               dev-python/pyserial[${PYTHON_USEDEP}]
+               dev-python/python-socketio[${PYTHON_USEDEP}]
+               dev-python/pyyaml[${PYTHON_USEDEP}]
+               dev-python/reedsolomon[${PYTHON_USEDEP}]
+               dev-embedded/idf-component-manager[${PYTHON_USEDEP}]
+       ')
+"
+
+RESTRICT="strip"
+
+QA_PREBUILT="opt/* usr/lib* usr/share/esp-idf/*"
+QA_PRESTRIPPED="opt/*"
+
+PATCHES=(
+       "${FILESDIR}/allow-system-install-${PN}-5.0.2.patch"
+       "${FILESDIR}/pyparsing-${P}.patch"
+)
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+install_tool() {
+       shopt -s globstar
+
+       into /opt/${1}
+
+       if [[ -d "../${1}/lib" ]]; then
+               if stat *.so &>/dev/null; then
+               for i in ../${1}/lib/**/*.so*; do
+                       dolib.so ${i}
+               done
+               fi
+
+               if stat *.a &>/dev/null; then
+               for i in ../${1}/lib/**/*.a*; do
+                       dolib.a ${i}
+               done
+               fi
+
+               insinto /opt/${1}/lib
+               doins -r ../${1}/lib/*
+       fi
+
+       exeinto /opt/${1}/bin
+       doexe ../${1}/bin/*
+       (
+       cd ../${1}
+       for i in libexec/**/*; do
+               exeinto /opt/${1}/$(dirname ${i})
+               if [[ -x "${i}" && ! -d "${i}" ]]; then
+                       doexe ${i}
+               fi
+       done
+
+       if [[ -d "include" ]]; then
+               insinto /opt/${1}
+               doins -r include
+       fi
+
+       if [[ -d "share" ]]; then
+               insinto /opt/${1}
+               doins -r share
+       fi
+       )
+
+       (
+               cd "${D}"/opt/${1}/bin/ || die
+               for i in *; do
+                       dodir /opt/bin
+                       cd "${D}"/opt/bin || die
+                       dosym ../${1}/bin/${i} /opt/bin/${i}
+               done
+       )
+
+       shopt -u globstar
+}
+
+src_install() {
+
+       echo -e "#!/bin/sh\npython /usr/share/${PN}/tools/idf.py \"\$@\"" > idf
+       dobin idf
+
+       if use esp32; then
+               install_tool xtensa-esp32-elf
+               install_tool xtensa-esp32-elf/xtensa-esp32-elf
+       fi
+
+       if use esp32s2; then
+               install_tool xtensa-esp32s2-elf
+               install_tool xtensa-esp32s2-elf/xtensa-esp32s2-elf
+       fi
+
+       if use esp32s3; then
+               install_tool xtensa-esp32s3-elf
+               install_tool xtensa-esp32s3-elf/xtensa-esp32s3-elf
+       fi
+
+       if use riscv32; then
+               install_tool riscv32-esp-elf
+               install_tool riscv32-esp-elf/riscv32-esp-elf
+       fi
+
+       install_tool openocd-esp32
+
+       # Remove unsupported python versions
+       rm "${WORKDIR}"/xtensa-esp-elf-gdb/bin/xtensa-esp-elf-gdb-3.{6..10} || 
die
+       install_tool xtensa-esp-elf-gdb
+
+       echo "IDF_PATH=/usr/share/${PN}" > 99esp-idf || die
+       doenvd 99esp-idf
+
+       insinto /usr/share/${PN}
+
+       rm -r .git || die
+       find . -name ".git" -exec rm -rf {} \; || die
+       doins -r .
+}

diff --git a/dev-embedded/esp-idf/files/pyparsing-esp-idf-5.1.patch 
b/dev-embedded/esp-idf/files/pyparsing-esp-idf-5.1.patch
new file mode 100644
index 000000000..bd08b43d6
--- /dev/null
+++ b/dev-embedded/esp-idf/files/pyparsing-esp-idf-5.1.patch
@@ -0,0 +1,37 @@
+commit 4020b0deb036ffa3fd01d2dac2297670f65fb7c3
+Author: radim.karnis <radim.kar...@espressif.com>
+Date:   Tue Jun 20 13:16:22 2023 +0200
+
+    fix: Compatibility with pyparsing>=3.1.0
+
+diff --git a/tools/ldgen/ldgen/entity.py b/tools/ldgen/ldgen/entity.py
+index 35021a51b5..aecdcab91b 100644
+--- a/tools/ldgen/ldgen/entity.py
++++ b/tools/ldgen/ldgen/entity.py
+@@ -1,5 +1,5 @@
+ #
+-# SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
++# SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
+ # SPDX-License-Identifier: Apache-2.0
+ #
+ 
+@@ -9,8 +9,8 @@ import os
+ from enum import Enum
+ from functools import total_ordering
+ 
+-from pyparsing import (Group, Literal, OneOrMore, ParseException, SkipTo, 
Suppress, White, Word, ZeroOrMore, alphas,
+-                       nums, rest_of_line)
++from pyparsing import (Group, Literal, OneOrMore, ParseException, Regex, 
SkipTo, Suppress, White, Word, ZeroOrMore,
++                       alphas, nums, rest_of_line)
+ 
+ 
+ @total_ordering
+@@ -139,7 +139,7 @@ class EntityDB:
+ 
+         # 00 {section} 0000000 ...
+         #              CONTENTS, ALLOC, ....
+-        section_entry = (Suppress(Word(nums)) + SkipTo(' ') + 
Suppress(rest_of_line)
++        section_entry = (Suppress(Word(nums)) + Regex(r'\.\S+') + 
Suppress(rest_of_line)
+                          + Suppress(ZeroOrMore(Word(alphas) + Literal(',')) + 
Word(alphas)))
+ 
+         content = Group(object_line

Reply via email to