diff options
| author | Hirokazu MORIKAWA <morikw2@gmail.com> | 2019-06-19 09:02:13 +0900 |
|---|---|---|
| committer | Hirokazu MORIKAWA <morikw2@gmail.com> | 2019-06-19 10:43:21 +0900 |
| commit | 6e6740b0a58a7b5d3e50f06a4f47a021e5b41039 (patch) | |
| tree | d0b9ad5e0fbb7f0bc6d09e1fe00524906a834e52 /libs/libupm/Makefile | |
| parent | 59c9ec6bfe35fd47a34be2c6cbeccbc12b24af45 (diff) | |
libupm: update to 2.0.0
Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Diffstat (limited to 'libs/libupm/Makefile')
| -rw-r--r-- | libs/libupm/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libs/libupm/Makefile b/libs/libupm/Makefile index 384ab1816..d9b809e2d 100644 --- a/libs/libupm/Makefile +++ b/libs/libupm/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupm -PKG_VERSION:=1.7.1 +PKG_VERSION:=2.0.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/intel-iot-devkit/upm/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b253742b01146f4b86e20714aa24e75ca1e9d46629eab9aa8db070ce94cf3619 +PKG_HASH:=7dd2f4165b71e071d100b58d6a392f3cf57b0f257c82ffabf49e931b5ed6bc23 PKG_BUILD_DIR:=$(BUILD_DIR)/upm-$(PKG_VERSION) PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>, Hirokazu MORIKAWA <morikw2@gmail.com> @@ -21,7 +21,9 @@ PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE CMAKE_INSTALL:=1 +CMAKE_BINARY_SUBDIR:=build PKG_USE_MIPS16:=0 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -33,9 +35,7 @@ UPM_MODULES:= \ adxrs610 am2315 apa102 apds9002 apds9930 at42qt1070 bh1749 bh1750 bh1792 biss0001 bma220 \ bma250e bmg160 bmi160 bmm150 bmp280 bmpx8x bmx055 bno055 button buzzer cjq4435 collision \ cwlsxxa dfrec dfrorp dfrph ds1307 ds1808lc ds18b20 ds2413 ecezo ecs1030 \ - ehr eldriver electromagnet emg enc03r flex gas gp2y0a gprs grove grovecollision groveehr \ - groveeldriver groveelectromagnet groveemg grovegprs grovegsr grovelinefinder grovemd \ - grovemoisture groveo2 grovescam grovespeaker groveultrasonic grovevdiv grovewater grovewfs \ + ehr eldriver electromagnet emg enc03r flex gas gp2y0a gprs \ gsr guvas12d h3lis331dl hcsr04 hdc1000 hdxxvxta hka5 hlg150h hm11 hmc5883l hmtrp hp20x \ ht9170 htu21d hx711 ili9341 ims ina132 interfaces isd1820 itg3200 jhd1313m1 joystick12 kx122 \ kxcjk1013 kxtj3 l298 l3gd20 lcd lcdks lcm1602 ldt0028 led lidarlitev3 light linefinder lis2ds12 \ @@ -51,6 +51,7 @@ UPM_MODULES:= \ veml6070 water waterlevel wfs wheelencoder wt5001 xbee yg1006 zfm20 \ vcap t3311 hwxpxx h803x ozw curieimu # (require libbacnet) tb7300 t8100 e50hx bacnetmstp +# (require libtinyb) 2jciebu01_ble 2jciebu01_usb define Package/libupm/Default SECTION:=libs @@ -96,7 +97,7 @@ endef define Package/libupm/install/Default-python $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/site-packages/upm - $(CP) $(PKG_BUILD_DIR)/src/$(2)/python$(PYTHON_VERSION)/pyupm_$(2).py \ + $(CP) $(CMAKE_BINARY_DIR)/$(if $(filter interfaces, $(2)),,src/)$(2)/python$(PYTHON_VERSION)/pyupm_$(2).py \ $(1)/usr/lib/python$(PYTHON_VERSION)/site-packages/upm/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON_VERSION)/site-packages/upm/_pyupm_$(2).so \ $(1)/usr/lib/python$(PYTHON_VERSION)/site-packages/upm/ ; @@ -104,7 +105,7 @@ endef define Package/libupm/install/Default-python3 $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/upm - $(CP) $(PKG_BUILD_DIR)/src/$(2)/python$(PYTHON3_VERSION)/pyupm_$(2).py \ + $(CP) $(CMAKE_BINARY_DIR)/$(if $(filter interfaces, $(2)),,src/)$(2)/python$(PYTHON3_VERSION)/pyupm_$(2).py \ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/upm/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/python$(PYTHON3_VERSION)/site-packages/upm/_pyupm_$(2).so \ $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/upm/ ; |