diff options
| author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-02-17 14:57:57 +1100 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2018-05-02 00:29:03 -0500 |
| commit | 03671c06d119a673e14d290f0785deb148cd83fd (patch) | |
| tree | 30e1b74673ba040cff3cffa937a0b16fb5808b77 /openpower/package/machine-xml | |
| parent | 9307e07318cbdfb104118bf4dca1c174a3e8368b (diff) | |
| download | blackbird-op-build-03671c06d119a673e14d290f0785deb148cd83fd.tar.gz blackbird-op-build-03671c06d119a673e14d290f0785deb148cd83fd.zip | |
Split P8 and P9 Hostboot and OCC packages
This was causing a couple of issues:
1) increased complexity in build files
2) It breaks the pkg-version patch detection/checksum
3) Failing to apply patches to would silently fail
The split makes this a bit easier and requires less custom code.
We keep the P9 hostboot/occ named hostboot/occ, so that day-to-day,
nobody notices a difference. The only difference you'll notice
is if doing POWER8 hostboot/occ development, as the package name
will be 'hostboot-p8' or 'occ-p8'.
Fixes: https://github.com/open-power/op-build/issues/876
Fixes: https://github.com/open-power/op-build/issues/1194
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'openpower/package/machine-xml')
| -rw-r--r-- | openpower/package/machine-xml/machine-xml.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/openpower/package/machine-xml/machine-xml.mk b/openpower/package/machine-xml/machine-xml.mk index e335e8b1..dc05d0d3 100644 --- a/openpower/package/machine-xml/machine-xml.mk +++ b/openpower/package/machine-xml/machine-xml.mk @@ -13,7 +13,14 @@ endif MACHINE_XML_LICENSE = Apache-2.0 MACHINE_XML_LICENSE_FILES = LICENSE -MACHINE_XML_DEPENDENCIES = hostboot openpower-mrw common-p8-xml +MACHINE_XML_DEPENDENCIES = openpower-mrw common-p8-xml + +ifeq ($(BR2_OPENPOWER_POWER9),y) +MACHINE_XML_DEPENDENCIES += hostboot +endif +ifeq ($(BR2_OPENPOWER_POWER8),y) +MACHINE_XML_DEPENDENCIES += hostboot-p8 +endif MACHINE_XML_INSTALL_IMAGES = YES MACHINE_XML_INSTALL_TARGET = YES |
