diff --git a/build_kernel.sh b/build_kernel.sh index ef13897511f424d5e5003329b2eaed88d2dd8b44..2c6dba29c419dfecbcf2949f89d33fbd5087b904 100755 --- a/build_kernel.sh +++ b/build_kernel.sh @@ -48,7 +48,7 @@ function git_kernel { git checkout master git pull - #git remote | grep torvalds_remote && git fetch --tags torvalds_remote master + git remote | grep torvalds_remote && git fetch --tags torvalds_remote master if [ "${PRE_RC}" ]; then wget -c --directory-prefix=${DIR}/patches/ http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-${PRE_RC}.bz2 diff --git a/patches/defconfig b/patches/defconfig index 5a3fbdac110cef3d8c2b99a7495c00720237bfcc..c2abb34d9a27a4940d163de8de4004f1b8c98669 100644 --- a/patches/defconfig +++ b/patches/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux/arm 2.6.37-git17 Kernel Configuration -# Mon Jan 17 21:01:58 2011 +# Linux/arm 2.6.38-rc2 Kernel Configuration +# Sat Jan 22 20:41:33 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -62,7 +62,6 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y # CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set CONFIG_HAVE_SPARSE_IRQ=y # CONFIG_GENERIC_PENDING_IRQ is not set @@ -116,6 +115,7 @@ CONFIG_RD_LZO=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y +# CONFIG_EXPERT is not set # CONFIG_EMBEDDED is not set CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y @@ -2259,7 +2259,6 @@ CONFIG_VIDEO_IR_I2C=m # CONFIG_VIDEO_TVAUDIO is not set # CONFIG_VIDEO_TDA7432 is not set # CONFIG_VIDEO_TDA9840 is not set -# CONFIG_VIDEO_TDA9875 is not set # CONFIG_VIDEO_TEA6415C is not set # CONFIG_VIDEO_TEA6420 is not set CONFIG_VIDEO_MSP3400=m diff --git a/patches/no_devtmps-defconfig b/patches/no_devtmps-defconfig index 742281a73fd08cbd3470960a3587714ec04f9e07..980c6eb5375f021f505448ff6d23855f2e5e2ef6 100644 --- a/patches/no_devtmps-defconfig +++ b/patches/no_devtmps-defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux/arm 2.6.37-git17 Kernel Configuration -# Mon Jan 17 21:01:58 2011 +# Linux/arm 2.6.38-rc2 Kernel Configuration +# Sat Jan 22 20:41:33 2011 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -62,7 +62,6 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y # IRQ subsystem # CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y # CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set CONFIG_HAVE_SPARSE_IRQ=y # CONFIG_GENERIC_PENDING_IRQ is not set @@ -116,6 +115,7 @@ CONFIG_RD_LZO=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y CONFIG_ANON_INODES=y +# CONFIG_EXPERT is not set # CONFIG_EMBEDDED is not set CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y @@ -2258,7 +2258,6 @@ CONFIG_VIDEO_IR_I2C=m # CONFIG_VIDEO_TVAUDIO is not set # CONFIG_VIDEO_TDA7432 is not set # CONFIG_VIDEO_TDA9840 is not set -# CONFIG_VIDEO_TDA9875 is not set # CONFIG_VIDEO_TEA6415C is not set # CONFIG_VIDEO_TEA6420 is not set CONFIG_VIDEO_MSP3400=m diff --git a/version.sh b/version.sh index 23716e2e7ef01d456fa7a34d6c7147603e14b680..eb55377b3799be53c534408557f57ef9155f0810 100644 --- a/version.sh +++ b/version.sh @@ -6,7 +6,7 @@ KERNEL_REL=2.6.37 #STABLE_PATCH=.1 #PRE_RC=2.6.37-git18 RC_KERNEL=2.6.38 -RC_PATCH=-rc1 +RC_PATCH=-rc2 ABI=1 if [ "${NO_DEVTMPS}" ] ; then