Merge resurrector into github.com:magao-x/MagAOX #169
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Along with previous commit that brought in /libMagAOX/app/MagAOXApp.hpp, everything under /libMagAOX/ is now the same as current resurrector
- /apps/CGFSMHIfpga/ - /apps/CGFSMUIfpga/ - /apps/CGraphFSMHardwareInterface/
- remove trailing whitespace
- also new script files: - /script/resuctrl - /script/magaox (may be obsolete)
- Updated /apps/xindiserver/xindiserver.cpp
- Works with resurrector (/utils/resurrector_indi/)
- Uses named FIFOs to INDI drivers: xindidriver,symlinks are obsolete
- builds with and calls INDI server internally
- instead of forking INDI server (/INDI/INDI/indiserver.c)
- N.B. Still gets logging from STDERR
- New/updated configuration options
- f = <INDI server control FIFO/pipe>
- z = <inter-INDI server compression>
- v = <handles multiple verbosity options correctly>
- remote.drivers@hosts = <other INDI servers on other hosts>
- new file /apps/xindiserver/callable_indiserver.c
- updated /apps/xindiserver/Makefile
- /utils/resurrector_indi/ - /scripts/resuctrl
- {x,y}.sh are _common.sh and provision.sh
- this approximates a merge of drbitboy/resurrector into magaox/dev
- Merging was not possible, I feel I left in the best from resurrector:
- systemd-detect-virt sets VM_KIND to none i.e. assume host is not VM
- VM_KIND assignemnts are in both _common.sh and provision.sh
- apt install uses NEEDRESTART_SUSPEND=yes, so apt will not wait for
user input
- In function [clone_or_update_and_cd], [git clone] will use
directory $HOME/githubalt/<reponame>, if it exists, as an alternate
upstream repo
- Future openBLAS installations, which take a long time, are inhibited
after a successful installation
- MAGAOX_ROLE of "vm" is no longer checked in provision.sh, but other
scripts under /setup/scripts/ have not yet be modified for that.
- install_zlib-drbitboy.sh installs a custome zlib under /usr/local/
- magaox/dev has removed the duplicate installs of xrif and mxlib;
this is reflected by re-enabling those installations in their
original location in this commit
- setup/setup_users_and_groups.sh[.resurrector]
- magaox/dev version uses $MAGAOX_ROLE == vm, and hardcoded instrument
groups, so the drbitboy/resurrector version has been backed up:
- setup/setup_users_and_groups.sh.resurrector
- fixed conflicts in INDI/INDI/Makefile
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a manual merge, not a git-merge, of the drbitboy/resurrector branch into the one of the recent branches, magaox/resurrector, that was a copy of magaox/dev on 19.August, 2024.