Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Support Fedora 24 (redux)#2982

Merged
andyleejordan merged 3 commits into
PowerShell:masterPowerShell/PowerShell:masterfrom
andyleejordan:fedora-fixandyleejordan/PowerShell:fedora-fixCopy head branch name to clipboard
Jan 20, 2017
Merged

Support Fedora 24 (redux)#2982
andyleejordan merged 3 commits into
PowerShell:masterPowerShell/PowerShell:masterfrom
andyleejordan:fedora-fixandyleejordan/PowerShell:fedora-fixCopy head branch name to clipboard

Conversation

@andyleejordan

Copy link
Copy Markdown
Member

This reapplies #2738 with a bug fix for #2970.

@paulcallen you'll need to rebase your work-in-progress again if this gets in first.

I tested package creation and installation on the Ubuntu 16.04 Docker image:

PS /> $PSVersionTable

Name                           Value
----                           -----
PSVersion                      6.0.0-alpha
PSEdition                      Core
PSCompatibleVersions           {1.0, 2.0, 3.0, 4.0...}
BuildVersion                   3.0.0.0
GitCommitId                    v6.0.0-alpha.14-27-g13f01a651a4561690921b2a8d5fdc4762b339589
CLRVersion
WSManStackVersion              3.0
PSRemotingProtocolVersion      2.3
SerializationVersion           1.1.0.1

and the CentOS 7 image:

PS /PowerShell> $PSVersionTable

Name                           Value
----                           -----
PSVersion                      6.0.0-alpha
PSEdition                      Core
PSCompatibleVersions           {1.0, 2.0, 3.0, 4.0...}
BuildVersion                   3.0.0.0
GitCommitId                    v6.0.0-alpha.14-27-g13f01a651a4561690921b2a8d5fdc4762b339589
CLRVersion
WSManStackVersion              3.0
PSRemotingProtocolVersion      2.3
SerializationVersion           1.1.0.1

Comment thread build.psm1 Outdated

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Please add a reference to the discussion on the GitHub for the context

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This is owned by @randomvariable: can you open a PR on top of this to fix up the comments? (Or do it with the documentation additions.)

Comment thread docker/release/fedora24/Dockerfile Outdated

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

That should probably go away after the next release, correct?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Hm I'm not sure why my name is on this Dockerfile as maintainer, it should be @randomvariable's probably.

@PowerShellTeam PowerShellTeam added the Review - Needed The PR is being reviewed label Jan 10, 2017
Comment thread build.psm1 Outdated

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.

The comment implies that this applies only to Fedora 24. Should we add an additional condition to the IF statement?
if ($IsFedora -AND Test-Path ENV:LD_LIBRARY_PATH) {

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@mirichmo

Copy link
Copy Markdown
Member

And thanks for addressing the issue @andschwa

randomvariable and others added 2 commits January 12, 2017 13:20
* Initial support for Fedora 24
This commit adds initial support for the Fedora distribution,
starting with Fedora 24.

Whereever possible, build tooling for CentOS has been reused.

Until the next release of PowerShell is compiled against .NET 1.1,
the Docker release image uses the CentOS 7 build, but loads
in the CentOS 7 version of `libicu50` via LD_LIBRARY_PATH.

* Update Dockerfile

Fix typos
`$rpm_dist` used to be unconditionally defined,
but the changes to support Fedora made it defined only on
RedHat family platforms, so the variable was undefined on Ubuntu
but the flag still added to fpm's arguments, causing a build error.
Now we only add the flag and its argument when it's relevant.
@andyleejordan

Copy link
Copy Markdown
Member Author

I'm not seeing any activity from @randomvariable, so I updated his changes per the comments.

@andyleejordan

Copy link
Copy Markdown
Member Author

I've got an in-person merge approval from @lzybkr, I'll get this finished.

@andyleejordan andyleejordan merged commit 3a34747 into PowerShell:master Jan 20, 2017
@andyleejordan andyleejordan deleted the fedora-fix branch January 20, 2017 19:05
@andyleejordan andyleejordan mentioned this pull request Jan 30, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Review - Needed The PR is being reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.