Skip to content

Ubuntu 18.04 Compatibility #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
syntheticgio wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Ubuntu 18.04 Compatibility #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d9e4bbe
Removed system-service-manager - doesn't exist like this for ubuntu 1…
syntheticgio Sep 17, 2020
2941fa4
mysql no longer allows blank default timestamp
syntheticgio Sep 18, 2020
c9f75d7
Some of the apt get installs needed
syntheticgio Sep 18, 2020
47b0853
Fix for imagemagick 7.0+
syntheticgio Sep 18, 2020
5e645c6
Added an incomplete requirements list
syntheticgio Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@ elif [[ "${USER}" == "root" ]]; then
if [[ "${OSxx}" == "ubuntu" ]]; then
apt-get --assume-yes install \
mc zip unzip xz-utils wget curl htop dstat netcat \
socat xfsprogs nfs-common system-storage-manager lvm2 \
socat xfsprogs nfs-common lvm2 \
perl psmisc iotop bzip2
else
yum install --assumeyes \
Expand Down
8 changes: 8 additions & 0 deletions requirements.list
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
libmysql-dev
libpcre3
libpcre3-dev
libsqlite3
libmagickwand-dev


Install ImageMagick (tested with 7.0)
6 changes: 3 additions & 3 deletions vlib/db/QPJob.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ CREATE TABLE `QPJob` (
`cntGrabbed` int(11) NOT NULL DEFAULT '0',
`inParallel` int(11) NOT NULL DEFAULT '0',
`cdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`aliveTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
`actTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
`psTm` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`aliveTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01',
`actTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01',
`psTm` datetime NOT NULL DEFAULT '1970-01-01 00:00:01',
`mem` bigint(20) NOT NULL DEFAULT '0',
`maxmem` bigint(20) NOT NULL DEFAULT '0',
`killCnt` bigint(20) NOT NULL DEFAULT '0',
Expand Down
2 changes: 1 addition & 1 deletion vlib/db/QPLock.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ DROP TABLE IF EXISTS `QPLock`;
CREATE TABLE `QPLock` (
`reqID` bigint(20) NOT NULL COMMENT 'request ID if positive, or private-use handle if negative',
`key` varchar(767) NOT NULL COMMENT '767 is max length of mysql varchar key; really should be 4096 - max linux path length',
`purgeTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'if purgeTm < NOW(), lock has expired',
`purgeTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01' COMMENT 'if purgeTm < NOW(), lock has expired',
PRIMARY KEY (`key`),
KEY `qplock_reqid` (`reqID`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
12 changes: 6 additions & 6 deletions vlib/db/QPReq.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ CREATE TABLE `QPReq` (
`progress` bigint(20) DEFAULT '0',
`progress100` int(11) DEFAULT '0',
`cdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
`takenTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
`actTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
`aliveTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
`doneTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
`purgeTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
`takenTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01',
`actTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01',
`aliveTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01',
`doneTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01',
`purgeTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01',
`userKey` bigint(20) NOT NULL DEFAULT '0',
`grabRand` bigint(20) DEFAULT '0',
`scheduleGrab` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
`scheduleGrab` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01',
PRIMARY KEY (`reqID`),
KEY `qpreq_grab` (`svcID`,`jobID`,`stat`,`act`),
KEY `qpreq_grabParallel` (`inParallel`),
Expand Down
2 changes: 1 addition & 1 deletion vlib/xlib/image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ sImage * sImage::resize(const char* pic_dst, udx width, udx height, EAspect keep
} else if( keepAspect == eAspectHeight ) {
width = m_width * height / m_height;
}
rc = MagickResizeImage(wand, width, height, LanczosFilter, 1);
rc = MagickResizeImage(wand, width, height, LanczosFilter);
if( rc == MagickTrue ) {
rc = MagickWriteImage(wand, pic_dst);
if( rc == MagickTrue ) {
Expand Down