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 c58a9c034764f18311553737fe4deef658dbfc0b (commit) via edb153e209b31d77f23ba849c950ff23343e0e2e (commit) via 37dee2c459dc6e59c34f95f68b015d265b690b9b (commit) via 946a27a28c7812785180c564b7133064ba43feea (commit) via 8b251380b668c45b9b7974a16cbcf12e1f770dca (commit) via 2b1a701ec41e118a996bd379bfb1805146521b4a (commit) via f55ea781c3dc98e0b1dd07ae23b7cfbe408ca588 (commit) via b5784fbc3308214852e3029bccca20e0f63f35a8 (commit) from 092ff6670a71bcd74ae113e70604deeac1d86097 (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 c58a9c034764f18311553737fe4deef658dbfc0b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Apr 28 20:35:15 2023 +0000

samba: aarch64 rootfile update

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit edb153e209b31d77f23ba849c950ff23343e0e2e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Apr 28 19:41:05 2023 +0000

kernel: arm64 rootfile update

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 37dee2c459dc6e59c34f95f68b015d265b690b9b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue May 2 19:35:27 2023 +0000

core175: ship led and partresize initskripts

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 946a27a28c7812785180c564b7133064ba43feea Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Apr 28 19:36:23 2023 +0000

initskripts: add OrangePi R1 Plus LTS

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 8b251380b668c45b9b7974a16cbcf12e1f770dca Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Apr 28 19:36:22 2023 +0000

u-boot: add OrangePi R1 Plus LTS

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 2b1a701ec41e118a996bd379bfb1805146521b4a Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Apr 28 19:36:21 2023 +0000

kernel: add OrangePi R1 Plus LTS

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit f55ea781c3dc98e0b1dd07ae23b7cfbe408ca588 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue May 2 19:32:15 2023 +0000

core175: ship rules.pl

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit b5784fbc3308214852e3029bccca20e0f63f35a8 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Tue Apr 25 20:40:09 2023 +0200

firewall: Allow traffic from multicast networks

The multicast network segment 224.0.0.0/4 is used for a lot of different services provided by the local ISP's. (IPTV etc.)

We have to allow traffic from this networks when using one of the BOGON blocklists in order to get those ISP services still accessable.

https://www.iana.org/assignments/multicast-addresses/multicast-addresses.xht...

Fixes 13092.

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/firewall/rules.pl | 1 + config/rootfiles/common/aarch64/linux | 11 +- config/rootfiles/common/aarch64/u-boot | 2 + config/rootfiles/core/175/filelists/files | 3 + config/rootfiles/packages/aarch64/samba | 17 ++- lfs/linux | 4 +- lfs/u-boot | 19 ++- src/initscripts/system/leds | 11 ++ src/initscripts/system/partresize | 10 +- ... add-nanopi-r2c-and-orangepi-r1-plus-lts.patch} | 148 ++++++++++++++++++++- 10 files changed, 214 insertions(+), 12 deletions(-) rename src/patches/u-boot/rockchip/{add_nanopi-r2c.patch => add-nanopi-r2c-and-orangepi-r1-plus-lts.patch} (52%)

Difference in files: diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 6c08feb86..7edb910e2 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -55,6 +55,7 @@ my @PRIVATE_NETWORKS = ( "172.16.0.0/12", "192.168.0.0/16", "100.64.0.0/10", + "224.0.0.0/4", );

