From c5acfef4d2e0bb48ef52a5fe605c336c789730b9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 20 May 2008 14:34:52 +0000 Subject: linux-rp: disable CONFIG_LOCALVERSION_AUTO git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4512 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/packages/linux/linux-rp-2.6.23/defconfig-akita | 9 +++------ meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 | 2 +- meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0 | 2 +- meta/packages/linux/linux-rp-2.6.23/defconfig-collie | 2 +- meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal | 2 +- meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000 | 2 +- meta/packages/linux/linux-rp-2.6.23/defconfig-poodle | 2 +- meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm | 2 +- meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86 | 2 +- meta/packages/linux/linux-rp-2.6.23/defconfig-spitz | 2 +- meta/packages/linux/linux-rp-2.6.23/defconfig-tosa | 2 +- meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite | 2 +- meta/packages/linux/linux-rp-2.6.24/defconfig-akita | 2 +- meta/packages/linux/linux-rp-2.6.24/defconfig-bootcdx86 | 2 +- meta/packages/linux/linux-rp-2.6.24/defconfig-c7x0 | 2 +- meta/packages/linux/linux-rp-2.6.24/defconfig-collie | 2 +- meta/packages/linux/linux-rp-2.6.24/defconfig-htcuniversal | 2 +- meta/packages/linux/linux-rp-2.6.24/defconfig-hx2000 | 2 +- meta/packages/linux/linux-rp-2.6.24/defconfig-poodle | 2 +- meta/packages/linux/linux-rp-2.6.24/defconfig-qemuarm | 2 +- meta/packages/linux/linux-rp-2.6.24/defconfig-qemux86 | 2 +- meta/packages/linux/linux-rp-2.6.24/defconfig-spitz | 2 +- meta/packages/linux/linux-rp-2.6.24/defconfig-zylonite | 2 +- meta/packages/linux/linux-rp_2.6.23.bb | 2 +- meta/packages/linux/linux-rp_2.6.24.bb | 2 +- 25 files changed, 27 insertions(+), 30 deletions(-) diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-akita b/meta/packages/linux/linux-rp-2.6.23/defconfig-akita index 9587fb2a23..ddc7ba01b1 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-akita +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-akita @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.23 -# Tue Oct 16 13:20:27 2007 +# Mon May 19 22:50:30 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -241,7 +241,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 dyntick=enable quiet" +CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 noinitrd root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 dyntick=enable debug" # CONFIG_XIP_KERNEL is not set CONFIG_KEXEC=y CONFIG_ATAGS_PROC=y @@ -1081,9 +1081,6 @@ CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y # CONFIG_LOGO_LINUX_CLUT224 is not set CONFIG_LOGO_OHAND_CLUT224=y -# CONFIG_LOGO_OZ240_CLUT224 is not set -# CONFIG_LOGO_OZ480_CLUT224 is not set -# CONFIG_LOGO_OZ640_CLUT224 is not set # # Sound diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 b/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 index 3d033ec566..244df733ac 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-bootcdx86 @@ -31,7 +31,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0 index 4f6b8d202d..f1d0295fb0 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0 +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-c7x0 @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-collie b/meta/packages/linux/linux-rp-2.6.23/defconfig-collie index fd10d3df85..64e5090ae6 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-collie +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-collie @@ -31,7 +31,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # General setup # CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_IPC_NS is not set diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal b/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal index ead49c2c8a..3f33b1446f 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-htcuniversal @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000 index 09ce9e5740..447d26da80 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000 +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-hx2000 @@ -31,7 +31,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # General setup # CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_SWAP is not set CONFIG_SYSVIPC=y # CONFIG_IPC_NS is not set diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle index 210997df4a..5afa7c556b 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-poodle @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm index c369657596..78f08bea40 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemuarm @@ -32,7 +32,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86 index 5bc9a9ec26..5cba544cd6 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86 +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-qemux86 @@ -31,7 +31,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz index a18218f2d1..2ced24e951 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-spitz @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa b/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa index 5173e242a8..d005193a34 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-tosa @@ -21,7 +21,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 # General setup # CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y # CONFIG_POSIX_MQUEUE is not set diff --git a/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite b/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite index 4eb064b5dd..bd15f9e933 100644 --- a/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite +++ b/meta/packages/linux/linux-rp-2.6.23/defconfig-zylonite @@ -33,7 +33,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-akita b/meta/packages/linux/linux-rp-2.6.24/defconfig-akita index 5e4560c39d..707936953d 100644 --- a/meta/packages/linux/linux-rp-2.6.24/defconfig-akita +++ b/meta/packages/linux/linux-rp-2.6.24/defconfig-akita @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-bootcdx86 b/meta/packages/linux/linux-rp-2.6.24/defconfig-bootcdx86 index fda13665cd..35e9b5cd22 100644 --- a/meta/packages/linux/linux-rp-2.6.24/defconfig-bootcdx86 +++ b/meta/packages/linux/linux-rp-2.6.24/defconfig-bootcdx86 @@ -51,7 +51,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-c7x0 b/meta/packages/linux/linux-rp-2.6.24/defconfig-c7x0 index a47e843a2e..2d6c76ec0f 100644 --- a/meta/packages/linux/linux-rp-2.6.24/defconfig-c7x0 +++ b/meta/packages/linux/linux-rp-2.6.24/defconfig-c7x0 @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-collie b/meta/packages/linux/linux-rp-2.6.24/defconfig-collie index d4b813e2cf..78e3e0757f 100644 --- a/meta/packages/linux/linux-rp-2.6.24/defconfig-collie +++ b/meta/packages/linux/linux-rp-2.6.24/defconfig-collie @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-htcuniversal b/meta/packages/linux/linux-rp-2.6.24/defconfig-htcuniversal index f121ddea90..7703594672 100644 --- a/meta/packages/linux/linux-rp-2.6.24/defconfig-htcuniversal +++ b/meta/packages/linux/linux-rp-2.6.24/defconfig-htcuniversal @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-hx2000 b/meta/packages/linux/linux-rp-2.6.24/defconfig-hx2000 index 41eee3854a..0f2557c0f7 100644 --- a/meta/packages/linux/linux-rp-2.6.24/defconfig-hx2000 +++ b/meta/packages/linux/linux-rp-2.6.24/defconfig-hx2000 @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-poodle b/meta/packages/linux/linux-rp-2.6.24/defconfig-poodle index ecffc3aba6..7a4f0b2724 100644 --- a/meta/packages/linux/linux-rp-2.6.24/defconfig-poodle +++ b/meta/packages/linux/linux-rp-2.6.24/defconfig-poodle @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-qemuarm b/meta/packages/linux/linux-rp-2.6.24/defconfig-qemuarm index d2b8265214..e636b6c671 100644 --- a/meta/packages/linux/linux-rp-2.6.24/defconfig-qemuarm +++ b/meta/packages/linux/linux-rp-2.6.24/defconfig-qemuarm @@ -33,7 +33,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.24/defconfig-qemux86 index e0094fec3c..42f6740201 100644 --- a/meta/packages/linux/linux-rp-2.6.24/defconfig-qemux86 +++ b/meta/packages/linux/linux-rp-2.6.24/defconfig-qemux86 @@ -51,7 +51,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-spitz b/meta/packages/linux/linux-rp-2.6.24/defconfig-spitz index d0226301f7..0de526199f 100644 --- a/meta/packages/linux/linux-rp-2.6.24/defconfig-spitz +++ b/meta/packages/linux/linux-rp-2.6.24/defconfig-spitz @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp-2.6.24/defconfig-zylonite b/meta/packages/linux/linux-rp-2.6.24/defconfig-zylonite index 0cf0b23db5..cc2fc482ae 100644 --- a/meta/packages/linux/linux-rp-2.6.24/defconfig-zylonite +++ b/meta/packages/linux/linux-rp-2.6.24/defconfig-zylonite @@ -34,7 +34,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -CONFIG_LOCALVERSION_AUTO=y +# CONFIG_LOCALVERSION_AUTO is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y diff --git a/meta/packages/linux/linux-rp_2.6.23.bb b/meta/packages/linux/linux-rp_2.6.23.bb index 1b6a9ba78f..6742082112 100644 --- a/meta/packages/linux/linux-rp_2.6.23.bb +++ b/meta/packages/linux/linux-rp_2.6.23.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r32" +PR = "r33" # Handy URLs # git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046 diff --git a/meta/packages/linux/linux-rp_2.6.24.bb b/meta/packages/linux/linux-rp_2.6.24.bb index 95e734ece8..b46e23ba89 100644 --- a/meta/packages/linux/linux-rp_2.6.24.bb +++ b/meta/packages/linux/linux-rp_2.6.24.bb @@ -1,6 +1,6 @@ require linux-rp.inc -PR = "r2" +PR = "r3" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_collie = "1" -- cgit 1.2.3-korg