From 2c9d0d869fc5b1ed07cf33f962758dc69c195f60 Mon Sep 17 00:00:00 2001
From: kubodera_yuichi <kubodera_yuichi@ff987cc8-cf2f-4642-8568-d52cce064691>
Date: Thu, 7 Jan 2010 13:16:12 +0000
Subject: [PATCH] =?UTF-8?q?=E5=BF=85=E8=A6=81=E3=81=AA=E3=82=AA=E3=83=96?=
 =?UTF-8?q?=E3=82=B8=E3=82=A7=E3=82=AF=E3=83=88=E3=83=95=E3=82=A1=E3=82=A4?=
 =?UTF-8?q?=E3=83=AB=E3=82=92=E4=B8=80=E3=81=A4=E3=81=AB=E5=9B=BA=E3=82=81?=
 =?UTF-8?q?=E3=82=8B,HSM=E7=B7=A8(=E3=81=BE=E3=81=A0=E4=B8=8A=E6=89=8B?=
 =?UTF-8?q?=E3=81=8F=E3=81=84=E3=81=8B=E3=81=AA=E3=81=84)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_eFuse@157 ff987cc8-cf2f-4642-8568-d52cce064691
---
 tools/merge_lib_objs_hsm.plx | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/tools/merge_lib_objs_hsm.plx b/tools/merge_lib_objs_hsm.plx
index 03f6568..263cacf 100644
--- a/tools/merge_lib_objs_hsm.plx
+++ b/tools/merge_lib_objs_hsm.plx
@@ -3,23 +3,37 @@ use strict;
 
 print "cd dep_objs/\n";
 chdir 'dep_objs';
-
+
+# openssl
 print "ar x ../openssl-0.9.8k/libcrypto.a\n";
 system "ar", "x", "../openssl-0.9.8k/libcrypto.a";
 
 print "ar x ../openssl-0.9.8k/libssl.a\n";
 system "ar", "x", "../openssl-0.9.8k/libssl.a";
+
+# hsm
+print "ar x /opt/nfast/c/ctd/gcc/lib/libchknfast.a\n";
+system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libchknfast.a";
+
+print "ar x /opt/nfast/c/ctd/gcc/lib/libnfhwcrhk.a\n";
+system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libnfhwcrhk.a";
 
-print "ar x /opt/nfast/c/ctd/gcc/lib/libnfkm.a";
+print "ar x /opt/nfast/c/ctd/gcc/lib/libnfkm.a\n";
 system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libnfkm.a";
+
+print "ar x /opt/nfast/c/ctd/gcc/lib/libnfkma.a\n";
+system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libnfkma.a";
+
+print "ar x /opt/nfast/c/ctd/gcc/lib/librqcard.a\n";
+system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/librqcard.a";
 
-print "ar x /opt/nfast/c/ctd/gcc/lib/libnfstub.a";
+print "ar x /opt/nfast/c/ctd/gcc/lib/libnfstub.a\n";
 system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libnfstub.a";
 
-print "ar x /opt/nfast/c/ctd/gcc/lib/libnflog.a";
+print "ar x /opt/nfast/c/ctd/gcc/lib/libnflog.a\n";
 system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libnflog.a";
 
-print "ar x /opt/nfast/c/ctd/gcc/lib/libcutils.a";
+print "ar x /opt/nfast/c/ctd/gcc/lib/libcutils.a\n";
 system "ar", "x", "/opt/nfast/c/ctd/gcc/lib/libcutils.a";
 
 my @object_files = glob "*.o";
@@ -27,5 +41,5 @@ my @object_files = glob "*.o";
 print "ar rcs ../lib_gen_id.a @object_files\n";
 system "ar", "rcs", "../lib_gen_id.a", @object_files;
 
-print "rm @object_files\n";
+print "rm *.o\n";
 system "rm", @object_files;