# MARK masks diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 8d7686427..023bf52fe 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -297,6 +297,10 @@ boot/dtb-KVER-ipfire #boot/dtb-KVER-ipfire/rockchip/rk3328-nanopi-r2c.dtb #boot/dtb-KVER-ipfire/rockchip/rk3328-nanopi-r2s-oc.dtb #boot/dtb-KVER-ipfire/rockchip/rk3328-nanopi-r2s.dtb +#boot/dtb-KVER-ipfire/rockchip/rk3328-orangepi-r1-plus-lts-oc.dtb +#boot/dtb-KVER-ipfire/rockchip/rk3328-orangepi-r1-plus-lts.dtb +#boot/dtb-KVER-ipfire/rockchip/rk3328-orangepi-r1-plus-oc.dtb +#boot/dtb-KVER-ipfire/rockchip/rk3328-orangepi-r1-plus.dtb #boot/dtb-KVER-ipfire/rockchip/rk3328-roc-cc.dtb #boot/dtb-KVER-ipfire/rockchip/rk3328-roc-pc.dtb #boot/dtb-KVER-ipfire/rockchip/rk3328-rock-pi-e.dtb @@ -6857,7 +6861,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/ARCH_WANT_DEFAULT_BPF_JIT #lib/modules/KVER-ipfire/build/include/config/ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT #lib/modules/KVER-ipfire/build/include/config/ARCH_WANT_FRAME_POINTERS -#lib/modules/KVER-ipfire/build/include/config/ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP #lib/modules/KVER-ipfire/build/include/config/ARCH_WANT_HUGE_PMD_SHARE #lib/modules/KVER-ipfire/build/include/config/ARCH_WANT_LD_ORPHAN_WARN #lib/modules/KVER-ipfire/build/include/config/ARC_EMAC_CORE @@ -7763,7 +7766,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/DRM_TTM #lib/modules/KVER-ipfire/build/include/config/DRM_TTM_HELPER #lib/modules/KVER-ipfire/build/include/config/DRM_UDL -#lib/modules/KVER-ipfire/build/include/config/DRM_USE_DYNAMIC_DEBUG #lib/modules/KVER-ipfire/build/include/config/DRM_V3D #lib/modules/KVER-ipfire/build/include/config/DRM_VC4 #lib/modules/KVER-ipfire/build/include/config/DRM_VC4_HDMI_CEC @@ -9275,7 +9277,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/NET_CLS_ROUTE4 #lib/modules/KVER-ipfire/build/include/config/NET_CLS_RSVP #lib/modules/KVER-ipfire/build/include/config/NET_CLS_RSVP6 -#lib/modules/KVER-ipfire/build/include/config/NET_CLS_TCINDEX #lib/modules/KVER-ipfire/build/include/config/NET_CLS_U32 #lib/modules/KVER-ipfire/build/include/config/NET_CORE #lib/modules/KVER-ipfire/build/include/config/NET_DEVLINK @@ -10086,6 +10087,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/RTC_CLASS #lib/modules/KVER-ipfire/build/include/config/RTC_DRV_88PM80X #lib/modules/KVER-ipfire/build/include/config/RTC_DRV_88PM860X +#lib/modules/KVER-ipfire/build/include/config/RTC_DRV_ARMADA38X #lib/modules/KVER-ipfire/build/include/config/RTC_DRV_BQ32K #lib/modules/KVER-ipfire/build/include/config/RTC_DRV_BQ4802 #lib/modules/KVER-ipfire/build/include/config/RTC_DRV_DS1286 @@ -10369,7 +10371,6 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/SERIAL_FSL_LINFLEXUART #lib/modules/KVER-ipfire/build/include/config/SERIAL_FSL_LINFLEXUART_CONSOLE #lib/modules/KVER-ipfire/build/include/config/SERIAL_FSL_LPUART -#lib/modules/KVER-ipfire/build/include/config/SERIAL_FSL_LPUART_CONSOLE #lib/modules/KVER-ipfire/build/include/config/SERIAL_IMX #lib/modules/KVER-ipfire/build/include/config/SERIAL_IMX_CONSOLE #lib/modules/KVER-ipfire/build/include/config/SERIAL_IMX_EARLYCON @@ -21389,6 +21390,7 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/rtc #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-88pm80x.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-88pm860x.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-armada38x.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-bq32k.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-bq4802.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1286.ko.xz @@ -22181,7 +22183,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/net/sched/cls_route.ko.xz #lib/modules/KVER-ipfire/kernel/net/sched/cls_rsvp.ko.xz #lib/modules/KVER-ipfire/kernel/net/sched/cls_rsvp6.ko.xz -#lib/modules/KVER-ipfire/kernel/net/sched/cls_tcindex.ko.xz #lib/modules/KVER-ipfire/kernel/net/sched/cls_u32.ko.xz #lib/modules/KVER-ipfire/kernel/net/sched/em_cmp.ko.xz #lib/modules/KVER-ipfire/kernel/net/sched/em_ipset.ko.xz diff --git a/config/rootfiles/common/aarch64/u-boot b/config/rootfiles/common/aarch64/u-boot index 4b2dcd4fd..a9b9ed435 100644 --- a/config/rootfiles/common/aarch64/u-boot +++ b/config/rootfiles/common/aarch64/u-boot @@ -12,6 +12,8 @@ usr/share/u-boot/nanopi_r2c/u-boot-rockchip.bin usr/share/u-boot/nanopi_r2s/u-boot-rockchip.bin #usr/share/u-boot/nanopi_r4s usr/share/u-boot/nanopi_r4s/u-boot-rockchip.bin +#usr/share/u-boot/orangepi_r1_plus_lts +usr/share/u-boot/orangepi_r1_plus_lts/u-boot-rockchip.bin #usr/share/u-boot/orangepi_zero_plus usr/share/u-boot/orangepi_zero_plus/u-boot-sunxi-with-spl.bin #usr/share/u-boot/rpi diff --git a/config/rootfiles/core/175/filelists/files b/config/rootfiles/core/175/filelists/files index 78a23c7d3..dad266e7e 100644 --- a/config/rootfiles/core/175/filelists/files +++ b/config/rootfiles/core/175/filelists/files @@ -1,4 +1,6 @@ etc/rc.d/init.d/firewall +etc/rc.d/init.d/leds +etc/rc.d/init.d/partresize lib/firmware/amdgpu/dcn_3_1_4_dmcub.bin lib/firmware/amdgpu/gc_11_0_1_imu.bin lib/firmware/amdgpu/gc_11_0_1_me.bin @@ -80,3 +82,4 @@ lib/firmware/rtlwifi/rtl8710bufw_SMIC.bin lib/firmware/rtlwifi/rtl8710bufw_UMC.bin lib/firmware/rtw88/rtw8822c_fw.bin lib/firmware/rtw89/rtw8852b_fw-1.bin +usr/lib/firewall/rules.pl diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index 75c95b395..40ccec083 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -62,6 +62,7 @@ usr/bin/wbinfo #usr/include/samba-4.0/gen_ndr #usr/include/samba-4.0/gen_ndr/atsvc.h #usr/include/samba-4.0/gen_ndr/auth.h +#usr/include/samba-4.0/gen_ndr/claims.h #usr/include/samba-4.0/gen_ndr/dcerpc.h #usr/include/samba-4.0/gen_ndr/drsblobs.h #usr/include/samba-4.0/gen_ndr/drsuapi.h @@ -196,7 +197,7 @@ usr/lib/libtevent-util.so.0 usr/lib/libtevent-util.so.0.0.1 usr/lib/libwbclient.so usr/lib/libwbclient.so.0 -usr/lib/libwbclient.so.0.15 +usr/lib/libwbclient.so.0.16 #usr/lib/pkgconfig/dcerpc.pc #usr/lib/pkgconfig/dcerpc_samr.pc #usr/lib/pkgconfig/ndr.pc @@ -223,6 +224,7 @@ usr/lib/python3.10/site-packages/samba/auth.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/auth_util.py usr/lib/python3.10/site-packages/samba/colour.py usr/lib/python3.10/site-packages/samba/common.py +usr/lib/python3.10/site-packages/samba/compression.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/credentials.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/crypto.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/dbchecker.py @@ -231,6 +233,7 @@ usr/lib/python3.10/site-packages/samba/dcerpc/__init__.py usr/lib/python3.10/site-packages/samba/dcerpc/atsvc.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/dcerpc/auth.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/dcerpc/base.cpython-310-aarch64-linux-gnu.so +usr/lib/python3.10/site-packages/samba/dcerpc/claims.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/dcerpc/dcerpc.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/dcerpc/dfs.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/dcerpc/dns.cpython-310-aarch64-linux-gnu.so @@ -382,6 +385,8 @@ usr/lib/python3.10/site-packages/samba/provision/kerberos_implementation.py usr/lib/python3.10/site-packages/samba/provision/sambadns.py usr/lib/python3.10/site-packages/samba/registry.cpython-310-aarch64-linux-gnu.so usr/lib/python3.10/site-packages/samba/remove_dc.py +usr/lib/python3.10/site-packages/samba/reparse_symlink.cpython-310-aarch64-linux-gnu.so +usr/lib/python3.10/site-packages/samba/safe_tarfile.py #usr/lib/python3.10/site-packages/samba/samba3 usr/lib/python3.10/site-packages/samba/samba3/__init__.py usr/lib/python3.10/site-packages/samba/samba3/libsmb_samba_cwrapper.cpython-310-aarch64-linux-gnu.so @@ -437,6 +442,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/blackbox/traffic_summary.py #usr/lib/python3.10/site-packages/samba/tests/common.py #usr/lib/python3.10/site-packages/samba/tests/complex_expressions.py +#usr/lib/python3.10/site-packages/samba/tests/compression.py #usr/lib/python3.10/site-packages/samba/tests/core.py #usr/lib/python3.10/site-packages/samba/tests/cred_opt.py #usr/lib/python3.10/site-packages/samba/tests/credentials.py @@ -507,9 +513,11 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/krb5/alias_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/as_canonicalization_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/as_req_tests.py +#usr/lib/python3.10/site-packages/samba/tests/krb5/claims_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/compatability_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/etype_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/fast_tests.py +#usr/lib/python3.10/site-packages/samba/tests/krb5/group_tests.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kcrypto.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_base_test.py #usr/lib/python3.10/site-packages/samba/tests/krb5/kdc_tests.py @@ -540,6 +548,7 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/ldap_referrals.py #usr/lib/python3.10/site-packages/samba/tests/ldap_spn.py #usr/lib/python3.10/site-packages/samba/tests/ldap_upn_sam_account.py +#usr/lib/python3.10/site-packages/samba/tests/libsmb-basic.py #usr/lib/python3.10/site-packages/samba/tests/libsmb.py #usr/lib/python3.10/site-packages/samba/tests/loadparm.py #usr/lib/python3.10/site-packages/samba/tests/logfiles.py @@ -577,12 +586,14 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/pso.py #usr/lib/python3.10/site-packages/samba/tests/py_credentials.py #usr/lib/python3.10/site-packages/samba/tests/registry.py +#usr/lib/python3.10/site-packages/samba/tests/reparsepoints.py #usr/lib/python3.10/site-packages/samba/tests/s3_net_join.py #usr/lib/python3.10/site-packages/samba/tests/s3idmapdb.py #usr/lib/python3.10/site-packages/samba/tests/s3param.py #usr/lib/python3.10/site-packages/samba/tests/s3passdb.py #usr/lib/python3.10/site-packages/samba/tests/s3registry.py #usr/lib/python3.10/site-packages/samba/tests/s3windb.py +#usr/lib/python3.10/site-packages/samba/tests/safe_tarfile.py #usr/lib/python3.10/site-packages/samba/tests/samba3sam.py #usr/lib/python3.10/site-packages/samba/tests/samba_tool #usr/lib/python3.10/site-packages/samba/tests/samba_tool/__init__.py @@ -632,6 +643,9 @@ usr/lib/python3.10/site-packages/samba/tdb_util.py #usr/lib/python3.10/site-packages/samba/tests/sid_strings.py #usr/lib/python3.10/site-packages/samba/tests/smb-notify.py #usr/lib/python3.10/site-packages/samba/tests/smb.py +#usr/lib/python3.10/site-packages/samba/tests/smb1posix.py +#usr/lib/python3.10/site-packages/samba/tests/smb2symlink.py +#usr/lib/python3.10/site-packages/samba/tests/smb3unix.py #usr/lib/python3.10/site-packages/samba/tests/smbconf.py #usr/lib/python3.10/site-packages/samba/tests/smbd_base.py #usr/lib/python3.10/site-packages/samba/tests/smbd_fuzztest.py @@ -783,6 +797,7 @@ usr/lib/samba/libsmbd-shim-samba4.so usr/lib/samba/libsmbldaphelper-samba4.so usr/lib/samba/libsmbpasswdparser-samba4.so usr/lib/samba/libsocket-blocking-samba4.so +usr/lib/samba/libstable-sort-samba4.so usr/lib/samba/libsys-rw-samba4.so usr/lib/samba/libtalloc-report-printf-samba4.so usr/lib/samba/libtalloc-report-samba4.so diff --git a/lfs/linux b/lfs/linux index e48374f1e..85f767799 100644 --- a/lfs/linux +++ b/lfs/linux @@ -25,7 +25,7 @@ include Config

VER = 6.1.24 -ARM_PATCHES = 6.1.y-ipfire1 +ARM_PATCHES = 6.1.y-ipfire2

THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -76,7 +76,7 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz

$(DL_FILE)_BLAKE2 = 2f20ad999655226bc79caca109bde0f940420d87a293cf000f2d8304122bdfcc388c1a558ff26f2f551c9b6133b8fb120dbd537f914e1b88d0fbbd5408e648b0 -arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 2181ba20d1c9d2752d67438784da12470f5c9cb8acc4eb748637ae1e8bf9d7cd0e7a08a51fad5cac98764d46ae6a20521ddda31da7002d48dbd180ff04a4d9aa +arm-multi-patches-$(ARM_PATCHES).patch.xz_BLAKE2 = 7afc460562fb24bcd75784fc79de768f9b60780aedd88d1a847927169e31920bbb475b1ac1466c4a224a7876d16bd8d465b96202de12b74f6e2ccbfcec731ad3

install : $(TARGET)

diff --git a/lfs/u-boot b/lfs/u-boot index cea74e64c..2ad92df05 100644 --- a/lfs/u-boot +++ b/lfs/u-boot @@ -138,7 +138,7 @@ ifneq "$(MKIMAGE)" "1" cd $(DIR_APP) && make distclean

# Nanopi R2C - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/rockchip/add_nanopi-r2c.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/rockchip/add-nanopi-r2c-and-orangepi-r1-plus-lts.patch cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER) cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-$(ATF_VER).tar.gz cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=rk3328 ARCH=aarch64 DEBUG=0 bl31 LDFLAGS="$(LDFLAGS)" @@ -156,6 +156,23 @@ ifneq "$(MKIMAGE)" "1" /usr/share/u-boot/nanopi_r2c/u-boot-rockchip.bin cd $(DIR_APP) && make distclean

+ # Orangepi R1 plus lts + cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER) + cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-$(ATF_VER).tar.gz + cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=rk3328 ARCH=aarch64 DEBUG=0 bl31 LDFLAGS="$(LDFLAGS)" + cd $(DIR_APP) && cp arm-trusted-firmware-$(ATF_VER)/build/rk3328/release/bl31/bl31.elf bl31.elf + cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER) + -mkdir -pv /usr/share/u-boot/orangepi_r1_plus_lts + + cd $(DIR_APP) && make CROSS_COMPILE="" orangepi-r1-plus-lts-rk3328_config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" OrangePi R1 plus lts - IPFire.org"!' .config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_BOOTCOMMAND=.*!CONFIG_BOOTCOMMAND="console=ttyS2,115200n8;run distro_bootcmd"!' .config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_BAUDRATE=.*!CONFIG_BAUDRATE=115200!' .config + cd $(DIR_APP) && sed -i -e 's!.*CONFIG_ENV_OVERWRITE.*!CONFIG_ENV_OVERWRITE=y!' .config + cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" + cd $(DIR_APP) && install -v -m 644 u-boot-rockchip.bin \ + /usr/share/u-boot/orangepi_r1_plus_lts/u-boot-rockchip.bin + cd $(DIR_APP) && make distclean

