Browse Source

Bring camera installer up to date

Phillip Burgess 1 year ago
parent
commit
c3d4209f47
1 changed files with 11 additions and 18 deletions
  1. 11
    18
      pi-touch-cam.sh

+ 11
- 18
pi-touch-cam.sh View File

@@ -9,14 +9,12 @@ fi
9 9
 clear
10 10
 echo "This script will install and/or modify"
11 11
 echo "packages needed for the Adafruit Pi"
12
-echo "Camera project. It should be installed"
13
-echo "atop one of Adafruit's PiTFT-enabled"
14
-echo "Raspbian setups (either resistive or"
15
-echo "capacitive), NOT a stock Raspbian OS."
12
+echo "Camera project. It requires that the"
13
+echo "adafruit-pitft.sh installer script (for"
14
+echo "PiTFT display support) was run first."
16 15
 echo
17 16
 echo "Operations performed include:"
18
-echo "- In /boot/config.txt, enable Pi"
19
-echo "  camera and boost PiTFT speed"
17
+echo "- In /boot/config.txt, enable camera"
20 18
 echo "- apt-get update"
21 19
 echo "- Install Python libraries:"
22 20
 echo "  picamera, pygame, PIL"
@@ -25,14 +23,7 @@ echo "  touch compatibility"
25 23
 echo "- Download Dropbox Updater and"
26 24
 echo "  Adafruit Pi Cam software"
27 25
 echo
28
-echo "NEVER perform an 'apt-get upgrade' on"
29
-echo "a PiTFT-enabled system; it may fail to"
30
-echo "boot. Upgrades, if necessary, should"
31
-echo "be done by downloading & installing"
32
-echo "the latest PiTFT-enabled OS image from"
33
-echo "Adafruit and running this script."
34
-echo
35
-echo "Run time 10+ minutes. Reboot required."
26
+echo "Run time 5+ minutes. Reboot required."
36 27
 echo
37 28
 
38 29
 if [ "$1" != '-y' ]; then
@@ -48,7 +39,7 @@ echo "Continuing..."
48 39
 
49 40
 if ! grep -q "dtoverlay=pitft" /boot/config.txt ; then
50 41
 	echo "PiTFT overlay not in /boot/config.txt."
51
-	echo "Run script on Adafruit PiTFT-enabled OS."
42
+	echo "Download & run adafruit-pitft.sh first."
52 43
 	echo "Canceling."
53 44
 	exit 1
54 45
 fi
@@ -79,16 +70,18 @@ fi # else gpu_mem OK as-is
79 70
 
80 71
 echo "Installing prerequisite packages..."
81 72
 
82
-# Enable Wheezy package sources
73
+# Enable Wheezy package sources (for SDL downgrade)
83 74
 echo "deb http://archive.raspbian.org/raspbian wheezy main
84 75
 " > /etc/apt/sources.list.d/wheezy.list
85 76
  
86
-# Set stable as default package source (currently jessie)
77
+# Set 'stable' as default package source (current OS)
87 78
 echo "APT::Default-release \"stable\";
88 79
 " > /etc/apt/apt.conf.d/10defaultRelease
89 80
 
90
-# Set priority for libsdl from wheezy higher then the jessie package
81
+# Set priority for libsdl from Wheezy higher than current package
91 82
 echo "Package: libsdl1.2debian
83
+Pin: release n=stretch
84
+Pin-Priority: -10
92 85
 Pin: release n=jessie
93 86
 Pin-Priority: -10
94 87
 Package: libsdl1.2debian

Loading…
Cancel
Save