Merge branch 'master' of https://github.com/AutoModality/Onboard-SDK-4.0 into AM-682/camera-stream AM-682/camera-stream

Author: Aaron Roller

.github/workflows/package.yml

@@ -8,15 +8,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, [arm64,self-hosted,linux, build]]
+        os: [[x64,self-hosted,linux, build], [arm64,self-hosted,linux, build]]
       fail-fast: false
     steps:
       - uses: AutoModality/action-clean@v1.1.0
       - uses: actions/checkout@v2
-      - uses: rlespinasse/github-slug-action@2.0.0 # for GITHUB_REF_SLUG
+      - uses: rlespinasse/github-slug-action@3.1.0 # for GITHUB_REF_SLUG
       - name: Package
         id: package
-        uses: AutoModality/action-package-debian-ros@v3
+        uses: AutoModality/action-package-debian-ros@v5-amros
         with:
           branch: ${{ env.GITHUB_REF_SLUG }}
           build-number: ${{ github.run_number }}
@@ -45,12 +45,3 @@ jobs:
         with:
           pr_draft: true
           github_token: ${{ secrets.GITHUB_TOKEN }}
-  # code-format:
-  #   runs-on: ubuntu-18.04
-  #   needs: package
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Format Code
-  #       uses: AutoModality/action-ros-clang-format@master
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -8,15 +8,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, [arm64,self-hosted,linux, build]]
+        os: [[x64,self-hosted,linux, build], [arm64,self-hosted,linux, build]]
       fail-fast: false
     name: Package
     steps:
       - uses: AutoModality/action-clean@v1.1.0
       - uses: actions/checkout@v2
       - name: Package
         id: package
-        uses: AutoModality/action-package-debian-ros@v3
+        uses: AutoModality/action-package-debian-ros@v5-amros
         with:
           version: 4.0.0-AM${{ github.run_number }}
       - name: Deploy

.gitignore

@@ -59,4 +59,5 @@ cmake-build-debug
 .history
 am-onboard-sdk-build-deps_*_all.deb
 debian/am-onboard-sdk*
-debian/.debhelper/
+debian/.debhelper/
+debian/dji-onboard-sdk*

debian/README.md

@@ -1,9 +1,11 @@
-3# Packaging Onboard-SDK-4.0
+# Packaging Onboard-SDK-4.0
 
 * The goal is to make as few custom changes to this repository as possible. 
 * Consider making custom changes to one of our repos that extends this library.
 * We forked this repository so we could provide debian binary packages for easy and consistent distributions.
 
+Updating from DJI's origin is encouraged.  Branch from our master, then pull from their tag that you wish to merge.
+
 Changes are currently found under two directories introduced by AM:
 
 * debian/
@@ -25,13 +27,16 @@ Let's keep it that way.
 
 ### ARM 64 Builder
 
-We provide self hosted runners to build our ARM binaries, however, this can cause a [security threat](https://help.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories).  
+We provide self hosted runners to build our AMD and ARM binaries, however, this can cause a [security threat](https://help.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners#self-hosted-runner-security-with-public-repositories).  
 For this reason, we only bring up the self hosted runner manually when builds need to happen, which should be rare.  
 Organization action runners will not satisfy requirements since Github restricts such from the Org level, but allows at the repo level where we can apply granualar control. 
 
-1. `ssh nvidia@192.168.4.135`
-1. `/media/nvidia/build/actions-runners/Onboard-SDK-4.0/run.sh`
+1. `ssh resource@flops2` (password in Rpass)
+1. `/usr/lib/github/actions-runners/flops2-onboard-sdk-4.0/run.sh`
 1. You should see `√ Connected to GitHub` and `Listening for Jobs`
-1. You should see `arm-builder` available in the [repo's actions](https://github.com/AutoModality/Onboard-SDK-4.0/settings/actions)
+1. You should see `flops2` available in the [repo's actions](https://github.com/AutoModality/Onboard-SDK-4.0/settings/actions)
 1. Any queues actions should be processed.
 
+Repeat the steps above with `arm-builder-2`.
+
+See [Github Actions Wiki](https://automodality.atlassian.net/wiki/spaces/AMROS/pages/758382915/Continuous+Integration+with+Github+Actions#FLOPS-AMD-Builders) for more information about builders.

debian/changelog

@@ -1 +1 @@
-dji-onboard-sdk (123) unstable; urgency=medium
+dji-onboard-sdk (0.0.0) unstable; urgency=medium

debian/rules

@@ -14,3 +14,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_configure:
 	dh_auto_configure --  -DCMAKE_BUILD_TYPE=Release -DADVANCED_SENSING:BOOL=ON
+
+override_dh_builddeb:
+	dh_builddeb --destdir=.
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f *.*deb
+	rm -rf obj-*