selinux: fix Makefile for versions of make < v4.3
Paul Moore
maintainerPATCH 1/1 selinux: fix Makefile for versions of make < v4.3
As noted in the comments of this commit, the current SELinux Makefile requires features found in make v4.3 or later, which is problematic as the Linux Kernel currently only requires make v3.82. This patch fixes the SELinux Makefile so that it works properly on these older versions of make, and adds a couple of comments to the Makefile about how it can be improved once make v4.3 is required by the kernel.
--- security/selinux/Makefile | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
security/selinux/Makefile +14 -3
@@ -3,6 +3,11 @@ # Makefile for building the SELinux module as part of the kernel tree. # +# NOTE: There are a number of improvements that can be made to this Makefile +# once the kernel requires make v4.3 or greater; the most important feature +# lacking in older versions of make is support for grouped targets. These +# improvements are noted inline in the Makefile below ... + obj-$(CONFIG_SECURITY_SELINUX) := selinux.o ccflags-y := -I$(srctree)/security/selinux -I$(srctree)/security/selinux/include
@@ -19,11 +24,17 @@ selinux-$(CONFIG_IMA) += ima.o genhdrs := flask.h av_permissions.h -$(addprefix $(obj)/,$(selinux-y)): $(addprefix $(obj)/,$(genhdrs)) +# see the note above, replace the dependency rule with the one below: +# $(addprefix $(obj)/,$(selinux-y)): $(addprefix $(obj)/,$(genhdrs)) +$(addprefix $(obj)/,$(selinux-y)): $(obj)/flask.h quiet_cmd_genhdrs = GEN $(addprefix $(obj)/,$(genhdrs)) cmd_genhdrs = $< $(addprefix $(obj)/,$(genhdrs)) -targets += $(genhdrs) -$(addprefix $(obj)/,$(genhdrs)) &: scripts/selinux/genheaders/genheaders FORCE +# see the note above, replace the $targets and $genhdrs dependency rule with +# the lines below: +# targets += $(genhdrs) +# $(addprefix $(obj)/,$(genhdrs)) &: scripts/selinux/... +targets += flask.h +$(obj)/flask.h: scripts/selinux/genheaders/genheaders FORCE $(call if_changed,genhdrs)
Signature · 1 line
2.40.1
Paul Moore
maintainerQuoted 36 lines · Paul Moore
As noted in the comments of this commit, the current SELinux
Makefilerequires features found in make v4.3 or later, which is problematic as the Linux Kernel currently only requires make v3.82. This patch fixes the SELinuxMakefileso that it works properly on these older versions of make, and adds a couple of comments to theMakefileabout how it can be improved once make v4.3 is required by the kernel.Fixes 6f933aa7dfd0 ("selinux: more Makefile tweaks")Signed-off-by Paul Moore <[email protected]>--- security/selinux/Makefile | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)security/selinux/Makefile +6
-1@@ -3,6 +3,11 @@ # Makefile for building the SELinux module as part of the kernel tree. # +# NOTE: There are a number of improvements that can be made to this Makefile +# once the kernel requires make v4.3 or greater; the most important feature +# lacking in older versions of make is support for grouped targets. These +# improvements are noted inline in the Makefile below ... + obj-$(CONFIG_SECURITY_SELINUX) := selinux.o ccflags-y := -I$(srctree)/security/selinux -I$(srctree)/security/selinux/include@@ -19,11 +24,17 @@ selinux-$(CONFIG_IMA) += ima.o genhdrs := flask.h av_permissions.h -$(addprefix $(obj)/,$(selinux-y)): $(addprefix $(obj)/,$(genhdrs)) +# see the note above, replace the dependency rule with the one below:
security/selinux/Makefile selinux-$(CONFIG_IMA) += ima.o · line 35
Quoted 10 lines
security/selinux/Makefile +4
-2+# $(addprefix $(obj)/,$(selinux-y)): $(addprefix $(obj)/,$(genhdrs)) +$(addprefix $(obj)/,$(selinux-y)): $(obj)/flask.h quiet_cmd_genhdrs = GEN $(addprefix $(obj)/,$(genhdrs)) cmd_genhdrs = $< $(addprefix $(obj)/,$(genhdrs)) -targets += $(genhdrs) -$(addprefix $(obj)/,$(genhdrs)) &: scripts/selinux/genheaders/genheaders FORCE +# see the note above, replace the $targets and $genhdrs dependency rule with +# the lines below:
My apologies, I didn't fully refresh my patch before sending it out so there is a slight difference in the comments, below is what I currently have in my working branch:
-# see the note above, replace the $targets and $genhdrs dependency rule with -# the lines below:
+# see the note above, replace the $targets and 'flask.h' rule with the lines +# below:
Signature · 1 line
paul-moore.com
Quoted 43 lines · Paul Moore
Quoted 42 lines · Paul Moore
As noted in the comments of this commit, the current SELinux
Makefilerequires features found in make v4.3 or later, which is problematic as the Linux Kernel currently only requires make v3.82. This patch fixes the SELinuxMakefileso that it works properly on these older versions of make, and adds a couple of comments to theMakefileabout how it can be improved once make v4.3 is required by the kernel.Fixes 6f933aa7dfd0 ("selinux: more Makefile tweaks")Signed-off-by Paul Moore <[email protected]>--- security/selinux/Makefile | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)security/selinux/Makefile +8
-1@@ -3,6 +3,11 @@ # Makefile for building the SELinux module as part of the kernel tree. # +# NOTE: There are a number of improvements that can be made to this Makefile +# once the kernel requires make v4.3 or greater; the most important feature +# lacking in older versions of make is support for grouped targets. These +# improvements are noted inline in the Makefile below ... + obj-$(CONFIG_SECURITY_SELINUX) := selinux.o ccflags-y := -I$(srctree)/security/selinux -I$(srctree)/security/selinux/include@@ -19,11 +24,17 @@ selinux-$(CONFIG_IMA) += ima.o genhdrs := flask.h av_permissions.h -$(addprefix $(obj)/,$(selinux-y)): $(addprefix $(obj)/,$(genhdrs)) +# see the note above, replace the dependency rule with the one below: +# $(addprefix $(obj)/,$(selinux-y)): $(addprefix $(obj)/,$(genhdrs)) +$(addprefix $(obj)/,$(selinux-y)): $(obj)/flask.h quiet_cmd_genhdrs = GEN $(addprefix $(obj)/,$(genhdrs)) cmd_genhdrs = $< $(addprefix $(obj)/,$(genhdrs))
Quoted 8 lines
security/selinux/Makefile selinux-$(CONFIG_IMA) += ima.o · line 35
Quoted 4 lines
security/selinux/Makefile +2
-2-targets += $(genhdrs) -$(addprefix $(obj)/,$(genhdrs)) &: scripts/selinux/genheaders/genheaders FORCE +# see the note above, replace the $targets and $genhdrs dependency rule with +# the lines below:My apologies, I didn't fully refresh my patch before sending it out so there is a slight difference in the comments, below is what I currently have in my working branch:
Merged into selinux/next.
Quoted 4 lines
(quoted diff) +2
-2-# see the note above, replace the $targets and $genhdrs dependency rule with -# the lines below: +# see the note above, replace the $targets and 'flask.h' rule with the lines +# below:
Signature · 1 line
paul-moore.com