Skip to content

Commit cda0158

Browse files
alecthwalecthw
committed
add daed immortalwrt-common-x86-amd64
1 parent ccdd33a commit cda0158

File tree

20 files changed

+177
-11
lines changed

20 files changed

+177
-11
lines changed

‎.github/workflows/build-n1.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ jobs:
7373
sudo -E apt -y purge azure-cli* docker* ghc* zulu* llvm* firefox google* dotnet* powershell* openjdk* mysql* php* mongodb* dotnet* snap*
7474
sudo -E apt -y full-upgrade
7575
sudo -E apt -y install ack antlr3 aria2 asciidoc autoconf automake autopoint binutils bison build-essential bzip2 ccache cmake cpio curl device-tree-compiler fastjar flex gawk gettext gcc-multilib g++-multilib git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libglib2.0-dev libgmp3-dev libltdl-dev libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libreadline-dev libssl-dev libtool lrzsz mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python3 python3-pip python3-pyelftools libpython3-dev qemu-utils rsync scons squashfs-tools subversion swig texinfo uglifyjs upx-ucl unzip vim wget xmlto xxd zlib1g-dev
76+
sudo -E apt -y install clang llvm npm
7677
sudo -E systemctl daemon-reload
7778
sudo -E apt -y autoremove --purge
7879
sudo -E apt -y clean

‎.github/workflows/build-openwrt.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
- lede-common-r2s-arm64
3737
- lede-common-360t7-arm64
3838
- lede-common-newifi_d2-mipsle_softfloat
39+
- immortalwrt-common-x86-amd64
3940
- immortalwrt-openclash-x86-amd64
4041

4142
steps:
@@ -79,6 +80,7 @@ jobs:
7980
sudo -E apt -y purge azure-cli* docker* ghc* zulu* llvm* firefox google* dotnet* powershell* openjdk* mysql* php* mongodb* dotnet* snap*
8081
sudo -E apt -y full-upgrade
8182
sudo -E apt -y install ack antlr3 aria2 asciidoc autoconf automake autopoint binutils bison build-essential bzip2 ccache cmake cpio curl device-tree-compiler fastjar flex gawk gettext gcc-multilib g++-multilib git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libglib2.0-dev libgmp3-dev libltdl-dev libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libreadline-dev libssl-dev libtool lrzsz mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python3 python3-pip python3-pyelftools libpython3-dev qemu-utils rsync scons squashfs-tools subversion swig texinfo uglifyjs upx-ucl unzip vim wget xmlto xxd zlib1g-dev
83+
sudo -E apt -y install clang llvm npm
8284
sudo -E systemctl daemon-reload
8385
sudo -E apt -y autoremove --purge
8486
sudo -E apt -y clean

‎.github/workflows/build-private.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ jobs:
7777
sudo -E apt -y purge azure-cli* docker* ghc* zulu* llvm* firefox google* dotnet* powershell* openjdk* mysql* php* mongodb* dotnet* snap*
7878
sudo -E apt -y full-upgrade
7979
sudo -E apt -y install ack antlr3 aria2 asciidoc autoconf automake autopoint binutils bison build-essential bzip2 ccache cmake cpio curl device-tree-compiler fastjar flex gawk gettext gcc-multilib g++-multilib git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libglib2.0-dev libgmp3-dev libltdl-dev libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libreadline-dev libssl-dev libtool lrzsz mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python3 python3-pip python3-pyelftools libpython3-dev qemu-utils rsync scons squashfs-tools subversion swig texinfo uglifyjs upx-ucl unzip vim wget xmlto xxd zlib1g-dev
80+
sudo -E apt -y install clang llvm npm
8081
sudo -E systemctl daemon-reload
8182
sudo -E apt -y autoremove --purge
8283
sudo -E apt -y clean

‎localbuild.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ do_compile() {
170170
}
171171

