diff options
| author | Nicolas Thill <nico@openwrt.org> | 2005-05-15 09:16:29 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2005-05-15 09:16:29 +0000 |
| commit | eb338e2325457851028c2d7696ebf9471bf63566 (patch) | |
| tree | df0eb9af106ff7748fb27bd62ce0d8c1b5ffeabc /package/usbutils | |
| parent | 69d04e5c3b6c081b52d5a2e90eb4a08bf00cd170 (diff) | |
| download | upstream-eb338e2325457851028c2d7696ebf9471bf63566.tar.gz upstream-eb338e2325457851028c2d7696ebf9471bf63566.tar.bz2 upstream-eb338e2325457851028c2d7696ebf9471bf63566.zip | |
Convert usbutils to new packaging style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@902 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/usbutils')
| -rw-r--r-- | package/usbutils/Config.in | 6 | ||||
| -rw-r--r-- | package/usbutils/Makefile | 89 | ||||
| -rw-r--r-- | package/usbutils/ipkg/lsusb.control (renamed from package/usbutils/usbutils.control) | 0 |
3 files changed, 44 insertions, 51 deletions
diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in index 9b7de2dde4..327d61edc6 100644 --- a/package/usbutils/Config.in +++ b/package/usbutils/Config.in @@ -4,3 +4,9 @@ config BR2_PACKAGE_USBUTILS select BR2_PACKAGE_LIBUSB help A program to list Linux USB devices + + +config BR2_PACKAGE_LSUSB + tristate + default BR2_PACKAGE_USBUTILS + diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile index 5492d96e9a..84502e66a7 100644 --- a/package/usbutils/Makefile +++ b/package/usbutils/Makefile @@ -12,69 +12,56 @@ 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 -IPKG_LSUSB:=$(PACKAGE_DIR)/lsusb_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -IDIR_LSUSB:=$(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) -INFO_LSUSB:=$(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) +$(eval $(call PKG_template,LSUSB,lsusb,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $(PKG_BUILD_DIR)/.prepared - -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared - (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ +$(PKG_BUILD_DIR)/.configured: + (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ ac_cv_func_malloc_0_nonnull=yes \ ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_NLS) \ - $(DISABLE_LARGEFILE) \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_LARGEFILE) \ + $(DISABLE_NLS) \ + --enable-shared \ + --disable-static \ ); touch $(PKG_BUILD_DIR)/.configured -$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: + $(MAKE) -C $(PKG_BUILD_DIR) + mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) + DESTDIR="$(PKG_INSTALL_DIR)" \ + install + touch $(PKG_BUILD_DIR)/.built -$(IPKG_LSUSB): $(PKG_BUILD_DIR)/$(PKG_NAME) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LSUSB) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(IDIR_LSUSB)/usr/share - cp $(PKG_BUILD_DIR)/usb.ids $(IDIR_LSUSB)/usr/share/ - mkdir -p $(IDIR_LSUSB)/usr/sbin - cp $(PKG_BUILD_DIR)/lsusb $(IDIR_LSUSB)/usr/sbin/ - $(STRIP) $(IDIR_LSUSB)/usr/sbin/* - mkdir -p $(PACKAGE_DIR) +$(IPKG_LSUSB): + install -d -m0755 $(IDIR_LSUSB)/usr/share + cp -fpR $(PKG_INSTALL_DIR)/usr/share/usb.ids $(IDIR_LSUSB)/usr/share/ + install -d -m0755 $(IDIR_LSUSB)/usr/sbin + cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/lsusb $(IDIR_LSUSB)/usr/sbin/ + $(RSTRIP) $(IDIR_LSUSB) $(IPKG_BUILD) $(IDIR_LSUSB) $(PACKAGE_DIR) - -$(INFO_LSUSB): $(IPKG_LSUSB) - $(IPKG) install $(IPKG_LSUSB) - -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.prepared -compile: $(IPKG_LSUSB) -install: $(INFO_LSUSB) - -clean: - rm -rf $(PKG_BUILD_DIR) $(IPKG_LSUSB) diff --git a/package/usbutils/usbutils.control b/package/usbutils/ipkg/lsusb.control index 7f864d15a2..7f864d15a2 100644 --- a/package/usbutils/usbutils.control +++ b/package/usbutils/ipkg/lsusb.control |