commit ed2b985c37bf220c675af67815bf2a804e08e993
author Christian Geddes <crgeddes@us.ibm.com> Tue Aug 20 13:26:50 2019 -0500
committer Christian Geddes <crgeddes@us.ibm.com> Tue Aug 20 13:38:50 2019 -0500
tree ce21df1735b0791cb334f34f153ba5901f8b55e4
parent 793bdb1ce26993c5dd9d395030b1c784c64417e4

Update openpower-pnor makefile to use BR2_ version vars

Previously we were using the * wildcard to lookup files to copy
over for debug data. This breaks when there are multiple versions
of a given package built in the output/build directory. This commit
will make the openpower-pnor.mk files use the build root env vars
(BR2_..) to make sure we just attempt to copy files from the current
version we are using.

Signed-off-by: Christian Geddes <crgeddes@us.ibm.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 00b0566..7f08682 100644
--- a/openpower/package/openpower-pnor/openpower-pnor.mk
+++ b/openpower/package/openpower-pnor/openpower-pnor.mk
@@ -69,11 +69,11 @@
 HOSTBOOT_BUILD_IMAGES_DIR = $(STAGING_DIR)/hostboot_build_images/
 
 FILES_TO_TAR = $(HOSTBOOT_BUILD_IMAGES_DIR)/* \
-               $(OUTPUT_BUILD_DIR)/skiboot-*/skiboot.elf \
-               $(OUTPUT_BUILD_DIR)/skiboot-*/skiboot.map \
-               $(OUTPUT_BUILD_DIR)/linux-*/.config \
-               $(OUTPUT_BUILD_DIR)/linux-*/vmlinux \
-               $(OUTPUT_BUILD_DIR)/linux-*/System.map \
+               $(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_CUSTOM_VERSION_VALUE)/.config \
+               $(OUTPUT_BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE)/vmlinux \
+               $(OUTPUT_BUILD_DIR)/linux-$(BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE)/System.map \
                $(OUTPUT_IMAGES_DIR)/zImage.epapr