From 2804fb86f5c27dfe3dd4d6f366282e11558a41af Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 18 Nov 2020 13:40:28 +0000
Subject: [PATCH] [master] Update dependencies from dotnet/arcade (#799)
[master] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 +++++------
eng/common/cross/armel/armel.jessie.patch | 43 +++++++++++++++++++++++
eng/common/cross/build-rootfs.sh | 8 ++++-
global.json | 2 +-
4 files changed, 61 insertions(+), 12 deletions(-)
create mode 100644 eng/common/cross/armel/armel.jessie.patch
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9b62c785..973d4c2d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- e65d307045c183af6e48b087571f6b7a05e39f01
+ 7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf
-
+
https://github.com/dotnet/arcade
- e65d307045c183af6e48b087571f6b7a05e39f01
+ 7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf
-
+
https://github.com/dotnet/arcade
- e65d307045c183af6e48b087571f6b7a05e39f01
+ 7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf
-
+
https://github.com/dotnet/arcade
- e65d307045c183af6e48b087571f6b7a05e39f01
+ 7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf
-
+
https://github.com/dotnet/arcade
- e65d307045c183af6e48b087571f6b7a05e39f01
+ 7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf
https://github.com/dotnet/arcade-services
diff --git a/eng/common/cross/armel/armel.jessie.patch b/eng/common/cross/armel/armel.jessie.patch
new file mode 100644
index 00000000..2d261561
--- /dev/null
+++ b/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);
diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 575eee9f..6d59e181 100755
--- a/eng/common/cross/build-rootfs.sh
+++ b/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
diff --git a/global.json b/global.json
index 93c849cc..73160783 100644
--- a/global.json
+++ b/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"
}
}