From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 716f00b1165d492479e7ec24a6b3cf14ea17b89d
Date: Tue, 21 May 2019 19:48:12 +0100 [thread overview]
Message-ID: <20190521184813.A213D84FDAF@people01.i.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 6333 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 716f00b1165d492479e7ec24a6b3cf14ea17b89d (commit)
via b0d31edbd6268e32fe7ab7649c581d20686e8ced (commit)
from 6d37280f3ededab6b3b13ff14dc2c368b076b0db (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 716f00b1165d492479e7ec24a6b3cf14ea17b89d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue May 21 20:42:51 2019 +0200
kernel: update to 4.14.121
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b0d31edbd6268e32fe7ab7649c581d20686e8ced
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue May 21 20:36:16 2019 +0200
vnstat: fix errormessage at first boot
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.aarch64-ipfire | 2 +-
config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 2 +-
config/kernel/kernel.config.armv5tel-ipfire-multi | 2 +-
config/kernel/kernel.config.i586-ipfire | 2 +-
config/kernel/kernel.config.i586-ipfire-pae | 2 +-
config/kernel/kernel.config.x86_64-ipfire | 2 +-
config/rootfiles/common/vnstat | 2 ++
lfs/linux | 6 +++---
lfs/vnstat | 4 ++++
9 files changed, 15 insertions(+), 9 deletions(-)
Difference in files:
diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index eafedb834..165f90421 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 4.14.120-ipfire Kernel Configuration
+# Linux/arm64 4.14.121-ipfire Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
index d707d1067..7879e9177 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
+++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.120-ipfire-kirkwood Kernel Configuration
+# Linux/arm 4.14.121-ipfire-kirkwood Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi
index 3ea3fa35b..50d26909a 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-multi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-multi
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.120-ipfire-multi Kernel Configuration
+# Linux/arm 4.14.121-ipfire-multi Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 89665b33d..82ee92ea7 100644
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.120-ipfire Kernel Configuration
+# Linux/x86 4.14.121-ipfire Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index c65f29c9a..13675255e 100644
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.120-ipfire-pae Kernel Configuration
+# Linux/x86 4.14.121-ipfire-pae Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire
index ef347fd00..066832670 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 4.14.120-ipfire Kernel Configuration
+# Linux/x86 4.14.121-ipfire Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
diff --git a/config/rootfiles/common/vnstat b/config/rootfiles/common/vnstat
index faabf47e8..d5b56a679 100644
--- a/config/rootfiles/common/vnstat
+++ b/config/rootfiles/common/vnstat
@@ -9,3 +9,5 @@ usr/bin/vnstati
#usr/share/man/man1/vnstati.1
#usr/share/man/man1/vnstat.1
#var/lib/vnstat
+#var/log/vnstat
+var/log/vnstat/tag
diff --git a/lfs/linux b/lfs/linux
index 5fc0b3cde..3eab07107 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
include Config
-VER = 4.14.120
-ARM_PATCHES = 4.14.120-ipfire0
+VER = 4.14.121
+ARM_PATCHES = 4.14.121-ipfire0
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -82,7 +82,7 @@ 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 = f7c27311735c335f7d854eafebab42aa
+$(DL_FILE)_MD5 = 619cfc35e376eaa1f05d835624bbb432
arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = ac64bdb78fbecba032b92df61c928d3f
install : $(TARGET)
diff --git a/lfs/vnstat b/lfs/vnstat
index a61bc5ed2..b1a17ce1f 100644
--- a/lfs/vnstat
+++ b/lfs/vnstat
@@ -85,5 +85,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
sed -i 's|/var/lib/vnstat|/var/log/vnstat|g' /etc/vnstat.conf
sed -i 's|/var/log/vnstat/vnstat.log|/var/log/vnstat.log|g' /etc/vnstat.conf
sed -i 's|/var/run/vnstat/vnstat.pid|/var/run/vnstat.pid|g' /etc/vnstat.conf
+
+ mkdir -p /var/log/vnstat
+ touch /var/log/vnstat/tag
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2019-05-21 18:48 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=20190521184813.A213D84FDAF@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