mirrors
/
nanopi-openwrt
mirror of https://github.com/stupidloud/nanopi-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86: use 18.06

pull/891/merge 2021-10-08
John Doe 2021-10-06 04:13:35 +08:00
parent 7876b527e9
commit 993ff5283d
No known key found for this signature in database
GPG Key ID: 30F190E0C359CB4F
9 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/dispatch.yml vendored
View File

@ -17,7 +17,7 @@ jobs:
steps:
- name: Trigger Compile
run: |
if [ ${{ matrix.device }} = 'r1s' ] OR [ ${{ matrix.device }} = 'x86' ]; then
if [ '${{ matrix.device }}' = 'r1s' ] || [ '${{ matrix.device }}' = 'x86' ]; then
branch='18.06';
else
branch='master';

2
.github/workflows/lo-test.yml vendored
View File

@ -209,7 +209,7 @@ jobs:
sed -i 's/$(OPKG) install $(BUILD_PACKAGES)/$(OPKG) install --force-overwrite $(BUILD_PACKAGES)/' Makefile
ls packages/*.ipk | xargs -n1 basename > package.files
PACKAGES=$(cat $GITHUB_WORKSPACE/$DEVICE.config.seed $GITHUB_WORKSPACE/common.seed | grep CONFIG_PACKAGE | grep -v CONFIG_PACKAGE_luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i grep -o {} package.files | sort -u | xargs echo)
[ $DEVICE != 'r1s' ] && PACKAGES="$PACKAGES luci-i18n-opkg-zh-cn"
[ $BRANCH == 'master' ] && PACKAGES="$PACKAGES luci-i18n-opkg-zh-cn"
make image PACKAGES="$PACKAGES $LUCI $LP luci-i18n-base-zh-cn luci-i18n-firewall-zh-cn" FILES="files"
mkdir -p $GITHUB_WORKSPACE/release

3
common.seed
View File

@ -59,6 +59,9 @@ CONFIG_PACKAGE_curl=y
CONFIG_PACKAGE_ddns-scripts_aliyun=y
CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y
CONFIG_PACKAGE_ddns-scripts_dnspod=y
CONFIG_PACKAGE_ddns-scripts-cloudflare=y
CONFIG_PACKAGE_ddns-scripts-dnspod=y
CONFIG_PACKAGE_ddns-scripts-dnspod-com=y
CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
CONFIG_PACKAGE_fdisk=y
CONFIG_PACKAGE_frpc=y

1
r1p.config.seed
View File

@ -25,7 +25,6 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
CONFIG_PACKAGE_collectd-mod-ping=y
CONFIG_PACKAGE_collectd-mod-thermal=y
CONFIG_PACKAGE_ddns-scripts_cloudflare=y
CONFIG_PACKAGE_kmod-drm-rockchip=y

1
r2c.config.seed
View File

@ -25,7 +25,6 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
CONFIG_PACKAGE_collectd-mod-ping=y
CONFIG_PACKAGE_collectd-mod-thermal=y
CONFIG_PACKAGE_ddns-scripts_cloudflare=y
CONFIG_PACKAGE_kmod-drm-rockchip=y

1
r2s.config.seed
View File

@ -25,7 +25,6 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
CONFIG_PACKAGE_collectd-mod-ping=y
CONFIG_PACKAGE_collectd-mod-thermal=y
CONFIG_PACKAGE_ddns-scripts_cloudflare=y
CONFIG_PACKAGE_kmod-drm-rockchip=y

1
r4s.config.seed
View File

@ -25,7 +25,6 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
CONFIG_PACKAGE_collectd-mod-ping=y
CONFIG_PACKAGE_collectd-mod-thermal=y
CONFIG_PACKAGE_ddns-scripts_cloudflare=y
CONFIG_PACKAGE_kmod-drm-rockchip=y

3
scripts/patches.sh
View File

@ -28,14 +28,13 @@ rm -rf luci-app-ssr-plus/
mkdir -p `find package/ -follow -type d -path '*/pdnsd-alt'`/patches
mv $GITHUB_WORKSPACE/patches/99-disallow-aaaa.patch `find package/ -follow -type d -path '*/pdnsd-alt'`/patches
if [ $DEVICE != 'r1s' ]; then
if [ $BRANCH == 'master' ]; then
# fix po path for snapshot
find package/ -follow -type d -path '*/po/zh-cn' | xargs dirname | xargs -n1 -i sh -c "rm -f {}/zh_Hans; ln -sf zh-cn {}/zh_Hans"
# remove non-exist package from x86 profile
sed -i 's/kmod-i40evf//' target/linux/x86/Makefile
sed -i 's/KERNEL_PATCHVER:=5.10/KERNEL_PATCHVER:=5.4/' target/linux/x86/Makefile
# enable r2s oled plugin by default
sed -i "s/enable '0'/enable '1'/" `find package/ -follow -type f -path '*/luci-app-oled/root/etc/config/oled'`

1
x86.config.seed
View File

@ -24,7 +24,6 @@ CONFIG_PACKAGE_luci-theme-openwrt=y
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
CONFIG_PACKAGE_collectd-mod-ping=y
CONFIG_PACKAGE_collectd-mod-thermal=y
CONFIG_PACKAGE_ddns-scripts_cloudflare=y