Skip to content

Commit bcafaf3

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#1598)
* Update dependencies from https://github.com/dotnet/arcade build 20211230.1 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21474.2 -> To Version 7.0.0-beta.21630.1 * Update dependencies from https://github.com/dotnet/arcade build 20220106.6 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21630.1 -> To Version 7.0.0-beta.22056.6 * Update dependencies from https://github.com/dotnet/arcade build 20220114.25 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.22056.6 -> To Version 7.0.0-beta.22064.25 * Update dependencies from https://github.com/dotnet/arcade build 20220121.6 Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.21474.2 -> To Version 7.0.0-beta.22071.6 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 9b9feba commit bcafaf3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+844
-1414
lines changed

‎eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21474.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22071.6">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>3ea0d860c6973f2cbadc9e895c7ec2cbdaec4ad5</Sha>
8+
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
1111
</ToolsetDependencies>

‎eng/common/build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,6 @@ function InitializeCustomToolset {
187187
}
188188

189189
function Build {
190-
191-
if [[ "$ci" == true ]]; then
192-
TryLogClientIpAddress
193-
fi
194190
InitializeToolset
195191
InitializeCustomToolset
196192

‎eng/common/cross/arm/tizen-build-rootfs.sh

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
__ARM_HARDFP_CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
5+
__TIZEN_CROSSDIR="$__ARM_HARDFP_CrossDir/tizen"
6+
7+
if [[ -z "$ROOTFS_DIR" ]]; then
8+
echo "ROOTFS_DIR is not defined."
9+
exit 1;
10+
fi
11+
12+
TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
13+
mkdir -p $TIZEN_TMP_DIR
14+
15+
# Download files
16+
echo ">>Start downloading files"
17+
VERBOSE=1 $__ARM_HARDFP_CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR
18+
echo "<<Finish downloading files"
19+
20+
echo ">>Start constructing Tizen rootfs"
21+
TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm`
22+
cd $ROOTFS_DIR
23+
for f in $TIZEN_RPM_FILES; do
24+
rpm2cpio $f | cpio -idm --quiet
25+
done
26+
echo "<<Finish constructing Tizen rootfs"
27+
28+
# Cleanup tmp
29+
rm -rf $TIZEN_TMP_DIR
30+
31+
# Configure Tizen rootfs
32+
echo ">>Start configuring Tizen rootfs"
33+
ln -sfn asm-arm ./usr/include/asm
34+
patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
35+
echo "<<Finish configuring Tizen rootfs"

‎eng/common/cross/arm/tizen-fetch.sh

Lines changed: 170 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,170 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
if [[ -z "${VERBOSE// }" ]] || [ "$VERBOSE" -ne "$VERBOSE" ] 2>/dev/null; then
5+
VERBOSE=0
6+
fi
7+
8+
Log()
9+
{
10+
if [ $VERBOSE -ge $1 ]; then
11+
echo ${@:2}
12+
fi
13+
}
14+
15+
Inform()
16+
{
17+
Log 1 -e "\x1B[0;34m$@\x1B[m"
18+
}
19+
20+
Debug()
21+
{
22+
Log 2 -e "\x1B[0;32m$@\x1B[m"
23+
}
24+
25+
Error()
26+
{
27+
>&2 Log 0 -e "\x1B[0;31m$@\x1B[m"
28+
}
29+
30+
Fetch()
31+
{
32+
URL=$1
33+
FILE=$2
34+
PROGRESS=$3
35+
if [ $VERBOSE -ge 1 ] && [ $PROGRESS ]; then
36+
CURL_OPT="--progress-bar"
37+
else
38+
CURL_OPT="--silent"
39+
fi
40+
curl $CURL_OPT $URL > $FILE
41+
}
42+
43+
hash curl 2> /dev/null || { Error "Require 'curl' Aborting."; exit 1; }
44+
hash xmllint 2> /dev/null || { Error "Require 'xmllint' Aborting."; exit 1; }
45+
hash sha256sum 2> /dev/null || { Error "Require 'sha256sum' Aborting."; exit 1; }
46+
47+
TMPDIR=$1
48+
if [ ! -d $TMPDIR ]; then
49+
TMPDIR=./tizen_tmp
50+
Debug "Create temporary directory : $TMPDIR"
51+
mkdir -p $TMPDIR
52+
fi
53+
54+
TIZEN_URL=http://download.tizen.org/snapshots/tizen
55+
BUILD_XML=build.xml
56+
REPOMD_XML=repomd.xml
57+
PRIMARY_XML=primary.xml
58+
TARGET_URL="http://__not_initialized"
59+
60+
Xpath_get()
61+
{
62+
XPATH_RESULT=''
63+
XPATH=$1
64+
XML_FILE=$2
65+
RESULT=$(xmllint --xpath $XPATH $XML_FILE)
66+
if [[ -z ${RESULT// } ]]; then
67+
Error "Can not find target from $XML_FILE"
68+
Debug "Xpath = $XPATH"
69+
exit 1
70+
fi
71+
XPATH_RESULT=$RESULT
72+
}
73+
74+
fetch_tizen_pkgs_init()
75+
{
76+
TARGET=$1
77+
PROFILE=$2
78+
Debug "Initialize TARGET=$TARGET, PROFILE=$PROFILE"
79+
80+
TMP_PKG_DIR=$TMPDIR/tizen_${PROFILE}_pkgs
81+
if [ -d $TMP_PKG_DIR ]; then rm -rf $TMP_PKG_DIR; fi
82+
mkdir -p $TMP_PKG_DIR
83+
84+
PKG_URL=$TIZEN_URL/$PROFILE/latest
85+
86+
BUILD_XML_URL=$PKG_URL/$BUILD_XML
87+
TMP_BUILD=$TMP_PKG_DIR/$BUILD_XML
88+
TMP_REPOMD=$TMP_PKG_DIR/$REPOMD_XML
89+
TMP_PRIMARY=$TMP_PKG_DIR/$PRIMARY_XML
90+
TMP_PRIMARYGZ=${TMP_PRIMARY}.gz
91+
92+
Fetch $BUILD_XML_URL $TMP_BUILD
93+
94+
Debug "fetch $BUILD_XML_URL to $TMP_BUILD"
95+
96+
TARGET_XPATH="//build/buildtargets/buildtarget[@name=\"$TARGET\"]/repo[@type=\"binary\"]/text()"
97+
Xpath_get $TARGET_XPATH $TMP_BUILD
98+
TARGET_PATH=$XPATH_RESULT
99+
TARGET_URL=$PKG_URL/$TARGET_PATH
100+
101+
REPOMD_URL=$TARGET_URL/repodata/repomd.xml
102+
PRIMARY_XPATH='string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)'
103+
104+
Fetch $REPOMD_URL $TMP_REPOMD
105+
106+
Debug "fetch $REPOMD_URL to $TMP_REPOMD"
107+
108+
Xpath_get $PRIMARY_XPATH $TMP_REPOMD
109+
PRIMARY_XML_PATH=$XPATH_RESULT
110+
PRIMARY_URL=$TARGET_URL/$PRIMARY_XML_PATH
111+
112+
Fetch $PRIMARY_URL $TMP_PRIMARYGZ
113+
114+
Debug "fetch $PRIMARY_URL to $TMP_PRIMARYGZ"
115+
116+
gunzip $TMP_PRIMARYGZ
117+
118+
Debug "unzip $TMP_PRIMARYGZ to $TMP_PRIMARY"
119+
}
120+
121+
fetch_tizen_pkgs()
122+
{
123+
ARCH=$1
124+
PACKAGE_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)'
125+
126+
PACKAGE_CHECKSUM_XPATH_TPL='string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())'
127+
128+
for pkg in ${@:2}
129+
do
130+
Inform "Fetching... $pkg"
131+
XPATH=${PACKAGE_XPATH_TPL/_PKG_/$pkg}
132+
XPATH=${XPATH/_ARCH_/$ARCH}
133+
Xpath_get $XPATH $TMP_PRIMARY
134+
PKG_PATH=$XPATH_RESULT
135+
136+
XPATH=${PACKAGE_CHECKSUM_XPATH_TPL/_PKG_/$pkg}
137+
XPATH=${XPATH/_ARCH_/$ARCH}
138+
Xpath_get $XPATH $TMP_PRIMARY
139+
CHECKSUM=$XPATH_RESULT
140+
141+
PKG_URL=$TARGET_URL/$PKG_PATH
142+
PKG_FILE=$(basename $PKG_PATH)
143+
PKG_PATH=$TMPDIR/$PKG_FILE
144+
145+
Debug "Download $PKG_URL to $PKG_PATH"
146+
Fetch $PKG_URL $PKG_PATH true
147+
148+
echo "$CHECKSUM $PKG_PATH" | sha256sum -c - > /dev/null
149+
if [ $? -ne 0 ]; then
150+
Error "Fail to fetch $PKG_URL to $PKG_PATH"
151+
Debug "Checksum = $CHECKSUM"
152+
exit 1
153+
fi
154+
done
155+
}
156+
157+
Inform "Initialize arm base"
158+
fetch_tizen_pkgs_init standard base
159+
Inform "fetch common packages"
160+
fetch_tizen_pkgs armv7hl gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
161+
Inform "fetch coreclr packages"
162+
fetch_tizen_pkgs armv7hl lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
163+
Inform "fetch corefx packages"
164+
fetch_tizen_pkgs armv7hl libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
165+
166+
Inform "Initialize standard unified"
167+
fetch_tizen_pkgs_init standard unified
168+
Inform "fetch corefx packages"
169+
fetch_tizen_pkgs armv7hl gssdp gssdp-devel tizen-release
170+

‎eng/common/cross/arm/tizen/tizen.patch

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
2+
--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900
3+
+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900
4+
@@ -2,4 +2,4 @@
5+
Use the shared library, but some functions are only in
6+
the static library, so try that secondarily. */
7+
OUTPUT_FORMAT(elf32-littlearm)
8+
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-armhf.so.3 ) )

‎eng/common/cross/armv6/sources.list.buster

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
deb http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi
2+
deb-src http://raspbian.raspberrypi.org/raspbian/ buster main contrib non-free rpi

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

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,15 @@ while :; do
9999
__AlpineArch=armv7
100100
__QEMUArch=arm
101101
;;
102+
armv6)
103+
__BuildArch=armv6
104+
__UbuntuArch=armhf
105+
__QEMUArch=arm
106+
__UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/"
107+
__CodeName=buster
108+
__LLDB_Package="liblldb-6.0-dev"
109+
__Keyring="/usr/share/keyrings/raspbian-archive-keyring.gpg"
110+
;;
102111
arm64)
103112
__BuildArch=arm64
104113
__UbuntuArch=arm64
@@ -176,8 +185,8 @@ while :; do
176185
__LLDB_Package="liblldb-6.0-dev"
177186
;;
178187
tizen)
179-
if [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
180-
echo "Tizen is available only for armel and arm64."
188+
if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
189+
echo "Tizen is available only for arm, armel and arm64."
181190
usage;
182191
exit 1;
183192
fi
@@ -236,6 +245,12 @@ while :; do
236245
shift
237246
done
238247

248+
if [ -e "$__Keyring" ]; then
249+
__Keyring="--keyring=$__Keyring"
250+
else
251+
__Keyring=""
252+
fi
253+
239254
if [ "$__BuildArch" == "armel" ]; then
240255
__LLDB_Package="lldb-3.5-dev"
241256
fi
@@ -337,7 +352,7 @@ elif [[ "$__CodeName" == "illumos" ]]; then
337352
wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h
338353
wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h
339354
elif [[ -n $__CodeName ]]; then
340-
qemu-debootstrap --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
355+
qemu-debootstrap $__Keyring --arch $__UbuntuArch $__CodeName $__RootfsDir $__UbuntuRepo
341356
cp $__CrossDir/$__BuildArch/sources.list.$__CodeName $__RootfsDir/etc/apt/sources.list
342357
chroot $__RootfsDir apt-get update
343358
chroot $__RootfsDir apt-get -f -y install

0 commit comments

Comments
 (0)