commit 98c3c06d4cb98adf2db12264e3c2d10d8dc60ad6
author Lei YU <mine260309@gmail.com> Wed Mar 06 16:09:02 2019 +0800
committer Lei YU <mine260309@gmail.com> Wed Mar 20 15:11:13 2019 +0800
tree 2036bb6443fa3dabd56ee72fdfe9c3f2ba3dc3ae
parent b0c35017c309d152bba203da173ae481b1ecbc47

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>

openpower/package/openpower-pnor/openpower-pnor.mk

diff --git a/openpower/package/openpower-pnor/openpower-pnor.mk b/openpower/package/openpower-pnor/openpower-pnor.mk
index b07e054..7ca2b8c 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -9,7 +9,7 @@
 
 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 @@
     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 @@
             $(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