From a0963f2fe9225c05e05cd2212cc08a632584b78e Mon Sep 17 00:00:00 2001 From: macaron Date: Sun, 3 Mar 2024 05:12:13 +0900 Subject: [PATCH] Fix checkout, Add Prometheus exporter packages (#9) --- .config | 32 +++++++++++++++++++++++++------- .github/workflows/build.yml | 4 ++-- .gitignore | 2 ++ Dockerfile | 3 ++- README.md | 3 ++- 5 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 .gitignore diff --git a/.config b/.config index c2d129a..b129249 100644 --- a/.config +++ b/.config @@ -7,6 +7,7 @@ CONFIG_HAVE_DOT_CONFIG=y CONFIG_HOST_OS_LINUX=y # CONFIG_HOST_OS_MACOS is not set # CONFIG_TARGET_airoha is not set +# CONFIG_TARGET_d1 is not set # CONFIG_TARGET_sunxi is not set # CONFIG_TARGET_apm821xx is not set # CONFIG_TARGET_armsr is not set @@ -3006,6 +3007,7 @@ CONFIG_PACKAGE_kmod-random-core=y # CONFIG_PACKAGE_kmod-rtc-ds1672 is not set # CONFIG_PACKAGE_kmod-rtc-em3027 is not set # CONFIG_PACKAGE_kmod-rtc-isl1208 is not set +# CONFIG_PACKAGE_kmod-rtc-mv is not set # CONFIG_PACKAGE_kmod-rtc-pcf2123 is not set # CONFIG_PACKAGE_kmod-rtc-pcf2127 is not set # CONFIG_PACKAGE_kmod-rtc-pcf8563 is not set @@ -3331,12 +3333,12 @@ CONFIG_GOLANG_BUILD_CACHE_DIR="" # CONFIG_PACKAGE_dkjson is not set # CONFIG_PACKAGE_json4lua is not set # CONFIG_PACKAGE_ldbus is not set -# CONFIG_PACKAGE_libiwinfo-lua is not set +CONFIG_PACKAGE_libiwinfo-lua=y # CONFIG_PACKAGE_linotify is not set # CONFIG_PACKAGE_lpeg is not set # CONFIG_PACKAGE_lsqlite3 is not set # CONFIG_PACKAGE_lsqlite3-lua5.3 is not set -# CONFIG_PACKAGE_lua is not set +CONFIG_PACKAGE_lua=y # CONFIG_PACKAGE_lua-argparse is not set # CONFIG_PACKAGE_lua-bencode is not set # CONFIG_PACKAGE_lua-bit32 is not set @@ -3366,6 +3368,7 @@ CONFIG_LUA_ECO_MBEDTLS=y # CONFIG_PACKAGE_lua-eco-ubus is not set # CONFIG_PACKAGE_lua-eco-websocket is not set # CONFIG_PACKAGE_lua-ev is not set +# CONFIG_PACKAGE_lua-examples is not set # CONFIG_PACKAGE_lua-libmodbus is not set # CONFIG_PACKAGE_lua-lzlib is not set # CONFIG_PACKAGE_lua-md5 is not set @@ -3394,7 +3397,7 @@ CONFIG_HAS_LUAJIT_ARCH=y # CONFIG_PACKAGE_luarocks is not set # CONFIG_PACKAGE_luasec is not set # CONFIG_PACKAGE_luasoap is not set -# CONFIG_PACKAGE_luasocket is not set +CONFIG_PACKAGE_luasocket=y # CONFIG_PACKAGE_luasocket5.3 is not set # CONFIG_PACKAGE_luasql-mysql is not set # CONFIG_PACKAGE_luasql-pgsql is not set @@ -4478,6 +4481,7 @@ CONFIG_PACKAGE_libblobmsg-json=y # CONFIG_PACKAGE_libdnet is not set # CONFIG_PACKAGE_libdrm is not set # CONFIG_PACKAGE_libdw is not set +# CONFIG_PACKAGE_libe2p is not set # CONFIG_PACKAGE_libecdsautil is not set # CONFIG_PACKAGE_libedit is not set # CONFIG_PACKAGE_libelf is not set @@ -4558,7 +4562,7 @@ CONFIG_PACKAGE_libjson-c=y # CONFIG_PACKAGE_libleptonica is not set # CONFIG_PACKAGE_libloragw is not set # CONFIG_PACKAGE_libltdl is not set -# CONFIG_PACKAGE_liblua is not set +CONFIG_PACKAGE_liblua=y # CONFIG_PACKAGE_liblua5.3 is not set CONFIG_PACKAGE_liblucihttp=y # CONFIG_PACKAGE_liblucihttp-lua is not set @@ -4717,7 +4721,7 @@ CONFIG_PACKAGE_libpcre2=y CONFIG_PACKAGE_libubox=y # CONFIG_PACKAGE_libubox-lua is not set CONFIG_PACKAGE_libubus=y -# CONFIG_PACKAGE_libubus-lua is not set +CONFIG_PACKAGE_libubus-lua=y CONFIG_PACKAGE_libuci=y # CONFIG_PACKAGE_libuci-lua is not set # CONFIG_PACKAGE_libuci2 is not set @@ -5930,7 +5934,7 @@ CONFIG_PACKAGE_cgi-io=y # CONFIG_PACKAGE_tinyproxy is not set # CONFIG_PACKAGE_trojan-go is not set CONFIG_PACKAGE_uhttpd=y -# CONFIG_PACKAGE_uhttpd-mod-lua is not set +CONFIG_PACKAGE_uhttpd-mod-lua=y CONFIG_PACKAGE_uhttpd-mod-ubus=y # CONFIG_PACKAGE_uhttpd-mod-ucode is not set # CONFIG_PACKAGE_uwsgi is not set @@ -6908,7 +6912,21 @@ CONFIG_PACKAGE_libjson-script=y # CONFIG_PACKAGE_procps-ng3 is not set # CONFIG_PACKAGE_procs is not set # CONFIG_PACKAGE_progress is not set -# CONFIG_PACKAGE_prometheus-node-exporter-lua is not set +CONFIG_PACKAGE_prometheus-node-exporter-lua=y +# CONFIG_PACKAGE_prometheus-node-exporter-lua-dawn is not set +# CONFIG_PACKAGE_prometheus-node-exporter-lua-hostapd_stations is not set +# CONFIG_PACKAGE_prometheus-node-exporter-lua-hostapd_ubus_stations is not set +# CONFIG_PACKAGE_prometheus-node-exporter-lua-hwmon is not set +CONFIG_PACKAGE_prometheus-node-exporter-lua-nat_traffic=y +CONFIG_PACKAGE_prometheus-node-exporter-lua-netstat=y +CONFIG_PACKAGE_prometheus-node-exporter-lua-openwrt=y +# CONFIG_PACKAGE_prometheus-node-exporter-lua-snmp6 is not set +# CONFIG_PACKAGE_prometheus-node-exporter-lua-textfile is not set +# CONFIG_PACKAGE_prometheus-node-exporter-lua-thermal is not set +# CONFIG_PACKAGE_prometheus-node-exporter-lua-ubnt-manager is not set +# CONFIG_PACKAGE_prometheus-node-exporter-lua-uci_dhcp_host is not set +CONFIG_PACKAGE_prometheus-node-exporter-lua-wifi=y +CONFIG_PACKAGE_prometheus-node-exporter-lua-wifi_stations=y # CONFIG_PACKAGE_prometheus-node-exporter-ucode is not set # CONFIG_PACKAGE_prometheus-statsd-exporter is not set # CONFIG_PACKAGE_pservice is not set diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 50268e9..87f66e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,8 +33,8 @@ jobs: - uses: actions/checkout@v4 with: - repository: 'musashino205/openwrt' - ref: 'devadd/wab' + repository: 'openwrt/openwrt' + ref: 'b18edb1bfa34420fde1404d9d1e619c889557154' path: openwrt - name: Install feeds diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f4a7de7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +targets +packages diff --git a/Dockerfile b/Dockerfile index 6dd09c5..4601527 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,8 @@ RUN apt update && apt install -y \ && apt-get clean -y \ && rm -rf /var/lib/apt/lists/ -RUN git clone -b devadd/wab https://github.com/musashino205/openwrt . \ +RUN git clone https://github.com/openwrt/openwrt . \ + && git checkout b18edb1bfa34420fde1404d9d1e619c889557154 \ && ./scripts/feeds update -a \ && ./scripts/feeds install -a \ && groupadd -g 1100 elecombuilder \ diff --git a/README.md b/README.md index 9795f4b..98f11a9 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,8 @@ docker run --rm -t -v$(pwd):/openwrt/bin rtlsdr/wab-i1750-ps ```bash git clone https://github.com/macaron/WAB-I1750-PS && cd WAB-I1750-PS -docker run --rm -it -v$(pwd)/.config:/openwrt/.config rtlsdr/wab-i1750-ps make menuconfig +docker run --name builder -it rtlsdr/wab-i1750-ps make menuconfig +docker cp builder:/openwrt/.config . && docker rm builder docker run --rm -t -v$(pwd)/.config:/openwrt/.config -v$(pwd):/openwrt/bin rtlsdr/wab-i1750-ps ```