From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter 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 Message-ID: <20190521184813.A213D84FDAF@people01.i.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8569602564256274757==" List-Id: --===============8569602564256274757== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 Date: Tue May 21 20:42:51 2019 +0200 kernel: update to 4.14.121 =20 Signed-off-by: Arne Fitzenreiter commit b0d31edbd6268e32fe7ab7649c581d20686e8ced Author: Arne Fitzenreiter Date: Tue May 21 20:36:16 2019 +0200 vnstat: fix errormessage at first boot =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- 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/kerne= l.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=3Dy CONFIG_64BIT=3Dy diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/ke= rnel/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=3Dy CONFIG_ARM_HAS_SG_CHAIN=3Dy diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kerne= l/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=3Dy CONFIG_ARM_HAS_SG_CHAIN=3Dy diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.c= onfig.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=3Dy diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kern= el.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=3Dy 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=3Dy CONFIG_X86_64=3Dy 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 @@ =20 include Config =20 -VER =3D 4.14.120 -ARM_PATCHES =3D 4.14.120-ipfire0 +VER =3D 4.14.121 +ARM_PATCHES =3D 4.14.121-ipfire0 =20 THISAPP =3D linux-$(VER) DL_FILE =3D linux-$(VER).tar.xz @@ -82,7 +82,7 @@ objects =3D$(DL_FILE) \ $(DL_FILE) =3D $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz =3D $(URL_IPFIRE)/arm-multi-patche= s-$(ARM_PATCHES).patch.xz =20 -$(DL_FILE)_MD5 =3D f7c27311735c335f7d854eafebab42aa +$(DL_FILE)_MD5 =3D 619cfc35e376eaa1f05d835624bbb432 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 =3D ac64bdb78fbecba032b92df61c= 928d3f =20 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 --===============8569602564256274757==--