s/suse/rpmify/

suse-commit: 48f5f0fc484365150a2dfe33babc0ba0b4e7c850

diff --git a/Makefile b/Makefile
index 67e0189..6e9ba16 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -224,7 +224,7 @@ scripts:
 # ---------------------------------------------------------------------------
 
 init-y         := init/
-drivers-y      := drivers/ sound/ suse/
+drivers-y      := drivers/ sound/ rpmify/
 net-y          := net/
 libs-y         := lib/
 core-y         := usr/

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 881efe3..c3d9ae8 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1232,5 +1232,5 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 1a42dfa..834d564 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -714,5 +714,5 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index feb460b..4def9a5 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -425,5 +425,5 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 4f0a5a4..9a77f2d 100644 (file)
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1546,7 +1546,7 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 
 config X86_SMP
        bool

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 799f589..fb55bf5 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -921,5 +921,5 @@ source "security/Kconfig"
 
 source "crypto/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 284a7ca..898baf0 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -1835,5 +1835,5 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index e937257..77bc1fd 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -710,5 +710,5 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 05d206b..874d70c 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1239,5 +1239,5 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index e26a48d..ff867b6 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -386,5 +386,5 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 35ccb8c..ce0b3bc 100644 (file)
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -1630,5 +1630,5 @@ source "security/Kconfig"
 
 source "crypto/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 1c90f71..ab9b4a8 100644 (file)
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -519,5 +519,5 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 4d3b37d..b8d3dec 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -367,5 +367,5 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 12c71e0..0d2c1a6 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -1230,5 +1230,5 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 2dc28c0..b70733a 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -1008,5 +1008,5 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index acd35f2..bdf9db3 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -1708,5 +1708,5 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index c70d0c7..82a16c4 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -273,5 +273,5 @@ config GCOV
 
 endmenu
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index 8564a02..ca38f4e 100644 (file)
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -415,6 +415,6 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 
 #############################################################################

diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 66c0e56..41e3a0e 100644 (file)
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -674,5 +674,5 @@ source "crypto/Kconfig"
 
 source "lib/Kconfig"
 
-source "suse/Kconfig"
+source "rpmify/Kconfig"
 

diff --git a/rpmify/Kconfig b/rpmify/Kconfig
new file mode 100644 (file)
index 0000000..4249add
--- /dev/null
+++ b/rpmify/Kconfig
@@ -0,0 +1,36 @@
+#
+# Build options
+#
+
+menu "Build options"
+
+config SUSE_KERNEL
+       bool
+       default y
+
+config PROC_CONFIG
+       bool
+       default y
+
+config CONFIG_CFGNAME
+       string "Configuration name"
+       default ""
+       help
+         The name of the kernel configuration used. The configuration
+         files provided in arch/$ARCH/defconfig.$CFGNAME set the
+         CONFIG_CFGNAME option to $CFGNAME. The configuration name is
+         part of the EXTRAVERSION.
+
+config CONFIG_RELEASE
+       int "Release number"
+       default 0
+       help
+         The release number of the kernel sources. The configuration
+         files provided in arch/$ARCH/defconfig.$CFGNAME set the
+         CONFIG_RELEASE option to the RPM release number of the
+         kernel source package. The release number of the kernel
+         sources and of all binary kernel packages built from those
+         sources should be the same. The release number is part of
+         the EXTRAVERSION.
+
+endmenu

diff --git a/rpmify/Makefile b/rpmify/Makefile
new file mode 100644 (file)
index 0000000..9ab19bd
--- /dev/null
+++ b/rpmify/Makefile
@@ -0,0 +1,10 @@
+
+obj-$(CONFIG_PROC_CONFIG) = config_gz.o
+
+CLEAN_FILES += config_gz.h
+
+rpmify/config_gz.h: .config
+       gzip -c $< | hexdump -v -e '1/1 "0x%02x,"' > $@
+       echo >> $@ # make gcc 3.x happy
+
+rpmify/config_gz.o: rpmify/config_gz.c rpmify/config_gz.h

