iop: fix wifilife consumer build

This commit is contained in:
Anjan Chanda 2018-10-05 13:41:37 +02:00
parent a41267e62e
commit 3666863bc5
3 changed files with 27 additions and 14 deletions

View file

@ -303,7 +303,7 @@ function genconfig {
[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
[ $natalieAllowed -eq 0 ] && echo "CONFIG_NATALIE_OPEN=y" >> .config
[ $mediatekAllowed -eq 0 ] && echo "CONFIG_MEDIATEK_OPEN=y" >> .config
[ $wifilifeAllowed -eq 0 ] && echo "CONFIG_PACKAGE_wifilife=y" >> .config
[ $wifilifeAllowed -eq 0 ] && echo "CONFIG_WIFILIFE_OPEN=y" >> .config
else
echo "CONFIG_GITMIRROR_REWRITE=n" >>.config
echo "CONFIG_BCM_OPEN=y" >> .config
@ -311,7 +311,7 @@ function genconfig {
echo "CONFIG_ENDPT_OPEN=y" >> .config
echo "CONFIG_NATALIE_OPEN=y" >> .config
echo "CONFIG_MEDIATEK_OPEN=y" >> .config
echo "CONFIG_PACKAGE_wifilife=y" >> .config
echo "CONFIG_WIFILIFE_OPEN=y" >> .config
fi
# Force regeneration of themes

View file

@ -81,15 +81,15 @@ build_wifilife_consumer() {
ver=$(grep -w "PKG_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
commit=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/wifilife/Makefile | cut -d'=' -f2)
[ -n "$ver" -a -n "$commit" ] || return
ssh $SERVER "test -f $FPATH/wifilife-${ver}_${commit}.tar.xz" && return
ssh $SERVER "test -f $FPATH/wifilife-$target-${ver}_${commit}.tar.xz" && return
cd ./build_dir/target-*/wifilife-$ver/ipkg-* || cd ./build_dir/target-mips*musl-*/wifilife-$ver/ipkg-*
cp -rf wifilife wifilife-open-$ver
rm -rf wifilife-open-$ver/CONTROL/
tar Jcf wifilife-open-${ver}_${commit}.tar.xz wifilife-open-$ver
scp -pv wifilife-open-${ver}_${commit}.tar.xz $SERVER:$FPATH/
cp wifilife-open-${ver}_${commit}.tar.xz $curdir/
rm -rf wifilife-open-$ver
rm -f wifilife-open-${ver}_${commit}.tar.xz
cp -rf wifilife wifilife-${target}-$ver
rm -rf wifilife-${target}-$ver/CONTROL/
tar Jcf wifilife-${target}-${ver}_${commit}.tar.xz wifilife-${target}-$ver
scp -pv wifilife-$target-${ver}_${commit}.tar.xz $SERVER:$FPATH/
cp wifilife-${target}-${ver}_${commit}.tar.xz $curdir/
rm -rf wifilife-${target}-$ver
rm -f wifilife-${target}-${ver}_${commit}.tar.xz
cd "$curdir"
}

View file

@ -6,14 +6,20 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=wifilife
PKG_VERSION:=1.0.2
PKG_SOURCE_PROTO:=git
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=a9c2106bf53a4e9f5e1a773cbda0af7e54e83a09
PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/wifilife.git
PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
ifeq ($(CONFIG_WIFILIFE_OPEN),y)
TARGET_PROD=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
PKG_SOURCE:=$(PKG_NAME)-$(TARGET_PROD)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
else
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/wifilife.git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(BASE_PKG_VERSION)
endif
include $(INCLUDE_DIR)/package.mk
@ -30,6 +36,12 @@ define Package/wifilife/description
802.11k,v and r.
endef
ifeq ($(CONFIG_WIFILIFE_OPEN),y)
define Build/Compile
endef
define Package/wifilife/install
endef
else
TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/include \
-I$(STAGING_DIR)/usr/include/libnl3 \
@ -43,5 +55,6 @@ define Package/wifilife/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/wifiagent $(1)/usr/sbin/
endef
endif
$(eval $(call BuildPackage,wifilife))