Browse Source

[master] Update dependencies from dotnet/arcade (#799)

[master] Update dependencies from dotnet/arcade
pull/804/head
dotnet-maestro[bot] 6 years ago
committed by GitHub
parent
commit
2804fb86f5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      eng/Version.Details.xml
  2. 43
      eng/common/cross/armel/armel.jessie.patch
  3. 8
      eng/common/cross/build-rootfs.sh
  4. 2
      global.json

20
eng/Version.Details.xml

@ -3,25 +3,25 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20561.5">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20566.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e65d307045c183af6e48b087571f6b7a05e39f01</Sha>
<Sha>7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20561.5">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20566.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e65d307045c183af6e48b087571f6b7a05e39f01</Sha>
<Sha>7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.20561.5">
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.20566.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e65d307045c183af6e48b087571f6b7a05e39f01</Sha>
<Sha>7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20561.5">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20566.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e65d307045c183af6e48b087571f6b7a05e39f01</Sha>
<Sha>7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.20561.5">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.20566.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>e65d307045c183af6e48b087571f6b7a05e39f01</Sha>
<Sha>7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri>

43
eng/common/cross/armel/armel.jessie.patch

@ -0,0 +1,43 @@
diff -u -r a/usr/include/urcu/uatomic/generic.h b/usr/include/urcu/uatomic/generic.h
--- a/usr/include/urcu/uatomic/generic.h 2014-10-22 15:00:58.000000000 -0700
+++ b/usr/include/urcu/uatomic/generic.h 2020-10-30 21:38:28.550000000 -0700
@@ -69,10 +69,10 @@
#endif
#ifdef UATOMIC_HAS_ATOMIC_SHORT
case 2:
- return __sync_val_compare_and_swap_2(addr, old, _new);
+ return __sync_val_compare_and_swap_2((uint16_t*) addr, old, _new);
#endif
case 4:
- return __sync_val_compare_and_swap_4(addr, old, _new);
+ return __sync_val_compare_and_swap_4((uint32_t*) addr, old, _new);
#if (CAA_BITS_PER_LONG == 64)
case 8:
return __sync_val_compare_and_swap_8(addr, old, _new);
@@ -109,7 +109,7 @@
return;
#endif
case 4:
- __sync_and_and_fetch_4(addr, val);
+ __sync_and_and_fetch_4((uint32_t*) addr, val);
return;
#if (CAA_BITS_PER_LONG == 64)
case 8:
@@ -148,7 +148,7 @@
return;
#endif
case 4:
- __sync_or_and_fetch_4(addr, val);
+ __sync_or_and_fetch_4((uint32_t*) addr, val);
return;
#if (CAA_BITS_PER_LONG == 64)
case 8:
@@ -187,7 +187,7 @@
return __sync_add_and_fetch_2(addr, val);
#endif
case 4:
- return __sync_add_and_fetch_4(addr, val);
+ return __sync_add_and_fetch_4((uint32_t*) addr, val);
#if (CAA_BITS_PER_LONG == 64)
case 8:
return __sync_add_and_fetch_8(addr, val);

8
eng/common/cross/build-rootfs.sh

@ -336,7 +336,7 @@ elif [[ -n $__CodeName ]]; then
chroot $__RootfsDir apt-get -f -y install
chroot $__RootfsDir apt-get -y install $__UbuntuPackages
chroot $__RootfsDir symlinks -cr /usr
chroot $__RootfsDir apt clean
chroot $__RootfsDir apt-get clean
if [ $__SkipUnmount == 0 ]; then
umount $__RootfsDir/* || true
@ -348,6 +348,12 @@ elif [[ -n $__CodeName ]]; then
patch -p1 < $__CrossDir/$__BuildArch/trusty-lttng-2.4.patch
popd
fi
if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then
pushd $__RootfsDir
patch -p1 < $__CrossDir/$__BuildArch/armel.jessie.patch
popd
fi
elif [[ "$__Tizen" == "tizen" ]]; then
ROOTFS_DIR=$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh
else

2
global.json

@ -11,6 +11,6 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20561.5"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20566.3"
}
}

Loading…
Cancel
Save