* [Buildroot] [PATCH 0/3 next] bump edk2 version
@ 2022-12-01 18:33 Vincent Stehlé
2022-12-01 18:33 ` [Buildroot] [PATCH 1/3 next] package/edk2-platforms: bump in sync with edk2-stable202208 Vincent Stehlé
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Vincent Stehlé @ 2022-12-01 18:33 UTC (permalink / raw)
To: buildroot; +Cc: Vincent Stehlé, Thomas Petazzoni
Hi,
The intend of this patch series is "just" to bump the edk2 version.
To do that, bumping the edk2-platforms version in sync is necessary.
A small difficulty is that some Marvell files, which are necessary for the edk2
MACCHIATObin recipe, have moved out of the edk2-platforms repository into the
edk2-non-osi repository.
The proposal is to add a new edk2-non-osi package, which is inspired from the
edk2-platforms package created by Dick.
Because licenses in the edk2-non-osi repository vary per-platform, we copy only
the Marvell Armada Devicetree files we need for the MACCHIATObin, for the sake
of legal-info simplicity, but we prepare to add more in the future.
Dick, can I also add you to DEVELOPERS for this new edk2-non-osi package,
please? Let me know if you agree and I will re-send.
Other alternatives to avoid a new package could be to switch the edk2
MACCHIATObin recipe to ACPI (but how would we test?), or to drop the recipe
completely, as the solidrun_macchiatobin_defconfig is not using edk2 anyway. Let
me know if this is preferred.
In term of testing, the qemu_aarch64_sbsa_defconfig, which is using edk2, runs
fine on Qemu.
The following combinations of edk2 platforms and toolchains build ok (or skip):
fvp arm-aarch64
sbsa bootlin-aarch64-glibc
virt bootlin-x86-64-glibc
sgi575 bootlin-x86-64-musl
default x bootlin-x86-64-uclibc
ovmf-x64 br-i386-pentium-mmx-musl
solidrun br-i386-pentium4-full
ovmf-i386 linaro-aarch64
socionext linaro-aarch64-be
virt-kernel
The following python tests run ok:
tests.boot.test_edk2.TestEdk2
tests.boot.test_grub.TestGrubAArch64EFI
tests.boot.test_grub.TestGrubX8664EFI
tests.boot.test_grub.TestGrubi386EFI
tests.fs.test_iso9660.TestIso9660Grub2EFI
tests.fs.test_iso9660.TestIso9660Grub2Hybrid
If anyone can test edk2 on actual hardware, feedback would be greatly
appreciated.
This patch series is for the `next' branch, please.
Best regards,
Vincent.
Vincent Stehlé (3):
package/edk2-platforms: bump in sync with edk2-stable202208
package/edk2-non-osi: new package
boot/edk2: bump version to edk2-stable202208
DEVELOPERS | 1 +
...ePkg-UsbBusDxe-fix-NOOPT-build-error.patch | 48 -------------------
boot/edk2/Config.in | 1 +
boot/edk2/edk2.hash | 2 +-
boot/edk2/edk2.mk | 9 ++--
package/Config.in | 1 +
package/edk2-non-osi/Config.in | 11 +++++
package/edk2-non-osi/edk2-non-osi.hash | 3 ++
package/edk2-non-osi/edk2-non-osi.mk | 29 +++++++++++
package/edk2-platforms/edk2-platforms.hash | 2 +-
package/edk2-platforms/edk2-platforms.mk | 2 +-
11 files changed, 55 insertions(+), 54 deletions(-)
delete mode 100644 boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch
create mode 100644 package/edk2-non-osi/Config.in
create mode 100644 package/edk2-non-osi/edk2-non-osi.hash
create mode 100644 package/edk2-non-osi/edk2-non-osi.mk
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/3 next] package/edk2-platforms: bump in sync with edk2-stable202208
2022-12-01 18:33 [Buildroot] [PATCH 0/3 next] bump edk2 version Vincent Stehlé
@ 2022-12-01 18:33 ` Vincent Stehlé
2022-12-04 13:05 ` Thomas Petazzoni via buildroot
2022-12-01 18:33 ` [Buildroot] [PATCH 2/3 next] package/edk2-non-osi: new package Vincent Stehlé
2022-12-01 18:33 ` [Buildroot] [PATCH 3/3 next] boot/edk2: bump version to edk2-stable202208 Vincent Stehlé
2 siblings, 1 reply; 6+ messages in thread
From: Vincent Stehlé @ 2022-12-01 18:33 UTC (permalink / raw)
To: buildroot; +Cc: Vincent Stehlé, Thomas Petazzoni
Bump the edk2-platforms commit to the one corresponding to version
edk2-stable202208 of edk2, based on the timestamps.
Note: the Marvell Armada Devicetree files have been moved out of
edk2-platforms by commit 4b53da6b12a8 ("Marvell/Armada7k8k: Remove device
tree sources from edk2-platforms") and they are now in edk2-non-osi.
Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
Cc: Dick Olsson <hi@senzilla.io>
---
This is for the `next' branch, please.
package/edk2-platforms/edk2-platforms.hash | 2 +-
package/edk2-platforms/edk2-platforms.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/edk2-platforms/edk2-platforms.hash b/package/edk2-platforms/edk2-platforms.hash
index 30ae235078d..405a09241cd 100644
--- a/package/edk2-platforms/edk2-platforms.hash
+++ b/package/edk2-platforms/edk2-platforms.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 dfdc34fea86e5037a3a6cbd2a83b1f655f16b4c9ab4f5ff9da91e45a358c9a14 edk2-platforms-db922e1253cb6f1fc456805bc42fb7d401eed5c2.tar.gz
+sha256 1ed3f369a2743cc5a5fa4804d0af154e37b578f4e68c2e7f69734701a9b874db edk2-platforms-3c3b1168017073c2bb2d97336c5929ebae805be1.tar.gz
sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt
diff --git a/package/edk2-platforms/edk2-platforms.mk b/package/edk2-platforms/edk2-platforms.mk
index 7de59c1afcc..898937a5ab4 100644
--- a/package/edk2-platforms/edk2-platforms.mk
+++ b/package/edk2-platforms/edk2-platforms.mk
@@ -5,7 +5,7 @@
################################################################################
# Keep in sync with latest commit as of the release date for boot/edk2
-EDK2_PLATFORMS_VERSION = db922e1253cb6f1fc456805bc42fb7d401eed5c2
+EDK2_PLATFORMS_VERSION = 3c3b1168017073c2bb2d97336c5929ebae805be1
EDK2_PLATFORMS_SITE = $(call github,tianocore,edk2-platforms,$(EDK2_PLATFORMS_VERSION))
EDK2_PLATFORMS_LICENSE = BSD-2-Clause
EDK2_PLATFORMS_LICENSE_FILES = License.txt
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/3 next] package/edk2-non-osi: new package
2022-12-01 18:33 [Buildroot] [PATCH 0/3 next] bump edk2 version Vincent Stehlé
2022-12-01 18:33 ` [Buildroot] [PATCH 1/3 next] package/edk2-platforms: bump in sync with edk2-stable202208 Vincent Stehlé
@ 2022-12-01 18:33 ` Vincent Stehlé
2022-12-04 13:08 ` Thomas Petazzoni via buildroot
2022-12-01 18:33 ` [Buildroot] [PATCH 3/3 next] boot/edk2: bump version to edk2-stable202208 Vincent Stehlé
2 siblings, 1 reply; 6+ messages in thread
From: Vincent Stehlé @ 2022-12-01 18:33 UTC (permalink / raw)
To: buildroot; +Cc: Vincent Stehlé, Thomas Petazzoni
Add a package to install the additional edk2 platforms files, not
compatible with the normal licensing requirements and held in the
edk2-non-osi repository.
Only the Marvell Armada files are copied at this point, to support building
edk2 for the MACCHIATObin platform.
The referenced commit corresponds to version edk2-stable202208 of edk2,
based on the timestamps.
This package is heavily inspired from package/edk2-platforms.
Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
This is for the `next' branch, please.
DEVELOPERS | 1 +
package/Config.in | 1 +
package/edk2-non-osi/Config.in | 11 ++++++++++
package/edk2-non-osi/edk2-non-osi.hash | 3 +++
package/edk2-non-osi/edk2-non-osi.mk | 29 ++++++++++++++++++++++++++
5 files changed, 45 insertions(+)
create mode 100644 package/edk2-non-osi/Config.in
create mode 100644 package/edk2-non-osi/edk2-non-osi.hash
create mode 100644 package/edk2-non-osi/edk2-non-osi.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index ab9cfe5ee98..233fda4c71d 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -3002,6 +3002,7 @@ F: package/utp_com/
N: Vincent Stehlé <vincent.stehle@arm.com>
F: board/qemu/aarch64-ebbr/
F: configs/qemu_aarch64_ebbr_defconfig
+F: package/edk2-non-osi/
N: Vincent Stehlé <vincent.stehle@laposte.net>
F: board/bananapi/bananapi-m2-zero/
diff --git a/package/Config.in b/package/Config.in
index 1a2bda4639e..ce0d55bbf2f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -489,6 +489,7 @@ endmenu
source "package/dvb-apps/Config.in"
source "package/dvbsnoop/Config.in"
source "package/edid-decode/Config.in"
+ source "package/edk2-non-osi/Config.in"
source "package/edk2-platforms/Config.in"
source "package/eudev/Config.in"
source "package/ev3dev-linux-drivers/Config.in"
diff --git a/package/edk2-non-osi/Config.in b/package/edk2-non-osi/Config.in
new file mode 100644
index 00000000000..6c540c8a408
--- /dev/null
+++ b/package/edk2-non-osi/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_EDK2_NON_OSI
+ bool
+ help
+ EDK2 description files for additional platforms, not
+ compatible with the normal licensing requirements.
+ The main EDK2 bootloader package will depend on these
+ description files while building firmware for some platforms.
+
+ Only the Marvell Armada files are copied at this point.
+
+ https://github.com/tianocore/edk2-non-osi
diff --git a/package/edk2-non-osi/edk2-non-osi.hash b/package/edk2-non-osi/edk2-non-osi.hash
new file mode 100644
index 00000000000..7941df1f2fc
--- /dev/null
+++ b/package/edk2-non-osi/edk2-non-osi.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 7d27b1e6d90a26f3585ab58a2e051da69eae1b97754d3e2d80a5372879ae2501 edk2-non-osi-61662e8596dd9a64e3372f9a3ba6622d2628607c.tar.gz
+sha256 38d73db2f9dfb32e1666d898cb9d7c1ccd78302dd9922d5fac4a9cf61fa872d9 Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
diff --git a/package/edk2-non-osi/edk2-non-osi.mk b/package/edk2-non-osi/edk2-non-osi.mk
new file mode 100644
index 00000000000..5cd08c03de5
--- /dev/null
+++ b/package/edk2-non-osi/edk2-non-osi.mk
@@ -0,0 +1,29 @@
+################################################################################
+#
+# edk2-non-osi
+#
+################################################################################
+
+# Keep in sync with latest commit as of the release date for boot/edk2
+EDK2_NON_OSI_VERSION = 61662e8596dd9a64e3372f9a3ba6622d2628607c
+EDK2_NON_OSI_SITE = $(call github,tianocore,edk2-non-osi,$(EDK2_NON_OSI_VERSION))
+EDK2_NON_OSI_INSTALL_TARGET = NO
+EDK2_NON_OSI_INSTALL_STAGING = YES
+
+# Copy Marvell Armada files
+EDK2_NON_OSI_LICENSE += , BSD-2-Clause-Patent (Marvell Armada)
+EDK2_NON_OSI_LICENSE_FILES += Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
+EDK2_NON_OSI_DIRS += Silicon/Marvell/Armada7k8k/DeviceTree
+
+# There is nothing to build for edk2-non-osi. All we need to do is to copy
+# the selected description files to staging, for other packages to build with.
+define EDK2_NON_OSI_INSTALL_STAGING_CMDS
+ mkdir -p $(STAGING_DIR)/usr/share/edk2-non-osi
+
+ for d in $(EDK2_NON_OSI_DIRS); do \
+ mkdir -p $(STAGING_DIR)/usr/share/edk2-non-osi/$$d; \
+ cp -rf $(@D)/$$d/* $(STAGING_DIR)/usr/share/edk2-non-osi/$$d/; \
+ done
+endef
+
+$(eval $(generic-package))
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/3 next] boot/edk2: bump version to edk2-stable202208
2022-12-01 18:33 [Buildroot] [PATCH 0/3 next] bump edk2 version Vincent Stehlé
2022-12-01 18:33 ` [Buildroot] [PATCH 1/3 next] package/edk2-platforms: bump in sync with edk2-stable202208 Vincent Stehlé
2022-12-01 18:33 ` [Buildroot] [PATCH 2/3 next] package/edk2-non-osi: new package Vincent Stehlé
@ 2022-12-01 18:33 ` Vincent Stehlé
2 siblings, 0 replies; 6+ messages in thread
From: Vincent Stehlé @ 2022-12-01 18:33 UTC (permalink / raw)
To: buildroot; +Cc: Vincent Stehlé, Thomas Petazzoni
The Marvell Armada Devicetree files have been moved out of edk2-platforms
by commit 4b53da6b12a8 ("Marvell/Armada7k8k: Remove device tree sources
from edk2-platforms") and they are now in edk2-non-osi.
Therefore update the MACCHIATObin recipe to depend on the new edk2-non-osi
package and rework a bit the packages path to support that.
Also, drop the backported patch as it is not necessary anymore.
Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
Cc: Dick Olsson <hi@senzilla.io>
---
This is for the `next' branch, please.
...ePkg-UsbBusDxe-fix-NOOPT-build-error.patch | 48 -------------------
boot/edk2/Config.in | 1 +
boot/edk2/edk2.hash | 2 +-
boot/edk2/edk2.mk | 9 ++--
4 files changed, 8 insertions(+), 52 deletions(-)
delete mode 100644 boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch
diff --git a/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch b/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch
deleted file mode 100644
index f4f1b1565aa..00000000000
--- a/boot/edk2/0001-MdeModulePkg-UsbBusDxe-fix-NOOPT-build-error.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 59aa67f7a4d8efc564b46fe467aaf6eccec17183 Mon Sep 17 00:00:00 2001
-From: Gerd Hoffmann <kraxel@redhat.com>
-Date: Mon, 20 Dec 2021 22:32:38 +0800
-Subject: [PATCH] MdeModulePkg/UsbBusDxe: fix NOOPT build error
-
-gcc-11 (fedora 35):
-
-/home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c: In function ?UsbIoBulkTransfer?:
-/home/kraxel/projects/edk2/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c:277:12: error: ?UsbHcBulkTransfer? accessing 80 bytes in a region of size 8 [-Werror=stringop-overflow=]
-
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
-(cherry picked from commit ae8272ef787d80950803c521a13a308651bdc62e)
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c | 2 +-
- MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
-index 7529e03e85..b2ce97ca37 100644
---- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
-+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.c
-@@ -285,7 +285,7 @@ UsbHcBulkTransfer (
- IN UINT8 DevSpeed,
- IN UINTN MaxPacket,
- IN UINT8 BufferNum,
-- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
-+ IN OUT VOID *Data[],
- IN OUT UINTN *DataLength,
- IN OUT UINT8 *DataToggle,
- IN UINTN TimeOut,
-diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
-index 1d2b8a6174..1316a5981f 100644
---- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
-+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbUtility.h
-@@ -149,7 +149,7 @@ UsbHcBulkTransfer (
- IN UINT8 DevSpeed,
- IN UINTN MaxPacket,
- IN UINT8 BufferNum,
-- IN OUT VOID *Data[EFI_USB_MAX_BULK_BUFFER_NUM],
-+ IN OUT VOID *Data[],
- IN OUT UINTN *DataLength,
- IN OUT UINT8 *DataToggle,
- IN UINTN TimeOut,
---
-2.35.3
-
diff --git a/boot/edk2/Config.in b/boot/edk2/Config.in
index df723122ee0..855a62f70b3 100644
--- a/boot/edk2/Config.in
+++ b/boot/edk2/Config.in
@@ -88,6 +88,7 @@ config BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN
bool "SolidRun MacchiatoBin"
depends on BR2_aarch64
depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE
+ select BR2_PACKAGE_EDK2_NON_OSI
select BR2_PACKAGE_HOST_DTC
select BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP
help
diff --git a/boot/edk2/edk2.hash b/boot/edk2/edk2.hash
index f28e9ce841b..94ee22ddc4e 100644
--- a/boot/edk2/edk2.hash
+++ b/boot/edk2/edk2.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 04791c13b414a6d1877182a6d565cb762c30aa63e49bb4d495fca68ef4dd209d edk2-edk2-stable202102-br1.tar.gz
+sha256 c10520f269557d566e35fe8104141aa2865f9085ad2b3a30aae8a7e78a3ca5aa edk2-edk2-stable202208-br1.tar.gz
sha256 50ce20c9cfdb0e19ee34fe0a51fc0afe961f743697b068359ab2f862b494df80 License.txt
diff --git a/boot/edk2/edk2.mk b/boot/edk2/edk2.mk
index 5cbd9d152e7..c377b498776 100644
--- a/boot/edk2/edk2.mk
+++ b/boot/edk2/edk2.mk
@@ -4,7 +4,7 @@
#
################################################################################
-EDK2_VERSION = edk2-stable202102
+EDK2_VERSION = edk2-stable202208
EDK2_SITE = https://github.com/tianocore/edk2
EDK2_SITE_METHOD = git
EDK2_LICENSE = BSD-2-Clause
@@ -47,7 +47,7 @@ endif
EDK2_GIT_SUBMODULES = YES
EDK2_BUILD_PACKAGES = $(@D)/Build/Buildroot
-EDK2_PACKAGES_PATH = $(@D):$(EDK2_BUILD_PACKAGES):$(STAGING_DIR)/usr/share/edk2-platforms
+EDK2_PACKAGES_PATHS = $(@D) $(EDK2_BUILD_PACKAGES) $(STAGING_DIR)/usr/share/edk2-platforms
ifeq ($(BR2_TARGET_EDK2_PLATFORM_OVMF_I386),y)
EDK2_ARCH = IA32
@@ -102,12 +102,13 @@ endef
else ifeq ($(BR2_TARGET_EDK2_PLATFORM_SOLIDRUN_ARMADA80X0MCBIN),y)
EDK2_ARCH = AARCH64
-EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware
+EDK2_DEPENDENCIES += host-dtc arm-trusted-firmware edk2-non-osi
EDK2_PACKAGE_NAME = Platform/SolidRun/Armada80x0McBin
EDK2_PLATFORM_NAME = Armada80x0McBin
EDK2_BUILD_DIR = $(EDK2_PLATFORM_NAME)-$(EDK2_ARCH)
EDK2_BUILD_ENV += DTC_PREFIX=$(HOST_DIR)/bin/
EDK2_BUILD_OPTS += -D INCLUDE_TFTP_COMMAND
+EDK2_PACKAGES_PATHS += $(STAGING_DIR)/usr/share/edk2-non-osi
else ifeq ($(BR2_TARGET_EDK2_PLATFORM_QEMU_SBSA),y)
EDK2_ARCH = AARCH64
@@ -128,6 +129,8 @@ EDK2_BASETOOLS_OPTS = \
EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
EXTRA_OPTFLAGS="$(HOST_CPPFLAGS)"
+EDK2_PACKAGES_PATH = $(subst $(space),:,$(strip $(EDK2_PACKAGES_PATHS)))
+
EDK2_BUILD_ENV += \
WORKSPACE=$(@D) \
PACKAGES_PATH=$(EDK2_PACKAGES_PATH) \
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Buildroot] [PATCH 1/3 next] package/edk2-platforms: bump in sync with edk2-stable202208
2022-12-01 18:33 ` [Buildroot] [PATCH 1/3 next] package/edk2-platforms: bump in sync with edk2-stable202208 Vincent Stehlé
@ 2022-12-04 13:05 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-12-04 13:05 UTC (permalink / raw)
To: Vincent Stehlé; +Cc: buildroot
On Thu, 1 Dec 2022 19:33:35 +0100
Vincent Stehlé <vincent.stehle@arm.com> wrote:
> Bump the edk2-platforms commit to the one corresponding to version
> edk2-stable202208 of edk2, based on the timestamps.
>
> Note: the Marvell Armada Devicetree files have been moved out of
> edk2-platforms by commit 4b53da6b12a8 ("Marvell/Armada7k8k: Remove device
> tree sources from edk2-platforms") and they are now in edk2-non-osi.
>
> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> Cc: Dick Olsson <hi@senzilla.io>
> ---
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] 6+ messages in thread
* Re: [Buildroot] [PATCH 2/3 next] package/edk2-non-osi: new package
2022-12-01 18:33 ` [Buildroot] [PATCH 2/3 next] package/edk2-non-osi: new package Vincent Stehlé
@ 2022-12-04 13:08 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-12-04 13:08 UTC (permalink / raw)
To: Vincent Stehlé; +Cc: buildroot
On Thu, 1 Dec 2022 19:33:36 +0100
Vincent Stehlé <vincent.stehle@arm.com> wrote:
> Add a package to install the additional edk2 platforms files, not
> compatible with the normal licensing requirements and held in the
> edk2-non-osi repository.
>
> Only the Marvell Armada files are copied at this point, to support building
> edk2 for the MACCHIATObin platform.
>
> The referenced commit corresponds to version edk2-stable202208 of edk2,
> based on the timestamps.
>
> This package is heavily inspired from package/edk2-platforms.
>
> Signed-off-by: Vincent Stehlé <vincent.stehle@arm.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
To be honest, I don't really understand the reasoning of the move of
the Marvell files to this edk2-non-osi repository. Indeed, they are
under BSD-2-Patent, which is an OSI-compatible license.
But anyway...
> +# Copy Marvell Armada files
> +EDK2_NON_OSI_LICENSE += , BSD-2-Clause-Patent (Marvell Armada)
I changed the += and removed the comma, as for now we only have this
particular license, and we don't want the _LICENSE variable value to
start with a comma.
> +EDK2_NON_OSI_LICENSE_FILES += Silicon/Marvell/Armada7k8k/DeviceTree/Armada80x0McBin.inf
> +EDK2_NON_OSI_DIRS += Silicon/Marvell/Armada7k8k/DeviceTree
> +
> +# There is nothing to build for edk2-non-osi. All we need to do is to copy
> +# the selected description files to staging, for other packages to build with.
> +define EDK2_NON_OSI_INSTALL_STAGING_CMDS
> + mkdir -p $(STAGING_DIR)/usr/share/edk2-non-osi
I removed this mkdir, since anway you are using mkdir -p below to
create the subdirs.
> + for d in $(EDK2_NON_OSI_DIRS); do \
> + mkdir -p $(STAGING_DIR)/usr/share/edk2-non-osi/$$d; \
> + cp -rf $(@D)/$$d/* $(STAGING_DIR)/usr/share/edk2-non-osi/$$d/; \
> + done
Reworked with a make foreach loop so that i aborts in case of a failure.
Applied to next with those changes.
Best regards,
Thomas
--
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-12-04 13:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-01 18:33 [Buildroot] [PATCH 0/3 next] bump edk2 version Vincent Stehlé
2022-12-01 18:33 ` [Buildroot] [PATCH 1/3 next] package/edk2-platforms: bump in sync with edk2-stable202208 Vincent Stehlé
2022-12-04 13:05 ` Thomas Petazzoni via buildroot
2022-12-01 18:33 ` [Buildroot] [PATCH 2/3 next] package/edk2-non-osi: new package Vincent Stehlé
2022-12-04 13:08 ` Thomas Petazzoni via buildroot
2022-12-01 18:33 ` [Buildroot] [PATCH 3/3 next] boot/edk2: bump version to edk2-stable202208 Vincent Stehlé
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.