From 1f0c1280401ce7b1bc8e791d89de1a4329fe30cd Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Fri, 28 Jul 2023 17:06:14 +0200 Subject: [PATCH 01/12] Add comment on how to better implement util function --- packages/lime-system/files/usr/lib/lua/lime/utils.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/lime-system/files/usr/lib/lua/lime/utils.lua b/packages/lime-system/files/usr/lib/lua/lime/utils.lua index 4d9111fd4..b175a8ee6 100644 --- a/packages/lime-system/files/usr/lib/lua/lime/utils.lua +++ b/packages/lime-system/files/usr/lib/lua/lime/utils.lua @@ -574,6 +574,8 @@ function utils.is_valid_mac(string) end end +--! TODO: Better having a C strcmp/memcmp like behavior so the output can be +--! used for sorting beyond determining equality function utils.deepcompare(t1,t2) if t1 == t2 then return true end local ty1 = type(t1) From ffb9ee13532e82e5b587cb0806add79059e7a2cd Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Fri, 28 Jul 2023 17:08:03 +0200 Subject: [PATCH 02/12] Minor cleanup of Makefile --- packages/shared-state-network_nodes/Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/shared-state-network_nodes/Makefile b/packages/shared-state-network_nodes/Makefile index 10c37aab7..e82ea908f 100644 --- a/packages/shared-state-network_nodes/Makefile +++ b/packages/shared-state-network_nodes/Makefile @@ -1,23 +1,22 @@ # -# Copyright (C) 2020 German Ferrero +# Copyright (C) 2020-2023 Asociacion Civil Altermundi # -# This is free software, licensed under the GNU General Public License v3. +# This is free software, licensed under the GNU Affero General Public License v3. # include ../../libremesh.mk define Package/$(PKG_NAME) - SECTION:=utils - CATEGORY:=Utilities - TITLE:=$(PKG_NAME) provides shared state database of all times network nodes - MAINTAINER:=Germán Ferrero + CATEGORY:=LibreMesh + TITLE:=$(PKG_NAME) provides data-type for user marked reliable network nodes + MAINTAINER:=Asociacion Civil Altermundi DEPENDS:=+shared-state +shared-state-nodes_and_links +lime-system +luci-lib-jsonc \ +libubus-lua +random-numgen PKGARCH:=all endef define Package/$(PKG_NAME)/description - This $(PKG_NAME) provides shared state database of all times network nodes. + TODO endef $(eval $(call BuildPackage,$(PKG_NAME))) From 4e890599a5235a87f627d22ee2f528ae0560f2ae Mon Sep 17 00:00:00 2001 From: "javier.jorge" Date: Fri, 25 Aug 2023 10:51:29 -0300 Subject: [PATCH 03/12] Add new reference state data types to shared state --- .../shared-state-reference-state/Makefile | 38 +++++++++++++++++++ ...ared-state-reference_state_nodes_info_cron | 10 +++++ ...state-reference_state_wifi_links_info_cron | 10 +++++ 3 files changed, 58 insertions(+) create mode 100644 packages/shared-state-reference-state/Makefile create mode 100755 packages/shared-state-reference-state/files/etc/uci-defaults/shared-state-reference_state_nodes_info_cron create mode 100644 packages/shared-state-reference-state/files/etc/uci-defaults/shared-state-reference_state_wifi_links_info_cron diff --git a/packages/shared-state-reference-state/Makefile b/packages/shared-state-reference-state/Makefile new file mode 100644 index 000000000..9bf405a33 --- /dev/null +++ b/packages/shared-state-reference-state/Makefile @@ -0,0 +1,38 @@ +# +# Copyright (C) 2019 Gioacchino Mazzurco +# Copyright (C) 2023 Javier Jorge +# +# This is free software, licensed under the GNU Affero General Public License v3. +# + +include $(TOPDIR)/rules.mk + +GIT_COMMIT_DATE:=$(shell git log -n 1 --pretty=%ad --date=short . ) +GIT_COMMIT_TSTAMP:=$(shell git log -n 1 --pretty=%at . ) + +PKG_NAME:=shared-state-wifi_links_info +PKG_VERSION=$(GIT_COMMIT_DATE)-$(GIT_COMMIT_TSTAMP) + +include $(INCLUDE_DIR)/package.mk + +define Package/$(PKG_NAME) + TITLE:=Reference state datatypes module for shared-state + CATEGORY:=LibreMesh + URL:=http://libremesh.org + DEPENDS:= shared-state + PKGARCH:=all +endef + +define Package/$(PKG_NAME)/description + Syncronize Reference state datatypes using shared state multiwriter. +endef + +define Build/Compile +endef + +define Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/ + $(CP) ./files/* $(1)/ +endef + +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/packages/shared-state-reference-state/files/etc/uci-defaults/shared-state-reference_state_nodes_info_cron b/packages/shared-state-reference-state/files/etc/uci-defaults/shared-state-reference_state_nodes_info_cron new file mode 100755 index 000000000..5cba2a6fa --- /dev/null +++ b/packages/shared-state-reference-state/files/etc/uci-defaults/shared-state-reference_state_nodes_info_cron @@ -0,0 +1,10 @@ +#!/bin/sh + +unique_append() +{ + grep -qF "$1" "$2" || echo "$1" >> "$2" +} + +unique_append \ + '*/5 * * * * ((sleep $(($RANDOM % 120)); shared-state-multiwriter sync reference_state_nodes_info &> /dev/null)&)'\ + /etc/crontabs/root diff --git a/packages/shared-state-reference-state/files/etc/uci-defaults/shared-state-reference_state_wifi_links_info_cron b/packages/shared-state-reference-state/files/etc/uci-defaults/shared-state-reference_state_wifi_links_info_cron new file mode 100644 index 000000000..d71d2b4c5 --- /dev/null +++ b/packages/shared-state-reference-state/files/etc/uci-defaults/shared-state-reference_state_wifi_links_info_cron @@ -0,0 +1,10 @@ +#!/bin/sh + +unique_append() +{ + grep -qF "$1" "$2" || echo "$1" >> "$2" +} + +unique_append \ + '*/5 * * * * ((sleep $(($RANDOM % 120)); shared-state-multiwriter sync reference_state_wifi_links_info &> /dev/null)&)'\ + /etc/crontabs/root From b8450d6f9084cda03c56b51e68bd489d4cc2fe96 Mon Sep 17 00:00:00 2001 From: Javier Jorge Date: Mon, 28 Aug 2023 12:29:52 -0300 Subject: [PATCH 04/12] relocation of limeapp sepecific datatypes sinc script --- ...ared-state-reference_state_nodes_info_cron | 0 ...state-reference_state_wifi_links_info_cron | 0 .../shared-state-reference-state/Makefile | 38 ------------------- 3 files changed, 38 deletions(-) rename packages/{shared-state-reference-state => lime-app}/files/etc/uci-defaults/shared-state-reference_state_nodes_info_cron (100%) rename packages/{shared-state-reference-state => lime-app}/files/etc/uci-defaults/shared-state-reference_state_wifi_links_info_cron (100%) delete mode 100644 packages/shared-state-reference-state/Makefile diff --git a/packages/shared-state-reference-state/files/etc/uci-defaults/shared-state-reference_state_nodes_info_cron b/packages/lime-app/files/etc/uci-defaults/shared-state-reference_state_nodes_info_cron similarity index 100% rename from packages/shared-state-reference-state/files/etc/uci-defaults/shared-state-reference_state_nodes_info_cron rename to packages/lime-app/files/etc/uci-defaults/shared-state-reference_state_nodes_info_cron diff --git a/packages/shared-state-reference-state/files/etc/uci-defaults/shared-state-reference_state_wifi_links_info_cron b/packages/lime-app/files/etc/uci-defaults/shared-state-reference_state_wifi_links_info_cron similarity index 100% rename from packages/shared-state-reference-state/files/etc/uci-defaults/shared-state-reference_state_wifi_links_info_cron rename to packages/lime-app/files/etc/uci-defaults/shared-state-reference_state_wifi_links_info_cron diff --git a/packages/shared-state-reference-state/Makefile b/packages/shared-state-reference-state/Makefile deleted file mode 100644 index 9bf405a33..000000000 --- a/packages/shared-state-reference-state/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (C) 2019 Gioacchino Mazzurco -# Copyright (C) 2023 Javier Jorge -# -# This is free software, licensed under the GNU Affero General Public License v3. -# - -include $(TOPDIR)/rules.mk - -GIT_COMMIT_DATE:=$(shell git log -n 1 --pretty=%ad --date=short . ) -GIT_COMMIT_TSTAMP:=$(shell git log -n 1 --pretty=%at . ) - -PKG_NAME:=shared-state-wifi_links_info -PKG_VERSION=$(GIT_COMMIT_DATE)-$(GIT_COMMIT_TSTAMP) - -include $(INCLUDE_DIR)/package.mk - -define Package/$(PKG_NAME) - TITLE:=Reference state datatypes module for shared-state - CATEGORY:=LibreMesh - URL:=http://libremesh.org - DEPENDS:= shared-state - PKGARCH:=all -endef - -define Package/$(PKG_NAME)/description - Syncronize Reference state datatypes using shared state multiwriter. -endef - -define Build/Compile -endef - -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/ - $(CP) ./files/* $(1)/ -endef - -$(eval $(call BuildPackage,$(PKG_NAME))) From b640c271ba3ea0111737340ebccf9cb890411c33 Mon Sep 17 00:00:00 2001 From: a-gave Date: Thu, 31 Aug 2023 23:55:53 +0200 Subject: [PATCH 05/12] update CHANGELOG.md --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa266e202..491e6d010 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,20 @@ All notable changes to this project will be documented in this file. ## 2023.1 - Unreleased +### Full changelog since 2023.1-rc1 + - add freq information (merge #1045) + - Enable Node Information Exchange (merge #1043) + - readme: expanded instructions on ImageBuilder (merge #1028) + - removed extra info from shared state (merge #1041) + - wifi-unstuck-wa: allow parametrizable values for interval and timeout (merge #1039, fix #1034) + - Shrared state ubus (merge #1040) + - New Shared-State wifi Links information module (merge #1038) + +## 2023.1-rc1 - Release candidate 1 + ### Full changelog + - Add shared state async node (merge #1030) + - lime.network.scandevices: fix finding intefaces on dsa devices (merge #1033) - Unit testing update (merge #1027) - various readme improvements (merge #1015) - remove old iw/iw-full compatibility check (merge #1024) From 393127cf81925c772a15c4b7b8e6ef03ed191e7e Mon Sep 17 00:00:00 2001 From: Javier Jorge Date: Fri, 8 Sep 2023 15:47:32 -0300 Subject: [PATCH 06/12] add wifi interface name --- .../files/usr/bin/shared-state-publish_wifi_links_info | 2 +- .../tests/test_shared-state_wifi_links_info.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/shared-state-wifi_links_info/files/usr/bin/shared-state-publish_wifi_links_info b/packages/shared-state-wifi_links_info/files/usr/bin/shared-state-publish_wifi_links_info index fd0668fca..48301e0b0 100755 --- a/packages/shared-state-wifi_links_info/files/usr/bin/shared-state-publish_wifi_links_info +++ b/packages/shared-state-wifi_links_info/files/usr/bin/shared-state-publish_wifi_links_info @@ -32,7 +32,7 @@ function get_wifi_links_info() local station_stats = node_status.get_station_stats(station) local freq = iwinfo.nl80211.frequency(station.iface) table.insert(links, {src_mac=src_macaddr ,dst_mac=station.station_mac, - signal=station_stats.signal,chains=station_stats.chains, + signal=station_stats.signal,chains=station_stats.chains,iface=station.iface, rx_rate=station_stats.rx_rate,tx_rate=station_stats.tx_rate,freq=freq } ) end return links diff --git a/packages/shared-state-wifi_links_info/tests/test_shared-state_wifi_links_info.lua b/packages/shared-state-wifi_links_info/tests/test_shared-state_wifi_links_info.lua index 84efb0c13..98de1e7fb 100644 --- a/packages/shared-state-wifi_links_info/tests/test_shared-state_wifi_links_info.lua +++ b/packages/shared-state-wifi_links_info/tests/test_shared-state_wifi_links_info.lua @@ -28,6 +28,7 @@ it('a simple test to get links info and assert requiered fields are present', fu assert.is.equal("C0:4A:00:BE:7B:09", links_info[1].dst_mac) assert.is.same({-17,-18}, links_info[1].chains) assert.is.equal(-14, links_info[1].signal) + assert.is.equal("wlan0-mesh", links_info[1].iface) assert.is.equal(13000, links_info[1].rx_rate) assert.is.equal(2400, links_info[1].freq) assert.is.equal("C0:00:00:00:00:00", links_info[1].src_mac) From 4770a828a53f2f2f99d3d39b9633b727625836a8 Mon Sep 17 00:00:00 2001 From: Ilario Gelmetti Date: Sat, 2 Sep 2023 20:39:54 +0200 Subject: [PATCH 07/12] default distance setting increase 10x --- packages/lime-docs/files/www/docs/lime-example.txt | 8 ++++---- packages/lime-system/files/etc/config/lime-defaults | 4 ++-- tests/test_lime_config_device.lua | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/lime-docs/files/www/docs/lime-example.txt b/packages/lime-docs/files/www/docs/lime-example.txt index da84bfc10..a12d5504d 100644 --- a/packages/lime-docs/files/www/docs/lime-example.txt +++ b/packages/lime-docs/files/www/docs/lime-example.txt @@ -98,7 +98,7 @@ config lime wifi # Settings in this section applies to all radios. config lime-wifi-band '2ghz' # Settings in this section applies for all radios in '2ghz' (or '5ghz') band. And take presedence over 'lime wifi' section option channel '11' option htmode 'HT20' # htmode sets the width of the channel. HT40 should have better performances in non-noisy environments. Check out the documentation in the OpenWrt wiki here: https://openwrt.org/docs/guide-user/network/wifi/basic#htmodewi-fi_channel_width - option distance '100' + option distance '1000' # 1 km max distance, farther clients or peers will not be able to connect option adhoc_mcast_rate '24000' option ieee80211s_mcast_rate '24000' # list modes 'ap' # For networks where only dual band routers are used, @@ -110,7 +110,7 @@ config lime-wifi-band '5ghz' list channel '157' # Check for allowed channels on https://en.wikipedia.org/wiki/List_of_WLAN_channels#regulatory_tables5.0ghz option htmode 'HT40' # htmode sets the width of the channel. VHT80 should have better performances in non-noisy environment. Check out the valid channels list in this comment: https://github.com/libremesh/lime-packages/issues/647#issuecomment-1503968192 and check out the documentation in the OpenWrt wiki here: https://openwrt.org/docs/guide-user/network/wifi/basic#htmodewi-fi_channel_width # list modes 'ieee80211s' # For networks where only dual band routers are used, the 5 GHz radio can be reserved for the node-to-node connections - option distance '1000' # Distance between this node/ap and the furthest connected node/client in meters, heavily affects performances. If you are unsure of the right number, better to use a too-large distance here than a too-small one. + option distance '10000' # Distance between this node/ap and the furthest connected node/client in meters, affects performances. If you are unsure of the right number, better to use a too-large distance here than a too-small one. Farther clients or peers will not be able to connect option adhoc_mcast_rate '6000' option ieee80211s_mcast_rate '6000' @@ -167,7 +167,7 @@ config wifi radio99 # you should ensure that the chosen radio name exists, for e option client_ssid 'SomeWiFiNetwork' option client_key 'SomeWPApskPassword' option client_encryption 'psk2' # psk for WPA or psk2 for WPA2 - option distance 300 # maximum distance to AP, heavily affects performances + option distance 1000 # maximum distance to AP, affects performances config net wirelessclientWAN option linux_name 'wlan0-sta' # verify the name, the client interface name could be named differently, like wlan1-sta @@ -205,7 +205,7 @@ config wifi radio99 # you should ensure that the chosen radio name exists, for e option client_ssid 'backbone/LiMe-ddeeff' # specify here the name of the specifically configured backbone AP interface you want to connect to # option client_key 'somePassword' # option client_encryption 'psk2' - option distance 1000 # maximum distance to AP, heavily affects performances + option distance 1000 # maximum distance to AP, affects performances config net wirelessclientbackbone option linux_name 'wlan0-sta' # verify the name, the client interface name could be named differently, like wlan1-sta diff --git a/packages/lime-system/files/etc/config/lime-defaults b/packages/lime-system/files/etc/config/lime-defaults index cd182f084..5f5c4a31f 100644 --- a/packages/lime-system/files/etc/config/lime-defaults +++ b/packages/lime-system/files/etc/config/lime-defaults @@ -66,7 +66,7 @@ config lime wifi config lime-wifi-band '2ghz' option channel '11' option htmode 'HT20' - option distance '100' + option distance '1000' option adhoc_mcast_rate '24000' option ieee80211s_mcast_rate '24000' @@ -74,7 +74,7 @@ config lime-wifi-band '5ghz' list channel '48' list channel '157' option htmode 'HT40' - option distance '1000' + option distance '10000' option adhoc_mcast_rate '6000' option ieee80211s_mcast_rate '6000' diff --git a/tests/test_lime_config_device.lua b/tests/test_lime_config_device.lua index 6364824b9..081aa377e 100644 --- a/tests/test_lime_config_device.lua +++ b/tests/test_lime_config_device.lua @@ -69,9 +69,9 @@ describe('LiMe Config tests', function() assert.is.equal('HT40', uci:get('wireless', 'radio1', 'htmode')) assert.is.equal('HT40', uci:get('wireless', 'radio2', 'htmode')) - assert.is.equal('100', uci:get('wireless', 'radio0', 'distance')) - assert.is.equal('1000', uci:get('wireless', 'radio1', 'distance')) - assert.is.equal('1000', uci:get('wireless', 'radio2', 'distance')) + assert.is.equal('1000', uci:get('wireless', 'radio0', 'distance')) + assert.is.equal('10000', uci:get('wireless', 'radio1', 'distance')) + assert.is.equal('10000', uci:get('wireless', 'radio2', 'distance')) end) setup('', function() From bef1b8fa203569218608fc68c0976ca01b00c8ab Mon Sep 17 00:00:00 2001 From: Santiago Piccinini Date: Wed, 13 Sep 2023 19:01:07 -0300 Subject: [PATCH 08/12] Add force option to safe-upgrade bootstrap cmd --- packages/safe-upgrade/files/usr/sbin/safe-upgrade | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/safe-upgrade/files/usr/sbin/safe-upgrade b/packages/safe-upgrade/files/usr/sbin/safe-upgrade index e649f56da..d4a15b1ac 100755 --- a/packages/safe-upgrade/files/usr/sbin/safe-upgrade +++ b/packages/safe-upgrade/files/usr/sbin/safe-upgrade @@ -262,11 +262,14 @@ function su.preserve_files_to_new_partition(args) end local function bootstrap(args) - --TODO: add --force option to upgrade SU if is_su_installed() then - print(string.format("safe-upgrade version '%s' is already installed, aborting", - get_su_version())) - os.exit(su.EXIT_STATUS_ALREADY_INSTALLED) + if args.force then + print("Forcing the bootstrap.") + else + print(string.format("safe-upgrade version '%s' is already installed, aborting", + get_su_version())) + os.exit(su.EXIT_STATUS_ALREADY_INSTALLED) + end end @@ -421,8 +424,8 @@ local function parse_args() parser:command('confirm', ('Confirm the current partition. Use when after an upgrade ' .. 'or after running "test-other-partition".')) - parser:command('bootstrap', 'Install the safe-upgrade mechanism') - + local bootstrap = parser:command('bootstrap', 'Install the safe-upgrade mechanism') + bootstrap:flag("--force", "Install even it is already installed.") parser:command('test-other-partition', 'Mark the other partition as testing partition.') parser:command('board-supported', 'Exits with 0 if board is supported') From a0d14acc8dcc2cdc5baa28d3d1deaacba2357ffc Mon Sep 17 00:00:00 2001 From: Santiago Piccinini Date: Wed, 13 Sep 2023 16:00:27 -0300 Subject: [PATCH 09/12] Fix safe-upgrade bootstrap broken since OpenWrt 19.07 --- packages/safe-upgrade/files/usr/sbin/safe-upgrade | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/safe-upgrade/files/usr/sbin/safe-upgrade b/packages/safe-upgrade/files/usr/sbin/safe-upgrade index d4a15b1ac..cf8685fdc 100755 --- a/packages/safe-upgrade/files/usr/sbin/safe-upgrade +++ b/packages/safe-upgrade/files/usr/sbin/safe-upgrade @@ -24,8 +24,10 @@ local su = {} su.version = '1.0' local firmware_size_bytes = 7936*1024 -local fw1_addr = 0x9f050000 -local fw2_addr = 0x9f050000 + firmware_size_bytes +-- Keep the fw addresses as strings beacause of https://gitlab.com/librerouter/librerouteros/-/issues/61 +local fw1_addr = '0x9f050000' +local fw2_addr = '0x9f810000' -- fw1_addr + firmware_size_bytes + su._supported_devices = {'librerouter-v1'} su._mtd_partitions_desc = '/proc/mtd' @@ -280,8 +282,8 @@ local function bootstrap(args) set_stable_partition(1) set_testing_partition(0) - set_uboot_env('fw1_addr', string.format("0x%x", fw1_addr)) - set_uboot_env('fw2_addr', string.format("0x%x", fw2_addr)) + set_uboot_env('fw1_addr', fw1_addr) + set_uboot_env('fw2_addr', fw2_addr) -- configure cmdline using the current cmdline config to not force -- us to know here the correct cmdline bootargs of the running kernel From da55dca6189ce97e88ccbd042da14591ae658fa1 Mon Sep 17 00:00:00 2001 From: a-gave Date: Tue, 19 Sep 2023 18:06:05 +0200 Subject: [PATCH 10/12] ci: update openwrt/gh-action-sdk@v5; split build workflow files to ensure v2020 is builded with sdk 19.07.10 and not with default newer releases --- .github/workflows/build.yml | 3 +- .github/workflows/build_2020.yml | 49 ++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build_2020.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce71d5398..f09d55ac0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,7 @@ on: branches: [master] tags: - v* + - '!v2020*' jobs: build: @@ -17,7 +18,7 @@ jobs: - uses: actions/checkout@v2 - name: Build packages - uses: openwrt/gh-action-sdk@v1 + uses: openwrt/gh-action-sdk@v5 env: ARCH: "x86_64" FEEDNAME: "libremesh" diff --git a/.github/workflows/build_2020.yml b/.github/workflows/build_2020.yml new file mode 100644 index 000000000..a4e46ca6c --- /dev/null +++ b/.github/workflows/build_2020.yml @@ -0,0 +1,49 @@ +name: Build packages + +on: + push: + tags: + - v2020* + +jobs: + build: + name: Build ${{ github.ref }} + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Build packages + uses: openwrt/gh-action-sdk@v5 + env: + ARCH: "x86_64-19.07.10" + FEEDNAME: "libremesh" + IGNORE_ERRORS: "n m y" + KEY_BUILD: "${{ secrets.KEY_BUILD }}" + + - name: Set package destination + run: | + export TAG=$(echo "${{ github.ref }}" | cut -d '/' -f 3- | perl -pe 's/v([0-9])/$1/') + echo "$TAG" + echo "DEST_DIR=$TAG" >> $GITHUB_ENV + + - name: Upload packages to GitHub Pages + uses: peaceiris/actions-gh-pages@v3 + with: + deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} + external_repository: libremesh/lime-feed + publish_dir: bin/packages/x86_64/libremesh/ + destination_dir: ${{ env.DEST_DIR }} + +# - name: Upload packages to S3 +# uses: jakejarvis/s3-sync-action@master +# with: +# args: --acl public-read --follow-symlinks --delete +# env: +# AWS_S3_BUCKET: libremesh +# AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} +# AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} +# AWS_S3_ENDPOINT: ${{ secrets.AWS_S3_ENDPOINT }} +# SOURCE_DIR: bin/packages/x86_64/libremesh/ +# DEST_DIR: ${{ env.DEST_DIR }} + From 17d8b2f125ac9b1297997a8f69acb4fc645f2bb9 Mon Sep 17 00:00:00 2001 From: a-gave Date: Wed, 27 Sep 2023 01:02:23 +0200 Subject: [PATCH 11/12] update CHANGELOG.md --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 491e6d010..f83807bb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,19 @@ All notable changes to this project will be documented in this file. ## 2023.1 - Unreleased +## 2023.1-rc1 - Release candidate 2 + ### Full changelog since 2023.1-rc1 + - Fix safe-upgrade bootstrap broken since OpenWrt 19.07 (merge #1050) + - Add force option to safe-upgrade bootstrap cmd (merge #1051) + - Default distance setting: increase 10x (merge #1047) + - add wifi interface name in shared state wifi information module (merge #1048) - add freq information (merge #1045) - Enable Node Information Exchange (merge #1043) - readme: expanded instructions on ImageBuilder (merge #1028) - removed extra info from shared state (merge #1041) - wifi-unstuck-wa: allow parametrizable values for interval and timeout (merge #1039, fix #1034) - - Shrared state ubus (merge #1040) + - Shared state ubus (merge #1040) - New Shared-State wifi Links information module (merge #1038) ## 2023.1-rc1 - Release candidate 1 From 6e909d1c7c53213496e935739571bb3dfc325f61 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Wed, 4 Oct 2023 15:32:49 +0200 Subject: [PATCH 12/12] Add description as per Ilario request --- packages/shared-state-network_nodes/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/shared-state-network_nodes/Makefile b/packages/shared-state-network_nodes/Makefile index e82ea908f..b6158d2ad 100644 --- a/packages/shared-state-network_nodes/Makefile +++ b/packages/shared-state-network_nodes/Makefile @@ -8,7 +8,7 @@ include ../../libremesh.mk define Package/$(PKG_NAME) CATEGORY:=LibreMesh - TITLE:=$(PKG_NAME) provides data-type for user marked reliable network nodes + TITLE:=$(PKG_NAME) provides data-type for network nodes marked as reliable by user MAINTAINER:=Asociacion Civil Altermundi DEPENDS:=+shared-state +shared-state-nodes_and_links +lime-system +luci-lib-jsonc \ +libubus-lua +random-numgen @@ -16,7 +16,7 @@ define Package/$(PKG_NAME) endef define Package/$(PKG_NAME)/description - TODO + Provides data-type for network nodes marked as reliable by user via lime-app endef $(eval $(call BuildPackage,$(PKG_NAME)))