From efa5c3b6799114fa167c0a606efef38c9a0a59a6 Mon Sep 17 00:00:00 2001 From: Anael Orlinski Date: Wed, 28 Jun 2023 15:52:35 +0200 Subject: [PATCH] freeze 23.02.0-rc2 and update packages --- README.md | 2 +- openwrt-23.05/patches/package/adguardhome/Makefile | 4 ++-- openwrt-23.05/patches/package/haproxy/Makefile | 6 +++--- openwrt-23.05/patches/package/haproxy/get-latest-patches.sh | 4 ++-- openwrt-23.05/release-info.md | 5 ++++- openwrt-23.05/steps/01_clone_openwrt.sh | 1 - openwrt-23.05/steps/02_prepare_openwrt_folder.sh | 2 +- workflow-scripts/free_disk_space.sh | 4 +++- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index a0b7a9e..2f4bfed 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Automated builds of OpenWrt for FriendlyARM NanoPi R5S 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¤cy_code=EUR) -## OpenWrt 23.05 (beta) +## OpenWrt 23.05 [Download 23.05 Releases](https://github.com/anaelorlinski/OpenWrt-NanoPi-R5S-Builds/releases?q=OpenWrtAO-23.05&expanded=true) [Changelog](https://github.com/anaelorlinski/OpenWrt-NanoPi-R5S-Builds/blob/main/openwrt-23.05/release-info.md) Supported Models : R5S diff --git a/openwrt-23.05/patches/package/adguardhome/Makefile b/openwrt-23.05/patches/package/adguardhome/Makefile index 7a0af6e..f373981 100644 --- 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.28 +PKG_VERSION:=0.107.32 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:=136401c00d29ac9e01f1aead123f65064027ad851396cc1e38906942c2c1a3d3 +PKG_HASH:=2e3e1e09c320a72d809461ca03fc51c597361d5de5972916c157935251d7bf22 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 index 70b776f..a1f858c 100644 --- 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.6.13 +PKG_VERSION:=2.8.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://www.haproxy.org/download/2.6/src -PKG_HASH:=d69ff5233dbca657132ef280d111222ec1e33f5be1c1937d4e9ff516f63f5243 +PKG_SOURCE_URL:=https://www.haproxy.org/download/2.8/src +PKG_HASH:=61cdafb5db7e9174d0757b8e4bcde938352306fb7cc8ff2b5f55c26dd48a6cf7 PKG_MAINTAINER:=Thomas Heil , \ Christian Lachner diff --git a/openwrt-23.05/patches/package/haproxy/get-latest-patches.sh b/openwrt-23.05/patches/package/haproxy/get-latest-patches.sh index 2e312cc..6b60869 100755 --- 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.6.git -BASE_TAG=v2.6.13 +CLONEURL=https://git.haproxy.org/git/haproxy-2.8.git +BASE_TAG=v2.8.0 TMP_REPODIR=tmprepo PATCHESDIR=patches diff --git a/openwrt-23.05/release-info.md b/openwrt-23.05/release-info.md index 86b02f2..6bee7b0 100644 --- a/openwrt-23.05/release-info.md +++ b/openwrt-23.05/release-info.md @@ -1,12 +1,13 @@ ## OpenWrt 23.05 (beta) ### General Info -- Based of openwrt 23.05 branch +- Based of openwrt 23.05.0-rc2 ### Configuration - OpenWRT 23.05 Vanilla / Kernel 5.15 - ImmortalWRT patches for Rockchip target NanoPi R5S (rk3568) - NanoPi R5S : r8125 Realtek driver +- Console access on HDMI + USB keyboard ### Applications - A useful set of applications from official OpenWrt package feed @@ -16,6 +17,8 @@ - pbr latest version from https://github.com/stangri/source.openwrt.melmac.net ### Changelog +- [2023-06-28] Freeze to 23.05.0-rc2 / Update packages +- [2023-06-21] Update patches - [2023-04-25] Update patches and enable hdmi console - [2023-04-16] Re-add some disabled features and packages - [2023-04-10] Initial build diff --git a/openwrt-23.05/steps/01_clone_openwrt.sh b/openwrt-23.05/steps/01_clone_openwrt.sh index f21fd3a..6df788c 100755 --- a/openwrt-23.05/steps/01_clone_openwrt.sh +++ b/openwrt-23.05/steps/01_clone_openwrt.sh @@ -12,7 +12,6 @@ cd build OPENWRT_FOLDER=openwrt-fresh-23.05 -# for now use master, switch to 23.05 when branch is created git clone -b openwrt-23.05 --single-branch https://git.openwrt.org/openwrt/openwrt.git $OPENWRT_FOLDER #git clone --single-branch https://git.openwrt.org/openwrt/openwrt.git $OPENWRT_FOLDER diff --git a/openwrt-23.05/steps/02_prepare_openwrt_folder.sh b/openwrt-23.05/steps/02_prepare_openwrt_folder.sh index 2e4f419..e8f8456 100755 --- a/openwrt-23.05/steps/02_prepare_openwrt_folder.sh +++ b/openwrt-23.05/steps/02_prepare_openwrt_folder.sh @@ -12,7 +12,7 @@ cp -R openwrt-fresh-23.05 openwrt # freeze revision to 23.05.0-rc2 cd openwrt -#git reset --hard 94adc23fa693d1b129ce1718573dfb12594f20f8 +git reset --hard 55ae516f61fa9d38a5080630795070a8e6673088 echo "Current OpenWRT commit" git log -1 diff --git a/workflow-scripts/free_disk_space.sh b/workflow-scripts/free_disk_space.sh index 44339cd..dd012e7 100755 --- a/workflow-scripts/free_disk_space.sh +++ b/workflow-scripts/free_disk_space.sh @@ -36,7 +36,9 @@ sudo apt-get remove -y '^ghc-8.*' sudo apt-get remove -y '^dotnet-.*' sudo apt-get remove -y '^llvm-.*' sudo apt-get remove -y 'php.*' -sudo apt-get remove -y azure-cli google-cloud-sdk hhvm google-chrome-stable firefox powershell mono-devel +sudo apt-get remove -y 'temurin-.*' +sudo apt-get remove -y 'mono-.*' +sudo apt-get remove -y azure-cli google-cloud-sdk hhvm google-chrome-stable firefox powershell microsoft-edge-stable sudo apt-get autoremove -y sudo apt-get clean df -h