diff --git a/rpmify/config_gz.c b/rpmify/config_gz.c
new file mode 100644 (file)
index 0000000..4c95e7f
--- /dev/null
+++ b/rpmify/config_gz.c
@@ -0,0 +1,40 @@
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/proc_fs.h>
+
+/* ----------------------------------------------------------------------------- */
+
+static char kernel_config_data[] = {
+#include "config_gz.h"
+};
+
+static int config_read_proc(char *page, char **start, off_t off,
+                           int count, int *eof, void *data)
+{
+    int len = ARRAY_SIZE(kernel_config_data);
+    if (len <= off+count)
+       *eof = 1;
+    *start = page;
+    len  -= off;
+    if (len > count)
+       len = count;
+    if (len < 0)
+       len = 0;
+    memcpy(page,kernel_config_data+off,len);
+    return len;
+}
+
+static int __init config_init(void)
+{
+    create_proc_read_entry("config.gz", 0, NULL, config_read_proc, NULL);
+    return 0;
+}
+
+static void __exit config_fini(void)
+{
+    remove_proc_entry("config.gz", NULL);
+}
+
+module_init(config_init);
+module_exit(config_fini);

diff --git a/suse/Kconfig b/suse/Kconfig
deleted file mode 100644 (file)
index 4249add..0000000
--- a/suse/Kconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# Build options
-#
-
-menu "Build options"
-
-config SUSE_KERNEL
-       bool
-       default y
-
-config PROC_CONFIG
-       bool
-       default y
-
-config CONFIG_CFGNAME
-       string "Configuration name"
-       default ""
-       help
-         The name of the kernel configuration used. The configuration
-         files provided in arch/$ARCH/defconfig.$CFGNAME set the
-         CONFIG_CFGNAME option to $CFGNAME. The configuration name is
-         part of the EXTRAVERSION.
-
-config CONFIG_RELEASE
-       int "Release number"
-       default 0
-       help
-         The release number of the kernel sources. The configuration
-         files provided in arch/$ARCH/defconfig.$CFGNAME set the
-         CONFIG_RELEASE option to the RPM release number of the
-         kernel source package. The release number of the kernel
-         sources and of all binary kernel packages built from those
-         sources should be the same. The release number is part of
-         the EXTRAVERSION.
-
-endmenu

diff --git a/suse/Makefile b/suse/Makefile
deleted file mode 100644 (file)
index 0424847..0000000
--- a/suse/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-
-obj-$(CONFIG_PROC_CONFIG) = config_gz.o
-
-CLEAN_FILES += config_gz.h
-
-suse/config_gz.h: .config
-       gzip -c $< | hexdump -v -e '1/1 "0x%02x,"' > $@
-       echo >> $@ # make gcc 3.x happy
-
-suse/config_gz.o: suse/config_gz.c suse/config_gz.h

diff --git a/suse/config_gz.c b/suse/config_gz.c
deleted file mode 100644 (file)
index 4c95e7f..0000000
--- a/suse/config_gz.c
+++ /dev/null
@@ -1,40 +0,0 @@
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/proc_fs.h>
-
-/* ----------------------------------------------------------------------------- */
-
-static char kernel_config_data[] = {
-#include "config_gz.h"
-};
-
-static int config_read_proc(char *page, char **start, off_t off,
-                           int count, int *eof, void *data)
-{
-    int len = ARRAY_SIZE(kernel_config_data);
-    if (len <= off+count)
-       *eof = 1;
-    *start = page;
-    len  -= off;
-    if (len > count)
-       len = count;
-    if (len < 0)
-       len = 0;
-    memcpy(page,kernel_config_data+off,len);
-    return len;
-}
-
-static int __init config_init(void)
-{
-    create_proc_read_entry("config.gz", 0, NULL, config_read_proc, NULL);
-    return 0;
-}
-
-static void __exit config_fini(void)
-{
-    remove_proc_entry("config.gz", NULL);
-}
-
-module_init(config_init);
-module_exit(config_fini);