[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 28636c46cb541d583e8cc63ab9a4e5dca160d484

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 28636c46cb541d583e8cc63ab9a4e5dca160d484

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 5724 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  28636c46cb541d583e8cc63ab9a4e5dca160d484 (commit)
       via  ac7c2b8270096f3679b14f0e537a41b0eb37645f (commit)
       via  e8b7c0bc3f1c5f1df17c7f117afb9fdd8f60ef62 (commit)
      from  afd54bb41adb06a04659244793165ace7e53b324 (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 28636c46cb541d583e8cc63ab9a4e5dca160d484
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Nov 9 09:46:53 2024 +0100

    collectd: fix errormessage on fresh installations
    
    the /etc/collectd.d/ folder must have at least one file in it
    so this add an file with a comment that custom configs should placed
    there.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit ac7c2b8270096f3679b14f0e537a41b0eb37645f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Nov 9 09:46:24 2024 +0100

    kernel: update to 6.6.60
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit e8b7c0bc3f1c5f1df17c7f117afb9fdd8f60ef62
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Nov 8 18:49:52 2024 +0100

    networking/red: remove leftover debugging messages.
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/kernel/kernel.config.aarch64-ipfire | 2 +-
 config/kernel/kernel.config.riscv64-ipfire | 2 +-
 config/kernel/kernel.config.x86_64-ipfire  | 2 +-
 config/rootfiles/common/collectd           | 3 ++-
 lfs/collectd                               | 1 +
 lfs/linux                                  | 4 ++--
 src/initscripts/networking/red             | 2 --
 7 files changed, 8 insertions(+), 8 deletions(-)

Difference in files:
diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index f46465967..1642bdcd8 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.6.59 Kernel Configuration
+# Linux/arm64 6.6.60 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/kernel/kernel.config.riscv64-ipfire b/config/kernel/kernel.config.riscv64-ipfire
index d6c818876..639e8e8d5 100644
--- a/config/kernel/kernel.config.riscv64-ipfire
+++ b/config/kernel/kernel.config.riscv64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/riscv 6.6.59 Kernel Configuration
+# Linux/riscv 6.6.60 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 11ad578fe..5ec0edab6 100644
--- a/config/kernel/kernel.config.x86_64-ipfire
+++ b/config/kernel/kernel.config.x86_64-ipfire
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.59 Kernel Configuration
+# Linux/x86 6.6.60 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0"
 CONFIG_CC_IS_GCC=y
diff --git a/config/rootfiles/common/collectd b/config/rootfiles/common/collectd
index c8a3ad607..be7bdf08e 100644
--- a/config/rootfiles/common/collectd
+++ b/config/rootfiles/common/collectd
@@ -2,7 +2,8 @@ etc/collectd.conf
 etc/collectd.precache
 etc/collectd.thermal
 etc/collectd.vpn
-etc/collectd.d
+#etc/collectd.d
+etc/collectd.d/info
 etc/rc.d/rc0.d/K50collectd
 etc/rc.d/rc3.d/S29collectd
 etc/rc.d/rc6.d/K50collectd
diff --git a/lfs/collectd b/lfs/collectd
index 2438d2eaf..0abd91cc4 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -130,6 +130,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--with-fp-layout=nothing
 	cd $(DIR_APP) && make install #collectd-4 does not support parallel build
 	mkdir /etc/collectd.d
+	echo "# Put custom configfiles in this folder" > /etc/collectd.d/info
 	cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
 	mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn
 	chown nobody.nobody /var/ipfire/ovpn/collectd.vpn
diff --git a/lfs/linux b/lfs/linux
index 41f34a9ab..7d0869a16 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER         = 6.6.59
+VER         = 6.6.60
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -69,7 +69,7 @@ objects = \
 
 $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = a280cffe2a9efa3cad8bc850c9b57486811fa2cc5abc29ae47d712f0f145c6d9bbe6686eb777d87882781d10b8f1d89dedd158c8f7991aeff04e473cbceea900
+$(DL_FILE)_BLAKE2 = 82e39bb4f9abe204c6361152fdeb5ad2ccfeec478f0af20ab795dd52271b159bcfe2d4aea32cd505a567a0bed64cb10b988283548ddaa5cbbe014117970e3318
 
 install : $(TARGET)
 
diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red
index 72b9bf0cf..2a5f06b4e 100644
--- a/src/initscripts/networking/red
+++ b/src/initscripts/networking/red
@@ -180,8 +180,6 @@ case "${1}" in
 					;;
 			esac
 
-			echo dhcpcd_start "${DEVICE}" "${DHCPCD_ARGS[@]}"
-
 			if [ -z "${pid}" ]; then
 				# No wpa_supplicant is running. So it's save to start dhcpcd.
 				dhcpcd_start "${DEVICE}" "${DHCPCD_ARGS[@]}"


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