isa/citadel
1
0
Fork 0
forked from brl/citadel
Code Pull Requests Activity

citadel tools update

Browse Source
This commit is contained in:
Bruce Leidl 2021-10-04 07:00:14 -04:00
parent 5bd1166b0a
commit e5dfdab707
2 changed files with 231 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta-citadel/recipes-citadel/citadel-config/files/dconf/build.d/citadel.d/citadel-dconf.conf
View File

@ -14,8 +14,3 @@ font='DejaVu Sans Mono 13'
[org/gnome/terminal/legacy]
theme-variant='dark'
default-show-menubar=false
[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0]
binding='<Primary><Alt>c'
command='/usr/libexec/citadel-realms-ui'
name='Launch Citadel Realms UI'

405
meta-citadel/recipes-core/citadel-tools/citadel-tools_0.1.0.bb
View File

@ -3,11 +3,12 @@ HOMEPAGE = "http://github.com/subgraph/citadel"
LICENSE = "CLOSED"
LIC_FILES_CHKSUM=""
inherit cargo systemd
inherit cargo systemd gsettings
#
# Update this when changes are pushed to github
#
SRCREV = "f665490a4d8bce26c2b70fba94731c60c581ddbd"
SRCREV = "220920cb2f3539ccefff7fe31d8a58a3ec791c81"
GIT_URI = "git://github.com/brl/citadel-tools.git;protocol=https"
@ -20,174 +21,225 @@ GIT_URI = "git://github.com/brl/citadel-tools.git;protocol=https"
# the dependency list.
SRC_URI += " \
crate://crates.io/addr2line/0.12.1 \
crate://crates.io/adler32/1.1.0 \
crate://crates.io/ansi_term/0.11.0 \
crate://crates.io/anyhow/1.0.33 \
crate://crates.io/arc-swap/0.4.7 \
crate://crates.io/array-macro/1.0.3 \
crate://crates.io/atk-sys/0.10.0 \
crate://crates.io/atk/0.9.0 \
crate://crates.io/atty/0.2.14 \
crate://crates.io/autocfg/1.0.0 \
crate://crates.io/backtrace/0.3.49 \
crate://crates.io/bincode/1.2.1 \
crate://crates.io/bitflags/1.2.1 \
crate://crates.io/block-buffer/0.9.0 \
crate://crates.io/block-cipher/0.7.1 \
crate://crates.io/block-padding/0.2.0 \
crate://crates.io/blowfish/0.5.0 \
crate://crates.io/byteorder/1.3.4 \
crate://crates.io/cairo-rs/0.9.1 \
crate://crates.io/cairo-sys-rs/0.10.0 \
crate://crates.io/cc/1.0.54 \
crate://crates.io/cfg-if/0.1.10 \
crate://crates.io/chrono/0.4.11 \
crate://crates.io/clap/2.33.1 \
crate://crates.io/cpuid-bool/0.1.2 \
crate://crates.io/crc32fast/1.2.0 \
crate://crates.io/crossbeam-channel/0.3.9 \
crate://crates.io/crossbeam-utils/0.6.6 \
crate://crates.io/crypto-mac/0.8.0 \
crate://crates.io/cursive/0.11.0 \
crate://crates.io/dbus/0.6.5 \
crate://crates.io/dbus/0.8.4 \
crate://crates.io/digest/0.9.0 \
crate://crates.io/either/1.6.1 \
crate://crates.io/enum-map-derive/0.4.3 \
crate://crates.io/enum-map-internals/0.1.3 \
crate://crates.io/enum-map/0.5.0 \
crate://crates.io/enumset/0.3.19 \
crate://crates.io/enumset_derive/0.3.2 \
crate://crates.io/failure/0.1.8 \
crate://crates.io/failure_derive/0.1.8 \
crate://crates.io/filetime/0.2.10 \
crate://crates.io/futures/0.3.6 \
crate://crates.io/futures-channel/0.3.6 \
crate://crates.io/futures-core/0.3.6 \
crate://crates.io/futures-executor/0.3.6 \
crate://crates.io/futures-io/0.3.6 \
crate://crates.io/futures-macro/0.3.6 \
crate://crates.io/futures-sink/0.3.6 \
crate://crates.io/futures-task/0.3.6 \
crate://crates.io/futures-util/0.3.6 \
crate://crates.io/fuzzy-matcher/0.3.7 \
crate://crates.io/generic-array/0.14.4 \
crate://crates.io/getrandom/0.1.15 \
crate://crates.io/gdk-pixbuf-sys/0.10.0 \
crate://crates.io/gdk-pixbuf/0.9.0 \
crate://crates.io/gdk-sys/0.10.0 \
crate://crates.io/gdk/0.13.2 \
crate://crates.io/gimli/0.21.0 \
crate://crates.io/gio-sys/0.10.1 \
crate://crates.io/gio/0.9.1 \
crate://crates.io/glib-sys/0.10.1 \
crate://crates.io/glib/0.10.2 \
crate://crates.io/glib-macros/0.10.1 \
crate://crates.io/gobject-sys/0.10.0 \
crate://crates.io/gtk-sys/0.10.0 \
crate://crates.io/gtk/0.9.2 \
crate://crates.io/hermit-abi/0.1.14 \
crate://crates.io/heck/0.3.1 \
crate://crates.io/hex/0.4.2 \
crate://crates.io/hmac/0.8.1 \
crate://crates.io/inotify-sys/0.1.3 \
crate://crates.io/inotify/0.8.3 \
crate://crates.io/itertools/0.9.0 \
crate://crates.io/lazy_static/1.4.0 \
crate://crates.io/libc/0.2.71 \
crate://crates.io/libdbus-sys/0.2.1 \
crate://crates.io/libflate/0.1.27 \
crate://crates.io/libsodium-sys/0.2.5 \
crate://crates.io/log/0.4.8 \
crate://crates.io/md-5/0.9.1 \
crate://crates.io/memchr/2.3.3 \
crate://crates.io/miniz_oxide/0.3.7 \
crate://crates.io/nix/0.17.0 \
crate://crates.io/num-complex/0.2.4 \
crate://crates.io/num-integer/0.1.43 \
crate://crates.io/num-iter/0.1.41 \
crate://crates.io/num-rational/0.2.4 \
crate://crates.io/num-traits/0.2.12 \
crate://crates.io/num/0.2.1 \
crate://crates.io/numtoa/0.1.0 \
crate://crates.io/object/0.20.0 \
crate://crates.io/once_cell/1.4.0 \
crate://crates.io/opaque-debug/0.2.3 \
crate://crates.io/opaque-debug/0.3.0 \
crate://crates.io/owning_ref/0.4.1 \
crate://crates.io/pango-sys/0.10.0 \
crate://crates.io/pango/0.9.1 \
crate://crates.io/pin-project-internal/0.4.22 \
crate://crates.io/pin-project/0.4.22 \
crate://crates.io/pin-utils/0.1.0 \
crate://crates.io/pkg-config/0.3.17 \
crate://crates.io/ppv-lite86/0.2.9 \
crate://crates.io/proc-macro-crate/0.1.5 \
crate://crates.io/proc-macro-error/1.0.4 \
crate://crates.io/proc-macro-error-attr/1.0.4 \
crate://crates.io/proc-macro-hack/0.5.16 \
crate://crates.io/proc-macro-nested/0.1.6 \
crate://crates.io/proc-macro2/0.4.30 \
crate://crates.io/proc-macro2/1.0.18 \
crate://crates.io/pwhash/0.3.1 \
crate://crates.io/quote/0.6.13 \
crate://crates.io/quote/1.0.7 \
crate://crates.io/rand/0.7.3 \
crate://crates.io/rand_chacha/0.2.2 \
crate://crates.io/rand_core/0.5.1 \
crate://crates.io/rand_hc/0.2.0 \
crate://crates.io/redox_syscall/0.1.56 \
crate://crates.io/redox_termios/0.1.1 \
crate://crates.io/rle-decode-fast/1.0.1 \
crate://crates.io/rpassword/4.0.5 \
crate://crates.io/rustc-demangle/0.1.16 \
crate://crates.io/same-file/1.0.6 \
crate://crates.io/serde/1.0.112 \
crate://crates.io/serde_derive/1.0.112 \
crate://crates.io/sha-1/0.9.1 \
crate://crates.io/sha2/0.9.1 \
crate://crates.io/signal-hook-registry/1.2.0 \
crate://crates.io/signal-hook/0.1.16 \
crate://crates.io/slab/0.4.2 \
crate://crates.io/sodiumoxide/0.2.5 \
crate://crates.io/stable_deref_trait/1.1.1 \
crate://crates.io/strsim/0.8.0 \
crate://crates.io/strum/0.18.0 \
crate://crates.io/strum_macros/0.18.0 \
crate://crates.io/subtle/2.3.0 \
crate://crates.io/syn/0.15.44 \
crate://crates.io/syn/1.0.31 \
crate://crates.io/synstructure/0.12.4 \
crate://crates.io/system-deps/1.3.2 \
crate://crates.io/take_mut/0.2.2 \
crate://crates.io/tar/0.4.29 \
crate://crates.io/termion/1.5.5 \
crate://crates.io/textwrap/0.11.0 \
crate://crates.io/thread_local/1.0.1 \
crate://crates.io/thiserror/1.0.21 \
crate://crates.io/thiserror-impl/1.0.21 \
crate://crates.io/time/0.1.43 \
crate://crates.io/toml/0.4.10 \
crate://crates.io/toml/0.5.6 \
crate://crates.io/typenum/1.12.0 \
crate://crates.io/unicode-segmentation/1.6.0 \
crate://crates.io/unicode-width/0.1.7 \
crate://crates.io/unicode-xid/0.1.0 \
crate://crates.io/unicode-xid/0.2.0 \
crate://crates.io/vcpkg/0.2.10 \
crate://crates.io/vec_map/0.8.2 \
crate://crates.io/version-compare/0.0.10 \
crate://crates.io/version_check/0.9.2 \
crate://crates.io/void/1.0.2 \
crate://crates.io/walkdir/2.3.1 \
crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \
crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
crate://crates.io/winapi-util/0.1.5 \
crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
crate://crates.io/winapi/0.3.9 \
crate://crates.io/xattr/0.2.2 \
crate://crates.io/xi-unicode/0.1.0 \
crate://crates.io/addr2line/0.15.2 \
crate://crates.io/adler/1.0.2 \
crate://crates.io/aho-corasick/0.7.18 \
crate://crates.io/ansi_term/0.11.0 \
crate://crates.io/anyhow/1.0.42 \
crate://crates.io/array-macro/1.0.3 \
crate://crates.io/async-broadcast/0.3.3 \
crate://crates.io/async-channel/1.6.1 \
crate://crates.io/async-executor/1.4.1 \
crate://crates.io/async-io/1.6.0 \
crate://crates.io/async-lock/2.4.0 \
crate://crates.io/async-task/4.0.3 \
crate://crates.io/atk-sys/0.14.0 \
crate://crates.io/atk/0.14.0 \
crate://crates.io/atty/0.2.14 \
crate://crates.io/autocfg/1.0.1 \
crate://crates.io/backtrace/0.3.60 \
crate://crates.io/bincode/1.3.3 \
crate://crates.io/bitflags/1.2.1 \
crate://crates.io/block-buffer/0.9.0 \
crate://crates.io/block-cipher/0.7.1 \
crate://crates.io/blowfish/0.5.0 \
crate://crates.io/byteorder/1.4.3 \
crate://crates.io/cache-padded/1.1.1 \
crate://crates.io/cairo-rs/0.14.7 \
crate://crates.io/cairo-sys-rs/0.14.0 \
crate://crates.io/cc/1.0.69 \
crate://crates.io/cfg-expr/0.8.1 \
crate://crates.io/cfg-if/0.1.10 \
crate://crates.io/cfg-if/1.0.0 \
crate://crates.io/chrono/0.4.19 \
crate://crates.io/clap/2.33.3 \
crate://crates.io/concurrent-queue/1.2.2 \
crate://crates.io/cpufeatures/0.1.5 \
crate://crates.io/crossbeam-channel/0.3.9 \
crate://crates.io/crossbeam-utils/0.6.6 \
crate://crates.io/crypto-mac/0.8.0 \
crate://crates.io/cursive/0.11.0 \
crate://crates.io/dbus/0.6.5 \
crate://crates.io/dbus/0.8.4 \
crate://crates.io/derivative/2.2.0 \
crate://crates.io/digest/0.9.0 \
crate://crates.io/easy-parallel/3.1.0 \
crate://crates.io/ed25519/1.1.1 \
crate://crates.io/either/1.6.1 \
crate://crates.io/enum-map-derive/0.4.6 \
crate://crates.io/enum-map-internals/0.1.3 \
crate://crates.io/enum-map/0.5.0 \
crate://crates.io/enumflags2/0.6.4 \
crate://crates.io/enumflags2_derive/0.6.4 \
crate://crates.io/enumset/0.3.19 \
crate://crates.io/enumset_derive/0.3.2 \
crate://crates.io/event-listener/2.5.1 \
crate://crates.io/failure/0.1.8 \
crate://crates.io/failure_derive/0.1.8 \
crate://crates.io/fastrand/1.4.1 \
crate://crates.io/field-offset/0.3.4 \
crate://crates.io/futures-channel/0.3.15 \
crate://crates.io/futures-core/0.3.15 \
crate://crates.io/futures-executor/0.3.15 \
crate://crates.io/futures-io/0.3.15 \
crate://crates.io/futures-lite/1.12.0 \
crate://crates.io/futures-macro/0.3.15 \
crate://crates.io/futures-sink/0.3.15 \
crate://crates.io/futures-task/0.3.15 \
crate://crates.io/futures-util/0.3.15 \
crate://crates.io/gdk-pixbuf-sys/0.14.0 \
crate://crates.io/gdk-pixbuf/0.14.0 \
crate://crates.io/gdk-sys/0.14.0 \
crate://crates.io/gdk/0.14.2 \
crate://crates.io/generic-array/0.14.4 \
crate://crates.io/getrandom/0.1.16 \
crate://crates.io/getrandom/0.2.3 \
crate://crates.io/gimli/0.24.0 \
crate://crates.io/gio-sys/0.14.0 \
crate://crates.io/gio/0.14.6 \
crate://crates.io/glib-macros/0.10.1 \
crate://crates.io/glib-macros/0.14.1 \
crate://crates.io/glib-sys/0.10.1 \
crate://crates.io/glib-sys/0.14.0 \
crate://crates.io/glib/0.10.3 \
crate://crates.io/glib/0.14.5 \
crate://crates.io/gobject-sys/0.10.0 \
crate://crates.io/gobject-sys/0.14.0 \
crate://crates.io/gtk-sys/0.14.0 \
crate://crates.io/gtk/0.14.1 \
crate://crates.io/gtk3-macros/0.14.0 \
crate://crates.io/heck/0.3.3 \
crate://crates.io/hermit-abi/0.1.19 \
crate://crates.io/hex/0.4.3 \
crate://crates.io/hmac/0.8.1 \
crate://crates.io/inotify-sys/0.1.5 \
crate://crates.io/inotify/0.8.3 \
crate://crates.io/instant/0.1.10 \
crate://crates.io/itertools/0.10.1 \
crate://crates.io/itertools/0.9.0 \
crate://crates.io/lazy_static/1.4.0 \
crate://crates.io/libc/0.2.98 \
crate://crates.io/libdbus-sys/0.2.1 \
crate://crates.io/libsodium-sys/0.2.7 \
crate://crates.io/log/0.4.14 \
crate://crates.io/md-5/0.9.1 \
crate://crates.io/memchr/2.4.0 \
crate://crates.io/memoffset/0.6.4 \
crate://crates.io/miniz_oxide/0.4.4 \
crate://crates.io/nix/0.17.0 \
crate://crates.io/nix/0.21.0 \
crate://crates.io/num-complex/0.2.4 \
crate://crates.io/num-integer/0.1.44 \
crate://crates.io/num-iter/0.1.42 \
crate://crates.io/num-rational/0.2.4 \
crate://crates.io/num-traits/0.2.14 \
crate://crates.io/num/0.2.1 \
crate://crates.io/numtoa/0.1.0 \
crate://crates.io/object/0.25.3 \
crate://crates.io/once_cell/1.8.0 \
crate://crates.io/opaque-debug/0.2.3 \
crate://crates.io/opaque-debug/0.3.0 \
crate://crates.io/owning_ref/0.4.1 \
crate://crates.io/pango-sys/0.10.0 \
crate://crates.io/pango-sys/0.14.0 \
crate://crates.io/pango/0.14.3 \
crate://crates.io/pango/0.9.1 \
crate://crates.io/parking/2.0.0 \
crate://crates.io/pest/2.1.3 \
crate://crates.io/pin-project-lite/0.2.7 \
crate://crates.io/pin-utils/0.1.0 \
crate://crates.io/pkg-config/0.3.19 \
crate://crates.io/polling/2.1.0 \
crate://crates.io/ppv-lite86/0.2.10 \
crate://crates.io/proc-macro-crate/0.1.5 \
crate://crates.io/proc-macro-crate/1.0.0 \
crate://crates.io/proc-macro-error-attr/1.0.4 \
crate://crates.io/proc-macro-error/1.0.4 \
crate://crates.io/proc-macro-hack/0.5.19 \
crate://crates.io/proc-macro-nested/0.1.7 \
crate://crates.io/proc-macro2/0.4.30 \
crate://crates.io/proc-macro2/1.0.27 \
crate://crates.io/pwhash/0.3.1 \
crate://crates.io/quote/0.6.13 \
crate://crates.io/quote/1.0.9 \
crate://crates.io/rand/0.7.3 \
crate://crates.io/rand/0.8.4 \
crate://crates.io/rand_chacha/0.2.2 \
crate://crates.io/rand_chacha/0.3.1 \
crate://crates.io/rand_core/0.5.1 \
crate://crates.io/rand_core/0.6.3 \
crate://crates.io/rand_hc/0.2.0 \
crate://crates.io/rand_hc/0.3.1 \
crate://crates.io/redox_syscall/0.2.9 \
crate://crates.io/redox_termios/0.1.2 \
crate://crates.io/regex-syntax/0.6.25 \
crate://crates.io/regex/1.5.4 \
crate://crates.io/rpassword/4.0.5 \
crate://crates.io/rustc-demangle/0.1.20 \
crate://crates.io/rustc_version/0.3.3 \
crate://crates.io/same-file/1.0.6 \
crate://crates.io/scoped-tls/1.0.0 \
crate://crates.io/semver-parser/0.10.2 \
crate://crates.io/semver/0.11.0 \
crate://crates.io/serde/1.0.126 \
crate://crates.io/serde_derive/1.0.126 \
crate://crates.io/serde_repr/0.1.7 \
crate://crates.io/sha-1/0.9.6 \
crate://crates.io/sha1/0.6.0 \
crate://crates.io/sha2/0.9.5 \
crate://crates.io/signal-hook-registry/1.4.0 \
crate://crates.io/signal-hook/0.1.17 \
crate://crates.io/signature/1.3.1 \
crate://crates.io/slab/0.4.3 \
crate://crates.io/slotmap/1.0.5 \
crate://crates.io/smallvec/1.6.1 \
crate://crates.io/socket2/0.4.0 \
crate://crates.io/sodiumoxide/0.2.7 \
crate://crates.io/stable_deref_trait/1.2.0 \
crate://crates.io/static_assertions/1.1.0 \
crate://crates.io/strsim/0.8.0 \
crate://crates.io/strum/0.18.0 \
crate://crates.io/strum/0.21.0 \
crate://crates.io/strum_macros/0.18.0 \
crate://crates.io/strum_macros/0.21.1 \
crate://crates.io/subtle/2.4.1 \
crate://crates.io/syn/0.15.44 \
crate://crates.io/syn/1.0.73 \
crate://crates.io/synstructure/0.12.5 \
crate://crates.io/system-deps/1.3.2 \
crate://crates.io/system-deps/3.2.0 \
crate://crates.io/termion/1.5.6 \
crate://crates.io/textwrap/0.11.0 \
crate://crates.io/thiserror-impl/1.0.26 \
crate://crates.io/thiserror/1.0.26 \
crate://crates.io/time/0.1.43 \
crate://crates.io/toml/0.4.10 \
crate://crates.io/toml/0.5.8 \
crate://crates.io/typenum/1.13.0 \
crate://crates.io/ucd-trie/0.1.3 \
crate://crates.io/unicode-segmentation/1.8.0 \
crate://crates.io/unicode-width/0.1.8 \
crate://crates.io/unicode-xid/0.1.0 \
crate://crates.io/unicode-xid/0.2.2 \
crate://crates.io/vec_map/0.8.2 \
crate://crates.io/version-compare/0.0.10 \
crate://crates.io/version-compare/0.0.11 \
crate://crates.io/version_check/0.9.3 \
crate://crates.io/void/1.0.2 \
crate://crates.io/waker-fn/1.1.0 \
crate://crates.io/walkdir/2.3.2 \
crate://crates.io/wasi/0.10.2+wasi-snapshot-preview1 \
crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \
crate://crates.io/wepoll-ffi/0.1.2 \
crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
crate://crates.io/winapi-util/0.1.5 \
crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
crate://crates.io/winapi/0.3.9 \
crate://crates.io/xi-unicode/0.1.0 \
crate://crates.io/zbus/2.0.0-beta.5 \
crate://crates.io/zbus_macros/2.0.0-beta.5 \
crate://crates.io/zvariant/2.7.0 \
crate://crates.io/zvariant_derive/2.7.0 \
"
export SODIUM_USE_PKG_CONFIG = "1"
@ -208,13 +260,14 @@ FILES_${PN} = "\
${libexecdir}/citadel-install-backend \
${libexecdir}/citadel-desktop-sync \
${libexecdir}/citadel-realmsd \
${libexecdir}/citadel-realms-ui \
${libexecdir}/citadel-installer-ui \
${libexecdir}/realm-config-ui \
${bindir}/citadel-image \
${bindir}/citadel-realmfs \
${bindir}/citadel-update \
${systemd_system_unitdir} \
${sysconfdir}/dbus-1/system.d \
${datadir}/applications \
"
SYSTEMD_SERVICE_${PN} = "citadel-current-watcher.path citadel-realmsd.service citadel-boot-automount.service"
@ -225,6 +278,8 @@ do_install() {
install -d ${D}${bindir}
install -d ${D}${libexecdir}
install -d ${D}${systemd_system_unitdir}
install -d ${D}${datadir}/applications
install -d ${D}${datadir}/glib-2.0/schemas
# Services desktop sync
install -m 644 ${S}/systemd/citadel-desktop-watcher.path ${D}${systemd_system_unitdir}
@ -241,13 +296,15 @@ do_install() {
install -d ${D}${sysconfdir}/dbus-1/system.d
install -m 644 ${S}/data/com.subgraph.realms.Manager.conf ${D}${sysconfdir}/dbus-1/system.d
# citadel-realms-ui
install -m 755 ${TARGET_BIN}/citadel-realms-ui ${D}${libexecdir}
# citadel-installer-ui
install -m 755 ${TARGET_BIN}/citadel-installer-ui ${D}${libexecdir}
install -m 644 ${S}/data/com.subgraph.installer.Manager.conf ${D}${sysconfdir}/dbus-1/system.d
# realm-config-ui
install -m 0755 ${TARGET_BIN}/realm-config-ui ${D}${libexecdir}
install -m 0644 ${S}/data/com.subgraph.RealmConfig.desktop ${D}${datadir}/applications
install -m 0644 ${S}/data/com.subgraph.RealmConfig.gschema.xml ${D}${datadir}/glib-2.0/schemas
# /usr/libexec/citadel-tool
install -m 755 ${TARGET_BIN}/citadel-tool ${D}${libexecdir}