Browse code
aarch64 compilation: constant.perPackageToolChain
openjdk8 would require different constant.perPackageToolChain
for x86_64 and aarch64. So created two sections within
constant.perPackageToolChain as x86_64 and aarch64.
Change-Id: Idb1cc5155186235f41289e7924c9bcf729b92038
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5438
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Ajay Kaher authored on 2018/08/01 05:26:28Showing 3 changed files
- support/package-builder/PackageBuilder.py
- support/package-builder/ToolChainUtils.py
- support/package-builder/constants.py
| ... | ... |
@@ -295,7 +295,7 @@ class PackageBuilderContainer(PackageBuilderBase): |
| 295 | 295 |
self.logger.debug(constants.perPackageToolChain[self.package]) |
| 296 | 296 |
tcUtils.installCustomToolChainRPMSinContainer( |
| 297 | 297 |
containerID, |
| 298 |
- constants.perPackageToolChain[self.package], |
|
| 298 |
+ constants.perPackageToolChain[self.package].get(platform.machine(), []), |
|
| 299 | 299 |
self.package) |
| 300 | 300 |
|
| 301 | 301 |
listDependentPackages,listDependentPackagesParseObj, listInstalledPackages, listInstalledRPMs = ( |
| ... | ... |
@@ -159,7 +159,8 @@ class ToolChainUtils(object): |
| 159 | 159 |
print(constants.perPackageToolChain) |
| 160 | 160 |
if packageName in constants.perPackageToolChain: |
| 161 | 161 |
print(constants.perPackageToolChain[packageName]) |
| 162 |
- self.installCustomToolChainRPMS(chrootID, constants.perPackageToolChain[packageName], |
|
| 162 |
+ self.installCustomToolChainRPMS(chrootID, |
|
| 163 |
+ constants.perPackageToolChain[packageName].get(platform.machine(), []), |
|
| 163 | 164 |
packageName) |
| 164 | 165 |
|
| 165 | 166 |
def installCustomToolChainRPMS(self, chrootID, listOfToolChainPkgs, packageName): |
| ... | ... |
@@ -233,7 +233,8 @@ class constants(object): |
| 233 | 233 |
"openjdk10-doc", |
| 234 | 234 |
"openjdk10-src", |
| 235 | 235 |
"openjre10"], |
| 236 |
- [ |
|
| 236 |
+ {
|
|
| 237 |
+ "x86_64":[ |
|
| 237 | 238 |
"icu-devel", |
| 238 | 239 |
"cups", |
| 239 | 240 |
"cups-devel", |
| ... | ... |
@@ -273,8 +274,46 @@ class constants(object): |
| 273 | 273 |
"libXt-devel", |
| 274 | 274 |
"libXmu-devel", |
| 275 | 275 |
"libXrender", |
| 276 |
- "libXrender-devel"]) |
|
| 277 |
- perPackageToolChain["apache-maven"] = ["apache-maven"] |
|
| 276 |
+ "libXrender-devel"], |
|
| 277 |
+ "aarch64":[ |
|
| 278 |
+ "icu-devel", |
|
| 279 |
+ "openjdk", |
|
| 280 |
+ "openjre", |
|
| 281 |
+ "icu", |
|
| 282 |
+ "alsa-lib", |
|
| 283 |
+ "alsa-lib-devel", |
|
| 284 |
+ "xcb-proto", |
|
| 285 |
+ "libXdmcp-devel", |
|
| 286 |
+ "libXau-devel", |
|
| 287 |
+ "util-macros", |
|
| 288 |
+ "xtrans", |
|
| 289 |
+ "libxcb-devel", |
|
| 290 |
+ "proto", |
|
| 291 |
+ "libXdmcp", |
|
| 292 |
+ "libxcb", |
|
| 293 |
+ "libXau", |
|
| 294 |
+ "xtrans-devel", |
|
| 295 |
+ "libX11", |
|
| 296 |
+ "libX11-devel", |
|
| 297 |
+ "libXext", |
|
| 298 |
+ "libXext-devel", |
|
| 299 |
+ "libICE-devel", |
|
| 300 |
+ "libSM", |
|
| 301 |
+ "libICE", |
|
| 302 |
+ "libSM-devel", |
|
| 303 |
+ "libXt", |
|
| 304 |
+ "libXmu", |
|
| 305 |
+ "libXt-devel", |
|
| 306 |
+ "libXmu-devel", |
|
| 307 |
+ "libXrender", |
|
| 308 |
+ "libXrender-devel"] |
|
| 309 |
+ }) |
|
| 310 |
+ |
|
| 311 |
+ perPackageToolChain["apache-maven"] = {
|
|
| 312 |
+ "x86_64":["apache-maven"], |
|
| 313 |
+ "aarch64":["apache-maven"] |
|
| 314 |
+ } |
|
| 315 |
+ |
|
| 278 | 316 |
# List of RPMs which are not published. They will be created during the |
| 279 | 317 |
# build process |
| 280 | 318 |
listOfRPMsProvidedAfterBuild = [ |