aboutsummaryrefslogtreecommitdiffstats
path: root/cmake/cmake.d/01-variables.cmake
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-06-28 18:10:46 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-06-28 18:10:46 +0200
commit8d60cd89fb3dbca16ac50abd1cceabf8662676b9 (patch)
tree8525a03b696f7bd2947413db62ff82bc2b124866 /cmake/cmake.d/01-variables.cmake
parent3a798fa04ebfd9f7644f304af41baedd1e2a591f (diff)
Fix: Debian detection, only valid in native env
Generate packaging files for Debian isn't available from SDK. Only native and configured environment is supported about now. Change-Id: I70f6b19a4a04ecd7a902ef9d6f2300f4f98209a5 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh> # Conflicts: # cmake/cmake.d/01-variables.cmake
Diffstat (limited to 'cmake/cmake.d/01-variables.cmake')
-rw-r--r--cmake/cmake.d/01-variables.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/cmake.d/01-variables.cmake b/cmake/cmake.d/01-variables.cmake
index 123c0f6..9314061 100644
--- a/cmake/cmake.d/01-variables.cmake
+++ b/cmake/cmake.d/01-variables.cmake
@@ -21,7 +21,7 @@
#--------------------------------------------------------------------------
# WARNING:
# Do not change this cmake template
-# Customise your preferences in "./conf.d/cmake/config.cmake"
+# Customise your preferences in "./etc/config.cmake"
#--------------------------------------------------------------------------
# Get colorized message output non Windows OS. You know bash ? :)
@@ -58,7 +58,7 @@ set(CMP0048 1)
# Get the os type
# Used to package .deb
if(EXISTS "/etc/os-release")
- execute_process(COMMAND grep ID_LIKE /etc/os-release
+ execute_process(COMMAND grep -E "^ID(=|_LIKE=)" /etc/os-release
OUTPUT_VARIABLE TMP_OSRELEASE
)
if (NOT TMP_OSRELEASE STREQUAL "")
@@ -115,7 +115,7 @@ set(ARCHIVE_OUTPUT ${ARCHIVE_OUTPUT_ARCHIVE}.gz)
set(TMP_ARCHIVE_SUBMODULE ${PROJECT_PKG_ENTRY_POINT}/${NPKG_PROJECT_NAME}-sub)
set(CMD_ARCHIVE_SUBMODULE \'git archive --verbose --prefix=${NPKG_PROJECT_NAME}-${PROJECT_VERSION}/$$path/ --format tar HEAD --output ${TMP_ARCHIVE_SUBMODULE}-$$sha1.tar\' )
-if(OSRELEASE MATCHES "debian")
+if(OSRELEASE MATCHES "debian" AND NOT DEFINED $ENV{SDKTARGETSYSROOT})
# build deb spec file from template
set(PACKAGING_DEB_OUTPUT_DSC ${PROJECT_PKG_ENTRY_POINT}/${NPKG_PROJECT_NAME}.dsc)
set(PACKAGING_DEB_OUTPUT_INSTALL ${PROJECT_PKG_ENTRY_POINT}/debian.${NPKG_PROJECT_NAME}.install)
@@ -123,4 +123,4 @@ if(OSRELEASE MATCHES "debian")
set(PACKAGING_DEB_OUTPUT_COMPAT ${PROJECT_PKG_ENTRY_POINT}/debian.compat)
set(PACKAGING_DEB_OUTPUT_CONTROL ${PROJECT_PKG_ENTRY_POINT}/debian.control)
set(PACKAGING_DEB_OUTPUT_RULES ${PROJECT_PKG_ENTRY_POINT}/debian.rules)
-endif(OSRELEASE MATCHES "debian")
+endif(OSRELEASE MATCHES "debian" AND NOT DEFINED $ENV{SDKTARGETSYSROOT}) \ No newline at end of file