diff options
Diffstat (limited to 'kernels')
| -rw-r--r-- | kernels/linux-libre-xen/PKGBUILD | 18 | ||||
| -rw-r--r-- | kernels/linux-libre-xen/config.i686 | 2 | ||||
| -rw-r--r-- | kernels/linux-libre-xen/config.x86_64 | 2 | ||||
| -rw-r--r-- | kernels/linux-libre-xen/ext4-options.patch | 49 | ||||
| -rw-r--r-- | kernels/linux-libre-xen/linux-libre-xen.install | 2 |
5 files changed, 64 insertions, 9 deletions
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index c84aa9217..b9572d2ad 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -10,7 +10,7 @@ pkgname=('linux-libre-xen' 'linux-libre-xen-headers' 'linux-libre-xen-docs') # B # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.2 -pkgver=${_basekernel}.7 +pkgver=${_basekernel}.8 pkgrel=1 arch=('i686' 'x86_64') url="http://linux-libre.fsfla.org/" @@ -26,16 +26,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - 'i915-gpu-finish.patch') + 'i915-gpu-finish.patch' + 'ext4-options.patch') md5sums=('27c641c4f6785fc647cdd3e44963a55c' - '37a0fdc7ad19c9489faf09925b4fae5b' - 'a56e949b6c872d0d40ee3fd6969e0352' - '6685fcb15d021dff6e02667c60113577' + 'a97a83d5b003b3c9d87250e4eace45ce' + '1149b265c194f243c9249372602f0ac8' + 'e3a0f760de97df1f8852893507a0eef4' '67463f7a6e88305d7cd14a430e9efe92' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '4cd79aa147825837dc8bc9f6b736c0a0') + '4cd79aa147825837dc8bc9f6b736c0a0' + 'c8299cf750a84e12d60b372c8ca7e1e8') build() { cd "${srcdir}/linux-${_basekernel}" @@ -63,6 +65,10 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # fix ext4 module to mount ext3/2 correct + # https://bugs.archlinux.org/task/28653 + patch -Np1 -i "${srcdir}/ext4-options.patch" + cat "${srcdir}/config.${CARCH}" > ./.config # simpler if [ "${_kernelname}" != "" ]; then diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686 index 0e11985ee..b2a825481 100644 --- a/kernels/linux-libre-xen/config.i686 +++ b/kernels/linux-libre-xen/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.2.7-libre Kernel Configuration +# Linux/i386 3.2.8-libre Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/kernels/linux-libre-xen/config.x86_64 b/kernels/linux-libre-xen/config.x86_64 index 7bc5bd2e7..2899a7467 100644 --- a/kernels/linux-libre-xen/config.x86_64 +++ b/kernels/linux-libre-xen/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.2.7-libre Kernel Configuration +# Linux/x86_64 3.2.8-libre Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set diff --git a/kernels/linux-libre-xen/ext4-options.patch b/kernels/linux-libre-xen/ext4-options.patch new file mode 100644 index 000000000..812b05f04 --- /dev/null +++ b/kernels/linux-libre-xen/ext4-options.patch @@ -0,0 +1,49 @@ +Report: https://bbs.archlinux.org/profile.php?id=33804 +Signed-off-by: Tom Gundersen <teg@jklm.no> +Cc: Thomas Baechler <thomas@archlinux.org> +Cc: Tobias Powalowski <tobias.powalowski@googlemail.com> +Cc: Dave Reisner <d@falconindy.com> +--- + fs/ext4/super.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index 502c61f..30de9cd 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -1333,6 +1333,7 @@ enum { + Opt_inode_readahead_blks, Opt_journal_ioprio, + Opt_dioread_nolock, Opt_dioread_lock, + Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, ++ Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum, + }; + + static const match_table_t tokens = { +@@ -1408,6 +1409,10 @@ static const match_table_t tokens = { + {Opt_init_itable, "init_itable=%u"}, + {Opt_init_itable, "init_itable"}, + {Opt_noinit_itable, "noinit_itable"}, ++ {Opt_nocheck, "nocheck"}, ++ {Opt_reservation, "reservation"}, ++ {Opt_noreservation, "noreservation"}, ++ {Opt_journal_inum, "journal=%u"}, + {Opt_err, NULL}, + }; + +@@ -1904,6 +1909,16 @@ set_qf_format: + case Opt_noinit_itable: + clear_opt(sb, INIT_INODE_TABLE); + break; ++#ifdef CONFIG_EXT4_USE_FOR_EXT23 ++ case Opt_nocheck: ++ case Opt_reservation: ++ case Opt_noreservation: ++ case Opt_journal_inum: ++ ext4_msg(sb, KERN_WARNING, ++ "ext3 mount option \"%s\" ignored " ++ "by ext4 module", p); ++ break; ++#endif + default: + ext4_msg(sb, KERN_ERR, + "Unrecognized mount option \"%s\" "
\ No newline at end of file diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 16b877724..b73d4aa77 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.2.7-1-LIBRE-XEN +KERNEL_VERSION=3.2.8-1-LIBRE-XEN post_install () { # updating module dependencies |