From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 14 Apr 2006 01:22:55 +0000 (+0000)
Subject: remove some more stuff, change package makefile format in rules.mk, port busybox... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bea2a5bd9de89a02daaa878233de0cdb7c415e61;p=openwrt%2Fstaging%2Fadrian.git

remove some more stuff, change package makefile format in rules.mk, port busybox over to the new format

SVN-Revision: 3643
---

diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index 3a123aa8f9..17e15275f9 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -14,325 +14,5 @@ source "package/mtd/Config.in"
 source "package/nvram/Config.in"
 endmenu
 
-menu "Applications"
-source "package/autossh/Config.in"
-source "package/bitchx/Config.in"
-source "package/collectd/Config.in"
-source "package/cbtt/Config.in"
-source "package/ctorrent/Config.in"
-source "package/deco/Config.in"
-source "package/elinks/Config.in"
-source "package/fetchmail/Config.in"
-source "package/gpsd/Config.in"
-source "package/gpg/Config.in"
-source "package/haserl/Config.in"
-source "package/irssi/Config.in"
-source "package/jamvm/Config.in"
-source "package/lcd4linux/Config.in"
-source "package/less/Config.in"
-source "package/lua/Config.in"
-source "package/microperl/Config.in"
-source "package/monit/Config.in"
-source "package/motion/Config.in"
-source "package/mgetty/Config.in"
-source "package/mutt/Config.in"
-source "package/nano/Config.in"
-source "package/osiris/Config.in"
-source "package/php4/Config.in"
-source "package/php5/Config.in"
-source "package/procmail/Config.in"
-source "package/psybnc/Config.in"
-menu "sablevm........................... A Java Virtual Machine (JVM) implementation"
-source "package/sablevm/Config.in"
-source "package/sablevm-classpath/Config.in"
-source "package/libffi-sable/Config.in"
-endmenu
-source "package/sane-backends/Config.in"
-source "package/screen/Config.in"
-source "package/ser2net/Config.in"
-source "package/syslog-ng/Config.in"
-menu "rrdtool........................... Round-Robin Database (RRD) libraries and tools"
-source "package/rrdtool/Config.in"
-source "package/rrdtool1/Config.in"
-source "package/rrdcollect/Config.in"
-endmenu
-source "package/vim/Config.in"
-endmenu
-
-menu "Networking"
-source "package/aircrack/Config.in"
-source "package/amwall/Config.in"
-source "package/arpd/Config.in"
-source "package/arptables/Config.in"
-source "package/arpwatch/Config.in"
-source "package/asterisk/Config.in"
-source "package/atftp/Config.in"
-source "package/avahi/Config.in"
-source "package/bind/Config.in"
-source "package/bitlbee/Config.in"
-source "package/bwm/Config.in"
-source "package/chillispot/Config.in"
-source "package/cifsmount/Config.in"
-source "package/click/Config.in"
-source "package/cups/Config.in"
-source "package/cutter/Config.in"
-source "package/dhcp/Config.in"
-source "package/dhcp-forwarder/Config.in"
-source "package/dropbear/Config.in"
-source "package/dsniff/Config.in"
-source "package/ebtables/Config.in"
-source "package/elhttp/Config.in"
-source "package/ether-wake/Config.in"
-source "package/ethtool/Config.in"
-source "package/ez-ipupdate/Config.in"
-source "package/fakeidentd/Config.in"
-source "package/fping/Config.in"
-source "package/fprobe/Config.in"
-source "package/fprobe-ulog/Config.in"
-source "package/freeradius/Config.in"
-source "package/frickin/Config.in"
-source "package/howl/Config.in"
-source "package/hostap-utils/Config.in"
-source "package/hostapd/Config.in"
-source "package/htpdate/Config.in"
-source "package/httping/Config.in"
-source "package/iftop/Config.in"
-source "package/igmpproxy/Config.in"
-source "package/ipcad/Config.in"
-source "package/iproute2/Config.in"
-source "package/iperf/Config.in"
-source "package/ipsec-tools/Config.in"
-source "package/ipset/Config.in"
-source "package/iptables-snmp/Config.in"
-source "package/iptraf/Config.in"
-source "package/kismet/Config.in"
-source "package/knock/Config.in"
-source "package/l2tpd/Config.in"
-source "package/l2tpns/Config.in"
-source "package/lighttpd/Config.in"
-source "package/linux-atm/Config.in"
-source "package/macchanger/Config.in"
-source "package/maradns/Config.in"
-source "package/miau/Config.in"
-source "package/mini_httpd/Config.in"
-source "package/mini_sendmail/Config.in"
-source "package/mtr/Config.in"
-source "package/net-snmp/Config.in"
-source "package/netperf/Config.in"
-source "package/netstat-nat/Config.in"
-source "package/nfs-server/Config.in"
-source "package/nmap/Config.in"
-source "package/nocatsplash/Config.in"
-source "package/ntpclient/Config.in"
-source "package/olsrd/Config.in"
-source "package/openntpd/Config.in"
-source "package/openser/Config.in"
-source "package/openssh/Config.in"
-source "package/openswan/Config.in"
-source "package/openvpn/Config.in"
-source "package/p910nd/Config.in"
-source "package/parprouted/Config.in"
-source "package/pipacs/Config.in"
-source "package/pmacct/Config.in"
-source "package/portmap/Config.in"
-source "package/portsentry/Config.in"
-source "package/ppp/Config.in"
-source "package/pptp/Config.in"
-source "package/pptpd/Config.in"
-source "package/privoxy/Config.in"
-source "package/ptunnel/Config.in"
-source "package/quagga/Config.in"
-source "package/raddump/Config.in"
-source "package/rarpd/Config.in"
-source "package/reaim/Config.in"
-source "package/robocfg/Config.in"
-source "package/rp-pppoe/Config.in"
-source "package/rrs/Config.in"
-source "package/rsync/Config.in"
-source "package/samba/Config.in"
-source "package/scanlogd/Config.in"
-source "package/scdp/Config.in"
-source "package/shat/Config.in"
-source "package/sipp/Config.in"
-source "package/siproxd/Config.in"
-source "package/sipsak/Config.in"
-source "package/slurm/Config.in"
-source "package/snort/Config.in"
-source "package/snort-wireless/Config.in"
-source "package/socat/Config.in"
-source "package/ssltunnel/Config.in"
-source "package/ssmtp/Config.in"
-source "package/srelay/Config.in"
-source "package/tmsnc/Config.in"
-source "package/tcpdump/Config.in"
-source "package/tinc/Config.in"
-source "package/tinyproxy/Config.in"
-source "package/tor/Config.in"
-source "package/ttcp/Config.in"
-source "package/udp-broadcast-relay/Config.in"
-source "package/ulogd/Config.in"
-source "package/updatedd/Config.in"
-source "package/vgp/Config.in"
-source "package/vncrepeater/Config.in"
-source "package/vnc-reflector/Config.in"
-source "package/vnstat/Config.in"
-source "package/vpnc/Config.in"
-source "package/vrrpd/Config.in"
-source "package/vsftpd/Config.in"
-source "package/vtun/Config.in"
-source "package/wccpd/Config.in"
-source "package/weechat/Config.in"
-source "package/wificonf/Config.in"
-source "package/wifidog/Config.in"
-source "package/wireless-tools/Config.in"
-source "package/wiviz/Config.in"
-source "package/wknock/Config.in"
-source "package/wol/Config.in"
-source "package/wondershaper/Config.in"
-source "package/wpa_supplicant/Config.in"
-source "package/wput/Config.in"
-source "package/wrt-radauth/Config.in"
-source "package/wx200d/Config.in"
-source "package/xinetd/Config.in"
-source "package/xsupplicant/Config.in"
-endmenu
-
-menu "IPv6"
-source "package/6tunnel/Config.in"
-source "package/aiccu/Config.in"
-source "package/dhcp6/Config.in"
-source "package/miredo/Config.in"
-source "package/mrd6/Config.in"
-source "package/ndisc/Config.in"
-source "package/radvd/Config.in"
-endmenu
-
-menu "Libraries"
-source "package/cgilib/Config.in"
-source "package/glib/Config.in"
-source "package/id3lib/Config.in"
-source "package/libamsel/Config.in"
-source "package/libao/Config.in"
-source "package/libart/Config.in"
-source "package/libcli/Config.in"
-source "package/clinkc/Config.in"
-source "package/curl/Config.in" # libcurl
-source "package/libdaemon/Config.in"
-source "package/libdb/Config.in"
-source "package/libdnet/Config.in"
-source "package/libelf/Config.in"
-source "package/libevent/Config.in"
-source "package/expat/Config.in" # libexpat
-source "package/flac/Config.in"  # libflac
-source "package/freetype/Config.in"  # libfreetype
-source "package/base-files/Config.in" # libgcc
-source "package/libgcrypt/Config.in"
-source "package/libgd/Config.in"
-source "package/libgdbm/Config.in"
-source "package/gmp/Config.in"  # libgmp
-source "package/gnutls/Config.in" ## libgnutls
-source "package/libgpg-error/Config.in"
-source "package/gsm/Config.in" # libgsm
-source "package/libiconv/Config.in"
-source "package/libid3tag/Config.in"
-source "package/jpeg/Config.in"  # libjpeg
-source "package/libtool/Config.in"  # libltdl
-source "package/liblzo/Config.in"
-source "package/libmad/Config.in"
-source "package/matrixssl/Config.in"  # libmatrixssl
-source "package/mysql/Config.in"  # limysqlclient
-source "package/ncurses/Config.in"  # libncurses
-source "package/libnet/Config.in"
-source "package/libnids/Config.in"
-source "package/libogg/Config.in"
-source "package/libol/Config.in"
-source "package/opencdk/Config.in"  # libopencdk
-source "package/openh323/Config.in" 
-source "package/openldap/Config.in"  # libopenldap
-source "package/openssl/Config.in"  # libopenssl
-source "package/libosip2/Config.in"
-source "package/libpcap/Config.in"
-source "package/pcre/Config.in"  # libpcre
-source "package/pwlib/Config.in" 
-source "package/libpng/Config.in"
-source "package/popt/Config.in"  # libpopt
-source "package/postgresql/Config.in"  # libpq
-source "package/libpthread/Config.in"
-source "package/radiusclient-ng/Config.in" #libradiusclient-ng
-source "package/readline/Config.in"  # libreadline
-source "package/cyrus-sasl/Config.in"  # libsasl2
-source "package/speex/Config.in" # libspeex
-source "package/sqlite/Config.in" # libsqlite
-source "package/sqlite2/Config.in" # libsqlite2
-source "package/libtasn1/Config.in"
-source "package/libupnp/Config.in"
-source "package/libusb/Config.in"
-source "package/libvorbis/Config.in"
-source "package/libvorbisidec/Config.in"
-source "package/libxml2/Config.in"
-source "package/libxslt/Config.in"
-source "package/uclibc++/Config.in"
-source "package/ustl/Config.in"
-source "package/zlib/Config.in"
-endmenu
-
-menu "Multimedia"
-source "package/gmediaserver/Config.in"
-source "package/icecast/Config.in"
-source "package/madplay/Config.in"
-source "package/mpd/Config.in"
-source "package/mt-daapd/Config.in"
-source "package/palantir/Config.in"
-source "package/peercast/Config.in"
-source "package/setpwc/Config.in"
-endmenu
-
-menu "Serial communications & terminal emulation"
-source "package/heyu/Config.in"
-source "package/lrzsz/Config.in"
-source "package/microcom/Config.in"
-source "package/picocom/Config.in"
-source "package/serdisplib/Config.in"
-source "package/setserial/Config.in"
-endmenu
-
-menu "Utilities"
-source "package/bc/Config.in"
-source "package/gdbserver/Config.in"
-source "package/hdparm/Config.in"
-source "package/pcmcia-cs/Config.in"  # pcmcia-utils
-source "package/usbutils/Config.in"  # lsusb
-source "package/pciutils/Config.in"
-source "package/strace/Config.in"
-source "package/udev/Config.in"
-source "package/watchdog/Config.in"
-endmenu
-
-menu "FileSystems related"
-source "package/dosfstools/Config.in"
-source "package/e2fsprogs/Config.in"
-source "package/fuse/Config.in"
-source "package/shfs/Config.in"
-source "package/util-linux/Config.in"
-endmenu
-
-menu "Bluetooth"
-source "package/bluez-libs/Config.in"
-source "package/bluez-utils/Config.in"
-source "package/miax/Config.in"
-endmenu
-
-comment "Extra stuff"
-source "package/sdk/Config.in"
-
-config BR2_PACKAGE_IMAGEBUILDER
-	bool "OpenWrt Image Builder"
-	default y if CONFIG_DEVEL
-	help
-	  Build an OpenWrt Image Builder.
-	  This package contains the necessary (precompiled) tools and all packages to generate
-	  firmware images from package lists, without having to use the full buildroot.
-	  Useful for building images with custom scripts or extra packages.
-
 endmenu
 
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 4d0f0046f5..d213200156 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -1,295 +1,5 @@
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
-include $(TOPDIR)/package/depend.mk
-
-package-$(BR2_PACKAGE_6TUNNEL) += 6tunnel
-package-$(BR2_PACKAGE_AICCU) += aiccu
-package-$(BR2_PACKAGE_AIRCRACK) += aircrack
-package-$(BR2_PACKAGE_AMWALL) += amwall
-package-$(BR2_PACKAGE_ARPD) += arpd
-package-$(BR2_PACKAGE_ARPTABLES) += arptables
-package-$(BR2_PACKAGE_ARPWATCH) += arpwatch
-package-$(BR2_PACKAGE_ASTERISK) += asterisk
-package-$(BR2_COMPILE_ATFTP) += atftp
-package-$(BR2_PACKAGE_AUTOSSH) += autossh
-package-$(BR2_COMPILE_AVAHI) += avahi
-package-$(BR2_COMPILE_BC) += bc
-package-$(BR2_COMPILE_BIND) += bind
-package-$(BR2_PACKAGE_BITCHX) += bitchx
-package-$(BR2_PACKAGE_BITLBEE) += bitlbee
-package-$(BR2_PACKAGE_BLUEZ_LIBS) += bluez-libs
-package-$(BR2_PACKAGE_BLUEZ_UTILS) += bluez-utils
-package-$(BR2_PACKAGE_BRIDGE) += bridge
-package-$(BR2_PACKAGE_BUSYBOX) += busybox
-package-$(BR2_PACKAGE_BWM) += bwm
-package-$(BR2_PACKAGE_CBTT) += cbtt
-package-$(BR2_PACKAGE_CGILIB) += cgilib
-package-$(BR2_PACKAGE_CHILLISPOT) += chillispot
-package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount
-package-$(BR2_PACKAGE_CLICK) += click
-package-$(BR2_PACKAGE_CLINKC) += clinkc
-package-$(BR2_PACKAGE_COLLECTD) += collectd
-package-$(BR2_PACKAGE_CTORRENT) += ctorrent
-package-$(BR2_PACKAGE_CUPS) += cups
-package-$(BR2_COMPILE_CURL) += curl
-package-$(BR2_PACKAGE_CUTTER) += cutter
-package-$(BR2_COMPILE_CYRUS_SASL) += cyrus-sasl
-package-$(BR2_COMPILE_DB) += libdb
-package-$(BR2_PACKAGE_DECO) += deco
-package-$(BR2_COMPILE_DHCP) += dhcp
-package-$(BR2_PACKAGE_DHCP6) += dhcp6
-package-$(BR2_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
-package-$(BR2_PACKAGE_DNSMASQ) += dnsmasq
-package-$(BR2_PACKAGE_DOSFSTOOLS) += dosfstools
-package-$(BR2_PACKAGE_DROPBEAR) += dropbear
-package-$(BR2_PACKAGE_DSNIFF) += dsniff
-package-$(BR2_PACKAGE_E2FSPROGS) += e2fsprogs
-package-$(BR2_PACKAGE_EBTABLES) += ebtables
-package-$(BR2_PACKAGE_ELINKS) += elinks
-package-$(BR2_PACKAGE_ETHER_WAKE) += ether-wake
-package-$(BR2_COMPILE_EXPAT) += expat
-package-$(BR2_PACKAGE_EZIPUPDATE) += ez-ipupdate
-package-$(BR2_PACKAGE_FAKEIDENTD) += fakeidentd
-package-$(BR2_PACKAGE_FETCHMAIL) += fetchmail
-package-$(BR2_COMPILE_FLAC) += flac
-package-$(BR2_PACKAGE_FPING) += fping
-package-$(BR2_PACKAGE_FPROBE) += fprobe
-package-$(BR2_PACKAGE_FPROBE_ULOG) += fprobe-ulog
-package-$(BR2_PACKAGE_FREERADIUS) += freeradius
-package-$(BR2_COMPILE_FREETYPE) += freetype
-package-$(BR2_PACKAGE_FRICKIN) += frickin
-package-$(BR2_COMPILE_FUSE) += fuse
-package-$(BR2_PACKAGE_GDBSERVER) += gdbserver
-package-$(BR2_COMPILE_GLIB) += glib
-package-$(BR2_PACKAGE_GMEDIASERVER) += gmediaserver
-package-$(BR2_COMPILE_GMP) += gmp
-package-$(BR2_COMPILE_GNUTLS) += gnutls
-package-$(BR2_PACKAGE_GPSD) += gpsd
-package-$(BR2_PACKAGE_GPG) += gpg
-package-$(BR2_COMPILE_GSM) += gsm
-package-$(BR2_PACKAGE_HASERL) += haserl
-package-$(BR2_PACKAGE_HDPARM) += hdparm
-package-$(BR2_PACKAGE_HEYU) += heyu
-package-$(BR2_PACKAGE_HOSTAP_UTILS) += hostap-utils
-package-$(BR2_COMPILE_HOSTAPD) += hostapd
-package-$(BR2_COMPILE_HOWL) += howl
-package-$(BR2_PACKAGE_HTPDATE) += htpdate
-package-$(BR2_PACKAGE_HTTPING) += httping
-package-$(BR2_PACKAGE_ICECAST) += icecast
-package-$(BR2_PACKAGE_ID3LIB) += id3lib
-package-$(BR2_PACKAGE_IFTOP) += iftop
-package-$(BR2_PACKAGE_IGMPPROXY) += igmpproxy
-package-$(BR2_PACKAGE_IPCAD) += ipcad
-package-$(BR2_PACKAGE_IPERF) += iperf
-package-$(BR2_PACKAGE_IPKG) += ipkg
-package-$(BR2_COMPILE_IPROUTE2) += iproute2
-package-$(BR2_PACKAGE_IPSEC_TOOLS) += ipsec-tools
-package-$(BR2_PACKAGE_IPSET) += ipset
-package-$(BR2_COMPILE_IPTABLES) += iptables
-package-$(BR2_PACKAGE_IPTABLES_SNMP) += iptables-snmp
-package-$(BR2_PACKAGE_IPTRAF) += iptraf
-package-$(BR2_PACKAGE_IRSSI) += irssi
-package-$(BR2_PACKAGE_JAMVM) += jamvm
-package-$(BR2_COMPILE_JPEG) += jpeg
-package-$(BR2_COMPILE_KISMET) += kismet
-package-$(BR2_COMPILE_KNOCK) += knock
-package-$(BR2_PACKAGE_L2TPD) += l2tpd
-package-$(BR2_PACKAGE_L2TPNS) += l2tpns
-package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux
-package-$(BR2_PACKAGE_LESS) += less
-package-$(BR2_PACKAGE_LIBAMSEL) += libamsel
-package-$(BR2_PACKAGE_LIBAO) += libao
-package-$(BR2_PACKAGE_LIBART) += libart
-package-$(BR2_PACKAGE_LIBCLI) += libcli
-package-$(BR2_PACKAGE_LIBDAEMON) += libdaemon
-package-$(BR2_PACKAGE_LIBDNET) += libdnet
-package-$(BR2_PACKAGE_LIBELF) += libelf
-package-$(BR2_PACKAGE_LIBEVENT) += libevent
-package-$(BR2_PACKAGE_LIBFFI_SABLE) += libffi-sable
-package-$(BR2_PACKAGE_LIBGCRYPT) += libgcrypt
-package-$(BR2_PACKAGE_LIBGD) += libgd
-package-$(BR2_PACKAGE_LIBGDBM) += libgdbm
-package-$(BR2_PACKAGE_LIBGPG_ERROR) += libgpg-error
-package-$(BR2_PACKAGE_LIBICONV) += libiconv
-package-$(BR2_PACKAGE_LIBID3TAG) += libid3tag
-package-$(BR2_PACKAGE_LIBLZO) += liblzo
-package-$(BR2_PACKAGE_LIBMAD) += libmad
-package-$(BR2_PACKAGE_LIBNET) += libnet
-package-$(BR2_PACKAGE_LIBNIDS) += libnids
-package-$(BR2_PACKAGE_LIBOGG) += libogg
-package-$(BR2_PACAKGE_LIBOL) += libol
-package-$(BR2_PACKAGE_LIBOSIP2) += libosip2
-package-$(BR2_PACKAGE_LIBPCAP) += libpcap
-package-$(BR2_PACKAGE_LIBPNG) += libpng
-package-$(BR2_PACKAGE_LIBPTHREAD) += libpthread
-package-$(BR2_PACKAGE_LIBTASN1) += libtasn1
-package-$(BR2_COMPILE_LIBTOOL) += libtool
-package-$(BR2_PACKAGE_LIBUPNP) += libupnp
-package-$(BR2_PACKAGE_LIBUSB) += libusb
-package-$(BR2_PACKAGE_LIBVORBIS) += libvorbis
-package-$(BR2_PACKAGE_LIBVORBISIDEC) += libvorbisidec
-package-$(BR2_PACKAGE_LIBWRAP) += tcp_wrappers
-package-$(BR2_PACKAGE_LIBXML2) += libxml2
-package-$(BR2_PACKAGE_LIBXSLT) += libxslt
-package-$(BR2_PACKAGE_LIGHTTPD) += lighttpd
-package-$(BR2_PACKAGE_LINUX_ATM) += linux-atm
-package-$(BR2_PACKAGE_LOGROTATE) += logrotate
-package-$(BR2_PACKAGE_LRZSZ) += lrzsz
-package-$(BR2_COMPILE_LUA) += lua
-package-$(BR2_PACKAGE_MACCHANGER) += macchanger
-package-$(BR2_PACKAGE_MADPLAY) += madplay
-package-$(BR2_PACKAGE_MARADNS) += maradns
-package-$(BR2_COMPILE_MATRIXSSL) += matrixssl
-package-$(BR2_PACKAGE_MGETTY) += mgetty
-package-$(BR2_PACKAGE_MIAU) += miau
-package-$(BR2_PACKAGE_MIAX) += miax
-package-$(BR2_PACKAGE_MICROCOM) += microcom
-package-$(BR2_PACKAGE_MICROPERL) += microperl
-package-$(BR2_COMPILE_MINI_HTTPD) += mini_httpd
-package-$(BR2_PACKAGE_MINI_SENDMAIL) += mini_sendmail
-package-$(BR2_COMPILE_MIREDO) += miredo
-package-$(BR2_COMPILE_MONIT) += monit
-package-$(BR2_PACKAGE_MOTION) += motion
-package-$(BR2_PACKAGE_MPD) += mpd
-package-$(BR2_PACKAGE_MRD6) += mrd6
-package-$(BR2_PACKAGE_MT_DAAPD) += mt-daapd
-package-$(BR2_PACKAGE_MTD) += mtd
-package-$(BR2_PACKAGE_MTR) += mtr
-package-$(BR2_PACKAGE_MUTT) += mutt
-package-$(BR2_COMPILE_MYSQL) += mysql
-package-$(BR2_PACKAGE_NANO) += nano
-package-$(BR2_COMPILE_NCURSES) += ncurses
-package-$(BR2_COMPILE_NDISC6) += ndisc
-package-$(BR2_COMPILE_NET_SNMP) += net-snmp
-package-$(BR2_PACKAGE_NETPERF) += netperf
-package-$(BR2_PACKAGE_NETSTAT_NAT) += netstat-nat
-package-$(BR2_PACKAGE_NFS_SERVER) += nfs-server
-package-$(BR2_PACKAGE_NMAP) += nmap
-package-$(BR2_PACKAGE_NOCATSPLASH) += nocatsplash
-package-$(BR2_PACKAGE_NTPCLIENT) += ntpclient
-package-$(BR2_PACKAGE_NVRAM) += nvram
-package-$(BR2_PACKAGE_OLSRD) += olsrd
-package-$(BR2_COMPILE_OPENCDK) += opencdk
-package-$(BR2_PACKAGE_OPENH323) += openh323
-package-$(BR2_COMPILE_OPENLDAP) += openldap
-package-$(BR2_PACKAGE_OPENNTPD) += openntpd
-package-$(BR2_PACKAGE_OPENSER) += openser
-package-$(BR2_COMPILE_OPENSSH) += openssh
-package-$(BR2_COMPILE_OPENSSL) += openssl
-package-$(BR2_PACKAGE_OPENSWAN) += openswan
-package-$(BR2_PACKAGE_OPENVPN) += openvpn
-package-$(BR2_COMPILE_OSIRIS) += osiris
-package-$(BR2_PACKAGE_PALANTIR) += palantir
-package-$(BR2_PACKAGE_P910ND) += p910nd
-package-$(BR2_PACKAGE_PARPROUTED) += parprouted
-package-$(BR2_PACKAGE_PCIUTILS) += pciutils
-package-$(BR2_COMPILE_PCMCIA_CS) += pcmcia-cs
-package-$(BR2_COMPILE_PCRE) += pcre
-package-$(BR2_PACKAGE_PEERCAST) += peercast
-package-$(BR2_PACKAGE_PEERGUARDIAN) += peerguardian
-package-$(BR2_COMPILE_PHP4) += php4
-package-$(BR2_COMPILE_PHP5) += php5
-package-$(BR2_PACKAGE_PICOCOM) += picocom
-package-$(BR2_PACKAGE_PIPACS) += pipacs
-package-$(BR2_COMPILE_PMACCT) += pmacct
-package-$(BR2_COMPILE_POPT) += popt
-package-$(BR2_PACKAGE_PORTMAP) += portmap
-package-$(BR2_PACKAGE_PORTSENTRY) += portsentry
-package-$(BR2_COMPILE_POSTGRESQL) += postgresql
-package-$(BR2_PACKAGE_PPP) += ppp
-package-$(BR2_PACKAGE_PPTP) += pptp
-package-$(BR2_PACKAGE_PPTPD) += pptpd
-package-$(BR2_PACKAGE_PRIVOXY) += privoxy
-package-$(BR2_PACKAGE_PROCMAIL) += procmail
-package-$(BR2_PACKAGE_PSYBNC) += psybnc
-package-$(BR2_PACKAGE_PTUNNEL) += ptunnel
-package-$(BR2_PACKAGE_PWLIB) += pwlib
-package-$(BR2_PACKAGE_QUAGGA) += quagga
-package-$(BR2_COMPILE_RADIUSCLIENT_NG) += radiusclient-ng
-package-$(BR2_PACKAGE_RADVD) += radvd
-package-$(BR2_PACKAGE_RARPD) += rarpd
-package-$(BR2_COMPILE_READLINE) += readline
-package-$(BR2_PACKAGE_REAIM) += reaim
-package-$(BR2_PACKAGE_ROBOCFG) += robocfg
-package-$(BR2_COMPILE_RP_PPPOE) += rp-pppoe
-package-$(BR2_PACKAGE_RRDCOLLECT) += rrdcollect
-package-$(BR2_COMPILE_RRDTOOL) += rrdtool
-package-$(BR2_COMPILE_RRDTOOL1) += rrdtool1
-package-$(BR2_COMPILE_RRS) += rrs
-package-$(BR2_PACKAGE_RSYNC) += rsync
-package-$(BR2_PACKAGE_SABLEVM) += sablevm
-package-$(BR2_COMPILE_SABLEVM_CLASSPATH) += sablevm-classpath
-package-$(BR2_COMPILE_SAMBA) += samba
-package-$(BR2_PACKAGE_SANE_BACKENDS) += sane-backends
-package-$(BR2_PACKAGE_SCANLOGD) += scanlogd
-package-$(BR2_PACKAGE_SCDP) += scdp
-package-$(BR2_PACKAGE_SCREEN) += screen
-package-$(BR2_PACKAGE_SDK) += sdk
-package-$(BR2_PACKAGE_SER2NET) += ser2net
-package-$(BR2_PACKAGE_SERDISPLIB) += serdisplib
-package-$(BR2_PACKAGE_SETPWC) += setpwc
-package-$(BR2_PACKAGE_SETSERIAL) += setserial
-package-$(BR2_PACKAGE_SHAT) += shat
-package-$(BR2_COMPILE_SHFS) += shfs
-package-$(BR2_PACKAGE_SIPP) += sipp
-package-$(BR2_PACKAGE_SIPROXD) += siproxd
-package-$(BR2_PACKAGE_SIPSAK) += sipsak
-package-$(BR2_PACKAGE_SLURM) += slurm
-package-$(BR2_COMPILE_SNORT) += snort
-package-$(BR2_COMPILE_SNORT_WIRELESS) += snort-wireless
-package-$(BR2_PACKAGE_SOCAT) += socat
-package-$(BR2_COMPILE_SPEEX) += speex
-package-$(BR2_COMPILE_SQLITE) += sqlite
-package-$(BR2_COMPILE_SQLITE2) += sqlite2
-package-$(BR2_PACKAGE_SSMTP) += ssmtp
-package-$(BR2_PACKAGE_SSLTUNNEL) += ssltunnel
-package-$(BR2_PACKAGE_SRELAY) += srelay
-package-$(BR2_PACKAGE_STRACE) += strace
-package-$(BR2_PACKAGE_SYSLOG_NG) += syslog-ng
-package-$(BR2_PACKAGE_TCPDUMP) += tcpdump
-package-$(BR2_PACKAGE_TINC) += tinc
-package-$(BR2_PACKAGE_TINYPROXY) += tinyproxy
-package-$(BR2_PACKAGE_TOR) += tor
-package-$(BR2_PACKAGE_TTCP) += ttcp
-package-$(BR2_PACKAGE_UCLIBCXX) += uclibc++
-package-$(BR2_PACKAGE_UDP_BROADCAST_RELAY) += udp-broadcast-relay
-package-$(BR2_PACKAGE_ULOGD) += ulogd
-package-$(BR2_PACKAGE_UPDATEDD) += updatedd
-package-$(BR2_COMPILE_USBUTILS) += usbutils
-package-$(BR2_PACKAGE_USTL) += ustl
-package-$(BR2_COMPILE_UTIL_LINUX) += util-linux
-package-$(BR2_PACKAGE_UDEV) += udev
-package-$(BR2_PACKAGE_VIM) += vim
-package-$(BR2_PACKAGE_VGP) += vgp
-package-$(BR2_PACKAGE_VNCREPEATER) += vncrepeater
-package-$(BR2_PACKAGE_VNC_REFLECTOR) += vnc-reflector
-package-$(BR2_PACKAGE_VNSTAT) += vnstat
-package-$(BR2_PACKAGE_VPNC) += vpnc
-package-$(BR2_PACKAGE_VRRPD) += vrrpd
-package-$(BR2_PACKAGE_VTUN) += vtun
-package-$(BR2_PACKAGE_VSFTPD) += vsftpd
-package-$(BR2_PACKAGE_WATCHDOG) += watchdog
-package-$(BR2_PACKAGE_WCCPD) += wccpd
-package-$(BR2_PACKAGE_WEECHAT) += weechat
-package-$(BR2_PACKAGE_WIFICONF) += wificonf
-package-$(BR2_PACKAGE_WIFIDOG) += wifidog
-package-$(BR2_PACKAGE_WIVIZ) += wiviz
-package-$(BR2_PACKAGE_WIRELESS_TOOLS) += wireless-tools
-package-$(BR2_PACKAGE_WKNOCK) += wknock
-package-$(BR2_PACKAGE_WOL) += wol
-package-$(BR2_PACKAGE_WONDERSHAPER) += wondershaper
-package-$(BR2_PACKAGE_WPA_SUPPLICANT) += wpa_supplicant
-package-$(BR2_PACKAGE_WPUT) += wput
-package-$(BR2_PACKAGE_WRT_RADAUTH) += wrt-radauth
-package-$(BR2_PACKAGE_WX200D) += wx200d
-package-$(BR2_PACKAGE_XINETD) += xinetd
-package-$(BR2_PACKAGE_XSUPPLICANT) += xsupplicant
-package-$(BR2_PACKAGE_ZLIB) += zlib
-
-DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl liblzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm libamsel libao libart libdaemon libdb libdnet libevent libffi-sable libgcrypt libgdbm libgpg-error libid3tag libmad libnet libnids libogg libol libosip2 libpcap radiusclient-ng libtasn1 libupnp libusb libvorbis libvorbisidec libxml2 libxslt id3lib net-snmp
-DEV_LIBS_COMPILE:=$(patsubst %,%-compile,$(DEV_LIBS))
-SDK_DEFAULT_PACKAGES:=busybox dnsmasq iptables wireless-tools dropbear bridge ipkg ppp
-SDK_DEFAULT_COMPILE:=$(patsubst %,%-compile,$(SDK_DEFAULT_PACKAGES))
 COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
 INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 
@@ -301,8 +11,6 @@ install: base-files-install $(INSTALL_PACKAGES)
 $(COMPILE_PACKAGES): base-files-compile
 $(INSTALL_PACKAGES): base-files-install
 
-sdk-compile: $(DEV_LIBS_COMPILE) $(SDK_DEFAULT_COMPILE)
-
 $(STAMP_DIR):
 	mkdir -p $@
 
diff --git a/openwrt/package/busybox/Makefile b/openwrt/package/busybox/Makefile
index 35f954b931..3ada74532e 100644
--- a/openwrt/package/busybox/Makefile
+++ b/openwrt/package/busybox/Makefile
@@ -5,25 +5,23 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=busybox
 PKG_RELEASE:=1
 
-ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y)
-# Be aware that this changes daily....
-PKG_VERSION:=0.${shell date +"%G%m%d"}
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_SOURCE:=$(PKG_NAME)-snapshot.tar.bz2
-PKG_SOURCE_URL:=http://www.busybox.net/downloads/snapshots
-PKG_MD5SUM:=x
-else
 PKG_VERSION:=1.1.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads
 PKG_MD5SUM:=0b5d78072302fe687407956537bdb9e3
