All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 21/22] package/libselinux: bear the kernel options munging
Date: Sat,  4 Apr 2020 14:10:33 +0200	[thread overview]
Message-ID: <2e26e65ead8f1fa43ada0c792b54b04d67606f18.1586002215.git.yann.morin.1998@free.fr> (raw)
In-Reply-To: <cover.1586002215.git.yann.morin.1998@free.fr>

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Adam Duskett <aduskett@gmail.com>
Cc: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
Cc: Matt Weber <matthew.weber@rockwellcollins.com>
Cc: Marcus Folkesson <marcus.folkesson@gmail.com>
---
 linux/linux.mk                   |  8 --------
 package/libselinux/libselinux.mk | 10 ++++++++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index b9e2058e29..3762e718c6 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -363,14 +363,6 @@ define LINUX_KCONFIG_FIXUP_CMDS
 		$(call KCONFIG_ENABLE_OPT,CONFIG_FB)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_LOGO)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_LOGO_LINUX_CLUT224))
-	$(if $(BR2_PACKAGE_LIBSELINUX),
-		$(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT)
-		$(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_SECURITY_SELINUX)
-		$(call KCONFIG_ENABLE_OPT,CONFIG_INET)
-		$(call KCONFIG_ENABLE_OPT,CONFIG_NET)
-		$(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY)
-		$(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_NETWORK)
-		$(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SELINUX))
 	$(PACKAGES_LINUX_CONFIG_FIXUPS)
 endef
 
diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk
index 1461e34539..5f07236791 100644
--- a/package/libselinux/libselinux.mk
+++ b/package/libselinux/libselinux.mk
@@ -116,5 +116,15 @@ define HOST_LIBSELINUX_INSTALL_CMDS
 		$(HOST_LIBSELINUX_MAKE_OPTS) install-pywrap
 endef
 
+define LIBSELINUX_LINUX_CONFIG_FIXUPS
+	$(call KCONFIG_ENABLE_OPT,CONFIG_AUDIT)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_DEFAULT_SECURITY_SELINUX)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_INET)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_NET)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_NETWORK)
+	$(call KCONFIG_ENABLE_OPT,CONFIG_SECURITY_SELINUX)
+endef
+
 $(eval $(generic-package))
 $(eval $(host-generic-package))
-- 
2.20.1

  parent reply	other threads:[~2020-04-04 12:10 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-04 12:10 [Buildroot] [PATCH 00/22] linux: allow packages to set kconfig options (branch yem/pkg-linux-opts) Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 01/22] core/pkg-utils: rationalise kconfig option mangling Yann E. MORIN
2020-08-30  7:54   ` Peter Korsgaard
2020-04-04 12:10 ` [Buildroot] [PATCH 02/22] core/pkg-utils: kconfig mangling defaults to current package's .config Yann E. MORIN
2020-05-01 13:55   ` Thomas Petazzoni
2020-08-30  7:54   ` Peter Korsgaard
2020-04-04 12:10 ` [Buildroot] [PATCH 03/22] boot/barebox: don't specify .config to munge Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 04/22] boot/uboot: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 05/22] boot/busybox: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 06/22] boot/swupdate: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 07/22] boot/uclibc: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 08/22] linux: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 09/22] linux: allow packages to set options Yann E. MORIN
2020-05-01 13:56   ` Thomas Petazzoni
2020-04-04 12:10 ` [Buildroot] [PATCH 10/22] package/audit: bear the kernel options munging Yann E. MORIN
2020-04-06 12:10   ` Matthew Weber
2020-04-04 12:10 ` [Buildroot] [PATCH 11/22] package/intel-micro-code: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 12/22] package/ktap: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 13/22] package/pcm-tools: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 14/22] package/linux-tools/perf: " Yann E. MORIN
2020-05-01 13:57   ` Thomas Petazzoni
2020-04-04 12:10 ` [Buildroot] [PATCH 15/22] package/systemd: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 16/22] package/smack: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 17/22] package/sunxi-mali-mainline-driver: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 18/22] package/iptables: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 19/22] package/xtables-addons: " Yann E. MORIN
2020-04-04 12:10 ` [Buildroot] [PATCH 20/22] package/wireguard-linux-compat: " Yann E. MORIN
2020-04-04 12:10 ` Yann E. MORIN [this message]
2020-04-06 12:08   ` [Buildroot] [PATCH 21/22] package/libselinux: " Matthew Weber
2020-04-19 18:14     ` Adam Duskett
2020-04-04 12:10 ` [Buildroot] [PATCH 22/22] package/kernel-module-imx-gpu-viv: " Yann E. MORIN
2020-05-01 13:54 ` [Buildroot] [PATCH 00/22] linux: allow packages to set kconfig options (branch yem/pkg-linux-opts) Thomas Petazzoni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=2e26e65ead8f1fa43ada0c792b54b04d67606f18.1586002215.git.yann.morin.1998@free.fr \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.