|
 |
c2f6120 |
From f870bd1ea6847840f1878490e090ef96ed708ac4 Mon Sep 17 00:00:00 2001
|
|
|
c2f6120 |
From: =?UTF-8?q?Bj=C3=B6rn=20Bidar?= <bjorn.bidar@jolla.com>
|
|
|
c2f6120 |
Date: Mon, 12 Oct 2020 19:07:22 +0300
|
|
|
c2f6120 |
Subject: [PATCH] libselinux: LABEL_BACKEND_ANDROID add option to enable
|
|
|
c2f6120 |
MIME-Version: 1.0
|
|
|
c2f6120 |
Content-Type: text/plain; charset=UTF-8
|
|
|
c2f6120 |
Content-Transfer-Encoding: 8bit
|
|
|
c2f6120 |
|
|
|
c2f6120 |
Add option to just enable the android label backend without disabling
|
|
|
c2f6120 |
anything else eg. using ANDROID_HOST. Enable by default when using ANDROID_HOST.
|
|
|
c2f6120 |
|
|
|
c2f6120 |
Signed-off-by: Björn Bidar <bjorn.bidar@jolla.com>
|
|
|
c2f6120 |
---
|
|
|
c2f6120 |
libselinux/Makefile | 3 ++-
|
|
|
c2f6120 |
libselinux/src/Makefile | 6 +++++-
|
|
|
c2f6120 |
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
c2f6120 |
|
|
|
c2f6120 |
diff --git a/libselinux/Makefile b/libselinux/Makefile
|
|
|
c2f6120 |
index cb5872b7b090..ac16c15e8d0a 100644
|
|
|
c2f6120 |
--- a/libselinux/Makefile
|
|
|
c2f6120 |
+++ b/libselinux/Makefile
|
|
|
c2f6120 |
@@ -4,6 +4,7 @@ PKG_CONFIG ?= pkg-config
|
|
|
c2f6120 |
DISABLE_SETRANS ?= n
|
|
|
c2f6120 |
DISABLE_RPM ?= n
|
|
|
c2f6120 |
ANDROID_HOST ?= n
|
|
|
c2f6120 |
+LABEL_BACKEND_ANDROID ?= n
|
|
|
c2f6120 |
ifeq ($(ANDROID_HOST),y)
|
|
|
c2f6120 |
override DISABLE_SETRANS=y
|
|
|
c2f6120 |
override DISABLE_BOOL=y
|
|
|
c2f6120 |
@@ -20,7 +21,7 @@ endif
|
|
|
c2f6120 |
ifeq ($(DISABLE_X11),y)
|
|
|
c2f6120 |
DISABLE_FLAGS+= -DNO_X_BACKEND
|
|
|
c2f6120 |
endif
|
|
|
c2f6120 |
-export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST DISABLE_X11
|
|
|
c2f6120 |
+export DISABLE_SETRANS DISABLE_RPM DISABLE_FLAGS ANDROID_HOST DISABLE_X11 LABEL_BACKEND_ANDROID
|
|
|
c2f6120 |
|
|
|
c2f6120 |
USE_PCRE2 ?= n
|
|
|
c2f6120 |
ifeq ($(USE_PCRE2),y)
|
|
|
c2f6120 |
diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile
|
|
|
c2f6120 |
index be0b6eec6f6d..52c40f018f51 100644
|
|
|
c2f6120 |
--- a/libselinux/src/Makefile
|
|
|
c2f6120 |
+++ b/libselinux/src/Makefile
|
|
|
c2f6120 |
@@ -122,8 +122,12 @@ SRCS= callbacks.c freecon.c label.c label_file.c \
|
|
|
c2f6120 |
label_backends_android.c regex.c label_support.c \
|
|
|
c2f6120 |
matchpathcon.c setrans_client.c sha1.c booleans.c
|
|
|
c2f6120 |
else
|
|
|
c2f6120 |
-DISABLE_FLAGS+= -DNO_ANDROID_BACKEND
|
|
|
c2f6120 |
+LABEL_BACKEND_ANDROID=y
|
|
|
c2f6120 |
+endif
|
|
|
c2f6120 |
+
|
|
|
c2f6120 |
+ifneq ($(LABEL_BACKEND_ANDROIDT),y)
|
|
|
c2f6120 |
SRCS:= $(filter-out label_backends_android.c, $(SRCS))
|
|
|
c2f6120 |
+DISABLE_FLAGS+= -DNO_ANDROID_BACKEND
|
|
|
c2f6120 |
endif
|
|
|
c2f6120 |
|
|
|
c2f6120 |
ifeq ($(DISABLE_X11),y)
|
|
|
c2f6120 |
--
|
|
|
c2f6120 |
2.29.2
|
|
|
c2f6120 |
|