-endif
 PKG_CAT:=bzcat
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,BUSYBOX,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/busybox
+CONFIGFILE:=config/Config.in
+SECTION:=base
+CATEGORY:=Base system
+TITLE:=Core utilities
+DESCRIPTION:=Core utilities for embedded Linux systems
+endef
+$(eval $(call BuildPackage,BUSYBOX,busybox))
 
 $(PKG_BUILD_DIR)/.configured:
 	$(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
diff --git a/openwrt/package/busybox/ipkg/busybox.control b/openwrt/package/busybox/ipkg/busybox.control
deleted file mode 100644
index e7fc84a290..0000000000
--- a/openwrt/package/busybox/ipkg/busybox.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: busybox
-Priority: optional
-Section: net
-Description: Core utilities for embedded Linux systems
diff --git a/openwrt/package/depend.mk b/openwrt/package/depend.mk
deleted file mode 100644
index cbf75d4471..0000000000
--- a/openwrt/package/depend.mk
+++ /dev/null
@@ -1,277 +0,0 @@
-amwall-compile: libamsel-compile
-arpd-compile: libpcap-compile libdnet-compile libevent-compile
-arpwatch-compile: libpcap-compile
-atftp-compile: readline-compile ncurses-compile
-avahi-compile: libdaemon-compile expat-compile libgdbm-compile
-bind-compile: openssl-compile
-bitchx-compile: ncurses-compile
-bitlbee-compile: libiconv-compile openssl-compile glib-compile
-cbtt-compile: mysql-compile zlib-compile
-clinkc-compile: expat-compile
-curl-compile: openssl-compile zlib-compile
-cyrus-sasl-compile: openssl-compile
-deco-compile: ncurses-compile
-dhcp6-compile: ncurses-compile
-dsniff-compile: libnids-compile openssl-compile libgdbm-compile
-freetype-compile: zlib-compile
-fprobe-compile: libpcap-compile
-gdbserver-compile: ncurses-compile
-gmediaserver-compile: id3lib-compile libupnp-compile
-gnutls-compile: libgcrypt-compile opencdk-compile libtasn1-compile
-gpsd-compile: uclibc++-compile
-icecast-compile: curl-compile libvorbisidec-compile libxml2-compile libxslt-compile
-id3lib-compile: uclibc++-compile zlib-compile
-iftop-compile: libpcap-compile libpthread-compile ncurses-compile
-ipcad-compile: libpcap-compile
-irssi-compile: glib-compile ncurses-compile
-iperf-compile: uclibc++-compile
-iptables-snmp-compile: net-snmp-compile
-iptraf-compile: ncurses-compile
-ipsec-tools-compile: openssl-compile
-jamvm-compile: libffi-sable-compile zlib-compile sablevm-classpath-compile
-httping-compile: openssl-compile
-kismet-compile: uclibc++-compile libpcap-compile ncurses-compile
-l2tpns-compile: libcli-compile
-less-compile: ncurses-compile
-lcd4linux-compile: ncurses-compile
-libgcrypt-compile: libgpg-error-compile
-libgd-compile: libpng-compile jpeg-compile
-libid3tag-compile: zlib-compile
-libnet-compile: libpcap-compile
-libnids-compile: libnet-compile
-libvorbis-compile: libogg-compile
-libxml2-compile: zlib-compile
-libxslt-compile: libxml2-compile
-lighttpd-compile: openssl-compile pcre-compile
-logrotate-compile: popt-compile
-madplay-compile: libid3tag-compile libmad-compile
-miax-compile: bluez-libs-compile
-miredo-compile: uclibc++-compile
-monit-compile: openssl-compile
-mt-daapd-compile: howl-compile libgdbm-compile libid3tag-compile
-mtr-compile: ncurses-compile
-mutt-compile: ncurses-compile openssl-compile
-mysql-compile: ncurses-compile zlib-compile readline-compile
-nano-compile: ncurses-compile
-net-snmp-compile: libelf-compile
-nfs-server-compile: portmap-compile
-nmap-compile: uclibc++-compile pcre-compile libpcap-compile
-nocatsplash-compile: glib-compile
-opencdk-compile: libgcrypt-compile
-openh323-compile: pwlib-compile
-openldap-compile: cyrus-sasl-compile openssl-compile
-openssh-compile: zlib-compile openssl-compile
-openssl-compile: zlib-compile
-openswan-compile: gmp-compile
-osiris-compile: openssl-compile
-palantir-compile: jpeg-compile
-peercast-compile: uclibc++-compile
-peerguardian-compile: libpthread-compile
-portmap-compile: tcp_wrappers-compile
-postgresql-compile: zlib-compile
-ppp-compile: linux-atm-compile libpcap-compile
-privoxy-compile: pcre-compile
-ptunnel-compile: libpcap-compile
-pwlib-compile: libpthread-compile
-quagga-compile: readline-compile ncurses-compile
-raddump-compile: openssl-compile libpcap-compile
-radiusclient-ng-compile: openssl-compile
-rarpd-compile: libnet-compile
-ifneq ($(BR2_PACKAGE_LIBRRD),)
-rrdcollect-compile: rrdtool-compile
-endif
-ifneq ($(BR2_PACKAGE_LIBRRD1),)
-rrdcollect-compile: rrdtool1-compile
-endif
-rrdtool-compile: cgilib-compile freetype-compile libart-compile libpng-compile
-rrdtool1-compile: zlib-compile
-rsync-compile: popt-compile
-scanlogd-compile: libpcap-compile libnids-compile libnet-compile
-scdp-compile: libnet-compile
-screen-compile: ncurses-compile
-sipp-compile: ncurses-compile uclibc++-compile libpthread-compile
-siproxd-compile: libosip2-compile
-sipsak-compile: openssl-compile
-socat-compile: openssl-compile
-sqlite-compile: ncurses-compile readline-compile
-sqlite2-compile: ncurses-compile readline-compile
-ssltunnel-compile: openssl-compile ppp-compile
-syslog-ng-compile: libol-compile
-tcpdump-compile: libpcap-compile
-tinc-compile: zlib-compile openssl-compile liblzo-compile
-tor-compile: libevent-compile openssl-compile zlib-compile
-usbutils-compile: libusb-compile
-vim-compile: ncurses-compile
-vncrepeater-compile: uclibc++-compile
-vnc-reflector-compile: jpeg-compile zlib-compile
-vpnc-compile: libgcrypt-compile libgpg-error-compile
-vtun-compile: zlib-compile openssl-compile liblzo-compile
-weechat-compile: ncurses-compile gnutls-compile lua-compile
-wificonf-compile: wireless-tools-compile nvram-compile
-wiviz-compile: libpcap-compile
-wknock-compile: libpcap-compile
-wpa_supplicant-compile: openssl-compile
-wx200d-compile: postgresql-compile
-xsupplicant-compile: openssl-compile
-
-asterisk-compile: bluez-libs-compile ncurses-compile openssl-compile openh323-compile
-ifneq ($(BR2_PACKAGE_ASTERISK_CODEC_SPEEX),)
-asterisk-compile: speex-compile
-endif
-ifneq ($(BR2_PACKAGE_ASTERISK_PGSQL),)
-asterisk-compile: postgresql-compile
-endif
-ifneq ($(BR2_PACKAGE_ASTERISK_MYSQL),)
-asterisk-compile: mysql-compile
-endif
-ifneq ($(BR2_PACKAGE_ASTERISK_SQLITE),)
-asterisk-compile: sqlite2-compile
-endif
-
-freeradius-compile: libtool-compile openssl-compile
-ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_LDAP),)
-freeradius-compile: openldap-compile
-endif
-ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_SQL_MYSQL),)
-freeradius-compile: mysql-compile
-endif
-ifneq ($(BR2_PACKAGE_FREERADIUS_MOD_SQL_PGSQL),)
-freeradius-compile: postgresql-compile
-endif
-
-hostapd-compile: wireless-tools-compile
-ifneq ($(BR2_PACKAGE_HOSTAPD),)
-hostapd-compile: openssl-compile
-endif
-
-ifneq ($(BR2_PACKAGE_MINI_HTTPD_MATRIXSSL),)
-mini_httpd-compile: matrixssl-compile
-endif
-ifneq ($(BR2_PACKAGE_MINI_HTTPD_OPENSSL),)
-mini_httpd-compile: openssl-compile
-endif
-
-ifneq ($(BR2_PACKAGE_MOTION),)
-motion-compile: jpeg-compile
-endif
-
-ifneq ($(BR2_PACKAGE_MPD_MP3),)
-mpd-compile: libid3tag-compile libmad-compile
-endif
-ifneq ($(BR2_PACKAGE_MPD_OGG),)
-mpd-compile: libvorbisidec-compile
-endif
-ifneq ($(BR2_PACKAGE_MPD_FLAC),)
-mpd-compile: flac-compile
-endif
-
-ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
-openvpn-compile: openssl-compile
-endif
-ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
-openvpn-compile: liblzo-compile
-endif
-
-php4-compile: openssl-compile zlib-compile
-ifneq ($(BR2_PACKAGE_PHP4_MOD_CURL),)
-php4-compile: curl-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP4_MOD_GD),)
-php4-compile: libgd-compile libpng-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP4_MOD_GMP),)
-php4-compile: gmp-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP4_MOD_LDAP),)
-php4-compile: openldap-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP4_MOD_MYSQL),)
-php4-compile: mysql-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP4_MOD_PCRE),)
-php4-compile: pcre-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP4_MOD_PGSQL),)
-php4-compile: postgresql-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP4_MOD_SQLITE),)
-php4-compile: sqlite2-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP4_MOD_XML),)
-php4-compile: expat-compile
-endif
-
-php5-compile: openssl-compile zlib-compile
-ifneq ($(BR2_PACKAGE_PHP5_MOD_CURL),)
-php5-compile: curl-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP5_MOD_GD),)
-php5-compile: libgd-compile libpng-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP5_MOD_GMP),)
-php5-compile: gmp-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP5_MOD_LDAP),)
-php5-compile: openldap-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP5_MOD_MYSQL),)
-php5-compile: mysql-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP5_MOD_PCRE),)
-php5-compile: pcre-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP5_MOD_PGSQL),)
-php5-compile: postgresql-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP5_MOD_SQLITE),)
-php5-compile: sqlite2-compile
-endif
-ifneq ($(BR2_PACKAGE_PHP5_MOD_XML),)
-php5-compile: expat-compile
-endif
-
-pmacct-compile: libpcap-compile
-ifneq ($(BR2_COMPILE_PMACCT_MYSQL),)
-pmacct-compile: mysql-compile
-endif
-ifneq ($(BR2_COMPILE_PMACCT_PGSQL),)
-pmacct-compile: postgresql-compile
-endif
-ifneq ($(BR2_COMPILE_PMACCT_SQLITE),)
-pmacct-compile: sqlite-compile
-endif
-
-rrs-compile: uclibc++-compile
-ifneq ($(BR2_PACKAGE_RRS),)
-rrs-compile: openssl-compile
-endif
-
-snort-compile: libnet-compile libpcap-compile pcre-compile
-ifeq ($(BR2_PACKAGE_SNORT_WITH_MYSQL),y)
-snort-compile: mysql-compile
-endif
-ifeq ($(BR2_PACKAGE_SNORT_WITH_PGSQL),y)
-snort-compile: postgresql-compile
-endif
-ifeq ($(BR2_PACKAGE_SNORT_ENABLE_INLINE),y)
-snort-compile: iptables-compile
-endif
-
-snort-wireless-compile: libnet-compile libpcap-compile pcre-compile
-ifeq ($(BR2_PACKAGE_SNORT_WIRELESS_WITH_MYSQL),y)
-snort-wireless-compile: mysql-compile
-endif
-ifeq ($(BR2_PACKAGE_SNORT_WIRELESS_WITH_PGSQL),y)
-snort-wireless-compile: postgresql-compile
-endif
-ifeq ($(BR2_PACKAGE_SNORT_WIRELESS_ENABLE_INLINE),y)
-snort-wireless-compile: iptables-compile
-endif
-
-ulogd-compile: iptables-compile
-ifneq ($(BR2_PACKAGE_ULOGD_MOD_MYSQL),)
-ulogd-compile: mysql-compile
-endif
-ifneq ($(BR2_PACKAGE_ULOGD_MOD_PGSQL),)
-ulogd-compile: postgresql-compile
-endif
diff --git a/openwrt/package/gdbserver/Config.in b/openwrt/package/gdbserver/Config.in
deleted file mode 100644
index df74ff6143..0000000000
--- a/openwrt/package/gdbserver/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_GDBSERVER
-	prompt "gdbserver......................... Remote Server for the GNU Debugger"
-	tristate
-	default m if CONFIG_DEVEL
-	help
-	  GDBSERVER is a program that allows you to run GDB on a different machine
-	  than the one which is running the program being debugged.
-
diff --git a/openwrt/package/gdbserver/Makefile b/openwrt/package/gdbserver/Makefile
deleted file mode 100644
index 922e631230..0000000000
--- a/openwrt/package/gdbserver/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=gdbserver
-PKG_VERSION:=6.3
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-GDB_DIR:=$(TOOL_BUILD_DIR)/gdb-$(PKG_VERSION)
-
-include $(TOPDIR)/package/rules.mk
-
-$(eval $(call PKG_template,GDBSERVER,gdbserver,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-
-$(PKG_BUILD_DIR)/.prepared:
-	rm -rf $(PKG_BUILD_DIR)
-	mkdir -p $(PKG_BUILD_DIR)
-	touch $@
-
-$(PKG_BUILD_DIR)/.configured:
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		$(GDB_DIR)/gdb/gdbserver/configure \
-		  --target=$(GNU_TARGET_NAME) \
-		  --host=$(GNU_TARGET_NAME) \
-		  --build=$(GNU_HOST_NAME) \
-		  --program-prefix="" \
-		  --program-suffix="" \
-		  --prefix=/usr \
-		  --exec-prefix=/usr \
-		  --bindir=/usr/bin \
-		  --sbindir=/usr/sbin \
-		  --libexecdir=/usr/lib \
-		  --sysconfdir=/etc \
-		  --datadir=/usr/share \
-		  --localstatedir=/var \
-		  --mandir=/usr/man \
-		  --infodir=/usr/info \
-		  $(DISABLE_NLS) \
-		  $(DISABLE_LARGEFILE) \
-	);
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		install
-	touch $@
-
-$(IPKG_GDBSERVER):
-	install -m0755 -d $(IDIR_GDBSERVER)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/gdbserver $(IDIR_GDBSERVER)/usr/bin/
-	$(RSTRIP) $(IDIR_GDBSERVER)
-	$(IPKG_BUILD) $(IDIR_GDBSERVER) $(PACKAGE_DIR)
-
diff --git a/openwrt/package/gdbserver/ipkg/gdbserver.control b/openwrt/package/gdbserver/ipkg/gdbserver.control
deleted file mode 100644
index f12eebe1cc..0000000000
--- a/openwrt/package/gdbserver/ipkg/gdbserver.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: gdbserver
-Priority: optional
-Section: devel
-Description: Remote Server for the GNU Debugger
diff --git a/openwrt/package/iptables-snmp/Config.in b/openwrt/package/iptables-snmp/Config.in
deleted file mode 100644
index 7232abb14f..0000000000
--- a/openwrt/package/iptables-snmp/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_IPTABLES_SNMP
-	prompt "iptables-snmp..................... An snmpd plugin to access iptables rules"
-	tristate
-	default m if CONFIG_DEVEL
-	select BR2_PACKAGE_IPTABLES
-	select BR2_PACKAGE_SNMPD
-	help
-	  This is a plugin that makes iptables rules accessable from snmpd.
-	  
-	  http://www.nobiscuit.com/iptables-snmp/
-
diff --git a/openwrt/package/iptables-snmp/Makefile b/openwrt/package/iptables-snmp/Makefile
deleted file mode 100644
index dbf35c8f94..0000000000
--- a/openwrt/package/iptables-snmp/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=iptables-snmp
-PKG_VERSION:=0.1
-PKG_RELEASE:=1
-PKG_MD5SUM:=8370d2f0c899461a053da491400119d1
-
-PKG_SOURCE_URL:=http://www.nobiscuit.com/iptables-snmp
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(TOPDIR)/package/rules.mk
-
-$(eval $(call PKG_template,IPTABLES_SNMP,iptables-snmp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-	(cd $(PKG_BUILD_DIR); rm -f config.{cache,status}; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) " \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-	);
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \
-		all install
-	touch $@
- 
-$(IPKG_IPTABLES_SNMP):
-	install -d -m0755 $(IDIR_IPTABLES_SNMP)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables-snmp.so $(IDIR_IPTABLES_SNMP)/usr/lib
-	$(RSTRIP) $(IDIR_IPTABLES_SNMP)
-	$(IPKG_BUILD) $(IDIR_IPTABLES_SNMP) $(PACKAGE_DIR)
- 
-mostlyclean:
-	-$(MAKE) -C $(PKG_BUILD_DIR) clean
-	rm $(PKG_BUILD_DIR)/.built
\ No newline at end of file
diff --git a/openwrt/package/iptables-snmp/ipkg/iptables-snmp.control b/openwrt/package/iptables-snmp/ipkg/iptables-snmp.control
deleted file mode 100644
index cd92ffeb58..0000000000
--- a/openwrt/package/iptables-snmp/ipkg/iptables-snmp.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: iptables-snmp
-Priority: optional
-Section: net
-Depends: snmpd
-Description: An snmpd plugin to access iptables rules
\ No newline at end of file
diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index 9bbf4fa48f..775c34906a 100644
--- a/openwrt/package/rules.mk
+++ b/openwrt/package/rules.mk
@@ -1,7 +1,41 @@
 # invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf 
 
-define PKG_template
-IPKG_$(1):=$(PACKAGE_DIR)/$(2)_$(3)_$(4).ipk
+define BuildPackage
+CONFIGFILE:=
+NAME:=$(PKG_NAME)
+SECTION:=opt
+CATEGORY:=Extra packages
+DEPENDS:=
+MAINTAINER:=OpenWrt Developers Team <openwrt-devel@openwrt.org>
+SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd})
+VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
+PKGARCH:=$(ARCH)
+PRIORITY:=optional
+TITLE:=
+DESCRIPTION:=
+
+$$(eval $$(call Package/$(2)))
+
+ifeq ($$(NAME),)
+$$(error Package $(2) has no NAME)
+endif
+ifeq ($$(TITLE),)
+$$(error Package $(2) has no TITLE)
+endif
+ifeq ($$(CATEGORY),)
+$$(error Package $(2) has no CATEGORY)
+endif
+ifeq ($$(PRIORITY),)
+$$(error Package $(2) has no PRIORITY)
+endif
+ifeq ($$(VERSION),)
+$$(error Package $(2) has no VERSION)
+endif
+ifeq ($$(PKGARCH),)
+PKGARCH:=$(ARCH)
+endif
+
+IPKG_$(1):=$(PACKAGE_DIR)/$(2)_$(VERSION)_$(PKGARCH).ipk
 IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(2)
 INFO_$(1):=$(IPKG_STATE_DIR)/info/$(2).list
 
@@ -15,11 +49,20 @@ ifeq ($(BR2_PACKAGE_$(1)),y)
 install-targets: $$(INFO_$(1))
 endif
 
-IDEPEND_$(1):=$$(strip $(5))
+IDEPEND_$(1):=$$(strip $$(DEPENDS))
 
 $$(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
+	mkdir -p $$(IDIR_$(1))/CONTROL
+	echo "Package: $(2)" > $$(IDIR_$(1))/CONTROL/control
+	echo "Version: $$(VERSION)" >> $$(IDIR_$(1))/CONTROL/control
+	echo "Depends: $$(IDEPEND_$(1))" >> $$(IDIR_$(1))/CONTROL/control
+	echo "Source: $$(SOURCE)" >> $$(IDIR_$(1))/CONTROL/control
+	echo "Section: $$(SECTION)" >> $$(IDIR_$(1))/CONTROL/control
+	echo "Priority: $$(PRIORITY)" >> $$(IDIR_$(1))/CONTROL/control
+	echo "Maintainer: $$(MAINTAINER)" >> $$(IDIR_$(1))/CONTROL/control
+	echo "Architecture: $$(PKGARCH)" >> $$(IDIR_$(1))/CONTROL/control
+	echo "Description: $$(DESCRIPTION)" >> $$(IDIR_$(1))/CONTROL/control
+	chmod 644 $$(IDIR_$(1))/CONTROL/control
 	for file in conffiles preinst postinst prerm postrm; do \
 		[ -f ./ipkg/$(2).$$$$file ] && cp ./ipkg/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file || true; \
 	done