Hardware video acceleration, minor improvements

Added back fbdev and fbturbo, because why not?

Changed package names to Debian's instead of Raspbian's

Nginx config question now defaults to no since most people don't do
that

Nginx is now disabled on first boot since it just failed anyways
This commit is contained in:
Logan G 2020-08-17 00:49:15 -06:00
parent 926851361c
commit c05b4a1815
Signed by: logan
GPG key ID: E328528C921E7A7A
4 changed files with 7 additions and 3 deletions

View file

@ -6,6 +6,8 @@ install -m 644 files/nginx.conf ${ROOTFS_DIR}/etc/nginx/nginx.conf
echo -e "listen 443;" > ${ROOTFS_DIR}/etc/nginx/listen.conf
on_chroot << EOF
# Package enables this when installed, won't start until first-time is run due to missing SSL certs
systemctl disable nginx
# If OctoPrint already exists, skip this (for debugging)
if [[ ! -f /srv/octoprint/bin/octoprint ]]; then
cd /srv/ || exit 1

View file

@ -1,5 +1,5 @@
cmake
libjpeg8-dev
libjpeg-dev
v4l-utils
libv4l-dev
gcc

View file

@ -84,7 +84,7 @@ screen_timeout
openssl req -x509 -nodes -days 36500 -newkey rsa:4096 -subj "/C=/ST=/L=/O=/OU=/CN=*/emailAddress=" -out /etc/ssl/certs/nginx-octoprint.crt -keyout /etc/ssl/private/nginx-octoprint.key
# If OctoPrint/MJPG Streamer is running locally, ask if the user wants to change the default listening port/IP (optional)
if ( [[ -f /etc/systemd/system/multi-user.target.wants/octoprint.service ]] || [[ -f /etc/systemd/system/multi-user.target.wants/mjpg-streamer.service ]] ) && dialog --title "Nginx Config" --yesno "Do you wish to change the default Nginx listening address and/or port?" 10 60; then
if ( [[ -f /etc/systemd/system/multi-user.target.wants/octoprint.service ]] || [[ -f /etc/systemd/system/multi-user.target.wants/mjpg-streamer.service ]] ) && dialog --title "Nginx Config" --defaultno --yesno "Do you wish to change the default Nginx listening address and/or port?" 10 60; then
nginx_config
fi

View file

@ -1,9 +1,11 @@
xserver-xorg
xserver-xorg-video-fbdev
xserver-xorg-video-fbturbo
xinit
menu-xdg
zenity
xdg-utils
gvfs-backends
gvfs-fuse
gnome-themes-standard-data
gnome-themes-standard
gnome-icon-theme