* [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 @ 2020-09-13 0:16 Christian Stewart 2020-09-13 0:16 ` [Buildroot] [PATCH v1 2/5] package/docker-containerd: bump to version 1.4.0 Christian Stewart ` (6 more replies) 0 siblings, 7 replies; 16+ messages in thread From: Christian Stewart @ 2020-09-13 0:16 UTC (permalink / raw) To: buildroot Signed-off-by: Christian Stewart <christian@paral.in> --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index b895f6fccb..d792947d5f 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6b44985023347fb9c5a2cc6f761df8c41cc2c84a7a68a6e6acf834dff6653a9a runc-1.0.0-rc10.tar.gz +sha256 28378df983a3c586ed3ec8c76a774a9b10f36a0c323590a284b801cce95cc61f runc-1.0.0-rc92.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index aedfb5ef9e..3d177d23d5 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.0.0-rc10 +RUNC_VERSION = 1.0.0-rc92 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0 RUNC_LICENSE_FILES = LICENSE -- 2.28.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v1 2/5] package/docker-containerd: bump to version 1.4.0 2020-09-13 0:16 [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 Christian Stewart @ 2020-09-13 0:16 ` Christian Stewart 2020-09-15 18:52 ` Peter Korsgaard 2020-09-13 0:16 ` [Buildroot] [PATCH v1 3/5] package/docker-cli: bump to version 19.03.12 Christian Stewart ` (5 subsequent siblings) 6 siblings, 1 reply; 16+ messages in thread From: Christian Stewart @ 2020-09-13 0:16 UTC (permalink / raw) To: buildroot Signed-off-by: Christian Stewart <christian@paral.in> --- package/docker-containerd/docker-containerd.hash | 4 ++-- package/docker-containerd/docker-containerd.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash index 95288be58b..4b32d62649 100644 --- a/package/docker-containerd/docker-containerd.hash +++ b/package/docker-containerd/docker-containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 0811057ab67b78ce911416e793edaeb14b3f1e105d67b8e67b6302e0eab572e4 docker-containerd-1.2.13.tar.gz -sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE +sha256 d6284c69e1933e4c05fe285feebef461efe8cd2030634dcf1cbdcde46abe86be docker-containerd-1.4.0.tar.gz +sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk index 904fa424b8..67060e3ff6 100644 --- a/package/docker-containerd/docker-containerd.mk +++ b/package/docker-containerd/docker-containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CONTAINERD_VERSION = 1.2.13 +DOCKER_CONTAINERD_VERSION = 1.4.0 DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION)) DOCKER_CONTAINERD_LICENSE = Apache-2.0 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE -- 2.28.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v1 2/5] package/docker-containerd: bump to version 1.4.0 2020-09-13 0:16 ` [Buildroot] [PATCH v1 2/5] package/docker-containerd: bump to version 1.4.0 Christian Stewart @ 2020-09-15 18:52 ` Peter Korsgaard 2020-09-15 21:15 ` Christian Stewart 0 siblings, 1 reply; 16+ messages in thread From: Peter Korsgaard @ 2020-09-15 18:52 UTC (permalink / raw) To: buildroot >>>>> "Christian" == Christian Stewart <christian@paral.in> writes: > Signed-off-by: Christian Stewart <christian@paral.in> Is this a dependency for the docker-cli / docker-engine bumps? From the looks of it, it isn't? -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v1 2/5] package/docker-containerd: bump to version 1.4.0 2020-09-15 18:52 ` Peter Korsgaard @ 2020-09-15 21:15 ` Christian Stewart 2020-09-15 21:30 ` Peter Korsgaard 0 siblings, 1 reply; 16+ messages in thread From: Christian Stewart @ 2020-09-15 21:15 UTC (permalink / raw) To: buildroot Hi Peter, On Tue, Sep 15, 2020, 11:52 AM Peter Korsgaard <peter@korsgaard.com> wrote: > >>>>> "Christian" == Christian Stewart <christian@paral.in> writes: > > > Signed-off-by: Christian Stewart <christian@paral.in> > > Is this a dependency for the docker-cli / docker-engine bumps? From the > looks of it, it isn't? > It's not necessarily a dependency but I cannot understand why you would chose to not update it at the same time. Best, Christian -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200915/381fd688/attachment.html> ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v1 2/5] package/docker-containerd: bump to version 1.4.0 2020-09-15 21:15 ` Christian Stewart @ 2020-09-15 21:30 ` Peter Korsgaard 0 siblings, 0 replies; 16+ messages in thread From: Peter Korsgaard @ 2020-09-15 21:30 UTC (permalink / raw) To: buildroot >>>>> "Christian" == Christian Stewart <christian@paral.in> writes: > Hi Peter, > On Tue, Sep 15, 2020, 11:52 AM Peter Korsgaard <peter@korsgaard.com> wrote: >> >>>>> "Christian" == Christian Stewart <christian@paral.in> writes: >> >> > Signed-off-by: Christian Stewart <christian@paral.in> >> >> Is this a dependency for the docker-cli / docker-engine bumps? From the >> looks of it, it isn't? >> > It's not necessarily a dependency but I cannot understand why you would > chose to not update it at the same time. Ehh, containerd 1.2.x -> 1.4.0 brings quite a lot of changes and new code: https://github.com/containerd/containerd/releases/tag/v1.4.0 So this is normally not something we do for the stable branches. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v1 3/5] package/docker-cli: bump to version 19.03.12 2020-09-13 0:16 [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 Christian Stewart 2020-09-13 0:16 ` [Buildroot] [PATCH v1 2/5] package/docker-containerd: bump to version 1.4.0 Christian Stewart @ 2020-09-13 0:16 ` Christian Stewart 2020-09-15 18:52 ` Peter Korsgaard 2020-09-13 0:16 ` [Buildroot] [PATCH v1 4/5] package/docker-engine: " Christian Stewart ` (4 subsequent siblings) 6 siblings, 1 reply; 16+ messages in thread From: Christian Stewart @ 2020-09-13 0:16 UTC (permalink / raw) To: buildroot Signed-off-by: Christian Stewart <christian@paral.in> --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 8868a60e38..8f9e69e593 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a5b1d6c5766f77896273e864a448a7f0ea4055bb52f50f884f14ad6ef0d5fdb4 docker-cli-19.03.11.tar.gz +sha256 00801d6b7e9777cf2cf54255ca5afb7b58b3d35c14bb0f60bb9f07d031883223 docker-cli-19.03.12.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 577e92c502..e17f3186ba 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 19.03.11 +DOCKER_CLI_VERSION = 19.03.12 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 -- 2.28.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v1 3/5] package/docker-cli: bump to version 19.03.12 2020-09-13 0:16 ` [Buildroot] [PATCH v1 3/5] package/docker-cli: bump to version 19.03.12 Christian Stewart @ 2020-09-15 18:52 ` Peter Korsgaard 0 siblings, 0 replies; 16+ messages in thread From: Peter Korsgaard @ 2020-09-15 18:52 UTC (permalink / raw) To: buildroot >>>>> "Christian" == Christian Stewart <christian@paral.in> writes: > Signed-off-by: Christian Stewart <christian@paral.in> Committed to 2020.02.x, 2020.05.x and 2020.08.x, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v1 4/5] package/docker-engine: bump to version 19.03.12 2020-09-13 0:16 [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 Christian Stewart 2020-09-13 0:16 ` [Buildroot] [PATCH v1 2/5] package/docker-containerd: bump to version 1.4.0 Christian Stewart 2020-09-13 0:16 ` [Buildroot] [PATCH v1 3/5] package/docker-cli: bump to version 19.03.12 Christian Stewart @ 2020-09-13 0:16 ` Christian Stewart 2020-09-15 18:53 ` Peter Korsgaard 2020-09-13 0:16 ` [Buildroot] [PATCH v1 5/5] package/docker-proxy: bump to latest commit hash 6d6f28 Christian Stewart ` (3 subsequent siblings) 6 siblings, 1 reply; 16+ messages in thread From: Christian Stewart @ 2020-09-13 0:16 UTC (permalink / raw) To: buildroot Signed-off-by: Christian Stewart <christian@paral.in> --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 99159f9376..3283e4eb48 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5ff62d7b3638a275b2c459e53a4d1a7a8fb03dde8305defcd55e05e059e5618d docker-engine-19.03.11.tar.gz +sha256 858e4e74ee0097bcbdb71d737e268dfcfd1970efa4a1600354253b02fd403e39 docker-engine-19.03.12.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 2119a883bc..2d92570b94 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 19.03.11 +DOCKER_ENGINE_VERSION = 19.03.12 DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 -- 2.28.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v1 4/5] package/docker-engine: bump to version 19.03.12 2020-09-13 0:16 ` [Buildroot] [PATCH v1 4/5] package/docker-engine: " Christian Stewart @ 2020-09-15 18:53 ` Peter Korsgaard 0 siblings, 0 replies; 16+ messages in thread From: Peter Korsgaard @ 2020-09-15 18:53 UTC (permalink / raw) To: buildroot >>>>> "Christian" == Christian Stewart <christian@paral.in> writes: > Signed-off-by: Christian Stewart <christian@paral.in> Committed to 2020.02.x, 2020.05.x and 2020.08.x, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v1 5/5] package/docker-proxy: bump to latest commit hash 6d6f28 2020-09-13 0:16 [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 Christian Stewart ` (2 preceding siblings ...) 2020-09-13 0:16 ` [Buildroot] [PATCH v1 4/5] package/docker-engine: " Christian Stewart @ 2020-09-13 0:16 ` Christian Stewart 2020-09-14 6:41 ` Thomas Petazzoni 2020-09-13 0:16 ` [Buildroot] [PATCH v2 1/1] package/rtl8821au: fix build against 5.8.x kernel Christian Stewart ` (2 subsequent siblings) 6 siblings, 1 reply; 16+ messages in thread From: Christian Stewart @ 2020-09-13 0:16 UTC (permalink / raw) To: buildroot docker network library has not published a release, take the latest master branch commit hash. Signed-off-by: Christian Stewart <christian@paral.in> --- package/docker-proxy/docker-proxy.hash | 4 ++-- package/docker-proxy/docker-proxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/docker-proxy/docker-proxy.hash b/package/docker-proxy/docker-proxy.hash index 4fa9541bed..9f63fa2834 100644 --- a/package/docker-proxy/docker-proxy.hash +++ b/package/docker-proxy/docker-proxy.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 0fffcd438b9a87a7ff8315364ff4631d2241ac0cf9f9f83871aeafcb2a383fd1 docker-proxy-feeff4f0a3fd2a2bb19cf67c826082c66ffaaed9.tar.gz -sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE +sha256 c68d09e47dc1dbe27c93e121959be5f0c6cfe47940efe81e3465cb438e9ef625 docker-proxy-6d6f28a1b61b6dd0ad562277d19592125428ed4e.tar.gz +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 LICENSE diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk index bd8a3d0f17..392e5f1b59 100644 --- a/package/docker-proxy/docker-proxy.mk +++ b/package/docker-proxy/docker-proxy.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_PROXY_VERSION = feeff4f0a3fd2a2bb19cf67c826082c66ffaaed9 +DOCKER_PROXY_VERSION = 6d6f28a1b61b6dd0ad562277d19592125428ed4e DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION)) DOCKER_PROXY_LICENSE = Apache-2.0 -- 2.28.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v1 5/5] package/docker-proxy: bump to latest commit hash 6d6f28 2020-09-13 0:16 ` [Buildroot] [PATCH v1 5/5] package/docker-proxy: bump to latest commit hash 6d6f28 Christian Stewart @ 2020-09-14 6:41 ` Thomas Petazzoni 2020-09-14 11:56 ` Christian Stewart 0 siblings, 1 reply; 16+ messages in thread From: Thomas Petazzoni @ 2020-09-14 6:41 UTC (permalink / raw) To: buildroot Hello Christian, On Sat, 12 Sep 2020 17:16:58 -0700 Christian Stewart <christian@paral.in> wrote: > docker network library has not published a release, take the latest master > branch commit hash. > > Signed-off-by: Christian Stewart <christian@paral.in> I have not applied this patch, because it doesn't apply to master. Your "previous" version of docker-proxy doesn't match the one we have in master. Of course, I could have fixed up the trivial conflict myself, but rather than blindly doing that I wanted to make sure we haven't missed something. Could you double check this? Thanks ! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v1 5/5] package/docker-proxy: bump to latest commit hash 6d6f28 2020-09-14 6:41 ` Thomas Petazzoni @ 2020-09-14 11:56 ` Christian Stewart 0 siblings, 0 replies; 16+ messages in thread From: Christian Stewart @ 2020-09-14 11:56 UTC (permalink / raw) To: buildroot Hi Thomas, We are bumping to latest, the previous doesn't matter. On Sun, Sep 13, 2020, 11:41 PM Thomas Petazzoni < thomas.petazzoni@bootlin.com> wrote: > I have not applied this patch, because it doesn't apply to master. Your > "previous" version of docker-proxy doesn't match the one we have in > master. Of course, I could have fixed up the trivial conflict myself, > but rather than blindly doing that I wanted to make sure we haven't > missed something. > I'll submit another revision of this patch if needed. Best, Christian -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200914/fdc8c5be/attachment.html> ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v2 1/1] package/rtl8821au: fix build against 5.8.x kernel 2020-09-13 0:16 [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 Christian Stewart ` (3 preceding siblings ...) 2020-09-13 0:16 ` [Buildroot] [PATCH v1 5/5] package/docker-proxy: bump to latest commit hash 6d6f28 Christian Stewart @ 2020-09-13 0:16 ` Christian Stewart 2020-09-19 19:49 ` Thomas Petazzoni 2020-09-14 6:40 ` [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 Thomas Petazzoni 2020-09-15 18:48 ` Peter Korsgaard 6 siblings, 1 reply; 16+ messages in thread From: Christian Stewart @ 2020-09-13 0:16 UTC (permalink / raw) To: buildroot Signed-off-by: Christian Stewart <christian@paral.in> --- v1 -> v2: - added patch by @lwfinger to disable rtw_mgmt_frame_register - wrote patch for change to proc_ops in 5.6.x from file_operations Signed-off-by: Christian Stewart <christian@paral.in> --- ...ate-to-rtl_sha256_state-to-avoid-nam.patch | 79 +++++++++++++ ..._mgmt_frame_register-on-kernel-5.8.0.patch | 47 ++++++++ ...-file_operations-to-proc_ops-for-5.6.patch | 109 ++++++++++++++++++ 3 files changed, 235 insertions(+) create mode 100644 package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch create mode 100644 package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch create mode 100644 package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch diff --git a/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch b/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch new file mode 100644 index 0000000000..41cee2b247 --- /dev/null +++ b/package/rtl8821au/0004-rename-sha256_state-to-rtl_sha256_state-to-avoid-nam.patch @@ -0,0 +1,79 @@ +From 19aee91e45788d594615a9be58fa5d0879ec816a Mon Sep 17 00:00:00 2001 +From: youcai <omegacoleman@gmail.com> +Date: Tue, 18 Aug 2020 00:43:16 +0800 +Subject: [PATCH] rename sha256_state to rtl_sha256_state to avoid name + conflict with crypto + +[Upstream: https://github.com/abperiasamy/rtl8812AU_8821AU_linux/pull/338/commits/af6f6c1578f16145478326a939bb7593bbcdb4e7.patch] +Signed-off-by: Coleman <omegacoleman@gmail.com> +Signed-off-by: Christian Stewart <christian@paral.in> +--- + core/rtw_security.c | 10 +++++----- + include/rtw_security.h | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/core/rtw_security.c b/core/rtw_security.c +index d54e6af..de2d91f 100644 +--- a/core/rtw_security.c ++++ b/core/rtw_security.c +@@ -2200,7 +2200,7 @@ BIP_exit: + + #ifndef PLATFORM_FREEBSD + /* 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; +@@ -2249,7 +2249,7 @@ static int sha256_compress(struct sha256_state *md, unsigned char *buf) + } + + /* Initialize the hash state */ +-static void sha256_init(struct sha256_state *md) ++static void sha256_init(struct rtl_sha256_state *md) + { + md->curlen = 0; + md->length = 0; +@@ -2270,7 +2270,7 @@ static void sha256_init(struct sha256_state *md) + @param inlen The length of the data (octets) + @return CRYPT_OK if successful + */ +-static int sha256_process(struct sha256_state *md, unsigned char *in, ++static int sha256_process(struct rtl_sha256_state *md, unsigned char *in, + unsigned long inlen) + { + unsigned long n; +@@ -2311,7 +2311,7 @@ static int sha256_process(struct sha256_state *md, unsigned char *in, + @param out [out] The destination of the hash (32 bytes) + @return CRYPT_OK if successful + */ +-static int sha256_done(struct sha256_state *md, unsigned char *out) ++static int sha256_done(struct rtl_sha256_state *md, unsigned char *out) + { + int i; + +@@ -2363,7 +2363,7 @@ static int sha256_done(struct sha256_state *md, unsigned char *out) + static int sha256_vector(size_t num_elem, u8 *addr[], size_t *len, + u8 *mac) + { +- struct sha256_state ctx; ++ struct rtl_sha256_state ctx; + size_t i; + + sha256_init(&ctx); +diff --git a/include/rtw_security.h b/include/rtw_security.h +index d41014e..98feb69 100644 +--- a/include/rtw_security.h ++++ b/include/rtw_security.h +@@ -233,7 +233,7 @@ struct security_priv { + #endif /* DBG_SW_SEC_CNT */ + }; + +-struct sha256_state { ++struct rtl_sha256_state { + u64 length; + u32 state[8], curlen; + u8 buf[64]; +-- +2.28.0 + diff --git a/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch b/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch new file mode 100644 index 0000000000..6d09153b82 --- /dev/null +++ b/package/rtl8821au/0005-disable-rtw_mgmt_frame_register-on-kernel-5.8.0.patch @@ -0,0 +1,47 @@ +From 9421b0763e5f20babb2c0fd437979a71fbac1739 Mon Sep 17 00:00:00 2001 +From: Christian Stewart <christian@paral.in> +Date: Tue, 8 Sep 2020 22:46:45 -0700 +Subject: [PATCH] disable rtw_mgmt_frame_register on kernel 5.8.0 + +rtl8812au: fix build for kernel 5.8 + +[Source: https://github.com/lwfinger/rtl8812au/commit/ec1591b90dd323185717fa42887f96444cca5921.patch] +Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> +Signed-off-by: Christian Stewart <christian@paral.in> +--- + os_dep/linux/ioctl_cfg80211.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c +index 019daf9..13238cb 100644 +--- a/os_dep/linux/ioctl_cfg80211.c ++++ b/os_dep/linux/ioctl_cfg80211.c +@@ -5177,6 +5177,7 @@ exit: + return ret; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) + struct wireless_dev *wdev, +@@ -5205,6 +5206,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, + exit: + return; + } ++#endif + + #if defined(CONFIG_TDLS) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) + static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy, +@@ -6021,7 +6023,9 @@ static struct cfg80211_ops rtw_cfg80211_ops = { + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) + .mgmt_tx = cfg80211_rtw_mgmt_tx, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0) + .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, ++#endif + #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,34) && LINUX_VERSION_CODE<=KERNEL_VERSION(2,6,35)) + .action = cfg80211_rtw_mgmt_tx, + #endif +-- +2.28.0 + diff --git a/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch b/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch new file mode 100644 index 0000000000..607d00d604 --- /dev/null +++ b/package/rtl8821au/0006-rtw_proc-convert-file_operations-to-proc_ops-for-5.6.patch @@ -0,0 +1,109 @@ +From d3bd26812728c9ac2249ea29bda674dd31034ac6 Mon Sep 17 00:00:00 2001 +From: Christian Stewart <christian@paral.in> +Date: Tue, 8 Sep 2020 23:08:39 -0700 +Subject: [PATCH] rtw_proc: convert file_operations to proc_ops for 5.6.x + compat + +Signed-off-by: Christian Stewart <christian@paral.in> +--- + os_dep/linux/rtw_proc.c | 40 ++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 38 insertions(+), 2 deletions(-) + +diff --git a/os_dep/linux/rtw_proc.c b/os_dep/linux/rtw_proc.c +index 048080a..d944649 100644 +--- a/os_dep/linux/rtw_proc.c ++++ b/os_dep/linux/rtw_proc.c +@@ -65,9 +65,15 @@ inline struct proc_dir_entry *rtw_proc_create_dir(const char *name, struct proc_ + } + + inline struct proc_dir_entry *rtw_proc_create_entry(const char *name, struct proc_dir_entry *parent, +- const struct file_operations *fops, void * data) ++ #if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) ++ const struct file_operations *fops, ++ #else ++ const struct proc_ops *fops, ++ #endif ++ void * data ++ ) + { +- struct proc_dir_entry *entry; ++ struct proc_dir_entry *entry; + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)) + entry = proc_create_data(name, S_IFREG|S_IRUGO|S_IWUGO, parent, fops, data); +@@ -167,6 +173,7 @@ static ssize_t rtw_drv_proc_write(struct file *file, const char __user *buffer, + return -EROFS; + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) + static const struct file_operations rtw_drv_proc_fops = { + .owner = THIS_MODULE, + .open = rtw_drv_proc_open, +@@ -174,7 +181,16 @@ static const struct file_operations rtw_drv_proc_fops = { + .llseek = seq_lseek, + .release = single_release, + .write = rtw_drv_proc_write, ++} ++#else ++static const struct proc_ops rtw_drv_proc_fops = { ++ .proc_open = rtw_drv_proc_open, ++ .proc_read = seq_read, ++ .proc_lseek = seq_lseek, ++ .proc_release = seq_release, ++ .proc_write = rtw_drv_proc_write, + }; ++#endif + + int rtw_drv_proc_init(void) + { +@@ -776,6 +792,7 @@ static ssize_t rtw_adapter_proc_write(struct file *file, const char __user *buff + return -EROFS; + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) + static const struct file_operations rtw_adapter_proc_fops = { + .owner = THIS_MODULE, + .open = rtw_adapter_proc_open, +@@ -784,6 +801,15 @@ static const struct file_operations rtw_adapter_proc_fops = { + .release = single_release, + .write = rtw_adapter_proc_write, + }; ++#else ++static const struct proc_ops rtw_adapter_proc_fops = { ++ .proc_open = rtw_adapter_proc_open, ++ .proc_read = seq_read, ++ .proc_lseek = seq_lseek, ++ .proc_release = single_release, ++ .proc_write = rtw_adapter_proc_write, ++}; ++#endif + + int proc_get_odm_dbg_comp(struct seq_file *m, void *v) + { +@@ -1030,6 +1056,7 @@ static ssize_t rtw_odm_proc_write(struct file *file, const char __user *buffer, + return -EROFS; + } + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)) + static const struct file_operations rtw_odm_proc_fops = { + .owner = THIS_MODULE, + .open = rtw_odm_proc_open, +@@ -1038,6 +1065,15 @@ static const struct file_operations rtw_odm_proc_fops = { + .release = single_release, + .write = rtw_odm_proc_write, + }; ++#else ++static const struct proc_ops rtw_odm_proc_fops = { ++ .proc_open = rtw_odm_proc_open, ++ .proc_read = seq_read, ++ .proc_lseek = seq_lseek, ++ .proc_release = single_release, ++ .proc_write = rtw_odm_proc_write, ++}; ++#endif + + struct proc_dir_entry *rtw_odm_proc_init(struct net_device *dev) + { +-- +2.28.0 + -- 2.28.0 ^ permalink raw reply related [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v2 1/1] package/rtl8821au: fix build against 5.8.x kernel 2020-09-13 0:16 ` [Buildroot] [PATCH v2 1/1] package/rtl8821au: fix build against 5.8.x kernel Christian Stewart @ 2020-09-19 19:49 ` Thomas Petazzoni 0 siblings, 0 replies; 16+ messages in thread From: Thomas Petazzoni @ 2020-09-19 19:49 UTC (permalink / raw) To: buildroot On Sat, 12 Sep 2020 17:16:59 -0700 Christian Stewart <christian@paral.in> wrote: > Signed-off-by: Christian Stewart <christian@paral.in> > > --- Applied to master, thanks. Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 2020-09-13 0:16 [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 Christian Stewart ` (4 preceding siblings ...) 2020-09-13 0:16 ` [Buildroot] [PATCH v2 1/1] package/rtl8821au: fix build against 5.8.x kernel Christian Stewart @ 2020-09-14 6:40 ` Thomas Petazzoni 2020-09-15 18:48 ` Peter Korsgaard 6 siblings, 0 replies; 16+ messages in thread From: Thomas Petazzoni @ 2020-09-14 6:40 UTC (permalink / raw) To: buildroot On Sat, 12 Sep 2020 17:16:54 -0700 Christian Stewart <christian@paral.in> wrote: > Signed-off-by: Christian Stewart <christian@paral.in> > --- > package/runc/runc.hash | 2 +- > package/runc/runc.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) I have applied patches 1 to 4 of this series to master. Thanks! Thomas -- Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 16+ messages in thread
* [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 2020-09-13 0:16 [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 Christian Stewart ` (5 preceding siblings ...) 2020-09-14 6:40 ` [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 Thomas Petazzoni @ 2020-09-15 18:48 ` Peter Korsgaard 6 siblings, 0 replies; 16+ messages in thread From: Peter Korsgaard @ 2020-09-15 18:48 UTC (permalink / raw) To: buildroot >>>>> "Christian" == Christian Stewart <christian@paral.in> writes: > Signed-off-by: Christian Stewart <christian@paral.in> > --- > package/runc/runc.hash | 2 +- > package/runc/runc.mk | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > diff --git a/package/runc/runc.hash b/package/runc/runc.hash > index b895f6fccb..d792947d5f 100644 > --- a/package/runc/runc.hash > +++ b/package/runc/runc.hash > @@ -1,3 +1,3 @@ > # Locally computed > -sha256 6b44985023347fb9c5a2cc6f761df8c41cc2c84a7a68a6e6acf834dff6653a9a runc-1.0.0-rc10.tar.gz > +sha256 28378df983a3c586ed3ec8c76a774a9b10f36a0c323590a284b801cce95cc61f runc-1.0.0-rc92.tar.gz > sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE > diff --git a/package/runc/runc.mk b/package/runc/runc.mk > index aedfb5ef9e..3d177d23d5 100644 > --- a/package/runc/runc.mk > +++ b/package/runc/runc.mk > @@ -4,7 +4,7 @@ > # > ################################################################################ > -RUNC_VERSION = 1.0.0-rc10 > +RUNC_VERSION = 1.0.0-rc92 rc91 contained a (low severity) security fix: https://github.com/opencontainers/runc/security/advisories/GHSA-g54h-m393-cpwq and rc92 contained a fix for a regression introduced in rc91, so I've adjusted the commit message to make this clear and committed to 2020.02.x, 2020.05.x and 2020.08.x, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2020-09-19 19:49 UTC | newest] Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-09-13 0:16 [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 Christian Stewart 2020-09-13 0:16 ` [Buildroot] [PATCH v1 2/5] package/docker-containerd: bump to version 1.4.0 Christian Stewart 2020-09-15 18:52 ` Peter Korsgaard 2020-09-15 21:15 ` Christian Stewart 2020-09-15 21:30 ` Peter Korsgaard 2020-09-13 0:16 ` [Buildroot] [PATCH v1 3/5] package/docker-cli: bump to version 19.03.12 Christian Stewart 2020-09-15 18:52 ` Peter Korsgaard 2020-09-13 0:16 ` [Buildroot] [PATCH v1 4/5] package/docker-engine: " Christian Stewart 2020-09-15 18:53 ` Peter Korsgaard 2020-09-13 0:16 ` [Buildroot] [PATCH v1 5/5] package/docker-proxy: bump to latest commit hash 6d6f28 Christian Stewart 2020-09-14 6:41 ` Thomas Petazzoni 2020-09-14 11:56 ` Christian Stewart 2020-09-13 0:16 ` [Buildroot] [PATCH v2 1/1] package/rtl8821au: fix build against 5.8.x kernel Christian Stewart 2020-09-19 19:49 ` Thomas Petazzoni 2020-09-14 6:40 ` [Buildroot] [PATCH v1 1/5] package/runc: bump to version 1.0.0-rc92 Thomas Petazzoni 2020-09-15 18:48 ` Peter Korsgaard
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.