add extra version for file name

diff --git a/builder/builder b/builder/builder
index b7379978824a958e204d703251c1c88ab4ed3865..de080ea0ca7b83b3fb6a3d4bb143dde4f4255ef3 100755 (executable)
--- a/builder/builder
+++ b/builder/builder
@@ -25,7 +25,7 @@ run_build_container()
 
        podman run \
                --rm \
-               -v ./:/src \
+               -v .:/src \
                -e SOLL_HOUR=$SOLL_HOUR \
                -e SOLL_MINUTES=$SOLL_MINUTES \
                feierabend-builder-$distro_postfix

diff --git a/builder/run b/builder/run
index da5a0d04e755db357161a992048797a6021f86f5..e5161cc4aeb827bf07e609a15067353953ffcd75 100644 (file)
--- a/builder/run
+++ b/builder/run
@@ -14,20 +14,12 @@ build()
 
        mkdir -p /app/build && cd /app/build
        cmake -DCMAKE_BUILD_TYPE=Release \
+               -DEXTRA_VERSION="-$ID-$VERSION_CODENAME" \
                -DSOLL_HOUR="$soll_hour" \
                -DSOLL_MINUTES="$soll_minutes" /src
        make -j$(nproc) package
 }
 
-rename_package()
-{
-       cd /app/build
-       local package_name=$(find . -maxdepth 1 -name '*.deb')
-       local new_package_name=${package_name/.deb/-$ID-$VERSION_CODENAME.deb}
-
-       mv "$package_name" "$new_package_name"
-}
-
 copy_package()
 {
        cp /app/build/*.deb /src/build/

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0d55422b631c39b82dcdea2311290d6ff8e765f1..a8c7049a307889e4ce736352303c1cf9834743e8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,7 +50,7 @@ set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 set(CPACK_DEBIAN_PACKAGE_NAME ${PROJECT_NAME})
 set(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_HOST_SYSTEM_PROCESSOR})
-set(CPACK_DEBIAN_FILE_NAME ${PROJECT_NAME}_${PROJECT_VERSION}-1_${CMAKE_HOST_SYSTEM_PROCESSOR}.deb)
+set(CPACK_DEBIAN_FILE_NAME ${PROJECT_NAME}_${PROJECT_VERSION}-1${EXTRA_VERSION}_${CMAKE_HOST_SYSTEM_PROCESSOR}.deb)
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 set(CPACK_DEBIAN_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION})
 set(CPACK_DEBIAN_PACKAGE_RELEASE 1)