projects
/
openwrt
/
staging
/
mkresin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7db5108
)
more BR2_ / CONFIG_ patches
author
Mike Baker
<mbm@openwrt.org>
Mon, 15 May 2006 23:13:49 +0000
(23:13 +0000)
committer
Mike Baker
<mbm@openwrt.org>
Mon, 15 May 2006 23:13:49 +0000
(23:13 +0000)
SVN-Revision: 3784
openwrt/package/base-files/Config.in
patch
|
blob
|
history
openwrt/package/base-files/Makefile
patch
|
blob
|
history
openwrt/package/linux-atm/Config.in
patch
|
blob
|
history
openwrt/package/ppp/Config.in
patch
|
blob
|
history
openwrt/package/ppp/Makefile
patch
|
blob
|
history
openwrt/package/pptp/Config.in
patch
|
blob
|
history
openwrt/package/wificonf/Config.in
patch
|
blob
|
history
diff --git
a/openwrt/package/base-files/Config.in
b/openwrt/package/base-files/Config.in
index c278b272f1b61a122b8c0d0573af9ad1e2171f04..1dd6ff5360c4f6a455e4ce14032d761ce520a7f2 100644
(file)
--- 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
prompt "libgcc............................ GCC support library"
tristate
- default m if
CONFIG_
DEVEL
+ default m if DEVEL
help
GCC support library
help
GCC support library
diff --git
a/openwrt/package/base-files/Makefile
b/openwrt/package/base-files/Makefile
index 8517dcc685ca28282908c8dcf77cb0adf9a5f68f..90820cf91dcc012c14a74a763d1231c076addf7a 100644
(file)
--- 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
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:]")
-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),)
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)
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
PACKAGES+=$(IPKG_LIBGCC)
PACKAGES_INSTALL+=$(IPKG_LIBGCC)
endif
-ifeq ($(
BR2
_PACKAGE_LIBGCC),m)
+ifeq ($(
CONFIG
_PACKAGE_LIBGCC),m)
PACKAGES+=$(IPKG_LIBGCC)
endif
PACKAGES+=$(IPKG_LIBGCC)
endif
diff --git
a/openwrt/package/linux-atm/Config.in
b/openwrt/package/linux-atm/Config.in
index bf7ff35c0bcc16feceb812b466d9a3c668dda20e..e9769b5da49be46f9a42d152cd95e97933b2f797 100644
(file)
--- 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
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/
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
prompt "br2684ctl....................... RFC2684 bridging utility"
tristate
- default y if
BR2_
LINUX_2_4_AR7
+ default y if LINUX_2_4_AR7
default n
default n
- depends
BR2_
PACKAGE_LINUX_ATM
+ depends PACKAGE_LINUX_ATM
help
Utility for setting up ATM RFC2684 bridging mode
Useful for PPPoE
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 21139adf77619e7b1238146030e25162a15e9b35..237ef20517620aa735357a035fd2aff37c4177a9 100644
(file)
--- a/
openwrt/package/ppp/Config.in
+++ b/
openwrt/package/ppp/Config.in
@@
-1,53
+1,53
@@
menu "ppp............................... PPP (Point-to-Point Protocol) daemon"
menu "ppp............................... PPP (Point-to-Point Protocol) daemon"
-config
BR2_
PACKAGE_PPP
+config PACKAGE_PPP
prompt "ppp............................... PPP (Point-to-Point Protocol) daemon"
tristate
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
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
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
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
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
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
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
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
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
endmenu
diff --git
a/openwrt/package/ppp/Makefile
b/openwrt/package/ppp/Makefile
index e63fa4cf5040fc0c999e36c3248543330648936e..92aba9a57d716803859f193fc0a4f0b4268e4ab9 100644
(file)
--- 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"
$(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
ENABLE_FILTER:="PRECOMPILED_FILTER=1"
endif
@@
-84,7
+84,7
@@
$(PKG_BUILD_DIR)/.built:
all install
touch $@
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
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 88da23748c99277c0e329f5edae3ac97ac1ca672..425473a058b9cfe4ca9218c0218b387229697e4a 100644
(file)
--- 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
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
help
A Point-to-Point Tunneling Protocol Client
diff --git
a/openwrt/package/wificonf/Config.in
b/openwrt/package/wificonf/Config.in
index 410f33107d2ea600bfff6abacb90c8581fcafeea..e401cee7c29d8849189b130b7403317cca466171 100644
(file)
--- 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
prompt "wificonf.......................... replacement utility for wlconf"
tristate
default y
- depends
BR2_
PACKAGE_NVRAM
+ depends PACKAGE_NVRAM
help
Replacement utility for wlconf
help
Replacement utility for wlconf