172172
do_env() {
173-
sudo apt install ack antlr3 aria2 asciidoc autoconf automake autopoint binutils bison build-essential bzip2 ccache cmake cpio curl device-tree-compiler fastjar flex gawk gettext gcc-multilib g++-multilib git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libglib2.0-dev libgmp3-dev libltdl-dev libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libreadline-dev libssl-dev libtool lrzsz mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python3 python3-pip python3-pyelftools libpython3-dev qemu-utils rsync scons squashfs-tools subversion swig texinfo uglifyjs upx-ucl unzip vim wget xmlto xxd zlib1g-dev
173+
sudo apt install ack antlr3 aria2 asciidoc autoconf automake autopoint binutils bison build-essential bzip2 ccache cmake cpio curl device-tree-compiler fastjar flex gawk gettext gcc-multilib g++-multilib git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libglib2.0-dev libgmp3-dev libltdl-dev libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libreadline-dev libssl-dev libtool lrzsz mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python3 python3-pip python3-pyelftools libpython3-dev qemu-utils rsync scons squashfs-tools subversion swig texinfo uglifyjs upx-ucl unzip vim wget xmlto xxd zlib1g-dev clang llvm npm
174174
}
175175

176176
do_help() {

‎user/common/immortalwrt.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ do_immortalwrt_common() {
2626
# replace zerotier
2727
rm -rf package/zerotier
2828
dl_git_sub https://github.com/coolsnowwolf/packages package/zerotier net/zerotier master
29+
30+
# add daed
31+
rm -rf package/dae
32+
dl_git https://github.com/QiuSimons/luci-app-daed package/dae
33+
dl_git_sub https://github.com/immortalwrt/packages package/libcron libs/libcron master
2934
}
3035

3136
# excute

‎user/immortalwrt-common-x86-amd64/README.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# x86-amd64 common 固件, immortalwrt 源码
2+
3+
默认 IP: `192.168.11.4/24`
4+
5+
密码: `没有密码`，其他涉及默认密码的都是 `password`
6+
7+
## 特性
8+
9+
参考 [lede-common-x86-amd64](../lede-common-x86-amd64/README.md)，基本一致。
10+
11+
### 额外插件应用
12+
13+
详细参考 `[config.diff](config.diff)
14+
15+
添加了 `daed`，但是与 AdGuardHome 和 mosdns 配合使用的配置尚未预置。
16+
17+
- CONFIG_PACKAGE_luci-app-daed
18+
19+
## 链接
20+
21+
- [luci-app-daed](https://github.com/QiuSimons/luci-app-daed)
22+
- [dae](https://github.com/daeuniverse/dae)
23+
- [daed](https://github.com/daeuniverse/daed)

‎user/immortalwrt-common-x86-amd64/RELEASE.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
- Default IP: `192.168.11.4/24`
2+
- Default GW: `192.168.11.1`
3+
- Default Password: `no password`
4+
5+
Other apps default password is usually `password`

‎user/immortalwrt-common-x86-amd64/config.diff‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# 配置
2+
CONFIG_MODULES=y
3+
CONFIG_HAVE_DOT_CONFIG=y
4+
5+
# 机型选择
6+
CONFIG_TARGET_x86=y
7+
CONFIG_TARGET_x86_64=y
8+
CONFIG_TARGET_x86_64_DEVICE_generic=y
9+
10+
# 镜像设置
11+
CONFIG_TARGET_ROOTFS_TARGZ=y
12+
CONFIG_TARGET_ROOTFS_EXT4FS=y
13+
CONFIG_TARGET_ROOTFS_SQUASHFS=y
14+
# CONFIG_GRUB_IMAGES is not set
15+
CONFIG_GRUB_EFI_IMAGES=y
16+
CONFIG_GRUB_TIMEOUT="0"
17+
CONFIG_QCOW2_IMAGES=y
18+
CONFIG_VMDK_IMAGES=y
19+
CONFIG_VHDX_IMAGES=y
20+
CONFIG_TARGET_IMAGES_GZIP=y
21+
22+
# 设置分区大小
23+
CONFIG_TARGET_KERNEL_PARTSIZE=32
24+
CONFIG_TARGET_ROOTFS_PARTSIZE=760
25+
26+
# 额外包
27+
CONFIG_PACKAGE_autocore=y
28+
CONFIG_PACKAGE_automount=y
29+
CONFIG_PACKAGE_autosamba=y
30+
31+
# 插件选择
32+
CONFIG_PACKAGE_luci-ssl-openssl=y
33+
CONFIG_PACKAGE_luci-app-adguardhome=y
34+
CONFIG_PACKAGE_luci-app-autoreboot=y
35+
CONFIG_PACKAGE_luci-app-daed=y
36+
CONFIG_PACKAGE_luci-app-ddns=y
37+
CONFIG_PACKAGE_luci-app-firewall=y
38+
CONFIG_PACKAGE_luci-app-frpc=y
39+
CONFIG_PACKAGE_luci-app-homeproxy=y
40+
CONFIG_PACKAGE_luci-app-mosdns=y
41+
CONFIG_PACKAGE_luci-app-openclash=y
42+
CONFIG_PACKAGE_luci-app-package-manager=y
43+
CONFIG_PACKAGE_luci-app-ramfree=y
44+
CONFIG_PACKAGE_luci-app-snmpd=y
45+
CONFIG_PACKAGE_luci-app-udpxy=y
46+
CONFIG_PACKAGE_luci-app-vlmcsd=y
47+
CONFIG_PACKAGE_luci-app-wol=y
48+
CONFIG_PACKAGE_luci-app-zerotier=y
49+
50+
# 主题
51+
CONFIG_PACKAGE_luci-theme-argon-jerrykuku=y
52+
CONFIG_PACKAGE_luci-theme-design=y
53+
CONFIG_PACKAGE_luci-theme-material=y
54+
55+
# 协议
56+
CONFIG_PACKAGE_luci-proto-bonding=y
57+
58+
# 其他
59+
CONFIG_PACKAGE_openssh-sftp-server=y
60+
CONFIG_PACKAGE_fdisk=y
61+
CONFIG_PACKAGE_open-vm-tools=y
62+
CONFIG_PACKAGE_ddns-scripts_aliyun=y
63+
64+
# daed ebpf
65+
CONFIG_DEVEL=y
66+
CONFIG_KERNEL_DEBUG_INFO=y
67+
# CONFIG_KERNEL_DEBUG_INFO_REDUCED is not set
68+
CONFIG_KERNEL_DEBUG_INFO_BTF=y
69+
CONFIG_KERNEL_CGROUPS=y
70+
CONFIG_KERNEL_CGROUP_BPF=y
71+
CONFIG_KERNEL_BPF_EVENTS=y
72+
CONFIG_BPF_TOOLCHAIN_HOST=y
73+
CONFIG_KERNEL_XDP_SOCKETS=y
74+
CONFIG_PACKAGE_kmod-xdp-sockets-diag=y

‎user/immortalwrt-common-x86-amd64/custom.sh‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
3+
# Execute after install feeds
4+
# patch -> [update & install feeds] -> custom -> config
5+
6+
echo "Current dir: $(pwd), Script: $0"
7+
8+
if [ -z "${GITHUB_WORKSPACE}" ]; then
9+
echo "GITHUB_WORKSPACE not set"
10+
GITHUB_WORKSPACE=$(
11+
cd $(dirname $0)/../..
12+
pwd
13+
)
14+
export GITHUB_WORKSPACE
15+
fi
16+
17+
source $GITHUB_WORKSPACE/lib.sh
18+
19+
echo "Execute custom custom.sh"
20+
21+
cat package/emortal/default-settings/files/99-default-settings

‎user/immortalwrt-common-x86-amd64/files/etc/banner‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2+
\ .___ __ .__ /
3+
\ | | _____ _____ ____________/ |______ | | ┬ ┬┬─┐┌┬┐ /
4+
\ | |/ \ / \ / _ \_ __ \ __\__ \ | | │││├┬┘ │ /
5+
\ | | Y Y \ Y Y ( <_> ) | \/| | / __ \| |__ └┴┘┴└─ ┴ /
6+
\ |___|__|_| /__|_| /\____/|__| |__| (____ /____/ /
7+
\ W I R E L E S S F R E E D O M For x86-amd64 /
8+
\ immortalwrt common /
9+
\ Build by alecthw. https://github.com/alecthw/openwrt-actions /
10+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
11+
Base on %D %V, %C

0 commit comments

Comments
 (0)