Skip to contentSkip to conversation

cgl layer.conf: add layer depends

PATCH In review Armin Kuster 1 participant 5 messages Feb 3, 2017 – Feb 20, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 cgl layer.conf: add layer depends

From: Armin Kuster <[email protected]>

---
 meta-cgl-common/conf/layer.conf | 2 ++
 1 file changed, 2 insertions(+)
meta-cgl-common/conf/layer.conf +2 -0
index 0c19a95..dfd0d1f 100644
@@ -11,4 +11,6 @@ BBFILE_COLLECTIONS += "cgl-common"
 BBFILE_PATTERN_cgl-common = "^${LAYERDIR}/"
 BBFILE_PRIORITY_cgl-common = "7"
 
+LAYERDEPENDS_cgl-common = "core openembedded-layer networking-layer perl-layer filesystems-layer security openclovis selinux"
+
 require conf/distro/include/cgl_common_security_flags.inc
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/3 iscsi-initiator-utils: make it DISTRO_FEATURE dependent

From: Armin Kuster <[email protected]>

When this package was updated in OE,
it now requires systemd. Make this optional.

---
 meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb +1 -1
index b0c2cac..045691a 100644
@@ -42,7 +42,7 @@ RDEPENDS_packagegroup-cgl-middleware = "\
     strongswan \
     vlan \
     corosync \
-    iscsi-initiator-utils \
+ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "iscsi-initiator-utils", "",d)} \
     openais \
     openipmi \
     openhpi \
Signature · 1 line
2.7.4
author
#2 lore raw

Re: [meta-cgl][PATCH 2/3] iscsi-initiator-utils: make it DISTRO_FEATURE dependent

ping

Quoted 23 lines · Armin Kuster

From: Armin Kuster <[email protected]>

When this package was updated in OE,
it now requires systemd. Make this optional.

---
  meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb +1 -1
index b0c2cac..045691a 100644
@@ -42,7 +42,7 @@ RDEPENDS_packagegroup-cgl-middleware = "\
      strongswan \
      vlan \
      corosync \
-    iscsi-initiator-utils \
+ ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "iscsi-initiator-utils", "",d)} \
      openais \
      openipmi \
      openhpi \
#3 lore raw

PATCH 3/3 openais: change SRC_URI http to fix error

In reply to Armin Kuster

From: Armin Kuster <[email protected]>

ERROR: openais-1.1.4-r0 do_fetch: Error executing a python function in exec_python_func() autogenerated:

ftp://ftp@ breaks the fetcher and really is not needed.

---
 meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-cgl-common/recipes-cgl/openais/openais_1.1.4.bb +1 -1
index 69934a5..e503cec 100644
@@ -5,7 +5,7 @@ DEPENDS = "cluster-glue corosync"
 
 
 SRC_URI = " \
-    ftp://[email protected]/gentoo/distfiles/openais-${PV}.tar.gz \
+    http://tux.rainside.sk/gentoo/distfiles/openais-${PV}.tar.gz \
     file://fix-lcrso-linkage.patch \
     file://build-cleanup-configure-ac.patch \
     file://openais-fix-bash.patch \
Signature · 1 line
2.7.4
author
#4 lore raw
In reply to Armin Kuster

ping.

is there an issue with this patch?

Quoted 18 lines · Armin Kuster

From: Armin Kuster <[email protected]>

---
  meta-cgl-common/conf/layer.conf | 2 ++
  1 file changed, 2 insertions(+)
meta-cgl-common/conf/layer.conf +2 -0
index 0c19a95..dfd0d1f 100644
@@ -11,4 +11,6 @@ BBFILE_COLLECTIONS += "cgl-common"
  BBFILE_PATTERN_cgl-common = "^${LAYERDIR}/"
  BBFILE_PRIORITY_cgl-common = "7"
 
+LAYERDEPENDS_cgl-common = "core openembedded-layer networking-layer perl-layer filesystems-layer security openclovis selinux"
+
  require conf/distro/include/cgl_common_security_flags.inc