#6 Export DOTNET_ROOT in profile to make apphost lookup work
Merged 4 years ago by omajid. Opened 4 years ago by omajid.
dotnet-sig/ omajid/dotnet-3-0 master  into  master

dotnet.sh.in dotnet.sh
file renamed
+2 -2
@@ -1,6 +1,6 @@ 

  

- # Set location of shared framework

- [ -z "$DOTNET_ROOT" ] && DOTNET_ROOT=/usr/lib64/dotnet

+ # Set location for AppHost lookup

+ [ -z "$DOTNET_ROOT" ] && export DOTNET_ROOT=@LIBDIR@/dotnet

  

  # Add dotnet tools directory to PATH

  DOTNET_TOOLS_PATH="$HOME/.dotnet/tools"

file modified
+8 -4
@@ -52,7 +52,7 @@ 

  

  Name:           dotnet3.0

  Version:        %{sdk_rpm_version}

- Release:        1%{?dist}

+ Release:        2%{?dist}

  Summary:        .NET Core CLI tools and runtime

  License:        MIT and ASL 2.0 and BSD

  URL:            https://github.com/dotnet/
@@ -61,7 +61,7 @@ 

  # ./build-dotnet-tarball dotnet-v%%{runtime_version}

  Source0:        dotnet-v%{runtime_version}.tar.gz

  Source1:        check-debug-symbols.py

- Source2:        dotnet.sh

+ Source2:        dotnet.sh.in

  

  Patch100:       corefx-optflags-support.patch

  
@@ -338,6 +338,8 @@ 

    /p:ContinueOnPrebuiltBaselineError=true \

  

  

+ sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE2} > dotnet.sh

+ 

  

  %install

  install -dm 0755 %{buildroot}%{_libdir}/dotnet
@@ -355,9 +357,8 @@ 

  find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.pubxml' -exec chmod -x {} \;

  find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {} \;

  

- # Add ~/.dotnet/tools to $PATH for all users

  install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/

- install %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/

+ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/

  

  install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions

  # dynamic completion needs the file to be named the same as the base command
@@ -430,6 +431,9 @@ 

  %dir %{_libdir}/dotnet/packs

  

  %changelog

+ * Fri Oct 11 2019 Omair Majid <omajid@redhat.com> - 3.0.100-2

+ - Export DOTNET_ROOT in profile to make apphost lookup work

+ 

  * Fri Sep 27 2019 Omair Majid <omajid@redhat.com> - 3.0.100-1

  - Update to .NET Core Runtime 3.0.0 and SDK 3.0.100

  

Also add support for non-x86_64 architecures by using %{_libdir} for path.

Build: https://copr.fedorainfracloud.org/coprs/g/dotnet-sig/dotnet/build/1054510/

Without this fix, applications using .NET Core 2.2 (which also uses this host) can be broken.

Got some okays on IRC. Merging.

Pull-Request has been merged by omajid

4 years ago
Metadata