Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

efivar: Add armsr target support

Browse source 
Backport up-stream patch:
ca48d3964d

Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
This commit is contained in:
Anton Antonov 2023-10-03 12:56:39 +01:00 committed by Tianling Shen
parent ee47bf4a52
commit c618100c82
2 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/efivar/Makefile
View file

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=efivar PKG_NAME:=efivar
PKG_VERSION:=38 PKG_VERSION:=38
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://github.com/rhboot/efivar/releases/download/$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/rhboot/efivar/releases/download/$(PKG_VERSION)
@ -25,7 +25,7 @@ define Package/efivar
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=Tools and libraries to work with EFI variables TITLE:=Tools and libraries to work with EFI variables
DEPENDS:=@TARGET_x86_64 DEPENDS:=@(TARGET_x86_64||TARGET_armsr_armv8)
URL:=https://github.com/rhboot/efibootmgr URL:=https://github.com/rhboot/efibootmgr
endef endef

32
libs/efivar/patches/006-build-util-c-separately-for-makeguids.patch Normal file
View file

@ -0,0 +1,32 @@
From ca48d3964d26f5e3b38d73655f19b1836b16bd2d Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Tue, 18 Jan 2022 11:53:41 +0100
Subject: [PATCH] src/Makefile: build util.c separately for makeguids
util.c needs to be built twice when cross-compiling:
for the build machine to be able to link with
makeguids which then runs during the same build,
and then for the actual target.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
src/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,10 +28,13 @@ EFIVAR_OBJECTS = $(patsubst %.S,%.o,$(pa
EFISECDB_SOURCES = efisecdb.c guid-symbols.c secdb-dump.c util.c
EFISECDB_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(EFISECDB_SOURCES)))
GENERATED_SOURCES = include/efivar/efivar-guids.h guid-symbols.c
-MAKEGUIDS_SOURCES = makeguids.c util.c
+MAKEGUIDS_SOURCES = makeguids.c util-makeguids.c
MAKEGUIDS_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(MAKEGUIDS_SOURCES)))
MAKEGUIDS_OUTPUT = $(GENERATED_SOURCES) guids.lds
+util-makeguids.c : util.c
+ cp util.c util-makeguids.c
+
ALL_SOURCES=$(LIBEFISEC_SOURCES) $(LIBEFIBOOT_SOURCES) $(LIBEFIVAR_SOURCES) \
$(MAKEGUIDS_SOURCES) $(GENERATED_SOURCES) $(EFIVAR_SOURCES) \
$(sort $(wildcard include/efivar/*.h))