[arch-commits] Commit in ceph/trunk (4 files)

Thore Bödecker foxxx0 at archlinux.org
Thu May 3 16:48:32 UTC 2018


    Date: Thursday, May 3, 2018 @ 16:48:32
  Author: foxxx0
Revision: 318879

upgpkg: ceph 12.2.5-1

update to 12.2.5

Modified:
  ceph/trunk/PKGBUILD
  ceph/trunk/fix-or-disable-broken-tests.patch
  ceph/trunk/fix-python2-paths.patch
  ceph/trunk/remove-distro-version-detection.patch

---------------------------------------+
 PKGBUILD                              |   10 +++++-----
 fix-or-disable-broken-tests.patch     |   15 ++-------------
 fix-python2-paths.patch               |    8 ++++----
 remove-distro-version-detection.patch |    9 ---------
 4 files changed, 11 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-03 16:01:22 UTC (rev 318878)
+++ PKGBUILD	2018-05-03 16:48:32 UTC (rev 318879)
@@ -3,7 +3,7 @@
 
 pkgbase='ceph'
 pkgname=('ceph' 'ceph-libs')
-pkgver=12.2.4
+pkgver=12.2.5
 pkgrel=1
 pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
 arch=('x86_64')
@@ -26,12 +26,12 @@
         'fix-or-disable-broken-tests.patch'
         'fix-python2-paths.patch'
         'remove-distro-version-detection.patch')
-sha512sums=('ce9ec49e8693d11345adb3a219763cc76b626db2c26d8d9ba08ff0a4d6fdeb08739da29bb87ff0946fed8e6fd55c8db0672cb286f7ebb90cf2e11a47042ba5d6'
+sha512sums=('bd78358590eb077afcc3c1e12864fadee906c95ac8afee25bdca6155f99b75f89d923159fcc13430abba21a89fee3e566177ff5f9ffabdd3b3f220d05602ab86'
             '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
             '7abd94a333fb0d6c9f7156d69ed6d4bf123f0f3030407f4347209d677b282e5023664d43e74a21a27b7856d3493ae469a17ea8a810331c7266018cc34eee4841'
-            '40446e298ab6b735b149d26ac26d273d6e159c319bb79f112614f1d4933a5a2684007fc9a1d660c5d4a17075d8bac59019c6cc7e66d64d4e240a1a61454800ef'
-            'd5d9e8123833212f6cf0ecef209a5dd9b9a8ec70d780b5140884dc9f87690ec305fb2569c5d1da2b28deb05bd03caecc534acc9dc5ce7ec75e2580df4b5b2063'
-            'e2ed33e2ac37bfdb9597083388e1a87f10051e976033055d440b1a4bc2bd11148c29128fb9841771ca983c12fb36b343bcc04219dea87199321ceea9aa18b3cc')
+            '89699b0a3d4b7e5f184533a5f658270ca4b942a8af82b106a844c41a652bdb6eaf7cd840c1a4574e88993a8fdedf29c3d066ff22786c5e44122328c77829d107'
+            'ead2c5fa20cf2e41041f52039acb5fb513922270bdacde234e7ae8e7fd3375ba63e9e3a930a717829577d4d551fa05151c6709a728cb43ef7f930983b38fd762'
+            '962f2406d856763a071666a090328789fe6d7ab60258a2ec024eab0ef57d5d00caa42d14771a1bc522c6f74d81ed95b38f1732894fa7f0045ae4fadaa75991b3')
 
 prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"

Modified: fix-or-disable-broken-tests.patch
===================================================================
--- fix-or-disable-broken-tests.patch	2018-05-03 16:01:22 UTC (rev 318878)
+++ fix-or-disable-broken-tests.patch	2018-05-03 16:48:32 UTC (rev 318879)
@@ -1,14 +1,3 @@
---- a/src/test/common/test_util.cc	2017-09-18 23:14:01.782825030 +0200
-+++ b/src/test/common/test_util.cc	2017-09-19 10:27:45.926925114 +0200
-@@ -48,7 +48,7 @@
- 
- 
-   ASSERT_TRUE(sys_info.find("distro") != sys_info.end());
--  ASSERT_TRUE(sys_info.find("distro_version") != sys_info.end());
-+  //ASSERT_TRUE(sys_info.find("distro_version") != sys_info.end());
-   ASSERT_TRUE(sys_info.find("distro_description") != sys_info.end());
- 
-   cct->put();
 --- a/src/script/subman	2017-08-28 18:30:20.000000000 +0200
 +++ b/src/script/subman	2017-09-19 13:09:03.417286215 +0200
 @@ -11,7 +11,7 @@
@@ -22,7 +11,7 @@
  facts_file = os.environ.get("CEPH_FACTS_FILE", "/etc/rhsm/facts/ceph_usage.facts")
 --- a/src/test/CMakeLists.txt	2017-08-28 18:30:20.000000000 +0200
 +++ b/src/test/CMakeLists.txt	2017-09-21 17:50:12.074504293 +0200
-@@ -572,7 +572,6 @@
+@@ -587,7 +587,6 @@
  #add_ceph_test(test_pidfile.sh ${CMAKE_CURRENT_SOURCE_DIR}/test_pidfile.sh)
  
  add_ceph_test(test_subman.sh ${CMAKE_CURRENT_SOURCE_DIR}/test_subman.sh)
@@ -124,7 +113,7 @@
 +tox2 -c ${TOX_PATH}
 --- a/qa/workunits/rbd/run_devstack_tempest.sh	2017-09-26 18:27:07.000000000 +0200
 +++ b/qa/workunits/rbd/run_devstack_tempest.sh	2017-10-10 18:53:33.564468674 +0200
-@@ -119,4 +119,4 @@
+@@ -125,4 +125,4 @@
  chmod -R o+rx ${STACK_OPT_PATH}/devstack/files
  
  cd ${STACK_OPT_PATH}/tempest

Modified: fix-python2-paths.patch
===================================================================
--- fix-python2-paths.patch	2018-05-03 16:01:22 UTC (rev 318878)
+++ fix-python2-paths.patch	2018-05-03 16:48:32 UTC (rev 318879)
@@ -44,9 +44,9 @@
      export NO_INDEX=--no-index
  fi
  
--pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse 'tox >=1.9'
-+pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse 'tox >=1.9'
+-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=1.9'
++pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=1.9'
  if test -f requirements.txt ; then
--    pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse -r requirements.txt
-+    pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --use-wheel --find-links=file://$(pwd)/wheelhouse -r requirements.txt
+-    pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse -r requirements.txt
++    pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse -r requirements.txt
  fi

Modified: remove-distro-version-detection.patch
===================================================================
--- remove-distro-version-detection.patch	2018-05-03 16:01:22 UTC (rev 318878)
+++ remove-distro-version-detection.patch	2018-05-03 16:48:32 UTC (rev 318879)
@@ -10,12 +10,3 @@
    };
  
    FILE *fp = fopen("/etc/os-release", "r");
-@@ -182,7 +181,7 @@
-     lderr(cct) << "distro_detect - /etc/os-release is required" << dendl;
-   }
- 
--  for (const char* rk: {"distro", "distro_version"}) {
-+  for (const char* rk: {"distro"}) {
-     if (m->find(rk) == m->end())
-       lderr(cct) << "distro_detect - can't detect " << rk << dendl;
-   }



More information about the arch-commits mailing list