Commit Graph

382 Commits

Author SHA1 Message Date
Anthony Lavado
229bd598b5
Add escapes for path quotes in the NSIS Installer (#1777)
This adds backslashes to escape the `--datadir` path in the Windows Installer. Without this, the path would be dropped at the first space (e.g. `C:\Test Area\Jellyfin` would become `C:\Test`).

Fixes #1773.
2019-09-20 13:45:20 -04:00
Joshua Boniface
260dd37bd5 Include libssl-dev dep in Ubuntu build containers 2019-09-20 11:55:51 -04:00
Erwin de Haan
2f2010ce59 NSIS improvements (#1692)
* Much better, but still broken

It crashes with two custom pages after one another. (So when the service should be installed).

* Fixed the problems and finished the NSIS installer.

Also ignored some of the artifacts.

* Added changes to CI for setup building.

Consolidate building and fixed git error.

Small CI fixes.

Move UX repo to SourcesDirectory

Fix stupid checkout <> clone error.

Fix typo in PowerShell command.

Artifact publish tasks can not have wildcards.
2019-09-09 17:40:51 -04:00
Joshua M. Boniface
fde9dd2a61
Merge pull request #1693 from joshuaboniface/update-libssl
Update Debian build to Buster and LibSSL 1.1
2019-09-02 21:11:57 -04:00
Joshua Boniface
5552e8cbd7 Add missing build dependency 2019-09-02 20:13:28 -04:00
Joshua Boniface
742102b541 Bump version to 10.4.0 2019-08-31 21:39:10 -04:00
Joshua Boniface
93a668de8b Add libssl-dev dependency 2019-08-31 01:17:23 -04:00
Joshua Boniface
1d5b11f7f6 Update GCC crossbuild to version 8 2019-08-31 01:12:11 -04:00
Joshua Boniface
b1c7b88b5b Use latest 2.2.6 dotnet SDK image (2.2.401) 2019-08-31 00:39:46 -04:00
Joshua Boniface
bedc2be525 Add libssl-dev build dependency 2019-08-31 00:32:26 -04:00
Joshua Boniface
fb37f4a1d5 Use base Debian image in Docker build 2019-08-26 11:05:15 -04:00
Joshua Boniface
5945a638ff Update builds to Debian 10 and OpenSSL to 1.1-only 2019-08-26 11:00:36 -04:00
loli10K
588db95e2a Fix firewall-cmd: Error: INVALID_SERVICE: 'jellyfin' not among existing services 2019-08-20 20:27:31 +02:00
Joshua M. Boniface
94e25e898a
Merge pull request #1511 from crankdoofus/master
Add NSIS installer build support
2019-08-18 13:56:20 -04:00
crankdoofus
c6111a7fb5
Change service install user
The default is Network Service, with advanced option to use Local System
2019-07-27 20:23:22 +10:00
crankdoofus
5517d912bf
Rework based on review comments 2019-07-25 21:52:44 +10:00
crankdoofus
fbbcba95d3
Update installer name to copy 2019-07-25 21:51:53 +10:00
Bond-009
e8028de4d7
Merge pull request #1560 from jellyfin/release-10.3.z
Backmerge for 10.3.7
2019-07-24 19:10:04 +02:00
Joshua M. Boniface
595a68b822 Bump version for 10.3.7 2019-07-24 10:48:35 -04:00
Joshua M. Boniface
953f077f9d Override the installinit name
Without this, when building the `jellyfin-nightly` package, it attempts
to find service/init files with the name `jellyfin-nightly` instead of
the proper name. This override prevents this by forcing the name to
`jellyfin`. Required for nightly builds.
2019-07-14 23:11:17 -04:00
Joshua M. Boniface
0f8e2600e3 Fix broken symlinks
These were removed somehow in defc5f1cf9b486357b379c610663e1bad48428ad;
restore them to their proper link state.
2019-07-13 14:23:57 -04:00
Joshua M. Boniface
881f385a61 Use dash or underscore on mv command
Required for nightlies, which would not match this file format with the
underscore then wildcard. Enables nightly builds.
2019-07-13 13:03:50 -04:00
crankdoofus
e31851d25e
Update to uninstall silently if already installed 2019-07-13 21:16:56 +10:00
crankdoofus
aff72323c6
Update code for in-place upgrades 2019-07-09 22:56:23 +10:00
crankdoofus
8555c5fae1
Correct comment 2019-07-07 09:17:03 +10:00
crankdoofus
da71354e82
Remove Emby migration section, include License 2019-07-07 09:13:27 +10:00
crankdoofus
3d0e7f6cb6
Include License file with installation 2019-07-07 09:10:35 +10:00
Bond-009
82f041d050
Merge branch 'master' into release-10.3.z 2019-07-06 23:08:52 +02:00
Joshua M. Boniface
b3f9d04501 Bump version for 10.3.6 2019-07-06 13:34:38 -04:00
crankdoofus
cea6a2217e
Correct Service handling & LocalAppData folder
The service is now completely controlled by nssm as with the install-jellyfin.ps1
The LocalAppData had the global context, its now 
Corrected order of Mandatory and Optional components.
2019-07-06 18:34:48 +10:00
crankdoofus
dc3eceec6a
Changed order to include install scripts in installer 2019-07-06 18:02:00 +10:00
crankdoofus
a6819ffd1d
Cleaned up code 2019-07-06 12:19:57 +10:00
crankdoofus
de9ee10abc
Uncomment accidental commenting of compilation 2019-07-06 12:18:20 +10:00
crankdoofus
43989800ba
Added -Force to nsis extraction 2019-07-06 12:16:34 +10:00
crankdoofus
1fd827fa77
Create jellyfin.nsi 2019-07-06 11:43:20 +10:00
crankdoofus
3b9766f58c
Added option for NSIS
This change will 
1. download NSIS zip, 
2. unzip in temp folder, 
3. use nsis to build the installer
2019-07-06 11:41:33 +10:00
dkanada
0e0c70f782
Merge pull request #1505 from trumblejoe/patch-1
Qualified Namespace of pscredential
2019-07-04 20:18:46 -07:00
dkanada
4f2d601f02
Merge pull request #1167 from Bond-009/eol
Force LF line endings
2019-07-02 13:02:29 -07:00
trumblejoe
b719ca5a33
Qualified Namespace of pscredential
Qualified Namespace of pscredential, otherwise script fails in Powershell builds <3.0.
2019-07-02 13:29:28 -04:00
Joshua M. Boniface
62105c249f Use which to find the service binary path 2019-06-28 11:15:08 -04:00
Joshua M. Boniface
a629f209b9 Make message wording more consistent 2019-06-28 11:06:55 -04:00
Joshua M. Boniface
c08c0272b5 Add nicer restart script
The old restart script was buggy, as reported in #1320. This updated
script seems to work far more reliably and conforms to the existing
jellyfin-sudoers packages sudo configuration.
2019-06-27 18:05:03 -04:00
Joshua M. Boniface
687255aa31
Merge pull request #1442 from jellyfin/release-10.3.z
Backmerge for Release 10.3.4 and 10.3.5
2019-06-12 23:30:57 -04:00
Joshua M. Boniface
d5fe82314e Bump version for 10.3.5 2019-06-09 21:47:45 -04:00
Bond-009
cb07822aa3 Add execute permissions back 2019-06-08 19:56:08 +02:00
Bond_009
defc5f1cf9 Force LF line endings 2019-06-08 19:56:08 +02:00
Joshua M. Boniface
855911333a Bump version for 10.3.4 2019-06-06 22:45:37 -04:00
Bond-009
2d011b781e
Merge pull request #1383 from jellyfin/release-10.3.z
Backmerge for Release 10.3.3
2019-05-18 12:56:42 +02:00
Joshua M. Boniface
1bf3a26a61 Bump version for 10.3.3 2019-05-17 23:12:21 -04:00
Odd Stråbø
3634d367c1 Move artifact chown inside docker to avoid sudo 2019-05-01 20:32:15 +02:00
Joshua M. Boniface
2bc378a9c3
Merge pull request #1337 from jellyfin/release-10.3.z
Backmerge for 10.3.2 release
2019-04-30 23:35:11 -04:00
Joshua Boniface
e8196fed7c Bump version for 10.3.2 2019-04-30 20:18:54 -04:00
Joshua M. Boniface
477702fbb9
Merge pull request #1324 from joshuaboniface/arm64
Add arm64 packaging for Debuntu
2019-04-30 20:07:41 -04:00
Joshua Boniface
c8a59c8343 Support libssl1.1 for Ubuntu Disco 2019-04-29 23:03:57 -04:00
Joshua Boniface
2b2a2ed708 Add arm64 packaging for Debuntu 2019-04-29 00:56:17 -04:00
Bond-009
61d7bed181
Merge pull request #1304 from jellyfin/release-10.3.z
Backmerge 10.3.1
2019-04-25 07:27:37 +02:00
Joshua Boniface
5fb4922c6f Bump version to 10.3.1 2019-04-20 14:24:40 -04:00
Bond-009
a8da122fb3
Merge pull request #1252 from jellyfin/release-10.3.z
Backmerge release 10.3.0
2019-04-20 12:25:29 +02:00
Joshua Boniface
46c37c0ae8 Bump version to 10.3.0 (release) 2019-04-19 14:25:29 -04:00
Terror-Gene
a9f790e101
Fix directory capitalization 2019-04-11 04:00:46 +09:30
Terror-Gene
f888c4b641
Fix missing Unraid cache mount
Cache folder was not mounted outside of the Docker image since its separation from the config folder.
Config HostDir was only updated for consistency, previous directory was overridden by unraid into the appdata/appname folder anyway.
Name capitalization was corrected as this is only used by new installations & does not affect current installations/updates.
2019-04-11 03:19:05 +09:30
Joshua Boniface
65bff1181a Bump version to 10.3.0-rc2 and update submodule 2019-04-10 00:51:21 -04:00
Joshua M. Boniface
eae0c28e6d
Merge pull request #1178 from jellyfin/LogicalPhallacy-patch-1
Updates windows installer default lib location
2019-04-08 18:44:43 -04:00
Terror-Gene
c72393c970
Updated Unraid Docker icon
Logo was set to use emby, but binhex has since added the jellyfin logo.
2019-04-08 14:56:42 +09:30
John Taylor
f5f7de64de Use TLS 1.2 to download NSSM 2019-04-06 13:40:19 -04:00
LogicalPhallacy
816d8a0216
Update install-jellyfin.ps1 2019-03-31 10:34:49 -07:00
LogicalPhallacy
e37ccd6ec0
Updates windows installer default lib location
You can use the emby import to move an existing library this way.
2019-03-31 10:32:56 -07:00
Joshua Boniface
f27477da26 Bump version to 10.3.0 and update submodule 2019-03-30 15:47:34 -04:00
Andrew Rabert
c032a015a4
Merge pull request #1172 from joshuaboniface/build-improvements
Minor improvements to release build setup
2019-03-30 15:45:11 -04:00
Joshua Boniface
31aa6c486c Get the version string from build.yaml
For the purposes of packaging, this makes more sense, since we can
include additional appends to this version (e.g. `-rcX`) when we
can't in the SharedVersion file. The previous commit to the
bump_version script sets this as well.
2019-03-30 12:42:33 -04:00
Joshua Boniface
3375ca5a8c Split lists echoes into separate lines 2019-03-30 12:19:49 -04:00
Joshua Boniface
1596e93cc1 Fix up the Ubuntu repository definitions 2019-03-30 11:58:56 -04:00
Joshua Boniface
1a540f1cf7 Add Ubuntu armhf (Raspberry Pi) build
A pretty-much direct copy of the Debian armhf build infrastructure.
2019-03-30 11:50:46 -04:00
Joshua Boniface
427a3e9b08 Use new libexecdir location for jellyfin-ffmpeg
From commit d6bb1f3c in jellyfin-ffmpeg, which moves the installed
binaries from /usr/share to /usr/lib on the next release.
2019-03-28 18:21:25 -04:00
Torsten
bd31091648 Update init scripts for compatibility with Devuan
Include start, stop, restart and status option for /etc/init.d/jellyfin
Use start-stop-daemon to make the script refer to systemctl mechanism
on systems that have systemd installed
2019-03-20 20:16:24 +01:00
PloughPuff
b864e9da2a Finalise removal of --ffprobe switch
Removed --ffprobe from src files and server/docker scripts.
2019-03-12 22:09:18 +00:00
Joshua Boniface
86f5221f96 Use environment variables instead of opts for RPM 2019-03-10 17:11:16 -04:00
Joshua Boniface
ecf85a73ec Use environment variables instead of opts for Deb 2019-03-10 17:09:51 -04:00
Joshua Boniface
4ef7eda593 Copy install script from new location 2019-03-06 09:22:38 -05:00
Bond-009
594b271383
Merge pull request #1024 from jellyfin/release-10.2.z
Backmerge for 10.2.2
2019-03-01 07:49:07 +01:00
Joshua Boniface
58e5931a32 Bump version to 10.2.2 2019-02-28 22:03:08 -05:00
Anthony Lavado
fcd299965d
Merge pull request #992 from joshuaboniface/armhf-debian
Add Debian armhf (Rasberry Pi) build plus crossbuild
2019-02-28 12:55:59 -05:00
Andrew Rabert
f384822aa5
Merge pull request #991 from joshuaboniface/ffmpeg-compat
Fix the ffmpeg compatibility
2019-02-27 20:45:43 -05:00
Vasily
500c0b9cba
Merge pull request #979 from Wuerfelbecher/release-disable-debug
Build Package releases without debug turned on
2019-02-25 16:35:06 +03:00
Joshua Boniface
5054a77dcf Fix the ffmpeg compatibility
Doing this the other way was just complex. No longer try to override
the system ffmpeg, just put ours somewhere else and depend on that
package.
2019-02-25 00:41:34 -05:00
Joshua Boniface
dac2c98d8a Disable documentation and debug in build 2019-02-24 23:20:04 -05:00
Thomas Büttner
38ec68c488
use common.build.sh for docker image builds
Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
2019-02-24 11:17:39 +01:00
Thomas Büttner
da61998ad6
Build releases without debug
Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
2019-02-24 11:00:15 +01:00
Joshua Boniface
c2e57aba27 Add Debian armhf (Rasberry Pi) build plus crossbuild 2019-02-23 20:07:05 -05:00
Brian J. Murrell
f03e279382 COPR auto building
This adds enhancements so that Fedora/EL packages can be automatically
built in COPR when a webhook is received.  A typical webhook could be
for tagging events for example or even a "Release" webhook to only
build releases.
2019-02-21 02:12:16 -05:00
Brian J. Murrell
1bc2b12ee3 dotnet-runtime is needed in Fedora RPM build also 2019-02-21 02:11:46 -05:00
Joshua Boniface
469a17b3ca Install the dotnet runtime too
This is needed since /usr/bin/dotnet doesn't exist in the SDK package
for whatever reason as of Feb 18 2019.
2019-02-20 20:36:49 -05:00
scheidleon
74aa38acd7 Fix Path 2019-02-20 21:04:52 +01:00
Joshua M. Boniface
d4ded281aa
Merge pull request #961 from jellyfin/release-10.2.z
Release 10.2.1
2019-02-20 14:24:22 -05:00
Joshua Boniface
83948420a4 Bump version to 10.2.1 2019-02-20 13:29:14 -05:00
Bond-009
99bed9a9c3
Merge pull request #939 from joshuaboniface/cleanup-builds
Clean up and rename obsolete deployment platforms
2019-02-20 07:28:20 -05:00
Joshua Boniface
3ed9d32f68 Rename Windows scripts folder 2019-02-18 22:07:53 -05:00
Joshua Boniface
3ecfd1fdd1 Rename framework to portable 2019-02-18 22:07:12 -05:00
Joshua Boniface
24574d4964 Rename MacOS build 2019-02-18 22:06:44 -05:00
Joshua Boniface
512ab8c6aa Remove unneeded Linux builds 2019-02-18 22:06:06 -05:00
Joshua M. Boniface
781cca0c82
Merge pull request #902 from brianjmurrell/copr-autobuild
COPR auto building
2019-02-18 13:53:59 -05:00
Joshua Boniface
a15098dc00 Bump release version for last-minute PRs 2019-02-16 12:13:38 -05:00
Joshua Boniface
056e19f350 Remove superfluous changelog entries 2019-02-15 21:04:12 -05:00
Joshua Boniface
f8ba55e202 Update version to 10.2.0 release 2019-02-15 20:52:54 -05:00
Brian J. Murrell
e33706ab25 Code review updates
Also fix a bug in the tarball creation that existed even prior
to moving it into create_tarball.sh
2019-02-15 10:22:52 -05:00
Brian J. Murrell
4018b7e2d5 COPR auto building
This adds enhancements so that Fedora/EL packages can be automatically
built in COPR when a webhook is received.  A typical webhook could be
for tagging events for example or even a "Release" webhook to only
build releases.
2019-02-15 08:21:55 -05:00
Joshua Boniface
8414285b58 Only modify Debian package spec for jellyfin-ffmpeg 2019-02-14 09:15:37 -05:00
Joshua Boniface
7ec42b89a0 Correct changelogs for updated 10.2.0~rc2 2019-02-13 17:45:17 -05:00
Joshua Boniface
af8f86b3de Bump version to 10.2.0~rc2 2019-02-13 01:03:48 -05:00
Joshua Boniface
9849c183ac Fix syntax error of additional brace 2019-02-10 21:42:37 +01:00
Joshua Boniface
bcb32ec6ad Bump version to 10.2.0~rc1 2019-02-10 02:08:12 -05:00
Joshua M. Boniface
d6c669a7c8
Merge pull request #824 from joshuaboniface/improved-docker-pkgbuild
Improved Docker pkgbuild
2019-02-09 20:58:56 -05:00
Joshua Boniface
fb256b7aa0 Fix control file for Microsoft Docker setup 2019-02-09 19:32:06 -05:00
Joshua Boniface
00234a5ece Remove superfluous comments 2019-02-09 19:12:55 -05:00
Joshua Boniface
57cefb432a Combine various RUNs in Fedora/CentOS 2019-02-09 19:06:27 -05:00
Joshua Boniface
7be4a8500c Use Microsoft dotnet Docker images 2019-02-09 19:02:27 -05:00
Anthony Lavado
4727f69fc9
Merge pull request #807 from joshuaboniface/fix-restart
Fix restart script in OS packages
2019-02-09 15:43:00 -05:00
Joshua Boniface
3014866f65 Add similar Ubuntu build package 2019-02-08 21:08:34 -05:00
Joshua Boniface
37985c2e26 Update image name 2019-02-08 20:44:41 -05:00
Joshua Boniface
139e3c19ee Replace symlinks with copies and update image name 2019-02-08 20:43:18 -05:00
Joshua Boniface
da860e6e54 Remove superfluous VERSION variables 2019-02-08 20:40:19 -05:00
Joshua Boniface
b8b650540d Allow Fedora/CentOS mounting by default 2019-02-06 09:33:14 -05:00
Joshua Boniface
e1d523ee45 Improve description of keep_artifacts flag 2019-02-05 21:37:56 -05:00
Joshua Boniface
8413c56392 Update CentOS package build 2019-02-05 19:19:55 -05:00
Joshua Boniface
88038d9644 Update Fedora package build 2019-02-05 19:04:08 -05:00
Joshua Boniface
c846da4f9e Update Debian package build 2019-02-05 18:40:50 -05:00
Joshua Boniface
546f4cd46f Add prerequisite keep_artifacts var 2019-02-05 18:40:31 -05:00
Joshua Boniface
72beadc74d Fix restart script for Fedora/CentOS 2019-02-04 00:27:00 -05:00
Joshua Boniface
f0e74c2c6b Fix restart script for Debian 2019-02-04 00:26:23 -05:00
Joshua Boniface
d351fa0c1e Make Fedora package.sh script use bash 2019-02-03 22:59:55 -05:00
Joshua M. Boniface
20033f2275
Merge branch 'master' into fix-env 2019-02-03 22:34:40 -05:00
Joshua Boniface
be89d53a9e Handle new option parser properly 2019-02-03 20:57:07 -05:00
Thomas Büttner
d573f2d671
use cachedir option
Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
2019-02-03 13:17:22 +01:00
Thomas Büttner
1ce5939362
optimize rpm dependencies
Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
2019-02-03 13:17:11 +01:00
Thomas Büttner
4d335d8f13
Add CentOS
Signed-off-by: Thomas Büttner <thomas@vergesslicher.tech>
2019-02-03 13:15:38 +01:00
Joshua Boniface
6772ac5603 Fix double-dashes in Fedora environment file 2019-02-01 20:03:04 -05:00
Joshua Boniface
b630e9de82 Allow adm group to view Jellyfin resources
This is pretty arbitrary and personal, but I detest services that
lock out global access (which is good), but don't simultaneously
make it easy for administrators to enter the directories. The adm
group should only have actual system administrators as members,
so this lets them view the secure directories.
2019-02-01 19:16:47 -05:00
Joshua Boniface
7774977cdd Implement review feedback 2019-02-01 19:12:12 -05:00
Joshua Boniface
aad34e62ca Move jellyfin-sudoers to conf dir 2019-01-31 22:28:12 -05:00
Joshua Boniface
45d8ace9bb Use good ideas from Fedora systemd in Debian 2019-01-31 22:26:31 -05:00
Joshua Boniface
5e4697802f Replace programdata with datadir everywhere 2019-01-31 22:03:55 -05:00
Joshua Boniface
f6227e99cc Add cachedir to deployment scripts; fix bad logdir 2019-01-31 21:57:25 -05:00
Joshua Boniface
ae24d644db Use double-dash args in install-jellyfn.ps1 2019-01-31 21:52:26 -05:00
Joshua Boniface
b982d7c239 Update to long opts and add cache dirs 2019-01-31 21:50:50 -05:00
Andrew Rabert
b4fdfb562d Merge pull request #700 from jellyfin/dev
Dev sync
2019-01-24 23:03:54 -05:00
Thomas Büttner
6a3ed5d519 Added macOS to the docker sudo exception 2019-01-24 16:24:00 +01:00
Thomas Büttner
f2d0d1f646 Make the docker group check BSD compatible 2019-01-24 15:24:04 +01:00
Phallacy
d6a729c119 parameterized ffmpeg and nssm stuff 2019-01-24 01:56:56 -08:00
Phallacy
4e7675e78f Updated Packaging Windows from Linux for parity 2019-01-24 01:42:34 -08:00
Thomas Büttner
cc3b1e5cc8 Fix package build for fedora 2019-01-23 21:14:10 +01:00
Phallacy
a30687a15a Quick fix to erroring build scripts and pulling the supported ffmpeg 2019-01-23 00:41:38 -08:00
Joshua Boniface
411139cd78 Update changelogs to add #666 2019-01-21 23:56:02 -05:00
Joshua Boniface
8d298e0e36 Update changelogs to remove #639, add #661, #54 2019-01-21 21:24:28 -05:00
Joshua Boniface
e6b95db132 Add jellyfin-web#53 to changelogs 2019-01-21 16:34:53 -05:00
Joshua M. Boniface
571afa4fe2 Merge pull request #655 from joshuaboniface/local-web-branch
Support trying local branches in submodule
2019-01-21 13:28:40 -05:00
Joshua Boniface
42f2799d66 Add jellyfin-web#52 to changelogs 2019-01-21 13:25:26 -05:00
Joshua Boniface
384f867228 Update changelogs to include this PR 2019-01-21 12:57:46 -05:00
Joshua Boniface
ff4cbfc6df Fix inconsistencies in changelogs 2019-01-21 00:02:56 -05:00
Joshua Boniface
73038ee3f7 Bump version to 10.1.0 2019-01-20 23:39:55 -05:00
Joshua Boniface
3320d4feeb Move dotnet to a per-platform dependency 2019-01-20 12:34:52 -05:00
Joshua Boniface
daaa007fea Update YUM spec version 2019-01-19 18:57:14 -05:00
Joshua Boniface
0addc9ef46 Add mention of dependencies file per platform 2019-01-19 18:48:48 -05:00
Joshua Boniface
9f8b716f40 Add dependencies.txt entries for Docker builds 2019-01-19 18:45:29 -05:00
Joshua Boniface
f952988fb3 Add new centralized build script and README 2019-01-19 18:10:54 -05:00
Joshua Boniface
d42ef36bf9 Correct invalid changelog entry 2019-01-19 16:44:55 -05:00
Erwin de Haan
c5430f86b0 Fixed csproj and xml identation. 2019-01-19 15:01:16 +01:00
Erwin de Haan
d116efe1f7 Merge branch 'dev' into reformat 2019-01-18 17:04:01 +01:00
Joshua Boniface
b30d702782 Merge branch 'master' into dev 2019-01-15 22:29:22 -05:00
Erwin de Haan
49b61f238e Merge branch 'dev' into reformat
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
#	Emby.Server.Implementations/LiveTv/LiveTvManager.cs
#	Emby.Server.Implementations/Security/MBLicenseFile.cs
#	Emby.Server.Implementations/Security/PluginSecurityManager.cs
#	Emby.Server.Implementations/Security/RegRecord.cs
#	MediaBrowser.Api/PluginService.cs
#	MediaBrowser.Api/System/SystemService.cs
#	MediaBrowser.Common/Security/IRequiresRegistration.cs
#	MediaBrowser.Common/Security/ISecurityManager.cs
#	MediaBrowser.Common/Security/PaymentRequiredException.cs
#	MediaBrowser.Model/Entities/MBRegistrationRecord.cs
#	MediaBrowser.Model/Entities/PluginSecurityInfo.cs
#	deployment/win-generic/build-jellyfin.ps1
2019-01-15 17:34:39 +01:00
Erwin de Haan
9b224d7080 Merged the two ARM platforms. To be split apart when a binary ffmpeg is required. 2019-01-13 23:43:12 +01:00
Erwin de Haan
ca320ba7ac Sudo fix for debian and fedora. 2019-01-13 23:34:40 +01:00
Erwin de Haan
d7b7be395b Moved ARM dockerfiles back to root. 2019-01-13 23:24:43 +01:00
Erwin de Haan
672013c23d Add TODO for netcore version upgrade. 2019-01-12 16:34:13 +01:00
Erwin de Haan
b73d081bd2 Updated docker build script. 2019-01-12 15:56:06 +01:00
Erwin de Haan
ba671569b4 Moved main docker file. 2019-01-12 15:54:52 +01:00
Erwin de Haan
2c65fe53f2 Enabled update-version in anticipation of the versioning PR. 2019-01-12 03:09:38 +01:00
Erwin de Haan
2c62f8dbd5 Renamed main script to be more correct for what it does. 2019-01-12 03:07:16 +01:00
Erwin de Haan
4b00b0cc87 Fixed fedora rpm build unexpected dependency on liblttng-ust. Fixed the docker builds and added manifest generation. 2019-01-12 03:04:36 +01:00
Erwin de Haan
74507099ad Added git submodules command. Converted RPM to build from local tree. Added all the execution bits to the build scripts. 2019-01-12 01:49:46 +01:00
Erwin de Haan
0bb08b3f8d Added debian bin folder. 2019-01-11 23:35:14 +01:00
Erwin de Haan
21098eb861 Moved rpm package and edited the package slightly, to build the project correctly. 2019-01-11 23:22:50 +01:00
Erwin de Haan
399a079dd4 Build scripts and build system consolidation.
Squashed commit.
2019-01-10 19:45:30 +01:00