[yocto] [PATCH] [meta-cgl][PATCH 2_2] cluster: Fix the path

Alexandru.Vaduva Alexandru.Vaduva at enea.com
Fri Feb 13 04:39:21 PST 2015


The patch from Qian Lei was redone since the SRC_URI checksum
change ws done previous to this change by me.

Signed-off-by: Qian Lei <qianl.fnst at cn.fujitsu.com>
Signed-off-by: Alexandru.Vaduva <Alexandru.Vaduva at enea.com>
---
 .../cluster/0001-Fix-the-kernel-source-patch.patch | 39 ++++++++++++++++++++++
 .../recipes-cgl/cluster/cluster_3.2.0.bb           |  4 ++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 meta-cgl-common/recipes-cgl/cluster/cluster/0001-Fix-the-kernel-source-patch.patch

diff --git a/meta-cgl-common/recipes-cgl/cluster/cluster/0001-Fix-the-kernel-source-patch.patch b/meta-cgl-common/recipes-cgl/cluster/cluster/0001-Fix-the-kernel-source-patch.patch
new file mode 100644
index 0000000..79640d5
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/cluster/cluster/0001-Fix-the-kernel-source-patch.patch
@@ -0,0 +1,39 @@
+From 7ddf265becd44e7f7270ff98d2dcc14361effe8c Mon Sep 17 00:00:00 2001
+From: Qian Lei <qianl.fnst at cn.fujitsu.com>
+Date: Sun, 18 Jan 2015 14:01:17 +0800
+Subject: [PATCH] Fix the kernel source patch
+
+Signed-off-by: Qian Lei <qianl.fnst at cn.fujitsu.com>
+---
+ configure | 12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/configure b/configure
+index 1e6356e..0c8038f 100755
+--- a/configure
++++ b/configure
+@@ -362,18 +362,10 @@ if (! -d "$objdir/make") {
+
+ my @un = POSIX::uname();
+ if (!$kernel_build) {
+-  if (-d "/lib/modules/$un[2]/build") {
+-    $kernel_build="/lib/modules/$un[2]/build";
+-  } else {
+-    $kernel_build="/usr/src/linux";
+-  }
++  $kernel_build="${KERNEL_SRC}";
+ }
+ if (!$kernel_src) {
+-  if (-d "/lib/modules/$un[2]/source") {
+-    $kernel_src="/lib/modules/$un[2]/source";
+-  } else {
+-    $kernel_src=$kernel_build;
+-  }
++  $kernel_src=$kernel_build;
+ }
+ if (not $disable_kernel_check and !kernel_version($kernel_src,$required_kernelversion)) {
+   exit 1;
+--
+1.8.3.1
+
+
diff --git a/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb b/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb
index 2610236..d85f2b6 100644
--- a/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb
+++ b/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb
@@ -3,7 +3,9 @@ DESCRIPTION = "Red Hat Cluster"
 SECTION = "libs"
 HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage"
 
-SRC_URI = "https://fedorahosted.org/releases/c/l/cluster/${BP}.tar.xz"
+SRC_URI = "https://fedorahosted.org/releases/c/l/cluster/${BP}.tar.xz \
+           file://0001-Fix-the-kernel-source-patch.patch"
+
 
 SRC_URI[md5sum] = "300d83dbbc525c3da21c2e961271c84b"
 SRC_URI[sha256sum] = "4d340338c2376d369cb223469fa1a3356cce9ab5b2a0a0a33256ade2dbbe02d1"
-- 
1.9.1




More information about the yocto mailing list