RPM Build script && Use host glibmm (#96)

dhilst · web-flow · commit ae1436e09e76 · 2025-03-17T14:11:59.000-03:00
* Add script to build rpms

* Fix debug build

* Link against host Glibmm using pkg-config

* Extract glibmm from diskImage, move it to files.cpp

---------

Co-authored-by: Daniel Hilst &lt;daniel@versatushpc.com.br&gt;
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,10 @@ cmake_minimum_required(VERSION 3.26.5)
 # so that it works well with tools like CPM or other
 # manual dependency management
 
+# Load PkgConfig so we can use pkg_check_modules later
+# to find local packages.
+find_package(PkgConfig REQUIRED)
+
 # Only set the cxx_standard if it is not set by someone else
 if (NOT DEFINED CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 23)
diff --git a/Dependencies.cmake b/Dependencies.cmake
@@ -86,14 +86,6 @@ function(cloysterhpc_setup_dependencies)
     endif()
   endif()
 
-  if(NOT TARGET glibmm::glibmm)
-    if (cloysterhpc_ENABLE_CONAN)
-      CPMFindPackage(NAME glibmm)
-    else()
-      CPMAddPackage("gh:GNOME/glibmm@2.78.1")
-    endif()
-  endif()
-
   if(NOT TARGET SDBusCpp::sdbus-c++)
     if (cloysterhpc_ENABLE_CONAN)
       CPMFindPackage(NAME sdbus-c++)
@@ -123,13 +115,29 @@ function(cloysterhpc_setup_dependencies)
   endif()
 
   # Standalone packages
+  include(FindPackageHandleStandardArgs)
+
   # Include module path for packages that we need to find or build
   set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
   include(cmake/Findnewt.cmake)
   if(NOT TARGET newt)
     CPMFindPackage(NAME newt)
   endif()
 
+  if(NOT TARGET glibmm)
+    pkg_check_modules(GLIBMM REQUIRED glibmm-2.4)
+
+    message(STATUS "GLIBMM_LIBRARIES=${GLIBMM_LIBRARIES}")
+    message(STATUS "GLIBMM_INCLUDE_DIRS=${GLIBMM_INCLUDE_DIRS}")
+    find_package_handle_standard_args(glibmm
+      DEFAULT_MSG
+      GLIBMM_LIBRARIES
+      GLIBMM_INCLUDE_DIRS)
+
+    mark_as_advanced(GLIBMM_INCLUDE_DIRS GLIBMM_LIBRARIES)
+    # include_directories(${GLIBMM_INCLUDE_DIRS})
+  endif()
+
   # Set the variable ${STDC++FS} to the correct library
   include(cmake/Addstdcppfs.cmake)
 
diff --git a/buildrpm.sh b/buildrpm.sh
@@ -0,0 +1,40 @@
+#!/bin/bash -eu
+
+function check_build_distro() {
+    local SUPPORTED_BUILD_DISTS=(rocky)
+    local ID=$(awk -F= '/^ID=/ { gsub("\"" , "", $2); print $2}' /etc/os-release)
+    case "${SUPPORTED_BUILD_DISTS[*]}" in
+        "${ID}")
+            ;;
+        *)
+            echo "Build RPM Environment not supported, you need to run this" \
+              "in one of these distros: ${SUPPORTED_BUILD_DISTS}"
+            exit -1
+            ;;
+    esac
+}
+
+function check_rpmbuild_installed() {
+    if ! rpm -q rpmdevtools; then
+        sudo dnf -y install rpmdevtools;
+        rpmdev-setuptree;
+    fi
+}
+
+function check_rpmbuild_init() {
+    if [ ! -d ~/rpmbuild/SOURCES ]; then
+        rpmdev-setuptree
+    fi
+}
+
+check_build_distro
+check_rpmbuild_installed
+check_rpmbuild_init
+
+VERSION=$(awk '/Version:/ {print $2}' rpmspecs/opencattus.spec)
+cp rpmspecs/opencattus.spec ~/rpmbuild/SPECS/
+git archive -o ~/rpmbuild/SOURCES/opencattus-${VERSION}.tar.gz \
+    --format tgz HEAD --prefix opencattus-${VERSION}/
+rpmbuild -ba ~/rpmbuild/SPECS/opencattus.spec
+echo "RPM Generated"
+ls -l ~/rpmbuild/RPMS/*/opencattus-installer*.rpm
diff --git a/cmake/CommonLibraries.cmake b/cmake/CommonLibraries.cmake
@@ -9,7 +9,7 @@ set(COMMON_LIBS
         Boost::thread
         spdlog::spdlog
         gsl::gsl-lite
-        glibmm::glibmm
+        ${GLIBMM_LIBRARIES}
         magic_enum::magic_enum
         SimpleIni::SimpleIni
         resolv
diff --git a/conanfile.py b/conanfile.py
@@ -4,7 +4,6 @@
 class MyProjectConan(ConanFile):
     name = "CloysterHPC"
     version = "0.1.1"
-
     settings = "os", "arch", "compiler", "build_type"
 
     def requirements(self):
@@ -16,7 +15,9 @@ def requirements(self):
         self.requires("gsl-lite/[>=0.41.0 <0.42.0]")
         self.requires("doctest/[>=2.4.0 <2.5.0]")
         self.requires("sdbus-cpp/[>=2.0.0 <2.1.0]")
-        self.requires("glibmm/[>=2.78.1 <2.79.0]")
+
+        # We're using host's glibmm
+        # self.requires("glibmm/[>=2.78.1 <2.79.0]")
 
         # Override libmount to unify on 2.39.2.
         # This prevents the conflict with glib and sdbus-cpp requirements.
diff --git a/include/cloysterhpc/functions.h b/include/cloysterhpc/functions.h
@@ -5,12 +5,9 @@
 #include <boost/process/child.hpp>
 #include <boost/process/pipe.hpp>
 #include <cloysterhpc/services/repos.h>
-#include <concepts>
 #include <filesystem>
-#include <glibmm/ustring.h>
 #include <list>
 #include <optional>
-#include <ranges>
 #include <string>
 
 #include <boost/asio.hpp>
diff --git a/include/cloysterhpc/services/files.h b/include/cloysterhpc/services/files.h
@@ -91,6 +91,10 @@ static_assert(cloyster::concepts::IsSaveable<KeyFile>);
 static_assert(concepts::IsMoveable<KeyFile>);
 static_assert(!concepts::IsCopyable<KeyFile>);
 
+
+std::string checksum(const std::string& data);
+std::string checksum(const std::filesystem::path& path, const std::size_t chunkSize = 16384);
+
 };
 
 #endif
diff --git a/rpmspecs/opencattus.spec b/rpmspecs/opencattus.spec
@@ -0,0 +1,40 @@
+Name: opencattus-installer 
+Version: 1.0
+Release: 1
+Summary: OpenCATTUS Installer
+License: Apache 2.0
+URL: https://versatushpc.com.br/opencattus/
+Source0: opencattus-%{VERSION}.tar.gz
+BuildRequires: make,cmake,cppcheck,ninja-build,newt-devel,gcc-toolset-14,gcc-toolset-14-libubsan-devel,gcc-toolset-14-libasan-devel
+Requires: newt
+
+# Disable debug package for now
+%global _enable_debug_package 0
+%global debug_package %{nil}
+
+%description
+Use OpenCATTUS installer to setup a HPC cluster from scratch.
+
+%prep
+echo "PREP: $PWD"
+%autosetup -n opencattus-%{VERSION}
+bash -c '
+	source rhel-gcc-toolset-14.sh;
+	cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -G Ninja
+'
+
+%build
+echo "BUILD: $PWD"
+cmake --build build
+
+%install
+echo "INSTALL: $PWD"
+mkdir -p %{buildroot}/usr/bin
+install -m 755 build/src/cloysterhpc %{buildroot}/usr/bin/cloysterhpc
+
+%files
+/usr/bin/cloysterhpc
+
+%changelog
+* Tue Feb 25 2025 Daniel Hilst <danielhilst@versatushpc.com> - 1.0-1
+- Initial release
diff --git a/setupDevEnvironment.sh b/setupDevEnvironment.sh
@@ -123,10 +123,12 @@ case "$os_version" in
     ;;
   9)
     dnf -y install python pip libasan libubsan gcc-toolset-14 \
-      gcc-toolset-14-libubsan-devel gcc-toolset-14-libasan-devel cppcheck
+      gcc-toolset-14-libubsan-devel gcc-toolset-14-libasan-devel cppcheck \
+      glibmm24 glibmm24-devel
     ;;
   10)
-    dnf -y install python pip libubsan libasan liblsan libtsan libhwasan
+    dnf -y install python pip libubsan libasan liblsan libtsan libhwasan \
+      glibmm-2.68 glibmm-2.68-devel
     ;;
 esac
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -21,6 +21,10 @@ target_link_system_libraries(
 
 # Build a library and a ${cloysterhpc_BINARY_NAME} binary that links to the library
 add_library(cloysterhpc_object OBJECT ${SOURCE_FILES})
+
+# Include glibmm headers as SYSTEM header to avoid warnings
+target_include_directories(cloysterhpc_object SYSTEM PRIVATE ${GLIBMM_INCLUDE_DIRS})
+
 # add_library(cloysterhpc_static STATIC $<TARGET_OBJECTS:cloysterhpc_object>)
 add_library(cloysterhpc_static STATIC $<TARGET_OBJECTS:cloysterhpc_object> $<TARGET_OBJECTS:cloysterhpc_presenter_object>)
 add_executable(${cloysterhpc_BINARY_NAME} main.cpp)
diff --git a/src/diskImage.cpp b/src/diskImage.cpp
@@ -8,13 +8,9 @@
 #include <cloysterhpc/functions.h>
 #include <cloysterhpc/models/os.h>
 #include <cloysterhpc/services/log.h>
-#include <cstddef>
-#include <fstream>
-#include <glibmm/checksum.h>
-#include <ios>
-#include <istream>
+#include <cloysterhpc/services/files.h>
 #include <unordered_map>
-#include <vector>
+
 
 // @FIXME: This file need some work
 //
@@ -108,42 +104,16 @@ bool DiskImage::hasVerifiedChecksum(const std::filesystem::path& path)
             "e" }
     };
 
-    Glib::Checksum checksum(Glib::Checksum::Type::SHA256);
-
-    std::ifstream file(path, std::ios::in | std::ios::binary);
-    if (!file.is_open()) {
-        throw std::filesystem::filesystem_error(
-            "Failed to open file", path, std::error_code());
-    }
-
-    // Read the file in chunks of 16834 bytes
-    constexpr std::size_t chunk_size = 16384;
-    std::vector<std::byte> buffer(chunk_size);
-
-    while (file.read(reinterpret_cast<std::istream::char_type*>(buffer.data()),
-        static_cast<std::streamsize>(buffer.size()))) {
-        std::streamsize bytesRead = file.gcount();
+    auto checksum = cloyster::services::files::checksum(path);
+    LOG_INFO("SHA256 checksum of file {} is: {}", path.string(), checksum);
 
-        checksum.update(
-            reinterpret_cast<const unsigned char*>(buffer.data()), bytesRead);
-    }
-
-    // Handle any leftover bytes after the while loop ends
-    std::streamsize bytesRead = file.gcount();
-    if (bytesRead > 0) {
-        checksum.update(
-            reinterpret_cast<const unsigned char*>(buffer.data()), bytesRead);
-    }
-
-    LOG_INFO(fmt::format("SHA256 checksum of file {} is: {}", path.string(),
-        checksum.get_string()));
-
-    if (checksum.get_string()
+    if (checksum
         == hash_map.find(path.filename().string())->second) {
         LOG_TRACE("Checksum - The disk image is valid")
         return true;
     }
 
+
     LOG_TRACE("Checksum - The disk image is invalid. Maybe you're using a "
               "custom image?");
     return false;
diff --git a/src/main.cpp b/src/main.cpp
@@ -6,9 +6,6 @@
 #include <cctype>
 #include <cstdlib>
 
-#include <glibmm/fileutils.h>
-#include <glibmm/keyfile.h>
-
 #include <CLI/CLI.hpp>
 #include <cloysterhpc/cloyster.h>
 #include <cloysterhpc/const.h>
diff --git a/src/models/cluster.cpp b/src/models/cluster.cpp
@@ -400,8 +400,7 @@ void Cluster::fillTestData()
     setProvisioner(Provisioner::xCAT);
 
     setDiskImage("/root/OracleLinux-R8-U5-x86_64-dvd.iso");
-    OS nodeOS(OS::Arch::x86_64, OS::Family::Linux, OS::Platform::el8,
-        OS::Distro::OL, "5.4.17-2136.302.6.1.el8uek.x86_64", 8, 5);
+    OS nodeOS;
     CPU nodeCPU(2, 4, 2);
 
     // TODO: Pass network connection as object
diff --git a/src/services/files.cpp b/src/services/files.cpp
@@ -1,8 +1,12 @@
-#include <concepts>
 #include <ranges>
 #include <stdexcept>
 #include <utility>
+#include <cstddef>
+#include <fstream>
+#include <ios>
+#include <istream>
 
+#include <glibmm/checksum.h>
 #include <glibmm/fileutils.h>
 #include <glibmm/keyfile.h>
 
@@ -13,11 +17,11 @@ namespace cloyster::services::files {
 
 struct KeyFile::Impl {
     std::filesystem::path m_path;
-    Glib::RefPtr<Glib::KeyFile> m_keyfile;
+    std::unique_ptr<Glib::KeyFile> m_keyfile;
 
-    Impl(Glib::RefPtr<Glib::KeyFile>&& keyfile, std::filesystem::path path)
+    Impl(Glib::KeyFile&& keyfile, std::filesystem::path path)
         : m_path(std::move(path))
-        , m_keyfile(std::move(keyfile)) { };
+        , m_keyfile(std::make_unique<Glib::KeyFile>(std::move(keyfile))) { };
 
     void safeToFile(const std::filesystem::path& path)
     {
@@ -59,7 +63,7 @@ KeyFile::KeyFile(KeyFile::Impl&& impl)
 }
 
 KeyFile::KeyFile(const std::filesystem::path& path)
-    : m_impl(std::make_unique<KeyFile::Impl>(Glib::KeyFile::create(), path))
+    : m_impl(std::make_unique<KeyFile::Impl>(Glib::KeyFile(), path))
 {
     m_impl->m_path = path;
     m_impl->loadFromFile(path);
@@ -90,9 +94,8 @@ std::string KeyFile::getString(
 std::optional<std::string> KeyFile::getStringOpt(
     const std::string& group, const std::string& key) const
 {
-    auto keyFile = m_impl->m_keyfile;
-    if (keyFile->has_key(group, key)) {
-        return keyFile->get_string(group, key).raw();
+    if (m_impl->m_keyfile->has_key(group, key)) {
+        return m_impl->m_keyfile->get_string(group, key).raw();
     }
     return std::nullopt;
 }
@@ -128,4 +131,40 @@ void KeyFile::save() { m_impl->safeToFile(m_impl->m_path); }
 
 void KeyFile::load() { m_impl->loadFromFile(m_impl->m_path); }
 
+std::string checksum(const std::string& data)
+{
+    Glib::Checksum checksum(Glib::Checksum::ChecksumType::CHECKSUM_SHA256);
+    checksum.update(data);
+    return checksum.get_string();
+}
+
+std::string checksum(const std::filesystem::path& path, const std::size_t chunkSize)
+{
+    Glib::Checksum checksum(Glib::Checksum::ChecksumType::CHECKSUM_SHA256);
+    std::ifstream file(path, std::ios::in | std::ios::binary);
+    if (!file.is_open()) {
+        throw std::filesystem::filesystem_error(
+            "Failed to open file", path, std::error_code());
+    }
+
+    std::vector<std::byte> buffer(chunkSize);
+
+    while (file.read(reinterpret_cast<std::istream::char_type*>(buffer.data()),
+        static_cast<std::streamsize>(buffer.size()))) {
+        auto bytesRead = static_cast<gsize>(file.gcount());
+
+        checksum.update(
+            reinterpret_cast<const unsigned char*>(buffer.data()), bytesRead);
+    }
+
+    // Handle any leftover bytes after the while loop ends
+    auto bytesRead = static_cast<gsize>(file.gcount());
+    if (bytesRead > 0) {
+        checksum.update(
+            reinterpret_cast<const unsigned char*>(buffer.data()), bytesRead);
+    }
+
+    return checksum.get_string();
+}
+
 } // namespace cloyster::services::files
