Skip to content

Commit

Permalink
Merge pull request #576 from bluecherrydvr/jammy-support
Browse files Browse the repository at this point in the history
Jammy support
  • Loading branch information
curtishall authored Apr 5, 2023
2 parents 11caa00 + 2140be9 commit 6e6e1d9
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 10 deletions.
15 changes: 15 additions & 0 deletions debian/bluecherry.service
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[Unit]
Description=Bluecherry DVR Server
After=syslog.target network.target mysql.service

[Service]
Type=simple
User=bluecherry
Group=bluecherry
#ExecStart=/usr/sbin/bc-server -s -u bluecherry -g bluecherry
ExecStart=/usr/sbin/bc-server -s
Restart=on-failure

[Install]
WantedBy=multi-user.target

2 changes: 1 addition & 1 deletion debian/compat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7
11
4 changes: 2 additions & 2 deletions debian/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: bluecherry
Section: admin
Priority: optional
Maintainer: Bluecherry <maintainers@bluecherrydvr.com>
Build-Depends: debhelper (>= 7),
Build-Depends: debhelper (>= 11),
#focal libmysqlclient-dev,
#xenial libmysqlclient-dev,
#bionic libmysqlclient-dev,
Expand All @@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 7),
#buster default-libmysqlclient-dev,
libidn11-dev, libbsd-dev, yasm, libudev-dev, libopencv-dev,
libva-dev
Standards-Version: 3.8.4
Standards-Version: 3.9.5

Package: bluecherry
Architecture: any
Expand Down
20 changes: 14 additions & 6 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,24 @@ LD_LIBRARY_PATH+=:stage/lib
RELEASE_NAME := $(shell ./scripts/build_helper/get_distro_release_name.sh)

%:
dh --parallel $@
dh $@

.PHONY: override_dh_strip debian/control

override_dh_strip:
dh_strip --dbg-package=bluecherry-dbg
# Don't build debug packages anymore

#override_dh_strip:
# dh_strip --dbg-package=bluecherry-dbg

#override_dh_installinit: sbin-start=$(wildcard /sbin/start)
#override_dh_installinit:
# dh_installinit $(if $(sbin-start),--name=bluecherry)

# Add support for systemd

override_dh_installsystemd:
dh_installsystemd --name=bluecherry

override_dh_installinit: sbin-start=$(wildcard /sbin/start)
override_dh_installinit:
dh_installinit $(if $(sbin-start),--name=bluecherry)

override_dh_installlogrotate:
dh_installlogrotate
Expand Down
2 changes: 1 addition & 1 deletion misc/sql/installed_db_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3000009
3000010
10 changes: 10 additions & 0 deletions nginx-configs/php/jammy.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
location ~ \.php$ {
fastcgi_pass unix:/var/run/php/php7.4-fpm.sock;
fastcgi_split_path_info ^(.+\.php)(/.*)$;
include fastcgi.conf;
set $path_info $fastcgi_path_info;
fastcgi_read_timeout 300;
fastcgi_param PATH_INFO $path_info;
fastcgi_param SCRIPT_FILENAME $document_root/index.php;
fastcgi_index index.php;
}
Binary file removed utils/onvif_tool
Binary file not shown.

0 comments on commit 6e6e1d9

Please sign in to comment.