* and fix indentation
Signed-off-by: Martin Jansa <[email protected]>
---
.../iscsi-initiator-utils_2.0.874.bb | 40 ++++++++++++----------
.../recipes-support/open-isns/open-isns_0.97.bb | 6 ++--
2 files changed, 25 insertions(+), 21 deletions(-)
diff --git
a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb
b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb
index c3ac5a8..72a17b0 100644
---
a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb
+++
b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb
@@ -14,20 +14,22 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
SRCREV ?= "8db9717e73d32d2c5131da4f9ad86dfd9065f74b"
SRC_URI = "git://github.com/open-iscsi/open-iscsi \
- file://iscsi-initiator-utils-Do-not-clean-kernel-source.patch \
-
file://iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch
\
- file://initd.debian \
- file://99_iscsi-initiator-utils \
- file://iscsi-initiator \
- file://iscsi-initiator.service \
- file://iscsi-initiator-targets.service \
- file://set_initiatorname \
+ file://iscsi-initiator-utils-Do-not-clean-kernel-source.patch \
+
file://iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch
\
+ file://initd.debian \
+ file://99_iscsi-initiator-utils \
+ file://iscsi-initiator \
+ file://iscsi-initiator.service \
+ file://iscsi-initiator-targets.service \
+ file://set_initiatorname \
"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
-inherit update-rc.d systemd autotools
+inherit update-rc.d systemd autotools distro_features_check
+# open-isns depends on systemd
+REQUIRED_DISTRO_FEATURES = "systemd"
EXTRA_OECONF = " \
--target=${TARGET_SYS} \
@@ -37,16 +39,16 @@ EXTRA_OECONF = " \
"
EXTRA_OEMAKE = ' \
- CC="${CC}" \
- AR="${AR}" \
- RANLIB="${RANLIB}" \
- CFLAGS="${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE -I. -I../include
-I../../include -I../usr -I../../usr" \
- LDFLAGS="${LDFLAGS}" \
- LD="${LD}" \
- OS="${TARGET_SYS}" \
- TARGET="${TARGET_OS}" \
- BASE="${prefix}" \
- MANDIR="${mandir}" \
+ CC="${CC}" \
+ AR="${AR}" \
+ RANLIB="${RANLIB}" \
+ CFLAGS="${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE -I. -I../include
-I../../include -I../usr -I../../usr" \
+ LDFLAGS="${LDFLAGS}" \
+ LD="${LD}" \
+ OS="${TARGET_SYS}" \
+ TARGET="${TARGET_OS}" \
+ BASE="${prefix}" \
+ MANDIR="${mandir}" \
'
TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/meta-networking/recipes-support/open-isns/open-isns_0.97.bb
b/meta-networking/recipes-support/open-isns/open-isns_0.97.bb
index fe41093..b809762 100644
--- a/meta-networking/recipes-support/open-isns/open-isns_0.97.bb
+++ b/meta-networking/recipes-support/open-isns/open-isns_0.97.bb
@@ -14,14 +14,16 @@ SECTION = "net"
DEPENDS = "openssl systemd"
SRC_URI = " \
- git://github.com/open-iscsi/open-isns \
+ git://github.com/open-iscsi/open-isns \
"
SRCREV ?= "09954404e948e41eb0fce8e28836018b4ce3d20d"
S = "${WORKDIR}/git"
-inherit systemd autotools-brokensep
+inherit systemd autotools-brokensep distro_features_check
+# depends on systemd
+REQUIRED_DISTRO_FEATURES = "systemd"
EXTRA_OECONF = " --prefix=${prefix} --enable-shared"
--
2.10.2
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
