From 2b2a2ed70892e1e2ed55e59408df530fcdc01933 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Mon, 29 Apr 2019 00:56:17 -0400 Subject: Add arm64 packaging for Debuntu --- deployment/debian-package-x64/pkg-src/rules | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'deployment/debian-package-x64/pkg-src/rules') diff --git a/deployment/debian-package-x64/pkg-src/rules b/deployment/debian-package-x64/pkg-src/rules index 62f75bc6b1..ee41e0e24b 100644 --- a/deployment/debian-package-x64/pkg-src/rules +++ b/deployment/debian-package-x64/pkg-src/rules @@ -6,18 +6,25 @@ SHELL := /bin/bash HOST_ARCH := $(shell arch) BUILD_ARCH := ${DEB_HOST_MULTIARCH} ifeq ($(HOST_ARCH),x86_64) + # Building AMD64 + DOTNETRUNTIME := debian-x64 ifeq ($(BUILD_ARCH),arm-linux-gnueabihf) # Cross-building ARM on AMD64 DOTNETRUNTIME := debian-arm - else - # Building AMD64 - DOTNETRUNTIME := debian-x64 + endif + ifeq ($(BUILD_ARCH),aarch64-linux-gnu) + # Cross-building ARM on AMD64 + DOTNETRUNTIME := debian-arm64 endif endif ifeq ($(HOST_ARCH),armv7l) # Building ARM DOTNETRUNTIME := debian-arm endif +ifeq ($(HOST_ARCH),arm64) + # Building ARM + DOTNETRUNTIME := debian-arm64 +endif export DH_VERBOSE=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 -- cgit v1.2.3 From 953f077f9d6e4272ebc38a6ef50111b04045a3a3 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sun, 14 Jul 2019 23:11:17 -0400 Subject: 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. --- deployment/debian-package-x64/pkg-src/rules | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'deployment/debian-package-x64/pkg-src/rules') diff --git a/deployment/debian-package-x64/pkg-src/rules b/deployment/debian-package-x64/pkg-src/rules index ee41e0e24b..2a5d41a696 100644 --- a/deployment/debian-package-x64/pkg-src/rules +++ b/deployment/debian-package-x64/pkg-src/rules @@ -45,3 +45,7 @@ override_dh_auto_build: override_dh_auto_clean: dotnet clean -maxcpucount:1 --configuration $(CONFIG) Jellyfin.Server || true rm -rf '$(CURDIR)/usr' + +# Force the service name to jellyfin even if we're building jellyfin-nightly +override_dh_installinit: + dh_installinit --name=jellyfin -- cgit v1.2.3