aboutsummaryrefslogtreecommitdiffstats
path: root/default
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-05-24 14:08:22 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-05-24 14:08:22 +0200
commit15d1830a8520fdf1a1950083ff8be6ba3a00b9be (patch)
treeb9c17d836d5dc4099eb5e6d2a55624c2f91c3163 /default
parent6d55c85990ce83b038809cb957759d0cd09dc38c (diff)
Fix wrong rpm spec files extensions.
Classic RPM build file is suffixed with .spec. Change-Id: I66e1a756ce72501d3ebb103588bf439bf1135140 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'default')
-rw-r--r--default/cmake/macros.cmake14
1 files changed, 7 insertions, 7 deletions
diff --git a/default/cmake/macros.cmake b/default/cmake/macros.cmake
index b1a5f68..9650ad0 100644
--- a/default/cmake/macros.cmake
+++ b/default/cmake/macros.cmake
@@ -166,8 +166,8 @@ macro(wgt_package_build)
endmacro(wgt_package_build)
macro(rpm_package_build)
- if(NOT EXISTS ${PROJECT_RPM_DIR}/config.rpm.in)
- MESSAGE(STATUS "Missing mandatory files: you needconfig.rpm.in in ${PROJECT_RPM_DIR} folder.")
+ if(NOT EXISTS ${PROJECT_RPM_DIR}/config.spec.in)
+ MESSAGE(STATUS "Missing mandatory files: you need config.spec.in in ${PROJECT_RPM_DIR} folder.")
else()
# extract PROJECT_PKG_DEPS and replace ; by , for RPM spec file
get_property(PROJECT_PKG_DEPS GLOBAL PROPERTY PROJECT_PKG_DEPS)
@@ -176,16 +176,16 @@ macro(rpm_package_build)
endforeach()
# build rpm spec file from template
- configure_file(${PROJECT_RPM_DIR}/config.rpm.in ${PROJECT_PKG_DIR}/config.rpm)
+ configure_file(${PROJECT_RPM_DIR}/config.spec.in ${PROJECT_PKG_DIR}/config.spec)
- add_custom_command(OUTPUT ${PROJECT_NAME}.rpm
+ add_custom_command(OUTPUT ${PROJECT_NAME}.spec
DEPENDS ${PROJECT_TARGETS}
- COMMAND rpmbuild -ba ${PROJECT_PKG_DIR}/config.rpm
+ COMMAND rpmbuild -ba ${PROJECT_PKG_DIR}/config.spec
)
- add_custom_target(rpm DEPENDS ${PROJECT_NAME}.rpm)
+ add_custom_target(rpm DEPENDS ${PROJECT_NAME}.spec)
add_dependencies(rpm populate)
- set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.rpm")
+ set(ADDITIONAL_MAKE_CLEAN_FILES, "${PROJECT_NAME}.spec")
if(PACKAGE_MESSAGE)
add_custom_command(TARGET rpm