Refine false positive and license clue rules

AyanSinhaMahapatra · AyanSinhaMahapatra · commit 916bba5ce15d · 2024-09-16T20:27:23.000+05:30
Signed-off-by: Ayan Sinha Mahapatra &lt;ayansmahapatra@gmail.com&gt;
diff --git a/src/licensedcode/data/rules/false-positive_771.RULE b/src/licensedcode/data/rules/false-positive_771.RULE
@@ -3,4 +3,4 @@ is_false_positive: yes
 notes: seen in kernel /Documentation/process/license-rules.rst
 ---
 
-The SPDX license identifier in kernel files shall be added at the first
+The SPDX license identifier in kernel files
diff --git a/src/licensedcode/data/rules/false-positive_772.RULE b/src/licensedcode/data/rules/false-positive_772.RULE
@@ -3,4 +3,4 @@ is_false_positive: yes
 notes: seen in kernel /Documentation/process/license-rules.rst
 ---
 
-The SPDX license identifier is added in form of a comment.
+The SPDX license identifier is added
diff --git a/src/licensedcode/data/rules/false-positive_773.RULE b/src/licensedcode/data/rules/false-positive_773.RULE
@@ -3,4 +3,4 @@ is_false_positive: yes
 notes: seen in kernel /Documentation/process/license-rules.rst
 ---
 
-(SPDX-License-Identifier) nor in any way relevant for expressing or
+(SPDX-License-Identifier) nor
diff --git a/src/licensedcode/data/rules/false-positive_774.RULE b/src/licensedcode/data/rules/false-positive_774.RULE
@@ -3,4 +3,4 @@ is_false_positive: yes
 notes: seen at drivers/block/floppy.c
 ---
 
-* modeled after the freeware MS-DOS program fdformat/88 V1.8 by
+* modeled after the freeware MS-DOS program
diff --git a/src/licensedcode/data/rules/false-positive_776.RULE b/src/licensedcode/data/rules/false-positive_776.RULE
@@ -1,6 +1,6 @@
 ---
 is_false_positive: yes
-notes: seen in kernel /Documentation/process/license-rules.rst
+notes: seen in kernel menuconfig
 ---
 
- SPDX-License-Identifier: <SPDX License Expression>
+_GNU_SOURCE
diff --git a/src/licensedcode/data/rules/false-positive_781.RULE b/src/licensedcode/data/rules/false-positive_781.RULE
@@ -3,4 +3,4 @@ is_false_positive: yes
 notes: found in linux/drivers/gpu/drm/amd/include/asic_reg/nbio/
 ---
 
-#define PCIE_RX_AD__RX_RC_UR_SSPL_MSG
+UR_SSPL_MSG
diff --git a/src/licensedcode/data/rules/false-positive_782.RULE b/src/licensedcode/data/rules/false-positive_782.RULE
@@ -3,4 +3,4 @@ is_false_positive: yes
 notes: found in linux/drivers/pinctrl/samsung/pinctrl-exynos-arm.c
 ---
 
-EXYNOS_PIN_BANK_EINTG("gpl2")
+EINTG("gpl2")
diff --git a/src/licensedcode/data/rules/false-positive_783.RULE b/src/licensedcode/data/rules/false-positive_783.RULE
@@ -3,4 +3,4 @@ is_false_positive: yes
 notes: found in linux/drivers/pinctrl/samsung/pinctrl-exynos-arm.c
 ---
 
-EXYNOS_PIN_BANK_EINTG("gpl1")
+EINTG("gpl1")
diff --git a/src/licensedcode/data/rules/false-positive_784.RULE b/src/licensedcode/data/rules/false-positive_784.RULE
diff --git a/src/licensedcode/data/rules/false-positive_785.RULE b/src/licensedcode/data/rules/false-positive_785.RULE
@@ -3,4 +3,4 @@ is_false_positive: yes
 notes: found in linux/include/linux/mfd/rn5t618.h
 ---
 
-#define RN5T618_GPLED_FUNC
+GPLED_FUNC
diff --git a/src/licensedcode/data/rules/false-positive_786.RULE b/src/licensedcode/data/rules/false-positive_786.RULE
diff --git a/src/licensedcode/data/rules/false-positive_787.RULE b/src/licensedcode/data/rules/false-positive_787.RULE
diff --git a/src/licensedcode/data/rules/false-positive_788.RULE b/src/licensedcode/data/rules/false-positive_788.RULE
diff --git a/src/licensedcode/data/rules/gpl-2.0_1436.RULE b/src/licensedcode/data/rules/gpl-2.0_1436.RULE
diff --git a/src/licensedcode/data/rules/gpl-2.0_and_gpl-1.0-plus_and_gpl-2.0-plus_and_lgpl-2.0_and_lgpl-2.0-plus_and_lgpl-2.1_and_lgpl-2.1-plus_1.RULE b/src/licensedcode/data/rules/gpl-2.0_and_gpl-1.0-plus_and_gpl-2.0-plus_and_lgpl-2.0_and_lgpl-2.0-plus_and_lgpl-2.1_and_lgpl-2.1-plus_1.RULE
@@ -5,7 +5,7 @@ is_license_notice: yes
 minimum_coverage: 90
 ---
 
-The license described in the COPYING file applies to the kernel source
+The license described in the {{COPYING file applies to the kernel source}}
 as a whole, though individual source files can have a different license
 which is required to be compatible with the GPL-2.0::
 
diff --git a/src/licensedcode/data/rules/license-clue_gpl-2.0_1.RULE b/src/licensedcode/data/rules/license-clue_gpl-2.0_1.RULE
@@ -0,0 +1,9 @@
+---
+license_expression: gpl-2.0
+is_license_clue: yes
+relevance: 80
+minimum_coverage: 90
+notes: found in linux/net/core/filter.c
+---
+
+EXPORT_PER_CPU_SYMBOL_GPL
diff --git a/tests/licensedcode/data/datadriven/external/spdx/uboot.c.yml b/tests/licensedcode/data/datadriven/external/spdx/uboot.c.yml
@@ -32,8 +32,8 @@ license_expressions:
   - gpl-2.0-plus
   - gpl-2.0-plus OR bsd-simplified
   - gpl-2.0-plus OR bsd-simplified
-  - gpl-2.0-plus OR bsd-new
-  - gpl-2.0-plus OR bsd-new
+  - gpl-2.0-plus AND bsd-new
+  - gpl-2.0-plus AND bsd-new
   - gpl-2.0 OR ibm-pibs
   - isc
   - lgpl-2.0-plus
diff --git a/tests/licensedcode/test_detect.py b/tests/licensedcode/test_detect.py
@@ -1062,7 +1062,7 @@ def test_match_has_correct_line_positions_in_automake_perl_file(self):
             # detected, match.lines(), match.qspan,
             ('gpl-2.0-plus', (12, 25), Span(48, 157)),
             ('fsf-unlimited-no-warranty', (231, 238), Span(964, 1027)),
-            ('warranty-disclaimer', (306, 307), Span(1336, 1358)),
+            ('warranty-disclaimer', (306, 307), Span(1335, 1357)),
         ]
         self.check_position('positions/automake.pl', expected)
 
