mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-15 19:55:32 +00:00
c30743e2cc
commit42c4e97e06upstream. The Linux Kernel currently only requires make v3.82 while the grouped target functionality requires make v4.3. Removed the grouped target introduced in4ce1f694eb("selinux: ensure av_permissions.h is built when needed") as well as the multiple header file targets in the make rule. This effectively reverts the problem commit. We will revisit this change when make >= 4.3 is required by the rest of the kernel. Cc: stable@vger.kernel.org Fixes:4ce1f694eb("selinux: ensure av_permissions.h is built when needed") Reported-by: Erwan Velu <e.velu@criteo.com> Reported-by: Luiz Capitulino <luizcap@amazon.com> Tested-by: Luiz Capitulino <luizcap@amazon.com> Signed-off-by: Paul Moore <paul@paul-moore.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
34 lines
1.2 KiB
Makefile
34 lines
1.2 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# Makefile for building the SELinux module as part of the kernel tree.
|
|
#
|
|
|
|
obj-$(CONFIG_SECURITY_SELINUX) := selinux.o
|
|
|
|
selinux-y := avc.o hooks.o selinuxfs.o netlink.o nlmsgtab.o netif.o \
|
|
netnode.o netport.o status.o \
|
|
ss/ebitmap.o ss/hashtab.o ss/symtab.o ss/sidtab.o ss/avtab.o \
|
|
ss/policydb.o ss/services.o ss/conditional.o ss/mls.o ss/context.o
|
|
|
|
selinux-$(CONFIG_SECURITY_NETWORK_XFRM) += xfrm.o
|
|
|
|
selinux-$(CONFIG_NETLABEL) += netlabel.o
|
|
|
|
selinux-$(CONFIG_SECURITY_INFINIBAND) += ibpkey.o
|
|
|
|
selinux-$(CONFIG_IMA) += ima.o
|
|
|
|
ccflags-y := -I$(srctree)/security/selinux -I$(srctree)/security/selinux/include
|
|
|
|
$(addprefix $(obj)/,$(selinux-y)): $(obj)/flask.h
|
|
|
|
quiet_cmd_flask = GEN $(obj)/flask.h $(obj)/av_permissions.h
|
|
cmd_flask = $< $(obj)/flask.h $(obj)/av_permissions.h
|
|
|
|
targets += flask.h av_permissions.h
|
|
# once make >= 4.3 is required, we can use grouped targets in the rule below,
|
|
# which basically involves adding both headers and a '&' before the colon, see
|
|
# the example below:
|
|
# $(obj)/flask.h $(obj)/av_permissions.h &: scripts/selinux/...
|
|
$(obj)/flask.h: scripts/selinux/genheaders/genheaders FORCE
|
|
$(call if_changed,flask)
|