libselinux: drop DISABLE_AVC=y

Remove build config DISABLE_AVC, it is unused and broken.

Signed-off-by: William Roberts <william.c.roberts@intel.com>
This commit is contained in:
William Roberts 2016-09-28 11:26:08 -04:00 committed by Stephen Smalley
parent b8bb9a104b
commit 42ab513703
4 changed files with 1 additions and 18 deletions

View File

@ -1,12 +1,8 @@
SUBDIRS = src include utils man
DISABLE_AVC ?= n
DISABLE_SETRANS ?= n
DISABLE_RPM ?= n
DISABLE_BOOL ?= n
ifeq ($(DISABLE_AVC),y)
EMFLAGS+= -DDISABLE_AVC
endif
ifeq ($(DISABLE_BOOL),y)
EMFLAGS+= -DDISABLE_BOOL
endif
@ -16,7 +12,7 @@ endif
ifeq ($(DISABLE_SETRANS),y)
EMFLAGS+= -DDISABLE_SETRANS
endif
export DISABLE_AVC DISABLE_SETRANS DISABLE_RPM DISABLE_BOOL EMFLAGS
export DISABLE_SETRANS DISABLE_RPM DISABLE_BOOL EMFLAGS
USE_PCRE2 ?= n
ifeq ($(USE_PCRE2),y)

View File

@ -41,9 +41,6 @@ LIBSO=$(TARGET).$(LIBVERSION)
AUDIT2WHYLOBJ=$(PYPREFIX)audit2why.lo
AUDIT2WHYSO=$(PYPREFIX)audit2why.so
ifeq ($(DISABLE_AVC),y)
UNUSED_SRCS+=avc.c avc_internal.c avc_sidtab.c mapping.c stringrep.c checkAccess.c
endif
ifeq ($(DISABLE_BOOL),y)
UNUSED_SRCS+=booleans.c
endif

View File

@ -31,11 +31,4 @@ map_perm(security_class_t tclass, access_vector_t kperm);
extern void
map_decision(security_class_t tclass, struct av_decision *avd);
/*mapping is not used for embedded build*/
#ifdef DISABLE_AVC
#define unmap_perm(x,y) y
#define unmap_class(x) x
#define map_decision(x,y)
#endif
#endif /* _SELINUX_MAPPING_H_ */

View File

@ -36,9 +36,6 @@ sefcontext_compile: sefcontext_compile.o ../src/regex.o
selinux_restorecon: LDLIBS += -lsepol
ifeq ($(DISABLE_AVC),y)
UNUSED_TARGETS+=compute_av compute_create compute_member compute_relabel
endif
ifeq ($(DISABLE_BOOL),y)
UNUSED_TARGETS+=getsebool togglesebool
endif