diff options
Diffstat (limited to 'contrib')
6 files changed, 59 insertions, 4 deletions
diff --git a/contrib/package/community-profiles/files/etc/config/profile_berlin b/contrib/package/community-profiles/files/etc/config/profile_berlin index 1bfc8ed7d7..e1e4eda91b 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_berlin +++ b/contrib/package/community-profiles/files/etc/config/profile_berlin @@ -33,7 +33,7 @@ config 'defaults' 'ssidscheme' config 'defaults' 'interface' option 'netmask' '255.255.255.255' - option 'dns' '85.214.20.141 213.73.91.35 194.150.168.168 2001:4ce8::53 2001:910:800::12' + option 'dns' '85.214.20.141 194.150.168.168 2001:4ce8::53 2001:910:800::12' config 'dhcp' 'dhcp' option leasetime '5m' diff --git a/contrib/package/community-profiles/files/etc/config/profile_cottbus b/contrib/package/community-profiles/files/etc/config/profile_cottbus index 6f395a1332..9b08acc256 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_cottbus +++ b/contrib/package/community-profiles/files/etc/config/profile_cottbus @@ -31,7 +31,7 @@ config 'defaults' 'ssidscheme' config 'defaults' 'interface' option 'netmask' '255.255.255.255' - option 'dns' '85.214.20.141 213.73.91.35 194.150.168.168 2001:4ce8::53 2001:910:800::12' + option 'dns' '85.214.20.141 194.150.168.168 2001:4ce8::53 2001:910:800::12' config 'dhcp' 'dhcp' option 'leasetime' '5m' diff --git a/contrib/package/community-profiles/files/etc/config/profile_potsdam b/contrib/package/community-profiles/files/etc/config/profile_potsdam index 6a8f1f14b9..84bbdfe528 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_potsdam +++ b/contrib/package/community-profiles/files/etc/config/profile_potsdam @@ -11,7 +11,7 @@ config 'community' 'profile' config 'defaults' 'interface' option 'netmask' '255.255.0.0' - option 'dns' '85.214.20.141 213.73.91.35 194.150.168.168' + option 'dns' '85.214.20.141 194.150.168.168' option 'delegate' '0' config 'defaults' 'wifi_device' diff --git a/contrib/package/community-profiles/files/etc/config/profile_tulumlibre b/contrib/package/community-profiles/files/etc/config/profile_tulumlibre index ecc6f9bc43..c028a66614 100644 --- a/contrib/package/community-profiles/files/etc/config/profile_tulumlibre +++ b/contrib/package/community-profiles/files/etc/config/profile_tulumlibre @@ -7,4 +7,4 @@ config 'community' 'profile' option 'splash_prefix' '28' config 'defaults' 'interface' - option 'dns' '213.73.91.35 216.87.84.211' + option 'dns' '216.87.84.211' diff --git a/contrib/package/freifunk-common/Makefile b/contrib/package/freifunk-common/Makefile index 2b9336fb06..f7128b6411 100644 --- a/contrib/package/freifunk-common/Makefile +++ b/contrib/package/freifunk-common/Makefile @@ -15,6 +15,7 @@ define Package/freifunk-common CATEGORY:=LuCI SUBMENU:=9. Freifunk TITLE:=Freifunk common files + DEPENDS:=+libuci-lua endef define Package/freifunk-common/description diff --git a/contrib/package/lucihttp/Makefile b/contrib/package/lucihttp/Makefile new file mode 100644 index 0000000000..f1926a8e32 --- /dev/null +++ b/contrib/package/lucihttp/Makefile @@ -0,0 +1,54 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=lucihttp +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL=https://github.com/jow-/lucihttp.git +PKG_SOURCE_DATE:=2018-04-22 +PKG_SOURCE_VERSION:=ccc685e5c366490fc9f50a2e211ec79b7cf5962e +PKG_MIRROR_HASH:=48608971cdfe20a6ad476fbf461527e4bf4786afeb8316fd6c38412bfeed4a3c +CMAKE_INSTALL:=1 + +PKG_LICENSE:=ISC +PKG_LICENSE_FILES:=LICENSE + +PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io> +PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_liblucihttp-lua + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/cmake.mk + +define Package/liblucihttp + SECTION:=libs + CATEGORY:=Libraries + ABI_VERSION:=$(PKG_VERSION) + TITLE:=LuCI HTTP utility library +endef + +define Package/liblucihttp-lua + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+liblucihttp +liblua + TITLE:=Lua binding for the LuCI HTTP utility library +endef + +TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include + +CMAKE_OPTIONS = \ + -DLUAPATH=/usr/lib/lua \ + -DBUILD_LUA=$(if $(CONFIG_PACKAGE_liblucihttp-lua),ON,OFF) \ + -DBUILD_TESTS=OFF + +define Package/liblucihttp/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblucihttp.so $(1)/usr/lib/ +endef + +define Package/liblucihttp-lua/install + $(INSTALL_DIR) $(1)/usr/lib/lua + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lua/lucihttp.so $(1)/usr/lib/lua/ +endef + +$(eval $(call BuildPackage,liblucihttp)) +$(eval $(call BuildPackage,liblucihttp-lua)) |