From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: <475F264F.1000803@manicmethod.com> Date: Tue, 11 Dec 2007 19:07:43 -0500 From: Joshua Brindle MIME-Version: 1.0 To: Stephen Smalley CC: SE Linux Subject: Re: [PATCH] [STABLE] Makefile change to disable restorecond References: <475EED72.3090607@manicmethod.com> <475EEF4D.4000807@manicmethod.com> <1197404396.28006.111.camel@moss-spartans.epoch.ncsc.mil> In-Reply-To: <1197404396.28006.111.camel@moss-spartans.epoch.ncsc.mil> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Sender: owner-selinux@tycho.nsa.gov List-Id: selinux@tycho.nsa.gov Stephen Smalley wrote: > On Tue, 2007-12-11 at 15:13 -0500, Joshua Brindle wrote: > >> Joshua Brindle wrote: >> >>> This patch is necessary to build stable on RHEL4. CLIP uses the >>> current stable toolchain and supports RHEL4 as a target so we are >>> trying to upstream any magic that is necessary to build on that platform. >>> >>> >> Ignore last patch, this one is actually against stable :) >> > > What about just checking for the presence of /usr/include/sys/inotify.h > and disabling restorecond in its absence, similar to handling of PAMH > and AUDITH in newrole's Makefile? Then that could go into trunk too. > So... like this? --- policycoreutils/Makefile (revision 2696) +++ policycoreutils/Makefile (working copy) @@ -1,5 +1,11 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +SUBDIRS = setfiles semanage load_policy newrole run_init secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po +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; \ -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with the words "unsubscribe selinux" without quotes as the message.