bump to latest version
This commit is contained in:
parent
cff3c5dd30
commit
86fe51174a
28
PKGBUILD
28
PKGBUILD
|
@ -5,7 +5,7 @@
|
|||
pkgbase=linux # Build stock -ARCH kernel
|
||||
#pkgbase=linux-custom # Build kernel with a different name
|
||||
_srcname=linux-3.6
|
||||
pkgver=3.6.8
|
||||
pkgver=3.6.9
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.kernel.org/"
|
||||
|
@ -21,16 +21,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
|
|||
'change-default-console-loglevel.patch'
|
||||
'module-symbol-waiting-3.6.patch'
|
||||
'module-init-wait-3.6.patch'
|
||||
'irq_cfg_pointer-3.6.6.patch')
|
||||
md5sums=('1a1760420eac802c541a20ab51a093d1'
|
||||
'f248294551c34753c5c019c8d513280c'
|
||||
'65f7ff39775f20f65014383564d3cb65'
|
||||
'3adbfa45451c4bcf9dd7879bed033d77'
|
||||
'eb14dcfd80c00852ef81ded6e826826a'
|
||||
'9d3c56a4b999c8bfbd4018089a62f662'
|
||||
'670931649c60fcb3ef2e0119ed532bd4'
|
||||
'8a71abc4224f575008f974a099b5cf6f'
|
||||
'4909a0271af4e5f373136b382826717f')
|
||||
'irq_cfg_pointer-3.6.6.patch'
|
||||
'fat-3.6.x.patch')
|
||||
|
||||
_kernelname=${pkgbase#linux}
|
||||
|
||||
|
@ -56,6 +48,10 @@ build() {
|
|||
# fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt
|
||||
patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch"
|
||||
|
||||
# fix cosmetic fat issue
|
||||
# https://bugs.archlinux.org/task/32916
|
||||
patch -Np1 -i "${srcdir}/fat-3.6.x.patch"
|
||||
|
||||
if [ "${CARCH}" = "x86_64" ]; then
|
||||
cat "${srcdir}/config.x86_64" > ./.config
|
||||
else
|
||||
|
@ -321,3 +317,13 @@ for _p in ${pkgname[@]}; do
|
|||
done
|
||||
|
||||
# vim:set ts=8 sts=2 sw=2 et:
|
||||
md5sums=('1a1760420eac802c541a20ab51a093d1'
|
||||
'a7c656034599f90dcbc50895b69022aa'
|
||||
'65f7ff39775f20f65014383564d3cb65'
|
||||
'3adbfa45451c4bcf9dd7879bed033d77'
|
||||
'eb14dcfd80c00852ef81ded6e826826a'
|
||||
'9d3c56a4b999c8bfbd4018089a62f662'
|
||||
'670931649c60fcb3ef2e0119ed532bd4'
|
||||
'8a71abc4224f575008f974a099b5cf6f'
|
||||
'4909a0271af4e5f373136b382826717f'
|
||||
'88d501404f172dac6fcb248978251560')
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
From: Dave Reisner <dreisner@archlinux.org>
|
||||
Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100)
|
||||
Subject: fs/fat: strip "cp" prefix from codepage in display
|
||||
X-Git-Tag: next-20121130~1^2~97
|
||||
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405
|
||||
|
||||
fs/fat: strip "cp" prefix from codepage in display
|
||||
|
||||
Option parsing code expects an unsigned integer for the codepage option,
|
||||
but prefixes and stores this option with "cp" before passing to
|
||||
load_nls(). This makes the displayed option in /proc an invalid one.
|
||||
Strip the prefix when printing so that the displayed option is valid for
|
||||
reuse.
|
||||
|
||||
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
|
||||
Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
|
||||
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
||||
---
|
||||
|
||||
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
|
||||
index 3b733a7..3580681 100644
|
||||
--- a/fs/fat/inode.c
|
||||
+++ b/fs/fat/inode.c
|
||||
@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root)
|
||||
if (opts->allow_utime)
|
||||
seq_printf(m, ",allow_utime=%04o", opts->allow_utime);
|
||||
if (sbi->nls_disk)
|
||||
- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset);
|
||||
+ /* strip "cp" prefix from displayed option */
|
||||
+ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]);
|
||||
if (isvfat) {
|
||||
if (sbi->nls_io)
|
||||
seq_printf(m, ",iocharset=%s", sbi->nls_io->charset);
|
|
@ -2,7 +2,7 @@
|
|||
# arg 2: the old package version
|
||||
|
||||
KERNEL_NAME=
|
||||
KERNEL_VERSION=3.6.8-1-ARCH
|
||||
KERNEL_VERSION=3.6.9-1-ARCH
|
||||
|
||||
# set a sane PATH to ensure that critical utils like depmod will be found
|
||||
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
|
||||
|
|
Loading…
Reference in New Issue