* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/u-boot-tools/, dev-embedded/u-boot-tools/files/
@ 2016-08-26 2:09 Tim Harder
0 siblings, 0 replies; 4+ messages in thread
From: Tim Harder @ 2016-08-26 2:09 UTC (permalink / raw
To: gentoo-commits
commit: bb811a008db572dc5e6e18a062071cca3236fdf4
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 02:08:23 2016 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 02:08:23 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb811a00
dev-embedded/u-boot-tools: remove old
dev-embedded/u-boot-tools/Manifest | 4 -
.../u-boot-tools/files/u-boot-no-config.h.patch | 92 ----------------------
.../u-boot-tools/u-boot-tools-2013.07.ebuild | 46 -----------
.../u-boot-tools/u-boot-tools-2014.01.ebuild | 46 -----------
.../u-boot-tools/u-boot-tools-2015.01.ebuild | 42 ----------
.../u-boot-tools/u-boot-tools-2015.04.ebuild | 44 -----------
6 files changed, 274 deletions(-)
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 9b429ac..ffb45d4 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,6 +1,2 @@
-DIST u-boot-2013.07.tar.bz2 10067674 SHA256 2bbd440c1b29928d230604eac372fda5152d3ae23f52b1910c77fc5bf531250b SHA512 5c0725c9c5c7c9101d7ef8eb659aafb513ca5742fbafec55e0b64cd68b3e37520de55f71aebba59bf979b8daef2b0c71645b5ab343b7057d601b3cd6ffc6e763 WHIRLPOOL 41f1a78b6f7af206bb2a6c04be23ad1aceaa4a105ede4794b4a9d6777e3e92ae2014906be30c749cae51ea9d865f7e565185d9baaa0e953b01a053b62621ad66
-DIST u-boot-2014.01.tar.bz2 10180625 SHA256 cdaf8c81583abfa2e73da46cfcf87b0cbd9741d9aa766f3b905376e3652d543d SHA512 c6e4f6f9a2dae1a50b7dd94dad13ef5d0ce440c3f0401de3f0ecf907c8fca0ff183077ec3b2c4da42b0fa9775450b03571725c76dfd2419a4ee7b982c261ccb1 WHIRLPOOL 9964abde477ce54dfe0a0972920e19c6d60209e8a19819c98b955a9a8b23cc57ac8e687d9ced65411eb6ff1ac40121edac154e754b3b5a2f037cf3a7724de374
-DIST u-boot-2015.01.tar.bz2 9982195 SHA256 383051a656ebe11757b17d38a3326387e4a1b0949ca8a9e8ee506bf71dac9fde SHA512 6697c6da5f463bdfa75b8025a2dd302e9cda58ce36bc3252590f11976807aeccc1ca76be93cbc83d3367a7557878516bb57130ffb76197ffd513640c48e18938 WHIRLPOOL 7ed552f0f32d061c1723c42f0230611d6552068765ea3130fe070d1a906da2defafa14a67078ef7feda4ed29857f51a5b47b3595aa7a8eb07bf26778a3517aff
-DIST u-boot-2015.04.tar.bz2 9471487 SHA256 0a1a70df586655f527befa6f12e184e96ed61b126e5a567382321b17200f5d60 SHA512 e50a3d7e44bf588a7cf8e28cdf3342bc38bd1bf55231d579c2501b75386cfff0fbc7a34648d893971e0095510c9d582b7180427832cb78470b4e7af2ce0e3646 WHIRLPOOL dbfd4b13b82505ef94e8b394ba260684ee18c881bd84adfc841194ce6a4b967c8514cedfcac6777045a50b940e3a1882af667e152dc0fc0d3b9254a7dfca89d0
DIST u-boot-2016.03.tar.bz2 11076762 SHA256 e49337262ecac44dbdeac140f2c6ebd1eba345e0162b0464172e7f05583ed7bb SHA512 d3a8d5f334a1a1a33756d9ac33d14eca689cafe1ada478e61b51dcbff1781266d4f0ea121e25d0232b292475721c04be63e5a153715b91a14dfc82656a54de6f WHIRLPOOL 32f246e3bdb71648f47a4246602b6f27de5dbae9834aed71880c5d5e737dfd63adcd03e9b47874b4fa61c0336fe13b8b079693baec633bd428d991abb47a88f0
DIST u-boot-2016.07.tar.bz2 11506848 SHA256 974fb7225c0af6a721307631f66b81e20dbda82a4d7cc32aba2a625727231253 SHA512 fa76dbd7e654ff9e4b3166162be6c0a77ecf2eb2a952b4865df3c818ebcdca7e2bb75e5ba19bf0346000c3d185888552193bb74510b115426cfe444b78efd3ef WHIRLPOOL 066019af0e8fd04d53569ebd001309238514daa757be6cc50db6d4544f34d0c720ff420811d44d88af6028d02dfb02667e44d8d1abb23bb364baff46c5a26a9f
diff --git a/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch b/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch
deleted file mode 100644
index 1009ab0..00000000
--- a/dev-embedded/u-boot-tools/files/u-boot-no-config.h.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-This patch has been reverted later on by
-http://git.denx.de/?p=u-boot.git;a=commit;h=e3c52f2b8779469c843eb79282396f1a5ca3fef5
-
-but we still need it to build the tools without having to configure
-a full u-boot environment.
-
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 10 Nov 2012 19:47:47 +0000 (+0000)
-Subject: fw_env: fix building w/out a config.h
-X-Git-Tag: v2013.01-rc3~19
-X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=92ace272d06cec1d7f1533bb9edf914fb5845fba;hp=7a546db2ffc6a713fb8009d8246c29da5420f6a7
-
-fw_env: fix building w/out a config.h
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
----
-
-diff --git a/tools/env/Makefile b/tools/env/Makefile
-index 0e798e0..e6dc5f3 100644
---- a/tools/env/Makefile
-+++ b/tools/env/Makefile
-@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
- HOSTSRCS := $(SRCTREE)/lib/crc32.c fw_env.c fw_env_main.c
- HOSTSRCS += $(SRCTREE)/lib/ctype.c $(SRCTREE)/lib/linux_string.c
- HOSTSRCS += $(SRCTREE)/common/env_attr.c $(SRCTREE)/common/env_flags.c
--HEADERS := fw_env.h $(OBJTREE)/include/config.h
-+HEADERS := fw_env.h
-
- # Compile for a hosted environment on the target
- HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
-@@ -36,6 +36,15 @@ HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \
- -DUSE_HOSTCC \
- -DTEXT_BASE=$(TEXT_BASE)
-
-+# Pass CONFIG_xxx settings via the command line so that we can build w/out
-+# a config.h file existing in the first place. Useful for generic builds.
-+CONFIG_VARS_TO_PASS = \
-+ ENV_OVERWRITE \
-+ OVERWRITE_ETHADDR_ONCE \
-+ ETHADDR
-+HOSTCPPFLAGS += \
-+ $(foreach x,$(CONFIG_VARS_TO_PASS),$(if $(CONFIG_$(x)),-DCONFIG_$(x)=$(CONFIG_$(x))))
-+
- ifeq ($(MTD_VERSION),old)
- HOSTCPPFLAGS += -DMTD_OLD
- endif
-diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
-index a1a6807..19703c7 100644
---- a/tools/env/fw_env.h
-+++ b/tools/env/fw_env.h
-@@ -21,15 +21,6 @@
- * MA 02111-1307 USA
- */
-
--/* Pull in the current config to define the default environment */
--#ifndef __ASSEMBLY__
--#define __ASSEMBLY__ /* get only #defines from config.h */
--#include <config.h>
--#undef __ASSEMBLY__
--#else
--#include <config.h>
--#endif
--
- /*
- * To build the utility with the static configuration
- * comment out the next line.
-@@ -52,22 +43,6 @@
- #define DEVICE2_ENVSECTORS 2
- #endif
-
--#ifndef CONFIG_BAUDRATE
--#define CONFIG_BAUDRATE 115200
--#endif
--
--#ifndef CONFIG_BOOTDELAY
--#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
--#endif
--
--#ifndef CONFIG_BOOTCOMMAND
--#define CONFIG_BOOTCOMMAND \
-- "bootp; " \
-- "setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} " \
-- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
-- "bootm"
--#endif
--
- extern int fw_printenv(int argc, char *argv[]);
- extern char *fw_getenv (char *name);
- extern int fw_setenv (int argc, char *argv[]);
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2013.07.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2013.07.ebuild
deleted file mode 100644
index b07f862..00000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2013.07.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed -i -e "s:-g ::" tools/Makefile || die
- # Make sure we find local u-boot headers first #429302
- ln -s ../include/image.h tools/ || die
- epatch "${FILESDIR}"/u-boot-no-config.h.patch
-}
-
-src_compile() {
- emake \
- HOSTSTRIP=: \
- HOSTCC="$(tc-getCC)" \
- HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
- HOSTLDFLAGS="${LDFLAGS}" \
- CONFIG_ENV_OVERWRITE=y \
- tools-all
-}
-
-src_install() {
- cd tools
- dobin bmp_logo gen_eth_addr img2srec mkimage
- dobin easylogo/easylogo
- dobin env/fw_printenv
- dosym fw_printenv /usr/bin/fw_setenv
- insinto /etc
- doins env/fw_env.config
-}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild
deleted file mode 100644
index f7fee91..00000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2014.01.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- sed -i "s:-g ::" tools/Makefile || die
- # Make sure we find local u-boot headers first #429302
- ln -s ../include/image.h tools/ || die
- epatch "${FILESDIR}"/u-boot-no-config.h.patch
-}
-
-src_compile() {
- emake \
- HOSTSTRIP=: \
- HOSTCC="$(tc-getCC)" \
- HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
- HOSTLDFLAGS="${LDFLAGS}" \
- CONFIG_ENV_OVERWRITE=y \
- tools-all
-}
-
-src_install() {
- cd tools
- dobin bmp_logo gen_eth_addr img2srec mkimage
- dobin easylogo/easylogo
- dobin env/fw_printenv
- dosym fw_printenv /usr/bin/fw_setenv
- insinto /etc
- doins env/fw_env.config
-}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2015.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2015.01.ebuild
deleted file mode 100644
index 3a0bedb..00000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2015.01.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
- # Unset a few KBUILD variables. Bug #540476
- unset KBUILD_OUTPUT KBUILD_SRC
- emake defconfig
- emake \
- HOSTSTRIP=: \
- HOSTCC="$(tc-getCC)" \
- HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
- HOSTLDFLAGS="${LDFLAGS}" \
- CONFIG_ENV_OVERWRITE=y \
- tools-all
-}
-
-src_install() {
- cd tools
- dobin bmp_logo gen_eth_addr img2srec mkimage
- dobin easylogo/easylogo
- dobin env/fw_printenv
- dosym fw_printenv /usr/bin/fw_setenv
- insinto /etc
- doins env/fw_env.config
-}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild
deleted file mode 100644
index 1bce507..00000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2015.04.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="http://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
- # Unset a few KBUILD variables. Bug #540476
- unset KBUILD_OUTPUT KBUILD_SRC
- emake defconfig
- emake \
- HOSTSTRIP=: \
- STRIP=: \
- HOSTCC="$(tc-getCC)" \
- HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
- HOSTLDFLAGS="${LDFLAGS}" \
- CONFIG_ENV_OVERWRITE=y \
- tools-all
-}
-
-src_install() {
- cd tools
- dobin bmp_logo gen_eth_addr img2srec mkimage
- dobin easylogo/easylogo
- dobin env/fw_printenv
- dosym fw_printenv /usr/bin/fw_setenv
- insinto /etc
- doins env/fw_env.config
- doman "${S}/doc/mkimage.1"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/u-boot-tools/, dev-embedded/u-boot-tools/files/
@ 2019-12-16 23:15 Sergei Trofimovich
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2019-12-16 23:15 UTC (permalink / raw
To: gentoo-commits
commit: 069a96a2ea5aaa7d4d27d2423f4a1845663272eb
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 16 23:14:56 2019 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Dec 16 23:15:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=069a96a2
dev-embedded/u-boot-tools: fix build on musl, bug #703132
include/compiler.h implies to define 'ulong' type.
glibc and musl define it on different conditions.
As a result tools fail to build on musl as:
include/env.h:159:1: error: unknown type name 'ulong'; did you mean 'long'?
We fix it by defining 'ulong' unconditionally (as on BSD).
Reported-by: eroen
Closes: https://bugs.gentoo.org/703132
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../files/u-boot-tools-2019.10-musl-ulong.patch | 19 +++++++++++++++++++
dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild | 2 ++
2 files changed, 21 insertions(+)
diff --git a/dev-embedded/u-boot-tools/files/u-boot-tools-2019.10-musl-ulong.patch b/dev-embedded/u-boot-tools/files/u-boot-tools-2019.10-musl-ulong.patch
new file mode 100644
index 00000000000..910e95a8cbf
--- /dev/null
+++ b/dev-embedded/u-boot-tools/files/u-boot-tools-2019.10-musl-ulong.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/703132
+
+include/compiler.h implies to define 'ulong' type.
+glibc and musl define it on different conditions.
+As a result tools fail to build on musl as:
+ include/env.h:159:1: error: unknown type name 'ulong'; did you mean 'long'?
+
+We fix it by defining 'ulong' unconditionally (as on BSD).
+
+--- a/include/compiler.h
++++ b/include/compiler.h
+@@ -44,6 +44,7 @@
+ #ifdef __linux__
+ # include <endian.h>
+ # include <byteswap.h>
++typedef unsigned long ulong;
+ #elif defined(__MACH__) || defined(__FreeBSD__)
+ # include <machine/endian.h>
+ typedef unsigned long ulong;
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild
index bcda5a2499b..5e06655915d 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2019.10.ebuild
@@ -22,6 +22,8 @@ DEPEND="
S=${WORKDIR}/${MY_P}
+PATCHES=("${FILESDIR}"/${P}-musl-ulong.patch)
+
src_compile() {
# Unset a few KBUILD variables. Bug #540476
unset KBUILD_OUTPUT KBUILD_SRC
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/u-boot-tools/, dev-embedded/u-boot-tools/files/
@ 2020-02-03 7:49 Sergei Trofimovich
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2020-02-03 7:49 UTC (permalink / raw
To: gentoo-commits
commit: a47d7b0377791cebee6fb09cad667fc13df7362a
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 3 07:49:06 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Feb 3 07:49:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a47d7b03
dev-embedded/u-boot-tools: tweak for gcc-10
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../u-boot-tools/files/u-boot-tools-2020.01-gcc-10.patch | 11 +++++++++++
dev-embedded/u-boot-tools/u-boot-tools-2020.01.ebuild | 4 ++++
2 files changed, 15 insertions(+)
diff --git a/dev-embedded/u-boot-tools/files/u-boot-tools-2020.01-gcc-10.patch b/dev-embedded/u-boot-tools/files/u-boot-tools-2020.01-gcc-10.patch
new file mode 100644
index 00000000000..32155976151
--- /dev/null
+++ b/dev-embedded/u-boot-tools/files/u-boot-tools-2020.01-gcc-10.patch
@@ -0,0 +1,11 @@
+--- a/scripts/dtc/dtc-lexer.l
++++ b/scripts/dtc/dtc-lexer.l
+@@ -38,7 +38,7 @@ LINECOMMENT "//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+
+-YYLTYPE yylloc;
++extern YYLTYPE yylloc;
+ extern bool treesource_error;
+
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2020.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2020.01.ebuild
index 6deafb7f05c..798ff7a240b 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2020.01.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2020.01.ebuild
@@ -20,6 +20,10 @@ DEPEND="
sys-devel/bison
"
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc-10.patch
+)
+
S=${WORKDIR}/${MY_P}
src_compile() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-embedded/u-boot-tools/, dev-embedded/u-boot-tools/files/
@ 2024-02-19 7:37 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-02-19 7:37 UTC (permalink / raw
To: gentoo-commits
commit: d512295a7a744a0d81722b5de466c20d31120692
Author: Raul E Rangel <rrangel <AT> chromium <DOT> org>
AuthorDate: Fri Aug 11 22:48:47 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 07:37:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d512295a
dev-embedded/u-boot-tools: Fix missing BDEPENDs
This package currently shows the following errors:
```
Traceback (most recent call last):
File "scripts/dtc/pylibfdt/setup.py", line 23, in <module>
from setuptools import setup, Extension
ModuleNotFoundError: No module named 'setuptools'
```
```
tools/mkeficapsule.c:21:10: fatal error: 'gnutls/gnutls.h' file not found
```
```
./scripts/dtc-version.sh: line 18: which: command not found
```
This change fixes the errors by not compiling pylibfdt and mkeficapsule.
It also adds the missing `which` dependency.
Signed-off-by: Raul E Rangel <rrangel <AT> chromium.org>
Closes: https://github.com/gentoo/gentoo/pull/32268
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/disable-unused-mkeficapsule.patch | 14 ++++++++++++++
.../u-boot-tools/files/disable-unused-pylibfdt.patch | 17 +++++++++++++++++
...ls-2023.10.ebuild => u-boot-tools-2023.10-r1.ebuild} | 7 ++++++-
3 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/dev-embedded/u-boot-tools/files/disable-unused-mkeficapsule.patch b/dev-embedded/u-boot-tools/files/disable-unused-mkeficapsule.patch
new file mode 100644
index 000000000000..90c8ce3f0a4d
--- /dev/null
+++ b/dev-embedded/u-boot-tools/files/disable-unused-mkeficapsule.patch
@@ -0,0 +1,14 @@
+Disable unused mkeficapsule
+
+`CONFIG_TOOLS_MKEFICAPSULE` requires gnutls to build. Since we don't actually
+expose the tool, we can just disable it.
+
+diff -ur a/configs/tools-only_defconfig b/configs/tools-only_defconfig
+--- a/configs/tools-only_defconfig 2023-01-09 09:07:33.000000000 -0700
++++ b/configs/tools-only_defconfig 2023-08-11 14:01:50.151294889 -0600
+@@ -33,4 +33,4 @@
+ # CONFIG_VIRTIO_SANDBOX is not set
+ # CONFIG_GENERATE_ACPI_TABLE is not set
+ # CONFIG_EFI_LOADER is not set
+-CONFIG_TOOLS_MKEFICAPSULE=y
++# CONFIG_TOOLS_MKEFICAPSULE is not set
diff --git a/dev-embedded/u-boot-tools/files/disable-unused-pylibfdt.patch b/dev-embedded/u-boot-tools/files/disable-unused-pylibfdt.patch
new file mode 100644
index 000000000000..8686341a8776
--- /dev/null
+++ b/dev-embedded/u-boot-tools/files/disable-unused-pylibfdt.patch
@@ -0,0 +1,17 @@
+Disable unused pylibfdt
+
+The `imply BINMAN` causes `pylibfdt` to be built, which requires python. We
+don't currently expose `pylibfdt`, or declare python dependencies, so disable
+it.
+
+diff -ur a/arch/Kconfig b/arch/Kconfig
+--- a/arch/Kconfig 2023-01-09 09:07:33.000000000 -0700
++++ b/arch/Kconfig 2023-08-11 14:01:05.998403114 -0600
+@@ -205,7 +205,6 @@
+ imply KEYBOARD
+ imply PHYSMEM
+ imply GENERATE_ACPI_TABLE
+- imply BINMAN
+
+ config SH
+ bool "SuperH architecture"
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2023.10.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2023.10-r1.ebuild
similarity index 92%
rename from dev-embedded/u-boot-tools/u-boot-tools-2023.10.ebuild
rename to dev-embedded/u-boot-tools/u-boot-tools-2023.10-r1.ebuild
index 81a202294643..05e693d9e34a 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2023.10.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2023.10-r1.ebuild
@@ -19,12 +19,17 @@ IUSE="envtools"
RDEPEND="dev-libs/openssl:="
DEPEND="${RDEPEND}"
BDEPEND="
- dev-lang/swig
app-alternatives/yacc
app-alternatives/lex
+ sys-apps/which
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}/disable-unused-mkeficapsule.patch"
+ "${FILESDIR}/disable-unused-pylibfdt.patch"
+)
+
src_prepare() {
default
sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-19 7:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-16 23:15 [gentoo-commits] repo/gentoo:master commit in: dev-embedded/u-boot-tools/, dev-embedded/u-boot-tools/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2024-02-19 7:37 Sam James
2020-02-03 7:49 Sergei Trofimovich
2016-08-26 2:09 Tim Harder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox