Allow PPC builds to be identified as REDHAT, not ULINUX

These builds only run on PPC platform (Power*) hosted by AIX
This commit is contained in:
Jeff Coffler 2016-11-21 14:41:20 -08:00
Родитель 44abcd358d
Коммит e51a645353
3 изменённых файлов: 3 добавлений и 2 удалений

1
build/configure поставляемый
Просмотреть файл

@ -92,6 +92,7 @@ case $uname in
case `uname -m` in
# ARCH is only used for OMS to determine the correct ruby folder
ppc64*)
PF_DISTRO=REDHAT
PF_ARCH=ppc
ARCH=ppc
VERSION=`grep 'Red Hat Enterprise' /etc/redhat-release | sed s/.*release\ // | sed s/\ .*//`

Просмотреть файл

@ -134,8 +134,6 @@ class LinuxRPMFile:
specfile.close()
if self.variables['PFDISTRO'] == 'ULINUX' and self.variables['PFARCH'] == 'ppc':
self.variables['PFDISTRO']='REDHAT'
def StageAndProperlyNameRPM(self):
if 'OUTPUTFILE' in self.variables:
rpmNewFileName = self.variables['OUTPUTFILE'] + '.rpm'

Просмотреть файл

@ -252,6 +252,8 @@ if Variables["PF"] == "Linux":
PACKAGE_TYPE = "RPM"
elif (Variables["PFDISTRO"] == "ULINUX" and Variables["PF_DISTRO_ULINUX_KIT"] == "D"):
PACKAGE_TYPE = "DPKG"
elif (Variables["PFDISTRO"] == "REDHAT" and Variables["PFARCH"] == "ppc"):
PACKAGE_TYPE = "RPM"
else:
error("Invalid Platform")
elif Variables["PF"] == "AIX":