github-mirrors/radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2025-04-24 06:27:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

New: Support older ARMv7 CPUs

Browse source 
Eg armada370 ad armadaxp
This commit is contained in:
ta264 2022-05-16 21:21:48 +01:00
parent 879668eb61
commit 1de454de17
7 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
azure-pipelines.yml
View file

@ -101,7 +101,7 @@ stages:
echo "Extra platforms already enabled"
else
echo "Enabling extra platform support"
sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86;linux-arm-vfpv3d16/' $BUNDLEDVERSIONS
fi
displayName: Enable Extra Platform Support
- bash: ./build.sh --backend --enable-extra-platforms
@ -326,6 +326,14 @@ stages:
tarCompression: 'gz'
includeRootFolder: false
rootFolderOrFile: $(artifactsFolder)/linux-arm/net6.0
- task: ArchiveFiles@2
displayName: Create linux-arm-vfpv3d16 tar
inputs:
archiveFile: '$(Build.ArtifactStagingDirectory)/Radarr.$(buildName).linux-core-arm-vfpv3d16.tar.gz'
archiveType: 'tar'
tarCompression: 'gz'
includeRootFolder: false
rootFolderOrFile: $(artifactsFolder)/linux-arm-vfpv3d16/net6.0
- task: ArchiveFiles@2
displayName: Create linux-musl-arm tar
inputs:

11
build.sh
View file

@ -27,20 +27,20 @@ UpdateVersionNumber()
EnableExtraPlatformsInSDK()
{
SDK_PATH=$(dotnet --list-sdks | grep -P '6\.\d\.\d+' | head -1 | sed 's/\(6\.[0-9]*\.[0-9]*\).*\[\(.*\)\]/\2\/\1/g')
SDK_PATH=$(dotnet --list-sdks | grep -P '6\.\d\.\d+' | tail -1 | sed 's/\(6\.[0-9]*\.[0-9]*\).*\[\(.*\)\]/\2\/\1/g')
BUNDLEDVERSIONS="${SDK_PATH}/Microsoft.NETCoreSdk.BundledVersions.props"
if grep -q freebsd-x64 $BUNDLEDVERSIONS; then
if grep -q freebsd-x64 "${BUNDLEDVERSIONS}"; then
echo "Extra platforms already enabled"
else
echo "Enabling extra platform support"
sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86/' $BUNDLEDVERSIONS
sed -i.ORI 's/osx-x64/osx-x64;freebsd-x64;linux-x86;linux-arm-vfpv3d16/' "${BUNDLEDVERSIONS}"
fi
}
EnableExtraPlatforms()
{
if grep -qv freebsd-x64 src/Directory.Build.props; then
sed -i'' -e "s^<RuntimeIdentifiers>\(.*\)</RuntimeIdentifiers>^<RuntimeIdentifiers>\1;freebsd-x64;linux-x86</RuntimeIdentifiers>^g" src/Directory.Build.props
if ! grep -q freebsd-x64 src/Directory.Build.props; then
sed -i'' -e "s^<RuntimeIdentifiers>\(.*\)</RuntimeIdentifiers>^<RuntimeIdentifiers>\1;freebsd-x64;linux-x86;linux-arm-vfpv3d16</RuntimeIdentifiers>^g" src/Directory.Build.props
fi
}
@ -428,6 +428,7 @@ then
then
Package "net6.0" "freebsd-x64"
Package "net6.0" "linux-x86"
Package "net6.0" "linux-arm-vfpv3d16"
fi
else
Package "$FRAMEWORK" "$RID"

5
src/Directory.Build.props
View file

@ -154,4 +154,9 @@
<RuntimeIdentifier>osx-x64</RuntimeIdentifier>
</PropertyGroup>
<!-- Define constant so we can identify the non-standard arch arm-vfpv3d16 -->
<PropertyGroup Condition="'$(RuntimeIdentifier)' == 'linux-arm-vfpv3d16'">
<DefineConstants>ARM_VFPV3D16</DefineConstants>
</PropertyGroup>
</Project>

8
src/NzbDrone.Core/Update/UpdatePackageProvider.cs
View file

@ -34,11 +34,17 @@ namespace NzbDrone.Core.Update
public UpdatePackage GetLatestUpdate(string branch, Version currentVersion)
{
#if ARM_VFPV3D16
var arch = "arm-vfpv3d16";
#else
var arch = RuntimeInformation.OSArchitecture.ToString();
#endif
var request = _requestBuilder.Create()
.Resource("/update/{branch}")
.AddQueryParam("version", currentVersion)
.AddQueryParam("os", OsInfo.Os.ToString().ToLowerInvariant())
.AddQueryParam("arch", RuntimeInformation.OSArchitecture)
.AddQueryParam("arch", arch)
.AddQueryParam("runtime", PlatformInfo.Platform.ToString().ToLowerInvariant())
.AddQueryParam("runtimeVer", _platformInfo.Version)
.AddQueryParam("dbType", _mainDatabase.DatabaseType)

1
src/NzbDrone.Host/Radarr.Host.csproj
View file

@ -9,6 +9,7 @@
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.3.0" />
<PackageReference Include="DryIoc.dll" Version="4.8.8" />
<PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="5.1.0" />
<PackageReference Include="Servarr.NETCore.Platforms" Version="6.0.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NzbDrone.Common\Radarr.Common.csproj" />

2
src/NzbDrone.Mono.Test/Radarr.Mono.Test.csproj
View file

@ -7,7 +7,7 @@
See https://github.com/xamarin/XamarinComponents/issues/282
-->
<ItemGroup>
<PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1.34-servarr20" />
<PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1.34-servarr22" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NzbDrone.Common.Test\Radarr.Common.Test.csproj" />

2
src/NzbDrone.Mono/Radarr.Mono.csproj
View file

@ -7,7 +7,7 @@
See https://github.com/xamarin/XamarinComponents/issues/282
-->
<ItemGroup>
<PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1.34-servarr20" />
<PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1.34-servarr22" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
</ItemGroup>
<ItemGroup>