diff options
| author | Lei YU <mine260309@gmail.com> | 2019-03-06 16:09:02 +0800 |
|---|---|---|
| committer | Lei YU <mine260309@gmail.com> | 2019-03-20 15:11:13 +0800 |
| commit | 98c3c06d4cb98adf2db12264e3c2d10d8dc60ad6 (patch) | |
| tree | 2036bb6443fa3dabd56ee72fdfe9c3f2ba3dc3ae /openpower/package | |
| parent | b0c35017c309d152bba203da173ae481b1ecbc47 (diff) | |
| download | blackbird-op-build-98c3c06d4cb98adf2db12264e3c2d10d8dc60ad6.tar.gz blackbird-op-build-98c3c06d4cb98adf2db12264e3c2d10d8dc60ad6.zip | |
openpower: pnor: Generate tarball
A tarball containing PNOR and MANIFEST is used to do code update for
OpenBMC.
This was done for VPNOR, and now it is needed for static layout PNOR.
* Rename openpower-vpnor to openpower-pnor-util and rename the installed
script to `generate-tar`.
* Invoke generate-tar to generate tarball for both static and VPNOR.
Signed-off-by: Lei YU <mine260309@gmail.com>
Diffstat (limited to 'openpower/package')
3 files changed, 23 insertions, 22 deletions
diff --git a/openpower/package/openpower-pnor-util/openpower-pnor-util.mk b/openpower/package/openpower-pnor-util/openpower-pnor-util.mk new file mode 100644 index 00000000..b7f508a8 --- /dev/null +++ b/openpower/package/openpower-pnor-util/openpower-pnor-util.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# openpower_pnor_util +# +################################################################################ + +HOST_OPENPOWER_PNOR_UTIL_VERSION ?= e499446423d6ebe96f74e079de36a8929d47277b +HOST_OPENPOWER_PNOR_UTIL_SITE ?= $(call github,openbmc,openpower-pnor-code-mgmt,$(HOST_OPENPOWER_PNOR_UTIL_VERSION)) +HOST_OPENPOWER_PNOR_UTIL_DEPENDENCIES = host-squashfs host-libflash + +define HOST_OPENPOWER_PNOR_UTIL_INSTALL_CMDS + $(INSTALL) -D $(@D)/generate-tar $(HOST_DIR)/usr/bin/generate-tar +endef + +OPENPOWER_PNOR_UTIL_LICENSE = Apache-2.0 + +$(eval $(host-generic-package)) diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk index b07e0549..7ca2b8cc 100644 --- a/openpower/package/openpower-pnor/openpower-pnor.mk +++ b/openpower/package/openpower-pnor/openpower-pnor.mk @@ -9,7 +9,7 @@ OPENPOWER_PNOR_SITE ?= $(call github,open-power,pnor,$(OPENPOWER_PNOR_VERSION)) OPENPOWER_PNOR_LICENSE = Apache-2.0 OPENPOWER_PNOR_LICENSE_FILES = LICENSE -OPENPOWER_PNOR_DEPENDENCIES = hostboot-binaries machine-xml skiboot host-openpower-ffs capp-ucode +OPENPOWER_PNOR_DEPENDENCIES = hostboot-binaries machine-xml skiboot host-openpower-ffs capp-ucode host-openpower-pnor-util ifeq ($(BR2_OPENPOWER_POWER9),y) OPENPOWER_PNOR_DEPENDENCIES += hcode @@ -52,10 +52,6 @@ else OPENPOWER_RELEASE=p8 endif -ifeq ($(BR2_BUILD_PNOR_SQUASHFS),y) - OPENPOWER_PNOR_DEPENDENCIES += host-openpower-vpnor -endif - OPENPOWER_PNOR_INSTALL_IMAGES = YES OPENPOWER_PNOR_INSTALL_TARGET = NO @@ -166,11 +162,14 @@ define OPENPOWER_PNOR_INSTALL_IMAGES_CMDS $(INSTALL) $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_UPDATE_FILENAME) $(BINARIES_DIR); \ fi - # If this is a VPNOR system, run the generate-squashfs command and + # If this is a VPNOR system, run the generate-tar command and # create a tarball if [ "$(BR2_BUILD_PNOR_SQUASHFS)" == "y" ]; then \ - PATH=$(HOST_DIR)/usr/bin:$(PATH) $(HOST_DIR)/usr/bin/generate-squashfs -f $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME).squashfs.tar $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME) -s; \ + PATH=$(HOST_DIR)/usr/bin:$(PATH) $(HOST_DIR)/usr/bin/generate-tar -i squashfs -f $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME).squashfs.tar $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME) -s; \ $(INSTALL) $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME).squashfs.tar $(BINARIES_DIR); \ + else \ + PATH=$(HOST_DIR)/usr/bin:$(PATH) $(HOST_DIR)/usr/bin/generate-tar -i static -f $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME).static.tar.gz $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME) -s; \ + $(INSTALL) $(STAGING_DIR)/pnor/$(BR2_OPENPOWER_PNOR_FILENAME).static.tar.gz $(BINARIES_DIR); \ fi #Create Debug Tarball diff --git a/openpower/package/openpower-vpnor/openpower-vpnor.mk b/openpower/package/openpower-vpnor/openpower-vpnor.mk deleted file mode 100644 index 56666173..00000000 --- a/openpower/package/openpower-vpnor/openpower-vpnor.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# openpower_vpnor -# -################################################################################ - -HOST_OPENPOWER_VPNOR_VERSION ?= c39d923fee581533775e37be3f59f77c021718ee -HOST_OPENPOWER_VPNOR_SITE ?= $(call github,openbmc,openpower-pnor-code-mgmt,$(HOST_OPENPOWER_VPNOR_VERSION)) -HOST_OPENPOWER_VPNOR_DEPENDENCIES = host-squashfs host-libflash - -define HOST_OPENPOWER_VPNOR_INSTALL_CMDS - $(INSTALL) -D $(@D)/generate-squashfs $(HOST_DIR)/usr/bin/generate-squashfs -endef - -$(eval $(host-generic-package)) |
