From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ef7ae3fd1d31c3da479edad91f78dda0c6699a59
Date: Fri, 28 Jul 2023 16:57:35 +0000 [thread overview]
Message-ID: <4RCDMh1gmpz2xY0@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 4937 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 ef7ae3fd1d31c3da479edad91f78dda0c6699a59 (commit)
via 6084fa89bfe8e65592b8e3a74b21470585332736 (commit)
via d4781c29aeb8f5ae2323c445142e48b303fd09e5 (commit)
via 8ffe9b67de2fad230ea28200cd5c5b79d586c793 (commit)
via 0bb82a95dd383912bde857db9a7d702604e582f6 (commit)
from d622d1c62ec400bc503b0736da66a925a34d3287 (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 ef7ae3fd1d31c3da479edad91f78dda0c6699a59
Merge: d622d1c62 6084fa89b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Jul 28 16:57:15 2023 +0000
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.x86_64-ipfire | 2 +-
config/rootfiles/oldcore/177/filelists/files | 2 ++
config/rootfiles/oldcore/177/update.sh | 9 +++++++++
lfs/linux | 4 ++--
src/initscripts/system/halt | 5 -----
src/initscripts/system/reboot | 4 ----
6 files changed, 14 insertions(+), 12 deletions(-)
Difference in files:
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index 32fcb18c4..a5ad9700f 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.1.41-ipfire Kernel Configuration
+# Linux/x86 6.1.42-ipfire Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 13.1.0"
CONFIG_CC_IS_GCC=y
diff --git a/config/rootfiles/oldcore/177/filelists/files b/config/rootfiles/oldcore/177/filelists/files
index e9ba30a0c..5f0034d81 100644
--- a/config/rootfiles/oldcore/177/filelists/files
+++ b/config/rootfiles/oldcore/177/filelists/files
@@ -1,3 +1,5 @@
+etc/rc.d/init.d/halt
+etc/rc.d/init.d/reboot
lib/firmware/amd-ucode/microcode_amd_fam17h.bin
lib/firmware/amd-ucode/microcode_amd_fam19h.bin
lib/firmware/amdgpu/aldebaran_mec2.bin
diff --git a/config/rootfiles/oldcore/177/update.sh b/config/rootfiles/oldcore/177/update.sh
index 818079940..52ef205b0 100644
--- a/config/rootfiles/oldcore/177/update.sh
+++ b/config/rootfiles/oldcore/177/update.sh
@@ -97,6 +97,15 @@ rm -f \
/opt/pakfire/db/meta/meta-squidclamav \
/opt/pakfire/db/rootfiles/squidclamav
+# remove old rngd if the addon is not installed
+if [ ! -e "/opt/pakfire/db/installed/meta-rng-tools" ]; then
+ rm -fv /usr/bin/randstat \
+ /usr/bin/rngtest \
+ /usr/sbin/rngd \
+ /etc/rc.d/init.d/rngd \
+ /etc/rc.d/rc?.d/*rngd
+fi
+
# Extract files
extract_files
diff --git a/lfs/linux b/lfs/linux
index 4aa8c08cb..2160482ca 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
include Config
-VER = 6.1.41
+VER = 6.1.42
ARM_PATCHES = 6.1.y-ipfire2
THISAPP = linux-$(VER)
@@ -75,7 +75,7 @@ objects = \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
-$(DL_FILE)_BLAKE2 = 7b67b16cb45e8089a4554c59e5be29fef39acd95013345752f5e57af4f185cc79a5effb13741f643d7a9ef2c99555342cfeb1e859f38303be800d889a35972fe
+$(DL_FILE)_BLAKE2 = 27d506867a44764ca5fb71d36a1732ded064b8d24d2d53bd1b2158db53cc82283a390b46071ed0cd07fdd68a0fd60486e5ec231fc6247f87bc0bea9692d449f9
arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3
install : $(TARGET)
diff --git a/src/initscripts/system/halt b/src/initscripts/system/halt
index 91c89455c..40a72ac7d 100644
--- a/src/initscripts/system/halt
+++ b/src/initscripts/system/halt
@@ -24,11 +24,6 @@
case "${1}" in
stop)
- sync && sync
- boot_mesg "Remount root readonly..."
- mount -f -o remount,ro / > /dev/null 2>&1
- evaluate_retval
-
boot_mesg "Prepare for halt..."
sleep 2
diff --git a/src/initscripts/system/reboot b/src/initscripts/system/reboot
index 30c504025..f87f12921 100644
--- a/src/initscripts/system/reboot
+++ b/src/initscripts/system/reboot
@@ -24,10 +24,6 @@
case "${1}" in
stop)
- sync && sync
- boot_mesg "Remount root readonly..."
- mount -f -o remount,ro / > /dev/null 2>&1
- evaluate_retval
boot_mesg "Prepare for reboot..."
sleep 2
reboot -d -f -i
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2023-07-28 16:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4RCDMh1gmpz2xY0@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox