mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
u_boot, bump version (#10296)
previously one marked as vulnerable at repology
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From c0f42ed759b403c785faf2b519f8d79ea6b0ad7e Mon Sep 17 00:00:00 2001
|
||||
From 9b3d75998e81fe9913656d40a6fbce99655d5b6a Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sun, 13 Mar 2022 13:09:45 +0100
|
||||
Subject: Fix build under Haiku
|
||||
@@ -21,7 +21,7 @@ index 900b261..0b7b3fa 100644
|
||||
/*
|
||||
* These aren't exported outside the kernel to avoid name space clashes
|
||||
diff --git a/include/u-boot/ecdsa.h b/include/u-boot/ecdsa.h
|
||||
index 6e0269e..c6bda3f 100644
|
||||
index 53490c6..ebaac65 100644
|
||||
--- a/include/u-boot/ecdsa.h
|
||||
+++ b/include/u-boot/ecdsa.h
|
||||
@@ -7,7 +7,7 @@
|
||||
@@ -30,14 +30,14 @@ index 6e0269e..c6bda3f 100644
|
||||
#include <errno.h>
|
||||
-#include <image.h>
|
||||
+#include "../include/image.h"
|
||||
#include <linux/kconfig.h>
|
||||
|
||||
/**
|
||||
* crypto_algo API impementation for ECDSA;
|
||||
diff --git a/lib/hash-checksum.c b/lib/hash-checksum.c
|
||||
index 8f2a42f..cf99255 100644
|
||||
index 1970a74..74ab1fe 100644
|
||||
--- a/lib/hash-checksum.c
|
||||
+++ b/lib/hash-checksum.c
|
||||
@@ -14,7 +14,7 @@
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "fdt_host.h"
|
||||
#endif
|
||||
#include <hash.h>
|
||||
@@ -47,7 +47,7 @@ index 8f2a42f..cf99255 100644
|
||||
int hash_calculate(const char *name,
|
||||
const struct image_region *region,
|
||||
diff --git a/tools/imagetool.h b/tools/imagetool.h
|
||||
index 5169b02..4ab9f29 100644
|
||||
index a766aa2..394d641 100644
|
||||
--- a/tools/imagetool.h
|
||||
+++ b/tools/imagetool.h
|
||||
@@ -21,7 +21,7 @@
|
||||
@@ -60,10 +60,10 @@ index 5169b02..4ab9f29 100644
|
||||
#include "fdt_host.h"
|
||||
|
||||
--
|
||||
2.30.2
|
||||
2.43.2
|
||||
|
||||
|
||||
From 30cee83e2807f1469a00376d751841b75e20e19c Mon Sep 17 00:00:00 2001
|
||||
From 75dce0bdd3b8ebfcb56424ba81973b8c488a77d6 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sun, 13 Mar 2022 15:04:42 +0100
|
||||
Subject: Quirk to ignore invalid video mode
|
||||
@@ -73,7 +73,7 @@ incorrect timings and a black screen. Just ignore that mode (with a
|
||||
pretty crude detection).
|
||||
|
||||
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
|
||||
index 5a21f7a..757cd74 100644
|
||||
index 8da44a1..a4935f9 100644
|
||||
--- a/drivers/video/sunxi/sunxi_display.c
|
||||
+++ b/drivers/video/sunxi/sunxi_display.c
|
||||
@@ -289,6 +289,9 @@ static int sunxi_hdmi_edid_get_mode(struct sunxi_display_priv *sunxi_display,
|
||||
@@ -87,5 +87,5 @@ index 5a21f7a..757cd74 100644
|
||||
if (r == 0)
|
||||
break;
|
||||
--
|
||||
2.30.2
|
||||
2.43.2
|
||||
|
||||
@@ -15,13 +15,13 @@ add new commands. Also, instead of permanently adding rarely used \
|
||||
code (for instance hardware test utilities) to the monitor, you can \
|
||||
load and run it dynamically."
|
||||
HOMEPAGE="https://www.denx.de/wiki/U-Boot"
|
||||
COPYRIGHT="2000-2022 Wolfgang Denk, DENX Software Engineering"
|
||||
COPYRIGHT="2000-2024 Wolfgang Denk, DENX Software Engineering"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://ftp.denx.de/pub/u-boot/u-boot-2022.04-rc3.tar.bz2"
|
||||
SOURCE_DIR="u-boot-2022.04-rc3"
|
||||
CHECKSUM_SHA256="4731da5228dc35827a9d9ebc8f541b01aa6af36c27be24e10aff06e596bee2de"
|
||||
PATCHES="u_boot-2022.04.rc3.patchset"
|
||||
SOURCE_URI="https://ftp.denx.de/pub/u-boot/u-boot-$portVersion.tar.bz2"
|
||||
SOURCE_DIR="u-boot-$portVersion"
|
||||
CHECKSUM_SHA256="18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a"
|
||||
PATCHES="u_boot-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="any"
|
||||
|
||||
@@ -42,7 +42,7 @@ fi
|
||||
BUILD_REQUIRES="
|
||||
haiku${hostArchSuffix}_devel
|
||||
devel:libssl$hostArchSuffix
|
||||
setuptools_python39
|
||||
setuptools_python310
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:arm_none_eabi_gcc
|
||||
Reference in New Issue
Block a user