[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 26707c0aeb54d8ab47c5e684ef99367e73834e19

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 26707c0aeb54d8ab47c5e684ef99367e73834e19

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 5103 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 3.x development tree".

The branch, master has been updated
       via  26707c0aeb54d8ab47c5e684ef99367e73834e19 (commit)
       via  ad379bce9e477758c49cbd19cd7e78d37194c22b (commit)
       via  18c3200a76fe1b9392bfb5cd7396d1feada560f2 (commit)
       via  2e4bebe58e10a9593ed257b3b8657d0b5fdb064c (commit)
      from  170e118fe5a7d1d8794bf71cc5018df6d5318466 (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 26707c0aeb54d8ab47c5e684ef99367e73834e19
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jan 3 13:49:25 2019 +0000

    dracut: update to 048
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit ad379bce9e477758c49cbd19cd7e78d37194c22b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jan 3 14:04:24 2019 +0000

    ccache: Update to version 3.5.1
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 18c3200a76fe1b9392bfb5cd7396d1feada560f2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Thu Jan 3 14:02:56 2019 +0000

    kernel: Fix compiled-in version number
    
    When we have a .0 release of the kernel, the internal kernel
    versioning is 4.20.0, but the tarball is called 4.20 only.
    
    This causes the kernel to look for its modules in the wrong place.
    
    This patch overwrites the compiled-in version number so that
    it is in sync with the directory of the installed modules.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 2e4bebe58e10a9593ed257b3b8657d0b5fdb064c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Jan 3 12:28:26 2019 +0000

    kmod: update to 25
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 ccache/ccache.nm | 11 ++++++++---
 dracut/dracut.nm |  2 +-
 kernel/kernel.nm |  4 ++--
 kmod/kmod.nm     |  4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/ccache/ccache.nm b/ccache/ccache.nm
index 2ae7631a0..9c62b05bc 100644
--- a/ccache/ccache.nm
+++ b/ccache/ccache.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = ccache
-version    = 3.3.6
+version    = 3.5.1
 release    = 1
 
 groups     = Development/Compilers
@@ -27,6 +27,8 @@ CFLAGS += -DDEFAULT_MAXSIZE=2097152
 
 build
 	requires
+		autoconf
+		automake
 		perl
 		zlib-devel
 	end
@@ -34,8 +36,11 @@ build
 	CCACHE_CACHE = %{localstatedir}/cache/ccache
 
 	prepare_cmds
-		# Disable pch test that fails
-		sed -e "s/^pch_suite.*/& return 0/" -i test.sh
+		# The included configure script renders an incorrect Makefile
+		autoreconf -vfi
+
+		# Do not run test for pre-compiled headers
+		sed -e "/^pch$/d" -i test/run
 
 		# Remove shipped zlib
 		rm -rf zlib
diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index b7e72c24f..8da9822dd 100644
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = dracut
-version    = 046
+version    = 048
 release    = 1
 
 groups     = System/Boot
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 9b1460cda..2cf721044 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 4.20
-release    = 10
+release    = 11
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
@@ -162,7 +162,7 @@ build
 			# Run the build.
 			make ARCH=%{kernel_arch} olddefconfig >/dev/null
 			make ARCH=%{kernel_arch} %{kernel_target} modules \
-				%{PARALLELISMFLAGS}
+				KERNELRELEASE=${fullversion} %{PARALLELISMFLAGS}
 
 			# Compile Flattened Device Tree database
 			case "${DISTRO_ARCH}" in
diff --git a/kmod/kmod.nm b/kmod/kmod.nm
index daba803cd..d14c49ea8 100644
--- a/kmod/kmod.nm
+++ b/kmod/kmod.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = kmod
-version    = 22
+version    = 25
 release    = 1
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -20,7 +20,7 @@ description
 	filesystems are two examples of loaded and unloaded modules.
 end
 
-source_dl  = ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/
+source_dl  = https://www.kernel.org/pub/linux/utils/kernel/kmod/
 sources    = %{thisapp}.tar.xz
 
 build


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