Date: Wednesday, June 6, 2018 @ 12:44:48 Author: foxxx0 Revision: 341151
upgpkg: ceph 13.2.0-1 update to 13.2.0 for boost 1.67 Modified: ceph/trunk/PKGBUILD ceph/trunk/boost-1.67.patch ceph/trunk/fix-or-disable-broken-tests.patch ceph/trunk/fix-python2-paths.patch ceph/trunk/remove-distro-version-detection.patch Deleted: ceph/trunk/disable-fail-on-warnings-for-rocksdb.patch --------------------------------------------+ PKGBUILD | 22 +++----- boost-1.67.patch | 35 +++++++------ disable-fail-on-warnings-for-rocksdb.patch | 28 ---------- fix-or-disable-broken-tests.patch | 71 +++++++++++---------------- fix-python2-paths.patch | 26 ++++----- remove-distro-version-detection.patch | 10 +-- 6 files changed, 76 insertions(+), 116 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-06-06 11:59:10 UTC (rev 341150) +++ PKGBUILD 2018-06-06 12:44:48 UTC (rev 341151) @@ -3,8 +3,8 @@ pkgbase='ceph' pkgname=('ceph' 'ceph-libs') -pkgver=12.2.5 -pkgrel=2 +pkgver=13.2.0 +pkgrel=1 pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system' arch=('x86_64') url='https://ceph.com/' @@ -18,24 +18,22 @@ 'python2-prettytable' 'python2-pyopenssl' 'python2-setuptools' 'python2-sphinx' 'python2-tox' 'python2-virtualenv' 'python2-werkzeug' 'sed' 'snappy' 'socat' 'systemd' 'valgrind' 'xfsprogs' 'xmlstarlet' 'yasm' - 'zlib' 'zstd') + 'zlib' 'zstd' 'cunit' 'oath-toolkit' 'fontconfig') options=('emptydirs') source=("https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz" 'ceph.sysusers' - 'disable-fail-on-warnings-for-rocksdb.patch' 'boost-1.67.patch' 'fix-ceph_disk-python-interpreter.patch' 'fix-or-disable-broken-tests.patch' 'fix-python2-paths.patch' 'remove-distro-version-detection.patch') -sha512sums=('bd78358590eb077afcc3c1e12864fadee906c95ac8afee25bdca6155f99b75f89d923159fcc13430abba21a89fee3e566177ff5f9ffabdd3b3f220d05602ab86' +sha512sums=('2524ad5a868024463e1a1edc5bd9c3f7bc1f58e47bf8d331902ed53206120abc6a427dd9c1d657131e67efd955d6ed8052b6c3fed8658aa905d58ac58ee62973' '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049' - '8991759dd968fa073c5ef37c9a9d4513dded9090db0ba33eed57fae03c9ef497f8f99b0d912a3f9b64cd711fb0185fb60c130e247e6ddfe9ae96f6899c12380a' - 'aaddc72bc195b8c265c424479f875a85dfe446ae9634c327e0377cc8d31004cb2c1b992ae46e1c4eb750050ca5e2a4e7928cb53f9f74713dfd01f99016dca970' + '1e29028783bb50ab0fda0ef915a795cd77b09a9b605e8ffaaab9ac6464b207f9b1c8772779ca2e8b90eec4990d516d8400619819c9f3ec21b578aea084da8fa5' '7abd94a333fb0d6c9f7156d69ed6d4bf123f0f3030407f4347209d677b282e5023664d43e74a21a27b7856d3493ae469a17ea8a810331c7266018cc34eee4841' - '89699b0a3d4b7e5f184533a5f658270ca4b942a8af82b106a844c41a652bdb6eaf7cd840c1a4574e88993a8fdedf29c3d066ff22786c5e44122328c77829d107' - 'ead2c5fa20cf2e41041f52039acb5fb513922270bdacde234e7ae8e7fd3375ba63e9e3a930a717829577d4d551fa05151c6709a728cb43ef7f930983b38fd762' - '962f2406d856763a071666a090328789fe6d7ab60258a2ec024eab0ef57d5d00caa42d14771a1bc522c6f74d81ed95b38f1732894fa7f0045ae4fadaa75991b3') + '915bb02b91a2e7c6e21243e5d4d80847aedaf6f899e3bac55f4ccae4bb8386c434aad7f052dd449fd510c103f7796bd0a25c0cfac72ee8d1e94d230cf2f0550a' + 'b8ce48ab190b2408f38a7e78d755d762994d271f7bbf88f51392572d1976c4f81e8fad78eb38051df8ef287d70554214624c7b45359d4bef2c11d9ae7d61151c' + '02c9e8fd3c23fb4c9c4c576ee6d06e8525ca31decfd964fb7231e73c98fe2987a483dda680969752186f0918f47d9af4fb09a4901e5319077f45d870906716da') prepare() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -65,9 +63,7 @@ # fix python interpreter -> python2 for file in \ src/ceph-create-keys \ - src/ceph-rest-api \ src/mount.fuse.ceph \ - src/brag/client/ceph-brag \ src/ceph-detect-init/ceph_detect_init/main.py do sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${file}" @@ -126,7 +122,7 @@ package_ceph-libs() { depends=('boost-libs' 'curl' 'glibc' 'keyutils' 'leveldb' 'libaio' - 'libutil-linux' 'lz4' 'nss' 'python2' 'xfsprogs') + 'libutil-linux' 'lz4' 'nss' 'python2' 'xfsprogs' 'oath-toolkit') cd "${srcdir}/${pkgbase}-${pkgver}/build" Modified: boost-1.67.patch =================================================================== --- boost-1.67.patch 2018-06-06 11:59:10 UTC (rev 341150) +++ boost-1.67.patch 2018-06-06 12:44:48 UTC (rev 341151) @@ -1,18 +1,5 @@ -diff -upr ceph-12.2.5.orig/src/rbd_replay/Replayer.cc ceph-12.2.5/src/rbd_replay/Replayer.cc ---- ceph-12.2.5.orig/src/rbd_replay/Replayer.cc 2018-04-23 19:18:33.000000000 +0300 -+++ ceph-12.2.5/src/rbd_replay/Replayer.cc 2018-06-03 01:55:46.476396645 +0300 -@@ -350,7 +350,7 @@ void Replayer::wait_for_actions(const ac - dout(DEPGRAPH_LEVEL) << "Finished waiting for " << dep.id << " after " << micros << " microseconds" << dendl; - // Apparently the nanoseconds constructor is optional: - // http://www.boost.org/doc/libs/1_46_0/doc/html/date_time/details.html#compile_options -- boost::system_time sub_release_time(action_completed_time + boost::posix_time::microseconds(dep.time_delta * m_latency_multiplier / 1000)); -+ boost::system_time sub_release_time(action_completed_time + boost::posix_time::microseconds(static_cast<long long>(dep.time_delta * m_latency_multiplier / 1000))); - if (sub_release_time > release_time) { - release_time = sub_release_time; - } -diff -upr ceph-12.2.5.orig/src/test/librbd/test_mock_Journal.cc ceph-12.2.5/src/test/librbd/test_mock_Journal.cc ---- ceph-12.2.5.orig/src/test/librbd/test_mock_Journal.cc 2018-06-03 01:56:35.407273176 +0300 -+++ ceph-12.2.5/src/test/librbd/test_mock_Journal.cc 2018-06-03 01:56:29.800506081 +0300 +--- a/src/test/librbd/test_mock_Journal.cc 2018-06-03 01:56:35.407273176 +0300 ++++ b/src/test/librbd/test_mock_Journal.cc 2018-06-03 01:56:29.800506081 +0300 @@ -1,6 +1,8 @@ // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab @@ -22,3 +9,21 @@ #include "test/librbd/test_mock_fixture.h" #include "test/journal/mock/MockJournaler.h" #include "test/librbd/test_support.h" +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -604,13 +604,13 @@ if(WITH_SYSTEM_BOOST) + else() + set(Boost_USE_STATIC_LIBS ON) + endif() +- find_package(Boost 1.66 COMPONENTS ${BOOST_COMPONENTS} REQUIRED) ++ find_package(Boost 1.67 COMPONENTS ${BOOST_COMPONENTS} REQUIRED) + else() + set(BOOST_J 1 CACHE STRING + "max jobs for Boost build") # override w/-DBOOST_J=<n> + set(Boost_USE_STATIC_LIBS ON) + include(BuildBoost) +- build_boost(1.66 ++ build_boost(1.67 + COMPONENTS ${BOOST_COMPONENTS} ${BOOST_HEADER_COMPONENTS}) + include_directories(BEFORE SYSTEM ${Boost_INCLUDE_DIRS}) + endif() Deleted: disable-fail-on-warnings-for-rocksdb.patch =================================================================== --- disable-fail-on-warnings-for-rocksdb.patch 2018-06-06 11:59:10 UTC (rev 341150) +++ disable-fail-on-warnings-for-rocksdb.patch 2018-06-06 12:44:48 UTC (rev 341151) @@ -1,28 +0,0 @@ -From 6559a850512ddefef384d2733823ac2cb8027e3a Mon Sep 17 00:00:00 2001 -From: Kefu Chai <kc...@redhat.com> -Date: Sat, 9 Dec 2017 20:18:39 +0800 -Subject: [PATCH] cmake: disable FAIL_ON_WARNINGS for rocksdb - -otherwise -Werror=implicit-fallthrough will fail the build with GCC-7 - -Signed-off-by: Kefu Chai <kc...@redhat.com> ---- - src/CMakeLists.txt | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d62f7458058e..8e0ad577887a 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -17,10 +17,7 @@ function(do_build_rocksdb) - list(APPEND ROCKSDB_CMAKE_ARGS -DPORTABLE=ON) - list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_AR=${CMAKE_AR}) - list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) -- -- if (CMAKE_CXX_COMPILER_ID STREQUAL Clang) -- list(APPEND ROCKSDB_CMAKE_ARGS -DFAIL_ON_WARNINGS=OFF) -- endif() -+ list(APPEND ROCKSDB_CMAKE_ARGS -DFAIL_ON_WARNINGS=OFF) - - # we use an external project and copy the sources to bin directory to ensure - # that object files are built outside of the source tree. Modified: fix-or-disable-broken-tests.patch =================================================================== --- fix-or-disable-broken-tests.patch 2018-06-06 11:59:10 UTC (rev 341150) +++ fix-or-disable-broken-tests.patch 2018-06-06 12:44:48 UTC (rev 341151) @@ -1,17 +1,6 @@ ---- 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 @@ - for disk in disks: - for partition in disk.get('partition', []): - if partition.get('type') == 'data': -- df = subprocess.check_output("df --output=used " + partition['path'], shell=True) -+ df = subprocess.check_output("df --output=used " + partition['path'], shell=True).decode('utf-8') - used += int(re.findall('\d+', df)[0]) - - 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 -@@ -587,7 +587,6 @@ +--- a/src/test/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200 ++++ b/src/test/CMakeLists.txt 2018-06-04 13:35:28.440465053 +0200 +@@ -572,7 +572,6 @@ add_ceph_test(test_objectstore_memstore. #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) @@ -19,31 +8,31 @@ add_ceph_test(unittest_bufferlist.sh ${CMAKE_SOURCE_DIR}/src/unittest_bufferlist.sh) add_test(NAME run-tox-ceph-disk COMMAND bash ${CMAKE_SOURCE_DIR}/src/ceph-disk/run-tox.sh) ---- a/src/test/common/CMakeLists.txt 2017-08-28 18:30:20.000000000 +0200 -+++ b/src/test/common/CMakeLists.txt 2017-09-21 17:50:30.375079349 +0200 -@@ -42,13 +42,6 @@ - add_ceph_unittest(unittest_prioritized_queue ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_prioritized_queue) - target_link_libraries(unittest_prioritized_queue global ${BLKID_LIBRARIES}) +--- a/src/test/common/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200 ++++ b/src/test/common/CMakeLists.txt 2018-06-04 13:36:33.340014839 +0200 +@@ -41,13 +41,6 @@ add_executable(unittest_prioritized_queu + ) + add_ceph_unittest(unittest_prioritized_queue) -# unittest_mclock_priority_queue --add_executable(unittest_mclock_priority_queue EXCLUDE_FROM_ALL +-add_executable(unittest_mclock_priority_queue - test_mclock_priority_queue.cc - ) --add_ceph_unittest(unittest_mclock_priority_queue ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_mclock_priority_queue) --target_link_libraries(unittest_mclock_priority_queue global ${BLKID_LIBRARIES} dmclock) +-add_ceph_unittest(unittest_mclock_priority_queue) +-target_link_libraries(unittest_mclock_priority_queue ceph-common dmclock) - # unittest_str_map add_executable(unittest_str_map test_str_map.cc ---- a/src/test/encoding/CMakeLists.txt 2017-08-28 18:30:20.000000000 +0200 -+++ b/src/test/encoding/CMakeLists.txt 2017-09-21 17:50:42.202117682 +0200 +--- a/src/test/encoding/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200 ++++ b/src/test/encoding/CMakeLists.txt 2018-06-04 13:37:22.693006351 +0200 @@ -1,4 +1,3 @@ # scripts -add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh) add_ceph_test(readable.sh ${CMAKE_CURRENT_SOURCE_DIR}/readable.sh) ---- a/src/test/run-cli-tests 2017-09-26 18:27:07.000000000 +0200 -+++ b/src/test/run-cli-tests 2017-10-08 16:28:48.574708891 +0200 +--- a/src/test/run-cli-tests 2018-05-29 14:04:02.000000000 +0200 ++++ b/src/test/run-cli-tests 2018-06-04 13:38:12.529328276 +0200 @@ -1,7 +1,7 @@ #!/bin/sh set -e @@ -53,7 +42,7 @@ echo "$0: virtualenv not installed, skipping python-using tests." 1>&2 exit 1 fi -@@ -30,7 +30,7 @@ +@@ -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 # -- t...@inktank.com @@ -78,34 +67,34 @@ # -*- mode:python; tab-width:4; indent-tabs-mode:t -*- # vim: ts=4 sw=4 smarttab expandtab # ---- a/qa/standalone/ceph-helpers.sh 2017-09-26 18:27:07.000000000 +0200 -+++ b/qa/standalone/ceph-helpers.sh 2017-10-10 16:41:58.095364616 +0200 -@@ -158,7 +158,7 @@ +--- a/qa/standalone/ceph-helpers.sh 2018-05-29 14:04:02.000000000 +0200 ++++ b/qa/standalone/ceph-helpers.sh 2018-06-04 13:39:31.305450795 +0200 +@@ -147,7 +147,7 @@ function teardown() { kill_daemons $dir KILL if [ `uname` != FreeBSD ] \ && [ $(stat -f -c '%T' .) == "btrfs" ]; then - __teardown_btrfs $dir -+ true ++ true fi local cores="no" local pattern="$(sysctl -n $KERNCORE)" -@@ -194,12 +194,7 @@ +@@ -183,12 +183,7 @@ function teardown() { } function __teardown_btrfs() { - local btrfs_base_dir=$1 - local btrfs_root=$(df -P . | tail -1 | awk '{print $NF}') -- local btrfs_dirs=$(cd $btrfs_base_dir; sudo btrfs subvolume list . -t | awk '/^[0-9]/ {print $4}' | grep "$btrfs_base_dir/$btrfs_dir") +- local btrfs_dirs=$(cd $btrfs_base_dir; sudo btrfs subvolume list -t . | awk '/^[0-9]/ {print $4}' | grep "$btrfs_base_dir/$btrfs_dir") - for subvolume in $btrfs_dirs; do - sudo btrfs subvolume delete $btrfs_root/$subvolume - done -+ true ++ true } function test_teardown() { ---- a/src/ceph-disk/run-tox.sh 2017-09-26 18:27:07.000000000 +0200 -+++ b/src/ceph-disk/run-tox.sh 2017-10-10 18:52:33.542561990 +0200 -@@ -30,4 +30,4 @@ +--- a/src/ceph-disk/run-tox.sh 2018-05-29 14:04:02.000000000 +0200 ++++ b/src/ceph-disk/run-tox.sh 2018-06-04 13:40:15.601811858 +0200 +@@ -30,4 +30,4 @@ if [ -z $CEPH_BUILD_DIR ]; then fi source ${CEPH_DISK_VIRTUALENV}/bin/activate @@ -113,7 +102,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 -@@ -125,4 +125,4 @@ +@@ -127,4 +127,4 @@ chmod -R o+rx ${STACK_OPT_PATH}/devstack/files cd ${STACK_OPT_PATH}/tempest @@ -150,7 +139,7 @@ debug osd = 20 --- a/src/spdk/test/iscsi_tgt/filesystem/filesystem.sh 2017-04-13 06:05:24.000000000 +0200 +++ b/src/spdk/test/iscsi_tgt/filesystem/filesystem.sh 2017-10-10 21:33:09.084930640 +0200 -@@ -61,7 +61,7 @@ +@@ -55,7 +55,7 @@ parted -s /dev/$dev mkpart primary '0%' '100%' sleep 1 @@ -161,7 +150,7 @@ mkfs.${fstype} -F /dev/${dev}1 --- a/src/spdk/test/nvmf/filesystem/filesystem.sh 2017-04-13 06:05:24.000000000 +0200 +++ b/src/spdk/test/nvmf/filesystem/filesystem.sh 2017-10-10 21:33:26.258820759 +0200 -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ timing_exit parted sleep 1 @@ -185,7 +174,7 @@ devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0" --- a/src/ceph-disk/tests/ceph-disk.sh 2017-09-26 18:27:07.000000000 +0200 +++ b/src/ceph-disk/tests/ceph-disk.sh 2017-10-10 21:35:26.386044372 +0200 -@@ -72,8 +72,7 @@ +@@ -74,8 +74,7 @@ kill_daemons $dir if [ `uname` != FreeBSD ] && \ [ $(stat -f -c '%T' .) == "btrfs" ]; then Modified: fix-python2-paths.patch =================================================================== --- fix-python2-paths.patch 2018-06-06 11:59:10 UTC (rev 341150) +++ fix-python2-paths.patch 2018-06-06 12:44:48 UTC (rev 341151) @@ -1,6 +1,6 @@ ---- a/CMakeLists.txt 2017-09-26 18:27:07.000000000 +0200 -+++ b/CMakeLists.txt 2017-10-06 14:10:11.032378659 +0200 -@@ -63,7 +63,7 @@ +--- a/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200 ++++ b/CMakeLists.txt 2018-06-04 13:41:55.684455580 +0200 +@@ -49,7 +49,7 @@ endif(WITH_CCACHE) option(WITH_MANPAGE "Build man pages." ON) if(WITH_MANPAGE) find_program(SPHINX_BUILD @@ -9,14 +9,14 @@ if(NOT SPHINX_BUILD) message(FATAL_ERROR "Can't find sphinx-build.") endif(NOT SPHINX_BUILD) ---- a/src/tools/setup-virtualenv.sh 2017-09-26 18:27:07.000000000 +0200 -+++ b/src/tools/setup-virtualenv.sh 2017-10-06 15:02:01.736664556 +0200 -@@ -18,10 +18,10 @@ - DIR=$1 +--- a/src/tools/setup-virtualenv.sh 2018-05-29 14:04:02.000000000 +0200 ++++ b/src/tools/setup-virtualenv.sh 2018-06-04 13:43:24.767175961 +0200 +@@ -58,10 +58,10 @@ if [ -z "$DIR" ] ; then + fi rm -fr $DIR mkdir -p $DIR --virtualenv --python python2.7 $DIR -+virtualenv2 --python python2.7 $DIR +-virtualenv --python $PYTHON_BINARY $DIR ++virtualenv2 --python $PYTHON_BINARY $DIR . $DIR/bin/activate -if pip --help | grep -q disable-pip-version-check; then @@ -24,7 +24,7 @@ DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check else DISABLE_PIP_VERSION_CHECK= -@@ -29,12 +29,12 @@ +@@ -69,12 +69,12 @@ fi # older versions of pip will not install wrap_console scripts # when using wheel packages @@ -40,12 +40,12 @@ DISABLE_PIP_VERSION_CHECK=--disable-pip-version-check else DISABLE_PIP_VERSION_CHECK= -@@ -44,7 +44,7 @@ +@@ -84,7 +84,7 @@ if test -d wheelhouse ; then export NO_INDEX=--no-index fi --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' +-pip $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1' ++pip2 $DISABLE_PIP_VERSION_CHECK --log $DIR/log.txt install $NO_INDEX --find-links=file://$(pwd)/wheelhouse 'tox >=2.9.1' if test -f requirements.txt ; then - 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 Modified: remove-distro-version-detection.patch =================================================================== --- remove-distro-version-detection.patch 2018-06-06 11:59:10 UTC (rev 341150) +++ remove-distro-version-detection.patch 2018-06-06 12:44:48 UTC (rev 341151) @@ -1,12 +1,10 @@ ---- a/src/common/util.cc 2017-09-26 18:27:07.000000000 +0200 -+++ b/src/common/util.cc 2017-10-05 15:58:14.852647976 +0200 -@@ -158,8 +158,7 @@ - { +--- a/src/common/util.cc 2018-05-29 14:04:02.000000000 +0200 ++++ b/src/common/util.cc 2018-06-04 13:45:52.279495745 +0200 +@@ -96,7 +96,6 @@ static bool os_release_parse(map<string, static const map<string, string> kvm = { { "distro", "ID=" }, -- { "distro_description", "PRETTY_NAME=" }, + { "distro_description", "PRETTY_NAME=" }, - { "distro_version", "VERSION_ID=" } -+ { "distro_description", "PRETTY_NAME=" } }; FILE *fp = fopen("/etc/os-release", "r");