Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework older conda packages #40

Merged
merged 36 commits into from
Sep 23, 2018
Merged

Conversation

mithro
Copy link
Contributor

@mithro mithro commented Aug 23, 2018

Make the conda packages use the new Jinja templating for package creation. Original package variants where attempted but ended up falling back to just using environment variables.

All packages should be green again now. The cross compilers are back to not being statically linked, instead they are built with the conda toolchain.

This should fix;

For git based packages, the build string / number is as follows;

# y==GIT_DESCRIBE_NUMBER, z==DATESTR, x==GIT_DESCRIBE_HASH
#
# number: 10693001803050325
#         1yyyy00zzzzzzzzzz
number: {{ '1%04i00%s'|format(environ.get('GIT_DESCRIBE_NUMBER')|int, environ.get('DATESTR')) }}
# string: 0693.1803050325.g588ce0e3
#         yyyy.zzzzzzzzzz.gxxxxxxxx
string: {{ '%04i'|format(environ.get('GIT_DESCRIBE_NUMBER')|int) }}.{{ environ.get('DATESTR') }}.{{ environ.get('GIT_DESCRIBE_HASH', 'unknown') }}

For source repos the build string / number is as follows;

# z==DATESTR
#
# number: 1803050325
#         zzzzzzzzzz
number: {{ environ.get('DATESTR') }}
# string: 0693.1803050325.g588ce0e3
#         yyyy.zzzzzzzzzz.gxxxxxxxx
string: {{ environ.get('DATESTR') }}

@mithro mithro force-pushed the binutils-update branch 4 times, most recently from b38f61e to 14f05d0 Compare August 23, 2018 22:03
@mithro mithro changed the title Upgrade binutils to 2.31.1 Rework older conda packages to use variants Aug 24, 2018
@mithro mithro force-pushed the binutils-update branch 2 times, most recently from 14ac23e to ec4d37c Compare August 26, 2018 04:33
@mithro mithro force-pushed the binutils-update branch 7 times, most recently from fa911c6 to 9f02aa5 Compare September 18, 2018 23:37
@mithro mithro changed the title Rework older conda packages to use variants Rework older conda packages Sep 18, 2018
@mithro mithro force-pushed the binutils-update branch 6 times, most recently from f56203e to 93ca0d4 Compare September 19, 2018 04:29
@mithro mithro force-pushed the master branch 2 times, most recently from 09a546c to 7d76643 Compare September 19, 2018 05:44
@mithro mithro force-pushed the binutils-update branch 2 times, most recently from 685a8d5 to 29e5a77 Compare September 19, 2018 18:31
@mithro mithro merged commit 138b41f into litex-hub:master Sep 23, 2018
@mithro mithro deleted the binutils-update branch September 23, 2018 17:06
mithro added a commit to mithro/litex-conda that referenced this pull request Oct 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant