commit 0e9e106be9c5103f5702cc6ab0351007a7f2e7ce
author Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> Wed May 20 15:06:13 2020 -0300
committer Klaus Heinrich Kiwi <klausk@br.ibm.com> Sat Jun 20 07:33:57 2020 -0300
tree aaa8ae5b9474cc67b4a674b5f7514c746db62ed9
parent bc8e64dd8100f9d7d51e624ae74f1e510c39303b

openpower-pnor.mk: use correct version vars

Use the correct <pkg>_VERSION variables for packages, instead of the
ones defined in _defconfig.

Fixes build in situations where the <pkg>_VERSION variable is overriden
(i.e., when using <pkg>_OVERRIDE_SRCDIR) since the build directory
always depends on this variable, not the one defined in the _defconfig.

Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
(cherry picked from commit 1a083efb0c173c7e65b25687c02b111be424358a)
(Solved Conflicts:
	openpower/package/openpower-pnor/openpower-pnor.mk)

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 becc9ef..f748c97 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -82,15 +82,14 @@
 BMC_POWER_TARGET_FILENAME = power-target.dtb
 
 FILES_TO_TAR = $(HOSTBOOT_BUILD_IMAGES_DIR)/* \
-               $(OUTPUT_BUILD_DIR)/skiboot-$(BR2_SKIBOOT_VERSION)/skiboot.elf \
-               $(OUTPUT_BUILD_DIR)/skiboot-$(BR2_SKIBOOT_VERSION)/skiboot.map \
-               $(OUTPUT_BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_VERSION)/.config \
-               $(OUTPUT_BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_VERSION)/vmlinux \
-               $(OUTPUT_BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_VERSION)/System.map \
+               $(OUTPUT_BUILD_DIR)/skiboot-$(SKIBOOT_VERSION)/skiboot.elf \
+               $(OUTPUT_BUILD_DIR)/skiboot-$(SKIBOOT_VERSION)/skiboot.map \
+               $(OUTPUT_BUILD_DIR)/linux-$(LINUX_VERSION)/.config \
+               $(OUTPUT_BUILD_DIR)/linux-$(LINUX_VERSION)/vmlinux \
+               $(OUTPUT_BUILD_DIR)/linux-$(LINUX_VERSION)/System.map \
  	       $(FSP_TRACE_IMAGES_DIR)/fsp-trace \
                $(OUTPUT_IMAGES_DIR)/zImage.epapr
 
-
 # Subpackages we want to include in the version info (do not include openpower-pnor)
 OPENPOWER_VERSIONED_SUBPACKAGES = skiboot
 
@@ -155,7 +154,7 @@
             -payload_filename $(BR2_SKIBOOT_LID_XZ_NAME) \
             -binary_dir $(BINARIES_DIR) \
             -bootkernel_filename $(LINUX_IMAGE_NAME) \
-	    -ocmbfw_version $(BR2_OCMB_EXPLORER_FW_VERSION) \
+	    -ocmbfw_version $(OCMB_EXPLORER_FW_VERSION) \
 	    -ocmbfw_url $(BR2_OCMB_EXPLORER_FW_URL) \
 	    -ocmbfw_original_filename $(BINARIES_DIR)/$(BR2_OCMBFW_FILENAME) \
 	    -ocmbfw_binary_filename $(OPENPOWER_PNOR_SCRATCH_DIR)/$(BR2_OCMBFW_PROCESSED_FILENAME) \