commit: 3528b85730f888f624e70d8c5de1c037f53269db Author: David Roman <davidroman96 <AT> gmail <DOT> com> AuthorDate: Wed Jul 5 13:20:45 2023 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Wed Jul 5 13:20:45 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3528b857
dev-embedded/esp-idf: drop 5.0 Signed-off-by: David Roman <davidroman96 <AT> gmail.com> dev-embedded/esp-idf/Manifest | 1 - dev-embedded/esp-idf/esp-idf-5.0.ebuild | 146 --------------------- .../files/allow-system-install-esp-idf-5.0.patch | 37 ------ 3 files changed, 184 deletions(-) diff --git a/dev-embedded/esp-idf/Manifest b/dev-embedded/esp-idf/Manifest index 5ad2eef15..0f413d12e 100644 --- a/dev-embedded/esp-idf/Manifest +++ b/dev-embedded/esp-idf/Manifest @@ -1,5 +1,4 @@ DIST esp-idf-5.0.2.zip 1000558879 BLAKE2B 6127dfb7f78261060b4981e414fea95a4ef7162bb3da11cf53aeb6504396d9e0958044dd66ba1329e87004fd1149c41a86638b4f7a6c3a9d7236fc908961818d SHA512 c58013a5597c00c2ee1c8ae8814b18365f5949b5d834b1fccbee3dce944561d9f2c4296aad578cfc5d79fcd5f86cfa6a5024ff1472305d08ab65e6634be65f05 -DIST esp-idf-5.0.zip 880574300 BLAKE2B 25afdb2e6ee28b86b2072e86ce2de713574e59195480b0be0efbe720e849120585917b393f5de77bf52a7c0245857a09e5c44db41cf96ff966d79640d9138736 SHA512 0fa438ca9afbc02a65259ae21e4957950eb3a373174bbc288b2f316b57a9384ac668ce487ae31373ff27dda85b8300e4c63ef927afce7a35380f8d2e793a4ea0 DIST openocd-esp32-linux-amd64-0.11.0-esp32-20221026.tar.gz 2051435 BLAKE2B 59fd510cf3c12514791fa85b76d81722685add64f0a690793b52c5d41101c727fefe064727b148577c3fc522ffae79e8f632d34f300a9543377027579b9cea70 SHA512 f8296460efa3d43b23a51c81a840a2e7c13272fa213770bfdb269decd23a3571be9c4ff4be6647d87e56e156284952d9a8c92b24244eaa6996fae18497ce15f8 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 diff --git a/dev-embedded/esp-idf/esp-idf-5.0.ebuild b/dev-embedded/esp-idf/esp-idf-5.0.ebuild deleted file mode 100644 index 328cd094e..000000000 --- a/dev-embedded/esp-idf/esp-idf-5.0.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_10 ) - -VER="esp-2022r1" -CROSSTOOL_URL="https://github.com/espressif/crosstool-NG/releases/download/${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.11.0-esp32-20221026/openocd-esp32-linux-amd64-0.11.0-esp32-20221026.tar.gz - ${CROSSTOOL_URL}/xtensa-esp32-elf-gcc11_2_0-${VER}-linux-amd64.tar.xz - ${CROSSTOOL_URL}/xtensa-esp32s2-elf-gcc11_2_0-${VER}-linux-amd64.tar.xz - ${CROSSTOOL_URL}/xtensa-esp32s3-elf-gcc11_2_0-${VER}-linux-amd64.tar.xz - ${CROSSTOOL_URL}/riscv32-esp-elf-gcc11_2_0-${VER}-linux-amd64.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" - -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-${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 - ) -} - -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 - fi - - if use esp32s3; then - install_tool xtensa-esp32s3-elf - fi - - if use riscv32; then - install_tool riscv32-esp-elf - fi - install_tool openocd-esp32 - - echo "IDF_PATH=/usr/share/${PN}" > 99esp-idf || die - doenvd 99esp-idf - - insinto /usr/share/${PN} - - rm -r .git || die - doins -r . -} diff --git a/dev-embedded/esp-idf/files/allow-system-install-esp-idf-5.0.patch b/dev-embedded/esp-idf/files/allow-system-install-esp-idf-5.0.patch deleted file mode 100644 index 74fd3a318..000000000 --- a/dev-embedded/esp-idf/files/allow-system-install-esp-idf-5.0.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/tools/idf.py b/tools/idf.py -index 0b91e13ff0..8ff1479f16 100755 ---- a/tools/idf.py -+++ b/tools/idf.py -@@ -35,16 +35,11 @@ sys.dont_write_bytecode = True - - import python_version_checker # noqa: E402 - --try: -- from idf_py_actions.errors import FatalError # noqa: E402 -- from idf_py_actions.tools import (PropertyDict, executable_exists, get_target, idf_version, # noqa: E402 -+from idf_py_actions.errors import FatalError # noqa: E402 -+from idf_py_actions.tools import (PropertyDict, executable_exists, get_target, idf_version, # noqa: E402 - merge_action_lists, realpath) -- if os.getenv('IDF_COMPONENT_MANAGER') != '0': -- from idf_component_manager import idf_extensions --except ImportError: -- # For example, importing click could cause this. -- print('Please use idf.py only in an ESP-IDF shell environment.', file=sys.stderr) -- sys.exit(1) -+if os.getenv('IDF_COMPONENT_MANAGER') != '0': -+ from idf_component_manager import idf_extensions - - # Use this Python interpreter for any subprocesses we launch - PYTHON = sys.executable -diff --git a/tools/idf_tools.py b/tools/idf_tools.py -index a388bbdb5f..63aa9c3cf4 100755 ---- a/tools/idf_tools.py -+++ b/tools/idf_tools.py -@@ -2039,6 +2039,7 @@ def action_install_python_env(args): # type: ignore - - - def action_check_python_dependencies(args): # type: ignore -+ return - use_constraints = not args.no_constraints - req_paths = get_requirements('') # no new features -> just detect the existing ones -
