both classic and lite work

Author: thomas-roos

classes/greengrass-common.inc

@@ -1,4 +1,4 @@
-# Base Greengrass directory definitions
+# Common Greengrass definitions
 
 GG_BASENAME = "greengrass/v2"
 GG_ROOT = "${D}/${GG_BASENAME}"

classes/greengrass-lite-component.bbclass

@@ -103,7 +103,7 @@ python __anonymous() {
 }
 
 # Installation function for Greengrass Lite components
-greengrass_lite_component_do_install() {
+do_install() {
     # Create component directories
     install -d ${D}${GGL_RECIPES_DIR}
     install -d ${D}${GGL_ARTIFACTS_DIR}
@@ -174,13 +174,9 @@ do_deploy() {
 }
 
 # Add to install task
-EXPORT_FUNCTIONS do_install do_deploy
 addtask do_install after do_compile before do_package
 addtask do_deploy after do_install before do_package
 
-# Default do_install implementation
-greengrass_lite_component_do_install[dirs] = "${D}"
-
 # Package the appropriate directories based on mode
 FILES:${PN} += "${@'${GGL_PACKAGES_DIR}/*' if d.getVar('GREENGRASS_LITE_ZERO_COPY') == '1' else '${GGL_IMAGE_COMPONENTS_ROOT}/*'}"
 

recipes-iot/aws-iot-greengrass/greengrass-component-helloworld-sdk-lite/CMakeLists.txt

@@ -5,9 +5,31 @@ project(hello-world-sdk-lite)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 
+# Option to control library linking type (default: shared)
+option(USE_STATIC_LIBS "Link against static libraries instead of shared" OFF)
+
 # Find the AWS Greengrass SDK Lite
 find_path(GGL_INCLUDE_DIR ggl/sdk.h)
-find_library(GGL_LIBRARY NAMES libggl-sdk.a ggl-sdk PATHS /usr/lib)
+
+if(USE_STATIC_LIBS)
+    # Prefer static library
+    find_library(GGL_LIBRARY NAMES libggl-sdk.a PATHS /usr/lib)
+    if(NOT GGL_LIBRARY)
+        message(STATUS "Static library not found, falling back to shared")
+        find_library(GGL_LIBRARY NAMES ggl-sdk libggl-sdk.so PATHS /usr/lib)
+    else()
+        message(STATUS "Using static Greengrass SDK Lite library: ${GGL_LIBRARY}")
+    endif()
+else()
+    # Prefer shared library (default)
+    find_library(GGL_LIBRARY NAMES ggl-sdk libggl-sdk.so PATHS /usr/lib)
+    if(NOT GGL_LIBRARY)
+        message(STATUS "Shared library not found, falling back to static")
+        find_library(GGL_LIBRARY NAMES libggl-sdk.a PATHS /usr/lib)
+    else()
+        message(STATUS "Using shared Greengrass SDK Lite library: ${GGL_LIBRARY}")
+    endif()
+endif()
 
 if(NOT GGL_INCLUDE_DIR OR NOT GGL_LIBRARY)
     message(FATAL_ERROR "AWS Greengrass SDK Lite not found")

recipes-iot/aws-iot-greengrass/greengrass-component-helloworld-sdk-lite_1.0.0.bb

@@ -20,6 +20,12 @@ DEPENDS = "aws-greengrass-sdk-lite"
 # Skip QA check for buildpaths in debug symbols
 INSANE_SKIP:${PN}-dbg += "buildpaths"
 
+# Package configuration options
+# Default: shared library linking
+# Add 'static' to PACKAGECONFIG to use static linking instead
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[static] = "-DUSE_STATIC_LIBS=ON,-DUSE_STATIC_LIBS=OFF"
+
 # Conditionally inherit the appropriate class based on variant
 # greengrass-component.bbclass = Classic Greengrass only
 # greengrass-lite-component.bbclass = Greengrass Lite only
@@ -92,4 +98,9 @@ do_install_ptest() {
 # Conditional runtime dependencies based on variant
 # Lite depends on greengrass-lite, Classic depends on greengrass-bin
 RDEPENDS:${PN} += "${@'greengrass-lite' if d.getVar('GREENGRASS_VARIANT') == 'lite' else 'greengrass-bin'}"
+
+# Add runtime dependency on shared library package when using shared linking (default)
+# Only skip this dependency when explicitly using static linking
+RDEPENDS:${PN} += "${@'' if bb.utils.contains('PACKAGECONFIG', 'static', True, False, d) else 'aws-greengrass-sdk-lite'}"
+
 RDEPENDS:${PN}-ptest = "${PN} bash grep"