projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2d5f3dc)
scritp: update merge check pl
authorJianxin <jianxin.pan@amlogic.com>
Fri, 10 Aug 2018 10:54:11 +0000 (18:54 +0800)
committerJianxin Pan <jianxin.pan@amlogic.com>
Mon, 13 Aug 2018 10:53:12 +0000 (03:53 -0700)
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>
scripts/amlogic/merge_pre_check.pl patch | blob | history
scripts/amlogic/mk_dtb_gx.sh [changed mode: 0644->0755] patch | blob | history

diff --git a/scripts/amlogic/merge_pre_check.pl b/scripts/amlogic/merge_pre_check.pl
index cd171c5..238aac0 100755 (executable)
--- 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 (file)
new mode 100755 (executable)
Domain: System / Kernel;