Skip to content

Commit ce3c1fc

Browse files
v23.05.0-rc1 released
Signed-off-by: Nicholas Sun <nicholas-sun@outlook.com>
1 parent 8d25007 commit ce3c1fc

File tree

10 files changed

+43
-43
lines changed

10 files changed

+43
-43
lines changed

.github/workflows/R2S-OpenWrt.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ jobs:
2121
- name: Maximize build space
2222
uses: easimon/maximize-build-space@master
2323
with:
24-
swap-size-mb: 2048
25-
root-reserve-mb: 2048
24+
swap-size-mb: 512
25+
temp-reserve-mb: 100
26+
root-reserve-mb: 1280
2627
remove-dotnet: 'true'
2728
remove-android: 'true'
2829
remove-haskell: 'true'
30+
remove-codeql: 'true'
2931
- name: Checkout
3032
uses: actions/checkout@main
3133
- name: Show CPU Model

.github/workflows/R4S-OpenWrt.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ jobs:
2121
- name: Maximize build space
2222
uses: easimon/maximize-build-space@master
2323
with:
24-
swap-size-mb: 2048
25-
root-reserve-mb: 2048
24+
swap-size-mb: 512
25+
temp-reserve-mb: 100
26+
root-reserve-mb: 1280
2627
remove-dotnet: 'true'
2728
remove-android: 'true'
2829
remove-haskell: 'true'
30+
remove-codeql: 'true'
2931
- name: Checkout
3032
uses: actions/checkout@main
3133
- name: Show CPU Model

.github/workflows/X86-OpenWrt.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ jobs:
2121
- name: Maximize build space
2222
uses: easimon/maximize-build-space@master
2323
with:
24-
swap-size-mb: 2048
25-
root-reserve-mb: 2048
24+
swap-size-mb: 512
25+
temp-reserve-mb: 100
26+
root-reserve-mb: 1280
2627
remove-dotnet: 'true'
2728
remove-android: 'true'
2829
remove-haskell: 'true'
30+
remove-codeql: 'true'
2931
- name: Checkout
3032
uses: actions/checkout@main
3133
- name: Show CPU Model

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Password:None
2929

3030
### Version Informations
3131

32-
OpenWrt official v23.05-SNAPSHOT ( Test only, waiting v23.05.0-rc1 )
32+
OpenWrt official v23.05.0-rc1
3333

3434
---
3535
### Feature

SCRIPTS/01_get_ready.sh

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@
22

33
# Clone source code
44
#latest_release="$(curl -s https://api.github.com/repos/openwrt/openwrt/tags | grep -Eo "v23.05.+[0-9\.]" | head -n 1)"
5-
#latest_release="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][0-9]/p' | sed -n 1p | sed 's/.tar.gz//g')"
6-
#git clone --single-branch -b ${latest_release} https://github.com/openwrt/openwrt openwrt_release
5+
latest_release="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][3-9]/p' | sed -n 1p | sed 's/.tar.gz//g')"
6+
git clone --single-branch -b ${latest_release} https://github.com/openwrt/openwrt openwrt_release
77
git clone --single-branch -b openwrt-23.05 https://github.com/openwrt/openwrt openwrt
8-
#rm -f ./openwrt/include/version.mk
9-
#rm -f ./openwrt/include/kernel.mk
10-
#rm -f ./openwrt/include/kernel-5.15
11-
#rm -f ./openwrt/include/kernel-version.mk
12-
#rm -f ./openwrt/include/toolchain-build.mk
13-
#rm -f ./openwrt/include/kernel-defaults.mk
14-
#rm -f ./openwrt/package/base-files/image-config.in
15-
#rm -rf ./openwrt/target/linux/*
16-
#rm -rf ./openwrt/package/kernel/linux/*
17-
#cp -f ./openwrt_release/include/version.mk ./openwrt/include/version.mk
18-
#cp -f ./openwrt_release/include/kernel.mk ./openwrt/include/kernel.mk
19-
#cp -f ./openwrt_release/include/kernel-5.15 ./openwrt/include/kernel-5.15
20-
#cp -f ./openwrt_release/include/kernel-version.mk ./openwrt/include/kernel-version.mk
21-
#cp -f ./openwrt_release/include/toolchain-build.mk ./openwrt/include/toolchain-build.mk
22-
#cp -f ./openwrt_release/include/kernel-defaults.mk ./openwrt/include/kernel-defaults.mk
23-
#cp -f ./openwrt_release/package/base-files/image-config.in ./openwrt/package/base-files/image-config.in
24-
#cp -f ./openwrt_release/version ./openwrt/version
25-
#cp -f ./openwrt_release/version.date ./openwrt/version.date
26-
#cp -rf ./openwrt_release/target/linux/* ./openwrt/target/linux/
27-
#cp -rf ./openwrt_release/package/kernel/linux/* ./openwrt/package/kernel/linux/
8+
rm -f ./openwrt/include/version.mk
9+
rm -f ./openwrt/include/kernel.mk
10+
rm -f ./openwrt/include/kernel-5.15
11+
rm -f ./openwrt/include/kernel-version.mk
12+
rm -f ./openwrt/include/toolchain-build.mk
13+
rm -f ./openwrt/include/kernel-defaults.mk
14+
rm -f ./openwrt/package/base-files/image-config.in
15+
rm -rf ./openwrt/target/linux/*
16+
rm -rf ./openwrt/package/kernel/linux/*
17+
cp -f ./openwrt_release/include/version.mk ./openwrt/include/version.mk
18+
cp -f ./openwrt_release/include/kernel.mk ./openwrt/include/kernel.mk
19+
cp -f ./openwrt_release/include/kernel-5.15 ./openwrt/include/kernel-5.15
20+
cp -f ./openwrt_release/include/kernel-version.mk ./openwrt/include/kernel-version.mk
21+
cp -f ./openwrt_release/include/toolchain-build.mk ./openwrt/include/toolchain-build.mk
22+
cp -f ./openwrt_release/include/kernel-defaults.mk ./openwrt/include/kernel-defaults.mk
23+
cp -f ./openwrt_release/package/base-files/image-config.in ./openwrt/package/base-files/image-config.in
24+
cp -f ./openwrt_release/version ./openwrt/version
25+
cp -f ./openwrt_release/version.date ./openwrt/version.date
26+
cp -rf ./openwrt_release/target/linux/* ./openwrt/target/linux/
27+
cp -rf ./openwrt_release/package/kernel/linux/* ./openwrt/package/kernel/linux/
2828

2929
# Clone packages
3030
git clone -b master --depth 1 https://github.com/immortalwrt/immortalwrt.git immortalwrt

SCRIPTS/02_prepare_package.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ sed -i "s/enabled '0'/enabled '1'/g" feeds/packages/utils/irqbalance/files/irqba
1212
sed -i 's,-SNAPSHOT,,g' include/version.mk
1313
sed -i 's,-SNAPSHOT,,g' package/base-files/image-config.in
1414
# Victoria's secret
15-
rm -rf ./scripts/download.pl
16-
rm -rf ./include/download.mk
17-
cp -rf ../immortalwrt/scripts/download.pl ./scripts/download.pl
18-
cp -rf ../immortalwrt/include/download.mk ./include/download.mk
19-
sed -i '/unshift/d' scripts/download.pl
20-
sed -i '/mirror02/d' scripts/download.pl
2115
echo "net.netfilter.nf_conntrack_helper = 1" >>./package/kernel/linux/files/sysctl-nf-conntrack.conf
2216
sed -i 's/default NODEJS_ICU_SMALL/default NODEJS_ICU_NONE/g' feeds/packages/lang/node/Makefile
2317

SCRIPTS/R2S/02_R2S.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ clear
33

44
## Custom-made
55
# GCC CFlags for R2S
6-
sed -i 's,-mcpu=generic,-mcpu=cortex-a53+crypto,g' include/target.mk
6+
sed -i 's,-mcpu=generic,-march=armv8-a,g' include/target.mk
77
# Overclock or not
88
rm -rf ./target/linux/rockchip/patches-5.15/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch
99
cp -f ../PATCH/overclock/999-rk3328-enable-1512mhz-and-minimum-at-816mhz.patch ./target/linux/rockchip/patches-5.15/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch
@@ -22,7 +22,7 @@ cp -rf ../PATCH/script/cputemp.sh ./package/base-files/files/bin/cputemp
2222
cp -rf ../PATCH/duplicate/files ./files
2323

2424
# Match Vermagic
25-
latest_version="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][0-9]/p' | sed -n 1p | sed 's/v//g' | sed 's/.tar.gz//g')"
25+
latest_release="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][3-9]/p' | sed -n 1p | sed 's/.tar.gz//g' | sed 's/v//g')"
2626
wget https://downloads.openwrt.org/releases/${latest_version}/targets/rockchip/armv8/packages/Packages.gz
2727
zgrep -m 1 "Depends: kernel (=.*)$" Packages.gz | sed -e 's/.*-\(.*\))/\1/' >.vermagic
2828
sed -i -e 's/^\(.\).*vermagic$/\1cp $(TOPDIR)\/.vermagic $(LINUX_DIR)\/.vermagic/' include/kernel-defaults.mk

SCRIPTS/R4S/02_R4S.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ clear
33

44
## Custom-made
55
# GCC CFlags for R4S
6-
sed -i 's,-mcpu=generic,-mcpu=cortex-a72.cortex-a53+crypto,g' include/target.mk
6+
sed -i 's,-mcpu=generic,-march=armv8-a+crc+crypto,g' include/target.mk
77
# Add PWM fans
88
#wget -P target/linux/rockchip/armv8/base-files/etc/init.d/ https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3399/base-files/etc/init.d/fa-rk3399-pwmfan
99
#wget -P target/linux/rockchip/armv8/base-files/usr/bin/ https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3399/base-files/usr/bin/start-rk3399-pwm-fan.sh
@@ -16,7 +16,7 @@ cp -rf ../PATCH/script/cputemp.sh ./package/base-files/files/bin/cputemp
1616
cp -rf ../PATCH/duplicate/files ./files
1717

1818
# Match Vermagic
19-
latest_version="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][0-9]/p' | sed -n 1p | sed 's/v//g' | sed 's/.tar.gz//g')"
19+
latest_release="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][3-9]/p' | sed -n 1p | sed 's/.tar.gz//g' | sed 's/v//g')"
2020
wget https://downloads.openwrt.org/releases/${latest_version}/targets/rockchip/armv8/packages/Packages.gz
2121
zgrep -m 1 "Depends: kernel (=.*)$" Packages.gz | sed -e 's/.*-\(.*\))/\1/' >.vermagic
2222
sed -i -e 's/^\(.\).*vermagic$/\1cp $(TOPDIR)\/.vermagic $(LINUX_DIR)\/.vermagic/' include/kernel-defaults.mk

SCRIPTS/X86/02_X86.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
clear
33

44
# GCC CFlags for x86 and Kernel Settings
5-
sed -i 's/O2/O2 -mtune=goldmont-plus/g' include/target.mk
5+
sed -i 's/O2/O2 -march=x86-64-v2/g' include/target.mk
66

77
# Addition-Trans-zh-master and fix APNS
88
cp -rf ../PATCH/duplicate/addition-trans-zh-x86 ./package/utils/addition-trans-zh
@@ -27,7 +27,7 @@ CONFIG_SMP=y
2727
' >>./target/linux/x86/config-5.15
2828

2929
# Match Vermagic
30-
latest_version="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][0-9]/p' | sed -n 1p | sed 's/v//g' | sed 's/.tar.gz//g')"
30+
latest_release="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][3-9]/p' | sed -n 1p | sed 's/.tar.gz//g' | sed 's/v//g')"
3131
wget https://downloads.openwrt.org/releases/${latest_version}/targets/x86/64/packages/Packages.gz
3232
zgrep -m 1 "Depends: kernel (=.*)$" Packages.gz | sed -e 's/.*-\(.*\))/\1/' >.vermagic
3333
sed -i -e 's/^\(.\).*vermagic$/\1cp $(TOPDIR)\/.vermagic $(LINUX_DIR)\/.vermagic/' include/kernel-defaults.mk

SCRIPTS/switch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# This is a useless file
22
#
3-
# v23.05 branch has released!
3+
# v23.05.0-rc1 has released!
44
#
55
# A
66
# B
77
# C
88
#
99
# Change Lines
1010
#
11-
# 27 May / 2nd compiles
11+
# 12 Jun

0 commit comments

Comments
 (0)