Bump version numbers

Update Ansible configuration
Add expect script to install SDRPlay API3 for Linux desktop
Update for repos
Update for HamPC

ansible.cfg

@@ -11,8 +11,8 @@
 
 # some basic default values...
 
-#inventory      = hosts
-inventory      = hosts_xubuntu_vm
+inventory      = hosts
+#inventory      = hosts_xubuntu_vm
 #library        = /usr/share/my_modules/
 #remote_tmp     = $HOME/.ansible/tmp
 #forks          = 5
@@ -55,8 +55,8 @@ timeout = 30
 
 # default user to use for playbooks if user is not specified
 # (/usr/bin/ansible will use current user as default)
-#remote_user = pi
-remote_user = hampi
+remote_user = pi
+#remote_user = hampi
 
 # logging is off by default unless this path is defined
 # if so defined, consider logrotate
@@ -214,7 +214,7 @@ remote_user = hampi
 # paramiko on older platforms rather than removing it
 #ssh_args = -o ControlMaster=auto -o ControlPersist=60s
 
-ssh_args = -o ControlMaster=auto -o ControlPersist=5m
+# ssh_args = -o ControlMaster=auto -o ControlPersist=5m
 
 # The path to use for the ControlPath sockets. This defaults to
 # "%(directory)s/ansible-ssh-%%h-%%p-%%r", however on some systems with
@@ -235,8 +235,8 @@ ssh_args = -o ControlMaster=auto -o ControlPersist=5m
 # By default, this option is disabled to preserve compatibility with
 # sudoers configurations that have requiretty (the default on many distros).
 # 
-#pipelining = False
-pipelining = True
+pipelining = False
+#pipelining = True
 
 # if True, make ansible use scp if the connection type is ssh 
 # (default is sftp)

files/etc/hampc-release

@@ -1,7 +1,7 @@
-PRETTY_NAME="HamPC 2.0b1 (December 2021)"
+PRETTY_NAME="HamPC 2.1 (April 2022)"
 NAME="HamPC"
-VERSION_ID="2,0b1"
-VERSION="2.0b1 (December 2021)"
+VERSION_ID="2,1"
+VERSION="2.1 (April 2021)"
 HOME_URL="http://hampi.radiowaves.ca"
 SUPPORT_URL="https://groups.io/g/Ham-Pi"
 BUG_REPORT_URL="https://github.com/dslotter/HamPi/issues/"

files/etc/hampi-release

@@ -1,7 +1,7 @@
-PRETTY_NAME="HamPi 2.0 (December 2021)"
+PRETTY_NAME="HamPi 2.1 (April 2022)"
 NAME="HamPi"
-VERSION_ID="2,0"
-VERSION="2.0 (December 2021)"
+VERSION_ID="2,1"
+VERSION="2.1 (April 2022)"
 HOME_URL="http://hampi.radiowaves.ca"
 SUPPORT_URL="https://groups.io/g/Ham-Pi"
 BUG_REPORT_URL="https://github.com/dslotter/HamPi/issues/"

files/sdrplay_linux_api3_install.exp

@@ -0,0 +1,19 @@
+#!/usr/bin/expect -f
+# Copyright 2020 - 2022, Dave Slotter, W3DJS
+
+set timeout 120
+match_max 100000
+
+spawn ./SDRplay_RSP_API-Linux-3.07.1.run
+
+expect {
+        -- "--More--" {
+                send -- " "
+                exp_continue
+        }
+
+        "\[y/n\] " {
+                send -- "y\r"
+                exp_continue
+        }
+}

library/install_buster_repo.yml

@@ -12,6 +12,15 @@
         deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
     when: is_bullseye|bool
 
+  - name: Add repository key
+    become: yes
+    command: apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9165938D90FDDD2E
+    when: is_bullseye|bool
+    retries: 5
+    delay: 30
+    register: result
+    until: result.failed == false
+
   - name: Update package cache
     become: yes
     apt:

library/set_facts.yml

@@ -41,7 +41,13 @@
     set_fact:
       is_buster: False
       is_bullseye: True
-    when: (is_debian|bool or is_ubuntu|bool ) and ansible_distribution_major_version == "11"
+    when: (is_debian|bool or is_ubuntu|bool ) and ansible_distribution_release == "bullseye"
+
+  - name: Set facts for Debian Bullseye on Ubuntu
+    set_fact:
+      is_buster: False
+      is_bullseye: True
+    when: (is_debian|bool or is_ubuntu|bool ) and ansible_distribution_major_version == "21"
 
   - name: Set facts for Raspberry Pi
     set_fact:

tasks/main.yml

@@ -4,7 +4,7 @@
 
 ---
 
-- name: HamPi / HamPC v2.0 (December 2021) Playbook by W3DJS
+- name: HamPi 64-bit / HamPC v2.1 (March 2021) Playbook by W3DJS
   hosts: all
   # hosts: nuc
   # hosts: vm
@@ -23,7 +23,6 @@
 - import_playbook: install_wallpaper.yml
 - import_playbook: upgrade_debian_packages.yml
 - import_playbook: install_bookmarks.yml
-- import_playbook: install_orca.yml
 - import_playbook: install_cmake.yml
 - import_playbook: install_wxwidgets.yml
 # ^^^ This part takes about 1 hour to build on a RPi 4 ^^^
@@ -89,7 +88,6 @@
 - import_playbook: install_lopora.yml
 - import_playbook: install_morsecode_apps.yml
 - import_playbook: install_satellite_tracking.yml
-# Fails to build under aarch64:
 - import_playbook: install_wsjtx.yml
 # Fails to build under aarch64:
 - import_playbook: install_js8call.yml
@@ -132,6 +130,7 @@
 - import_playbook: install_leansdr.yml
 - import_playbook: install_cygnusRFI.yml
 - import_playbook: install_uhrr.yml
+# Build broken on AMD64 by change to glibc:
 - import_playbook: install_qrsspig.yml
 - import_playbook: install_skcclogger.yml
 - import_playbook: install_radioexplorer.yml
@@ -149,7 +148,8 @@
 - import_playbook: install_lysdr.yml
 - import_playbook: install_cubicsdr.yml
 - import_playbook: install_sdrplusplus.yml
-- import_playbook: install_sdrangel.yml
+
+#- import_playbook: install_sdrangel.yml
 # ^^^ SDRAngel takes about 65 minutes to build on a RPi 4 and 42 minutes on a x86_64 ^^^
 
 # Final tasks