Skip to contentSkip to conversation

libselinux: LABEL_BACKEND_ANDROID add option to enable it

PATCH In review Björn Bidar 2 participants 3 messages Oct 20, 2020 – Oct 31, 2020 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libselinux: LABEL_BACKEND_ANDROID add option to enable it

Add option to just enable the android label backend without disabling anything else.

---
 libselinux/Makefile     | 3 ++-
 libselinux/src/Makefile | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
libselinux/Makefile +2 -1
index 6a43b243..17226758 100644
@@ -4,6 +4,7 @@ PKG_CONFIG ?= pkg-config
 DISABLE_SETRANS ?= n
 DISABLE_RPM ?= n
 ANDROID_HOST ?= n
+LABEL_BACKEND_ANDROID ?= n
 ifeq ($(ANDROID_HOST),y)
 	override DISABLE_SETRANS=y
 	override DISABLE_BOOL=y
@@ -17,7 +18,7 @@ endif
 ifeq ($(DISABLE_BOOL),y)
 	DISABLE_FLAGS+= -DDISABLE_BOOL
 endif
-export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST
+export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST 

LABEL_BACKEND_ANDROID

USE_PCRE2 ?= n
ifeq ($(USE_PCRE2),y)

libselinux/src/Makefile +5 -1
index 190016e2..2f7c0401 100644
@@ -122,8 +122,12 @@ SRCS= callbacks.c freecon.c label.c label_file.c \
 	label_backends_android.c regex.c label_support.c \
 	matchpathcon.c setrans_client.c sha1.c booleans.c
 else
-DISABLE_FLAGS+= -DNO_ANDROID_BACKEND
+LABEL_BACKEND_ANDROID=y
+endif
+
+ifneq ($(LABEL_BACKEND_ANDROIDT),y)
 SRCS:= $(filter-out label_backends_android.c, $(SRCS))
+DISABLE_FLAGS+= -DNO_ANDROID_BACKEND
 endif
 
 SWIGRUBY = swig -Wall -ruby -o $(SWIGRUBYCOUT) -outdir ./ $(DISABLE_FLAGS)
Signature · 1 line
2.28.0
#1 lore raw

Re: [PATCH] libselinux: LABEL_BACKEND_ANDROID add option to enable, rebased

Add option to just enable the android label backend without disabling anything else eg. using ANDROID_HOST. Enable by default when using ANDROID_HOST.

---
 libselinux/Makefile     | 3 ++-
 libselinux/src/Makefile | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
libselinux/Makefile +2 -1
index cb5872b7..ac16c15e 100644
@@ -4,6 +4,7 @@ PKG_CONFIG ?= pkg-config
 DISABLE_SETRANS ?= n
 DISABLE_RPM ?= n
 ANDROID_HOST ?= n
+LABEL_BACKEND_ANDROID ?= n
 ifeq ($(ANDROID_HOST),y)
 	override DISABLE_SETRANS=y
 	override DISABLE_BOOL=y
@@ -20,7 +21,7 @@ endif
 ifeq ($(DISABLE_X11),y)
 	DISABLE_FLAGS+= -DNO_X_BACKEND
 endif
-export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST DISABLE_X11
+export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST DISABLE_X11 

LABEL_BACKEND_ANDROID

USE_PCRE2 ?= n
ifeq ($(USE_PCRE2),y)

libselinux/src/Makefile +5 -1
index be0b6eec..52c40f01 100644
@@ -122,8 +122,12 @@ SRCS= callbacks.c freecon.c label.c label_file.c \
 	label_backends_android.c regex.c label_support.c \
 	matchpathcon.c setrans_client.c sha1.c booleans.c
 else
-DISABLE_FLAGS+= -DNO_ANDROID_BACKEND
+LABEL_BACKEND_ANDROID=y
+endif
+
+ifneq ($(LABEL_BACKEND_ANDROIDT),y)
 SRCS:= $(filter-out label_backends_android.c, $(SRCS))
+DISABLE_FLAGS+= -DNO_ANDROID_BACKEND
 endif
 
 ifeq ($(DISABLE_X11),y)
Signature · 1 line
2.29.1
#2 lore raw

Re: [PATCH] libselinux: LABEL_BACKEND_ANDROID add option to enable, rebased

Quoted 52 lines · Björn Bidar

Add option to just enable the android label backend without disabling anything else eg. using ANDROID_HOST. Enable by default when using ANDROID_HOST.

---
 libselinux/Makefile     | 3 ++-
 libselinux/src/Makefile | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
libselinux/Makefile +2 -1
index cb5872b7..ac16c15e 100644
@@ -4,6 +4,7 @@ PKG_CONFIG ?= pkg-config
 DISABLE_SETRANS ?= n
 DISABLE_RPM ?= n
 ANDROID_HOST ?= n
+LABEL_BACKEND_ANDROID ?= n
 ifeq ($(ANDROID_HOST),y)
        override DISABLE_SETRANS=y
        override DISABLE_BOOL=y
@@ -20,7 +21,7 @@ endif
 ifeq ($(DISABLE_X11),y)
        DISABLE_FLAGS+= -DNO_X_BACKEND
 endif
-export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST DISABLE_X11
+export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST DISABLE_X11

LABEL_BACKEND_ANDROID

USE_PCRE2 ?= n
ifeq ($(USE_PCRE2),y)

libselinux/src/Makefile +5 -2
index be0b6eec..52c40f01 100644
@@ -122,8 +122,12 @@ SRCS= callbacks.c freecon.c label.c label_file.c \
        label_backends_android.c regex.c label_support.c \
        matchpathcon.c setrans_client.c sha1.c booleans.c
 else
-DISABLE_FLAGS+= -DNO_ANDROID_BACKEND
+LABEL_BACKEND_ANDROID=y
+endif
+
+ifneq ($(LABEL_BACKEND_ANDROIDT),y)
 SRCS:= $(filter-out label_backends_android.c, $(SRCS))
+DISABLE_FLAGS+= -DNO_ANDROID_BACKEND
 endif
 
 ifeq ($(DISABLE_X11),y)
--
Quoted 2 lines

2.29.1

Why would I want this, is there a specific use case for this one?