mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-16 01:16:59 +02:00
Merge pull request #247 from aniruddha2000/aniruddha/update-dev-embedded-u-boot-tools-2021.04_rc2
dev-embedded/u-boot-tools: Update to 2021.04_rc2
This commit is contained in:
commit
40738a81e1
@ -1,3 +1 @@
|
||||
DIST u-boot-2019.10.tar.bz2 14214608 BLAKE2B 0dc89ebe207f836d2430d5111def9b4efa22839311d28cbfe4f0387a1b211850b0bf3cd67440b3cc32fb23aa8ece270c2438c44f5432f72474b4802ff117e803 SHA512 d8e98fca4b6af8d49d20ec09beab16b77863fcee88cda3605cc14435de21030bf3ca5e7cf7d06e42d4c0f75279c7295ecd628d2b77666eff7b7fd50374e051fd
|
||||
DIST u-boot-2020.01.tar.bz2 14716125 BLAKE2B a2860f74cd3b147d39ed55ba4745e0400e19889a772f21d4bb18be9bdca9b43c6542b2b750207421f87b155529ddb38ea52b2820b46fdbd76232cdd6c13085cd SHA512 073d4e0234095c1bda1ffa7a648972aa4530d106ee1a73035e0501b1aba2951653582c8b7bcf338d4e95012fa67e75f97b7e1fbac5cc764d609b671ef29617f7
|
||||
DIST u-boot-2020.04.tar.bz2 15065656 BLAKE2B 29cf8be6027ce46e3bf3fae9b6736e6aba46dba2904112f845d79f50b52b7c7ff3437c71dac6ab22d112347467fb5baaa3ec421cb842ba3ae9b547e4f8378d03 SHA512 e04fe54883149123730605b084324ac0d1d72ce6913467bbe587a5a2675bcf7bb393405d9a446dc0c64ba42abc1e862ae5a132e9e51aa7390e2e9fce045af8d8
|
||||
DIST u-boot-2021.04-rc2.tar.bz2 16620315 BLAKE2B e16c167346ef3999443855b9a702bf28faacf51b7887c84096f7a372a0c820d6ed9f06c1dd209b4070adf8000853b58b7b9b81c5b32a973d37558acf1da2edfa SHA512 7bf07f15e0c5f5e63ef8cb9568278ea7c209e484bbb599c47b22a8d2e5c007cc204eec365e5328dea3e7b016cd6ba0cb4c917330cc76163b1016f7c7762ad1bf
|
||||
|
@ -1,19 +0,0 @@
|
||||
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;
|
@ -1,11 +0,0 @@
|
||||
--- 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() */
|
@ -1,60 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
MY_P="u-boot-${PV/_/-}"
|
||||
DESCRIPTION="utilities for working with Das U-Boot"
|
||||
HOMEPAGE="https://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 ~ppc64 x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
sys-devel/flex
|
||||
sys-devel/bison
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
PATCHES=("${FILESDIR}"/${P}-musl-ulong.patch)
|
||||
|
||||
src_compile() {
|
||||
# Unset a few KBUILD variables. Bug #540476
|
||||
unset KBUILD_OUTPUT KBUILD_SRC
|
||||
|
||||
emake \
|
||||
V=1 \
|
||||
HOSTCC="$(tc-getCC)" \
|
||||
HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
|
||||
HOSTLDFLAGS="${LDFLAGS}" \
|
||||
tools-only_defconfig
|
||||
|
||||
emake \
|
||||
V=1 \
|
||||
NO_SDL=1 \
|
||||
HOSTSTRIP=: \
|
||||
STRIP=: \
|
||||
HOSTCC="$(tc-getCC)" \
|
||||
HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
|
||||
HOSTLDFLAGS="${LDFLAGS}" \
|
||||
CONFIG_ENV_OVERWRITE=y \
|
||||
tools-all
|
||||
}
|
||||
|
||||
src_test() { :; }
|
||||
|
||||
src_install() {
|
||||
cd tools || die
|
||||
dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
|
||||
dobin env/fw_printenv
|
||||
dosym fw_printenv /usr/bin/fw_setenv
|
||||
insinto /etc
|
||||
doins env/fw_env.config
|
||||
doman "${S}"/doc/mkimage.1
|
||||
}
|
@ -1,62 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
MY_P="u-boot-${PV/_/-}"
|
||||
DESCRIPTION="utilities for working with Das U-Boot"
|
||||
HOMEPAGE="https://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 ~ppc64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
sys-devel/flex
|
||||
sys-devel/bison
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-gcc-10.patch
|
||||
)
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_compile() {
|
||||
# Unset a few KBUILD variables. Bug #540476
|
||||
unset KBUILD_OUTPUT KBUILD_SRC
|
||||
|
||||
emake \
|
||||
V=1 \
|
||||
HOSTCC="$(tc-getCC)" \
|
||||
HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
|
||||
HOSTLDFLAGS="${LDFLAGS}" \
|
||||
tools-only_defconfig
|
||||
|
||||
emake \
|
||||
V=1 \
|
||||
NO_SDL=1 \
|
||||
HOSTSTRIP=: \
|
||||
STRIP=: \
|
||||
HOSTCC="$(tc-getCC)" \
|
||||
HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
|
||||
HOSTLDFLAGS="${LDFLAGS}" \
|
||||
CONFIG_ENV_OVERWRITE=y \
|
||||
tools-all
|
||||
}
|
||||
|
||||
src_test() { :; }
|
||||
|
||||
src_install() {
|
||||
cd tools || die
|
||||
dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
|
||||
dobin env/fw_printenv
|
||||
dosym fw_printenv /usr/bin/fw_setenv
|
||||
insinto /etc
|
||||
doins env/fw_env.config
|
||||
doman "${S}"/doc/mkimage.1
|
||||
}
|
@ -1,72 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
MY_P="u-boot-${PV/_/-}"
|
||||
DESCRIPTION="utilities for working with Das U-Boot"
|
||||
HOMEPAGE="https://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 ~ppc64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
BDEPEND="
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
|
||||
scripts/kconfig/lxdialog/check-lxdialog.sh \
|
||||
scripts/kconfig/Makefile \
|
||||
tools/Makefile || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC PKG_CONFIG
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Unset a few KBUILD variables. Bug #540476
|
||||
unset KBUILD_OUTPUT KBUILD_SRC
|
||||
|
||||
emake \
|
||||
V=1 \
|
||||
CC="${CC}" \
|
||||
HOSTCC="${CC}" \
|
||||
HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
|
||||
HOSTLDFLAGS="${LDFLAGS}" \
|
||||
tools-only_defconfig
|
||||
|
||||
emake \
|
||||
V=1 \
|
||||
NO_SDL=1 \
|
||||
HOSTSTRIP=: \
|
||||
STRIP=: \
|
||||
CC="${CC}" \
|
||||
HOSTCC="${CC}" \
|
||||
HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
|
||||
HOSTLDFLAGS="${LDFLAGS}" \
|
||||
CONFIG_ENV_OVERWRITE=y \
|
||||
tools-all
|
||||
}
|
||||
|
||||
src_test() { :; }
|
||||
|
||||
src_install() {
|
||||
cd tools || die
|
||||
dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
|
||||
dobin env/fw_printenv
|
||||
dosym fw_printenv /usr/bin/fw_setenv
|
||||
insinto /etc
|
||||
doins env/fw_env.config
|
||||
doman "${S}"/doc/mkimage.1
|
||||
}
|
@ -1,58 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
MY_P="u-boot-${PV/_/-}"
|
||||
DESCRIPTION="utilities for working with Das U-Boot"
|
||||
HOMEPAGE="https://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 ~ppc64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
sys-devel/flex
|
||||
sys-devel/bison
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_compile() {
|
||||
# Unset a few KBUILD variables. Bug #540476
|
||||
unset KBUILD_OUTPUT KBUILD_SRC
|
||||
|
||||
emake \
|
||||
V=1 \
|
||||
HOSTCC="$(tc-getCC)" \
|
||||
HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
|
||||
HOSTLDFLAGS="${LDFLAGS}" \
|
||||
tools-only_defconfig
|
||||
|
||||
emake \
|
||||
V=1 \
|
||||
NO_SDL=1 \
|
||||
HOSTSTRIP=: \
|
||||
STRIP=: \
|
||||
HOSTCC="$(tc-getCC)" \
|
||||
HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)' \
|
||||
HOSTLDFLAGS="${LDFLAGS}" \
|
||||
CONFIG_ENV_OVERWRITE=y \
|
||||
tools-all
|
||||
}
|
||||
|
||||
src_test() { :; }
|
||||
|
||||
src_install() {
|
||||
cd tools || die
|
||||
dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
|
||||
dobin env/fw_printenv
|
||||
dosym fw_printenv /usr/bin/fw_setenv
|
||||
insinto /etc
|
||||
doins env/fw_env.config
|
||||
doman "${S}"/doc/mkimage.1
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
@ -12,12 +12,15 @@ SRC_URI="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
|
||||
KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="dev-libs/openssl:0="
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
@ -25,7 +28,7 @@ S=${WORKDIR}/${MY_P}
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
|
||||
scripts/kconfig/lxdialog/check-lxdialog.sh \
|
||||
scripts/kconfig/{g,m,n,q}conf-cfg.sh \
|
||||
scripts/kconfig/Makefile \
|
||||
tools/Makefile || die
|
||||
}
|
Loading…
Reference in New Issue
Block a user