All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/rtl8192eu: bump to 2022-12-29 version on branch 5.11.2.1
@ 2022-12-29 18:45 Giulio Benetti
  2023-02-22 20:56 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Giulio Benetti @ 2022-12-29 18:45 UTC (permalink / raw)
  To: buildroot; +Cc: James Hilliard, Giulio Benetti

Drop local patch since it's been merged[0].

[0]: https://github.com/clnhub/rtl8192eu-linux/pull/69

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
 ...e-due-to-redefition-of-local-sha256-.patch | 108 ------------------
 package/rtl8192eu/rtl8192eu.hash              |   2 +-
 package/rtl8192eu/rtl8192eu.mk                |   2 +-
 3 files changed, 2 insertions(+), 110 deletions(-)
 delete mode 100644 package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch

diff --git a/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch b/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch
deleted file mode 100644
index 52ef8c9005..0000000000
--- a/package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 1f968bd58656f200347bd398b34aa9f1b6393302 Mon Sep 17 00:00:00 2001
-From: Giulio Benetti <giulio.benetti@benettiengineering.com>
-Date: Wed, 28 Dec 2022 18:54:48 +0100
-Subject: [PATCH] Fix build failure due to redefition of local sha256 data
- types and functions
-
-Linux provides sha256_init() and 'struct sha256_state' in file
-include/crypto/sha2.h so this leads to a build failure due to redefinition.
-To avoid this let's prepend to all local exposed functions and data types
-rtl_. sha256_process() and sha256_done() are not required to be renamed but
-let's change them for consistency.
-
-[Upstream status: https://github.com/clnhub/rtl8192eu-linux/pull/69]
-Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
----
- core/crypto/sha256-internal.c | 16 ++++++++--------
- core/crypto/sha256_i.h        |  8 ++++----
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/core/crypto/sha256-internal.c b/core/crypto/sha256-internal.c
-index 4d61cb1..537bb2e 100644
---- a/core/crypto/sha256-internal.c
-+++ b/core/crypto/sha256-internal.c
-@@ -26,17 +26,17 @@
- int sha256_vector(size_t num_elem, const u8 *addr[], const size_t *len,
- 		  u8 *mac)
- {
--	struct sha256_state ctx;
-+	struct rtl_sha256_state ctx;
- 	size_t i;
- 
- 	if (TEST_FAIL())
- 		return -1;
- 
--	sha256_init(&ctx);
-+	rtl_sha256_init(&ctx);
- 	for (i = 0; i < num_elem; i++)
--		if (sha256_process(&ctx, addr[i], len[i]))
-+		if (rtl_sha256_process(&ctx, addr[i], len[i]))
- 			return -1;
--	if (sha256_done(&ctx, mac))
-+	if (rtl_sha256_done(&ctx, mac))
- 		return -1;
- 	return 0;
- }
-@@ -82,7 +82,7 @@ static const unsigned long K[64] = {
- #endif
- 
- /* compress 512-bits */
--static int sha256_compress(struct sha256_state *md, unsigned char *buf)
-+static int sha256_compress(struct rtl_sha256_state *md, unsigned char *buf)
- {
- 	u32 S[8], W[64], t0, t1;
- 	u32 t;
-@@ -125,7 +125,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf)
- 
- 
- /* Initialize the hash state */
--void sha256_init(struct sha256_state *md)
-+void rtl_sha256_init(struct rtl_sha256_state *md)
- {
- 	md->curlen = 0;
- 	md->length = 0;
-@@ -146,7 +146,7 @@ void sha256_init(struct sha256_state *md)
-    @param inlen  The length of the data (octets)
-    @return CRYPT_OK if successful
- */
--int sha256_process(struct sha256_state *md, const unsigned char *in,
-+int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in,
- 		   unsigned long inlen)
- {
- 	unsigned long n;
-@@ -186,7 +186,7 @@ int sha256_process(struct sha256_state *md, const unsigned char *in,
-    @param out [out] The destination of the hash (32 bytes)
-    @return CRYPT_OK if successful
- */
--int sha256_done(struct sha256_state *md, unsigned char *out)
-+int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out)
- {
- 	int i;
- 
-diff --git a/core/crypto/sha256_i.h b/core/crypto/sha256_i.h
-index a502d2b..93a8858 100644
---- a/core/crypto/sha256_i.h
-+++ b/core/crypto/sha256_i.h
-@@ -11,15 +11,15 @@
- 
- #define SHA256_BLOCK_SIZE 64
- 
--struct sha256_state {
-+struct rtl_sha256_state {
- 	u64 length;
- 	u32 state[8], curlen;
- 	u8 buf[SHA256_BLOCK_SIZE];
- };
- 
--void sha256_init(struct sha256_state *md);
--int sha256_process(struct sha256_state *md, const unsigned char *in,
-+void rtl_sha256_init(struct rtl_sha256_state *md);
-+int rtl_sha256_process(struct rtl_sha256_state *md, const unsigned char *in,
- 		   unsigned long inlen);
--int sha256_done(struct sha256_state *md, unsigned char *out);
-+int rtl_sha256_done(struct rtl_sha256_state *md, unsigned char *out);
- 
- #endif /* SHA256_I_H */
--- 
-2.34.1
-
diff --git a/package/rtl8192eu/rtl8192eu.hash b/package/rtl8192eu/rtl8192eu.hash
index 0cb9961345..2d6498f19d 100644
--- a/package/rtl8192eu/rtl8192eu.hash
+++ b/package/rtl8192eu/rtl8192eu.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  827e9592336744cbcfca5de988d8f4e14a62690302d3cabf72aa4bedebded2b7  rtl8192eu-94bce7798bbb18de6d8b1646dedb2511f24867d3.tar.gz
+sha256  72d1d97c6d2038885e5666f3271609b4dcbe45633c19a5606dc59745ff8ab543  rtl8192eu-865656c3a1d1aee8c4ba459ce7608756d17c712f.tar.gz
diff --git a/package/rtl8192eu/rtl8192eu.mk b/package/rtl8192eu/rtl8192eu.mk
index d967db90b8..da6fe42e99 100644
--- a/package/rtl8192eu/rtl8192eu.mk
+++ b/package/rtl8192eu/rtl8192eu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RTL8192EU_VERSION = 94bce7798bbb18de6d8b1646dedb2511f24867d3
+RTL8192EU_VERSION = 865656c3a1d1aee8c4ba459ce7608756d17c712f
 RTL8192EU_SITE = $(call github,clnhub,rtl8192eu-linux,$(RTL8192EU_VERSION))
 RTL8192EU_LICENSE = GPL-2.0
 
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH] package/rtl8192eu: bump to 2022-12-29 version on branch 5.11.2.1
  2022-12-29 18:45 [Buildroot] [PATCH] package/rtl8192eu: bump to 2022-12-29 version on branch 5.11.2.1 Giulio Benetti
@ 2023-02-22 20:56 ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2023-02-22 20:56 UTC (permalink / raw)
  To: Giulio Benetti; +Cc: James Hilliard, buildroot

On Thu, 29 Dec 2022 19:45:20 +0100
Giulio Benetti <giulio.benetti@benettiengineering.com> wrote:

> Drop local patch since it's been merged[0].
> 
> [0]: https://github.com/clnhub/rtl8192eu-linux/pull/69
> 
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> ---
>  ...e-due-to-redefition-of-local-sha256-.patch | 108 ------------------
>  package/rtl8192eu/rtl8192eu.hash              |   2 +-
>  package/rtl8192eu/rtl8192eu.mk                |   2 +-
>  3 files changed, 2 insertions(+), 110 deletions(-)
>  delete mode 100644 package/rtl8192eu/0001-Fix-build-failure-due-to-redefition-of-local-sha256-.patch

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-22 20:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-29 18:45 [Buildroot] [PATCH] package/rtl8192eu: bump to 2022-12-29 version on branch 5.11.2.1 Giulio Benetti
2023-02-22 20:56 ` Thomas Petazzoni via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.