From 661da0ba828153a2b9b32043aa489b6c1a2b77ef Mon Sep 17 00:00:00 2001 From: Mengyi Wang Date: Mon, 23 May 2022 10:52:31 +0200 Subject: [PATCH 1/3] feat(snap): add secretstore token for camera snaps - device-usb-camera snap - device-onvif-camera snap Signed-off-by: Mengyi Wang --- snap/local/hooks/cmd/install/install.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/snap/local/hooks/cmd/install/install.go b/snap/local/hooks/cmd/install/install.go index c4fefe8082..d3ae221d21 100644 --- a/snap/local/hooks/cmd/install/install.go +++ b/snap/local/hooks/cmd/install/install.go @@ -56,6 +56,8 @@ var secretStoreTokens = []string{ "device-grove", "device-uart", "device-rfid-llrp", + "device-usb-camera", + "device-onvif-camera", "edgex-ekuiper", } @@ -80,6 +82,8 @@ var secretStoreKnownSecrets = []string{ "redisdb[device-grove]", "redisdb[device-uart]", "redisdb[device-rfid-llrp]", + "redisdb[device-usb-camera]", + "redisdb[device-onvif-camera]", "redisdb[edgex-ekuiper]", } From 903d230f6d87f6b3900e8ca6180ff3f984038cf6 Mon Sep 17 00:00:00 2001 From: Mengyi Wang Date: Mon, 23 May 2022 11:08:07 +0200 Subject: [PATCH 2/3] feat(snap): exclude redundant files in snapcraft Parts 'kuiper' and 'postgres' have some files with same file name, but with different contents Signed-off-by: Mengyi Wang --- snap/snapcraft.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 72d11174b4..54e2825926 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -848,11 +848,15 @@ parts: organize: bin/setup-redis-credentials.sh: bin/kuiper-setup-redis-credentials.sh stage: - # Exclude redundant curl files + # Exclude redundant files - -usr/bin/curl - -usr/lib/*/libcurl* - -usr/share/doc/libcurl* - -usr/share/doc/curl + - -usr/lib/x86_64-linux-gnu/* + - -usr/share/doc/libldap-2.4-2/* + - -usr/share/doc/libldap-common/* + metadata: plugin: nil From 9c427644f386d7d470522997d87a07c6fbd55569 Mon Sep 17 00:00:00 2001 From: Mengyi Wang Date: Mon, 23 May 2022 11:08:07 +0200 Subject: [PATCH 3/3] Revert "feat(snap): exclude redundant files in snapcraft" This reverts commit 903d230f6d87f6b3900e8ca6180ff3f984038cf6. Signed-off-by: Mengyi Wang --- snap/snapcraft.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 54e2825926..72d11174b4 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -848,15 +848,11 @@ parts: organize: bin/setup-redis-credentials.sh: bin/kuiper-setup-redis-credentials.sh stage: - # Exclude redundant files + # Exclude redundant curl files - -usr/bin/curl - -usr/lib/*/libcurl* - -usr/share/doc/libcurl* - -usr/share/doc/curl - - -usr/lib/x86_64-linux-gnu/* - - -usr/share/doc/libldap-2.4-2/* - - -usr/share/doc/libldap-common/* - metadata: plugin: nil