mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-10-23 07:23:19 +02:00
dracut: upgrade 055 -> 056
* Add a patch to fix musl build: src/install/util.c:30:19: error: missing binary operator before token "(" 30 | #if __GLIBC_PREREQ(2, 30) == 0 | ^ make: *** [Makefile:57: src/install/util.o] Error 1 * Pass "-fPIC" to CFLAGS to fix build warning with musl build: WARNING: dracut-1_056-r0 do_package_qa: QA Issue: dracut: ELF binary /usr/lib/dracut/dracut-install has relocations in .text [textrel] Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
f00ec3db13
commit
fcdafe933c
|
@ -0,0 +1,35 @@
|
|||
From ff5e1a662ba93ba79e2aeaaaec48a2a8ec4b4701 Mon Sep 17 00:00:00 2001
|
||||
From: Yi Zhao <yi.zhao@windriver.com>
|
||||
Date: Thu, 31 Mar 2022 22:22:44 +0800
|
||||
Subject: [PATCH] Guard against __GLIBC_PREREQ for musl libc
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
src/install/util.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/install/util.c b/src/install/util.c
|
||||
index 5721de89..784aec48 100644
|
||||
--- a/src/install/util.c
|
||||
+++ b/src/install/util.c
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
#include "util.h"
|
||||
|
||||
+#if defined(__GLIBC__)
|
||||
#if __GLIBC_PREREQ(2, 30) == 0
|
||||
#include <sys/syscall.h>
|
||||
#ifndef SYS_gettid
|
||||
@@ -35,6 +36,7 @@
|
||||
|
||||
#define gettid() ((pid_t) syscall(SYS_gettid))
|
||||
#endif /*__GLIBC_PREREQ */
|
||||
+#endif /*__GLIBC__*/
|
||||
|
||||
size_t page_size(void)
|
||||
{
|
||||
--
|
||||
2.25.1
|
||||
|
|
@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
|||
|
||||
PE = "1"
|
||||
|
||||
SRCREV = "86bf2533d77762e823ad7a3e06a574522c1a90e3"
|
||||
SRCREV = "631d5f72a223288aa1f48bb8e8d0313e75947400"
|
||||
SRC_URI = "git://git.kernel.org/pub/scm/boot/dracut/dracut.git;protocol=http;branch=master \
|
||||
file://0001-util.h-include-sys-reg.h-when-libc-glibc.patch \
|
||||
file://0001-Guard-against-__GLIBC_PREREQ-for-musl-libc.patch \
|
||||
"
|
||||
|
||||
DEPENDS += "kmod"
|
||||
|
@ -36,6 +37,7 @@ PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/
|
|||
|
||||
EXTRA_OEMAKE += 'libdir=${prefix}/lib LDLIBS="${LDLIBS}"'
|
||||
|
||||
CFLAGS:append = " -fPIC"
|
||||
LDLIBS:append:libc-musl = " -lfts"
|
||||
|
||||
do_configure() {
|
Loading…
Reference in New Issue
Block a user