From: Jianxin <jianxin.pan@amlogic.com>
Date: Fri, 10 Aug 2018 10:54:11 +0000 (+0800)
Subject: scritp: update merge check pl
X-Git-Tag: khadas-vims-v0.9.6-release~1557
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49d2203703be144deb4cc408c5cb310d66ada481;p=platform%2Fkernel%2Flinux-amlogic.git

scritp: update merge check pl

PD#146811
':' and extral message folling PD#xxxx is not a must in line three

Change-Id: Ibe115f6a64bc267730020aaa52f8b21adb2f66a5
Signed-off-by: Jianxin <jianxin.pan@amlogic.com>
---

diff --git a/scripts/amlogic/merge_pre_check.pl b/scripts/amlogic/merge_pre_check.pl
index cd171c5..238aac0 100755
--- a/scripts/amlogic/merge_pre_check.pl
+++ b/scripts/amlogic/merge_pre_check.pl
@@ -118,7 +118,7 @@ sub check_msg_49
 
 	if( $lnum == 7 )
 	{
-		if( $line !~ /^(\s){4}PD\#(\d)+:(\s\w.*)*$/ )
+		if( $line !~ /^(\s){4}PD\#(\d)+/ )
 		{
 			$err_cnt += 1;
 			$line =~ s/^(\s){4}//;
diff --git a/scripts/amlogic/mk_dtb_gx.sh b/scripts/amlogic/mk_dtb_gx.sh
old mode 100644
new mode 100755