Move policycoreutils/restorecond to restorecond.

Signed-off-by: Stephen Smalley <[email protected]>
SELinuxProject · Nov 16, 2016 · 00be136 · 00be136
1 parent 4cc8086
commit 00be136
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ cscope.*
 .*.swp
 # Failsafes
 !.gitignore
+restorecond/restorecond
diff --git a/Makefile b/Makefile
@@ -2,6 +2,12 @@ SUBDIRS=libsepol libselinux libsemanage sepolgen checkpolicy secilc policycoreut
 PYSUBDIRS=libselinux libsemanage
 DISTCLEANSUBDIRS=libselinux libsemanage
 
+INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
+
+ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
+	SUBDIRS += restorecond
+endif
+
 ifeq ($(DEBUG),1)
 	export CFLAGS = -g3 -O0 -gdwarf-2 -fno-strict-aliasing -Wall -Wshadow -Werror
 	export LDFLAGS = -g

diff --git a/policycoreutils/.gitignore b/policycoreutils/.gitignore
@@ -1,6 +1,5 @@
 load_policy/load_policy
 newrole/newrole
-restorecond/restorecond
 run_init/open_init_pty
 run_init/run_init
 secon/secon

diff --git a/policycoreutils/Makefile b/policycoreutils/Makefile
@@ -1,11 +1,5 @@
 SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man hll
 
-INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
-
-ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
-	SUBDIRS += restorecond
-endif
-
 all install relabel clean indent:
 	@for subdir in $(SUBDIRS); do \
 		(cd $$subdir && $(MAKE) $@) || exit 1; \

diff --git a/policycoreutils/restorecond/Makefile → restorecond/Makefile b/policycoreutils/restorecond/Makefile → restorecond/Makefile
@@ -16,8 +16,10 @@ SELINUXDIR = $(DESTDIR)/etc/selinux
 DBUSFLAGS = -DHAVE_DBUS $(shell $(PKG_CONFIG) --cflags dbus-glib-1)
 DBUSLIB = $(shell $(PKG_CONFIG) --libs dbus-glib-1)
 
+SETFILESDIR ?= ../policycoreutils/setfiles
+
 CFLAGS ?= -g -Werror -Wall -W
-override CFLAGS += -I$(PREFIX)/include $(DBUSFLAGS)
+override CFLAGS += -I$(PREFIX)/include $(DBUSFLAGS) -I$(SETFILESDIR)
 
 USE_PCRE2 ?= n
 ifeq ($(USE_PCRE2),y)
@@ -32,7 +34,7 @@ all: restorecond
 
 restorecond.o utmpwatcher.o stringslist.o user.o watch.o: restorecond.h
 
-restorecond:  ../setfiles/restore.o restorecond.o utmpwatcher.o stringslist.o user.o watch.o
+restorecond:  $(SETFILESDIR)/restore.o restorecond.o utmpwatcher.o stringslist.o user.o watch.o
 	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 install: all

diff --git a/...storecond/org.selinux.Restorecond.service → restorecond/org.selinux.Restorecond.service b/...storecond/org.selinux.Restorecond.service → restorecond/org.selinux.Restorecond.service
diff --git a/policycoreutils/restorecond/restorecond.8 → restorecond/restorecond.8 b/policycoreutils/restorecond/restorecond.8 → restorecond/restorecond.8
diff --git a/policycoreutils/restorecond/restorecond.c → restorecond/restorecond.c b/policycoreutils/restorecond/restorecond.c → restorecond/restorecond.c
@@ -55,7 +55,7 @@
 #include <signal.h>
 #include <string.h>
 #include <unistd.h>
-#include "../setfiles/restore.h"
+#include "restore.h"
 #include <sys/types.h>
 #include <syslog.h>
 #include <limits.h>

diff --git a/policycoreutils/restorecond/restorecond.conf → restorecond/restorecond.conf b/policycoreutils/restorecond/restorecond.conf → restorecond/restorecond.conf
diff --git a/...coreutils/restorecond/restorecond.desktop → restorecond/restorecond.desktop b/...coreutils/restorecond/restorecond.desktop → restorecond/restorecond.desktop
diff --git a/policycoreutils/restorecond/restorecond.h → restorecond/restorecond.h b/policycoreutils/restorecond/restorecond.h → restorecond/restorecond.h
diff --git a/policycoreutils/restorecond/restorecond.init → restorecond/restorecond.init b/policycoreutils/restorecond/restorecond.init → restorecond/restorecond.init
diff --git a/...coreutils/restorecond/restorecond.service → restorecond/restorecond.service b/...coreutils/restorecond/restorecond.service → restorecond/restorecond.service
diff --git a/...reutils/restorecond/restorecond_user.conf → restorecond/restorecond_user.conf b/...reutils/restorecond/restorecond_user.conf → restorecond/restorecond_user.conf
diff --git a/policycoreutils/restorecond/stringslist.c → restorecond/stringslist.c b/policycoreutils/restorecond/stringslist.c → restorecond/stringslist.c
diff --git a/policycoreutils/restorecond/stringslist.h → restorecond/stringslist.h b/policycoreutils/restorecond/stringslist.h → restorecond/stringslist.h
diff --git a/policycoreutils/restorecond/user.c → restorecond/user.c b/policycoreutils/restorecond/user.c → restorecond/user.c
diff --git a/policycoreutils/restorecond/utmpwatcher.c → restorecond/utmpwatcher.c b/policycoreutils/restorecond/utmpwatcher.c → restorecond/utmpwatcher.c
diff --git a/policycoreutils/restorecond/utmpwatcher.h → restorecond/utmpwatcher.h b/policycoreutils/restorecond/utmpwatcher.h → restorecond/utmpwatcher.h
diff --git a/policycoreutils/restorecond/watch.c → restorecond/watch.c b/policycoreutils/restorecond/watch.c → restorecond/watch.c