OpenWrt
/
openwrt
mirror of https://github.com/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

target: include selinux-variants if CONFIG_SELINUX is set 

Rather than unconditionally adding busybox and procd to the set of
default packages, add busybox-selinux and procd-selinux in case
CONFIG_SELINUX is set.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2020-10-19 16:55:39 +01:00
parent 610843f3bc
commit d355b578b7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/target.mk
View File

@ -15,7 +15,6 @@ DEVICE_TYPE?=router
# Default packages - the really basic set # Default packages - the really basic set
DEFAULT_PACKAGES:=\ DEFAULT_PACKAGES:=\
base-files \ base-files \
busybox \
ca-bundle \ ca-bundle \
dropbear \ dropbear \
fstools \ fstools \
@ -30,6 +29,13 @@ DEFAULT_PACKAGES:=\
uclient-fetch \ uclient-fetch \
urandom-seed \ urandom-seed \
urngd urngd
ifneq ($(CONFIG_SELINUX),)
DEFAULT_PACKAGES+=busybox-selinux procd-selinux
else
DEFAULT_PACKAGES+=busybox procd
endif
# For the basic set # For the basic set
DEFAULT_PACKAGES.basic:= DEFAULT_PACKAGES.basic:=
# For nas targets # For nas targets

2
package/base-files/Makefile
View File

@ -37,7 +37,7 @@ endif
define Package/base-files define Package/base-files
SECTION:=base SECTION:=base
CATEGORY:=Base system CATEGORY:=Base system
DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:openwrt-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool DEPENDS:=+netifd +libc +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:openwrt-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
TITLE:=Base filesystem for OpenWrt TITLE:=Base filesystem for OpenWrt
URL:=http://openwrt.org/ URL:=http://openwrt.org/
VERSION:=$(PKG_RELEASE)-$(REVISION) VERSION:=$(PKG_RELEASE)-$(REVISION)