From 1f4d32e938be626c07f5d4ffe99aed4a4fedd379 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 2 Jan 2024 20:15:13 -0700 Subject: [PATCH 1/2] Re-order install script --- install_limelight.sh | 19 +++++++++---------- install_opi5.sh | 13 ++++++++----- install_pi.sh | 19 +++++++++---------- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/install_limelight.sh b/install_limelight.sh index fe0b440..c8c42ed 100755 --- a/install_limelight.sh +++ b/install_limelight.sh @@ -5,16 +5,7 @@ chmod +x install.sh ./install.sh rm install.sh -echo "Installing additional things" -sudo apt-get update -apt-get install -y pigpiod pigpio device-tree-compiler libraspberrypi-bin -apt-get install -y network-manager -apt-get install -y net-tools -# libcamera-driver stuff -apt-get install -y libegl1 libopengl0 libopencv-core406 libgl1-mesa-dri libcamera0.1 libgbm1 libatomic1 -# And keep rpi-bin installed -apt-mark manual libraspberrypi-bin # edit boot partition install -m 644 limelight/config.txt /boot/ @@ -36,10 +27,18 @@ systemctl enable ssh systemctl enable pigpiod # Remove extra packages too - +echo "Purging extra things" apt-get purge -y python3 gdb gcc g++ linux-headers* libgcc*-dev libqt* wpasupplicant wireless-tools firmware-atheros firmware-brcm80211 firmware-libertas firmware-misc-nonfree firmware-realtek raspberrypi-net-mods device-tree-compiler apt-get autoremove -y +echo "Installing additional things" +sudo apt-get update +apt-get install -y pigpiod pigpio device-tree-compiler libraspberrypi-bin +apt-get install -y network-manager +apt-get install -y net-tools +# libcamera-driver stuff +apt-get install -y libegl1 libopengl0 libopencv-core406 libgl1-mesa-dri libcamera0.1 libgbm1 libatomic1 + rm -rf /var/lib/apt/lists/* apt-get clean diff --git a/install_opi5.sh b/install_opi5.sh index f676a44..e588e6c 100755 --- a/install_opi5.sh +++ b/install_opi5.sh @@ -20,6 +20,14 @@ sed -i 's/# AllowedCPUs=4-7/AllowedCPUs=4-7/g' install.sh ./install.sh rm install.sh + +# Remove extra packages +echo "Purging extra things" +apt-get remove -y gdb gcc g++ linux-headers* libgcc*-dev +apt-get autoremove -y + + +echo "Installing additional things" sudo apt-get update apt-get install -y network-manager net-tools libatomic1 apt-mark manual netplan.io @@ -30,11 +38,6 @@ network: renderer: NetworkManager EOF -# Remove extra packages - -apt-get remove -y gdb gcc g++ linux-headers* libgcc*-dev -apt-get autoremove -y - rm -rf /var/lib/apt/lists/* apt-get clean diff --git a/install_pi.sh b/install_pi.sh index aeb33d4..063c206 100755 --- a/install_pi.sh +++ b/install_pi.sh @@ -5,16 +5,6 @@ chmod +x install.sh ./install.sh rm install.sh -echo "Installing additional things" -sudo apt-get update -apt-get install -y pigpiod pigpio device-tree-compiler libraspberrypi-bin -apt-get install -y network-manager -apt-get install -y net-tools -# libcamera-driver stuff + libatomic1 for wpilib -apt-get install -y libegl1 libopengl0 libopencv-core406 libgl1-mesa-dri libcamera0.1 libgbm1 libatomic1 - -# And keep rpi-bin installed, ideally -apt-mark manual libraspberrypi-bin # and edit boot partition install -m 644 config.txt /boot/ @@ -34,9 +24,18 @@ systemctl enable pigpiod # Remove extra packages too +echo "Purging extra things" apt-get purge -y python3 gdb gcc g++ linux-headers* libgcc*-dev device-tree-compiler apt-get autoremove -y +echo "Installing additional things" +sudo apt-get update +apt-get install -y pigpiod pigpio device-tree-compiler libraspberrypi-bin +apt-get install -y network-manager +apt-get install -y net-tools +# libcamera-driver stuff + libatomic1 for wpilib +apt-get install -y libegl1 libopengl0 libopencv-core406 libgl1-mesa-dri libcamera0.1 libgbm1 libatomic1 + rm -rf /var/lib/apt/lists/* apt-get clean From 82cf773d82757ca5ea219aad899a9af86c111dae Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 2 Jan 2024 21:37:20 -0700 Subject: [PATCH 2/2] Install mrcal packages --- install_limelight.sh | 2 ++ install_opi5.sh | 4 ++-- install_pi.sh | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/install_limelight.sh b/install_limelight.sh index c8c42ed..c3532a6 100755 --- a/install_limelight.sh +++ b/install_limelight.sh @@ -38,6 +38,8 @@ apt-get install -y network-manager apt-get install -y net-tools # libcamera-driver stuff apt-get install -y libegl1 libopengl0 libopencv-core406 libgl1-mesa-dri libcamera0.1 libgbm1 libatomic1 +# mrcal stuff +apt-get install -y libcholmod3 liblapack3 libsuitesparseconfig5 rm -rf /var/lib/apt/lists/* apt-get clean diff --git a/install_opi5.sh b/install_opi5.sh index e588e6c..f325ee0 100755 --- a/install_opi5.sh +++ b/install_opi5.sh @@ -30,8 +30,8 @@ apt-get autoremove -y echo "Installing additional things" sudo apt-get update apt-get install -y network-manager net-tools libatomic1 -apt-mark manual netplan.io -apt-mark manual libatomic1 +# mrcal stuff +apt-get install -y libcholmod3 liblapack3 libsuitesparseconfig5 cat > /etc/netplan/00-default-nm-renderer.yaml <