Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging feature/snap branch to develop #613

Open
wants to merge 45 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
ab1a2e7
snapcraft support
Nox-MSFT Oct 11, 2022
e699111
small fix
shiyi-peng Nov 22, 2022
1f261fb
Disable healthcheck (#263)
Nox-MSFT Nov 29, 2022
946c58e
Add --ubuntu-core-snap-only build option and snap post-refresh hooks …
Nox-MSFT Nov 29, 2022
a79bb0d
Unbuntu Core - configure hook, extensions registration, and folders o…
Nox-MSFT Dec 3, 2022
f491b9d
Readme Design Doc for Snapcraft (Ubuntu Core Support) (#277)
shiyi-peng Jan 12, 2023
4f3c508
DU Snap and DO Snap integration, change to 'strict' confinement, upda…
Nox-MSFT Mar 16, 2023
9f5539e
Add Ubuntu Core snap update example document and artifacts (#431)
Nox-MSFT Mar 20, 2023
8c88ead
Ubuntu Core Snap - AzIoTIdentity integration (#434)
shiyi-peng Mar 21, 2023
40cadda
Under Strict Confinement - AzIoTIdentity integration (#429)
shiyi-peng Mar 24, 2023
182be26
some fix for Ubuntu Core
shiyi-peng May 8, 2023
dbd1a5a
remove add_subdirectory (apt_handler) etc
shiyi-peng May 8, 2023
921c82c
Fix bad merge (#473)
Nox-MSFT May 9, 2023
8494d27
snapcraft support
Nox-MSFT Oct 11, 2022
efd8a8b
small fix
shiyi-peng Nov 22, 2022
2f3ae9c
Disable healthcheck (#263)
Nox-MSFT Nov 29, 2022
a9c2911
Add --ubuntu-core-snap-only build option and snap post-refresh hooks …
Nox-MSFT Nov 29, 2022
b8a14b4
Unbuntu Core - configure hook, extensions registration, and folders o…
Nox-MSFT Dec 3, 2022
4d979ee
Readme Design Doc for Snapcraft (Ubuntu Core Support) (#277)
shiyi-peng Jan 12, 2023
553b0a3
DU Snap and DO Snap integration, change to 'strict' confinement, upda…
Nox-MSFT Mar 16, 2023
90bb399
Add Ubuntu Core snap update example document and artifacts (#431)
Nox-MSFT Mar 20, 2023
a730d75
Ubuntu Core Snap - AzIoTIdentity integration (#434)
shiyi-peng Mar 21, 2023
ebf873b
Under Strict Confinement - AzIoTIdentity integration (#429)
shiyi-peng Mar 24, 2023
2c6b831
some fix for Ubuntu Core
shiyi-peng May 8, 2023
7a4f1b1
remove add_subdirectory (apt_handler) etc
shiyi-peng May 8, 2023
9bcec49
Fix bad merge (#473)
Nox-MSFT May 9, 2023
636d3ac
Merge branch 'user/shiyipeng/feature-snap-rebase' of github.com:Azure…
shiyi-peng May 31, 2023
9e38a8a
change snapcraft (stage-packages)
shiyi-peng Jun 5, 2023
4a763ee
revoke last commit
shiyi-peng Jun 6, 2023
90836e1
logging fix
shiyi-peng Jun 6, 2023
1f2e4e1
add doc to build on arm64
shiyi-peng Jun 6, 2023
352fd5e
Small fix on snap yaml for publishing to Ubuntu Core Store (#499)
shiyi-peng Jul 18, 2023
61bee76
publishing to snap store
shiyi-peng Sep 19, 2023
02598e1
resolve conflicts
shiyi-peng Mar 13, 2024
ab3da4c
continue to resolve
shiyi-peng Mar 14, 2024
0fb3ffd
build snap
shiyi-peng Mar 15, 2024
631865c
typo
shiyi-peng Mar 15, 2024
b9298d1
fix azure-stoage-sdk dependency
shiyi-peng Mar 28, 2024
28f3413
add ifndef for diagnostics
shiyi-peng Mar 28, 2024
d767a09
fix library path
shiyi-peng Mar 30, 2024
9a63d84
try to fix
shiyi-peng Apr 15, 2024
1efcc99
Fix file download error in Ubuntu Core agent (#675)
Nox-MSFT Dec 11, 2024
081b578
Update script investigate (#680)
shiyi-peng Jan 8, 2025
40c4de2
Update eis_utils, increase AIS response buffer size, add more error l…
Nox-MSFT Jan 15, 2025
ad8ff16
Fixing Ubuntu Core DO downloader script handler update failure (#686)
shiyi-peng Jan 15, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ cscope.po.out
out/
build/
Testing/
squashfs-root/
*.snap

### VCPKG
.vcpkg/
Expand Down
92 changes: 76 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,44 @@ set (
"download_handlers"
CACHE STRING "Sub folder for download handler extensions.")

set (
ADUC_DOWNLOAD_HANDLER_EXTENSION_DIR
"${ADUC_EXTENSIONS_FOLDER}/${ADUC_EXTENSIONS_SUBDIR_DOWNLOAD_HANDLERS}"
CACHE STRING "Path for the download handler extensions")

if (ADUC_BUILD_UNIT_TESTS)
set (
EIS_DATA_PATH
"/tmp/eis_conn_info.txt"
CACHE STRING "The file for eis identities.")
else()
set (
EIS_DATA_PATH
"/var/lib/adu/eis_conn_info.txt"
CACHE STRING "The file for eis identities.")
endif()

if (ADUC_BUILD_SNAP)
set (
ADUC_DOWNLOADS_FOLDER
/var/lib/deviceupdate-agent-downloads
CACHE STRING "Path to the folder containing downloaded update artifacts.")
set (
EIS_USER
"snap_aziotdu"
CACHE STRING "The uid to call eis service.")

else()
set (
ADUC_DOWNLOADS_FOLDER
"${ADUC_DATA_FOLDER}/downloads"
CACHE STRING "Path to the folder containing downloaded update artifacts.")
set (
EIS_USER
"adu"
CACHE STRING "The uid to call eis service.")
endif()

# Define the mapping from step handler names to subdirectory names
set (
ADUC_STEP_HANDLER_NAME_TO_DIRECOTRY_MAP
Expand Down Expand Up @@ -356,25 +394,47 @@ set (
"adu"
CACHE STRING "The effective group name for adu-shell process.")

set (
ADUC_FILE_USER
"adu"
CACHE STRING "The user for adu file ownership.")
if (ADUC_BUILD_SNAP)
set (
ADUC_FILE_USER
"root"
CACHE STRING "The user for adu file ownership.")

set (
ADUC_FILE_GROUP
"adu"
CACHE STRING "The group for adu file ownership.")
set (
ADUC_FILE_GROUP
"snap_aziotdu"
CACHE STRING "The group for adu file ownership.")

set (
DO_FILE_USER
"do"
CACHE STRING "The user for do file ownership.")
set (
DO_FILE_USER
"snap_aziotdo"
CACHE STRING "The user for do file ownership.")

set (
DO_FILE_GROUP
"do"
CACHE STRING "The group for do file ownership.")
set (
DO_FILE_GROUP
"snap_aziotdo"
CACHE STRING "The group for do file ownership.")
else ()
set (
ADUC_FILE_USER
"adu"
CACHE STRING "The user for adu file ownership.")

set (
ADUC_FILE_GROUP
"adu"
CACHE STRING "The group for adu file ownership.")

set (
DO_FILE_USER
"do"
CACHE STRING "The user for do file ownership.")

set (
DO_FILE_GROUP
"do"
CACHE STRING "The group for do file ownership.")
endif ()

set (
SYSLOG_FILE_GROUP
Expand Down
Loading
Loading