[Pkg-ceph-commits] [ceph] 11/59: d/p/*: Drop existing patches, either upstream or obsolete due to switch to cmake build.
James Downing Page
jamespage at moszumanska.debian.org
Thu Feb 1 15:27:50 UTC 2018
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch ubuntu/artful
in repository ceph.
commit 7425695b7cb8710de35381360c491adf804b6bc1
Author: James Page <james.page at ubuntu.com>
Date: Fri Jun 2 09:40:41 2017 +0000
d/p/*: Drop existing patches, either upstream or obsolete due to switch to cmake build.
---
debian/changelog | 2 +
debian/control | 2 +-
debian/patches/arch.patch | 17 ---
debian/patches/bug-10036.patch | 32 -----
debian/patches/fix-argparse-defaults.patch | 18 ---
debian/patches/fix-cycles-arch.patch | 19 ---
debian/patches/powerpc_libatomic.patch | 18 ---
debian/patches/rbdmap3-lazyumount.patch | 51 -------
debian/patches/sample.ceph.conf.patch | 172 -----------------------
debian/patches/series | 23 +---
debian/patches/skip-setup.py-makefiles.patch | 20 ---
debian/patches/sleep-recover.patch | 16 ---
debian/patches/tests-disable.patch | 54 --------
debian/patches/use_system_jerasure.patch | 182 -------------------------
debian/patches/virtualenv-never-download.patch | 16 ---
15 files changed, 6 insertions(+), 636 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a697e16..c31e9bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ ceph (12.0.3-0ubuntu1) UNRELEASED; urgency=medium
ceph-common package.
- d/ceph-common.install: Install crypto modules on amd64 only.
- d/*: wrap-and-sort.
+ - d/p/*: Drop existing patches, either upstream or obsolete due
+ to switch to cmake build.
* Use distro provided boost libraries:
- d/p/disable-boost_container-check.patch: Cherry pick fix from
upstream VCS to check for Boost.Container headers only.
diff --git a/debian/control b/debian/control
index b8b2946..662438c 100644
--- a/debian/control
+++ b/debian/control
@@ -67,7 +67,7 @@ Build-Depends: cmake,
valgrind [amd64 armhf i386 powerpc],
xfslibs-dev,
xfsprogs,
- yasm [amd64],
+ yasm [amd64 i386],
zlib1g-dev,
Build-Conflicts: libcrypto++-dev,
Standards-Version: 3.9.8
diff --git a/debian/patches/arch.patch b/debian/patches/arch.patch
deleted file mode 100644
index 09c3767..0000000
--- a/debian/patches/arch.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Last-Update: 2014-10-19
-Forwarded: not-needed
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: use `dpkg-architecture` instead of `arch` to get build architecture
- Fixes build in `pbuilder` on amd64 for i386.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -244,7 +244,7 @@ AC_CHECK_PROG(YASM_CHECK, yasm, yes)
- if test x"$YASM_CHECK" = x"yes"; then
- if yasm -f elf64 src/common/crc32c_intel_fast_asm.S -o /dev/null; then
- echo 'we have a modern and working yasm'
-- if test `arch` = "x86_64" ; then
-+ if test `dpkg-architecture -qDEB_BUILD_GNU_CPU` = "x86_64" ; then
- echo 'we are x86_64'
- arch_x32=0
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[
diff --git a/debian/patches/bug-10036.patch b/debian/patches/bug-10036.patch
deleted file mode 100644
index 360e476..0000000
--- a/debian/patches/bug-10036.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Last-Update: 2014-12-25
-Bug-Ceph: http://tracker.ceph.com/issues/10036
-Author: Mykola Golub <mgolub at mirantis.com>
-Description: show primary-affinity in OSD tree
-
---- a/src/osd/OSDMap.cc
-+++ b/src/osd/OSDMap.cc
-@@ -2349,19 +2349,23 @@
- *out << std::setprecision(4)
- << (exists(cur) ? get_weightf(cur) : 0)
- << std::setprecision(p)
- << "\t";
-+ *out << std::setprecision(4)
-+ << (exists(cur) ? get_primary_affinityf(cur) : 0)
-+ << std::setprecision(p);
- }
- if (f) {
- f->dump_float("reweight", get_weightf(cur));
-+ f->dump_float("primary_affinity", get_primary_affinityf(cur));
- }
- }
- }
-
- void OSDMap::print_tree(ostream *out, Formatter *f) const
- {
- if (out)
-- *out << "# id\tweight\ttype name\tup/down\treweight\n";
-+ *out << "# id\tweight\ttype name\tup/down\treweight\tprimary-affinity\n";
- if (f)
- f->open_array_section("nodes");
- set<int> touched;
- set<int> roots;
diff --git a/debian/patches/fix-argparse-defaults.patch b/debian/patches/fix-argparse-defaults.patch
deleted file mode 100644
index 5e25985..0000000
--- a/debian/patches/fix-argparse-defaults.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix argparse usage for Python 2.7.9
- The behaviour of set_defaults appears to have
- regressed in python 2.7.9; this patch works around
- this problem by providing the default for 'cluster'
- alongside the --cluster option.
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ceph/+bug/1413321
-Forwarded: no
-
---- a/src/ceph-disk/ceph_disk/main.py
-+++ b/src/ceph-disk/ceph_disk/main.py
-@@ -4515,6 +4515,7 @@ def parse_args(argv):
- parser.set_defaults(
- # we want to hold on to this, for later
- prog=parser.prog,
-+ cluster='ceph',
- )
-
- subparsers = parser.add_subparsers(
diff --git a/debian/patches/fix-cycles-arch.patch b/debian/patches/fix-cycles-arch.patch
deleted file mode 100644
index c441663..0000000
--- a/debian/patches/fix-cycles-arch.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Enable high precision clock for PPC + fallback
- This code is only used for benchmarking so warning and
- fallback if architecture does not have support.
-Author: James Page <james.page at ubuntu.com>
-Forwarded: no
-
---- a/src/common/Cycles.cc
-+++ b/src/common/Cycles.cc
-@@ -57,6 +57,10 @@ void Cycles::init()
- if (rdtsc() == 0)
- return;
-
-+ // Skip initialization if rtdsc is not implemented
-+ if (rdtsc() == 0)
-+ return;
-+
- // Compute the frequency of the fine-grained CPU timer: to do this,
- // take parallel time readings using both rdtsc and gettimeofday.
- // After 10ms have elapsed, take the ratio between these readings.
diff --git a/debian/patches/powerpc_libatomic.patch b/debian/patches/powerpc_libatomic.patch
deleted file mode 100644
index b12da76..0000000
--- a/debian/patches/powerpc_libatomic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Enforce linking with -latomic for powerpc
- Resolves build failures on this arch
-Author: James Page <james.page at ubuntu.com>
-Fowarded: no
-
---- a/src/rocksdb/build_tools/build_detect_platform
-+++ b/src/rocksdb/build_tools/build_detect_platform
-@@ -362,6 +362,10 @@ elif test -z "$PORTABLE"; then
- COMMON_FLAGS="$COMMON_FLAGS -march=native "
- fi
-
-+if [ "$TARGET_ARCHITECTURE" = "powerpc" ] ; then
-+ PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -latomic"
-+fi
-+
- PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"
- PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS $COMMON_FLAGS"
-
diff --git a/debian/patches/rbdmap3-lazyumount.patch b/debian/patches/rbdmap3-lazyumount.patch
deleted file mode 100644
index f415982..0000000
--- a/debian/patches/rbdmap3-lazyumount.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Forwarded: yes
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: rbdmap: lazy umount on shutdown and reboot (runlevel 0 and 6)
-
-Do lazy unmount in runlevel 0 and 6. This is necessary to avoid unclean
-shutdown due to "umount" hangs on reboot.
-
-"rbdmap" fail to umount and unmap RBD device when some applications are
-still using file system on RBD. If RBD device not released on
-shutdown/reboot system deconfigures network interfaces, terminates
-remaining processes then tries to umount remaining file systems where it
-hangs forever in endless libceph attempt to reach MONs. This scenario was
-observed when /home is located on RBD device (users start processes in
-screen/tmux etc.). Even worse, `umount` stuck on RBD mount point so
-remaining local file systems are never un-mounted making unclean shutdown
-almost inevitable.
-
-Lazy umount is effective because it allows to release RBD device and
-unmount file system when applications are terminated.
-
-Also before umount (if `fuser` utility is available) TERM signal will be
-sent to all processes still using mount point so applications that haven't
-been asked to terminate yet will have some time to finish before final cut.
-
-Signed-off-by: Dmitry Smirnov <onlyjob at member.fsf.org>
----
- src/init-rbdmap | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
---- a/src/init-rbdmap
-+++ b/src/init-rbdmap
-@@ -104,7 +104,18 @@ do_unmap() {
- MNT=$(findmnt --mtab --source ${DEV} --noheadings | awk '{print $1'})
- if [ -n "${MNT}" ]; then
- log_action_cont_msg "un-mounting '${MNT}'"
-- UMNT_RV=$(umount "${MNT}" 2>&1)
-+ local ULAZY=""
-+ local RUNLEVEL=$(runlevel | awk '{print $2}')
-+ if [ $? -eq 0 ]; then
-+ if [ "${RUNLEVEL}" -eq 0 ] \
-+ || [ "${RUNLEVEL}" -eq 6 ] ; then
-+ ULAZY="-l"
-+ if [ -x "$(which fuser)" ]; then
-+ fuser -M -m "${MNT}" --kill -TERM
-+ fi
-+ fi
-+ fi
-+ UMNT_RV=$(umount ${ULAZY} "${MNT}" 2>&1)
- fi
- if mountpoint -q "${MNT}"; then
- ## Un-mounting failed.
diff --git a/debian/patches/sample.ceph.conf.patch b/debian/patches/sample.ceph.conf.patch
deleted file mode 100644
index 98ae786..0000000
--- a/debian/patches/sample.ceph.conf.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-Last-Update: 2014-10-19
-Forwarded: no
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: sample.ceph.conf updates:
-
- * corrected URLs.
- * more options and descriptions.
-
---- a/src/sample.ceph.conf
-+++ b/src/sample.ceph.conf
-@@ -31,7 +31,7 @@
- # ; Example: /var/run/ceph/$cluster-$name.asok
-
- [global]
--### http://ceph.com/docs/master/rados/configuration/general-config-ref/
-+### http://ceph.com/docs/giant/rados/configuration/general-config-ref/
-
- ;fsid = {UUID} # use `uuidgen` to generate your own UUID
- ;public network = 192.168.0.0/24
-@@ -51,8 +51,8 @@
- ;max open files = 131072
-
-
--### http://ceph.com/docs/master/rados/operations/authentication
--### http://ceph.com/docs/master/rados/configuration/auth-config-ref/
-+### http://ceph.com/docs/giant/rados/operations/authentication
-+### http://ceph.com/docs/giant/rados/configuration/auth-config-ref/
-
- # If enabled, the Ceph Storage Cluster daemons (i.e., ceph-mon, ceph-osd,
- # and ceph-mds) must authenticate with each other.
-@@ -90,7 +90,7 @@
- ;keyring = /etc/ceph/$cluster.$name.keyring
-
-
--### http://ceph.com/docs/master/rados/configuration/pool-pg-config-ref/
-+### http://ceph.com/docs/giant/rados/configuration/pool-pg-config-ref/
-
-
- ## Replication level, number of data copies.
-@@ -139,7 +139,7 @@
- ;osd crush chooseleaf type = 1
-
-
--### http://ceph.com/docs/master/rados/troubleshooting/log-and-debug/
-+### http://ceph.com/docs/giant/rados/troubleshooting/log-and-debug/
-
- # The location of the logging file for your cluster.
- # Type: String
-@@ -154,7 +154,7 @@
- ;log to syslog = true
-
-
--### http://ceph.com/docs/master/rados/configuration/ms-ref/
-+### http://ceph.com/docs/giant/rados/configuration/ms-ref/
-
- # Enable if you want your daemons to bind to IPv6 address instead of
- # IPv4 ones. (Not required if you specify a daemon or cluster IP.)
-@@ -167,8 +167,8 @@
- ## You need at least one. You need at least three if you want to
- ## tolerate any node failures. Always create an odd number.
- [mon]
--### http://ceph.com/docs/master/rados/configuration/mon-config-ref/
--### http://ceph.com/docs/master/rados/configuration/mon-osd-interaction/
-+### http://ceph.com/docs/giant/rados/configuration/mon-config-ref/
-+### http://ceph.com/docs/giant/rados/configuration/mon-osd-interaction/
-
- # The IDs of initial monitors in a cluster during startup.
- # If specified, Ceph requires an odd number of monitors to form an
-@@ -216,7 +216,7 @@
- # (Default: 900)
- ;mon osd report timeout = 300
-
--### http://ceph.com/docs/master/rados/troubleshooting/log-and-debug/
-+### http://ceph.com/docs/giant/rados/troubleshooting/log-and-debug/
-
- # logging, for debugging monitor crashes, in order of
- # their likelihood of being helpful :)
-@@ -238,6 +238,10 @@
- ; host = gamma
- ; mon addr = 192.168.0.12:6789
-
-+ # The maximum number of simultaneous scrub operations for a Ceph OSD Daemon.
-+ # Type: 32-bit Int
-+ # (Default: 1)
-+ ;osd max scrubs = 2
-
- ##################
- ## Metadata servers
-@@ -245,7 +249,7 @@
- # experimental support for running multiple metadata servers. Do not run
- # multiple metadata servers in production.
- [mds]
--### http://ceph.com/docs/master/cephfs/mds-config-ref/
-+### http://ceph.com/docs/giant/cephfs/mds-config-ref/
-
- # where the mds keeps it's secret encryption keys
- ;keyring = /var/lib/ceph/mds/$name/keyring
-@@ -277,7 +281,7 @@
- # You need at least one. Two or more if you want data to be replicated.
- # Define as many as you like.
- [osd]
--### http://ceph.com/docs/master/rados/configuration/osd-config-ref/
-+### http://ceph.com/docs/giant/rados/configuration/osd-config-ref/
-
- # The path to the OSDs data.
- # You must create the directory when deploying Ceph.
-@@ -337,7 +341,7 @@
- # (Default: false)
- ;osd check for log corruption = true
-
--### http://ceph.com/docs/master/rados/configuration/journal-ref/
-+### http://ceph.com/docs/giant/rados/configuration/journal-ref/
-
- # The size of the journal in megabytes. If this is 0,
- # and the journal is a block device, the entire block device is used.
-@@ -363,7 +367,7 @@
- ;debug filestore = 20
- ;debug journal = 20
-
--### http://ceph.com/docs/master/rados/configuration/filestore-config-ref/
-+### http://ceph.com/docs/giant/rados/configuration/filestore-config-ref/
-
- # The maximum interval in seconds for synchronizing the filestore.
- # Type: Double (optional)
-@@ -376,12 +380,6 @@
- # (Default: true)
- ;filestore btrfs snap = false
-
-- # Enables the filestore flusher.
-- # Type: Boolean
-- # Required: No
-- # (Default: false)
-- ;filestore flusher = true
--
- # Defines the maximum number of in progress operations the file store
- # accepts before blocking on queuing new operations.
- # Type: Integer
-@@ -391,7 +389,7 @@
-
- ## Filestore and OSD settings can be tweak to achieve better performance
-
--### http://ceph.com/docs/master/rados/configuration/filestore-config-ref/#misc
-+### http://ceph.com/docs/giant/rados/configuration/filestore-config-ref/#misc
-
- # Min number of files in a subdir before merging into parent NOTE: A negative value means to disable subdir merging
- # Type: Integer
-@@ -424,6 +422,7 @@
- # (Default: true)
- ;osd crush update on start = false
-
-+
- ;[osd.0]
- ; host = delta
-
-@@ -441,7 +440,7 @@
- ## client settings
- [client]
-
--### http://ceph.com/docs/master/rbd/rbd-config-ref/
-+### http://ceph.com/docs/giant/rbd/rbd-config-ref/
-
- # Enable caching for RADOS Block Device (RBD).
- # Type: Boolean
-@@ -497,7 +496,7 @@
- ## radosgw client settings
- [client.radosgw.gateway]
-
--### http://ceph.com/docs/master/radosgw/config-ref/
-+### http://ceph.com/docs/giant/radosgw/config-ref/
-
- # Sets the location of the data files for Ceph Object Gateway.
- # You must create the directory when deploying Ceph.
diff --git a/debian/patches/series b/debian/patches/series
index 7f13b30..ebd8010 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,24 +1,7 @@
-## Backported / Upstream
-#sleep-recover.patch
-
-## Debian
-#rbdmap3-lazyumount.patch
-#arch.patch
-#sample.ceph.conf.patch
-# Disabled until adopted upstream
-# use_system_jerasure.patch
-#virtualenv-never-download.patch
-# Testing patches
-#tests-disable.patch
-
-## From Ubuntu
-#fix-argparse-defaults.patch
-#fix-cycles-arch.patch
-#skip-setup.py-makefiles.patch
-#powerpc_libatomic.patch
-
-# Misc fixes for Boost integration
+# Ubuntu: Misc fixes for Boost integration
disable-boost_container-check.patch
radosgw-boost-linking.patch
conditional-rgw-beast.patch
+
+# Ubuntu: i386 build failure
gf-complete-i386.patch
diff --git a/debian/patches/skip-setup.py-makefiles.patch b/debian/patches/skip-setup.py-makefiles.patch
deleted file mode 100644
index 9e36e35..0000000
--- a/debian/patches/skip-setup.py-makefiles.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Skip Makefile base install of python modules
- ceph-disk and ceph-detect-init are python modules; the Makefile
- based build uses tox and virtualenv, which we really don't want
- to use in the package build process.
- .
- Skip this part of the build, and use d/rules to install.
-Author: James Page <james.page at ubuntu.com>
-Forwarded: not-needed
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -32,8 +32,6 @@ endif
- include arch/Makefile.am
- include auth/Makefile.am
- include brag/Makefile.am
--include ceph-detect-init/Makefile.am
--include ceph-disk/Makefile.am
- include crush/Makefile.am
- include kv/Makefile.am
- include mon/Makefile.am
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
deleted file mode 100644
index 658b69b..0000000
--- a/debian/patches/sleep-recover.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Last-Update: 2014-05-12
-Forwarded: not-needed
-Bug-Ceph: http://tracker.ceph.com/issues/8291
-Author: Yan, Zheng <ukernel at gmail.com>
-Description: fix fuse-client hang after wake-up from suspend.
-
---- a/src/client/Client.cc
-+++ b/src/client/Client.cc
-@@ -12061,6 +12061,7 @@ void Client::ms_handle_remote_reset(Conn
- case MetaSession::STATE_OPEN:
- ldout(cct, 1) << "reset from mds we were open; mark session as stale" << dendl;
- s->state = MetaSession::STATE_STALE;
-+ _closed_mds_session(s);
- break;
-
- case MetaSession::STATE_NEW:
diff --git a/debian/patches/tests-disable.patch b/debian/patches/tests-disable.patch
deleted file mode 100644
index 7cd5a50..0000000
--- a/debian/patches/tests-disable.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Last-Update: 2014-10-31
-Forwarded: no
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: disable tests that depend on network...
-
---- a/src/test/Makefile.am
-+++ b/src/test/Makefile.am
-@@ -100,6 +100,7 @@ bin_DEBUGPROGRAMS += ceph_bench_log
-
- ## Unit tests
-
-+if WITH_CLUSTER_TESTS
- check_SCRIPTS += \
- test/ceph_objectstore_tool.py \
- test/test-ceph-helpers.sh \
-@@ -133,6 +134,8 @@ check_SCRIPTS += \
- test/test_pidfile.sh \
- test/test_subman.sh
-
-+endif
-+
- EXTRA_DIST += \
- $(srcdir)/test/python/brag-client/setup.py \
- $(srcdir)/test/python/brag-client/tox.ini \
---- a/configure.ac
-+++ b/configure.ac
-@@ -1349,6 +1349,13 @@ AC_LANG_POP([C++])
-
- AM_CONDITIONAL(WITH_BUILD_TESTS, test "$WITH_BUILD_TESTS" = "1")
-
-+AC_ARG_WITH([cluster-tests],
-+ [AS_HELP_STRING([--with-cluster-tests], [enables cluster tests])],
-+ [],
-+ [with_cluster_tests=no]
-+)
-+AM_CONDITIONAL(WITH_CLUSTER_TESTS, [ test "$with_cluster_tests" = "yes" ])
-+
- AM_PATH_PYTHON([2.4],
- [], [AC_MSG_FAILURE([Failed to find Python 2.4 or newer])])
-
---- a/src/test/erasure-code/Makefile.am
-+++ b/src/test/erasure-code/Makefile.am
-@@ -1,9 +1,11 @@
- if ENABLE_SERVER
- if WITH_OSD
-
-+if WITH_CLUSTER_TESTS
- check_SCRIPTS += \
- test/erasure-code/test-erasure-code.sh \
- test/erasure-code/test-erasure-eio.sh
-+endif
-
- noinst_HEADERS += \
- test/erasure-code/ceph_erasure_code_benchmark.h
diff --git a/debian/patches/use_system_jerasure.patch b/debian/patches/use_system_jerasure.patch
deleted file mode 100644
index 7c9858c..0000000
--- a/debian/patches/use_system_jerasure.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-Last-Update: 2014-12-09
-Forwarded: not-needed
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: use system "libjerasure" instead of bundled one.
-
---- a/src/erasure-code/jerasure/Makefile.am
-+++ b/src/erasure-code/jerasure/Makefile.am
-@@ -1,40 +1,8 @@
- # jerasure plugin
- noinst_HEADERS += \
-- erasure-code/jerasure/gf-complete/include/gf_complete.h \
-- erasure-code/jerasure/gf-complete/include/gf_general.h \
-- erasure-code/jerasure/gf-complete/include/gf_int.h \
-- erasure-code/jerasure/gf-complete/include/gf_method.h \
-- erasure-code/jerasure/gf-complete/include/gf_rand.h \
-- erasure-code/jerasure/gf-complete/include/gf_w16.h \
-- erasure-code/jerasure/gf-complete/include/gf_w32.h \
-- erasure-code/jerasure/gf-complete/include/gf_w4.h \
-- erasure-code/jerasure/gf-complete/include/gf_w64.h \
-- erasure-code/jerasure/gf-complete/include/gf_w8.h \
-- erasure-code/jerasure/jerasure/include/cauchy.h \
-- erasure-code/jerasure/jerasure/include/galois.h \
-- erasure-code/jerasure/jerasure/include/jerasure.h \
-- erasure-code/jerasure/jerasure/include/liberation.h \
-- erasure-code/jerasure/jerasure/include/reed_sol.h \
- erasure-code/jerasure/ErasureCodeJerasure.h
-
- jerasure_sources = \
-- erasure-code/ErasureCode.cc \
-- erasure-code/jerasure/jerasure/src/cauchy.c \
-- erasure-code/jerasure/jerasure/src/galois.c \
-- erasure-code/jerasure/jerasure/src/jerasure.c \
-- erasure-code/jerasure/jerasure/src/liberation.c \
-- erasure-code/jerasure/jerasure/src/reed_sol.c \
-- erasure-code/jerasure/gf-complete/src/gf_wgen.c \
-- erasure-code/jerasure/gf-complete/src/gf_method.c \
-- erasure-code/jerasure/gf-complete/src/gf_w16.c \
-- erasure-code/jerasure/gf-complete/src/gf.c \
-- erasure-code/jerasure/gf-complete/src/gf_w32.c \
-- erasure-code/jerasure/gf-complete/src/gf_w64.c \
-- erasure-code/jerasure/gf-complete/src/gf_w128.c \
-- erasure-code/jerasure/gf-complete/src/gf_general.c \
-- erasure-code/jerasure/gf-complete/src/gf_w4.c \
-- erasure-code/jerasure/gf-complete/src/gf_rand.c \
-- erasure-code/jerasure/gf-complete/src/gf_w8.c \
- erasure-code/jerasure/ErasureCodePluginJerasure.cc \
- erasure-code/jerasure/ErasureCodeJerasure.cc
-
-@@ -42,13 +10,11 @@ erasure-code/jerasure/ErasureCodePluginJ
-
- libec_jerasure_generic_la_SOURCES = ${jerasure_sources}
- libec_jerasure_generic_la_CFLAGS = ${AM_CFLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
-+ -I$(includedir)/jerasure
- libec_jerasure_generic_la_CXXFLAGS= ${AM_CXXFLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
-+ -I$(includedir)/jerasure
- libec_jerasure_generic_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
-+libec_jerasure_generic_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
- if LINUX
- libec_jerasure_generic_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
-@@ -85,17 +51,15 @@ libec_jerasure_sse3_la_CFLAGS = ${AM_CFL
- ${INTEL_SSE2_FLAGS} \
- ${INTEL_SSE3_FLAGS} \
- ${INTEL_SSSE3_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
-+ -I$(includedir)/jerasure
- libec_jerasure_sse3_la_CXXFLAGS= ${AM_CXXFLAGS} \
- ${INTEL_SSE_FLAGS} \
- ${INTEL_SSE2_FLAGS} \
- ${INTEL_SSE3_FLAGS} \
- ${INTEL_SSSE3_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
-+ -I$(includedir)/jerasure
- libec_jerasure_sse3_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
-+libec_jerasure_sse3_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
- if LINUX
- libec_jerasure_sse3_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
-@@ -112,8 +76,7 @@ libec_jerasure_sse4_la_CFLAGS = ${AM_CFL
- ${INTEL_SSSE3_FLAGS} \
- ${INTEL_SSE4_1_FLAGS} \
- ${INTEL_SSE4_2_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
-+ -I$(includedir)/jerasure
- libec_jerasure_sse4_la_CXXFLAGS= ${AM_CXXFLAGS} \
- ${INTEL_SSE_FLAGS} \
- ${INTEL_SSE2_FLAGS} \
-@@ -121,10 +84,9 @@ libec_jerasure_sse4_la_CXXFLAGS= ${AM_CX
- ${INTEL_SSSE3_FLAGS} \
- ${INTEL_SSE4_1_FLAGS} \
- ${INTEL_SSE4_2_FLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include
-+ -I$(includedir)/jerasure
- libec_jerasure_sse4_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
-+libec_jerasure_sse4_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
- if LINUX
- libec_jerasure_sse4_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
-@@ -138,7 +100,7 @@ libec_jerasure_la_SOURCES = \
- libec_jerasure_la_CFLAGS = ${AM_CFLAGS}
- libec_jerasure_la_CXXFLAGS= ${AM_CXXFLAGS}
- libec_jerasure_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
--libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
-+libec_jerasure_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
- if LINUX
- libec_jerasure_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
---- a/src/erasure-code/shec/Makefile.am
-+++ b/src/erasure-code/shec/Makefile.am
-@@ -6,54 +6,24 @@ libec_shec_la_SOURCES = \
- erasure-code/shec/ErasureCodeShec.cc \
- erasure-code/shec/ErasureCodeShecTableCache.cc \
- erasure-code/shec/shec.cc \
-- erasure-code/shec/determinant.c \
-- erasure-code/jerasure/jerasure/src/cauchy.c \
-- erasure-code/jerasure/jerasure/src/galois.c \
-- erasure-code/jerasure/jerasure/src/jerasure.c \
-- erasure-code/jerasure/jerasure/src/liberation.c \
-- erasure-code/jerasure/jerasure/src/reed_sol.c \
-- erasure-code/jerasure/gf-complete/src/gf_wgen.c \
-- erasure-code/jerasure/gf-complete/src/gf_method.c \
-- erasure-code/jerasure/gf-complete/src/gf_w16.c \
-- erasure-code/jerasure/gf-complete/src/gf.c \
-- erasure-code/jerasure/gf-complete/src/gf_w32.c \
-- erasure-code/jerasure/gf-complete/src/gf_w64.c \
-- erasure-code/jerasure/gf-complete/src/gf_w128.c \
-- erasure-code/jerasure/gf-complete/src/gf_general.c \
-- erasure-code/jerasure/gf-complete/src/gf_w4.c \
-- erasure-code/jerasure/gf-complete/src/gf_rand.c \
-- erasure-code/jerasure/gf-complete/src/gf_w8.c
-+ erasure-code/shec/determinant.c
- noinst_HEADERS += \
- erasure-code/shec/ErasureCodeShec.h \
- erasure-code/shec/ErasureCodeShecTableCache.h \
-- erasure-code/shec/shec.h \
-- erasure-code/jerasure/jerasure/include/cauchy.h \
-- erasure-code/jerasure/jerasure/include/galois.h \
-- erasure-code/jerasure/jerasure/include/jerasure.h \
-- erasure-code/jerasure/jerasure/include/liberation.h \
-- erasure-code/jerasure/jerasure/include/reed_sol.h \
-- erasure-code/jerasure/gf-complete/include/gf_int.h \
-- erasure-code/jerasure/gf-complete/include/gf_complete.h \
-- erasure-code/jerasure/gf-complete/include/gf_rand.h \
-- erasure-code/jerasure/gf-complete/include/gf_method.h \
-- erasure-code/jerasure/gf-complete/include/gf_general.h
-+ erasure-code/shec/shec.h
-
- erasure-code/shec/ErasureCodePluginShec.cc: ./ceph_ver.h
-
- libec_shec_la_CFLAGS = ${AM_CFLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure \
-- -I$(srcdir)/erasure-code/shec
-+ -I$(srcdir)/erasure-code/shec \
-+ -I$(includedir)/jerasure
- libec_shec_la_CXXFLAGS= ${AM_CXXFLAGS} \
-- -I$(srcdir)/erasure-code/jerasure/jerasure/include \
-- -I$(srcdir)/erasure-code/jerasure/gf-complete/include \
-- -I$(srcdir)/erasure-code/jerasure \
-- -I$(srcdir)/erasure-code/shec
-+ -I$(srcdir)/erasure-code/shec \
-+ -I$(includedir)/jerasure
- libec_shec_la_LIBADD = $(LIBCRUSH) $(PTHREAD_LIBS) $(EXTRALIBS)
- #libec_shec_la_LIBADD = $(PTHREAD_LIBS) $(EXTRALIBS)
- #libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -version-info 1:0:0 -export-symbols-regex '.*__erasure_code_.*'
--libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared
-+libec_shec_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version -shared -lJerasure
- if LINUX
- libec_shec_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*'
- endif
diff --git a/debian/patches/virtualenv-never-download.patch b/debian/patches/virtualenv-never-download.patch
deleted file mode 100644
index 23f151f..0000000
--- a/debian/patches/virtualenv-never-download.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Last-Update: 2014-10-31
-Forwarded: no
-Author: Bastian Blank <waldi at debian.org>
-Description: Ask virtualenv to never download anything
-
---- a/src/test/run-cli-tests
-+++ b/src/test/run-cli-tests
-@@ -30,7 +30,7 @@ if [ ! -e "$CRAM_BIN" ]; then
- # patched cram to support that. See upstream ticket at
- # https://bitbucket.org/brodie/cram/issue/9/allow-read-only-directories-for-t
- # -- tv at inktank.com
-- virtualenv "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
-+ virtualenv --system-site-packages "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
- fi
-
- SRCDIR_ABS="$(readlink -f "$SRCDIR")"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list