grubby: Link with libexecinfo on musl

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj
2017-07-17 20:10:04 -07:00
committed by Martin Jansa
parent b455bfd77f
commit d45db2d6ec
3 changed files with 58 additions and 2 deletions

View File

@@ -0,0 +1,26 @@
From 22afaa21b4b258082be591e54c99e1ba6fbd7748 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 15 Jul 2017 10:19:22 -0700
Subject: [PATCH 1/2] Add another variable LIBS to provides libraries from env
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index ac14404..92a8e73 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ RPM_OPT_FLAGS ?= -O2 -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector
CFLAGS += $(RPM_OPT_FLAGS) -std=gnu99 -Wall -Werror -Wno-error=unused-function -Wno-unused-function -ggdb
LDFLAGS :=
-grubby_LIBS = -lblkid -lpopt
+grubby_LIBS = -lblkid -lpopt ${LIBS}
all: grubby
--
2.13.3

View File

@@ -0,0 +1,25 @@
From 8f844ac7f44b8dc428d06cd6958c5f32d383d01c Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 15 Jul 2017 10:19:50 -0700
Subject: [PATCH 2/2] include paths.h for _PATH_MOUNTED
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
grubby.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/grubby.c b/grubby.c
index 47a1a15..59f74a9 100644
--- a/grubby.c
+++ b/grubby.c
@@ -34,6 +34,7 @@
#include <libgen.h>
#include <execinfo.h>
#include <signal.h>
+#include <paths.h>
#include <blkid/blkid.h>
#include "log.h"
--
2.13.3

View File

@@ -9,11 +9,14 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
DEPENDS = "popt util-linux"
DEPENDS_append_libc-musl = " libexecinfo"
SRC_URI = "https://github.com/rhinstaller/${BPN}/archive/${PV}-1.tar.gz;downloadfilename=${BPN}-${PV}-1.tar.gz \
file://grubby-rename-grub2-editenv-to-grub-editenv.patch \
file://run-ptest \
"
file://0001-Add-another-variable-LIBS-to-provides-libraries-from.patch \
file://0002-include-paths.h-for-_PATH_MOUNTED.patch \
"
SRC_URI[md5sum] = "1005907b275d6d93368d045274537d86"
SRC_URI[sha256sum] = "85f1c678484f74c8978e8643451594967defce463a86c35cb1ee56d12767a9df"
@@ -24,8 +27,10 @@ RDEPENDS_${PN} += "dracut"
inherit autotools-brokensep ptest
EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}'"
EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}' LIBS='${LIBS}'"
LIBS_libc-musl = "-lexecinfo"
LIBS ?= ""
do_install_ptest() {
install -d ${D}${PTEST_PATH}
cp -r ${S}/test ${S}/test.sh ${D}${PTEST_PATH}