PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Last Changed Rev: //p')
PKG_NAME:=luci
-PKG_VERSION:=0.5+svn$(PKG_REV)
+PKG_VERSION:=0.6+svn$(PKG_REV)
PKG_RELEASE:=1
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
define Package/luci/install/template
- $(CP) $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
+ $(CP) -a $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R
+ $(CP) -a $(PKG_BUILD_DIR)/$(2)/ipkg/* $(1)/CONTROL/ 2>/dev/null || true
endef
define Package/luci-uci
$(call Package/luci/libtemplate)
+ DEPENDS+=+libuci-lua
TITLE:=High-Level UCI API
endef
define Package/luci-ff-halle
$(call Package/luci/fftemplate)
DEPENDS+= \
- +luci-sgi-haserl +luci-app-splash \
+ +luci-sgi-haserl +luci-app-splash +luci-app-olsr \
+luci-app-ffwizard-leipzig \
+luci-theme-fledermaus \
+luci-i18n-german \
define Package/luci-ff-halle/install
$(call Package/luci/install/template,$(1),applications/community-halle)
- $(CP) -a ./ipkg/luci-ff-halle.postinst $(1)/CONTROL/postinst
endef
define Package/luci-ff-leipzig
$(call Package/luci/fftemplate)
DEPENDS+= \
- +luci-sgi-haserl +luci-app-splash \
+ +luci-sgi-haserl +luci-app-splash +luci-app-olsr \
+luci-app-ffwizard-leipzig \
+luci-theme-fledermaus \
+luci-i18n-german \
define Package/luci-ff-leipzig/install
$(call Package/luci/install/template,$(1),applications/community-leipzig)
- $(CP) -a ./ipkg/luci-ff-leipzig.postinst $(1)/CONTROL/postinst
endef
define Package/luci-ff-hannover
$(call Package/luci/fftemplate)
DEPENDS+= \
- +luci-sgi-haserl +luci-app-splash \
+ +luci-sgi-haserl +luci-app-splash +luci-app-olsr \
+luci-theme-fledermaus \
+luci-i18n-german \
+olsrd +olsrd-mod-dyn-gw +olsrd-mod-txtinfo +olsrd-mod-nameservice
define Package/luci-ff-hannover/install
$(call Package/luci/install/template,$(1),applications/community-hannover)
- $(CP) -a ./ipkg/luci-ff-hannover.postinst $(1)/CONTROL/postinst
endef
define Package/luci-app-firewall/install
$(call Package/luci/install/template,$(1),applications/luci-fw)
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-fw/dist/etc/init.d/luci_fw $(1)/etc/init.d
+endef
+
+
+define Package/luci-app-olsr
+ $(call Package/luci/webtemplate)
+ DEPENDS+=+luci-mod-admin-core +olsrd-mod-txtinfo
+ TITLE:=OLSR configuration and status module
+endef
+
+define Package/luci-app-olsr/install
+ $(call Package/luci/install/template,$(1),applications/luci-olsr)
+endef
+
+
+define Package/luci-app-qos
+ $(call Package/luci/webtemplate)
+ DEPENDS+=+luci-mod-admin-core +qos-scripts
+ TITLE:=Quality of Service configuration module
+endef
+
+define Package/luci-app-qos/install
+ $(call Package/luci/install/template,$(1),applications/luci-qos)
endef
define Package/luci-app-splash
$(call Package/luci/fftemplate)
- DEPENDS+=+luci-sgi-haserl +iptables-mod-nat +iptables-mod-ipopt
+ DEPENDS+=+iptables-mod-nat +iptables-mod-ipopt
TITLE:=Freifunk DHCP-Splash application
endef
define Package/luci-app-splash/install
$(call Package/luci/install/template,$(1),applications/luci-splash)
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/usr/sbin/luci-splash $(1)/usr/sbin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/etc/init.d/luci_splash $(1)/etc/init.d
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/etc/cron.minutely/luci_splash $(1)/etc/cron.minutely
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/usr/lib/luci-splash/htdocs/cgi-bin/index.cgi $(1)/usr/lib/luci-splash/htdocs/cgi-bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-splash/dist/www/cgi-bin/luci-splash $(1)/www/cgi-bin/luci-splash
endef
define Package/luci-app-statistics/install
$(call Package/luci/install/template,$(1),applications/luci-statistics)
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-statistics/dist/usr/bin/stat-genconfig $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/applications/luci-statistics/dist/etc/init.d/luci_statistics $(1)/etc/init.d
endef
define Package/luci-sgi-haserl/install
$(call Package/luci/install/template,$(1),libs/sgi-haserl)
- $(CP) -a ./ipkg/luci-sgi-haserl.postinst $(1)/CONTROL/postinst
endef
ifneq ($(CONFIG_PACKAGE_luci-app-firewall),)
PKG_SELECTED_MODULES+=applications/luci-fw
endif
+ifneq ($(CONFIG_PACKAGE_luci-app-olsr),)
+ PKG_SELECTED_MODULES+=applications/luci-olsr
+endif
+ifneq ($(CONFIG_PACKAGE_luci-app-qos),)
+ PKG_SELECTED_MODULES+=applications/luci-qos
+endif
ifneq ($(CONFIG_PACKAGE_luci-app-splash),)
PKG_SELECTED_MODULES+=applications/luci-splash
endif
endif
-MAKE_FLAGS += MODULES="$(PKG_SELECTED_MODULES)" LUA_TARGET="$(LUA_TARGET)" CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" LDFLAGS="$(TARGET_LDFLAGS)"
+MAKE_FLAGS += MODULES="$(PKG_SELECTED_MODULES)" LUA_TARGET="$(LUA_TARGET)" \
+CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" LDFLAGS="$(TARGET_LDFLAGS)" \
+CFOPTS='$(TARGET_CONFIGURE_OPTS)'
$(eval $(call BuildPackage,luci-core))
$(eval $(call BuildPackage,luci-app-ffwizard-leipzig))
$(eval $(call BuildPackage,luci-app-firewall))
+$(eval $(call BuildPackage,luci-app-olsr))
+$(eval $(call BuildPackage,luci-app-qos))
$(eval $(call BuildPackage,luci-app-splash))
$(eval $(call BuildPackage,luci-app-statistics))