u-boot-*: fix libfdt build errors
Signed-off-by: Oliver Smith <ollieparanoid@postmarketos.org> Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8685>
This commit is contained in:
Oliver Smith
The Friendly Meow (merge) Bot
parent
e7e8fcb2e3
commit
aeb5875bc7
17 changed files with 70 additions and 6 deletions
|
|
@ -0,0 +1,34 @@
|
|||
From c977b184350479b8c43a0e002eaf2b13b510ba4f Mon Sep 17 00:00:00 2001
|
||||
From: Michal Suchanek <msuchanek@suse.de>
|
||||
Date: Thu, 13 Oct 2022 22:39:51 +0200
|
||||
Subject: [PATCH] libfdt: Fix invalid version warning
|
||||
|
||||
python does not like the u-boot- prefix in the version, drop it.
|
||||
|
||||
/usr/lib/python3.10/site-packages/setuptools/dist.py:544: UserWarning:
|
||||
The version specified ('u-boot-2022.10') is an invalid version, this may
|
||||
not work as expected with newer versions of setuptools, pip, and PyPI.
|
||||
Please see PEP 440 for more details.
|
||||
|
||||
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
|
||||
Reviewed-by: Simon Glass <sjg@chromium.org>
|
||||
Link: https://github.com/u-boot/u-boot/commit/c977b184350479b8c43a0e002eaf2b13b510ba4f
|
||||
Note by ollieparanoid: this isn't just a warning anymore, but causes
|
||||
builds to fail with more recent python tooling.
|
||||
---
|
||||
scripts/dtc/pylibfdt/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/dtc/pylibfdt/Makefile b/scripts/dtc/pylibfdt/Makefile
|
||||
index 493995e30384..a7579f0c5f67 100644
|
||||
--- a/scripts/dtc/pylibfdt/Makefile
|
||||
+++ b/scripts/dtc/pylibfdt/Makefile
|
||||
@@ -17,7 +17,7 @@ quiet_cmd_pymod = PYMOD $@
|
||||
cmd_pymod = unset CROSS_COMPILE; unset CFLAGS; \
|
||||
CC="$(HOSTCC)" LDSHARED="$(HOSTCC) -shared " \
|
||||
LDFLAGS="$(HOSTLDFLAGS)" \
|
||||
- VERSION="u-boot-$(UBOOTVERSION)" \
|
||||
+ VERSION="$(UBOOTVERSION)" \
|
||||
CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \
|
||||
SOURCES="$(PYLIBFDT_srcs)" \
|
||||
SWIG_OPTS="-I$(LIBFDT_srcdir) -I$(LIBFDT_srcdir)/.." \
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../.shared-patches/u-boot/libfdt-fix-invalid-version.patch
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../.shared-patches/u-boot/libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
maintainer="Jacek Pruciak <pmos@juniorjpdj.pl>"
|
||||
pkgname=u-boot-goclever-gcta741l
|
||||
pkgver=2021.01
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="u-boot for GoClever Orion 70L"
|
||||
url="https://www.denx.de/wiki/U-Boot/"
|
||||
arch="armv7"
|
||||
|
|
@ -17,6 +17,8 @@ source="
|
|||
0002-dts-add-sun6i-a31s-goclever-gcta741l.patch
|
||||
0003-configs-add-goclever-gcta741l.patch
|
||||
0004-python-3.13-binman-migrate-from-pkg_resources-to-imp.patch
|
||||
0005-libfdt-fix-invalid-version.patch
|
||||
0006-libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
"
|
||||
builddir="$srcdir"/u-boot-${pkgver//_/-}
|
||||
|
||||
|
|
@ -40,4 +42,6 @@ sha512sums="
|
|||
26a3da78f3a0c3d6552334a83121aa318fa187b716e5a2b92a330a12c37c2a74aa319faa7e4c06be4918c4de6c28a5c8b909c39a5e3aa64b2960c7e2648799a2 0002-dts-add-sun6i-a31s-goclever-gcta741l.patch
|
||||
60bebb229e26e574b49f79470b0b6717a510eec69dd27835da0c6c9c10ccf1b8908fb4095f177a48b68bae1674187549bc5a9cbf26525b8242e4a82c94f1733d 0003-configs-add-goclever-gcta741l.patch
|
||||
c0545c6a1d17507f7e4bc337200fa3a4a1a89d62122cc6599ea00f27187b85f3e322d945683a84cdff98d981cf604187ded05d7b93bb5fae5a3fe7f9751077a2 0004-python-3.13-binman-migrate-from-pkg_resources-to-imp.patch
|
||||
fa49de52d61e619991b05ed679f13bef6054d8740164b006a252f346993a2b471b266daa4cf320364f3f4bddf3882c39190f1a6916de8b1a92ff09242368f7ba 0005-libfdt-fix-invalid-version.patch
|
||||
016ef30dbbb1021dad4f58eeda3f5a5e89ff3a76dbc69e8e4cf6a3fc3983aef998cfe1087abb4b21bb2f859bd5cffe26c1da42d13f1c3d2e3c053c399f38720b 0006-libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
"
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
../../.shared-patches/u-boot/libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../.shared-patches/u-boot/libfdt-fix-invalid-version.patch
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
maintainer="Jacek Pruciak <pmos@juniorjpdj.pl>"
|
||||
pkgname=u-boot-lark-freeme-70-2s
|
||||
pkgver=2021.01
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="u-boot for Lark FreeMe 70.2s"
|
||||
url="https://www.denx.de/wiki/U-Boot/"
|
||||
arch="armv7"
|
||||
|
|
@ -17,6 +17,8 @@ source="
|
|||
0002-dts-add-sun4i-a10-lark-freeme-70-2s.patch
|
||||
0003-configs-add-lark-freeme-70-2s.patch
|
||||
0004-python-3.13-binman-migrate-from-pkg_resources-to-imp.patch
|
||||
0005-libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
0006-libfdt-fix-invalid-version.patch
|
||||
"
|
||||
builddir="$srcdir"/u-boot-${pkgver//_/-}
|
||||
|
||||
|
|
@ -40,4 +42,6 @@ sha512sums="
|
|||
e1317ba266d8d615dfae41e6d57056b8cbb7a84df910b80f39b9b1e7737e0b1769943259ddd4637ded7412a18097a565b12b359313b566d85799ac28bf141c23 0002-dts-add-sun4i-a10-lark-freeme-70-2s.patch
|
||||
113ca6677fc6bf30f95b830f4da962a6acf7e64a7b7e0ffd76f5a3e1a861f7fdd68d8cecd61eda9b438612a9e165228eb061b9e7b2b02f38a41eedd831c83f37 0003-configs-add-lark-freeme-70-2s.patch
|
||||
c0545c6a1d17507f7e4bc337200fa3a4a1a89d62122cc6599ea00f27187b85f3e322d945683a84cdff98d981cf604187ded05d7b93bb5fae5a3fe7f9751077a2 0004-python-3.13-binman-migrate-from-pkg_resources-to-imp.patch
|
||||
016ef30dbbb1021dad4f58eeda3f5a5e89ff3a76dbc69e8e4cf6a3fc3983aef998cfe1087abb4b21bb2f859bd5cffe26c1da42d13f1c3d2e3c053c399f38720b 0005-libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
fa49de52d61e619991b05ed679f13bef6054d8740164b006a252f346993a2b471b266daa4cf320364f3f4bddf3882c39190f1a6916de8b1a92ff09242368f7ba 0006-libfdt-fix-invalid-version.patch
|
||||
"
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
../../.shared-patches/u-boot/libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
maintainer="Denis Burkov <hitechshell@mail.ru>"
|
||||
pkgname=u-boot-pocketbook-614-plus
|
||||
pkgver=2024.01
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="U-Boot bootloader for Pocketbook 614 Plus"
|
||||
url="https://source.denx.de/u-boot"
|
||||
arch="armv7"
|
||||
|
|
@ -24,6 +24,7 @@ source="
|
|||
0001-ARM-dts-allwinner-sun5i-a13-pocketbook-614-plus-Add-.patch
|
||||
0002-ARM-add-defconfig-for-PocketBook-614-Plus.patch
|
||||
0003-python-3.13-binman-migrate-from-pkg_resources-to-imp.patch
|
||||
0004-libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
"
|
||||
builddir="$srcdir/u-boot-v$pkgver"
|
||||
|
||||
|
|
@ -49,4 +50,5 @@ sha512sums="
|
|||
b1271dbb462c9cb6ea02baf3f954d0c09e7de1610086e7b95862538911465d0754b96a2e1be7048b5d3f6aeb314da5ef9eb290622cd6099266a8e3ba7e7609ca 0001-ARM-dts-allwinner-sun5i-a13-pocketbook-614-plus-Add-.patch
|
||||
3447a3614499a7ffcfdabb70b1c2d33945c1ace258d87ad2ab013ad2c5501fcd030c6f9902246bfc2c91892437fc7e230a663887954c877fe9d404bba943582a 0002-ARM-add-defconfig-for-PocketBook-614-Plus.patch
|
||||
c0545c6a1d17507f7e4bc337200fa3a4a1a89d62122cc6599ea00f27187b85f3e322d945683a84cdff98d981cf604187ded05d7b93bb5fae5a3fe7f9751077a2 0003-python-3.13-binman-migrate-from-pkg_resources-to-imp.patch
|
||||
016ef30dbbb1021dad4f58eeda3f5a5e89ff3a76dbc69e8e4cf6a3fc3983aef998cfe1087abb4b21bb2f859bd5cffe26c1da42d13f1c3d2e3c053c399f38720b 0004-libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
maintainer=""
|
||||
pkgname=u-boot-q8-a33-tablet
|
||||
pkgver=2023.01
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="U-Boot bootloader for the Q8 A33 Tablet"
|
||||
url="https://source.denx.de/u-boot"
|
||||
arch="armv7"
|
||||
|
|
@ -21,6 +21,7 @@ makedepends="$depends_dev
|
|||
options="!check"
|
||||
source="https://source.denx.de/u-boot/u-boot/-/archive/v$pkgver/u-boot-v$pkgver.tar.gz
|
||||
python-3.13-binman-migrate-from-pkg_resources-to-imp.patch
|
||||
libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
"
|
||||
builddir="$srcdir/u-boot-v$pkgver"
|
||||
|
||||
|
|
@ -44,4 +45,5 @@ package() {
|
|||
sha512sums="
|
||||
c25aae1b0d2f677d295587c6d318f23d52bc3a79e968bed9093645943a9840c56b1f6f44e5649d236e76e3dc85f0473c1da4a5205c02dcf437bca820acaf6fb8 u-boot-v2023.01.tar.gz
|
||||
c0545c6a1d17507f7e4bc337200fa3a4a1a89d62122cc6599ea00f27187b85f3e322d945683a84cdff98d981cf604187ded05d7b93bb5fae5a3fe7f9751077a2 python-3.13-binman-migrate-from-pkg_resources-to-imp.patch
|
||||
016ef30dbbb1021dad4f58eeda3f5a5e89ff3a76dbc69e8e4cf6a3fc3983aef998cfe1087abb4b21bb2f859bd5cffe26c1da42d13f1c3d2e3c053c399f38720b libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
"
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
../../.shared-patches/u-boot/libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
maintainer=""
|
||||
pkgname=u-boot-rock64
|
||||
pkgver=2021.07
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
pkgdesc="u-boot bootloader for the rk3328"
|
||||
url="https://gitlab.com/u-boot/u-boot"
|
||||
arch="aarch64"
|
||||
|
|
@ -25,6 +25,8 @@ source="
|
|||
kernel_comp-defaults.patch
|
||||
update-u-boot
|
||||
python-3.13-binman-migrate-from-pkg_resources-to-imp.patch
|
||||
libfdt-fix-invalid-version.patch
|
||||
libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
"
|
||||
builddir="$srcdir"/u-boot-${pkgver//_/-}
|
||||
|
||||
|
|
@ -52,4 +54,6 @@ sha512sums="
|
|||
c4f083120bc3cf60ca5178ddf39b6e5f83ff234ce31afc628112db43c2666e6644583f70f12921bd9021a27056c3fe85e785f0bbf352d4d5247cb562621676d2 kernel_comp-defaults.patch
|
||||
5ffa497122f3fd23b0b1c055229d650895fd03ca415ba6fb6df2ba848023d523fc14caaaf13d5409cc4b03e73cb92493eac1d8952738376c46395de827cad509 update-u-boot
|
||||
c0545c6a1d17507f7e4bc337200fa3a4a1a89d62122cc6599ea00f27187b85f3e322d945683a84cdff98d981cf604187ded05d7b93bb5fae5a3fe7f9751077a2 python-3.13-binman-migrate-from-pkg_resources-to-imp.patch
|
||||
fa49de52d61e619991b05ed679f13bef6054d8740164b006a252f346993a2b471b266daa4cf320364f3f4bddf3882c39190f1a6916de8b1a92ff09242368f7ba libfdt-fix-invalid-version.patch
|
||||
016ef30dbbb1021dad4f58eeda3f5a5e89ff3a76dbc69e8e4cf6a3fc3983aef998cfe1087abb4b21bb2f859bd5cffe26c1da42d13f1c3d2e3c053c399f38720b libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
"
|
||||
|
|
|
|||
1
device/testing/u-boot-rock64/libfdt-fix-invalid-version.patch
Symbolic link
1
device/testing/u-boot-rock64/libfdt-fix-invalid-version.patch
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
../../.shared-patches/u-boot/libfdt-fix-invalid-version.patch
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../.shared-patches/u-boot/libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
maintainer=""
|
||||
pkgname=u-boot-sourceparts-pocketpc
|
||||
pkgver=2021.1
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="U-Boot bootloader for the Sourceparts Pocket P.C."
|
||||
url="https://source.denx.de/u-boot"
|
||||
arch="aarch64"
|
||||
|
|
@ -14,6 +14,8 @@ _ref="49694d39d856c9ab537c4f2ff1d0167f4e21d19b"
|
|||
source="https://github.com/PopcornComputer/PocketPC-Uboot/archive/$_ref.tar.gz
|
||||
update-u-boot
|
||||
python-3.13-binman-migrate-from-pkg_resources-to-imp.patch
|
||||
libfdt-fix-invalid-version.patch
|
||||
libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
"
|
||||
builddir="$srcdir/PocketPC-Uboot-$_ref"
|
||||
install="$pkgname.post-upgrade"
|
||||
|
|
@ -51,4 +53,6 @@ sha512sums="
|
|||
39caa823655d38510d563b149265da1bba2e63efcd2ef5999a0a41a6b96775108c3ee86e6d9d6acc0fc11acb8dd66e534ec834c12fd8cd76057ca52c581557fe 49694d39d856c9ab537c4f2ff1d0167f4e21d19b.tar.gz
|
||||
d9ebf59e37a2d8435d5a31884fde554f175390d1ce23511da8d38ba368f6b812b45f1399a0fa49821c37ef573dfb4500e895fcc993bb247fae88f63b3bb7804f update-u-boot
|
||||
c0545c6a1d17507f7e4bc337200fa3a4a1a89d62122cc6599ea00f27187b85f3e322d945683a84cdff98d981cf604187ded05d7b93bb5fae5a3fe7f9751077a2 python-3.13-binman-migrate-from-pkg_resources-to-imp.patch
|
||||
fa49de52d61e619991b05ed679f13bef6054d8740164b006a252f346993a2b471b266daa4cf320364f3f4bddf3882c39190f1a6916de8b1a92ff09242368f7ba libfdt-fix-invalid-version.patch
|
||||
016ef30dbbb1021dad4f58eeda3f5a5e89ff3a76dbc69e8e4cf6a3fc3983aef998cfe1087abb4b21bb2f859bd5cffe26c1da42d13f1c3d2e3c053c399f38720b libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
"
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
../../.shared-patches/u-boot/libfdt-fix-invalid-version.patch
|
||||
|
|
@ -0,0 +1 @@
|
|||
../../.shared-patches/u-boot/libfdt.i_shipped-use-SWIG_AppendOutput.patch
|
||||
Loading…
Add table
Add a link
Reference in a new issue