openwrt 22.03.3

Author: anaelorlinski

README.md

@@ -6,11 +6,17 @@ Automated builds of OpenWrt for FriendlyARM NanoPi R2S & R4S boards
 If you like this project you can gift me a coffee !
 [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/donate/?business=8XQTGXAHEAKPY&no_recurring=0&currency_code=EUR)
 
-## OpenWrt branch 22.03 (stable)
+## OpenWrt 22.03.3 (stable)
 
 [Download 22.03 Releases](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/releases?q=OpenWrtAO-22.03&expanded=true) [Changelog](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/blob/main/openwrt-22.03/release-info.md)
+Supported Models : R2S / R4S(1Gb & 4Gb) / R2C (Untested)
 
-## OpenWrt branch 21.02 (EOL)
+## OpenWrt branch master (experimental)
+
+[Download master Releases](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/releases?q=OpenWrtAO-master&expanded=true) [Changelog](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/blob/main/openwrt-master/release-info.md)
+Supported Models : R2S / R4S(1Gb & 4Gb)
+
+## OpenWrt 21.02.5 (EOL)
 
 [Download 21.02 Releases](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/releases?q=OpenWrtAO-21.02&expanded=true) [Changelog](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/blob/main/openwrt-21.02/release-info.md)
 

openwrt-22.03/patches/package/adguardhome/Makefile

@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adguardhome
-PKG_VERSION:=0.107.16
+PKG_VERSION:=0.107.21
 PKG_RELEASE:=1
 
 # WARNING : need rework for other arch
 PKG_SOURCE:=AdGuardHome_linux_arm64.tar.gz
 PKG_SOURCE_URL:=https://github.com/AdguardTeam/AdGuardHome/releases/download/v$(PKG_VERSION)/
-PKG_HASH:=ddca30322d3cd53231eb9760cc13fe624223e08070c8ad5877f827db32fd90e2
+PKG_HASH:=6a386fbf1630b6d11a0905cbe16683723ce4f20d24ae121726fe551c411d7ea8
 
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE.txt

openwrt-22.03/release-info.md

@@ -1,12 +1,10 @@
-## OpenWrt branch 22.03 (stable)
+## OpenWrt 22.03.3 (stable)
 
-### Warning
-- Fully experimental build, still WIP.
-- R2S / R4S patches will be reviwed if still needed
-- Goal is to get rid of iptables if possible.
+### General Info
+- Based of openwrt 22.03.3
 
 ### Configuration
-- OpenWRT 22.03 Vanilla / Kernel 5.10
+- OpenWRT 22.03.3 Vanilla / Kernel 5.10
 - ImmortalWRT patches for Rockchip target NanoPi R2S (rk3328) / NanoPi R4S support (rk3399)
 - NanoPi R4S : r8168 driver for R4S (realtek) instead of kernel r8169 + r8169 firmwares package
 
@@ -18,6 +16,7 @@
 - pbr latest version from https://github.com/stangri/source.openwrt.melmac.net
 
 ### Changelog
+- [2023-01-04] Freeze to OpenWrt 22.03.3 release instead of branch
 - [2022-10-19] Re-Update U-Boot to 2022.07 and use FriendlyWrt patches
 - [2022-09-28] Add kmod-sched
 - [2022-09-27] Revert u-boot to 2021.07 to fix R4S 1Gb broken support

openwrt-22.03/steps/01_clone_openwrt.sh

@@ -10,7 +10,7 @@ cd $ROOTDIR
 mkdir build
 cd build
 
-OPENWRT_FOLDER=openwrt-fresh-2203
+OPENWRT_FOLDER=openwrt-fresh-22.03
 git clone -b openwrt-22.03 --single-branch https://git.openwrt.org/openwrt/openwrt.git $OPENWRT_FOLDER
 cd $OPENWRT_FOLDER
 echo "Current OpenWRT commit"

openwrt-22.03/steps/02_prepare_openwrt_folder.sh

@@ -8,7 +8,15 @@ fi
 
 cd "$ROOTDIR/build"
 
-cp -R openwrt-fresh-2203 openwrt
+cp -R openwrt-fresh-22.03 openwrt
+
+# freeze revision to 22.03.3
+cd openwrt
+git reset --hard 221fbfa2d854ccb6cd003c065ec308fbc0651b11
+
+echo "Current OpenWRT commit"
+git log -1
+git describe
 
 # install feeds
 # cd openwrt

openwrt-22.03/steps/03_patch_openwrt.sh

@@ -9,7 +9,6 @@ fi
 BUILDDIR="$ROOTDIR/build"
 
 cd "$BUILDDIR/openwrt"
-OPENWRT_SUFFIX=2203
 OPENWRT_BRANCH=22.03
 
 # -------------- UBOOT -----------------------------------
@@ -21,7 +20,7 @@ cp -R $ROOTDIR/openwrt-$OPENWRT_BRANCH/patches/package/uboot-rockchip package/bo
 # -------------- target linux/rockchip ----------------
 # replace target rockchip with original one
 rm -rf target/linux/rockchip
-cp -R $BUILDDIR/openwrt-fresh-$OPENWRT_SUFFIX/target/linux/rockchip target/linux/
+cp -R $BUILDDIR/openwrt-fresh-$OPENWRT_BRANCH/target/linux/rockchip target/linux/
 
 # override manually some files in the rockchip target using rsync to merge folders and override same filenames
 rsync -avz $ROOTDIR/openwrt-$OPENWRT_BRANCH/patches/target/ target
@@ -50,7 +49,7 @@ else
 fi
 
 # revert to fresh config
-cp $BUILDDIR/openwrt-fresh-$OPENWRT_SUFFIX/target/linux/generic/config-5.10 target/linux/generic/config-5.10
+cp $BUILDDIR/openwrt-fresh-$OPENWRT_BRANCH/target/linux/generic/config-5.10 target/linux/generic/config-5.10
 
 #cleanup
 if [ -e .config ]; then