diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2019-05-07 23:34:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-07 23:34:04 +0200 |
| commit | 2fb1b3156fdb012ef015dc0aed5f00d3d07a4528 (patch) | |
| tree | 4f4c82cc3c572a6e7c5fd854c6bf92743c001d51 /pkgs/tools/filesystems | |
| parent | 24b26eede445256b58edceb02f8e26d578f49866 (diff) | |
| parent | 9cb260d091f5a474ee70ddccc6b8ecad825a78dc (diff) | |
| download | nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.tar nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.tar.gz nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.tar.bz2 nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.tar.lz nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.tar.xz nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.tar.zst nixpkgs-2fb1b3156fdb012ef015dc0aed5f00d3d07a4528.zip | |
Merge pull request #60932 from c0bw3b/patches-cleanup
[treewide] delete (some) unused patches
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch | 25 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/ceph/fix-pythonpath.patch | 31 |
2 files changed, 0 insertions, 56 deletions
diff --git a/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch b/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch deleted file mode 100644 index cb2de6ad4f5..00000000000 --- a/pkgs/tools/filesystems/ceph/0001-Makefile-env-Don-t-force-sbin.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 34c27f66210570adf5aba624d7da3c0382d5493f Mon Sep 17 00:00:00 2001 -From: "William A. Kennington III" <william@wkennington.com> -Date: Sun, 21 Sep 2014 12:19:30 -0700 -Subject: [PATCH] Makefile-env: Don't force /sbin - ---- - src/Makefile-env.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile-env.am b/src/Makefile-env.am -index f2ab655..bf8876e 100644 ---- a/src/Makefile-env.am -+++ b/src/Makefile-env.am -@@ -27,7 +27,7 @@ bin_DEBUGPROGRAMS = - ceph_sbindir = $(sbindir) - - # certain things go straight into /sbin, though! --su_sbindir = /sbin -+su_sbindir = $(sbindir) - - # C/C++ tests to build will be appended to this - check_PROGRAMS = --- -2.1.0 - diff --git a/pkgs/tools/filesystems/ceph/fix-pythonpath.patch b/pkgs/tools/filesystems/ceph/fix-pythonpath.patch deleted file mode 100644 index 7458a46aca1..00000000000 --- a/pkgs/tools/filesystems/ceph/fix-pythonpath.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/Makefile-env.am b/src/Makefile-env.am -index e176596..384e230 100644 ---- a/src/Makefile-env.am -+++ b/src/Makefile-env.am -@@ -40,7 +40,7 @@ check_SCRIPTS = - export VERBOSE = true - - # python unit tests need to know where the scripts are located --export PYTHONPATH=$(top_srcdir)/src/pybind -+export PYTHONPATH+=:$(top_srcdir)/src/pybind - - # when doing a debug build, make sure to make the targets - if WITH_DEBUG -diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am -index 3e5ad03..66d6683 100644 ---- a/src/ceph-detect-init/Makefile.am -+++ b/src/ceph-detect-init/Makefile.am -@@ -64,9 +64,10 @@ install-data-local:: - if test "$(DESTDIR)" ; then \ - if lsb_release -si | grep --quiet 'Ubuntu\|Debian\|Devuan' ; then \ - options=--install-layout=deb ; \ -- else \ -- options=--prefix=/usr ; \ - fi ; \ - root="--root=$(DESTDIR)" ; \ - fi ; \ -- python setup.py install $$root $$options -+ if test "$(prefix)"; then \ -+ prefix="--prefix=$(prefix)" ; \ -+ fi ; \ -+ python setup.py install $$prefix $$root $$options |