fix some build flags, add support for transparently copying files from a luci checkout's top level directory if the package subdirectory is symlinked
This commit is contained in:
parent
87e30fa12c
commit
d7476bd131
1 changed files with 33 additions and 9 deletions
|
@ -1,27 +1,45 @@
|
||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_BRANCH:=trunk
|
PKG_BRANCH:=trunk
|
||||||
PKG_SOURCE_URL:=https://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH)
|
|
||||||
PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Last Changed Rev: //p')
|
ifeq ($(DUMP),)
|
||||||
|
USELOCAL:=$(shell grep luci ../../../.project 2>/dev/null >/dev/null && echo 1)
|
||||||
|
endif
|
||||||
|
|
||||||
PKG_NAME:=luci
|
PKG_NAME:=luci
|
||||||
PKG_VERSION:=0.7+svn$(PKG_REV)
|
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
ifeq ($(USELOCAL),1)
|
||||||
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
|
PKG_VERSION:=0.7+svn
|
||||||
PKG_SOURCE_PROTO:=svn
|
else
|
||||||
PKG_SOURCE_VERSION:=$(PKG_REV)
|
PKG_SOURCE_URL:=https://dev.leipzig.freifunk.net/svn/ff-luci/$(PKG_BRANCH)
|
||||||
|
ifeq ($(DUMP),)
|
||||||
|
PKG_REV:=$(shell LC_ALL=C svn info ${PKG_SOURCE_URL} | sed -ne's/^Last Changed Rev: //p')
|
||||||
|
PKG_VERSION:=0.7+svn$(PKG_REV)
|
||||||
|
endif
|
||||||
|
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||||
|
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
|
||||||
|
PKG_SOURCE_PROTO:=svn
|
||||||
|
PKG_SOURCE_VERSION:=$(PKG_REV)
|
||||||
|
endif
|
||||||
|
|
||||||
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
|
||||||
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
|
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
|
||||||
|
|
||||||
|
PKG_BUILD_DEPENDS:=libnotimpl
|
||||||
LUA_TARGET:=source
|
LUA_TARGET:=source
|
||||||
PKG_SELECTED_MODULES:=
|
PKG_SELECTED_MODULES:=
|
||||||
|
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
ifeq ($(USELOCAL),1)
|
||||||
|
define Build/Prepare
|
||||||
|
mkdir -p $(PKG_BUILD_DIR)
|
||||||
|
$(TAR) c -C ../../../ . --exclude=.pc --exclude='boa-0*' --exclude=.svn --exclude=.git | tar x -C $(PKG_BUILD_DIR)/
|
||||||
|
endef
|
||||||
|
endif
|
||||||
|
|
||||||
define Build/Configure
|
define Build/Configure
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -499,7 +517,13 @@ ifneq ($(CONFIG_PACKAGE_luci-i18n-english),)
|
||||||
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)" \
|
||||||
|
LUA_SHLIBS="-llua -lm" \
|
||||||
|
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
|
||||||
|
LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \
|
||||||
|
OS="Linux"
|
||||||
|
|
||||||
|
|
||||||
$(eval $(call BuildPackage,luci-core))
|
$(eval $(call BuildPackage,luci-core))
|
||||||
|
|
Loading…
Reference in a new issue