diff options
Diffstat (limited to 'libre')
| -rwxr-xr-x | libre/linux-libre/PKGBUILD | 14 | ||||
| -rw-r--r-- | libre/linux-libre/fat-3.6.x.patch | 33 | ||||
| -rwxr-xr-x | libre/linux-libre/linux-libre.install | 2 |
3 files changed, 44 insertions, 5 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 55d68e2a6..9924386ea 100755 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 -_sublevel=8 +_sublevel=9 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,9 +32,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-symbol-waiting-3.6.patch' 'module-init-wait-3.6.patch' 'irq_cfg_pointer-3.6.6.patch' + 'fat-3.6.x.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '3f4d630f49a12079598a3601dd2adb24' + '2127e118d09154c7a44dd2dfed2cfecd' 'e4a3a4677e1fac6ecf0e0fb44c41ca08' '68fc36a4efb6ade0eca409b9444fef0c' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -45,7 +46,8 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' '4909a0271af4e5f373136b382826717f' - 'acc79d1934fe9710acd9039dcd4e8b30') + '88d501404f172dac6fcb248978251560' + '2f3ae0624acb4a4b12ea2c008b964bd2') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -78,6 +80,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" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre/fat-3.6.x.patch b/libre/linux-libre/fat-3.6.x.patch new file mode 100644 index 000000000..d8deeb788 --- /dev/null +++ b/libre/linux-libre/fat-3.6.x.patch @@ -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); diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 62df4eb18..89024bf96 100755 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.6.8-1-LIBRE +KERNEL_VERSION=3.6.9-1-LIBRE # 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' |