# Nanopi R4S # arm trusted firmware for rk3399 cannot build without cortex m0 gcc crosscompiler diff --git a/src/initscripts/system/leds b/src/initscripts/system/leds index 7522ce94d..464a71043 100644 --- a/src/initscripts/system/leds +++ b/src/initscripts/system/leds @@ -144,6 +144,11 @@ case "${1}" in setup_netdev_trigger nanopi-r4s:green:wan ${RED_DEV} tx rx setup_netdev_trigger nanopi-r4s:green:lan ${GREEN_DEV} tx rx

+ # OrangePi R1 Plus + setup_heartbeat_trigger red:status + setup_netdev_trigger green:wan ${RED_DEV} tx rx + setup_netdev_trigger green:lan ${GREEN_DEV} tx rx + exit 0 ;;

@@ -190,6 +195,12 @@ case "${1}" in disable_led_trigger nanopi-r4s:green:wan disable_led_trigger nanopi-r4s:green:lan

+ # OrangePi R1 Plus stop + disable_led_trigger red:status + enable_led red:status + disable_led_trigger green:wan + disable_led_trigger green:lan + exit 0 ;;

diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize index 147405e1e..272fbe482 100644 --- a/src/initscripts/system/partresize +++ b/src/initscripts/system/partresize @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@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 # @@ -71,6 +71,14 @@ case "${1}" in echo ethaddr=$SWMAC:00 >> /boot/uEnv.txt echo eth1addr=$SWMAC:01 >> /boot/uEnv.txt ;; + Xunlong\ Orange\ Pi\ R1\ Plus* ) + # Generate MAC address at first boot + # This board should have mac addresses in rom but uboot + # doesnt set it for fist nic + SWMAC=`printf "%1x2:%02x:%02x:%02x:%02x" $[RANDOM%16] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256] $[RANDOM%256]` + echo ethaddr=$SWMAC:00 >> /boot/uEnv.txt + echo eth1addr=$SWMAC:01 >> /boot/uEnv.txt + ;; esac 2>/dev/null

