From 4e00d98efdec5bb2e6e19eccf85fcf9a0eecb646 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 18 Jun 2006 18:30:40 +0000 Subject: [PATCH] normalize Makefiles. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3998 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/base-files/Makefile | 32 ++++++++--------- package/fuse/Makefile | 51 ++++++++++++--------------- package/hostap/Makefile | 38 +++++++++----------- package/ipsec-tools/Makefile | 4 +-- package/ipset/Makefile | 2 +- package/iptables/Makefile | 6 ---- package/libpcap/Makefile | 34 ++++++++---------- package/mini_fo/Makefile | 17 +++++---- package/nvram/Makefile | 11 +++--- package/openswan/Makefile | 17 +++++---- package/ppp/Makefile | 77 ++++++++++++++++++++--------------------- package/pptp/Makefile | 6 ++-- package/shfs/Makefile | 16 ++++----- package/spca5xx/Makefile | 17 +++++---- package/switch/Makefile | 26 +++++++------- package/ueagle-atm/Makefile | 16 ++++----- package/wireless-tools/Makefile | 26 +++++++------- package/zd1211/Makefile | 19 +++++----- package/zlib/Makefile | 25 ++++++------- 19 files changed, 204 insertions(+), 236 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index c790efeab1..ec3dc88923 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -23,12 +23,12 @@ endif CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files) define Package/base-files$(TARGET) - SECTION:=base - CATEGORY:=Base system - DEFAULT:=y - TITLE:=OpenWrt system scripts - DESCRIPTION:=Base filesystem for OpenWrt - VERSION:=$(PKG_RELEASE) +SECTION:=base +CATEGORY:=Base system +DEFAULT:=y +TITLE:=OpenWrt system scripts +DESCRIPTION:=Base filesystem for OpenWrt +VERSION:=$(PKG_RELEASE) endef define -ar7-2.4/conffiles @@ -74,19 +74,19 @@ $(call $(TARGET)/conffiles) endef define Package/libgcc - SECTION:=libs - CATEGORY:=Libraries - DEFAULT:=y - TITLE:=GCC support library - VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE) - DESCRIPTION:=$(TITLE) +SECTION:=libs +CATEGORY:=Libraries +DEFAULT:=y +TITLE:=GCC support library +VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE) +DESCRIPTION:=$(TITLE) endef define Package/uclibc - $(call Package/base-files$(TARGET)) - VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) - TITLE:=C library - DESCRIPTION:=C library for embedded systems +$(call Package/base-files$(TARGET)) +VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) +TITLE:=C library +DESCRIPTION:=C library for embedded systems endef define Build/Prepare diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 09780e0d38..91d4dd6074 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -8,23 +8,23 @@ PKG_VERSION:=2.5.3 PKG_RELEASE:=1 PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=@SF/$(PKG_NAME) 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 include $(TOPDIR)/package/rules.mk define Package/kmod-fuse - SECTION:=drivers - CATEGORY:=Drivers - DEPENDS:= - TITLE:=FUSE (Filesystem in UserSpacE) - DESCRIPTION:=FUSE (Filesystem in UserSpacE) - URL:=http://fuse.sourceforge.net/ - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) +SECTION:=drivers +CATEGORY:=Drivers +DEPENDS:= +TITLE:=FUSE (Filesystem in UserSpacE) +DESCRIPTION:=FUSE (Filesystem in UserSpacE) +URL:=http://fuse.sourceforge.net/ +VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) endef define Build/Configure @@ -81,24 +81,13 @@ define Build/Compile all install endef -define Package/kmod-fuse/install - install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION) - $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ - $(1)/lib/modules/$(LINUX_VERSION)/ - install -d -m0755 $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/ - install -d -m0755 $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/ -endef - - define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse $(STAGING_DIR)/usr/include/ - $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse{,.h} \ + $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.a $(STAGING_DIR)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.{a,so*} \ + $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir}/fuse,,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc @@ -106,13 +95,19 @@ define Build/InstallDev endef define Build/UninstallDev - rm -rf \ - $(STAGING_DIR)/usr/include/fuse \ - $(STAGING_DIR)/usr/include/fuse.h \ - $(STAGING_DIR)/usr/lib/libfuse.a \ - $(STAGING_DIR)/usr/lib/libfuse.so* \ + rm -rf $(STAGING_DIR)/usr/include/fuse{,.h} \ + $(STAGING_DIR)/usr/lib/libfuse.{a,so*} \ $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc endef +define Package/kmod-fuse/install + install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION) + $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ + $(1)/lib/modules/$(LINUX_VERSION)/ + install -d -m0755 $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(1)/usr/lib/ + install -d -m0755 $(1)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(1)/usr/bin/ +endef $(eval $(call BuildPackage,kmod-fuse)) diff --git a/package/hostap/Makefile b/package/hostap/Makefile index b546c0b255..80f820187b 100644 --- a/package/hostap/Makefile +++ b/package/hostap/Makefile @@ -8,21 +8,21 @@ PKG_VERSION:=0.4.9 PKG_RELEASE:=1 PKG_MD5SUM:=c7534dc040ab90218257a78488ecd378 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/ 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 include $(TOPDIR)/package/rules.mk define Package/kmod-hostap - SECTION:=drivers - CATEGORY:=Drivers - DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_4_X86 - TITLE:=Host AP support for Prism2/2.5/3 IEEE 802.11b - DESCRIPTION:=Host AP support for Prism2/2.5/3 IEEE 802.11b \\\ +SECTION:=drivers +CATEGORY:=Drivers +DEPENDS:=@LINUX_2_4_BRCM||LINUX_2_4_X86 +TITLE:=Host AP support for Prism2/2.5/3 IEEE 802.11b +DESCRIPTION:=Host AP support for Prism2/2.5/3 IEEE 802.11b \\\ A driver for 802.11b wireless cards based on Intersil Prism2/2.5/3 \\\ chipset. This driver supports so called Host AP mode that allows the card \\\ to act as an IEEE 802.11 access point. \\\ @@ -30,28 +30,22 @@ to act as an IEEE 802.11 access point. \\\ This option includes the base Host AP driver code that is shared by \\\ different hardware models. You will also need to enable support for \\\ PLX/PCI/CS version of the driver to actually use the driver. \\\ - URL:=http://hostap.epitest.fi/ - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) +URL:=http://hostap.epitest.fi/ +VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) endef define Package/kmod-hostap-pci - SECTION:=drivers - CATEGORY:=Drivers - DEPENDS:=kmod-hostap - TITLE:=Host AP driver for Prism2.5 PCI adaptors - DESCRIPTION:=Host AP driver for Prism2.5 PCI adaptors - URL:=http://hostap.epitest.fi/ - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) +$(call Package/kmod-hostap) +DEPENDS:=kmod-hostap +TITLE:=Host AP driver for Prism2.5 PCI adaptors +DESCRIPTION:=Host AP driver for Prism2.5 PCI adaptors endef define Package/kmod-hostap-plx - SECTION:=drivers - CATEGORY:=Drivers - DEPENDS:=kmod-hostap - TITLE:=Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors - DESCRIPTION:=Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors - URL:=http://hostap.epitest.fi/ - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) +$(call Package/kmod-hostap) +DEPENDS:=kmod-hostap +TITLE:=Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors +DESCRIPTION:=Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors endef diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 4b6bfe09ec..58dccca62a 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -74,11 +74,11 @@ endef define Package/ipsec-tools/install install -d -m0755 $(1)/etc + install -m0600 $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(1)/etc/ install -d -m0755 $(1)/usr/lib/ - install -d -m0755 $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(1)/etc/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/ + install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(1)/usr/sbin/ diff --git a/package/ipset/Makefile b/package/ipset/Makefile index b5b9c784ed..456f8b6be4 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -6,7 +6,7 @@ PKG_NAME:=ipset PKG_VERSION:=2.2.3 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/ipset-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2 PKG_SOURCE_URL:=http://ipset.netfilter.org PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26 diff --git a/package/iptables/Makefile b/package/iptables/Makefile index f47b936f05..623a64ed84 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -50,7 +50,6 @@ Includes: \\\ * libipt_conntrack \\\ * libipt_helper \\\ * libipt_connmark/CONNMARK - endef define Package/iptables-mod-filter @@ -62,7 +61,6 @@ DESCRIPTION:=iptables extensions for packet content inspection\\\ Includes: \\\ * libipt_ipp2p \\\ * libipt_layer7 - endef define Package/iptables-mod-imq @@ -73,7 +71,6 @@ TITLE:=IMQ support DESCRIPTION:=iptables extension for IMQ support\\\ Includes: \\\ * libipt_IMQ - endef define Package/iptables-mod-ipopt @@ -91,7 +88,6 @@ Includes: \\\ * libipt_tcpmms \\\ * libipt_ttl/TTL \\\ * libipt_unclean - endef define Package/iptables-mod-ipsec @@ -103,7 +99,6 @@ DESCRIPTION:=iptables extensions for matching ipsec traffic\\\ Includes: \\\ * libipt_ah \\\ * libipt_esp - endef define Package/iptables-mod-nat @@ -138,7 +133,6 @@ Includes: \\\ * libipt_physdev \\\ * libipt_pkttype \\\ * libipt_recent - endef define Package/iptables-utils diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 960caf133d..d4d7e21672 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -17,11 +17,11 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(TOPDIR)/package/rules.mk define Package/libpcap - SECTION:=base - CATEGORY:=Libraries - TITLE:=Low-level packet capture library - DESCRIPTION:=A system-independent library for user-level network packet capture. - URL:=http://www.tcpdump.org/ +SECTION:=base +CATEGORY:=Libraries +TITLE:=Low-level packet capture library +DESCRIPTION:=A system-independent library for user-level network packet capture. +URL:=http://www.tcpdump.org/ endef define Build/Configure @@ -69,29 +69,23 @@ define Build/Compile all install endef -define Package/libpcap/install - install -m0755 -d $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/ -endef - define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/pcap.h \ - $(PKG_INSTALL_DIR)/usr/include/pcap-bpf.h \ - $(PKG_INSTALL_DIR)/usr/include/pcap-namedb.h \ + $(CP) $(PKG_INSTALL_DIR)/usr/include/pcap{,-bpf,-namedb}.h \ $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.a \ - $(PKG_INSTALL_DIR)/usr/lib/libpcap.so* \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} \ $(STAGING_DIR)/usr/lib/ endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/pcap.h \ - $(STAGING_DIR)/usr/include/pcap-bpf.h \ - $(STAGING_DIR)/usr/include/pcap-namedb.h \ - $(STAGING_DIR)/usr/lib/libpcap.a \ - $(STAGING_DIR)/usr/lib/libpcap.so* + rm -rf $(STAGING_DIR)/usr/include/pcap{,-bpf,-named}.h \ + $(STAGING_DIR)/usr/lib/libpcap.{a,so*} +endef + +define Package/libpcap/install + install -m0755 -d $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libpcap)) diff --git a/package/mini_fo/Makefile b/package/mini_fo/Makefile index a6319f4f7e..f2c46c9ec3 100644 --- a/package/mini_fo/Makefile +++ b/package/mini_fo/Makefile @@ -8,22 +8,21 @@ PKG_VERSION:=0.6.2pre1 PKG_RELEASE:=1 PKG_MD5SUM:=acd12157be25d7b3c8df90914049403e +PKG_BUILD_DIR:=$(BUILD_DIR)/mini_fo-0-6-2-pre1 PKG_SOURCE_URL:=http://www.denx.de/twiki/pub/Know/MiniFOHome/ PKG_SOURCE:=mini_fo-0-6-2-pre1.tar.bz2 PKG_CAT:=bzcat -PKG_BUILD_DIR:=$(BUILD_DIR)/mini_fo-0-6-2-pre1 - include $(TOPDIR)/package/rules.mk define Package/kmod-mini-fo - SECTION:=drivers - CATEGORY:=Drivers - DEPENDS:= - TITLE:=The mini fanout overlay file system - DESCRIPTION:=The mini fanout overlay file system - URL:=http://www.denx.de/wiki/Know.MiniFOHome - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) +SECTION:=drivers +CATEGORY:=Drivers +DEPENDS:= +TITLE:=The mini fanout overlay file system +DESCRIPTION:=The mini fanout overlay file system +URL:=http://www.denx.de/wiki/Know.MiniFOHome +VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) endef define Build/Compile diff --git a/package/nvram/Makefile b/package/nvram/Makefile index 5900f6f05b..019800a0c6 100644 --- a/package/nvram/Makefile +++ b/package/nvram/Makefile @@ -22,20 +22,19 @@ define Build/Prepare endef define Package/nvram/install - install -d -m0755 $(1)/usr/lib + install -d -m0755 $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib{nvram,shared}*.so $(1)/usr/lib/ install -d -m0755 $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib - install -m0755 $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin/ endef define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_BUILD_DIR)/*.so $(STAGING_DIR)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib{nvram,shared}*.so $(STAGING_DIR)/usr/lib/ endef define Build/UninstallDev - rm -f $(STAGING_DIR)/usr/lib/libshared*.so \ - $(STAGING_DIR)/usr/lib/libnvram*.so + rm -f $(STAGING_DIR)/usr/lib/lib{nvram,shared}*.so endef $(eval $(call BuildPackage,nvram)) diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 1f41ccff91..4a1a42cc07 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -8,23 +8,22 @@ PKG_VERSION:=2.4.5 PKG_RELEASE:=1 PKG_MD5SUM:=a9a8e88313faceebfc5ceb1a9da9a3c4 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=http://www.openswan.org/download PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - include $(TOPDIR)/package/rules.mk define Package/kmod-openswan - SECTION:=drivers - CATEGORY:=Drivers - DEPENDS:= - TITLE:=Openswan kernel module - DESCRIPTION:=Openswan kernel module \\\ +SECTION:=drivers +CATEGORY:=Drivers +DEPENDS:= +TITLE:=Openswan kernel module +DESCRIPTION:=Openswan kernel module \\\ Openswan is an implementation of IPsec for Linux. - URL:=http://www.openswan.org/ - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) +URL:=http://www.openswan.org/ +VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) endef define Build/Compile diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 2f01400308..55986f95c0 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -18,65 +18,64 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(TOPDIR)/package/rules.mk define Package/ppp - SECTION:=net - CATEGORY:=Network - MENU:=1 - DEFAULT:=y - TITLE:=PPP daemon - DESCRIPTION:=PPP (Point-to-Point Protocol) daemon - URL:=http://ppp.samba.org/ +SECTION:=net +CATEGORY:=Network +MENU:=1 +DEFAULT:=y +TITLE:=PPP daemon +DESCRIPTION:=PPP (Point-to-Point Protocol) daemon +URL:=http://ppp.samba.org/ endef define Package/ppp-mod-pppoa - SECTION:=net - CATEGORY:=Network - DEPENDS:=ppp +linux-atm - TITLE:=PPPoA plugin - DESCRIPTION:=PPPoA (PPP over ATM) plugin for ppp +SECTION:=net +CATEGORY:=Network +DEPENDS:=ppp +linux-atm +TITLE:=PPPoA plugin +DESCRIPTION:=PPPoA (PPP over ATM) plugin for ppp endef define Package/ppp-mod-pppoe - SECTION:=net - CATEGORY:=Network - DEFAULT:=y - DEPENDS:=ppp - TITLE:=PPPoE plugin - DESCRIPTION:=PPPoE (PPP over Ethernet) plugin for ppp +SECTION:=net +CATEGORY:=Network +DEFAULT:=y +DEPENDS:=ppp +TITLE:=PPPoE plugin +DESCRIPTION:=PPPoE (PPP over Ethernet) plugin for ppp endef define Package/ppp-mod-radius - SECTION:=net - CATEGORY:=Network - DEPENDS:=ppp - TITLE:=RADIUS plugin - DESCRIPTION:=RADIUS (Remote Authentication Dial-In User Service) plugin for ppp +SECTION:=net +CATEGORY:=Network +DEPENDS:=ppp +TITLE:=RADIUS plugin +DESCRIPTION:=RADIUS (Remote Authentication Dial-In User Service) plugin for ppp endef define Package/chat - SECTION:=net - CATEGORY:=Network - DEPENDS:=ppp - TITLE:=Establish conversation with a modem - DESCRIPTION:=Utility to establish conversation with other PPP servers (via a modem) +SECTION:=net +CATEGORY:=Network +DEPENDS:=ppp +TITLE:=Establish conversation with a modem +DESCRIPTION:=Utility to establish conversation with other PPP servers (via a modem) endef define Package/pppdump - SECTION:=net - CATEGORY:=Network - DEPENDS:=ppp - TITLE:=Read PPP record file - DESCRIPTION:=Utility to read PPP record file +SECTION:=net +CATEGORY:=Network +DEPENDS:=ppp +TITLE:=Read PPP record file +DESCRIPTION:=Utility to read PPP record file endef define Package/pppstats - SECTION:=net - CATEGORY:=Network - DEPENDS:=ppp - TITLE:=Report PPP statistics - DESCRIPTION:=Utility to report PPP statistics +SECTION:=net +CATEGORY:=Network +DEPENDS:=ppp +TITLE:=Report PPP statistics +DESCRIPTION:=Utility to report PPP statistics endef - define Build/Compile rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR)/usr diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 776a668640..08cb43a7c2 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -23,11 +23,11 @@ URL:=http://pptpclient.sourceforge.net/ endef define Package/pptp/install - install -d -m0755 $(1)/sbin install -d -m0755 $(1)/etc/ppp - install -d -m0755 $(1)/usr/sbin - install -m0755 ./files/ifup.pptp $(1)/sbin/ifup.pptp install -m0644 ./files/options.pptp $(1)/etc/ppp/ + install -d -m0755 $(1)/sbin + install -m0755 ./files/ifup.pptp $(1)/sbin/ + install -d -m0755 $(1)/usr/sbin install -m0755 $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/ endef diff --git a/package/shfs/Makefile b/package/shfs/Makefile index dacbf8d75f..69f8d83a46 100644 --- a/package/shfs/Makefile +++ b/package/shfs/Makefile @@ -8,27 +8,27 @@ PKG_VERSION:=0.35 PKG_RELEASE:=2 PKG_MD5SUM:=016f49d71bc32eee2b5d11fc1600cfbe +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=@SF/shfs 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 include $(TOPDIR)/package/rules.mk define Package/kmod-shfs - SECTION:=drivers - CATEGORY:=Drivers - DEPENDS:= - TITLE:=Shell FileSystem (ShFS) - DESCRIPTION:=Shell FileSystem (ShFS) \\\ +SECTION:=drivers +CATEGORY:=Drivers +DEPENDS:= +TITLE:=Shell FileSystem (ShFS) +DESCRIPTION:=Shell FileSystem (ShFS) \\\ ShFS is a simple and easy to use Linux kernel module which allows you to \\\ mount remote filesystems using a plain shell (SSH) connection. When using \\\ ShFS, you can access all remote files just like the local ones, only the \\\ access is governed through the transport security of SSH. - URL:=http://shfs.sourceforge.net/ - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) +URL:=http://shfs.sourceforge.net/ +VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) endef define Build/Compile diff --git a/package/spca5xx/Makefile b/package/spca5xx/Makefile index 0a84d980c9..93eea633cd 100644 --- a/package/spca5xx/Makefile +++ b/package/spca5xx/Makefile @@ -8,23 +8,22 @@ PKG_VERSION:=20060301 PKG_RELEASE:=1 PKG_MD5SUM:=4160e03c408ac254111febacf058b88a +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=http://mxhaard.free.fr/spca50x/Download/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - include $(TOPDIR)/package/rules.mk #FIXME: add proper dependency handling on kmod-usb-core & kmod-videodev packages define Package/kmod-spca5xx - SECTION:=drivers - CATEGORY:=Drivers - DEPENDS:=@PACKAGE_KMOD_USB&&PACKAGE_KMOD_VIDEODEV - TITLE:=Driver for SPCA5xx based USB cameras - DESCRIPTION:=Driver for SPCA5xx based USB cameras - URL:=http://mxhaard.free.fr/ - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) +SECTION:=drivers +CATEGORY:=Drivers +DEPENDS:=@PACKAGE_KMOD_USB&&PACKAGE_KMOD_VIDEODEV +TITLE:=Driver for SPCA5xx based USB cameras +DESCRIPTION:=Driver for SPCA5xx based USB cameras +URL:=http://mxhaard.free.fr/ +VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) endef define Build/Compile diff --git a/package/switch/Makefile b/package/switch/Makefile index be99a6064d..e8aa6a02a4 100644 --- a/package/switch/Makefile +++ b/package/switch/Makefile @@ -3,12 +3,22 @@ include $(TOPDIR)/rules.mk include $(TOPDIR)/package/kernel.mk -PKG_NAME := kmod-switch -PKG_RELEASE := 1 -PKG_BUILD_DIR := $(KERNEL_BUILD_DIR)/$(PKG_NAME) +PKG_NAME:=kmod-switch +PKG_RELEASE:=1 + +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) include $(TOPDIR)/package/rules.mk +define Package/kmod-switch +SECTION:=drivers +CATEGORY:=Drivers +DEPENDS:=@LINUX_2_6_BRCM||LINUX_2_4_BRCM +DEFAULT:=y +TITLE:=Switch drivers +DESCRIPTION:=Switch drivers for ADM6996L and BCM53XX RoboSwitch +VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) +endef define Build/Prepare mkdir -p $(PKG_BUILD_DIR) @@ -25,16 +35,6 @@ define Build/Compile modules endef -define Package/kmod-switch - SECTION:=drivers - CATEGORY:=Drivers - DEPENDS:=@LINUX_2_6_BRCM||LINUX_2_4_BRCM - DEFAULT:=y - TITLE:=Switch drivers - DESCRIPTION:=Switch drivers for ADM6996L and BCM53XX RoboSwitch - VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) -endef - define Package/kmod-switch/install install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION) $(CP) $(PKG_BUILD_DIR)/*.$(LINUX_KMOD_SUFFIX) \ diff --git a/package/ueagle-atm/Makefile b/package/ueagle-atm/Makefile index 630bcf74b6..6f227a1bf4 100644 --- a/package/ueagle-atm/Makefile +++ b/package/ueagle-atm/Makefile @@ -8,24 +8,24 @@ PKG_VERSION:=1.0d1 PKG_RELEASE:=1 PKG_MD5SUM:=5da1fceb15168f4c7ad407a3e38ddecb +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=http://castet.matthieu.free.fr/eagle/release/ 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 include $(TOPDIR)/package/rules.mk #FIXME: add dependency on kmod-usb-core define Package/kmod-ueagle-atm - SECTION:=drivers - CATEGORY:=Drivers - DEPENDS:=@LINUX_2_6_BRCM - TITLE:=Driver for Eagle 8051 based USB ADSL modems - DESCRIPTION:=Driver for Eagle 8051 based USB ADSL modems - URL:=http://www.eagle-usb.org/ - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) +SECTION:=drivers +CATEGORY:=Drivers +DEPENDS:=@LINUX_2_6_BRCM @PACKAGE_KMOD_USB +TITLE:=Driver for Eagle 8051 based USB ADSL modems +DESCRIPTION:=Driver for Eagle 8051 based USB ADSL modems +URL:=http://www.eagle-usb.org/ +VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) endef define Build/Compile diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index 4839563e74..ad4eddab8c 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -26,10 +26,11 @@ URL:=http://hplabs.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html endef define Build/Compile + rm -rf $(PKG_INSTALL_DIR) + mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \ libiw.so.28 iwmulticall - mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ PREFIX="$(PKG_INSTALL_DIR)" \ INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \ @@ -37,23 +38,24 @@ define Build/Compile install-iwmulticall endef -define Package/wireless-tools/install - install -d -m0755 $(1)/usr/lib - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/libiw.so.28 $(1)/usr/lib/ - install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/ -endef - define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/{lib,include} + mkdir -p $(STAGING_DIR)/usr/include + $(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/ + mkdir -p $(STAGING_DIR)/usr/lib $(CP) $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/ ln -sf libiw.so.28 $(STAGING_DIR)/usr/lib/libiw.so - $(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/ endef define Build/UninstallDev - rm -f $(STAGING_DIR)/usr/lib/libiw.* - rm -f $(STAGING_DIR)/usr/include/{iwlib,wireless}.h + rm -f $(STAGING_DIR)/usr/include/{iwlib,wireless}.h \ + $(STAGING_DIR)/usr/lib/libiw.so* +endef + +define Package/wireless-tools/install + install -d -m0755 $(1)/usr/lib + install -m0755 $(PKG_BUILD_DIR)/libiw.so.28 $(1)/usr/lib/ + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/ endef $(eval $(call BuildPackage,wireless-tools)) diff --git a/package/zd1211/Makefile b/package/zd1211/Makefile index e73c0dc522..a71873b9f7 100644 --- a/package/zd1211/Makefile +++ b/package/zd1211/Makefile @@ -8,25 +8,25 @@ PKG_VERSION:=r69 PKG_RELEASE:=1 PKG_MD5SUM:=c14133a3d5b27927402a492e84d2467a +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION) PKG_SOURCE_URL:=http://zd1211.ath.cx/download/ PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz PKG_CAT:=zcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION) - include $(TOPDIR)/package/rules.mk +#FIXME: add proper dependency handling on kmod-usb-core packages define Package/kmod-zd1211 - SECTION:=drivers - CATEGORY:=Drivers - DEPENDS:=@LINUX_2_6 - TITLE:=Driver for Zydas 1211 based USB devices - DESCRIPTION:=Driver for Zydas 1211 based USB devices \\\ +SECTION:=drivers +CATEGORY:=Drivers +DEPENDS:=@LINUX_2_6 +TITLE:=Driver for Zydas 1211 based USB devices +DESCRIPTION:=Driver for Zydas 1211 based USB devices \\\ Linux driver for the ZyDAS ZD1211 802.11b/g USB-WLAN-Chip.\\\ Initially contributed by ZyDAS, this driver is actively maintained by the \\\ open source community. - URL:=http://zd1211.ath.cx/ - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) +URL:=http://zd1211.ath.cx/ +VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) endef define Build/Compile @@ -54,4 +54,3 @@ define Package/kmod-zd1211/install endef $(eval $(call BuildPackage,kmod-zd1211)) - diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 33cbcceb27..02659bb9ac 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -8,8 +8,7 @@ PKG_RELEASE:=3 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.zlib.net \ - @SF/zlib +PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6 PKG_CAT:=bzcat @@ -47,27 +46,23 @@ define Build/Compile install endef -define Package/zlib/install - install -m0755 -d $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/ -endef - define Build/InstallDev mkdir -p $(STAGING_DIR)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/zconf.h \ - $(PKG_INSTALL_DIR)/usr/include/zlib.h \ + $(CP) $(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h \ $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.a \ - $(PKG_INSTALL_DIR)/usr/lib/libz.so* \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \ $(STAGING_DIR)/usr/lib/ endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/zconf.h \ - $(STAGING_DIR)/usr/include/zlib.h \ - $(STAGING_DIR)/usr/lib/libz.a \ - $(STAGING_DIR)/usr/lib/libz.so* + rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h \ + $(STAGING_DIR)/usr/lib/libz.{a,so*} +endef + +define Package/zlib/install + install -m0755 -d $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,zlib)) -- 2.11.0