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:
Родитель
44abcd358d
Коммит
e51a645353
|
@ -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":
|
||||
|
|
Загрузка…
Ссылка в новой задаче