Convert usbutils to new packaging style

SVN-Revision: 902

diff --git a/openwrt/package/usbutils/Config.in b/openwrt/package/usbutils/Config.in
index 9b7de2dde43cfe2482bada09943c7082cfb56d76..327d61edc67c45c012f6ffe53fd24bca02b8a7bd 100644 (file)
--- a/openwrt/package/usbutils/Config.in
+++ b/openwrt/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/openwrt/package/usbutils/Makefile b/openwrt/package/usbutils/Makefile
index 5492d96e9a507a06d330bb57670d4ea836722194..84502e66a7ab06c2e4d6a3e296fbb68641f9402c 100644 (file)
--- a/openwrt/package/usbutils/Makefile
+++ b/openwrt/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/openwrt/package/usbutils/ipkg/lsusb.control b/openwrt/package/usbutils/ipkg/lsusb.control
new file mode 100644 (file)
index 0000000..7f864d1
--- /dev/null
+++ b/openwrt/package/usbutils/ipkg/lsusb.control
@@ -0,0 +1,7 @@
+Package: lsusb
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Depends: libusb
+Description: A program to list USB devices

diff --git a/openwrt/package/usbutils/usbutils.control b/openwrt/package/usbutils/usbutils.control
deleted file mode 100644 (file)
index 7f864d1..0000000
--- a/openwrt/package/usbutils/usbutils.control
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: lsusb
-Priority: optional
-Section: net
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Depends: libusb
-Description: A program to list USB devices