[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8f31e2c38d331bf27c4c0610f59a2df2683dac03

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8f31e2c38d331bf27c4c0610f59a2df2683dac03

[git]

[-- Attachment #1: Type: text/plain, Size: 2414 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  8f31e2c38d331bf27c4c0610f59a2df2683dac03 (commit)
       via  c3ab884ca5e581448f051c75e5162428a3230d6c (commit)
      from  022438b50b801bc480e9585c81efb4356ac91102 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8f31e2c38d331bf27c4c0610f59a2df2683dac03
Merge: c3ab884 022438b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun May 25 10:06:05 2014 +0200

    Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit c3ab884ca5e581448f051c75e5162428a3230d6c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun May 25 10:03:58 2014 +0200

    Revert "kernel: change compression of pae kernel to bz2."
    
    This reverts commit 3e8286210f4e167c9ad2bb20b7fe3a56d2435b52.
    
    bz2 is not supported by debian xen. So users that have problems
    with xz compression need to update the pygrub on the host.

-----------------------------------------------------------------------

Summary of changes:
 config/kernel/kernel.config.i586-ipfire-pae | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 775ed0e..4f71362 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.39-ipfire Kernel Configuration
+# Linux/x86 3.10.40-ipfire Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -55,9 +55,9 @@ CONFIG_HAVE_KERNEL_LZMA=y
 CONFIG_HAVE_KERNEL_XZ=y
 CONFIG_HAVE_KERNEL_LZO=y
 # CONFIG_KERNEL_GZIP is not set
-CONFIG_KERNEL_BZIP2=y
+# CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
-# CONFIG_KERNEL_XZ is not set
+CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y


hooks/post-receive
--
IPFire 2.x development tree