Skip to contentSkip to conversation

iscsi-initiator-utils: make it DISTRO_FEATURE dependent

PATCH In review Armin Kuster 2 participants 6 messages Feb 3, 2017 – Feb 22, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/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
#1 lore raw

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

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
#2 lore raw

Re: [meta-cgl][PATCH 2/3] openais: change SRC_URI http to fix error

ping.

is there an issue with this patch ?

- armin

Quoted 24 lines · 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 \
#3 lore raw

Re: [meta-cgl][PATCH 2/3] openais: change SRC_URI http to fix error

Quoted 5 lines · On sön, 2017-02-19 at 19:51 -0800, akuster808 wrote:

ping.

is there an issue with this patch ?

- armin

Hi Armin,
There is nothing wrong with your patches, just that I've been on vacation the past weeks and now I was trying to get meta-cgl to build again on master before merging them.

Anyways, I see Alexandru merged your patches, so all's good.

best regards,
--Adrian

Quoted 30 lines · Armin Kuster
Quoted 28 lines

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 +0 -0
index 69934a5..e503cec 100644
@@ -5,7 +5,7 @@ DEPENDS = "cluster-glue corosync"



  SRC_URI = " \
-    ftp://[email protected]/gentoo/distfiles/openais-${PV}.tar.g z \
+    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 \

#4 lore raw

PATCH 3/3 initramfs: fix parsing issue with do to uboot inclusion

In reply to Armin Kuster

From: Armin Kuster <[email protected]>

since the image type includes "uboot", need to inherit the class for it

---
 meta-cgl-common/images/core-image-cgl-initramfs.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-cgl-common/images/core-image-cgl-initramfs.bb +2 -2
index 0777b7c..2ebbdf5 100644
@@ -12,8 +12,8 @@ export IMAGE_BASENAME = "core-image-cgl-initramfs"
 IMAGE_LINGUAS = ""
 
 LICENSE = "MIT"
-
-IMAGE_FSTYPES = "cpio.gz.u-boot"
+IMAGE_CLASSES = " image_types_uboot"
+IMAGE_FSTYPES ??= "cpio.gz.u-boot"
 
 IMAGE_ROOTFS_SIZE = "8192"
 
Signature · 1 line
2.7.4
author
#5 lore raw

Re: [meta-cgl][PATCH 3/3] initramfs: fix parsing issue with do to uboot inclusion

ignore this one. started at wrong location

-armin

Quoted 24 lines · Armin Kuster

From: Armin Kuster <[email protected]>

since the image type includes "uboot", need to inherit the class for it

---
  meta-cgl-common/images/core-image-cgl-initramfs.bb | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
meta-cgl-common/images/core-image-cgl-initramfs.bb +2 -2
index 0777b7c..2ebbdf5 100644
@@ -12,8 +12,8 @@ export IMAGE_BASENAME = "core-image-cgl-initramfs"
  IMAGE_LINGUAS = ""
 
  LICENSE = "MIT"
-
-IMAGE_FSTYPES = "cpio.gz.u-boot"
+IMAGE_CLASSES = " image_types_uboot"
+IMAGE_FSTYPES ??= "cpio.gz.u-boot"
 
  IMAGE_ROOTFS_SIZE = "8192"