Author: adamg Date: Sat Feb 14 22:33:00 2009 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- tomoyo support
---- Files affected:
SPECS:
kernel.spec (1.441.2.2063 -> 1.441.2.2064)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.2063 SPECS/kernel.spec:1.441.2.2064
--- SPECS/kernel.spec:1.441.2.2063 Thu Feb 12 21:52:33 2009
+++ SPECS/kernel.spec Sat Feb 14 23:32:53 2009
@@ -34,6 +34,7 @@
%bcond_without vserver # support for VServer (enabled by default)
%bcond_without tuxonice # support for tuxonice (ex-suspend2) (enabled
by default)
%bcond_without apparmor # build kernel with apparmor (exerimental mix)
+%bcond_with tomoyo # build kernel with tomoyo support [ disables
apparmor ]
%bcond_with rescuecd # build kernel for our rescue
@@ -86,6 +87,10 @@
%define have_sound 0
%endif
+%if %{with tomoyo}
+%undefine with_apparmor
+%endif
+
%ifarch %{ix86} alpha ppc
%define have_isa 1
%else
@@ -175,6 +180,9 @@
Source58: kernel-inittmpfs.config
Source59: kernel-bzip2-lzma.config
+Source6000:
http://globalbase.dl.sourceforge.jp/tomoyo/30297/ccs-patch-1.6.6-20090202.tar.gz
+# Source6000-md5: cceb1731d3720030eac34ed128848b32
+
# tahoe9xx http://www.tahoe.pl/drivers/tahoe9xx-2.6.24.patch
Patch2: tahoe9xx-2.6.24.patch
@@ -318,6 +326,9 @@
Patch5001: kernel-apparmor-after-grsec_full.patch
Patch5002: kernel-apparmor-common.patch
+# tomoyo based on patch from ccs-patch-1.6.6-20090202 tarball
+Patch6000: kernel-tomoyo.patch
+
# for rescuecd
# based on http://ftp.leg.uct.ac.za/pub/linux/rip/inittmpfs-2.6.14.diff.gz
Patch7000: kernel-inittmpfs.patch
@@ -910,6 +921,12 @@
%endif
%endif
+# tomoyo
+%if %{with tomoyo}
+%patch6000 -p1
+tar xzvf %{SOURCE6000}
+%endif
+
%patch150 -p1
%ifarch ppc ppc64
@@ -1130,6 +1147,9 @@
%{SOURCE42} \
%endif
%endif
+%if %{with tomoyo}
+ config.ccs \
+%endif
%{SOURCE40} %{?0:netfilter} \
%{SOURCE41} %{?0:patches} \
%{SOURCE20} \
@@ -1666,6 +1686,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.2064 2009/02/14 22:32:53 adamg
+- tomoyo support
+
Revision 1.441.2.2063 2009/02/12 20:52:33 adamg
- updated to 2.6.28.5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.2063&r2=1.441.2.2064&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
