forge/ayaports
1
0
Fork 0
Code Issues 42 Pull requests 10 Projects Releases Packages Wiki Activity Actions

[main/dotnet-5.0][main/dotnet-3.1] FIxed for merge

Browse source
This commit is contained in:
build@apk-groulx 2021-12-06 01:52:52 +00:00
parent 9afca7ad14
commit ace86cd063
3 changed files with 24 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
apk/v3.15/main/dotnet-3.1/APKBUILD
View file

@ -31,6 +31,7 @@ makedepends="
libunwind-dev
libxml2-dev
libxml2-utils
libintl
lldb-dev
llvm$_llvmver-dev
lttng-ust-dev
@ -67,7 +68,8 @@ _gittag=v$pkgver-runtime
_giturl=https://github.com/dotnet/source-build
options="!check"
source="
$pkgname-$_gittag.git.zip
$pkgname-$_gittag.tar.gz::$_giturl/archive/refs/tags/$_gittag.tar.gz
https://dot.net/v1/dotnet-install.sh
dotnet.sh
application-insights_fix-net40-location.patch
build_coreclr-tools-path.patch
@ -77,35 +79,10 @@ source="
core-setup_rid-plat-generation-on-alpine-fix.patch
corefx_fix-build-clang10.patch
corefx_added-alpine-315-rid.patch
installer_generate-layout-core-setup-blob-path-fix.patch
core-sdk_generate-layout-core-setup-blob-path-fix.patch
"
builddir="$srcdir/$pkgname"
snapshot() {
mkdir -p "$srcdir"
cd "$srcdir"
if ! [ -d $pkgname.git ]; then
git clone $_giturl $pkgname.git
cd $pkgname.git
else
cd $pkgname.git
git fetch
fi
echo "Repo archive"
mkfifo $pkgname-$_gittag.git
git bundle create - $_gittag > $pkgname-$_gittag.git &
zip --fifo "$SRCDEST"/$pkgname-$_gittag.git.zip $pkgname-$_gittag.git
rm $pkgname-$_gittag.git
ln -s "$SRCDEST"/$pkgname-$_gittag.git.zip "$startdir"/$pkgname-$_gittag.git.zip
}
unpack() {
default_unpack
cd "$srcdir"
git clone $pkgname-$_gittag.git $pkgname --branch $_gittag 1>/dev/null 2>&1
}
_srcbld="source-build-$(echo $_gittag | sed 's|v||')"
builddir="$srcdir/$_srcbld"
default_prepare() {
local i failed=
@ -156,6 +133,9 @@ prepare() {
# disable warnings
sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.common.props
# darc git init
git init
}
@ -172,7 +152,7 @@ build() {
export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1
./build.sh \
--with-sdk ../$pkgname \
--with-sdk ../$_srcbld \
/p:ArchiveDownloadedPackages=true \
/p:ContinueOnPrebuiltBaselineError=true \
/p:SkipPortableRuntimeBuild=true \
@ -308,7 +288,8 @@ aspnet_targeting_pack() {
}
sha512sums="
27cdb0cc7d77b2c5c1faf9dbab3e79933497ec02c6837eb1e4ff4d3248b6bd016aff6d3c7b3a64038a03e4903ca0a103f9b612ad5516364ecca49e7a5d270a76 dotnet-3.1-v3.1.20-runtime.git.zip
51395877eb14ad6c5c81a2dd804a4135adb2d5d4ddf4e33d3e08379872b1eb843b0912fd644cee4e988360f650585701b2266f634c4189554f7c4c1415a28d7f dotnet-3.1-v3.1.20-runtime.tar.gz
ecab4809e617e9cd30940b1c1a700e16b37b5974c850a60da7f1a25bf81516850e4533ef39d2d8786381e0e4e325d3b53fbb2377ecaa6c0813bb00fc1c92b784 dotnet-install.sh
e61b9e3e5a2305646a616d598378230c9755c5dd5363692cc363f8f4add3807563c324dd86f3a7ae9d358c82d730608e7b293935a2b6c81c0c0f62d752a0a1cf dotnet.sh
0469d571d0f7634d3794761f04e1cbff9d27d642d134a11a13560574280e5cab6f366eb8820e61a449eca99470fdea8d9f6a7d97b633059b2fe25257ed1579e6 application-insights_fix-net40-location.patch
2334e36d5bb24b9b834800407c6110c09262af20a4353e92ef1897855f27eab117270dda0637071010a7a5ac8c4a5d4032240a7b659d8576801b503b66b14ab7 build_coreclr-tools-path.patch
@ -318,5 +299,5 @@ b3475c0b727c5258c7bc6f4c53305f9ced991e57f9f46a2ad323bed40627662eb8bf57286bf6a22d
720fefc20ef4985917cfd243bbef427862af9ea0156cc6c78502daf8da5f6293bba0a1a5180c88dc145921592d533a8508b30eab2f388be1be7d6d10b6ab91d0 core-setup_rid-plat-generation-on-alpine-fix.patch
eb107ae9765d9eebe2f2ab4cebda4d3f76d683e21d88f806bb008e29051ad196ea637d410075b7ed61f4997a22085e4c36021860b82c4c0822c23ba9ded9656a corefx_fix-build-clang10.patch
72092a7323bb91e8d011ad09cefcc3fd0e4ebfc7c258895d454cc1d015eda36c7de97b09af76a492fa689f39b9216435faace77edd0ca75d8e39a34ed6641840 corefx_added-alpine-315-rid.patch
e67f4f92659892aa65de7192dfbbf2cafab17e1a4ef60e4981507c7309da61b866864a18b0452e47cee2ce9253032c3f4c39e4426b7b2216ffa73236239c9669 installer_generate-layout-core-setup-blob-path-fix.patch
e67f4f92659892aa65de7192dfbbf2cafab17e1a4ef60e4981507c7309da61b866864a18b0452e47cee2ce9253032c3f4c39e4426b7b2216ffa73236239c9669 core-sdk_generate-layout-core-setup-blob-path-fix.patch
"

0
apk/v3.15/main/dotnet-3.1/installer_generate-layout-core-setup-blob-path-fix.patch → apk/v3.15/main/dotnet-3.1/core-sdk_generate-layout-core-setup-blob-path-fix.patch
View file

43
apk/v3.15/main/dotnet-5.0/APKBUILD
View file

@ -38,6 +38,7 @@ makedepends="
libxml2-dev
libxml2-utils
lldb-dev
libintl
llvm$_llvmver-dev
lttng-ust-dev
nodejs
@ -65,7 +66,7 @@ _gittag=v$pkgver.1-runtime
_giturl=https://github.com/dotnet/source-build
options="!check"
source="
$pkgname-$_gittag.git.zip
$pkgname-$_gittag.tar.gz::$_giturl/archive/refs/tags/$_gittag.tar.gz
dotnet.sh
https://dot.net/v1/dotnet-install.sh
application-insights_fix-net40-location.patch
@ -75,33 +76,8 @@ source="
runtime_non-portable-distrorid-fix-alpine.patch
sdk_telemetry-optout.patch
"
builddir="$srcdir/$pkgname"
snapshot() {
mkdir -p "$srcdir"
cd "$srcdir"
if ! [ -d $pkgname.git ]; then
git clone $_giturl $pkgname.git
cd $pkgname.git
else
cd $pkgname.git
git fetch
fi
echo "Repo archive"
mkfifo $pkgname-$_gittag.git
git bundle create - $_gittag > $pkgname-$_gittag.git &
zip --fifo "$SRCDEST"/$pkgname-$_gittag.git.zip $pkgname-$_gittag.git
rm $pkgname-$_gittag.git
ln -s "$SRCDEST"/$pkgname-$_gittag.git.zip "$startdir"/$pkgname-$_gittag.git.zip
}
unpack() {
default_unpack
cd "$srcdir"
git clone $pkgname-$_gittag.git $pkgname --branch $_gittag 1>/dev/null 2>&1
}
_srcbld="source-build-$(echo $_gittag | sed 's|v||')"
builddir="$srcdir/$_srcbld"
default_prepare() {
local i failed=
@ -141,8 +117,8 @@ prepare() {
msg "Settings up bootstrap SDK"
if [ "$_bootstrap" == 'true' ]; then
chmod +x "$srcdir"/dotnet-install.sh
"$srcdir"/dotnet-install.sh --install-dir ./
"$srcdir"/dotnet-install.sh --install-dir ./ --runtime dotnet
"$srcdir"/dotnet-install.sh --version=5.0.205 --install-dir ./
"$srcdir"/dotnet-install.sh --version=3.1.17 --install-dir ./ --runtime dotnet
else
cp -r /usr/share/dotnet/* ./
if [[ $(find sdk -type d -not -name '5.0.*' -maxdepth 1 -mindepth 1) ]]; then
@ -152,6 +128,9 @@ prepare() {
# disable warnings
sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props
# Git init for Darc
git init
}
pkgver() {
@ -169,7 +148,7 @@ build() {
export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1
./build.sh \
--with-sdk ../$pkgname \
--with-sdk ../$_srcbld \
/p:ArchiveDownloadedPackages=true \
/p:ContinueOnPrebuiltBaselineError=true \
/p:SkipPortableRuntimeBuild=true \
@ -300,7 +279,7 @@ aspnet_targeting_pack() {
}
sha512sums="
7899483157a32012137e4ee44b03173908f6325085b7ee352ee329a208a0d1e5b434d1f24099e5b346ec9753e23c6a94553e76dc76a1ea6633392758132ed492 dotnet-5.0-v5.0.12.1-runtime.git.zip
5d957694c33a2f4440af7955a526141859c1ad0dccf07b1efe2f474f855650ba5d3256a19b38216d7a7a86d62890034fb060f1bb14733daddc97a871d7e2aad7 dotnet-5.0-v5.0.12.1-runtime.tar.gz
f58bd83b709dcb4b0b67830756069c34258a167b33cb290cbf30f21d69d75402d38e013fd7bbf00640fe19e397f78df6ff787cf8484ee8967d5b8809f033eafb dotnet.sh
ecab4809e617e9cd30940b1c1a700e16b37b5974c850a60da7f1a25bf81516850e4533ef39d2d8786381e0e4e325d3b53fbb2377ecaa6c0813bb00fc1c92b784 dotnet-install.sh
0469d571d0f7634d3794761f04e1cbff9d27d642d134a11a13560574280e5cab6f366eb8820e61a449eca99470fdea8d9f6a7d97b633059b2fe25257ed1579e6 application-insights_fix-net40-location.patch