Ignore:
Timestamp:
2011-11-13T23:16:30+01:00 (5 years ago)
Author:
nico
Message:

packages/rp-pppoe: use new service functions, use $(CP) instead of $(INSTALL_*) for packaging stuff installed by upstream Makefile

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/net/rp-pppoe/Makefile

    r24297 r29082  
    11# 
    2 # Copyright (C) 2006 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1010PKG_NAME:=rp-pppoe 
    1111PKG_VERSION:=3.10 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     
    3030 
    3131define Package/rp-pppoe/Default/description 
    32         Dubbed RP-PPPoE, this open-source product is ideal for Linux users with 
    33         a DSL "modem" whose Internet service provider uses PPPoE. 
     32  Dubbed RP-PPPoE, this open-source product is ideal for Linux users with 
     33  a DSL "modem" whose Internet service provider uses PPPoE. 
    3434endef 
    3535 
     
    4040 
    4141define Package/rp-pppoe-client/description 
    42         $(call Package/rp-pppoe/Default/description) 
    43         This package contains pppoe-connect. 
     42$(call Package/rp-pppoe/Default/description) 
     43 . 
     44 This package contains pppoe-connect. 
    4445endef 
    4546 
     
    5051 
    5152define Package/rp-pppoe-relay/description 
    52         $(call Package/rp-pppoe/Default/description) 
    53         This package contains pppoe-relay. 
     53$(call Package/rp-pppoe/Default/description) 
     54 . 
     55 This package contains pppoe-relay. 
    5456endef 
    5557 
     
    6567 
    6668define Package/rp-pppoe-server/description 
    67         $(call Package/rp-pppoe/Default/description) 
    68         This package contains pppoe-server. 
     69$(call Package/rp-pppoe/Default/description) 
     70 . 
     71 This package contains pppoe-server. 
    6972endef 
    7073 
     
    7578 
    7679define Package/rp-pppoe-sniff/description 
    77         $(call Package/rp-pppoe/Default/description) 
    78         This package contains pppoe-sniff. 
     80$(call Package/rp-pppoe/Default/description) 
     81 . 
     82 This package contains pppoe-sniff. 
    7983endef 
    8084 
     
    8589MAKE_PATH := ./src 
    8690 
    87 define Package/rp-pppoe-client/install   
     91define Package/rp-pppoe-client/install 
    8892        $(INSTALL_DIR) $(1)/etc/init.d 
    8993        $(INSTALL_BIN) ./files/pppoe-client.init $(1)/etc/init.d/pppoe-client 
    9094        $(INSTALL_DIR) $(1)/etc/ppp 
    91         $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ppp/pppoe.conf $(1)/etc/ppp/ 
     95        $(CP) $(PKG_INSTALL_DIR)/etc/ppp/pppoe.conf $(1)/etc/ppp/ 
    9296        $(INSTALL_DIR) $(1)/usr/sbin 
    93         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pppoe $(1)/usr/sbin/ 
     97        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe $(1)/usr/sbin/ 
    9498        $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/pppoe-connect $(1)/usr/sbin/ 
    9599        $(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/pppoe-start $(1)/usr/sbin/ 
     
    98102endef 
    99103 
    100 define Package/rp-pppoe-relay/install    
     104define Package/rp-pppoe-relay/install 
    101105        $(INSTALL_DIR) $(1)/etc/default 
    102106        $(INSTALL_BIN) ./files/pppoe-relay.default $(1)/etc/default/pppoe-relay 
     
    104108        $(INSTALL_BIN) ./files/pppoe-relay.init $(1)/etc/init.d/pppoe-relay 
    105109        $(INSTALL_DIR) $(1)/usr/sbin 
    106         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-relay $(1)/usr/sbin/ 
     110        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-relay $(1)/usr/sbin/ 
    107111endef 
    108112 
    109 define Package/rp-pppoe-server/install   
     113define Package/rp-pppoe-server/install 
    110114        $(INSTALL_DIR) $(1)/etc/default 
    111115        $(INSTALL_BIN) ./files/pppoe-server.default $(1)/etc/default/pppoe-server 
     
    114118        $(INSTALL_DIR) $(1)/etc/ppp 
    115119        $(INSTALL_DIR) $(1)/etc/ppp/plugins 
    116         $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ppp/pppoe-server-options $(1)/etc/ppp/ 
     120        $(CP) $(PKG_INSTALL_DIR)/etc/ppp/pppoe-server-options $(1)/etc/ppp/ 
    117121        $(INSTALL_DIR) $(1)/usr/sbin 
    118         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-server $(1)/usr/sbin/ 
    119         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/ppp/plugins/rp-pppoe.so $(1)/etc/ppp/plugins/ 
     122        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-server $(1)/usr/sbin/ 
     123        $(CP) $(PKG_INSTALL_DIR)/etc/ppp/plugins/rp-pppoe.so $(1)/etc/ppp/plugins/ 
    120124endef 
    121125 
    122 define Package/rp-pppoe-sniff/install    
     126define Package/rp-pppoe-sniff/install 
    123127        $(INSTALL_DIR) $(1)/usr/sbin 
    124         $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-sniff $(1)/usr/sbin/ 
     128        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-sniff $(1)/usr/sbin/ 
    125129endef 
    126130 
Note: See TracChangeset for help on using the changeset viewer.