From c28a63ae1da9f6a38f15de0ab1aeb989de926479 Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Wed, 10 Jun 2020 16:16:14 -0500 Subject: [PATCH 01/10] Adding XrootD major version to the shared file name (software-4093) --- CMakeLists.txt | 10 ++++++++-- rpm/xrootd-hdfs.spec | 12 ++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 788834d..c029603 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,12 @@ find_package( Hdfs REQUIRED ) find_package( Jvm REQUIRED ) find_package( Dl REQUIRED ) +if(NOT XROOTD_PLUGIN_VERSION) + find_program(XROOTD_CONFIG_EXECUTABLE xrootd-config) + exec_program(${XROOTD_CONFIG_EXECUTABLE} ARGS "--plugin-version" OUTPUT_VARIABLE XROOTD_PLUGIN_VERSION RETURN_VALUE RETVAR) + set(XROOTD_PLUGIN_VERSION ${XROOTD_PLUGIN_VERSION} CACHE INTERNAL "") +endif() + include (FindPkgConfig) pkg_check_modules(LIBCRYPTO REQUIRED libcrypto) pkg_check_modules(ZLIB REQUIRED zlib) @@ -42,11 +48,11 @@ include_directories( "${PROJECT_SOURCE_DIR}" "${XROOTD_INCLUDES}" ) add_library(XrdHdfs MODULE src/XrdHdfsBootstrap.cc src/XrdHdfsChecksum.cc src/XrdHdfsChecksumCalc.cc) target_link_libraries(XrdHdfs ${XROOTD_UTILS} ${DL_LIB} ${LIBCRYPTO_LIBRARIES} ${ZLIB_LIBRARIES}) -set_target_properties(XrdHdfs PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/export-lib-symbols") +set_target_properties(XrdHdfs PROPERTIES OUTPUT_NAME "XrdHdfs-${XROOTD_PLUGIN_VERSION}" LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/export-lib-symbols") add_library(XrdHdfsReal MODULE src/XrdHdfs.cc src/XrdHdfsConfig.cc src/XrdHdfs.hh src/XrdHdfsChecksum.cc src/XrdHdfsChecksumCalc.cc) target_link_libraries(XrdHdfsReal ${HDFS_LIB} ${XROOTD_UTILS} ${LIBCRYPTO_LIBRARIES} ${ZLIB_LIBRARIES}) -set_target_properties(XrdHdfsReal PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/export-lib-symbols") +set_target_properties(XrdHdfsReal PROPERTIES OUTPUT_NAME "XrdHdfsReal-${XROOTD_PLUGIN_VERSION}" LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/export-lib-symbols") add_executable(xrootd_hdfs_envcheck src/XrdHdfsEnvCheck.cc) diff --git a/rpm/xrootd-hdfs.spec b/rpm/xrootd-hdfs.spec index 820d443..456680e 100644 --- a/rpm/xrootd-hdfs.spec +++ b/rpm/xrootd-hdfs.spec @@ -1,6 +1,6 @@ Name: xrootd-hdfs Version: 2.1.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: HDFS plugin for xrootd Group: System Environment/Development @@ -62,9 +62,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/xrootd_hdfs_envcheck %files %defattr(-,root,root,-) -%{_libdir}/libXrdHdfs.so -%{_libdir}/libXrdHdfs.so.* -%{_libdir}/libXrdHdfsReal.so +%{_libdir}/libXrdHdfs-*.so +%{_libdir}/libXrdHdfs-*.so.* +%{_libdir}/libXrdHdfsReal-*.so %{_sysconfdir}/xrootd/xrootd.sample.hdfs.cfg %{_libexecdir}/xrootd-hdfs/xrootd_hdfs_envcheck %config(noreplace) %{_sysconfdir}/sysconfig/xrootd-hdfs @@ -74,6 +74,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/xrootd_hdfs_envcheck %{_includedir}/XrdHdfs.hh %changelog +* Wed Jun 10 2020 Diego Davila - 2.1.7-7 +- Adding XrootD major version to the shared file name +- building against XrootD-4.12.2 (software-4093) + * Fri Apr 24 2020 Edgar Fajardo - 2.1.7-6 - Rebuild for xrootd 4.12 (SOFTWARE-4063) From a15a293693e668a975f1a8269d2916c1381da0fe Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Thu, 11 Jun 2020 17:52:50 -0500 Subject: [PATCH 02/10] adding BuildRequires hadoop-libhdfs-devel --- rpm/xrootd-hdfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/xrootd-hdfs.spec b/rpm/xrootd-hdfs.spec index 456680e..463a36d 100644 --- a/rpm/xrootd-hdfs.spec +++ b/rpm/xrootd-hdfs.spec @@ -16,7 +16,7 @@ BuildRequires: xrootd-server-devel < 1:%{xrootd_next}.0-0 BuildRequires: xrootd-devel >= 1:%{xrootd_current}.0-0 BuildRequires: xrootd-devel < 1:%{xrootd_next}.0-0 BuildRequires: cmake -BuildRequires: /usr/include/hdfs.h +BuildRequires: hadoop-libhdfs-devel BuildRequires: java-devel = 1:1.7.0 BuildRequires: jpackage-utils BuildRequires: openssl-devel From 948a0426b092a8f29ec29ddb8577b7b096c4e607 Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Fri, 12 Jun 2020 13:47:05 -0500 Subject: [PATCH 03/10] trying to fix the failed travis test by adding KOJI_BUILD_TAG --- .travis.yml | 1 + rpm/xrootd-hdfs.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2eae315..f68744b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ sudo: required env: - REPO_NAME=${TRAVIS_REPO_SLUG#*/} + - KOJI_BUILD_TAG=osg-3.5-el7-build git: depth: false diff --git a/rpm/xrootd-hdfs.spec b/rpm/xrootd-hdfs.spec index 463a36d..456680e 100644 --- a/rpm/xrootd-hdfs.spec +++ b/rpm/xrootd-hdfs.spec @@ -16,7 +16,7 @@ BuildRequires: xrootd-server-devel < 1:%{xrootd_next}.0-0 BuildRequires: xrootd-devel >= 1:%{xrootd_current}.0-0 BuildRequires: xrootd-devel < 1:%{xrootd_next}.0-0 BuildRequires: cmake -BuildRequires: hadoop-libhdfs-devel +BuildRequires: /usr/include/hdfs.h BuildRequires: java-devel = 1:1.7.0 BuildRequires: jpackage-utils BuildRequires: openssl-devel From 03752696decf60383b26ec990bd1f251e138d50c Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Fri, 12 Jun 2020 14:00:40 -0500 Subject: [PATCH 04/10] putting envars in the same line --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f68744b..381c454 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ sudo: required env: - - REPO_NAME=${TRAVIS_REPO_SLUG#*/} - - KOJI_BUILD_TAG=osg-3.5-el7-build + - REPO_NAME=${TRAVIS_REPO_SLUG#*/} KOJI_BUILD_TAG=osg-3.5-el7-build git: depth: false From 3665f6b7d715216fcbe3f1b16098738de71060ee Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Fri, 12 Jun 2020 15:55:28 -0500 Subject: [PATCH 05/10] Revert "putting envars in the same line" This reverts commit 03752696decf60383b26ec990bd1f251e138d50c. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 381c454..f68744b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ sudo: required env: - - REPO_NAME=${TRAVIS_REPO_SLUG#*/} KOJI_BUILD_TAG=osg-3.5-el7-build + - REPO_NAME=${TRAVIS_REPO_SLUG#*/} + - KOJI_BUILD_TAG=osg-3.5-el7-build git: depth: false From 1389ee0fa40fda1c0ec97a6e2a1adc6f091557c1 Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Fri, 12 Jun 2020 15:55:41 -0500 Subject: [PATCH 06/10] Revert "trying to fix the failed travis test by adding KOJI_BUILD_TAG" This reverts commit 948a0426b092a8f29ec29ddb8577b7b096c4e607. --- .travis.yml | 1 - rpm/xrootd-hdfs.spec | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f68744b..2eae315 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ sudo: required env: - REPO_NAME=${TRAVIS_REPO_SLUG#*/} - - KOJI_BUILD_TAG=osg-3.5-el7-build git: depth: false diff --git a/rpm/xrootd-hdfs.spec b/rpm/xrootd-hdfs.spec index 456680e..463a36d 100644 --- a/rpm/xrootd-hdfs.spec +++ b/rpm/xrootd-hdfs.spec @@ -16,7 +16,7 @@ BuildRequires: xrootd-server-devel < 1:%{xrootd_next}.0-0 BuildRequires: xrootd-devel >= 1:%{xrootd_current}.0-0 BuildRequires: xrootd-devel < 1:%{xrootd_next}.0-0 BuildRequires: cmake -BuildRequires: /usr/include/hdfs.h +BuildRequires: hadoop-libhdfs-devel BuildRequires: java-devel = 1:1.7.0 BuildRequires: jpackage-utils BuildRequires: openssl-devel From 6e4d1915831cc0d356939a3c1054471f8f04bfb8 Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Fri, 12 Jun 2020 15:55:46 -0500 Subject: [PATCH 07/10] Revert "adding BuildRequires hadoop-libhdfs-devel" This reverts commit a15a293693e668a975f1a8269d2916c1381da0fe. --- rpm/xrootd-hdfs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/xrootd-hdfs.spec b/rpm/xrootd-hdfs.spec index 463a36d..456680e 100644 --- a/rpm/xrootd-hdfs.spec +++ b/rpm/xrootd-hdfs.spec @@ -16,7 +16,7 @@ BuildRequires: xrootd-server-devel < 1:%{xrootd_next}.0-0 BuildRequires: xrootd-devel >= 1:%{xrootd_current}.0-0 BuildRequires: xrootd-devel < 1:%{xrootd_next}.0-0 BuildRequires: cmake -BuildRequires: hadoop-libhdfs-devel +BuildRequires: /usr/include/hdfs.h BuildRequires: java-devel = 1:1.7.0 BuildRequires: jpackage-utils BuildRequires: openssl-devel From 74f608ebcf60d0826ade7307f3b320737f00bf4c Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Fri, 12 Jun 2020 15:59:17 -0500 Subject: [PATCH 08/10] Revert "Adding XrootD major version to the shared file name (software-4093)" This reverts commit c28a63ae1da9f6a38f15de0ab1aeb989de926479. --- CMakeLists.txt | 10 ++-------- rpm/xrootd-hdfs.spec | 12 ++++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c029603..788834d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,12 +9,6 @@ find_package( Hdfs REQUIRED ) find_package( Jvm REQUIRED ) find_package( Dl REQUIRED ) -if(NOT XROOTD_PLUGIN_VERSION) - find_program(XROOTD_CONFIG_EXECUTABLE xrootd-config) - exec_program(${XROOTD_CONFIG_EXECUTABLE} ARGS "--plugin-version" OUTPUT_VARIABLE XROOTD_PLUGIN_VERSION RETURN_VALUE RETVAR) - set(XROOTD_PLUGIN_VERSION ${XROOTD_PLUGIN_VERSION} CACHE INTERNAL "") -endif() - include (FindPkgConfig) pkg_check_modules(LIBCRYPTO REQUIRED libcrypto) pkg_check_modules(ZLIB REQUIRED zlib) @@ -48,11 +42,11 @@ include_directories( "${PROJECT_SOURCE_DIR}" "${XROOTD_INCLUDES}" ) add_library(XrdHdfs MODULE src/XrdHdfsBootstrap.cc src/XrdHdfsChecksum.cc src/XrdHdfsChecksumCalc.cc) target_link_libraries(XrdHdfs ${XROOTD_UTILS} ${DL_LIB} ${LIBCRYPTO_LIBRARIES} ${ZLIB_LIBRARIES}) -set_target_properties(XrdHdfs PROPERTIES OUTPUT_NAME "XrdHdfs-${XROOTD_PLUGIN_VERSION}" LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/export-lib-symbols") +set_target_properties(XrdHdfs PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/export-lib-symbols") add_library(XrdHdfsReal MODULE src/XrdHdfs.cc src/XrdHdfsConfig.cc src/XrdHdfs.hh src/XrdHdfsChecksum.cc src/XrdHdfsChecksumCalc.cc) target_link_libraries(XrdHdfsReal ${HDFS_LIB} ${XROOTD_UTILS} ${LIBCRYPTO_LIBRARIES} ${ZLIB_LIBRARIES}) -set_target_properties(XrdHdfsReal PROPERTIES OUTPUT_NAME "XrdHdfsReal-${XROOTD_PLUGIN_VERSION}" LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/export-lib-symbols") +set_target_properties(XrdHdfsReal PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/export-lib-symbols") add_executable(xrootd_hdfs_envcheck src/XrdHdfsEnvCheck.cc) diff --git a/rpm/xrootd-hdfs.spec b/rpm/xrootd-hdfs.spec index 456680e..820d443 100644 --- a/rpm/xrootd-hdfs.spec +++ b/rpm/xrootd-hdfs.spec @@ -1,6 +1,6 @@ Name: xrootd-hdfs Version: 2.1.7 -Release: 7%{?dist} +Release: 6%{?dist} Summary: HDFS plugin for xrootd Group: System Environment/Development @@ -62,9 +62,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/xrootd_hdfs_envcheck %files %defattr(-,root,root,-) -%{_libdir}/libXrdHdfs-*.so -%{_libdir}/libXrdHdfs-*.so.* -%{_libdir}/libXrdHdfsReal-*.so +%{_libdir}/libXrdHdfs.so +%{_libdir}/libXrdHdfs.so.* +%{_libdir}/libXrdHdfsReal.so %{_sysconfdir}/xrootd/xrootd.sample.hdfs.cfg %{_libexecdir}/xrootd-hdfs/xrootd_hdfs_envcheck %config(noreplace) %{_sysconfdir}/sysconfig/xrootd-hdfs @@ -74,10 +74,6 @@ rm $RPM_BUILD_ROOT%{_bindir}/xrootd_hdfs_envcheck %{_includedir}/XrdHdfs.hh %changelog -* Wed Jun 10 2020 Diego Davila - 2.1.7-7 -- Adding XrootD major version to the shared file name -- building against XrootD-4.12.2 (software-4093) - * Fri Apr 24 2020 Edgar Fajardo - 2.1.7-6 - Rebuild for xrootd 4.12 (SOFTWARE-4063) From 60c2422b39069856e3113adbe2751acf71723ecc Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Fri, 12 Jun 2020 17:01:36 -0500 Subject: [PATCH 09/10] passing KOJI_BUILD_TAG to the container --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2eae315..3a7feda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ sudo: required env: - - REPO_NAME=${TRAVIS_REPO_SLUG#*/} + - REPO_NAME=${TRAVIS_REPO_SLUG#*/} KOJI_BUILD_TAG=osg-3.5-el7-build git: depth: false @@ -17,4 +17,4 @@ before_install: - sudo docker pull opensciencegrid/osg-build script: - - docker run -v $(pwd):/$REPO_NAME -e REPO_NAME=$REPO_NAME --cap-add=SYS_ADMIN opensciencegrid/osg-build build-from-github + - docker run -v $(pwd):/$REPO_NAME -e REPO_NAME=$REPO_NAME -e KOJI_BUILD_TAG=osg-3.5-el7-build --cap-add=SYS_ADMIN opensciencegrid/osg-build build-from-github From 267cbbc5e3d40a15bb63aeab0f54ae2a04b82923 Mon Sep 17 00:00:00 2001 From: Diego Davila Date: Fri, 12 Jun 2020 17:07:15 -0500 Subject: [PATCH 10/10] "RE-Adding XrootD major version to the shared file name (software-4093)" This reverts commit 74f608ebcf60d0826ade7307f3b320737f00bf4c. --- CMakeLists.txt | 10 ++++++++-- rpm/xrootd-hdfs.spec | 12 ++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 788834d..c029603 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,12 @@ find_package( Hdfs REQUIRED ) find_package( Jvm REQUIRED ) find_package( Dl REQUIRED ) +if(NOT XROOTD_PLUGIN_VERSION) + find_program(XROOTD_CONFIG_EXECUTABLE xrootd-config) + exec_program(${XROOTD_CONFIG_EXECUTABLE} ARGS "--plugin-version" OUTPUT_VARIABLE XROOTD_PLUGIN_VERSION RETURN_VALUE RETVAR) + set(XROOTD_PLUGIN_VERSION ${XROOTD_PLUGIN_VERSION} CACHE INTERNAL "") +endif() + include (FindPkgConfig) pkg_check_modules(LIBCRYPTO REQUIRED libcrypto) pkg_check_modules(ZLIB REQUIRED zlib) @@ -42,11 +48,11 @@ include_directories( "${PROJECT_SOURCE_DIR}" "${XROOTD_INCLUDES}" ) add_library(XrdHdfs MODULE src/XrdHdfsBootstrap.cc src/XrdHdfsChecksum.cc src/XrdHdfsChecksumCalc.cc) target_link_libraries(XrdHdfs ${XROOTD_UTILS} ${DL_LIB} ${LIBCRYPTO_LIBRARIES} ${ZLIB_LIBRARIES}) -set_target_properties(XrdHdfs PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/export-lib-symbols") +set_target_properties(XrdHdfs PROPERTIES OUTPUT_NAME "XrdHdfs-${XROOTD_PLUGIN_VERSION}" LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/export-lib-symbols") add_library(XrdHdfsReal MODULE src/XrdHdfs.cc src/XrdHdfsConfig.cc src/XrdHdfs.hh src/XrdHdfsChecksum.cc src/XrdHdfsChecksumCalc.cc) target_link_libraries(XrdHdfsReal ${HDFS_LIB} ${XROOTD_UTILS} ${LIBCRYPTO_LIBRARIES} ${ZLIB_LIBRARIES}) -set_target_properties(XrdHdfsReal PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/export-lib-symbols") +set_target_properties(XrdHdfsReal PROPERTIES OUTPUT_NAME "XrdHdfsReal-${XROOTD_PLUGIN_VERSION}" LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/export-lib-symbols") add_executable(xrootd_hdfs_envcheck src/XrdHdfsEnvCheck.cc) diff --git a/rpm/xrootd-hdfs.spec b/rpm/xrootd-hdfs.spec index 820d443..456680e 100644 --- a/rpm/xrootd-hdfs.spec +++ b/rpm/xrootd-hdfs.spec @@ -1,6 +1,6 @@ Name: xrootd-hdfs Version: 2.1.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: HDFS plugin for xrootd Group: System Environment/Development @@ -62,9 +62,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/xrootd_hdfs_envcheck %files %defattr(-,root,root,-) -%{_libdir}/libXrdHdfs.so -%{_libdir}/libXrdHdfs.so.* -%{_libdir}/libXrdHdfsReal.so +%{_libdir}/libXrdHdfs-*.so +%{_libdir}/libXrdHdfs-*.so.* +%{_libdir}/libXrdHdfsReal-*.so %{_sysconfdir}/xrootd/xrootd.sample.hdfs.cfg %{_libexecdir}/xrootd-hdfs/xrootd_hdfs_envcheck %config(noreplace) %{_sysconfdir}/sysconfig/xrootd-hdfs @@ -74,6 +74,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/xrootd_hdfs_envcheck %{_includedir}/XrdHdfs.hh %changelog +* Wed Jun 10 2020 Diego Davila - 2.1.7-7 +- Adding XrootD major version to the shared file name +- building against XrootD-4.12.2 (software-4093) + * Fri Apr 24 2020 Edgar Fajardo - 2.1.7-6 - Rebuild for xrootd 4.12 (SOFTWARE-4063)