package/libsepol: change policy version to an int

The policy version has to be a number, as such, set the type to int.

Due to the type change, we can't any longer do the legacy handling of
re-using the refpolicy policy version.

Signed-off-by: Adam Duskett <aduskett@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Adam Duskett 2020-02-03 05:29:50 -08:00 committed by Thomas Petazzoni
parent 10e19b7532
commit 45bd1e73a9
2 changed files with 3 additions and 5 deletions

View File

@ -10,9 +10,8 @@ config BR2_PACKAGE_LIBSEPOL
if BR2_PACKAGE_LIBSEPOL
config BR2_PACKAGE_LIBSEPOL_POLICY_VERSION
string "Policy version"
default BR2_PACKAGE_REFPOLICY_POLICY_VERSION if BR2_PACKAGE_REFPOLICY_POLICY_VERSION != ""
default "30"
int "Policy version"
default 30
endif

View File

@ -25,8 +25,7 @@ REFPOLICY_MAKE = \
$(TARGET_MAKE_ENV) \
$(MAKE1)
REFPOLICY_POLICY_VERSION = \
$(call qstrip,$(BR2_PACKAGE_LIBSEPOL_POLICY_VERSION))
REFPOLICY_POLICY_VERSION = $(BR2_PACKAGE_LIBSEPOL_POLICY_VERSION)
REFPOLICY_POLICY_STATE = \
$(call qstrip,$(BR2_PACKAGE_REFPOLICY_POLICY_STATE))