Changeset 40705


Ignore:
Timestamp:
2014-05-06T01:10:44+02:00 (4 years ago)
Author:
swalker
Message:

[packages] libusbmuxd: add separate libusbmuxd & tools package that was split from usbmuxd
[packages] usbmuxd: disable building & packaging the bundled libusbmuxd & tools

Signed-off-by: Stephen Walker <stephendwalker+openwrt@…>

Location:
packages
Files:
3 added
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • packages/libs/libusbmuxd/Makefile

    r40695 r40705  
    88include $(TOPDIR)/rules.mk 
    99 
    10 PKG_NAME:=usbmuxd 
    11 PKG_VERSION:=1.0.8 
     10PKG_NAME:=libusbmuxd 
     11PKG_VERSION:=1.0.9 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1515PKG_SOURCE_URL:=http://www.libimobiledevice.org/downloads 
    16 PKG_MD5SUM:=4b33cc78e479e0f9a6745f9b9a8b60a8 
     16PKG_MD5SUM:=3f1d4bd0c0a1a4d7bf96219e117ec499 
    1717 
    18 CMAKE_INSTALL:=1 
     18PKG_INSTALL:=1 
    1919 
    2020include $(INCLUDE_DIR)/package.mk 
    21 include $(INCLUDE_DIR)/cmake.mk 
    2221 
    23 define Package/usbmuxd/Default 
     22define Package/libusbmuxd/Default 
    2423  TITLE:=USB multiplexing daemon 
    2524  URL:=http://www.libimobiledevice.org/ 
    2625endef 
    2726 
    28 define Package/usbmuxd/Default/description 
     27define Package/libusbmuxd/Default/description 
    2928  This daemon is in charge of multiplexing connections over USB to an iPhone or 
    3029  iPod touch. To users, it means you can sync your music, contacts, photos, etc. 
     
    3433endef 
    3534 
    36 define Package/usbmuxd 
    37   $(call Package/usbmuxd/Default) 
    38   SECTION:=utils 
    39   CATEGORY:=Utilities 
    40   DEPENDS:=+librt +libusb-1.0 +libusbmuxd 
    41 endef 
    42  
    43 define Package/usbmuxd/description 
    44   $(call Package/usbmuxd/Default/description) 
    45 endef 
    46  
    4735define Package/libusbmuxd 
    48   $(call Package/usbmuxd/Default) 
     36  $(call Package/libusbmuxd/Default) 
    4937  SECTION:=libs 
    5038  CATEGORY:=Libraries 
     
    5442 
    5543define Package/libusbmuxd/description 
    56   $(call Package/usbmuxd/Default/description) 
    57   This package contains the usbmuxd shared library. 
     44  $(call Package/libusbmuxd/Default/description) 
     45  This package contains the libusbmuxd shared library. 
     46endef 
     47 
     48define Package/libusbmuxd-utils 
     49  $(call Package/libusbmuxd/Default) 
     50  SECTION:=utils 
     51  CATEGORY:=Utilities 
     52  TITLE+= utilies 
     53  DEPENDS:=+libusbmuxd 
     54endef 
     55 
     56define Package/libusbmuxd-utils/description 
     57  $(call Package/libusbmuxd/Default/description) 
     58  This package contains the libusbmuxd utilities. 
    5859endef 
    5960 
     
    6465        $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ 
    6566        $(INSTALL_DIR) $(1)/usr/lib 
    66         $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/libusbmuxd.so* $(1)/usr/lib/ 
     67        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusbmuxd.so* $(1)/usr/lib/ 
    6768        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig 
    68         $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/pkgconfig/libusbmuxd.pc $(1)/usr/lib/pkgconfig/ 
    69         $(SED) 's,lib$(LIB_SUFFIX),lib,g' $(1)/usr/lib/pkgconfig/libusbmuxd.pc 
    70         $(SED) 's,\-dirty,$(PKG_VERSION),g' $(1)/usr/lib/pkgconfig/libusbmuxd.pc 
    71 endef 
    72  
    73 define Package/usbmuxd/install 
    74         $(INSTALL_DIR) $(1)/usr/bin 
    75         $(CP) $(PKG_INSTALL_DIR)/usr/bin/iproxy $(1)/usr/bin/ 
    76         $(INSTALL_DIR) $(1)/usr/sbin 
    77         $(CP) $(PKG_INSTALL_DIR)/usr/sbin/usbmuxd $(1)/usr/sbin/ 
     69        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libusbmuxd.pc $(1)/usr/lib/pkgconfig/ 
    7870endef 
    7971 
    8072define Package/libusbmuxd/install 
    8173        $(INSTALL_DIR) $(1)/usr/lib 
    82         $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/libusbmuxd.so.* $(1)/usr/lib/ 
     74        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusbmuxd.so.* $(1)/usr/lib/ 
    8375endef 
    8476 
    85 $(eval $(call BuildPackage,usbmuxd)) 
     77define Package/libusbmuxd-utils/install 
     78        $(INSTALL_DIR) $(1)/usr/bin 
     79        $(CP) $(PKG_INSTALL_DIR)/usr/bin/iproxy $(1)/usr/bin/ 
     80endef 
     81 
    8682$(eval $(call BuildPackage,libusbmuxd)) 
     83$(eval $(call BuildPackage,libusbmuxd-utils)) 
  • packages/utils/usbmuxd/Makefile

    r40657 r40705  
    1010PKG_NAME:=usbmuxd 
    1111PKG_VERSION:=1.0.8 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    2121include $(INCLUDE_DIR)/cmake.mk 
    2222 
    23 define Package/usbmuxd/Default 
     23define Package/usbmuxd 
     24  SECTION:=utils 
     25  CATEGORY:=Utilities 
    2426  TITLE:=USB multiplexing daemon 
    2527  URL:=http://www.libimobiledevice.org/ 
     28  DEPENDS:=+librt +libusb-1.0 +libusbmuxd 
    2629endef 
    2730 
    28 define Package/usbmuxd/Default/description 
     31define Package/usbmuxd/description 
    2932  This daemon is in charge of multiplexing connections over USB to an iPhone or 
    3033  iPod touch. To users, it means you can sync your music, contacts, photos, etc. 
     
    3437endef 
    3538 
    36 define Package/usbmuxd 
    37   $(call Package/usbmuxd/Default) 
    38   SECTION:=utils 
    39   CATEGORY:=Utilities 
    40   DEPENDS:=+librt +libusb-1.0 +libusbmuxd 
    41 endef 
    42  
    43 define Package/usbmuxd/description 
    44   $(call Package/usbmuxd/Default/description) 
    45 endef 
    46  
    47 define Package/libusbmuxd 
    48   $(call Package/usbmuxd/Default) 
    49   SECTION:=libs 
    50   CATEGORY:=Libraries 
    51   TITLE+= library 
    52   DEPENDS:=+libplist +libpthread +libxml2 +zlib 
    53 endef 
    54  
    55 define Package/libusbmuxd/description 
    56   $(call Package/usbmuxd/Default/description) 
    57   This package contains the usbmuxd shared library. 
    58 endef 
    59  
    6039TARGET_CFLAGS += $(FPIC) 
    6140 
    62 define Build/InstallDev 
    63         $(INSTALL_DIR) $(1)/usr/include 
    64         $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ 
    65         $(INSTALL_DIR) $(1)/usr/lib 
    66         $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/libusbmuxd.so* $(1)/usr/lib/ 
    67         $(INSTALL_DIR) $(1)/usr/lib/pkgconfig 
    68         $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/pkgconfig/libusbmuxd.pc $(1)/usr/lib/pkgconfig/ 
    69         $(SED) 's,lib$(LIB_SUFFIX),lib,g' $(1)/usr/lib/pkgconfig/libusbmuxd.pc 
    70         $(SED) 's,\-dirty,$(PKG_VERSION),g' $(1)/usr/lib/pkgconfig/libusbmuxd.pc 
    71 endef 
    72  
    7341define Package/usbmuxd/install 
    74         $(INSTALL_DIR) $(1)/usr/bin 
    75         $(CP) $(PKG_INSTALL_DIR)/usr/bin/iproxy $(1)/usr/bin/ 
    7642        $(INSTALL_DIR) $(1)/usr/sbin 
    7743        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/usbmuxd $(1)/usr/sbin/ 
    7844endef 
    7945 
    80 define Package/libusbmuxd/install 
    81         $(INSTALL_DIR) $(1)/usr/lib 
    82         $(CP) $(PKG_INSTALL_DIR)/usr/lib$(LIB_SUFFIX)/libusbmuxd.so.* $(1)/usr/lib/ 
    83 endef 
    84  
    8546$(eval $(call BuildPackage,usbmuxd)) 
    86 $(eval $(call BuildPackage,libusbmuxd)) 
Note: See TracChangeset for help on using the changeset viewer.