Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workaround to fix conflict with Luci index.html file and Update of repositories #24

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Workaround to fix conflict with Luci index.html file and Update of repositories #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e48854a
Workaround to fix conflict with Luci's /www/index.html file
p4u Feb 21, 2017
387b1e2
Update revision for libblopack, libusys, orange-rpcd and juci reposit…
p4u Feb 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions juci-full-openwrt/files/etc/uci-defaults/40-juci-openwrt-config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,4 +403,10 @@ echo "<html><head></head><body><a href="/">Click here to go to new JUCI webgui.<
EOF
}

# move luci index.html and create juci index.html
[ -f /www/index.html ] && {
mv /www/index.html /www/luci-index.html
juci-update
}

exit 0
3 changes: 2 additions & 1 deletion juci/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PKG_NAME:=juci

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/mkschreder/juci.git
PKG_SOURCE_VERSION:=80e74d5285d46ca1848971c5a084d101fb8f2098
PKG_SOURCE_VERSION:=592e32a1bdbc5498c0bfd2a038fcc3fced407e3a
PKG_VERSION:=3.17.01
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
Expand Down Expand Up @@ -38,6 +38,7 @@ endef

define Package/juci/install
$(INSTALL_DIR) $(1)/
rm -f $(PKG_BUILD_DIR)/bin/www/index.html
$(CP) $(PKG_BUILD_DIR)/bin/* $(1)/
$(INSTALL_DIR) $(1)/www/cgi-bin/
$(INSTALL_DIR) $(1)/sbin/
Expand Down
2 changes: 1 addition & 1 deletion libblobpack/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/mkschreder/libblobpack.git
PKG_SOURCE_VERSION:=d0fe5175995c550f6961d2675d80a96e44242475
PKG_SOURCE_VERSION:=48987ff8731342e20a4bf57be87dc5a7229d3448
PKG_VERSION=2.16.09-$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
Expand Down
2 changes: 1 addition & 1 deletion libusys/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=libusys
PKG_VERSION:=dd7b53bf45baa1765f2163a81fd53a422e3b4fa8
PKG_VERSION:=a0e110454531336d2b00e283dd1941854cf01944
PKG_RELEASE:=1.0.0

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
Expand Down
2 changes: 1 addition & 1 deletion orange-rpcd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PKG_NAME:=orange-rpcd

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/mkschreder/orangerpcd.git
PKG_SOURCE_VERSION:=2e02cb0594b35e534c1e155d94d95ecf062d26c7
PKG_SOURCE_VERSION:=da616c23648f032fd88dc84ac7a2c7450febcb91
PKG_VERSION:=3.16.01-$(PKG_SOURCE_VERSION)
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
Expand Down