Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Enable armel for CI script#14843

Merged
gkhanna79 merged 5 commits into
dotnet:masterfrom
chunseoklee:armel_ci
Jan 9, 2017
Merged

Enable armel for CI script#14843
gkhanna79 merged 5 commits into
dotnet:masterfrom
chunseoklee:armel_ci

Conversation

@chunseoklee
Copy link
Copy Markdown
Contributor

Signed-off-by: chunseoklee chunseok.lee@samsung.com

chunseoklee and others added 2 commits January 4, 2017 15:24
Signed-off-by: chunseoklee <chunseok.lee@samsung.com>
Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>
@chunseoklee
Copy link
Copy Markdown
Contributor Author

This patch relates to https://github.com/dotnet/core-setup/issues/725

@chunseoklee chunseoklee changed the title [WIP]Enable armel for CI script Enable armel for CI script Jan 4, 2017
@karelz karelz assigned chunseoklee and mellinoe and unassigned chunseoklee Jan 4, 2017
Comment thread scripts/arm32_ci_script.sh Outdated
#Apply the changes needed to build for the emulator rootfs
(set +x; echo 'Applying cross build patch to suit Linux ARM emulator rootfs')
git am < "$__ARMRootfsMountPath"/dotnet/setenv/corefx_cross.patch
#(set +x; echo 'Applying cross build patch to suit Linux ARM emulator rootfs')
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please remove the commented out lines if they are no longer required?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed as you commented.

Comment thread scripts/arm32_ci_script.sh Outdated
@@ -212,7 +212,7 @@ do
;;
--softfp)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why dont we change the -softfp to armel as well for consistency?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with you.
It seems that -softfp option is passed by CI. To modify this name, we have to modify CI trigger command as well.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found that we can modify -softfp in corefx/netci.groovy script.
I will update the last patch again soon.

Signed-off-by: chunseoklee <chunseok.lee@samsung.com>
Signed-off-by: chunseoklee <chunseok.lee@samsung.com>
@chunseoklee
Copy link
Copy Markdown
Contributor Author

This patch conflicts to #14844 .
After #14844 is landed, I shall rebase on it.

@hqueue
Copy link
Copy Markdown
Member

hqueue commented Jan 5, 2017

@chunseoklee I've updated #14844 not to modify toolchain.cmake :)

Comment thread scripts/arm32_ci_script.sh Outdated
echo ' Any other value is not accepted'
echo 'Optional Arguments:'
echo ' --softfp : Build as arm-softfp'
echo ' --armel : Build as armel'
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Spacing looks off by 1

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed as you commented

@gkhanna79
Copy link
Copy Markdown
Member

@chunseoklee Is this ready to merge?

@chunseoklee
Copy link
Copy Markdown
Contributor Author

Except mellinoe's comment, it is ready to merge.

@gkhanna79
Copy link
Copy Markdown
Member

@chunseoklee Let me know when that is fixed and I will merge the change.

1. This patch removes tizen version number from
cross/armel/toolchain.cmake.
2. indentation fix

Signed-off-by: chunseoklee <chunseok.lee@samsung.com>
@chunseoklee
Copy link
Copy Markdown
Contributor Author

@gkhanna79 ready to merged. Thank you !

@gkhanna79 gkhanna79 merged commit f053a6c into dotnet:master Jan 9, 2017
hseok-oh added a commit to hseok-oh/coreclr that referenced this pull request Jan 10, 2017
Fix corefx directory: arm-softfp to armel
related PR: dotnet/corefx#14843
@karelz karelz modified the milestone: 2.0.0 Jan 12, 2017
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants