From c9c97d6e8bace621b8d91c1f5fb1e321f8d4c326 Mon Sep 17 00:00:00 2001 From: Stephen Smalley Date: Mon, 31 Oct 2016 13:33:52 -0400 Subject: [PATCH] Move policycoreutils/semodule_{deps,expand,link} to semodule-utils. Signed-off-by: Stephen Smalley --- Makefile | 2 +- policycoreutils/.gitignore | 3 --- policycoreutils/Makefile | 2 +- semodule-utils/.gitignore | 3 +++ semodule-utils/Makefile | 8 ++++++++ .../semodule_deps/Makefile | 0 .../semodule_deps/semodule_deps.8 | 0 .../semodule_deps/semodule_deps.c | 0 .../semodule_expand/Makefile | 0 .../semodule_expand/semodule_expand.8 | 0 .../semodule_expand/semodule_expand.c | 0 .../semodule_link/Makefile | 0 .../semodule_link/semodule_link.8 | 0 .../semodule_link/semodule_link.c | 0 14 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 semodule-utils/.gitignore create mode 100644 semodule-utils/Makefile rename {policycoreutils => semodule-utils}/semodule_deps/Makefile (100%) rename {policycoreutils => semodule-utils}/semodule_deps/semodule_deps.8 (100%) rename {policycoreutils => semodule-utils}/semodule_deps/semodule_deps.c (100%) rename {policycoreutils => semodule-utils}/semodule_expand/Makefile (100%) rename {policycoreutils => semodule-utils}/semodule_expand/semodule_expand.8 (100%) rename {policycoreutils => semodule-utils}/semodule_expand/semodule_expand.c (100%) rename {policycoreutils => semodule-utils}/semodule_link/Makefile (100%) rename {policycoreutils => semodule-utils}/semodule_link/semodule_link.8 (100%) rename {policycoreutils => semodule-utils}/semodule_link/semodule_link.c (100%) diff --git a/Makefile b/Makefile index 2cbd0ace..8002fbb7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -SUBDIRS=libsepol libselinux libsemanage checkpolicy secilc policycoreutils gui sandbox dbus python +SUBDIRS=libsepol libselinux libsemanage checkpolicy secilc policycoreutils gui sandbox dbus python semodule-utils PYSUBDIRS=libselinux libsemanage DISTCLEANSUBDIRS=libselinux libsemanage diff --git a/policycoreutils/.gitignore b/policycoreutils/.gitignore index 6869d85d..4da1418f 100644 --- a/policycoreutils/.gitignore +++ b/policycoreutils/.gitignore @@ -4,9 +4,6 @@ run_init/open_init_pty run_init/run_init secon/secon semodule/semodule -semodule_deps/semodule_deps -semodule_expand/semodule_expand -semodule_link/semodule_link semodule_package/semodule_package semodule_package/semodule_unpackage sestatus/sestatus diff --git a/policycoreutils/Makefile b/policycoreutils/Makefile index 83d58005..1aa12414 100644 --- a/policycoreutils/Makefile +++ b/policycoreutils/Makefile @@ -1,4 +1,4 @@ -SUBDIRS = setfiles load_policy newrole run_init secon sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man hll +SUBDIRS = setfiles load_policy newrole run_init secon sestatus semodule_package semodule sepolgen-ifgen setsebool scripts po man hll all install relabel clean indent: @for subdir in $(SUBDIRS); do \ diff --git a/semodule-utils/.gitignore b/semodule-utils/.gitignore new file mode 100644 index 00000000..d516ccfb --- /dev/null +++ b/semodule-utils/.gitignore @@ -0,0 +1,3 @@ +semodule_deps/semodule_deps +semodule_expand/semodule_expand +semodule_link/semodule_link diff --git a/semodule-utils/Makefile b/semodule-utils/Makefile new file mode 100644 index 00000000..f61835b0 --- /dev/null +++ b/semodule-utils/Makefile @@ -0,0 +1,8 @@ +SUBDIRS = semodule_link semodule_expand semodule_deps + +all install relabel clean indent: + @for subdir in $(SUBDIRS); do \ + (cd $$subdir && $(MAKE) $@) || exit 1; \ + done + +test: diff --git a/policycoreutils/semodule_deps/Makefile b/semodule-utils/semodule_deps/Makefile similarity index 100% rename from policycoreutils/semodule_deps/Makefile rename to semodule-utils/semodule_deps/Makefile diff --git a/policycoreutils/semodule_deps/semodule_deps.8 b/semodule-utils/semodule_deps/semodule_deps.8 similarity index 100% rename from policycoreutils/semodule_deps/semodule_deps.8 rename to semodule-utils/semodule_deps/semodule_deps.8 diff --git a/policycoreutils/semodule_deps/semodule_deps.c b/semodule-utils/semodule_deps/semodule_deps.c similarity index 100% rename from policycoreutils/semodule_deps/semodule_deps.c rename to semodule-utils/semodule_deps/semodule_deps.c diff --git a/policycoreutils/semodule_expand/Makefile b/semodule-utils/semodule_expand/Makefile similarity index 100% rename from policycoreutils/semodule_expand/Makefile rename to semodule-utils/semodule_expand/Makefile diff --git a/policycoreutils/semodule_expand/semodule_expand.8 b/semodule-utils/semodule_expand/semodule_expand.8 similarity index 100% rename from policycoreutils/semodule_expand/semodule_expand.8 rename to semodule-utils/semodule_expand/semodule_expand.8 diff --git a/policycoreutils/semodule_expand/semodule_expand.c b/semodule-utils/semodule_expand/semodule_expand.c similarity index 100% rename from policycoreutils/semodule_expand/semodule_expand.c rename to semodule-utils/semodule_expand/semodule_expand.c diff --git a/policycoreutils/semodule_link/Makefile b/semodule-utils/semodule_link/Makefile similarity index 100% rename from policycoreutils/semodule_link/Makefile rename to semodule-utils/semodule_link/Makefile diff --git a/policycoreutils/semodule_link/semodule_link.8 b/semodule-utils/semodule_link/semodule_link.8 similarity index 100% rename from policycoreutils/semodule_link/semodule_link.8 rename to semodule-utils/semodule_link/semodule_link.8 diff --git a/policycoreutils/semodule_link/semodule_link.c b/semodule-utils/semodule_link/semodule_link.c similarity index 100% rename from policycoreutils/semodule_link/semodule_link.c rename to semodule-utils/semodule_link/semodule_link.c