IPFire-SCM August 2019

ipfire-scm@lists.ipfire.org

1 participants
23 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c934c5ff1983826291b73da54e093aa7caa7c151
by Arne Fitzenreiter 07 Aug '19

07 Aug '19

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 c934c5ff1983826291b73da54e093aa7caa7c151 (commit) from dc362263f4d1b2e1551e7cca406e82eddcd01aee (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 c934c5ff1983826291b73da54e093aa7caa7c151 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Aug 7 22:16:46 2019 +0200 clamav: update to 0.101.3 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/clamav | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/clamav b/lfs/clamav index 640691408..d6f8164b7 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.101.2 +VER = 0.101.3 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 44 +PAK_VER = 45 DEPS = "" @@ -50,7 +50,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = faeb0e286e76c2a26e2e10845e4b68db +$(DL_FILE)_MD5 = 1981c5bd299c1f3cbf3f74095a00524c install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dc362263f4d1b2e1551e7cca406e82eddcd01aee
by Arne Fitzenreiter 06 Aug '19

06 Aug '19

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 dc362263f4d1b2e1551e7cca406e82eddcd01aee (commit) from 6836e528e521b94e8e4360451f11a5b9ce1d82d2 (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 dc362263f4d1b2e1551e7cca406e82eddcd01aee Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Aug 6 09:17:41 2019 +0000 setup: add ignore to all no nic assigned errors ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/135/filelists/files | 1 + src/setup/networking.c | 30 +++++++++++++++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) Difference in files: diff --git a/config/rootfiles/core/135/filelists/files b/config/rootfiles/core/135/filelists/files index d8df9f65b..34ab272bf 100644 --- a/config/rootfiles/core/135/filelists/files +++ b/config/rootfiles/core/135/filelists/files @@ -10,4 +10,5 @@ etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders etc/rc.d/init.d/partresize etc/rc.d/init.d/unbound etc/sysctl.conf +usr/sbin/setup usr/sbin/unbound-dhcp-leases-bridge diff --git a/src/setup/networking.c b/src/setup/networking.c index 00dfc4b5a..d6cd30cff 100644 --- a/src/setup/networking.c +++ b/src/setup/networking.c @@ -144,9 +144,13 @@ int oktoleave(void) strcpy(temp, ""); findkey(kv, "GREEN_DEV", temp); if (!(strlen(temp))) { - errorbox(_("No GREEN interface assigned.")); - freekeyvalues(kv); - return 0; + rc = newtWinChoice(_("Error"), _("OK"), _("Ignore"), + _("No GREEN interface assigned.")); + if (rc == 0 || rc == 1) + { + freekeyvalues(kv); + return 0; + } } if (!(interfacecheck(kv, "GREEN"))) { @@ -181,9 +185,13 @@ int oktoleave(void) strcpy(temp, ""); findkey(kv, "ORANGE_DEV", temp); if (!(strlen(temp))) { - errorbox(_("No ORANGE interface assigned.")); - freekeyvalues(kv); - return 0; + rc = newtWinChoice(_("Error"), _("OK"), _("Ignore"), + _("No ORANGE interface assigned.")); + if (rc == 0 || rc == 1) + { + freekeyvalues(kv); + return 0; + } } if (!(interfacecheck(kv, "ORANGE"))) { @@ -197,9 +205,13 @@ int oktoleave(void) strcpy(temp, ""); findkey(kv, "BLUE_DEV", temp); if (!(strlen(temp))) { - errorbox(_("No BLUE interface assigned.")); - freekeyvalues(kv); - return 0; + rc = newtWinChoice(_("Error"), _("OK"), _("Ignore"), + _("No BLUE interface assigned.")); + if (rc == 0 || rc == 1) + { + freekeyvalues(kv); + return 0; + } } if (!(interfacecheck(kv, "BLUE"))) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6836e528e521b94e8e4360451f11a5b9ce1d82d2
by Arne Fitzenreiter 06 Aug '19

06 Aug '19

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 6836e528e521b94e8e4360451f11a5b9ce1d82d2 (commit) via e47e01f60c379922d11ea8a9352f163d4e034ff0 (commit) from fd9fa1d8947f1691db53f5839658eddfa392c165 (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 6836e528e521b94e8e4360451f11a5b9ce1d82d2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Aug 6 04:32:22 2019 +0000 u-boot-friendlyarm: add u-boot for nanopi-r1 to boot from eMMC this is a heavy patched version and should replaced when stock u-boot is able to boot from h3 eMMC. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e47e01f60c379922d11ea8a9352f163d4e034ff0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Aug 4 08:54:50 2019 +0000 u-boot: enable boot from additional mmc device Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../rootfiles/common/armv5tel/u-boot-friendlyarm | 1 + config/u-boot/boot.cmd | 6 +++- config/u-boot/boot.scr | Bin 2544 -> 2607 bytes config/u-boot/uEnv.txt | 1 + lfs/flash-images | 6 ++++ lfs/{wget => u-boot-friendlyarm} | 34 +++++++++++++-------- make.sh | 1 + src/patches/u-boot/sunxi/nanopi-r1-add-mac.diff | 15 +++++++++ 8 files changed, 50 insertions(+), 14 deletions(-) create mode 100644 config/rootfiles/common/armv5tel/u-boot-friendlyarm copy lfs/{wget => u-boot-friendlyarm} (75%) create mode 100644 src/patches/u-boot/sunxi/nanopi-r1-add-mac.diff Difference in files: diff --git a/config/rootfiles/common/armv5tel/u-boot-friendlyarm b/config/rootfiles/common/armv5tel/u-boot-friendlyarm new file mode 100644 index 000000000..d3d3e1088 --- /dev/null +++ b/config/rootfiles/common/armv5tel/u-boot-friendlyarm @@ -0,0 +1 @@ +usr/share/u-boot/nanopi-r1/u-boot-sunxi-with-spl.bin diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index 5cb4b8971..b86b6809a 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -3,8 +3,12 @@ if test ${boot_dev} = ""; then setenv root_dev /dev/mmcblk0p3; fi; +if test ${dev_num} = ""; then + setenv dev_num 0; +fi; + if test ${boot_part} = ""; then - setenv boot_part 0:1; + setenv boot_part ${dev_num}:1; fi; if test ${soc} = "kirkwood"; then diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr index 5143b051b..b3c6bc2c8 100644 Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ diff --git a/config/u-boot/uEnv.txt b/config/u-boot/uEnv.txt index 6edc97715..21780a971 100644 --- a/config/u-boot/uEnv.txt +++ b/config/u-boot/uEnv.txt @@ -1,3 +1,4 @@ KVER=xxxKVERxxx DTBSUNXI=sun8i-h3-nanopi-r1.dtb +root_dev=UUID=xxxROOT-UUIDxxx SERIAL-CONSOLE=ON diff --git a/lfs/flash-images b/lfs/flash-images index dcad81ab3..e9bd0434b 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -215,6 +215,12 @@ endif rm -f $(MNThdd)/etc/grub.d/11_linux_scon endif +ifeq "$(BUILD_ARCH)" "armv5tel" + # Insert the UUID to uENV.txt + sed -i $(MNThdd)/boot/uENV.txt \ + -e "s/^root_dev=.*/root_dev=UUID=$$(blkid -o value -s UUID $(PART_ROOT))/g" +endif + # Set ramdisk mode to automatic echo RAMDISK_MODE=2 > $(MNThdd)/etc/sysconfig/ramdisk diff --git a/lfs/u-boot-friendlyarm b/lfs/u-boot-friendlyarm new file mode 100644 index 000000000..5945ef6c5 --- /dev/null +++ b/lfs/u-boot-friendlyarm @@ -0,0 +1,93 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1ee53f5 + +THISAPP = u-boot-friendlyarm-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/u-boot-$(VER)* +TARGET = $(DIR_INFO)/$(THISAPP) +SUP_ARCH = armv5tel + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = a329359aa0e9211f02526548eb6a6208 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +dist: + @$(PAK) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + +ifeq "${BUILD_ARCH}" "armv5tel" + # Nanopi-R1 eMMC + -mkdir -pv /usr/share/u-boot/nanopi-r1 + cd $(DIR_APP) && cp arch/arm/dts/sun8i-h3-nanopi-m1-plus.dts arch/arm/dts/sun8i-h3-nanopi-r1.dts + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/sunxi/nanopi-r1-add-mac.diff + cd $(DIR_APP) && make CROSS_COMPILE="" nanopi_h3_config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Nanopi-R1 eMMC - IPFire.org"!' .config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_DEFAULT_DEVICE_TREE=.*!CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-nanopi-r1"!' .config + cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" + cd $(DIR_APP) && install -v -m 644 u-boot-sunxi-with-spl.bin \ + /usr/share/u-boot/nanopi-r1 + cd $(DIR_APP) && make distclean +endif + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index d6f6f7147..9613b4e5c 100755 --- a/make.sh +++ b/make.sh @@ -1518,6 +1518,7 @@ buildipfire() { lfsmake2 swig lfsmake2 u-boot lfsmake2 u-boot-kirkwood + lfsmake2 u-boot-friendlyarm lfsmake2 python-typing lfsmake2 python-m2crypto lfsmake2 wireless-regdb diff --git a/src/patches/u-boot/sunxi/nanopi-r1-add-mac.diff b/src/patches/u-boot/sunxi/nanopi-r1-add-mac.diff new file mode 100644 index 000000000..70cf4a6e4 --- /dev/null +++ b/src/patches/u-boot/sunxi/nanopi-r1-add-mac.diff @@ -0,0 +1,15 @@ +diff -Naur u-boot-1ee53f5cff60d4daf9e5b49873932c454d53383a.org/arch/arm/dts/sun8i-h3-n… u-boot-1ee53f5cff60d4daf9e5b49873932c454d53383a/arch/arm/dts/sun8i-h3-nanopi-r1.dts +--- u-boot-1ee53f5cff60d4daf9e5b49873932c454d53383a.org/arch/arm/dts/sun8i-h3-n… 2019-08-05 09:02:22.211159367 +0000 ++++ u-boot-1ee53f5cff60d4daf9e5b49873932c454d53383a/arch/arm/dts/sun8i-h3-nanopi-r1.dts 2019-08-05 09:05:25.745207373 +0000 +@@ -46,6 +46,11 @@ + model = "FriendlyElec NanoPi H3"; + compatible = "friendlyarm,nanopi-m1-plus", "allwinner,sun8i-h3"; + ++ aliases { ++ /* entry to generate a second mac address for the realtek ++ u-boot ignore that it point to wrong device */ ++ ethernet1 = &emac; ++ }; + + reg_gmac_3v3: gmac-3v3 { + compatible = "regulator-fixed"; hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM August 2019