Skip to content

Commit 4eb1494

Browse files
mirichmomirichmo
authored
Revert "Initial Support for Fedora 24" (PowerShell#2970)
1 parent 8262091 commit 4eb1494

11 files changed

Lines changed: 10 additions & 129 deletions

File tree

‎build.psm1‎

Lines changed: 10 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,6 @@ if ($IsLinux) {
3131
$IsUbuntu14 = $IsUbuntu -and $LinuxInfo.VERSION_ID -match '14.04'
3232
$IsUbuntu16 = $IsUbuntu -and $LinuxInfo.VERSION_ID -match '16.04'
3333
$IsCentOS = $LinuxInfo.ID -match 'centos' -and $LinuxInfo.VERSION_ID -match '7'
34-
$IsFedora = $LinuxInfo.ID -match 'fedora' -and $LinuxInfo.VERSION_ID -ge 24
35-
$IsRedHatFamily = $IsCentOS -or $IsFedora
36-
37-
# Workaround for temporary LD_LIBRARY_PATH hack for Fedora 24
38-
if (Test-Path ENV:\LD_LIBRARY_PATH) {
39-
Remove-Item -Force ENV:\LD_LIBRARY_PATH
40-
Get-ChildItem ENV:
41-
}
4234
}
4335

4436
#
@@ -83,7 +75,6 @@ function Start-PSBuild {
8375
"ubuntu.16.04-x64",
8476
"debian.8-x64",
8577
"centos.7-x64",
86-
"fedora.24-x64",
8778
"win7-x64",
8879
"win7-x86",
8980
"win81-x64",
@@ -448,7 +439,6 @@ function New-PSOptions {
448439
"ubuntu.16.04-x64",
449440
"debian.8-x64",
450441
"centos.7-x64",
451-
"fedora.24-x64",
452442
"win7-x86",
453443
"win7-x64",
454444
"win81-x64",
@@ -954,15 +944,6 @@ function Install-Dotnet {
954944
}
955945
}
956946

957-
function Get-RedHatPackageManager {
958-
if ($IsRedHatFamily -and $IsCentOS) {
959-
"yum"
960-
} elseif ($IsRedHatFamily -and $IsFedora) {
961-
"dnf"
962-
} else {
963-
throw "Error determining package manager for this distribution."
964-
}
965-
}
966947

967948
function Start-PSBootstrap {
968949
[CmdletBinding(
@@ -1019,7 +1000,7 @@ function Start-PSBootstrap {
10191000
Invoke-Expression "$sudo apt-get update"
10201001
Invoke-Expression "$sudo apt-get install -y -qq $Deps"
10211002
}
1022-
} elseif ($IsRedHatFamily) {
1003+
} elseif ($IsCentOS) {
10231004
# Build tools
10241005
$Deps += "which", "curl", "gcc-c++", "cmake", "make"
10251006

@@ -1029,11 +1010,9 @@ function Start-PSBootstrap {
10291010
# Packaging tools
10301011
if ($Package) { $Deps += "ruby-devel", "rpm-build", "groff" }
10311012

1032-
$PackageManager = Get-RedHatPackageManager
1033-
10341013
# Install dependencies
10351014
Start-NativeExecution {
1036-
Invoke-Expression "$sudo $PackageManager install -y -q $Deps"
1015+
Invoke-Expression "$sudo yum install -y -q $Deps"
10371016
}
10381017
} elseif ($IsOSX) {
10391018
precheck 'brew' "Bootstrap dependency 'brew' not found, must install Homebrew! See http://brew.sh/"
@@ -1213,7 +1192,7 @@ function Start-PSPackage {
12131192
[ValidatePattern("^powershell")]
12141193
[string]$Name = "powershell",
12151194

1216-
# Ubuntu, CentOS, Fedora, OS X, and Windows packages are supported
1195+
# Ubuntu, CentOS, and OS X, and Windows packages are supported
12171196
[ValidateSet("deb", "osxpkg", "rpm", "msi", "appx", "zip")]
12181197
[string[]]$Type,
12191198

@@ -1267,7 +1246,7 @@ function Start-PSPackage {
12671246
$Type = if ($IsLinux) {
12681247
if ($LinuxInfo.ID -match "ubuntu") {
12691248
"deb"
1270-
} elseif ($IsRedHatFamily) {
1249+
} elseif ($LinuxInfo.ID -match "centos") {
12711250
"rpm"
12721251
} else {
12731252
throw "Building packages for $($LinuxInfo.PRETTY_NAME) is unsupported!"
@@ -1378,8 +1357,8 @@ function New-UnixPackage {
13781357
}
13791358
}
13801359
"rpm" {
1381-
if (!$IsRedHatFamily) {
1382-
throw ($ErrorMessage -f "Redhat Family")
1360+
if (!$IsCentOS) {
1361+
throw ($ErrorMessage -f "CentOS")
13831362
}
13841363
}
13851364
"osxpkg" {
@@ -1443,7 +1422,7 @@ It consists of a cross-platform command-line shell and associated scripting lang
14431422

14441423
New-Item -Force -ItemType SymbolicLink -Path "/tmp/$Name" -Target "$Destination/$Name" >$null
14451424

1446-
if ($IsRedHatFamily) {
1425+
if ($IsCentos) {
14471426
$AfterInstallScript = [io.path]::GetTempFileName()
14481427
$AfterRemoveScript = [io.path]::GetTempFileName()
14491428
@'
@@ -1560,7 +1539,7 @@ esac
15601539
} elseif ($IsUbuntu16) {
15611540
$Dependencies += "libicu55"
15621541
}
1563-
} elseif ($IsRedHatFamily) {
1542+
} elseif ($IsCentOS) {
15641543
$Dependencies = @(
15651544
"glibc",
15661545
"libcurl",
@@ -1583,15 +1562,9 @@ esac
15831562
$Iteration += "ubuntu1.16.04.1"
15841563
}
15851564

1586-
# We currently only support CentOS 7 and Fedora 24+
1565+
# We currently only support CentOS 7
15871566
# https://fedoraproject.org/wiki/Packaging:DistTag
1588-
if ($IsCentOS) {
1589-
$rpm_dist = "el7.centos"
1590-
} elseif ($IsFedora) {
1591-
$version_id = $LinuxInfo.VERSION_ID
1592-
$rpm_dist = "fedora.$version_id"
1593-
}
1594-
1567+
$rpm_dist = "el7.centos"
15951568

15961569
$Arguments = @(
15971570
"--force", "--verbose",
@@ -2597,7 +2570,6 @@ function Start-CrossGen {
25972570
"ubuntu.16.04-x64",
25982571
"debian.8-x64",
25992572
"centos.7-x64",
2600-
"fedora.24-x64",
26012573
"win7-x86",
26022574
"win7-x64",
26032575
"win81-x64",
@@ -2668,8 +2640,6 @@ function Start-CrossGen {
26682640
"ubuntu.14.04-x64"
26692641
} elseif ($IsCentOS) {
26702642
"rhel.7-x64"
2671-
} elseif ($IsFedora) {
2672-
"fedora.24-x64"
26732643
}
26742644
} elseif ($IsOSX) {
26752645
"osx.10.10-x64"

‎docker/nightly/fedora24/Dockerfile‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎docker/release/fedora24/Dockerfile‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎src/ResGen/project.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"ubuntu.14.04-x64": { },
2323
"debian.8-x64": { },
2424
"centos.7-x64": { },
25-
"fedora.24-x64": { },
2625
"win7-x86": { },
2726
"win7-x64": { },
2827
"win81-x64": { },

‎src/TypeCatalogGen/project.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
"ubuntu.16.10-x64": { },
4848
"debian.8-x64": { },
4949
"centos.7-x64": { },
50-
"fedora.24-x64": { },
5150
"win7-x86": { },
5251
"win7-x64": { },
5352
"win81-x64": { },

‎src/TypeCatalogParser/project.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
"ubuntu.16.04-x64": { },
4646
"ubuntu.16.10-x64": { },
4747
"centos.7-x64": { },
48-
"fedora.24-x64": { },
4948
"win7-x86": { },
5049
"win7-x64": { },
5150
"win10-x64": { },

‎src/powershell-unix/project.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@
102102
"ubuntu.16.10-x64": { },
103103
"debian.8-x64": { },
104104
"centos.7-x64": { },
105-
"fedora.24-x64": { },
106105
"osx.10.11-x64": { }
107106
}
108107
}

‎test/PSReadLine/project.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"ubuntu.14.04-x64": { },
2626
"ubuntu.16.04-x64": { },
2727
"centos.7-x64": { },
28-
"fedora.24-x64": { },
2928
"win7-x86": { },
3029
"win7-x64": { },
3130
"win10-x64": { },

‎test/csharp/project.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"ubuntu.16.04-x64": { },
3131
"debian.8-x64": { },
3232
"centos.7-x64": { },
33-
"fedora.24-x64": { },
3433
"win7-x86": { },
3534
"win7-x64": { },
3635
"win81-x64": { },

‎test/tools/CreateChildProcess/project.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"ubuntu.14.04-x64": { },
2121
"debian.8-x64": { },
2222
"centos.7-x64": { },
23-
"fedora.24-x64": { },
2423
"win7-x86": { },
2524
"win7-x64": { },
2625
"win81-x64": { },

0 commit comments

Comments
 (0)