add linux-vserver related config options in order to make them adjustable

diff --git a/Makefile b/Makefile
index 7796405..cd2299f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ trees: sources
 srpm: sources
        mkdir -p SOURCES SRPMS
        (cd SOURCES; rpm2cpio ../$(SOURCE_RPM) | cpio -diu; \
-        cp ../$(notdir $(SPECFILE)) . ; cp ../linux*.patch . ; \
+        cp ../$(notdir $(SPECFILE)) . ; cp ../linux*.patch . ; cp ../Makefile.config . ; cp ../config-vserver . ; \
         for downloaded in $(SOURCEFILES) ; do cp ../$$downloaded . ; done ; \
         sed -i -e s,CONFIG_IPV6=m,CONFIG_IPV6=y, config-generic)
        ./rpmmacros.sh

diff --git a/Makefile.config b/Makefile.config
new file mode 100644 (file)
index 0000000..25930b7
--- /dev/null
+++ b/Makefile.config
@@ -0,0 +1,105 @@
+# Make rules for configuration files.
+#
+# $Id$
+
+CFG            = kernel-$(VERSION)
+
+CONFIGFILES    = \
+       $(CFG)-i686.config $(CFG)-i686-debug.config \
+       $(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
+       $(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
+       $(CFG)-s390x.config $(CFG)-arm.config \
+       $(CFG)-ppc.config $(CFG)-ppc-smp.config \
+       $(CFG)-sparc64.config  \
+       $(CFG)-ppc64.config $(CFG)-ppc64-debug.config \
+       $(CFG)-ia64.config
+
+PLATFORMS      = x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64
+TEMPFILES      = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
+
+configs: $(CONFIGFILES)
+       @rm -f kernel-*-config
+       @rm -f $(TEMPFILES)
+       @rm -f temp-generic temp-*-generic temp-*-generic-tmp
+
+# Augment the clean target to clean up our own cruft
+clean ::
+       @rm -fv $(CONFIGFILES) $(TEMPFILES) temp-generic kernel-$(VERSION)*config
+
+temp-generic: config-generic
+       cat config-generic config-nodebug > temp-generic
+
+temp-debug-generic: config-generic
+       cat config-generic config-debug > temp-debug-generic
+
+temp-x86-generic: config-x86-generic temp-generic
+       perl merge.pl $^  > $@
+
+temp-x86-debug-generic: config-x86-generic temp-debug-generic
+       perl merge.pl $^  > $@
+
+temp-x86_64-generic: config-x86_64-generic temp-generic
+       perl merge.pl $^  > $@
+
+temp-x86_64-debug-generic: config-x86_64-generic temp-debug-generic
+       perl merge.pl $^  > $@
+
+temp-sparc64-generic: config-sparc64-generic temp-generic
+       perl merge.pl $^  > $@
+
+temp-powerpc-generic: config-powerpc-generic temp-generic
+       perl merge.pl $^  > $@
+
+temp-powerpc-debug-generic: config-powerpc-generic temp-debug-generic
+       perl merge.pl $^  > $@
+
+temp-powerpc32-generic: config-powerpc32-generic temp-powerpc-generic
+       perl merge.pl $^  > $@
+
+temp-s390-generic: config-s390x temp-generic
+       perl merge.pl $^ > $@
+
+temp-ia64-generic: config-ia64-generic temp-generic
+       perl merge.pl $^ > $@
+
+kernel-$(VERSION)-i686-PAE.config: config-i686-PAE temp-x86-generic
+       perl merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-i686-PAEdebug.config: config-i686-PAE temp-x86-debug-generic
+       perl merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-i686.config: config-vserver temp-x86-generic
+       perl merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-i686-debug.config: config-vserver temp-x86-debug-generic
+       perl merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-x86_64.config: config-vserver temp-x86_64-generic
+       perl merge.pl $^ x86_64 > $@
+
+kernel-$(VERSION)-x86_64-debug.config: config-vserver temp-x86_64-debug-generic
+       perl merge.pl $^ x86_64 > $@
+
+kernel-$(VERSION)-sparc64.config: /dev/null temp-sparc64-generic
+       perl merge.pl $^ sparc64 > $@
+
+kernel-$(VERSION)-ppc64.config: config-powerpc64 temp-powerpc-generic
+       perl merge.pl $^ powerpc > $@
+
+kernel-$(VERSION)-ppc64-debug.config: config-powerpc64 temp-powerpc-debug-generic
+       perl merge.pl $^ powerpc > $@
+
+kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
+       perl merge.pl $^ s390 > $@
+
+kernel-$(VERSION)-arm.config: config-arm temp-generic
+       perl merge.pl $^ arm > $@
+
+kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic
+       perl merge.pl $^ powerpc > $@
+
+kernel-$(VERSION)-ppc-smp.config: config-powerpc32-smp temp-powerpc32-generic
+       perl merge.pl $^ powerpc > $@
+
+kernel-$(VERSION)-ia64.config: /dev/null temp-ia64-generic
+       perl merge.pl $^ ia64 > $@

diff --git a/config-vserver b/config-vserver
new file mode 100644 (file)
index 0000000..751660e
--- /dev/null
+++ b/config-vserver
@@ -0,0 +1,27 @@
+# CONFIG_CFS_HARD_LIMITS is not set
+# CONFIG_BLK_DEV_VROOT is not set
+
+#
+# Linux VServer
+#
+CONFIG_VSERVER_AUTO_LBACK=y
+CONFIG_VSERVER_AUTO_SINGLE=y
+CONFIG_VSERVER_COWBL=y
+# CONFIG_VSERVER_VTIME is not set
+# CONFIG_VSERVER_DEVICE is not set
+CONFIG_VSERVER_PROC_SECURE=y
+CONFIG_VSERVER_HARDCPU=y
+CONFIG_VSERVER_IDLETIME=y
+# CONFIG_VSERVER_IDLELIMIT is not set
+# CONFIG_TAGGING_NONE is not set
+# CONFIG_TAGGING_UID16 is not set
+# CONFIG_TAGGING_GID16 is not set
+CONFIG_TAGGING_ID24=y
+# CONFIG_TAGGING_INTERN is not set
+# CONFIG_TAG_NFSD is not set
+# CONFIG_VSERVER_PRIVACY is not set
+CONFIG_VSERVER_CONTEXTS=768
+CONFIG_VSERVER_WARN=y
+# CONFIG_VSERVER_DEBUG is not set
+CONFIG_VSERVER=y
+CONFIG_VSERVER_SECURITY=y

diff --git a/kernel.spec b/kernel.spec
index 4ef98f0..c31c0df 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -561,6 +561,8 @@ Source90: config-sparc64-generic
 
 Source100: config-arm
 
+Source110: config-vserver
+
 Source200: perf
 
 # Here should be only the patches up to the upstream canonical Linus tree.

diff --git a/original/Makefile.config b/original/Makefile.config
new file mode 100644 (file)
index 0000000..53812fa
--- /dev/null
+++ b/original/Makefile.config
@@ -0,0 +1,105 @@
+# Make rules for configuration files.
+#
+# $Id$
+
+CFG            = kernel-$(VERSION)
+
+CONFIGFILES    = \
+       $(CFG)-i686.config $(CFG)-i686-debug.config \
+       $(CFG)-i686-PAE.config $(CFG)-i686-PAEdebug.config \
+       $(CFG)-x86_64.config $(CFG)-x86_64-debug.config \
+       $(CFG)-s390x.config $(CFG)-arm.config \
+       $(CFG)-ppc.config $(CFG)-ppc-smp.config \
+       $(CFG)-sparc64.config  \
+       $(CFG)-ppc64.config $(CFG)-ppc64-debug.config \
+       $(CFG)-ia64.config
+
+PLATFORMS      = x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64
+TEMPFILES      = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
+
+configs: $(CONFIGFILES)
+       @rm -f kernel-*-config
+       @rm -f $(TEMPFILES)
+       @rm -f temp-generic temp-*-generic temp-*-generic-tmp
+
+# Augment the clean target to clean up our own cruft
+clean ::
+       @rm -fv $(CONFIGFILES) $(TEMPFILES) temp-generic kernel-$(VERSION)*config
+
+temp-generic: config-generic
+       cat config-generic config-nodebug > temp-generic
+
+temp-debug-generic: config-generic
+       cat config-generic config-debug > temp-debug-generic
+
+temp-x86-generic: config-x86-generic temp-generic
+       perl merge.pl $^  > $@
+
+temp-x86-debug-generic: config-x86-generic temp-debug-generic
+       perl merge.pl $^  > $@
+
+temp-x86_64-generic: config-x86_64-generic temp-generic
+       perl merge.pl $^  > $@
+
+temp-x86_64-debug-generic: config-x86_64-generic temp-debug-generic
+       perl merge.pl $^  > $@
+
+temp-sparc64-generic: config-sparc64-generic temp-generic
+       perl merge.pl $^  > $@
+
+temp-powerpc-generic: config-powerpc-generic temp-generic
+       perl merge.pl $^  > $@
+
+temp-powerpc-debug-generic: config-powerpc-generic temp-debug-generic
+       perl merge.pl $^  > $@
+
+temp-powerpc32-generic: config-powerpc32-generic temp-powerpc-generic
+       perl merge.pl $^  > $@
+
+temp-s390-generic: config-s390x temp-generic
+       perl merge.pl $^ > $@
+
+temp-ia64-generic: config-ia64-generic temp-generic
+       perl merge.pl $^ > $@
+
+kernel-$(VERSION)-i686-PAE.config: config-i686-PAE temp-x86-generic
+       perl merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-i686-PAEdebug.config: config-i686-PAE temp-x86-debug-generic
+       perl merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-i686.config: /dev/null temp-x86-generic
+       perl merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-i686-debug.config: /dev/null temp-x86-debug-generic
+       perl merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-x86_64.config: /dev/null temp-x86_64-generic
+       perl merge.pl $^ x86_64 > $@
+
+kernel-$(VERSION)-x86_64-debug.config: /dev/null temp-x86_64-debug-generic
+       perl merge.pl $^ x86_64 > $@
+
+kernel-$(VERSION)-sparc64.config: /dev/null temp-sparc64-generic
+       perl merge.pl $^ sparc64 > $@
+
+kernel-$(VERSION)-ppc64.config: config-powerpc64 temp-powerpc-generic
+       perl merge.pl $^ powerpc > $@
+
+kernel-$(VERSION)-ppc64-debug.config: config-powerpc64 temp-powerpc-debug-generic
+       perl merge.pl $^ powerpc > $@
+
+kernel-$(VERSION)-s390x.config: config-s390x temp-s390-generic
+       perl merge.pl $^ s390 > $@
+
+kernel-$(VERSION)-arm.config: config-arm temp-generic
+       perl merge.pl $^ arm > $@
+
+kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic
+       perl merge.pl $^ powerpc > $@
+
+kernel-$(VERSION)-ppc-smp.config: config-powerpc32-smp temp-powerpc32-generic
+       perl merge.pl $^ powerpc > $@
+
+kernel-$(VERSION)-ia64.config: /dev/null temp-ia64-generic
+       perl merge.pl $^ ia64 > $@