commit:     40ca60304a3b60367ae40f40dd0ed52a2e2bb47f
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  2 09:59:40 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Apr  2 10:04:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40ca6030

sys-kernel/linux-headers: avoid ${D} in src_test()

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-kernel/linux-headers/linux-headers-3.18.ebuild    |  5 +----
 sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild | 10 +---------
 sys-kernel/linux-headers/linux-headers-4.19.ebuild    | 10 +---------
 sys-kernel/linux-headers/linux-headers-4.4.ebuild     | 10 +---------
 sys-kernel/linux-headers/linux-headers-4.9.ebuild     | 10 +---------
 5 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/sys-kernel/linux-headers/linux-headers-3.18.ebuild 
b/sys-kernel/linux-headers/linux-headers-3.18.ebuild
index ba6ba023e84..b4c2a44ff50 100644
--- a/sys-kernel/linux-headers/linux-headers-3.18.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-3.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,8 +48,5 @@ src_test() {
                -e '\<([us](8|16|32|64))\>' \
                .
 
-       einfo "Missing linux/types.h include"
-       egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L 
linux/types.h
-
        emake ARCH=$(tc-arch-kernel) headers_check
 }

diff --git a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild 
b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
index 7179ff17feb..c931c75d07e 100644
--- a/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,19 +39,11 @@ src_install() {
 }
 
 src_test() {
-       # Make sure no uapi/ include paths are used by accident.
-       egrep -r \
-               -e '# *include.*["<]uapi/' \
-               "${D}" && die "#include uapi/xxx detected"
-
        einfo "Possible unescaped attribute/type usage"
        egrep -r \
                -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
                -e '\<([us](8|16|32|64))\>' \
                .
 
-       einfo "Missing linux/types.h include"
-       egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L 
linux/types.h
-
        emake ARCH=$(tc-arch-kernel) headers_check
 }

diff --git a/sys-kernel/linux-headers/linux-headers-4.19.ebuild 
b/sys-kernel/linux-headers/linux-headers-4.19.ebuild
index 6b5b4f2a627..159b1080ae4 100644
--- a/sys-kernel/linux-headers/linux-headers-4.19.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -42,19 +42,11 @@ src_install() {
 }
 
 src_test() {
-       # Make sure no uapi/ include paths are used by accident.
-       egrep -r \
-               -e '# *include.*["<]uapi/' \
-               "${D}" && die "#include uapi/xxx detected"
-
        einfo "Possible unescaped attribute/type usage"
        egrep -r \
                -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
                -e '\<([us](8|16|32|64))\>' \
                .
 
-       einfo "Missing linux/types.h include"
-       egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L 
linux/types.h
-
        emake ARCH=$(tc-arch-kernel) headers_check
 }

diff --git a/sys-kernel/linux-headers/linux-headers-4.4.ebuild 
b/sys-kernel/linux-headers/linux-headers-4.4.ebuild
index 7179ff17feb..c931c75d07e 100644
--- a/sys-kernel/linux-headers/linux-headers-4.4.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,19 +39,11 @@ src_install() {
 }
 
 src_test() {
-       # Make sure no uapi/ include paths are used by accident.
-       egrep -r \
-               -e '# *include.*["<]uapi/' \
-               "${D}" && die "#include uapi/xxx detected"
-
        einfo "Possible unescaped attribute/type usage"
        egrep -r \
                -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
                -e '\<([us](8|16|32|64))\>' \
                .
 
-       einfo "Missing linux/types.h include"
-       egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L 
linux/types.h
-
        emake ARCH=$(tc-arch-kernel) headers_check
 }

diff --git a/sys-kernel/linux-headers/linux-headers-4.9.ebuild 
b/sys-kernel/linux-headers/linux-headers-4.9.ebuild
index 3b5fc0c8ba5..45ad986072e 100644
--- a/sys-kernel/linux-headers/linux-headers-4.9.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -39,19 +39,11 @@ src_install() {
 }
 
 src_test() {
-       # Make sure no uapi/ include paths are used by accident.
-       egrep -r \
-               -e '# *include.*["<]uapi/' \
-               "${D}" && die "#include uapi/xxx detected"
-
        einfo "Possible unescaped attribute/type usage"
        egrep -r \
                -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \
                -e '\<([us](8|16|32|64))\>' \
                .
 
-       einfo "Missing linux/types.h include"
-       egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L 
linux/types.h
-
        emake ARCH=$(tc-arch-kernel) headers_check
 }

Reply via email to