Commit 1419c3ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'selinux-pr-20230601' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux 

Pull selinux fix from Paul Moore:
 "A small SELinux Makefile fix to resolve a problem seen when building
  the kernel with older versions of make.

  The fix is pretty trivial and effectively reverts a patch that was
  merged during the last merge window"

* tag 'selinux-pr-20230601' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: don't use make's grouped targets feature yet
parents c43a6ff9 42c4e97e

security/selinux/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -26,5 +26,9 @@ 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

$(obj)/flask.h $(obj)/av_permissions.h &: scripts/selinux/genheaders/genheaders FORCE

# 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)