Merge branch 'master' of github.com:nesto-software/USBProxy-legacy

nesto-software · Apr 27, 2021 · 5731c8c · 5731c8c
2 parents 6383c3d + 273aae5
commit 5731c8c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/build-app-nightly.yaml b/.github/workflows/build-app-nightly.yaml
@@ -90,12 +90,17 @@ jobs:
         path: |
           usbproxy/*.deb
 
+    - name: Create greengrass deployment package
+      working-directory: usbproxy/src/build/greengrass/
+      run: |
+        zip usb-mitm.zip usb-mitm-gg
+
     - name: Upload Release Asset - Greengrass Deployment Package
       uses: actions/upload-artifact@v2
       with:
-        name: usb-mitm-gg
+        name: greengrass-deployment-package
         path: |
-          usbproxy/src/build/greengrass/usb-mitm-gg
+          usbproxy/src/build/greengrass/usb-mitm.zip
 
   upload-package:
     name: Upload nesto-usbproxy debian package into nesto repository in S3
@@ -138,4 +143,4 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       run: |
-        aptly publish repo -batch=true -passphrase-file="./key_passwd" -gpg-key="$GPG_KEY_ID" -component=aws -distribution=nightly nesto-pos-adapter-devel s3:nesto-debian-repo-devel:
+        aptly publish repo -batch=true -passphrase-file="./key_passwd" -gpg-key="$GPG_KEY_ID" -component=aws -distribution=nightly nesto-pos-adapter-devel s3:nesto-debian-repo-devel:
diff --git a/docker-crosstool-ng-arm/docker/deps.Dockerfile b/docker-crosstool-ng-arm/docker/deps.Dockerfile
@@ -112,4 +112,4 @@ RUN apt-get install -y dh-make
 # install aws-greengrass-sdk
 
 COPY ./rpi-scripts/install-aws-greengrass-sdk.sh ./install-aws-greengrass-sdk.sh
-RUN ./install-aws-greengrass-sdk.sh "${STAGING_DIR}" "-DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN_FILE" "-DCMAKE_FIND_ROOT_PATH=$STAGING_DIR"
+RUN ./install-aws-greengrass-sdk.sh "${STAGING_DIR}" "-DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN_FILE" "-DCMAKE_FIND_ROOT_PATH=$STAGING_DIR"
diff --git a/rpi-scripts/install-aws-greengrass-sdk.sh b/rpi-scripts/install-aws-greengrass-sdk.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 git clone https://github.com/aws/aws-greengrass-core-sdk-c.git /tmp/aws-sdk
-(cd /tmp/aws-sdk/ && git checkout a71613711438b48588e177f86ab322dd3992e780 && cd ./aws-greengrass-core-sdk-c && mkdir -p build && cd build && cmake $2 $3 .. && cmake $2 $3 --build . && sudo make install DESTDIR=$1)
+(cd /tmp/aws-sdk/ && git checkout a71613711438b48588e177f86ab322dd3992e780 && cd ./aws-greengrass-core-sdk-c && mkdir -p build && cd build && cmake $2 $3 .. && cmake $2 $3 --build . && sudo make install DESTDIR=$1)
diff --git a/src/greengrass/CMakeLists.txt b/src/greengrass/CMakeLists.txt
@@ -8,10 +8,6 @@ find_package(aws-greengrass-core-sdk-c REQUIRED)
 include_directories(${libusbproxy_SOURCE_DIR})
 add_executable(${TOOL} main.cpp)
 target_link_libraries(${TOOL} ${TOOLS_LINK_LIBS})
-target_compile_options(${TOOL} PRIVATE -Werror -Wall -Wextra -pedantic -std=c++11)
+target_compile_options(${TOOL} PRIVATE -Werror -Wall -Wextra -pedantic)
 
 install(TARGETS ${TOOL} RUNTIME DESTINATION ${INSTALL_DEFAULT_BINDIR})
-
-# build the deployment package
-# the following is only working with: https://github.com/awslabs/aws-lambda-cpp
-#aws_lambda_package_target(${TOOL})