[TRE-2549] Bug fixed. Use ibc file for generate NI 32/243232/1 accepted/tizen/6.0/unified/hotfix/20201103.050651 accepted/tizen/unified/20200904.065200 submit/tizen/20200904.063954 submit/tizen_6.0/20201029.205504 submit/tizen_6.0_hotfix/20201102.192904 submit/tizen_6.0_hotfix/20201103.115104 tizen_6.0.m2_release
authorj-h.choi <j-h.choi@samsung.com>
Fri, 4 Sep 2020 06:27:21 +0000 (15:27 +0900)
committerj-h.choi <j-h.choi@samsung.com>
Fri, 4 Sep 2020 06:27:21 +0000 (15:27 +0900)
Change-Id: I3dd18d8d020b04698bbb47767e637e200a25c333

scripts/iot-making-building-blocks-dll.post

index 7e9c0b6f0fc9875031725792e2558fc77527abff..3f67c7ec22278c41f06fa1423c7d50dbc489894e 100644 (file)
@@ -9,24 +9,25 @@ then
        /opt/share/bb/make_tizenfx_from_bb.sh
        if [ -f /usr/bin/dotnettool ]
        then
-               #remove previous native image
+               # remove previous native image
                dotnettool --ni-reset-system
 
-               # generate native image with ibcdata
-               dotnettool --ibc-dir $IBCDATA_DIR --ni-system
+               dotnettool --ibc-dir $IBCDATA_DIR --ni-dll /usr/share/dotnet.tizen/netcoreapp/System.Private.CoreLib.dll
+               if [ -f /usr/share/dotnet.tizen/netcoreapp/System.Private.CoreLib.dll.Backup ]
+               then
+                       # generate native image with ibcdata
+                       dotnettool --ibc-dir $IBCDATA_DIR --ni-system
+               else
+                       echo "The current ibcdata format does not match in Iot(aarch64) profile. So regenerate native image without ibcdata."
+                       # regenerate native image without ibcdata
+                       dotnettool --ni-system
+               fi
 
                # remove ibc data files
                if [ -d $IBCDATA_DIR ]
                then
                    rm -rf $IBCDATA_DIR
                fi
-
-               if [ ! -f /usr/share/dotnet.tizen/netcoreapp/System.Private.CoreLib.dll.Backup ]
-               then
-                       echo "The current ibcdata format does not match in Iot(aarch64) profile. So regenerate native image without ibcdata."
-                       # regenerate native image without ibcdata
-                       dotnettool --ni-system
-               fi
        else
                echo "There is no execute file - /usr/bin/dotnettool"
        fi