[Audit-test-developer] [PATCH 2/3] remove /rules.mk, duplicate of audit-test/rules.mk

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Signed-off-by: Jiri Jaburek <jja...@re...>
---
 Makefile |   6 +-
 rules.mk | 337 ---------------------------------------------------------------
 2 files changed, 3 insertions(+), 340 deletions(-)
 delete mode 100644 rules.mk

diff --git a/Makefile b/Makefile
index 4a0c8bf..194a6e7 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 TOPDIR		= .
 
-include $(TOPDIR)/rules.mk
+include $(TOPDIR)/audit-test/rules.mk
 
 SUB_DIRS        = audit-test ltp
 
@@ -77,11 +77,11 @@ dist:
 	into=$$(pwd) && \
 	for DIR in $(SUB_DIRS); do make -C "$$DIR" dist; done && \
 	mv "ltp-$$rev.tar.gz" "audit-test-$$rev.tar.gz" "$$tmpdir" && \
-	cp "Makefile" "rules.mk" "$$tmpdir" && \
+	cp "Makefile" "$$tmpdir" && \
 	cd "$$tmpdir" && \
 	tar xpzvf "ltp-$$rev.tar.gz" && \
 	tar xpzvf "audit-test-$$rev.tar.gz" && \
-	tar czf "$$into/audit-$$rev.tar.gz" "Makefile" "rules.mk" "ltp" "audit-test" && \
+	tar czf "$$into/audit-$$rev.tar.gz" "Makefile" "ltp" "audit-test" && \
 	echo "$$into" && \
 	cd "$$into" && \
 	rm -rf "$$tmpdir" && \
