openwrt 23.05-rc3 / update packages

anaelorlinski · Aug 22, 2023 · afecb52 · afecb52
1 parent efa5c3b
commit afecb52
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 9 deletions.
diff --git a/openwrt-23.05/patches/package/adguardhome/Makefile b/openwrt-23.05/patches/package/adguardhome/Makefile
@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adguardhome
-PKG_VERSION:=0.107.32
+PKG_VERSION:=0.107.36
 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:=2e3e1e09c320a72d809461ca03fc51c597361d5de5972916c157935251d7bf22
+PKG_HASH:=ad449fa35b8919bc71d67fd570bcaae73aa20e8e20d1c682a5570bdae6544a41
 
 PKG_LICENSE:=GPL-3.0-only
 PKG_LICENSE_FILES:=LICENSE.txt

diff --git a/openwrt-23.05/patches/package/haproxy/Makefile b/openwrt-23.05/patches/package/haproxy/Makefile
@@ -10,12 +10,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=haproxy
-PKG_VERSION:=2.8.0
+PKG_VERSION:=2.8.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://www.haproxy.org/download/2.8/src
-PKG_HASH:=61cdafb5db7e9174d0757b8e4bcde938352306fb7cc8ff2b5f55c26dd48a6cf7
+PKG_HASH:=698d6906d170946a869769964e57816ba3da3adf61ff75e89972b137f4658db0
 
 PKG_MAINTAINER:=Thomas Heil <[email protected]>, \
 		Christian Lachner <[email protected]>

diff --git a/openwrt-23.05/patches/package/haproxy/get-latest-patches.sh b/openwrt-23.05/patches/package/haproxy/get-latest-patches.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 CLONEURL=https://git.haproxy.org/git/haproxy-2.8.git
-BASE_TAG=v2.8.0
+BASE_TAG=v2.8.2
 TMP_REPODIR=tmprepo
 PATCHESDIR=patches
 

diff --git a/openwrt-23.05/patches/target/linux/rockchip/armv8/config-5.15 b/openwrt-23.05/patches/target/linux/rockchip/armv8/config-5.15
@@ -116,7 +116,7 @@ CONFIG_CMA_ALIGNMENT=8
 CONFIG_CMA_AREAS=7
 # CONFIG_CMA_DEBUG is not set
 # CONFIG_CMA_DEBUGFS is not set
-CONFIG_CMA_SIZE_MBYTES=64
+CONFIG_CMA_SIZE_MBYTES=16
 # CONFIG_CMA_SIZE_SEL_MAX is not set
 CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_MIN is not set

diff --git a/openwrt-23.05/release-info.md b/openwrt-23.05/release-info.md
@@ -1,7 +1,7 @@
 ## OpenWrt 23.05 (beta)
 
 ### General Info
-- Based of openwrt 23.05.0-rc2
+- Based of openwrt 23.05.0-rc3
 
 ### Configuration
 - OpenWRT 23.05 Vanilla / Kernel 5.15

diff --git a/openwrt-23.05/steps/02_prepare_openwrt_folder.sh b/openwrt-23.05/steps/02_prepare_openwrt_folder.sh
@@ -10,9 +10,9 @@ cd "$ROOTDIR/build"
 
 cp -R openwrt-fresh-23.05 openwrt
 
-# freeze revision to 23.05.0-rc2
+# freeze revision to 23.05.0-rc3
 cd openwrt
-git reset --hard 55ae516f61fa9d38a5080630795070a8e6673088
+git reset --hard 94cd25cb69805ec9b3ecd5a86ab39196c51e5a2e
 
 echo "Current OpenWRT commit"
 git log -1

diff --git a/openwrt-23.05/steps/06-create_config_from_seed.sh b/openwrt-23.05/steps/06-create_config_from_seed.sh
@@ -12,4 +12,11 @@ cd openwrt
 # copy R4S in any case, and then patch if R2S
 cp $ROOTDIR/openwrt-23.05/seed/ao-R5S-$2.seed .config
 
+# $1 is model
+# if model == R2S, then patch .config
+#if [[ "$1" == "R2S" ]]; then
+#    echo "NanoPi R2S model, post patching .config"
+#    sed -i 's/nanopi-r4s/nanopi-r2s/' .config
+#    sed -i 's/cortex-a72.cortex-a53/cortex-a53/' .config
+#fi
 make defconfig