Skip to content

Commit

Permalink
luci-app-olsrd2: upgrade uci-defaults for ucitrack handling to use json
Browse files Browse the repository at this point in the history
Conversion of the 'uci-defaults' script for ucitrack handling to the new
json processing.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
  • Loading branch information
feckert authored and BKPepe committed Apr 16, 2024
1 parent 1c3f6b1 commit d4e9f92
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 16 deletions.
6 changes: 3 additions & 3 deletions luci-app-olsrd2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=luci-app-olsrd2
PKG_VERSION:=0.2.6
PKG_RELEASE:=15
PKG_RELEASE:=16
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

include $(INCLUDE_DIR)/package.mk
Expand Down Expand Up @@ -42,8 +42,8 @@ define Package/$(PKG_NAME)/install
$(INSTALL_DATA) ./htdocs/luci-static/resources/view/olsrd2/* $(1)/www/luci-static/resources/view/olsrd2
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DATA) ./root/etc/config/* $(1)/etc/config
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_DATA) ./root/etc/uci-defaults/* $(1)/etc/uci-defaults
$(INSTALL_DIR) $(1)/usr/share/ucitrack
$(INSTALL_DATA) ./root/usr/share/ucitrack/luci-app-olsrd2.json $(1)/usr/share/ucitrack
$(INSTALL_DIR) $(1)/usr/libexec/rpcd
$(INSTALL_BIN) ./root/usr/libexec/rpcd/status.olsrd2 $(1)/usr/libexec/rpcd/status.olsrd2
$(INSTALL_DIR) $(1)/usr/share/luci/menu.d
Expand Down
13 changes: 0 additions & 13 deletions luci-app-olsrd2/root/etc/uci-defaults/41_luci-olsrd2

This file was deleted.

4 changes: 4 additions & 0 deletions luci-app-olsrd2/root/usr/share/ucitrack/luci-app-olsrd2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"config": "olsrd2",
"init": "olsrd2"
}

0 comments on commit d4e9f92

Please sign in to comment.