mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-04 16:10:10 +00:00
iscsi-initiator-utils: Upgrade to _2.1.2
Fix build with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit b99b2f5297)
[Bug fix only update]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
parent
e2e8d4ce79
commit
0a81e46a20
|
|
@ -0,0 +1,31 @@
|
|||
From 31d88f46bfc67de2659991674253a5d5dfb92afc Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 12 Aug 2020 12:00:29 -0700
|
||||
Subject: [PATCH] Makefile: Do not set -Werror
|
||||
|
||||
clang finds more warnings which causes build to fail, disable treating
|
||||
warning as errors
|
||||
|
||||
Upstream-Status: Inappropriate [OE-Specific]
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
usr/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/usr/Makefile b/usr/Makefile
|
||||
index 21bb154..0018605 100644
|
||||
--- a/usr/Makefile
|
||||
+++ b/usr/Makefile
|
||||
@@ -35,7 +35,7 @@ endif
|
||||
PKG_CONFIG = /usr/bin/pkg-config
|
||||
|
||||
CFLAGS ?= -O2 -g
|
||||
-WARNFLAGS ?= -Wall -Wextra -Werror -Wstrict-prototypes -fno-common
|
||||
+WARNFLAGS ?= -Wall -Wextra -Wstrict-prototypes -fno-common
|
||||
CFLAGS += $(WARNFLAGS) -I../include -I. -D_GNU_SOURCE \
|
||||
-I$(TOPDIR)/libopeniscsiusr
|
||||
CFLAGS += $(shell $(PKG_CONFIG) --cflags libkmod)
|
||||
--
|
||||
2.28.0
|
||||
|
||||
|
|
@ -12,9 +12,10 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)
|
|||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||
|
||||
SRCREV ?= "549f8987be49583bb06b117a364bea3a8fc5250c"
|
||||
SRCREV ?= "802688debcd88c48edabe86deb7e7ed47ebadc26"
|
||||
|
||||
SRC_URI = "git://github.com/open-iscsi/open-iscsi \
|
||||
file://0001-Makefile-Do-not-set-Werror.patch \
|
||||
file://initd.debian \
|
||||
file://99_iscsi-initiator-utils \
|
||||
file://iscsi-initiator \
|
||||
|
|
@ -23,9 +24,6 @@ SRC_URI = "git://github.com/open-iscsi/open-iscsi \
|
|||
file://set_initiatorname \
|
||||
"
|
||||
S = "${WORKDIR}/git"
|
||||
B = "${WORKDIR}/build"
|
||||
|
||||
PV .= "+git${SRCPV}"
|
||||
|
||||
inherit update-rc.d systemd autotools pkgconfig
|
||||
|
||||
|
|
@ -34,7 +32,7 @@ EXTRA_OECONF = " \
|
|||
--host=${BUILD_SYS} \
|
||||
"
|
||||
|
||||
EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '--without-systemd', d)}"
|
||||
EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '--without-systemd NO_SYSTEMD=1', d)}"
|
||||
|
||||
EXTRA_OEMAKE = ' \
|
||||
OS="${TARGET_SYS}" \
|
||||
|
|
@ -43,7 +41,6 @@ EXTRA_OEMAKE = ' \
|
|||
MANDIR="${mandir}" \
|
||||
OPTFLAGS="-DNO_SYSTEMD ${CFLAGS}" \
|
||||
PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config" \
|
||||
NO_SYSTEMD=1 \
|
||||
'
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user