From: "David Roman" <davidroman96@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-embedded/esp-idf/files/, dev-embedded/esp-idf/
Date: Wed, 08 Jan 2025 10:08:23 +0000 (UTC) [thread overview]
Message-ID: <1736330920.7470c2b9e4decbf44df73b0c9f3b69bc7074dfa8.davidroman@gentoo> (raw)
commit: 7470c2b9e4decbf44df73b0c9f3b69bc7074dfa8
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Wed Jan 8 10:08:40 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jan 8 10:08:40 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7470c2b9
dev-embedded/esp-idf: drop 5.3.1-r1
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
dev-embedded/esp-idf/Manifest | 2 -
dev-embedded/esp-idf/esp-idf-5.3.1-r1.ebuild | 162 ---------------------
.../files/esp-idf-5.3-fix-cpp-build-eth.patch | 125 ----------------
3 files changed, 289 deletions(-)
diff --git a/dev-embedded/esp-idf/Manifest b/dev-embedded/esp-idf/Manifest
index f6e03af68..ce4b19291 100644
--- a/dev-embedded/esp-idf/Manifest
+++ b/dev-embedded/esp-idf/Manifest
@@ -1,6 +1,4 @@
-DIST esp-idf-5.3.1.zip 1695394487 BLAKE2B 97168a8ab5c482a86588e87d42caafb5bbeb4192966294fa56cb237883490b86746571ba6d00b6306b06b3ede8e7b041726e17fe09e2a7e747021e580e575a10 SHA512 c82517801628a6f5d74a5d22a0cc1320226cac6a0d79120273e500b8e8cfbc49e4129b3dfa7eda45f94a9220221b7894ef77e208aeab17d3d452bf06a3419678
DIST esp-idf-5.3.2.zip 1900574501 BLAKE2B fa6937d0bc90ae8b3e6590bebbc1703b89c3e6467cf555256d68d5854d093f06cbbe0e8fe83f4afefe044cba1d8f1ff37b4dc08c1bcd0c50ceef76f1a13192cb SHA512 87be2eed9faab03d5da6c5fdecf19e7c59f1ad8b98ba8796c5070c20a286029d5162f48f4a24e623698bc410dbed6ef5476833362238e6508503408bf761af51
-DIST openocd-esp32-linux-amd64-0.12.0-esp32-20240318.tar.gz 2252682 BLAKE2B fbec39f77c7e2d423eacaf45d0f8c3373e24c65c3d5e2db0edf5b952945edcc838dd41f8c852ff0b2104dce62184b3b0803014e53d8dd4dcf6427955ec18f194 SHA512 5acb5d90740ea8b54be57fe80956c2bbcc6bb3c48dc4969043a7d49da7e9135ede4add8bdf8f7d772681867aca1faa72594fa8f70e7e8d2bc7ed93128ff1ec8d
DIST openocd-esp32-linux-amd64-0.12.0-esp32-20241016.tar.gz 2398717 BLAKE2B 4550fb391e77c4eb09f88bc596f002de12a1c26e07af1d4e1a9efb25851facab39afc96a73d7c3f5c1bd8dc11963c6dc619d161741ee96cb2fb39c2b9bfbacd8 SHA512 bc72521e5c01090b1628d97a33adf336d32e4b451050abd056046672bb5d8bc0326db350d8c96390a11891d783d1223ff98ebef35e7299cc2f36dde9f0b466f8
DIST riscv32-esp-elf-13.2.0_20240530-x86_64-linux-gnu.tar.xz 145544808 BLAKE2B b55513bf4cd6526a438aa5460806f0886438a52932631f5d142bc9c5f0b0affcda7a830b2f9b13c83ed356a4cebd7e3e0c0b5c29e718e880d312b6aa2f61c5b2 SHA512 fb4c868877bd9e68bedceb816c1aeec1736e2876bc1adf3138d59b73f0e9b0fb14eb826c885749b6070e6cf1e8e794f0a53c85bf5c5c896d8b3a6c7e6d0d821b
DIST riscv32-esp-elf-gdb-14.2_20240403-x86_64-linux-gnu.tar.gz 30707431 BLAKE2B 99809fbd5abe99c4890fbf4edd964ee53bc9269b9bb15f487316d0092a9d7aae9d3f9f61f7597f5721aec4f95813908c8ce6a3f6f97cd453d1610a5caa7dc42e SHA512 1ad4854c53f435b08d634f8e5e1a9169037745684b13972876176483badc7ebf5a6c38109e7ac5c3f484df76e82bf790244661ac70b1e52dd3b2fc8a4956e5ff
diff --git a/dev-embedded/esp-idf/esp-idf-5.3.1-r1.ebuild b/dev-embedded/esp-idf/esp-idf-5.3.1-r1.ebuild
deleted file mode 100644
index f13f4efaa..000000000
--- a/dev-embedded/esp-idf/esp-idf-5.3.1-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11,12} )
-
-VER="13.2.0_20240530"
-GDB_VER="14.2_20240403"
-
-CROSSTOOL_URL="https://github.com/espressif/crosstool-NG/releases/download/esp-${VER}"
-
-inherit estack python-r1
-
-DESCRIPTION="Espressif IoT Development Framework"
-HOMEPAGE="https://www.espressif.com/"
-
-# See https://dl.espressif.com/dl/esp-idf/espidf.constraints.v5.3.txt for information about version dependencies
-
-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-20240318/openocd-esp32-linux-amd64-0.12.0-esp32-20240318.tar.gz
- https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v${GDB_VER}/xtensa-esp-elf-gdb-${GDB_VER}-x86_64-linux-gnu.tar.gz"
-SRC_URI+=" ${CROSSTOOL_URL}/xtensa-esp-elf-${VER}-x86_64-linux-gnu.tar.xz"
-SRC_URI+=" riscv32? (
- ${CROSSTOOL_URL}/riscv32-esp-elf-${VER}-x86_64-linux-gnu.tar.xz
- https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v${GDB_VER}/riscv32-esp-elf-gdb-${GDB_VER}-x86_64-linux-gnu.tar.gz
-)"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="riscv32"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="app-arch/unzip"
-RDEPEND="
- ${PYTHON_DEPS}
-
- dev-libs/libusb:1
- dev-python/click[${PYTHON_USEDEP}]
- dev-python/pyserial[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyelftools[${PYTHON_USEDEP}]
- dev-embedded/esp-coredump[${PYTHON_USEDEP}]
- dev-embedded/esptool
- dev-embedded/esp-idf-kconfig[${PYTHON_USEDEP}]
- dev-embedded/esp-idf-monitor[${PYTHON_USEDEP}]
- dev-embedded/esp-idf-nvs-partition-gen[${PYTHON_USEDEP}]
- dev-embedded/esp-idf-panic-decoder[${PYTHON_USEDEP}]
- dev-embedded/esp-idf-size[${PYTHON_USEDEP}]
- dev-embedded/freertos-gdb[${PYTHON_USEDEP}]
- dev-embedded/idf-component-manager[${PYTHON_USEDEP}]
- sys-libs/zlib
-"
-
-RESTRICT="strip"
-
-QA_PREBUILT="opt/* usr/lib* usr/share/esp-idf/*"
-QA_PRESTRIPPED="opt/*"
-
-PATCHES=(
- "${FILESDIR}/allow-system-install-${PN}-5.3.patch"
- "${FILESDIR}/${PN}-5.3-fix-cpp-build-eth.patch"
-)
-
-install_tool() {
- eshopts_push -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
- )
-
- eshopts_pop
-}
-
-src_install() {
- echo "v${PV}" > version.txt || die
-
- newbin - idf <<-EOF
- #!/bin/sh
-
- # Silence a warning by idf.py
- export IDF_PYTHON_ENV_PATH=
- exec python /usr/share/${PN}/tools/idf.py \$@
-EOF
-
- install_tool xtensa-esp-elf
- install_tool xtensa-esp-elf/xtensa-esp-elf
-
- 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.{8..10} || die
- install_tool xtensa-esp-elf-gdb
- if use riscv32; then
- install_tool riscv32-esp-elf-gdb
- fi
-
- 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/esp-idf-5.3-fix-cpp-build-eth.patch b/dev-embedded/esp-idf/files/esp-idf-5.3-fix-cpp-build-eth.patch
deleted file mode 100644
index 41fe1e87b..000000000
--- a/dev-embedded/esp-idf/files/esp-idf-5.3-fix-cpp-build-eth.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff --git a/components/esp_eth/include/esp_eth_mac_esp.h b/components/esp_eth/include/esp_eth_mac_esp.h
-index 8c4909b8c5..39db373798 100644
---- a/components/esp_eth/include/esp_eth_mac_esp.h
-+++ b/components/esp_eth/include/esp_eth_mac_esp.h
-@@ -217,64 +217,64 @@ typedef enum {
- #error "Unsupported RMII clock mode"
- #endif // CONFIG_ETH_RMII_CLK_INPUT
-
--#define ETH_ESP32_EMAC_DEFAULT_CONFIG() \
-- { \
-- .smi_gpio = \
-- { \
-- .mdc_num = 23, \
-- .mdio_num = 18 \
-- }, \
-- .interface = EMAC_DATA_INTERFACE_RMII, \
-- .clock_config = \
-- { \
-- .rmii = \
-- { \
-- .clock_mode = DEFAULT_RMII_CLK_MODE, \
-- .clock_gpio = DEFAULT_RMII_CLK_GPIO \
-- } \
-- }, \
-- .dma_burst_len = ETH_DMA_BURST_LEN_32, \
-- .intr_priority = 0, \
-+#define ETH_ESP32_EMAC_DEFAULT_CONFIG() \
-+ { \
-+ .smi_gpio = \
-+ { \
-+ .mdc_num = 23, \
-+ .mdio_num = 18 \
-+ }, \
-+ .interface = EMAC_DATA_INTERFACE_RMII, \
-+ .clock_config = \
-+ { \
-+ .rmii = \
-+ { \
-+ .clock_mode = DEFAULT_RMII_CLK_MODE, \
-+ .clock_gpio = (emac_rmii_clock_gpio_t) DEFAULT_RMII_CLK_GPIO \
-+ } \
-+ }, \
-+ .dma_burst_len = ETH_DMA_BURST_LEN_32, \
-+ .intr_priority = 0, \
- }
- #elif CONFIG_IDF_TARGET_ESP32P4
--#define ETH_ESP32_EMAC_DEFAULT_CONFIG() \
-- { \
-- .smi_gpio = \
-- { \
-- .mdc_num = 31, \
-- .mdio_num = 27 \
-- }, \
-- .interface = EMAC_DATA_INTERFACE_RMII, \
-- .clock_config = \
-- { \
-- .rmii = \
-- { \
-- .clock_mode = EMAC_CLK_EXT_IN, \
-- .clock_gpio = 50 \
-- } \
-- }, \
-- .clock_config_out_in = \
-- { \
-- .rmii = \
-- { \
-- .clock_mode = EMAC_CLK_EXT_IN, \
-- .clock_gpio = -1 \
-- } \
-- }, \
-- .dma_burst_len = ETH_DMA_BURST_LEN_32, \
-- .intr_priority = 0, \
-- .emac_dataif_gpio = \
-- { \
-- .rmii = \
-- { \
-- .tx_en_num = 49, \
-- .txd0_num = 34, \
-- .txd1_num = 35, \
-- .crs_dv_num = 28, \
-- .rxd0_num = 29, \
-- .rxd1_num = 30 \
-- } \
-- }, \
-+#define ETH_ESP32_EMAC_DEFAULT_CONFIG() \
-+ { \
-+ .smi_gpio = \
-+ { \
-+ .mdc_num = 31, \
-+ .mdio_num = 27 \
-+ }, \
-+ .interface = EMAC_DATA_INTERFACE_RMII, \
-+ .clock_config = \
-+ { \
-+ .rmii = \
-+ { \
-+ .clock_mode = EMAC_CLK_EXT_IN, \
-+ .clock_gpio = (emac_rmii_clock_gpio_t) 50 \
-+ } \
-+ }, \
-+ .clock_config_out_in = \
-+ { \
-+ .rmii = \
-+ { \
-+ .clock_mode = EMAC_CLK_EXT_IN, \
-+ .clock_gpio = (emac_rmii_clock_gpio_t) -1 \
-+ } \
-+ }, \
-+ .dma_burst_len = ETH_DMA_BURST_LEN_32, \
-+ .intr_priority = 0, \
-+ .emac_dataif_gpio = \
-+ { \
-+ .rmii = \
-+ { \
-+ .tx_en_num = 49, \
-+ .txd0_num = 34, \
-+ .txd1_num = 35, \
-+ .crs_dv_num = 28, \
-+ .rxd0_num = 29, \
-+ .rxd1_num = 30 \
-+ } \
-+ }, \
- }
- #endif // CONFIG_IDF_TARGET_ESP32P4
-
WARNING: multiple messages have this Message-ID (diff)
From: "David Roman" <davidroman96@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-embedded/esp-idf/, dev-embedded/esp-idf/files/
Date: Wed, 08 Jan 2025 13:20:29 +0000 (UTC) [thread overview]
Message-ID: <1736330920.7470c2b9e4decbf44df73b0c9f3b69bc7074dfa8.davidroman@gentoo> (raw)
Message-ID: <20250108132029.9xTgWnQd1wr78Arp0OtwnegJl0sQsCEIc3vsEk1AtHg@z> (raw)
commit: 7470c2b9e4decbf44df73b0c9f3b69bc7074dfa8
Author: David Roman <davidroman96 <AT> gmail <DOT> com>
AuthorDate: Wed Jan 8 10:08:40 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Jan 8 10:08:40 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7470c2b9
dev-embedded/esp-idf: drop 5.3.1-r1
Signed-off-by: David Roman <davidroman96 <AT> gmail.com>
dev-embedded/esp-idf/Manifest | 2 -
dev-embedded/esp-idf/esp-idf-5.3.1-r1.ebuild | 162 ---------------------
.../files/esp-idf-5.3-fix-cpp-build-eth.patch | 125 ----------------
3 files changed, 289 deletions(-)
diff --git a/dev-embedded/esp-idf/Manifest b/dev-embedded/esp-idf/Manifest
index f6e03af68..ce4b19291 100644
--- a/dev-embedded/esp-idf/Manifest
+++ b/dev-embedded/esp-idf/Manifest
@@ -1,6 +1,4 @@
-DIST esp-idf-5.3.1.zip 1695394487 BLAKE2B 97168a8ab5c482a86588e87d42caafb5bbeb4192966294fa56cb237883490b86746571ba6d00b6306b06b3ede8e7b041726e17fe09e2a7e747021e580e575a10 SHA512 c82517801628a6f5d74a5d22a0cc1320226cac6a0d79120273e500b8e8cfbc49e4129b3dfa7eda45f94a9220221b7894ef77e208aeab17d3d452bf06a3419678
DIST esp-idf-5.3.2.zip 1900574501 BLAKE2B fa6937d0bc90ae8b3e6590bebbc1703b89c3e6467cf555256d68d5854d093f06cbbe0e8fe83f4afefe044cba1d8f1ff37b4dc08c1bcd0c50ceef76f1a13192cb SHA512 87be2eed9faab03d5da6c5fdecf19e7c59f1ad8b98ba8796c5070c20a286029d5162f48f4a24e623698bc410dbed6ef5476833362238e6508503408bf761af51
-DIST openocd-esp32-linux-amd64-0.12.0-esp32-20240318.tar.gz 2252682 BLAKE2B fbec39f77c7e2d423eacaf45d0f8c3373e24c65c3d5e2db0edf5b952945edcc838dd41f8c852ff0b2104dce62184b3b0803014e53d8dd4dcf6427955ec18f194 SHA512 5acb5d90740ea8b54be57fe80956c2bbcc6bb3c48dc4969043a7d49da7e9135ede4add8bdf8f7d772681867aca1faa72594fa8f70e7e8d2bc7ed93128ff1ec8d
DIST openocd-esp32-linux-amd64-0.12.0-esp32-20241016.tar.gz 2398717 BLAKE2B 4550fb391e77c4eb09f88bc596f002de12a1c26e07af1d4e1a9efb25851facab39afc96a73d7c3f5c1bd8dc11963c6dc619d161741ee96cb2fb39c2b9bfbacd8 SHA512 bc72521e5c01090b1628d97a33adf336d32e4b451050abd056046672bb5d8bc0326db350d8c96390a11891d783d1223ff98ebef35e7299cc2f36dde9f0b466f8
DIST riscv32-esp-elf-13.2.0_20240530-x86_64-linux-gnu.tar.xz 145544808 BLAKE2B b55513bf4cd6526a438aa5460806f0886438a52932631f5d142bc9c5f0b0affcda7a830b2f9b13c83ed356a4cebd7e3e0c0b5c29e718e880d312b6aa2f61c5b2 SHA512 fb4c868877bd9e68bedceb816c1aeec1736e2876bc1adf3138d59b73f0e9b0fb14eb826c885749b6070e6cf1e8e794f0a53c85bf5c5c896d8b3a6c7e6d0d821b
DIST riscv32-esp-elf-gdb-14.2_20240403-x86_64-linux-gnu.tar.gz 30707431 BLAKE2B 99809fbd5abe99c4890fbf4edd964ee53bc9269b9bb15f487316d0092a9d7aae9d3f9f61f7597f5721aec4f95813908c8ce6a3f6f97cd453d1610a5caa7dc42e SHA512 1ad4854c53f435b08d634f8e5e1a9169037745684b13972876176483badc7ebf5a6c38109e7ac5c3f484df76e82bf790244661ac70b1e52dd3b2fc8a4956e5ff
diff --git a/dev-embedded/esp-idf/esp-idf-5.3.1-r1.ebuild b/dev-embedded/esp-idf/esp-idf-5.3.1-r1.ebuild
deleted file mode 100644
index f13f4efaa..000000000
--- a/dev-embedded/esp-idf/esp-idf-5.3.1-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11,12} )
-
-VER="13.2.0_20240530"
-GDB_VER="14.2_20240403"
-
-CROSSTOOL_URL="https://github.com/espressif/crosstool-NG/releases/download/esp-${VER}"
-
-inherit estack python-r1
-
-DESCRIPTION="Espressif IoT Development Framework"
-HOMEPAGE="https://www.espressif.com/"
-
-# See https://dl.espressif.com/dl/esp-idf/espidf.constraints.v5.3.txt for information about version dependencies
-
-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-20240318/openocd-esp32-linux-amd64-0.12.0-esp32-20240318.tar.gz
- https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v${GDB_VER}/xtensa-esp-elf-gdb-${GDB_VER}-x86_64-linux-gnu.tar.gz"
-SRC_URI+=" ${CROSSTOOL_URL}/xtensa-esp-elf-${VER}-x86_64-linux-gnu.tar.xz"
-SRC_URI+=" riscv32? (
- ${CROSSTOOL_URL}/riscv32-esp-elf-${VER}-x86_64-linux-gnu.tar.xz
- https://github.com/espressif/binutils-gdb/releases/download/esp-gdb-v${GDB_VER}/riscv32-esp-elf-gdb-${GDB_VER}-x86_64-linux-gnu.tar.gz
-)"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="riscv32"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="app-arch/unzip"
-RDEPEND="
- ${PYTHON_DEPS}
-
- dev-libs/libusb:1
- dev-python/click[${PYTHON_USEDEP}]
- dev-python/pyserial[${PYTHON_USEDEP}]
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pyelftools[${PYTHON_USEDEP}]
- dev-embedded/esp-coredump[${PYTHON_USEDEP}]
- dev-embedded/esptool
- dev-embedded/esp-idf-kconfig[${PYTHON_USEDEP}]
- dev-embedded/esp-idf-monitor[${PYTHON_USEDEP}]
- dev-embedded/esp-idf-nvs-partition-gen[${PYTHON_USEDEP}]
- dev-embedded/esp-idf-panic-decoder[${PYTHON_USEDEP}]
- dev-embedded/esp-idf-size[${PYTHON_USEDEP}]
- dev-embedded/freertos-gdb[${PYTHON_USEDEP}]
- dev-embedded/idf-component-manager[${PYTHON_USEDEP}]
- sys-libs/zlib
-"
-
-RESTRICT="strip"
-
-QA_PREBUILT="opt/* usr/lib* usr/share/esp-idf/*"
-QA_PRESTRIPPED="opt/*"
-
-PATCHES=(
- "${FILESDIR}/allow-system-install-${PN}-5.3.patch"
- "${FILESDIR}/${PN}-5.3-fix-cpp-build-eth.patch"
-)
-
-install_tool() {
- eshopts_push -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
- )
-
- eshopts_pop
-}
-
-src_install() {
- echo "v${PV}" > version.txt || die
-
- newbin - idf <<-EOF
- #!/bin/sh
-
- # Silence a warning by idf.py
- export IDF_PYTHON_ENV_PATH=
- exec python /usr/share/${PN}/tools/idf.py \$@
-EOF
-
- install_tool xtensa-esp-elf
- install_tool xtensa-esp-elf/xtensa-esp-elf
-
- 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.{8..10} || die
- install_tool xtensa-esp-elf-gdb
- if use riscv32; then
- install_tool riscv32-esp-elf-gdb
- fi
-
- 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/esp-idf-5.3-fix-cpp-build-eth.patch b/dev-embedded/esp-idf/files/esp-idf-5.3-fix-cpp-build-eth.patch
deleted file mode 100644
index 41fe1e87b..000000000
--- a/dev-embedded/esp-idf/files/esp-idf-5.3-fix-cpp-build-eth.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff --git a/components/esp_eth/include/esp_eth_mac_esp.h b/components/esp_eth/include/esp_eth_mac_esp.h
-index 8c4909b8c5..39db373798 100644
---- a/components/esp_eth/include/esp_eth_mac_esp.h
-+++ b/components/esp_eth/include/esp_eth_mac_esp.h
-@@ -217,64 +217,64 @@ typedef enum {
- #error "Unsupported RMII clock mode"
- #endif // CONFIG_ETH_RMII_CLK_INPUT
-
--#define ETH_ESP32_EMAC_DEFAULT_CONFIG() \
-- { \
-- .smi_gpio = \
-- { \
-- .mdc_num = 23, \
-- .mdio_num = 18 \
-- }, \
-- .interface = EMAC_DATA_INTERFACE_RMII, \
-- .clock_config = \
-- { \
-- .rmii = \
-- { \
-- .clock_mode = DEFAULT_RMII_CLK_MODE, \
-- .clock_gpio = DEFAULT_RMII_CLK_GPIO \
-- } \
-- }, \
-- .dma_burst_len = ETH_DMA_BURST_LEN_32, \
-- .intr_priority = 0, \
-+#define ETH_ESP32_EMAC_DEFAULT_CONFIG() \
-+ { \
-+ .smi_gpio = \
-+ { \
-+ .mdc_num = 23, \
-+ .mdio_num = 18 \
-+ }, \
-+ .interface = EMAC_DATA_INTERFACE_RMII, \
-+ .clock_config = \
-+ { \
-+ .rmii = \
-+ { \
-+ .clock_mode = DEFAULT_RMII_CLK_MODE, \
-+ .clock_gpio = (emac_rmii_clock_gpio_t) DEFAULT_RMII_CLK_GPIO \
-+ } \
-+ }, \
-+ .dma_burst_len = ETH_DMA_BURST_LEN_32, \
-+ .intr_priority = 0, \
- }
- #elif CONFIG_IDF_TARGET_ESP32P4
--#define ETH_ESP32_EMAC_DEFAULT_CONFIG() \
-- { \
-- .smi_gpio = \
-- { \
-- .mdc_num = 31, \
-- .mdio_num = 27 \
-- }, \
-- .interface = EMAC_DATA_INTERFACE_RMII, \
-- .clock_config = \
-- { \
-- .rmii = \
-- { \
-- .clock_mode = EMAC_CLK_EXT_IN, \
-- .clock_gpio = 50 \
-- } \
-- }, \
-- .clock_config_out_in = \
-- { \
-- .rmii = \
-- { \
-- .clock_mode = EMAC_CLK_EXT_IN, \
-- .clock_gpio = -1 \
-- } \
-- }, \
-- .dma_burst_len = ETH_DMA_BURST_LEN_32, \
-- .intr_priority = 0, \
-- .emac_dataif_gpio = \
-- { \
-- .rmii = \
-- { \
-- .tx_en_num = 49, \
-- .txd0_num = 34, \
-- .txd1_num = 35, \
-- .crs_dv_num = 28, \
-- .rxd0_num = 29, \
-- .rxd1_num = 30 \
-- } \
-- }, \
-+#define ETH_ESP32_EMAC_DEFAULT_CONFIG() \
-+ { \
-+ .smi_gpio = \
-+ { \
-+ .mdc_num = 31, \
-+ .mdio_num = 27 \
-+ }, \
-+ .interface = EMAC_DATA_INTERFACE_RMII, \
-+ .clock_config = \
-+ { \
-+ .rmii = \
-+ { \
-+ .clock_mode = EMAC_CLK_EXT_IN, \
-+ .clock_gpio = (emac_rmii_clock_gpio_t) 50 \
-+ } \
-+ }, \
-+ .clock_config_out_in = \
-+ { \
-+ .rmii = \
-+ { \
-+ .clock_mode = EMAC_CLK_EXT_IN, \
-+ .clock_gpio = (emac_rmii_clock_gpio_t) -1 \
-+ } \
-+ }, \
-+ .dma_burst_len = ETH_DMA_BURST_LEN_32, \
-+ .intr_priority = 0, \
-+ .emac_dataif_gpio = \
-+ { \
-+ .rmii = \
-+ { \
-+ .tx_en_num = 49, \
-+ .txd0_num = 34, \
-+ .txd1_num = 35, \
-+ .crs_dv_num = 28, \
-+ .rxd0_num = 29, \
-+ .rxd1_num = 30 \
-+ } \
-+ }, \
- }
- #endif // CONFIG_IDF_TARGET_ESP32P4
-
next reply other threads:[~2025-01-08 10:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-08 10:08 David Roman [this message]
2025-01-08 13:20 ` [gentoo-commits] repo/proj/guru:master commit in: dev-embedded/esp-idf/, dev-embedded/esp-idf/files/ David Roman
-- strict thread matches above, loose matches on Subject: below --
2024-07-30 12:58 [gentoo-commits] repo/proj/guru:dev commit in: dev-embedded/esp-idf/files/, dev-embedded/esp-idf/ David Roman
2023-11-20 14:14 [gentoo-commits] repo/proj/guru:master commit in: dev-embedded/esp-idf/, dev-embedded/esp-idf/files/ David Roman
2023-11-20 13:39 ` [gentoo-commits] repo/proj/guru:dev commit in: dev-embedded/esp-idf/files/, dev-embedded/esp-idf/ David Roman
2023-07-05 13:44 David Roman
2023-05-16 14:55 Mazunki Hoksaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1736330920.7470c2b9e4decbf44df73b0c9f3b69bc7074dfa8.davidroman@gentoo \
--to=davidroman96@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox