efibootmgr

This commit is contained in:
aliriza committed 2023-04-25 07:22:33 +00:00
1 parent e13b4a49cd
commit 9cd36282ad
3 files changed
+121

No files matched your search

+27
View File
@@ -0,0 +1,27 @@
#!/usr/bin/env bash
name='efibootmgr'
release='1'
version='18'
url='https://github.com/rhboot/efibootmgr'
description='Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager.'
email='aliriza.keskin@pardus.org.tr'
maintainer='aliriza'
license=('GPLv3')
source=('https://github.com/rhboot/efibootmgr/archive/refs/tags/18.tar.gz')
depends=(efivar)
makedepends=()
md5sums=('e170147da25e1d5f72721ffc46fe4e06')
group=(sys.boot)
uses=()
arch=('x86_64')
cd $name-$version
build(){
make -C src $jobs
}
package(){
make -C src install $jobs
}
@@ -0,0 +1,55 @@
From bc65d63ebf8fe6ac8a099ff15ca200986dba1565 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Thu, 28 Jul 2022 16:11:24 -0400
Subject: [PATCH] Fix glibc 2.36 build (mount.h conflicts)
glibc has decided that sys/mount.h and linux/mount.h are no longer
usable at the same time. This broke the build, since linux/fs.h itself
includes linux/mount.h. For now, fix the build by only including
sys/mount.h where we need it.
See-also: https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E
Resolves: #227
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
---
src/gpt.c | 1 +
src/linux.c | 1 +
src/util.h | 1 -
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gpt.c b/src/gpt.c
index 1eda0497..21413c3b 100644
--- a/src/gpt.c
+++ b/src/gpt.c
@@ -17,6 +17,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/mount.h>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/utsname.h>
diff --git a/src/linux.c b/src/linux.c
index 47e45ae4..1780816f 100644
--- a/src/linux.c
+++ b/src/linux.c
@@ -20,6 +20,7 @@
#include <stdbool.h>
#include <stdio.h>
#include <sys/ioctl.h>
+#include <sys/mount.h>
#include <sys/socket.h>
#include <sys/sysmacros.h>
#include <sys/types.h>
diff --git a/src/util.h b/src/util.h
index 3300666f..1e67e447 100644
--- a/src/util.h
+++ b/src/util.h
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <string.h>
#include <sys/ioctl.h>
-#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <tgmath.h>
+39
View File
@@ -0,0 +1,39 @@
#!/usr/bin/env bash
name='efivar'
release='1'
version='38'
url='https://github.com/rhboot/efivar'
description='Tools and libraries to work with EFI variables'
email='aliriza.keskin@pardus.org.tr'
maintainer='aliriza'
license=('GPLv3')
source=('https://github.com/rhboot/efivar/archive/refs/tags/38.tar.gz'
'efivar-fix-mount-h-conflict.patch')
depends=()
makedepends=()
md5sums=('81782b8a856d2abf55a199a11c3790c6'
'SKIP')
group=(sys.libs)
uses=()
arch=('x86_64')
cd $name-$version
export ERRORS=''
export PATH=$PATH:$HOME
prepare(){
patch -Np1 -i ../efivar-fix-mount-h-conflict.patch
# fake mandoc for ignore extra dependency
echo "exit 0" > $HOME/mandoc
chmod +x $HOME/mandoc
}
build(){
make $jobs
}
package(){
make install $jobs
}