diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-01 10:40:13 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-01 10:40:13 -0700 |
| commit | 70e014dffed8dde8de838dc99e70fc482f87fbb8 (patch) | |
| tree | f1562edc86ef718ecdc9d8e5fcb37f3ec89359ac | |
| parent | cb9080c3c3a04f84818d698f73892441f6d14d40 (diff) | |
| parent | 9f72695e33093498e5957900e97817b78dba76c3 (diff) | |
| download | uhd-70e014dffed8dde8de838dc99e70fc482f87fbb8.tar.gz uhd-70e014dffed8dde8de838dc99e70fc482f87fbb8.tar.bz2 uhd-70e014dffed8dde8de838dc99e70fc482f87fbb8.zip | |
Merge branch 'images_install'
| -rw-r--r-- | host/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | images/Makefile | 18 |
2 files changed, 10 insertions, 17 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index 606742865..290ffdc7d 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -210,6 +210,15 @@ ENDIF(ENABLE_UTILS) ADD_SUBDIRECTORY(usrp_e_utils) ######################################################################## +# Handle pre-built images +######################################################################## +IF(DEFINED UHD_IMAGES_DIR AND EXISTS "${UHD_IMAGES_DIR}") + FILE(GLOB _image_files "${UHD_IMAGES_DIR}/*.*") + MESSAGE(STATUS "Using images: ${_image_files}") + INSTALL(FILES ${_image_files} DESTINATION ${PKG_DATA_DIR}/images) +ENDIF(DEFINED UHD_IMAGES_DIR AND EXISTS "${UHD_IMAGES_DIR}") + +######################################################################## # Print Summary ######################################################################## UHD_PRINT_COMPONENT_SUMMARY() diff --git a/images/Makefile b/images/Makefile index 74b1cd6e4..71b46d14e 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,5 +1,5 @@ # -# Copyright 2010 Ettus Research LLC +# Copyright 2010-2011 Ettus Research LLC # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -198,19 +198,3 @@ images: $(IMAGES_LIST) clean: $(RM) -rf $(BUILT_IMAGES_DIR) $(RM) -rf $(CMAKE_BUILD_DIR) - -#packages that a linux machine can build -linux-packages: - mkdir -p $(CMAKE_BUILD_DIR) - - cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=TGZ $(TOP_DIR) - make -C $(CMAKE_BUILD_DIR) package - - cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=ZIP $(TOP_DIR) - make -C $(CMAKE_BUILD_DIR) package - - cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=DEB $(TOP_DIR) - make -C $(CMAKE_BUILD_DIR) package - - cd $(CMAKE_BUILD_DIR) && cmake -DCPACK_GENERATOR=RPM $(TOP_DIR) - make -C $(CMAKE_BUILD_DIR) package |