From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, core127, updated. 99549950fa26674ec1807aeee0904f35cb930cd8
Date: Fri, 18 Jan 2019 12:54:10 +0000 [thread overview]
Message-ID: <20190118125410.AB8FD84FDD4@people01.i.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 4336 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, core127 has been updated
via 99549950fa26674ec1807aeee0904f35cb930cd8 (commit)
via ad62fda0addbd10573a30ce7a0ab6921b761f670 (commit)
via 9918b6f40dd4201a5962ad7d5ea0c4479e28fec3 (commit)
from 06ac824331726523e90607f472b822a9b50d156b (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 99549950fa26674ec1807aeee0904f35cb930cd8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 18 13:53:39 2019 +0100
core127: set reboot needed flag
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ad62fda0addbd10573a30ce7a0ab6921b761f670
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 18 13:53:06 2019 +0100
core127: add general-functions.pl to updater
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 9918b6f40dd4201a5962ad7d5ea0c4479e28fec3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 18 07:52:17 2019 +0100
core127: fix updater for aarch64 and armv5tel
if a arch specific filelist has the same name as the common the common filelist was ignored
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/127/filelists/aarch64/files | 9 ---------
.../core/127/filelists/{armv5tel/files => aarch64/files-aarch64} | 0
.../core/127/filelists/armv5tel/{files => files-armvtel} | 0
config/rootfiles/core/127/filelists/files | 1 +
config/rootfiles/core/127/update.sh | 3 +++
5 files changed, 4 insertions(+), 9 deletions(-)
delete mode 100644 config/rootfiles/core/127/filelists/aarch64/files
copy config/rootfiles/core/127/filelists/{armv5tel/files => aarch64/files-aarch64} (100%)
rename config/rootfiles/core/127/filelists/armv5tel/{files => files-armvtel} (100%)
Difference in files:
diff --git a/config/rootfiles/core/127/filelists/aarch64/files b/config/rootfiles/core/127/filelists/aarch64/files
deleted file mode 100644
index d76f3915c..000000000
--- a/config/rootfiles/core/127/filelists/aarch64/files
+++ /dev/null
@@ -1,9 +0,0 @@
-boot/boot.cmd
-boot/boot.scr
-etc/system-release
-etc/issue
-srv/web/ipfire/cgi-bin/credits.cgi
-var/ipfire/langs
-etc/rc.d/init.d/aws
-etc/rc.d/init.d/unbound
-srv/web/ipfire/cgi-bin/dnsforward.cgi
diff --git a/config/rootfiles/core/127/filelists/armv5tel/files b/config/rootfiles/core/127/filelists/aarch64/files-aarch64
similarity index 100%
rename from config/rootfiles/core/127/filelists/armv5tel/files
rename to config/rootfiles/core/127/filelists/aarch64/files-aarch64
diff --git a/config/rootfiles/core/127/filelists/armv5tel/files-armvtel b/config/rootfiles/core/127/filelists/armv5tel/files-armvtel
new file mode 100644
index 000000000..6a00446f4
--- /dev/null
+++ b/config/rootfiles/core/127/filelists/armv5tel/files-armvtel
@@ -0,0 +1,2 @@
+boot/boot.cmd
+boot/boot.scr
diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/core/127/filelists/files
index 4b001af63..758f9c537 100644
--- a/config/rootfiles/core/127/filelists/files
+++ b/config/rootfiles/core/127/filelists/files
@@ -17,4 +17,5 @@ srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/lib/firewall/firewall-lib.pl
var/ipfire/backup/include
+var/ipfire/general-functions.pl
var/ipfire/geoip-functions.pl
diff --git a/config/rootfiles/core/127/update.sh b/config/rootfiles/core/127/update.sh
index 4fe045ec9..8960ed46a 100644
--- a/config/rootfiles/core/127/update.sh
+++ b/config/rootfiles/core/127/update.sh
@@ -58,6 +58,9 @@ sysctl -p
# Re-run depmod
depmod -a
+# This update needs a reboot...
+touch /var/run/need_reboot
+
# Finish
/etc/init.d/fireinfo start
sendprofile
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2019-01-18 12:54 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=20190118125410.AB8FD84FDD4@people01.i.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