if [ -e /boot/grub/grub.cfg ]; then diff --git a/src/patches/u-boot/rockchip/add_nanopi-r2c.patch b/src/patches/u-boot/rockchip/add-nanopi-r2c-and-orangepi-r1-plus-lts.patch similarity index 52% rename from src/patches/u-boot/rockchip/add_nanopi-r2c.patch rename to src/patches/u-boot/rockchip/add-nanopi-r2c-and-orangepi-r1-plus-lts.patch index 9e330041f..99712be03 100644 --- a/src/patches/u-boot/rockchip/add_nanopi-r2c.patch +++ b/src/patches/u-boot/rockchip/add-nanopi-r2c-and-orangepi-r1-plus-lts.patch @@ -1,14 +1,16 @@ diff -Naur u-boot-2022.10.org/arch/arm/dts/Makefile u-boot-2022.10/arch/arm/dts/Makefile --- u-boot-2022.10.org/arch/arm/dts/Makefile 2022-10-03 19:25:32.000000000 +0000 -+++ u-boot-2022.10/arch/arm/dts/Makefile 2023-04-22 15:02:25.945603949 +0000 -@@ -124,6 +124,7 @@ ++++ u-boot-2022.10/arch/arm/dts/Makefile 2023-04-27 16:16:35.697116372 +0000 +@@ -124,7 +124,9 @@

