From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. e3ab1962ed4e129d02b6e98777ef0fe2accf2af4
Date: Fri, 28 Sep 2018 20:35:49 +0100 [thread overview]
Message-ID: <20180928193550.284B11081BD3@git01.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 7082 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, master has been updated
via e3ab1962ed4e129d02b6e98777ef0fe2accf2af4 (commit)
via d435f08d9b4a40817d6ae8601b20ef392253338f (commit)
via 71954dcac4e29a67477f2d0d9593b60c7272c447 (commit)
via ae61c74db903ac96e4c923cdb1e44add69a527a8 (commit)
via eaadeb5af0173e4ed4067a650beb3802a417ca20 (commit)
via 161a5b834a7bdc134996c0d24a642242f42fcc2c (commit)
via 46b307324263bdf2e874701c3c5c7afc673f0eb1 (commit)
from 0a5823db023c32135b1cd3fc9c8a426cd1d70b31 (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 e3ab1962ed4e129d02b6e98777ef0fe2accf2af4
Merge: d435f08d9 ae61c74db
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Sep 28 18:43:15 2018 +0200
Merge branch 'core124' of git.ipfire.org:/pub/git/ipfire-2.x into core124
commit d435f08d9b4a40817d6ae8601b20ef392253338f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Sep 28 17:53:03 2018 +0200
core124: add apache initskript and nsswitch.conf to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 71954dcac4e29a67477f2d0d9593b60c7272c447
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Sep 28 17:49:10 2018 +0200
core124: don't remove network trigger script
this script is still needed if /var/ipfire is on an extra partition.
New installations works without this script.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ae61c74db903ac96e4c923cdb1e44add69a527a8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Sep 27 21:53:53 2018 +0200
core124: fix removing old initrd files on arm systems
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit eaadeb5af0173e4ed4067a650beb3802a417ca20
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Sep 27 08:03:45 2018 +0200
kernel: update to 4.14.72
this commit has many important driver updates so we need to ship it fast...
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 161a5b834a7bdc134996c0d24a642242f42fcc2c
Merge: 46b307324 0a5823db0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Sep 26 14:09:57 2018 +0200
Merge remote-tracking branch 'origin/master' into core124
commit 46b307324263bdf2e874701c3c5c7afc673f0eb1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Sep 23 02:44:03 2018 +0200
core124: fix updater
fix some missing files on arm
remove not needed rebuild initrd because we ship it already built
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
.../core/124/filelists/aarch64/{files => files-aarch64} | 0
.../core/124/filelists/armv5tel/{files => files-armv5tel} | 0
config/rootfiles/core/124/filelists/files | 2 ++
config/rootfiles/core/124/update.sh | 14 +++++---------
lfs/linux | 9 ++++-----
5 files changed, 11 insertions(+), 14 deletions(-)
rename config/rootfiles/core/124/filelists/aarch64/{files => files-aarch64} (100%)
rename config/rootfiles/core/124/filelists/armv5tel/{files => files-armv5tel} (100%)
Difference in files:
diff --git a/config/rootfiles/core/124/filelists/aarch64/files b/config/rootfiles/core/124/filelists/aarch64/files-aarch64
similarity index 100%
rename from config/rootfiles/core/124/filelists/aarch64/files
rename to config/rootfiles/core/124/filelists/aarch64/files-aarch64
diff --git a/config/rootfiles/core/124/filelists/armv5tel/files b/config/rootfiles/core/124/filelists/armv5tel/files-armv5tel
similarity index 100%
rename from config/rootfiles/core/124/filelists/armv5tel/files
rename to config/rootfiles/core/124/filelists/armv5tel/files-armv5tel
diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files
index 25e812593..3e7153e12 100644
--- a/config/rootfiles/core/124/filelists/files
+++ b/config/rootfiles/core/124/filelists/files
@@ -1,6 +1,8 @@
etc/system-release
etc/issue
+etc/nsswitch.conf
etc/rc.d/helper/aws-setup
+etc/rc.d/init.d/apache
etc/rc.d/init.d/aws
etc/rc.d/init.d/localnet
etc/rc.d/init.d/networking/red.down/10-static-routes
diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh
index b65bc52b8..17208b769 100644
--- a/config/rootfiles/core/124/update.sh
+++ b/config/rootfiles/core/124/update.sh
@@ -72,9 +72,9 @@ rm -rf /boot/config-*
rm -rf /boot/ipfirerd-*
rm -rf /boot/initramfs-*
rm -rf /boot/vmlinuz-*
-rm -rf /boot/uImage-ipfire-*
-rm -rf /boot/zImage-ipfire-*
-rm -rf /boot/uInit-ipfire-*
+rm -rf /boot/uImage-*-ipfire-*
+rm -rf /boot/zImage-*-ipfire-*
+rm -rf /boot/uInit-*-ipfire-*
rm -rf /boot/dtb-*-ipfire-*
rm -rf /lib/modules
rm -f /etc/sysconfig/lm_sensors
@@ -82,9 +82,6 @@ rm -f /etc/sysconfig/lm_sensors
# Stop services
# Remove files
-rm -f \
- /etc/rc.d/rcsysinit.d/S90network-trigger \
- /etc/rc.d/init.d/network-trigger
# Extract files
extract_files
@@ -106,16 +103,15 @@ ldconfig
# Reload sysctl.conf
sysctl -p
-# rebuild initrd to add early microcode updates
-rebuild-initrd
-
# Remove deprecated GRUB configuration option
if [ -e "/etc/default/grub" ]; then
sed -e "/^GRUB_FONT/d" -i /etc/default/grub
fi
# Update bootloader
+if [ -e /usr/bin/install-bootloader ]; then
/usr/bin/install-bootloader
+fi
# Upadate Kernel version uEnv.txt
if [ -e /boot/uEnv.txt ]; then
diff --git a/lfs/linux b/lfs/linux
index ad10bc8e5..814bc0b73 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
include Config
-VER = 4.14.71
-ARM_PATCHES = 4.14.71-ipfire0
+VER = 4.14.72
+ARM_PATCHES = 4.14.72-ipfire0
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
-PAK_VER = 77
+PAK_VER = 78
DEPS = ""
HEADERS_ARCH = $(BUILD_PLATFORM)
@@ -82,10 +82,9 @@ objects =$(DL_FILE) \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
-$(DL_FILE)_MD5 = 14b21e5f11e8e195731c89a14794a0fc
+$(DL_FILE)_MD5 = 450b3f5f1124442dee768eaa097fd149
arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 889a8d49a63bf462067409887f8105bb
-
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2018-09-28 19:35 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=20180928193550.284B11081BD3@git01.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