diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2020-10-11 03:18:28 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2020-10-16 00:38:06 +0100 |
| commit | 1923669413b4aa8502ded20953dbf0f7ed647f5e (patch) | |
| tree | d9e8a8f004cdcc2f7169a01930f5ce011193b987 /package/utils/policycoreutils | |
| parent | 63e2e086bea2280fee47385e172d09e4eb86fc78 (diff) | |
| download | upstream-1923669413b4aa8502ded20953dbf0f7ed647f5e.tar.gz upstream-1923669413b4aa8502ded20953dbf0f7ed647f5e.tar.bz2 upstream-1923669413b4aa8502ded20953dbf0f7ed647f5e.zip | |
policycoreutils: 'restorecon' is a 'setfiles' applet
Instead of duplicating the '/sbin/setfiles' binary, have
'/sbin/restorecon' as yet another alias for
'/sbin/policycoreutils-setfiles'.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/utils/policycoreutils')
| -rw-r--r-- | package/utils/policycoreutils/Makefile | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/package/utils/policycoreutils/Makefile b/package/utils/policycoreutils/Makefile index 6abb64f102..ec55a3d8ee 100644 --- a/package/utils/policycoreutils/Makefile +++ b/package/utils/policycoreutils/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=policycoreutils PKG_VERSION:=3.1 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/20200710 @@ -25,10 +25,6 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/host-build.mk -DIR_SBIN:= \ - restorecon \ - setfiles - DIR_USR_BIN:= \ newrole \ secon @@ -43,7 +39,6 @@ LIBEXEC_UTILS := \ SBIN_UTILS:= \ restorecon_xattr \ - restorecon \ setfiles USR_BIN_UTILS:= \ @@ -76,6 +71,7 @@ HOST_LDFLAGS += -Wl,-rpath=$(STAGING_DIR_HOSTPKG)/lib $(eval $(foreach a,$(DIR_SBIN),ALTS_$(a):=300:/sbin/$(a):/sbin/policycoreutils-$(a)$(newline))) $(eval $(foreach a,$(DIR_USR_BIN),ALTS_$(a):=300:/usr/bin/$(a):/usr/bin/policycoreutils-$(a)$(newline))) $(eval $(foreach a,$(DIR_USR_SBIN),ALTS_$(a):=300:/usr/sbin/$(a):/usr/sbin/policycoreutils-$(a)$(newline))) +ALTS_setfiles:=300:/sbin/restorecon:/sbin/policycoreutils-setfiles 300:/sbin/setfiles:/sbin/policycoreutils-setfiles DEPENDS_genhomedircon:=+libsemanage $(INTL_DEPENDS) DEPENDS_load_policy:=+libselinux $(INTL_DEPENDS) @@ -83,7 +79,6 @@ DEPENDS_newrole:=+libselinux +libaudit +BUSYBOX_CONFIG_PAM:libpam $(INTL_DEPENDS DEPENDS_open_init_pty:=$(INTL_DEPENDS) DEPENDS_pp:=+libsepol $(INTL_DEPENDS) DEPENDS_restorecon_xattr:=+libselinux +libsepol +libaudit $(INTL_DEPENDS) -DEPENDS_restorecon:=+libselinux +libsepol +libaudit $(INTL_DEPENDS) DEPENDS_run_init:=+libselinux +libaudit +BUSYBOX_CONFIG_PAM:libpam $(INTL_DEPENDS) DEPENDS_secon:=+libselinux $(INTL_DEPENDS) DEPENDS_semanage:=+libsemanage |