From: Nicolas Thill Date: Fri, 13 May 2005 06:14:13 +0000 (+0000) Subject: Convert libusb to new packaging style X-Git-Tag: reboot~32842 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=655ea85decb7ba76ad92a84b76ad456fa5c3b2a9;p=oweals%2Fopenwrt.git Convert libusb to new packaging style SVN-Revision: 880 --- diff --git a/openwrt/package/libusb/Makefile b/openwrt/package/libusb/Makefile index c252965272..ae7782d93b 100644 --- a/openwrt/package/libusb/Makefile +++ b/openwrt/package/libusb/Makefile @@ -12,21 +12,14 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) -PKG_INFO:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list +include $(TOPDIR)/package/rules.mk -$(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) - -$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(PATCH) $(PKG_BUILD_DIR) ./patches - touch $(PKG_BUILD_DIR)/.prepared +$(eval $(call PKG_template,LIBUSB,libusb,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared - (cd $(PKG_BUILD_DIR); rm -rf config.cache config.status; \ + (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ @@ -57,33 +50,35 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared ); touch $(PKG_BUILD_DIR)/.configured -$(PKG_BUILD_DIR)/.libs/libusb.so: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) -j1 \ - CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(ARCH) \ + CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld ARCH=$(ARCH) + mkdir -p $(PKG_INSTALL_DIR) + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + install + touch $(PKG_BUILD_DIR)/.built + +$(IPKG_LIBUSB): + install -m0755 -d $(IDIR_LIBUSB)/usr/lib + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libusb*.so.* $(IDIR_LIBUSB)/usr/lib/ + $(RSTRIP) $(IDIR_LIBUSB) + $(IPKG_BUILD) $(IDIR_LIBUSB) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libusb.so: $(PKG_BUILD_DIR)/.libs/libusb.so - mkdir -p $(STAGING_DIR)/usr/lib + mkdir -p $(STAGING_DIR)/usr/bin + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -a $(PKG_BUILD_DIR)/.libs/*.so* $(STAGING_DIR)/usr/lib/ - cp -a $(PKG_BUILD_DIR)/usb.h $(STAGING_DIR)/usr/include/ - -$(PKG_IPK): $(STAGING_DIR)/usr/lib/libusb.so - $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(PKG_IPK_DIR)/usr/lib - cp -a $(PKG_BUILD_DIR)/.libs/libusb*.so* $(PKG_IPK_DIR)/usr/lib/ - $(STRIP) $(PKG_IPK_DIR)/usr/lib/* - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) + cp -fpR $(PKG_INSTALL_DIR)/usr/include/usb.h $(STAGING_DIR)/usr/include/ + mkdir -p $(STAGING_DIR)/usr/lib + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(STAGING_DIR)/usr/lib/ + touch $(STAGING_DIR)/usr/lib/libusb.so -$(PKG_INFO): $(PKG_IPK) - $(IPKG) install $(PKG_IPK) +install-dev: $(STAGING_DIR)/usr/lib/libusb.so -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.prepared -compile: $(PKG_IPK) $(STAGING_DIR)/usr/lib/libusb.so -install: $(PKG_INFO) +uninstall-dev: + rm -rf $(STAGING_DIR)/usr/include/usb.h + rm -rf $(STAGING_DIR)/usr/lib/libusb.{a,so*} -clean: - rm -f $(STAGING_DIR)/usr/lib/libusb* - rm -f $(STAGING_DIR)/usr/include/usb.h - rm -rf $(PKG_BUILD_DIR) $(PKG_IPK) +compile: install-dev +clean: uninstall-dev diff --git a/openwrt/package/libusb/ipkg/libusb.control b/openwrt/package/libusb/ipkg/libusb.control new file mode 100644 index 0000000000..89cc640dce --- /dev/null +++ b/openwrt/package/libusb/ipkg/libusb.control @@ -0,0 +1,6 @@ +Package: libusb +Priority: optional +Section: libs +Maintainer: Felix Fietkau +Source: buildroot internal +Description: a Library for accessing Linux USB devices diff --git a/openwrt/package/libusb/libusb.control b/openwrt/package/libusb/libusb.control deleted file mode 100644 index 89cc640dce..0000000000 --- a/openwrt/package/libusb/libusb.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: libusb -Priority: optional -Section: libs -Maintainer: Felix Fietkau -Source: buildroot internal -Description: a Library for accessing Linux USB devices