Skip to contentSkip to conversation

boot/opensbi: move patches to 0.9/ subdir to only apply when the 0.9 version is selected

PATCH New Peter Korsgaard 1 participant 4 messages May 12, 2021 – May 13, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 boot/opensbi: move patches to 0.9/ subdir to only apply when the 0.9 version is selected

With the addition of support for custom opensbi version in commit 5c7166d387b (boot/opensbi: add support for version configuration), we can no longer be sure that the Buildroot patches can be applied - So move them to a 0.9 subdir to ensure they are only applied when the _LATEST_VERSION is used.

---
 .../{ => 0.9}/0001-Makefile-Don-t-specify-mabi-or-march.patch     | 0
 .../{ => 0.9}/0002-Makefile-unconditionally-disable-SSP.patch     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename boot/opensbi/{ => 0.9}/0001-Makefile-Don-t-specify-mabi-or-march.patch (100%)
 rename boot/opensbi/{ => 0.9}/0002-Makefile-unconditionally-disable-SSP.patch (100%)
boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch renamed from boot/opensbi/0001-Makefile-Don-t-specify-mabi-or-march.patch +0 -0
similarity index 100%
rename from boot/opensbi/0001-Makefile-Don-t-specify-mabi-or-march.patch
rename to boot/opensbi/0.9/0001-Makefile-Don-t-specify-mabi-or-march.patch
boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch renamed from boot/opensbi/0002-Makefile-unconditionally-disable-SSP.patch +0 -0
similarity index 100%
rename from boot/opensbi/0002-Makefile-unconditionally-disable-SSP.patch
rename to boot/opensbi/0.9/0002-Makefile-unconditionally-disable-SSP.patch
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/2 boot/opensbi: move patches to 0.9/ subdir to only apply when the 0.9 version is selected

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

With the addition of support for custom opensbi version in commit 5c7166d387b (boot/opensbi: add support for version configuration), we can no longer be sure that the Buildroot patches can be applied - So move them to a 0.9 subdir to ensure they are only applied when the _LATEST_VERSION is used.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 2/2 boot/opensbi: only check/reference COPYING.BSD when _LATEST_VERSION is used

In reply to Peter Korsgaard

With the addition of support for custom opensbi version in commit 5c7166d387b (boot/opensbi: add support for version configuration), we can no longer be sure that the license file name / hash will be correct in all cases, so only specify COPYING.BSD when _LATEST_VERSION is used, similar to how we do it for the Linux kernel.

---
 boot/opensbi/opensbi.mk | 2 ++
 1 file changed, 2 insertions(+)
boot/opensbi/opensbi.mk +2 -0
index f8cbbb8fcc..a525b8aea3 100644
@@ -20,7 +20,9 @@ OPENSBI_SITE = $(call github,riscv,opensbi,v$(OPENSBI_VERSION))
 endif
 
 OPENSBI_LICENSE = BSD-2-Clause
+ifeq ($(BR2_TARGET_OPENSBI_LATEST_VERSION),y)
 OPENSBI_LICENSE_FILES = COPYING.BSD
+endif
 OPENSBI_INSTALL_TARGET = NO
 OPENSBI_INSTALL_STAGING = YES
 
Signature · 1 line
2.20.1
#3 lore raw

PATCH 2/2 boot/opensbi: only check/reference COPYING.BSD when _LATEST_VERSION is used

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

With the addition of support for custom opensbi version in commit 5c7166d387b (boot/opensbi: add support for version configuration), we can no longer be sure that the license file name / hash will be correct in all cases, so only specify COPYING.BSD when _LATEST_VERSION is used, similar to how we do it for the Linux kernel.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard