diff options
| author | Cody Robibero <cody@robibe.ro> | 2021-09-25 05:21:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-25 06:21:48 -0600 |
| commit | 4fc3de9b75e2b8ac9052271dca9aacf2bc6eed90 (patch) | |
| tree | c0cb7fef8aaf4dc16d987abae7a4b21d2e86347b /deployment/build.fedora.amd64 | |
| parent | e627b1b154a48ccc18dd50c5214799b41dd02f7a (diff) | |
Fix builds for dotnet6 (#6595)
* Target net6.0
* Use new Enum.TryParse(ReadOnlySpan<char>) overload
* Replace RNGCryptoServiceProvider with RandomNumberGenerator
* ci - target net6.0 (#6594)
* Update deployment for dotnet6
* Use generic 6.0.x preview for CI
* Update direct dotnet download links
Co-authored-by: Bond_009 <bond.009@outlook.com>
Diffstat (limited to 'deployment/build.fedora.amd64')
| -rwxr-xr-x | deployment/build.fedora.amd64 | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/deployment/build.fedora.amd64 b/deployment/build.fedora.amd64 index 2c7bff506..23c5ed86a 100755 --- a/deployment/build.fedora.amd64 +++ b/deployment/build.fedora.amd64 @@ -8,6 +8,16 @@ set -o xtrace # Move to source directory pushd ${SOURCE_DIR} +if [[ ${IS_DOCKER} == YES ]]; then + # Remove BuildRequires for dotnet-sdk-6.0, since it's installed manually + pushd fedora + + cp -a jellyfin.spec /tmp/spec.orig + sed -i 's/BuildRequires: dotnet/# BuildRequires: dotnet/' jellyfin.spec + + popd +fi + # Modify changelog to unstable configuration if IS_UNSTABLE if [[ ${IS_UNSTABLE} == 'yes' ]]; then pushd fedora @@ -37,4 +47,13 @@ fi rm -f fedora/jellyfin*.tar.gz +if [[ ${IS_DOCKER} == YES ]]; then + pushd fedora + + cp -a /tmp/spec.orig jellyfin.spec + chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR} + + popd +fi + popd |