On Mon, Mar 03, 2014 at 12:27:20PM -0800, Seth Arnold wrote: > > cp not mv, I'd like this to be able to be used make than once
Here's a corrected version; this also includes a typo fix for a typo introduced in rev 2405. Signed-of-by: Seth Arnold <[email protected]> Thanks
=== modified file 'tests/regression/apparmor/Makefile'
--- tests/regression/apparmor/Makefile 2014-03-01 23:46:42 +0000
+++ tests/regression/apparmor/Makefile 2014-03-03 23:27:51 +0000
@@ -39,7 +39,7 @@
LDLIBS += -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread
uservars.out:
- echo uservars.inc > uservars.out
+ cat uservars.inc > uservars.out
endif # USE_SYSTEM
CFLAGS += -Wall -Wstrict-prototypes
@@ -186,7 +186,14 @@
return 1 ; \
fi
-all: libapparmor_check $(EXEC) changehat.h
+all: libapparmor_check $(EXEC) changehat.h uservars.inc
+
+uservars.inc: uservars.inc.source uservars.inc.system
+ifdef USE_SYSTEM
+ cp uservars.inc.system uservars.inc
+else # !USE_SYSTEM
+ cp uservars.inc.source uservars.inc
+endif # USE_SYSTEM
changehat_pthread: changehat_pthread.c changehat.h
${CC} ${CFLAGS} ${LDFLAGS} $< -o $@ ${LDLIBS} -pthread
@@ -242,6 +249,6 @@
fi
clean:
- rm -f $(EXEC) dbus_common.o
+ rm -f $(EXEC) dbus_common.o uservars.inc
regex.sh: open exec
=== removed file 'tests/regression/apparmor/uservars.inc'
--- tests/regression/apparmor/uservars.inc 2014-01-13 04:39:07 +0000
+++ tests/regression/apparmor/uservars.inc 1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-# 1. Path to apparmor parser
-subdomain=${PWD}/../../../parser/apparmor_parser
-#subdomain=/sbin/apparmor_parser
-
-# 2. additional arguments to the apparmor parser
-parser_args="-q -K"
-
-# 3. directory to be used for temp files
-# Need to be able to access this directory by the root and nobody users.
-tmpdir=/tmp/sdtest.$$-$RANDOM
-
-
-# 4. Location of load system profiles for verification
-sys_profiles=/sys/kernel/security/apparmor/profiles
=== added file 'tests/regression/apparmor/uservars.inc.source'
--- tests/regression/apparmor/uservars.inc.source 1970-01-01 00:00:00 +0000
+++ tests/regression/apparmor/uservars.inc.source 2014-03-01 04:47:23 +0000
@@ -0,0 +1,14 @@
+# 1. Path to apparmor parser
+subdomain=${PWD}/../../../parser/apparmor_parser
+#subdomain=/sbin/apparmor_parser
+
+# 2. additional arguments to the apparmor parser
+parser_args="-q -K"
+
+# 3. directory to be used for temp files
+# Need to be able to access this directory by the root and nobody users.
+tmpdir=/tmp/sdtest.$$-$RANDOM
+
+
+# 4. Location of load system profiles for verification
+sys_profiles=/sys/kernel/security/apparmor/profiles
=== added file 'tests/regression/apparmor/uservars.inc.system'
--- tests/regression/apparmor/uservars.inc.system 1970-01-01 00:00:00 +0000
+++ tests/regression/apparmor/uservars.inc.system 2014-03-01 04:47:23 +0000
@@ -0,0 +1,14 @@
+# 1. Path to apparmor parser
+#subdomain=${PWD}/../../../parser/apparmor_parser
+subdomain=/sbin/apparmor_parser
+
+# 2. additional arguments to the apparmor parser
+parser_args="-q -K"
+
+# 3. directory to be used for temp files
+# Need to be able to access this directory by the root and nobody users.
+tmpdir=/tmp/sdtest.$$-$RANDOM
+
+
+# 4. Location of load system profiles for verification
+sys_profiles=/sys/kernel/security/apparmor/profiles
signature.asc
Description: Digital signature
-- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