dtb-$(CONFIG_ROCKCHIP_RK3328) += \ rk3328-evb.dtb \ + rk3328-nanopi-r2c.dtb \ rk3328-nanopi-r2s.dtb \ ++ rk3328-orangepi-r1-plus-lts.dtb \ rk3328-roc-cc.dtb \ rk3328-rock64.dtb \ + rk3328-rock-pi-e.dtb diff -Naur u-boot-2022.10.org/arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi u-boot-2022.10/arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi --- u-boot-2022.10.org/arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2022.10/arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi 2023-04-22 15:07:54.544953841 +0000 @@ -51,6 +53,32 @@ diff -Naur u-boot-2022.10.org/arch/arm/dts/rk3328-nanopi-r2c.dts u-boot-2022.10/ + vqmmc-supply = <&vcc18_emmc>; + status = "okay"; +}; +diff -Naur u-boot-2022.10.org/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi u-boot-2022.10/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi +--- u-boot-2022.10.org/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2022.10/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi 2023-04-27 16:12:50.320850145 +0000 +@@ -0,0 +1,6 @@ ++// SPDX-License-Identifier: GPL-2.0+ ++/* ++ */ ++ ++#include "rk3328-nanopi-r2s-u-boot.dtsi" ++#include "rk3328-sdram-lpddr3-666.dtsi" +diff -Naur u-boot-2022.10.org/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts u-boot-2022.10/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts +--- u-boot-2022.10.org/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2022.10/arch/arm/dts/rk3328-orangepi-r1-plus-lts.dts 2023-04-27 16:14:56.582755127 +0000 +@@ -0,0 +1,12 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ */ ++ ++/dts-v1/; ++#include "rk3328-nanopi-r2s.dts" ++ ++/ { ++ model = "Xunlong Orange Pi R1 Plus"; ++ compatible = "xunlong,orangepi-r1-plus", "rockchip,rk3328"; ++}; ++ diff -Naur u-boot-2022.10.org/configs/nanopi-r2c-rk3328_defconfig u-boot-2022.10/configs/nanopi-r2c-rk3328_defconfig --- u-boot-2022.10.org/configs/nanopi-r2c-rk3328_defconfig 1970-01-01 00:00:00.000000000 +0000 +++ u-boot-2022.10/configs/nanopi-r2c-rk3328_defconfig 2023-04-22 15:09:20.843584447 +0000 @@ -167,3 +195,119 @@ diff -Naur u-boot-2022.10.org/configs/nanopi-r2c-rk3328_defconfig u-boot-2022.10 +CONFIG_SPL_TINY_MEMSET=y +CONFIG_TPL_TINY_MEMSET=y +CONFIG_ERRNO_STR=y +diff -Naur u-boot-2022.10.org/configs/orangepi-r1-plus-lts-rk3328_defconfig u-boot-2022.10/configs/orangepi-r1-plus-lts-rk3328_defconfig +--- u-boot-2022.10.org/configs/orangepi-r1-plus-lts-rk3328_defconfig 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2022.10/configs/orangepi-r1-plus-lts-rk3328_defconfig 2023-04-27 16:19:41.122065498 +0000 +@@ -0,0 +1,112 @@ ++CONFIG_ARM=y ++CONFIG_SKIP_LOWLEVEL_INIT=y ++CONFIG_COUNTER_FREQUENCY=24000000 ++CONFIG_ARCH_ROCKCHIP=y ++CONFIG_SYS_TEXT_BASE=0x00200000 ++CONFIG_SPL_GPIO=y ++CONFIG_NR_DRAM_BANKS=1 ++CONFIG_ENV_OFFSET=0x3F8000 ++CONFIG_DEFAULT_DEVICE_TREE="rk3328-orangepi-r1-plus-lts" ++CONFIG_ROCKCHIP_RK3328=y ++CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y ++CONFIG_TPL_LIBCOMMON_SUPPORT=y ++CONFIG_TPL_LIBGENERIC_SUPPORT=y ++CONFIG_SPL_DRIVERS_MISC=y ++CONFIG_SPL_STACK_R_ADDR=0x600000 ++CONFIG_DEBUG_UART_BASE=0xFF130000 ++CONFIG_DEBUG_UART_CLOCK=24000000 ++CONFIG_SYS_LOAD_ADDR=0x800800 ++CONFIG_DEBUG_UART=y ++CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y ++CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000 ++CONFIG_TPL_SYS_MALLOC_F_LEN=0x800 ++# CONFIG_ANDROID_BOOT_IMAGE is not set ++CONFIG_FIT=y ++CONFIG_FIT_VERBOSE=y ++CONFIG_SPL_LOAD_FIT=y ++CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-orangepi-r1-plus-lts.dtb" ++# CONFIG_DISPLAY_CPUINFO is not set ++CONFIG_DISPLAY_BOARDINFO_LATE=y ++CONFIG_MISC_INIT_R=y ++CONFIG_SPL_MAX_SIZE=0x40000 ++CONFIG_SPL_PAD_TO=0x7f8000 ++CONFIG_SPL_HAS_BSS_LINKER_SECTION=y ++CONFIG_SPL_BSS_START_ADDR=0x2000000 ++CONFIG_SPL_BSS_MAX_SIZE=0x2000 ++# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set ++# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set ++CONFIG_SPL_STACK=0x400000 ++CONFIG_SPL_STACK_R=y ++CONFIG_SPL_I2C=y ++CONFIG_SPL_POWER=y ++CONFIG_SPL_ATF=y ++CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y ++CONFIG_TPL_SYS_MALLOC_SIMPLE=y ++CONFIG_CMD_BOOTZ=y ++CONFIG_CMD_GPT=y ++CONFIG_CMD_MMC=y ++CONFIG_CMD_USB=y ++# CONFIG_CMD_SETEXPR is not set ++CONFIG_CMD_TIME=y ++CONFIG_SPL_OF_CONTROL=y ++CONFIG_TPL_OF_CONTROL=y ++CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" ++CONFIG_TPL_OF_PLATDATA=y ++CONFIG_ENV_IS_IN_MMC=y ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_SYS_MMC_ENV_DEV=1 ++CONFIG_NET_RANDOM_ETHADDR=y ++CONFIG_TPL_DM=y ++CONFIG_REGMAP=y ++CONFIG_SPL_REGMAP=y ++CONFIG_TPL_REGMAP=y ++CONFIG_SYSCON=y ++CONFIG_SPL_SYSCON=y ++CONFIG_TPL_SYSCON=y ++CONFIG_CLK=y ++CONFIG_SPL_CLK=y ++CONFIG_FASTBOOT_BUF_ADDR=0x800800 ++CONFIG_FASTBOOT_CMD_OEM_FORMAT=y ++CONFIG_ROCKCHIP_GPIO=y ++CONFIG_SYS_I2C_ROCKCHIP=y ++CONFIG_MMC_DW=y ++CONFIG_MMC_DW_ROCKCHIP=y ++CONFIG_SF_DEFAULT_SPEED=20000000 ++CONFIG_ETH_DESIGNWARE=y ++CONFIG_GMAC_ROCKCHIP=y ++CONFIG_PINCTRL=y ++CONFIG_SPL_PINCTRL=y ++CONFIG_DM_PMIC=y ++CONFIG_PMIC_RK8XX=y ++CONFIG_SPL_PMIC_RK8XX=y ++CONFIG_SPL_DM_REGULATOR=y ++CONFIG_REGULATOR_PWM=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_SPL_DM_REGULATOR_FIXED=y ++CONFIG_REGULATOR_RK8XX=y ++CONFIG_PWM_ROCKCHIP=y ++CONFIG_RAM=y ++CONFIG_SPL_RAM=y ++CONFIG_TPL_RAM=y ++CONFIG_DM_RESET=y ++CONFIG_BAUDRATE=1500000 ++CONFIG_DEBUG_UART_SHIFT=2 ++CONFIG_SYSINFO=y ++CONFIG_SYSRESET=y ++# CONFIG_TPL_SYSRESET is not set ++CONFIG_USB=y ++CONFIG_USB_XHCI_HCD=y ++CONFIG_USB_XHCI_DWC3=y ++CONFIG_USB_EHCI_HCD=y ++CONFIG_USB_EHCI_GENERIC=y ++CONFIG_USB_OHCI_HCD=y ++CONFIG_USB_OHCI_GENERIC=y ++CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS=1 ++CONFIG_USB_DWC2=y ++CONFIG_USB_DWC3=y ++# CONFIG_USB_DWC3_GADGET is not set ++CONFIG_USB_GADGET=y ++CONFIG_USB_GADGET_DWC2_OTG=y ++CONFIG_SPL_TINY_MEMSET=y ++CONFIG_TPL_TINY_MEMSET=y ++CONFIG_ERRNO_STR=y

hooks/post-receive -- IPFire 2.x development tree