bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ofle...@apache.org
Subject bigtop git commit: BIGTOP-2353: fix qfs suse build
Date Sun, 06 Mar 2016 17:53:51 GMT
Repository: bigtop
Updated Branches:
  refs/heads/master 3ed2eeea8 -> 72ee14cdb


BIGTOP-2353: fix qfs suse build


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/72ee14cd
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/72ee14cd
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/72ee14cd

Branch: refs/heads/master
Commit: 72ee14cdb8565eb2749092cf70d3ba107f924ade
Parents: 3ed2eee
Author: Olaf Flebbe <of@ofleb.be>
Authored: Sun Mar 6 11:23:59 2016 +0100
Committer: Olaf Flebbe <of@fleb.be>
Committed: Sun Mar 6 18:51:02 2016 +0100

----------------------------------------------------------------------
 .../src/common/qfs/patch1-findsusekrb5config.diff        | 11 +++++++++++
 bigtop-packages/src/rpm/qfs/SPECS/qfs.spec               |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/72ee14cd/bigtop-packages/src/common/qfs/patch1-findsusekrb5config.diff
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/qfs/patch1-findsusekrb5config.diff b/bigtop-packages/src/common/qfs/patch1-findsusekrb5config.diff
new file mode 100644
index 0000000..d1e12dc
--- /dev/null
+++ b/bigtop-packages/src/common/qfs/patch1-findsusekrb5config.diff
@@ -0,0 +1,11 @@
+--- qfs-1.1.4/cmake/Modules/FindKrb5.cmake.old	2016-03-06 11:17:38.041431320 +0100
++++ qfs-1.1.4/cmake/Modules/FindKrb5.cmake	2016-03-06 11:18:38.165433125 +0100
+@@ -25,7 +25,7 @@
+     NO_DEFAULT_PATH
+     )
+ ENDIF(KRB5_PREFIX)
+-FIND_PROGRAM(KRB5_C_CONFIG NAMES krb5-config)
++FIND_PROGRAM(KRB5_C_CONFIG NAMES krb5-config PATHS /usr/lib/mit/bin)
+ 
+ MESSAGE(STATUS "found krb5-config here ${KRB5_C_CONFIG}")
+ 

http://git-wip-us.apache.org/repos/asf/bigtop/blob/72ee14cd/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec b/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec
index 599c4ed..2001d46 100644
--- a/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec
+++ b/bigtop-packages/src/rpm/qfs/SPECS/qfs.spec
@@ -74,6 +74,7 @@ Requires: qfs-python
 Requires: qfs-webui
 
 Source0: %{qfs_name}-%{qfs_base_version}.tar.gz
+#BIGTOP_PATCH_FILES
 
 %description
 Quantcast File System (QFS) is a high-performance, fault-tolerant, distributed
@@ -168,8 +169,8 @@ Web UI for viewing Quantcast File Server chunkserver and metaserver status.
 
 echo $RPM_SOURCE_DIR
 echo $RPM_BUILD_ROOT
-exit
 
+#BIGTOP_PATCH_COMMANDS
 %build
 %if 0%{?with_python3}
 PTYHON3_PATH=%{__python3}


Mime
View raw message