From e90b9b95b926a030e2be551fc59255208a2d02d7 Mon Sep 17 00:00:00 2001 From: Mike Baker Date: Mon, 15 May 2006 23:13:49 +0000 Subject: [PATCH] more BR2_ / CONFIG_ patches SVN-Revision: 3784 --- openwrt/package/base-files/Config.in | 4 +-- openwrt/package/base-files/Makefile | 10 +++--- openwrt/package/linux-atm/Config.in | 10 +++--- openwrt/package/ppp/Config.in | 46 ++++++++++++++-------------- openwrt/package/ppp/Makefile | 4 +-- openwrt/package/pptp/Config.in | 8 ++--- openwrt/package/wificonf/Config.in | 4 +-- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/openwrt/package/base-files/Config.in b/openwrt/package/base-files/Config.in index c278b272f1..1dd6ff5360 100644 --- a/openwrt/package/base-files/Config.in +++ b/openwrt/package/base-files/Config.in @@ -1,7 +1,7 @@ -config BR2_PACKAGE_LIBGCC +config PACKAGE_LIBGCC prompt "libgcc............................ GCC support library" tristate - default m if CONFIG_DEVEL + default m if DEVEL help GCC support library diff --git a/openwrt/package/base-files/Makefile b/openwrt/package/base-files/Makefile index 8517dcc685..90820cf91d 100644 --- a/openwrt/package/base-files/Makefile +++ b/openwrt/package/base-files/Makefile @@ -6,10 +6,10 @@ PKG_NAME:=base-files PKG_RELEASE:=6 PKG_BUILD_DIR:=$(BUILD_DIR)/base-files -BOARD:=$(shell LANG=C grep ^BR2_LINUX_2 $(TOPDIR)/.config|sed -e "s/=y//" \ +BOARD:=$(shell LANG=C grep ^CONFIG_LINUX_2 $(TOPDIR)/.config|sed -e "s/=y//" \ -e "s/.*_//"| tr "[:upper:]" "[:lower:]") -KERNEL:=$(shell LANG=C grep ^BR2_LINUX_2 $(TOPDIR)/.config|sed -e "s/=y//" \ - -e "s/BR2_LINUX_//" -e "s/_BRCM//" -e "s/_/./"| tr "[:upper:]" "[:lower:]") +KERNEL:=$(shell LANG=C grep ^CONFIG_LINUX_2 $(TOPDIR)/.config|sed -e "s/=y//" \ + -e "s/CONFIG_LINUX_//" -e "s/_BRCM//" -e "s/_/./"| tr "[:upper:]" "[:lower:]") REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' ) ifeq ($(REV),) @@ -32,11 +32,11 @@ IPKG_LIBGCC:=$(PACKAGE_DIR)/libgcc_$(LIBGCC_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PACKAGES:=$(IPKG_BASE) $(IPKG_UCLIBC) PACKAGES_INSTALL:=$(IPKG_BASE) $(IPKG_UCLIBC) -ifeq ($(BR2_PACKAGE_LIBGCC),y) +ifeq ($(CONFIG_PACKAGE_LIBGCC),y) PACKAGES+=$(IPKG_LIBGCC) PACKAGES_INSTALL+=$(IPKG_LIBGCC) endif -ifeq ($(BR2_PACKAGE_LIBGCC),m) +ifeq ($(CONFIG_PACKAGE_LIBGCC),m) PACKAGES+=$(IPKG_LIBGCC) endif diff --git a/openwrt/package/linux-atm/Config.in b/openwrt/package/linux-atm/Config.in index bf7ff35c0b..e9769b5da4 100644 --- a/openwrt/package/linux-atm/Config.in +++ b/openwrt/package/linux-atm/Config.in @@ -1,19 +1,19 @@ -config BR2_PACKAGE_LINUX_ATM +config PACKAGE_LINUX_ATM prompt "linux-atm......................... ATM Library/Utilities for Linux" tristate - default y if BR2_LINUX_2_4_AR7 + default y if LINUX_2_4_AR7 default n help ATM Library for linux http://ftp.debian.org/debian/pool/main/l/linux-atm/ -config BR2_PACKAGE_BR2684CTL +config PACKAGE_BR2684CTL prompt "br2684ctl....................... RFC2684 bridging utility" tristate - default y if BR2_LINUX_2_4_AR7 + default y if LINUX_2_4_AR7 default n - depends BR2_PACKAGE_LINUX_ATM + depends PACKAGE_LINUX_ATM help Utility for setting up ATM RFC2684 bridging mode Useful for PPPoE diff --git a/openwrt/package/ppp/Config.in b/openwrt/package/ppp/Config.in index 21139adf77..237ef20517 100644 --- a/openwrt/package/ppp/Config.in +++ b/openwrt/package/ppp/Config.in @@ -1,53 +1,53 @@ menu "ppp............................... PPP (Point-to-Point Protocol) daemon" -config BR2_PACKAGE_PPP +config PACKAGE_PPP prompt "ppp............................... PPP (Point-to-Point Protocol) daemon" tristate - default n if BR2_LINUX_2_6_ARUBA + default n if LINUX_2_6_ARUBA default y - select BR2_PACKAGE_KMOD_PPP + select PACKAGE_KMOD_PPP -config BR2_PACKAGE_PPP_WITH_FILTER +config PACKAGE_PPP_WITH_FILTER prompt "Enable filter support" bool default y -config BR2_PACKAGE_PPP_MOD_PPPOA +config PACKAGE_PPP_MOD_PPPOA prompt "ppp-mod-pppoa................... PPPoA (PPP over ATM) plugin" tristate - default y if BR2_LINUX_2_4_AR7 - depends on BR2_PACKAGE_PPP - select BR2_PACKAGE_KMOD_PPPOATM + default y if LINUX_2_4_AR7 + depends on PACKAGE_PPP + select PACKAGE_KMOD_PPPOATM -config BR2_PACKAGE_PPP_MOD_PPPOE +config PACKAGE_PPP_MOD_PPPOE prompt "ppp-mod-pppoe................... PPPoE (PPP over Ethernet) plugin" tristate default y - depends on BR2_PACKAGE_PPP - select BR2_PACKAGE_KMOD_PPPOE + depends on PACKAGE_PPP + select PACKAGE_KMOD_PPPOE -config BR2_PACKAGE_PPP_MOD_RADIUS +config PACKAGE_PPP_MOD_RADIUS prompt "ppp-mod-radius.................. RADIUS (Remote Authentication Dial-In User Service) plugin" tristate - default m if CONFIG_DEVEL - depends on BR2_PACKAGE_PPP + default m if DEVEL + depends on PACKAGE_PPP -config BR2_PACKAGE_CHAT +config PACKAGE_CHAT prompt "chat............................ Utility to establish conversation with other PPP servers (via a modem)" tristate - default m if CONFIG_DEVEL - depends on BR2_PACKAGE_PPP + default m if DEVEL + depends on PACKAGE_PPP -config BR2_PACKAGE_PPPDUMP +config PACKAGE_PPPDUMP prompt "pppdump......................... Utility to read PPP record file" tristate - default m if CONFIG_DEVEL - depends on BR2_PACKAGE_PPP + default m if DEVEL + depends on PACKAGE_PPP -config BR2_PACKAGE_PPPSTATS +config PACKAGE_PPPSTATS prompt "pppstats........................ Utility to report PPP statistics" tristate - default m if CONFIG_DEVEL - depends on BR2_PACKAGE_PPP + default m if DEVEL + depends on PACKAGE_PPP endmenu diff --git a/openwrt/package/ppp/Makefile b/openwrt/package/ppp/Makefile index e63fa4cf50..92aba9a57d 100644 --- a/openwrt/package/ppp/Makefile +++ b/openwrt/package/ppp/Makefile @@ -40,7 +40,7 @@ $(eval $(call PKG_mod_template,PPP_MOD_PPPOE,rp-pppoe)) $(eval $(call PKG_mod_template,PPP_MOD_RADIUS,radius)) PKG_DEPEND:="kmod-ppp" -ifeq ($(BR2_PACKAGE_PPP_WITH_FILTER),y) +ifeq ($(CONFIG_PACKAGE_PPP_WITH_FILTER),y) ENABLE_FILTER:="PRECOMPILED_FILTER=1" endif @@ -84,7 +84,7 @@ $(PKG_BUILD_DIR)/.built: all install touch $@ -ifeq ($(BR2_PACKAGE_PPP_WITH_FILTER),y) +ifeq ($(CONFIG_PACKAGE_PPP_WITH_FILTER),y) INSTALL_FILTER=install -m0644 ./files/etc/ppp/filter $(IDIR_PPP)/etc/ppp/ endif diff --git a/openwrt/package/pptp/Config.in b/openwrt/package/pptp/Config.in index 88da23748c..425473a058 100644 --- a/openwrt/package/pptp/Config.in +++ b/openwrt/package/pptp/Config.in @@ -1,9 +1,9 @@ -config BR2_PACKAGE_PPTP +config PACKAGE_PPTP prompt "pptp.............................. PPTP (Point-to-Point Tunneling Protocol) client" tristate - default m if CONFIG_DEVEL - select BR2_PACKAGE_KMOD_GRE - select BR2_PACKAGE_PPP + default m if DEVEL + select PACKAGE_KMOD_GRE + select PACKAGE_PPP help A Point-to-Point Tunneling Protocol Client diff --git a/openwrt/package/wificonf/Config.in b/openwrt/package/wificonf/Config.in index 410f33107d..e401cee7c2 100644 --- a/openwrt/package/wificonf/Config.in +++ b/openwrt/package/wificonf/Config.in @@ -1,8 +1,8 @@ -config BR2_PACKAGE_WIFICONF +config PACKAGE_WIFICONF prompt "wificonf.......................... replacement utility for wlconf" tristate default y - depends BR2_PACKAGE_NVRAM + depends PACKAGE_NVRAM help Replacement utility for wlconf -- 2.30.2