p/android-4.14 - require CONFIG_NETFILTER_XT_MATCH_OWNER=y instead of QTAGUID am: 0a47f23798
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2290640 Change-Id: I3ec211d115453abe02e099c07d0049f0d3d480e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
9a0748553b
2 changed files with 3 additions and 30 deletions
|
@ -1,31 +1 @@
|
|||
<kernel minlts="4.14.42" />
|
||||
|
||||
<!-- CONFIG_NETFILTER_XT_MATCH_QTAGUID || (CONFIG_NETFILTER_XT_MATCH_OWNER && BPF) -->
|
||||
<group>
|
||||
<conditions>
|
||||
<config>
|
||||
<key>CONFIG_NETFILTER_XT_MATCH_QTAGUID</key>
|
||||
<value type="bool">n</value>
|
||||
</config>
|
||||
</conditions>
|
||||
<config>
|
||||
<key>CONFIG_NETFILTER_XT_MATCH_OWNER</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
<config>
|
||||
<key>CONFIG_NET_CLS_BPF</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
</group>
|
||||
<group>
|
||||
<conditions>
|
||||
<config>
|
||||
<key>CONFIG_NETFILTER_XT_MATCH_OWNER</key>
|
||||
<value type="bool">n</value>
|
||||
</config>
|
||||
</conditions>
|
||||
<config>
|
||||
<key>CONFIG_NETFILTER_XT_MATCH_QTAGUID</key>
|
||||
<value type="bool">y</value>
|
||||
</config>
|
||||
</group>
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
# CONFIG_DEVKMEM is not set
|
||||
# CONFIG_DEVMEM is not set
|
||||
# CONFIG_FHANDLE is not set
|
||||
# CONFIG_NETFILTER_XT_MATCH_QTAGUID is not set
|
||||
# CONFIG_NFSD is not set
|
||||
# CONFIG_NFS_FS is not set
|
||||
# CONFIG_SYSVIPC is not set
|
||||
|
@ -101,6 +102,7 @@ CONFIG_NETFILTER_XT_MATCH_LENGTH=y
|
|||
CONFIG_NETFILTER_XT_MATCH_LIMIT=y
|
||||
CONFIG_NETFILTER_XT_MATCH_MAC=y
|
||||
CONFIG_NETFILTER_XT_MATCH_MARK=y
|
||||
CONFIG_NETFILTER_XT_MATCH_OWNER=y
|
||||
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
|
||||
CONFIG_NETFILTER_XT_MATCH_POLICY=y
|
||||
CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
|
||||
|
@ -123,6 +125,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
|
|||
CONFIG_NETFILTER_XT_TARGET_TPROXY=y
|
||||
CONFIG_NETFILTER_XT_TARGET_TRACE=y
|
||||
CONFIG_NET_CLS_ACT=y
|
||||
CONFIG_NET_CLS_BPF=y
|
||||
CONFIG_NET_CLS_U32=y
|
||||
CONFIG_NET_EMATCH=y
|
||||
CONFIG_NET_EMATCH_U32=y
|
||||
|
|
Loading…
Reference in a new issue