From b406e8202ba67abb84d59063738b51338a467e01 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 21 Apr 2006 10:08:47 +0000 Subject: move package/sdk to target/sdk git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3695 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/sdk/Config.in | 9 +++++++++ target/sdk/Makefile | 43 +++++++++++++++++++++++++++++++++++++++++++ target/sdk/files/Makefile.sdk | 42 ++++++++++++++++++++++++++++++++++++++++++ target/sdk/files/README.SDK | 7 +++++++ target/sdk/files/depend.mk | 6 ++++++ 5 files changed, 107 insertions(+) create mode 100644 target/sdk/Config.in create mode 100644 target/sdk/Makefile create mode 100644 target/sdk/files/Makefile.sdk create mode 100644 target/sdk/files/README.SDK create mode 100644 target/sdk/files/depend.mk (limited to 'target/sdk') diff --git a/target/sdk/Config.in b/target/sdk/Config.in new file mode 100644 index 0000000000..f70810ba02 --- /dev/null +++ b/target/sdk/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_SDK + bool "OpenWrt SDK" + default y if CONFIG_DEVEL + help + Build an OpenWrt SDK. + This is essentially a stripped-down version of the buildroot + with a precompiled toolchain. It can be used to develop and + test packages for OpenWrt before including them in the buildroot + diff --git a/target/sdk/Makefile b/target/sdk/Makefile new file mode 100644 index 0000000000..3f62aec115 --- /dev/null +++ b/target/sdk/Makefile @@ -0,0 +1,43 @@ +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_OS:=$(shell uname -s) +PKG_CPU:=$(shell uname -m) + +PKG_RELEASE:=1 +SDK_NAME:=OpenWrt-SDK-$(PKG_OS)-$(PKG_CPU)-$(PKG_RELEASE) + +SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME) + +all: compile + +$(BIN_DIR)/$(SDK_NAME).tar.bz2: + (cd $(STAGING_DIR); \ + rm -rf info man share; \ + cd usr; \ + rm -rf doc info man share; \ + ) + rm -rf $(SDK_BUILD_DIR) + mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/examples $(SDK_BUILD_DIR)/package + $(CP) $(STAGING_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/ + $(CP) $(TOPDIR)/package/strace $(TOPDIR)/package/iproute2 $(SDK_BUILD_DIR)/examples + $(CP) $(TOPDIR)/rules.mk $(SDK_BUILD_DIR)/ + $(CP) ./files/Makefile.sdk $(SDK_BUILD_DIR)/Makefile + $(CP) ./files/README.SDK $(SDK_BUILD_DIR)/ + $(CP) ./files/depend.mk $(SDK_BUILD_DIR)/package/ + $(CP) $(TOPDIR)/package/rules.mk $(SDK_BUILD_DIR)/package/ + egrep '^BR2_(ARCH|WGET|STAGING|JLEVEL|LARGEFILE|TARGET_OPT)' $(TOPDIR)/.config > $(SDK_BUILD_DIR)/.config + find $(SDK_BUILD_DIR) -name .svn | xargs rm -rf + find $(SDK_BUILD_DIR) -name CVS | xargs rm -rf + (cd $(BUILD_DIR); \ + tar cfj $@ $(SDK_NAME); \ + ) + +source: +prepare: +compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2 +install: + +clean: + rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2 diff --git a/target/sdk/files/Makefile.sdk b/target/sdk/files/Makefile.sdk new file mode 100644 index 0000000000..6d5f61ad11 --- /dev/null +++ b/target/sdk/files/Makefile.sdk @@ -0,0 +1,42 @@ +# OpenWrt SDK Makefile +TOPDIR:=${shell pwd} +export TOPDIR +DEVELOPER:=1 +export DEVELOPER + +include $(TOPDIR)/rules.mk +include $(TOPDIR)/package/depend.mk + +PACKAGES:=$(filter-out %.mk,$(shell ls $(TOPDIR)/package)) +PACKAGES_PREPARE:=$(foreach package,$(PACKAGES),$(package)-prepare) +PACKAGES_COMPILE:=$(foreach package,$(PACKAGES),$(package)-compile) +PACKAGES_CLEAN:=$(foreach package,$(PACKAGES),$(package)-clean) + +all: compile package_index +compile: $(PACKAGES_COMPILE) +clean: $(PACKAGES_CLEAN) + rm -rf $(BUILD_DIR) + rm -rf bin + +distclean: clean + rm -rf $(DL_DIR) + +%-prepare: $(BUILD_DIR) + @$(MAKE) -C package/$(patsubst %-prepare,%,$@) prepare + +%-compile: %-prepare + @$(MAKE) -C package/$(patsubst %-compile,%,$@) compile + +%-clean: + @$(MAKE) -C package/$(patsubst %-clean,%,$@) clean + + +$(BUILD_DIR): + mkdir -p $@ + mkdir -p $(DL_DIR) + +package_index: + (cd $(PACKAGE_DIR); \ + $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages \ + ) + diff --git a/target/sdk/files/README.SDK b/target/sdk/files/README.SDK new file mode 100644 index 0000000000..454e32b2fc --- /dev/null +++ b/target/sdk/files/README.SDK @@ -0,0 +1,7 @@ +This is the OpenWrt SDK. It contains a stripped-down version of +the buildroot. You can use it to test/develop packages without +having to compile your own toolchain or any of the libraries +included with OpenWrt. + +To use it, just put your buildroot-compatible package directory +in the subdir 'package/' and run 'make' from this directory. diff --git a/target/sdk/files/depend.mk b/target/sdk/files/depend.mk new file mode 100644 index 0000000000..d7b844db55 --- /dev/null +++ b/target/sdk/files/depend.mk @@ -0,0 +1,6 @@ +# You can put your package dependencies in here +# Example (make openvpn depend on openssl): +# openvpn-compile: openssl-compile +# +# Note: This file is not present in the full buildroot. There you +# have to put your package dependencies in buildroot/package/Makefile -- cgit v1.2.3 From 02eae88c3599c13df02546694887b629e8892fd0 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 12 May 2006 19:08:03 +0000 Subject: fix BR2_ and CONFIG_ issues git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3769 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Config.in | 1 + target/Config.in | 4 +- target/linux/Config.in | 296 +++++++++++----------- target/linux/ar7-2.4/Config.in | 16 +- target/linux/aruba-2.6/Config.in | 4 +- target/linux/aruba-2.6/Makefile | 2 +- target/linux/brcm-2.4/Config.in | 8 +- target/linux/image/Makefile | 6 +- target/linux/image/aruba/Makefile | 2 +- target/linux/image/jffs2.mk | 2 +- target/linux/package/Makefile | 32 +-- target/linux/package/alsa/Config.in | 10 +- target/linux/package/bcm43xx-standalone/Config.in | 6 +- target/linux/package/diag/Config.in | 4 +- target/linux/package/fuse/Config.in | 4 +- target/linux/package/hostap/Config.in | 18 +- target/linux/package/ieee80211-dscape/Config.in | 4 +- target/linux/package/madwifi-old/Config.in | 4 +- target/linux/package/madwifi-old/Makefile | 4 +- target/linux/package/madwifi/Config.in | 6 +- target/linux/package/madwifi/Makefile | 4 +- target/linux/package/mini_fo/Config.in | 4 +- target/linux/package/openswan/Config.in | 4 +- target/linux/package/shfs/Config.in | 4 +- target/linux/package/spca5xx/Config.in | 4 +- target/linux/package/switch/Config.in | 6 +- target/linux/package/ueagle-atm/Config.in | 6 +- target/linux/package/wlcompat/Config.in | 8 +- target/linux/package/zd1211/Config.in | 6 +- target/linux/rules.mk | 4 +- target/sdk/Config.in | 4 +- target/sdk/Makefile | 2 +- toolchain/binutils/Makefile | 2 +- toolchain/gcc/Makefile | 8 +- toolchain/gdb/Config.in | 2 +- toolchain/uClibc/Makefile | 8 +- 36 files changed, 256 insertions(+), 253 deletions(-) (limited to 'target/sdk') diff --git a/Config.in b/Config.in index 71f0568977..71db916c6e 100644 --- a/Config.in +++ b/Config.in @@ -34,5 +34,6 @@ config JLEVEL Number of jobs to run simultanesouly source "toolchain/Config.in" +source "target/linux/Config.in" source ".config.in" diff --git a/target/Config.in b/target/Config.in index 7f07ff0ac1..f20504031c 100644 --- a/target/Config.in +++ b/target/Config.in @@ -74,7 +74,7 @@ config LINUX_2_6_AU1000 Build firmware for AMD Alchemy 1500 boards (e.g. 4G-Systems Mesh/Access Cube ...) -if CONFIG_DEVEL +if DEVEL config LINUX_2_6_ARM bool "UNSUPPORTED little-endian arm platform" @@ -195,7 +195,7 @@ config ARCH default "i386" if i386 default "m68k" if m68k default "mips" if mips - default "mipsel" if mipsel || !CONFIG_DEVEL + default "mipsel" if mipsel || !DEVEL default "powerpc" if powerpc default "sh3" if sh3 default "sh3eb" if sh3eb diff --git a/target/linux/Config.in b/target/linux/Config.in index 6c7f5385e9..5257c78ad0 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -1,19 +1,19 @@ menu "Target Root Filesystem" - config BR2_TARGET_ROOTFS_JFFS2 + config TARGET_ROOTFS_JFFS2 bool "jffs2" default y help Build a jffs2 root filesystem - config BR2_TARGET_ROOTFS_SQUASHFS_LZMA + config TARGET_ROOTFS_SQUASHFS_LZMA bool "squashfs-lzma" default y - depends !BR2_LINUX_2_6_ARUBA + depends !LINUX_2_6_ARUBA help Build a squashfs-lzma root filesystem - config BR2_TARGET_ROOTFS_TGZ + config TARGET_ROOTFS_TGZ bool "tgz" default y help @@ -25,88 +25,90 @@ menu "Kernel Configuration / Device Support" comment "Device specific configuration" +source "target/linux/*-2.[46]/Config.in" + comment "Kernel modules" menu "Networking modules" -config BR2_PACKAGE_KMOD_ATM +config PACKAGE_KMOD_ATM prompt "kmod-atm.......................... ATM support" tristate - default y if BR2_LINUX_2_4_AR7 + default y if LINUX_2_4_AR7 default m help ATM support -config BR2_PACKAGE_KMOD_GRE +config PACKAGE_KMOD_GRE prompt "kmod-gre.......................... GRE tunneling driver" tristate default m help Kernel support for GRE tunnels -config BR2_PACKAGE_KMOD_IMQ +config PACKAGE_KMOD_IMQ prompt "kmod-imq.......................... Intermediate Queueing device" tristate default m help Kernel support for the Intermediate Queueing device -config BR2_PACKAGE_KMOD_IPV6 +config PACKAGE_KMOD_IPV6 prompt "kmod-ipv6......................... IPv6 support" tristate default m help Kernel modules for IPv6 protocol support -config BR2_PACKAGE_KMOD_PPP +config PACKAGE_KMOD_PPP prompt "kmod-ppp.......................... PPP support" tristate default m help Kernel support for PPP -config BR2_PACKAGE_KMOD_MPPE +config PACKAGE_KMOD_MPPE prompt "kmod-mppe....................... PPP MPPE/MPPC module" tristate default m - depends BR2_PACKAGE_KMOD_PPP - select BR2_PACKAGE_KMOD_CRYPTO + depends PACKAGE_KMOD_PPP + select PACKAGE_KMOD_CRYPTO help Support for Microsoft PPP Encryption/Compression -config BR2_PACKAGE_KMOD_PPPOATM +config PACKAGE_KMOD_PPPOATM prompt "kmod-pppoatm.................... PPPoA (PPP over ATM) kernel support" tristate - default y if BR2_LINUX_2_4_AR7 + default y if LINUX_2_4_AR7 default m - depends BR2_PACKAGE_KMOD_PPP - select BR2_PACKAGE_KMOD_ATM + depends PACKAGE_KMOD_PPP + select PACKAGE_KMOD_ATM help Support for PPP over ATM -config BR2_PACKAGE_KMOD_PPPOE +config PACKAGE_KMOD_PPPOE prompt "kmod-pppoe...................... PPPoE (PPP over Ethernet) kernel support" tristate default m - depends BR2_PACKAGE_KMOD_PPP + depends PACKAGE_KMOD_PPP help Support for PPP over Ethernet -config BR2_PACKAGE_KMOD_RING +config PACKAGE_KMOD_RING prompt "kmod-ring......................... PF Ring" tristate default m help PF Ring -config BR2_PACKAGE_KMOD_SCHED +config PACKAGE_KMOD_SCHED prompt "kmod-sched........................ Traffic schedulers" tristate default m help Kernel schedulers for IP traffic -config BR2_PACKAGE_KMOD_TUN +config PACKAGE_KMOD_TUN prompt "kmod-tun.......................... Universal TUN/TAP driver" tristate default m @@ -117,44 +119,44 @@ endmenu menu "Filtering/Firewalling" -config BR2_PACKAGE_KMOD_ARPTABLES +config PACKAGE_KMOD_ARPTABLES prompt "kmod-arptables.................... ARP firewalling support" tristate default m help Kernel modules for ARP firewalling -config BR2_PACKAGE_KMOD_EBTABLES +config PACKAGE_KMOD_EBTABLES prompt "kmod-ebtables..................... Ethernet Bridge firewalling support" tristate default m help Kernel modules for bridge firewalling -config BR2_PACKAGE_KMOD_IPTABLES +config PACKAGE_KMOD_IPTABLES prompt "kmod-iptables..................... Core Netfilter modules for IPv4 firewalling" tristate default y help Kernel modules for IPv4 firewalling -config BR2_PACKAGE_KMOD_IPTABLES_EXTRA +config PACKAGE_KMOD_IPTABLES_EXTRA prompt "kmod-iptables-extra............... Extra Netfilter modules for IPv4 firewalling (meta-package)" tristate default m - select BR2_PACKAGE_KMOD_IPT_CONNTRACK - select BR2_PACKAGE_KMOD_IPT_FILTER - select BR2_PACKAGE_KMOD_IPT_IPOPT - select BR2_PACKAGE_KMOD_IPT_IPSEC - select BR2_PACKAGE_KMOD_IPT_NAT - select BR2_PACKAGE_KMOD_IPT_NAT_EXTRA - select BR2_PACKAGE_KMOD_IPT_QUEUE - select BR2_PACKAGE_KMOD_IPT_ULOG - select BR2_PACKAGE_KMOD_IPT_EXTRA + select PACKAGE_KMOD_IPT_CONNTRACK + select PACKAGE_KMOD_IPT_FILTER + select PACKAGE_KMOD_IPT_IPOPT + select PACKAGE_KMOD_IPT_IPSEC + select PACKAGE_KMOD_IPT_NAT + select PACKAGE_KMOD_IPT_NAT_EXTRA + select PACKAGE_KMOD_IPT_QUEUE + select PACKAGE_KMOD_IPT_ULOG + select PACKAGE_KMOD_IPT_EXTRA help Extra Netfilter kernel modules for IPv4 firewalling (meta-package) -config BR2_PACKAGE_KMOD_IPT_CONNTRACK +config PACKAGE_KMOD_IPT_CONNTRACK prompt "kmod-ipt-conntrack................ Netfilter modules for connection tracking" tristate default m @@ -166,7 +168,7 @@ config BR2_PACKAGE_KMOD_IPT_CONNTRACK * ipt_helper * ipt_connmark/CONNMARK -config BR2_PACKAGE_KMOD_IPT_FILTER +config PACKAGE_KMOD_IPT_FILTER prompt "kmod-ipt-filter................... Netfilter modules for packet content inspection" tristate default m @@ -177,7 +179,7 @@ config BR2_PACKAGE_KMOD_IPT_FILTER * ipt_ipp2p * ipt_layer7 -config BR2_PACKAGE_KMOD_IPT_IPOPT +config PACKAGE_KMOD_IPT_IPOPT prompt "kmod-ipt-ipopt.................... Netfilter modules for matching/changing IP packet options" tristate default m @@ -194,7 +196,7 @@ config BR2_PACKAGE_KMOD_IPT_IPOPT * ipt_ttl/TTL * ipt_unclean -config BR2_PACKAGE_KMOD_IPT_IPSEC +config PACKAGE_KMOD_IPT_IPSEC prompt "kmod-ipt-ipsec.................... Netfilter modules for matching IPsec packets" tristate default m @@ -205,7 +207,7 @@ config BR2_PACKAGE_KMOD_IPT_IPSEC * ipt_ah * ipt_esp -config BR2_PACKAGE_KMOD_IPT_NAT +config PACKAGE_KMOD_IPT_NAT prompt "kmod-ipt-nat...................... Netfilter modules for different NAT targets" tristate default m @@ -215,7 +217,7 @@ config BR2_PACKAGE_KMOD_IPT_NAT Includes: * ipt_REDIRECT -config BR2_PACKAGE_KMOD_IPT_NAT_EXTRA +config PACKAGE_KMOD_IPT_NAT_EXTRA prompt "kmod-ipt-nat-extra................ Extra Netfilter NAT modules for special protocols" tristate default m @@ -233,7 +235,7 @@ config BR2_PACKAGE_KMOD_IPT_NAT_EXTRA * ip_nat_snmp_basic * ip_conntrack_tftp -config BR2_PACKAGE_KMOD_IPT_QUEUE +config PACKAGE_KMOD_IPT_QUEUE prompt "kmod-ipt-queue.................... Netfilter module for user-space packet queueing" tristate default m @@ -243,7 +245,7 @@ config BR2_PACKAGE_KMOD_IPT_QUEUE Includes: * ipt_QUEUE -config BR2_PACKAGE_KMOD_IPT_ULOG +config PACKAGE_KMOD_IPT_ULOG prompt "kmod-ipt-ulog..................... Netfilter module for user-space packet logging" tristate default m @@ -253,7 +255,7 @@ config BR2_PACKAGE_KMOD_IPT_ULOG Includes: * ipt_ULOG -config BR2_PACKAGE_KMOD_IPT_EXTRA +config PACKAGE_KMOD_IPT_EXTRA prompt "kmod-ipt-extra.................... Other extra Netfilter modules" tristate default m @@ -267,11 +269,11 @@ config BR2_PACKAGE_KMOD_IPT_EXTRA * ipt_pkttype * ipt_recent -config BR2_PACKAGE_KMOD_IP6TABLES +config PACKAGE_KMOD_IP6TABLES prompt "kmod-ip6tables.................... Kernel modules for ip6tables" tristate default m - depends BR2_PACKAGE_KMOD_IPV6 + depends PACKAGE_KMOD_IPV6 help IPv6 firewalling support @@ -279,11 +281,11 @@ endmenu menu "Block devices support" -config BR2_PACKAGE_KMOD_IDE +config PACKAGE_KMOD_IDE prompt "kmod-ide.......................... IDE support" tristate default m - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM + depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM help Kernel modules for IDE support useful for usb mass storage devices (e.g. on WL-HDD) @@ -292,16 +294,16 @@ config BR2_PACKAGE_KMOD_IDE - ide-core - ide-detect - ide-disk - - pdc202xx_old + - pdc202old -config BR2_PACKAGE_KMOD_LOOP +config PACKAGE_KMOD_LOOP prompt "kmod-loop......................... Loop mount support" tristate default m help Kernel module for loop mount support -config BR2_PACKAGE_KMOD_NBD +config PACKAGE_KMOD_NBD prompt "kmod-nbd.......................... Network Block Device" tristate default m @@ -310,45 +312,45 @@ config BR2_PACKAGE_KMOD_NBD endmenu -config BR2_PACKAGE_KMOD_CRYPTO +config PACKAGE_KMOD_CRYPTO prompt "CryptoAPI modules" tristate default m - select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE + select BUSYBOX_FEATURE_CHECK_TAINTED_MODULE help Kernel modules for cryptographic algorithms menu "Filesystems support" -config BR2_PACKAGE_KMOD_FS_CIFS +config PACKAGE_KMOD_FS_CIFS prompt "kmod-fs-cifs...................... CIFS support" tristate default m help Kernel modules for CIFS support -config BR2_PACKAGE_KMOD_FS_EXT2 +config PACKAGE_KMOD_FS_EXT2 prompt "kmod-fs-ext2...................... EXT2 filesystem support" tristate default m help Kernel modules for EXT2 filesystem support -config BR2_PACKAGE_KMOD_FS_EXT3 +config PACKAGE_KMOD_FS_EXT3 prompt "kmod-fs-ext3...................... EXT3 filesystem support" tristate default m help Kernel modules for EXT3 filesystem support -config BR2_PACKAGE_KMOD_FS_HFSPLUS +config PACKAGE_KMOD_FS_HFSPLUS prompt "kmod-fs-hfsplus................... HFS+ filesystem support" tristate default m help Kernel modules for HFS+ filesystem support -config BR2_PACKAGE_KMOD_FS_NFS +config PACKAGE_KMOD_FS_NFS prompt "kmod-fs-nfs....................... NFS support" tristate default m @@ -356,7 +358,7 @@ config BR2_PACKAGE_KMOD_FS_NFS Kernel modules for NFS support Includes lockd, nfs and sunrpc -config BR2_PACKAGE_KMOD_FS_VFAT +config PACKAGE_KMOD_FS_VFAT prompt "kmod-fs-vfat...................... VFAT filesystem support" tristate default m @@ -364,7 +366,7 @@ config BR2_PACKAGE_KMOD_FS_VFAT Kernel modules for VFAT filesystem support useful for usb mass storage devices -config BR2_PACKAGE_KMOD_FS_XFS +config PACKAGE_KMOD_FS_XFS prompt "kmod-fs-xfs....................... XFS filesystem support" tristate default m @@ -375,13 +377,13 @@ endmenu menu "Multimedia devices support" -config BR2_PACKAGE_KMOD_PWC +config PACKAGE_KMOD_PWC prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras" tristate - depends BR2_PACKAGE_KMOD_USB + depends PACKAGE_KMOD_USB default m -config BR2_PACKAGE_KMOD_SOUNDCORE +config PACKAGE_KMOD_SOUNDCORE prompt "kmod-soundcore.................... Soundcard support" tristate default n @@ -389,7 +391,7 @@ config BR2_PACKAGE_KMOD_SOUNDCORE Base support for soundcards Requires either USB soundcard support (OSS) or ALSA package to be useful -config BR2_PACKAGE_KMOD_VIDEODEV +config PACKAGE_KMOD_VIDEODEV prompt "kmod-videodev..................... Video (For Linux) kernel support" tristate default m @@ -398,62 +400,62 @@ endmenu menu "Native Language support" -config BR2_PACKAGE_KMOD_NLS_BASE +config PACKAGE_KMOD_NLS_BASE prompt "kmod-nls-base..................... Native Language support" tristate default m help Kernel native language support -config BR2_PACKAGE_KMOD_NLS_CP437 +config PACKAGE_KMOD_NLS_CP437 prompt "kmod-nls-cp437.................. Codepage 437 (United States, Canada)" tristate default m - depends BR2_PACKAGE_KMOD_NLS_BASE + depends PACKAGE_KMOD_NLS_BASE help Kernel native language support -config BR2_PACKAGE_KMOD_NLS_CP850 +config PACKAGE_KMOD_NLS_CP850 prompt "kmod-nls-cp850.................. Codepage 850 (Europe)" tristate default m - depends BR2_PACKAGE_KMOD_NLS_BASE + depends PACKAGE_KMOD_NLS_BASE help Kernel native language support -config BR2_PACKAGE_KMOD_NLS_ISO8859_1 +config PACKAGE_KMOD_NLS_ISO8859_1 prompt "kmod-nls-iso8859-1.............. NLS ISO 8859-1 (Latin 1; Western European Languages)" tristate default m - depends BR2_PACKAGE_KMOD_NLS_BASE + depends PACKAGE_KMOD_NLS_BASE help Kernel native language support -config BR2_PACKAGE_KMOD_NLS_ISO8859_15 +config PACKAGE_KMOD_NLS_ISO8859_15 prompt "kmod-nls-iso8859-15............. NLS ISO 8859-15 (Latin 15; Western European Languages with Euro)" tristate default m - depends BR2_PACKAGE_KMOD_NLS_BASE + depends PACKAGE_KMOD_NLS_BASE help Kernel native language support -config BR2_PACKAGE_KMOD_NLS_UTF8 +config PACKAGE_KMOD_NLS_UTF8 prompt "kmod-nls-utf8................... NLS UTF8" tristate default m - depends BR2_PACKAGE_KMOD_NLS_BASE + depends PACKAGE_KMOD_NLS_BASE help Kernel native language support endmenu menu "Network devices support" - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 + depends LINUX_2_4_X86 || LINUX_2_6_X86 -config BR2_PACKAGE_KMOD_NET_3C59X +config PACKAGE_KMOD_NET_3C59X prompt "kmod-net-3c59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support" tristate - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 + depends LINUX_2_4_X86 || LINUX_2_6_X86 default m help This option enables driver support for a large number of 10mbps and @@ -465,19 +467,19 @@ config BR2_PACKAGE_KMOD_NET_3C59X * "Tornado" (3c905) PCI * "Hurricane" (3c555/3cSOHO) PCI -config BR2_PACKAGE_KMOD_NET_8139TOO +config PACKAGE_KMOD_NET_8139TOO prompt "kmod-net-8139too.................. RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support" tristate - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 + depends LINUX_2_4_X86 || LINUX_2_6_X86 default m help This is a driver for the Fast Ethernet PCI network cards based on the RTL8139 chips. -config BR2_PACKAGE_KMOD_NET_AIRO +config PACKAGE_KMOD_NET_AIRO prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support" tristate - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 + depends LINUX_2_4_X86 || LINUX_2_6_X86 default m help This is the standard Linux driver to support Cisco/Aironet ISA and @@ -490,18 +492,18 @@ config BR2_PACKAGE_KMOD_NET_AIRO and Cisco proprietary API, so both the Linux Wireless Tools and the Cisco Linux utilities can be used to configure the card. -config BR2_PACKAGE_KMOD_NET_E100 +config PACKAGE_KMOD_NET_E100 prompt "kmod-net-e100..................... Intel(R) PRO/100+ cards kernel support" tristate - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 + depends LINUX_2_4_X86 || LINUX_2_6_X86 default m help Intel(R) PRO/100+ cards kernel support -config BR2_PACKAGE_KMOD_NET_HERMES +config PACKAGE_KMOD_NET_HERMES prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support" tristate - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 + depends LINUX_2_4_X86 || LINUX_2_6_X86 default m help A driver for 802.11b wireless cards based based on the "Hermes" or @@ -514,11 +516,11 @@ config BR2_PACKAGE_KMOD_NET_HERMES MA401, LinkSys WPC-11, D-Link DWL-650, 3Com AirConnect, Intel PRO/Wireless, and Symbol Spectrum24 High Rate amongst others. -config BR2_PACKAGE_KMOD_NET_HERMES_PCI +config PACKAGE_KMOD_NET_HERMES_PCI prompt "kmod-net-hermes-pci............. Intersil Prism 2.5 PCI 802.11b adaptor support" tristate default m - depends BR2_PACKAGE_KMOD_NET_HERMES + depends PACKAGE_KMOD_NET_HERMES help Enable support for PCI and mini-PCI 802.11b wireless NICs based on the Prism 2.5 chipset. These are true PCI cards, not the 802.11b @@ -526,11 +528,11 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PCI common. Some of the built-in wireless adaptors in laptops are of this variety. -config BR2_PACKAGE_KMOD_NET_HERMES_PLX +config PACKAGE_KMOD_NET_HERMES_PLX prompt "kmod-net-hermes-plx............. Hermes in PLX9052 based PCI adaptor (Netgear MA301, etc.) kernel support" tristate default m - depends BR2_PACKAGE_KMOD_NET_HERMES + depends PACKAGE_KMOD_NET_HERMES help Enable support for PCMCIA cards supported by the "Hermes" (aka orinoco_cs) driver when used in PLX9052 based PCI adaptors. These @@ -539,20 +541,20 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PLX 802.11b PCMCIA cards can be used in desktop machines. The Netgear MA301 is such an adaptor. -config BR2_PACKAGE_KMOD_NET_NATSEMI +config PACKAGE_KMOD_NET_NATSEMI prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support" tristate - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 + depends LINUX_2_4_X86 || LINUX_2_6_X86 default m help This driver is for the National Semiconductor DP83810 series, which is used in cards from PureData, NetGear, Linksys and others, including the 83815 chip. -config BR2_PACKAGE_KMOD_NET_PRISM54 +config PACKAGE_KMOD_NET_PRISM54 prompt "kmod-net-prism54.................. Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support" tristate - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM + depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM default m help Enable PCI and Cardbus support for the following chipset based cards: @@ -591,135 +593,135 @@ config BR2_PACKAGE_KMOD_NET_PRISM54 endmenu menu "PCMCIA/CardBus support" - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM + depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM -config BR2_PACKAGE_KMOD_PCMCIA_CORE +config PACKAGE_KMOD_PCMCIA_CORE prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support" - depends BR2_LINUX_PCMCIA_SUPPORT + depends LINUX_PCMCIA_SUPPORT tristate - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM + depends LINUX_2_4_X86 || LINUX_2_6_X86 || LINUX_2_4_BRCM || LINUX_2_6_BRCM default m -config BR2_PACKAGE_KMOD_PCMCIA_SERIAL +config PACKAGE_KMOD_PCMCIA_SERIAL prompt "kmod-pcmcia-serial.............. PCMCIA/CardBus serial device support" tristate default m - depends BR2_PACKAGE_KMOD_PCMCIA_CORE + depends PACKAGE_KMOD_PCMCIA_CORE endmenu menu "USB support" -config BR2_PACKAGE_KMOD_USB +config PACKAGE_KMOD_USB prompt "kmod-usb-core..................... USB support" tristate - default n if BR2_LINUX_2_4_AR531X + default n if LINUX_2_4_AR531X default m -config BR2_PACKAGE_KMOD_USB_UHCI +config PACKAGE_KMOD_USB_UHCI prompt "kmod-usb-uhci................... Support for UHCI controllers" tristate - default n if BR2_LINUX_2_6_AU1000 - depends BR2_PACKAGE_KMOD_USB - select BR2_PACKAGE_KMOD_USB_CONTROLLER + default n if LINUX_2_6_AU1000 + depends PACKAGE_KMOD_USB + select PACKAGE_KMOD_USB_CONTROLLER -config BR2_PACKAGE_KMOD_USB_OHCI +config PACKAGE_KMOD_USB_OHCI prompt "kmod-usb-ohci................... Support for OHCI controllers" tristate default m - depends BR2_PACKAGE_KMOD_USB - select BR2_PACKAGE_KMOD_USB_CONTROLLER + depends PACKAGE_KMOD_USB + select PACKAGE_KMOD_USB_CONTROLLER -config BR2_PACKAGE_KMOD_USB2 +config PACKAGE_KMOD_USB2 prompt "kmod-usb2....................... Support for USB 2.0 controllers" tristate - default n if BR2_LINUX_2_6_AU1000 - depends BR2_PACKAGE_KMOD_USB - select BR2_PACKAGE_KMOD_USB_CONTROLLER + default n if LINUX_2_6_AU1000 + depends PACKAGE_KMOD_USB + select PACKAGE_KMOD_USB_CONTROLLER -config BR2_PACKAGE_KMOD_USB_CONTROLLER +config PACKAGE_KMOD_USB_CONTROLLER tristate - depends on BR2_PACKAGE_KMOD_USB_UHCI || BR2_PACKAGE_KMOD_USB_OHCI || BR2_PACKAGE_KMOD_USB2 + depends on PACKAGE_KMOD_USB_UHCI || PACKAGE_KMOD_USB_OHCI || PACKAGE_KMOD_USB2 default n -config BR2_PACKAGE_KMOD_USB_ACM +config PACKAGE_KMOD_USB_ACM prompt "kmod-usb-acm...................... Support for USB modems/isdn controllers" tristate default m - depends BR2_PACKAGE_KMOD_USB_CONTROLLER + depends PACKAGE_KMOD_USB_CONTROLLER -config BR2_PACKAGE_KMOD_USB_AUDIO +config PACKAGE_KMOD_USB_AUDIO prompt "kmod-usb-audio.................... Support for USB soundcards" tristate default m - depends BR2_PACKAGE_KMOD_USB_CONTROLLER - select BR2_PACKAGE_KMOD_SOUNDCORE + depends PACKAGE_KMOD_USB_CONTROLLER + select PACKAGE_KMOD_SOUNDCORE -config BR2_PACKAGE_KMOD_USB_PRINTER +config PACKAGE_KMOD_USB_PRINTER prompt "kmod-usb-printer.................. Support for USB printers" tristate default m - depends BR2_PACKAGE_KMOD_USB_CONTROLLER + depends PACKAGE_KMOD_USB_CONTROLLER -config BR2_PACKAGE_KMOD_USB_SERIAL +config PACKAGE_KMOD_USB_SERIAL prompt "kmod-usb-serial................... Support for USB-to-serial converters" tristate default m - depends BR2_PACKAGE_KMOD_USB_CONTROLLER + depends PACKAGE_KMOD_USB_CONTROLLER -config BR2_PACKAGE_KMOD_USB_SERIAL_BELKIN +config PACKAGE_KMOD_USB_SERIAL_BELKIN prompt "kmod-usb-serial-belkin.......... Support for Belkin USB-to-serial converters" tristate default m - depends BR2_PACKAGE_KMOD_USB_SERIAL + depends PACKAGE_KMOD_USB_SERIAL -config BR2_PACKAGE_KMOD_USB_SERIAL_FTDI +config PACKAGE_KMOD_USB_SERIAL_FTDI prompt "kmod-usb-serial-ftdi............ Support for FTDI USB-to-serial converterr" tristate default m - depends BR2_PACKAGE_KMOD_USB_SERIAL + depends PACKAGE_KMOD_USB_SERIAL -config BR2_PACKAGE_KMOD_USB_SERIAL_MCT_U232 +config PACKAGE_KMOD_USB_SERIAL_MCT_U232 prompt "kmod-usb-serial-mct-u232........ Support for Magic Control Technology USB-to-Serial converters" tristate default m - depends BR2_PACKAGE_KMOD_USB_SERIAL + depends PACKAGE_KMOD_USB_SERIAL -config BR2_PACKAGE_KMOD_USB_SERIAL_PL2303 +config PACKAGE_KMOD_USB_SERIAL_PL2303 prompt "kmod-usb-serial-pl2303.......... Support for Prolific PL2303 USB-to-Serial converters" tristate default m - depends BR2_PACKAGE_KMOD_USB_SERIAL + depends PACKAGE_KMOD_USB_SERIAL -config BR2_PACKAGE_KMOD_USB_SERIAL_VISOR +config PACKAGE_KMOD_USB_SERIAL_VISOR prompt "kmod-usb-serial-visor........... Support for Handspring Visor / Palm m50x / Sony Clie Driver" tristate default m - depends BR2_PACKAGE_KMOD_USB_SERIAL + depends PACKAGE_KMOD_USB_SERIAL -config BR2_PACKAGE_KMOD_USB_STORAGE +config PACKAGE_KMOD_USB_STORAGE prompt "kmod-usb-storage.................. Support for USB storage devices" tristate default m - depends BR2_PACKAGE_KMOD_USB_CONTROLLER + depends PACKAGE_KMOD_USB_CONTROLLER -config BR2_PACKAGE_KMOD_USB_ATM +config PACKAGE_KMOD_USB_ATM prompt "kmod-usb-atm...................... Support for USB ATM devices" tristate default m - depends BR2_PACKAGE_KMOD_USB_CONTROLLER + depends PACKAGE_KMOD_USB_CONTROLLER -config BR2_PACKAGE_KMOD_USB_ATM_SPEEDTOUCH +config PACKAGE_KMOD_USB_ATM_SPEEDTOUCH prompt "kmod-usb-atm-speedtouch......... Support for USB Speedtouch ADSL modem" tristate default m - depends BR2_PACKAGE_KMOD_USB_ATM + depends PACKAGE_KMOD_USB_ATM endmenu menu "Misc. devices support" -config BR2_PACKAGE_KMOD_AX25 +config PACKAGE_KMOD_AX25 prompt "kmod-ax25......................... AX25 support" tristate default m @@ -728,33 +730,33 @@ config BR2_PACKAGE_KMOD_AX25 This package contains both the AX25 layer 2 support (ax25) and AX25 KISS driver (mkiss) -config BR2_PACKAGE_KMOD_BLUETOOTH +config PACKAGE_KMOD_BLUETOOTH prompt "kmod-bluetooth.................... Bluetooth drivers and network stack" tristate default m - default n if BR2_LINUX_2_4_AR531X + default n if LINUX_2_4_AR531X help Bluetooth drivers and network stack -config BR2_PACKAGE_KMOD_LP +config PACKAGE_KMOD_LP prompt "kmod-lp........................... Parallel port and lp support" tristate default m help Kernel modules for line printer and parallel port support -config BR2_PACKAGE_KMOD_SOFTDOG +config PACKAGE_KMOD_SOFTDOG prompt "kmod-softdog...................... Software watchdog" tristate default m help Kernel modules for software watchdog driver -config BR2_PACKAGE_KMOD_WD1100 +config PACKAGE_KMOD_WD1100 prompt "kmod-wd1100....................... Soekris net4801 watchdog" tristate default y - depends BR2_LINUX_2_4_X86 + depends LINUX_2_4_X86 help Driver for the NatSemi SC1x00 series Watchdog found on Soekris net4801 boards diff --git a/target/linux/ar7-2.4/Config.in b/target/linux/ar7-2.4/Config.in index 9d1fe7b813..57d06c01b5 100644 --- a/target/linux/ar7-2.4/Config.in +++ b/target/linux/ar7-2.4/Config.in @@ -1,27 +1,27 @@ -config BR2_PACKAGE_KMOD_CPMAC +config PACKAGE_KMOD_CPMAC prompt "kmod-cpmac........................ AR7 CPMAC Network Driver" tristate default y - depends BR2_LINUX_2_4_AR7 + depends LINUX_2_4_AR7 help Driver for the AR7 CPMAC network chip -config BR2_PACKAGE_KMOD_SANGAM_ATM_A +config PACKAGE_KMOD_SANGAM_ATM_A prompt "kmod-sangam-atm-annex-a........... AR7 Sangam ADSL Driver (Annex A)" tristate default m - depends BR2_LINUX_2_4_AR7 - select BR2_PACKAGE_KMOD_ATM + depends LINUX_2_4_AR7 + select PACKAGE_KMOD_ATM help ATM driver for the Sangam ADSL chip on AR7 Annex A version -config BR2_PACKAGE_KMOD_SANGAM_ATM_B +config PACKAGE_KMOD_SANGAM_ATM_B prompt "kmod-sangam-atm-annex-b........... AR7 Sangam ADSL Driver (Annex B)" tristate default y - depends BR2_LINUX_2_4_AR7 - select BR2_PACKAGE_KMOD_ATM + depends LINUX_2_4_AR7 + select PACKAGE_KMOD_ATM help ATM driver for the Sangam ADSL chip on AR7 Annex B version diff --git a/target/linux/aruba-2.6/Config.in b/target/linux/aruba-2.6/Config.in index c1fab56464..b66e8f6551 100644 --- a/target/linux/aruba-2.6/Config.in +++ b/target/linux/aruba-2.6/Config.in @@ -1,4 +1,4 @@ -config BR2_ARUBA_RAMDISK +config ARUBA_RAMDISK prompt "ramdisk support" - depends BR2_LINUX_2_6_ARUBA + depends LINUX_2_6_ARUBA bool diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile index 24330c08f1..b5b220d0f2 100644 --- a/target/linux/aruba-2.6/Makefile +++ b/target/linux/aruba-2.6/Makefile @@ -14,7 +14,7 @@ include ../kernel.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) [ -d ./patches ] && $(PATCH) $(LINUX_DIR) ./patches $(MAKE_TRACE) -ifeq ($(BR2_ARUBA_RAMDISK),y) +ifeq ($(CONFIG_ARUBA_RAMDISK),y) @$(CP) config-ramdisk $(LINUX_DIR)/.config else @$(CP) config $(LINUX_DIR)/.config diff --git a/target/linux/brcm-2.4/Config.in b/target/linux/brcm-2.4/Config.in index c344a97e81..181014f7b3 100644 --- a/target/linux/brcm-2.4/Config.in +++ b/target/linux/brcm-2.4/Config.in @@ -1,15 +1,15 @@ -config BR2_PACKAGE_KMOD_BRCM_WL +config PACKAGE_KMOD_BRCM_WL prompt "kmod-brcm-wl...................... Broadcom Wireless Network Driver" tristate - depends BR2_LINUX_2_4_BRCM + depends LINUX_2_4_BRCM default y help Proprietary driver for Broadcom Wireless chipsets -config BR2_PACKAGE_KMOD_BRCM_WL2 +config PACKAGE_KMOD_BRCM_WL2 prompt "kmod-brcm-wl2..................... Broadcom Wireless Network Driver (new)" tristate - depends BR2_LINUX_2_4_BRCM + depends LINUX_2_4_BRCM default m help Proprietary driver for Broadcom Wireless chipsets diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile index af7cd0e8d5..ce807b3027 100644 --- a/target/linux/image/Makefile +++ b/target/linux/image/Makefile @@ -2,15 +2,15 @@ include $(TOPDIR)/rules.mk KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) -ifeq ($(BR2_TARGET_ROOTFS_JFFS2),y) +ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y) include ./jffs2.mk endif -ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS_LZMA),y) +ifeq ($(CONFIG_TARGET_ROOTFS_SQUASHFS_LZMA),y) include ./squashfs.mk endif -ifeq ($(BR2_TARGET_ROOTFS_TGZ),y) +ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y) include ./tgz.mk endif diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile index a2cceaf0c1..0ddde20266 100644 --- a/target/linux/image/aruba/Makefile +++ b/target/linux/image/aruba/Makefile @@ -36,7 +36,7 @@ ifeq ($(FS),jffs2-4MB) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari: $(KDIR)/loader.elf ./addVersion -n ArubaOS $(KDIR)/loader.elf $@ version -ifneq ($(BR2_ARUBA_RAMDISK),y) +ifneq ($(CONFIG_ARUBA_RAMDISK),y) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari $(KDIR)/root.$(FS) @dd if=$< of=$@.tmp bs=655360 conv=sync @cat $(KDIR)/root.$(FS) >> $@.tmp diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk index 1b0c3a778f..7df3aedbcf 100644 --- a/target/linux/image/jffs2.mk +++ b/target/linux/image/jffs2.mk @@ -1,4 +1,4 @@ -ifneq ($(BR2_mips),y) +ifneq ($(CONFIG_mips),y) JFFS2OPTS := --pad --little-endian --squash else JFFS2OPTS := --pad --big-endian --squash diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile index 45211c1c8b..792fb7bd67 100644 --- a/target/linux/package/Makefile +++ b/target/linux/package/Makefile @@ -3,22 +3,22 @@ include $(TOPDIR)/rules.mk include ../rules.mk package-y += base-files -package-$(BR2_PACKAGE_KMOD_ALSA) += alsa -package-$(BR2_PACKAGE_KMOD_FUSE) += fuse -package-$(BR2_PACKAGE_KMOD_HOSTAP) += hostap -package-$(BR2_PACKAGE_KMOD_BCM43XX_STANDALONE) += bcm43xx-standalone -package-$(BR2_PACKAGE_KMOD_IEEE80211_DSCAPE) += ieee80211-dscape -package-$(BR2_PACKAGE_KMOD_MADWIFI) += madwifi -package-$(BR2_PACKAGE_KMOD_MADWIFI_OLD) += madwifi-old -package-$(BR2_PACKAGE_KMOD_MINI_FO) += mini_fo -package-$(BR2_PACKAGE_KMOD_OPENSWAN) += openswan -package-$(BR2_PACKAGE_KMOD_SHFS) += shfs -package-$(BR2_PACKAGE_KMOD_SPCA5XX) += spca5xx -package-$(BR2_PACKAGE_KMOD_SWITCH) += switch -package-$(BR2_PACKAGE_KMOD_UEAGLE_ATM) += ueagle-atm -package-$(BR2_PACKAGE_KMOD_DIAG) += diag -package-$(BR2_PACKAGE_KMOD_WLCOMPAT) += wlcompat -package-$(BR2_PACKAGE_KMOD_ZD1211) += zd1211 +package-$(CONFIG_PACKAGE_KMOD_ALSA) += alsa +package-$(CONFIG_PACKAGE_KMOD_FUSE) += fuse +package-$(CONFIG_PACKAGE_KMOD_HOSTAP) += hostap +package-$(CONFIG_PACKAGE_KMOD_BCM43XX_STANDALONE) += bcm43xx-standalone +package-$(CONFIG_PACKAGE_KMOD_IEEE80211_DSCAPE) += ieee80211-dscape +package-$(CONFIG_PACKAGE_KMOD_MADWIFI) += madwifi +package-$(CONFIG_PACKAGE_KMOD_MADWIFI_OLD) += madwifi-old +package-$(CONFIG_PACKAGE_KMOD_MINI_FO) += mini_fo +package-$(CONFIG_PACKAGE_KMOD_OPENSWAN) += openswan +package-$(CONFIG_PACKAGE_KMOD_SHFS) += shfs +package-$(CONFIG_PACKAGE_KMOD_SPCA5XX) += spca5xx +package-$(CONFIG_PACKAGE_KMOD_SWITCH) += switch +package-$(CONFIG_PACKAGE_KMOD_UEAGLE_ATM) += ueagle-atm +package-$(CONFIG_PACKAGE_KMOD_DIAG) += diag +package-$(CONFIG_PACKAGE_KMOD_WLCOMPAT) += wlcompat +package-$(CONFIG_PACKAGE_KMOD_ZD1211) += zd1211 bcm43xx-standalone-compile: ieee80211-dscape-compile wlcompat-compile: base-files-compile diff --git a/target/linux/package/alsa/Config.in b/target/linux/package/alsa/Config.in index df4da0b7d1..55d9abd1c4 100644 --- a/target/linux/package/alsa/Config.in +++ b/target/linux/package/alsa/Config.in @@ -1,9 +1,9 @@ -config BR2_PACKAGE_KMOD_ALSA +config PACKAGE_KMOD_ALSA prompt "kmod-alsa......................... Alsa Sound Drivers" tristate - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM - depends BR2_PACKAGE_KMOD_USB_CONTROLLER - select BR2_PACKAGE_KMOD_SOUNDCORE - default m if CONFIG_DEVEL + depends LINUX_2_4_X86 || LINUX_2_4_BRCM || LINUX_2_6_X86 || LINUX_2_6_BRCM + depends PACKAGE_KMOD_USB_CONTROLLER + select PACKAGE_KMOD_SOUNDCORE + default m if DEVEL help Alsa Drivers for USB Soundcards diff --git a/target/linux/package/bcm43xx-standalone/Config.in b/target/linux/package/bcm43xx-standalone/Config.in index 5e15f8121c..84a4702cf2 100644 --- a/target/linux/package/bcm43xx-standalone/Config.in +++ b/target/linux/package/bcm43xx-standalone/Config.in @@ -1,8 +1,8 @@ -config BR2_PACKAGE_KMOD_BCM43XX_STANDALONE +config PACKAGE_KMOD_BCM43XX_STANDALONE prompt "kmod-bcm43xx-standalone............... Free Broadcom 43xx wireless driver (devicescape stack)" tristate - depends BR2_LINUX_2_6_BRCM - select BR2_PACKAGE_KMOD_IEEE80211_DSCAPE + depends LINUX_2_6_BRCM + select PACKAGE_KMOD_IEEE80211_DSCAPE default n help Free driver for the Broadcom 43xx wireless chipset diff --git a/target/linux/package/diag/Config.in b/target/linux/package/diag/Config.in index 70f726c5b6..80cba50cf2 100644 --- a/target/linux/package/diag/Config.in +++ b/target/linux/package/diag/Config.in @@ -1,7 +1,7 @@ -config BR2_PACKAGE_KMOD_DIAG +config PACKAGE_KMOD_DIAG prompt "kmod-diag......................... Driver for router LEDs and Buttons" tristate - depends BR2_LINUX_2_4_BRCM + depends LINUX_2_4_BRCM default y help Driver for router LEDs and Buttons diff --git a/target/linux/package/fuse/Config.in b/target/linux/package/fuse/Config.in index 8fbb34c079..d51229522b 100644 --- a/target/linux/package/fuse/Config.in +++ b/target/linux/package/fuse/Config.in @@ -1,7 +1,7 @@ -config BR2_PACKAGE_KMOD_FUSE +config PACKAGE_KMOD_FUSE prompt "kmod-fuse......................... FUSE kernel module" tristate - default m if CONFIG_DEVEL + default m if DEVEL help With FUSE it is possible to implement a fully functional filesystem in a userspace program. diff --git a/target/linux/package/hostap/Config.in b/target/linux/package/hostap/Config.in index 767b459316..39b49d4c4b 100644 --- a/target/linux/package/hostap/Config.in +++ b/target/linux/package/hostap/Config.in @@ -1,8 +1,8 @@ -config BR2_PACKAGE_KMOD_HOSTAP +config PACKAGE_KMOD_HOSTAP prompt "kmod-hostap....................... Host AP support for Prism2/2.5/3 IEEE 802.11b" tristate - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM - default m if CONFIG_DEVEL + depends LINUX_2_4_X86 || LINUX_2_4_BRCM + default m if DEVEL help 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 @@ -14,11 +14,11 @@ config BR2_PACKAGE_KMOD_HOSTAP http://hostap.epitest.fi/ -config BR2_PACKAGE_KMOD_HOSTAP_PCI +config PACKAGE_KMOD_HOSTAP_PCI prompt "kmod-hostap-pci................. Host AP driver for Prism2.5 PCI adaptors" tristate - default m if CONFIG_DEVEL - depends BR2_PACKAGE_KMOD_HOSTAP + default m if DEVEL + depends PACKAGE_KMOD_HOSTAP help Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this driver and its help text includes more information about the Host AP @@ -26,11 +26,11 @@ config BR2_PACKAGE_KMOD_HOSTAP_PCI http://hostap.epitest.fi/ -config BR2_PACKAGE_KMOD_HOSTAP_PLX +config PACKAGE_KMOD_HOSTAP_PLX prompt "kmod-hostap-plx................. Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors" tristate - default m if CONFIG_DEVEL - depends BR2_PACKAGE_KMOD_HOSTAP + default m if DEVEL + depends PACKAGE_KMOD_HOSTAP help Host AP support for Prism2/2.5/3 IEEE 802.11b" is required for this driver and its help text includes more information about the Host AP diff --git a/target/linux/package/ieee80211-dscape/Config.in b/target/linux/package/ieee80211-dscape/Config.in index a440ee2607..d747ed2fba 100644 --- a/target/linux/package/ieee80211-dscape/Config.in +++ b/target/linux/package/ieee80211-dscape/Config.in @@ -1,8 +1,8 @@ -config BR2_PACKAGE_KMOD_IEEE80211_DSCAPE +config PACKAGE_KMOD_IEEE80211_DSCAPE prompt "kmod-ieee80211-dscape............. IEEE 802.11 stack (devicescape)" tristate default n - depends BR2_LINUX_2_6_BRCM || BR2_LINUX_2_6_X86 + depends LINUX_2_6_BRCM || LINUX_2_6_X86 help IEEE 802.11 stack (devicescape) diff --git a/target/linux/package/madwifi-old/Config.in b/target/linux/package/madwifi-old/Config.in index 115ce03f60..ec0385540d 100644 --- a/target/linux/package/madwifi-old/Config.in +++ b/target/linux/package/madwifi-old/Config.in @@ -1,7 +1,7 @@ -config BR2_PACKAGE_KMOD_MADWIFI_OLD +config PACKAGE_KMOD_MADWIFI_OLD prompt "kmod-madwifi-old.................. (old) Atheros Wifi driver" tristate - default m if CONFIG_DEVEL + default m if DEVEL default n help Madwifi-old driver for Atheros wireless adapters diff --git a/target/linux/package/madwifi-old/Makefile b/target/linux/package/madwifi-old/Makefile index 25c64df50a..7d369722aa 100644 --- a/target/linux/package/madwifi-old/Makefile +++ b/target/linux/package/madwifi-old/Makefile @@ -26,10 +26,10 @@ endif BUS := PCI -ifneq ($(BR2_LINUX_2_4_AR531X),) +ifneq ($(CONFIG_LINUX_2_4_AR531X),) BUS := AHB endif -# ifneq ($(BR2_LINUX_2_6_ARUBA),) +# ifneq ($(CONFIG_LINUX_2_6_ARUBA),) # BUS := PCI AHB # no suitable HAL for AHB yet. # endif diff --git a/target/linux/package/madwifi/Config.in b/target/linux/package/madwifi/Config.in index b554e672fd..6eda342f81 100644 --- a/target/linux/package/madwifi/Config.in +++ b/target/linux/package/madwifi/Config.in @@ -1,8 +1,8 @@ -config BR2_PACKAGE_KMOD_MADWIFI +config PACKAGE_KMOD_MADWIFI prompt "kmod-madwifi...................... Atheros Wifi driver" tristate - default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_6_ARUBA || BR2_LINUX_2_4_AR531X - default m if CONFIG_DEVEL + default y if LINUX_2_6_BRCM || LINUX_2_6_ARUBA || LINUX_2_4_AR531X + default m if DEVEL default n help Driver for Atheros 802.11a/b/g MiniPCI cards diff --git a/target/linux/package/madwifi/Makefile b/target/linux/package/madwifi/Makefile index fcdac9097f..d42372b52e 100644 --- a/target/linux/package/madwifi/Makefile +++ b/target/linux/package/madwifi/Makefile @@ -26,10 +26,10 @@ endif BUS := PCI -ifneq ($(BR2_LINUX_2_4_AR531X),) +ifneq ($(CONFIG_LINUX_2_4_AR531X),) BUS := AHB endif -ifneq ($(BR2_LINUX_2_6_ARUBA),) +ifneq ($(CONFIG_LINUX_2_6_ARUBA),) BUS := PCI AHB # no suitable HAL for AHB yet. endif diff --git a/target/linux/package/mini_fo/Config.in b/target/linux/package/mini_fo/Config.in index a92ff9785a..a280ff56a8 100644 --- a/target/linux/package/mini_fo/Config.in +++ b/target/linux/package/mini_fo/Config.in @@ -1,6 +1,6 @@ -config BR2_PACKAGE_KMOD_MINI_FO +config PACKAGE_KMOD_MINI_FO prompt "kmod-mini_fo...................... mini fanout overlay file system" tristate - default m if CONFIG_DEVEL + default m if DEVEL help The mini fanout overlay file system. diff --git a/target/linux/package/openswan/Config.in b/target/linux/package/openswan/Config.in index 59a943f8e4..faf0f8f4a6 100644 --- a/target/linux/package/openswan/Config.in +++ b/target/linux/package/openswan/Config.in @@ -1,7 +1,7 @@ -config BR2_PACKAGE_KMOD_OPENSWAN +config PACKAGE_KMOD_OPENSWAN prompt "kmod-openswan..................... Openswan kernel module" tristate - default m if CONFIG_DEVEL + default m if DEVEL help Openswan is an implementation of IPsec for Linux. diff --git a/target/linux/package/shfs/Config.in b/target/linux/package/shfs/Config.in index 61bd54b5e5..71cc327073 100644 --- a/target/linux/package/shfs/Config.in +++ b/target/linux/package/shfs/Config.in @@ -1,7 +1,7 @@ -config BR2_PACKAGE_KMOD_SHFS +config PACKAGE_KMOD_SHFS prompt "kmod-shfs......................... Shell FileSystem kernel module (ShFS) kernel module" tristate - default m if CONFIG_DEVEL + default m if DEVEL help ShFS is a simple and easy to use Linux kernel module which allows you to mount remote filesystems using a plain shell diff --git a/target/linux/package/spca5xx/Config.in b/target/linux/package/spca5xx/Config.in index 6d504823f1..729e6b0094 100644 --- a/target/linux/package/spca5xx/Config.in +++ b/target/linux/package/spca5xx/Config.in @@ -1,7 +1,7 @@ -config BR2_PACKAGE_KMOD_SPCA5XX +config PACKAGE_KMOD_SPCA5XX prompt "kmod-spca5xx...................... Kernel driver for SPCA5XX based USB cameras" tristate - default m if CONFIG_DEVEL + default m if DEVEL help Kernel driver for SPCA5XX based USB cameras diff --git a/target/linux/package/switch/Config.in b/target/linux/package/switch/Config.in index 407d5deb68..0ff2aa1aba 100644 --- a/target/linux/package/switch/Config.in +++ b/target/linux/package/switch/Config.in @@ -1,8 +1,8 @@ -config BR2_PACKAGE_KMOD_SWITCH +config PACKAGE_KMOD_SWITCH prompt "kmod-switch....................... Kernel driver for ROBO and ADMTEK SWITCH" tristate - default y if BR2_LINUX_2_6_BRCM || BR2_LINUX_2_4_BRCM - default m if CONFIG_DEVEL + default y if LINUX_2_6_BRCM || LINUX_2_4_BRCM + default m if DEVEL default n help Kernel driver for ROBO and ADMTEK switches. diff --git a/target/linux/package/ueagle-atm/Config.in b/target/linux/package/ueagle-atm/Config.in index 17b619cef8..c92fc2f724 100644 --- a/target/linux/package/ueagle-atm/Config.in +++ b/target/linux/package/ueagle-atm/Config.in @@ -1,8 +1,8 @@ -config BR2_PACKAGE_KMOD_UEAGLE_ATM +config PACKAGE_KMOD_UEAGLE_ATM prompt "kmod-ueagle-atm.................... Kernel driver for Eagle 8051 based USB ADSL modems" tristate - depends BR2_LINUX_2_6_BRCM - default m if CONFIG_DEVEL + depends LINUX_2_6_BRCM + default m if DEVEL help Kernel driver for Eagle 8051 USB ADSL modems diff --git a/target/linux/package/wlcompat/Config.in b/target/linux/package/wlcompat/Config.in index 1e5f5e79e0..904d1e6645 100644 --- a/target/linux/package/wlcompat/Config.in +++ b/target/linux/package/wlcompat/Config.in @@ -1,17 +1,17 @@ -config BR2_PACKAGE_KMOD_WLCOMPAT +config PACKAGE_KMOD_WLCOMPAT prompt "kmod-wlcompat..................... Wrapper providing Wireless Extensions for Broadcom wl module" tristate default y - depends BR2_PACKAGE_KMOD_BRCM_WL || BR2_PACKAGE_KMOD_BRCM_WL2 + depends PACKAGE_KMOD_BRCM_WL || PACKAGE_KMOD_BRCM_WL2 help A wrapper module, that provides Wireless Extension support for the proprietary Broadcom wl module. -config BR2_PACKAGE_KMOD_WLCOMPAT_DEBUG +config PACKAGE_KMOD_WLCOMPAT_DEBUG prompt "kmod-wlcompat-debug............... Wrapper providing Wireless Extensions for Broadcom wl module (debug)" tristate default m - depends BR2_PACKAGE_KMOD_BRCM_WL || BR2_PACKAGE_KMOD_BRCM_WL2 + depends PACKAGE_KMOD_BRCM_WL || PACKAGE_KMOD_BRCM_WL2 help A wrapper module, that provides Wireless Extension support for the proprietary Broadcom wl module. (debug version) diff --git a/target/linux/package/zd1211/Config.in b/target/linux/package/zd1211/Config.in index 2852c84e55..cadfa4f5dd 100644 --- a/target/linux/package/zd1211/Config.in +++ b/target/linux/package/zd1211/Config.in @@ -1,8 +1,8 @@ -config BR2_PACKAGE_KMOD_ZD1211 +config PACKAGE_KMOD_ZD1211 prompt "kmod-zd12111...................... Driver for Zydas 1211 based devices" tristate - depends BR2_LINUX_2_6 - default m if CONFIG_DEVEL + depends LINUX_2_6 + default m if DEVEL help Linux driver for the ZyDAS ZD1211 802.11b/g USB-WLAN-Chip. Initially contributed by ZyDAS, this driver is actively maintained diff --git a/target/linux/rules.mk b/target/linux/rules.mk index 1ebe28b6ac..8490d110de 100644 --- a/target/linux/rules.mk +++ b/target/linux/rules.mk @@ -54,10 +54,10 @@ PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_ I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) ifeq ($$(KDEPEND_$(1)),m) -ifneq ($(BR2_PACKAGE_KMOD_$(1)),) +ifneq ($(CONFIG_PACKAGE_KMOD_$(1)),) TARGETS += $$(PKG_$(1)) endif -ifeq ($(BR2_PACKAGE_KMOD_$(1)),y) +ifeq ($(CONFIG_PACKAGE_KMOD_$(1)),y) INSTALL_TARGETS += $$(PKG_$(1)) endif endif diff --git a/target/sdk/Config.in b/target/sdk/Config.in index f70810ba02..343352ad05 100644 --- a/target/sdk/Config.in +++ b/target/sdk/Config.in @@ -1,6 +1,6 @@ -config BR2_PACKAGE_SDK +config PACKAGE_SDK bool "OpenWrt SDK" - default y if CONFIG_DEVEL + default y if DEVEL help Build an OpenWrt SDK. This is essentially a stripped-down version of the buildroot diff --git a/target/sdk/Makefile b/target/sdk/Makefile index 3f62aec115..cfcf8c5e05 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -27,7 +27,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: $(CP) ./files/README.SDK $(SDK_BUILD_DIR)/ $(CP) ./files/depend.mk $(SDK_BUILD_DIR)/package/ $(CP) $(TOPDIR)/package/rules.mk $(SDK_BUILD_DIR)/package/ - egrep '^BR2_(ARCH|WGET|STAGING|JLEVEL|LARGEFILE|TARGET_OPT)' $(TOPDIR)/.config > $(SDK_BUILD_DIR)/.config + egrep '^CONFIG_(ARCH|WGET|STAGING|JLEVEL|LARGEFILE|TARGET_OPT)' $(TOPDIR)/.config > $(SDK_BUILD_DIR)/.config find $(SDK_BUILD_DIR) -name .svn | xargs rm -rf find $(SDK_BUILD_DIR) -name CVS | xargs rm -rf (cd $(BUILD_DIR); \ diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 1b205715e3..7d405664bb 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk # build binutils for use on the host system # ############################################################# -BINUTILS_VERSION:=$(strip $(subst ",, $(BR2_BINUTILS_VERSION))) +BINUTILS_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION))) #" BINUTILS_SITE:=http://www.fr.kernel.org/pub/linux/devel/binutils \ diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 26e17ad61e..cf60d75050 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -37,10 +37,10 @@ GCC_STRIP_HOST_BINARIES:=true # ############################################################# -ifeq ($(BR2_INSTALL_LIBGCJ),y) +ifeq ($(CONFIG_INSTALL_LIBGCJ),y) TARGET_LANGUAGES:=c,c++,java else -ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +ifeq ($(CONFIG_INSTALL_LIBSTDCPP),y) TARGET_LANGUAGES:=c,c++ else TARGET_LANGUAGES:=c @@ -71,7 +71,7 @@ $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked # We can dispense with the custom spec files, as well as libfloat for the arm case. # However, we still need a patch for arm. There's a similar patch for gcc 3.3.x # which needs to be integrated so we can kill of libfloat for good. -ifeq ($(BR2_SOFT_FLOAT),y) +ifeq ($(CONFIG_SOFT_FLOAT),y) ifeq ("$(strip $(ARCH))","arm") $(SCRIPT_DIR)/patch-kernel.sh $(GCC_DIR) ./$(GCC_VERSION) arm-softfloat.patch.conditional endif @@ -175,7 +175,7 @@ gcc-install: $(GCC_BUILD_DIR2)/.compiled # # Now for the ugly 3.3.x soft float hack... # -ifeq ($(BR2_SOFT_FLOAT),y) +ifeq ($(CONFIG_SOFT_FLOAT),y) ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) # Make sure we have a soft float specs file for this arch if [ ! -f ./$(GCC_VERSION)/specs-$(ARCH)-soft-float ] ; then \ diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in index 574a398bb8..f8560cbd90 100644 --- a/toolchain/gdb/Config.in +++ b/toolchain/gdb/Config.in @@ -1,6 +1,6 @@ comment "Gdb Options" -config BR2_PACKAGE_GDB_CLIENT +config PACKAGE_GDB_CLIENT bool "Build gdb client for the Host" default n help diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index d77f554a12..19ab0326f6 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk # ############################################################# -ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y) +ifeq ($(CONFIG_UCLIBC_VERSION_SNAPSHOT),y) # Be aware that this changes daily.... UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc -UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(BR2_USE_UCLIBC_SNAPSHOT))).tar.bz2 +UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(CONFIG_USE_UCLIBC_SNAPSHOT))).tar.bz2 #" UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots UCLIBC_VER:=PKG_VERSION:=0.${shell date +"%G%m%d"} @@ -50,13 +50,13 @@ $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(CP) ./files/config.$(ARCH) $(UCLIBC_DIR)/.config $(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \ $(UCLIBC_DIR)/.config -ifeq ($(BR2_LARGEFILE),y) +ifeq ($(CONFIG_LARGEFILE),y) $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' $(UCLIBC_DIR)/.config else $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=n,g' $(UCLIBC_DIR)/.config endif $(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config -ifeq ($(BR2_SOFT_FLOAT),y) +ifeq ($(CONFIG_SOFT_FLOAT),y) $(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(UCLIBC_DIR)/.config endif mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include -- cgit v1.2.3 From 1b14a20c70b78c037ef4bcc6d1edb61ea8b27e68 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 03:17:13 +0000 Subject: fix and enable the sdk git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4037 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Config.in | 35 ++++++++++++++++++ package/Makefile | 5 ++- target/Makefile | 10 +++-- target/linux/Config.in | 33 ----------------- target/sdk/Config.in | 8 ++-- target/sdk/Makefile | 19 ++++------ target/sdk/files/Makefile.sdk | 86 +++++++++++++++++++++++++++---------------- target/sdk/files/depend.mk | 6 --- 8 files changed, 112 insertions(+), 90 deletions(-) delete mode 100644 target/sdk/files/depend.mk (limited to 'target/sdk') diff --git a/Config.in b/Config.in index 740205e3ec..74bd648465 100644 --- a/Config.in +++ b/Config.in @@ -40,7 +40,42 @@ config JLEVEL help Number of jobs to run simultanesouly +source "target/sdk/Config.in" source "toolchain/Config.in" + +menu "Target Images" + config TARGET_ROOTFS_INITRAMFS + bool "ramdisk" + default n + depends LINUX_2_6 + help + Embed the rootfs into the kernel (initramfs) + + config TARGET_ROOTFS_JFFS2 + bool "jffs2" + default y + depends !TARGET_ROOTFS_INITRAMFS + help + Build a jffs2 root filesystem + + config TARGET_ROOTFS_SQUASHFS + bool "squashfs" + default y + depends !LINUX_2_6_ARUBA + depends !LINUX_2_6_XSCALE + depends !TARGET_ROOTFS_INITRAMFS + help + Build a squashfs-lzma root filesystem + + config TARGET_ROOTFS_TGZ + bool "tgz" + default y if !LINUX_2_4_BRCM && !LINUX_2_6_BRCM && !LINUX_2_6_ARUBA && !LINUX_2_4_AR531X + depends !TARGET_ROOTFS_INITRAMFS + help + Build a compressed tar archive of the the root filesystem + +endmenu + source "target/linux/Config.in" source ".config.in" diff --git a/package/Makefile b/package/Makefile index 2b7f0db764..e947bcfaea 100644 --- a/package/Makefile +++ b/package/Makefile @@ -27,9 +27,12 @@ $(STAMP_DIR) $(TARGET_DIR): %-clean: $(STAMP_DIR) $(TARGET_DIR) $(MAKE) -C $(patsubst %-clean,%,$@) clean MAKEFLAGS="$(BUILD_MAKEFLAGS)" +ifeq ($(SDK),1) +GENDEP_OPTS := -s +endif $(TOPDIR)/.pkgdeps: $(TOPDIR)/.pkginfo - @$(TOPDIR)/scripts/gen_deps.pl < $< > $@ || rm -f $@ + @$(TOPDIR)/scripts/gen_deps.pl $(GENDEP_OPTS) < $< > $@ || rm -f $@ all: compile clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) diff --git a/target/Makefile b/target/Makefile index 9205f5b986..0a1434472a 100644 --- a/target/Makefile +++ b/target/Makefile @@ -5,16 +5,18 @@ all: install $(BIN_DIR): mkdir -p $(BIN_DIR) -TARGETS:=linux utils +TARGETS-y := linux utils +TARGETS-$(CONFIG_SDK) += sdk linux-compile: utils-install linux-install: $(BIN_DIR) +sdk-compile: linux-install -download: $(patsubst %,%-source,$(TARGETS)) +download: $(patsubst %,%-source,$(TARGETS-y)) prepare: linux-prepare compile: linux-compile -install: image_clean linux-install -clean: $(patsubst %,%-clean,$(TARGETS)) image_clean +install: image_clean $(patsubst %,%-install,$(TARGETS-y)) +clean: $(patsubst %,%-clean,$(TARGETS-y)) image_clean image_clean: FORCE rm -f $(BIN_DIR)/openwrt-* diff --git a/target/linux/Config.in b/target/linux/Config.in index 23c96b76df..71f88d7a52 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -1,36 +1,3 @@ -menu "Target Root Filesystem" - config TARGET_ROOTFS_INITRAMFS - bool "ramdisk" - default n - depends LINUX_2_6 - help - Embed the rootfs into the kernel (initramfs) - - config TARGET_ROOTFS_JFFS2 - bool "jffs2" - default y - depends !TARGET_ROOTFS_INITRAMFS - help - Build a jffs2 root filesystem - - config TARGET_ROOTFS_SQUASHFS - bool "squashfs" - default y - depends !LINUX_2_6_ARUBA - depends !LINUX_2_6_XSCALE - depends !TARGET_ROOTFS_INITRAMFS - help - Build a squashfs-lzma root filesystem - - config TARGET_ROOTFS_TGZ - bool "tgz" - default y if !LINUX_2_4_BRCM && !LINUX_2_6_BRCM && !LINUX_2_6_ARUBA && !LINUX_2_4_AR531X - depends !TARGET_ROOTFS_INITRAMFS - help - Build a compressed tar archive of the the root filesystem - -endmenu - menu "Kernel Configuration / Device Support" comment "Device specific configuration" diff --git a/target/sdk/Config.in b/target/sdk/Config.in index 343352ad05..538b473d00 100644 --- a/target/sdk/Config.in +++ b/target/sdk/Config.in @@ -1,9 +1,9 @@ -config PACKAGE_SDK - bool "OpenWrt SDK" - default y if DEVEL +config SDK + bool "Build the OpenWrt SDK" + default n help - Build an OpenWrt SDK. This is essentially a stripped-down version of the buildroot with a precompiled toolchain. It can be used to develop and test packages for OpenWrt before including them in the buildroot + diff --git a/target/sdk/Makefile b/target/sdk/Makefile index cfcf8c5e05..01438a6e0d 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -1,33 +1,30 @@ # $Id$ include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk PKG_OS:=$(shell uname -s) PKG_CPU:=$(shell uname -m) -PKG_RELEASE:=1 -SDK_NAME:=OpenWrt-SDK-$(PKG_OS)-$(PKG_CPU)-$(PKG_RELEASE) - +SDK_NAME:=OpenWrt-SDK-$(BOARD)-$(KERNEL)-for-$(PKG_OS)-$(PKG_CPU) SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME) all: compile $(BIN_DIR)/$(SDK_NAME).tar.bz2: (cd $(STAGING_DIR); \ - rm -rf info man share; \ + rm -rf info man share stampfiles; \ cd usr; \ rm -rf doc info man share; \ ) rm -rf $(SDK_BUILD_DIR) - mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/examples $(SDK_BUILD_DIR)/package - $(CP) $(STAGING_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/ - $(CP) $(TOPDIR)/package/strace $(TOPDIR)/package/iproute2 $(SDK_BUILD_DIR)/examples - $(CP) $(TOPDIR)/rules.mk $(SDK_BUILD_DIR)/ + mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package + $(CP) $(STAGING_DIR) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/ + $(CP) $(TOPDIR)/rules.mk $(TOPDIR)/.config $(SDK_BUILD_DIR)/ + $(CP) $(TOPDIR)/package/Makefile $(SDK_BUILD_DIR)/package/ $(CP) ./files/Makefile.sdk $(SDK_BUILD_DIR)/Makefile $(CP) ./files/README.SDK $(SDK_BUILD_DIR)/ - $(CP) ./files/depend.mk $(SDK_BUILD_DIR)/package/ - $(CP) $(TOPDIR)/package/rules.mk $(SDK_BUILD_DIR)/package/ - egrep '^CONFIG_(ARCH|WGET|STAGING|JLEVEL|LARGEFILE|TARGET_OPT)' $(TOPDIR)/.config > $(SDK_BUILD_DIR)/.config + echo OPENWRTVERSION:=$(OPENWRTVERSION) > $(SDK_BUILD_DIR)/.version.mk find $(SDK_BUILD_DIR) -name .svn | xargs rm -rf find $(SDK_BUILD_DIR) -name CVS | xargs rm -rf (cd $(BUILD_DIR); \ diff --git a/target/sdk/files/Makefile.sdk b/target/sdk/files/Makefile.sdk index 6d5f61ad11..50723232bc 100644 --- a/target/sdk/files/Makefile.sdk +++ b/target/sdk/files/Makefile.sdk @@ -1,42 +1,66 @@ -# OpenWrt SDK Makefile -TOPDIR:=${shell pwd} +# Makefile for OpenWrt +# +# Copyright (C) 2006 by Felix Fietkau +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +RELEASE:=Kamikaze +#VERSION:=2.0 # uncomment for final release + +#-------------------------------------------------------------- +# Just run 'make menuconfig', configure stuff, then run 'make'. +# You shouldn't need to mess with anything beyond this point... +#-------------------------------------------------------------- +TOPDIR=${shell pwd} export TOPDIR -DEVELOPER:=1 -export DEVELOPER -include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/depend.mk +include $(TOPDIR)/.version.mk +export OPENWRTVERSION -PACKAGES:=$(filter-out %.mk,$(shell ls $(TOPDIR)/package)) -PACKAGES_PREPARE:=$(foreach package,$(PACKAGES),$(package)-prepare) -PACKAGES_COMPILE:=$(foreach package,$(PACKAGES),$(package)-compile) -PACKAGES_CLEAN:=$(foreach package,$(PACKAGES),$(package)-clean) +DEVELOPER=1 +export DEVELOPER -all: compile package_index -compile: $(PACKAGES_COMPILE) -clean: $(PACKAGES_CLEAN) - rm -rf $(BUILD_DIR) - rm -rf bin +all: world -distclean: clean - rm -rf $(DL_DIR) +.pkginfo: FORCE +ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo) + @echo Collecting package info... + @-for dir in package/*/; do \ + echo Source-Makefile: $${dir}Makefile; \ + $(MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \ + done > $@ +endif + +pkginfo-clean: FORCE + -rm -f .pkginfo .config.in -%-prepare: $(BUILD_DIR) - @$(MAKE) -C package/$(patsubst %-prepare,%,$@) prepare +package/%: .pkginfo FORCE + $(MAKE) -C package $(patsubst package/%,%,$@) SDK=1 -%-compile: %-prepare - @$(MAKE) -C package/$(patsubst %-compile,%,$@) compile +download: FORCE + $(MAKE) package/download -%-clean: - @$(MAKE) -C package/$(patsubst %-clean,%,$@) clean +world: FORCE + $(MAKE) package/compile +clean: FORCE + rm -rf build_* bin -$(BUILD_DIR): - mkdir -p $@ - mkdir -p $(DL_DIR) - -package_index: - (cd $(PACKAGE_DIR); \ - $(STAGING_DIR)/usr/bin/ipkg-make-index . > Packages \ - ) +distclean: clean + rm -rf dl .pkg* +.PHONY: FORCE +FORCE: diff --git a/target/sdk/files/depend.mk b/target/sdk/files/depend.mk deleted file mode 100644 index d7b844db55..0000000000 --- a/target/sdk/files/depend.mk +++ /dev/null @@ -1,6 +0,0 @@ -# You can put your package dependencies in here -# Example (make openvpn depend on openssl): -# openvpn-compile: openssl-compile -# -# Note: This file is not present in the full buildroot. There you -# have to put your package dependencies in buildroot/package/Makefile -- cgit v1.2.3 From 02cdebbb91a33d8e24da1c94a9d93ac39be168a7 Mon Sep 17 00:00:00 2001 From: mbm Date: Tue, 27 Jun 2006 00:35:46 +0000 Subject: credit where credit is due git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4091 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Makefile | 16 +++------------- include/host-build.mk | 6 ++++++ include/image.mk | 6 ++++++ include/kernel-build.mk | 6 ++++++ include/kernel.mk | 6 ++++++ include/modules-2.4.mk | 6 ++++++ include/modules-2.6.mk | 6 ++++++ include/modules.mk | 6 ++++++ include/netfilter.mk | 6 ++++++ include/package.mk | 6 ++++++ include/target.mk | 6 ++++++ include/verbose.mk | 7 ++++++- package/alsa/Makefile | 6 ++++++ package/base-files/Makefile | 6 ++++++ package/bridge/Makefile | 6 ++++++ package/broadcom-wl/Makefile | 6 ++++++ package/busybox/Makefile | 6 ++++++ package/diag/Makefile | 6 ++++++ package/dnsmasq/Makefile | 6 ++++++ package/dropbear/Makefile | 6 ++++++ package/ebtables/Makefile | 6 ++++++ package/fuse/Makefile | 6 ++++++ package/haserl/Makefile | 6 ++++++ package/hostap/Makefile | 6 ++++++ package/hostapd/Makefile | 6 ++++++ package/iproute2/Makefile | 6 ++++++ package/ipsec-tools/Makefile | 6 ++++++ package/ipset/Makefile | 6 ++++++ package/iptables/Makefile | 6 ++++++ package/libpcap/Makefile | 6 ++++++ package/linux-atm/Makefile | 6 ++++++ package/madwifi/Makefile | 6 ++++++ package/mini_fo/Makefile | 6 ++++++ package/mtd/Makefile | 6 ++++++ package/nvram/Makefile | 6 ++++++ package/openssl/Makefile | 6 ++++++ package/openswan/Makefile | 6 ++++++ package/pcmcia-cs/Makefile | 6 ++++++ package/ppp/Makefile | 6 ++++++ package/pptp/Makefile | 6 ++++++ package/robocfg/Makefile | 6 ++++++ package/shfs/Makefile | 6 ++++++ package/spca5xx/Makefile | 6 ++++++ package/switch/Makefile | 8 +++++++- package/udev/Makefile | 6 ++++++ package/ueagle-atm/Makefile | 6 ++++++ package/util-linux/Makefile | 6 ++++++ package/wireless-tools/Makefile | 6 ++++++ package/wlcompat/Makefile | 6 ++++++ package/zd1211/Makefile | 6 ++++++ package/zlib/Makefile | 6 ++++++ rules.mk | 7 +++++++ scripts/configtest.pl | 7 +++++++ scripts/download.pl | 7 +++++++ scripts/gen_busybox_config.pl | 7 +++++++ scripts/gen_busybox_menuconfig.pl | 7 +++++++ scripts/gen_deps.pl | 7 +++++++ scripts/gen_menuconfig.pl | 7 +++++++ scripts/rstrip.sh | 7 +++++++ scripts/timestamp.pl | 7 +++++++ target/Makefile | 6 ++++++ target/image/ar7/Makefile | 6 ++++++ target/image/aruba/Makefile | 6 ++++++ target/image/au1000/Makefile | 6 ++++++ target/image/brcm/Makefile | 6 ++++++ target/image/brcm/lzma-loader/Makefile | 6 ++++++ target/image/brcm63xx/Makefile | 6 ++++++ target/image/generic/Makefile | 6 ++++++ target/image/generic/lzma-loader/Makefile | 6 ++++++ target/image/generic/lzma-loader/src/Makefile | 6 ++++++ target/image/rb532/Makefile | 6 ++++++ target/image/x86/Makefile | 6 ++++++ target/image/xscale/Makefile | 6 ++++++ target/linux/Makefile | 6 ++++++ target/linux/ar531x-2.4/Makefile | 6 ++++++ target/linux/ar7-2.4/Makefile | 6 ++++++ target/linux/aruba-2.6/Makefile | 6 ++++++ target/linux/au1000-2.6/Makefile | 6 ++++++ target/linux/brcm-2.4/Makefile | 6 ++++++ target/linux/brcm-2.6/Makefile | 6 ++++++ target/linux/brcm63xx-2.6/Makefile | 6 ++++++ target/linux/imagebuilder/Makefile | 6 ++++++ target/linux/package/Makefile | 6 ++++++ target/linux/rb532-2.6/Makefile | 6 ++++++ target/linux/sibyte-2.6/Makefile | 6 ++++++ target/linux/x86-2.4/Makefile | 6 ++++++ target/linux/x86-2.6/Makefile | 6 ++++++ target/linux/xscale-2.6/Makefile | 6 ++++++ target/sdk/Makefile | 6 ++++++ target/utils/Makefile | 6 ++++++ 90 files changed, 547 insertions(+), 15 deletions(-) (limited to 'target/sdk') diff --git a/Makefile b/Makefile index f5d49fed27..5c218f155f 100644 --- a/Makefile +++ b/Makefile @@ -1,20 +1,10 @@ # Makefile for OpenWrt # +# Copyright (C) 2006 OpenWrt.org # Copyright (C) 2006 by Felix Fietkau # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. # RELEASE:=Kamikaze diff --git a/include/host-build.mk b/include/host-build.mk index 0d103e2a02..43c83142df 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# ifneq ($(strip $(PKG_CAT)),) ifeq ($(PKG_CAT),unzip) UNPACK=unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) diff --git a/include/image.mk b/include/image.mk index ca0d688f17..95accd6e1d 100644 --- a/include/image.mk +++ b/include/image.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) ifneq ($(CONFIG_BIG_ENDIAN),y) diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 3a455a812e..6fae4acc53 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# -include $(INCLUDE_DIR)/modules-$(KERNEL).mk LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 diff --git a/include/kernel.mk b/include/kernel.mk index b40f65f480..2c5d093778 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# ifeq ($(DUMP),1) KERNEL:= BOARD:= diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk index 325cf16bcc..f8d966f401 100644 --- a/include/modules-2.4.mk +++ b/include/modules-2.4.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(INCLUDE_DIR)/netfilter.mk # Networking diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index 6e8a2ded70..c98e4ea8a4 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# NF_2_6:=1 include $(INCLUDE_DIR)/netfilter.mk diff --git a/include/modules.mk b/include/modules.mk index 026c4a6103..d20fd41bb0 100644 --- a/include/modules.mk +++ b/include/modules.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/include/kernel.mk define KernelPackage/ide-core diff --git a/include/netfilter.mk b/include/netfilter.mk index 66cb747dea..236d4b2429 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id: netfilter.mk 2411 2005-11-11 03:41:43Z nico $ ifeq ($(NF_2_6),1) diff --git a/include/package.mk b/include/package.mk index 0996574d26..bf2376dcd0 100644 --- a/include/package.mk +++ b/include/package.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# ifneq ($(DUMP),) all: dumpinfo else diff --git a/include/target.mk b/include/target.mk index afdf5d8ae6..5a87ab84d7 100644 --- a/include/target.mk +++ b/include/target.mk @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# define kernel_template ifeq ($(CONFIG_LINUX_$(3)),y) KERNEL:=$(1) diff --git a/include/verbose.mk b/include/verbose.mk index 6d7c7ef6c1..98dfd5632b 100644 --- a/include/verbose.mk +++ b/include/verbose.mk @@ -1,4 +1,9 @@ -# OpenWrt.org 2006 +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id:$ ifndef KBUILD_VERBOSE diff --git a/package/alsa/Makefile b/package/alsa/Makefile index 7046bfee92..9a745aa96b 100644 --- a/package/alsa/Makefile +++ b/package/alsa/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f81c681c26..b0fd72c767 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/bridge/Makefile b/package/bridge/Makefile index c3e682cc7f..e5e7c63f66 100644 --- a/package/bridge/Makefile +++ b/package/bridge/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile index 23ea674417..fc3f035b6e 100644 --- a/package/broadcom-wl/Makefile +++ b/package/broadcom-wl/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id: Makefile 2480 2005-11-14 02:07:33Z nbd $ include $(TOPDIR)/rules.mk diff --git a/package/busybox/Makefile b/package/busybox/Makefile index b444129175..31ec103517 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/diag/Makefile b/package/diag/Makefile index de6ab8d64f..8edc4093d4 100644 --- a/package/diag/Makefile +++ b/package/diag/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 09770dac28..8d76f378e7 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index b76d3dacf2..f5e9b154d1 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index 87f93defe7..7609fc7d46 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 06777c8528..c9eef88344 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/haserl/Makefile b/package/haserl/Makefile index 53a28a7713..c58d04c23e 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/hostap/Makefile b/package/hostap/Makefile index 612b2b72e0..64b3e40257 100644 --- a/package/hostap/Makefile +++ b/package/hostap/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 7fc77f81a3..352d597669 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index bbbcc758c3..d21a92c66b 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 1a5ae5b4fd..5d2b391411 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 0991148566..d3ea1318ed 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ # include $(TOPDIR)/rules.mk diff --git a/package/iptables/Makefile b/package/iptables/Makefile index f8f590991a..7fdc28422d 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 0ded09a908..76c88af9c4 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index 48a94ed046..0b8c59d4e1 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 57210c0dd0..07e2c45399 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/mini_fo/Makefile b/package/mini_fo/Makefile index 2922908631..6cba9db170 100644 --- a/package/mini_fo/Makefile +++ b/package/mini_fo/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/mtd/Makefile b/package/mtd/Makefile index 80409a9082..50a75a555f 100644 --- a/package/mtd/Makefile +++ b/package/mtd/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/nvram/Makefile b/package/nvram/Makefile index 11e89363fc..b7040deec8 100644 --- a/package/nvram/Makefile +++ b/package/nvram/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 78e17a2195..23207714be 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 61aefe457b..6e51853154 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile index 388b431ef0..11f32a8923 100644 --- a/package/pcmcia-cs/Makefile +++ b/package/pcmcia-cs/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 813b7227d2..dcacbafba5 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 0478b4c2b8..061e55395e 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/robocfg/Makefile b/package/robocfg/Makefile index 8451ac5a95..e43198de93 100644 --- a/package/robocfg/Makefile +++ b/package/robocfg/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/shfs/Makefile b/package/shfs/Makefile index 5617693015..3f958ad731 100644 --- a/package/shfs/Makefile +++ b/package/shfs/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/spca5xx/Makefile b/package/spca5xx/Makefile index 001a64f76d..b4025d7629 100644 --- a/package/spca5xx/Makefile +++ b/package/spca5xx/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/switch/Makefile b/package/switch/Makefile index befae3410e..5513394fd6 100644 --- a/package/switch/Makefile +++ b/package/switch/Makefile @@ -1,4 +1,10 @@ -# $Id$ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id:$ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk diff --git a/package/udev/Makefile b/package/udev/Makefile index 0156115362..942e8cf8f4 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/ueagle-atm/Makefile b/package/ueagle-atm/Makefile index 6d9c739c3c..6db9b830ec 100644 --- a/package/ueagle-atm/Makefile +++ b/package/ueagle-atm/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id: Makefile 2767 2005-12-25 02:10:14Z wbx $ include $(TOPDIR)/rules.mk diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 798e3c8571..79517f9dfb 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id: Makefile 3822 2006-05-24 07:01:52Z nico $ include $(TOPDIR)/rules.mk diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index 5f1205884c..5884424876 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/wlcompat/Makefile b/package/wlcompat/Makefile index e6ec27ee81..a42cdd2050 100644 --- a/package/wlcompat/Makefile +++ b/package/wlcompat/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/package/zd1211/Makefile b/package/zd1211/Makefile index ba7308cc01..c25d8067f9 100644 --- a/package/zd1211/Makefile +++ b/package/zd1211/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id: Makefile 3297 2006-03-02 23:42:52Z florian $ include $(TOPDIR)/rules.mk diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 6c560624f0..41be6cc830 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/rules.mk b/rules.mk index 42aedcfe54..533bdc35c3 100644 --- a/rules.mk +++ b/rules.mk @@ -1,3 +1,10 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + -include $(TOPDIR)/.config include $(TOPDIR)/include/verbose.mk diff --git a/scripts/configtest.pl b/scripts/configtest.pl index 476bba7dce..289b2fecc0 100755 --- a/scripts/configtest.pl +++ b/scripts/configtest.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + my %change = ( '^BUSYBOX' => 'make package/busybox-clean', 'OPENVPN_' => 'make package/openvpn-clean', diff --git a/scripts/download.pl b/scripts/download.pl index 794d8edeb8..40b8d212a5 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + use strict; use warnings; diff --git a/scripts/gen_busybox_config.pl b/scripts/gen_busybox_config.pl index 0c70b4a116..9360052d29 100755 --- a/scripts/gen_busybox_config.pl +++ b/scripts/gen_busybox_config.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + use strict; my $line; diff --git a/scripts/gen_busybox_menuconfig.pl b/scripts/gen_busybox_menuconfig.pl index 6ce323bb13..5fe64783eb 100644 --- a/scripts/gen_busybox_menuconfig.pl +++ b/scripts/gen_busybox_menuconfig.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + use strict; my $PATH = $ARGV[0]; ($PATH and -d $PATH) or die 'invalid path'; diff --git a/scripts/gen_deps.pl b/scripts/gen_deps.pl index 04998715d4..0cdcc97a14 100755 --- a/scripts/gen_deps.pl +++ b/scripts/gen_deps.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + use strict; my $name; diff --git a/scripts/gen_menuconfig.pl b/scripts/gen_menuconfig.pl index c1510b0d58..e62363e630 100755 --- a/scripts/gen_menuconfig.pl +++ b/scripts/gen_menuconfig.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + use strict; my $src; diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh index 619af00d53..e63ccf0895 100755 --- a/scripts/rstrip.sh +++ b/scripts/rstrip.sh @@ -1,4 +1,11 @@ #!/bin/sh +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + SELF=${0##*/} diff --git a/scripts/timestamp.pl b/scripts/timestamp.pl index dc47e24aae..093ced9935 100755 --- a/scripts/timestamp.pl +++ b/scripts/timestamp.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + use strict; sub get_ts($$) { diff --git a/target/Makefile b/target/Makefile index 836469d171..2c18611931 100644 --- a/target/Makefile +++ b/target/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk diff --git a/target/image/ar7/Makefile b/target/image/ar7/Makefile index 5ee6b0dc10..f56ceffb67 100644 --- a/target/image/ar7/Makefile +++ b/target/image/ar7/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk diff --git a/target/image/aruba/Makefile b/target/image/aruba/Makefile index ad13ffd541..1d2aebfb18 100644 --- a/target/image/aruba/Makefile +++ b/target/image/aruba/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk diff --git a/target/image/au1000/Makefile b/target/image/au1000/Makefile index 3aaf665ca9..0d25f84497 100644 --- a/target/image/au1000/Makefile +++ b/target/image/au1000/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk diff --git a/target/image/brcm/Makefile b/target/image/brcm/Makefile index 30bad50f20..853902627c 100644 --- a/target/image/brcm/Makefile +++ b/target/image/brcm/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk diff --git a/target/image/brcm/lzma-loader/Makefile b/target/image/brcm/lzma-loader/Makefile index 3fa00fa4d9..2f9117bcac 100644 --- a/target/image/brcm/lzma-loader/Makefile +++ b/target/image/brcm/lzma-loader/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/target/image/brcm63xx/Makefile b/target/image/brcm63xx/Makefile index 19799e88af..6aa72c2920 100644 --- a/target/image/brcm63xx/Makefile +++ b/target/image/brcm63xx/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk diff --git a/target/image/generic/Makefile b/target/image/generic/Makefile index 3cb3b2e0b6..64b294d76e 100644 --- a/target/image/generic/Makefile +++ b/target/image/generic/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk diff --git a/target/image/generic/lzma-loader/Makefile b/target/image/generic/lzma-loader/Makefile index 3de04a81a8..29f9f3b058 100644 --- a/target/image/generic/lzma-loader/Makefile +++ b/target/image/generic/lzma-loader/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id: Makefile 1823 2005-09-01 20:07:42Z nbd $ include $(TOPDIR)/rules.mk diff --git a/target/image/generic/lzma-loader/src/Makefile b/target/image/generic/lzma-loader/src/Makefile index 54356889f5..d4a100df4b 100644 --- a/target/image/generic/lzma-loader/src/Makefile +++ b/target/image/generic/lzma-loader/src/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# LOADADDR = 0x80400000 # RAM start + 4M KERNEL_ENTRY = 0x80001000 RAMSIZE = 0x00100000 # 1MB diff --git a/target/image/rb532/Makefile b/target/image/rb532/Makefile index bba89522ac..2a61a484dc 100644 --- a/target/image/rb532/Makefile +++ b/target/image/rb532/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk diff --git a/target/image/x86/Makefile b/target/image/x86/Makefile index e4b3a9e446..d9ed294574 100644 --- a/target/image/x86/Makefile +++ b/target/image/x86/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk diff --git a/target/image/xscale/Makefile b/target/image/xscale/Makefile index 683c6028f6..52c15a93d0 100644 --- a/target/image/xscale/Makefile +++ b/target/image/xscale/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk diff --git a/target/linux/Makefile b/target/linux/Makefile index bab26845a1..9afda46c86 100644 --- a/target/linux/Makefile +++ b/target/linux/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar531x-2.4/Makefile b/target/linux/ar531x-2.4/Makefile index b33898754b..33cb47cf50 100644 --- a/target/linux/ar531x-2.4/Makefile +++ b/target/linux/ar531x-2.4/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk LINUX_VERSION:=2.4.32 diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile index 02a553a1ee..a766b50457 100644 --- a/target/linux/ar7-2.4/Makefile +++ b/target/linux/ar7-2.4/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk LINUX_VERSION:=2.4.32 diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile index 4d7955b103..7ffd11c668 100644 --- a/target/linux/aruba-2.6/Makefile +++ b/target/linux/aruba-2.6/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk LINUX_VERSION:=2.6.17 diff --git a/target/linux/au1000-2.6/Makefile b/target/linux/au1000-2.6/Makefile index a301fabcfe..a09c029d22 100644 --- a/target/linux/au1000-2.6/Makefile +++ b/target/linux/au1000-2.6/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk LINUX_VERSION:=2.6.17 diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile index 7945db9171..f0bf67a649 100644 --- a/target/linux/brcm-2.4/Makefile +++ b/target/linux/brcm-2.4/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk LINUX_VERSION:=2.4.32 diff --git a/target/linux/brcm-2.6/Makefile b/target/linux/brcm-2.6/Makefile index 35a778fdf2..0437338e8e 100644 --- a/target/linux/brcm-2.6/Makefile +++ b/target/linux/brcm-2.6/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk LINUX_VERSION:=2.6.17 diff --git a/target/linux/brcm63xx-2.6/Makefile b/target/linux/brcm63xx-2.6/Makefile index a48442a69f..ebbb84425a 100644 --- a/target/linux/brcm63xx-2.6/Makefile +++ b/target/linux/brcm63xx-2.6/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk LINUX_VERSION:=2.6.8.1 diff --git a/target/linux/imagebuilder/Makefile b/target/linux/imagebuilder/Makefile index 53e8dfc58b..2c1ab1712e 100644 --- a/target/linux/imagebuilder/Makefile +++ b/target/linux/imagebuilder/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# default: clean all TOPDIR:=${shell pwd} diff --git a/target/linux/package/Makefile b/target/linux/package/Makefile index a8f01ff5ef..d6ce8623ea 100644 --- a/target/linux/package/Makefile +++ b/target/linux/package/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # Main makefile for the packages include $(TOPDIR)/rules.mk include ../rules.mk diff --git a/target/linux/rb532-2.6/Makefile b/target/linux/rb532-2.6/Makefile index 11e34e7910..30fa1a85a1 100644 --- a/target/linux/rb532-2.6/Makefile +++ b/target/linux/rb532-2.6/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk LINUX_VERSION:=2.6.17 diff --git a/target/linux/sibyte-2.6/Makefile b/target/linux/sibyte-2.6/Makefile index 11e34e7910..30fa1a85a1 100644 --- a/target/linux/sibyte-2.6/Makefile +++ b/target/linux/sibyte-2.6/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk LINUX_VERSION:=2.6.17 diff --git a/target/linux/x86-2.4/Makefile b/target/linux/x86-2.4/Makefile index 8a690afd01..12039454e5 100644 --- a/target/linux/x86-2.4/Makefile +++ b/target/linux/x86-2.4/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk LINUX_VERSION:=2.4.32 diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile index 04b13a3908..6aa10005a4 100644 --- a/target/linux/x86-2.6/Makefile +++ b/target/linux/x86-2.6/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk LINUX_VERSION:=2.6.17 diff --git a/target/linux/xscale-2.6/Makefile b/target/linux/xscale-2.6/Makefile index bd17ba7645..59f02b3340 100644 --- a/target/linux/xscale-2.6/Makefile +++ b/target/linux/xscale-2.6/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk LINUX_VERSION:=2.6.17 diff --git a/target/sdk/Makefile b/target/sdk/Makefile index 01438a6e0d..25d2acc57c 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # $Id$ include $(TOPDIR)/rules.mk diff --git a/target/utils/Makefile b/target/utils/Makefile index bcd1e653e4..855f55267a 100644 --- a/target/utils/Makefile +++ b/target/utils/Makefile @@ -1,3 +1,9 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk TARGETS := addpattern trx motorola-bin dgfirmware -- cgit v1.2.3 From 30010567953c3acfa28c2beafe50e6177254eefa Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 18 Jul 2006 20:17:05 +0000 Subject: make the buildroot-ng sdk compatible with the old packages git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4158 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/package.mk | 1 + target/sdk/Makefile | 3 +- target/sdk/files/Makefile | 69 +++++++++++++++++++++++++++++ target/sdk/files/Makefile.sdk | 66 ---------------------------- target/sdk/files/package/depend.mk | 6 +++ target/sdk/files/package/rules.mk | 89 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 167 insertions(+), 67 deletions(-) create mode 100644 target/sdk/files/Makefile delete mode 100644 target/sdk/files/Makefile.sdk create mode 100644 target/sdk/files/package/depend.mk create mode 100644 target/sdk/files/package/rules.mk (limited to 'target/sdk') diff --git a/include/package.mk b/include/package.mk index 2784cc8881..ce07640eed 100644 --- a/include/package.mk +++ b/include/package.mk @@ -41,6 +41,7 @@ define Build/DefaultTargets touch $$@ $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built + mkdir -p $(STAGING_DIR)/stampfiles $(call Build/InstallDev) touch $$@ diff --git a/target/sdk/Makefile b/target/sdk/Makefile index 25d2acc57c..0552b0aaa8 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -28,8 +28,9 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: $(CP) $(STAGING_DIR) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/ $(CP) $(TOPDIR)/rules.mk $(TOPDIR)/.config $(SDK_BUILD_DIR)/ $(CP) $(TOPDIR)/package/Makefile $(SDK_BUILD_DIR)/package/ - $(CP) ./files/Makefile.sdk $(SDK_BUILD_DIR)/Makefile + $(CP) ./files/Makefile $(SDK_BUILD_DIR)/ $(CP) ./files/README.SDK $(SDK_BUILD_DIR)/ + $(CP) ./files/package/rules.mk $(SDK_BUILD_DIR)/package/ echo OPENWRTVERSION:=$(OPENWRTVERSION) > $(SDK_BUILD_DIR)/.version.mk find $(SDK_BUILD_DIR) -name .svn | xargs rm -rf find $(SDK_BUILD_DIR) -name CVS | xargs rm -rf diff --git a/target/sdk/files/Makefile b/target/sdk/files/Makefile new file mode 100644 index 0000000000..ba488e380c --- /dev/null +++ b/target/sdk/files/Makefile @@ -0,0 +1,69 @@ +# Makefile for OpenWrt +# +# Copyright (C) 2006 by Felix Fietkau +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +RELEASE:=Kamikaze +#VERSION:=2.0 # uncomment for final release + +#-------------------------------------------------------------- +# Just run 'make menuconfig', configure stuff, then run 'make'. +# You shouldn't need to mess with anything beyond this point... +#-------------------------------------------------------------- +TOPDIR=${shell pwd} +export TOPDIR + +DEVELOPER=1 +export DEVELOPER + +all: world + +.pkginfo: FORCE +ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo) + @echo Collecting package info... + @-for dir in package/*/; do \ + echo Source-Makefile: $${dir}Makefile; \ + $(MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \ + done > $@ +endif + +pkginfo-clean: FORCE + -rm -f .pkginfo .config.in + +package/%: .pkginfo FORCE + $(MAKE) -C package $(patsubst package/%,%,$@) SDK=1 + +download: FORCE + $(MAKE) package/download + +world: FORCE + $(MAKE) package/compile + -( \ + cd package; \ + find . -maxdepth 2 -name Config.in | \ + sed -e 's,/Config.in,,g' | \ + xargs -r -n1 make compile -C; \ + ) + +clean: FORCE + rm -rf build_* bin + +distclean: clean + rm -rf dl .pkg* + +.PHONY: FORCE +FORCE: diff --git a/target/sdk/files/Makefile.sdk b/target/sdk/files/Makefile.sdk deleted file mode 100644 index 50723232bc..0000000000 --- a/target/sdk/files/Makefile.sdk +++ /dev/null @@ -1,66 +0,0 @@ -# Makefile for OpenWrt -# -# Copyright (C) 2006 by Felix Fietkau -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -RELEASE:=Kamikaze -#VERSION:=2.0 # uncomment for final release - -#-------------------------------------------------------------- -# Just run 'make menuconfig', configure stuff, then run 'make'. -# You shouldn't need to mess with anything beyond this point... -#-------------------------------------------------------------- -TOPDIR=${shell pwd} -export TOPDIR - -include $(TOPDIR)/.version.mk -export OPENWRTVERSION - -DEVELOPER=1 -export DEVELOPER - -all: world - -.pkginfo: FORCE -ifneq ($(shell ./scripts/timestamp.pl -p .pkginfo package Makefile),.pkginfo) - @echo Collecting package info... - @-for dir in package/*/; do \ - echo Source-Makefile: $${dir}Makefile; \ - $(MAKE) --no-print-dir DUMP=1 -C $$dir 2>&- || true; \ - done > $@ -endif - -pkginfo-clean: FORCE - -rm -f .pkginfo .config.in - -package/%: .pkginfo FORCE - $(MAKE) -C package $(patsubst package/%,%,$@) SDK=1 - -download: FORCE - $(MAKE) package/download - -world: FORCE - $(MAKE) package/compile - -clean: FORCE - rm -rf build_* bin - -distclean: clean - rm -rf dl .pkg* - -.PHONY: FORCE -FORCE: diff --git a/target/sdk/files/package/depend.mk b/target/sdk/files/package/depend.mk new file mode 100644 index 0000000000..d7b844db55 --- /dev/null +++ b/target/sdk/files/package/depend.mk @@ -0,0 +1,6 @@ +# You can put your package dependencies in here +# Example (make openvpn depend on openssl): +# openvpn-compile: openssl-compile +# +# Note: This file is not present in the full buildroot. There you +# have to put your package dependencies in buildroot/package/Makefile diff --git a/target/sdk/files/package/rules.mk b/target/sdk/files/package/rules.mk new file mode 100644 index 0000000000..b3f4cdbea9 --- /dev/null +++ b/target/sdk/files/package/rules.mk @@ -0,0 +1,89 @@ +# invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf +IPKG := IPKG_INSTROOT=$(TARGET_DIR) IPKG_CONF_DIR=$(IPKG_CONF) $(SCRIPT_DIR)/ipkg -force-defaults -force-depends +IPKG_STATE_DIR := $(TARGET_DIR)/usr/lib/ipkg + +ifneq ($(DUMP),) +dump: +.PHONY: dump +endif + +define PKG_template +IPKG_$(1):=$(PACKAGE_DIR)/$(2)_$(3)_$(4).ipk +IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(2) +INFO_$(1):=$(IPKG_STATE_DIR)/info/$(2).list + +ifneq ($(BR2_PACKAGE_$(1)),) +compile-targets: $$(IPKG_$(1)) +endif +ifneq ($(DEVELOPER),) +compile-targets: $$(IPKG_$(1)) +endif +ifeq ($(BR2_PACKAGE_$(1)),y) +install-targets: $$(INFO_$(1)) +endif + +IDEPEND_$(1):=$$(strip $(5)) + +$$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared + $(SCRIPT_DIR)/make-ipkg-dir.sh $$(IDIR_$(1)) ./ipkg/$(2).control $(3) $(4) + if [ "$$(IDEPEND_$(1))" != "" ]; then echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control; fi + for file in conffiles preinst postinst prerm postrm; do \ + [ -f ./ipkg/$(2).$$$$file ] && cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \ + done + +$$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built $(PACKAGE_DIR) + +$$(INFO_$(1)): $$(IPKG_$(1)) + $(IPKG) install $$(IPKG_$(1)) + +$(2)-clean: + rm -f $$(IPKG_$(1)) +clean-targets: $(2)-clean +endef + +ifeq ($(DUMP),) +ifneq ($(strip $(PKG_SOURCE)),) +$(DL_DIR)/$(PKG_SOURCE): + $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) +endif + +ifneq ($(strip $(PKG_CAT)),) +$(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) + rm -rf $(PKG_BUILD_DIR) + mkdir -p $(PKG_BUILD_DIR) + $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - + if [ -d ./patches ]; then \ + $(PATCH) $(PKG_BUILD_DIR) ./patches ; \ + fi + touch $(PKG_BUILD_DIR)/.prepared +endif + +all: compile + +compile-targets: +install-targets: +clean-targets: + +source: $(DL_DIR)/$(PKG_SOURCE) +prepare: $(PKG_BUILD_DIR)/.prepared +compile: compile-targets +install: install-targets +mostlyclean: +rebuild: + -$(MAKE) mostlyclean + if [ -f $(PKG_BUILD_DIR)/.built ]; then \ + $(MAKE) clean; \ + fi + $(MAKE) compile + +$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared +$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured + +$(PACKAGE_DIR): + mkdir -p $@ + +clean: clean-targets + rm -rf $(PKG_BUILD_DIR) + +.PHONY: all source prepare compile install clean +endif -- cgit v1.2.3 From 65aeed311cbddeb66427150582239ff1623246d9 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 21 Jul 2006 17:00:14 +0000 Subject: fix a few directories missed in [4176]'s source -> download git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4198 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Makefile | 2 +- include/host-build.mk | 4 ++-- include/image.mk | 2 +- include/kernel-build.mk | 2 +- target/image/brcm/lzma-loader/Makefile | 2 +- target/image/generic/lzma-loader/Makefile | 2 +- target/linux/Makefile | 4 ++-- target/linux/ar7-2.4/Makefile | 4 ++-- target/sdk/Makefile | 2 +- target/utils/Makefile | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) (limited to 'target/sdk') diff --git a/Makefile b/Makefile index 27526d09a8..e2e467cd8c 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ menuconfig: ./scripts/config/mconf FORCE $< Config.in config-clean: FORCE - $(MAKE) -C scripts/config clean + $(NO_TRACE_MAKE) -C scripts/config clean package/%: .pkginfo FORCE $(MAKE) -C package $(patsubst package/%,%,$@) diff --git a/include/host-build.mk b/include/host-build.mk index 43c83142df..9a5a41317e 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -64,7 +64,7 @@ endef ifneq ($(strip $(PKG_SOURCE)),) - source: $(DL_DIR)/$(PKG_SOURCE) + download: $(DL_DIR)/$(PKG_SOURCE) $(DL_DIR)/$(PKG_SOURCE): mkdir -p $(DL_DIR) @@ -101,7 +101,7 @@ define HostBuild $(call Build/Uninstall) rm -f $(STAGING_DIR)/stampfiles/.host_$(PKG_NAME)-installed - source: + download: prepare: $(PKG_BUILD_DIR)/.prepared configure: $(PKG_BUILD_DIR)/.configured diff --git a/include/image.mk b/include/image.mk index 54f0e8b6bc..87d6815ee8 100644 --- a/include/image.mk +++ b/include/image.mk @@ -87,7 +87,7 @@ compile-targets: install-targets: clean-targets: -source: +download: prepare: compile: compile-targets install: compile install-targets diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 3fb96e1007..38ea9a18eb 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -106,7 +106,7 @@ pkg-install: FORCE $(IPKG) install $$pkg || echo; \ done -source: $(DL_DIR)/$(LINUX_SOURCE) +download: $(DL_DIR)/$(LINUX_SOURCE) prepare: $(LINUX_DIR)/.configured @mkdir -p $(LINUX_DIR) $(PACKAGE_DIR) diff --git a/target/image/brcm/lzma-loader/Makefile b/target/image/brcm/lzma-loader/Makefile index 2f9117bcac..a31ddf1b7f 100644 --- a/target/image/brcm/lzma-loader/Makefile +++ b/target/image/brcm/lzma-loader/Makefile @@ -20,7 +20,7 @@ $(PKG_BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/.prepared $(MAKE) -C $(PKG_BUILD_DIR) CC=$(TARGET_CC) \ LD=$(TARGET_CROSS)ld CROSS_COMPILE=$(TARGET_CROSS) -source: +download: prepare: $(PKG_BUILD_DIR)/.prepared compile: $(PKG_BUILD_DIR)/loader.gz install: diff --git a/target/image/generic/lzma-loader/Makefile b/target/image/generic/lzma-loader/Makefile index 29f9f3b058..6cbbd942cc 100644 --- a/target/image/generic/lzma-loader/Makefile +++ b/target/image/generic/lzma-loader/Makefile @@ -33,7 +33,7 @@ $(PKG_BUILD_DIR)/vmlinux.lzma: $(KDIR)/vmlinux.lzma $(KDIR)/loader.elf: $(PKG_BUILD_DIR)/lzma.elf $(CP) $< $@ -source: +download: prepare: $(PKG_BUILD_DIR)/.prepared compile: $(KDIR)/loader.elf install: diff --git a/target/linux/Makefile b/target/linux/Makefile index 9afda46c86..8682fc2b9b 100644 --- a/target/linux/Makefile +++ b/target/linux/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/target.mk -source: - $(MAKE) -C $(BOARD)-$(KERNEL) source +download: + $(MAKE) -C $(BOARD)-$(KERNEL) download prepare: rm -f $(TOPDIR)/.kernel.mk diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile index a766b50457..d385722e03 100644 --- a/target/linux/ar7-2.4/Makefile +++ b/target/linux/ar7-2.4/Makefile @@ -46,7 +46,7 @@ $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked # ATM firmware for the DSL modem ############################################### -DOWNLOAD_SITE=http://openwrt.org/downloads/sources +DOWNLOAD_SITE=http://openwrt.org/downloads/downloads # extracted from netgear DG834B V1.0.5 GPL release ATM_FIRMWARE_FILE=$(ATM_FIRMWARE_DIR).tar.gz ATM_FIRMWARE_MD5SUM=8bfcb31109796502d66b11baaeb2fba6 @@ -54,7 +54,7 @@ ATM_FIRMWARE_MD5SUM=8bfcb31109796502d66b11baaeb2fba6 $(DL_DIR)/$(ATM_FIRMWARE_FILE): $(SCRIPT_DIR)/download.pl $(DL_DIR) $(ATM_FIRMWARE_FILE) $(ATM_FIRMWARE_MD5SUM) $(DOWNLOAD_SITE) -source: $(DL_DIR)/$(ATM_FIRMWARE_FILE) +download: $(DL_DIR)/$(ATM_FIRMWARE_FILE) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(ATM_FIRMWARE_FILE) $(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.drivers-unpacked $(LINUX_DIR)/.modules_done: $(LINUX_DIR)/.drivers-unpacked diff --git a/target/sdk/Makefile b/target/sdk/Makefile index 0552b0aaa8..a8413562b2 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -38,7 +38,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: tar cfj $@ $(SDK_NAME); \ ) -source: +download: prepare: compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2 install: diff --git a/target/utils/Makefile b/target/utils/Makefile index 855f55267a..c7b9a04980 100644 --- a/target/utils/Makefile +++ b/target/utils/Makefile @@ -10,7 +10,7 @@ TARGETS := addpattern trx motorola-bin dgfirmware UTILS_BUILD_DIR:=$(BUILD_DIR)/target-utils -source: +download: prepare: $(UTILS_BUILD_DIR) compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS)) FORCE mkdir -p $(STAGING_DIR)/bin -- cgit v1.2.3 From 0d3a9cc32ab84cfa68d1cc5d9c20f9241acc8c1a Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 3 Oct 2006 12:25:20 +0000 Subject: set the sdk default to y if CONFIG_ALL is set git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4889 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/sdk/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/sdk') diff --git a/target/sdk/Config.in b/target/sdk/Config.in index 538b473d00..3ead29600c 100644 --- a/target/sdk/Config.in +++ b/target/sdk/Config.in @@ -1,6 +1,6 @@ config SDK bool "Build the OpenWrt SDK" - default n + default y if ALL help This is essentially a stripped-down version of the buildroot with a precompiled toolchain. It can be used to develop and -- cgit v1.2.3