rmc-db: allow multiple fingerprint per board directory

Different firmware revisions often result in different fingerprints for
the same hardware platform. This change allows multiple fingerprints to
be stored in the same board directory to avoid having to duplicate the
data for each record.

Signed-off-by: Todor Minchev <todor.minchev@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/classes/rmc-db.bbclass b/classes/rmc-db.bbclass
index 0fb4c272..72594d69 100644
--- a/classes/rmc-db.bbclass
+++ b/classes/rmc-db.bbclass
@@ -60,7 +60,6 @@ rmc_generate_db () {
                 # For all board dirs in a topdir:
                 CUR_BOARD_DIRS=$(find ${topdir}/* -type d)
                 for board_dir in ${CUR_BOARD_DIRS}; do
-                        # FIXME: we shall fail when having more than one .fp file
                         CUR_FINGERPRINT=$(find ${board_dir}/ -name "*.fp")
 
                         # disallow a board directory without any fingerprint file in it.
@@ -77,12 +76,13 @@ rmc_generate_db () {
                                 continue
                         fi
 
-                        CUR_TAG=$(echo "${board_dir}"|sed  's/\//-/g')
-                        CUR_RECORD=${RMC_DB_DIR}/rmc${CUR_TAG}.rec
-
-                        rmc -R -f ${CUR_FINGERPRINT} -b ${CUR_FILES} -o ${CUR_RECORD}
-
-                        RMC_RECORDS="${RMC_RECORDS} ${CUR_RECORD}"
+                        for fp in ${CUR_FINGERPRINT}; do
+                                fullname=$(basename ${fp})
+                                CUR_TAG="${fullname%.*}"
+                                CUR_RECORD=${RMC_DB_DIR}/${CUR_TAG}.rec
+                                rmc -R -f ${fp} -b ${CUR_FILES} -o ${CUR_RECORD}
+                                RMC_RECORDS="${RMC_RECORDS} ${CUR_RECORD}"
+                        done
                 done
         done