@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME := libupm
PKG_NAME := libupm
PKG_VERSION := 2.0.0
PKG_VERSION := 2.0.0
PKG_RELEASE := 4
PKG_RELEASE := 5
PKG_SOURCE := $( PKG_NAME) -$( PKG_VERSION) .tar.gz
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_SOURCE_URL := https://codeload.github.com/intel-iot-devkit/upm/tar.gz/v$( PKG_VERSION) ?
@ -53,7 +53,7 @@ UPM_MODULES:= \
# (require libtinyb) 2jciebu01_ble 2jciebu01_usb
# (require libtinyb) 2jciebu01_ble 2jciebu01_usb
CMAKE_OPTIONS += \
CMAKE_OPTIONS += \
-DBUILDSWIGNODE= $( if $( CONFIG_PACKAGE_libmraa-node) ,ON, OFF) \
-DBUILDSWIGNODE= OFF \
-DPYTHON2LIBS_FOUND= FALSE \
-DPYTHON2LIBS_FOUND= FALSE \
-DPYTHON2INTERP_FOUND= FALSE \
-DPYTHON2INTERP_FOUND= FALSE \
@ -78,7 +78,6 @@ define Package/libupm
TITLE:= Intel IoT sensor library - Full
TITLE:= Intel IoT sensor library - Full
DEPENDS += +libjpeg +libmodbus +openzwave
DEPENDS += +libjpeg +libmodbus +openzwave
DEPENDS += $( foreach module, $( UPM_MODULES) , +libupm-$( module) )
DEPENDS += $( foreach module, $( UPM_MODULES) , +libupm-$( module) )
DEPENDS += $( foreach module, $( UPM_MODULES) , +libupm-$( module) -node)
DEPENDS += $( foreach module, $( UPM_MODULES) , +libupm-$( module) -python3)
DEPENDS += $( foreach module, $( UPM_MODULES) , +libupm-$( module) -python3)
e n d e f
e n d e f
@ -93,11 +92,6 @@ define Package/libupm/install/Default
$( CP) $( PKG_INSTALL_DIR) /usr/lib/libupm*-$( 2) .so* $( 1) /usr/lib/ ;
$( CP) $( PKG_INSTALL_DIR) /usr/lib/libupm*-$( 2) .so* $( 1) /usr/lib/ ;
e n d e f
e n d e f
d e f i n e P a c k a g e / l i b u p m / i n s t a l l / D e f a u l t - n o d e
$( INSTALL_DIR) $( 1) /usr/lib/node/
$( CP) $( PKG_INSTALL_DIR) /usr/lib/node_modules/jsupm_$( 2) $( 1) /usr/lib/node/ ;
e n d e f
d e f i n e P a c k a g e / l i b u p m / i n s t a l l / D e f a u l t - p y t h o n 3
d e f i n e P a c k a g e / l i b u p m / i n s t a l l / D e f a u l t - p y t h o n 3
$( INSTALL_DIR) $( 1) /usr/lib/python$( PYTHON3_VERSION) /site-packages/upm
$( INSTALL_DIR) $( 1) /usr/lib/python$( PYTHON3_VERSION) /site-packages/upm
$( CP) $( CMAKE_BINARY_DIR) /$( if $( filter interfaces, $( 2) ) ,,src/) $( 2) /python$( PYTHON3_VERSION) /pyupm_$( 2) .py \
$( CP) $( CMAKE_BINARY_DIR) /$( if $( filter interfaces, $( 2) ) ,,src/) $( 2) /python$( PYTHON3_VERSION) /pyupm_$( 2) .py \
@ -109,7 +103,6 @@ endef
d e f i n e P a c k a g e / l i b u p m / i n s t a l l
d e f i n e P a c k a g e / l i b u p m / i n s t a l l
$( foreach module, $( UPM_MODULES) , \
$( foreach module, $( UPM_MODULES) , \
$( call Package/libupm/install/Default,$( 1) ,$( module) ) \
$( call Package/libupm/install/Default,$( 1) ,$( module) ) \
$( call Package/libupm/install/Default-node,$( 1) ,$( module) ) \
$( call Package/libupm/install/Default-python3,$( 1) ,$( module) ) )
$( call Package/libupm/install/Default-python3,$( 1) ,$( module) ) )
e n d e f
e n d e f
@ -345,19 +338,6 @@ $(call Package/libupm/Default/description)
T h i s p a c k a g e c o n t a i n s $( 1) s e n s o r C / C + + l i b r a r y
T h i s p a c k a g e c o n t a i n s $( 1) s e n s o r C / C + + l i b r a r y
e n d e f
e n d e f
d e f i n e P a c k a g e / l i b u p m - $( 1) - n o d e
$( call Package/libupm/Default)
$( call UpmPackage/depends,$( 1) )
TITLE:= $( 1) Node.js library
DEPENDS += +libupm-$( 1) +libmraa-node
e n d e f
d e f i n e P a c k a g e / l i b u p m - $( 1) - n o d e / d e s c r i p t i o n
$( call Package /libupm /Default /description )
T h i s p a c k a g e c o n t a i n s $( 1) s e n s o r N o d e . j s l i b r a r y
e n d e f
d e f i n e P a c k a g e / l i b u p m - $( 1) - p y t h o n 3
d e f i n e P a c k a g e / l i b u p m - $( 1) - p y t h o n 3
$( call Package/libupm/Default)
$( call Package/libupm/Default)
$( call UpmPackage/depends,$( 1) )
$( call UpmPackage/depends,$( 1) )
@ -374,9 +354,6 @@ endef
d e f i n e P a c k a g e / l i b u p m - $( 1) / i n s t a l l
d e f i n e P a c k a g e / l i b u p m - $( 1) / i n s t a l l
$( call Package/libupm/install/Default,$$ ( 1) ,$( 1) )
$( call Package/libupm/install/Default,$$ ( 1) ,$( 1) )
e n d e f
e n d e f
d e f i n e P a c k a g e / l i b u p m - $( 1) - n o d e / i n s t a l l
$( call Package/libupm/install/Default-node,$$ ( 1) ,$( 1) )
e n d e f
d e f i n e P a c k a g e / l i b u p m - $( 1) - p y t h o n 3 / i n s t a l l
d e f i n e P a c k a g e / l i b u p m - $( 1) - p y t h o n 3 / i n s t a l l
$( call Package/libupm/install/Default-python3,$$ ( 1) ,$( 1) )
$( call Package/libupm/install/Default-python3,$$ ( 1) ,$( 1) )
e n d e f
e n d e f
@ -386,5 +363,4 @@ $(eval $(call BuildPackage,libupm))
$( foreach module , $ ( UPM_MODULES ) , \
$( foreach module , $ ( UPM_MODULES ) , \
$( eval $( call UpmPackage,$( module) ) ) \
$( eval $( call UpmPackage,$( module) ) ) \
$( eval $( call BuildPackage,libupm-$( module) ) ) \
$( eval $( call BuildPackage,libupm-$( module) ) ) \
$( eval $( call BuildPackage,libupm-$( module) -node) ) \
$( eval $( call BuildPackage,libupm-$( module) -python3) ) )
$( eval $( call BuildPackage,libupm-$( module) -python3) ) )