Do not use systemd-run in Fedora 19

Resolves: rhbz#1157938
- update Requires for s390(x)
2014-10-31 03:35:39 +01:00 · 2014-09-09 10:16:00 +02:00 · 2014-09-03 15:37:30 +02:00 · 2014-08-22 02:04:35 +02:00 · 2014-08-16 23:38:39 +02:00 · 2014-08-16 16:00:20 +02:00
11 changed files with 770 additions and 334 deletions
@@ -1,40 +0,0 @@
--- ceph-0.81/src/Makefile.in.orig	2014-07-02 09:07:44.888133273 -0400
-+++ ceph-0.81/src/Makefile.in	2014-07-03 13:32:30.213133273 -0400
-@@ -3875,6 +3875,7 @@
- 	${WARN_IGNORED_QUALIFIERS} \
- 	-Winit-self \
- 	-Wpointer-arith \
-+	-Wformat \
- 	-Werror=format-security \
- 	-fno-strict-aliasing \
- 	-fsigned-char
-@@ -4928,7 +4929,7 @@
- @LINUX_TRUE@ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
- @LINUX_TRUE@nodist_EXTRA_ceph_test_librbd_fsx_SOURCES = dummy.cc # force c++ linking
- @LINUX_TRUE@ceph_test_librbd_fsx_LDADD = $(LIBKRBD) $(LIBRBD) $(LIBRADOS)
-@LINUX_TRUE@ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
-+@LINUX_TRUE@ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
- ceph_test_cls_rbd_SOURCES = test/cls_rbd/test_cls_rbd.cc
- ceph_test_cls_rbd_LDADD = $(LIBRADOS) libcls_rbd_client.la libcls_lock_client.la $(UNITTEST_LDADD) $(RADOS_TEST_LDADD)
- ceph_test_cls_rbd_CXXFLAGS = $(UNITTEST_CXXFLAGS)
--- ceph-0.81/src/Makefile-env.am.orig	2014-07-02 09:23:02.126133273 -0400
-+++ ceph-0.81/src/Makefile-env.am	2014-07-03 11:50:14.063133273 -0400
-@@ -64,6 +64,7 @@
- 	${WARN_IGNORED_QUALIFIERS} \
- 	-Winit-self \
- 	-Wpointer-arith \
-+	-Wformat \
- 	-Werror=format-security \
- 	-fno-strict-aliasing \
- 	-fsigned-char
--- ceph-0.81/src/test/Makefile.am.orig	2014-07-04 06:36:22.016099589 -0400
-+++ ceph-0.81/src/test/Makefile.am	2014-07-04 06:37:26.156099589 -0400
-@@ -642,7 +642,7 @@
- ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
- nodist_EXTRA_ceph_test_librbd_fsx_SOURCES = dummy.cc # force c++ linking
- ceph_test_librbd_fsx_LDADD = $(LIBKRBD) $(LIBRBD) $(LIBRADOS)
-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
-+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
- bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
- endif
- 
@@ -1,14 +0,0 @@
--- ceph-0.81/configure.ac.orig	2014-07-04 10:00:39.193099589 -0400
-+++ ceph-0.81/configure.ac	2014-07-04 10:03:54.739099589 -0400
-@@ -425,9 +425,9 @@
-         # the search path.
-         AS_IF([test "x$with_debug" = "xyes"], [
-         	dir='/usr/share/java'
-	        junit4_jar=`find $dir -name junit4.jar | head -n 1`
-+	        junit4_jar=`find $dir -name junit.jar | head -n 1`
- 		AS_IF([test -r "$junit4_jar"], [
-		      EXTRA_CLASSPATH_JAR=`dirname $junit4_jar`/junit4.jar
-+		      EXTRA_CLASSPATH_JAR=`dirname $junit4_jar`/junit.jar
- 		      AC_SUBST(EXTRA_CLASSPATH_JAR)
- 		      [have_junit4=1]], [
- 		      AC_MSG_NOTICE([Cannot find junit4.jar (apt-get install junit4)])
@@ -1,11 +0,0 @@
--- ceph-0.81/src/test/librbd/fsx.c.orig	2014-07-04 07:23:03.485099589 -0400
-+++ ceph-0.81/src/test/librbd/fsx.c	2014-07-04 08:11:04.208099589 -0400
-@@ -1360,7 +1360,7 @@
- 	int ret, fd;
- 	struct rbd_ctx cur_ctx = RBD_CTX_INIT;
- 	struct stat file_info;
-	char *good_buf, *temp_buf;
-+	char *good_buf, *temp_buf = NULL;
- 
- 	clone_imagename(imagename, sizeof(imagename), clonenum);
- 	if ((ret = ops->open(imagename, &cur_ctx)) < 0) {
@@ -1,13 +0,0 @@
-diff -urb ceph-0.51/configure.ac ceph-0.51b/configure.ac
--- ceph-0.51/configure.ac	2012-08-26 01:58:14.000000000 +0300
-+++ ceph-0.51b/configure.ac	2012-09-24 09:19:20.791969694 +0300
-@@ -17,6 +17,9 @@
- AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
- 
-+# fix automake problems in 1.12
-+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-+
- # Automake
- AM_INIT_AUTOMAKE
- AM_PROG_CC_C_O
@@ -1,31 +0,0 @@
-From 69baa8948f2d922554e815c572d8339a4a197306 Mon Sep 17 00:00:00 2001
-From: Ken Dreyer <ken.dreyer@inktank.com>
-Date: Tue, 7 Jan 2014 21:51:14 -0700
-Subject: [PATCH] Fedora only: fix sbin path
-
-On Fedora, /sbin is a symbolic link to /usr/sbin. Install all the sbin
-binaries into the /usr/sbin location.
-
-Signed-off-by: Ken Dreyer <ken.dreyer@inktank.com>
---
- src/Makefile-env.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile-env.am b/src/Makefile-env.am
-index 9bc6ee7..d02f034 100644
--- a/src/Makefile-env.am
-+++ b/src/Makefile-env.am
-@@ -26,8 +26,8 @@ bin_DEBUGPROGRAMS =
- # like sbin_SCRIPTS but can be used to install to e.g. /usr/sbin
- ceph_sbindir = $(sbindir)
- 
-# certain things go straight into /sbin, though!
-su_sbindir = /sbin
-+# On Fedora these things also go into /usr/sbin
-+su_sbindir = $(sbindir)
- 
- # C/C++ tests to build will be appended to this
- check_PROGRAMS =
-- 
-1.8.3.1
-
@@ -0,0 +1,13 @@
+--- ceph-0.80.5/src/perfglue/heap_profiler.cc.orig	2014-08-15 16:05:00.161794290 +0200
+++ ceph-0.80.5/src/perfglue/heap_profiler.cc	2014-08-15 16:05:04.691794305 +0200
+@@ -12,8 +12,8 @@
+  * 
+  */
+ 
+-#include <google/heap-profiler.h>
+-#include <google/malloc_extension.h>
+#include <gperftools/heap-profiler.h>
+#include <gperftools/malloc_extension.h>
+ #include "heap_profiler.h"
+ #include "common/environment.h"
+ #include "common/LogClient.h"
@@ -1,18 +0,0 @@
-diff -up ceph-0.46/src/init-ceph.in.orig ceph-0.46/src/init-ceph.in
--- ceph-0.46/src/init-ceph.in.orig	2012-04-24 16:06:39.000000000 -0400
-+++ ceph-0.46/src/init-ceph.in	2012-05-09 16:41:36.500004052 -0400
-@@ -1,11 +1,11 @@
- #!/bin/sh
- # Start/stop ceph daemons
-# chkconfig: 2345 60 80
-+# chkconfig: - 60 80
- 
- ### BEGIN INIT INFO
- # Provides:          ceph
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-+# Default-Start:
-+# Default-Stop:
- # Required-Start:    $remote_fs $named $network $time
- # Required-Stop:     $remote_fs $named $network $time
- # Short-Description: Start Ceph distributed file system daemons at boot time
@@ -0,0 +1,11 @@
+--- ceph-0.80.5/src/test/Makefile.am.orig	2014-08-15 16:30:18.831799418 +0200
+++ ceph-0.80.5/src/test/Makefile.am	2014-08-15 16:23:17.758464663 +0200
+@@ -642,7 +642,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd
+ if LINUX
+ ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
+ ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm
+-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
+ bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
+ endif
+ 
@@ -0,0 +1,40 @@
+From 369daeeb447154016f774d16f1b618cdaaf575d5 Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Fri, 31 Oct 2014 03:27:46 +0100
+Subject: [PATCH] Remove systemd detection in ceph init script, rhbz#1157938
+
+---
+ src/init-ceph.in | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/src/init-ceph.in b/src/init-ceph.in
+index 95723b0..1effb56 100644
+--- a/src/init-ceph.in
+++ b/src/init-ceph.in
+@@ -44,10 +44,6 @@ test -f $LIBDIR/ceph_common.sh || exit 0
+ 
+ EXIT_STATUS=0
+ 
+-# detect systemd
+-SYSTEMD=0
+-grep -qs systemd /proc/1/comm && SYSTEMD=1
+-
+ signal_daemon() {
+     name=$1
+     daemon=$2
+@@ -276,11 +272,7 @@ for name in $what; do
+ 	    [ -n "$wrap" ] && runmode="-f &" && runarg="-f"
+ 	    [ -n "$max_open_files" ] && files="ulimit -n $max_open_files;"
+ 
+-	    if [ $SYSTEMD -eq 1 ]; then
+-		cmd="systemd-run -r bash -c '$files $cmd --cluster $cluster -f'"
+-	    else
+-		cmd="$files $wrap $cmd --cluster $cluster $runmode"
+-	    fi
+	    cmd="$files $wrap $cmd --cluster $cluster $runmode"
+ 
+ 	    if [ $dofsmount -eq 1 ] && [ -n "$fs_devs" ]; then
+ 		get_conf pre_mount "true" "pre mount command"
+-- 
+1.9.3
+
@@ -1 +1 @@
-5020b63746ccbaa454aab09450ee7a43  ceph-0.81.tar.bz2
+c57f6887f6097f95ad2c3b169a94f811  ceph-0.80.5.tar.bz2
Author	SHA1	Message	Date
Boris Ranto	de8bfba2ef	Do not use systemd-run in Fedora 19 Resolves: rhbz#1157938	2014-10-31 03:35:39 +01:00
Dan Horák	f71517fa89	- update Requires for s390(x)	2014-09-09 10:16:00 +02:00
Boris Ranto	d84f5c5288	Fix bz 1136811 (incorrect symlink on fedora)	2014-09-03 15:37:30 +02:00
Boris Ranto	8d46a4a552	Second attempt to fix selinux issue (bz 1118504)	2014-08-22 02:04:35 +02:00
Kalev Lember	25b47f32a9	Obsolete ceph-libcephfs Correct the name of the obsoleted package. It used to be called "ceph-libcephfs" and not "libcephfs". Transaction check error: file /usr/lib64/libcephfs.so.1.0.0 from install of libcephfs1-1:0.80.5-5.fc21.x86_64 conflicts with file from package ceph-libcephfs-0.81.0-6.fc21.x86_64	2014-08-16 23:38:39 +02:00
Boris Ranto	e44806fede	Various fixes: - Do not require xfsprogs/xfsprogs-devel for el6 - Require gperftools-devel for non-ppc/s390 architectures only - Do not require junit -- no need to build libcephfs-test.jar - Build without libxfs for el6 - Build without tcmalloc for ppc/s390 architectures - Location of mkcephfs must depend on a rhel release - Use epoch in the Requires fields [1130700]	2014-08-16 16:00:20 +02:00
Boris Ranto	830e99f484	Use the proper version name in Obsoletes, the previous one did not obsolete all the packages that it should	2014-08-16 10:32:16 +02:00
Boris Ranto	a236dbbbe2	Fix the date in changelog	2014-08-16 03:50:05 +02:00
Peter Robinson	c81d313d7c	- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild	2014-08-15 23:54:45 +00:00
Boris Ranto	5311ad2942	Add the arm pthread hack	2014-08-16 01:11:30 +02:00
Boris Ranto	08b7207d61	Bump the Epoch, we need to keep the latest stable, not development, ceph version in fedora - Use the upstream spec file with the ceph-libs split - Add libs-compat subpackage - Use fedora in rhel 7 checks - Obsolete libcephfs - Depend on redhat-lsb-core for the initscript	2014-08-15 23:07:34 +02:00