Changeset 308


Ignore:
Timestamp:
2005-03-06T04:53:29+01:00 (13 years ago)
Author:
mbm
Message:

bring up to date with nbd's br2_test20.tar.bz2

Location:
trunk/openwrt
Files:
74 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/Config.in

    r307 r308  
    1717source "package/iproute2/Config.in" 
    1818source "package/openvpn/Config.in" 
     19source "package/pptpd/Config.in" 
    1920 
    2021comment "Libraries" 
    2122source "package/zlib/Config.in" 
     23source "package/matrixssl/Config.in" 
    2224source "package/lzo/Config.in" 
    2325source "package/openssl/Config.in" 
  • trunk/openwrt/package/Makefile

    r307 r308  
    1313package-$(BR2_PACKAGE_LZO) += lzo 
    1414package-$(BR2_PACKAGE_ZLIB) += zlib 
     15package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl 
    1516package-$(BR2_PACKAGE_OPENSSL) += openssl 
    1617package-$(BR2_PACKAGE_OPENVPN) += openvpn 
     18package-$(BR2_PACKAGE_PPTPD) += pptpd 
    1719package-$(BR2_PACKAGE_IPROUTE2) += iproute2 
    1820package-$(BR2_PACKAGE_LINKSYS_UTILS) += linksys-utils 
  • trunk/openwrt/package/dnsmasq/Config.in

    r202 r308  
    11config BR2_PACKAGE_DNSMASQ 
    2         bool "dnsmasq" 
     2        tristate "dnsmasq" 
    33        default y 
    44        help 
  • trunk/openwrt/package/dnsmasq/Makefile

    r307 r308  
     1############################################################# 
     2# 
     3# ebtables 
     4# 
     5############################################################# 
    16include $(TOPDIR)/rules.mk 
    27 
    3 include ./dnsmasq.mk 
     8PKG_NAME:=dnsmasq 
     9PKG_VERSION:=2.15 
     10PKG_RELEASE:=1 
     11PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq 
     12PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
     13PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) 
     14PKG_CAT:=zcat 
     15PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk 
     16PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg 
    417 
    5 source: dnsmasq-source 
    6 prepare: $(DNSMASQ_DIR)/.unpacked 
    7 compile: $(DNSMASQ_DIR)/src/dnsmasq 
    8 install: dnsmasq 
    9 clean: dnsmasq-dirclean 
     18$(DL_DIR)/$(PKG_SOURCE): 
     19         $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) 
     20 
     21$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE) 
     22        $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - 
     23        $(PATCH) $(PKG_BUILD_DIR) ./patches 
     24        touch $(PKG_BUILD_DIR)/.patched 
     25 
     26$(PKG_BUILD_DIR)/src/$(PKG_NAME): $(PKG_BUILD_DIR)/.patched 
     27        $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \ 
     28                BINDIR=/usr/sbin MANDIR=/usr/man -C $(PKG_BUILD_DIR) 
     29 
     30$(PKG_IPK): $(PKG_BUILD_DIR)/src/$(PKG_NAME) 
     31        $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) 
     32        mkdir -p $(PKG_IPK_DIR)/usr/sbin 
     33        cp $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_IPK_DIR)/usr/sbin/ 
     34        $(STRIP) $(PKG_IPK_DIR)/usr/sbin/* 
     35        mkdir -p $(PACKAGE_DIR) 
     36        $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) 
     37 
     38source: $(DL_DIR)/$(PKG_SOURCE) 
     39prepare: $(PKG_BUILD_DIR)/.patched 
     40compile: $(PKG_IPK) 
     41install: 
     42        $(IPKG) install $(PKG_IPK) 
     43clean: 
     44        rm -rf $(PKG_BUILD_DIR) 
     45        rm -f $(PKG_IPK) 
  • trunk/openwrt/package/linux/Config.in

    r307 r308  
    5555        help 
    5656          Kernel support for the TUN/TAP tunneling device 
    57            
     57 
     58config BR2_PACKAGE_KMOD_GRE 
     59        tristate "GRE tunneling driver" 
     60        default m 
     61        help 
     62          Kernel support for GRE tunnels 
     63 
    5864config BR2_PACKAGE_KMOD_SCHED 
    5965        tristate "Traffic schedulers" 
  • trunk/openwrt/package/linux/Makefile

    r307 r308  
    5555        $(MODULES_DIR)/kernel/drivers/net/tun.o \ 
    5656)) 
     57$(eval $(call KMOD_template,GRE,gre,\ 
     58        $(MODULES_DIR)/kernel/net/ipv4/ip_gre.o \ 
     59)) 
    5760$(eval $(call KMOD_template,SCHED,sched,\ 
    5861        $(MODULES_DIR)/kernel/net/sched/*.o \ 
Note: See TracChangeset for help on using the changeset viewer.