diff --git a/rules.mk b/rules.mk
deleted file mode 100644
index 294ed4e..0000000
--- a/rules.mk
+++ /dev/null
@@ -1,337 +0,0 @@
-##########################################################################
-#   Copyright (C) International Business Machines  Corp., 2003
-#   (c) Copyright Hewlett-Packard Development Company, L.P., 2005
-#
-#   This program is free software: you can redistribute it and/or modify
-#   it under the terms of version 2 the GNU General Public License as
-#   published by the Free Software Foundation.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#
-#
-#  FILE   : rules.mk
-#
-#  PURPOSE: This rules file facilitates the compiling, linking and running
-#           of the Linux Auditing System test suite.
-#
-#           Rules are provided for dependency building, compiling, sub
-#           directory traversal and running of the tests.
-#
-#
-#  HISTORY:
-#    08/03 originated by Tom Lendacky (to...@us...)
-#
-##########################################################################
-
-SHELL := /bin/bash
-
-MACHINE		= $(strip $(shell uname -m))
-X		= i486 i586 i686 ix86
-P		= ppc powerpc
-IP		= ppc64 powerpc64
-Z		= s390
-Z64		= s390x
-X86_64		= x86_64
-IA		= ia64
-SYSTEMINFO      = systeminfo.run.log
-CFLAGS          += -g -O2 -Wall -Werror -D_GNU_SOURCE -fno-strict-aliasing
-LDFLAGS         +=
-
-LINK_AR		= $(AR) rc $@ $^
-LINK_EXE	= $(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES) $(LDLIBS)
-LINK_SO		= $(CC) $(LDFLAGS) -shared -o $@ $^ $(LOADLIBES) $(LDLIBS)
-
-# If MODE isn't set explicitly, the default for the machine is used
-export NATIVE   = $(strip $(shell file /bin/bash | awk -F'[ -]' '{print $$3}'))
-export MODE     ?= $(NATIVE)
-ifneq ($(MODE), $(NATIVE))
-    ifeq ($(MODE), 32)
-	    ifneq (,$(findstring $(MACHINE), $(Z64)))
-		    CFLAGS += -m31
-		    LDFLAGS += -m31
-	    else
-		    ifneq (,$(findstring $(MACHINE), $(X86_64)))
-			    CFLAGS += -m32 -malign-double
-			    LDFLAGS += -m32
-		    else
-			    CFLAGS += -m32
-			    LDFLAGS += -m32
-		    endif
-	    endif
-    endif
-    ifeq ($(MODE), 64)
-	    CFLAGS += -m64
-	    LDFLAGS += -m64
-    endif
-endif
-RELEASE = $(wildcard /etc/*-release)
-ifeq (SuSE, $(findstring SuSE, $(RELEASE)))
-CFLAGS +=-DSUSE
-export DISTRO=SUSE
-endif
-ifeq (fedora, $(findstring fedora, $(RELEASE)))
-CFLAGS +=-DFEDORA
-export DISTRO=FEDORA
-else ifeq (redhat, $(findstring redhat, $(RELEASE)))
-CFLAGS +=-DRHEL
-export DISTRO=RHEL
-endif
-
-ifeq (s390x, $(findstring s390x, $(MACHINE)))
-CFLAGS +=-DS390X
-endif
-ifeq (ppc64, $(findstring ppc64, $(MACHINE)))
-CFLAGS +=-DPPC64
-endif
-##########################################################################
-# Common rules
-##########################################################################
-
-.PHONY: all run \
-	clean clobber distclean _clean _clobber _distclean \
-	msgque rmlogs showrpms showrpms2
-
-all: deps subdirs $(ALL_AR) $(ALL_EXE) $(ALL_SO)
-
-run:
-
-# Re-used in toplevel Makefile
-check_set_PPROFILE = \
-	if [[ ! -x /usr/sbin/getenforce ]]; then \
-	  export PPROFILE=capp ; \
-        elif [[ $$PPROFILE != capp && $$PPROFILE != lspp ]]; then \
-	  export PPROFILE=capp ; \
-	  if [[ "$$(getenforce)" == "Enforcing" ]] &&  \
-	        (/usr/sbin/sestatus | grep -q mls); then \
-	    if [[ "$$(secon -r)" != "lspp_test_r" ]]; then \
-	      echo "SELinux MLS policy is enabled but you are not in lspp_test_r" ; \
-	      exit 1; \
-	    else \
-	      export PPROFILE=lspp ; \
-	    fi \
-	  fi \
-	fi
-
-check_set_PASSWD = \
-	while [[ -z $$PASSWD ]]; do \
-	    trap 'stty echo; exit' 1 2; \
-	    read -sp "Login user password: " PASSWD; echo; export PASSWD; \
-	    trap - 1 2; \
-	done
-
-ifeq (, $(findstring network, $(RUN_DIRS)))
-check_set_LBLNET_SVR_IPV4 = true
-else
-check_set_LBLNET_SVR_IPV4 = \
-	while [[ -z $$LBLNET_SVR_IPV4 ]]; do \
-	    trap 'stty echo; exit' 1 2; \
-	    read -p "Remote test server IPv4 address: " LBLNET_SVR_IPV4; \
-		echo; export LBLNET_SVR_IPV4; \
-	    trap - 1 2; \
-	done
-endif
-
-ifeq (, $(findstring network, $(RUN_DIRS)))
-check_set_LBLNET_SVR_IPV6 = true
-else
-check_set_LBLNET_SVR_IPV6 = \
-	while [[ -z $$LBLNET_SVR_IPV6 ]]; do \
-	    trap 'stty echo; exit' 1 2; \
-	    read -p "Remote test server IPv6 address: " LBLNET_SVR_IPV6; \
-		echo; export LBLNET_SVR_IPV6; \
-	    trap - 1 2; \
-	done
-endif
-
-check_TTY = \
-	if [[ -f /etc/selinux/mls/contexts/securetty_types ]]; then \
-	    tty=`/usr/bin/tty`; \
-	    tty_type=`ls -lZ $$tty | awk -F: '{print $$3}' | awk '{print $$1}'`; \
-	    grep -q $$tty_type /etc/selinux/mls/contexts/securetty_types /dev/null && { \
-	        echo -n "You are connected to the test machine through "; \
-	        echo "a device ($$tty) that"; \
-	        echo -n "will prevent one or more tests from functioning "; \
-	        echo "as intended.  Connect to"; \
-	        echo -n "the machine remotely through a pty device, such "; \
-	        echo "as logging in as the "; \
-	        echo "test-user directly using ssh."; \
-	        echo ; \
-	        exit 1; \
-	    } \
-	fi
-
-ifneq ($(if $(filter-out .,$(TOPDIR)),$(wildcard run.conf)),)
-all: run.bash
-
-run.bash:
-	[[ -f run.bash ]] || ln -sfn $(TOPDIR)/utils/run.bash run.bash
-
-run: all
-	@$(check_set_PPROFILE); \
-	$(check_set_PASSWD); \
-	./run.bash
-endif
-
-_clean:
-	@if [[ "$(MAKECMDGOALS)" == clean ]]; then \
-	    for x in $(SUB_DIRS); do \
-		make -C $$x clean; \
-	    done; \
-	fi
-	$(RM) -r .deps
-	$(RM) $(ALL_OBJ)
-	$(RM) $(ALL_EXE) $(ALL_AR) $(ALL_SO)
-
-clean: _clean
-
-ALL_LOGS += run.log rollup.log $(SYSTEMINFO)
-_distclean: clean
-	@if [[ "$(MAKECMDGOALS)" == distclean ]]; then \
-	    for x in $(SUB_DIRS); do \
-		make -C $$x distclean; \
-	    done; \
-	fi
-	$(RM) $(ALL_LOGS)
-	if [[ -L run.bash ]]; then $(RM) run.bash; fi
-
-distclean: _distclean
-
-##########################################################################
-# RPM dependency checking
-##########################################################################
-
-# These are assumed to be the base requirements for all the tests.  Requirements
-# can be refined in individual Makefiles by appending (+=) or overriding (=)
-# the RPMS variable.
-RPMS		= binutils \
-		  cpp \
-                  expect \
-                  flex \
-                  gcc \
-                  gcc-c++ \
-                  glibc-devel \
-                  libattr-devel \
-                  libstdc++-devel \
-                  libcap-devel \
-                  make \
-		  audit-libs-devel
-ifneq ($(findstring $(MACHINE),$(IP)),)
-RPMS		+= gcc-64bit
-endif
-
-# This can be augmented per directory to check things other than the default
-# list in "verify".  (In fact some things should be moved from that list to the
-# appropriate directory)
-verifyme: subdirs
-
-verify:
-	$(MAKE) verifyme
-	@if ! mount | grep -q "^$$(df . | head -n2 | tail -n1 | cut -f1 -d\ ) .*(.*user_xattr"; then \
-		echo "please set 'user_xattr' for this filesystem'"; \
-		exit 1; \
-	fi
-	@if ! mount | grep -q "^$$(df . | head -n2 | tail -n1 | cut -f1 -d\ ) .*(.*acl"; then \
-		echo "please set 'acl' for this filesystem'"; \
-		exit 1; \
-	fi
-	@echo "-----------------------"
-	@echo "Checking installed rpms"
-	@echo "-----------------------"
-	@if ! rpm -q $$($(MAKE) --no-print-directory showrpms); then \
-	    echo "Please install the missing rpms"; \
-	    exit 1; \
-	fi
-	@echo "-----------------------"
-	@echo "Looks good!"
-
-showrpms:
-	@$(MAKE) --no-print-directory _showrpms | xargs -n1 echo | sort -u
-
-_showrpms: subdirs_quiet
-	@echo "$(RPMS)"
-
-##########################################################################
-# Dependency rules
-##########################################################################
-
-DEP_FILES = $(addprefix .deps/, $(ALL_OBJ:.o=.d))
-
-.PHONY: deps
-
-deps: $(DEP_FILES)
-
-# See http://www.gnu.org/software/make/manual/html_node/make_47.html#SEC51
-# "4.14 Generating Prerequisites Automatically"
-.deps/%.d: %.c
-	@mkdir -p .deps
-	@echo Creating dependencies for $<
-	@$(SHELL) -ec '$(CC) $(CFLAGS) $(CPPFLAGS) -MM $< \
-		| sed '\''s@\($*\)\.o[ :]*@\1.o $@: @g'\'' > $@; \
-		[ -s $@ ] || $(RM) $@'
-
-ifneq ($(DEP_FILES),)
--include $(DEP_FILES)
-endif
-
-# How to build missing things like libraries
-../%:
-	$(MAKE) -C $(dir $@) $(notdir $@)
-
-##########################################################################
-# Sub-directory processing rules
-##########################################################################
-
-.PHONY: subdirs subdirs_quiet
-
-subdirs:
-	@for x in $(SUB_DIRS); do \
-	    $(MAKE) -C $$x $(MAKECMDGOALS) || exit $$?; \
-	done
-
-subdirs_quiet:
-	@for x in $(SUB_DIRS); do \
-	    $(MAKE) --no-print-directory -C $$x $(MAKECMDGOALS) || exit $$?; \
-	done
-
-##########################################################################
-# Command framework execution rules
-##########################################################################
-
-systeminfo::
-	echo "==> date <==" > $(SYSTEMINFO)
-	date >> $(SYSTEMINFO)
-	echo "" >> $(SYSTEMINFO)
-	echo "==> uname -a <==" >> $(SYSTEMINFO)
-	uname -a >> $(SYSTEMINFO)
-	echo "" >> $(SYSTEMINFO)
-	echo "==> uptime <==" >> $(SYSTEMINFO)
-	uptime >> $(SYSTEMINFO)
-	echo "" >> $(SYSTEMINFO)
-	echo "==> cat /proc/cpuinfo <==" >> $(SYSTEMINFO)
-	cat /proc/cpuinfo >> $(SYSTEMINFO)
-	echo "" >> $(SYSTEMINFO)
-	echo "==> rpm -qai <==" >> $(SYSTEMINFO)
-	rpm -qai >> $(SYSTEMINFO)
-
-ifneq ($(DEBUG),)
-DEBUG_ARG	= -d $(DEBUG)
-endif
-
-ifneq ($(TEST_USER),)
-USER_ARG	= -u $(TEST_USER)
-endif
-
-ifneq ($(LOGIN_USER),)
-LOGIN_ARG	= -l $(LOGIN_USER)
-endif
-
-ifneq ($(TEST),)
-TEST_ARG	= -t $(TEST)
-endif
-- 
1.7.11.7





[Audit-test-developer] [PATCH 2/3] remove /rules.mk, duplicate of audit-test/rules.mk

Test suite for Linux audit and related security functionality

[Audit-test-developer] [PATCH 2/3] remove /rules.mk, duplicate of audit-test/rules.mk