From f77b88d124ea1c900f9cf5e04046939aad48bbe1 Mon Sep 17 00:00:00 2001 From: mbm Date: Sun, 6 Mar 2005 03:34:52 +0000 Subject: nbd's makefile/menuconfig rewrite git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@307 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 package/dnsmasq/Makefile (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile new file mode 100644 index 0000000000..cd4cae4be9 --- /dev/null +++ b/package/dnsmasq/Makefile @@ -0,0 +1,9 @@ +include $(TOPDIR)/rules.mk + +include ./dnsmasq.mk + +source: dnsmasq-source +prepare: $(DNSMASQ_DIR)/.unpacked +compile: $(DNSMASQ_DIR)/src/dnsmasq +install: dnsmasq +clean: dnsmasq-dirclean -- cgit v1.2.3 From a4d8c8e5caa11cb5301bedeb4aa29c880f599a2c Mon Sep 17 00:00:00 2001 From: mbm Date: Sun, 6 Mar 2005 03:53:29 +0000 Subject: bring up to date with nbd's br2_test20.tar.bz2 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@308 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/Config.in | 2 + package/Makefile | 2 + package/dnsmasq/Config.in | 2 +- package/dnsmasq/Makefile | 48 +- package/dnsmasq/dnsmasq.control | 8 + package/dnsmasq/patches/100-config.patch | 49 + package/dropbear/Config.in | 10 + package/dropbear/Makefile | 80 + package/dropbear/dropbear.control | 9 + package/dropbear/files/S50dropbear | 64 + package/dropbear/patches/change-user.patch | 15 + package/dropbear/patches/use-dev-urandom.patch | 12 + package/linux/Config.in | 8 +- package/linux/Makefile | 3 + package/linux/control/kmod-gre.control | 8 + package/matrixssl/Config.in | 7 + package/matrixssl/Makefile | 54 + package/matrixssl/matrixssl.control | 8 + package/matrixssl/matrixssl.mk | 80 + package/matrixssl/patches/matrixssl-1.2.4.diff | 1971 ++++++++++++++++++++ package/matrixssl/patches/matrixssl-typefix.patch | 12 + package/ppp/Config.in | 37 + package/ppp/Makefile | 147 ++ package/ppp/control/chat.control | 9 + package/ppp/control/ppp-pppoe-plugin.control | 9 + package/ppp/control/ppp-radius-plugin.control | 9 + package/ppp/control/ppp.control | 8 + package/ppp/control/pppdump.control | 9 + package/ppp/control/pppstats.control | 9 + .../ppp/ipkg/ppp-radius-plugin/CONTROL/conffiles | 2 + .../ipkg/ppp-radius-plugin/etc/ppp/radius-options | 2 + .../ppp/ipkg/ppp-radius-plugin/etc/ppp/radius.conf | 8 + .../ppp-radius-plugin/etc/ppp/radius/dictionary | 253 +++ .../etc/ppp/radius/dictionary.asnet | 3 + .../etc/ppp/radius/dictionary.microsoft | 81 + .../ipkg/ppp-radius-plugin/etc/ppp/radius/servers | 1 + package/ppp/ipkg/ppp/CONTROL/conffiles | 2 + package/ppp/ipkg/ppp/etc/ppp/chap-secrets | 1 + package/ppp/ipkg/ppp/etc/ppp/options | 1 + package/ppp/ipkg/ppp/etc/ppp/peers/sample | 3 + package/ppp/ppp.patch | 1865 ++++++++++++++++++ package/pptpd/Config.in | 7 + package/pptpd/Makefile | 70 + package/pptpd/ipkg/CONTROL/conffiles | 2 + package/pptpd/ipkg/etc/ppp/pptp-server-options | 27 + package/pptpd/ipkg/etc/pptpd.conf | 5 + package/pptpd/pptpd.control | 9 + .../1.7/ipkg-utils-1.7-ipkg_build_clean.patch | 36 + .../1.7/ipkg-utils-1.7-ipkg_buildpackage.patch | 24 + toolchain/ipkg-utils/Makefile | 55 + toolchain/sed/Makefile | 9 + toolchain/sed/sed.mk | 75 + toolchain/sed/sedcheck.sh | 21 + 53 files changed, 5243 insertions(+), 8 deletions(-) create mode 100644 package/dnsmasq/dnsmasq.control create mode 100644 package/dnsmasq/patches/100-config.patch create mode 100644 package/dropbear/Config.in create mode 100644 package/dropbear/Makefile create mode 100644 package/dropbear/dropbear.control create mode 100755 package/dropbear/files/S50dropbear create mode 100644 package/dropbear/patches/change-user.patch create mode 100644 package/dropbear/patches/use-dev-urandom.patch create mode 100644 package/linux/control/kmod-gre.control create mode 100644 package/matrixssl/Config.in create mode 100644 package/matrixssl/Makefile create mode 100644 package/matrixssl/matrixssl.control create mode 100644 package/matrixssl/matrixssl.mk create mode 100644 package/matrixssl/patches/matrixssl-1.2.4.diff create mode 100644 package/matrixssl/patches/matrixssl-typefix.patch create mode 100644 package/ppp/Config.in create mode 100644 package/ppp/Makefile create mode 100644 package/ppp/control/chat.control create mode 100644 package/ppp/control/ppp-pppoe-plugin.control create mode 100644 package/ppp/control/ppp-radius-plugin.control create mode 100644 package/ppp/control/ppp.control create mode 100644 package/ppp/control/pppdump.control create mode 100644 package/ppp/control/pppstats.control create mode 100644 package/ppp/ipkg/ppp-radius-plugin/CONTROL/conffiles create mode 100644 package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius-options create mode 100644 package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius.conf create mode 100644 package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary create mode 100644 package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.asnet create mode 100644 package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.microsoft create mode 100644 package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/servers create mode 100644 package/ppp/ipkg/ppp/CONTROL/conffiles create mode 100644 package/ppp/ipkg/ppp/etc/ppp/chap-secrets create mode 100644 package/ppp/ipkg/ppp/etc/ppp/options create mode 100644 package/ppp/ipkg/ppp/etc/ppp/peers/sample create mode 100644 package/ppp/ppp.patch create mode 100644 package/pptpd/Config.in create mode 100644 package/pptpd/Makefile create mode 100644 package/pptpd/ipkg/CONTROL/conffiles create mode 100644 package/pptpd/ipkg/etc/ppp/pptp-server-options create mode 100644 package/pptpd/ipkg/etc/pptpd.conf create mode 100644 package/pptpd/pptpd.control create mode 100644 toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch create mode 100644 toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch create mode 100644 toolchain/ipkg-utils/Makefile create mode 100644 toolchain/sed/Makefile create mode 100644 toolchain/sed/sed.mk create mode 100755 toolchain/sed/sedcheck.sh (limited to 'package/dnsmasq/Makefile') diff --git a/package/Config.in b/package/Config.in index c449c117cc..bd551922f3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -16,9 +16,11 @@ source "package/ebtables/Config.in" source "package/arptables/Config.in" source "package/iproute2/Config.in" source "package/openvpn/Config.in" +source "package/pptpd/Config.in" comment "Libraries" source "package/zlib/Config.in" +source "package/matrixssl/Config.in" source "package/lzo/Config.in" source "package/openssl/Config.in" diff --git a/package/Makefile b/package/Makefile index 5afc8f9f1f..6f5e4ace7c 100644 --- a/package/Makefile +++ b/package/Makefile @@ -12,8 +12,10 @@ package-$(BR2_PACKAGE_IPTABLES) += iptables package-$(BR2_PACKAGE_PPP) += ppp package-$(BR2_PACKAGE_LZO) += lzo package-$(BR2_PACKAGE_ZLIB) += zlib +package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl package-$(BR2_PACKAGE_OPENSSL) += openssl package-$(BR2_PACKAGE_OPENVPN) += openvpn +package-$(BR2_PACKAGE_PPTPD) += pptpd package-$(BR2_PACKAGE_IPROUTE2) += iproute2 package-$(BR2_PACKAGE_LINKSYS_UTILS) += linksys-utils diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in index c0f05088e3..9c7bdef65b 100644 --- a/package/dnsmasq/Config.in +++ b/package/dnsmasq/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_DNSMASQ - bool "dnsmasq" + tristate "dnsmasq" default y help A lightweight DNS and DHCP server. It is intended to provide diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index cd4cae4be9..3b6acb49d9 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -1,9 +1,45 @@ +############################################################# +# +# ebtables +# +############################################################# include $(TOPDIR)/rules.mk -include ./dnsmasq.mk +PKG_NAME:=dnsmasq +PKG_VERSION:=2.15 +PKG_RELEASE:=1 +PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_CAT:=zcat +PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg -source: dnsmasq-source -prepare: $(DNSMASQ_DIR)/.unpacked -compile: $(DNSMASQ_DIR)/src/dnsmasq -install: dnsmasq -clean: dnsmasq-dirclean +$(DL_DIR)/$(PKG_SOURCE): + $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + +$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE) + $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(PATCH) $(PKG_BUILD_DIR) ./patches + touch $(PKG_BUILD_DIR)/.patched + +$(PKG_BUILD_DIR)/src/$(PKG_NAME): $(PKG_BUILD_DIR)/.patched + $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \ + BINDIR=/usr/sbin MANDIR=/usr/man -C $(PKG_BUILD_DIR) + +$(PKG_IPK): $(PKG_BUILD_DIR)/src/$(PKG_NAME) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(PKG_IPK_DIR)/usr/sbin + cp $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_IPK_DIR)/usr/sbin/ + $(STRIP) $(PKG_IPK_DIR)/usr/sbin/* + mkdir -p $(PACKAGE_DIR) + $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) + +source: $(DL_DIR)/$(PKG_SOURCE) +prepare: $(PKG_BUILD_DIR)/.patched +compile: $(PKG_IPK) +install: + $(IPKG) install $(PKG_IPK) +clean: + rm -rf $(PKG_BUILD_DIR) + rm -f $(PKG_IPK) diff --git a/package/dnsmasq/dnsmasq.control b/package/dnsmasq/dnsmasq.control new file mode 100644 index 0000000000..ef6bd0db30 --- /dev/null +++ b/package/dnsmasq/dnsmasq.control @@ -0,0 +1,8 @@ +Package: dnsmasq +Priority: essential +Section: net +Version: 2.15-1 +Architecture: mipsel +Maintainer: Felix Fietkau +Source: buildroot internal +Description: A lightweight DNS and DHCP server diff --git a/package/dnsmasq/patches/100-config.patch b/package/dnsmasq/patches/100-config.patch new file mode 100644 index 0000000000..270c22740e --- /dev/null +++ b/package/dnsmasq/patches/100-config.patch @@ -0,0 +1,49 @@ +diff -ur dnsmasq-2.15.orig/src/config.h dnsmasq-2.15/src/config.h +--- dnsmasq-2.15.orig/src/config.h 2004-10-08 11:41:34.757371880 -0400 ++++ dnsmasq-2.15/src/config.h 2004-10-08 11:43:49.074952504 -0400 +@@ -78,6 +78,11 @@ + /* We assume that systems which don't have IPv6 + headers don't have ntop and pton either */ + ++#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__) ++# undef NO_IPV6 ++# define NO_IPV6 ++#endif ++ + #if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6) + # define HAVE_IPV6 + # define ADDRSTRLEN INET6_ADDRSTRLEN +@@ -194,7 +199,7 @@ + /* platform dependent options. */ + + /* Must preceed __linux__ since uClinux defines __linux__ too. */ +-#if defined(__uClinux__) || defined(__UCLIBC__) ++#if defined(__uClinux__) + #undef HAVE_LINUX_IPV6_PROC + #define HAVE_GETOPT_LONG + #undef HAVE_ARC4RANDOM +@@ -208,6 +213,24 @@ + # define NO_FORK + #endif + ++#elif defined(__linux__) && defined(__UCLIBC__) ++# define HAVE_LINUX_IPV6_PROC ++# if defined(__UCLIBC_HAS_GNU_GETOPT__) || \ ++ ((__UCLIBC_MAJOR__==0) && (__UCLIBC_MINOR__==9) && (__UCLIBC_SUBLEVEL__<21)) ++# define HAVE_GETOPT_LONG ++# else ++# undef HAVE_GETOPT_LONG ++# endif ++#undef HAVE_ARC4RANDOM ++#define HAVE_RANDOM ++#define HAVE_DEV_URANDOM ++#define HAVE_DEV_RANDOM ++#undef HAVE_SOCKADDR_SA_LEN ++#undef HAVE_PSELECT ++#if !defined(__ARCH_HAS_MMU__) ++# define NO_FORK ++#endif ++ + /* libc5 - must precede __linux__ too */ + /* Note to build a libc5 binary on a modern Debian system: + install the packages altgcc libc5 and libc5-altdev diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in new file mode 100644 index 0000000000..b82464586d --- /dev/null +++ b/package/dropbear/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_DROPBEAR + tristate "SSH Server/Client" + default y + select BR2_PACKAGE_ZLIB + help + dropbear + + A small SSH 2 server/client designed for small memory environments. + + http://matt.ucc.asn.au/dropbear/ diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile new file mode 100644 index 0000000000..eec889deaf --- /dev/null +++ b/package/dropbear/Makefile @@ -0,0 +1,80 @@ +############################################################# +# +# dropbear +# +############################################################# +include $(TOPDIR)/rules.mk + +DROPBEAR_VERSION:=0.44 +DROPBEAR_SOURCE:=dropbear-$(DROPBEAR_VERSION).tar.bz2 +DROPBEAR_SITE:=http://matt.ucc.asn.au/dropbear/releases/ +DROPBEAR_DIR:=$(BUILD_DIR)/dropbear-$(DROPBEAR_VERSION) +DROPBEAR_CAT:=bzcat +DROPBEAR_BINARY:=dropbearmulti +DROPBEAR_TARGET_BINARY:=usr/sbin/dropbear +DROPBEAR_IPK:=dropbear_$(DROPBEAR_VERSION)-1_$(ARCH).ipk +DROPBEAR_IPK_DIR:=$(DROPBEAR_DIR)/ipkg + +$(DL_DIR)/$(DROPBEAR_SOURCE): + $(WGET) -P $(DL_DIR) $(DROPBEAR_SITE)/$(DROPBEAR_SOURCE) + +$(DROPBEAR_DIR)/.patched: $(DL_DIR)/$(DROPBEAR_SOURCE) + $(DROPBEAR_CAT) $(DL_DIR)/$(DROPBEAR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(PATCH) $(DROPBEAR_DIR) ./patches \*.patch + $(SED) 's,^/\* #define DROPBEAR_MULTI.*,#define DROPBEAR_MULTI,g' $(DROPBEAR_DIR)/options.h + touch $(DROPBEAR_DIR)/.patched + +$(DROPBEAR_DIR)/.configured: $(DROPBEAR_DIR)/.patched + (cd $(DROPBEAR_DIR); rm -rf config.cache; \ + autoconf; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --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) \ + --with-shared \ + ); + touch $(DROPBEAR_DIR)/.configured + +$(DROPBEAR_DIR)/$(DROPBEAR_BINARY): $(DROPBEAR_DIR)/.configured + $(MAKE) $(TARGET_CONFIGURE_OPTS) LD=$(TARGET_CC) \ + PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" \ + MULTI=1 SCPPROGRESS=1 -C $(DROPBEAR_DIR) + +$(PACKAGE_DIR)/$(DROPBEAR_IPK): $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(DROPBEAR_IPK_DIR) dropbear.control $(DROPBEAR_VERSION)-1 $(ARCH) + mkdir -p $(DROPBEAR_IPK_DIR)/usr/bin + mkdir -p $(DROPBEAR_IPK_DIR)/usr/sbin + install -m 755 $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) \ + $(DROPBEAR_IPK_DIR)/$(DROPBEAR_TARGET_BINARY) + $(STRIP) $(DROPBEAR_IPK_DIR)/usr/sbin/dropbear + ln -sf ../sbin/dropbear $(DROPBEAR_IPK_DIR)/usr/bin/scp + ln -sf ../sbin/dropbear $(DROPBEAR_IPK_DIR)/usr/bin/ssh + ln -sf ../sbin/dropbear $(DROPBEAR_IPK_DIR)/usr/bin/dropbearkey + ln -sf ../sbin/dropbear $(DROPBEAR_IPK_DIR)/usr/bin/dropbearconvert + mkdir -p $(DROPBEAR_IPK_DIR)/etc/init.d + cp ./files/S50dropbear $(DROPBEAR_IPK_DIR)/etc/init.d/ + chmod a+x $(DROPBEAR_IPK_DIR)/etc/init.d/S50dropbear + $(IPKG_BUILD) $(DROPBEAR_IPK_DIR) $(PACKAGE_DIR) + +source: $(DL_DIR)/$(DROPBEAR_SOURCE) +prepare: $(DROPBEAR_DIR)/.patched +compile: $(PACKAGE_DIR)/$(DROPBEAR_IPK) +install: compile + $(IPKG) install $(PACKAGE_DIR)/$(DROPBEAR_IPK) +clean: + rm -rf $(DROPBEAR_DIR) + rm -f $(PACKAGE_DIR)/$(DROPBEAR_IPK) + diff --git a/package/dropbear/dropbear.control b/package/dropbear/dropbear.control new file mode 100644 index 0000000000..e30f02ac5c --- /dev/null +++ b/package/dropbear/dropbear.control @@ -0,0 +1,9 @@ +Package: dropbear +Priority: optional +Depends: zlib +Section: net +Version: 0.44-1 +Architecture: mipsel +Maintainer: Felix Fietkau +Source: buildroot internal +Description: a small SSH 2 server/client designed for small memory environments. diff --git a/package/dropbear/files/S50dropbear b/package/dropbear/files/S50dropbear new file mode 100755 index 0000000000..c7ae0af6ba --- /dev/null +++ b/package/dropbear/files/S50dropbear @@ -0,0 +1,64 @@ +#!/bin/sh +# +# Starts dropbear sshd. +# + +# Make sure the dropbearkey progam exists +[ -f /usr/bin/dropbearkey ] || exit 0 + +# Check for the Dropbear RSA key +if [ ! -f /etc/dropbear/dropbear_rsa_host_key ] ; then + ( + echo Generating RSA Key... + mkdir -p /etc/dropbear + /usr/bin/dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key + [ -f /etc/dropbear/dropbear_rsa_host_key ] && exec $0 $* + ) > /dev/null 2> /dev/null & + exit 0 +fi + +# Check for the Dropbear DSS key +if [ ! -f /etc/dropbear/dropbear_dss_host_key ] ; then + ( + echo Generating DSS Key... + mkdir -p /etc/dropbear + /usr/bin/dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key + [ -f /etc/dropbear/dropbear_dss_host_key ] && exec $0 $* + ) > /dev/null 2> /dev/null & + exit 0 +fi + +umask 077 + +start() { + echo -n "Starting dropbear sshd: " + start-stop-daemon --start --quiet --pidfile /var/run/dropbear.pid --exec /usr/sbin/dropbear + echo "OK" +} +stop() { + echo -n "Stopping dropbear sshd: " + start-stop-daemon --stop --quiet --pidfile /var/run/dropbear.pid + echo "OK" +} +restart() { + stop + start +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + restart + ;; + *) + echo $"Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $? + diff --git a/package/dropbear/patches/change-user.patch b/package/dropbear/patches/change-user.patch new file mode 100644 index 0000000000..3dc068f8ba --- /dev/null +++ b/package/dropbear/patches/change-user.patch @@ -0,0 +1,15 @@ +--- dropbear-0.44.old/svr-chansession.c 2005-02-03 02:29:44.000000000 +0100 ++++ dropbear-0.44/svr-chansession.c 2005-02-03 02:31:05.000000000 +0100 +@@ -859,10 +859,10 @@ + /* We can only change uid/gid as root ... */ + if (getuid() == 0) { + +- if ((setgid(ses.authstate.pw->pw_gid) < 0) || ++ if ((ses.authstate.pw->pw_uid != 0) && ((setgid(ses.authstate.pw->pw_gid) < 0) || + (initgroups(ses.authstate.pw->pw_name, + ses.authstate.pw->pw_gid) < 0) || +- (setuid(ses.authstate.pw->pw_uid) < 0)) { ++ (setuid(ses.authstate.pw->pw_uid) < 0))) { + dropbear_exit("error changing user"); + } + } else { diff --git a/package/dropbear/patches/use-dev-urandom.patch b/package/dropbear/patches/use-dev-urandom.patch new file mode 100644 index 0000000000..139728308c --- /dev/null +++ b/package/dropbear/patches/use-dev-urandom.patch @@ -0,0 +1,12 @@ +diff -urN dropbear-0.44.old/options.h dropbear-0.44/options.h +--- dropbear-0.44.old/options.h 2005-03-02 23:08:07.000000000 +0100 ++++ dropbear-0.44/options.h 2005-03-03 01:12:21.000000000 +0100 +@@ -139,7 +139,7 @@ + * will prevent Dropbear from blocking on the device. This could + * however significantly reduce the security of your ssh connections + * if the PRNG state becomes simpler. */ +-#define DROPBEAR_RANDOM_DEV "/dev/random" ++#define DROPBEAR_RANDOM_DEV "/dev/urandom" + + /* prngd must be manually set up to produce output */ + /*#define DROPBEAR_PRNGD_SOCKET "/var/run/dropbear-rng"*/ diff --git a/package/linux/Config.in b/package/linux/Config.in index e420f87899..5ef20f87c6 100644 --- a/package/linux/Config.in +++ b/package/linux/Config.in @@ -54,7 +54,13 @@ config BR2_PACKAGE_KMOD_TUN default m help Kernel support for the TUN/TAP tunneling device - + +config BR2_PACKAGE_KMOD_GRE + tristate "GRE tunneling driver" + default m + help + Kernel support for GRE tunnels + config BR2_PACKAGE_KMOD_SCHED tristate "Traffic schedulers" default m diff --git a/package/linux/Makefile b/package/linux/Makefile index 90fb5ac77e..fa89f45ed8 100644 --- a/package/linux/Makefile +++ b/package/linux/Makefile @@ -54,6 +54,9 @@ $(eval $(call KMOD_template,MPPE,mppe,\ $(eval $(call KMOD_template,TUN,tun,\ $(MODULES_DIR)/kernel/drivers/net/tun.o \ )) +$(eval $(call KMOD_template,GRE,gre,\ + $(MODULES_DIR)/kernel/net/ipv4/ip_gre.o \ +)) $(eval $(call KMOD_template,SCHED,sched,\ $(MODULES_DIR)/kernel/net/sched/*.o \ )) diff --git a/package/linux/control/kmod-gre.control b/package/linux/control/kmod-gre.control new file mode 100644 index 0000000000..f3c71d743c --- /dev/null +++ b/package/linux/control/kmod-gre.control @@ -0,0 +1,8 @@ +Package: kmod-gre +Priority: optional +Section: sys +Version: 2.4.29-1 +Architecture: mipsel +Maintainer: Felix Fietkau +Source: buildroot internal +Description: Kernel GRE tunneling support diff --git a/package/matrixssl/Config.in b/package/matrixssl/Config.in new file mode 100644 index 0000000000..7f056c3a6d --- /dev/null +++ b/package/matrixssl/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_MATRIXSSL + tristate "matrixssl" + default m + help + an embedded SSL implementation + + http://www.matrixssl.org/ diff --git a/package/matrixssl/Makefile b/package/matrixssl/Makefile new file mode 100644 index 0000000000..22209a9dd8 --- /dev/null +++ b/package/matrixssl/Makefile @@ -0,0 +1,54 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME := matrixssl +PKG_VERSION := 1.2.4 +PKG_RELEASE := 1 + +PKG_SOURCE_SITE := http://nbd.vd-s.ath.cx/openwrt +PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_CAT := zcat +PKG_SOURCE_DIR := $(PKG_NAME) +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) +PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk + + +$(DL_DIR)/$(PKG_SOURCE_FILE): + mkdir -p $(DL_DIR) + $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + +$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) + mkdir -p $(TOOL_BUILD_DIR) + $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(PATCH) $(PKG_BUILD_DIR) ./patches + touch $(PKG_BUILD_DIR)/.patched + +$(PKG_BUILD_DIR)/src/libmatrixssl.so: $(PKG_BUILD_DIR)/.patched + $(MAKE) -C $(PKG_BUILD_DIR)/src \ + $(TARGET_CONFIGURE_OPTS) \ + DFLAGS="$(TARGET_CFLAGS) -Wall" + +$(STAGING_DIR)/lib/libmatrixssl.so: $(PKG_BUILD_DIR)/src/libmatrixssl.so + cp -a $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/lib + mkdir -p $(STAGING_DIR)/include/matrixSsl + cp $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/include/matrixSsl + ln -sf matrixSsl/matrixSsl.h $(STAGING_DIR)/include/matrixSsl.h + +$(PKG_IPK): $(STAGING_DIR)/lib/libmatrixssl.so + mkdir -p $(PACKAGE_DIR) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/matrixssl matrixssl.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib + cp -a $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib + $(STRIP) $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib/* + $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/matrixssl $(PACKAGE_DIR) + + +source: $(DL_DIR)/$(PKG_SOURCE_FILE) +prepare: $(PKG_BUILD_DIR)/.patched +compile: $(STAGING_DIR)/lib/libmatrixssl.so $(PKG_IPK) +install: $(PKG_ZLIB) + $(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK) +clean: + rm -rf $(PKG_BUILD_DIR) + rm -f $(STAGING_DIR)/lib/libmatrixssl* $(STAGING_DIR)/include/matrixssl* + rm -f $(PACKAGE_DIR)/matrixssl\*.ipk + diff --git a/package/matrixssl/matrixssl.control b/package/matrixssl/matrixssl.control new file mode 100644 index 0000000000..604e8a79ee --- /dev/null +++ b/package/matrixssl/matrixssl.control @@ -0,0 +1,8 @@ +Package: libmatrixssl +Priority: optional +Section: libs +Version: 1.2.4-1 +Architecture: mipsel +Maintainer: Felix Fietkau +Source: buildroot internal +Description: an embedded SSL implementation diff --git a/package/matrixssl/matrixssl.mk b/package/matrixssl/matrixssl.mk new file mode 100644 index 0000000000..c71d224156 --- /dev/null +++ b/package/matrixssl/matrixssl.mk @@ -0,0 +1,80 @@ +## matrixssl + +MATRIXSSL_VERSION := 1.2.1 +MATRIXSSL_RELEASE := 1 + +MATRIXSSL_SOURCE := matrixssl-1-2-1.tar.gz +#MATRIXSSL_SITE := http://www.matrixssl.org/ +MATRIXSSL_SITE := http://nthill.free.fr/openwrt/sources/ +MATRIXSSL_DIR := $(BUILD_DIR)/matrixssl +MATRIXSSL_CAT := zcat + +MATRIXSSL_PATCH_DIR := $(SOURCE_DIR)/openwrt/patches/matrixssl + +MATRIXSSL_BUILD_DIR := $(BUILD_DIR)/libmatrixssl_$(MATRIXSSL_VERSION)-$(MATRIXSSL_RELEASE) +MATRIXSSL_IPK_DIR := $(OPENWRT_IPK_DIR)/libmatrixssl +MATRIXSSL_IPK := $(MATRIXSSL_BUILD_DIR)_$(ARCH).ipk + + +$(DL_DIR)/$(MATRIXSSL_SOURCE): + $(WGET) -P $(DL_DIR) $(MATRIXSSL_SITE)/$(MATRIXSSL_SOURCE) + + +$(MATRIXSSL_DIR)/.stamp-unpacked: $(DL_DIR)/$(MATRIXSSL_SOURCE) + $(MATRIXSSL_CAT) $(DL_DIR)/$(MATRIXSSL_SOURCE) | tar -C $(BUILD_DIR) -xvf - + + touch $(MATRIXSSL_DIR)/.stamp-unpacked + + +$(MATRIXSSL_DIR)/.stamp-patched: $(MATRIXSSL_DIR)/.stamp-unpacked + $(SOURCE_DIR)/patch-kernel.sh $(MATRIXSSL_DIR) $(MATRIXSSL_PATCH_DIR) + + touch $(MATRIXSSL_DIR)/.stamp-patched + + +$(MATRIXSSL_DIR)/.stamp-built: $(MATRIXSSL_DIR)/.stamp-patched + cd $(MATRIXSSL_DIR) ; \ + $(MAKE) -C src \ + CC=$(TARGET_CC) \ + DFLAGS="$(TARGET_CFLAGS)" \ + STRIP=/bin/true \ + all + + touch $(MATRIXSSL_DIR)/.stamp-built + + +$(MATRIXSSL_BUILD_DIR): $(MATRIXSSL_DIR)/.stamp-built + mkdir -p $(MATRIXSSL_BUILD_DIR) + + install -m0755 -d $(STAGING_DIR)/include/matrixSsl + install -m0644 $(MATRIXSSL_DIR)/matrixSsl.h $(STAGING_DIR)/include/matrixSsl/ + ln -fs matrixSsl/matrixSsl.h $(STAGING_DIR)/include/ + install -m0755 $(MATRIXSSL_DIR)/src/libmatrixssl.so $(STAGING_DIR)/lib/libmatrixssl.so.$(MATRIXSSL_VERSION) + ln -fs libmatrixssl.so.$(MATRIXSSL_VERSION) $(STAGING_DIR)/lib/libmatrixssl.so.1.2 + ln -fs libmatrixssl.so.1.2 $(STAGING_DIR)/lib/libmatrixssl.so + + mkdir -p $(MATRIXSSL_BUILD_DIR)/usr/lib + cp -a $(STAGING_DIR)/lib/libmatrixssl.so.* $(MATRIXSSL_BUILD_DIR)/usr/lib/ + + $(STRIP) $(MATRIXSSL_BUILD_DIR)/usr/lib/libmatrixssl.so.* + + +$(MATRIXSSL_IPK): $(MATRIXSSL_BUILD_DIR) + cp -a $(MATRIXSSL_IPK_DIR)/CONTROL $(MATRIXSSL_BUILD_DIR)/ + perl -pi -e "s/^Vers.*:.*$$/Version: $(MATRIXSSL_VERSION)-$(MATRIXSSL_RELEASE)/" $(MATRIXSSL_BUILD_DIR)/CONTROL/control + perl -pi -e "s/^Arch.*:.*$$/Architecture: $(ARCH)/" $(MATRIXSSL_BUILD_DIR)/CONTROL/control + cd $(BUILD_DIR); $(IPKG_BUILD) $(MATRIXSSL_BUILD_DIR) + + +matrixssl-ipk: ipkg-utils libpthread-ipk $(MATRIXSSL_IPK) + +matrixssl-clean: + $(MAKE) -C $(MATRIXSSL_DIR) clean + +matrixssl-clean-all: + rm -rf $(MATRIXSSL_DIR) + rm -rf $(MATRIXSSL_BUILD_DIR) + rm -rf $(MATRIXSSL_IPK) + rm -rf $(STAGING_DIR)/include/pcap*.h + rm -rf $(STAGING_DIR)/lib/libpcap.a + rm -rf $(STAGING_DIR)/lib/libpcap.so* diff --git a/package/matrixssl/patches/matrixssl-1.2.4.diff b/package/matrixssl/patches/matrixssl-1.2.4.diff new file mode 100644 index 0000000000..b4a2bc9905 --- /dev/null +++ b/package/matrixssl/patches/matrixssl-1.2.4.diff @@ -0,0 +1,1971 @@ +diff -urN matrixssl.old/matrixSsl.h matrixssl/matrixSsl.h +--- matrixssl.old/matrixSsl.h 2005-02-23 22:43:10.000000000 +0100 ++++ matrixssl/matrixSsl.h 2005-03-06 01:32:33.000000000 +0100 +@@ -154,6 +154,29 @@ + + #define SSL_OPTION_DELETE_SESSION 0 + ++ ++#define SSL_MD5_DIGEST_LENGTH 16 ++#define SSL_MD5_CONTEXT_DATA_SIZE 96 ++ ++typedef struct { ++ unsigned char data[SSL_MD5_CONTEXT_DATA_SIZE]; ++} sslMd5Context_t; ++ ++ ++#define SSL_SHA1_DIGEST_LENGTH 20 ++#define SSL_SHA1_CONTEXT_DATA_SIZE 96 ++ ++typedef struct { ++ unsigned char data[SSL_SHA1_CONTEXT_DATA_SIZE]; ++} sslSha1Context_t; ++ ++ ++#define SSL_CIPHER_CONTEXT_DATA_SIZE 784 ++ ++typedef struct { ++ unsigned char data[SSL_CIPHER_CONTEXT_DATA_SIZE]; ++} sslCipherContext_t; ++ + /******************************************************************************/ + /* + Explicitly import these apis on Windows. If we're being included from the +@@ -220,6 +243,71 @@ + char *privBuf, int32 privLen, char *privPass, + char *trustedCABuf, int32 trustedCALen); + ++ ++/* ++ ARC4 (RC4) API ++*/ ++ ++SSLPUBLIC void matrixArc4Init(sslCipherContext_t *ctx, unsigned char *key, ++ int keylen); ++ ++SSLPUBLIC int matrixArc4(sslCipherContext_t *ctx, unsigned char *in, ++ unsigned char *out, int len); ++ ++/* ++ 3DES (Triple-DES) API ++*/ ++ ++SSLPUBLIC int matrix3desInit(sslCipherContext_t *ctx, unsigned char *IV, ++ unsigned char *key, int keylen); ++ ++SSLPUBLIC int matrix3desEncrypt(sslCipherContext_t *ctx, unsigned char *pt, ++ unsigned char *ct, int len); ++ ++SSLPUBLIC int matrix3desDecrypt(sslCipherContext_t *ctx, unsigned char *ct, ++ unsigned char *pt, int len); ++ ++/* ++ AES API ++*/ ++ ++SSLPUBLIC int matrixAesInit(sslCipherContext_t *ctx, unsigned char *IV, ++ unsigned char *key, int keylen); ++ ++SSLPUBLIC int matrixAesEncrypt(sslCipherContext_t *ctx, unsigned char *pt, ++ unsigned char *ct, int len); ++ ++SSLPUBLIC int matrixAesDecrypt(sslCipherContext_t *ctx, unsigned char *ct, ++ unsigned char *pt, int len); ++ ++/* ++ MD5 API ++*/ ++ ++SSLPUBLIC void matrixMd5Init(sslMd5Context_t *ctx); ++ ++SSLPUBLIC void matrixMd5Update(sslMd5Context_t *ctx, const unsigned char *buf, ++ unsigned long len); ++ ++SSLPUBLIC int matrixMd5Final(sslMd5Context_t *ctx, unsigned char *hash); ++ ++SSLPUBLIC unsigned char *matrixMd5Digest(const unsigned char *buf, ++ unsigned long len, unsigned char *hash); ++ ++/* ++ SHA1 API ++*/ ++ ++SSLPUBLIC void matrixSha1Init(sslSha1Context_t *ctx); ++ ++SSLPUBLIC void matrixSha1Update(sslSha1Context_t *ctx, const unsigned char *buf, ++ unsigned long len); ++ ++SSLPUBLIC int matrixSha1Final(sslSha1Context_t *ctx, unsigned char *hash); ++ ++SSLPUBLIC unsigned char *matrixSha1Digest(const unsigned char *buf, ++ unsigned long len, unsigned char *hash); ++ + /******************************************************************************/ + + #ifdef __cplusplus +diff -urN matrixssl.old/src/crypto/cryptoLayer.h matrixssl/src/crypto/cryptoLayer.h +--- matrixssl.old/src/crypto/cryptoLayer.h 2005-02-23 22:43:10.000000000 +0100 ++++ matrixssl/src/crypto/cryptoLayer.h 2005-03-06 01:32:33.000000000 +0100 +@@ -115,6 +115,7 @@ + */ + /* #define USE_FULL_CERT_PARSE */ + /* #define USE_MD2 */ ++#define USE_AES + + /* + Now that we've set up the required defines, include the crypto layer header +diff -urN matrixssl.old/src/crypto/peersec/aes.c matrixssl/src/crypto/peersec/aes.c +--- matrixssl.old/src/crypto/peersec/aes.c 1970-01-01 01:00:00.000000000 +0100 ++++ matrixssl/src/crypto/peersec/aes.c 2005-03-06 01:32:33.000000000 +0100 +@@ -0,0 +1,1708 @@ ++/* ++ * aes.c ++ * ++ * AES CBC block cipher implementation ++ */ ++/* ++ * Copyright (c) PeerSec Networks, 2002-2004. All Rights Reserved. ++ * The latest version of this code is available at http://www.matrixssl.org ++ * ++ * This software is open source; 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 General Public License does NOT permit incorporating this software ++ * into proprietary programs. If you are unable to comply with the GPL, a ++ * commercial license for this software may be purchased from PeerSec Networks ++ * at http://www.peersec.com ++ * ++ * This program is distributed in 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 ++ * http://www.gnu.org/copyleft/gpl.html ++ */ ++/******************************************************************************/ ++ ++#include "../cryptoLayer.h" ++ ++#ifdef USE_AES ++ ++/* The precomputed tables for AES */ ++/* ++Te0[x] = S [x].[02, 01, 01, 03]; ++Te1[x] = S [x].[03, 02, 01, 01]; ++Te2[x] = S [x].[01, 03, 02, 01]; ++Te3[x] = S [x].[01, 01, 03, 02]; ++Te4[x] = S [x].[01, 01, 01, 01]; ++ ++Td0[x] = Si[x].[0e, 09, 0d, 0b]; ++Td1[x] = Si[x].[0b, 0e, 09, 0d]; ++Td2[x] = Si[x].[0d, 0b, 0e, 09]; ++Td3[x] = Si[x].[09, 0d, 0b, 0e]; ++Td4[x] = Si[x].[01, 01, 01, 01]; ++*/ ++ ++static const ulong32 TE0[256] = { ++ 0xc66363a5UL, 0xf87c7c84UL, 0xee777799UL, 0xf67b7b8dUL, ++ 0xfff2f20dUL, 0xd66b6bbdUL, 0xde6f6fb1UL, 0x91c5c554UL, ++ 0x60303050UL, 0x02010103UL, 0xce6767a9UL, 0x562b2b7dUL, ++ 0xe7fefe19UL, 0xb5d7d762UL, 0x4dababe6UL, 0xec76769aUL, ++ 0x8fcaca45UL, 0x1f82829dUL, 0x89c9c940UL, 0xfa7d7d87UL, ++ 0xeffafa15UL, 0xb25959ebUL, 0x8e4747c9UL, 0xfbf0f00bUL, ++ 0x41adadecUL, 0xb3d4d467UL, 0x5fa2a2fdUL, 0x45afafeaUL, ++ 0x239c9cbfUL, 0x53a4a4f7UL, 0xe4727296UL, 0x9bc0c05bUL, ++ 0x75b7b7c2UL, 0xe1fdfd1cUL, 0x3d9393aeUL, 0x4c26266aUL, ++ 0x6c36365aUL, 0x7e3f3f41UL, 0xf5f7f702UL, 0x83cccc4fUL, ++ 0x6834345cUL, 0x51a5a5f4UL, 0xd1e5e534UL, 0xf9f1f108UL, ++ 0xe2717193UL, 0xabd8d873UL, 0x62313153UL, 0x2a15153fUL, ++ 0x0804040cUL, 0x95c7c752UL, 0x46232365UL, 0x9dc3c35eUL, ++ 0x30181828UL, 0x379696a1UL, 0x0a05050fUL, 0x2f9a9ab5UL, ++ 0x0e070709UL, 0x24121236UL, 0x1b80809bUL, 0xdfe2e23dUL, ++ 0xcdebeb26UL, 0x4e272769UL, 0x7fb2b2cdUL, 0xea75759fUL, ++ 0x1209091bUL, 0x1d83839eUL, 0x582c2c74UL, 0x341a1a2eUL, ++ 0x361b1b2dUL, 0xdc6e6eb2UL, 0xb45a5aeeUL, 0x5ba0a0fbUL, ++ 0xa45252f6UL, 0x763b3b4dUL, 0xb7d6d661UL, 0x7db3b3ceUL, ++ 0x5229297bUL, 0xdde3e33eUL, 0x5e2f2f71UL, 0x13848497UL, ++ 0xa65353f5UL, 0xb9d1d168UL, 0x00000000UL, 0xc1eded2cUL, ++ 0x40202060UL, 0xe3fcfc1fUL, 0x79b1b1c8UL, 0xb65b5bedUL, ++ 0xd46a6abeUL, 0x8dcbcb46UL, 0x67bebed9UL, 0x7239394bUL, ++ 0x944a4adeUL, 0x984c4cd4UL, 0xb05858e8UL, 0x85cfcf4aUL, ++ 0xbbd0d06bUL, 0xc5efef2aUL, 0x4faaaae5UL, 0xedfbfb16UL, ++ 0x864343c5UL, 0x9a4d4dd7UL, 0x66333355UL, 0x11858594UL, ++ 0x8a4545cfUL, 0xe9f9f910UL, 0x04020206UL, 0xfe7f7f81UL, ++ 0xa05050f0UL, 0x783c3c44UL, 0x259f9fbaUL, 0x4ba8a8e3UL, ++ 0xa25151f3UL, 0x5da3a3feUL, 0x804040c0UL, 0x058f8f8aUL, ++ 0x3f9292adUL, 0x219d9dbcUL, 0x70383848UL, 0xf1f5f504UL, ++ 0x63bcbcdfUL, 0x77b6b6c1UL, 0xafdada75UL, 0x42212163UL, ++ 0x20101030UL, 0xe5ffff1aUL, 0xfdf3f30eUL, 0xbfd2d26dUL, ++ 0x81cdcd4cUL, 0x180c0c14UL, 0x26131335UL, 0xc3ecec2fUL, ++ 0xbe5f5fe1UL, 0x359797a2UL, 0x884444ccUL, 0x2e171739UL, ++ 0x93c4c457UL, 0x55a7a7f2UL, 0xfc7e7e82UL, 0x7a3d3d47UL, ++ 0xc86464acUL, 0xba5d5de7UL, 0x3219192bUL, 0xe6737395UL, ++ 0xc06060a0UL, 0x19818198UL, 0x9e4f4fd1UL, 0xa3dcdc7fUL, ++ 0x44222266UL, 0x542a2a7eUL, 0x3b9090abUL, 0x0b888883UL, ++ 0x8c4646caUL, 0xc7eeee29UL, 0x6bb8b8d3UL, 0x2814143cUL, ++ 0xa7dede79UL, 0xbc5e5ee2UL, 0x160b0b1dUL, 0xaddbdb76UL, ++ 0xdbe0e03bUL, 0x64323256UL, 0x743a3a4eUL, 0x140a0a1eUL, ++ 0x924949dbUL, 0x0c06060aUL, 0x4824246cUL, 0xb85c5ce4UL, ++ 0x9fc2c25dUL, 0xbdd3d36eUL, 0x43acacefUL, 0xc46262a6UL, ++ 0x399191a8UL, 0x319595a4UL, 0xd3e4e437UL, 0xf279798bUL, ++ 0xd5e7e732UL, 0x8bc8c843UL, 0x6e373759UL, 0xda6d6db7UL, ++ 0x018d8d8cUL, 0xb1d5d564UL, 0x9c4e4ed2UL, 0x49a9a9e0UL, ++ 0xd86c6cb4UL, 0xac5656faUL, 0xf3f4f407UL, 0xcfeaea25UL, ++ 0xca6565afUL, 0xf47a7a8eUL, 0x47aeaee9UL, 0x10080818UL, ++ 0x6fbabad5UL, 0xf0787888UL, 0x4a25256fUL, 0x5c2e2e72UL, ++ 0x381c1c24UL, 0x57a6a6f1UL, 0x73b4b4c7UL, 0x97c6c651UL, ++ 0xcbe8e823UL, 0xa1dddd7cUL, 0xe874749cUL, 0x3e1f1f21UL, ++ 0x964b4bddUL, 0x61bdbddcUL, 0x0d8b8b86UL, 0x0f8a8a85UL, ++ 0xe0707090UL, 0x7c3e3e42UL, 0x71b5b5c4UL, 0xcc6666aaUL, ++ 0x904848d8UL, 0x06030305UL, 0xf7f6f601UL, 0x1c0e0e12UL, ++ 0xc26161a3UL, 0x6a35355fUL, 0xae5757f9UL, 0x69b9b9d0UL, ++ 0x17868691UL, 0x99c1c158UL, 0x3a1d1d27UL, 0x279e9eb9UL, ++ 0xd9e1e138UL, 0xebf8f813UL, 0x2b9898b3UL, 0x22111133UL, ++ 0xd26969bbUL, 0xa9d9d970UL, 0x078e8e89UL, 0x339494a7UL, ++ 0x2d9b9bb6UL, 0x3c1e1e22UL, 0x15878792UL, 0xc9e9e920UL, ++ 0x87cece49UL, 0xaa5555ffUL, 0x50282878UL, 0xa5dfdf7aUL, ++ 0x038c8c8fUL, 0x59a1a1f8UL, 0x09898980UL, 0x1a0d0d17UL, ++ 0x65bfbfdaUL, 0xd7e6e631UL, 0x844242c6UL, 0xd06868b8UL, ++ 0x824141c3UL, 0x299999b0UL, 0x5a2d2d77UL, 0x1e0f0f11UL, ++ 0x7bb0b0cbUL, 0xa85454fcUL, 0x6dbbbbd6UL, 0x2c16163aUL, ++}; ++ ++static const ulong32 Te4[256] = { ++ 0x63636363UL, 0x7c7c7c7cUL, 0x77777777UL, 0x7b7b7b7bUL, ++ 0xf2f2f2f2UL, 0x6b6b6b6bUL, 0x6f6f6f6fUL, 0xc5c5c5c5UL, ++ 0x30303030UL, 0x01010101UL, 0x67676767UL, 0x2b2b2b2bUL, ++ 0xfefefefeUL, 0xd7d7d7d7UL, 0xababababUL, 0x76767676UL, ++ 0xcacacacaUL, 0x82828282UL, 0xc9c9c9c9UL, 0x7d7d7d7dUL, ++ 0xfafafafaUL, 0x59595959UL, 0x47474747UL, 0xf0f0f0f0UL, ++ 0xadadadadUL, 0xd4d4d4d4UL, 0xa2a2a2a2UL, 0xafafafafUL, ++ 0x9c9c9c9cUL, 0xa4a4a4a4UL, 0x72727272UL, 0xc0c0c0c0UL, ++ 0xb7b7b7b7UL, 0xfdfdfdfdUL, 0x93939393UL, 0x26262626UL, ++ 0x36363636UL, 0x3f3f3f3fUL, 0xf7f7f7f7UL, 0xccccccccUL, ++ 0x34343434UL, 0xa5a5a5a5UL, 0xe5e5e5e5UL, 0xf1f1f1f1UL, ++ 0x71717171UL, 0xd8d8d8d8UL, 0x31313131UL, 0x15151515UL, ++ 0x04040404UL, 0xc7c7c7c7UL, 0x23232323UL, 0xc3c3c3c3UL, ++ 0x18181818UL, 0x96969696UL, 0x05050505UL, 0x9a9a9a9aUL, ++ 0x07070707UL, 0x12121212UL, 0x80808080UL, 0xe2e2e2e2UL, ++ 0xebebebebUL, 0x27272727UL, 0xb2b2b2b2UL, 0x75757575UL, ++ 0x09090909UL, 0x83838383UL, 0x2c2c2c2cUL, 0x1a1a1a1aUL, ++ 0x1b1b1b1bUL, 0x6e6e6e6eUL, 0x5a5a5a5aUL, 0xa0a0a0a0UL, ++ 0x52525252UL, 0x3b3b3b3bUL, 0xd6d6d6d6UL, 0xb3b3b3b3UL, ++ 0x29292929UL, 0xe3e3e3e3UL, 0x2f2f2f2fUL, 0x84848484UL, ++ 0x53535353UL, 0xd1d1d1d1UL, 0x00000000UL, 0xededededUL, ++ 0x20202020UL, 0xfcfcfcfcUL, 0xb1b1b1b1UL, 0x5b5b5b5bUL, ++ 0x6a6a6a6aUL, 0xcbcbcbcbUL, 0xbebebebeUL, 0x39393939UL, ++ 0x4a4a4a4aUL, 0x4c4c4c4cUL, 0x58585858UL, 0xcfcfcfcfUL, ++ 0xd0d0d0d0UL, 0xefefefefUL, 0xaaaaaaaaUL, 0xfbfbfbfbUL, ++ 0x43434343UL, 0x4d4d4d4dUL, 0x33333333UL, 0x85858585UL, ++ 0x45454545UL, 0xf9f9f9f9UL, 0x02020202UL, 0x7f7f7f7fUL, ++ 0x50505050UL, 0x3c3c3c3cUL, 0x9f9f9f9fUL, 0xa8a8a8a8UL, ++ 0x51515151UL, 0xa3a3a3a3UL, 0x40404040UL, 0x8f8f8f8fUL, ++ 0x92929292UL, 0x9d9d9d9dUL, 0x38383838UL, 0xf5f5f5f5UL, ++ 0xbcbcbcbcUL, 0xb6b6b6b6UL, 0xdadadadaUL, 0x21212121UL, ++ 0x10101010UL, 0xffffffffUL, 0xf3f3f3f3UL, 0xd2d2d2d2UL, ++ 0xcdcdcdcdUL, 0x0c0c0c0cUL, 0x13131313UL, 0xececececUL, ++ 0x5f5f5f5fUL, 0x97979797UL, 0x44444444UL, 0x17171717UL, ++ 0xc4c4c4c4UL, 0xa7a7a7a7UL, 0x7e7e7e7eUL, 0x3d3d3d3dUL, ++ 0x64646464UL, 0x5d5d5d5dUL, 0x19191919UL, 0x73737373UL, ++ 0x60606060UL, 0x81818181UL, 0x4f4f4f4fUL, 0xdcdcdcdcUL, ++ 0x22222222UL, 0x2a2a2a2aUL, 0x90909090UL, 0x88888888UL, ++ 0x46464646UL, 0xeeeeeeeeUL, 0xb8b8b8b8UL, 0x14141414UL, ++ 0xdedededeUL, 0x5e5e5e5eUL, 0x0b0b0b0bUL, 0xdbdbdbdbUL, ++ 0xe0e0e0e0UL, 0x32323232UL, 0x3a3a3a3aUL, 0x0a0a0a0aUL, ++ 0x49494949UL, 0x06060606UL, 0x24242424UL, 0x5c5c5c5cUL, ++ 0xc2c2c2c2UL, 0xd3d3d3d3UL, 0xacacacacUL, 0x62626262UL, ++ 0x91919191UL, 0x95959595UL, 0xe4e4e4e4UL, 0x79797979UL, ++ 0xe7e7e7e7UL, 0xc8c8c8c8UL, 0x37373737UL, 0x6d6d6d6dUL, ++ 0x8d8d8d8dUL, 0xd5d5d5d5UL, 0x4e4e4e4eUL, 0xa9a9a9a9UL, ++ 0x6c6c6c6cUL, 0x56565656UL, 0xf4f4f4f4UL, 0xeaeaeaeaUL, ++ 0x65656565UL, 0x7a7a7a7aUL, 0xaeaeaeaeUL, 0x08080808UL, ++ 0xbabababaUL, 0x78787878UL, 0x25252525UL, 0x2e2e2e2eUL, ++ 0x1c1c1c1cUL, 0xa6a6a6a6UL, 0xb4b4b4b4UL, 0xc6c6c6c6UL, ++ 0xe8e8e8e8UL, 0xddddddddUL, 0x74747474UL, 0x1f1f1f1fUL, ++ 0x4b4b4b4bUL, 0xbdbdbdbdUL, 0x8b8b8b8bUL, 0x8a8a8a8aUL, ++ 0x70707070UL, 0x3e3e3e3eUL, 0xb5b5b5b5UL, 0x66666666UL, ++ 0x48484848UL, 0x03030303UL, 0xf6f6f6f6UL, 0x0e0e0e0eUL, ++ 0x61616161UL, 0x35353535UL, 0x57575757UL, 0xb9b9b9b9UL, ++ 0x86868686UL, 0xc1c1c1c1UL, 0x1d1d1d1dUL, 0x9e9e9e9eUL, ++ 0xe1e1e1e1UL, 0xf8f8f8f8UL, 0x98989898UL, 0x11111111UL, ++ 0x69696969UL, 0xd9d9d9d9UL, 0x8e8e8e8eUL, 0x94949494UL, ++ 0x9b9b9b9bUL, 0x1e1e1e1eUL, 0x87878787UL, 0xe9e9e9e9UL, ++ 0xcecececeUL, 0x55555555UL, 0x28282828UL, 0xdfdfdfdfUL, ++ 0x8c8c8c8cUL, 0xa1a1a1a1UL, 0x89898989UL, 0x0d0d0d0dUL, ++ 0xbfbfbfbfUL, 0xe6e6e6e6UL, 0x42424242UL, 0x68686868UL, ++ 0x41414141UL, 0x99999999UL, 0x2d2d2d2dUL, 0x0f0f0f0fUL, ++ 0xb0b0b0b0UL, 0x54545454UL, 0xbbbbbbbbUL, 0x16161616UL, ++}; ++ ++static const ulong32 TD0[256] = { ++ 0x51f4a750UL, 0x7e416553UL, 0x1a17a4c3UL, 0x3a275e96UL, ++ 0x3bab6bcbUL, 0x1f9d45f1UL, 0xacfa58abUL, 0x4be30393UL, ++ 0x2030fa55UL, 0xad766df6UL, 0x88cc7691UL, 0xf5024c25UL, ++ 0x4fe5d7fcUL, 0xc52acbd7UL, 0x26354480UL, 0xb562a38fUL, ++ 0xdeb15a49UL, 0x25ba1b67UL, 0x45ea0e98UL, 0x5dfec0e1UL, ++ 0xc32f7502UL, 0x814cf012UL, 0x8d4697a3UL, 0x6bd3f9c6UL, ++ 0x038f5fe7UL, 0x15929c95UL, 0xbf6d7aebUL, 0x955259daUL, ++ 0xd4be832dUL, 0x587421d3UL, 0x49e06929UL, 0x8ec9c844UL, ++ 0x75c2896aUL, 0xf48e7978UL, 0x99583e6bUL, 0x27b971ddUL, ++ 0xbee14fb6UL, 0xf088ad17UL, 0xc920ac66UL, 0x7dce3ab4UL, ++ 0x63df4a18UL, 0xe51a3182UL, 0x97513360UL, 0x62537f45UL, ++ 0xb16477e0UL, 0xbb6bae84UL, 0xfe81a01cUL, 0xf9082b94UL, ++ 0x70486858UL, 0x8f45fd19UL, 0x94de6c87UL, 0x527bf8b7UL, ++ 0xab73d323UL, 0x724b02e2UL, 0xe31f8f57UL, 0x6655ab2aUL, ++ 0xb2eb2807UL, 0x2fb5c203UL, 0x86c57b9aUL, 0xd33708a5UL, ++ 0x302887f2UL, 0x23bfa5b2UL, 0x02036abaUL, 0xed16825cUL, ++ 0x8acf1c2bUL, 0xa779b492UL, 0xf307f2f0UL, 0x4e69e2a1UL, ++ 0x65daf4cdUL, 0x0605bed5UL, 0xd134621fUL, 0xc4a6fe8aUL, ++ 0x342e539dUL, 0xa2f355a0UL, 0x058ae132UL, 0xa4f6eb75UL, ++ 0x0b83ec39UL, 0x4060efaaUL, 0x5e719f06UL, 0xbd6e1051UL, ++ 0x3e218af9UL, 0x96dd063dUL, 0xdd3e05aeUL, 0x4de6bd46UL, ++ 0x91548db5UL, 0x71c45d05UL, 0x0406d46fUL, 0x605015ffUL, ++ 0x1998fb24UL, 0xd6bde997UL, 0x894043ccUL, 0x67d99e77UL, ++ 0xb0e842bdUL, 0x07898b88UL, 0xe7195b38UL, 0x79c8eedbUL, ++ 0xa17c0a47UL, 0x7c420fe9UL, 0xf8841ec9UL, 0x00000000UL, ++ 0x09808683UL, 0x322bed48UL, 0x1e1170acUL, 0x6c5a724eUL, ++ 0xfd0efffbUL, 0x0f853856UL, 0x3daed51eUL, 0x362d3927UL, ++ 0x0a0fd964UL, 0x685ca621UL, 0x9b5b54d1UL, 0x24362e3aUL, ++ 0x0c0a67b1UL, 0x9357e70fUL, 0xb4ee96d2UL, 0x1b9b919eUL, ++ 0x80c0c54fUL, 0x61dc20a2UL, 0x5a774b69UL, 0x1c121a16UL, ++ 0xe293ba0aUL, 0xc0a02ae5UL, 0x3c22e043UL, 0x121b171dUL, ++ 0x0e090d0bUL, 0xf28bc7adUL, 0x2db6a8b9UL, 0x141ea9c8UL, ++ 0x57f11985UL, 0xaf75074cUL, 0xee99ddbbUL, 0xa37f60fdUL, ++ 0xf701269fUL, 0x5c72f5bcUL, 0x44663bc5UL, 0x5bfb7e34UL, ++ 0x8b432976UL, 0xcb23c6dcUL, 0xb6edfc68UL, 0xb8e4f163UL, ++ 0xd731dccaUL, 0x42638510UL, 0x13972240UL, 0x84c61120UL, ++ 0x854a247dUL, 0xd2bb3df8UL, 0xaef93211UL, 0xc729a16dUL, ++ 0x1d9e2f4bUL, 0xdcb230f3UL, 0x0d8652ecUL, 0x77c1e3d0UL, ++ 0x2bb3166cUL, 0xa970b999UL, 0x119448faUL, 0x47e96422UL, ++ 0xa8fc8cc4UL, 0xa0f03f1aUL, 0x567d2cd8UL, 0x223390efUL, ++ 0x87494ec7UL, 0xd938d1c1UL, 0x8ccaa2feUL, 0x98d40b36UL, ++ 0xa6f581cfUL, 0xa57ade28UL, 0xdab78e26UL, 0x3fadbfa4UL, ++ 0x2c3a9de4UL, 0x5078920dUL, 0x6a5fcc9bUL, 0x547e4662UL, ++ 0xf68d13c2UL, 0x90d8b8e8UL, 0x2e39f75eUL, 0x82c3aff5UL, ++ 0x9f5d80beUL, 0x69d0937cUL, 0x6fd52da9UL, 0xcf2512b3UL, ++ 0xc8ac993bUL, 0x10187da7UL, 0xe89c636eUL, 0xdb3bbb7bUL, ++ 0xcd267809UL, 0x6e5918f4UL, 0xec9ab701UL, 0x834f9aa8UL, ++ 0xe6956e65UL, 0xaaffe67eUL, 0x21bccf08UL, 0xef15e8e6UL, ++ 0xbae79bd9UL, 0x4a6f36ceUL, 0xea9f09d4UL, 0x29b07cd6UL, ++ 0x31a4b2afUL, 0x2a3f2331UL, 0xc6a59430UL, 0x35a266c0UL, ++ 0x744ebc37UL, 0xfc82caa6UL, 0xe090d0b0UL, 0x33a7d815UL, ++ 0xf104984aUL, 0x41ecdaf7UL, 0x7fcd500eUL, 0x1791f62fUL, ++ 0x764dd68dUL, 0x43efb04dUL, 0xccaa4d54UL, 0xe49604dfUL, ++ 0x9ed1b5e3UL, 0x4c6a881bUL, 0xc12c1fb8UL, 0x4665517fUL, ++ 0x9d5eea04UL, 0x018c355dUL, 0xfa877473UL, 0xfb0b412eUL, ++ 0xb3671d5aUL, 0x92dbd252UL, 0xe9105633UL, 0x6dd64713UL, ++ 0x9ad7618cUL, 0x37a10c7aUL, 0x59f8148eUL, 0xeb133c89UL, ++ 0xcea927eeUL, 0xb761c935UL, 0xe11ce5edUL, 0x7a47b13cUL, ++ 0x9cd2df59UL, 0x55f2733fUL, 0x1814ce79UL, 0x73c737bfUL, ++ 0x53f7cdeaUL, 0x5ffdaa5bUL, 0xdf3d6f14UL, 0x7844db86UL, ++ 0xcaaff381UL, 0xb968c43eUL, 0x3824342cUL, 0xc2a3405fUL, ++ 0x161dc372UL, 0xbce2250cUL, 0x283c498bUL, 0xff0d9541UL, ++ 0x39a80171UL, 0x080cb3deUL, 0xd8b4e49cUL, 0x6456c190UL, ++ 0x7bcb8461UL, 0xd532b670UL, 0x486c5c74UL, 0xd0b85742UL, ++}; ++ ++static const ulong32 Td4[256] = { ++ 0x52525252UL, 0x09090909UL, 0x6a6a6a6aUL, 0xd5d5d5d5UL, ++ 0x30303030UL, 0x36363636UL, 0xa5a5a5a5UL, 0x38383838UL, ++ 0xbfbfbfbfUL, 0x40404040UL, 0xa3a3a3a3UL, 0x9e9e9e9eUL, ++ 0x81818181UL, 0xf3f3f3f3UL, 0xd7d7d7d7UL, 0xfbfbfbfbUL, ++ 0x7c7c7c7cUL, 0xe3e3e3e3UL, 0x39393939UL, 0x82828282UL, ++ 0x9b9b9b9bUL, 0x2f2f2f2fUL, 0xffffffffUL, 0x87878787UL, ++ 0x34343434UL, 0x8e8e8e8eUL, 0x43434343UL, 0x44444444UL, ++ 0xc4c4c4c4UL, 0xdedededeUL, 0xe9e9e9e9UL, 0xcbcbcbcbUL, ++ 0x54545454UL, 0x7b7b7b7bUL, 0x94949494UL, 0x32323232UL, ++ 0xa6a6a6a6UL, 0xc2c2c2c2UL, 0x23232323UL, 0x3d3d3d3dUL, ++ 0xeeeeeeeeUL, 0x4c4c4c4cUL, 0x95959595UL, 0x0b0b0b0bUL, ++ 0x42424242UL, 0xfafafafaUL, 0xc3c3c3c3UL, 0x4e4e4e4eUL, ++ 0x08080808UL, 0x2e2e2e2eUL, 0xa1a1a1a1UL, 0x66666666UL, ++ 0x28282828UL, 0xd9d9d9d9UL, 0x24242424UL, 0xb2b2b2b2UL, ++ 0x76767676UL, 0x5b5b5b5bUL, 0xa2a2a2a2UL, 0x49494949UL, ++ 0x6d6d6d6dUL, 0x8b8b8b8bUL, 0xd1d1d1d1UL, 0x25252525UL, ++ 0x72727272UL, 0xf8f8f8f8UL, 0xf6f6f6f6UL, 0x64646464UL, ++ 0x86868686UL, 0x68686868UL, 0x98989898UL, 0x16161616UL, ++ 0xd4d4d4d4UL, 0xa4a4a4a4UL, 0x5c5c5c5cUL, 0xccccccccUL, ++ 0x5d5d5d5dUL, 0x65656565UL, 0xb6b6b6b6UL, 0x92929292UL, ++ 0x6c6c6c6cUL, 0x70707070UL, 0x48484848UL, 0x50505050UL, ++ 0xfdfdfdfdUL, 0xededededUL, 0xb9b9b9b9UL, 0xdadadadaUL, ++ 0x5e5e5e5eUL, 0x15151515UL, 0x46464646UL, 0x57575757UL, ++ 0xa7a7a7a7UL, 0x8d8d8d8dUL, 0x9d9d9d9dUL, 0x84848484UL, ++ 0x90909090UL, 0xd8d8d8d8UL, 0xababababUL, 0x00000000UL, ++ 0x8c8c8c8cUL, 0xbcbcbcbcUL, 0xd3d3d3d3UL, 0x0a0a0a0aUL, ++ 0xf7f7f7f7UL, 0xe4e4e4e4UL, 0x58585858UL, 0x05050505UL, ++ 0xb8b8b8b8UL, 0xb3b3b3b3UL, 0x45454545UL, 0x06060606UL, ++ 0xd0d0d0d0UL, 0x2c2c2c2cUL, 0x1e1e1e1eUL, 0x8f8f8f8fUL, ++ 0xcacacacaUL, 0x3f3f3f3fUL, 0x0f0f0f0fUL, 0x02020202UL, ++ 0xc1c1c1c1UL, 0xafafafafUL, 0xbdbdbdbdUL, 0x03030303UL, ++ 0x01010101UL, 0x13131313UL, 0x8a8a8a8aUL, 0x6b6b6b6bUL, ++ 0x3a3a3a3aUL, 0x91919191UL, 0x11111111UL, 0x41414141UL, ++ 0x4f4f4f4fUL, 0x67676767UL, 0xdcdcdcdcUL, 0xeaeaeaeaUL, ++ 0x97979797UL, 0xf2f2f2f2UL, 0xcfcfcfcfUL, 0xcecececeUL, ++ 0xf0f0f0f0UL, 0xb4b4b4b4UL, 0xe6e6e6e6UL, 0x73737373UL, ++ 0x96969696UL, 0xacacacacUL, 0x74747474UL, 0x22222222UL, ++ 0xe7e7e7e7UL, 0xadadadadUL, 0x35353535UL, 0x85858585UL, ++ 0xe2e2e2e2UL, 0xf9f9f9f9UL, 0x37373737UL, 0xe8e8e8e8UL, ++ 0x1c1c1c1cUL, 0x75757575UL, 0xdfdfdfdfUL, 0x6e6e6e6eUL, ++ 0x47474747UL, 0xf1f1f1f1UL, 0x1a1a1a1aUL, 0x71717171UL, ++ 0x1d1d1d1dUL, 0x29292929UL, 0xc5c5c5c5UL, 0x89898989UL, ++ 0x6f6f6f6fUL, 0xb7b7b7b7UL, 0x62626262UL, 0x0e0e0e0eUL, ++ 0xaaaaaaaaUL, 0x18181818UL, 0xbebebebeUL, 0x1b1b1b1bUL, ++ 0xfcfcfcfcUL, 0x56565656UL, 0x3e3e3e3eUL, 0x4b4b4b4bUL, ++ 0xc6c6c6c6UL, 0xd2d2d2d2UL, 0x79797979UL, 0x20202020UL, ++ 0x9a9a9a9aUL, 0xdbdbdbdbUL, 0xc0c0c0c0UL, 0xfefefefeUL, ++ 0x78787878UL, 0xcdcdcdcdUL, 0x5a5a5a5aUL, 0xf4f4f4f4UL, ++ 0x1f1f1f1fUL, 0xddddddddUL, 0xa8a8a8a8UL, 0x33333333UL, ++ 0x88888888UL, 0x07070707UL, 0xc7c7c7c7UL, 0x31313131UL, ++ 0xb1b1b1b1UL, 0x12121212UL, 0x10101010UL, 0x59595959UL, ++ 0x27272727UL, 0x80808080UL, 0xececececUL, 0x5f5f5f5fUL, ++ 0x60606060UL, 0x51515151UL, 0x7f7f7f7fUL, 0xa9a9a9a9UL, ++ 0x19191919UL, 0xb5b5b5b5UL, 0x4a4a4a4aUL, 0x0d0d0d0dUL, ++ 0x2d2d2d2dUL, 0xe5e5e5e5UL, 0x7a7a7a7aUL, 0x9f9f9f9fUL, ++ 0x93939393UL, 0xc9c9c9c9UL, 0x9c9c9c9cUL, 0xefefefefUL, ++ 0xa0a0a0a0UL, 0xe0e0e0e0UL, 0x3b3b3b3bUL, 0x4d4d4d4dUL, ++ 0xaeaeaeaeUL, 0x2a2a2a2aUL, 0xf5f5f5f5UL, 0xb0b0b0b0UL, ++ 0xc8c8c8c8UL, 0xebebebebUL, 0xbbbbbbbbUL, 0x3c3c3c3cUL, ++ 0x83838383UL, 0x53535353UL, 0x99999999UL, 0x61616161UL, ++ 0x17171717UL, 0x2b2b2b2bUL, 0x04040404UL, 0x7e7e7e7eUL, ++ 0xbabababaUL, 0x77777777UL, 0xd6d6d6d6UL, 0x26262626UL, ++ 0xe1e1e1e1UL, 0x69696969UL, 0x14141414UL, 0x63636363UL, ++ 0x55555555UL, 0x21212121UL, 0x0c0c0c0cUL, 0x7d7d7d7dUL, ++}; ++ ++#ifdef SMALL_CODE ++ ++#define Te0(x) TE0[x] ++#define Te1(x) ROR(TE0[x], 8) ++#define Te2(x) ROR(TE0[x], 16) ++#define Te3(x) ROR(TE0[x], 24) ++ ++#define Td0(x) TD0[x] ++#define Td1(x) ROR(TD0[x], 8) ++#define Td2(x) ROR(TD0[x], 16) ++#define Td3(x) ROR(TD0[x], 24) ++ ++#define Te4_0 0x000000FF & Te4 ++#define Te4_1 0x0000FF00 & Te4 ++#define Te4_2 0x00FF0000 & Te4 ++#define Te4_3 0xFF000000 & Te4 ++ ++#else /* SMALL_CODE */ ++ ++#define Te0(x) TE0[x] ++#define Te1(x) TE1[x] ++#define Te2(x) TE2[x] ++#define Te3(x) TE3[x] ++ ++#define Td0(x) TD0[x] ++#define Td1(x) TD1[x] ++#define Td2(x) TD2[x] ++#define Td3(x) TD3[x] ++ ++static const ulong32 TE1[256] = { ++ 0xa5c66363UL, 0x84f87c7cUL, 0x99ee7777UL, 0x8df67b7bUL, ++ 0x0dfff2f2UL, 0xbdd66b6bUL, 0xb1de6f6fUL, 0x5491c5c5UL, ++ 0x50603030UL, 0x03020101UL, 0xa9ce6767UL, 0x7d562b2bUL, ++ 0x19e7fefeUL, 0x62b5d7d7UL, 0xe64dababUL, 0x9aec7676UL, ++ 0x458fcacaUL, 0x9d1f8282UL, 0x4089c9c9UL, 0x87fa7d7dUL, ++ 0x15effafaUL, 0xebb25959UL, 0xc98e4747UL, 0x0bfbf0f0UL, ++ 0xec41adadUL, 0x67b3d4d4UL, 0xfd5fa2a2UL, 0xea45afafUL, ++ 0xbf239c9cUL, 0xf753a4a4UL, 0x96e47272UL, 0x5b9bc0c0UL, ++ 0xc275b7b7UL, 0x1ce1fdfdUL, 0xae3d9393UL, 0x6a4c2626UL, ++ 0x5a6c3636UL, 0x417e3f3fUL, 0x02f5f7f7UL, 0x4f83ccccUL, ++ 0x5c683434UL, 0xf451a5a5UL, 0x34d1e5e5UL, 0x08f9f1f1UL, ++ 0x93e27171UL, 0x73abd8d8UL, 0x53623131UL, 0x3f2a1515UL, ++ 0x0c080404UL, 0x5295c7c7UL, 0x65462323UL, 0x5e9dc3c3UL, ++ 0x28301818UL, 0xa1379696UL, 0x0f0a0505UL, 0xb52f9a9aUL, ++ 0x090e0707UL, 0x36241212UL, 0x9b1b8080UL, 0x3ddfe2e2UL, ++ 0x26cdebebUL, 0x694e2727UL, 0xcd7fb2b2UL, 0x9fea7575UL, ++ 0x1b120909UL, 0x9e1d8383UL, 0x74582c2cUL, 0x2e341a1aUL, ++ 0x2d361b1bUL, 0xb2dc6e6eUL, 0xeeb45a5aUL, 0xfb5ba0a0UL, ++ 0xf6a45252UL, 0x4d763b3bUL, 0x61b7d6d6UL, 0xce7db3b3UL, ++ 0x7b522929UL, 0x3edde3e3UL, 0x715e2f2fUL, 0x97138484UL, ++ 0xf5a65353UL, 0x68b9d1d1UL, 0x00000000UL, 0x2cc1ededUL, ++ 0x60402020UL, 0x1fe3fcfcUL, 0xc879b1b1UL, 0xedb65b5bUL, ++ 0xbed46a6aUL, 0x468dcbcbUL, 0xd967bebeUL, 0x4b723939UL, ++ 0xde944a4aUL, 0xd4984c4cUL, 0xe8b05858UL, 0x4a85cfcfUL, ++ 0x6bbbd0d0UL, 0x2ac5efefUL, 0xe54faaaaUL, 0x16edfbfbUL, ++ 0xc5864343UL, 0xd79a4d4dUL, 0x55663333UL, 0x94118585UL, ++ 0xcf8a4545UL, 0x10e9f9f9UL, 0x06040202UL, 0x81fe7f7fUL, ++ 0xf0a05050UL, 0x44783c3cUL, 0xba259f9fUL, 0xe34ba8a8UL, ++ 0xf3a25151UL, 0xfe5da3a3UL, 0xc0804040UL, 0x8a058f8fUL, ++ 0xad3f9292UL, 0xbc219d9dUL, 0x48703838UL, 0x04f1f5f5UL, ++ 0xdf63bcbcUL, 0xc177b6b6UL, 0x75afdadaUL, 0x63422121UL, ++ 0x30201010UL, 0x1ae5ffffUL, 0x0efdf3f3UL, 0x6dbfd2d2UL, ++ 0x4c81cdcdUL, 0x14180c0cUL, 0x35261313UL, 0x2fc3ececUL, ++ 0xe1be5f5fUL, 0xa2359797UL, 0xcc884444UL, 0x392e1717UL, ++ 0x5793c4c4UL, 0xf255a7a7UL, 0x82fc7e7eUL, 0x477a3d3dUL, ++ 0xacc86464UL, 0xe7ba5d5dUL, 0x2b321919UL, 0x95e67373UL, ++ 0xa0c06060UL, 0x98198181UL, 0xd19e4f4fUL, 0x7fa3dcdcUL, ++ 0x66442222UL, 0x7e542a2aUL, 0xab3b9090UL, 0x830b8888UL, ++ 0xca8c4646UL, 0x29c7eeeeUL, 0xd36bb8b8UL, 0x3c281414UL, ++ 0x79a7dedeUL, 0xe2bc5e5eUL, 0x1d160b0bUL, 0x76addbdbUL, ++ 0x3bdbe0e0UL, 0x56643232UL, 0x4e743a3aUL, 0x1e140a0aUL, ++ 0xdb924949UL, 0x0a0c0606UL, 0x6c482424UL, 0xe4b85c5cUL, ++ 0x5d9fc2c2UL, 0x6ebdd3d3UL, 0xef43acacUL, 0xa6c46262UL, ++ 0xa8399191UL, 0xa4319595UL, 0x37d3e4e4UL, 0x8bf27979UL, ++ 0x32d5e7e7UL, 0x438bc8c8UL, 0x596e3737UL, 0xb7da6d6dUL, ++ 0x8c018d8dUL, 0x64b1d5d5UL, 0xd29c4e4eUL, 0xe049a9a9UL, ++ 0xb4d86c6cUL, 0xfaac5656UL, 0x07f3f4f4UL, 0x25cfeaeaUL, ++ 0xafca6565UL, 0x8ef47a7aUL, 0xe947aeaeUL, 0x18100808UL, ++ 0xd56fbabaUL, 0x88f07878UL, 0x6f4a2525UL, 0x725c2e2eUL, ++ 0x24381c1cUL, 0xf157a6a6UL, 0xc773b4b4UL, 0x5197c6c6UL, ++ 0x23cbe8e8UL, 0x7ca1ddddUL, 0x9ce87474UL, 0x213e1f1fUL, ++ 0xdd964b4bUL, 0xdc61bdbdUL, 0x860d8b8bUL, 0x850f8a8aUL, ++ 0x90e07070UL, 0x427c3e3eUL, 0xc471b5b5UL, 0xaacc6666UL, ++ 0xd8904848UL, 0x05060303UL, 0x01f7f6f6UL, 0x121c0e0eUL, ++ 0xa3c26161UL, 0x5f6a3535UL, 0xf9ae5757UL, 0xd069b9b9UL, ++ 0x91178686UL, 0x5899c1c1UL, 0x273a1d1dUL, 0xb9279e9eUL, ++ 0x38d9e1e1UL, 0x13ebf8f8UL, 0xb32b9898UL, 0x33221111UL, ++ 0xbbd26969UL, 0x70a9d9d9UL, 0x89078e8eUL, 0xa7339494UL, ++ 0xb62d9b9bUL, 0x223c1e1eUL, 0x92158787UL, 0x20c9e9e9UL, ++ 0x4987ceceUL, 0xffaa5555UL, 0x78502828UL, 0x7aa5dfdfUL, ++ 0x8f038c8cUL, 0xf859a1a1UL, 0x80098989UL, 0x171a0d0dUL, ++ 0xda65bfbfUL, 0x31d7e6e6UL, 0xc6844242UL, 0xb8d06868UL, ++ 0xc3824141UL, 0xb0299999UL, 0x775a2d2dUL, 0x111e0f0fUL, ++ 0xcb7bb0b0UL, 0xfca85454UL, 0xd66dbbbbUL, 0x3a2c1616UL, ++}; ++static const ulong32 TE2[256] = { ++ 0x63a5c663UL, 0x7c84f87cUL, 0x7799ee77UL, 0x7b8df67bUL, ++ 0xf20dfff2UL, 0x6bbdd66bUL, 0x6fb1de6fUL, 0xc55491c5UL, ++ 0x30506030UL, 0x01030201UL, 0x67a9ce67UL, 0x2b7d562bUL, ++ 0xfe19e7feUL, 0xd762b5d7UL, 0xabe64dabUL, 0x769aec76UL, ++ 0xca458fcaUL, 0x829d1f82UL, 0xc94089c9UL, 0x7d87fa7dUL, ++ 0xfa15effaUL, 0x59ebb259UL, 0x47c98e47UL, 0xf00bfbf0UL, ++ 0xadec41adUL, 0xd467b3d4UL, 0xa2fd5fa2UL, 0xafea45afUL, ++ 0x9cbf239cUL, 0xa4f753a4UL, 0x7296e472UL, 0xc05b9bc0UL, ++ 0xb7c275b7UL, 0xfd1ce1fdUL, 0x93ae3d93UL, 0x266a4c26UL, ++ 0x365a6c36UL, 0x3f417e3fUL, 0xf702f5f7UL, 0xcc4f83ccUL, ++ 0x345c6834UL, 0xa5f451a5UL, 0xe534d1e5UL, 0xf108f9f1UL, ++ 0x7193e271UL, 0xd873abd8UL, 0x31536231UL, 0x153f2a15UL, ++ 0x040c0804UL, 0xc75295c7UL, 0x23654623UL, 0xc35e9dc3UL, ++ 0x18283018UL, 0x96a13796UL, 0x050f0a05UL, 0x9ab52f9aUL, ++ 0x07090e07UL, 0x12362412UL, 0x809b1b80UL, 0xe23ddfe2UL, ++ 0xeb26cdebUL, 0x27694e27UL, 0xb2cd7fb2UL, 0x759fea75UL, ++ 0x091b1209UL, 0x839e1d83UL, 0x2c74582cUL, 0x1a2e341aUL, ++ 0x1b2d361bUL, 0x6eb2dc6eUL, 0x5aeeb45aUL, 0xa0fb5ba0UL, ++ 0x52f6a452UL, 0x3b4d763bUL, 0xd661b7d6UL, 0xb3ce7db3UL, ++ 0x297b5229UL, 0xe33edde3UL, 0x2f715e2fUL, 0x84971384UL, ++ 0x53f5a653UL, 0xd168b9d1UL, 0x00000000UL, 0xed2cc1edUL, ++ 0x20604020UL, 0xfc1fe3fcUL, 0xb1c879b1UL, 0x5bedb65bUL, ++ 0x6abed46aUL, 0xcb468dcbUL, 0xbed967beUL, 0x394b7239UL, ++ 0x4ade944aUL, 0x4cd4984cUL, 0x58e8b058UL, 0xcf4a85cfUL, ++ 0xd06bbbd0UL, 0xef2ac5efUL, 0xaae54faaUL, 0xfb16edfbUL, ++ 0x43c58643UL, 0x4dd79a4dUL, 0x33556633UL, 0x85941185UL, ++ 0x45cf8a45UL, 0xf910e9f9UL, 0x02060402UL, 0x7f81fe7fUL, ++ 0x50f0a050UL, 0x3c44783cUL, 0x9fba259fUL, 0xa8e34ba8UL, ++ 0x51f3a251UL, 0xa3fe5da3UL, 0x40c08040UL, 0x8f8a058fUL, ++ 0x92ad3f92UL, 0x9dbc219dUL, 0x38487038UL, 0xf504f1f5UL, ++ 0xbcdf63bcUL, 0xb6c177b6UL, 0xda75afdaUL, 0x21634221UL, ++ 0x10302010UL, 0xff1ae5ffUL, 0xf30efdf3UL, 0xd26dbfd2UL, ++ 0xcd4c81cdUL, 0x0c14180cUL, 0x13352613UL, 0xec2fc3ecUL, ++ 0x5fe1be5fUL, 0x97a23597UL, 0x44cc8844UL, 0x17392e17UL, ++ 0xc45793c4UL, 0xa7f255a7UL, 0x7e82fc7eUL, 0x3d477a3dUL, ++ 0x64acc864UL, 0x5de7ba5dUL, 0x192b3219UL, 0x7395e673UL, ++ 0x60a0c060UL, 0x81981981UL, 0x4fd19e4fUL, 0xdc7fa3dcUL, ++ 0x22664422UL, 0x2a7e542aUL, 0x90ab3b90UL, 0x88830b88UL, ++ 0x46ca8c46UL, 0xee29c7eeUL, 0xb8d36bb8UL, 0x143c2814UL, ++ 0xde79a7deUL, 0x5ee2bc5eUL, 0x0b1d160bUL, 0xdb76addbUL, ++ 0xe03bdbe0UL, 0x32566432UL, 0x3a4e743aUL, 0x0a1e140aUL, ++ 0x49db9249UL, 0x060a0c06UL, 0x246c4824UL, 0x5ce4b85cUL, ++ 0xc25d9fc2UL, 0xd36ebdd3UL, 0xacef43acUL, 0x62a6c462UL, ++ 0x91a83991UL, 0x95a43195UL, 0xe437d3e4UL, 0x798bf279UL, ++ 0xe732d5e7UL, 0xc8438bc8UL, 0x37596e37UL, 0x6db7da6dUL, ++ 0x8d8c018dUL, 0xd564b1d5UL, 0x4ed29c4eUL, 0xa9e049a9UL, ++ 0x6cb4d86cUL, 0x56faac56UL, 0xf407f3f4UL, 0xea25cfeaUL, ++ 0x65afca65UL, 0x7a8ef47aUL, 0xaee947aeUL, 0x08181008UL, ++ 0xbad56fbaUL, 0x7888f078UL, 0x256f4a25UL, 0x2e725c2eUL, ++ 0x1c24381cUL, 0xa6f157a6UL, 0xb4c773b4UL, 0xc65197c6UL, ++ 0xe823cbe8UL, 0xdd7ca1ddUL, 0x749ce874UL, 0x1f213e1fUL, ++ 0x4bdd964bUL, 0xbddc61bdUL, 0x8b860d8bUL, 0x8a850f8aUL, ++ 0x7090e070UL, 0x3e427c3eUL, 0xb5c471b5UL, 0x66aacc66UL, ++ 0x48d89048UL, 0x03050603UL, 0xf601f7f6UL, 0x0e121c0eUL, ++ 0x61a3c261UL, 0x355f6a35UL, 0x57f9ae57UL, 0xb9d069b9UL, ++ 0x86911786UL, 0xc15899c1UL, 0x1d273a1dUL, 0x9eb9279eUL, ++ 0xe138d9e1UL, 0xf813ebf8UL, 0x98b32b98UL, 0x11332211UL, ++ 0x69bbd269UL, 0xd970a9d9UL, 0x8e89078eUL, 0x94a73394UL, ++ 0x9bb62d9bUL, 0x1e223c1eUL, 0x87921587UL, 0xe920c9e9UL, ++ 0xce4987ceUL, 0x55ffaa55UL, 0x28785028UL, 0xdf7aa5dfUL, ++ 0x8c8f038cUL, 0xa1f859a1UL, 0x89800989UL, 0x0d171a0dUL, ++ 0xbfda65bfUL, 0xe631d7e6UL, 0x42c68442UL, 0x68b8d068UL, ++ 0x41c38241UL, 0x99b02999UL, 0x2d775a2dUL, 0x0f111e0fUL, ++ 0xb0cb7bb0UL, 0x54fca854UL, 0xbbd66dbbUL, 0x163a2c16UL, ++}; ++static const ulong32 TE3[256] = { ++ ++ 0x6363a5c6UL, 0x7c7c84f8UL, 0x777799eeUL, 0x7b7b8df6UL, ++ 0xf2f20dffUL, 0x6b6bbdd6UL, 0x6f6fb1deUL, 0xc5c55491UL, ++ 0x30305060UL, 0x01010302UL, 0x6767a9ceUL, 0x2b2b7d56UL, ++ 0xfefe19e7UL, 0xd7d762b5UL, 0xababe64dUL, 0x76769aecUL, ++ 0xcaca458fUL, 0x82829d1fUL, 0xc9c94089UL, 0x7d7d87faUL, ++ 0xfafa15efUL, 0x5959ebb2UL, 0x4747c98eUL, 0xf0f00bfbUL, ++ 0xadadec41UL, 0xd4d467b3UL, 0xa2a2fd5fUL, 0xafafea45UL, ++ 0x9c9cbf23UL, 0xa4a4f753UL, 0x727296e4UL, 0xc0c05b9bUL, ++ 0xb7b7c275UL, 0xfdfd1ce1UL, 0x9393ae3dUL, 0x26266a4cUL, ++ 0x36365a6cUL, 0x3f3f417eUL, 0xf7f702f5UL, 0xcccc4f83UL, ++ 0x34345c68UL, 0xa5a5f451UL, 0xe5e534d1UL, 0xf1f108f9UL, ++ 0x717193e2UL, 0xd8d873abUL, 0x31315362UL, 0x15153f2aUL, ++ 0x04040c08UL, 0xc7c75295UL, 0x23236546UL, 0xc3c35e9dUL, ++ 0x18182830UL, 0x9696a137UL, 0x05050f0aUL, 0x9a9ab52fUL, ++ 0x0707090eUL, 0x12123624UL, 0x80809b1bUL, 0xe2e23ddfUL, ++ 0xebeb26cdUL, 0x2727694eUL, 0xb2b2cd7fUL, 0x75759feaUL, ++ 0x09091b12UL, 0x83839e1dUL, 0x2c2c7458UL, 0x1a1a2e34UL, ++ 0x1b1b2d36UL, 0x6e6eb2dcUL, 0x5a5aeeb4UL, 0xa0a0fb5bUL, ++ 0x5252f6a4UL, 0x3b3b4d76UL, 0xd6d661b7UL, 0xb3b3ce7dUL, ++ 0x29297b52UL, 0xe3e33eddUL, 0x2f2f715eUL, 0x84849713UL, ++ 0x5353f5a6UL, 0xd1d168b9UL, 0x00000000UL, 0xeded2cc1UL, ++ 0x20206040UL, 0xfcfc1fe3UL, 0xb1b1c879UL, 0x5b5bedb6UL, ++ 0x6a6abed4UL, 0xcbcb468dUL, 0xbebed967UL, 0x39394b72UL, ++ 0x4a4ade94UL, 0x4c4cd498UL, 0x5858e8b0UL, 0xcfcf4a85UL, ++ 0xd0d06bbbUL, 0xefef2ac5UL, 0xaaaae54fUL, 0xfbfb16edUL, ++ 0x4343c586UL, 0x4d4dd79aUL, 0x33335566UL, 0x85859411UL, ++ 0x4545cf8aUL, 0xf9f910e9UL, 0x02020604UL, 0x7f7f81feUL, ++ 0x5050f0a0UL, 0x3c3c4478UL, 0x9f9fba25UL, 0xa8a8e34bUL, ++ 0x5151f3a2UL, 0xa3a3fe5dUL, 0x4040c080UL, 0x8f8f8a05UL, ++ 0x9292ad3fUL, 0x9d9dbc21UL, 0x38384870UL, 0xf5f504f1UL, ++ 0xbcbcdf63UL, 0xb6b6c177UL, 0xdada75afUL, 0x21216342UL, ++ 0x10103020UL, 0xffff1ae5UL, 0xf3f30efdUL, 0xd2d26dbfUL, ++ 0xcdcd4c81UL, 0x0c0c1418UL, 0x13133526UL, 0xecec2fc3UL, ++ 0x5f5fe1beUL, 0x9797a235UL, 0x4444cc88UL, 0x1717392eUL, ++ 0xc4c45793UL, 0xa7a7f255UL, 0x7e7e82fcUL, 0x3d3d477aUL, ++ 0x6464acc8UL, 0x5d5de7baUL, 0x19192b32UL, 0x737395e6UL, ++ 0x6060a0c0UL, 0x81819819UL, 0x4f4fd19eUL, 0xdcdc7fa3UL, ++ 0x22226644UL, 0x2a2a7e54UL, 0x9090ab3bUL, 0x8888830bUL, ++ 0x4646ca8cUL, 0xeeee29c7UL, 0xb8b8d36bUL, 0x14143c28UL, ++ 0xdede79a7UL, 0x5e5ee2bcUL, 0x0b0b1d16UL, 0xdbdb76adUL, ++ 0xe0e03bdbUL, 0x32325664UL, 0x3a3a4e74UL, 0x0a0a1e14UL, ++ 0x4949db92UL, 0x06060a0cUL, 0x24246c48UL, 0x5c5ce4b8UL, ++ 0xc2c25d9fUL, 0xd3d36ebdUL, 0xacacef43UL, 0x6262a6c4UL, ++ 0x9191a839UL, 0x9595a431UL, 0xe4e437d3UL, 0x79798bf2UL, ++ 0xe7e732d5UL, 0xc8c8438bUL, 0x3737596eUL, 0x6d6db7daUL, ++ 0x8d8d8c01UL, 0xd5d564b1UL, 0x4e4ed29cUL, 0xa9a9e049UL, ++ 0x6c6cb4d8UL, 0x5656faacUL, 0xf4f407f3UL, 0xeaea25cfUL, ++ 0x6565afcaUL, 0x7a7a8ef4UL, 0xaeaee947UL, 0x08081810UL, ++ 0xbabad56fUL, 0x787888f0UL, 0x25256f4aUL, 0x2e2e725cUL, ++ 0x1c1c2438UL, 0xa6a6f157UL, 0xb4b4c773UL, 0xc6c65197UL, ++ 0xe8e823cbUL, 0xdddd7ca1UL, 0x74749ce8UL, 0x1f1f213eUL, ++ 0x4b4bdd96UL, 0xbdbddc61UL, 0x8b8b860dUL, 0x8a8a850fUL, ++ 0x707090e0UL, 0x3e3e427cUL, 0xb5b5c471UL, 0x6666aaccUL, ++ 0x4848d890UL, 0x03030506UL, 0xf6f601f7UL, 0x0e0e121cUL, ++ 0x6161a3c2UL, 0x35355f6aUL, 0x5757f9aeUL, 0xb9b9d069UL, ++ 0x86869117UL, 0xc1c15899UL, 0x1d1d273aUL, 0x9e9eb927UL, ++ 0xe1e138d9UL, 0xf8f813ebUL, 0x9898b32bUL, 0x11113322UL, ++ 0x6969bbd2UL, 0xd9d970a9UL, 0x8e8e8907UL, 0x9494a733UL, ++ 0x9b9bb62dUL, 0x1e1e223cUL, 0x87879215UL, 0xe9e920c9UL, ++ 0xcece4987UL, 0x5555ffaaUL, 0x28287850UL, 0xdfdf7aa5UL, ++ 0x8c8c8f03UL, 0xa1a1f859UL, 0x89898009UL, 0x0d0d171aUL, ++ 0xbfbfda65UL, 0xe6e631d7UL, 0x4242c684UL, 0x6868b8d0UL, ++ 0x4141c382UL, 0x9999b029UL, 0x2d2d775aUL, 0x0f0f111eUL, ++ 0xb0b0cb7bUL, 0x5454fca8UL, 0xbbbbd66dUL, 0x16163a2cUL, ++}; ++ ++static const ulong32 Te4_0[] = { ++0x00000063UL, 0x0000007cUL, 0x00000077UL, 0x0000007bUL, 0x000000f2UL, 0x0000006bUL, 0x0000006fUL, 0x000000c5UL, ++0x00000030UL, 0x00000001UL, 0x00000067UL, 0x0000002bUL, 0x000000feUL, 0x000000d7UL, 0x000000abUL, 0x00000076UL, ++0x000000caUL, 0x00000082UL, 0x000000c9UL, 0x0000007dUL, 0x000000faUL, 0x00000059UL, 0x00000047UL, 0x000000f0UL, ++0x000000adUL, 0x000000d4UL, 0x000000a2UL, 0x000000afUL, 0x0000009cUL, 0x000000a4UL, 0x00000072UL, 0x000000c0UL, ++0x000000b7UL, 0x000000fdUL, 0x00000093UL, 0x00000026UL, 0x00000036UL, 0x0000003fUL, 0x000000f7UL, 0x000000ccUL, ++0x00000034UL, 0x000000a5UL, 0x000000e5UL, 0x000000f1UL, 0x00000071UL, 0x000000d8UL, 0x00000031UL, 0x00000015UL, ++0x00000004UL, 0x000000c7UL, 0x00000023UL, 0x000000c3UL, 0x00000018UL, 0x00000096UL, 0x00000005UL, 0x0000009aUL, ++0x00000007UL, 0x00000012UL, 0x00000080UL, 0x000000e2UL, 0x000000ebUL, 0x00000027UL, 0x000000b2UL, 0x00000075UL, ++0x00000009UL, 0x00000083UL, 0x0000002cUL, 0x0000001aUL, 0x0000001bUL, 0x0000006eUL, 0x0000005aUL, 0x000000a0UL, ++0x00000052UL, 0x0000003bUL, 0x000000d6UL, 0x000000b3UL, 0x00000029UL, 0x000000e3UL, 0x0000002fUL, 0x00000084UL, ++0x00000053UL, 0x000000d1UL, 0x00000000UL, 0x000000edUL, 0x00000020UL, 0x000000fcUL, 0x000000b1UL, 0x0000005bUL, ++0x0000006aUL, 0x000000cbUL, 0x000000beUL, 0x00000039UL, 0x0000004aUL, 0x0000004cUL, 0x00000058UL, 0x000000cfUL, ++0x000000d0UL, 0x000000efUL, 0x000000aaUL, 0x000000fbUL, 0x00000043UL, 0x0000004dUL, 0x00000033UL, 0x00000085UL, ++0x00000045UL, 0x000000f9UL, 0x00000002UL, 0x0000007fUL, 0x00000050UL, 0x0000003cUL, 0x0000009fUL, 0x000000a8UL, ++0x00000051UL, 0x000000a3UL, 0x00000040UL, 0x0000008fUL, 0x00000092UL, 0x0000009dUL, 0x00000038UL, 0x000000f5UL, ++0x000000bcUL, 0x000000b6UL, 0x000000daUL, 0x00000021UL, 0x00000010UL, 0x000000ffUL, 0x000000f3UL, 0x000000d2UL, ++0x000000cdUL, 0x0000000cUL, 0x00000013UL, 0x000000ecUL, 0x0000005fUL, 0x00000097UL, 0x00000044UL, 0x00000017UL, ++0x000000c4UL, 0x000000a7UL, 0x0000007eUL, 0x0000003dUL, 0x00000064UL, 0x0000005dUL, 0x00000019UL, 0x00000073UL, ++0x00000060UL, 0x00000081UL, 0x0000004fUL, 0x000000dcUL, 0x00000022UL, 0x0000002aUL, 0x00000090UL, 0x00000088UL, ++0x00000046UL, 0x000000eeUL, 0x000000b8UL, 0x00000014UL, 0x000000deUL, 0x0000005eUL, 0x0000000bUL, 0x000000dbUL, ++0x000000e0UL, 0x00000032UL, 0x0000003aUL, 0x0000000aUL, 0x00000049UL, 0x00000006UL, 0x00000024UL, 0x0000005cUL, ++0x000000c2UL, 0x000000d3UL, 0x000000acUL, 0x00000062UL, 0x00000091UL, 0x00000095UL, 0x000000e4UL, 0x00000079UL, ++0x000000e7UL, 0x000000c8UL, 0x00000037UL, 0x0000006dUL, 0x0000008dUL, 0x000000d5UL, 0x0000004eUL, 0x000000a9UL, ++0x0000006cUL, 0x00000056UL, 0x000000f4UL, 0x000000eaUL, 0x00000065UL, 0x0000007aUL, 0x000000aeUL, 0x00000008UL, ++0x000000baUL, 0x00000078UL, 0x00000025UL, 0x0000002eUL, 0x0000001cUL, 0x000000a6UL, 0x000000b4UL, 0x000000c6UL, ++0x000000e8UL, 0x000000ddUL, 0x00000074UL, 0x0000001fUL, 0x0000004bUL, 0x000000bdUL, 0x0000008bUL, 0x0000008aUL, ++0x00000070UL, 0x0000003eUL, 0x000000b5UL, 0x00000066UL, 0x00000048UL, 0x00000003UL, 0x000000f6UL, 0x0000000eUL, ++0x00000061UL, 0x00000035UL, 0x00000057UL, 0x000000b9UL, 0x00000086UL, 0x000000c1UL, 0x0000001dUL, 0x0000009eUL, ++0x000000e1UL, 0x000000f8UL, 0x00000098UL, 0x00000011UL, 0x00000069UL, 0x000000d9UL, 0x0000008eUL, 0x00000094UL, ++0x0000009bUL, 0x0000001eUL, 0x00000087UL, 0x000000e9UL, 0x000000ceUL, 0x00000055UL, 0x00000028UL, 0x000000dfUL, ++0x0000008cUL, 0x000000a1UL, 0x00000089UL, 0x0000000dUL, 0x000000bfUL, 0x000000e6UL, 0x00000042UL, 0x00000068UL, ++0x00000041UL, 0x00000099UL, 0x0000002dUL, 0x0000000fUL, 0x000000b0UL, 0x00000054UL, 0x000000bbUL, 0x00000016UL ++}; ++ ++static const ulong32 Te4_1[] = { ++0x00006300UL, 0x00007c00UL, 0x00007700UL, 0x00007b00UL, 0x0000f200UL, 0x00006b00UL, 0x00006f00UL, 0x0000c500UL, ++0x00003000UL, 0x00000100UL, 0x00006700UL, 0x00002b00UL, 0x0000fe00UL, 0x0000d700UL, 0x0000ab00UL, 0x00007600UL, ++0x0000ca00UL, 0x00008200UL, 0x0000c900UL, 0x00007d00UL, 0x0000fa00UL, 0x00005900UL, 0x00004700UL, 0x0000f000UL, ++0x0000ad00UL, 0x0000d400UL, 0x0000a200UL, 0x0000af00UL, 0x00009c00UL, 0x0000a400UL, 0x00007200UL, 0x0000c000UL, ++0x0000b700UL, 0x0000fd00UL, 0x00009300UL, 0x00002600UL, 0x00003600UL, 0x00003f00UL, 0x0000f700UL, 0x0000cc00UL, ++0x00003400UL, 0x0000a500UL, 0x0000e500UL, 0x0000f100UL, 0x00007100UL, 0x0000d800UL, 0x00003100UL, 0x00001500UL, ++0x00000400UL, 0x0000c700UL, 0x00002300UL, 0x0000c300UL, 0x00001800UL, 0x00009600UL, 0x00000500UL, 0x00009a00UL, ++0x00000700UL, 0x00001200UL, 0x00008000UL, 0x0000e200UL, 0x0000eb00UL, 0x00002700UL, 0x0000b200UL, 0x00007500UL, ++0x00000900UL, 0x00008300UL, 0x00002c00UL, 0x00001a00UL, 0x00001b00UL, 0x00006e00UL, 0x00005a00UL, 0x0000a000UL, ++0x00005200UL, 0x00003b00UL, 0x0000d600UL, 0x0000b300UL, 0x00002900UL, 0x0000e300UL, 0x00002f00UL, 0x00008400UL, ++0x00005300UL, 0x0000d100UL, 0x00000000UL, 0x0000ed00UL, 0x00002000UL, 0x0000fc00UL, 0x0000b100UL, 0x00005b00UL, ++0x00006a00UL, 0x0000cb00UL, 0x0000be00UL, 0x00003900UL, 0x00004a00UL, 0x00004c00UL, 0x00005800UL, 0x0000cf00UL, ++0x0000d000UL, 0x0000ef00UL, 0x0000aa00UL, 0x0000fb00UL, 0x00004300UL, 0x00004d00UL, 0x00003300UL, 0x00008500UL, ++0x00004500UL, 0x0000f900UL, 0x00000200UL, 0x00007f00UL, 0x00005000UL, 0x00003c00UL, 0x00009f00UL, 0x0000a800UL, ++0x00005100UL, 0x0000a300UL, 0x00004000UL, 0x00008f00UL, 0x00009200UL, 0x00009d00UL, 0x00003800UL, 0x0000f500UL, ++0x0000bc00UL, 0x0000b600UL, 0x0000da00UL, 0x00002100UL, 0x00001000UL, 0x0000ff00UL, 0x0000f300UL, 0x0000d200UL, ++0x0000cd00UL, 0x00000c00UL, 0x00001300UL, 0x0000ec00UL, 0x00005f00UL, 0x00009700UL, 0x00004400UL, 0x00001700UL, ++0x0000c400UL, 0x0000a700UL, 0x00007e00UL, 0x00003d00UL, 0x00006400UL, 0x00005d00UL, 0x00001900UL, 0x00007300UL, ++0x00006000UL, 0x00008100UL, 0x00004f00UL, 0x0000dc00UL, 0x00002200UL, 0x00002a00UL, 0x00009000UL, 0x00008800UL, ++0x00004600UL, 0x0000ee00UL, 0x0000b800UL, 0x00001400UL, 0x0000de00UL, 0x00005e00UL, 0x00000b00UL, 0x0000db00UL, ++0x0000e000UL, 0x00003200UL, 0x00003a00UL, 0x00000a00UL, 0x00004900UL, 0x00000600UL, 0x00002400UL, 0x00005c00UL, ++0x0000c200UL, 0x0000d300UL, 0x0000ac00UL, 0x00006200UL, 0x00009100UL, 0x00009500UL, 0x0000e400UL, 0x00007900UL, ++0x0000e700UL, 0x0000c800UL, 0x00003700UL, 0x00006d00UL, 0x00008d00UL, 0x0000d500UL, 0x00004e00UL, 0x0000a900UL, ++0x00006c00UL, 0x00005600UL, 0x0000f400UL, 0x0000ea00UL, 0x00006500UL, 0x00007a00UL, 0x0000ae00UL, 0x00000800UL, ++0x0000ba00UL, 0x00007800UL, 0x00002500UL, 0x00002e00UL, 0x00001c00UL, 0x0000a600UL, 0x0000b400UL, 0x0000c600UL, ++0x0000e800UL, 0x0000dd00UL, 0x00007400UL, 0x00001f00UL, 0x00004b00UL, 0x0000bd00UL, 0x00008b00UL, 0x00008a00UL, ++0x00007000UL, 0x00003e00UL, 0x0000b500UL, 0x00006600UL, 0x00004800UL, 0x00000300UL, 0x0000f600UL, 0x00000e00UL, ++0x00006100UL, 0x00003500UL, 0x00005700UL, 0x0000b900UL, 0x00008600UL, 0x0000c100UL, 0x00001d00UL, 0x00009e00UL, ++0x0000e100UL, 0x0000f800UL, 0x00009800UL, 0x00001100UL, 0x00006900UL, 0x0000d900UL, 0x00008e00UL, 0x00009400UL, ++0x00009b00UL, 0x00001e00UL, 0x00008700UL, 0x0000e900UL, 0x0000ce00UL, 0x00005500UL, 0x00002800UL, 0x0000df00UL, ++0x00008c00UL, 0x0000a100UL, 0x00008900UL, 0x00000d00UL, 0x0000bf00UL, 0x0000e600UL, 0x00004200UL, 0x00006800UL, ++0x00004100UL, 0x00009900UL, 0x00002d00UL, 0x00000f00UL, 0x0000b000UL, 0x00005400UL, 0x0000bb00UL, 0x00001600UL ++}; ++ ++static const ulong32 Te4_2[] = { ++0x00630000UL, 0x007c0000UL, 0x00770000UL, 0x007b0000UL, 0x00f20000UL, 0x006b0000UL, 0x006f0000UL, 0x00c50000UL, ++0x00300000UL, 0x00010000UL, 0x00670000UL, 0x002b0000UL, 0x00fe0000UL, 0x00d70000UL, 0x00ab0000UL, 0x00760000UL, ++0x00ca0000UL, 0x00820000UL, 0x00c90000UL, 0x007d0000UL, 0x00fa0000UL, 0x00590000UL, 0x00470000UL, 0x00f00000UL, ++0x00ad0000UL, 0x00d40000UL, 0x00a20000UL, 0x00af0000UL, 0x009c0000UL, 0x00a40000UL, 0x00720000UL, 0x00c00000UL, ++0x00b70000UL, 0x00fd0000UL, 0x00930000UL, 0x00260000UL, 0x00360000UL, 0x003f0000UL, 0x00f70000UL, 0x00cc0000UL, ++0x00340000UL, 0x00a50000UL, 0x00e50000UL, 0x00f10000UL, 0x00710000UL, 0x00d80000UL, 0x00310000UL, 0x00150000UL, ++0x00040000UL, 0x00c70000UL, 0x00230000UL, 0x00c30000UL, 0x00180000UL, 0x00960000UL, 0x00050000UL, 0x009a0000UL, ++0x00070000UL, 0x00120000UL, 0x00800000UL, 0x00e20000UL, 0x00eb0000UL, 0x00270000UL, 0x00b20000UL, 0x00750000UL, ++0x00090000UL, 0x00830000UL, 0x002c0000UL, 0x001a0000UL, 0x001b0000UL, 0x006e0000UL, 0x005a0000UL, 0x00a00000UL, ++0x00520000UL, 0x003b0000UL, 0x00d60000UL, 0x00b30000UL, 0x00290000UL, 0x00e30000UL, 0x002f0000UL, 0x00840000UL, ++0x00530000UL, 0x00d10000UL, 0x00000000UL, 0x00ed0000UL, 0x00200000UL, 0x00fc0000UL, 0x00b10000UL, 0x005b0000UL, ++0x006a0000UL, 0x00cb0000UL, 0x00be0000UL, 0x00390000UL, 0x004a0000UL, 0x004c0000UL, 0x00580000UL, 0x00cf0000UL, ++0x00d00000UL, 0x00ef0000UL, 0x00aa0000UL, 0x00fb0000UL, 0x00430000UL, 0x004d0000UL, 0x00330000UL, 0x00850000UL, ++0x00450000UL, 0x00f90000UL, 0x00020000UL, 0x007f0000UL, 0x00500000UL, 0x003c0000UL, 0x009f0000UL, 0x00a80000UL, ++0x00510000UL, 0x00a30000UL, 0x00400000UL, 0x008f0000UL, 0x00920000UL, 0x009d0000UL, 0x00380000UL, 0x00f50000UL, ++0x00bc0000UL, 0x00b60000UL, 0x00da0000UL, 0x00210000UL, 0x00100000UL, 0x00ff0000UL, 0x00f30000UL, 0x00d20000UL, ++0x00cd0000UL, 0x000c0000UL, 0x00130000UL, 0x00ec0000UL, 0x005f0000UL, 0x00970000UL, 0x00440000UL, 0x00170000UL, ++0x00c40000UL, 0x00a70000UL, 0x007e0000UL, 0x003d0000UL, 0x00640000UL, 0x005d0000UL, 0x00190000UL, 0x00730000UL, ++0x00600000UL, 0x00810000UL, 0x004f0000UL, 0x00dc0000UL, 0x00220000UL, 0x002a0000UL, 0x00900000UL, 0x00880000UL, ++0x00460000UL, 0x00ee0000UL, 0x00b80000UL, 0x00140000UL, 0x00de0000UL, 0x005e0000UL, 0x000b0000UL, 0x00db0000UL, ++0x00e00000UL, 0x00320000UL, 0x003a0000UL, 0x000a0000UL, 0x00490000UL, 0x00060000UL, 0x00240000UL, 0x005c0000UL, ++0x00c20000UL, 0x00d30000UL, 0x00ac0000UL, 0x00620000UL, 0x00910000UL, 0x00950000UL, 0x00e40000UL, 0x00790000UL, ++0x00e70000UL, 0x00c80000UL, 0x00370000UL, 0x006d0000UL, 0x008d0000UL, 0x00d50000UL, 0x004e0000UL, 0x00a90000UL, ++0x006c0000UL, 0x00560000UL, 0x00f40000UL, 0x00ea0000UL, 0x00650000UL, 0x007a0000UL, 0x00ae0000UL, 0x00080000UL, ++0x00ba0000UL, 0x00780000UL, 0x00250000UL, 0x002e0000UL, 0x001c0000UL, 0x00a60000UL, 0x00b40000UL, 0x00c60000UL, ++0x00e80000UL, 0x00dd0000UL, 0x00740000UL, 0x001f0000UL, 0x004b0000UL, 0x00bd0000UL, 0x008b0000UL, 0x008a0000UL, ++0x00700000UL, 0x003e0000UL, 0x00b50000UL, 0x00660000UL, 0x00480000UL, 0x00030000UL, 0x00f60000UL, 0x000e0000UL, ++0x00610000UL, 0x00350000UL, 0x00570000UL, 0x00b90000UL, 0x00860000UL, 0x00c10000UL, 0x001d0000UL, 0x009e0000UL, ++0x00e10000UL, 0x00f80000UL, 0x00980000UL, 0x00110000UL, 0x00690000UL, 0x00d90000UL, 0x008e0000UL, 0x00940000UL, ++0x009b0000UL, 0x001e0000UL, 0x00870000UL, 0x00e90000UL, 0x00ce0000UL, 0x00550000UL, 0x00280000UL, 0x00df0000UL, ++0x008c0000UL, 0x00a10000UL, 0x00890000UL, 0x000d0000UL, 0x00bf0000UL, 0x00e60000UL, 0x00420000UL, 0x00680000UL, ++0x00410000UL, 0x00990000UL, 0x002d0000UL, 0x000f0000UL, 0x00b00000UL, 0x00540000UL, 0x00bb0000UL, 0x00160000UL ++}; ++ ++static const ulong32 Te4_3[] = { ++0x63000000UL, 0x7c000000UL, 0x77000000UL, 0x7b000000UL, 0xf2000000UL, 0x6b000000UL, 0x6f000000UL, 0xc5000000UL, ++0x30000000UL, 0x01000000UL, 0x67000000UL, 0x2b000000UL, 0xfe000000UL, 0xd7000000UL, 0xab000000UL, 0x76000000UL, ++0xca000000UL, 0x82000000UL, 0xc9000000UL, 0x7d000000UL, 0xfa000000UL, 0x59000000UL, 0x47000000UL, 0xf0000000UL, ++0xad000000UL, 0xd4000000UL, 0xa2000000UL, 0xaf000000UL, 0x9c000000UL, 0xa4000000UL, 0x72000000UL, 0xc0000000UL, ++0xb7000000UL, 0xfd000000UL, 0x93000000UL, 0x26000000UL, 0x36000000UL, 0x3f000000UL, 0xf7000000UL, 0xcc000000UL, ++0x34000000UL, 0xa5000000UL, 0xe5000000UL, 0xf1000000UL, 0x71000000UL, 0xd8000000UL, 0x31000000UL, 0x15000000UL, ++0x04000000UL, 0xc7000000UL, 0x23000000UL, 0xc3000000UL, 0x18000000UL, 0x96000000UL, 0x05000000UL, 0x9a000000UL, ++0x07000000UL, 0x12000000UL, 0x80000000UL, 0xe2000000UL, 0xeb000000UL, 0x27000000UL, 0xb2000000UL, 0x75000000UL, ++0x09000000UL, 0x83000000UL, 0x2c000000UL, 0x1a000000UL, 0x1b000000UL, 0x6e000000UL, 0x5a000000UL, 0xa0000000UL, ++0x52000000UL, 0x3b000000UL, 0xd6000000UL, 0xb3000000UL, 0x29000000UL, 0xe3000000UL, 0x2f000000UL, 0x84000000UL, ++0x53000000UL, 0xd1000000UL, 0x00000000UL, 0xed000000UL, 0x20000000UL, 0xfc000000UL, 0xb1000000UL, 0x5b000000UL, ++0x6a000000UL, 0xcb000000UL, 0xbe000000UL, 0x39000000UL, 0x4a000000UL, 0x4c000000UL, 0x58000000UL, 0xcf000000UL, ++0xd0000000UL, 0xef000000UL, 0xaa000000UL, 0xfb000000UL, 0x43000000UL, 0x4d000000UL, 0x33000000UL, 0x85000000UL, ++0x45000000UL, 0xf9000000UL, 0x02000000UL, 0x7f000000UL, 0x50000000UL, 0x3c000000UL, 0x9f000000UL, 0xa8000000UL, ++0x51000000UL, 0xa3000000UL, 0x40000000UL, 0x8f000000UL, 0x92000000UL, 0x9d000000UL, 0x38000000UL, 0xf5000000UL, ++0xbc000000UL, 0xb6000000UL, 0xda000000UL, 0x21000000UL, 0x10000000UL, 0xff000000UL, 0xf3000000UL, 0xd2000000UL, ++0xcd000000UL, 0x0c000000UL, 0x13000000UL, 0xec000000UL, 0x5f000000UL, 0x97000000UL, 0x44000000UL, 0x17000000UL, ++0xc4000000UL, 0xa7000000UL, 0x7e000000UL, 0x3d000000UL, 0x64000000UL, 0x5d000000UL, 0x19000000UL, 0x73000000UL, ++0x60000000UL, 0x81000000UL, 0x4f000000UL, 0xdc000000UL, 0x22000000UL, 0x2a000000UL, 0x90000000UL, 0x88000000UL, ++0x46000000UL, 0xee000000UL, 0xb8000000UL, 0x14000000UL, 0xde000000UL, 0x5e000000UL, 0x0b000000UL, 0xdb000000UL, ++0xe0000000UL, 0x32000000UL, 0x3a000000UL, 0x0a000000UL, 0x49000000UL, 0x06000000UL, 0x24000000UL, 0x5c000000UL, ++0xc2000000UL, 0xd3000000UL, 0xac000000UL, 0x62000000UL, 0x91000000UL, 0x95000000UL, 0xe4000000UL, 0x79000000UL, ++0xe7000000UL, 0xc8000000UL, 0x37000000UL, 0x6d000000UL, 0x8d000000UL, 0xd5000000UL, 0x4e000000UL, 0xa9000000UL, ++0x6c000000UL, 0x56000000UL, 0xf4000000UL, 0xea000000UL, 0x65000000UL, 0x7a000000UL, 0xae000000UL, 0x08000000UL, ++0xba000000UL, 0x78000000UL, 0x25000000UL, 0x2e000000UL, 0x1c000000UL, 0xa6000000UL, 0xb4000000UL, 0xc6000000UL, ++0xe8000000UL, 0xdd000000UL, 0x74000000UL, 0x1f000000UL, 0x4b000000UL, 0xbd000000UL, 0x8b000000UL, 0x8a000000UL, ++0x70000000UL, 0x3e000000UL, 0xb5000000UL, 0x66000000UL, 0x48000000UL, 0x03000000UL, 0xf6000000UL, 0x0e000000UL, ++0x61000000UL, 0x35000000UL, 0x57000000UL, 0xb9000000UL, 0x86000000UL, 0xc1000000UL, 0x1d000000UL, 0x9e000000UL, ++0xe1000000UL, 0xf8000000UL, 0x98000000UL, 0x11000000UL, 0x69000000UL, 0xd9000000UL, 0x8e000000UL, 0x94000000UL, ++0x9b000000UL, 0x1e000000UL, 0x87000000UL, 0xe9000000UL, 0xce000000UL, 0x55000000UL, 0x28000000UL, 0xdf000000UL, ++0x8c000000UL, 0xa1000000UL, 0x89000000UL, 0x0d000000UL, 0xbf000000UL, 0xe6000000UL, 0x42000000UL, 0x68000000UL, ++0x41000000UL, 0x99000000UL, 0x2d000000UL, 0x0f000000UL, 0xb0000000UL, 0x54000000UL, 0xbb000000UL, 0x16000000UL ++}; ++ ++static const ulong32 TD1[256] = { ++ 0x5051f4a7UL, 0x537e4165UL, 0xc31a17a4UL, 0x963a275eUL, ++ 0xcb3bab6bUL, 0xf11f9d45UL, 0xabacfa58UL, 0x934be303UL, ++ 0x552030faUL, 0xf6ad766dUL, 0x9188cc76UL, 0x25f5024cUL, ++ 0xfc4fe5d7UL, 0xd7c52acbUL, 0x80263544UL, 0x8fb562a3UL, ++ 0x49deb15aUL, 0x6725ba1bUL, 0x9845ea0eUL, 0xe15dfec0UL, ++ 0x02c32f75UL, 0x12814cf0UL, 0xa38d4697UL, 0xc66bd3f9UL, ++ 0xe7038f5fUL, 0x9515929cUL, 0xebbf6d7aUL, 0xda955259UL, ++ 0x2dd4be83UL, 0xd3587421UL, 0x2949e069UL, 0x448ec9c8UL, ++ 0x6a75c289UL, 0x78f48e79UL, 0x6b99583eUL, 0xdd27b971UL, ++ 0xb6bee14fUL, 0x17f088adUL, 0x66c920acUL, 0xb47dce3aUL, ++ 0x1863df4aUL, 0x82e51a31UL, 0x60975133UL, 0x4562537fUL, ++ 0xe0b16477UL, 0x84bb6baeUL, 0x1cfe81a0UL, 0x94f9082bUL, ++ 0x58704868UL, 0x198f45fdUL, 0x8794de6cUL, 0xb7527bf8UL, ++ 0x23ab73d3UL, 0xe2724b02UL, 0x57e31f8fUL, 0x2a6655abUL, ++ 0x07b2eb28UL, 0x032fb5c2UL, 0x9a86c57bUL, 0xa5d33708UL, ++ 0xf2302887UL, 0xb223bfa5UL, 0xba02036aUL, 0x5ced1682UL, ++ 0x2b8acf1cUL, 0x92a779b4UL, 0xf0f307f2UL, 0xa14e69e2UL, ++ 0xcd65daf4UL, 0xd50605beUL, 0x1fd13462UL, 0x8ac4a6feUL, ++ 0x9d342e53UL, 0xa0a2f355UL, 0x32058ae1UL, 0x75a4f6ebUL, ++ 0x390b83ecUL, 0xaa4060efUL, 0x065e719fUL, 0x51bd6e10UL, ++ 0xf93e218aUL, 0x3d96dd06UL, 0xaedd3e05UL, 0x464de6bdUL, ++ 0xb591548dUL, 0x0571c45dUL, 0x6f0406d4UL, 0xff605015UL, ++ 0x241998fbUL, 0x97d6bde9UL, 0xcc894043UL, 0x7767d99eUL, ++ 0xbdb0e842UL, 0x8807898bUL, 0x38e7195bUL, 0xdb79c8eeUL, ++ 0x47a17c0aUL, 0xe97c420fUL, 0xc9f8841eUL, 0x00000000UL, ++ 0x83098086UL, 0x48322bedUL, 0xac1e1170UL, 0x4e6c5a72UL, ++ 0xfbfd0effUL, 0x560f8538UL, 0x1e3daed5UL, 0x27362d39UL, ++ 0x640a0fd9UL, 0x21685ca6UL, 0xd19b5b54UL, 0x3a24362eUL, ++ 0xb10c0a67UL, 0x0f9357e7UL, 0xd2b4ee96UL, 0x9e1b9b91UL, ++ 0x4f80c0c5UL, 0xa261dc20UL, 0x695a774bUL, 0x161c121aUL, ++ 0x0ae293baUL, 0xe5c0a02aUL, 0x433c22e0UL, 0x1d121b17UL, ++ 0x0b0e090dUL, 0xadf28bc7UL, 0xb92db6a8UL, 0xc8141ea9UL, ++ 0x8557f119UL, 0x4caf7507UL, 0xbbee99ddUL, 0xfda37f60UL, ++ 0x9ff70126UL, 0xbc5c72f5UL, 0xc544663bUL, 0x345bfb7eUL, ++ 0x768b4329UL, 0xdccb23c6UL, 0x68b6edfcUL, 0x63b8e4f1UL, ++ 0xcad731dcUL, 0x10426385UL, 0x40139722UL, 0x2084c611UL, ++ 0x7d854a24UL, 0xf8d2bb3dUL, 0x11aef932UL, 0x6dc729a1UL, ++ 0x4b1d9e2fUL, 0xf3dcb230UL, 0xec0d8652UL, 0xd077c1e3UL, ++ 0x6c2bb316UL, 0x99a970b9UL, 0xfa119448UL, 0x2247e964UL, ++ 0xc4a8fc8cUL, 0x1aa0f03fUL, 0xd8567d2cUL, 0xef223390UL, ++ 0xc787494eUL, 0xc1d938d1UL, 0xfe8ccaa2UL, 0x3698d40bUL, ++ 0xcfa6f581UL, 0x28a57adeUL, 0x26dab78eUL, 0xa43fadbfUL, ++ 0xe42c3a9dUL, 0x0d507892UL, 0x9b6a5fccUL, 0x62547e46UL, ++ 0xc2f68d13UL, 0xe890d8b8UL, 0x5e2e39f7UL, 0xf582c3afUL, ++ 0xbe9f5d80UL, 0x7c69d093UL, 0xa96fd52dUL, 0xb3cf2512UL, ++ 0x3bc8ac99UL, 0xa710187dUL, 0x6ee89c63UL, 0x7bdb3bbbUL, ++ 0x09cd2678UL, 0xf46e5918UL, 0x01ec9ab7UL, 0xa8834f9aUL, ++ 0x65e6956eUL, 0x7eaaffe6UL, 0x0821bccfUL, 0xe6ef15e8UL, ++ 0xd9bae79bUL, 0xce4a6f36UL, 0xd4ea9f09UL, 0xd629b07cUL, ++ 0xaf31a4b2UL, 0x312a3f23UL, 0x30c6a594UL, 0xc035a266UL, ++ 0x37744ebcUL, 0xa6fc82caUL, 0xb0e090d0UL, 0x1533a7d8UL, ++ 0x4af10498UL, 0xf741ecdaUL, 0x0e7fcd50UL, 0x2f1791f6UL, ++ 0x8d764dd6UL, 0x4d43efb0UL, 0x54ccaa4dUL, 0xdfe49604UL, ++ 0xe39ed1b5UL, 0x1b4c6a88UL, 0xb8c12c1fUL, 0x7f466551UL, ++ 0x049d5eeaUL, 0x5d018c35UL, 0x73fa8774UL, 0x2efb0b41UL, ++ 0x5ab3671dUL, 0x5292dbd2UL, 0x33e91056UL, 0x136dd647UL, ++ 0x8c9ad761UL, 0x7a37a10cUL, 0x8e59f814UL, 0x89eb133cUL, ++ 0xeecea927UL, 0x35b761c9UL, 0xede11ce5UL, 0x3c7a47b1UL, ++ 0x599cd2dfUL, 0x3f55f273UL, 0x791814ceUL, 0xbf73c737UL, ++ 0xea53f7cdUL, 0x5b5ffdaaUL, 0x14df3d6fUL, 0x867844dbUL, ++ 0x81caaff3UL, 0x3eb968c4UL, 0x2c382434UL, 0x5fc2a340UL, ++ 0x72161dc3UL, 0x0cbce225UL, 0x8b283c49UL, 0x41ff0d95UL, ++ 0x7139a801UL, 0xde080cb3UL, 0x9cd8b4e4UL, 0x906456c1UL, ++ 0x617bcb84UL, 0x70d532b6UL, 0x74486c5cUL, 0x42d0b857UL, ++}; ++static const ulong32 TD2[256] = { ++ 0xa75051f4UL, 0x65537e41UL, 0xa4c31a17UL, 0x5e963a27UL, ++ 0x6bcb3babUL, 0x45f11f9dUL, 0x58abacfaUL, 0x03934be3UL, ++ 0xfa552030UL, 0x6df6ad76UL, 0x769188ccUL, 0x4c25f502UL, ++ 0xd7fc4fe5UL, 0xcbd7c52aUL, 0x44802635UL, 0xa38fb562UL, ++ 0x5a49deb1UL, 0x1b6725baUL, 0x0e9845eaUL, 0xc0e15dfeUL, ++ 0x7502c32fUL, 0xf012814cUL, 0x97a38d46UL, 0xf9c66bd3UL, ++ 0x5fe7038fUL, 0x9c951592UL, 0x7aebbf6dUL, 0x59da9552UL, ++ 0x832dd4beUL, 0x21d35874UL, 0x692949e0UL, 0xc8448ec9UL, ++ 0x896a75c2UL, 0x7978f48eUL, 0x3e6b9958UL, 0x71dd27b9UL, ++ 0x4fb6bee1UL, 0xad17f088UL, 0xac66c920UL, 0x3ab47dceUL, ++ 0x4a1863dfUL, 0x3182e51aUL, 0x33609751UL, 0x7f456253UL, ++ 0x77e0b164UL, 0xae84bb6bUL, 0xa01cfe81UL, 0x2b94f908UL, ++ 0x68587048UL, 0xfd198f45UL, 0x6c8794deUL, 0xf8b7527bUL, ++ 0xd323ab73UL, 0x02e2724bUL, 0x8f57e31fUL, 0xab2a6655UL, ++ 0x2807b2ebUL, 0xc2032fb5UL, 0x7b9a86c5UL, 0x08a5d337UL, ++ 0x87f23028UL, 0xa5b223bfUL, 0x6aba0203UL, 0x825ced16UL, ++ 0x1c2b8acfUL, 0xb492a779UL, 0xf2f0f307UL, 0xe2a14e69UL, ++ 0xf4cd65daUL, 0xbed50605UL, 0x621fd134UL, 0xfe8ac4a6UL, ++ 0x539d342eUL, 0x55a0a2f3UL, 0xe132058aUL, 0xeb75a4f6UL, ++ 0xec390b83UL, 0xefaa4060UL, 0x9f065e71UL, 0x1051bd6eUL, ++ 0x8af93e21UL, 0x063d96ddUL, 0x05aedd3eUL, 0xbd464de6UL, ++ 0x8db59154UL, 0x5d0571c4UL, 0xd46f0406UL, 0x15ff6050UL, ++ 0xfb241998UL, 0xe997d6bdUL, 0x43cc8940UL, 0x9e7767d9UL, ++ 0x42bdb0e8UL, 0x8b880789UL, 0x5b38e719UL, 0xeedb79c8UL, ++ 0x0a47a17cUL, 0x0fe97c42UL, 0x1ec9f884UL, 0x00000000UL, ++ 0x86830980UL, 0xed48322bUL, 0x70ac1e11UL, 0x724e6c5aUL, ++ 0xfffbfd0eUL, 0x38560f85UL, 0xd51e3daeUL, 0x3927362dUL, ++ 0xd9640a0fUL, 0xa621685cUL, 0x54d19b5bUL, 0x2e3a2436UL, ++ 0x67b10c0aUL, 0xe70f9357UL, 0x96d2b4eeUL, 0x919e1b9bUL, ++ 0xc54f80c0UL, 0x20a261dcUL, 0x4b695a77UL, 0x1a161c12UL, ++ 0xba0ae293UL, 0x2ae5c0a0UL, 0xe0433c22UL, 0x171d121bUL, ++ 0x0d0b0e09UL, 0xc7adf28bUL, 0xa8b92db6UL, 0xa9c8141eUL, ++ 0x198557f1UL, 0x074caf75UL, 0xddbbee99UL, 0x60fda37fUL, ++ 0x269ff701UL, 0xf5bc5c72UL, 0x3bc54466UL, 0x7e345bfbUL, ++ 0x29768b43UL, 0xc6dccb23UL, 0xfc68b6edUL, 0xf163b8e4UL, ++ 0xdccad731UL, 0x85104263UL, 0x22401397UL, 0x112084c6UL, ++ 0x247d854aUL, 0x3df8d2bbUL, 0x3211aef9UL, 0xa16dc729UL, ++ 0x2f4b1d9eUL, 0x30f3dcb2UL, 0x52ec0d86UL, 0xe3d077c1UL, ++ 0x166c2bb3UL, 0xb999a970UL, 0x48fa1194UL, 0x642247e9UL, ++ 0x8cc4a8fcUL, 0x3f1aa0f0UL, 0x2cd8567dUL, 0x90ef2233UL, ++ 0x4ec78749UL, 0xd1c1d938UL, 0xa2fe8ccaUL, 0x0b3698d4UL, ++ 0x81cfa6f5UL, 0xde28a57aUL, 0x8e26dab7UL, 0xbfa43fadUL, ++ 0x9de42c3aUL, 0x920d5078UL, 0xcc9b6a5fUL, 0x4662547eUL, ++ 0x13c2f68dUL, 0xb8e890d8UL, 0xf75e2e39UL, 0xaff582c3UL, ++ 0x80be9f5dUL, 0x937c69d0UL, 0x2da96fd5UL, 0x12b3cf25UL, ++ 0x993bc8acUL, 0x7da71018UL, 0x636ee89cUL, 0xbb7bdb3bUL, ++ 0x7809cd26UL, 0x18f46e59UL, 0xb701ec9aUL, 0x9aa8834fUL, ++ 0x6e65e695UL, 0xe67eaaffUL, 0xcf0821bcUL, 0xe8e6ef15UL, ++ 0x9bd9bae7UL, 0x36ce4a6fUL, 0x09d4ea9fUL, 0x7cd629b0UL, ++ 0xb2af31a4UL, 0x23312a3fUL, 0x9430c6a5UL, 0x66c035a2UL, ++ 0xbc37744eUL, 0xcaa6fc82UL, 0xd0b0e090UL, 0xd81533a7UL, ++ 0x984af104UL, 0xdaf741ecUL, 0x500e7fcdUL, 0xf62f1791UL, ++ 0xd68d764dUL, 0xb04d43efUL, 0x4d54ccaaUL, 0x04dfe496UL, ++ 0xb5e39ed1UL, 0x881b4c6aUL, 0x1fb8c12cUL, 0x517f4665UL, ++ 0xea049d5eUL, 0x355d018cUL, 0x7473fa87UL, 0x412efb0bUL, ++ 0x1d5ab367UL, 0xd25292dbUL, 0x5633e910UL, 0x47136dd6UL, ++ 0x618c9ad7UL, 0x0c7a37a1UL, 0x148e59f8UL, 0x3c89eb13UL, ++ 0x27eecea9UL, 0xc935b761UL, 0xe5ede11cUL, 0xb13c7a47UL, ++ 0xdf599cd2UL, 0x733f55f2UL, 0xce791814UL, 0x37bf73c7UL, ++ 0xcdea53f7UL, 0xaa5b5ffdUL, 0x6f14df3dUL, 0xdb867844UL, ++ 0xf381caafUL, 0xc43eb968UL, 0x342c3824UL, 0x405fc2a3UL, ++ 0xc372161dUL, 0x250cbce2UL, 0x498b283cUL, 0x9541ff0dUL, ++ 0x017139a8UL, 0xb3de080cUL, 0xe49cd8b4UL, 0xc1906456UL, ++ 0x84617bcbUL, 0xb670d532UL, 0x5c74486cUL, 0x5742d0b8UL, ++}; ++static const ulong32 TD3[256] = { ++ 0xf4a75051UL, 0x4165537eUL, 0x17a4c31aUL, 0x275e963aUL, ++ 0xab6bcb3bUL, 0x9d45f11fUL, 0xfa58abacUL, 0xe303934bUL, ++ 0x30fa5520UL, 0x766df6adUL, 0xcc769188UL, 0x024c25f5UL, ++ 0xe5d7fc4fUL, 0x2acbd7c5UL, 0x35448026UL, 0x62a38fb5UL, ++ 0xb15a49deUL, 0xba1b6725UL, 0xea0e9845UL, 0xfec0e15dUL, ++ 0x2f7502c3UL, 0x4cf01281UL, 0x4697a38dUL, 0xd3f9c66bUL, ++ 0x8f5fe703UL, 0x929c9515UL, 0x6d7aebbfUL, 0x5259da95UL, ++ 0xbe832dd4UL, 0x7421d358UL, 0xe0692949UL, 0xc9c8448eUL, ++ 0xc2896a75UL, 0x8e7978f4UL, 0x583e6b99UL, 0xb971dd27UL, ++ 0xe14fb6beUL, 0x88ad17f0UL, 0x20ac66c9UL, 0xce3ab47dUL, ++ 0xdf4a1863UL, 0x1a3182e5UL, 0x51336097UL, 0x537f4562UL, ++ 0x6477e0b1UL, 0x6bae84bbUL, 0x81a01cfeUL, 0x082b94f9UL, ++ 0x48685870UL, 0x45fd198fUL, 0xde6c8794UL, 0x7bf8b752UL, ++ 0x73d323abUL, 0x4b02e272UL, 0x1f8f57e3UL, 0x55ab2a66UL, ++ 0xeb2807b2UL, 0xb5c2032fUL, 0xc57b9a86UL, 0x3708a5d3UL, ++ 0x2887f230UL, 0xbfa5b223UL, 0x036aba02UL, 0x16825cedUL, ++ 0xcf1c2b8aUL, 0x79b492a7UL, 0x07f2f0f3UL, 0x69e2a14eUL, ++ 0xdaf4cd65UL, 0x05bed506UL, 0x34621fd1UL, 0xa6fe8ac4UL, ++ 0x2e539d34UL, 0xf355a0a2UL, 0x8ae13205UL, 0xf6eb75a4UL, ++ 0x83ec390bUL, 0x60efaa40UL, 0x719f065eUL, 0x6e1051bdUL, ++ 0x218af93eUL, 0xdd063d96UL, 0x3e05aeddUL, 0xe6bd464dUL, ++ 0x548db591UL, 0xc45d0571UL, 0x06d46f04UL, 0x5015ff60UL, ++ 0x98fb2419UL, 0xbde997d6UL, 0x4043cc89UL, 0xd99e7767UL, ++ 0xe842bdb0UL, 0x898b8807UL, 0x195b38e7UL, 0xc8eedb79UL, ++ 0x7c0a47a1UL, 0x420fe97cUL, 0x841ec9f8UL, 0x00000000UL, ++ 0x80868309UL, 0x2bed4832UL, 0x1170ac1eUL, 0x5a724e6cUL, ++ 0x0efffbfdUL, 0x8538560fUL, 0xaed51e3dUL, 0x2d392736UL, ++ 0x0fd9640aUL, 0x5ca62168UL, 0x5b54d19bUL, 0x362e3a24UL, ++ 0x0a67b10cUL, 0x57e70f93UL, 0xee96d2b4UL, 0x9b919e1bUL, ++ 0xc0c54f80UL, 0xdc20a261UL, 0x774b695aUL, 0x121a161cUL, ++ 0x93ba0ae2UL, 0xa02ae5c0UL, 0x22e0433cUL, 0x1b171d12UL, ++ 0x090d0b0eUL, 0x8bc7adf2UL, 0xb6a8b92dUL, 0x1ea9c814UL, ++ 0xf1198557UL, 0x75074cafUL, 0x99ddbbeeUL, 0x7f60fda3UL, ++ 0x01269ff7UL, 0x72f5bc5cUL, 0x663bc544UL, 0xfb7e345bUL, ++ 0x4329768bUL, 0x23c6dccbUL, 0xedfc68b6UL, 0xe4f163b8UL, ++ 0x31dccad7UL, 0x63851042UL, 0x97224013UL, 0xc6112084UL, ++ 0x4a247d85UL, 0xbb3df8d2UL, 0xf93211aeUL, 0x29a16dc7UL, ++ 0x9e2f4b1dUL, 0xb230f3dcUL, 0x8652ec0dUL, 0xc1e3d077UL, ++ 0xb3166c2bUL, 0x70b999a9UL, 0x9448fa11UL, 0xe9642247UL, ++ 0xfc8cc4a8UL, 0xf03f1aa0UL, 0x7d2cd856UL, 0x3390ef22UL, ++ 0x494ec787UL, 0x38d1c1d9UL, 0xcaa2fe8cUL, 0xd40b3698UL, ++ 0xf581cfa6UL, 0x7ade28a5UL, 0xb78e26daUL, 0xadbfa43fUL, ++ 0x3a9de42cUL, 0x78920d50UL, 0x5fcc9b6aUL, 0x7e466254UL, ++ 0x8d13c2f6UL, 0xd8b8e890UL, 0x39f75e2eUL, 0xc3aff582UL, ++ 0x5d80be9fUL, 0xd0937c69UL, 0xd52da96fUL, 0x2512b3cfUL, ++ 0xac993bc8UL, 0x187da710UL, 0x9c636ee8UL, 0x3bbb7bdbUL, ++ 0x267809cdUL, 0x5918f46eUL, 0x9ab701ecUL, 0x4f9aa883UL, ++ 0x956e65e6UL, 0xffe67eaaUL, 0xbccf0821UL, 0x15e8e6efUL, ++ 0xe79bd9baUL, 0x6f36ce4aUL, 0x9f09d4eaUL, 0xb07cd629UL, ++ 0xa4b2af31UL, 0x3f23312aUL, 0xa59430c6UL, 0xa266c035UL, ++ 0x4ebc3774UL, 0x82caa6fcUL, 0x90d0b0e0UL, 0xa7d81533UL, ++ 0x04984af1UL, 0xecdaf741UL, 0xcd500e7fUL, 0x91f62f17UL, ++ 0x4dd68d76UL, 0xefb04d43UL, 0xaa4d54ccUL, 0x9604dfe4UL, ++ 0xd1b5e39eUL, 0x6a881b4cUL, 0x2c1fb8c1UL, 0x65517f46UL, ++ 0x5eea049dUL, 0x8c355d01UL, 0x877473faUL, 0x0b412efbUL, ++ 0x671d5ab3UL, 0xdbd25292UL, 0x105633e9UL, 0xd647136dUL, ++ 0xd7618c9aUL, 0xa10c7a37UL, 0xf8148e59UL, 0x133c89ebUL, ++ 0xa927eeceUL, 0x61c935b7UL, 0x1ce5ede1UL, 0x47b13c7aUL, ++ 0xd2df599cUL, 0xf2733f55UL, 0x14ce7918UL, 0xc737bf73UL, ++ 0xf7cdea53UL, 0xfdaa5b5fUL, 0x3d6f14dfUL, 0x44db8678UL, ++ 0xaff381caUL, 0x68c43eb9UL, 0x24342c38UL, 0xa3405fc2UL, ++ 0x1dc37216UL, 0xe2250cbcUL, 0x3c498b28UL, 0x0d9541ffUL, ++ 0xa8017139UL, 0x0cb3de08UL, 0xb4e49cd8UL, 0x56c19064UL, ++ 0xcb84617bUL, 0x32b670d5UL, 0x6c5c7448UL, 0xb85742d0UL, ++}; ++ ++static const ulong32 Tks0[] = { ++0x00000000UL, 0x0e090d0bUL, 0x1c121a16UL, 0x121b171dUL, 0x3824342cUL, 0x362d3927UL, 0x24362e3aUL, 0x2a3f2331UL, ++0x70486858UL, 0x7e416553UL, 0x6c5a724eUL, 0x62537f45UL, 0x486c5c74UL, 0x4665517fUL, 0x547e4662UL, 0x5a774b69UL, ++0xe090d0b0UL, 0xee99ddbbUL, 0xfc82caa6UL, 0xf28bc7adUL, 0xd8b4e49cUL, 0xd6bde997UL, 0xc4a6fe8aUL, 0xcaaff381UL, ++0x90d8b8e8UL, 0x9ed1b5e3UL, 0x8ccaa2feUL, 0x82c3aff5UL, 0xa8fc8cc4UL, 0xa6f581cfUL, 0xb4ee96d2UL, 0xbae79bd9UL, ++0xdb3bbb7bUL, 0xd532b670UL, 0xc729a16dUL, 0xc920ac66UL, 0xe31f8f57UL, 0xed16825cUL, 0xff0d9541UL, 0xf104984aUL, ++0xab73d323UL, 0xa57ade28UL, 0xb761c935UL, 0xb968c43eUL, 0x9357e70fUL, 0x9d5eea04UL, 0x8f45fd19UL, 0x814cf012UL, ++0x3bab6bcbUL, 0x35a266c0UL, 0x27b971ddUL, 0x29b07cd6UL, 0x038f5fe7UL, 0x0d8652ecUL, 0x1f9d45f1UL, 0x119448faUL, ++0x4be30393UL, 0x45ea0e98UL, 0x57f11985UL, 0x59f8148eUL, 0x73c737bfUL, 0x7dce3ab4UL, 0x6fd52da9UL, 0x61dc20a2UL, ++0xad766df6UL, 0xa37f60fdUL, 0xb16477e0UL, 0xbf6d7aebUL, 0x955259daUL, 0x9b5b54d1UL, 0x894043ccUL, 0x87494ec7UL, ++0xdd3e05aeUL, 0xd33708a5UL, 0xc12c1fb8UL, 0xcf2512b3UL, 0xe51a3182UL, 0xeb133c89UL, 0xf9082b94UL, 0xf701269fUL, ++0x4de6bd46UL, 0x43efb04dUL, 0x51f4a750UL, 0x5ffdaa5bUL, 0x75c2896aUL, 0x7bcb8461UL, 0x69d0937cUL, 0x67d99e77UL, ++0x3daed51eUL, 0x33a7d815UL, 0x21bccf08UL, 0x2fb5c203UL, 0x058ae132UL, 0x0b83ec39UL, 0x1998fb24UL, 0x1791f62fUL, ++0x764dd68dUL, 0x7844db86UL, 0x6a5fcc9bUL, 0x6456c190UL, 0x4e69e2a1UL, 0x4060efaaUL, 0x527bf8b7UL, 0x5c72f5bcUL, ++0x0605bed5UL, 0x080cb3deUL, 0x1a17a4c3UL, 0x141ea9c8UL, 0x3e218af9UL, 0x302887f2UL, 0x223390efUL, 0x2c3a9de4UL, ++0x96dd063dUL, 0x98d40b36UL, 0x8acf1c2bUL, 0x84c61120UL, 0xaef93211UL, 0xa0f03f1aUL, 0xb2eb2807UL, 0xbce2250cUL, ++0xe6956e65UL, 0xe89c636eUL, 0xfa877473UL, 0xf48e7978UL, 0xdeb15a49UL, 0xd0b85742UL, 0xc2a3405fUL, 0xccaa4d54UL, ++0x41ecdaf7UL, 0x4fe5d7fcUL, 0x5dfec0e1UL, 0x53f7cdeaUL, 0x79c8eedbUL, 0x77c1e3d0UL, 0x65daf4cdUL, 0x6bd3f9c6UL, ++0x31a4b2afUL, 0x3fadbfa4UL, 0x2db6a8b9UL, 0x23bfa5b2UL, 0x09808683UL, 0x07898b88UL, 0x15929c95UL, 0x1b9b919eUL, ++0xa17c0a47UL, 0xaf75074cUL, 0xbd6e1051UL, 0xb3671d5aUL, 0x99583e6bUL, 0x97513360UL, 0x854a247dUL, 0x8b432976UL, ++0xd134621fUL, 0xdf3d6f14UL, 0xcd267809UL, 0xc32f7502UL, 0xe9105633UL, 0xe7195b38UL, 0xf5024c25UL, 0xfb0b412eUL, ++0x9ad7618cUL, 0x94de6c87UL, 0x86c57b9aUL, 0x88cc7691UL, 0xa2f355a0UL, 0xacfa58abUL, 0xbee14fb6UL, 0xb0e842bdUL, ++0xea9f09d4UL, 0xe49604dfUL, 0xf68d13c2UL, 0xf8841ec9UL, 0xd2bb3df8UL, 0xdcb230f3UL, 0xcea927eeUL, 0xc0a02ae5UL, ++0x7a47b13cUL, 0x744ebc37UL, 0x6655ab2aUL, 0x685ca621UL, 0x42638510UL, 0x4c6a881bUL, 0x5e719f06UL, 0x5078920dUL, ++0x0a0fd964UL, 0x0406d46fUL, 0x161dc372UL, 0x1814ce79UL, 0x322bed48UL, 0x3c22e043UL, 0x2e39f75eUL, 0x2030fa55UL, ++0xec9ab701UL, 0xe293ba0aUL, 0xf088ad17UL, 0xfe81a01cUL, 0xd4be832dUL, 0xdab78e26UL, 0xc8ac993bUL, 0xc6a59430UL, ++0x9cd2df59UL, 0x92dbd252UL, 0x80c0c54fUL, 0x8ec9c844UL, 0xa4f6eb75UL, 0xaaffe67eUL, 0xb8e4f163UL, 0xb6edfc68UL, ++0x0c0a67b1UL, 0x02036abaUL, 0x10187da7UL, 0x1e1170acUL, 0x342e539dUL, 0x3a275e96UL, 0x283c498bUL, 0x26354480UL, ++0x7c420fe9UL, 0x724b02e2UL, 0x605015ffUL, 0x6e5918f4UL, 0x44663bc5UL, 0x4a6f36ceUL, 0x587421d3UL, 0x567d2cd8UL, ++0x37a10c7aUL, 0x39a80171UL, 0x2bb3166cUL, 0x25ba1b67UL, 0x0f853856UL, 0x018c355dUL, 0x13972240UL, 0x1d9e2f4bUL, ++0x47e96422UL, 0x49e06929UL, 0x5bfb7e34UL, 0x55f2733fUL, 0x7fcd500eUL, 0x71c45d05UL, 0x63df4a18UL, 0x6dd64713UL, ++0xd731dccaUL, 0xd938d1c1UL, 0xcb23c6dcUL, 0xc52acbd7UL, 0xef15e8e6UL, 0xe11ce5edUL, 0xf307f2f0UL, 0xfd0efffbUL, ++0xa779b492UL, 0xa970b999UL, 0xbb6bae84UL, 0xb562a38fUL, 0x9f5d80beUL, 0x91548db5UL, 0x834f9aa8UL, 0x8d4697a3UL ++}; ++ ++static const ulong32 Tks1[] = { ++0x00000000UL, 0x0b0e090dUL, 0x161c121aUL, 0x1d121b17UL, 0x2c382434UL, 0x27362d39UL, 0x3a24362eUL, 0x312a3f23UL, ++0x58704868UL, 0x537e4165UL, 0x4e6c5a72UL, 0x4562537fUL, 0x74486c5cUL, 0x7f466551UL, 0x62547e46UL, 0x695a774bUL, ++0xb0e090d0UL, 0xbbee99ddUL, 0xa6fc82caUL, 0xadf28bc7UL, 0x9cd8b4e4UL, 0x97d6bde9UL, 0x8ac4a6feUL, 0x81caaff3UL, ++0xe890d8b8UL, 0xe39ed1b5UL, 0xfe8ccaa2UL, 0xf582c3afUL, 0xc4a8fc8cUL, 0xcfa6f581UL, 0xd2b4ee96UL, 0xd9bae79bUL, ++0x7bdb3bbbUL, 0x70d532b6UL, 0x6dc729a1UL, 0x66c920acUL, 0x57e31f8fUL, 0x5ced1682UL, 0x41ff0d95UL, 0x4af10498UL, ++0x23ab73d3UL, 0x28a57adeUL, 0x35b761c9UL, 0x3eb968c4UL, 0x0f9357e7UL, 0x049d5eeaUL, 0x198f45fdUL, 0x12814cf0UL, ++0xcb3bab6bUL, 0xc035a266UL, 0xdd27b971UL, 0xd629b07cUL, 0xe7038f5fUL, 0xec0d8652UL, 0xf11f9d45UL, 0xfa119448UL, ++0x934be303UL, 0x9845ea0eUL, 0x8557f119UL, 0x8e59f814UL, 0xbf73c737UL, 0xb47dce3aUL, 0xa96fd52dUL, 0xa261dc20UL, ++0xf6ad766dUL, 0xfda37f60UL, 0xe0b16477UL, 0xebbf6d7aUL, 0xda955259UL, 0xd19b5b54UL, 0xcc894043UL, 0xc787494eUL, ++0xaedd3e05UL, 0xa5d33708UL, 0xb8c12c1fUL, 0xb3cf2512UL, 0x82e51a31UL, 0x89eb133cUL, 0x94f9082bUL, 0x9ff70126UL, ++0x464de6bdUL, 0x4d43efb0UL, 0x5051f4a7UL, 0x5b5ffdaaUL, 0x6a75c289UL, 0x617bcb84UL, 0x7c69d093UL, 0x7767d99eUL, ++0x1e3daed5UL, 0x1533a7d8UL, 0x0821bccfUL, 0x032fb5c2UL, 0x32058ae1UL, 0x390b83ecUL, 0x241998fbUL, 0x2f1791f6UL, ++0x8d764dd6UL, 0x867844dbUL, 0x9b6a5fccUL, 0x906456c1UL, 0xa14e69e2UL, 0xaa4060efUL, 0xb7527bf8UL, 0xbc5c72f5UL, ++0xd50605beUL, 0xde080cb3UL, 0xc31a17a4UL, 0xc8141ea9UL, 0xf93e218aUL, 0xf2302887UL, 0xef223390UL, 0xe42c3a9dUL, ++0x3d96dd06UL, 0x3698d40bUL, 0x2b8acf1cUL, 0x2084c611UL, 0x11aef932UL, 0x1aa0f03fUL, 0x07b2eb28UL, 0x0cbce225UL, ++0x65e6956eUL, 0x6ee89c63UL, 0x73fa8774UL, 0x78f48e79UL, 0x49deb15aUL, 0x42d0b857UL, 0x5fc2a340UL, 0x54ccaa4dUL, ++0xf741ecdaUL, 0xfc4fe5d7UL, 0xe15dfec0UL, 0xea53f7cdUL, 0xdb79c8eeUL, 0xd077c1e3UL, 0xcd65daf4UL, 0xc66bd3f9UL, ++0xaf31a4b2UL, 0xa43fadbfUL, 0xb92db6a8UL, 0xb223bfa5UL, 0x83098086UL, 0x8807898bUL, 0x9515929cUL, 0x9e1b9b91UL, ++0x47a17c0aUL, 0x4caf7507UL, 0x51bd6e10UL, 0x5ab3671dUL, 0x6b99583eUL, 0x60975133UL, 0x7d854a24UL, 0x768b4329UL, ++0x1fd13462UL, 0x14df3d6fUL, 0x09cd2678UL, 0x02c32f75UL, 0x33e91056UL, 0x38e7195bUL, 0x25f5024cUL, 0x2efb0b41UL, ++0x8c9ad761UL, 0x8794de6cUL, 0x9a86c57bUL, 0x9188cc76UL, 0xa0a2f355UL, 0xabacfa58UL, 0xb6bee14fUL, 0xbdb0e842UL, ++0xd4ea9f09UL, 0xdfe49604UL, 0xc2f68d13UL, 0xc9f8841eUL, 0xf8d2bb3dUL, 0xf3dcb230UL, 0xeecea927UL, 0xe5c0a02aUL, ++0x3c7a47b1UL, 0x37744ebcUL, 0x2a6655abUL, 0x21685ca6UL, 0x10426385UL, 0x1b4c6a88UL, 0x065e719fUL, 0x0d507892UL, ++0x640a0fd9UL, 0x6f0406d4UL, 0x72161dc3UL, 0x791814ceUL, 0x48322bedUL, 0x433c22e0UL, 0x5e2e39f7UL, 0x552030faUL, ++0x01ec9ab7UL, 0x0ae293baUL, 0x17f088adUL, 0x1cfe81a0UL, 0x2dd4be83UL, 0x26dab78eUL, 0x3bc8ac99UL, 0x30c6a594UL, ++0x599cd2dfUL, 0x5292dbd2UL, 0x4f80c0c5UL, 0x448ec9c8UL, 0x75a4f6ebUL, 0x7eaaffe6UL, 0x63b8e4f1UL, 0x68b6edfcUL, ++0xb10c0a67UL, 0xba02036aUL, 0xa710187dUL, 0xac1e1170UL, 0x9d342e53UL, 0x963a275eUL, 0x8b283c49UL, 0x80263544UL, ++0xe97c420fUL, 0xe2724b02UL, 0xff605015UL, 0xf46e5918UL, 0xc544663bUL, 0xce4a6f36UL, 0xd3587421UL, 0xd8567d2cUL, ++0x7a37a10cUL, 0x7139a801UL, 0x6c2bb316UL, 0x6725ba1bUL, 0x560f8538UL, 0x5d018c35UL, 0x40139722UL, 0x4b1d9e2fUL, ++0x2247e964UL, 0x2949e069UL, 0x345bfb7eUL, 0x3f55f273UL, 0x0e7fcd50UL, 0x0571c45dUL, 0x1863df4aUL, 0x136dd647UL, ++0xcad731dcUL, 0xc1d938d1UL, 0xdccb23c6UL, 0xd7c52acbUL, 0xe6ef15e8UL, 0xede11ce5UL, 0xf0f307f2UL, 0xfbfd0effUL, ++0x92a779b4UL, 0x99a970b9UL, 0x84bb6baeUL, 0x8fb562a3UL, 0xbe9f5d80UL, 0xb591548dUL, 0xa8834f9aUL, 0xa38d4697UL ++}; ++ ++static const ulong32 Tks2[] = { ++0x00000000UL, 0x0d0b0e09UL, 0x1a161c12UL, 0x171d121bUL, 0x342c3824UL, 0x3927362dUL, 0x2e3a2436UL, 0x23312a3fUL, ++0x68587048UL, 0x65537e41UL, 0x724e6c5aUL, 0x7f456253UL, 0x5c74486cUL, 0x517f4665UL, 0x4662547eUL, 0x4b695a77UL, ++0xd0b0e090UL, 0xddbbee99UL, 0xcaa6fc82UL, 0xc7adf28bUL, 0xe49cd8b4UL, 0xe997d6bdUL, 0xfe8ac4a6UL, 0xf381caafUL, ++0xb8e890d8UL, 0xb5e39ed1UL, 0xa2fe8ccaUL, 0xaff582c3UL, 0x8cc4a8fcUL, 0x81cfa6f5UL, 0x96d2b4eeUL, 0x9bd9bae7UL, ++0xbb7bdb3bUL, 0xb670d532UL, 0xa16dc729UL, 0xac66c920UL, 0x8f57e31fUL, 0x825ced16UL, 0x9541ff0dUL, 0x984af104UL, ++0xd323ab73UL, 0xde28a57aUL, 0xc935b761UL, 0xc43eb968UL, 0xe70f9357UL, 0xea049d5eUL, 0xfd198f45UL, 0xf012814cUL, ++0x6bcb3babUL, 0x66c035a2UL, 0x71dd27b9UL, 0x7cd629b0UL, 0x5fe7038fUL, 0x52ec0d86UL, 0x45f11f9dUL, 0x48fa1194UL, ++0x03934be3UL, 0x0e9845eaUL, 0x198557f1UL, 0x148e59f8UL, 0x37bf73c7UL, 0x3ab47dceUL, 0x2da96fd5UL, 0x20a261dcUL, ++0x6df6ad76UL, 0x60fda37fUL, 0x77e0b164UL, 0x7aebbf6dUL, 0x59da9552UL, 0x54d19b5bUL, 0x43cc8940UL, 0x4ec78749UL, ++0x05aedd3eUL, 0x08a5d337UL, 0x1fb8c12cUL, 0x12b3cf25UL, 0x3182e51aUL, 0x3c89eb13UL, 0x2b94f908UL, 0x269ff701UL, ++0xbd464de6UL, 0xb04d43efUL, 0xa75051f4UL, 0xaa5b5ffdUL, 0x896a75c2UL, 0x84617bcbUL, 0x937c69d0UL, 0x9e7767d9UL, ++0xd51e3daeUL, 0xd81533a7UL, 0xcf0821bcUL, 0xc2032fb5UL, 0xe132058aUL, 0xec390b83UL, 0xfb241998UL, 0xf62f1791UL, ++0xd68d764dUL, 0xdb867844UL, 0xcc9b6a5fUL, 0xc1906456UL, 0xe2a14e69UL, 0xefaa4060UL, 0xf8b7527bUL, 0xf5bc5c72UL, ++0xbed50605UL, 0xb3de080cUL, 0xa4c31a17UL, 0xa9c8141eUL, 0x8af93e21UL, 0x87f23028UL, 0x90ef2233UL, 0x9de42c3aUL, ++0x063d96ddUL, 0x0b3698d4UL, 0x1c2b8acfUL, 0x112084c6UL, 0x3211aef9UL, 0x3f1aa0f0UL, 0x2807b2ebUL, 0x250cbce2UL, ++0x6e65e695UL, 0x636ee89cUL, 0x7473fa87UL, 0x7978f48eUL, 0x5a49deb1UL, 0x5742d0b8UL, 0x405fc2a3UL, 0x4d54ccaaUL, ++0xdaf741ecUL, 0xd7fc4fe5UL, 0xc0e15dfeUL, 0xcdea53f7UL, 0xeedb79c8UL, 0xe3d077c1UL, 0xf4cd65daUL, 0xf9c66bd3UL, ++0xb2af31a4UL, 0xbfa43fadUL, 0xa8b92db6UL, 0xa5b223bfUL, 0x86830980UL, 0x8b880789UL, 0x9c951592UL, 0x919e1b9bUL, ++0x0a47a17cUL, 0x074caf75UL, 0x1051bd6eUL, 0x1d5ab367UL, 0x3e6b9958UL, 0x33609751UL, 0x247d854aUL, 0x29768b43UL, ++0x621fd134UL, 0x6f14df3dUL, 0x7809cd26UL, 0x7502c32fUL, 0x5633e910UL, 0x5b38e719UL, 0x4c25f502UL, 0x412efb0bUL, ++0x618c9ad7UL, 0x6c8794deUL, 0x7b9a86c5UL, 0x769188ccUL, 0x55a0a2f3UL, 0x58abacfaUL, 0x4fb6bee1UL, 0x42bdb0e8UL, ++0x09d4ea9fUL, 0x04dfe496UL, 0x13c2f68dUL, 0x1ec9f884UL, 0x3df8d2bbUL, 0x30f3dcb2UL, 0x27eecea9UL, 0x2ae5c0a0UL, ++0xb13c7a47UL, 0xbc37744eUL, 0xab2a6655UL, 0xa621685cUL, 0x85104263UL, 0x881b4c6aUL, 0x9f065e71UL, 0x920d5078UL, ++0xd9640a0fUL, 0xd46f0406UL, 0xc372161dUL, 0xce791814UL, 0xed48322bUL, 0xe0433c22UL, 0xf75e2e39UL, 0xfa552030UL, ++0xb701ec9aUL, 0xba0ae293UL, 0xad17f088UL, 0xa01cfe81UL, 0x832dd4beUL, 0x8e26dab7UL, 0x993bc8acUL, 0x9430c6a5UL, ++0xdf599cd2UL, 0xd25292dbUL, 0xc54f80c0UL, 0xc8448ec9UL, 0xeb75a4f6UL, 0xe67eaaffUL, 0xf163b8e4UL, 0xfc68b6edUL, ++0x67b10c0aUL, 0x6aba0203UL, 0x7da71018UL, 0x70ac1e11UL, 0x539d342eUL, 0x5e963a27UL, 0x498b283cUL, 0x44802635UL, ++0x0fe97c42UL, 0x02e2724bUL, 0x15ff6050UL, 0x18f46e59UL, 0x3bc54466UL, 0x36ce4a6fUL, 0x21d35874UL, 0x2cd8567dUL, ++0x0c7a37a1UL, 0x017139a8UL, 0x166c2bb3UL, 0x1b6725baUL, 0x38560f85UL, 0x355d018cUL, 0x22401397UL, 0x2f4b1d9eUL, ++0x642247e9UL, 0x692949e0UL, 0x7e345bfbUL, 0x733f55f2UL, 0x500e7fcdUL, 0x5d0571c4UL, 0x4a1863dfUL, 0x47136dd6UL, ++0xdccad731UL, 0xd1c1d938UL, 0xc6dccb23UL, 0xcbd7c52aUL, 0xe8e6ef15UL, 0xe5ede11cUL, 0xf2f0f307UL, 0xfffbfd0eUL, ++0xb492a779UL, 0xb999a970UL, 0xae84bb6bUL, 0xa38fb562UL, 0x80be9f5dUL, 0x8db59154UL, 0x9aa8834fUL, 0x97a38d46UL ++}; ++ ++static const ulong32 Tks3[] = { ++0x00000000UL, 0x090d0b0eUL, 0x121a161cUL, 0x1b171d12UL, 0x24342c38UL, 0x2d392736UL, 0x362e3a24UL, 0x3f23312aUL, ++0x48685870UL, 0x4165537eUL, 0x5a724e6cUL, 0x537f4562UL, 0x6c5c7448UL, 0x65517f46UL, 0x7e466254UL, 0x774b695aUL, ++0x90d0b0e0UL, 0x99ddbbeeUL, 0x82caa6fcUL, 0x8bc7adf2UL, 0xb4e49cd8UL, 0xbde997d6UL, 0xa6fe8ac4UL, 0xaff381caUL, ++0xd8b8e890UL, 0xd1b5e39eUL, 0xcaa2fe8cUL, 0xc3aff582UL, 0xfc8cc4a8UL, 0xf581cfa6UL, 0xee96d2b4UL, 0xe79bd9baUL, ++0x3bbb7bdbUL, 0x32b670d5UL, 0x29a16dc7UL, 0x20ac66c9UL, 0x1f8f57e3UL, 0x16825cedUL, 0x0d9541ffUL, 0x04984af1UL, ++0x73d323abUL, 0x7ade28a5UL, 0x61c935b7UL, 0x68c43eb9UL, 0x57e70f93UL, 0x5eea049dUL, 0x45fd198fUL, 0x4cf01281UL, ++0xab6bcb3bUL, 0xa266c035UL, 0xb971dd27UL, 0xb07cd629UL, 0x8f5fe703UL, 0x8652ec0dUL, 0x9d45f11fUL, 0x9448fa11UL, ++0xe303934bUL, 0xea0e9845UL, 0xf1198557UL, 0xf8148e59UL, 0xc737bf73UL, 0xce3ab47dUL, 0xd52da96fUL, 0xdc20a261UL, ++0x766df6adUL, 0x7f60fda3UL, 0x6477e0b1UL, 0x6d7aebbfUL, 0x5259da95UL, 0x5b54d19bUL, 0x4043cc89UL, 0x494ec787UL, ++0x3e05aeddUL, 0x3708a5d3UL, 0x2c1fb8c1UL, 0x2512b3cfUL, 0x1a3182e5UL, 0x133c89ebUL, 0x082b94f9UL, 0x01269ff7UL, ++0xe6bd464dUL, 0xefb04d43UL, 0xf4a75051UL, 0xfdaa5b5fUL, 0xc2896a75UL, 0xcb84617bUL, 0xd0937c69UL, 0xd99e7767UL, ++0xaed51e3dUL, 0xa7d81533UL, 0xbccf0821UL, 0xb5c2032fUL, 0x8ae13205UL, 0x83ec390bUL, 0x98fb2419UL, 0x91f62f17UL, ++0x4dd68d76UL, 0x44db8678UL, 0x5fcc9b6aUL, 0x56c19064UL, 0x69e2a14eUL, 0x60efaa40UL, 0x7bf8b752UL, 0x72f5bc5cUL, ++0x05bed506UL, 0x0cb3de08UL, 0x17a4c31aUL, 0x1ea9c814UL, 0x218af93eUL, 0x2887f230UL, 0x3390ef22UL, 0x3a9de42cUL, ++0xdd063d96UL, 0xd40b3698UL, 0xcf1c2b8aUL, 0xc6112084UL, 0xf93211aeUL, 0xf03f1aa0UL, 0xeb2807b2UL, 0xe2250cbcUL, ++0x956e65e6UL, 0x9c636ee8UL, 0x877473faUL, 0x8e7978f4UL, 0xb15a49deUL, 0xb85742d0UL, 0xa3405fc2UL, 0xaa4d54ccUL, ++0xecdaf741UL, 0xe5d7fc4fUL, 0xfec0e15dUL, 0xf7cdea53UL, 0xc8eedb79UL, 0xc1e3d077UL, 0xdaf4cd65UL, 0xd3f9c66bUL, ++0xa4b2af31UL, 0xadbfa43fUL, 0xb6a8b92dUL, 0xbfa5b223UL, 0x80868309UL, 0x898b8807UL, 0x929c9515UL, 0x9b919e1bUL, ++0x7c0a47a1UL, 0x75074cafUL, 0x6e1051bdUL, 0x671d5ab3UL, 0x583e6b99UL, 0x51336097UL, 0x4a247d85UL, 0x4329768bUL, ++0x34621fd1UL, 0x3d6f14dfUL, 0x267809cdUL, 0x2f7502c3UL, 0x105633e9UL, 0x195b38e7UL, 0x024c25f5UL, 0x0b412efbUL, ++0xd7618c9aUL, 0xde6c8794UL, 0xc57b9a86UL, 0xcc769188UL, 0xf355a0a2UL, 0xfa58abacUL, 0xe14fb6beUL, 0xe842bdb0UL, ++0x9f09d4eaUL, 0x9604dfe4UL, 0x8d13c2f6UL, 0x841ec9f8UL, 0xbb3df8d2UL, 0xb230f3dcUL, 0xa927eeceUL, 0xa02ae5c0UL, ++0x47b13c7aUL, 0x4ebc3774UL, 0x55ab2a66UL, 0x5ca62168UL, 0x63851042UL, 0x6a881b4cUL, 0x719f065eUL, 0x78920d50UL, ++0x0fd9640aUL, 0x06d46f04UL, 0x1dc37216UL, 0x14ce7918UL, 0x2bed4832UL, 0x22e0433cUL, 0x39f75e2eUL, 0x30fa5520UL, ++0x9ab701ecUL, 0x93ba0ae2UL, 0x88ad17f0UL, 0x81a01cfeUL, 0xbe832dd4UL, 0xb78e26daUL, 0xac993bc8UL, 0xa59430c6UL, ++0xd2df599cUL, 0xdbd25292UL, 0xc0c54f80UL, 0xc9c8448eUL, 0xf6eb75a4UL, 0xffe67eaaUL, 0xe4f163b8UL, 0xedfc68b6UL, ++0x0a67b10cUL, 0x036aba02UL, 0x187da710UL, 0x1170ac1eUL, 0x2e539d34UL, 0x275e963aUL, 0x3c498b28UL, 0x35448026UL, ++0x420fe97cUL, 0x4b02e272UL, 0x5015ff60UL, 0x5918f46eUL, 0x663bc544UL, 0x6f36ce4aUL, 0x7421d358UL, 0x7d2cd856UL, ++0xa10c7a37UL, 0xa8017139UL, 0xb3166c2bUL, 0xba1b6725UL, 0x8538560fUL, 0x8c355d01UL, 0x97224013UL, 0x9e2f4b1dUL, ++0xe9642247UL, 0xe0692949UL, 0xfb7e345bUL, 0xf2733f55UL, 0xcd500e7fUL, 0xc45d0571UL, 0xdf4a1863UL, 0xd647136dUL, ++0x31dccad7UL, 0x38d1c1d9UL, 0x23c6dccbUL, 0x2acbd7c5UL, 0x15e8e6efUL, 0x1ce5ede1UL, 0x07f2f0f3UL, 0x0efffbfdUL, ++0x79b492a7UL, 0x70b999a9UL, 0x6bae84bbUL, 0x62a38fb5UL, 0x5d80be9fUL, 0x548db591UL, 0x4f9aa883UL, 0x4697a38dUL ++}; ++ ++#endif /* SMALL CODE */ ++ ++static const ulong32 rcon[] = { ++ 0x01000000UL, 0x02000000UL, 0x04000000UL, 0x08000000UL, ++ 0x10000000UL, 0x20000000UL, 0x40000000UL, 0x80000000UL, ++ 0x1B000000UL, 0x36000000UL, /* for 128-bit blocks, AES never uses more than 10 rcon values */ ++}; ++ ++ ++static int aes_setup(const unsigned char *key, int keylen, int rounds, aes_CBC *skey); ++static void aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey); ++static void aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_CBC *skey); ++ ++#ifdef CLEAN_STACK ++static void _aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_CBC *skey); ++static void _aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey); ++#endif ++ ++int matrixAesInit(sslCipherContext_t *ctx, unsigned char *IV, unsigned char *key, int keylen) ++{ ++ int x, err; ++ ++ if (IV == NULL || key == NULL || ctx == NULL) { ++ return -1; ++ } ++/* ++ setup cipher ++ */ ++ if ((err = aes_setup(key, keylen, 0, &ctx->aes)) != CRYPT_OK) { ++ return -1; ++ } ++/* ++ copy IV ++ */ ++ ctx->aes.blocklen = 16; ++ for (x = 0; x < ctx->aes.blocklen; x++) { ++ ctx->aes.IV[x] = IV[x]; ++ } ++ return 0; ++} ++ ++int matrixAesEncrypt(sslCipherContext_t *ctx, unsigned char *pt, unsigned char *ct, int len) ++{ ++ int x, i; ++ unsigned char tmp[MAXBLOCKSIZE]; ++ ++ if (pt == NULL || ct == NULL || ctx == NULL || (len & 0x7) != 0) { ++ matrixStrDebugMsg("Bad parameters to matrixAesEncrypt\n", NULL); ++ return -1; ++ } ++ ++/* ++ is blocklen valid? ++ */ ++ if (ctx->aes.blocklen < 0 || ctx->aes.blocklen > ++ (int)sizeof(ctx->aes.IV)) { ++ return -1; ++ } ++ ++ for (i = 0; i < len; i += ctx->aes.blocklen) { ++/* ++ xor IV against plaintext ++ */ ++ for (x = 0; x < ctx->aes.blocklen; x++) { ++ tmp[x] = pt[x] ^ ctx->aes.IV[x]; ++ } ++/* ++ encrypt ++ */ ++ aes_ecb_encrypt(tmp, ct, &ctx->aes); ++ ++/* ++ store IV [ciphertext] for a future block ++ */ ++ for (x = 0; x < ctx->aes.blocklen; x++) { ++ ctx->aes.IV[x] = ct[x]; ++ } ++ ct += ctx->aes.blocklen; ++ pt += ctx->aes.blocklen; ++ } ++ ++#ifdef CLEAN_STACK ++ zeromem(tmp, sizeof(tmp)); ++#endif ++ return len; ++} ++ ++int matrixAesDecrypt(sslCipherContext_t *ctx, unsigned char *ct, unsigned char *pt, int len) ++{ ++ int x, i; ++ unsigned char tmp[MAXBLOCKSIZE], tmp2[MAXBLOCKSIZE]; ++ ++ if (pt == NULL || ct == NULL || ctx == NULL || (len & 0x7) != 0) { ++ matrixStrDebugMsg("Bad parameters to matrixAesDecrypt\n", NULL); ++ return -1; ++ } ++ ++/* ++ is blocklen valid? ++ */ ++ if (ctx->aes.blocklen < 0 || ctx->aes.blocklen > ++ (int)sizeof(ctx->aes.IV)) { ++ return -1; ++ } ++ for (i = 0; i < len; i += ctx->aes.blocklen) { ++/* ++ decrypt the block from ct into tmp ++ */ ++ aes_ecb_decrypt(ct, tmp, &ctx->aes); ++/* ++ xor IV against the plaintext of the previous step ++ */ ++ for (x = 0; x < ctx->aes.blocklen; x++) { ++/* ++ copy CT in case ct == pt ++ */ ++ tmp2[x] = ct[x]; ++/* ++ actually decrypt the byte ++ */ ++ pt[x] = tmp[x] ^ ctx->aes.IV[x]; ++ } ++/* ++ replace IV with this current ciphertext ++ */ ++ for (x = 0; x < ctx->aes.blocklen; x++) { ++ ctx->aes.IV[x] = tmp2[x]; ++ } ++ ct += ctx->aes.blocklen; ++ pt += ctx->aes.blocklen; ++ } ++#ifdef CLEAN_STACK ++ zeromem(tmp, sizeof(tmp)); ++ zeromem(tmp2, sizeof(tmp2)); ++#endif ++ return len; ++} ++ ++int aes_setup(const unsigned char *key, int keylen, int rounds, aes_CBC *skey) ++{ ++ int i, j; ++ ulong32 temp, *rk, *rrk; ++ ++ if (key == NULL || skey == NULL) { ++ return -1; ++ } ++ ++ if (keylen != 16 && keylen != 24 && keylen != 32) { ++ return CRYPT_INVALID_KEYSIZE; ++ } ++ ++ if (rounds != 0 && rounds != (10 + ((keylen/8)-2)*2)) { ++ return CRYPT_INVALID_ROUNDS; ++ } ++ ++ skey->key.Nr = 10 + ((keylen/8)-2)*2; ++ ++/* ++ setup the forward key ++ */ ++ i = 0; ++ rk = skey->key.eK; ++ LOAD32H(rk[0], key ); ++ LOAD32H(rk[1], key + 4); ++ LOAD32H(rk[2], key + 8); ++ LOAD32H(rk[3], key + 12); ++ if (keylen == 16) { ++ j = 44; ++ for (;;) { ++ temp = rk[3]; ++ rk[4] = rk[0] ^ ++ (Te4_3[byte(temp, 2)]) ^ ++ (Te4_2[byte(temp, 1)]) ^ ++ (Te4_1[byte(temp, 0)]) ^ ++ (Te4_0[byte(temp, 3)]) ^ ++ rcon[i]; ++ rk[5] = rk[1] ^ rk[4]; ++ rk[6] = rk[2] ^ rk[5]; ++ rk[7] = rk[3] ^ rk[6]; ++ if (++i == 10) { ++ break; ++ } ++ rk += 4; ++ } ++ } else if (keylen == 24) { ++ j = 52; ++ LOAD32H(rk[4], key + 16); ++ LOAD32H(rk[5], key + 20); ++ for (;;) { ++ #ifdef _MSC_VER ++ temp = skey->key.eK[rk - skey->key.eK + 5]; ++ #else ++ temp = rk[5]; ++ #endif /* _MSC_VER */ ++ rk[ 6] = rk[ 0] ^ ++ (Te4_3[byte(temp, 2)]) ^ ++ (Te4_2[byte(temp, 1)]) ^ ++ (Te4_1[byte(temp, 0)]) ^ ++ (Te4_0[byte(temp, 3)]) ^ ++ rcon[i]; ++ rk[ 7] = rk[ 1] ^ rk[ 6]; ++ rk[ 8] = rk[ 2] ^ rk[ 7]; ++ rk[ 9] = rk[ 3] ^ rk[ 8]; ++ if (++i == 8) { ++ break; ++ } ++ rk[10] = rk[ 4] ^ rk[ 9]; ++ rk[11] = rk[ 5] ^ rk[10]; ++ rk += 6; ++ } ++ } else if (keylen == 32) { ++ j = 60; ++ LOAD32H(rk[4], key + 16); ++ LOAD32H(rk[5], key + 20); ++ LOAD32H(rk[6], key + 24); ++ LOAD32H(rk[7], key + 28); ++ for (;;) { ++ #ifdef _MSC_VER ++ temp = skey->key.eK[rk - skey->key.eK + 7]; ++ #else ++ temp = rk[7]; ++ #endif /* _MSC_VER */ ++ rk[ 8] = rk[ 0] ^ ++ (Te4_3[byte(temp, 2)]) ^ ++ (Te4_2[byte(temp, 1)]) ^ ++ (Te4_1[byte(temp, 0)]) ^ ++ (Te4_0[byte(temp, 3)]) ^ ++ rcon[i]; ++ rk[ 9] = rk[ 1] ^ rk[ 8]; ++ rk[10] = rk[ 2] ^ rk[ 9]; ++ rk[11] = rk[ 3] ^ rk[10]; ++ if (++i == 7) { ++ break; ++ } ++ temp = rk[11]; ++ rk[12] = rk[ 4] ^ ++ (Te4_3[byte(temp, 3)]) ^ ++ (Te4_2[byte(temp, 2)]) ^ ++ (Te4_1[byte(temp, 1)]) ^ ++ (Te4_0[byte(temp, 0)]); ++ rk[13] = rk[ 5] ^ rk[12]; ++ rk[14] = rk[ 6] ^ rk[13]; ++ rk[15] = rk[ 7] ^ rk[14]; ++ rk += 8; ++ } ++ } else { ++/* ++ this can't happen ++ */ ++ j = 4; ++ } ++ ++/* ++ setup the inverse key now ++ */ ++ rk = skey->key.dK; ++ rrk = skey->key.eK + j - 4; ++ ++/* ++ apply the inverse MixColumn transform to all round keys but the first and the last: ++ */ ++ /* copy first */ ++ *rk++ = *rrk++; ++ *rk++ = *rrk++; ++ *rk++ = *rrk++; ++ *rk = *rrk; ++ rk -= 3; rrk -= 3; ++ ++ for (i = 1; i < skey->key.Nr; i++) { ++ rrk -= 4; ++ rk += 4; ++#ifdef SMALL_CODE ++ temp = rrk[0]; ++ rk[0] = ++ Td0(255 & Te4[byte(temp, 3)]) ^ ++ Td1(255 & Te4[byte(temp, 2)]) ^ ++ Td2(255 & Te4[byte(temp, 1)]) ^ ++ Td3(255 & Te4[byte(temp, 0)]); ++ temp = rrk[1]; ++ rk[1] = ++ Td0(255 & Te4[byte(temp, 3)]) ^ ++ Td1(255 & Te4[byte(temp, 2)]) ^ ++ Td2(255 & Te4[byte(temp, 1)]) ^ ++ Td3(255 & Te4[byte(temp, 0)]); ++ temp = rrk[2]; ++ rk[2] = ++ Td0(255 & Te4[byte(temp, 3)]) ^ ++ Td1(255 & Te4[byte(temp, 2)]) ^ ++ Td2(255 & Te4[byte(temp, 1)]) ^ ++ Td3(255 & Te4[byte(temp, 0)]); ++ temp = rrk[3]; ++ rk[3] = ++ Td0(255 & Te4[byte(temp, 3)]) ^ ++ Td1(255 & Te4[byte(temp, 2)]) ^ ++ Td2(255 & Te4[byte(temp, 1)]) ^ ++ Td3(255 & Te4[byte(temp, 0)]); ++#else /* SMALL CODE */ ++ temp = rrk[0]; ++ rk[0] = ++ Tks0[byte(temp, 3)] ^ ++ Tks1[byte(temp, 2)] ^ ++ Tks2[byte(temp, 1)] ^ ++ Tks3[byte(temp, 0)]; ++ temp = rrk[1]; ++ rk[1] = ++ Tks0[byte(temp, 3)] ^ ++ Tks1[byte(temp, 2)] ^ ++ Tks2[byte(temp, 1)] ^ ++ Tks3[byte(temp, 0)]; ++ temp = rrk[2]; ++ rk[2] = ++ Tks0[byte(temp, 3)] ^ ++ Tks1[byte(temp, 2)] ^ ++ Tks2[byte(temp, 1)] ^ ++ Tks3[byte(temp, 0)]; ++ temp = rrk[3]; ++ rk[3] = ++ Tks0[byte(temp, 3)] ^ ++ Tks1[byte(temp, 2)] ^ ++ Tks2[byte(temp, 1)] ^ ++ Tks3[byte(temp, 0)]; ++#endif /* SMALL CODE */ ++ } ++ ++ /* copy last */ ++ rrk -= 4; ++ rk += 4; ++ *rk++ = *rrk++; ++ *rk++ = *rrk++; ++ *rk++ = *rrk++; ++ *rk = *rrk; ++ ++ return CRYPT_OK; ++} ++ ++#ifdef CLEAN_STACK ++void aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey) ++{ ++ _aes_ecb_encrypt(pt, ct, skey); ++ burn_stack(sizeof(unsigned long)*8 + sizeof(unsigned long*) + sizeof(int)*2); ++} ++#endif /* CLEAN_STACK */ ++ ++#ifdef CLEAN_STACK ++static void _aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey) ++#else ++void aes_ecb_encrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey) ++#endif /* CLEAN_STACK */ ++{ ++ ulong32 s0, s1, s2, s3, t0, t1, t2, t3, *rk; ++ int Nr, r; ++ ++ if (pt == NULL || ct == NULL || skey == NULL) { ++ return; ++ } ++ ++ Nr = skey->key.Nr; ++ rk = skey->key.eK; ++ ++/* ++ map byte array block to cipher state ++ and add initial round key: ++ */ ++ LOAD32H(s0, pt ); s0 ^= rk[0]; ++ LOAD32H(s1, pt + 4); s1 ^= rk[1]; ++ LOAD32H(s2, pt + 8); s2 ^= rk[2]; ++ LOAD32H(s3, pt + 12); s3 ^= rk[3]; ++ ++/* ++ Nr - 1 full rounds: ++ */ ++ r = Nr >> 1; ++ for (;;) { ++ ++ t0 = ++ Te0(byte(s0, 3)) ^ ++ Te1(byte(s1, 2)) ^ ++ Te2(byte(s2, 1)) ^ ++ Te3(byte(s3, 0)) ^ ++ rk[4]; ++ t1 = ++ Te0(byte(s1, 3)) ^ ++ Te1(byte(s2, 2)) ^ ++ Te2(byte(s3, 1)) ^ ++ Te3(byte(s0, 0)) ^ ++ rk[5]; ++ t2 = ++ Te0(byte(s2, 3)) ^ ++ Te1(byte(s3, 2)) ^ ++ Te2(byte(s0, 1)) ^ ++ Te3(byte(s1, 0)) ^ ++ rk[6]; ++ t3 = ++ Te0(byte(s3, 3)) ^ ++ Te1(byte(s0, 2)) ^ ++ Te2(byte(s1, 1)) ^ ++ Te3(byte(s2, 0)) ^ ++ rk[7]; ++ ++ rk += 8; ++ if (--r == 0) { ++ break; ++ } ++ ++ s0 = ++ Te0(byte(t0, 3)) ^ ++ Te1(byte(t1, 2)) ^ ++ Te2(byte(t2, 1)) ^ ++ Te3(byte(t3, 0)) ^ ++ rk[0]; ++ s1 = ++ Te0(byte(t1, 3)) ^ ++ Te1(byte(t2, 2)) ^ ++ Te2(byte(t3, 1)) ^ ++ Te3(byte(t0, 0)) ^ ++ rk[1]; ++ s2 = ++ Te0(byte(t2, 3)) ^ ++ Te1(byte(t3, 2)) ^ ++ Te2(byte(t0, 1)) ^ ++ Te3(byte(t1, 0)) ^ ++ rk[2]; ++ s3 = ++ Te0(byte(t3, 3)) ^ ++ Te1(byte(t0, 2)) ^ ++ Te2(byte(t1, 1)) ^ ++ Te3(byte(t2, 0)) ^ ++ rk[3]; ++ } ++/* ++ apply last round and map cipher state to byte array block: ++ */ ++ s0 = ++ (Te4_3[byte(t0, 3)]) ^ ++ (Te4_2[byte(t1, 2)]) ^ ++ (Te4_1[byte(t2, 1)]) ^ ++ (Te4_0[byte(t3, 0)]) ^ ++ rk[0]; ++ STORE32H(s0, ct); ++ s1 = ++ (Te4_3[byte(t1, 3)]) ^ ++ (Te4_2[byte(t2, 2)]) ^ ++ (Te4_1[byte(t3, 1)]) ^ ++ (Te4_0[byte(t0, 0)]) ^ ++ rk[1]; ++ STORE32H(s1, ct+4); ++ s2 = ++ (Te4_3[byte(t2, 3)]) ^ ++ (Te4_2[byte(t3, 2)]) ^ ++ (Te4_1[byte(t0, 1)]) ^ ++ (Te4_0[byte(t1, 0)]) ^ ++ rk[2]; ++ STORE32H(s2, ct+8); ++ s3 = ++ (Te4_3[byte(t3, 3)]) ^ ++ (Te4_2[byte(t0, 2)]) ^ ++ (Te4_1[byte(t1, 1)]) ^ ++ (Te4_0[byte(t2, 0)]) ^ ++ rk[3]; ++ STORE32H(s3, ct+12); ++} ++ ++#ifdef CLEAN_STACK ++void aes_ecb_decrypt(const unsigned char *pt, unsigned char *ct, aes_CBC *skey) ++{ ++ _aes_ecb_decrypt(pt, ct, skey); ++ burn_stack(sizeof(unsigned long)*8 + sizeof(unsigned long*) + sizeof(int)*2); ++} ++#endif /* CLEAN_STACK */ ++ ++#ifdef CLEAN_STACK ++static void _aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_CBC *skey) ++#else ++void aes_ecb_decrypt(const unsigned char *ct, unsigned char *pt, aes_CBC *skey) ++#endif /* CLEAN_STACK */ ++{ ++ ulong32 s0, s1, s2, s3, t0, t1, t2, t3, *rk; ++ int Nr, r; ++ ++ if (pt == NULL || ct == NULL || skey == NULL) { ++ return; ++ } ++ ++ Nr = skey->key.Nr; ++ rk = skey->key.dK; ++ ++/* ++ map byte array block to cipher state and add initial round key: ++ */ ++ LOAD32H(s0, ct ); s0 ^= rk[0]; ++ LOAD32H(s1, ct + 4); s1 ^= rk[1]; ++ LOAD32H(s2, ct + 8); s2 ^= rk[2]; ++ LOAD32H(s3, ct + 12); s3 ^= rk[3]; ++ ++/* ++ Nr - 1 full rounds: ++ */ ++ r = Nr >> 1; ++ for (;;) { ++ ++ t0 = ++ Td0(byte(s0, 3)) ^ ++ Td1(byte(s3, 2)) ^ ++ Td2(byte(s2, 1)) ^ ++ Td3(byte(s1, 0)) ^ ++ rk[4]; ++ t1 = ++ Td0(byte(s1, 3)) ^ ++ Td1(byte(s0, 2)) ^ ++ Td2(byte(s3, 1)) ^ ++ Td3(byte(s2, 0)) ^ ++ rk[5]; ++ t2 = ++ Td0(byte(s2, 3)) ^ ++ Td1(byte(s1, 2)) ^ ++ Td2(byte(s0, 1)) ^ ++ Td3(byte(s3, 0)) ^ ++ rk[6]; ++ t3 = ++ Td0(byte(s3, 3)) ^ ++ Td1(byte(s2, 2)) ^ ++ Td2(byte(s1, 1)) ^ ++ Td3(byte(s0, 0)) ^ ++ rk[7]; ++ ++ rk += 8; ++ if (--r == 0) { ++ break; ++ } ++ ++ s0 = ++ Td0(byte(t0, 3)) ^ ++ Td1(byte(t3, 2)) ^ ++ Td2(byte(t2, 1)) ^ ++ Td3(byte(t1, 0)) ^ ++ rk[0]; ++ s1 = ++ Td0(byte(t1, 3)) ^ ++ Td1(byte(t0, 2)) ^ ++ Td2(byte(t3, 1)) ^ ++ Td3(byte(t2, 0)) ^ ++ rk[1]; ++ s2 = ++ Td0(byte(t2, 3)) ^ ++ Td1(byte(t1, 2)) ^ ++ Td2(byte(t0, 1)) ^ ++ Td3(byte(t3, 0)) ^ ++ rk[2]; ++ s3 = ++ Td0(byte(t3, 3)) ^ ++ Td1(byte(t2, 2)) ^ ++ Td2(byte(t1, 1)) ^ ++ Td3(byte(t0, 0)) ^ ++ rk[3]; ++ } ++ ++/* ++ apply last round and map cipher state to byte array block: ++ */ ++ s0 = ++ (Td4[byte(t0, 3)] & 0xff000000) ^ ++ (Td4[byte(t3, 2)] & 0x00ff0000) ^ ++ (Td4[byte(t2, 1)] & 0x0000ff00) ^ ++ (Td4[byte(t1, 0)] & 0x000000ff) ^ ++ rk[0]; ++ STORE32H(s0, pt); ++ s1 = ++ (Td4[byte(t1, 3)] & 0xff000000) ^ ++ (Td4[byte(t0, 2)] & 0x00ff0000) ^ ++ (Td4[byte(t3, 1)] & 0x0000ff00) ^ ++ (Td4[byte(t2, 0)] & 0x000000ff) ^ ++ rk[1]; ++ STORE32H(s1, pt+4); ++ s2 = ++ (Td4[byte(t2, 3)] & 0xff000000) ^ ++ (Td4[byte(t1, 2)] & 0x00ff0000) ^ ++ (Td4[byte(t0, 1)] & 0x0000ff00) ^ ++ (Td4[byte(t3, 0)] & 0x000000ff) ^ ++ rk[2]; ++ STORE32H(s2, pt+8); ++ s3 = ++ (Td4[byte(t3, 3)] & 0xff000000) ^ ++ (Td4[byte(t2, 2)] & 0x00ff0000) ^ ++ (Td4[byte(t1, 1)] & 0x0000ff00) ^ ++ (Td4[byte(t0, 0)] & 0x000000ff) ^ ++ rk[3]; ++ STORE32H(s3, pt+12); ++} ++ ++#ifdef CLEAN_STACK ++void aes(const unsigned char *ct, unsigned char *pt, aes_CBC *skey) ++{ ++ _aes_ecb_decrypt(ct, pt, skey); ++ burn_stack(sizeof(unsigned long)*8 + sizeof(unsigned long*) + sizeof(int)*2); ++} ++#endif /* CLEAN_STACK */ ++ ++ ++#ifdef PEERSEC_TEST ++ ++int matrixAesTest() ++{ ++ int err; ++ static const struct { ++ int keylen; ++ unsigned char key[32], pt[16], ct[16]; ++ } tests[] = { ++ { 16, ++ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, ++ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, ++ { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, ++ 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff }, ++ { 0x69, 0xc4, 0xe0, 0xd8, 0x6a, 0x7b, 0x04, 0x30, ++ 0xd8, 0xcd, 0xb7, 0x80, 0x70, 0xb4, 0xc5, 0x5a } ++ }, { ++ 24, ++ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, ++ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, ++ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17 }, ++ { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, ++ 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff }, ++ { 0xdd, 0xa9, 0x7c, 0xa4, 0x86, 0x4c, 0xdf, 0xe0, ++ 0x6e, 0xaf, 0x70, 0xa0, 0xec, 0x0d, 0x71, 0x91 } ++ }, { ++ 32, ++ { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, ++ 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, ++ 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, ++ 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }, ++ { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, ++ 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff }, ++ { 0x8e, 0xa2, 0xb7, 0xca, 0x51, 0x67, 0x45, 0xbf, ++ 0xea, 0xfc, 0x49, 0x90, 0x4b, 0x49, 0x60, 0x89 } ++ } ++ }; ++ ++ aes_CBC key; ++ unsigned char tmp[2][16]; ++ int i, y; ++ ++ for (i = 0; i < (int)(sizeof(tests)/sizeof(tests[0])); i++) { ++ zeromem(&key, sizeof(key)); ++ if ((err = aes_setup(tests[i].key, tests[i].keylen, 0, &key)) != CRYPT_OK) { ++ return err; ++ } ++ ++ aes_ecb_encrypt(tests[i].pt, tmp[0], &key); ++ aes_ecb_decrypt(tmp[0], tmp[1], &key); ++ if (memcmp(tmp[0], tests[i].ct, 16) || memcmp(tmp[1], tests[i].pt, 16)) { ++#if 0 ++ printf("\n\nTest %d failed\n", i); ++ if (memcmp(tmp[0], tests[i].ct, 16)) { ++ printf("CT: "); ++ for (i = 0; i < 16; i++) { ++ printf("%02x ", tmp[0][i]); ++ } ++ printf("\n"); ++ } else { ++ printf("PT: "); ++ for (i = 0; i < 16; i++) { ++ printf("%02x ", tmp[1][i]); ++ } ++ printf("\n"); ++ } ++#endif /* 0 */ ++ return CRYPT_FAIL_TESTVECTOR; ++ } ++ ++/* ++ now see if we can encrypt all zero bytes 1000 times, ++ decrypt and come back where we started ++ */ ++ for (y = 0; y < 16; y++) tmp[0][y] = 0; ++ for (y = 0; y < 1000; y++) aes_ecb_encrypt(tmp[0], tmp[0], &key); ++ for (y = 0; y < 1000; y++) aes_ecb_decrypt(tmp[0], tmp[0], &key); ++ for (y = 0; y < 16; y++) if (tmp[0][y] != 0) return CRYPT_FAIL_TESTVECTOR; ++ } ++ return CRYPT_OK; ++} ++#endif /* PEERSEC_TEST */ ++ ++#endif /* USE_AES */ ++/******************************************************************************/ +diff -urN matrixssl.old/src/crypto/peersec/md5.c matrixssl/src/crypto/peersec/md5.c +--- matrixssl.old/src/crypto/peersec/md5.c 2005-02-23 22:43:10.000000000 +0100 ++++ matrixssl/src/crypto/peersec/md5.c 2005-03-06 01:32:33.000000000 +0100 +@@ -334,7 +334,7 @@ + #ifdef CLEAN_STACK + psZeromem(md, sizeof(hash_state)); + #endif /* CLEAN_STACK */ +- return 16; ++ return SSL_MD5_HASH_SIZE; + } + + #ifdef PEERSEC_TEST +diff -urN matrixssl.old/src/crypto/peersec/pscrypto.h matrixssl/src/crypto/peersec/pscrypto.h +--- matrixssl.old/src/crypto/peersec/pscrypto.h 2005-02-23 22:43:10.000000000 +0100 ++++ matrixssl/src/crypto/peersec/pscrypto.h 2005-03-06 01:32:33.000000000 +0100 +@@ -40,7 +40,7 @@ + PeerSec crypto-specific defines. + */ + #define SMALL_CODE +-#define CLEAN_STACK ++#undef CLEAN_STACK + /* + If Native 64 bit integers are not supported, we must set the 16 bit flag + to produce 32 bit mp_words in mpi.h +diff -urN matrixssl.old/src/crypto/peersec/sha1.c matrixssl/src/crypto/peersec/sha1.c +--- matrixssl.old/src/crypto/peersec/sha1.c 2005-02-23 22:43:10.000000000 +0100 ++++ matrixssl/src/crypto/peersec/sha1.c 2005-03-06 01:32:33.000000000 +0100 +@@ -273,7 +273,7 @@ + #ifdef CLEAN_STACK + psZeromem(md, sizeof(hash_state)); + #endif /* CLEAN_STACK */ +- return 20; ++ return SSL_SHA1_HASH_SIZE; + } + + #ifdef PEERSEC_TEST +diff -urN matrixssl.old/src/Makefile matrixssl/src/Makefile +--- matrixssl.old/src/Makefile 2005-02-23 22:43:10.000000000 +0100 ++++ matrixssl/src/Makefile 2005-03-06 01:39:06.000000000 +0100 +@@ -15,7 +15,14 @@ + E = + + LIBRARY = libmatrixssl$(SO) +-STATIC = libmatrixsslstatic$(A) ++ ++SOVERSION_MAJ := 1 ++SOVERSION_MIN := 2 ++SOVERSION_REV := 4 ++SONAME := $(LIBRARY).$(SOVERSION_MAJ) ++SOREAL := $(LIBRARY).$(SOVERSION_MAJ).$(SOVERSION_MIN).$(SOVERSION_REV) ++ +++STATIC = libmatrixsslstatic$(A) + + OBJECTS = \ + cipherSuite$(O) \ +@@ -24,6 +31,7 @@ + sslEncode$(O) \ + sslv3$(O) \ + os/linux/linux$(O) \ ++ crypto/peersec/aes$(O) \ + crypto/peersec/arc4$(O) \ + crypto/peersec/asn1$(O) \ + crypto/peersec/base64$(O) \ +@@ -66,7 +74,7 @@ + # + SHARED = -shared + CFLAGS = $(DFLAGS) -DLINUX -I./ -Icrypto/peersec +-LDFLAGS = -lc -lpthread -lcrypto ++LDFLAGS = -lc -lpthread -Wl,-soname,$(SONAME) + + # + # Override variables for compilation on Mac OS X (Darwin) +@@ -105,8 +113,9 @@ + # Build the library + # + $(LIBRARY): $(OBJECTS) +- $(CC) $(SHARED) -o $@ $^ $(LDFLAGS) +- $(STRIP) $(LIBRARY) ++ $(CC) $(SHARED) -o $(SOREAL) $^ $(LDFLAGS) ++ ln -sf $(SOREAL) $(SONAME) ++ ln -sf $(SONAME) $(LIBRARY) + + # + # Build the static library +@@ -119,4 +128,4 @@ + # Clean up all generated files + # + clean: +- rm -f $(LIBRARY) $(OBJECTS) $(STATIC) ++ rm -f $(LIBRARY) $(OBJECTS) $(SONAME) $(SOREAL) +diff -urN matrixssl.old/src/matrixSsl.c matrixssl/src/matrixSsl.c +--- matrixssl.old/src/matrixSsl.c 2005-02-23 22:43:10.000000000 +0100 ++++ matrixssl/src/matrixSsl.c 2005-03-06 01:37:41.000000000 +0100 +@@ -950,6 +950,49 @@ + sslAssert(ssl->hsPool == NULL); + } + ++ ++/******************************************************************************/ ++/* ++ Compute an MD5 digest ++*/ ++unsigned char *matrixMd5Digest( ++ const unsigned char *buf, unsigned long len, unsigned char *hash) ++{ ++ sslMd5Context_t ctx; ++ static unsigned char hashBuf[SSL_MD5_HASH_SIZE]; ++ ++ if (hash == NULL) { ++ hash = hashBuf; ++ } ++ ++ matrixMd5Init(&ctx); ++ matrixMd5Update(&ctx, buf, len); ++ matrixMd5Final(&ctx, hash); ++ ++ return hash; ++} ++ ++/******************************************************************************/ ++/* ++ Compute an SHA1 digest ++*/ ++unsigned char *matrixSha1Digest( ++ const unsigned char *buf, unsigned long len, unsigned char *hash) ++{ ++ sslSha1Context_t ctx; ++ static unsigned char hashBuf[SSL_SHA1_HASH_SIZE]; ++ ++ if (hash == NULL) { ++ hash = hashBuf; ++ } ++ ++ matrixSha1Init(&ctx); ++ matrixSha1Update(&ctx, buf, len); ++ matrixSha1Final(&ctx, hash); ++ ++ return hash; ++} ++ + /******************************************************************************/ + /* + Debugging APIs diff --git a/package/matrixssl/patches/matrixssl-typefix.patch b/package/matrixssl/patches/matrixssl-typefix.patch new file mode 100644 index 0000000000..1b9b7a8d00 --- /dev/null +++ b/package/matrixssl/patches/matrixssl-typefix.patch @@ -0,0 +1,12 @@ +diff -urN matrixssl.old/src/os/linux/linux.c matrixssl/src/os/linux/linux.c +--- matrixssl.old/src/os/linux/linux.c 2005-02-23 22:43:10.000000000 +0100 ++++ matrixssl/src/os/linux/linux.c 2005-03-06 01:52:51.000000000 +0100 +@@ -51,7 +51,7 @@ + static sslTime_t hiresStart; /* zero-time */ + static sslTime_t hiresFreq; /* tics per second */ + #else /* __i386__ */ +-static unsigned int32 prevTicks; /* Check wrap */ ++static uint32 prevTicks; /* Check wrap */ + static sslTime_t elapsedTime; /* Last elapsed time */ + #endif + diff --git a/package/ppp/Config.in b/package/ppp/Config.in new file mode 100644 index 0000000000..1d4aecbfa2 --- /dev/null +++ b/package/ppp/Config.in @@ -0,0 +1,37 @@ +config BR2_PACKAGE_PPP + tristate + prompt "PPP daemon" + default y + +config BR2_PACKAGE_PPP_PPPOE + tristate + prompt "PPP over Ethernet plugin" + default y + depends on BR2_PACKAGE_PPP + +config BR2_PACKAGE_PPP_RADIUS + tristate + prompt "PPP RADIUS plugin" + default m + depends on BR2_PACKAGE_PPP + +config BR2_PACKAGE_PPP_CHAT + tristate + prompt "chat utility" + default m + depends on BR2_PACKAGE_PPP + +config BR2_PACKAGE_PPPDUMP + tristate + prompt "pppdump utility" + default m + depends on BR2_PACKAGE_PPP + +config BR2_PACKAGE_PPPSTATS + tristate + prompt "pppstats utility" + default m + depends on BR2_PACKAGE_PPP + + + diff --git a/package/ppp/Makefile b/package/ppp/Makefile new file mode 100644 index 0000000000..b246a3db33 --- /dev/null +++ b/package/ppp/Makefile @@ -0,0 +1,147 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME := ppp +PKG_VERSION := 2.4.3 +PKG_RELEASE := 3 + +PKG_SOURCE_SITE := ftp://ftp.samba.org/pub/ppp/ +PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_CAT := zcat +PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) + +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) + +PKG_PPP := $(PACKAGE_DIR)/ppp_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_PPP_PPPOE_PLUGIN := $(PACKAGE_DIR)/ppp-pppoe-plugin_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_PPP_RADIUS_PLUGIN := $(PACKAGE_DIR)/ppp-radius-plugin_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_PPPSTATS := $(PACKAGE_DIR)/pppstats_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_PPPDUMP := $(PACKAGE_DIR)/pppdump_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk + +I_PPP := $(PKG_BUILD_DIR)/ipkg/ppp +I_PPP_PPPOE_PLUGIN := $(PKG_BUILD_DIR)/ipkg/ppp-pppoe-plugin +I_PPP_RADIUS_PLUGIN := $(PKG_BUILD_DIR)/ipkg/ppp-radius-plugin +I_PPPDUMP := $(PKG_BUILD_DIR)/ipkg/pppdump +I_PPPSTATS := $(PKG_BUILD_DIR)/ipkg/pppstats + +TARGETS := $(PKG_PPP) +ifneq ($(BR2_PACKAGE_PPP_PPPOE),) +TARGETS += $(PKG_PPP_PPPOE_PLUGIN) +endif +ifneq ($(BR2_PACKAGE_PPP_RADIUS),) +TARGETS += $(PKG_PPP_RADIUS_PLUGIN) +endif +ifneq ($(BR2_PACKAGE_PPPDUMP),) +TARGETS += $(PKG_PPPDUMP) +endif +ifneq ($(BR2_PACKAGE_PPPSTATS),) +TARGETS += $(PKG_PPPSTATS) +endif + +$(DL_DIR)/$(PKG_SOURCE_FILE): + mkdir -p $(DL_DIR) + $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + +$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) + mkdir -p $(TOOL_BUILD_DIR) + $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + $(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME).patch + touch $(PKG_BUILD_DIR)/.patched + +$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.patched + (cd $(PKG_BUILD_DIR); \ + rm -f config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --infodir=/usr/share/info \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_NLS)) + touch $(PKG_BUILD_DIR)/.configured + +$(PKG_BUILD_DIR)/pppd/pppd $(PKG_BUILD_DIR)/pppd/plugins/radius/radius.so: $(PKG_BUILD_DIR)/.configured + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC=$(TARGET_CC) \ + COPTS="$(TARGET_CFLAGS)" \ + all + +$(PKG_PPP): $(PKG_BUILD_DIR)/pppd/pppd + mkdir -p $(I_PPP) + cp -af ./ipkg/ppp/* $(I_PPP) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP) control/ppp.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(I_PPP)/usr/sbin + cp -af $(PKG_BUILD_DIR)/pppd/pppd $(I_PPP)/usr/sbin/ + $(STRIP) $(I_PPP)/usr/sbin/* + mkdir -p $(I_PPP)/usr/lib/pppd + cp $(PKG_BUILD_DIR)/pppd/plugins/*.so $(I_PPP)/usr/lib/pppd/ + $(STRIP) $(I_PPP)/usr/lib/pppd/*.so + mkdir -p $(I_PPP)/$(MODULES_SUBDIR) + cp $(MODULES_DIR)/kernel/drivers/net/ppp_async.o $(I_PPP)/$(MODULES_SUBDIR) + cp $(MODULES_DIR)/kernel/drivers/net/ppp_deflate.o $(I_PPP)/$(MODULES_SUBDIR) + cp $(MODULES_DIR)/kernel/drivers/net/bsd_comp.o $(I_PPP)/$(MODULES_SUBDIR) + $(IPKG_BUILD) $(I_PPP) $(PACKAGE_DIR) + +$(PKG_PPP_PPPOE_PLUGIN): $(PKG_PPP) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_PPPOE_PLUGIN) control/ppp-pppoe-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe + cp -af $(PKG_BUILD_DIR)/pppd/plugins/rp-pppoe/rp-pppoe.so \ + $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe + $(STRIP) $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/*/*.so + mkdir -p $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR) + cp $(MODULES_DIR)/kernel/drivers/net/pppo*.o $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR) + $(IPKG_BUILD) $(I_PPP_PPPOE_PLUGIN) $(PACKAGE_DIR) + +$(PKG_PPP_RADIUS_PLUGIN): $(PKG_PPP) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_RADIUS_PLUGIN) control/ppp-radius-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius + cp -af $(PKG_BUILD_DIR)/pppd/plugins/radius/radius.so \ + $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius/ + $(STRIP) $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/*/*.so + $(IPKG_BUILD) $(I_PPP_RADIUS_PLUGIN) $(PACKAGE_DIR) + +$(PKG_PPPDUMP): $(PKG_PPP) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPDUMP) control/pppdump.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(I_PPPDUMP)/usr/sbin + cp -af $(PKG_BUILD_DIR)/pppdump/pppdump $(I_PPPDUMP)/usr/sbin/ + $(STRIP) $(I_PPPDUMP)/usr/sbin/* + $(IPKG_BUILD) $(I_PPPDUMP) $(PACKAGE_DIR) + +$(PKG_PPPSTATS): $(PKG_PPP) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPSTATS) control/pppstats.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + mkdir -p $(I_PPPSTATS)/usr/sbin + cp -af $(PKG_BUILD_DIR)/pppstats/pppstats $(I_PPPSTATS)/usr/sbin/ + $(STRIP) $(I_PPPSTATS)/usr/sbin/* + $(IPKG_BUILD) $(I_PPPSTATS) $(PACKAGE_DIR) + + +source: $(DL_DIR)/$(PKG_SOURCE_FILE) +prepare: $(PKG_BUILD_DIR)/.patched +compile: $(TARGETS) +install: compile + $(IPKG) install $(PKG_PPP) +ifeq ($(BR2_PACKAGE_PPP_PPPOE),y) + $(IPKG) install $(PKG_PPP_PPPOE_PLUGIN) +endif +ifeq ($(BR2_PACKAGE_PPP_RADIUS),y) + $(IPKG) install $(PKG_PPP_RADIUS_PLUGIN) +endif +ifeq ($(BR2_PACKAGE_PPPDUMP),y) + $(IPKG) install $(PKG_PPPDUMP) +endif +ifeq ($(BR2_PACKAGE_PPPSTATS),y) + $(IPKG) install $(PKG_PPPSTATS) +endif + +clean: + rm -rf $(PKG_BUILD_DIR) + rm -f $(PKG_PPP) $(PKG_PPP_PPPOE_PLUGIN) $(PKG_PPP_RADIUS_PLUGIN) $(PKG_PPPSTATS) $(PKG_PPPDUMP) diff --git a/package/ppp/control/chat.control b/package/ppp/control/chat.control new file mode 100644 index 0000000000..7b422fc9f3 --- /dev/null +++ b/package/ppp/control/chat.control @@ -0,0 +1,9 @@ +Package: chat +Priority: optional +Section: net +Version: 2.4.3-3 +Architecture: mipsel +Maintainer: Felix Fietkau +Source: buildroot internal +Description: Utility for establishing a connection with the ISP's PPP server (e.g. via Modem) +Depends: ppp diff --git a/package/ppp/control/ppp-pppoe-plugin.control b/package/ppp/control/ppp-pppoe-plugin.control new file mode 100644 index 0000000000..33e6a32199 --- /dev/null +++ b/package/ppp/control/ppp-pppoe-plugin.control @@ -0,0 +1,9 @@ +Package: ppp-pppoe-plugin +Priority: optional +Section: net +Version: 2.4.3-3 +Architecture: mipsel +Maintainer: Felix Fietkau +Source: buildroot internal +Description: a PPPoE (PPP over Ethernet) plugin for PPP +Depends: ppp diff --git a/package/ppp/control/ppp-radius-plugin.control b/package/ppp/control/ppp-radius-plugin.control new file mode 100644 index 0000000000..609bf4210a --- /dev/null +++ b/package/ppp/control/ppp-radius-plugin.control @@ -0,0 +1,9 @@ +Package: ppp-radius-plugin +Priority: optional +Section: net +Version: 2.4.3-3 +Architecture: mipsel +Maintainer: Felix Fietkau +Source: buildroot internal +Description: a RADIUS plugin for PPP +Depends: ppp diff --git a/package/ppp/control/ppp.control b/package/ppp/control/ppp.control new file mode 100644 index 0000000000..68b2dffb7b --- /dev/null +++ b/package/ppp/control/ppp.control @@ -0,0 +1,8 @@ +Package: ppp +Priority: optional +Section: net +Version: 2.4.3-3 +Architecture: mipsel +Maintainer: Felix Fietkau +Source: buildroot internal +Description: a PPP (Point-to-Point Protocol) daemon (with MPPE/MPPC support) diff --git a/package/ppp/control/pppdump.control b/package/ppp/control/pppdump.control new file mode 100644 index 0000000000..fa5d0d967c --- /dev/null +++ b/package/ppp/control/pppdump.control @@ -0,0 +1,9 @@ +Package: pppdump +Priority: optional +Section: net +Version: 2.4.3-3 +Architecture: mipsel +Maintainer: Felix Fietkau +Source: buildroot internal +Description: an utility to read PPP record file +Depends: ppp diff --git a/package/ppp/control/pppstats.control b/package/ppp/control/pppstats.control new file mode 100644 index 0000000000..3f6c898d95 --- /dev/null +++ b/package/ppp/control/pppstats.control @@ -0,0 +1,9 @@ +Package: pppstats +Priority: optional +Section: net +Version: 2.4.3-3 +Architecture: mipsel +Maintainer: Felix Fietkau +Source: buildroot internal +Description: an utility to report PPP statistics +Depends: ppp diff --git a/package/ppp/ipkg/ppp-radius-plugin/CONTROL/conffiles b/package/ppp/ipkg/ppp-radius-plugin/CONTROL/conffiles new file mode 100644 index 0000000000..70fe146d22 --- /dev/null +++ b/package/ppp/ipkg/ppp-radius-plugin/CONTROL/conffiles @@ -0,0 +1,2 @@ +/etc/ppp/radius.conf +/etc/ppp/radius/servers diff --git a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius-options b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius-options new file mode 100644 index 0000000000..1cb1867595 --- /dev/null +++ b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius-options @@ -0,0 +1,2 @@ +plugin radius.so +radius-config-file /etc/ppp/radius.conf diff --git a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius.conf b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius.conf new file mode 100644 index 0000000000..0f24a8c7f7 --- /dev/null +++ b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius.conf @@ -0,0 +1,8 @@ +authserver localhost:1812 +acctserver localhost:1813 +dictionary /etc/ppp/radius/dictionary +servers /etc/ppp/radius/servers +mapfile /dev/null +seqfile /tmp/radius.seq +radius_timeout 5 +radius_retries 3 diff --git a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary new file mode 100644 index 0000000000..706d1ce99c --- /dev/null +++ b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary @@ -0,0 +1,253 @@ +# +# Updated 97/06/13 to livingston-radius-2.01 miquels@cistron.nl +# +# This file contains dictionary translations for parsing +# requests and generating responses. All transactions are +# composed of Attribute/Value Pairs. The value of each attribute +# is specified as one of 4 data types. Valid data types are: +# +# string - 0-253 octets +# ipaddr - 4 octets in network byte order +# integer - 32 bit value in big endian order (high byte first) +# date - 32 bit value in big endian order - seconds since +# 00:00:00 GMT, Jan. 1, 1970 +# +# Enumerated values are stored in the user file with dictionary +# VALUE translations for easy administration. +# +# Example: +# +# ATTRIBUTE VALUE +# --------------- ----- +# Framed-Protocol = PPP +# 7 = 1 (integer encoding) +# + +# The dictionary format now supports vendor-specific attributes. +# Vendors are introduced like this: +# +# VENDOR vendor_name vendor_number +# +# For example: +# +# VENDOR RoaringPenguin 10055 +# +# Vendor-specific attributes have a fifth field with the name of the +# vendor. For example: +# +# ATTRIBUTE RP-Upstream-Speed-Limit 1 integer RoaringPenguin +# +# introduces a Roaring Penguin vendor-specific attribbute with name +# RP-Upstream-Speed-Limit, number 1, type integer and vendor RoaringPenguin. + +# +# Following are the proper new names. Use these. +# +ATTRIBUTE User-Name 1 string +ATTRIBUTE Password 2 string +ATTRIBUTE CHAP-Password 3 string +ATTRIBUTE NAS-IP-Address 4 ipaddr +ATTRIBUTE NAS-Port-Id 5 integer +ATTRIBUTE Service-Type 6 integer +ATTRIBUTE Framed-Protocol 7 integer +ATTRIBUTE Framed-IP-Address 8 ipaddr +ATTRIBUTE Framed-IP-Netmask 9 ipaddr +ATTRIBUTE Framed-Routing 10 integer +ATTRIBUTE Filter-Id 11 string +ATTRIBUTE Framed-MTU 12 integer +ATTRIBUTE Framed-Compression 13 integer +ATTRIBUTE Login-IP-Host 14 ipaddr +ATTRIBUTE Login-Service 15 integer +ATTRIBUTE Login-TCP-Port 16 integer +ATTRIBUTE Reply-Message 18 string +ATTRIBUTE Callback-Number 19 string +ATTRIBUTE Callback-Id 20 string +ATTRIBUTE Framed-Route 22 string +ATTRIBUTE Framed-IPX-Network 23 ipaddr +ATTRIBUTE State 24 string +ATTRIBUTE Class 25 string +ATTRIBUTE Session-Timeout 27 integer +ATTRIBUTE Idle-Timeout 28 integer +ATTRIBUTE Termination-Action 29 integer +ATTRIBUTE Called-Station-Id 30 string +ATTRIBUTE Calling-Station-Id 31 string +ATTRIBUTE NAS-Identifier 32 string +ATTRIBUTE Acct-Status-Type 40 integer +ATTRIBUTE Acct-Delay-Time 41 integer +ATTRIBUTE Acct-Input-Octets 42 integer +ATTRIBUTE Acct-Output-Octets 43 integer +ATTRIBUTE Acct-Session-Id 44 string +ATTRIBUTE Acct-Authentic 45 integer +ATTRIBUTE Acct-Session-Time 46 integer +ATTRIBUTE Acct-Input-Packets 47 integer +ATTRIBUTE Acct-Output-Packets 48 integer +ATTRIBUTE Acct-Terminate-Cause 49 integer +ATTRIBUTE Chap-Challenge 60 string +ATTRIBUTE NAS-Port-Type 61 integer +ATTRIBUTE Port-Limit 62 integer +ATTRIBUTE Connect-Info 77 string + +# RFC 2869 +ATTRIBUTE Acct-Interim-Interval 85 integer + +# +# Experimental Non Protocol Attributes used by Cistron-Radiusd +# +ATTRIBUTE Huntgroup-Name 221 string +ATTRIBUTE User-Category 1029 string +ATTRIBUTE Group-Name 1030 string +ATTRIBUTE Simultaneous-Use 1034 integer +ATTRIBUTE Strip-User-Name 1035 integer +ATTRIBUTE Fall-Through 1036 integer +ATTRIBUTE Add-Port-To-IP-Address 1037 integer +ATTRIBUTE Exec-Program 1038 string +ATTRIBUTE Exec-Program-Wait 1039 string +ATTRIBUTE Hint 1040 string + +# +# Non-Protocol Attributes +# These attributes are used internally by the server +# +ATTRIBUTE Expiration 21 date +ATTRIBUTE Auth-Type 1000 integer +ATTRIBUTE Menu 1001 string +ATTRIBUTE Termination-Menu 1002 string +ATTRIBUTE Prefix 1003 string +ATTRIBUTE Suffix 1004 string +ATTRIBUTE Group 1005 string +ATTRIBUTE Crypt-Password 1006 string +ATTRIBUTE Connect-Rate 1007 integer + +# +# Experimental, implementation specific attributes +# +# Limit session traffic +ATTRIBUTE Session-Octets-Limit 227 integer +# What to assume as limit - 0 in+out, 1 in, 2 out, 3 max(in,out) +ATTRIBUTE Octets-Direction 228 integer + +# +# Integer Translations +# + +# User Types + +VALUE Service-Type Login-User 1 +VALUE Service-Type Framed-User 2 +VALUE Service-Type Callback-Login-User 3 +VALUE Service-Type Callback-Framed-User 4 +VALUE Service-Type Outbound-User 5 +VALUE Service-Type Administrative-User 6 +VALUE Service-Type NAS-Prompt-User 7 + +# Framed Protocols + +VALUE Framed-Protocol PPP 1 +VALUE Framed-Protocol SLIP 2 + +# Framed Routing Values + +VALUE Framed-Routing None 0 +VALUE Framed-Routing Broadcast 1 +VALUE Framed-Routing Listen 2 +VALUE Framed-Routing Broadcast-Listen 3 + +# Framed Compression Types + +VALUE Framed-Compression None 0 +VALUE Framed-Compression Van-Jacobson-TCP-IP 1 + +# Login Services + +VALUE Login-Service Telnet 0 +VALUE Login-Service Rlogin 1 +VALUE Login-Service TCP-Clear 2 +VALUE Login-Service PortMaster 3 + +# Status Types + +VALUE Acct-Status-Type Start 1 +VALUE Acct-Status-Type Stop 2 +VALUE Acct-Status-Type Accounting-On 7 +VALUE Acct-Status-Type Accounting-Off 8 + +# Authentication Types + +VALUE Acct-Authentic RADIUS 1 +VALUE Acct-Authentic Local 2 +VALUE Acct-Authentic PowerLink128 100 + +# Termination Options + +VALUE Termination-Action Default 0 +VALUE Termination-Action RADIUS-Request 1 + +# NAS Port Types, available in 3.3.1 and later + +VALUE NAS-Port-Type Async 0 +VALUE NAS-Port-Type Sync 1 +VALUE NAS-Port-Type ISDN 2 +VALUE NAS-Port-Type ISDN-V120 3 +VALUE NAS-Port-Type ISDN-V110 4 + +# Acct Terminate Causes, available in 3.3.2 and later + +VALUE Acct-Terminate-Cause User-Request 1 +VALUE Acct-Terminate-Cause Lost-Carrier 2 +VALUE Acct-Terminate-Cause Lost-Service 3 +VALUE Acct-Terminate-Cause Idle-Timeout 4 +VALUE Acct-Terminate-Cause Session-Timeout 5 +VALUE Acct-Terminate-Cause Admin-Reset 6 +VALUE Acct-Terminate-Cause Admin-Reboot 7 +VALUE Acct-Terminate-Cause Port-Error 8 +VALUE Acct-Terminate-Cause NAS-Error 9 +VALUE Acct-Terminate-Cause NAS-Request 10 +VALUE Acct-Terminate-Cause NAS-Reboot 11 +VALUE Acct-Terminate-Cause Port-Unneeded 12 +VALUE Acct-Terminate-Cause Port-Preempted 13 +VALUE Acct-Terminate-Cause Port-Suspended 14 +VALUE Acct-Terminate-Cause Service-Unavailable 15 +VALUE Acct-Terminate-Cause Callback 16 +VALUE Acct-Terminate-Cause User-Error 17 +VALUE Acct-Terminate-Cause Host-Request 18 + +# +# Non-Protocol Integer Translations +# + +VALUE Auth-Type Local 0 +VALUE Auth-Type System 1 +VALUE Auth-Type SecurID 2 +VALUE Auth-Type Crypt-Local 3 +VALUE Auth-Type Reject 4 + +# +# Cistron extensions +# +VALUE Auth-Type Pam 253 +VALUE Auth-Type None 254 + +# +# Experimental Non-Protocol Integer Translations for Cistron-Radiusd +# +VALUE Fall-Through No 0 +VALUE Fall-Through Yes 1 +VALUE Add-Port-To-IP-Address No 0 +VALUE Add-Port-To-IP-Address Yes 1 + +# +# Configuration Values +# uncomment these two lines to turn account expiration on +# + +#VALUE Server-Config Password-Expiration 30 +#VALUE Server-Config Password-Warning 5 + +# Octets-Direction +VALUE Octets-Direction Sum 0 +VALUE Octets-Direction Input 1 +VALUE Octets-Direction Output 2 +VALUE Octets-Direction MaxOveral 3 +VALUE Octets-Direction MaxSession 4 + +INCLUDE /etc/ppp/radius/dictionary.microsoft diff --git a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.asnet b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.asnet new file mode 100644 index 0000000000..337d1e1407 --- /dev/null +++ b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.asnet @@ -0,0 +1,3 @@ +VENDOR ASNET 50000 +ATTRIBUTE Speed-Down 1 string ASNET +ATTRIBUTE Speed-Up 2 string ASNET diff --git a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.microsoft b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.microsoft new file mode 100644 index 0000000000..09fdbba63f --- /dev/null +++ b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/dictionary.microsoft @@ -0,0 +1,81 @@ +# +# Microsoft's VSA's, from RFC 2548 +# +# $Id$ +# + +VENDOR Microsoft 311 Microsoft + +ATTRIBUTE MS-CHAP-Response 1 string Microsoft +ATTRIBUTE MS-CHAP-Error 2 string Microsoft +ATTRIBUTE MS-CHAP-CPW-1 3 string Microsoft +ATTRIBUTE MS-CHAP-CPW-2 4 string Microsoft +ATTRIBUTE MS-CHAP-LM-Enc-PW 5 string Microsoft +ATTRIBUTE MS-CHAP-NT-Enc-PW 6 string Microsoft +ATTRIBUTE MS-MPPE-Encryption-Policy 7 string Microsoft +# This is referred to as both singular and plural in the RFC. +# Plural seems to make more sense. +ATTRIBUTE MS-MPPE-Encryption-Type 8 string Microsoft +ATTRIBUTE MS-MPPE-Encryption-Types 8 string Microsoft +ATTRIBUTE MS-RAS-Vendor 9 integer Microsoft +ATTRIBUTE MS-CHAP-Domain 10 string Microsoft +ATTRIBUTE MS-CHAP-Challenge 11 string Microsoft +ATTRIBUTE MS-CHAP-MPPE-Keys 12 string Microsoft +ATTRIBUTE MS-BAP-Usage 13 integer Microsoft +ATTRIBUTE MS-Link-Utilization-Threshold 14 integer Microsoft +ATTRIBUTE MS-Link-Drop-Time-Limit 15 integer Microsoft +ATTRIBUTE MS-MPPE-Send-Key 16 string Microsoft +ATTRIBUTE MS-MPPE-Recv-Key 17 string Microsoft +ATTRIBUTE MS-RAS-Version 18 string Microsoft +ATTRIBUTE MS-Old-ARAP-Password 19 string Microsoft +ATTRIBUTE MS-New-ARAP-Password 20 string Microsoft +ATTRIBUTE MS-ARAP-PW-Change-Reason 21 integer Microsoft + +ATTRIBUTE MS-Filter 22 string Microsoft +ATTRIBUTE MS-Acct-Auth-Type 23 integer Microsoft +ATTRIBUTE MS-Acct-EAP-Type 24 integer Microsoft + +ATTRIBUTE MS-CHAP2-Response 25 string Microsoft +ATTRIBUTE MS-CHAP2-Success 26 string Microsoft +ATTRIBUTE MS-CHAP2-CPW 27 string Microsoft + +ATTRIBUTE MS-Primary-DNS-Server 28 ipaddr Microsoft +ATTRIBUTE MS-Secondary-DNS-Server 29 ipaddr Microsoft +ATTRIBUTE MS-Primary-NBNS-Server 30 ipaddr Microsoft +ATTRIBUTE MS-Secondary-NBNS-Server 31 ipaddr Microsoft + +#ATTRIBUTE MS-ARAP-Challenge 33 string Microsoft + + +# +# Integer Translations +# + +# MS-BAP-Usage Values + +VALUE MS-BAP-Usage Not-Allowed 0 +VALUE MS-BAP-Usage Allowed 1 +VALUE MS-BAP-Usage Required 2 + +# MS-ARAP-Password-Change-Reason Values + +VALUE MS-ARAP-PW-Change-Reason Just-Change-Password 1 +VALUE MS-ARAP-PW-Change-Reason Expired-Password 2 +VALUE MS-ARAP-PW-Change-Reason Admin-Requires-Password-Change 3 +VALUE MS-ARAP-PW-Change-Reason Password-Too-Short 4 + +# MS-Acct-Auth-Type Values + +VALUE MS-Acct-Auth-Type PAP 1 +VALUE MS-Acct-Auth-Type CHAP 2 +VALUE MS-Acct-Auth-Type MS-CHAP-1 3 +VALUE MS-Acct-Auth-Type MS-CHAP-2 4 +VALUE MS-Acct-Auth-Type EAP 5 + +# MS-Acct-EAP-Type Values + +VALUE MS-Acct-EAP-Type MD5 4 +VALUE MS-Acct-EAP-Type OTP 5 +VALUE MS-Acct-EAP-Type Generic-Token-Card 6 +VALUE MS-Acct-EAP-Type TLS 13 + diff --git a/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/servers b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/servers new file mode 100644 index 0000000000..0c5b3b9add --- /dev/null +++ b/package/ppp/ipkg/ppp-radius-plugin/etc/ppp/radius/servers @@ -0,0 +1 @@ +localhost secret diff --git a/package/ppp/ipkg/ppp/CONTROL/conffiles b/package/ppp/ipkg/ppp/CONTROL/conffiles new file mode 100644 index 0000000000..8ad17eb436 --- /dev/null +++ b/package/ppp/ipkg/ppp/CONTROL/conffiles @@ -0,0 +1,2 @@ +/etc/ppp/chap-secrets +/etc/ppp/options diff --git a/package/ppp/ipkg/ppp/etc/ppp/chap-secrets b/package/ppp/ipkg/ppp/etc/ppp/chap-secrets new file mode 100644 index 0000000000..6ab76e49e9 --- /dev/null +++ b/package/ppp/ipkg/ppp/etc/ppp/chap-secrets @@ -0,0 +1 @@ +#USERNAME PROVIDER PASSWORD IPADDRESS diff --git a/package/ppp/ipkg/ppp/etc/ppp/options b/package/ppp/ipkg/ppp/etc/ppp/options new file mode 100644 index 0000000000..77170e960a --- /dev/null +++ b/package/ppp/ipkg/ppp/etc/ppp/options @@ -0,0 +1 @@ +#debug diff --git a/package/ppp/ipkg/ppp/etc/ppp/peers/sample b/package/ppp/ipkg/ppp/etc/ppp/peers/sample new file mode 100644 index 0000000000..492239c6d3 --- /dev/null +++ b/package/ppp/ipkg/ppp/etc/ppp/peers/sample @@ -0,0 +1,3 @@ +#name USERNAME +#remotename PROVIDER +#file /etc/ppp/sample-options diff --git a/package/ppp/ppp.patch b/package/ppp/ppp.patch new file mode 100644 index 0000000000..cb69791580 --- /dev/null +++ b/package/ppp/ppp.patch @@ -0,0 +1,1865 @@ +diff -ruN ppp-2.4.3-orig/chat/Makefile.linux ppp-2.4.3-3/chat/Makefile.linux +--- ppp-2.4.3-orig/chat/Makefile.linux 2004-11-03 12:51:47.000000000 +0100 ++++ ppp-2.4.3-3/chat/Makefile.linux 2004-12-05 17:42:43.000000000 +0100 +@@ -25,7 +25,7 @@ + + install: chat + mkdir -p $(BINDIR) +- $(INSTALL) -s -c chat $(BINDIR) ++ $(INSTALL) -c chat $(BINDIR) + $(INSTALL) -c -m 644 chat.8 $(MANDIR) + + clean: +diff -ruN ppp-2.4.3-orig/include/linux/ppp-comp.h ppp-2.4.3-3/include/linux/ppp-comp.h +--- ppp-2.4.3-orig/include/linux/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100 ++++ ppp-2.4.3-3/include/linux/ppp-comp.h 2004-12-16 00:50:53.000000000 +0100 +@@ -36,7 +36,7 @@ + */ + + /* +- * ==FILEVERSION 20020319== ++ * ==FILEVERSION 20020715== + * + * NOTE TO MAINTAINERS: + * If you modify this file at all, please set the above date. +@@ -56,10 +56,10 @@ + */ + + #ifndef DO_BSD_COMPRESS +-#define DO_BSD_COMPRESS 1 /* by default, include BSD-Compress */ ++#define DO_BSD_COMPRESS 0 /* by default, don't include BSD-Compress */ + #endif + #ifndef DO_DEFLATE +-#define DO_DEFLATE 1 /* by default, include Deflate */ ++#define DO_DEFLATE 0 /* by default, don't include Deflate */ + #endif + #define DO_PREDICTOR_1 0 + #define DO_PREDICTOR_2 0 +@@ -86,7 +86,7 @@ + + /* Compress a packet */ + int (*compress) (void *state, unsigned char *rptr, +- unsigned char *obuf, int isize, int osize); ++ unsigned char *obuf, int isize, int osize); + + /* Return compression statistics */ + void (*comp_stat) (void *state, struct compstat *stats); +@@ -107,7 +107,7 @@ + + /* Decompress a packet. */ + int (*decompress) (void *state, unsigned char *ibuf, int isize, +- unsigned char *obuf, int osize); ++ unsigned char *obuf, int osize); + + /* Update state for an incompressible packet received */ + void (*incomp) (void *state, unsigned char *ibuf, int icnt); +@@ -288,6 +288,33 @@ + opts |= MPPE_OPT_UNKNOWN; \ + } while (/* CONSTCOND */ 0) + ++/* MPPE/MPPC definitions by J.D.*/ ++#define MPPE_STATELESS MPPE_H_BIT /* configuration bit H */ ++#define MPPE_40BIT MPPE_L_BIT /* configuration bit L */ ++#define MPPE_56BIT MPPE_M_BIT /* configuration bit M */ ++#define MPPE_128BIT MPPE_S_BIT /* configuration bit S */ ++#define MPPE_MPPC MPPE_C_BIT /* configuration bit C */ ++ ++/* ++ * Definitions for Stac LZS. ++ */ ++ ++#define CI_LZS 17 /* config option for Stac LZS */ ++#define CILEN_LZS 5 /* length of config option */ ++ ++#define LZS_OVHD 4 /* max. LZS overhead */ ++#define LZS_HIST_LEN 2048 /* LZS history size */ ++#define LZS_MAX_CCOUNT 0x0FFF /* max. coherency counter value */ ++ ++#define LZS_MODE_NONE 0 ++#define LZS_MODE_LCB 1 ++#define LZS_MODE_CRC 2 ++#define LZS_MODE_SEQ 3 ++#define LZS_MODE_EXT 4 ++ ++#define LZS_EXT_BIT_FLUSHED 0x80 /* bit A */ ++#define LZS_EXT_BIT_COMP 0x20 /* bit C */ ++ + /* + * Definitions for other, as yet unsupported, compression methods. + */ +diff -ruN ppp-2.4.3-orig/include/net/ppp-comp.h ppp-2.4.3-3/include/net/ppp-comp.h +--- ppp-2.4.3-orig/include/net/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100 ++++ ppp-2.4.3-3/include/net/ppp-comp.h 2004-12-16 00:51:06.000000000 +0100 +@@ -43,10 +43,10 @@ + * various compression methods. + */ + #ifndef DO_BSD_COMPRESS +-#define DO_BSD_COMPRESS 1 /* by default, include BSD-Compress */ ++#define DO_BSD_COMPRESS 0 /* by default, don't include BSD-Compress */ + #endif + #ifndef DO_DEFLATE +-#define DO_DEFLATE 1 /* by default, include Deflate */ ++#define DO_DEFLATE 0 /* by default, don't include Deflate */ + #endif + #define DO_PREDICTOR_1 0 + #define DO_PREDICTOR_2 0 +@@ -255,6 +255,33 @@ + opts |= MPPE_OPT_UNKNOWN; \ + } while (/* CONSTCOND */ 0) + ++/* MPPE/MPPC definitions by J.D.*/ ++#define MPPE_STATELESS MPPE_H_BIT /* configuration bit H */ ++#define MPPE_40BIT MPPE_L_BIT /* configuration bit L */ ++#define MPPE_56BIT MPPE_M_BIT /* configuration bit M */ ++#define MPPE_128BIT MPPE_S_BIT /* configuration bit S */ ++#define MPPE_MPPC MPPE_C_BIT /* configuration bit C */ ++ ++/* ++ * Definitions for Stac LZS. ++ */ ++ ++#define CI_LZS 17 /* config option for Stac LZS */ ++#define CILEN_LZS 5 /* length of config option */ ++ ++#define LZS_OVHD 4 /* max. LZS overhead */ ++#define LZS_HIST_LEN 2048 /* LZS history size */ ++#define LZS_MAX_CCOUNT 0x0FFF /* max. coherency counter value */ ++ ++#define LZS_MODE_NONE 0 ++#define LZS_MODE_LCB 1 ++#define LZS_MODE_CRC 2 ++#define LZS_MODE_SEQ 3 ++#define LZS_MODE_EXT 4 ++ ++#define LZS_EXT_BIT_FLUSHED 0x80 /* bit A */ ++#define LZS_EXT_BIT_COMP 0x20 /* bit C */ ++ + /* + * Definitions for other, as yet unsupported, compression methods. + */ +diff -ruN ppp-2.4.3-orig/pppd/Makefile.linux ppp-2.4.3-3/pppd/Makefile.linux +--- ppp-2.4.3-orig/pppd/Makefile.linux 2004-11-13 13:02:22.000000000 +0100 ++++ ppp-2.4.3-3/pppd/Makefile.linux 2004-12-16 04:43:41.000000000 +0100 +@@ -48,19 +48,19 @@ + # Uncomment the next line to include support for PPP packet filtering. + # This requires that the libpcap library and headers be installed + # and that the kernel driver support PPP packet filtering. +-FILTER=y ++#FILTER=y + + # Uncomment the next line to enable multilink PPP (enabled by default) + # Linux distributions: Please leave multilink ENABLED in your builds + # of pppd! +-HAVE_MULTILINK=y ++#HAVE_MULTILINK=y + + # Uncomment the next line to enable the TDB database (enabled by default.) + # If you enable multilink, then TDB is automatically enabled also. + # Linux distributions: Please leave TDB ENABLED in your builds. +-USE_TDB=y ++#USE_TDB=y + +-HAS_SHADOW=y ++#HAS_SHADOW=y + #USE_PAM=y + #HAVE_INET6=y + +@@ -77,7 +77,7 @@ + + INCLUDE_DIRS= -I../include + +-COMPILE_FLAGS= -DHAVE_PATHS_H -DIPX_CHANGE -DHAVE_MMAP ++COMPILE_FLAGS= -DHAVE_PATHS_H -DHAVE_MMAP + + CFLAGS= $(COPTS) $(COMPILE_FLAGS) $(INCLUDE_DIRS) + +@@ -99,7 +99,7 @@ + CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include + LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto + TARGETS += srp-entry +-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry ++EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry + MANPAGES += srp-entry.8 + EXTRACLEAN += srp-entry.o + NEEDDES=y +@@ -117,12 +117,12 @@ + #LIBS += -lshadow $(LIBS) + endif + +-ifneq ($(wildcard /usr/include/crypt.h),) ++#ifneq ($(wildcard /usr/include/crypt.h),) + CFLAGS += -DHAVE_CRYPT_H=1 +-endif +-ifneq ($(wildcard /usr/lib/libcrypt.*),) ++#endif ++#ifneq ($(wildcard /usr/lib/libcrypt.*),) + LIBS += -lcrypt +-endif ++#endif + + ifdef NEEDDES + ifndef USE_CRYPT +@@ -202,7 +202,7 @@ + install: pppd + mkdir -p $(BINDIR) $(MANDIR) + $(EXTRAINSTALL) +- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd ++ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd + if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \ + chmod o-rx,u+s $(BINDIR)/pppd; fi + $(INSTALL) -c -m 444 pppd.8 $(MANDIR) +diff -ruN ppp-2.4.3-orig/pppd/ccp.c ppp-2.4.3-3/pppd/ccp.c +--- ppp-2.4.3-orig/pppd/ccp.c 2004-11-13 03:28:15.000000000 +0100 ++++ ppp-2.4.3-3/pppd/ccp.c 2004-12-05 17:51:27.000000000 +0100 +@@ -62,12 +62,10 @@ + static char bsd_value[8]; + static char deflate_value[8]; + +-/* +- * Option variables. +- */ + #ifdef MPPE +-bool refuse_mppe_stateful = 1; /* Allow stateful mode? */ +-#endif ++static int setmppe(char **); ++static int setnomppe(void); ++#endif /* MPPE */ + + static option_t ccp_option_list[] = { + { "noccp", o_bool, &ccp_protent.enabled_flag, +@@ -108,54 +106,36 @@ + "don't allow Predictor-1", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR, + &ccp_allowoptions[0].predictor_1 }, + ++ { "lzs", o_bool, &ccp_wantoptions[0].lzs, ++ "request Stac LZS", 1, &ccp_allowoptions[0].lzs, OPT_PRIO }, ++ { "+lzs", o_bool, &ccp_wantoptions[0].lzs, ++ "request Stac LZS", 1, &ccp_allowoptions[0].lzs, OPT_ALIAS | OPT_PRIO }, ++ { "nolzs", o_bool, &ccp_wantoptions[0].lzs, ++ "don't allow Stac LZS", OPT_PRIOSUB | OPT_A2CLR, ++ &ccp_allowoptions[0].lzs }, ++ { "-lzs", o_bool, &ccp_wantoptions[0].lzs, ++ "don't allow Stac LZS", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR, ++ &ccp_allowoptions[0].lzs }, ++ + #ifdef MPPE +- /* MPPE options are symmetrical ... we only set wantoptions here */ +- { "require-mppe", o_bool, &ccp_wantoptions[0].mppe, +- "require MPPE encryption", +- OPT_PRIO | MPPE_OPT_40 | MPPE_OPT_128 }, +- { "+mppe", o_bool, &ccp_wantoptions[0].mppe, +- "require MPPE encryption", +- OPT_ALIAS | OPT_PRIO | MPPE_OPT_40 | MPPE_OPT_128 }, +- { "nomppe", o_bool, &ccp_wantoptions[0].mppe, +- "don't allow MPPE encryption", OPT_PRIO }, +- { "-mppe", o_bool, &ccp_wantoptions[0].mppe, +- "don't allow MPPE encryption", OPT_ALIAS | OPT_PRIO }, +- +- /* We use ccp_allowoptions[0].mppe as a junk var ... it is reset later */ +- { "require-mppe-40", o_bool, &ccp_allowoptions[0].mppe, +- "require MPPE 40-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_40, +- &ccp_wantoptions[0].mppe }, +- { "+mppe-40", o_bool, &ccp_allowoptions[0].mppe, +- "require MPPE 40-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_40, +- &ccp_wantoptions[0].mppe }, +- { "nomppe-40", o_bool, &ccp_allowoptions[0].mppe, +- "don't allow MPPE 40-bit encryption", +- OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_40, &ccp_wantoptions[0].mppe }, +- { "-mppe-40", o_bool, &ccp_allowoptions[0].mppe, +- "don't allow MPPE 40-bit encryption", +- OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_40, +- &ccp_wantoptions[0].mppe }, +- +- { "require-mppe-128", o_bool, &ccp_allowoptions[0].mppe, +- "require MPPE 128-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_128, +- &ccp_wantoptions[0].mppe }, +- { "+mppe-128", o_bool, &ccp_allowoptions[0].mppe, +- "require MPPE 128-bit encryption", +- OPT_ALIAS | OPT_PRIO | OPT_A2OR | MPPE_OPT_128, +- &ccp_wantoptions[0].mppe }, +- { "nomppe-128", o_bool, &ccp_allowoptions[0].mppe, +- "don't allow MPPE 128-bit encryption", +- OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_128, &ccp_wantoptions[0].mppe }, +- { "-mppe-128", o_bool, &ccp_allowoptions[0].mppe, +- "don't allow MPPE 128-bit encryption", +- OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_128, +- &ccp_wantoptions[0].mppe }, +- +- /* strange one; we always request stateless, but will we allow stateful? */ +- { "mppe-stateful", o_bool, &refuse_mppe_stateful, +- "allow MPPE stateful mode", OPT_PRIO }, +- { "nomppe-stateful", o_bool, &refuse_mppe_stateful, +- "disallow MPPE stateful mode", OPT_PRIO | 1 }, ++ { "mppc", o_bool, &ccp_wantoptions[0].mppc, ++ "request MPPC compression", 1, &ccp_allowoptions[0].mppc }, ++ { "+mppc", o_bool, &ccp_wantoptions[0].mppc, ++ "request MPPC compression", 1, &ccp_allowoptions[0].mppc, OPT_ALIAS }, ++ { "nomppc", o_bool, &ccp_wantoptions[0].mppc, ++ "don't allow MPPC compression", OPT_PRIOSUB | OPT_A2CLR, ++ &ccp_allowoptions[0].mppc }, ++ { "-mppc", o_bool, &ccp_wantoptions[0].mppc, ++ "don't allow MPPC compression", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR, ++ &ccp_allowoptions[0].mppc }, ++ { "mppe", o_special, (void *)setmppe, ++ "request MPPE encryption" }, ++ { "+mppe", o_special, (void *)setmppe, ++ "request MPPE encryption" }, ++ { "nomppe", o_special_noarg, (void *)setnomppe, ++ "don't allow MPPE encryption" }, ++ { "-mppe", o_special_noarg, (void *)setnomppe, ++ "don't allow MPPE encryption" }, + #endif /* MPPE */ + + { NULL } +@@ -241,7 +221,7 @@ + */ + #define ANY_COMPRESS(opt) ((opt).deflate || (opt).bsd_compress \ + || (opt).predictor_1 || (opt).predictor_2 \ +- || (opt).mppe) ++ || (opt).lzs || (opt).mppc || (opt).mppe) + + /* + * Local state (mainly for handling reset-reqs and reset-acks). +@@ -344,6 +324,100 @@ + return 1; + } + ++#ifdef MPPE ++/* ++ * Functions called from config options ++ */ ++/* ++ MPPE suboptions: ++ required - require MPPE; disconnect if peer doesn't support it ++ stateless - use stateless mode ++ no40 - disable 40 bit keys ++ no56 - disable 56 bit keys ++ no128 - disable 128 bit keys ++*/ ++int setmppe(char **argv) ++{ ++ int i; ++ char *str, cmdbuf[16]; ++ ++ ccp_allowoptions[0].mppe = 1; ++ ccp_allowoptions[0].mppe_40 = 1; ++ ccp_allowoptions[0].mppe_56 = 1; ++ ccp_allowoptions[0].mppe_128 = 1; ++ ccp_allowoptions[0].mppe_stateless = 0; ++ ccp_wantoptions[0].mppe = 0; ++ ++ str = *argv; ++ ++ while (1) { ++ i = 0; ++ memset(cmdbuf, '\0', 16); ++ while ((i < 16) && (*str != ',') && (*str != '\0')) ++ cmdbuf[i++] = *str++; ++ cmdbuf[i] = '\0'; ++ if (!strncasecmp(cmdbuf, "no40", strlen("no40"))) { ++ ccp_allowoptions[0].mppe_40 = 0; ++ goto next_param; ++ } else if (!strncasecmp(cmdbuf, "no56", strlen("no56"))) { ++ ccp_allowoptions[0].mppe_56 = 0; ++ goto next_param; ++ } else if (!strncasecmp(cmdbuf, "no128", strlen("no128"))) { ++ ccp_allowoptions[0].mppe_128 = 0; ++ goto next_param; ++ } else if (!strncasecmp(cmdbuf, "stateless", strlen("stateless"))) { ++ ccp_allowoptions[0].mppe_stateless = 1; ++ goto next_param; ++ } else if (!strncasecmp(cmdbuf, "required", strlen("required"))) { ++ ccp_wantoptions[0].mppe = 1; ++ goto next_param; ++ } else { ++ option_error("invalid parameter '%s' for mppe option", cmdbuf); ++ return 0; ++ } ++ ++ next_param: ++ if (*str == ',') { ++ str++; ++ continue; ++ } ++ if (*str == '\0') { ++ if (!(ccp_allowoptions[0].mppe_40 || ccp_allowoptions[0].mppe_56 || ++ ccp_allowoptions[0].mppe_128)) { ++ if (ccp_wantoptions[0].mppe == 1) { ++ option_error("You require MPPE but you have switched off " ++ "all encryption key lengths."); ++ return 0; ++ } ++ ccp_wantoptions[0].mppe = ccp_allowoptions[0].mppe = 0; ++ ccp_wantoptions[0].mppe_stateless = ++ ccp_allowoptions[0].mppe_stateless = 0; ++ } else { ++ ccp_allowoptions[0].mppe = 1; ++ ccp_wantoptions[0].mppe_stateless = ++ ccp_allowoptions[0].mppe_stateless; ++ if (ccp_wantoptions[0].mppe == 1) { ++ ccp_wantoptions[0].mppe_40 = ccp_allowoptions[0].mppe_40; ++ ccp_wantoptions[0].mppe_56 = ccp_allowoptions[0].mppe_56; ++ ccp_wantoptions[0].mppe_128 = ccp_allowoptions[0].mppe_128; ++ } ++ } ++ return 1; ++ } ++ } ++} ++ ++int setnomppe(void) ++{ ++ ccp_wantoptions[0].mppe = ccp_allowoptions[0].mppe = 0; ++ ccp_wantoptions[0].mppe_40 = ccp_allowoptions[0].mppe_40 = 0; ++ ccp_wantoptions[0].mppe_56 = ccp_allowoptions[0].mppe_56 = 0; ++ ccp_wantoptions[0].mppe_128 = ccp_allowoptions[0].mppe_128 = 0; ++ ccp_wantoptions[0].mppe_stateless = ccp_allowoptions[0].mppe_stateless = 0; ++ return 1; ++} ++#endif /* MPPE */ ++ + /* + * ccp_init - initialize CCP. + */ +@@ -378,6 +452,30 @@ + ccp_allowoptions[0].bsd_bits = BSD_MAX_BITS; + + ccp_allowoptions[0].predictor_1 = 1; ++ ++ ccp_wantoptions[0].lzs = 0; /* Stac LZS - will be enabled in the future */ ++ ccp_wantoptions[0].lzs_mode = LZS_MODE_SEQ; ++ ccp_wantoptions[0].lzs_hists = 1; ++ ccp_allowoptions[0].lzs = 0; /* Stac LZS - will be enabled in the future */ ++ ccp_allowoptions[0].lzs_mode = LZS_MODE_SEQ; ++ ccp_allowoptions[0].lzs_hists = 1; ++ ++#ifdef MPPE ++ /* by default allow and request MPPC... */ ++ ccp_wantoptions[0].mppc = ccp_allowoptions[0].mppc = 1; ++ ++ /* ... and allow but don't request MPPE */ ++ ccp_allowoptions[0].mppe = 1; ++ ccp_allowoptions[0].mppe_40 = 1; ++ ccp_allowoptions[0].mppe_56 = 1; ++ ccp_allowoptions[0].mppe_128 = 1; ++ ccp_allowoptions[0].mppe_stateless = 1; ++ ccp_wantoptions[0].mppe = 0; ++ ccp_wantoptions[0].mppe_40 = 0; ++ ccp_wantoptions[0].mppe_56 = 0; ++ ccp_wantoptions[0].mppe_128 = 0; ++ ccp_wantoptions[0].mppe_stateless = 0; ++#endif /* MPPE */ + } + + /* +@@ -455,11 +553,11 @@ + if (oldstate == OPENED && p[0] == TERMREQ && f->state != OPENED) { + notice("Compression disabled by peer."); + #ifdef MPPE +- if (ccp_gotoptions[unit].mppe) { ++ if (ccp_wantoptions[unit].mppe) { + error("MPPE disabled, closing LCP"); + lcp_close(unit, "MPPE disabled by peer"); + } +-#endif ++#endif /* MPPE */ + } + + /* +@@ -487,6 +585,15 @@ + break; + /* send a reset-ack, which the transmitter will see and + reset its compression state. */ ++ ++ /* In case of MPPE/MPPC or LZS we shouldn't send CCP_RESETACK, ++ but we do it in order to reset compressor; CCP_RESETACK is ++ then silently discarded. See functions ppp_send_frame and ++ ppp_ccp_peek in ppp_generic.c (Linux only !!!). All the ++ confusion is caused by the fact that CCP code is splited ++ into two parts - one part is handled by pppd, the other one ++ is handled by kernel. */ ++ + fsm_sdata(f, CCP_RESETACK, id, NULL, 0); + break; + +@@ -515,12 +622,11 @@ + fsm_lowerdown(&ccp_fsm[unit]); + + #ifdef MPPE +- if (ccp_gotoptions[unit].mppe) { ++ if (ccp_wantoptions[unit].mppe) { + error("MPPE required but peer negotiation failed"); + lcp_close(unit, "MPPE required but peer negotiation failed"); + } +-#endif +- ++#endif /* MPPE */ + } + + /* +@@ -537,7 +643,7 @@ + all_rejected[f->unit] = 0; + + #ifdef MPPE +- if (go->mppe) { ++ if (go->mppe || go->mppc) { + ccp_options *ao = &ccp_allowoptions[f->unit]; + int auth_mschap_bits = auth_done[f->unit]; + int numbits; +@@ -551,80 +657,109 @@ + * NB: If MPPE is required, all other compression opts are invalid. + * So, we return right away if we can't do it. + */ ++ if (ccp_wantoptions[f->unit].mppe) { ++ /* Leave only the mschap auth bits set */ ++ auth_mschap_bits &= (CHAP_MS_WITHPEER | CHAP_MS_PEER | ++ CHAP_MS2_WITHPEER | CHAP_MS2_PEER); ++ /* Count the mschap auths */ ++ auth_mschap_bits >>= CHAP_MS_SHIFT; ++ numbits = 0; ++ do { ++ numbits += auth_mschap_bits & 1; ++ auth_mschap_bits >>= 1; ++ } while (auth_mschap_bits); ++ if (numbits > 1) { ++ error("MPPE required, but auth done in both directions."); ++ lcp_close(f->unit, "MPPE required but not available"); ++ return; ++ } ++ if (!numbits) { ++ error("MPPE required, but MS-CHAP[v2] auth not performed."); ++ lcp_close(f->unit, "MPPE required but not available"); ++ return; ++ } + +- /* Leave only the mschap auth bits set */ +- auth_mschap_bits &= (CHAP_MS_WITHPEER | CHAP_MS_PEER | +- CHAP_MS2_WITHPEER | CHAP_MS2_PEER); +- /* Count the mschap auths */ +- auth_mschap_bits >>= CHAP_MS_SHIFT; +- numbits = 0; +- do { +- numbits += auth_mschap_bits & 1; +- auth_mschap_bits >>= 1; +- } while (auth_mschap_bits); +- if (numbits > 1) { +- error("MPPE required, but auth done in both directions."); +- lcp_close(f->unit, "MPPE required but not available"); +- return; +- } +- if (!numbits) { +- error("MPPE required, but MS-CHAP[v2] auth not performed."); +- lcp_close(f->unit, "MPPE required but not available"); +- return; +- } +- +- /* A plugin (eg radius) may not have obtained key material. */ +- if (!mppe_keys_set) { +- error("MPPE required, but keys are not available. " +- "Possible plugin problem?"); +- lcp_close(f->unit, "MPPE required but not available"); +- return; +- } +- +- /* LM auth not supported for MPPE */ +- if (auth_done[f->unit] & (CHAP_MS_WITHPEER | CHAP_MS_PEER)) { +- /* This might be noise */ +- if (go->mppe & MPPE_OPT_40) { +- notice("Disabling 40-bit MPPE; MS-CHAP LM not supported"); +- go->mppe &= ~MPPE_OPT_40; +- ccp_wantoptions[f->unit].mppe &= ~MPPE_OPT_40; ++ /* A plugin (eg radius) may not have obtained key material. */ ++ if (!mppe_keys_set) { ++ error("MPPE required, but keys are not available. " ++ "Possible plugin problem?"); ++ lcp_close(f->unit, "MPPE required but not available"); ++ return; + } + } + +- /* Last check: can we actually negotiate something? */ +- if (!(go->mppe & (MPPE_OPT_40 | MPPE_OPT_128))) { +- /* Could be misconfig, could be 40-bit disabled above. */ +- error("MPPE required, but both 40-bit and 128-bit disabled."); +- lcp_close(f->unit, "MPPE required but not available"); +- return; ++ /* ++ * Check whether the kernel knows about the various ++ * compression methods we might request. Key material ++ * unimportant here. ++ */ ++ if (go->mppc) { ++ opt_buf[0] = CI_MPPE; ++ opt_buf[1] = CILEN_MPPE; ++ opt_buf[2] = 0; ++ opt_buf[3] = 0; ++ opt_buf[4] = 0; ++ opt_buf[5] = MPPE_MPPC; ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE, 0) <= 0) ++ go->mppc = 0; ++ } ++ if (go->mppe_40) { ++ opt_buf[0] = CI_MPPE; ++ opt_buf[1] = CILEN_MPPE; ++ opt_buf[2] = MPPE_STATELESS; ++ opt_buf[3] = 0; ++ opt_buf[4] = 0; ++ opt_buf[5] = MPPE_40BIT; ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) ++ go->mppe_40 = 0; ++ } ++ if (go->mppe_56) { ++ opt_buf[0] = CI_MPPE; ++ opt_buf[1] = CILEN_MPPE; ++ opt_buf[2] = MPPE_STATELESS; ++ opt_buf[3] = 0; ++ opt_buf[4] = 0; ++ opt_buf[5] = MPPE_56BIT; ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) ++ go->mppe_56 = 0; ++ } ++ if (go->mppe_128) { ++ opt_buf[0] = CI_MPPE; ++ opt_buf[1] = CILEN_MPPE; ++ opt_buf[2] = MPPE_STATELESS; ++ opt_buf[3] = 0; ++ opt_buf[4] = 0; ++ opt_buf[5] = MPPE_128BIT; ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) ++ go->mppe_128 = 0; ++ } ++ if (!go->mppe_40 && !go->mppe_56 && !go->mppe_128) { ++ if (ccp_wantoptions[f->unit].mppe) { ++ error("MPPE required, but kernel has no support."); ++ lcp_close(f->unit, "MPPE required but not available"); ++ } ++ go->mppe = go->mppe_stateless = 0; ++ } else { ++ /* MPPE is not compatible with other compression types */ ++ if (ccp_wantoptions[f->unit].mppe) { ++ ao->bsd_compress = go->bsd_compress = 0; ++ ao->predictor_1 = go->predictor_1 = 0; ++ ao->predictor_2 = go->predictor_2 = 0; ++ ao->deflate = go->deflate = 0; ++ ao->lzs = go->lzs = 0; ++ } + } +- +- /* sync options */ +- ao->mppe = go->mppe; +- /* MPPE is not compatible with other compression types */ +- ao->bsd_compress = go->bsd_compress = 0; +- ao->predictor_1 = go->predictor_1 = 0; +- ao->predictor_2 = go->predictor_2 = 0; +- ao->deflate = go->deflate = 0; + } + #endif /* MPPE */ +- +- /* +- * Check whether the kernel knows about the various +- * compression methods we might request. +- */ +-#ifdef MPPE +- if (go->mppe) { +- opt_buf[0] = CI_MPPE; +- opt_buf[1] = CILEN_MPPE; +- MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]); +- /* Key material unimportant here. */ +- if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) { +- error("MPPE required, but kernel has no support."); +- lcp_close(f->unit, "MPPE required but not available"); +- } ++ if (go->lzs) { ++ opt_buf[0] = CI_LZS; ++ opt_buf[1] = CILEN_LZS; ++ opt_buf[2] = go->lzs_hists >> 8; ++ opt_buf[3] = go->lzs_hists & 0xff; ++ opt_buf[4] = LZS_MODE_SEQ; ++ if (ccp_test(f->unit, opt_buf, CILEN_LZS, 0) <= 0) ++ go->lzs = 0; + } +-#endif + if (go->bsd_compress) { + opt_buf[0] = CI_BSD_COMPRESS; + opt_buf[1] = CILEN_BSD_COMPRESS; +@@ -679,7 +814,8 @@ + + (go->deflate? CILEN_DEFLATE: 0) + + (go->predictor_1? CILEN_PREDICTOR_1: 0) + + (go->predictor_2? CILEN_PREDICTOR_2: 0) +- + (go->mppe? CILEN_MPPE: 0); ++ + (go->lzs? CILEN_LZS: 0) ++ + ((go->mppe || go->mppc)? CILEN_MPPE: 0); + } + + /* +@@ -693,6 +829,8 @@ + { + int res; + ccp_options *go = &ccp_gotoptions[f->unit]; ++ ccp_options *ao = &ccp_allowoptions[f->unit]; ++ ccp_options *wo = &ccp_wantoptions[f->unit]; + u_char *p0 = p; + + /* +@@ -701,22 +839,43 @@ + * in case it gets Acked. + */ + #ifdef MPPE +- if (go->mppe) { ++ if (go->mppe || go->mppc || (!wo->mppe && ao->mppe)) { + u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN]; + +- p[0] = opt_buf[0] = CI_MPPE; +- p[1] = opt_buf[1] = CILEN_MPPE; +- MPPE_OPTS_TO_CI(go->mppe, &p[2]); +- MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]); ++ p[0] = CI_MPPE; ++ p[1] = CILEN_MPPE; ++ p[2] = (go->mppe_stateless ? MPPE_STATELESS : 0); ++ p[3] = 0; ++ p[4] = 0; ++ p[5] = (go->mppe_40 ? MPPE_40BIT : 0) | (go->mppe_56 ? MPPE_56BIT : 0) | ++ (go->mppe_128 ? MPPE_128BIT : 0) | (go->mppc ? MPPE_MPPC : 0); ++ ++ BCOPY(p, opt_buf, CILEN_MPPE); + BCOPY(mppe_recv_key, &opt_buf[CILEN_MPPE], MPPE_MAX_KEY_LEN); + res = ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0); +- if (res > 0) ++ if (res > 0) { + p += CILEN_MPPE; +- else ++ } else { + /* This shouldn't happen, we've already tested it! */ +- lcp_close(f->unit, "MPPE required but not available in kernel"); ++ go->mppe = go->mppe_40 = go->mppe_56 = go->mppe_128 = ++ go->mppe_stateless = go->mppc = 0; ++ if (ccp_wantoptions[f->unit].mppe) ++ lcp_close(f->unit, "MPPE required but not available in kernel"); ++ } ++ } ++#endif /* MPPE */ ++ if (go->lzs) { ++ p[0] = CI_LZS; ++ p[1] = CILEN_LZS; ++ p[2] = go->lzs_hists >> 8; ++ p[3] = go->lzs_hists & 0xff; ++ p[4] = LZS_MODE_SEQ; ++ res = ccp_test(f->unit, p, CILEN_LZS, 0); ++ if (res > 0) { ++ p += CILEN_LZS; ++ } else ++ go->lzs = 0; + } +-#endif + if (go->deflate) { + p[0] = go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT; + p[1] = CILEN_DEFLATE; +@@ -802,7 +961,7 @@ + + /* + * ccp_ackci - process a received configure-ack, and return +- * 1 iff the packet was OK. ++ * 1 if the packet was OK. + */ + static int + ccp_ackci(f, p, len) +@@ -811,24 +970,44 @@ + int len; + { + ccp_options *go = &ccp_gotoptions[f->unit]; ++ ccp_options *ao = &ccp_allowoptions[f->unit]; ++ ccp_options *wo = &ccp_wantoptions[f->unit]; + u_char *p0 = p; + + #ifdef MPPE +- if (go->mppe) { +- u_char opt_buf[CILEN_MPPE]; +- +- opt_buf[0] = CI_MPPE; +- opt_buf[1] = CILEN_MPPE; +- MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]); +- if (len < CILEN_MPPE || memcmp(opt_buf, p, CILEN_MPPE)) ++ if (go->mppe || go->mppc || (!wo->mppe && ao->mppe)) { ++ if (len < CILEN_MPPE ++ || p[1] != CILEN_MPPE || p[0] != CI_MPPE ++ || p[2] != (go->mppe_stateless ? MPPE_STATELESS : 0) ++ || p[3] != 0 ++ || p[4] != 0 ++ || (p[5] != ((go->mppe_40 ? MPPE_40BIT : 0) | ++ (go->mppc ? MPPE_MPPC : 0)) ++ && p[5] != ((go->mppe_56 ? MPPE_56BIT : 0) | ++ (go->mppc ? MPPE_MPPC : 0)) ++ && p[5] != ((go->mppe_128 ? MPPE_128BIT : 0) | ++ (go->mppc ? MPPE_MPPC : 0)))) + return 0; ++ if (go->mppe_40 || go->mppe_56 || go->mppe_128) ++ go->mppe = 1; + p += CILEN_MPPE; + len -= CILEN_MPPE; ++ /* Cope with first/fast ack */ ++ if (p == p0 && len == 0) ++ return 1; ++ } ++#endif /* MPPE */ ++ if (go->lzs) { ++ if (len < CILEN_LZS || p[0] != CI_LZS || p[1] != CILEN_LZS ++ || p[2] != go->lzs_hists>>8 || p[3] != (go->lzs_hists&0xff) ++ || p[4] != LZS_MODE_SEQ) ++ return 0; ++ p += CILEN_LZS; ++ len -= CILEN_LZS; + /* XXX Cope with first/fast ack */ +- if (len == 0) ++ if (p == p0 && len == 0) + return 1; + } +-#endif + if (go->deflate) { + if (len < CILEN_DEFLATE + || p[0] != (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT) +@@ -891,7 +1070,7 @@ + + /* + * ccp_nakci - process received configure-nak. +- * Returns 1 iff the nak was OK. ++ * Returns 1 if the nak was OK. + */ + static int + ccp_nakci(f, p, len, treat_as_reject) +@@ -900,6 +1079,8 @@ + int len; + { + ccp_options *go = &ccp_gotoptions[f->unit]; ++ ccp_options *ao = &ccp_allowoptions[f->unit]; ++ ccp_options *wo = &ccp_wantoptions[f->unit]; + ccp_options no; /* options we've seen already */ + ccp_options try; /* options to ask for next time */ + +@@ -907,28 +1088,100 @@ + try = *go; + + #ifdef MPPE +- if (go->mppe && len >= CILEN_MPPE +- && p[0] == CI_MPPE && p[1] == CILEN_MPPE) { +- no.mppe = 1; +- /* +- * Peer wants us to use a different strength or other setting. +- * Fail if we aren't willing to use his suggestion. +- */ +- MPPE_CI_TO_OPTS(&p[2], try.mppe); +- if ((try.mppe & MPPE_OPT_STATEFUL) && refuse_mppe_stateful) { +- error("Refusing MPPE stateful mode offered by peer"); +- try.mppe = 0; +- } else if (((go->mppe | MPPE_OPT_STATEFUL) & try.mppe) != try.mppe) { +- /* Peer must have set options we didn't request (suggest) */ +- try.mppe = 0; +- } ++ if ((go->mppe || go->mppc || (!wo->mppe && ao->mppe)) && ++ len >= CILEN_MPPE && p[0] == CI_MPPE && p[1] == CILEN_MPPE) { + +- if (!try.mppe) { +- error("MPPE required but peer negotiation failed"); +- lcp_close(f->unit, "MPPE required but peer negotiation failed"); ++ if (go->mppc) { ++ no.mppc = 1; ++ if (!(p[5] & MPPE_MPPC)) ++ try.mppc = 0; ++ } ++ ++ if (go->mppe) ++ no.mppe = 1; ++ if (go->mppe_40) ++ no.mppe_40 = 1; ++ if (go->mppe_56) ++ no.mppe_56 = 1; ++ if (go->mppe_128) ++ no.mppe_128 = 1; ++ if (go->mppe_stateless) ++ no.mppe_stateless = 1; ++ ++ if (ao->mppe_40) { ++ if ((p[5] & MPPE_40BIT)) ++ try.mppe_40 = 1; ++ else ++ try.mppe_40 = (p[5] == 0) ? 1 : 0; ++ } ++ if (ao->mppe_56) { ++ if ((p[5] & MPPE_56BIT)) ++ try.mppe_56 = 1; ++ else ++ try.mppe_56 = (p[5] == 0) ? 1 : 0; ++ } ++ if (ao->mppe_128) { ++ if ((p[5] & MPPE_128BIT)) ++ try.mppe_128 = 1; ++ else ++ try.mppe_128 = (p[5] == 0) ? 1 : 0; ++ } ++ ++ if (ao->mppe_stateless) { ++ if ((p[2] & MPPE_STATELESS) || wo->mppe_stateless) ++ try.mppe_stateless = 1; ++ else ++ try.mppe_stateless = 0; ++ } ++ ++ if (!try.mppe_56 && !try.mppe_40 && !try.mppe_128) { ++ try.mppe = try.mppe_stateless = 0; ++ if (wo->mppe) { ++ /* we require encryption, but peer doesn't support it ++ so we close connection */ ++ wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 = ++ wo->mppe_56 = wo->mppe_128 = 0; ++ lcp_close(f->unit, "MPPE required but cannot negotiate MPPE " ++ "key length"); ++ } ++ } ++ if (wo->mppe && (wo->mppe_40 != try.mppe_40) && ++ (wo->mppe_56 != try.mppe_56) && (wo->mppe_128 != try.mppe_128)) { ++ /* cannot negotiate key length */ ++ wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 = ++ wo->mppe_56 = wo->mppe_128 = 0; ++ lcp_close(f->unit, "Cannot negotiate MPPE key length"); + } ++ if (try.mppe_40 && try.mppe_56 && try.mppe_128) ++ try.mppe_40 = try.mppe_56 = 0; ++ else ++ if (try.mppe_56 && try.mppe_128) ++ try.mppe_56 = 0; ++ else ++ if (try.mppe_40 && try.mppe_128) ++ try.mppe_40 = 0; ++ else ++ if (try.mppe_40 && try.mppe_56) ++ try.mppe_40 = 0; ++ ++ p += CILEN_MPPE; ++ len -= CILEN_MPPE; + } + #endif /* MPPE */ ++ ++ if (go->lzs && len >= CILEN_LZS && p[0] == CI_LZS && p[1] == CILEN_LZS) { ++ no.lzs = 1; ++ if (((p[2]<<8)|p[3]) > 1 || (p[4] != LZS_MODE_SEQ && ++ p[4] != LZS_MODE_EXT)) ++ try.lzs = 0; ++ else { ++ try.lzs_mode = p[4]; ++ try.lzs_hists = (p[2] << 8) | p[3]; ++ } ++ p += CILEN_LZS; ++ len -= CILEN_LZS; ++ } ++ + if (go->deflate && len >= CILEN_DEFLATE + && p[0] == (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT) + && p[1] == CILEN_DEFLATE) { +@@ -1001,14 +1254,50 @@ + return -1; + + #ifdef MPPE +- if (go->mppe && len >= CILEN_MPPE ++ if ((go->mppe || go->mppc) && len >= CILEN_MPPE + && p[0] == CI_MPPE && p[1] == CILEN_MPPE) { +- error("MPPE required but peer refused"); +- lcp_close(f->unit, "MPPE required but peer refused"); ++ ccp_options *wo = &ccp_wantoptions[f->unit]; ++ if (p[2] != (go->mppe_stateless ? MPPE_STATELESS : 0) || ++ p[3] != 0 || ++ p[4] != 0 || ++ p[5] != ((go->mppe_40 ? MPPE_40BIT : 0) | ++ (go->mppe_56 ? MPPE_56BIT : 0) | ++ (go->mppe_128 ? MPPE_128BIT : 0) | ++ (go->mppc ? MPPE_MPPC : 0))) ++ return 0; ++ if (go->mppc) ++ try.mppc = 0; ++ if (go->mppe) { ++ try.mppe = 0; ++ if (go->mppe_40) ++ try.mppe_40 = 0; ++ if (go->mppe_56) ++ try.mppe_56 = 0; ++ if (go->mppe_128) ++ try.mppe_128 = 0; ++ if (go->mppe_stateless) ++ try.mppe_stateless = 0; ++ if (!try.mppe_56 && !try.mppe_40 && !try.mppe_128) ++ try.mppe = try.mppe_stateless = 0; ++ if (wo->mppe) { /* we want MPPE but cannot negotiate key length */ ++ wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 = ++ wo->mppe_56 = wo->mppe_128 = 0; ++ lcp_close(f->unit, "MPPE required but cannot negotiate MPPE " ++ "key length"); ++ } ++ } + p += CILEN_MPPE; + len -= CILEN_MPPE; + } +-#endif ++#endif /* MPPE */ ++ if (go->lzs && len >= CILEN_LZS && p[0] == CI_LZS && p[1] == CILEN_LZS) { ++ if (p[2] != go->lzs_hists>>8 || p[3] != (go->lzs_hists&0xff) ++ || p[4] != go->lzs_mode) ++ return 0; ++ try.lzs = 0; ++ p += CILEN_LZS; ++ len -= CILEN_LZS; ++ } + if (go->deflate_correct && len >= CILEN_DEFLATE + && p[0] == CI_DEFLATE && p[1] == CILEN_DEFLATE) { + if (p[2] != DEFLATE_MAKE_OPT(go->deflate_size) +@@ -1072,14 +1361,15 @@ + int dont_nak; + { + int ret, newret, res; +- u_char *p0, *retp; ++ u_char *p0, *retp, p2, p5; + int len, clen, type, nb; + ccp_options *ho = &ccp_hisoptions[f->unit]; + ccp_options *ao = &ccp_allowoptions[f->unit]; ++ ccp_options *wo = &ccp_wantoptions[f->unit]; + #ifdef MPPE +- bool rej_for_ci_mppe = 1; /* Are we rejecting based on a bad/missing */ +- /* CI_MPPE, or due to other options? */ +-#endif ++ u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN]; ++/* int mtu; */ ++#endif /* MPPE */ + + ret = CONFACK; + retp = p0 = p; +@@ -1102,103 +1392,305 @@ + switch (type) { + #ifdef MPPE + case CI_MPPE: +- if (!ao->mppe || clen != CILEN_MPPE) { ++ if ((!ao->mppc && !ao->mppe) || clen != CILEN_MPPE) { + newret = CONFREJ; + break; + } +- MPPE_CI_TO_OPTS(&p[2], ho->mppe); + +- /* Nak if anything unsupported or unknown are set. */ +- if (ho->mppe & MPPE_OPT_UNSUPPORTED) { +- newret = CONFNAK; +- ho->mppe &= ~MPPE_OPT_UNSUPPORTED; +- } +- if (ho->mppe & MPPE_OPT_UNKNOWN) { ++ p2 = p[2]; ++ p5 = p[5]; ++ /* not sure what they want, tell 'em what we got */ ++ if (((p[2] & ~MPPE_STATELESS) != 0 || p[3] != 0 || p[4] != 0 || ++ (p[5] & ~(MPPE_40BIT | MPPE_56BIT | MPPE_128BIT | ++ MPPE_MPPC)) != 0 || p[5] == 0) || ++ (p[2] == 0 && p[3] == 0 && p[4] == 0 && p[5] == 0)) { + newret = CONFNAK; +- ho->mppe &= ~MPPE_OPT_UNKNOWN; ++ p[2] = (wo->mppe_stateless ? MPPE_STATELESS : 0); ++ p[3] = 0; ++ p[4] = 0; ++ p[5] = (wo->mppe_40 ? MPPE_40BIT : 0) | ++ (wo->mppe_56 ? MPPE_56BIT : 0) | ++ (wo->mppe_128 ? MPPE_128BIT : 0) | ++ (wo->mppc ? MPPE_MPPC : 0); ++ break; + } + +- /* Check state opt */ +- if (ho->mppe & MPPE_OPT_STATEFUL) { +- /* +- * We can Nak and request stateless, but it's a +- * lot easier to just assume the peer will request +- * it if he can do it; stateful mode is bad over +- * the Internet -- which is where we expect MPPE. +- */ +- if (refuse_mppe_stateful) { +- error("Refusing MPPE stateful mode offered by peer"); ++ if ((p[5] & MPPE_MPPC)) { ++ if (ao->mppc) { ++ ho->mppc = 1; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ opt_buf[2] = opt_buf[3] = opt_buf[4] = 0; ++ opt_buf[5] = MPPE_MPPC; ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE, 1) <= 0) { ++ ho->mppc = 0; ++ p[5] &= ~MPPE_MPPC; ++ newret = CONFNAK; ++ } ++ } else { + newret = CONFREJ; +- break; ++ if (wo->mppe || ao->mppe) { ++ p[5] &= ~MPPE_MPPC; ++ newret = CONFNAK; ++ } ++ } ++ } ++ ++ if (ao->mppe) ++ ho->mppe = 1; ++ ++ if ((p[2] & MPPE_STATELESS)) { ++ if (ao->mppe_stateless) { ++ if (wo->mppe_stateless) ++ ho->mppe_stateless = 1; ++ else { ++ newret = CONFNAK; ++ if (!dont_nak) ++ p[2] &= ~MPPE_STATELESS; ++ } ++ } else { ++ newret = CONFNAK; ++ if (!dont_nak) ++ p[2] &= ~MPPE_STATELESS; ++ } ++ } else { ++ if (wo->mppe_stateless && !dont_nak) { ++ wo->mppe_stateless = 0; ++ newret = CONFNAK; ++ p[2] |= MPPE_STATELESS; + } + } + +- /* Find out which of {S,L} are set. */ +- if ((ho->mppe & MPPE_OPT_128) +- && (ho->mppe & MPPE_OPT_40)) { +- /* Both are set, negotiate the strongest. */ ++ if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_56BIT|MPPE_128BIT)) { + newret = CONFNAK; +- if (ao->mppe & MPPE_OPT_128) +- ho->mppe &= ~MPPE_OPT_40; +- else if (ao->mppe & MPPE_OPT_40) +- ho->mppe &= ~MPPE_OPT_128; +- else { +- newret = CONFREJ; +- break; ++ if (ao->mppe_128) { ++ ho->mppe_128 = 1; ++ p[5] &= ~(MPPE_40BIT|MPPE_56BIT); ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_128 = 0; ++ p[5] |= (MPPE_40BIT|MPPE_56BIT); ++ p[5] &= ~MPPE_128BIT; ++ goto check_mppe_56_40; ++ } ++ goto check_mppe; + } +- } else if (ho->mppe & MPPE_OPT_128) { +- if (!(ao->mppe & MPPE_OPT_128)) { +- newret = CONFREJ; +- break; ++ p[5] &= ~MPPE_128BIT; ++ goto check_mppe_56_40; ++ } ++ if ((p[5] & ~MPPE_MPPC) == (MPPE_56BIT|MPPE_128BIT)) { ++ newret = CONFNAK; ++ if (ao->mppe_128) { ++ ho->mppe_128 = 1; ++ p[5] &= ~MPPE_56BIT; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_128 = 0; ++ p[5] |= MPPE_56BIT; ++ p[5] &= ~MPPE_128BIT; ++ goto check_mppe_56; ++ } ++ goto check_mppe; + } +- } else if (ho->mppe & MPPE_OPT_40) { +- if (!(ao->mppe & MPPE_OPT_40)) { +- newret = CONFREJ; +- break; ++ p[5] &= ~MPPE_128BIT; ++ goto check_mppe_56; ++ } ++ if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_128BIT)) { ++ newret = CONFNAK; ++ if (ao->mppe_128) { ++ ho->mppe_128 = 1; ++ p[5] &= ~MPPE_40BIT; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_128 = 0; ++ p[5] |= MPPE_40BIT; ++ p[5] &= ~MPPE_128BIT; ++ goto check_mppe_40; ++ } ++ goto check_mppe; ++ } ++ p[5] &= ~MPPE_128BIT; ++ goto check_mppe_40; ++ } ++ if ((p[5] & ~MPPE_MPPC) == MPPE_128BIT) { ++ if (ao->mppe_128) { ++ ho->mppe_128 = 1; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_128 = 0; ++ p[5] &= ~MPPE_128BIT; ++ newret = CONFNAK; ++ } ++ goto check_mppe; ++ } ++ p[5] &= ~MPPE_128BIT; ++ newret = CONFNAK; ++ goto check_mppe; ++ } ++ check_mppe_56_40: ++ if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_56BIT)) { ++ newret = CONFNAK; ++ if (ao->mppe_56) { ++ ho->mppe_56 = 1; ++ p[5] &= ~MPPE_40BIT; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_56 = 0; ++ p[5] |= MPPE_40BIT; ++ p[5] &= ~MPPE_56BIT; ++ newret = CONFNAK; ++ goto check_mppe_40; ++ } ++ goto check_mppe; ++ } ++ p[5] &= ~MPPE_56BIT; ++ goto check_mppe_40; ++ } ++ check_mppe_56: ++ if ((p[5] & ~MPPE_MPPC) == MPPE_56BIT) { ++ if (ao->mppe_56) { ++ ho->mppe_56 = 1; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_56 = 0; ++ p[5] &= ~MPPE_56BIT; ++ newret = CONFNAK; ++ } ++ goto check_mppe; ++ } ++ p[5] &= ~MPPE_56BIT; ++ newret = CONFNAK; ++ goto check_mppe; ++ } ++ check_mppe_40: ++ if ((p[5] & ~MPPE_MPPC) == MPPE_40BIT) { ++ if (ao->mppe_40) { ++ ho->mppe_40 = 1; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_40 = 0; ++ p[5] &= ~MPPE_40BIT; ++ newret = CONFNAK; ++ } ++ goto check_mppe; ++ } ++ p[5] &= ~MPPE_40BIT; ++ } ++ ++ check_mppe: ++ if (!ho->mppe_40 && !ho->mppe_56 && !ho->mppe_128) { ++ if (wo->mppe_40 || wo->mppe_56 || wo->mppe_128) { ++ newret = CONFNAK; ++ p[2] |= (wo->mppe_stateless ? MPPE_STATELESS : 0); ++ p[5] |= (wo->mppe_40 ? MPPE_40BIT : 0) | ++ (wo->mppe_56 ? MPPE_56BIT : 0) | ++ (wo->mppe_128 ? MPPE_128BIT : 0) | ++ (wo->mppc ? MPPE_MPPC : 0); ++ } else { ++ ho->mppe = ho->mppe_stateless = 0; + } + } else { +- /* Neither are set. */ ++ /* MPPE is not compatible with other compression types */ ++ if (wo->mppe) { ++ ao->bsd_compress = 0; ++ ao->predictor_1 = 0; ++ ao->predictor_2 = 0; ++ ao->deflate = 0; ++ ao->lzs = 0; ++ } ++ } ++ if ((!ho->mppc || !ao->mppc) && !ho->mppe) { ++ p[2] = p2; ++ p[5] = p5; + newret = CONFREJ; + break; + } + +- /* rebuild the opts */ +- MPPE_OPTS_TO_CI(ho->mppe, &p[2]); +- if (newret == CONFACK) { +- u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN]; +- int mtu; +- +- BCOPY(p, opt_buf, CILEN_MPPE); +- BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], +- MPPE_MAX_KEY_LEN); +- if (ccp_test(f->unit, opt_buf, +- CILEN_MPPE + MPPE_MAX_KEY_LEN, 1) <= 0) { +- /* This shouldn't happen, we've already tested it! */ +- error("MPPE required, but kernel has no support."); +- lcp_close(f->unit, "MPPE required but not available"); +- newret = CONFREJ; +- break; +- } +- /* +- * We need to decrease the interface MTU by MPPE_PAD +- * because MPPE frames **grow**. The kernel [must] +- * allocate MPPE_PAD extra bytes in xmit buffers. +- */ +- mtu = netif_get_mtu(f->unit); +- if (mtu) +- netif_set_mtu(f->unit, mtu - MPPE_PAD); +- else +- newret = CONFREJ; +- } ++ /* ++ * I have commented the code below because according to RFC1547 ++ * MTU is only information for higher level protocols about ++ * "the maximum allowable length for a packet (q.v.) transmitted ++ * over a point-to-point link without incurring network layer ++ * fragmentation." Of course a PPP implementation should be able ++ * to handle overhead added by MPPE - in our case apropriate code ++ * is located in drivers/net/ppp_generic.c in the kernel sources. ++ * ++ * According to RFC1661: ++ * - when negotiated MRU is less than 1500 octets, a PPP ++ * implementation must still be able to receive at least 1500 ++ * octets, ++ * - when PFC is negotiated, a PPP implementation is still ++ * required to receive frames with uncompressed protocol field. ++ * ++ * So why not to handle MPPE overhead without changing MTU value? ++ * I am sure that RFC3078, unfortunately silently, assumes that. ++ */ + + /* +- * We have accepted MPPE or are willing to negotiate +- * MPPE parameters. A CONFREJ is due to subsequent +- * (non-MPPE) processing. ++ * We need to decrease the interface MTU by MPPE_PAD ++ * because MPPE frames **grow**. The kernel [must] ++ * allocate MPPE_PAD extra bytes in xmit buffers. + */ +- rej_for_ci_mppe = 0; ++/* ++ mtu = netif_get_mtu(f->unit); ++ if (mtu) { ++ netif_set_mtu(f->unit, mtu - MPPE_PAD); ++ } else { ++ newret = CONFREJ; ++ if (ccp_wantoptions[f->unit].mppe) { ++ error("Cannot adjust MTU needed by MPPE."); ++ lcp_close(f->unit, "Cannot adjust MTU needed by MPPE."); ++ } ++ } ++*/ + break; + #endif /* MPPE */ ++ ++ case CI_LZS: ++ if (!ao->lzs || clen != CILEN_LZS) { ++ newret = CONFREJ; ++ break; ++ } ++ ++ ho->lzs = 1; ++ ho->lzs_hists = (p[2] << 8) | p[3]; ++ ho->lzs_mode = p[4]; ++ if ((ho->lzs_hists != ao->lzs_hists) || ++ (ho->lzs_mode != ao->lzs_mode)) { ++ newret = CONFNAK; ++ if (!dont_nak) { ++ p[2] = ao->lzs_hists >> 8; ++ p[3] = ao->lzs_hists & 0xff; ++ p[4] = ao->lzs_mode; ++ } else ++ break; ++ } ++ ++ if (p == p0 && ccp_test(f->unit, p, CILEN_LZS, 1) <= 0) { ++ newret = CONFREJ; ++ } ++ break; ++ + case CI_DEFLATE: + case CI_DEFLATE_DRAFT: + if (!ao->deflate || clen != CILEN_DEFLATE +@@ -1340,12 +1832,6 @@ + else + *lenp = retp - p0; + } +-#ifdef MPPE +- if (ret == CONFREJ && ao->mppe && rej_for_ci_mppe) { +- error("MPPE required but peer negotiation failed"); +- lcp_close(f->unit, "MPPE required but peer negotiation failed"); +- } +-#endif + return ret; + } + +@@ -1367,24 +1853,35 @@ + char *p = result; + char *q = result + sizeof(result); /* 1 past result */ + +- slprintf(p, q - p, "MPPE "); +- p += 5; +- if (opt->mppe & MPPE_OPT_128) { +- slprintf(p, q - p, "128-bit "); +- p += 8; +- } +- if (opt->mppe & MPPE_OPT_40) { +- slprintf(p, q - p, "40-bit "); +- p += 7; +- } +- if (opt->mppe & MPPE_OPT_STATEFUL) +- slprintf(p, q - p, "stateful"); +- else +- slprintf(p, q - p, "stateless"); +- ++ if (opt->mppe) { ++ if (opt->mppc) { ++ slprintf(p, q - p, "MPPC/MPPE "); ++ p += 10; ++ } else { ++ slprintf(p, q - p, "MPPE "); ++ p += 5; ++ } ++ if (opt->mppe_128) { ++ slprintf(p, q - p, "128-bit "); ++ p += 8; ++ } else if (opt->mppe_56) { ++ slprintf(p, q - p, "56-bit "); ++ p += 7; ++ } else if (opt->mppe_40) { ++ slprintf(p, q - p, "40-bit "); ++ p += 7; ++ } ++ if (opt->mppe_stateless) ++ slprintf(p, q - p, "stateless"); ++ else ++ slprintf(p, q - p, "stateful"); ++ } else if (opt->mppc) ++ slprintf(p, q - p, "MPPC"); + break; + } +-#endif ++#endif /* MPPE */ ++ case CI_LZS: ++ return "Stac LZS"; + case CI_DEFLATE: + case CI_DEFLATE_DRAFT: + if (opt2 != NULL && opt2->deflate_size != opt->deflate_size) +@@ -1440,12 +1937,12 @@ + } else if (ANY_COMPRESS(*ho)) + notice("%s transmit compression enabled", method_name(ho, NULL)); + #ifdef MPPE +- if (go->mppe) { ++ if (go->mppe || go->mppc) { + BZERO(mppe_recv_key, MPPE_MAX_KEY_LEN); + BZERO(mppe_send_key, MPPE_MAX_KEY_LEN); + continue_networks(f->unit); /* Bring up IP et al */ + } +-#endif ++#endif /* MPPE */ + } + + /* +@@ -1468,7 +1965,7 @@ + lcp_close(f->unit, "MPPE disabled"); + } + } +-#endif ++#endif /* MPPE */ + } + + /* +@@ -1528,24 +2025,28 @@ + #ifdef MPPE + case CI_MPPE: + if (optlen >= CILEN_MPPE) { +- u_char mppe_opts; +- +- MPPE_CI_TO_OPTS(&p[2], mppe_opts); +- printer(arg, "mppe %s %s %s %s %s %s%s", +- (p[2] & MPPE_H_BIT)? "+H": "-H", +- (p[5] & MPPE_M_BIT)? "+M": "-M", +- (p[5] & MPPE_S_BIT)? "+S": "-S", +- (p[5] & MPPE_L_BIT)? "+L": "-L", ++ printer(arg, "mppe %s %s %s %s %s %s", ++ (p[2] & MPPE_STATELESS)? "+H": "-H", ++ (p[5] & MPPE_56BIT)? "+M": "-M", ++ (p[5] & MPPE_128BIT)? "+S": "-S", ++ (p[5] & MPPE_40BIT)? "+L": "-L", + (p[5] & MPPE_D_BIT)? "+D": "-D", +- (p[5] & MPPE_C_BIT)? "+C": "-C", +- (mppe_opts & MPPE_OPT_UNKNOWN)? " +U": ""); +- if (mppe_opts & MPPE_OPT_UNKNOWN) ++ (p[5] & MPPE_MPPC)? "+C": "-C"); ++ if ((p[5] & ~(MPPE_56BIT | MPPE_128BIT | MPPE_40BIT | ++ MPPE_D_BIT | MPPE_MPPC)) || ++ (p[2] & ~MPPE_STATELESS)) + printer(arg, " (%.2x %.2x %.2x %.2x)", + p[2], p[3], p[4], p[5]); + p += CILEN_MPPE; + } + break; +-#endif ++#endif /* MPPE */ ++ case CI_LZS: ++ if (optlen >= CILEN_LZS) { ++ printer(arg, "lzs %.2x %.2x %.2x", p[2], p[3], p[4]); ++ p += CILEN_LZS; ++ } ++ break; + case CI_DEFLATE: + case CI_DEFLATE_DRAFT: + if (optlen >= CILEN_DEFLATE) { +@@ -1631,6 +2132,7 @@ + error("Lost compression sync: disabling compression"); + ccp_close(unit, "Lost compression sync"); + #ifdef MPPE ++ /* My module dosn't need this. J.D., 2003-07-06 */ + /* + * If we were doing MPPE, we must also take the link down. + */ +@@ -1638,9 +2140,18 @@ + error("Too many MPPE errors, closing LCP"); + lcp_close(unit, "Too many MPPE errors"); + } +-#endif ++#endif /* MPPE */ + } else { + /* ++ * When LZS or MPPE/MPPC is negotiated we just send CCP_RESETREQ ++ * and don't wait for CCP_RESETACK ++ */ ++ if ((ccp_gotoptions[f->unit].method == CI_LZS) || ++ (ccp_gotoptions[f->unit].method == CI_MPPE)) { ++ fsm_sdata(f, CCP_RESETREQ, f->reqid = ++f->id, NULL, 0); ++ return; ++ } ++ /* + * Send a reset-request to reset the peer's compressor. + * We don't do that if we are still waiting for an + * acknowledgement to a previous reset-request. +@@ -1671,4 +2182,3 @@ + } else + ccp_localstate[f->unit] &= ~RACK_PENDING; + } +- +diff -ruN ppp-2.4.3-orig/pppd/ccp.h ppp-2.4.3-3/pppd/ccp.h +--- ppp-2.4.3-orig/pppd/ccp.h 2004-11-04 11:02:26.000000000 +0100 ++++ ppp-2.4.3-3/pppd/ccp.h 2004-12-05 17:51:27.000000000 +0100 +@@ -37,9 +37,17 @@ + bool predictor_2; /* do Predictor-2? */ + bool deflate_correct; /* use correct code for deflate? */ + bool deflate_draft; /* use draft RFC code for deflate? */ ++ bool lzs; /* do Stac LZS? */ ++ bool mppc; /* do MPPC? */ + bool mppe; /* do MPPE? */ ++ bool mppe_40; /* allow 40 bit encryption? */ ++ bool mppe_56; /* allow 56 bit encryption? */ ++ bool mppe_128; /* allow 128 bit encryption? */ ++ bool mppe_stateless; /* allow stateless encryption */ + u_short bsd_bits; /* # bits/code for BSD Compress */ + u_short deflate_size; /* lg(window size) for Deflate */ ++ u_short lzs_mode; /* LZS check mode */ ++ u_short lzs_hists; /* number of LZS histories */ + short method; /* code for chosen compression method */ + } ccp_options; + +diff -ruN ppp-2.4.3-orig/pppd/chap_ms.c ppp-2.4.3-3/pppd/chap_ms.c +--- ppp-2.4.3-orig/pppd/chap_ms.c 2004-11-12 10:57:43.000000000 +0100 ++++ ppp-2.4.3-3/pppd/chap_ms.c 2004-12-05 17:51:27.000000000 +0100 +@@ -895,13 +895,17 @@ + /* + * Disable undesirable encryption types. Note that we don't ENABLE + * any encryption types, to avoid overriding manual configuration. ++ * ++ * It seems that 56 bit keys are unsupported in MS-RADIUS (see RFC 2548) + */ + switch(types) { + case MPPE_ENC_TYPES_RC4_40: +- ccp_wantoptions[0].mppe &= ~MPPE_OPT_128; /* disable 128-bit */ ++ ccp_wantoptions[0].mppe_128 = 0; /* disable 128-bit */ ++ ccp_wantoptions[0].mppe_56 = 0; /* disable 56-bit */ + break; + case MPPE_ENC_TYPES_RC4_128: +- ccp_wantoptions[0].mppe &= ~MPPE_OPT_40; /* disable 40-bit */ ++ ccp_wantoptions[0].mppe_56 = 0; /* disable 56-bit */ ++ ccp_wantoptions[0].mppe_40 = 0; /* disable 40-bit */ + break; + default: + break; +diff -ruN ppp-2.4.3-orig/pppd/plugins/Makefile.linux ppp-2.4.3-3/pppd/plugins/Makefile.linux +--- ppp-2.4.3-orig/pppd/plugins/Makefile.linux 2004-11-14 08:57:35.000000000 +0100 ++++ ppp-2.4.3-3/pppd/plugins/Makefile.linux 2004-12-05 17:03:59.000000000 +0100 +@@ -9,7 +9,7 @@ + MANDIR = $(DESTDIR)/share/man/man8 + LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) + +-SUBDIRS := rp-pppoe pppoatm radius ++SUBDIRS := rp-pppoe radius + # Uncomment the next line to include the radius authentication plugin + # SUBDIRS += radius + PLUGINS := minconn.so passprompt.so passwordfd.so winbind.so +diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux +--- ppp-2.4.3-orig/pppd/plugins/radius/Makefile.linux 2004-11-14 08:02:31.000000000 +0100 ++++ ppp-2.4.3-3/pppd/plugins/radius/Makefile.linux 2004-12-05 17:43:17.000000000 +0100 +@@ -12,7 +12,8 @@ + INSTALL = install + + PLUGIN=radius.so radattr.so radrealms.so +-CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON ++COPTS = -O2 ++CFLAGS=-I. -I../.. -I../../../include $(COPTS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON + + # Uncomment the next line to include support for Microsoft's + # MS-CHAP authentication protocol. +@@ -36,9 +37,9 @@ + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) +- $(INSTALL) -s -c -m 755 radius.so $(LIBDIR) +- $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR) +- $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR) ++ $(INSTALL) -c -m 755 radius.so $(LIBDIR) ++ $(INSTALL) -c -m 755 radattr.so $(LIBDIR) ++ $(INSTALL) -c -m 755 radrealms.so $(LIBDIR) + $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR) + $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) + +diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/config.c ppp-2.4.3-3/pppd/plugins/radius/config.c +--- ppp-2.4.3-orig/pppd/plugins/radius/config.c 2004-11-14 08:26:26.000000000 +0100 ++++ ppp-2.4.3-3/pppd/plugins/radius/config.c 2004-12-16 04:03:46.000000000 +0100 +@@ -369,31 +369,37 @@ + } + #endif + ++#if 0 + if (rc_conf_int("login_tries") <= 0) + { + error("%s: login_tries <= 0 is illegal", filename); + return (-1); + } ++#endif + if (rc_conf_str("seqfile") == NULL) + { + error("%s: seqfile not specified", filename); + return (-1); + } ++#if 0 + if (rc_conf_int("login_timeout") <= 0) + { + error("%s: login_timeout <= 0 is illegal", filename); + return (-1); + } ++#endif + if (rc_conf_str("mapfile") == NULL) + { + error("%s: mapfile not specified", filename); + return (-1); + } ++#if 0 + if (rc_conf_str("nologin") == NULL) + { + error("%s: nologin not specified", filename); + return (-1); + } ++#endif + + return 0; + } +diff -ruN ppp-2.4.3-orig/pppd/plugins/radius/options.h ppp-2.4.3-3/pppd/plugins/radius/options.h +--- ppp-2.4.3-orig/pppd/plugins/radius/options.h 2004-11-14 08:26:26.000000000 +0100 ++++ ppp-2.4.3-3/pppd/plugins/radius/options.h 2004-12-16 04:09:16.000000000 +0100 +@@ -31,24 +31,21 @@ + static SERVER acctserver = {0}; + static SERVER authserver = {0}; + +-int default_tries = 4; +-int default_timeout = 60; +- + static OPTION config_options[] = { + /* internally used options */ + {"config_file", OT_STR, ST_UNDEF, NULL}, + /* General options */ + {"auth_order", OT_AUO, ST_UNDEF, NULL}, +-{"login_tries", OT_INT, ST_UNDEF, &default_tries}, +-{"login_timeout", OT_INT, ST_UNDEF, &default_timeout}, +-{"nologin", OT_STR, ST_UNDEF, "/etc/nologin"}, +-{"issue", OT_STR, ST_UNDEF, "/etc/radiusclient/issue"}, ++{"login_tries", OT_INT, ST_UNDEF, NULL}, ++{"login_timeout", OT_INT, ST_UNDEF, NULL}, ++{"nologin", OT_STR, ST_UNDEF, NULL}, ++{"issue", OT_STR, ST_UNDEF, NULL}, + /* RADIUS specific options */ + {"authserver", OT_SRV, ST_UNDEF, &authserver}, + {"acctserver", OT_SRV, ST_UNDEF, &acctserver}, + {"servers", OT_STR, ST_UNDEF, NULL}, + {"dictionary", OT_STR, ST_UNDEF, NULL}, +-{"login_radius", OT_STR, ST_UNDEF, "/usr/sbin/login.radius"}, ++{"login_radius", OT_STR, ST_UNDEF, NULL}, + {"seqfile", OT_STR, ST_UNDEF, NULL}, + {"mapfile", OT_STR, ST_UNDEF, NULL}, + {"default_realm", OT_STR, ST_UNDEF, NULL}, +diff -ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3-3/pppd/plugins/rp-pppoe/Makefile.linux +--- ppp-2.4.3-orig/pppd/plugins/rp-pppoe/Makefile.linux 2004-11-14 08:58:37.000000000 +0100 ++++ ppp-2.4.3-3/pppd/plugins/rp-pppoe/Makefile.linux 2004-12-05 17:43:23.000000000 +0100 +@@ -39,9 +39,9 @@ + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) +- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR) ++ $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR) + $(INSTALL) -d -m 755 $(BINDIR) +- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR) ++ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR) + + clean: + rm -f *.o *.so +diff -ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3-3/pppd/plugins/rp-pppoe/plugin.c +--- ppp-2.4.3-orig/pppd/plugins/rp-pppoe/plugin.c 2004-11-04 11:07:37.000000000 +0100 ++++ ppp-2.4.3-3/pppd/plugins/rp-pppoe/plugin.c 2004-12-16 01:07:22.000000000 +0100 +@@ -286,7 +286,7 @@ + /* Strip off "nic-" */ + cmd += 4; + } else if (strlen(cmd) < 4 +- || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3) ++ || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3) && strncmp(cmd, "vlan", 4) + && strncmp(cmd, "tap", 3) && strncmp(cmd, "br", 2))) { + return 0; + } +diff -ruN ppp-2.4.3-orig/pppd/pppd.8 ppp-2.4.3-3/pppd/pppd.8 +--- ppp-2.4.3-orig/pppd/pppd.8 2004-11-13 13:22:49.000000000 +0100 ++++ ppp-2.4.3-3/pppd/pppd.8 2004-12-05 17:51:27.000000000 +0100 +@@ -622,9 +622,29 @@ + Enables the use of PPP multilink; this is an alias for the `multilink' + option. This option is currently only available under Linux. + .TP +-.B mppe\-stateful +-Allow MPPE to use stateful mode. Stateless mode is still attempted first. +-The default is to disallow stateful mode. ++.B mppc ++Enables MPPC (Microsoft Point to Point Compression). This is the default. ++.TP ++.B mppe \fIsubopt1[,subopt2[,subopt3[..]]] ++Modify MPPE (Microsoft Point to Point Encryption) parameters. In order ++for MPPE to successfully come up, you must have authenticated with either ++MS-CHAP or MS-CHAPv2. By default MPPE is optional, it means that pppd will ++not propose MPPE to the peer, but will negotiate MPPE if peer wants that. ++You can change this using \fIrequired\fR suboption. ++This option is presently only supported under Linux, and only if your ++kernel has been configured to include MPPE support. ++.IP ++MPPE suboptions: ++.br ++\fIrequired\fR - require MPPE; disconnect if peer doesn't support it, ++.br ++\fIstateless\fR - try to negotiate stateless mode; default is stateful, ++.br ++\fIno40\fR - disable 40 bit keys, ++.br ++\fIno56\fR - disable 56 bit keys, ++.br ++\fIno128\fR - disable 128 bit keys + .TP + .B mpshortseq + Enables the use of short (12-bit) sequence numbers in multilink +@@ -757,17 +777,11 @@ + Disables the use of PPP multilink. This option is currently only + available under Linux. + .TP +-.B nomppe +-Disables MPPE (Microsoft Point to Point Encryption). This is the default. +-.TP +-.B nomppe\-40 +-Disable 40-bit encryption with MPPE. ++.B nomppc ++Disables MPPC (Microsoft Point to Point Compression). + .TP +-.B nomppe\-128 +-Disable 128-bit encryption with MPPE. +-.TP +-.B nomppe\-stateful +-Disable MPPE stateful mode. This is the default. ++.B nomppe ++Disables MPPE (Microsoft Point to Point Encryption). + .TP + .B nompshortseq + Disables the use of short (12-bit) sequence numbers in the PPP +@@ -948,19 +962,6 @@ + Require the peer to authenticate itself using CHAP [Challenge + Handshake Authentication Protocol] authentication. + .TP +-.B require\-mppe +-Require the use of MPPE (Microsoft Point to Point Encryption). This +-option disables all other compression types. This option enables +-both 40-bit and 128-bit encryption. In order for MPPE to successfully +-come up, you must have authenticated with either MS\-CHAP or MS\-CHAPv2. +-This option is presently only supported under Linux, and only if your +-kernel has been configured to include MPPE support. +-.TP +-.B require\-mppe\-40 +-Require the use of MPPE, with 40-bit encryption. +-.TP +-.B require\-mppe\-128 +-Require the use of MPPE, with 128-bit encryption. + .TP + .B require\-mschap + Require the peer to authenticate itself using MS\-CHAP [Microsoft Challenge +diff -ruN ppp-2.4.3-orig/pppdump/Makefile.linux ppp-2.4.3-3/pppdump/Makefile.linux +--- ppp-2.4.3-orig/pppdump/Makefile.linux 2004-10-31 02:36:52.000000000 +0200 ++++ ppp-2.4.3-3/pppdump/Makefile.linux 2004-12-05 17:50:34.000000000 +0100 +@@ -2,7 +2,8 @@ + BINDIR = $(DESTDIR)/sbin + MANDIR = $(DESTDIR)/share/man/man8 + +-CFLAGS= -O -I../include/net ++COPTS = -O ++CFLAGS= $(COPTS) -I../include/net + OBJS = pppdump.o bsd-comp.o deflate.o zlib.o + + INSTALL= install +@@ -17,5 +18,5 @@ + + install: + mkdir -p $(BINDIR) $(MANDIR) +- $(INSTALL) -s -c pppdump $(BINDIR) ++ $(INSTALL) -c pppdump $(BINDIR) + $(INSTALL) -c -m 444 pppdump.8 $(MANDIR) +diff -ruN ppp-2.4.3-orig/pppstats/Makefile.linux ppp-2.4.3-3/pppstats/Makefile.linux +--- ppp-2.4.3-orig/pppstats/Makefile.linux 2004-10-31 23:09:03.000000000 +0100 ++++ ppp-2.4.3-3/pppstats/Makefile.linux 2004-12-05 17:43:38.000000000 +0100 +@@ -22,7 +22,7 @@ + + install: pppstats + -mkdir -p $(MANDIR) +- $(INSTALL) -s -c pppstats $(BINDIR) ++ $(INSTALL) -c pppstats $(BINDIR) + $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) + + pppstats: $(PPPSTATSRCS) diff --git a/package/pptpd/Config.in b/package/pptpd/Config.in new file mode 100644 index 0000000000..e713b18b02 --- /dev/null +++ b/package/pptpd/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PPTPD + tristate "PPTP Server" + default m + select BR2_PACKAGE_KMOD_GRE + select BR2_PACKAGE_PPP + help + A Point-to-Point Tunneling Protocol Server diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile new file mode 100644 index 0000000000..dcd4e94bb3 --- /dev/null +++ b/package/pptpd/Makefile @@ -0,0 +1,70 @@ +############################################################# +# +# ebtables +# +############################################################# +include $(TOPDIR)/rules.mk + +PKG_NAME:=pptpd +PKG_VERSION:=1.2.3 +PKG_RELEASE:=1 +PKG_SOURCE_URL:=http://unc.dl.sourceforge.net/sourceforge/poptop +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_CAT:=zcat +PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg + +$(DL_DIR)/$(PKG_SOURCE): + $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + +$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) + $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(PKG_BUILD_DIR)/.unpacked + +$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked + (cd $(PKG_BUILD_DIR) ; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --libexecdir=/usr/lib \ + --datadir=/usr/share \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --sysconfdir=/etc \ + $(DISABLE_NLS) \ + --with-pppd-ip-alloc) + touch $(PKG_BUILD_DIR)/.configured + +$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC=$(TARGET_CC) \ + CFLAGS="$(TARGET_CFLAGS) -DSBINDIR=\\\"/usr/sbin\\\"" \ + all + +$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME) + mkdir -p $(PKG_IPK_DIR)/usr/sbin + cp -a ./ipkg/* $(PKG_IPK_DIR)/ + $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + cp $(PKG_BUILD_DIR)/pptpd $(PKG_IPK_DIR)/usr/sbin/ + cp $(PKG_BUILD_DIR)/pptpctrl $(PKG_IPK_DIR)/usr/sbin/ + $(STRIP) $(PKG_IPK_DIR)/usr/sbin/* + mkdir -p $(PACKAGE_DIR) + $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) + +source: $(DL_DIR)/$(PKG_SOURCE) +prepare: $(PKG_BUILD_DIR)/.unpacked +compile: $(PKG_IPK) +install: + $(IPKG) install $(PKG_IPK) +clean: + rm -rf $(PKG_BUILD_DIR) + rm -f $(PKG_IPK) diff --git a/package/pptpd/ipkg/CONTROL/conffiles b/package/pptpd/ipkg/CONTROL/conffiles new file mode 100644 index 0000000000..34a387ba43 --- /dev/null +++ b/package/pptpd/ipkg/CONTROL/conffiles @@ -0,0 +1,2 @@ +/etc/ppp/pptp-server-options +/etc/pptpd.conf diff --git a/package/pptpd/ipkg/etc/ppp/pptp-server-options b/package/pptpd/ipkg/etc/ppp/pptp-server-options new file mode 100644 index 0000000000..cca8027dbb --- /dev/null +++ b/package/pptpd/ipkg/etc/ppp/pptp-server-options @@ -0,0 +1,27 @@ +#debug +#logfile /tmp/pptp-server.log +172.16.1.1: +auth +name "pptp-server" +lcp-echo-failure 3 +lcp-echo-interval 60 +default-asyncmap +mtu 1482 +mru 1482 +nobsdcomp +nodeflate +#noproxyarp +#nomppc +nomppe-40 +nomppe-56 +nomppe-stateful +require-mppe +require-mppe-128 +require-mschap-v2 +refuse-chap +refuse-mschap +refuse-eap +refuse-pap +#ms-dns 172.16.1.1 +#plugin radius.so +#radius-config-file /etc/radius.conf diff --git a/package/pptpd/ipkg/etc/pptpd.conf b/package/pptpd/ipkg/etc/pptpd.conf new file mode 100644 index 0000000000..e9ac115c79 --- /dev/null +++ b/package/pptpd/ipkg/etc/pptpd.conf @@ -0,0 +1,5 @@ +#debug +option /etc/ppp/pptp-server-options +speed 115200 +stimeout 10 +#localip & remoteip are not needed, ip management is done by pppd diff --git a/package/pptpd/pptpd.control b/package/pptpd/pptpd.control new file mode 100644 index 0000000000..3879d2ec40 --- /dev/null +++ b/package/pptpd/pptpd.control @@ -0,0 +1,9 @@ +Package: pptpd +Priority: optional +Section: net +Version: 1.2.3-1 +Architecture: mipsel +Maintainer: Felix Fietkau +Source: buildroot internal +Description: a Point-to-Point Tunneling Protocol (PPTP) server +Depends: ppp, kmod-gre diff --git a/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch b/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch new file mode 100644 index 0000000000..4cff731d5b --- /dev/null +++ b/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_build_clean.patch @@ -0,0 +1,36 @@ +diff -ruN ipkg-utils-1.7-old/ipkg-build ipkg-utils-1.7-new/ipkg-build +--- ipkg-utils-1.7-old/ipkg-build 2004-08-24 04:56:12.000000000 +0200 ++++ ipkg-utils-1.7-new/ipkg-build 2004-08-24 04:55:49.000000000 +0200 +@@ -47,6 +47,19 @@ + + PKG_ERROR=0 + ++ cvs_dirs=`find . -name 'CVS'` ++ if [ -n "$cvs_dirs" ]; then ++ if [ "$noclean" = "1" ]; then ++ echo "*** Warning: The following CVS directories where found. ++You probably want to remove them: " >&2 ++ ls -ld $cvs_dirs ++ echo >&2 ++ else ++ echo "*** Removing the following files: $cvs_dirs" ++ rm -rf "$cvs_dirs" ++ fi ++ fi ++ + tilde_files=`find . -name '*~'` + if [ -n "$tilde_files" ]; then + if [ "$noclean" = "1" ]; then +@@ -134,8 +147,12 @@ + + for script in $CONTROL/preinst $CONTROL/postinst $CONTROL/prerm $CONTROL/postrm; do + if [ -f $script -a ! -x $script ]; then ++ if [ "$noclean" = "1" ]; then + echo "*** Error: package script $script is not executable" >&2 + PKG_ERROR=1 ++ else ++ chmod a+x $script ++ fi + fi + done + diff --git a/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch b/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch new file mode 100644 index 0000000000..d0a30489ae --- /dev/null +++ b/toolchain/ipkg-utils/1.7/ipkg-utils-1.7-ipkg_buildpackage.patch @@ -0,0 +1,24 @@ +diff -ruN ipkg-utils-1.7-old/ipkg-buildpackage ipkg-utils-1.7-new/ipkg-buildpackage +--- ipkg-utils-1.7-old/ipkg-buildpackage 2001-07-26 17:36:36.000000000 +0200 ++++ ipkg-utils-1.7-new/ipkg-buildpackage 2004-07-05 19:46:24.000000000 +0200 +@@ -30,8 +30,9 @@ + + set -e + +-#SCRIPTDIR=/usr/local/bin +-SCRIPTDIR=/other/kurth/ipaq-dev/familiar/dist/ipkg/util/ ++SCRIPTDIR=/usr/local/bin ++ ++IPKG_BUILD_OPTIONS=$* + + SCRIPTNAME=`basename $0` + +@@ -212,7 +213,7 @@ + # build the ipk package + owd=`pwd` + cd .. +-ipkg-build /tmp/${pkg} || exit 1 ++ipkg-build $IPKG_BUILD_OPTIONS /tmp/${pkg} || exit 1 + + rm -rf /tmp/${pkg} + diff --git a/toolchain/ipkg-utils/Makefile b/toolchain/ipkg-utils/Makefile new file mode 100644 index 0000000000..9568e8f758 --- /dev/null +++ b/toolchain/ipkg-utils/Makefile @@ -0,0 +1,55 @@ +# ipkg-utils +# +# http://handhelds.org/packages/ipkg-utils +# + +PKG_NAME := ipkg-utils +PKG_VERSION := 1.7 + +PKG_SOURCE_SITE := http://handhelds.org/packages/ipkg-utils/ +PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_CAT := zcat +PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) + +include $(TOPDIR)/rules.mk + +PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) + + +$(DL_DIR)/$(PKG_SOURCE_FILE): + mkdir -p $(DL_DIR) + $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + +$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE_FILE) + mkdir -p $(TOOL_BUILD_DIR) + $(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(PKG_BUILD_DIR)/.unpacked + +$(PKG_BUILD_DIR)/.patched: $(PKG_BUILD_DIR)/.unpacked + $(PATCH) $(PKG_BUILD_DIR) $(PKG_VERSION)/ \*.patch + touch $(PKG_BUILD_DIR)/.patched + +$(STAGING_DIR)/usr/bin/ipkg-build: $(PKG_BUILD_DIR)/.patched + mkdir -p $(STAGING_DIR)/etc + echo "dest root $(TARGET_DIR)" > $(STAGING_DIR)/etc/ipkg.conf + mkdir -p $(STAGING_DIR)/usr/bin + install -m0755 $(TARGET_DIR)/bin/ipkg $(STAGING_DIR)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/ipkg-build $(STAGING_DIR)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/ipkg-buildpackage $(STAGING_DIR)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/ipkg-make-index $(STAGING_DIR)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/ipkg.py $(STAGING_DIR)/usr/bin + +source: $(DL_DIR)/$(PKG_SOURCE_FILE) + +prepare: $(PKG_BUILD_DIR)/.patched + +compile: + +install: $(STAGING_DIR)/usr/bin/ipkg-build + +clean: + rm -f $(STAGING_DIR)/etc/ipkg.conf + rm -f $(STAGING_DIR)/usr/bin/ipkg* + rm -rf $(PKG_BUILD_DIR) + + diff --git a/toolchain/sed/Makefile b/toolchain/sed/Makefile new file mode 100644 index 0000000000..d9f0dc8756 --- /dev/null +++ b/toolchain/sed/Makefile @@ -0,0 +1,9 @@ +include $(TOPDIR)/rules.mk + +include ./sed.mk + +source: +prepare: +compile: +install: host-sed +clean: host-sed-toolclean diff --git a/toolchain/sed/sed.mk b/toolchain/sed/sed.mk new file mode 100644 index 0000000000..a4f1466ec6 --- /dev/null +++ b/toolchain/sed/sed.mk @@ -0,0 +1,75 @@ +############################################################# +# +# sed +# +############################################################# +SED_VER:=4.1.2 +SED_SOURCE:=sed-$(SED_VER).tar.gz +SED_SITE:=ftp://ftp.gnu.org/gnu/sed +SED_CAT:=zcat +SED_DIR1:=$(TOOL_BUILD_DIR)/sed-$(SED_VER) +SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VER) +SED_BINARY:=sed/sed +SED_TARGET_BINARY:=bin/sed +ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true) +SED_CPPFLAGS=-D_FILE_OFFSET_BITS=64 +endif +HOST_SED_TARGET=$(shell ./sedcheck.sh) + +$(DL_DIR)/$(SED_SOURCE): + mkdir -p $(DL_DIR) + $(WGET) -P $(DL_DIR) $(SED_SITE)/$(SED_SOURCE) + +sed-source: $(DL_DIR)/$(SED_SOURCE) + + +############################################################# +# +# build sed for use on the host system +# +############################################################# +$(SED_DIR1)/.unpacked: $(DL_DIR)/$(SED_SOURCE) + mkdir -p $(TOOL_BUILD_DIR) + mkdir -p $(STAGING_DIR)/bin; + $(SED_CAT) $(DL_DIR)/$(SED_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - + touch $(SED_DIR1)/.unpacked + +$(SED_DIR1)/.configured: $(SED_DIR1)/.unpacked + (cd $(SED_DIR1); rm -rf config.cache; \ + ./configure \ + --prefix=$(STAGING_DIR) \ + --prefix=/usr \ + ); + touch $(SED_DIR1)/.configured + +$(SED_DIR1)/$(SED_BINARY): $(SED_DIR1)/.configured + $(MAKE) -C $(SED_DIR1) + +# This stuff is needed to work around GNU make deficiencies +build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY) + @if [ -L $(STAGING_DIR)/$(SED_TARGET_BINARY) ] ; then \ + rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY); fi; + @if [ ! -f $(STAGING_DIR)/$(SED_TARGET_BINARY) -o $(STAGING_DIR)/$(SED_TARGET_BINARY) \ + -ot $(SED_DIR1)/$(SED_BINARY) ] ; then \ + set -x; \ + mkdir -p $(STAGING_DIR)/bin; \ + $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SED_DIR1) install; \ + mv $(STAGING_DIR)/usr/bin/sed $(STAGING_DIR)/bin/; \ + rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \ + $(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc; fi + +use-sed-host-binary: + @if [ -x /usr/bin/sed ]; then SED="/usr/bin/sed"; else \ + if [ -x /bin/sed ]; then SED="/bin/sed"; fi; fi; \ + mkdir -p $(STAGING_DIR)/bin; \ + rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY); \ + ln -s $$SED $(STAGING_DIR)/$(SED_TARGET_BINARY) + +host-sed: $(HOST_SED_TARGET) + +host-sed-clean: + -$(MAKE) -C $(SED_DIR1) clean + +host-sed-toolclean: + rm -rf $(SED_DIR1) + rm -f $(STAGING_DIR)/$(SED_TARGET_BINARY) diff --git a/toolchain/sed/sedcheck.sh b/toolchain/sed/sedcheck.sh new file mode 100755 index 0000000000..4d645b6ab0 --- /dev/null +++ b/toolchain/sed/sedcheck.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +if [ -x /usr/bin/sed ]; then + SED="/usr/bin/sed"; +else + if [ -x /bin/sed ]; then + SED="/bin/sed"; + fi; +fi; + +echo "HELLO" > .sedtest +$SED -i -e "s/HELLO/GOODBYE/" .sedtest >/dev/null 2>&1 + +if [ $? != 0 ] ; then + echo build-sed-host-binary +else + echo use-sed-host-binary +fi; +rm -f .sedtest + + -- cgit v1.2.3 From 3af82587f3b1a1cfa76bf7990dddf0548ad7f981 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 6 Mar 2005 12:03:54 +0000 Subject: Add package install dependencies (don't install a package if it's already installed) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@315 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/arptables/Makefile | 7 +++++-- package/bridge/Makefile | 7 +++++-- package/dnsmasq/Makefile | 7 +++++-- package/dropbear/Makefile | 7 +++++-- package/ebtables/Makefile | 7 +++++-- package/iproute2/Makefile | 20 +++++++++++++------- package/iptables/Makefile | 26 ++++++++++++++++++-------- package/lzo/Makefile | 13 ++++++++----- package/matrixssl/Makefile | 8 +++++--- package/openssl/Makefile | 11 +++++++---- package/openvpn/Makefile | 11 +++++++---- package/ppp/Makefile | 43 +++++++++++++++++++++++++++++-------------- package/pptpd/Makefile | 7 +++++-- package/zlib/Makefile | 12 +++++++----- 14 files changed, 124 insertions(+), 62 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/arptables/Makefile b/package/arptables/Makefile index d6af30f33b..03c6322fe1 100644 --- a/package/arptables/Makefile +++ b/package/arptables/Makefile @@ -34,10 +34,13 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/arptables mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/arptables.list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) + source: $(DL_DIR)/$(PKG_SOURCE) prepare: $(PKG_BUILD_DIR)/.unpacked compile: $(PKG_IPK) -install: - $(IPKG) install $(PKG_IPK) +install: $(IPKG_STATE_DIR)/info/arptables.list + clean: rm -rf $(PKG_BUILD_DIR) diff --git a/package/bridge/Makefile b/package/bridge/Makefile index 5340a9b58e..4381b1d40a 100644 --- a/package/bridge/Makefile +++ b/package/bridge/Makefile @@ -60,10 +60,13 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/brctl/brctl mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/bridge.list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) + source: $(DL_DIR)/$(PKG_SOURCE) prepare: $(PKG_BUILD_DIR)/.patched compile: $(PKG_IPK) -install: - $(IPKG) install $(PKG_IPK) +install: $(IPKG_STATE_DIR)/info/bridge.list + clean: rm -rf $(PKG_BUILD_DIR) diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 3b6acb49d9..899bad799f 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -35,11 +35,14 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/src/$(PKG_NAME) mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/dnsmasq.list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) + source: $(DL_DIR)/$(PKG_SOURCE) prepare: $(PKG_BUILD_DIR)/.patched compile: $(PKG_IPK) -install: - $(IPKG) install $(PKG_IPK) +install: $(IPKG_STATE_DIR)/info/dnsmasq.list + clean: rm -rf $(PKG_BUILD_DIR) rm -f $(PKG_IPK) diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index eec889deaf..62d802e941 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -69,11 +69,14 @@ $(PACKAGE_DIR)/$(DROPBEAR_IPK): $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) chmod a+x $(DROPBEAR_IPK_DIR)/etc/init.d/S50dropbear $(IPKG_BUILD) $(DROPBEAR_IPK_DIR) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/dropbear.list: $(PACKAGE_DIR)/$(DROPBEAR_IPK) + $(IPKG) install $(PACKAGE_DIR)/$(DROPBEAR_IPK) + source: $(DL_DIR)/$(DROPBEAR_SOURCE) prepare: $(DROPBEAR_DIR)/.patched compile: $(PACKAGE_DIR)/$(DROPBEAR_IPK) -install: compile - $(IPKG) install $(PACKAGE_DIR)/$(DROPBEAR_IPK) +install: $(IPKG_STATE_DIR)/info/dropbear.list + clean: rm -rf $(DROPBEAR_DIR) rm -f $(PACKAGE_DIR)/$(DROPBEAR_IPK) diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index 384576db9d..fd168a8a18 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -34,10 +34,13 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/ebtables mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/ebtables.list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) + source: $(DL_DIR)/$(PKG_SOURCE) prepare: $(PKG_BUILD_DIR)/.unpacked compile: $(PKG_IPK) -install: - $(IPKG) install $(PKG_IPK) +install: $(IPKG_STATE_DIR)/info/ebtables.list + clean: rm -rf $(PKG_BUILD_DIR) diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index a2d52df116..ad2ba0094d 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -1,6 +1,6 @@ ############################################################# # -# ebtables +# iproute2 # ############################################################# include $(TOPDIR)/rules.mk @@ -53,6 +53,9 @@ $(PKG_IP): $(PKG_BUILD_DIR)/ip/ip $(PACKAGE_DIR) $(STRIP) $(PKG_IP_DIR)/usr/sbin/* $(IPKG_BUILD) $(PKG_IP_DIR) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/ip.list: $(PKG_IP) + $(IPKG) install $(PKG_IP) + $(PKG_TC): $(PKG_BUILD_DIR)/tc/tc $(PACKAGE_DIR) $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_TC_DIR) tc.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(PKG_TC_DIR)/usr/sbin @@ -60,6 +63,9 @@ $(PKG_TC): $(PKG_BUILD_DIR)/tc/tc $(PACKAGE_DIR) $(STRIP) $(PKG_TC_DIR)/usr/sbin/* $(IPKG_BUILD) $(PKG_TC_DIR) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/tc.list: $(PKG_TC) + $(IPKG) install $(PKG_TC) + $(PACKAGE_DIR): mkdir -p $(PACKAGE_DIR) @@ -71,17 +77,17 @@ ifneq ($(BR2_PACKAGE_IPROUTE2_TC),) TARGETS += $(PKG_TC) endif -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.patched -compile: $(TARGETS) -install: ifeq ($(BR2_PACKAGE_IPROUTE2_IP),y) - $(IPKG) install $(PKG_IP) +INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip.list endif ifeq ($(BR2_PACKAGE_IPROUTE2_TC),y) - $(IPKG) install $(PKG_TC) +INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/tc.list endif +source: $(DL_DIR)/$(PKG_SOURCE) +prepare: $(PKG_BUILD_DIR)/.patched +compile: $(TARGETS) +install: $(INSTALL_TARGETS) clean: rm -rf $(PKG_BUILD_DIR) diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 1a0c385f3f..67e4a2d737 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -28,6 +28,14 @@ ifneq ($(BR2_PACKAGE_IP6TABLES),) TARGETS += $(PKG_IP6T) endif +INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/iptables.list +ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y) +INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/iptables-extra.list +endif +ifeq ($(BR2_PACKAGE_IP6TABLES),y) +INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ip6tables.list +endif + $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) @@ -58,6 +66,9 @@ $(PKG_IPT): $(PKG_BUILD_DIR)/iptables mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(I_IPT) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/iptables.list: $(PKG_IPT) + $(IPKG) install $(PKG_IPT) + $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IPT_EXTRA) control/iptables-extra.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(I_IPT_EXTRA)/usr/lib/iptables @@ -67,6 +78,9 @@ $(PKG_IPT_EXTRA): $(PKG_BUILD_DIR)/iptables mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(I_IPT_EXTRA) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/iptables-extra.list: $(PKG_IPT) + $(IPKG) install $(PKG_IPT_EXTRA) + $(PKG_IP6T): $(PKG_BUILD_DIR)/iptables $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_IP6T) control/ip6tables.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(I_IP6T)/usr/sbin @@ -79,18 +93,14 @@ $(PKG_IP6T): $(PKG_BUILD_DIR)/iptables mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(I_IP6T) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/ip6tables.list: $(PKG_IP6T) + $(IPKG) install $(PKG_IP6T) + source: $(DL_DIR)/$(PKG_SOURCE_FILE) prepare: $(PKG_BUILD_DIR)/.patched compile: $(TARGETS) -install: compile - $(IPKG) install $(PKG_IPT) -ifeq ($(BR2_PACKAGE_IPTABLES_EXTRA),y) - $(IPKG) install $(PKG_IPT_EXTRA) -endif -ifeq ($(BR2_PACKAGE_IP6TABLES),y) - $(IPKG) install $(PKG_IP6T) -endif +install: $(INSTALL_TARGETS) clean: rm -rf $(PKG_BUILD_DIR) diff --git a/package/lzo/Makefile b/package/lzo/Makefile index 8d7398194e..414ec3eb26 100644 --- a/package/lzo/Makefile +++ b/package/lzo/Makefile @@ -9,7 +9,7 @@ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_CAT := zcat PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) -PKG_IPK := $(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk $(DL_DIR)/$(PKG_SOURCE_FILE): @@ -49,7 +49,7 @@ $(STAGING_DIR)/lib/liblzo.a: $(PKG_BUILD_DIR)/src/liblzo.la DESTDIR="$(STAGING_DIR)" \ install -$(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/liblzo.a +$(PKG_IPK): $(STAGING_DIR)/lib/liblzo.a mkdir -p $(PACKAGE_DIR) $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/lzo lzo.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(PKG_BUILD_DIR)/ipkg/lzo/usr/lib @@ -57,11 +57,14 @@ $(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/liblzo.a $(STRIP) $(PKG_BUILD_DIR)/ipkg/lzo/usr/lib/* $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/lzo $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/lzo.list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) + source: $(DL_DIR)/$(PKG_SOURCE_FILE) prepare: $(PKG_BUILD_DIR)/.patched -compile: $(STAGING_DIR)/lib/liblzo.a $(PACKAGE_DIR)/$(PKG_IPK) -install: $(PKG_ZLIB) - $(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK) +compile: $(STAGING_DIR)/lib/liblzo.a $(PKG_IPK) +install: $(IPKG_STATE_DIR)/info/lzo.list + clean: rm -rf $(PKG_BUILD_DIR) rm -f $(STAGING_DIR)/lib/liblzo* diff --git a/package/matrixssl/Makefile b/package/matrixssl/Makefile index 22209a9dd8..4775c121e7 100644 --- a/package/matrixssl/Makefile +++ b/package/matrixssl/Makefile @@ -9,7 +9,7 @@ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_CAT := zcat PKG_SOURCE_DIR := $(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) -PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk $(DL_DIR)/$(PKG_SOURCE_FILE): @@ -41,12 +41,14 @@ $(PKG_IPK): $(STAGING_DIR)/lib/libmatrixssl.so $(STRIP) $(PKG_BUILD_DIR)/ipkg/matrixssl/usr/lib/* $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/matrixssl $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/libmatrixssl.list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) source: $(DL_DIR)/$(PKG_SOURCE_FILE) prepare: $(PKG_BUILD_DIR)/.patched compile: $(STAGING_DIR)/lib/libmatrixssl.so $(PKG_IPK) -install: $(PKG_ZLIB) - $(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK) +install: $(PKG_ZLIB) $(IPKG_STATE_DIR)/info/libmatrixssl.list + clean: rm -rf $(PKG_BUILD_DIR) rm -f $(STAGING_DIR)/lib/libmatrixssl* $(STAGING_DIR)/include/matrixssl* diff --git a/package/openssl/Makefile b/package/openssl/Makefile index e5dd851856..eb566c53f5 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -9,7 +9,7 @@ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_CAT := zcat PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) -PKG_IPK := $(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk OPENSSL_NO_CIPHERS:=no-idea no-mdc2 no-rc5 no-rc2 no-md2 no-md4 @@ -51,7 +51,7 @@ $(STAGING_DIR)/lib/libssl.so: $(PKG_BUILD_DIR)/apps/openssl (cd $(STAGING_DIR)/lib; ln -fs libssl.so.0.9.7 libssl.so) (cd $(STAGING_DIR)/lib; ln -fs libssl.so.0.9.7 libssl.so.0) -$(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/libssl.so +$(PKG_IPK): $(STAGING_DIR)/lib/libssl.so mkdir -p $(PACKAGE_DIR) $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)/usr/lib @@ -60,11 +60,14 @@ $(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/libssl.so $(STRIP) $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME)/usr/lib/* $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/$(PKG_NAME) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/openssl.list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) + source: $(DL_DIR)/$(PKG_SOURCE_FILE) prepare: $(PKG_BUILD_DIR)/.patched compile: $(STAGING_DIR)/lib/libssl.so $(PACKAGE_DIR)/$(PKG_IPK) -install: $(PKG_ZLIB) - $(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK) +install: $(PKG_ZLIB) $(IPKG_STATE_DIR)/info/openssl.list + clean: rm -rf $(PKG_BUILD_DIR) rm -f $(STAGING_DIR)/lib/libssl* diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 41f7d67594..94bee618d6 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -50,20 +50,23 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked ); touch $(PKG_BUILD_DIR)/.configured -$(PKG_BUILD_DIR)/usr/sbin/openvpn: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/openvpn: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) -$(PKG_IPK): $(PKG_BUILD_DIR)/usr/sbin/openvpn +$(PKG_IPK): $(PKG_BUILD_DIR)/openvpn $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(PKG_IPK_DIR)/usr/sbin cp $(PKG_BUILD_DIR)/openvpn $(PKG_IPK_DIR)/usr/sbin/ mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/openvpn.list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) + source: $(DL_DIR)/$(PKG_SOURCE) prepare: $(PKG_BUILD_DIR)/.unpacked compile: $(PKG_IPK) -install: - $(IPKG) install $(PKG_IPK) +install: $(IPKG_STATE_DIR)/info/openvpn.list + clean: rm -rf $(PKG_BUILD_DIR) diff --git a/package/ppp/Makefile b/package/ppp/Makefile index b246a3db33..69a934bea2 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -37,6 +37,20 @@ ifneq ($(BR2_PACKAGE_PPPSTATS),) TARGETS += $(PKG_PPPSTATS) endif +INSTALL_TARGETS := $(IPKG_STATE_DIR)/info/ppp.list +ifeq ($(BR2_PACKAGE_PPP_PPPOE),y) +INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ppp-pppoe-plugin.list +endif +ifeq ($(BR2_PACKAGE_PPP_RADIUS),y) +INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/ppp-radius-plugin.list +endif +ifeq ($(BR2_PACKAGE_PPPDUMP),y) +INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/pppdump.list +endif +ifeq ($(BR2_PACKAGE_PPPSTATS),y) +INSTALL_TARGETS += $(IPKG_STATE_DIR)/info/pppstats.list +endif + $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) @@ -91,6 +105,9 @@ $(PKG_PPP): $(PKG_BUILD_DIR)/pppd/pppd cp $(MODULES_DIR)/kernel/drivers/net/bsd_comp.o $(I_PPP)/$(MODULES_SUBDIR) $(IPKG_BUILD) $(I_PPP) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/ppp.list: $(PKG_PPP) + $(IPKG) install $(PKG_PPP) + $(PKG_PPP_PPPOE_PLUGIN): $(PKG_PPP) $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_PPPOE_PLUGIN) control/ppp-pppoe-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(I_PPP_PPPOE_PLUGIN)/usr/lib/pppd/rp-pppoe @@ -101,6 +118,9 @@ $(PKG_PPP_PPPOE_PLUGIN): $(PKG_PPP) cp $(MODULES_DIR)/kernel/drivers/net/pppo*.o $(I_PPP_PPPOE_PLUGIN)/$(MODULES_SUBDIR) $(IPKG_BUILD) $(I_PPP_PPPOE_PLUGIN) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/ppp-pppoe-plugin.list: $(PKG_PPP_PPPOE_PLUGIN) + $(IPKG) install $(PKG_PPP_PPPOE_PLUGIN) + $(PKG_PPP_RADIUS_PLUGIN): $(PKG_PPP) $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPP_RADIUS_PLUGIN) control/ppp-radius-plugin.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/radius @@ -109,6 +129,9 @@ $(PKG_PPP_RADIUS_PLUGIN): $(PKG_PPP) $(STRIP) $(I_PPP_RADIUS_PLUGIN)/usr/lib/pppd/*/*.so $(IPKG_BUILD) $(I_PPP_RADIUS_PLUGIN) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/ppp-radius-plugin.list: $(PKG_PPP_RADIUS_PLUGIN) + $(IPKG) install $(PKG_PPP_RADIUS_PLUGIN) + $(PKG_PPPDUMP): $(PKG_PPP) $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPDUMP) control/pppdump.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(I_PPPDUMP)/usr/sbin @@ -116,6 +139,9 @@ $(PKG_PPPDUMP): $(PKG_PPP) $(STRIP) $(I_PPPDUMP)/usr/sbin/* $(IPKG_BUILD) $(I_PPPDUMP) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/pppdump.list: $(PKG_PPPDUMP) + $(IPKG) install $(PKG_PPPDUMP) + $(PKG_PPPSTATS): $(PKG_PPP) $(SCRIPT_DIR)/make-ipkg-dir.sh $(I_PPPSTATS) control/pppstats.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(I_PPPSTATS)/usr/sbin @@ -123,24 +149,13 @@ $(PKG_PPPSTATS): $(PKG_PPP) $(STRIP) $(I_PPPSTATS)/usr/sbin/* $(IPKG_BUILD) $(I_PPPSTATS) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/pppstats.list: $(PKG_PPPSTATS) + $(IPKG) install $(PKG_PPPSTATS) source: $(DL_DIR)/$(PKG_SOURCE_FILE) prepare: $(PKG_BUILD_DIR)/.patched compile: $(TARGETS) -install: compile - $(IPKG) install $(PKG_PPP) -ifeq ($(BR2_PACKAGE_PPP_PPPOE),y) - $(IPKG) install $(PKG_PPP_PPPOE_PLUGIN) -endif -ifeq ($(BR2_PACKAGE_PPP_RADIUS),y) - $(IPKG) install $(PKG_PPP_RADIUS_PLUGIN) -endif -ifeq ($(BR2_PACKAGE_PPPDUMP),y) - $(IPKG) install $(PKG_PPPDUMP) -endif -ifeq ($(BR2_PACKAGE_PPPSTATS),y) - $(IPKG) install $(PKG_PPPSTATS) -endif +install: $(INSTALL_TARGETS) clean: rm -rf $(PKG_BUILD_DIR) diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index dcd4e94bb3..a320b15ac6 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -60,11 +60,14 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME) mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/pptpd.list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) + source: $(DL_DIR)/$(PKG_SOURCE) prepare: $(PKG_BUILD_DIR)/.unpacked compile: $(PKG_IPK) -install: - $(IPKG) install $(PKG_IPK) +install: $(IPKG_STATE_DIR)/info/pptpd.list + clean: rm -rf $(PKG_BUILD_DIR) rm -f $(PKG_IPK) diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 522c1b675c..6d9144f16c 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -9,7 +9,7 @@ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_CAT := zcat PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) -PKG_IPK := zlib_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPK := $(PACKAGE_DIR)/zlib_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk $(DL_DIR)/$(PKG_SOURCE_FILE): @@ -41,7 +41,7 @@ $(STAGING_DIR)/lib/libz.so: $(PKG_BUILD_DIR)/libz.so DESTDIR="$(STAGING_DIR)" \ install -$(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/libz.so +$(PKG_IPK): $(STAGING_DIR)/lib/libz.so mkdir -p $(PACKAGE_DIR) $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_BUILD_DIR)/ipkg/zlib zlib.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib @@ -49,12 +49,14 @@ $(PACKAGE_DIR)/$(PKG_IPK): $(STAGING_DIR)/lib/libz.so $(STRIP) $(PKG_BUILD_DIR)/ipkg/zlib/usr/lib/* $(IPKG_BUILD) $(PKG_BUILD_DIR)/ipkg/zlib $(PACKAGE_DIR) +$(IPKG_STATE_DIR)/info/zlib.list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) source: $(DL_DIR)/$(PKG_SOURCE_FILE) prepare: $(PKG_BUILD_DIR)/.patched -compile: $(STAGING_DIR)/lib/libz.so $(PACKAGE_DIR)/$(PKG_IPK) -install: $(PKG_ZLIB) - $(IPKG) install $(PACKAGE_DIR)/$(PKG_IPK) +compile: $(STAGING_DIR)/lib/libz.so $(PKG_IPK) +install: $(PKG_ZLIB) $(IPKG_STATE_DIR)/info/zlib.list + clean: rm -rf $(PKG_BUILD_DIR) rm -f $(STAGING_DIR)/lib/libz* $(STAGING_DIR)/include/zlib* -- cgit v1.2.3 From 0995de955ee0f3a7b9a1ab6616436c467fa54889 Mon Sep 17 00:00:00 2001 From: kaloz Date: Sat, 19 Mar 2005 17:52:30 +0000 Subject: support for the asus wl-500g deluxe and the buffalo v2 units. dnsmasq update, control file fixes. add back other boardtypes to make wl.o happy on other routers git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@390 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 2 +- package/dnsmasq/dnsmasq.control | 2 +- package/dropbear/dropbear.control | 2 +- package/iptables/control/ip6tables.control | 2 +- package/iptables/control/iptables-extra.control | 2 +- package/iptables/control/iptables.control | 2 +- .../arch/mips/brcm-boards/bcm947xx/sbpci.c | 2 +- .../linux/kernel-source/drivers/net/diag/diag_led.c | 16 ++++++++++++++++ target/default/target_skeleton/etc/init.d/S10boot | 10 ++++++++++ target/default/target_skeleton/etc/nvram.overrides | 18 ++++++++++++++++++ 10 files changed, 51 insertions(+), 7 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 899bad799f..761b79843b 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.15 +PKG_VERSION:=2.20 PKG_RELEASE:=1 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/package/dnsmasq/dnsmasq.control b/package/dnsmasq/dnsmasq.control index ef6bd0db30..3aba02b51d 100644 --- a/package/dnsmasq/dnsmasq.control +++ b/package/dnsmasq/dnsmasq.control @@ -1,7 +1,7 @@ Package: dnsmasq Priority: essential Section: net -Version: 2.15-1 +Version: 2.20-1 Architecture: mipsel Maintainer: Felix Fietkau Source: buildroot internal diff --git a/package/dropbear/dropbear.control b/package/dropbear/dropbear.control index e30f02ac5c..1a2f5ed970 100644 --- a/package/dropbear/dropbear.control +++ b/package/dropbear/dropbear.control @@ -2,7 +2,7 @@ Package: dropbear Priority: optional Depends: zlib Section: net -Version: 0.44-1 +Version: 0.45-1 Architecture: mipsel Maintainer: Felix Fietkau Source: buildroot internal diff --git a/package/iptables/control/ip6tables.control b/package/iptables/control/ip6tables.control index 4f7da5645a..6739656c7f 100644 --- a/package/iptables/control/ip6tables.control +++ b/package/iptables/control/ip6tables.control @@ -2,7 +2,7 @@ Package: ip6tables Priority: optional Depends: kmod-ipv6 Section: net -Version: 1.2.11-1 +Version: 1.3.0-1 Architecture: mipsel Maintainer: Felix Fietkau Source: buildroot internal diff --git a/package/iptables/control/iptables-extra.control b/package/iptables/control/iptables-extra.control index 2ce6044642..eb3dd7bed1 100644 --- a/package/iptables/control/iptables-extra.control +++ b/package/iptables/control/iptables-extra.control @@ -1,7 +1,7 @@ Package: iptables-extra Priority: optional Section: net -Version: 1.2.11-1 +Version: 1.3.0-1 Architecture: mipsel Maintainer: Felix Fietkau Source: buildroot internal diff --git a/package/iptables/control/iptables.control b/package/iptables/control/iptables.control index 09a99b5b04..6b7ab38a65 100644 --- a/package/iptables/control/iptables.control +++ b/package/iptables/control/iptables.control @@ -1,7 +1,7 @@ Package: iptables Priority: optional Section: net -Version: 1.2.11-1 +Version: 1.3.0-1 Architecture: mipsel Maintainer: Felix Fietkau Source: buildroot internal diff --git a/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c b/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c index b3469134eb..ead31e9aa5 100644 --- a/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c +++ b/package/linux/kernel-source/arch/mips/brcm-boards/bcm947xx/sbpci.c @@ -275,7 +275,7 @@ sbpci_init(void *sbh) sb_core_reset(sbh, 0); /* In some board, */ - if(nvram_match("boardtype", "bcm94710dev")) + if(nvram_match("boardtype", "bcm94710dev") || nvram_match("boardtype", "bcm94710ap")|| nvram_match("boardtype", "bcm94710r4")|| nvram_match("boardtype", "bcm94710r4")|| nvram_match("boardtype", "bcm95365r")) CT4712_WR = 0; else CT4712_WR = 1; diff --git a/package/linux/kernel-source/drivers/net/diag/diag_led.c b/package/linux/kernel-source/drivers/net/diag/diag_led.c index 41cb17bf4d..6f1ba97324 100644 --- a/package/linux/kernel-source/drivers/net/diag/diag_led.c +++ b/package/linux/kernel-source/drivers/net/diag/diag_led.c @@ -5,6 +5,7 @@ // initial release 2004/03/28 // // 2004/08/26 asus & buffalo support added +// 2005/03/14 asus wl-500g deluxe and buffalo v2 support added #include #include @@ -187,11 +188,26 @@ static int __init diag_init() reset_polarity=0; buf=nvram_get("boardnum")?:""; if (!strcmp(buf,"44")) { + //motorola set_diag=ignore; set_dmz=ignore; reset_gpio=(1<<5); reset_polarity=0; } + if (!strcmp(buf,"00")) { + //buffalo + set_diag=ignore; + set_dmz=ignore; + reset_gpio=(1<<7); + reset_polarity=1; + } + if (!strcmp(buf,"45")) { + //wl-500g deluxe + set_diag=ignore; + set_dmz=ignore; + reset_gpio=(1<<6); + reset_polarity=1; + } } printk(KERN_INFO "using v%d hardware\n",board_type); diff --git a/target/default/target_skeleton/etc/init.d/S10boot b/target/default/target_skeleton/etc/init.d/S10boot index 928fc585f0..1a36583cc2 100755 --- a/target/default/target_skeleton/etc/init.d/S10boot +++ b/target/default/target_skeleton/etc/init.d/S10boot @@ -15,6 +15,16 @@ touch /var/log/lastlog awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}') } +# set up the vlan*ports variables for the asus wl-500g deluxe, if they aren't exist +[ "$(nvram get boardtype)" = "bcm95365r" ] && \ +[ "$(nvram get boardnum)" = "45" ] && { + [ -z "$(nvram get vlan0ports)" ] && \ + [ -z "$(nvram get vlan1ports)" ] && { + nvram set vlan0ports="1 2 3 4 5*" + nvram set vlan1ports="0 5" + } +} + sed 's/^[^#]/insmod &/' /etc/modules 2>&-|ash ifconfig lo 127.0.0.1 up diff --git a/target/default/target_skeleton/etc/nvram.overrides b/target/default/target_skeleton/etc/nvram.overrides index 206c90b0dd..82c15900ea 100644 --- a/target/default/target_skeleton/etc/nvram.overrides +++ b/target/default/target_skeleton/etc/nvram.overrides @@ -45,11 +45,29 @@ NVRAM_lan_proto="static" FAILSAFE_ifnames="eth0 eth1" } +# hacks for buffalo wla2-g54l +[ "$(nvram get boardnum)" = "00" ] && \ +[ "$(nvram get product_name)" = "Product_name" ] && { + debug "### wla2-g54l hacks ###" + NVRAM_lan_ifnames="vlan0" + NVRAM_wan_ifname="none" +} + # hack for asus wl-500g hardware [ $asus ] && { FAILSAFE_lan_ifnames="eth0 eth2" } +# hacks for asus wl-500g deluxe +[ "$(nvram get boardtype)" = "bcm95365r" ] && \ +[ "$(nvram get boardnum)" = "45" ] && { + debug "### wl-500g deluxe hacks ###" + NVRAM_vlan0hwname="et0" + NVRAM_vlan1hwname="et0" + NVRAM_lan_ifnames="vlan0 eth1" + NVRAM_wan_ifname="vlan1" +} + # defaults if lan_ifname is missing [ -z "$(nvram get lan_ifname)" ] && { NVRAM_lan_ifname="br0" -- cgit v1.2.3 From 0d52ac0f6a06a36bc0f0316b8593f1f8dc3a8a53 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 19 Mar 2005 22:51:51 +0000 Subject: add downloading script (with md5sum checking and sourceforge downloading support) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@391 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/arptables/Makefile | 4 +- package/bridge/Makefile | 4 +- package/busybox/busybox.mk | 2 +- package/dnsmasq/Makefile | 2 +- package/dropbear/Makefile | 2 +- package/ebtables/Makefile | 4 +- package/haserl/Makefile | 4 +- package/iproute2/Makefile | 2 +- package/iptables/Makefile | 2 +- package/libelf/Makefile | 2 +- package/libpcap/Makefile | 2 +- package/linux/linux.mk | 4 +- package/lzo/Makefile | 2 +- package/matrixssl/Makefile | 2 +- package/microperl/Makefile | 2 +- package/ncurses/Makefile | 2 +- package/openssl/Makefile | 2 +- package/openvpn/Makefile | 4 +- package/openwrt/Makefile | 2 +- package/pcre/Makefile | 2 +- package/popt/Makefile | 2 +- package/ppp/Makefile | 2 +- package/pptp/Makefile | 4 +- package/pptpd/Makefile | 4 +- package/strace/Makefile | 4 +- package/tcpdump/Makefile | 2 +- package/zlib/Makefile | 2 +- scripts/download.pl | 76 ++++++++++++++++++++++++++++++ target/jffs2/jffs2root.mk | 2 +- target/squashfs-lzma/squashfslzmaroot.mk | 2 +- toolchain/binutils/binutils.mk | 2 +- toolchain/gcc/gcc-uclibc-3.x.mk | 2 +- toolchain/ipkg-utils/Makefile | 2 +- toolchain/kernel-headers/kernel-headers.mk | 3 +- toolchain/sed/sed.mk | 2 +- toolchain/uClibc/uclibc.mk | 2 +- 36 files changed, 121 insertions(+), 44 deletions(-) create mode 100755 scripts/download.pl (limited to 'package/dnsmasq/Makefile') diff --git a/package/arptables/Makefile b/package/arptables/Makefile index 961ee5e2a8..f27a35333f 100644 --- a/package/arptables/Makefile +++ b/package/arptables/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=arptables PKG_VERSION:=0.0.3 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://unc.dl.sourceforge.net/sourceforge/ebtables/ +PKG_SOURCE_URL:=@SF/ebtables PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) PKG_CAT:=zcat @@ -16,7 +16,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/bridge/Makefile b/package/bridge/Makefile index 2f3f4c6301..5aba7d30ef 100644 --- a/package/bridge/Makefile +++ b/package/bridge/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bridge PKG_VERSION:=1.0.4 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://unc.dl.sourceforge.net/sourceforge/bridge +PKG_SOURCE_URL:=@SF/bridge PKG_SOURCE:=bridge-utils-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION) PKG_CAT:=zcat @@ -16,7 +16,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index ab67544498..03b1c78bd5 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -18,7 +18,7 @@ endif BUSYBOX_UNZIP=bzcat $(DL_DIR)/$(BUSYBOX_SOURCE): - $(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(BUSYBOX_SOURCE) x $(BUSYBOX_SITE) busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG) diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 761b79843b..9d1506e850 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -16,7 +16,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 50031300b9..a62e25131b 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -16,7 +16,7 @@ DROPBEAR_IPK:=dropbear_$(DROPBEAR_VERSION)-1_$(ARCH).ipk DROPBEAR_IPK_DIR:=$(DROPBEAR_DIR)/ipkg $(DL_DIR)/$(DROPBEAR_SOURCE): - $(WGET) -P $(DL_DIR) $(DROPBEAR_SITE)/$(DROPBEAR_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(DROPBEAR_SOURCE) x $(DROPBEAR_SITE) $(DROPBEAR_DIR)/.patched: $(DL_DIR)/$(DROPBEAR_SOURCE) $(DROPBEAR_CAT) $(DL_DIR)/$(DROPBEAR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index d4a7584e13..f79f6864c1 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ebtables PKG_VERSION:=2.0.6 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://unc.dl.sourceforge.net/sourceforge/ebtables/ +PKG_SOURCE_URL:=@SF/ebtables PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION) PKG_CAT:=zcat @@ -16,7 +16,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/haserl/Makefile b/package/haserl/Makefile index 7e6c97af93..2ad108343f 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -4,7 +4,7 @@ PKG_NAME := haserl PKG_VERSION := 0.7.3 PKG_RELEASE := 3 -PKG_SOURCE_SITE := http://dl.sourceforge.net/sourceforge/haserl/ +PKG_SOURCE_SITE := @SF/haserl PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_CAT := zcat PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) @@ -14,7 +14,7 @@ PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 6c786eacfe..313435a47b 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -20,7 +20,7 @@ PKG_TC:=$(PACKAGE_DIR)/tc_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_TC_DIR:=$(PKG_BUILD_DIR)/ipkg/tc $(DL_DIR)/$(PKG_SOURCE): - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/iptables/Makefile b/package/iptables/Makefile index c50c4bdb38..910864583f 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -38,7 +38,7 @@ endif $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(PKG_BUILD_DIR)/modules diff --git a/package/libelf/Makefile b/package/libelf/Makefile index 65105697a5..3767f17c96 100644 --- a/package/libelf/Makefile +++ b/package/libelf/Makefile @@ -15,7 +15,7 @@ PKG_IPK_DIR :=$(PKG_BUILD_DIR)/ipkg/ $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 279190c02a..6d0dfafe7d 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -13,7 +13,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/linux/linux.mk b/package/linux/linux.mk index 225683d08d..e0d0acc846 100644 --- a/package/linux/linux.mk +++ b/package/linux/linux.mk @@ -36,10 +36,10 @@ LINUX_BINARY_ET_DRIVER=kernel-binary-et.tar.gz TARGET_MODULES_DIR=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION) $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER): - $(WGET) -P $(DL_DIR) $(LINUX_BINARY_DRIVER_SITE)/$(LINUX_BINARY_WL_DRIVER) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_WL_DRIVER) x $(LINUX_BINARY_DRIVER_SITE) $(DL_DIR)/$(LINUX_BINARY_ET_DRIVER): - $(WGET) -P $(DL_DIR) $(LINUX_BINARY_DRIVER_SITE)/$(LINUX_BINARY_ET_DRIVER) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_ET_DRIVER) x $(LINUX_BINARY_DRIVER_SITE) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) $(DL_DIR)/$(LINUX_BINARY_ET_DRIVER) -mkdir -p $(BUILD_DIR) diff --git a/package/lzo/Makefile b/package/lzo/Makefile index 414ec3eb26..05bb95e9cb 100644 --- a/package/lzo/Makefile +++ b/package/lzo/Makefile @@ -14,7 +14,7 @@ PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/matrixssl/Makefile b/package/matrixssl/Makefile index 2352742b9a..cd39be304c 100644 --- a/package/matrixssl/Makefile +++ b/package/matrixssl/Makefile @@ -14,7 +14,7 @@ PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).i $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/microperl/Makefile b/package/microperl/Makefile index ca6368ef5d..5ec836e6fd 100644 --- a/package/microperl/Makefile +++ b/package/microperl/Makefile @@ -16,7 +16,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 1a3ad4a561..633fc9f765 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -14,7 +14,7 @@ PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).i $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/openssl/Makefile b/package/openssl/Makefile index c038f02cee..cced77d742 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -15,7 +15,7 @@ OPENSSL_NO_CIPHERS:=no-idea no-mdc2 no-rc5 no-rc2 no-md2 no-md4 $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 1c7b06e5fa..c549e66a4d 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn PKG_VERSION:=2.0_rc16 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://puzzle.dl.sourceforge.net/sourceforge/openvpn +PKG_SOURCE_URL:=@SF/openvpn PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_CAT:=zcat @@ -16,7 +16,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/openwrt/Makefile b/package/openwrt/Makefile index 2c695bc409..8a9ff25cff 100644 --- a/package/openwrt/Makefile +++ b/package/openwrt/Makefile @@ -26,7 +26,7 @@ LINKSYS_WLCONF_TGZ=linksys-wlconf.tar.gz LINKSYS_WLCONF_DIR=$(BUILD_DIR)/linksys-wlconf $(DL_DIR)/$(LINKSYS_WLCONF_TGZ): - $(WGET) -P $(DL_DIR) $(LINKSYS_TGZ_SITE)/$(LINKSYS_WLCONF_TGZ) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINKSYS_WLCONF_TGZ) x $(LINKSYS_TGZ_SITE) $(LINKSYS_WLCONF_DIR)/.unpacked: $(DL_DIR)/$(LINKSYS_WLCONF_TGZ) zcat $(DL_DIR)/$(LINKSYS_WLCONF_TGZ) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/pcre/Makefile b/package/pcre/Makefile index de5680b8be..8f4e550bef 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -14,7 +14,7 @@ PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).i $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/popt/Makefile b/package/popt/Makefile index e00a10b49f..b35e097136 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -14,7 +14,7 @@ PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).i $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 69a934bea2..032a228e00 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -53,7 +53,7 @@ endif $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/pptp/Makefile b/package/pptp/Makefile index d0803103bb..0ddd247dc6 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pptp PKG_VERSION:=1.6.0 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://unc.dl.sourceforge.net/sourceforge/pptpclient/ +PKG_SOURCE_URL:=@SF/pptpclient PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_CAT:=zcat @@ -16,7 +16,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index a320b15ac6..5714e4d786 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pptpd PKG_VERSION:=1.2.3 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://unc.dl.sourceforge.net/sourceforge/poptop +PKG_SOURCE_URL:=@SF/poptop PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_CAT:=zcat @@ -16,7 +16,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/strace/Makefile b/package/strace/Makefile index 2702b72e7d..a5235eaa48 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=strace PKG_VERSION:=4.5.9 PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://aleron.dl.sourceforge.net/sourceforge/strace +PKG_SOURCE_URL:=@SF/strace PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_CAT:=bzcat @@ -16,7 +16,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 82abd30ff7..01cef5e2d0 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -16,7 +16,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 6d9144f16c..b01ff46950 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -14,7 +14,7 @@ PKG_IPK := $(PACKAGE_DIR)/zlib_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/scripts/download.pl b/scripts/download.pl new file mode 100755 index 0000000000..a3a5f09d9e --- /dev/null +++ b/scripts/download.pl @@ -0,0 +1,76 @@ +#!/usr/bin/perl +use strict; +use warnings; + +my $target = shift @ARGV; +my $filename = shift @ARGV; +my $md5sum = shift @ARGV; +my @mirrors = @ARGV; + +my $ok; + +@mirrors > 0 or die "Syntax: $0 [ ...]\n"; + +sub download +{ + my $mirror = shift; + + open WGET, "wget -t1 --connect-timeout=20 --read-timeout=15 -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n"; + open MD5SUM, "| md5sum > \"$target/$filename.md5sum\"" or die "Cannot launch md5sum.\n"; + open OUTPUT, "> $target/$filename.dl" or die "Cannot create file $target/$filename.dl: $!\n"; + my $buffer; + while (read WGET, $buffer, 1048576) { + print MD5SUM $buffer; + print OUTPUT $buffer; + } + close MD5SUM; + close WGET; + close OUTPUT; + + if (($? >> 8) != 0 ) { + print STDERR "Download failed.\n"; + cleanup(); + return; + } + + my $sum = `cat "$target/$filename.md5sum"`; + $sum =~ /^(\w+)\s+/ or die "Could not generate md5sum\n"; + $sum = $1; + + if (($md5sum =~ /\w{32}/) and ($sum ne $md5sum)) { + print STDERR "MD5 sum of the downloaded file does not match - deleting download.\n"; + cleanup(); + return; + } + + unlink "$target/$filename"; + system("mv \"$target/$filename.dl\" \"$target/$filename\""); +} + +sub cleanup +{ + unlink "$target/$filename.dl"; + unlink "$target/$filename.md5sum"; +} + +while (!$ok) { + my $mirror = shift @mirrors; + $mirror or die "No more mirrors to try - giving up.\n"; + + if ($mirror =~ /^\@SF\/(.+)$/) { + my $sfpath = $1; + open SF, "wget -t1 -q -O- 'http://prdownloads.sf.net/$sfpath/$filename' |"; + while () { + /RADIO NAME=use_default VALUE=(\w+) OnClick="form\.submit\(\)">/ and do { + push @mirrors, "http://$1.dl.sourceforge.net/sourceforge/$sfpath"; + }; + } + close SF; + } else { + download($mirror); + } + -f "$target/$filename" and $ok = 1; +} + +$SIG{INT} = \&cleanup; + diff --git a/target/jffs2/jffs2root.mk b/target/jffs2/jffs2root.mk index 1c7b962cfe..450c741f72 100644 --- a/target/jffs2/jffs2root.mk +++ b/target/jffs2/jffs2root.mk @@ -10,7 +10,7 @@ MTD_SITE=http://ftp.debian.org/debian/pool/main/m/mtd MKFS_JFFS2=$(shell which mkfs.jffs2 2>/dev/null || echo $(MTD_DIR)/util/mkfs.jffs2) $(DL_DIR)/$(MTD_SOURCE): - $(WGET) -P $(DL_DIR) $(MTD_SITE)/$(MTD_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(MTD_SOURCE) x $(MTD_SITE) $(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) zcat $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) -xvf - diff --git a/target/squashfs-lzma/squashfslzmaroot.mk b/target/squashfs-lzma/squashfslzmaroot.mk index ee7ede84b0..62b7dbb7b7 100644 --- a/target/squashfs-lzma/squashfslzmaroot.mk +++ b/target/squashfs-lzma/squashfslzmaroot.mk @@ -9,7 +9,7 @@ SQUASHFSLZMA_SOURCE=squashfs2.1-r2-lzma.tar.gz SQUASHFSLZMA_SITE=http://openwrt.openbsd-geek.de $(DL_DIR)/$(SQUASHFSLZMA_SOURCE): - $(WGET) -P $(DL_DIR) $(SQUASHFSLZMA_SITE)/$(SQUASHFSLZMA_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(SQUASHFSLZMA_SOURCE) x $(SQUASHFSLZMA_SITE) $(SQUASHFSLZMA_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) zcat $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) | tar -C $(BUILD_DIR) -xvf - diff --git a/toolchain/binutils/binutils.mk b/toolchain/binutils/binutils.mk index 8fccbac370..1bce3f932f 100644 --- a/toolchain/binutils/binutils.mk +++ b/toolchain/binutils/binutils.mk @@ -24,7 +24,7 @@ BINUTILS_DIR1:=$(TOOL_BUILD_DIR)/binutils-$(BINUTILS_VERSION)-build $(DL_DIR)/$(BINUTILS_SOURCE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(BINUTILS_SITE)/$(BINUTILS_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(BINUTILS_SOURCE) x $(BINUTILS_SITE) $(BINUTILS_DIR)/.unpacked: $(DL_DIR)/$(BINUTILS_SOURCE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index 878a55d270..09829db003 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -57,7 +57,7 @@ GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-initial $(DL_DIR)/$(GCC_SOURCE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(GCC_SITE)/$(GCC_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(GCC_SOURCE) x $(GCC_SITE) $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/toolchain/ipkg-utils/Makefile b/toolchain/ipkg-utils/Makefile index 0cfe3c06e4..d46e4f365c 100644 --- a/toolchain/ipkg-utils/Makefile +++ b/toolchain/ipkg-utils/Makefile @@ -18,7 +18,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 9ef884ef4c..73a13cdcae 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -1,6 +1,7 @@ # linux kernel headers for toolchain LINUX_HEADERS_VERSION=2.4.29 +LINUX_KERNEL_MD5SUM:=fcf8b6bb620467f27b657c1c4a60bbff LINUX_HEADERS_SITE=http://www.kernel.org/pub/linux/kernel/v2.4 LINUX_HEADERS_SOURCE=linux-$(LINUX_HEADERS_VERSION).tar.bz2 LINUX_HEADERS_CONFIG=./linux.config @@ -12,7 +13,7 @@ LINUX_HEADERS_ARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ $(DL_DIR)/$(LINUX_HEADERS_SOURCE): -mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(LINUX_HEADERS_SITE)/$(LINUX_HEADERS_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_HEADERS_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_HEADERS_SITE) $(LINUX_HEADERS_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/toolchain/sed/sed.mk b/toolchain/sed/sed.mk index a4f1466ec6..2dfd205f2e 100644 --- a/toolchain/sed/sed.mk +++ b/toolchain/sed/sed.mk @@ -18,7 +18,7 @@ HOST_SED_TARGET=$(shell ./sedcheck.sh) $(DL_DIR)/$(SED_SOURCE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(SED_SITE)/$(SED_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(SED_SOURCE) x $(SED_SITE) sed-source: $(DL_DIR)/$(SED_SOURCE) diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index eec100f83b..f7b6d2be6a 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -33,7 +33,7 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ $(DL_DIR)/$(UCLIBC_SOURCE): mkdir -p $(DL_DIR) - $(WGET) -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(UCLIBC_SOURCE) x $(UCLIBC_SITE) $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) mkdir -p $(TOOL_BUILD_DIR) -- cgit v1.2.3 From df1d9706f4e8dc21c18dd210c16cef8620ca7efe Mon Sep 17 00:00:00 2001 From: wbx Date: Mon, 21 Mar 2005 08:12:49 +0000 Subject: add md5sums git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@405 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/bridge/Makefile | 8 +++----- package/busybox/busybox.mk | 9 +++------ package/dnsmasq/Makefile | 11 +++++------ package/dropbear/Makefile | 11 +++++------ package/ebtables/Makefile | 8 +++----- package/haserl/Makefile | 5 ++++- package/iproute2/Makefile | 11 +++++------ package/iptables/Makefile | 5 ++++- package/lcd4linux/Makefile | 8 +++----- package/libelf/Makefile | 7 ++++--- package/libpcap/Makefile | 7 ++++--- package/linux/Makefile | 2 ++ package/linux/linux.mk | 7 +++++-- package/lzo/Makefile | 7 ++++--- package/matrixssl/Makefile | 9 ++++++--- package/microperl/Makefile | 11 +++++------ package/ncurses/Makefile | 5 +++-- package/openssl/Makefile | 5 ++++- package/openvpn/Makefile | 11 +++++------ package/openwrt/Makefile | 5 ++++- package/pcre/Makefile | 5 ++++- package/popt/Makefile | 6 ++++-- package/ppp/Makefile | 6 ++++-- package/pptp/Makefile | 11 +++++------ package/pptpd/Makefile | 11 +++++------ package/strace/Makefile | 11 +++++------ package/tcpdump/Makefile | 11 +++++------ package/zlib/Makefile | 5 ++++- 28 files changed, 117 insertions(+), 101 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/bridge/Makefile b/package/bridge/Makefile index f19a199c83..9f38b661ce 100644 --- a/package/bridge/Makefile +++ b/package/bridge/Makefile @@ -1,14 +1,12 @@ -############################################################# -# -# ebtables -# -############################################################# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=bridge PKG_VERSION:=1.0.4 PKG_RELEASE:=1 PKG_MD5SUM:=2cab42847c4654e58c4d0ba114bfe2c2 + PKG_SOURCE_URL:=@SF/bridge PKG_SOURCE:=bridge-utils-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 03b1c78bd5..98e8c5da9f 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -1,8 +1,4 @@ -############################################################# -# -# busybox -# -############################################################# +# $Id$ ifeq ($(strip $(BR2_PACKAGE_BUSYBOX_SNAPSHOT)),y) # Be aware that this changes daily.... @@ -11,6 +7,7 @@ BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2 BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots else BUSYBOX_VER:=1.00 +BUSYBOX_MD5:=5c7ea9b5d3b3677dfcdcec38b281a756 BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VER) BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2 BUSYBOX_SITE:=http://www.busybox.net/downloads @@ -18,7 +15,7 @@ endif BUSYBOX_UNZIP=bzcat $(DL_DIR)/$(BUSYBOX_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(BUSYBOX_SOURCE) x $(BUSYBOX_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(BUSYBOX_SOURCE) $(BUSYBOX_MD5) $(BUSYBOX_SITE) busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG) diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 9d1506e850..a9ad26bbec 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -1,13 +1,12 @@ -############################################################# -# -# ebtables -# -############################################################# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_VERSION:=2.20 PKG_RELEASE:=1 +PKG_MD5SUM:=a1501ff96a2925d9c1d44388892cd5af + PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -16,7 +15,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index a62e25131b..48d0068c4f 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -1,11 +1,10 @@ -############################################################# -# -# dropbear -# -############################################################# +# $Id$ + include $(TOPDIR)/rules.mk DROPBEAR_VERSION:=0.45 +DROPBEAR_MD5SUM:=2bcc46e4c239aec982bf36a723dd0b0e + DROPBEAR_SOURCE:=dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_SITE:=http://matt.ucc.asn.au/dropbear/releases/ DROPBEAR_DIR:=$(BUILD_DIR)/dropbear-$(DROPBEAR_VERSION) @@ -16,7 +15,7 @@ DROPBEAR_IPK:=dropbear_$(DROPBEAR_VERSION)-1_$(ARCH).ipk DROPBEAR_IPK_DIR:=$(DROPBEAR_DIR)/ipkg $(DL_DIR)/$(DROPBEAR_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(DROPBEAR_SOURCE) x $(DROPBEAR_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(DROPBEAR_SOURCE) $(DROPBEAR_MD5SUM) $(DROPBEAR_SITE) $(DROPBEAR_DIR)/.patched: $(DL_DIR)/$(DROPBEAR_SOURCE) $(DROPBEAR_CAT) $(DL_DIR)/$(DROPBEAR_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index 6df16dd778..3f0b467ba4 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -1,14 +1,12 @@ -############################################################# -# -# ebtables -# -############################################################# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=ebtables PKG_VERSION:=2.0.6 PKG_RELEASE:=1 PKG_MD5SUM:=c4559af2366c764c6c42a3fdd40d60d3 + PKG_SOURCE_URL:=@SF/ebtables PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION) diff --git a/package/haserl/Makefile b/package/haserl/Makefile index 2ad108343f..6846e7ac18 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -1,8 +1,11 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME := haserl PKG_VERSION := 0.7.3 PKG_RELEASE := 3 +PKG_MD5SUM := a45d9c5b07e053ad105124e1fc12d9c4 PKG_SOURCE_SITE := @SF/haserl PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -14,7 +17,7 @@ PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 313435a47b..e442129062 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -1,13 +1,12 @@ -############################################################# -# -# iproute2 -# -############################################################# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 PKG_VERSION:=2.6.9 PKG_RELEASE:=1 +PKG_MD5SUM:=4b3f335b0139cb909c6a2ae8bf72e548 + PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/ PKG_SOURCE:=$(PKG_NAME)-2.6.9-041019.tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-2.6.9 @@ -20,7 +19,7 @@ PKG_TC:=$(PACKAGE_DIR)/tc_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_TC_DIR:=$(PKG_BUILD_DIR)/ipkg/tc $(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 910864583f..ffaef0058c 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,9 +1,12 @@ +# $Id$ + include $(TOPDIR)/rules.mk include kernelconfig.mk PKG_NAME := iptables PKG_VERSION := 1.3.0 PKG_RELEASE := 1 +PKG_MD5SUM := a072c0f09f1b289cb7af56f76407d033 PKG_SOURCE_SITE := http://www.netfilter.org/files PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -38,7 +41,7 @@ endif $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(PKG_BUILD_DIR)/modules diff --git a/package/lcd4linux/Makefile b/package/lcd4linux/Makefile index c283a61e87..a35e5ebfe1 100644 --- a/package/lcd4linux/Makefile +++ b/package/lcd4linux/Makefile @@ -1,14 +1,12 @@ -############################################################# -# -# lcd4linux -# -############################################################# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=lcd4linux PKG_VERSION:=0.10.0-RC1 PKG_RELEASE:=1 PKG_MD5SUM:=bab64ac01ebdce7e46ab367351af839f + PKG_SOURCE_URL:=@SF/lcd4linux/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/libelf/Makefile b/package/libelf/Makefile index 3767f17c96..8971e86069 100644 --- a/package/libelf/Makefile +++ b/package/libelf/Makefile @@ -1,8 +1,11 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME := libelf PKG_VERSION := 0.8.5 PKG_RELEASE := 1 +PKG_MD5SUM := c1daf069367871350ece779b7de20047 PKG_SOURCE_SITE := http://www.mr511.de/software/ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -12,10 +15,9 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR :=$(PKG_BUILD_DIR)/ipkg/ - $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) @@ -64,4 +66,3 @@ clean: rm -rf $(PKG_BUILD_DIR) rm -f $(STAGING_DIR)/lib/$(PKG_NAME)* rm -f $(PACKAGE_DIR)/$(PKG_NAME)\*.ipk - diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 6d0dfafe7d..e9276367b7 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -1,8 +1,11 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME := libpcap PKG_VERSION := 0.8.3 PKG_RELEASE := 1 +PKG_MD5SUM := 56a9d4615d8354fcfe8cff8c8443c77b PKG_SOURCE_SITE := http://www.tcpdump.org/release PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -10,10 +13,9 @@ PKG_SOURCE_CAT := zcat PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) - $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) @@ -57,4 +59,3 @@ install: clean: rm -rf $(PKG_BUILD_DIR) rm -f $(STAGING_DIR)/lib/libpcap* - diff --git a/package/linux/Makefile b/package/linux/Makefile index 4be1ade372..c5d1f8338e 100644 --- a/package/linux/Makefile +++ b/package/linux/Makefile @@ -1,3 +1,5 @@ +# $Id$ + include $(TOPDIR)/rules.mk include ./linux.mk diff --git a/package/linux/linux.mk b/package/linux/linux.mk index a53682b01c..322adadc38 100644 --- a/package/linux/linux.mk +++ b/package/linux/linux.mk @@ -1,4 +1,5 @@ ############################################################# +# $Id$ # # Linux kernel target for the OpenWRT project # @@ -30,15 +31,17 @@ LINUX_SOURCE_DIR=$(LINUX_DIR)-$(LINUX_VERSION) # binary driver extracted from linksys firmware GPL sourcetree WRT54GS_3_37_2_1109_US LINUX_BINARY_WL_DRIVER=kernel-binary-wl-0.1.tar.gz +LINUX_BINARY_WL_MD5SUM=1b57ba129ad80c7f1702d0be1422cfba LINUX_BINARY_ET_DRIVER=kernel-binary-et-0.2.tar.gz +LINUX_BINARY_ET_MD5SUM=d657f929bceee926bc28821d753d945c TARGET_MODULES_DIR=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION) $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_WL_DRIVER) x $(LINUX_BINARY_DRIVER_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_WL_DRIVER) $(LINUX_BINARY_WL_MD5SUM) $(LINUX_BINARY_DRIVER_SITE) $(DL_DIR)/$(LINUX_BINARY_ET_DRIVER): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_ET_DRIVER) x $(LINUX_BINARY_DRIVER_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_BINARY_ET_DRIVER) $(LINUX_BINARY_ET_MD5SUM) $(LINUX_BINARY_DRIVER_SITE) $(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) $(DL_DIR)/$(LINUX_BINARY_ET_DRIVER) -mkdir -p $(BUILD_DIR) diff --git a/package/lzo/Makefile b/package/lzo/Makefile index 05bb95e9cb..6eaf6f6910 100644 --- a/package/lzo/Makefile +++ b/package/lzo/Makefile @@ -1,8 +1,11 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME := lzo PKG_VERSION := 1.08 PKG_RELEASE := 1 +PKG_MD5SUM := ab94d3da364c7cbd5b78d76f1875b0f6 PKG_SOURCE_SITE := http://www.oberhumer.com/opensource/lzo/download/ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -11,10 +14,9 @@ PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk - $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) @@ -69,4 +71,3 @@ clean: rm -rf $(PKG_BUILD_DIR) rm -f $(STAGING_DIR)/lib/liblzo* rm -f $(PACKAGE_DIR)/lzo\*.ipk - diff --git a/package/matrixssl/Makefile b/package/matrixssl/Makefile index cd39be304c..3ea33144b5 100644 --- a/package/matrixssl/Makefile +++ b/package/matrixssl/Makefile @@ -1,20 +1,23 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME := matrixssl PKG_VERSION := 1.2.4 PKG_RELEASE := 1 +PKG_MD5SUM := 771c1489488e62668d673478311d63ca -PKG_SOURCE_SITE := http://nbd.vd-s.ath.cx/openwrt +PKG_SOURCE_SITE := http://nbd.vd-s.ath.cx/openwrt \ + http://openwrt.openbsd-geek.de/ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_CAT := zcat PKG_SOURCE_DIR := $(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk - $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/microperl/Makefile b/package/microperl/Makefile index 5ec836e6fd..b4c8a3931a 100644 --- a/package/microperl/Makefile +++ b/package/microperl/Makefile @@ -1,13 +1,12 @@ -############################################################# -# -# ebtables -# -############################################################# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=microperl PKG_VERSION:=5.8.6 PKG_RELEASE:=1 +PKG_MD5SUM:=8d4aa4e061fd5bc0c39e4f0a63267880 + PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 PKG_SOURCE:=perl-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/perl-$(PKG_VERSION) @@ -16,7 +15,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 9b64016274..e31e424f8c 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -1,9 +1,12 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME := ncurses PKG_VERSION := 5.2 PKG_RELEASE := 5 PKG_MD5SUM := 464d6a49010cf2a6eb9ce59a264d4d47 + PKG_SOURCE_SITE := ftp://ftp.gnu.org/pub/gnu/$(PKG_NAME) \ ftp://gatekeeper.dec.com/pub/GNU/$(PKG_NAME) \ ftp://ftp.uu.net/archive/systems/gnu/$(PKG_NAME) \ @@ -17,7 +20,6 @@ PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk - $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) @@ -52,4 +54,3 @@ clean: clean rm -rf $(PKG_BUILD_DIR) rm -r $(PKG_IPK) - diff --git a/package/openssl/Makefile b/package/openssl/Makefile index cced77d742..8b6b83a79c 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -1,8 +1,11 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME := openssl PKG_VERSION := 0.9.7e PKG_RELEASE := 1 +PKG_MD5SUM := a8777164bca38d84e5eb2b1535223474 PKG_SOURCE_SITE := http://www.openssl.org/source PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -15,7 +18,7 @@ OPENSSL_NO_CIPHERS:=no-idea no-mdc2 no-rc5 no-rc2 no-md2 no-md4 $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index c549e66a4d..468f77d8f4 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -1,13 +1,12 @@ -############################################################# -# -# ebtables -# -############################################################# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=openvpn PKG_VERSION:=2.0_rc16 PKG_RELEASE:=1 +PKG_MD5SUM:=296a4ca736405525a8de4cd46fef4af5 + PKG_SOURCE_URL:=@SF/openvpn PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -16,7 +15,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/openwrt/Makefile b/package/openwrt/Makefile index 8a9ff25cff..1b6de828a8 100644 --- a/package/openwrt/Makefile +++ b/package/openwrt/Makefile @@ -1,3 +1,5 @@ +# $Id$ + include $(TOPDIR)/rules.mk SHARED_INCLUDE:=${shell pwd}/include @@ -22,11 +24,12 @@ $(TARGET_DIR)/sbin/jffs2root: jffs2root.c # wlconf tool extracted from linksys firmware GPL.unpackedtree # WRT54GS_3_37_2_1109_US LINKSYS_TGZ_SITE=http://openwrt.openbsd-geek.de +LINKSYS_TGZ_MD5SUM=1b596e5bf26d2898d1eab5bd200bee58 LINKSYS_WLCONF_TGZ=linksys-wlconf.tar.gz LINKSYS_WLCONF_DIR=$(BUILD_DIR)/linksys-wlconf $(DL_DIR)/$(LINKSYS_WLCONF_TGZ): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINKSYS_WLCONF_TGZ) x $(LINKSYS_TGZ_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINKSYS_WLCONF_TGZ) $(LINKSYS_TGZ_MD5SUM) $(LINKSYS_TGZ_SITE) $(LINKSYS_WLCONF_DIR)/.unpacked: $(DL_DIR)/$(LINKSYS_WLCONF_TGZ) zcat $(DL_DIR)/$(LINKSYS_WLCONF_TGZ) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/pcre/Makefile b/package/pcre/Makefile index 8f4e550bef..31be6b894c 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -1,8 +1,11 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME := pcre PKG_VERSION := 5.0 PKG_RELEASE := 3 +PKG_MD5SUM := 53976b62032fd5c76678274e5fd196b4 PKG_SOURCE_SITE := ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -14,7 +17,7 @@ PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).i $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/popt/Makefile b/package/popt/Makefile index b35e097136..360a18c1d2 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -1,8 +1,11 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME := popt PKG_VERSION := 1.7 PKG_RELEASE := 3 +PKG_MD5SUM := 5988e7aeb0ae4dac8d83561265984cc9 PKG_SOURCE_SITE := ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -11,10 +14,9 @@ PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk - $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 032a228e00..92dceecd05 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -1,14 +1,16 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME := ppp PKG_VERSION := 2.4.3 PKG_RELEASE := 3 +PKG_MD5SUM := 848f6c3cafeb6074ffeb293c3af79b7c PKG_SOURCE_SITE := ftp://ftp.samba.org/pub/ppp/ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_CAT := zcat PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) - PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) PKG_PPP := $(PACKAGE_DIR)/ppp_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk @@ -53,7 +55,7 @@ endif $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 0ddd247dc6..e017f98361 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -1,13 +1,12 @@ -############################################################# -# -# pptp client -# -############################################################# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=pptp PKG_VERSION:=1.6.0 PKG_RELEASE:=1 +PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 + PKG_SOURCE_URL:=@SF/pptpclient PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -16,7 +15,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index 5714e4d786..cd44864fd5 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -1,13 +1,12 @@ -############################################################# -# -# ebtables -# -############################################################# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=pptpd PKG_VERSION:=1.2.3 PKG_RELEASE:=1 +PKG_MD5SUM:=a521e40ca304b0c125cc25f9b9d03324 + PKG_SOURCE_URL:=@SF/poptop PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -16,7 +15,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/strace/Makefile b/package/strace/Makefile index a5235eaa48..3f532d3513 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -1,13 +1,12 @@ -############################################################# -# -# ebtables -# -############################################################# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=strace PKG_VERSION:=4.5.9 PKG_RELEASE:=1 +PKG_MD5SUM:=ef52064b97bbda23fa708d56a811ba23 + PKG_SOURCE_URL:=@SF/strace PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -16,7 +15,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 01cef5e2d0..4e8b9343dd 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -1,13 +1,12 @@ -############################################################# -# -# ebtables -# -############################################################# +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=tcpdump PKG_VERSION:=3.8.3 PKG_RELEASE:=1 +PKG_MD5SUM:=30645001f4b97019677cad88d3811904 + PKG_SOURCE_URL:=http://www.tcpdump.org/release PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -16,7 +15,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg $(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) x $(PKG_SOURCE_URL) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - diff --git a/package/zlib/Makefile b/package/zlib/Makefile index b01ff46950..26802ae531 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -1,8 +1,11 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME := zlib PKG_VERSION := 1.2.2 PKG_RELEASE := 1 +PKG_MD5SUM := 68bd51aaa6558c3bc3fd4890e53413de PKG_SOURCE_SITE := http://www.zlib.net/ PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -14,7 +17,7 @@ PKG_IPK := $(PACKAGE_DIR)/zlib_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk $(DL_DIR)/$(PKG_SOURCE_FILE): mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) x $(PKG_SOURCE_SITE) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) $(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE_FILE) mkdir -p $(TOOL_BUILD_DIR) -- cgit v1.2.3 From 68e11bcffb23c624f502639ea8249ef86e6251d0 Mon Sep 17 00:00:00 2001 From: kaloz Date: Sun, 3 Apr 2005 20:15:32 +0000 Subject: upgrade to dnsmasq 2.22 and openssl 0.9.7f git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@546 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 4 +- package/openssl/Makefile | 4 +- package/openssl/patches/openssl.patch | 126 ++++++++---------------------- package/openssl/patches/remove_fips.patch | 27 ++----- 4 files changed, 44 insertions(+), 117 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index a9ad26bbec..973215a80d 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.20 +PKG_VERSION:=2.22 PKG_RELEASE:=1 -PKG_MD5SUM:=a1501ff96a2925d9c1d44388892cd5af +PKG_MD5SUM:=b38f33cd0703fa664a37a4595d918189 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 8b6b83a79c..e72f8f68cc 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME := openssl -PKG_VERSION := 0.9.7e +PKG_VERSION := 0.9.7f PKG_RELEASE := 1 -PKG_MD5SUM := a8777164bca38d84e5eb2b1535223474 +PKG_MD5SUM := b2d37d7eb8a5a5040d834105d5ae1a50 PKG_SOURCE_SITE := http://www.openssl.org/source PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/package/openssl/patches/openssl.patch b/package/openssl/patches/openssl.patch index 2e8d50f1cb..888b7f36e3 100644 --- a/package/openssl/patches/openssl.patch +++ b/package/openssl/patches/openssl.patch @@ -1,74 +1,15 @@ ---- openssl-0.9.7.orig/Configure -+++ openssl-0.9.7/Configure +diff -Nur openssl-0.9.7f/Configure openssl-0.9.7f.new/Configure +--- openssl-0.9.7f/Configure 2005-03-12 12:28:21.000000000 +0100 ++++ openssl-0.9.7f.new/Configure 2005-04-03 20:32:00.000000000 +0200 @@ -1,4 +1,4 @@ -: +#!/usr/bin/perl eval 'exec perl -S $0 ${1+"$@"}' if $running_under_some_shell; ## -@@ -373,6 +373,40 @@ - # assembler versions -- currently defunct: - ##"OpenBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer:::(unknown):SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:${alpha_asm}", - -+# Sane Linux configuration values, stolen from the Debian package.... -+"linux-alpha","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-alpha-ev4","gcc:-DTERMIO -O3 -mcpu=ev4 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-alpha-ev5","gcc:-DTERMIO -O3 -mcpu=ev5 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${alpha_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-freebsd-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-freebsd-i386", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-ia64","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+#"linux-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC", -+"linux-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -mcpu=i486 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -mcpu=i586 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -mcpu=i686 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-openbsd-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-openbsd-mips","gcc:-O2 -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-sh3", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-sh4", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-sh3eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-sh4eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v8 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,-Av8plus -fomit-frame-pointer -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -+"linux-cris", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - # The intel boxes :-), It would be worth seeing if bsdi-gcc can use the - # bn86-elf.o file file since it is hand tweaked assembler. - "linux-elf", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ---- openssl-0.9.7.orig/crypto/md5/asm/md5-sparcv9.S -+++ openssl-0.9.7/crypto/md5/asm/md5-sparcv9.S -@@ -72,14 +72,14 @@ - #define Dval R8 - - #if defined(MD5_BLOCK_DATA_ORDER) --# if defined(OPENSSL_SYSNAME_ULTRASPARC) -+/*# if defined(OPENSSL_SYSNAME_ULTRASPARC)*/ - # define LOAD lda - # define X(i) [%i1+i*4]%asi - # define md5_block md5_block_asm_data_order_aligned - # define ASI_PRIMARY_LITTLE 0x88 --# else -+/*# else - # error "MD5_BLOCK_DATA_ORDER is supported only on UltraSPARC!" --# endif -+# endif*/ - #else - # define LOAD ld - # define X(i) [%i1+i*4] ---- openssl-0.9.7.orig/crypto/opensslconf.h -+++ openssl-0.9.7/crypto/opensslconf.h +diff -Nur openssl-0.9.7f/include/openssl/opensslconf.h openssl-0.9.7f.new/include/openssl/opensslconf.h +--- openssl-0.9.7f/include/openssl/opensslconf.h 2005-03-22 20:18:28.000000000 +0100 ++++ openssl-0.9.7f.new/include/openssl/opensslconf.h 2005-04-03 20:38:09.000000000 +0200 @@ -4,17 +4,38 @@ /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND @@ -122,7 +63,7 @@ #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) #define CONFIG_HEADER_BN_H -#undef BN_LLONG -+#define BN_LLONG ++#defne BN_LLONG /* Should we define BN_DIV2W here? */ @@ -161,9 +102,10 @@ #endif /* These default values were supplied by ---- openssl-0.9.7.orig/ssl/ssl_algs.c -+++ openssl-0.9.7/ssl/ssl_algs.c -@@ -109,3 +109,8 @@ +diff -Nur openssl-0.9.7f/ssl/ssl_algs.c openssl-0.9.7f.new/ssl/ssl_algs.c +--- openssl-0.9.7f/ssl/ssl_algs.c 2001-02-20 09:11:58.000000000 +0100 ++++ openssl-0.9.7f.new/ssl/ssl_algs.c 2005-04-03 20:40:27.000000000 +0200 +@@ -109,3 +109,9 @@ return(1); } @@ -172,64 +114,64 @@ + { + return SSL_library_init(); + } ---- openssl-0.9.7.orig/tools/c_rehash.in -+++ openssl-0.9.7/tools/c_rehash.in ++ +diff -Nur openssl-0.9.7f/tools/c_rehash.in openssl-0.9.7f.new/tools/c_rehash.in +--- openssl-0.9.7f/tools/c_rehash.in 2002-10-11 22:35:45.000000000 +0200 ++++ openssl-0.9.7f.new/tools/c_rehash.in 2005-04-03 20:41:17.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # Perl c_rehash script, scan all files in a directory ---- openssl-0.9.7.orig/util/clean-depend.pl -+++ openssl-0.9.7/util/clean-depend.pl +diff -Nur openssl-0.9.7f/util/clean-depend.pl openssl-0.9.7f.new/util/clean-depend.pl +--- openssl-0.9.7f/util/clean-depend.pl 2001-10-10 10:27:28.000000000 +0200 ++++ openssl-0.9.7f.new/util/clean-depend.pl 2005-04-03 20:41:38.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w -+#!/usr/bin/perl ++#!/usr/bin/perl -w # Clean the dependency list in a makefile of standard includes... # Written by Ben Laurie 19 Jan 1999 ---- openssl-0.9.7.orig/util/extract-names.pl -+++ openssl-0.9.7/util/extract-names.pl -@@ -1,4 +1,4 @@ --#!/usr/bin/perl -+#!/usr/bin/perl - - $/ = ""; # Eat a paragraph at once. - while() { ---- openssl-0.9.7.orig/util/mkdef.pl -+++ openssl-0.9.7/util/mkdef.pl +diff -Nur openssl-0.9.7f/util/mkdef.pl openssl-0.9.7f.new/util/mkdef.pl +--- openssl-0.9.7f/util/mkdef.pl 2005-02-05 18:19:23.000000000 +0100 ++++ openssl-0.9.7f.new/util/mkdef.pl 2005-04-03 20:42:49.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl # # generate a .def file # ---- openssl-0.9.7.orig/util/mkerr.pl -+++ openssl-0.9.7/util/mkerr.pl +diff -Nur openssl-0.9.7f/util/mkerr.pl openssl-0.9.7f.new/util/mkerr.pl +--- openssl-0.9.7f/util/mkerr.pl 2005-01-31 02:28:17.000000000 +0100 ++++ openssl-0.9.7f.new/util/mkerr.pl 2005-04-03 20:43:02.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl my $config = "crypto/err/openssl.ec"; my $debug = 0; ---- openssl-0.9.7.orig/util/mkstack.pl -+++ openssl-0.9.7/util/mkstack.pl +diff -Nur openssl-0.9.7f/util/mkstack.pl openssl-0.9.7f.new/util/mkstack.pl +--- openssl-0.9.7f/util/mkstack.pl 2004-10-04 18:27:36.000000000 +0200 ++++ openssl-0.9.7f.new/util/mkstack.pl 2005-04-03 20:43:18.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl # This is a utility that searches out "DECLARE_STACK_OF()" # declarations in .h and .c files, and updates/creates/replaces ---- openssl-0.9.7.orig/util/pod2man.pl -+++ openssl-0.9.7/util/pod2man.pl +diff -Nur openssl-0.9.7f/util/pod2man.pl openssl-0.9.7f.new/util/pod2man.pl +--- openssl-0.9.7f/util/pod2man.pl 2002-05-30 17:30:21.000000000 +0200 ++++ openssl-0.9.7f.new/util/pod2man.pl 2005-04-03 20:43:52.000000000 +0200 @@ -1,4 +1,4 @@ -: #!/usr/bin/perl-5.005 +#!/usr/bin/perl eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' if $running_under_some_shell; ---- openssl-0.9.7.orig/util/selftest.pl -+++ openssl-0.9.7/util/selftest.pl +diff -Nur openssl-0.9.7f/util/selftest.pl openssl-0.9.7f.new/util/selftest.pl +--- openssl-0.9.7f/util/selftest.pl 2004-05-11 14:46:19.000000000 +0200 ++++ openssl-0.9.7f.new/util/selftest.pl 2005-04-03 20:44:10.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl -w +#!/usr/bin/perl diff --git a/package/openssl/patches/remove_fips.patch b/package/openssl/patches/remove_fips.patch index 6c0c6133bc..de99c5b6a2 100644 --- a/package/openssl/patches/remove_fips.patch +++ b/package/openssl/patches/remove_fips.patch @@ -1,35 +1,20 @@ -diff -urN openssl-0.9.7e.old/Makefile.org openssl-0.9.7e/Makefile.org ---- openssl-0.9.7e.old/Makefile.org 2004-09-28 22:52:14.000000000 +0200 -+++ openssl-0.9.7e/Makefile.org 2005-03-03 15:55:11.000000000 +0100 -@@ -175,8 +175,8 @@ +diff -Nur openssl-0.9.7f/Makefile.org openssl-0.9.7f.new/Makefile.org +--- openssl-0.9.7f/Makefile.org 2005-03-15 10:46:13.000000000 +0100 ++++ openssl-0.9.7f.new/Makefile.org 2005-04-03 20:15:26.000000000 +0200 +@@ -175,7 +175,7 @@ # we might set SHLIB_MARK to '$(SHARED_LIBS)'. SHLIB_MARK= -DIRS= crypto fips ssl $(SHLIB_MARK) sigs apps test tools --SHLIBDIRS= fips crypto ssl +DIRS= crypto ssl $(SHLIB_MARK) sigs apps test tools -+SHLIBDIRS= crypto ssl + SHLIBDIRS= crypto ssl # dirs in crypto to build - SDIRS= objects \ @@ -229,7 +229,6 @@ libcrypto.a.sha1: libcrypto.a - if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ + @if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \ $(RANLIB) libcrypto.a; \ - fips/sha1/fips_standalone_sha1 libcrypto.a > libcrypto.a.sha1; \ fi sub_all: ---- openssl-0.9.7e/crypto/rand/rand_lib.c 2004-07-30 16:38:00.000000000 +0200 -+++ openssl-0.9.7e.patched/crypto/rand/rand_lib.c 2005-02-18 15:46:22.000000000 +0100 -@@ -63,8 +63,10 @@ - #ifndef OPENSSL_NO_ENGINE - #include - #endif -+#ifdef OPENSSL_FIPS - #include - #include -+#endif - - #ifndef OPENSSL_NO_ENGINE - /* non-NULL if default_RAND_meth is ENGINE-provided */ -- cgit v1.2.3 From d4a1203540b1cd063821ae7892d0c29169217d94 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 12 May 2005 19:41:18 +0000 Subject: convert dnsmasq to new packaging style git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@851 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 37 +++++++++--------------------------- package/dnsmasq/dnsmasq.control | 6 ------ package/dnsmasq/ipkg/dnsmasq.control | 6 ++++++ 3 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 package/dnsmasq/dnsmasq.control create mode 100644 package/dnsmasq/ipkg/dnsmasq.control (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 973215a80d..210b156907 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -11,37 +11,18 @@ PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_CAT:=zcat -PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg -$(DL_DIR)/$(PKG_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) +include $(TOPDIR)/package/rules.mk -$(PKG_BUILD_DIR)/.patched: $(DL_DIR)/$(PKG_SOURCE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(PATCH) $(PKG_BUILD_DIR) ./patches - touch $(PKG_BUILD_DIR)/.patched +$(eval $(call PKG_template,DNSMASQ,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/src/$(PKG_NAME): $(PKG_BUILD_DIR)/.patched +$(PKG_BUILD_DIR)/.built: $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \ BINDIR=/usr/sbin MANDIR=/usr/man -C $(PKG_BUILD_DIR) -$(PKG_IPK): $(PKG_BUILD_DIR)/src/$(PKG_NAME) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(PKG_IPK_DIR)/usr/sbin - cp $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(PKG_IPK_DIR)/usr/sbin/ - $(STRIP) $(PKG_IPK_DIR)/usr/sbin/* - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) - -$(IPKG_STATE_DIR)/info/dnsmasq.list: $(PKG_IPK) - $(IPKG) install $(PKG_IPK) - -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.patched -compile: $(PKG_IPK) -install: $(IPKG_STATE_DIR)/info/dnsmasq.list - -clean: - rm -rf $(PKG_BUILD_DIR) - rm -f $(PKG_IPK) +$(IPKG_DNSMASQ): + mkdir -p $(IDIR_DNSMASQ)/usr/sbin + cp $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/ + $(STRIP) $(IDIR_DNSMASQ)/usr/sbin/* + $(IPKG_BUILD) $(IDIR_DNSMASQ) $(PACKAGE_DIR) + diff --git a/package/dnsmasq/dnsmasq.control b/package/dnsmasq/dnsmasq.control deleted file mode 100644 index 6d9c58cf98..0000000000 --- a/package/dnsmasq/dnsmasq.control +++ /dev/null @@ -1,6 +0,0 @@ -Package: dnsmasq -Priority: essential -Section: net -Maintainer: Felix Fietkau -Source: buildroot internal -Description: A lightweight DNS and DHCP server diff --git a/package/dnsmasq/ipkg/dnsmasq.control b/package/dnsmasq/ipkg/dnsmasq.control new file mode 100644 index 0000000000..6d9c58cf98 --- /dev/null +++ b/package/dnsmasq/ipkg/dnsmasq.control @@ -0,0 +1,6 @@ +Package: dnsmasq +Priority: essential +Section: net +Maintainer: Felix Fietkau +Source: buildroot internal +Description: A lightweight DNS and DHCP server -- cgit v1.2.3 From 6852231594b1341a2273a8477829446b110cfb29 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 12 May 2005 19:54:17 +0000 Subject: oops... forgot to create build stamp file for some of the packages git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@854 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/aiccu/Makefile | 1 + package/arptables/Makefile | 1 + package/arpwatch/Makefile | 3 ++- package/cups/Makefile | 1 + package/dnsmasq/Makefile | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index f680f33ccb..7d3633c494 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -17,6 +17,7 @@ $(eval $(call PKG_template,AICCU,aiccu,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.built: $(SED) "s,strip,$(STRIP)," $(PKG_BUILD_DIR)/unix-console/Makefile $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" DEBUG=0 -C $(PKG_BUILD_DIR) + touch $@ $(IPKG_AICCU): mkdir -p $(IDIR_AICCU)/usr/sbin $(IDIR_AICCU)/etc/init.d diff --git a/package/arptables/Makefile b/package/arptables/Makefile index e770fef590..018d8afd49 100644 --- a/package/arptables/Makefile +++ b/package/arptables/Makefile @@ -22,6 +22,7 @@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \ CFLAGS="$(TARGET_CFLAGS) -Wall -I$(PKG_BUILD_DIR)/include/linux/include -I$(PKG_BUILD_DIR)/include -DARPTABLES_VERSION=\\\"$(PKG_VERSION)\\\" " + touch $@ $(IPKG_ARPTABLES): mkdir -p $(IDIR_ARPTABLES)/usr/sbin diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile index 8a267692a0..58f8e48da0 100644 --- a/package/arpwatch/Makefile +++ b/package/arpwatch/Makefile @@ -52,7 +52,8 @@ $(PKG_BUILD_DIR)/.built: ARPDIR=/etc/arpwatch \ CCOPT="$(TARGET_CFLAGS)" \ INCLS="-I. -I$(STAGING_DIR)/usr/include" \ - LIBS="-L$(STAGING_DIR)/usr/lib -lpcap" \ + LIBS="-L$(STAGING_DIR)/usr/lib -lpcap" + touch $@ $(IPKG_ARPWATCH): mkdir -p $(IDIR_ARPWATCH)/usr/sbin diff --git a/package/cups/Makefile b/package/cups/Makefile index 67891c8d3d..9b22a3879d 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -59,6 +59,7 @@ $(PKG_BUILD_DIR)/.built: $(MAKE) STRIP=$(STRIP) DSTROOT=$(PKG_INSTALL_DIR) -C $(PKG_BUILD_DIR) install cp -a $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/lib/ cp -a $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/include/ + touch $@ $(IPKG_CUPS): cp -a $(PKG_INSTALL_DIR)/* $(IDIR_CUPS)/ diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 210b156907..c6b7a8a9fd 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -19,6 +19,7 @@ $(eval $(call PKG_template,DNSMASQ,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(A $(PKG_BUILD_DIR)/.built: $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \ BINDIR=/usr/sbin MANDIR=/usr/man -C $(PKG_BUILD_DIR) + touch $@ $(IPKG_DNSMASQ): mkdir -p $(IDIR_DNSMASQ)/usr/sbin -- cgit v1.2.3 From aa4e2af280d4d707166e0479efbcfb3006f974ac Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 19 May 2005 20:56:21 +0000 Subject: Add missing .configured target that caused superfluous package rebuild git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@965 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 8 ++++++-- package/ebtables/Makefile | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index c6b7a8a9fd..5d7133fd1e 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -16,9 +16,13 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,DNSMASQ,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(PKG_BUILD_DIR)/.configured: + touch $@ + $(PKG_BUILD_DIR)/.built: - $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \ - BINDIR=/usr/sbin MANDIR=/usr/man -C $(PKG_BUILD_DIR) + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \ + BINDIR=/usr/sbin MANDIR=/usr/man touch $@ $(IPKG_DNSMASQ): diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index 44a175e66a..a928a2dbb1 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -16,6 +16,9 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,EBTABLES,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(PKG_BUILD_DIR)/.configured: + touch $@ + $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \ -- cgit v1.2.3 From 72936728abd1088b5d9f8e1c6c6fa013e5bb061c Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 25 Jul 2005 08:11:12 +0000 Subject: sync dnsmasq with whiterussian git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1556 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 7 +++++-- package/dnsmasq/files/S50dnsmasq | 25 +++++++++++++++++++++++++ package/dnsmasq/files/dnsmasq.conf | 25 +++++++++++++++++++++++++ package/dnsmasq/ipkg/dnsmasq.conffiles | 1 + 4 files changed, 56 insertions(+), 2 deletions(-) create mode 100755 package/dnsmasq/files/S50dnsmasq create mode 100644 package/dnsmasq/files/dnsmasq.conf create mode 100644 package/dnsmasq/ipkg/dnsmasq.conffiles (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 5d7133fd1e..73a9061353 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_VERSION:=2.22 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MD5SUM:=b38f33cd0703fa664a37a4595d918189 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq @@ -26,8 +26,11 @@ $(PKG_BUILD_DIR)/.built: touch $@ $(IPKG_DNSMASQ): - mkdir -p $(IDIR_DNSMASQ)/usr/sbin + install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin cp $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/ $(STRIP) $(IDIR_DNSMASQ)/usr/sbin/* + install -d -m0755 $(IDIR_DNSMASQ)/etc/init.d/ + install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf + install -m0755 ./files/S50dnsmasq $(IDIR_DNSMASQ)/etc/init.d/S50dnsmasq $(IPKG_BUILD) $(IDIR_DNSMASQ) $(PACKAGE_DIR) diff --git a/package/dnsmasq/files/S50dnsmasq b/package/dnsmasq/files/S50dnsmasq new file mode 100755 index 0000000000..4f3721846b --- /dev/null +++ b/package/dnsmasq/files/S50dnsmasq @@ -0,0 +1,25 @@ +#!/bin/sh +. /etc/functions.sh + +# interface to use for DHCP +iface=lan + +ifname=$(nvram get ${iface}_ifname) +ipaddr=$(nvram get ${iface}_ipaddr) +netmask=$(nvram get ${iface}_netmask) + +# check for existing DHCP server +udhcpc -n -q -R -s /bin/true -i $ifname >&- || { + + ipaddr=$(ip2int $ipaddr) + netmask=$(ip2int ${netmask:-255.255.255.0}) + network=$((ipaddr&netmask)) + + start=$(nvram get dhcp_start) + start=$((network+${start:-100})) + end=$(nvram get dhcp_num) + end=$((start+${end:-150})) + + args="-l /tmp/dhcp.leases -K -F $(int2ip $start),$(int2ip $end),$(int2ip $netmask),12h" +} +dnsmasq ${args} diff --git a/package/dnsmasq/files/dnsmasq.conf b/package/dnsmasq/files/dnsmasq.conf new file mode 100644 index 0000000000..4ef96803a6 --- /dev/null +++ b/package/dnsmasq/files/dnsmasq.conf @@ -0,0 +1,25 @@ +# filter what we send upstream +domain-needed +bogus-priv +filterwin2k +localise-queries + +# allow /etc/hosts and dhcp lookups via *.lan +local=/lan/ +domain=lan + +# no dhcp / dns queries from the wan +except-interface=vlan1 + +# enable dhcp (start,end,netmask,leasetime) +dhcp-authoritative +#dhcp-range=192.168.1.100,192.168.1.250,255.255.255.0,12h +#dhcp-leasefile=/tmp/dhcp.leases + +# use /etc/ethers for static hosts; same format as --dhcp-host +# [] +read-ethers + +# other useful options: +# default route(s): dhcp-option=3,192.168.1.1,192.168.1.2 +# dns server(s): dhcp-option=6,192.168.1.1,192.168.1.2 diff --git a/package/dnsmasq/ipkg/dnsmasq.conffiles b/package/dnsmasq/ipkg/dnsmasq.conffiles new file mode 100644 index 0000000000..e30eba8f66 --- /dev/null +++ b/package/dnsmasq/ipkg/dnsmasq.conffiles @@ -0,0 +1 @@ +/etc/dnsmasq.conf -- cgit v1.2.3 From 3c99e4a1a06925e021a1fd58aac7cfaec6ede9f8 Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 20 Oct 2005 13:52:02 +0000 Subject: update dnsmasq to new upstream release (v2.23) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2194 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 73a9061353..df77a47524 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.22 -PKG_RELEASE:=2 -PKG_MD5SUM:=b38f33cd0703fa664a37a4595d918189 +PKG_VERSION:=2.23 +PKG_RELEASE:=1 +PKG_MD5SUM:=7be1f5bd6446cbb743feaf26bf74db53 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -- cgit v1.2.3 From 1d756b712ea6a5ebb614986560c3d1faaa0b704a Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 27 Nov 2005 16:56:02 +0000 Subject: update dnsmasq to latest upstream release (v2.24) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2556 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index df77a47524..d3dd510c3b 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.23 +PKG_VERSION:=2.24 PKG_RELEASE:=1 -PKG_MD5SUM:=7be1f5bd6446cbb743feaf26bf74db53 +PKG_MD5SUM:=d269531be1f130ab642c71c593138d31 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -- cgit v1.2.3 From c80e7a81f74b2b8554da699c3bd9011d503e720f Mon Sep 17 00:00:00 2001 From: kaloz Date: Sun, 15 Jan 2006 00:02:47 +0000 Subject: upgrade to dnsmasq 2.25 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2986 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 4 +-- package/dnsmasq/patches/100-config.patch | 49 -------------------------------- 2 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 package/dnsmasq/patches/100-config.patch (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index d3dd510c3b..64ae0f49f0 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.24 +PKG_VERSION:=2.25 PKG_RELEASE:=1 -PKG_MD5SUM:=d269531be1f130ab642c71c593138d31 +PKG_MD5SUM:=a5a387aed551acf91990567a5e8e4fa4 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/package/dnsmasq/patches/100-config.patch b/package/dnsmasq/patches/100-config.patch deleted file mode 100644 index 270c22740e..0000000000 --- a/package/dnsmasq/patches/100-config.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ur dnsmasq-2.15.orig/src/config.h dnsmasq-2.15/src/config.h ---- dnsmasq-2.15.orig/src/config.h 2004-10-08 11:41:34.757371880 -0400 -+++ dnsmasq-2.15/src/config.h 2004-10-08 11:43:49.074952504 -0400 -@@ -78,6 +78,11 @@ - /* We assume that systems which don't have IPv6 - headers don't have ntop and pton either */ - -+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__) -+# undef NO_IPV6 -+# define NO_IPV6 -+#endif -+ - #if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6) - # define HAVE_IPV6 - # define ADDRSTRLEN INET6_ADDRSTRLEN -@@ -194,7 +199,7 @@ - /* platform dependent options. */ - - /* Must preceed __linux__ since uClinux defines __linux__ too. */ --#if defined(__uClinux__) || defined(__UCLIBC__) -+#if defined(__uClinux__) - #undef HAVE_LINUX_IPV6_PROC - #define HAVE_GETOPT_LONG - #undef HAVE_ARC4RANDOM -@@ -208,6 +213,24 @@ - # define NO_FORK - #endif - -+#elif defined(__linux__) && defined(__UCLIBC__) -+# define HAVE_LINUX_IPV6_PROC -+# if defined(__UCLIBC_HAS_GNU_GETOPT__) || \ -+ ((__UCLIBC_MAJOR__==0) && (__UCLIBC_MINOR__==9) && (__UCLIBC_SUBLEVEL__<21)) -+# define HAVE_GETOPT_LONG -+# else -+# undef HAVE_GETOPT_LONG -+# endif -+#undef HAVE_ARC4RANDOM -+#define HAVE_RANDOM -+#define HAVE_DEV_URANDOM -+#define HAVE_DEV_RANDOM -+#undef HAVE_SOCKADDR_SA_LEN -+#undef HAVE_PSELECT -+#if !defined(__ARCH_HAS_MMU__) -+# define NO_FORK -+#endif -+ - /* libc5 - must precede __linux__ too */ - /* Note to build a libc5 binary on a modern Debian system: - install the packages altgcc libc5 and libc5-altdev -- cgit v1.2.3 From 4c99fdddf7c742e94c8456b261c929a4c995414e Mon Sep 17 00:00:00 2001 From: kaloz Date: Sun, 22 Jan 2006 14:35:07 +0000 Subject: upgrade dnsmasq to 2.26 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3034 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 64ae0f49f0..405801063a 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.25 +PKG_VERSION:=2.26 PKG_RELEASE:=1 -PKG_MD5SUM:=a5a387aed551acf91990567a5e8e4fa4 +PKG_MD5SUM:=ae04abb5db4a8cc43c24f432f0c44d5c PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -- cgit v1.2.3 From 82daa5e9c007b2a16aa9e8c5526fd8d034ee4541 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 1 Feb 2006 23:53:19 +0000 Subject: change cp to $(CP) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3112 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/6tunnel/Makefile | 2 +- package/Config.in | 3 +-- package/Makefile | 5 ----- package/aircrack/Makefile | 10 ++++----- package/amwall/Makefile | 6 +++--- package/arpd/Makefile | 2 +- package/arpwatch/Makefile | 6 +++--- package/asterisk/Makefile | 16 +++++++-------- package/atftp/Config.in | 1 - package/atftp/Makefile | 4 ++-- package/atftp/ipkg/atftp.control | 1 - package/atftp/ipkg/atftpd.control | 1 - package/avahi/Makefile | 24 +++++++++++----------- package/base-files/Makefile | 8 ++++---- package/base-files/default/etc/init.d/S45firewall | 7 +++++-- package/base-files/default/sbin/mount_root | 2 +- package/bind/Makefile | 8 ++++---- package/bluez-libs/Makefile | 6 +++--- package/bluez-utils/Makefile | 8 ++++---- package/bridge/Makefile | 2 +- package/cgilib/Makefile | 6 +++--- package/chillispot/Makefile | 2 +- package/clinkc/Makefile | 2 +- package/collectd/Makefile | 6 +++--- package/config/Makefile | 6 +++--- package/cups/Makefile | 24 +++++++++++----------- package/curl/Makefile | 12 +++++------ package/cutter/Makefile | 2 +- package/cyrus-sasl/Makefile | 10 ++++----- package/dhcp-forwarder/Makefile | 2 +- package/dhcp/Makefile | 4 ++-- package/dhcp6/Makefile | 2 +- package/dnsmasq/Makefile | 6 +++--- package/dosfstools/Makefile | 8 ++++---- package/dsniff/Makefile | 4 ++-- package/e2fsprogs/Makefile | 10 ++++----- package/ebtables/Makefile | 2 +- package/elhttp/Makefile | 2 +- package/ether-wake/Makefile | 2 +- package/expat/Makefile | 8 ++++---- package/flac/Makefile | 8 ++++---- package/fping/Makefile | 4 ++-- package/fprobe-ulog/Makefile | 2 +- package/fprobe/Makefile | 2 +- package/freeradius/Makefile | 18 ++++++++-------- package/freetype/Makefile | 12 +++++------ package/fuse/Makefile | 14 ++++++------- package/gdbserver/Makefile | 2 +- package/glib/Makefile | 16 +++++++-------- package/glib/patches/04-gcc3.4-fix | 2 +- package/gmediaserver/Makefile | 2 +- package/gmp/Makefile | 6 +++--- package/gnutls/Makefile | 18 ++++++++-------- package/gpsd/Makefile | 10 ++++----- package/gsm/Makefile | 10 ++++----- package/haserl/Makefile | 2 +- package/hostapd/Makefile | 2 +- package/howl/Makefile | 16 +++++++-------- package/icecast/Makefile | 8 ++++---- .../patches/icecast-2.3.0-curl_config.patch | 2 +- package/id3lib/Makefile | 12 +++++------ package/ipcad/Makefile | 4 ++-- package/iperf/Makefile | 2 +- package/ipkg/Makefile | 4 ++-- package/iproute2/Makefile | 4 ++-- package/ipsec-tools/Makefile | 14 ++++++------- package/iptables-snmp/Makefile | 2 +- package/iptables/Makefile | 18 ++++++++-------- package/irssi/Makefile | 2 +- package/jpeg/Makefile | 8 ++++---- package/kismet/Makefile | 6 +++--- package/knock/Makefile | 4 ++-- package/l2tpns/Makefile | 6 +++--- package/libamsel/Makefile | 8 ++++---- package/libao/Makefile | 10 ++++----- package/libart/Makefile | 10 ++++----- package/libaudiofile/Makefile | 16 +++++++-------- package/libcli/Makefile | 6 +++--- package/libdaemon/Makefile | 10 ++++----- package/libdb/Makefile | 6 +++--- package/libdnet/Makefile | 12 +++++------ package/libelf/Makefile | 6 +++--- package/libevent/Makefile | 8 ++++---- package/libffi-sable/Makefile | 6 +++--- package/libgcrypt/Makefile | 10 ++++----- package/libgd/Makefile | 10 ++++----- package/libgdbm/Makefile | 6 +++--- package/libgpg-error/Makefile | 10 ++++----- package/libid3tag/Makefile | 8 ++++---- package/liblzo/Makefile | 6 +++--- package/libmad/Makefile | 8 ++++---- package/libnet/Makefile | 8 ++++---- package/libnids/Makefile | 6 +++--- package/libogg/Makefile | 10 ++++----- package/libosip2/Makefile | 8 ++++---- package/libpcap/Makefile | 6 +++--- package/libpng/Makefile | 12 +++++------ package/libpthread/Makefile | 4 ++-- package/libtasn1/Makefile | 10 ++++----- package/libtool/Makefile | 6 +++--- package/libupnp/Makefile | 14 ++++++------- package/libusb/Makefile | 8 ++++---- package/libvorbis/Makefile | 10 ++++----- package/libvorbisidec/Makefile | 8 ++++---- package/libxml2/Makefile | 10 ++++----- package/libxslt/Makefile | 10 ++++----- package/lighttpd/Makefile | 4 ++-- package/linux-atm/Makefile | 8 ++++---- package/linux-atm/patches/300-no_autotools.patch | 2 +- package/lrzsz/Makefile | 4 ++-- package/lua/Makefile | 12 +++++------ package/macchanger/Makefile | 2 +- package/maradns/Makefile | 4 ++-- package/matrixssl/Makefile | 6 +++--- package/microcom/Makefile | 2 +- package/mini_httpd/Makefile | 2 +- package/miredo/Makefile | 8 ++++---- package/mpd/Makefile | 4 ++-- package/mrd6/Makefile | 2 +- package/mt-daapd/Makefile | 4 ++-- package/mtr/Makefile | 2 +- package/mysql/Makefile | 8 ++++---- package/nano/Makefile | 2 +- package/ncurses/Makefile | 20 +++++++++--------- package/net-snmp/Makefile | 10 ++++----- package/netstat-nat/Makefile | 2 +- package/nmap/Makefile | 4 ++-- package/nocatsplash/Makefile | 2 +- package/nvram/Makefile | 8 ++++---- package/olsrd/Makefile | 6 +++--- package/opencdk/Makefile | 8 ++++---- package/openldap/Makefile | 12 +++++------ package/openser/Makefile | 12 +++++------ package/openssh/Makefile | 22 ++++++++++---------- package/openssl/Makefile | 10 ++++----- package/openvpn/Makefile | 2 +- package/osiris/Makefile | 2 +- package/p910nd/Makefile | 2 +- package/pciutils/Makefile | 4 ++-- package/pcmcia-cs/Makefile | 6 +++--- package/pcre/Makefile | 8 ++++---- package/peercast/Makefile | 4 ++-- package/peerguardian/Makefile | 2 +- package/php4/Makefile | 6 +++--- package/php5/Makefile | 6 +++--- package/pipacs/Makefile | 2 +- package/pmacct/Makefile | 2 +- package/popt/Makefile | 6 +++--- package/portsentry/Makefile | 4 ++-- package/postgresql/Makefile | 18 ++++++++-------- package/ppp/Makefile | 6 +++--- package/pptpd/Makefile | 4 ++-- package/ptunnel/Makefile | 2 +- package/quagga/Makefile | 20 +++++++++--------- package/raddump/Makefile | 2 +- package/rarpd/Makefile | 2 +- package/readline/Makefile | 6 +++--- package/reaim/Makefile | 2 +- package/rp-pppoe/Makefile | 10 ++++----- package/rrdcollect/Makefile | 2 +- package/rrdcollect/files/rrdcollect.conf | 12 +++++------ package/rrdtool/Makefile | 16 +++++++-------- package/rrdtool1/Makefile | 14 ++++++------- package/rsync/Makefile | 2 +- package/sablevm-classpath/Makefile | 8 ++++---- package/sablevm/Makefile | 4 ++-- package/sane-backends/Makefile | 4 ++-- package/scdp/Makefile | 2 +- package/sdk/Makefile | 14 ++++++------- package/serdisplib/Makefile | 6 +++--- package/shfs/Makefile | 4 ++-- package/siproxd/Makefile | 6 +++--- package/sipsak/Makefile | 2 +- package/slurm/Makefile | 2 +- package/socat/Makefile | 2 +- package/speex/Makefile | 8 ++++---- package/sqlite/Makefile | 10 ++++----- package/sqlite2/Makefile | 10 ++++----- package/srelay/Makefile | 8 ++++---- package/ssmtp/Makefile | 2 +- package/strace/Makefile | 2 +- package/tcp_wrappers/Makefile | 8 ++++---- package/tinc/Makefile | 2 +- package/tinyproxy/Makefile | 8 ++++---- package/tmsnc/Makefile | 2 +- package/tor/Makefile | 2 +- package/uclibc++/Makefile | 4 ++-- package/udev/Makefile | 18 ++++++++-------- package/udp-broadcast-relay/Makefile | 2 +- package/ulogd/Makefile | 8 ++++---- package/updatedd/Makefile | 2 +- package/usbutils/Makefile | 4 ++-- package/ustl/Makefile | 12 +++++------ package/util-linux/Makefile | 8 ++++---- package/vgp/Makefile | 2 +- package/vnstat/Makefile | 2 +- package/vpnc/Makefile | 2 +- package/vsftpd/Makefile | 2 +- package/watchdog/Makefile | 6 +++--- package/wccpd/Makefile | 2 +- package/wifidog/Makefile | 6 +++--- package/wireless-tools/Makefile | 12 +++++------ package/wiviz/Makefile | 6 +++--- package/wol/Makefile | 2 +- package/wondershaper/Makefile | 4 ++-- package/wpa_supplicant/Makefile | 2 +- package/wx200d/Makefile | 4 ++-- package/xinetd/Makefile | 2 +- package/xsupplicant/Makefile | 4 ++-- package/zlib/Makefile | 6 +++--- rules.mk | 1 + scripts/ipkg | 2 +- target/linux/Makefile | 12 +++++------ target/linux/ar531x-2.4/Makefile | 2 +- target/linux/ar7-2.4/Makefile | 6 +++--- target/linux/aruba-2.6/Makefile | 4 ++-- target/linux/brcm-2.4/Makefile | 6 +++--- target/linux/brcm-2.6/Makefile | 2 +- target/linux/image/Makefile | 3 ++- target/linux/image/ar7/Makefile | 6 +++--- target/linux/image/aruba/Makefile | 4 ++-- target/linux/image/brcm/Makefile | 20 ++++++------------ target/linux/image/brcm/lzma-loader/Makefile | 6 +++--- target/linux/image/generic/lzma-loader/Makefile | 6 +++--- target/linux/image/jffs2.mk | 2 +- target/linux/image/jffs2/Makefile | 2 +- target/linux/image/squashfs.mk | 2 +- target/linux/image/squashfs/Makefile | 2 +- target/linux/image/x86/Makefile | 8 ++++---- target/linux/imagebuilder/Makefile | 4 ++-- target/linux/package/base-files/Makefile | 6 +++--- target/linux/package/bcm43xx-dscape/Makefile | 6 +++--- target/linux/package/diag/Makefile | 2 +- target/linux/package/fuse/Makefile | 2 +- target/linux/package/hostap/Makefile | 6 +++--- target/linux/package/ieee80211-dscape/Makefile | 6 +++--- target/linux/package/madwifi/Makefile | 8 ++++---- target/linux/package/mini_fo/Makefile | 2 +- target/linux/package/openswan/Makefile | 2 +- target/linux/package/shfs/Makefile | 2 +- target/linux/package/spca5xx/Makefile | 2 +- target/linux/package/switch/Makefile | 4 ++-- target/linux/package/ueagle-atm/Makefile | 2 +- target/linux/package/wlcompat/Makefile | 4 ++-- target/linux/rules.mk | 2 +- target/linux/x86-2.4/Makefile | 4 ++-- target/linux/x86-2.6/Makefile | 4 ++-- target/lzma/Makefile | 4 ++-- target/utils/Makefile | 2 +- toolchain/gcc/Makefile | 2 +- toolchain/kernel-headers/Makefile | 2 +- toolchain/libnotimpl/Makefile | 2 +- toolchain/uClibc/Makefile | 2 +- toolchain/utils/Makefile | 2 +- 254 files changed, 771 insertions(+), 783 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile index 0135ad8459..8b24d7baa5 100644 --- a/package/6tunnel/Makefile +++ b/package/6tunnel/Makefile @@ -54,7 +54,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_6TUNNEL): install -d -m0755 $(IDIR_6TUNNEL)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/6tunnel $(IDIR_6TUNNEL)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/6tunnel $(IDIR_6TUNNEL)/usr/sbin/ $(RSTRIP) $(IDIR_6TUNNEL)/ $(IPKG_BUILD) $(IDIR_6TUNNEL) $(PACKAGE_DIR) diff --git a/package/Config.in b/package/Config.in index 6f1c5fe300..83ef404e1e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -130,7 +130,6 @@ 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" @@ -180,7 +179,6 @@ 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" @@ -256,6 +254,7 @@ source "package/setserial/Config.in" comment "Utilities" source "package/bc/Config.in" source "package/gdbserver/Config.in" +source "package/madwifi-tools/Config.in" source "package/pcmcia-cs/Config.in" # pcmcia-utils source "package/usbutils/Config.in" # lsusb source "package/pciutils/Config.in" diff --git a/package/Makefile b/package/Makefile index 5e29f88073..f2ad1c2061 100644 --- a/package/Makefile +++ b/package/Makefile @@ -21,7 +21,6 @@ package-$(BR2_PACKAGE_BWM) += bwm package-$(BR2_PACKAGE_CGILIB) += cgilib package-$(BR2_PACKAGE_CHILLISPOT) += chillispot package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount -package-$(BR2_PACKAGE_CLINKC) += clinkc package-$(BR2_PACKAGE_COLLECTD) += collectd package-$(BR2_PACKAGE_CUPS) += cups package-$(BR2_COMPILE_CURL) += curl @@ -210,7 +209,6 @@ 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_TCPDUMP) += tcpdump @@ -271,7 +269,6 @@ arpwatch-compile: libpcap-compile atftp-compile: readline-compile avahi-compile: libdaemon-compile expat-compile libgdbm-compile bind-compile: openssl-compile -clinkc-compile: expat-compile curl-compile: openssl-compile zlib-compile cyrus-sasl-compile: openssl-compile deco-compile: ncurses-compile @@ -308,7 +305,6 @@ lighttpd-compile: openssl-compile pcre-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 mysql-compile: ncurses-compile zlib-compile readline-compile @@ -349,7 +345,6 @@ 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 tcpdump-compile: libpcap-compile tinc-compile: zlib-compile openssl-compile liblzo-compile tor-compile: libevent-compile openssl-compile zlib-compile diff --git a/package/aircrack/Makefile b/package/aircrack/Makefile index 1869d2b82b..feb43044d3 100644 --- a/package/aircrack/Makefile +++ b/package/aircrack/Makefile @@ -35,11 +35,11 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_AIRCRACK): install -d -m0755 $(IDIR_AIRCRACK)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/aircrack $(IDIR_AIRCRACK)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/airdecap $(IDIR_AIRCRACK)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/aireplay $(IDIR_AIRCRACK)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/airodump $(IDIR_AIRCRACK)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/arpforge $(IDIR_AIRCRACK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/aircrack $(IDIR_AIRCRACK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/airdecap $(IDIR_AIRCRACK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/aireplay $(IDIR_AIRCRACK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/airodump $(IDIR_AIRCRACK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/arpforge $(IDIR_AIRCRACK)/usr/bin/ $(RSTRIP) $(IDIR_AIRCRACK) $(IPKG_BUILD) $(IDIR_AIRCRACK) $(PACKAGE_DIR) diff --git a/package/amwall/Makefile b/package/amwall/Makefile index 3fedcab960..a2e3c391b2 100644 --- a/package/amwall/Makefile +++ b/package/amwall/Makefile @@ -38,11 +38,11 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_AMWALL): install -d -m0755 $(IDIR_AMWALL)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_AMWALL)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_AMWALL)/usr/bin install -d -m0755 $(IDIR_AMWALL)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_AMWALL)/usr/sbin + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_AMWALL)/usr/sbin install -d -m0755 $(IDIR_AMWALL)/etc/amsel - cp -fpR $(PKG_INSTALL_DIR)/etc/amsel* $(IDIR_AMWALL)/etc + $(CP) $(PKG_INSTALL_DIR)/etc/amsel* $(IDIR_AMWALL)/etc $(RSTRIP) $(IDIR_AMWALL) $(IPKG_BUILD) $(IDIR_AMWALL) $(PACKAGE_DIR) diff --git a/package/arpd/Makefile b/package/arpd/Makefile index ad75e22d05..6707eff30b 100644 --- a/package/arpd/Makefile +++ b/package/arpd/Makefile @@ -59,6 +59,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ARPD): mkdir -p $(IDIR_ARPD)/usr/sbin - cp $(PKG_BUILD_DIR)/arpd $(IDIR_ARPD)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/arpd $(IDIR_ARPD)/usr/sbin/ $(STRIP) $(IDIR_ARPD)/usr/sbin/* $(IPKG_BUILD) $(IDIR_ARPD) $(PACKAGE_DIR) diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile index 27e6c795e7..a20c58f52e 100644 --- a/package/arpwatch/Makefile +++ b/package/arpwatch/Makefile @@ -55,9 +55,9 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ARPWATCH): mkdir -p $(IDIR_ARPWATCH)/usr/sbin - cp $(PKG_BUILD_DIR)/arpwatch $(IDIR_ARPWATCH)/usr/sbin/ - cp $(PKG_BUILD_DIR)/arpsnmp $(IDIR_ARPWATCH)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/arpwatch $(IDIR_ARPWATCH)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/arpsnmp $(IDIR_ARPWATCH)/usr/sbin/ $(STRIP) $(IDIR_ARPWATCH)/usr/sbin/* mkdir -p $(IDIR_ARPWATCH)/etc/arpwatch - cp $(PKG_BUILD_DIR)/arp.dat $(IDIR_ARPWATCH)/etc/arpwatch/ + $(CP) $(PKG_BUILD_DIR)/arp.dat $(IDIR_ARPWATCH)/etc/arpwatch/ $(IPKG_BUILD) $(IDIR_ARPWATCH) $(PACKAGE_DIR) diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 8f39127fc2..eb6edee1d7 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -82,7 +82,7 @@ $(PKG_BUILD_DIR)/.built: touch $@ $(IPKG_ASTERISK): - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_ASTERISK) + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_ASTERISK) rm -rf $(IDIR_ASTERISK)/usr/sbin/astgenkey rm -rf $(IDIR_ASTERISK)/usr/bin rm -rf $(IDIR_ASTERISK)/usr/share @@ -128,23 +128,23 @@ $(IPKG_ASTERISK): $(IPKG_ASTERISK_MINI): install -d -m0755 $(IDIR_ASTERISK_MINI)/etc/asterisk for f in asterisk enum extconfig extensions features iax iaxprov logger manager modules musiconhold rtp sip; do \ - cp -fpR $(PKG_INSTALL_DIR)/etc/asterisk/$$f.conf $(IDIR_ASTERISK_MINI)/etc/asterisk/ ; \ + $(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$$f.conf $(IDIR_ASTERISK_MINI)/etc/asterisk/ ; \ done install -m0644 ./files/modules.conf $(IDIR_ASTERISK)/etc/asterisk/ $(SED) 's|/var/lib/asterisk|/usr/lib/asterisk|g' $(PKG_INSTALL_DIR)/etc/asterisk/musiconhold.conf install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/asterisk/firmware $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/firmware $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/ install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/keys install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/modules for f in chan_iax2 chan_local chan_sip codec_gsm codec_ulaw format_gsm format_pcm format_wav \ format_wav_gsm pbx_config res_features res_musiconhold; do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$$f.so $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/modules/ ; \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$$f.so $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/modules/ ; \ done install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/mohmp3 install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/lib/asterisk/sounds install -d -m0755 $(IDIR_ASTERISK_MINI)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(IDIR_ASTERISK_MINI)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/safe_asterisk $(IDIR_ASTERISK_MINI)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(IDIR_ASTERISK_MINI)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/safe_asterisk $(IDIR_ASTERISK_MINI)/usr/sbin/ install -d -m0755 $(IDIR_ASTERISK_MINI)/etc/default install -m0644 ./files/asterisk.default $(IDIR_ASTERISK_MINI)/etc/default/asterisk install -d -m0755 $(IDIR_ASTERISK_MINI)/etc/init.d @@ -179,7 +179,7 @@ $(IPKG_ASTERISK_SQLITE): $(IPKG_ASTERISK_SOUNDS): install -d -m0755 $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds - cp -fpR $(PKG_BUILD_DIR)/sounds/* $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/ + $(CP) $(PKG_BUILD_DIR)/sounds/* $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/ rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/*.mp3 rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/vm-* $(IPKG_BUILD) $(IDIR_ASTERISK_SOUNDS) $(PACKAGE_DIR) @@ -191,7 +191,7 @@ $(IPKG_ASTERISK_VOICEMAIL): install -m0755 $(PKG_BUILD_DIR)/apps/*voicemail.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/ install -m0755 $(PKG_BUILD_DIR)/res/res_adsi.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/ install -d -m0755 $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds - cp -fpR $(PKG_BUILD_DIR)/sounds/vm-*.gsm $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/ + $(CP) $(PKG_BUILD_DIR)/sounds/vm-*.gsm $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/sounds/ $(RSTRIP) $(IDIR_ASTERISK_VOICEMAIL) $(IPKG_BUILD) $(IDIR_ASTERISK_VOICEMAIL) $(PACKAGE_DIR) diff --git a/package/atftp/Config.in b/package/atftp/Config.in index 296faec842..32ab9512a3 100644 --- a/package/atftp/Config.in +++ b/package/atftp/Config.in @@ -4,7 +4,6 @@ config BR2_COMPILE_ATFTP tristate default n depends BR2_PACKAGE_ATFTP || BR2_PACKAGE_ATFTPD - select BR2_PACKAGE_LIBREADLINE config BR2_PACKAGE_ATFTP prompt "atftp............................. TFTP client" diff --git a/package/atftp/Makefile b/package/atftp/Makefile index a609c53d36..f49aab6701 100644 --- a/package/atftp/Makefile +++ b/package/atftp/Makefile @@ -60,12 +60,12 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ATFTP): install -d -m0755 $(IDIR_ATFTP)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/atftp $(IDIR_ATFTP)/usr/bin + $(CP) $(PKG_BUILD_DIR)/atftp $(IDIR_ATFTP)/usr/bin $(RSTRIP) $(IDIR_ATFTP) $(IPKG_BUILD) $(IDIR_ATFTP) $(PACKAGE_DIR) $(IPKG_ATFTPD): install -d -m0755 $(IDIR_ATFTPD)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/atftpd $(IDIR_ATFTPD)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/atftpd $(IDIR_ATFTPD)/usr/sbin $(RSTRIP) $(IDIR_ATFTPD) $(IPKG_BUILD) $(IDIR_ATFTPD) $(PACKAGE_DIR) diff --git a/package/atftp/ipkg/atftp.control b/package/atftp/ipkg/atftp.control index ca4d86a308..d2083fc619 100644 --- a/package/atftp/ipkg/atftp.control +++ b/package/atftp/ipkg/atftp.control @@ -2,4 +2,3 @@ Package: atftp Priority: optional Section: net Description: tftp client -Depends: libreadline diff --git a/package/atftp/ipkg/atftpd.control b/package/atftp/ipkg/atftpd.control index acdd2f1ced..efb40299c3 100644 --- a/package/atftp/ipkg/atftpd.control +++ b/package/atftp/ipkg/atftpd.control @@ -2,4 +2,3 @@ Package: atftpd Priority: optional Section: net Description: tftp server -Depends: libreadline diff --git a/package/avahi/Makefile b/package/avahi/Makefile index a082d54699..16fb203851 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -99,36 +99,36 @@ $(IPKG_AVAHI_DAEMON): install -d -m0755 $(IDIR_AVAHI_DAEMON)/etc/init.d install -m0755 ./files/avahi-daemon.init $(IDIR_AVAHI_DAEMON)/etc/init.d/avahi-daemon install -d -m0755 $(IDIR_AVAHI_DAEMON)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(IDIR_AVAHI_DAEMON)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(IDIR_AVAHI_DAEMON)/usr/sbin/ $(RSTRIP) $(IDIR_AVAHI_DAEMON) $(IPKG_BUILD) $(IDIR_AVAHI_DAEMON) $(PACKAGE_DIR) $(IPKG_AVAHI_DNSCONFD): install -d -m0755 $(IDIR_AVAHI_DNSCONFD)/etc/avahi - cp -fpR $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(IDIR_AVAHI_DNSCONFD)/etc/avahi/ + $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(IDIR_AVAHI_DNSCONFD)/etc/avahi/ install -d -m0755 $(IDIR_AVAHI_DNSCONFD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(IDIR_AVAHI_DNSCONFD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(IDIR_AVAHI_DNSCONFD)/usr/sbin/ $(RSTRIP) $(IDIR_AVAHI_DNSCONFD) $(IPKG_BUILD) $(IDIR_AVAHI_DNSCONFD) $(PACKAGE_DIR) $(IPKG_LIBAVAHI): install -d -m0755 $(IDIR_LIBAVAHI)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so.* $(IDIR_LIBAVAHI)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so.* $(IDIR_LIBAVAHI)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so.* $(IDIR_LIBAVAHI)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so.* $(IDIR_LIBAVAHI)/usr/lib/ $(RSTRIP) $(IDIR_LIBAVAHI) $(IPKG_BUILD) $(IDIR_LIBAVAHI) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/avahi.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/avahi-common $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/avahi-core $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-common $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/avahi-core $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so* $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-common.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-core.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/avahi-core.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/avahi-core.pc touch $@ diff --git a/package/base-files/Makefile b/package/base-files/Makefile index e4753d045c..2604e62578 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -52,7 +52,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_BASE): $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_BASE) ipkg/$(PKG_NAME).control $(PKG_RELEASE) $(ARCH) - cp -a ./default/* $(IDIR_BASE) + $(CP) ./default/* $(IDIR_BASE) $(SED) 's,$$R,r$(REV),g' $(IDIR_BASE)/etc/banner $(SED) 's,$$S,$(BOARD)-$(KERNEL),g' $(IDIR_BASE)/etc/ipkg.conf mkdir -p $(IDIR_BASE)/sys @@ -77,8 +77,8 @@ $(IPKG_UCLIBC): $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_UCLIBC) ipkg/uclibc.control $(UCLIBC_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(IDIR_UCLIBC)/lib for file in ld-uClibc libc libcrypt libdl libm libnsl libresolv librt libuClibc libutil; do \ - cp -fpR $(STAGING_DIR)/lib/$$file.so.* $(IDIR_UCLIBC)/lib/; \ - cp -fpR $(STAGING_DIR)/lib/$$file-$(UCLIBC_VERSION).so $(IDIR_UCLIBC)/lib/; \ + $(CP) $(STAGING_DIR)/lib/$$file.so.* $(IDIR_UCLIBC)/lib/; \ + $(CP) $(STAGING_DIR)/lib/$$file-$(UCLIBC_VERSION).so $(IDIR_UCLIBC)/lib/; \ done -$(STRIP) $(IDIR_UCLIBC)/lib/* $(IPKG_BUILD) $(IDIR_UCLIBC) $(PACKAGE_DIR) @@ -86,7 +86,7 @@ $(IPKG_UCLIBC): $(IPKG_LIBGCC): $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBGCC) ipkg/libgcc.control $(LIBGCC_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(IDIR_LIBGCC)/lib - cp -fpR $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/ + $(CP) $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/ -$(STRIP) $(IDIR_LIBGCC)/lib/* $(IPKG_BUILD) $(IDIR_LIBGCC) $(PACKAGE_DIR) diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall index 8789fbab60..0110cfc775 100755 --- a/package/base-files/default/etc/init.d/S45firewall +++ b/package/base-files/default/etc/init.d/S45firewall @@ -81,8 +81,11 @@ iptables -t nat -N postrouting_rule iptables -A FORWARD -j forwarding_rule # allow - iptables -A FORWARD -i br0 -o br0 -j ACCEPT - + # if there is bridge splitting this workaround works too + for iface in $LAN; do + iptables -A FORWARD -i $iface -o $iface -j ACCEPT + [ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT + done # reject (what to do with anything not allowed earlier) # uses the default -P DROP diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root index 427ff0444f..693c694c1b 100755 --- a/package/base-files/default/sbin/mount_root +++ b/package/base-files/default/sbin/mount_root @@ -30,7 +30,7 @@ if [ "$1" != "failsafe" ]; then pivot_root /jffs /jffs/rom mount none /proc -t proc mount none /dev -t devfs - umount /rom/proc /rom/dev >&- + umount /rom/proc rom/dev >&- fi fi fi diff --git a/package/bind/Makefile b/package/bind/Makefile index eeb428ac30..ba895f3c03 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -70,15 +70,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_BIND_SERVER): install -d -m0755 $(IDIR_BIND_SERVER)/usr/sbin install -d -m0755 $(IDIR_BIND_SERVER)/etc/init.d - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/named $(IDIR_BIND_SERVER)/usr/sbin/ - cp -fpR files/bind $(IDIR_BIND_SERVER)/etc - cp -fpR files/named.init $(IDIR_BIND_SERVER)/etc/init.d/S$(PKG_INIT_LEVEL)named + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/named $(IDIR_BIND_SERVER)/usr/sbin/ + $(CP) files/bind $(IDIR_BIND_SERVER)/etc + $(CP) files/named.init $(IDIR_BIND_SERVER)/etc/init.d/S$(PKG_INIT_LEVEL)named find $(IDIR_BIND_SERVER)/etc/bind -name ".svn" | xargs rm -rf $(RSTRIP) $(IDIR_BIND_SERVER) $(IPKG_BUILD) $(IDIR_BIND_SERVER) $(PACKAGE_DIR) $(IPKG_BIND_CLIENT): install -d -m0755 $(IDIR_BIND_CLIENT)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(IDIR_BIND_CLIENT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(IDIR_BIND_CLIENT)/usr/bin/ $(RSTRIP) $(IDIR_BIND_CLIENT) $(IPKG_BUILD) $(IDIR_BIND_CLIENT) $(PACKAGE_DIR) diff --git a/package/bluez-libs/Makefile b/package/bluez-libs/Makefile index 45d868310a..b02d61836f 100644 --- a/package/bluez-libs/Makefile +++ b/package/bluez-libs/Makefile @@ -64,15 +64,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_BLUEZ_LIBS): install -d -m0755 $(IDIR_BLUEZ_LIBS)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.so.* $(IDIR_BLUEZ_LIBS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.so.* $(IDIR_BLUEZ_LIBS)/usr/lib/ $(RSTRIP) $(IDIR_BLUEZ_LIBS) $(IPKG_BUILD) $(IDIR_BLUEZ_LIBS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libbluetooth.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include/bluetooth - cp -fpR $(PKG_INSTALL_DIR)/usr/include/bluetooth/*.h $(STAGING_DIR)/usr/include/bluetooth + $(CP) $(PKG_INSTALL_DIR)/usr/include/bluetooth/*.h $(STAGING_DIR)/usr/include/bluetooth mkdir -p $(STAGING_DIR)/usr/lib - cp -fp $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.{a,so*} $(STAGING_DIR)/usr/lib/ install-dev: $(STAGING_DIR)/usr/lib/libbluetooth.so diff --git a/package/bluez-utils/Makefile b/package/bluez-utils/Makefile index 00a609b55e..1ac7d345d6 100644 --- a/package/bluez-utils/Makefile +++ b/package/bluez-utils/Makefile @@ -79,12 +79,12 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_BLUEZ_UTILS): install -d -m0755 $(IDIR_BLUEZ_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_BLUEZ_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_BLUEZ_UTILS)/usr/bin/ install -d -m0755 $(IDIR_BLUEZ_UTILS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_BLUEZ_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_BLUEZ_UTILS)/usr/sbin/ install -d -m0755 $(IDIR_BLUEZ_UTILS)/etc/bluetooth - cp -fp $(PKG_INSTALL_DIR)/../hcid/hcid.conf $(IDIR_BLUEZ_UTILS)/etc/bluetooth/ - cp -fp $(PKG_INSTALL_DIR)/../rfcomm/rfcomm.conf $(IDIR_BLUEZ_UTILS)/etc/bluetooth/ + $(CP) $(PKG_INSTALL_DIR)/../hcid/hcid.conf $(IDIR_BLUEZ_UTILS)/etc/bluetooth/ + $(CP) $(PKG_INSTALL_DIR)/../rfcomm/rfcomm.conf $(IDIR_BLUEZ_UTILS)/etc/bluetooth/ install -m0700 ./files/givepin $(IDIR_BLUEZ_UTILS)/etc/bluetooth/ $(RSTRIP) $(IDIR_BLUEZ_UTILS) $(IPKG_BUILD) $(IDIR_BLUEZ_UTILS) $(PACKAGE_DIR) diff --git a/package/bridge/Makefile b/package/bridge/Makefile index 44b22cd722..601373b994 100644 --- a/package/bridge/Makefile +++ b/package/bridge/Makefile @@ -44,6 +44,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_BRIDGE): mkdir -p $(IDIR_BRIDGE)/usr/sbin - cp $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/ $(STRIP) $(IDIR_BRIDGE)/usr/sbin/brctl $(IPKG_BUILD) $(IDIR_BRIDGE) $(PACKAGE_DIR) diff --git a/package/cgilib/Makefile b/package/cgilib/Makefile index 9a0534fe5d..b81effdb04 100644 --- a/package/cgilib/Makefile +++ b/package/cgilib/Makefile @@ -29,15 +29,15 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(IPKG_CGILIB): install -d -m0755 $(IDIR_CGILIB)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/libcgi.so.* $(IDIR_CGILIB)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libcgi.so.* $(IDIR_CGILIB)/usr/lib/ $(RSTRIP) $(IDIR_CGILIB) $(IPKG_BUILD) $(IDIR_CGILIB) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libcgi.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_BUILD_DIR)/cgi.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/cgi.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/libcgi.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libcgi.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libcgi.so diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile index 7e6fb76971..1d6323686c 100644 --- a/package/chillispot/Makefile +++ b/package/chillispot/Makefile @@ -68,6 +68,6 @@ $(IPKG_CHILLISPOT): install -m0755 -d $(IDIR_CHILLISPOT)/etc install -m0644 $(PKG_BUILD_DIR)/doc/chilli.conf $(IDIR_CHILLISPOT)/etc/ install -m0755 -d $(IDIR_CHILLISPOT)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/chilli $(IDIR_CHILLISPOT)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/chilli $(IDIR_CHILLISPOT)/usr/sbin/ $(RSTRIP) $(IDIR_CHILLISPOT) $(IPKG_BUILD) $(IDIR_CHILLISPOT) $(PACKAGE_DIR) diff --git a/package/clinkc/Makefile b/package/clinkc/Makefile index 1d6bf1d6a2..caa624ce65 100644 --- a/package/clinkc/Makefile +++ b/package/clinkc/Makefile @@ -57,7 +57,7 @@ $(PKG_BUILD_DIR)/.built: touch $@ $(IPKG_CLINKC): - cp -fpR $(PKG_INSTALL_DIR) $(IDIR_CLINKC) + $(CP) $(PKG_INSTALL_DIR) $(IDIR_CLINKC) $(RSTRIP) $(IDIR_CLINKC) $(IPKG_BUILD) $(IDIR_CLINKC) $(PACKAGE_DIR) diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 5d7bc34719..e757f965a5 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -93,9 +93,9 @@ $(IPKG_COLLECTD): install -d -m0755 $(IDIR_COLLECTD)/usr/lib/collectd install -d -m0755 $(IDIR_COLLECTD)/var/lib/collectd install -d -m0755 $(IDIR_COLLECTD)/var/run - cp -fpR ./files/S80collectd $(IDIR_COLLECTD)/etc/init.d/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/collectd $(IDIR_COLLECTD)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/collectd/*.so $(IDIR_COLLECTD)/usr/lib/collectd/ + $(CP) ./files/S80collectd $(IDIR_COLLECTD)/etc/init.d/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/collectd $(IDIR_COLLECTD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/collectd/*.so $(IDIR_COLLECTD)/usr/lib/collectd/ $(RSTRIP) $(IDIR_COLLECTD) $(IPKG_BUILD) $(IDIR_COLLECTD) $(PACKAGE_DIR) diff --git a/package/config/Makefile b/package/config/Makefile index 455a33d233..e8a2d4bf1f 100644 --- a/package/config/Makefile +++ b/package/config/Makefile @@ -77,16 +77,16 @@ lex.zconf.o: lex.zconf.c $(SHARED_DEPS) $(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@ lex.zconf.c: lex.zconf.c_shipped - cp lex.zconf.c_shipped lex.zconf.c + $(CP) lex.zconf.c_shipped lex.zconf.c zconf.tab.o: zconf.tab.c lex.zconf.c confdata.c expr.c symbol.c menu.c $(SHARED_DEPS) $(HOSTCC) $(HOSTCFLAGS) -I. -c $< -o $@ zconf.tab.c: zconf.tab.c_shipped - cp zconf.tab.c_shipped zconf.tab.c + $(CP) zconf.tab.c_shipped zconf.tab.c zconf.tab.h: zconf.tab.h_shipped - cp zconf.tab.h_shipped zconf.tab.h + $(CP) zconf.tab.h_shipped zconf.tab.h endif .PHONY: ncurses diff --git a/package/cups/Makefile b/package/cups/Makefile index 8ffa8665fb..bb3e9d33d7 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -73,24 +73,24 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_CUPS): rm -rf $(IDIR_CUPS)/etc/cups install -d -m0755 $(IDIR_CUPS)/etc/cups - cp -fpR $(PKG_INSTALL_DIR)/etc/cups/* $(IDIR_CUPS)/etc/cups/ + $(CP) $(PKG_INSTALL_DIR)/etc/cups/* $(IDIR_CUPS)/etc/cups/ rm -rf $(IDIR_CUPS)/etc/cups/certs ln -sf /tmp $(IDIR_CUPS)/etc/cups/certs install -d -m0755 $(IDIR_CUPS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_CUPS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_CUPS)/usr/bin/ rm -f $(IDIR_CUPS)/usr/bin/cups-config install -d -m0755 $(IDIR_CUPS)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcups.so.* $(IDIR_CUPS)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/cups $(IDIR_CUPS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.so.* $(IDIR_CUPS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/cups $(IDIR_CUPS)/usr/lib/ install -d -m0755 $(IDIR_CUPS)/usr/share/cups/templates - cp -fpR $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl $(IDIR_CUPS)/usr/share/cups/templates/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/cups/templates/*.tmpl $(IDIR_CUPS)/usr/share/cups/templates/ install -d -m0755 $(IDIR_CUPS)/usr/share/doc/cups - cp -fpR $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(IDIR_CUPS)/usr/share/doc/cups/ - cp -fpR $(PKG_INSTALL_DIR)/usr/share/doc/cups/images $(IDIR_CUPS)/usr/share/doc/cups/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/index.html $(IDIR_CUPS)/usr/share/doc/cups/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/doc/cups/images $(IDIR_CUPS)/usr/share/doc/cups/ install -d -m0755 $(IDIR_CUPS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_CUPS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_CUPS)/usr/sbin/ # overwrite default config with our own - cp -fpR ./files/etc/cups/* $(IDIR_CUPS)/etc/cups/ + $(CP) ./files/etc/cups/* $(IDIR_CUPS)/etc/cups/ # install initscript with priority 60 install -d -m0755 $(IDIR_CUPS)/etc/init.d install -m0755 ./files/cupsd.init $(IDIR_CUPS)/etc/init.d/S60cupsd @@ -100,11 +100,11 @@ $(IPKG_CUPS): $(STAGING_DIR)/usr/lib/libcups.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/cups-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/cups-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/cups $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/cups $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcups.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcups.{a,so*} $(STAGING_DIR)/usr/lib/ install-dev: $(STAGING_DIR)/usr/lib/libcups.so diff --git a/package/curl/Makefile b/package/curl/Makefile index 02ea0a3526..1a4ee86771 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -91,24 +91,24 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_CURL): install -m0755 -d $(IDIR_CURL)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/curl $(IDIR_CURL)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/curl $(IDIR_CURL)/usr/bin/ $(RSTRIP) $(IDIR_CURL) $(IPKG_BUILD) $(IDIR_CURL) $(PACKAGE_DIR) $(IPKG_LIBCURL): install -m0755 -d $(IDIR_LIBCURL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(IDIR_LIBCURL)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(IDIR_LIBCURL)/usr/lib/ $(RSTRIP) $(IDIR_LIBCURL) $(IPKG_BUILD) $(IDIR_LIBCURL) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libcurl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/curl-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/curl $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcurl.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcurl.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so* $(STAGING_DIR)/usr/lib/ $(SED) 's,-I/usr/include,,g' $(STAGING_DIR)/usr/bin/curl-config $(SED) 's,-L/usr/lib,,g' $(STAGING_DIR)/usr/bin/curl-config touch $@ diff --git a/package/cutter/Makefile b/package/cutter/Makefile index 361d1e750f..418718f1a5 100755 --- a/package/cutter/Makefile +++ b/package/cutter/Makefile @@ -27,6 +27,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_CUTTER): mkdir -p $(IDIR_CUTTER) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_CUTTER)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_CUTTER)/ $(RSTRIP) $(IDIR_CUTTER)/ $(IPKG_BUILD) $(IDIR_CUTTER) $(PACKAGE_DIR) diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index 84238db55d..e89bee1894 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -100,21 +100,21 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBSASL2): install -m0755 -d $(IDIR_LIBSASL2)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsasl2.so.* $(IDIR_LIBSASL2)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.so.* $(IDIR_LIBSASL2)/usr/lib/ install -m0755 -d $(IDIR_LIBSASL2)/usr/lib/sasl2 - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.so.* $(IDIR_LIBSASL2)/usr/lib/sasl2/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.so.* $(IDIR_LIBSASL2)/usr/lib/sasl2/ $(RSTRIP) $(IDIR_LIBSASL2) $(IPKG_BUILD) $(IDIR_LIBSASL2) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libsasl2.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/sasl $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/sasl $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsasl2.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.{a,so*} $(STAGING_DIR)/usr/lib/ ln -sf libsasl2.a $(STAGING_DIR)/usr/lib/libsasl.a ln -sf libsasl2.so $(STAGING_DIR)/usr/lib/libsasl.so mkdir -p $(STAGING_DIR)/usr/lib/sasl2 - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.{a,so*} $(STAGING_DIR)/usr/lib/sasl2/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.{a,so*} $(STAGING_DIR)/usr/lib/sasl2/ install-dev: $(STAGING_DIR)/usr/lib/libsasl2.so diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile index f92107c7f0..0a86efcf25 100644 --- a/package/dhcp-forwarder/Makefile +++ b/package/dhcp-forwarder/Makefile @@ -61,6 +61,6 @@ $(IPKG_DHCP_FORWARDER): install -m0755 -d $(IDIR_DHCP_FORWARDER)/etc/init.d install -m0755 ./files/dhcp-fwd.init $(IDIR_DHCP_FORWARDER)/etc/init.d/dhcp-fwd install -m0755 -d $(IDIR_DHCP_FORWARDER)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(IDIR_DHCP_FORWARDER)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(IDIR_DHCP_FORWARDER)/usr/bin/ $(RSTRIP) $(IDIR_DHCP_FORWARDER) $(IPKG_BUILD) $(IDIR_DHCP_FORWARDER) $(PACKAGE_DIR) diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile index 4914cc4ae5..8ee56ff4a6 100644 --- a/package/dhcp/Makefile +++ b/package/dhcp/Makefile @@ -38,12 +38,12 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_DHCP_RELAY): install -d -m0755 $(IDIR_DHCP_RELAY)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(IDIR_DHCP_RELAY)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(IDIR_DHCP_RELAY)/usr/sbin/ $(RSTRIP) $(IDIR_DHCP_RELAY) $(IPKG_BUILD) $(IDIR_DHCP_RELAY) $(PACKAGE_DIR) $(IPKG_DHCP_SERVER): install -d -m0755 $(IDIR_DHCP_SERVER)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcpd $(IDIR_DHCP_SERVER)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcpd $(IDIR_DHCP_SERVER)/usr/sbin/ $(RSTRIP) $(IDIR_DHCP_SERVER) $(IPKG_BUILD) $(IDIR_DHCP_SERVER) $(PACKAGE_DIR) diff --git a/package/dhcp6/Makefile b/package/dhcp6/Makefile index 9883ad18f9..e007abad29 100755 --- a/package/dhcp6/Makefile +++ b/package/dhcp6/Makefile @@ -32,6 +32,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_DHCP6): mkdir -p $(IDIR_DHCP6) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_DHCP6)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_DHCP6)/ $(RSTRIP) $(IDIR_DHCP6) $(IPKG_BUILD) $(IDIR_DHCP6) $(PACKAGE_DIR) diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 405801063a..215697cdb3 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.26 +PKG_VERSION:=2.25 PKG_RELEASE:=1 -PKG_MD5SUM:=ae04abb5db4a8cc43c24f432f0c44d5c +PKG_MD5SUM:=a5a387aed551acf91990567a5e8e4fa4 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -27,7 +27,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_DNSMASQ): install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin - cp $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/ $(STRIP) $(IDIR_DNSMASQ)/usr/sbin/* install -d -m0755 $(IDIR_DNSMASQ)/etc/init.d/ install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile index dc1982b901..91b455e9db 100644 --- a/package/dosfstools/Makefile +++ b/package/dosfstools/Makefile @@ -33,10 +33,10 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_DOSFSTOOLS): install -d -m0755 $(IDIR_DOSFSTOOLS)/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/dosfsck $(IDIR_DOSFSTOOLS)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/fsck.{msdos,vfat} $(IDIR_DOSFSTOOLS)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/mkdosfs $(IDIR_DOSFSTOOLS)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/mkfs.{msdos,vfat} $(IDIR_DOSFSTOOLS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/dosfsck $(IDIR_DOSFSTOOLS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/fsck.{msdos,vfat} $(IDIR_DOSFSTOOLS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/mkdosfs $(IDIR_DOSFSTOOLS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/mkfs.{msdos,vfat} $(IDIR_DOSFSTOOLS)/sbin/ $(RSTRIP) $(IDIR_DOSFSTOOLS) $(IPKG_BUILD) $(IDIR_DOSFSTOOLS) $(PACKAGE_DIR) diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile index 484f0c54be..ee5a19863c 100644 --- a/package/dsniff/Makefile +++ b/package/dsniff/Makefile @@ -66,8 +66,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_DSNIFF): install -d -m0755 $(IDIR_DSNIFF)/usr/lib install -d -m0755 $(IDIR_DSNIFF)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_DSNIFF)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/* $(IDIR_DSNIFF)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_DSNIFF)/usr/sbin + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(IDIR_DSNIFF)/usr/lib $(RSTRIP) $(IDIR_DSNIFF) $(IPKG_BUILD) $(IDIR_DSNIFF) $(PACKAGE_DIR) diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 6bb89078c5..b4393e2ebb 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -69,11 +69,11 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_E2FSPROGS): mkdir -p $(IDIR_E2FSPROGS)/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/e2fsck $(IDIR_E2FSPROGS)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/mke2fs $(IDIR_E2FSPROGS)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/mkfs.ext{2,3} $(IDIR_E2FSPROGS)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/tune2fs $(IDIR_E2FSPROGS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/e2fsck $(IDIR_E2FSPROGS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/mke2fs $(IDIR_E2FSPROGS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/mkfs.ext{2,3} $(IDIR_E2FSPROGS)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/tune2fs $(IDIR_E2FSPROGS)/sbin/ mkdir -p $(IDIR_E2FSPROGS)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{blkid,com_err,e2p,ext2fs,uuid}.so.* $(IDIR_E2FSPROGS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{blkid,com_err,e2p,ext2fs,uuid}.so.* $(IDIR_E2FSPROGS)/usr/lib/ $(RSTRIP) $(IDIR_E2FSPROGS) $(IPKG_BUILD) $(IDIR_E2FSPROGS) $(PACKAGE_DIR) diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index a928a2dbb1..9abd93a93a 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -27,6 +27,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_EBTABLES): mkdir -p $(IDIR_EBTABLES)/usr/sbin - cp $(PKG_BUILD_DIR)/ebtables $(IDIR_EBTABLES)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/ebtables $(IDIR_EBTABLES)/usr/sbin/ $(IPKG_BUILD) $(IDIR_EBTABLES) $(PACKAGE_DIR) diff --git a/package/elhttp/Makefile b/package/elhttp/Makefile index 1d747d6fb8..6c83185106 100644 --- a/package/elhttp/Makefile +++ b/package/elhttp/Makefile @@ -31,7 +31,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ELHTTP): mkdir -p $(IDIR_ELHTTP) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_ELHTTP)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_ELHTTP)/ $(RSTRIP) $(IDIR_ELHTTP)/ $(IPKG_BUILD) $(IDIR_ELHTTP) $(PACKAGE_DIR) diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile index 5ebcf46da1..9618b3e3e1 100644 --- a/package/ether-wake/Makefile +++ b/package/ether-wake/Makefile @@ -14,7 +14,7 @@ $(eval $(call PKG_template,ETHER_WAKE,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE), $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp ./files/$(PKG_NAME).c $(PKG_BUILD_DIR)/ + $(CP) ./files/$(PKG_NAME).c $(PKG_BUILD_DIR)/ $(PATCH) $(PKG_BUILD_DIR) ./patches touch $@ diff --git a/package/expat/Makefile b/package/expat/Makefile index ef9f3a9b53..47c8e81b18 100644 --- a/package/expat/Makefile +++ b/package/expat/Makefile @@ -59,17 +59,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBEXPAT): install -m0755 -d $(IDIR_LIBEXPAT)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(IDIR_LIBEXPAT)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(IDIR_LIBEXPAT)/usr/lib/ $(RSTRIP) $(IDIR_LIBEXPAT) $(IPKG_BUILD) $(IDIR_LIBEXPAT) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libexpat.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/xmlwf $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xmlwf $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/expat*.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/expat*.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libexpat.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libexpat.so diff --git a/package/flac/Makefile b/package/flac/Makefile index 0e18c5f334..b06cf0ec4d 100644 --- a/package/flac/Makefile +++ b/package/flac/Makefile @@ -32,16 +32,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBFLAC): install -m0755 -d $(IDIR_LIBFLAC)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.so $(IDIR_LIBFLAC)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.so $(IDIR_LIBFLAC)/usr/lib/ $(RSTRIP) $(IDIR_LIBFLAC) $(IPKG_BUILD) $(IDIR_LIBFLAC) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libFLAC.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_BUILD_DIR)/include/FLAC $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/include/FLAC $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.so $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/obj/release/lib/libFLAC.so $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libFLAC.so diff --git a/package/fping/Makefile b/package/fping/Makefile index 627d8fc619..998d3485fc 100644 --- a/package/fping/Makefile +++ b/package/fping/Makefile @@ -48,8 +48,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_FPING): mkdir -p $(IDIR_FPING)/usr/bin - cp $(PKG_BUILD_DIR)/$(PKG_NAME)4 $(IDIR_FPING)/usr/bin/$(PKG_NAME) - cp $(PKG_BUILD_DIR)/$(PKG_NAME)6 $(IDIR_FPING)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)4 $(IDIR_FPING)/usr/bin/$(PKG_NAME) + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)6 $(IDIR_FPING)/usr/bin/ $(STRIP) $(IDIR_FPING)/usr/bin/* $(IPKG_BUILD) $(IDIR_FPING) $(PACKAGE_DIR) diff --git a/package/fprobe-ulog/Makefile b/package/fprobe-ulog/Makefile index f5f3c53f68..6ea2493090 100644 --- a/package/fprobe-ulog/Makefile +++ b/package/fprobe-ulog/Makefile @@ -47,6 +47,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_FPROBE_ULOG): mkdir -p $(IDIR_FPROBE_ULOG)/usr/bin - cp $(PKG_BUILD_DIR)/src/fprobe-ulog $(IDIR_FPROBE_ULOG)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/src/fprobe-ulog $(IDIR_FPROBE_ULOG)/usr/bin/ $(RSTRIP) $(IDIR_FPROBE_ULOG) $(IPKG_BUILD) $(IDIR_FPROBE_ULOG) $(PACKAGE_DIR) diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile index 91f0c05ccd..fed7e3b540 100644 --- a/package/fprobe/Makefile +++ b/package/fprobe/Makefile @@ -49,6 +49,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_FPROBE): mkdir -p $(IDIR_FPROBE)/usr/bin - cp $(PKG_BUILD_DIR)/src/fprobe $(IDIR_FPROBE)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/src/fprobe $(IDIR_FPROBE)/usr/bin/ $(STRIP) $(IDIR_FPROBE)/usr/bin/* $(IPKG_BUILD) $(IDIR_FPROBE) $(PACKAGE_DIR) diff --git a/package/freeradius/Makefile b/package/freeradius/Makefile index 0f8f4b031d..0ae21bbb76 100644 --- a/package/freeradius/Makefile +++ b/package/freeradius/Makefile @@ -83,12 +83,12 @@ define PKG_mod_template $$(IPKG_$(1)): [ -z "$(2)" ] || install -d -m0755 $$(IDIR_$(1))/usr/lib/freeradius for m in $(2); do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/freeradius/$$$${m}{,-*}.so \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/$$$${m}{,-*}.so \ $$(IDIR_$(1))/usr/lib/freeradius/ ; \ done [ -z "$(3)" ] || install -d -m0755 $$(IDIR_$(1))/etc/freeradius for f in $(3); do \ - cp -fpR $(PKG_INSTALL_DIR)/etc/freeradius/$$$${f} \ + $(CP) $(PKG_INSTALL_DIR)/etc/freeradius/$$$${f} \ $$(IDIR_$(1))/etc/freeradius/ ; \ done $(RSTRIP) $$(IDIR_$(1)) @@ -186,28 +186,28 @@ $(IPKG_FREERADIUS): install -m0755 ./files/radiusd.init $(IDIR_FREERADIUS)/etc/init.d/radiusd install -m0755 -d $(IDIR_FREERADIUS)/etc/freeradius for f in clients.conf dictionary radiusd.conf; do \ - cp -fpR $(PKG_INSTALL_DIR)/etc/freeradius/$${f} \ + $(CP) $(PKG_INSTALL_DIR)/etc/freeradius/$${f} \ $(IDIR_FREERADIUS)/etc/freeradius/ ; \ done install -m0755 -d $(IDIR_FREERADIUS)/usr/share/freeradius - cp -fpR $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary \ + $(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary \ $(IDIR_FREERADIUS)/usr/share/freeradius/ for f in cisco freeradius microsoft tunnel wispr; do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary.$${f} \ + $(CP) $(PKG_INSTALL_DIR)/usr/share/freeradius/dictionary.$${f} \ $(IDIR_FREERADIUS)/usr/share/freeradius/ ; \ done install -m0755 -d $(IDIR_FREERADIUS)/usr/lib/freeradius - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/freeradius/libradius{,-*}.so \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius/libradius{,-*}.so \ $(IDIR_FREERADIUS)/usr/lib/freeradius/ install -m0755 -d $(IDIR_FREERADIUS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/radiusd \ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/radiusd \ $(IDIR_FREERADIUS)/usr/sbin/ $(RSTRIP) $(IDIR_FREERADIUS) $(IPKG_BUILD) $(IDIR_FREERADIUS) $(PACKAGE_DIR) $(IPKG_FREERADIUS_DEMOCERTS): install -m0755 -d $(IDIR_FREERADIUS_DEMOCERTS)/etc/freeradius - cp -fpR $(PKG_INSTALL_DIR)/etc/freeradius/certs \ + $(CP) $(PKG_INSTALL_DIR)/etc/freeradius/certs \ $(IDIR_FREERADIUS_DEMOCERTS)/etc/freeradius/ rm -rf $(IDIR_FREERADIUS_DEMOCERTS)/etc/freeradius/certs/README rm -rf $(IDIR_FREERADIUS_DEMOCERTS)/etc/freeradius/certs/new* @@ -219,7 +219,7 @@ $(IPKG_FREERADIUS_DEMOCERTS): $(IPKG_FREERADIUS_UTILS): install -m0755 -d $(IDIR_FREERADIUS_UTILS)/usr/bin for f in radclient radeapclient; do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/$${f} \ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/$${f} \ $(IDIR_FREERADIUS_UTILS)/usr/bin/ ; \ done $(RSTRIP) $(IDIR_FREERADIUS_UTILS) diff --git a/package/freetype/Makefile b/package/freetype/Makefile index 5744970f10..429df1d09e 100644 --- a/package/freetype/Makefile +++ b/package/freetype/Makefile @@ -58,20 +58,20 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBFREETYPE): install -d -m0755 $(IDIR_LIBFREETYPE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(IDIR_LIBFREETYPE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(IDIR_LIBFREETYPE)/usr/lib/ $(RSTRIP) $(IDIR_LIBFREETYPE) $(IPKG_BUILD) $(IDIR_LIBFREETYPE) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libfreetype.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/freetype2 $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/ft2build.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/freetype2 $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ft2build.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfreetype.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/freetype2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/freetype2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libfreetype.so diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 452a4ab7dd..7f3572e90d 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -72,25 +72,25 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBFUSE): mkdir -p $(IDIR_LIBFUSE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so.* $(IDIR_LIBFUSE)/usr/lib/ $(RSTRIP) $(IDIR_LIBFUSE) $(IPKG_BUILD) $(IDIR_LIBFUSE) $(PACKAGE_DIR) $(IPKG_FUSE_UTILS): mkdir -p $(IDIR_FUSE_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/fusermount $(IDIR_FUSE_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/fusermount $(IDIR_FUSE_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_FUSE_UTILS) $(IPKG_BUILD) $(IDIR_FUSE_UTILS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libfuse.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/fuse.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/fuse.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libfuse.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfuse.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fuse.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir}/fuse,,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index 7e5d33ba80..922e631230 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -56,7 +56,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_GDBSERVER): install -m0755 -d $(IDIR_GDBSERVER)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gdbserver $(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/package/glib/Makefile b/package/glib/Makefile index 2715d9fcc7..cb697995db 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -81,22 +81,22 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_GLIB1): install -m0755 -d $(IDIR_GLIB1)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(IDIR_GLIB1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(IDIR_GLIB1)/usr/lib/ $(RSTRIP) $(IDIR_GLIB1) $(IPKG_BUILD) $(IDIR_GLIB1) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libglib.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/glib-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/glib-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/glib-1.2 $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(STAGING_DIR)/usr/include/glib-1.2/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/glib-1.2 $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(STAGING_DIR)/usr/include/glib-1.2/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}.{a,so} $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-*.so.* $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/glib $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}.{a,so} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-*.so.* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/glib $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $(STAGING_DIR)/usr/lib/libglib.so install-dev: $(STAGING_DIR)/usr/lib/libglib.so diff --git a/package/glib/patches/04-gcc3.4-fix b/package/glib/patches/04-gcc3.4-fix index 3eddcf6fe7..96f10b7fa7 100644 --- a/package/glib/patches/04-gcc3.4-fix +++ b/package/glib/patches/04-gcc3.4-fix @@ -5,7 +5,7 @@ Origin: self-created, http://www.uwe-dueffert.de/lfs/ownpatches/glib-1.2.10-gcc3 Upstream Status: not reported Description: fix compilation of glib1 with gcc34 -$LastChangedBy: bdubbs $ +$LastChangedBy$ $Date$ diff -Naur glib-1.2.10.orig/gstrfuncs.c glib-1.2.10/gstrfuncs.c diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index fb5823e26b..bbadfb1129 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -69,7 +69,7 @@ $(IPKG_GMEDIASERVER): install -m0755 -d $(IDIR_GMEDIASERVER)/etc/init.d install -m0755 ./files/gmediaserver.init $(IDIR_GMEDIASERVER)/etc/init.d/gmediaserver install -m0755 -d $(IDIR_GMEDIASERVER)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gmediaserver $(IDIR_GMEDIASERVER)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/gmediaserver $(IDIR_GMEDIASERVER)/usr/sbin/ $(RSTRIP) $(IDIR_GMEDIASERVER) $(IPKG_BUILD) $(IDIR_GMEDIASERVER) $(PACKAGE_DIR) diff --git a/package/gmp/Makefile b/package/gmp/Makefile index 27d938427a..53db9451bc 100644 --- a/package/gmp/Makefile +++ b/package/gmp/Makefile @@ -57,15 +57,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGMP): install -m0755 -d $(IDIR_LIBGMP)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgmp.so.* $(IDIR_LIBGMP)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.so.* $(IDIR_LIBGMP)/usr/lib/ $(RSTRIP) $(IDIR_LIBGMP) $(IPKG_BUILD) $(IDIR_LIBGMP) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgmp.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gmp* $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gmp* $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgmp.so diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 4e7ccb95e0..5257850784 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -80,34 +80,34 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGNUTLS): install -m0755 -d $(IDIR_LIBGNUTLS)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra}.so.* $(IDIR_LIBGNUTLS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra}.so.* $(IDIR_LIBGNUTLS)/usr/lib/ $(RSTRIP) $(IDIR_LIBGNUTLS) $(IPKG_BUILD) $(IDIR_LIBGNUTLS) $(PACKAGE_DIR) $(IPKG_LIBGNUTLS_OPENSSL): install -m0755 -d $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgnutls-openssl.so.* $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls-openssl.so.* $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib/ $(RSTRIP) $(IDIR_LIBGNUTLS_OPENSSL) $(IPKG_BUILD) $(IDIR_LIBGNUTLS_OPENSSL) $(PACKAGE_DIR) $(IPKG_GNUTLS_UTILS): install -m0755 -d $(IDIR_GNUTLS_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/certtool $(IDIR_GNUTLS_UTILS)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(IDIR_GNUTLS_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(IDIR_GNUTLS_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(IDIR_GNUTLS_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_GNUTLS_UTILS) $(IPKG_BUILD) $(IDIR_GNUTLS_UTILS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgnutls.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gnutls $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ mkdir -p $(STAGING_DIR)/usr/share/aclocal - cp -fpR $(PKG_INSTALL_DIR)/usr/share/aclocal/libgnutls{,-extra}.m4 $(STAGING_DIR)/usr/share/aclocal/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgnutls{,-extra}.m4 $(STAGING_DIR)/usr/share/aclocal/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgnutls.so diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile index 43fad851cf..45748cb844 100644 --- a/package/gpsd/Makefile +++ b/package/gpsd/Makefile @@ -63,18 +63,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_GPSD): install -d -m0755 $(IDIR_GPSD)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(IDIR_GPSD)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.so.* $(IDIR_GPSD)/usr/lib/ install -d -m0755 $(IDIR_GPSD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(IDIR_GPSD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/gpsd $(IDIR_GPSD)/usr/sbin/ $(RSTRIP) $(IDIR_GPSD) $(IPKG_BUILD) $(IDIR_GPSD) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgps.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gps{,d}.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libgpsmm.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gps{,d}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libgpsmm.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgps.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgps.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgps.so diff --git a/package/gsm/Makefile b/package/gsm/Makefile index 0599696d8d..b30a6c5ab5 100644 --- a/package/gsm/Makefile +++ b/package/gsm/Makefile @@ -35,22 +35,22 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGSM): install -d -m0755 $(IDIR_LIBGSM)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgsm.so.* $(IDIR_LIBGSM)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.so.* $(IDIR_LIBGSM)/usr/lib/ $(RSTRIP) $(IDIR_LIBGSM) $(IPKG_BUILD) $(IDIR_LIBGSM) $(PACKAGE_DIR) $(IPKG_GSM_UTILS): install -d -m0755 $(IDIR_GSM_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_GSM_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_GSM_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_GSM_UTILS) $(IPKG_BUILD) $(IDIR_GSM_UTILS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgsm.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gsm.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gsm.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgsm.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgsm.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsm.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgsm.so diff --git a/package/haserl/Makefile b/package/haserl/Makefile index d9e1faacc1..05c6b47b1e 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -55,7 +55,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_HASERL): install -m0755 -d $(IDIR_HASERL)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/haserl $(IDIR_HASERL)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/haserl $(IDIR_HASERL)/usr/bin/ $(RSTRIP) $(IDIR_HASERL) $(IPKG_BUILD) $(IDIR_HASERL) $(PACKAGE_DIR) diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index c3b8ec6aa0..7ac6770fc8 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -19,7 +19,7 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,HOSTAPD,hostapd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - cp ./files/config $(PKG_BUILD_DIR)/.config + $(CP) ./files/config $(PKG_BUILD_DIR)/.config touch $@ $(PKG_BUILD_DIR)/.built: diff --git a/package/howl/Makefile b/package/howl/Makefile index 8969f10fce..02d9b78f2b 100644 --- a/package/howl/Makefile +++ b/package/howl/Makefile @@ -63,13 +63,13 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBHOWL): install -m0755 -d $(IDIR_LIBHOWL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.so.* $(IDIR_LIBHOWL)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.so.* $(IDIR_LIBHOWL)/usr/lib/ $(RSTRIP) $(IDIR_LIBHOWL) $(IPKG_BUILD) $(IDIR_LIBHOWL) $(PACKAGE_DIR) $(IPKG_HOWL_UTILS): install -m0755 -d $(IDIR_HOWL_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/mDNS{Browse,Publish,Query,Resolve} $(IDIR_HOWL_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/mDNS{Browse,Publish,Query,Resolve} $(IDIR_HOWL_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_HOWL_UTILS) $(IPKG_BUILD) $(IDIR_HOWL_UTILS) $(PACKAGE_DIR) @@ -79,7 +79,7 @@ $(IPKG_MDNSRESPONDER): install -m0755 -d $(IDIR_MDNSRESPONDER)/etc/init.d install -m0644 ./files/mDNSResponder.init $(IDIR_MDNSRESPONDER)/etc/init.d/mDNSResponder install -m0755 -d $(IDIR_MDNSRESPONDER)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/mDNSResponder $(IDIR_MDNSRESPONDER)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/mDNSResponder $(IDIR_MDNSRESPONDER)/usr/sbin/ $(RSTRIP) $(IDIR_MDNSRESPONDER) $(IPKG_BUILD) $(IDIR_MDNSRESPONDER) $(PACKAGE_DIR) @@ -87,7 +87,7 @@ $(IPKG_AUTOIPD): install -m0755 -d $(IDIR_AUTOIPD)/etc/init.d install -m0644 ./files/autoipd.init $(IDIR_AUTOIPD)/etc/init.d/autoipd install -m0755 -d $(IDIR_AUTOIPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/autoipd $(IDIR_AUTOIPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/autoipd $(IDIR_AUTOIPD)/usr/sbin/ $(RSTRIP) $(IDIR_AUTOIPD) $(IPKG_BUILD) $(IDIR_AUTOIPD) $(PACKAGE_DIR) @@ -95,17 +95,17 @@ $(IPKG_NIFD): install -m0755 -d $(IDIR_NIFD)/etc/init.d install -m0644 ./files/nifd.init $(IDIR_NIFD)/etc/init.d/nifd install -m0755 -d $(IDIR_NIFD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/nifd $(IDIR_NIFD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/nifd $(IDIR_NIFD)/usr/sbin/ $(RSTRIP) $(IDIR_NIFD) $(IPKG_BUILD) $(IDIR_NIFD) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libhowl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/howl $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/howl $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{howl,mDNSResponder}.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/howl.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/howl.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $(STAGING_DIR)/usr/lib/libhowl.so install-dev: $(STAGING_DIR)/usr/lib/libhowl.so diff --git a/package/icecast/Makefile b/package/icecast/Makefile index ffaee05a7b..ec2ed2405c 100644 --- a/package/icecast/Makefile +++ b/package/icecast/Makefile @@ -70,11 +70,11 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ICECAST): install -d -m0755 $(IDIR_ICECAST)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/icecast.xml $(IDIR_ICECAST)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/icecast.xml $(IDIR_ICECAST)/etc/ install -d -m0755 $(IDIR_ICECAST)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/icecast $(IDIR_ICECAST)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/icecast $(IDIR_ICECAST)/usr/bin/ install -d -m0755 $(IDIR_ICECAST)/usr/share/icecast - cp -fpR $(PKG_INSTALL_DIR)/usr/share/icecast/admin $(IDIR_ICECAST)/usr/share/icecast/ - cp -fpR $(PKG_INSTALL_DIR)/usr/share/icecast/web $(IDIR_ICECAST)/usr/share/icecast/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/admin $(IDIR_ICECAST)/usr/share/icecast/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/web $(IDIR_ICECAST)/usr/share/icecast/ $(RSTRIP) $(IDIR_ICECAST) $(IPKG_BUILD) $(IDIR_ICECAST) $(PACKAGE_DIR) diff --git a/package/icecast/patches/icecast-2.3.0-curl_config.patch b/package/icecast/patches/icecast-2.3.0-curl_config.patch index 22ab492ab7..eb9f46f2a1 100644 --- a/package/icecast/patches/icecast-2.3.0-curl_config.patch +++ b/package/icecast/patches/icecast-2.3.0-curl_config.patch @@ -10,7 +10,7 @@ diff -ruN icecast-2.3.0-old/aclocal.m4 icecast-2.3.0-new/aclocal.m4 -# serial 47 AC_PROG_LIBTOOL +# serial 46 AC_PROG_LIBTOOL -+# Debian $Rev: 189 $ ++# Debian $Rev$ - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index c40d800ec3..fd02bef87c 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -63,17 +63,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ID3LIB): install -d -m0755 $(IDIR_ID3LIB)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(IDIR_ID3LIB)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(IDIR_ID3LIB)/usr/lib/ $(IPKG_BUILD) $(IDIR_ID3LIB) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libid3.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/id3 $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/id3.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/id3 $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/id3.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3.so $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3.so $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libid3.so diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile index 870362aee4..21231d4c1c 100644 --- a/package/ipcad/Makefile +++ b/package/ipcad/Makefile @@ -63,8 +63,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IPCAD): install -d -m0755 $(IDIR_IPCAD)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/ipcad.conf $(IDIR_IPCAD)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/ipcad.conf $(IDIR_IPCAD)/etc/ install -d -m0755 $(IDIR_IPCAD)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ipcad $(IDIR_IPCAD)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ipcad $(IDIR_IPCAD)/usr/bin/ $(RSTRIP) $(IDIR_IPCAD) $(IPKG_BUILD) $(IDIR_IPCAD) $(PACKAGE_DIR) diff --git a/package/iperf/Makefile b/package/iperf/Makefile index 53589dd9eb..dc12dc0f4d 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -63,7 +63,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IPERF): install -d -m0755 $(IDIR_IPERF)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/iperf $(IDIR_IPERF)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/iperf $(IDIR_IPERF)/usr/bin $(RSTRIP) $(IDIR_IPERF) $(IPKG_BUILD) $(IDIR_IPERF) $(PACKAGE_DIR) diff --git a/package/ipkg/Makefile b/package/ipkg/Makefile index 0a55827fb6..3dddcc5556 100644 --- a/package/ipkg/Makefile +++ b/package/ipkg/Makefile @@ -60,8 +60,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IPKG): install -d -m0755 $(IDIR_IPKG)/bin - cp -fpR $(PKG_INSTALL_DIR)/bin/ipkg-cl $(IDIR_IPKG)/bin/ipkg + $(CP) $(PKG_INSTALL_DIR)/bin/ipkg-cl $(IDIR_IPKG)/bin/ipkg install -d -m0755 $(IDIR_IPKG)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipkg.so.* $(IDIR_IPKG)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipkg.so.* $(IDIR_IPKG)/usr/lib/ $(RSTRIP) $(IDIR_IPKG) $(IPKG_BUILD) $(IDIR_IPKG) $(PACKAGE_DIR) diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 5b30b81342..f0773e437d 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -36,13 +36,13 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IP): mkdir -p $(IDIR_IP)/usr/sbin - cp $(PKG_BUILD_DIR)/ip/ip $(IDIR_IP)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/ip/ip $(IDIR_IP)/usr/sbin/ $(STRIP) $(IDIR_IP)/usr/sbin/* $(IPKG_BUILD) $(IDIR_IP) $(PACKAGE_DIR) $(IPKG_TC): mkdir -p $(IDIR_TC)/usr/sbin - cp $(PKG_BUILD_DIR)/tc/tc $(IDIR_TC)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/tc/tc $(IDIR_TC)/usr/sbin/ $(STRIP) $(IDIR_TC)/usr/sbin/* $(IPKG_BUILD) $(IDIR_TC) $(PACKAGE_DIR) diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 70b0627b52..06d49e9686 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -72,14 +72,14 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IPSEC_TOOLS): install -d -m0755 $(IDIR_IPSEC_TOOLS)/etc - cp -fpR $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(IDIR_IPSEC_TOOLS)/etc/ + $(CP) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(IDIR_IPSEC_TOOLS)/etc/ install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(IDIR_IPSEC_TOOLS)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/racoon $(IDIR_IPSEC_TOOLS)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(IDIR_IPSEC_TOOLS)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/setkey $(IDIR_IPSEC_TOOLS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(IDIR_IPSEC_TOOLS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(IDIR_IPSEC_TOOLS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(IDIR_IPSEC_TOOLS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(IDIR_IPSEC_TOOLS)/usr/sbin/ $(RSTRIP) $(IDIR_IPSEC_TOOLS) $(IPKG_BUILD) $(IDIR_IPSEC_TOOLS) $(PACKAGE_DIR) diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile index 269a109a77..dbf35c8f94 100644 --- a/package/iptables-snmp/Makefile +++ b/package/iptables-snmp/Makefile @@ -56,7 +56,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IPTABLES_SNMP): install -d -m0755 $(IDIR_IPTABLES_SNMP)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/iptables-snmp.so $(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) diff --git a/package/iptables/Makefile b/package/iptables/Makefile index ed46df259e..1792fe37c6 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -22,7 +22,7 @@ define IPKG_plugin_template $$(IPKG_$(1)): install -m0755 -d $$(IDIR_$(1))/usr/lib/iptables for m in $(2); do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$${m}.so $$(IDIR_$(1))/usr/lib/iptables/ ; \ done @[ -z "$(3)" ] || $(MAKE) $(3) $(RSTRIP) $$(IDIR_$(1)) @@ -73,10 +73,10 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IPTABLES): install -d -m0755 $(IDIR_IPTABLES)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR $(patsubst %,lib%.so,$(IPT_BUILTIN)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ + $(CP) $(patsubst %,lib%.so,$(IPT_BUILTIN)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ ) $(RSTRIP) $(IDIR_IPTABLES) $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) @@ -86,29 +86,29 @@ $(IPKG_IPTABLES_EXTRA): $(IPKG_IPTABLES_UTILS): install -d -m0755 $(IDIR_IPTABLES_UTILS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(IDIR_IPTABLES_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(IDIR_IPTABLES_UTILS)/usr/sbin/ $(RSTRIP) $(IDIR_IPTABLES_UTILS) $(IPKG_BUILD) $(IDIR_IPTABLES_UTILS) $(PACKAGE_DIR) $(IPKG_IP6TABLES): install -d -m0755 $(IDIR_IP6TABLES)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(IDIR_IP6TABLES)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ip6tables $(IDIR_IP6TABLES)/usr/sbin/ install -d -m0755 $(IDIR_IP6TABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables/ \ + $(CP) libip6t_*.so $(IDIR_IP6TABLES)/usr/lib/iptables/ \ ) $(RSTRIP) $(IDIR_IP6TABLES) $(IPKG_BUILD) $(IDIR_IP6TABLES) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libipq.a: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libipq.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(STAGING_DIR)/usr/lib/ layer7-install: mkdir -p $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols - cp files/l7/*.pat $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols/ + $(CP) files/l7/*.pat $(IDIR_IPTABLES_MOD_FILTER)/etc/l7-protocols/ install-dev: $(STAGING_DIR)/usr/lib/libipq.a diff --git a/package/irssi/Makefile b/package/irssi/Makefile index fa70e148fb..bdf82a3047 100644 --- a/package/irssi/Makefile +++ b/package/irssi/Makefile @@ -61,7 +61,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_IRSSI): mkdir -p $(IDIR_IRSSI)/usr/bin - cp $(PKG_BUILD_DIR)/src/fe-text/$(PKG_NAME) $(IDIR_IRSSI)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/src/fe-text/$(PKG_NAME) $(IDIR_IRSSI)/usr/bin/ $(STRIP) $(IDIR_IRSSI)/usr/bin/* $(IPKG_BUILD) $(IDIR_IRSSI) $(PACKAGE_DIR) diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile index dbd2bd4ade..11fd017a4d 100644 --- a/package/jpeg/Makefile +++ b/package/jpeg/Makefile @@ -63,16 +63,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBJPEG): install -d -m0755 $(IDIR_LIBJPEG)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libjpeg.so.* $(IDIR_LIBJPEG)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.so.* $(IDIR_LIBJPEG)/usr/lib/ $(RSTRIP) $(IDIR_LIBJPEG) $(IPKG_BUILD) $(IDIR_LIBJPEG) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libjpeg.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/jpeglib.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/j{config,error,morecfg}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/jpeglib.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/j{config,error,morecfg}.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libjpeg.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjpeg.{a,so*} $(STAGING_DIR)/usr/lib/ install-dev: $(STAGING_DIR)/usr/lib/libjpeg.so diff --git a/package/kismet/Makefile b/package/kismet/Makefile index 58e3f501ad..5603a705e4 100644 --- a/package/kismet/Makefile +++ b/package/kismet/Makefile @@ -74,7 +74,7 @@ $(IPKG_KISMET_CLIENT): install -m0644 ./files/kismet.conf $(IDIR_KISMET_CLIENT)/etc/kismet/ install -m0644 ./files/kismet_ui.conf $(IDIR_KISMET_CLIENT)/etc/kismet/ install -d -m0755 $(IDIR_KISMET_CLIENT)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/kismet_client $(IDIR_KISMET_CLIENT)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/kismet_client $(IDIR_KISMET_CLIENT)/usr/bin/ $(RSTRIP) $(IDIR_KISMET_CLIENT) $(IPKG_BUILD) $(IDIR_KISMET_CLIENT) $(PACKAGE_DIR) @@ -82,7 +82,7 @@ $(IPKG_KISMET_DRONE): install -d -m0755 $(IDIR_KISMET_DRONE)/etc/kismet/ install -m0644 ./files/kismet_drone.conf $(IDIR_KISMET_DRONE)/etc/kismet/ install -d -m0755 $(IDIR_KISMET_DRONE)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/kismet_drone $(IDIR_KISMET_DRONE)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/kismet_drone $(IDIR_KISMET_DRONE)/usr/bin/ $(RSTRIP) $(IDIR_KISMET_DRONE) $(IPKG_BUILD) $(IDIR_KISMET_DRONE) $(PACKAGE_DIR) @@ -92,7 +92,7 @@ $(IPKG_KISMET_SERVER): install -m0644 ./files/client_manuf $(IDIR_KISMET_SERVER)/etc/kismet/ install -m0644 ./files/kismet.conf $(IDIR_KISMET_SERVER)/etc/kismet/ mkdir -p $(IDIR_KISMET_SERVER)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/kismet_server $(IDIR_KISMET_SERVER)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/kismet_server $(IDIR_KISMET_SERVER)/usr/bin/ $(RSTRIP) $(IDIR_KISMET_SERVER) $(IPKG_BUILD) $(IDIR_KISMET_SERVER) $(PACKAGE_DIR) diff --git a/package/knock/Makefile b/package/knock/Makefile index 68293f102d..d8d6262e86 100644 --- a/package/knock/Makefile +++ b/package/knock/Makefile @@ -62,7 +62,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KNOCK): install -d -m0755 $(IDIR_KNOCK)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/knock $(IDIR_KNOCK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/knock $(IDIR_KNOCK)/usr/bin/ $(RSTRIP) $(IDIR_KNOCK) $(IPKG_BUILD) $(IDIR_KNOCK) $(PACKAGE_DIR) @@ -70,6 +70,6 @@ $(IPKG_KNOCKD): install -d -m0755 $(IDIR_KNOCKD)/etc install -m0600 $(PKG_INSTALL_DIR)/etc/knockd.conf $(IDIR_KNOCKD)/etc/ install -d -m0755 $(IDIR_KNOCKD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/knockd $(IDIR_KNOCKD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/knockd $(IDIR_KNOCKD)/usr/sbin/ $(RSTRIP) $(IDIR_KNOCKD) $(IPKG_BUILD) $(IDIR_KNOCKD) $(PACKAGE_DIR) diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile index e138f51a9a..278ecdd297 100644 --- a/package/l2tpns/Makefile +++ b/package/l2tpns/Makefile @@ -33,10 +33,10 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_L2TPNS): install -d -m0755 $(IDIR_L2TPNS)/etc/l2tpns - cp -fpR $(PKG_INSTALL_DIR)/etc/l2tpns/* $(IDIR_L2TPNS)/etc/l2tpns/ + $(CP) $(PKG_INSTALL_DIR)/etc/l2tpns/* $(IDIR_L2TPNS)/etc/l2tpns/ install -d -m0755 $(IDIR_L2TPNS)/usr/lib/l2tpns - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/l2tpns/* $(IDIR_L2TPNS)/usr/lib/l2tpns/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/l2tpns/* $(IDIR_L2TPNS)/usr/lib/l2tpns/ install -d -m0755 $(IDIR_L2TPNS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_L2TPNS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(IDIR_L2TPNS)/usr/sbin/ $(RSTRIP) $(IDIR_L2TPNS) $(IPKG_BUILD) $(IDIR_L2TPNS) $(PACKAGE_DIR) diff --git a/package/libamsel/Makefile b/package/libamsel/Makefile index 530582f3ce..0a32c73eaf 100644 --- a/package/libamsel/Makefile +++ b/package/libamsel/Makefile @@ -33,18 +33,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBAMSEL): install -d -m0755 $(IDIR_LIBAMSEL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/* $(IDIR_LIBAMSEL)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(IDIR_LIBAMSEL)/usr/lib $(RSTRIP) $(IDIR_LIBAMSEL) $(IPKG_BUILD) $(IDIR_LIBAMSEL) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libamsel.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/amsel/compat.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/amsel/compat.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/include/compat - cp -fpR $(PKG_INSTALL_DIR)/usr/include/amsel/compat/queue.h $(STAGING_DIR)/usr/include/compat + $(CP) $(PKG_INSTALL_DIR)/usr/include/amsel/compat/queue.h $(STAGING_DIR)/usr/include/compat mkdir -p $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libamsel.so $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libamsel.so $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/libamsel.so install-dev: $(STAGING_DIR)/usr/lib/libamsel.so diff --git a/package/libao/Makefile b/package/libao/Makefile index 5df454c7c6..dee885ea2d 100644 --- a/package/libao/Makefile +++ b/package/libao/Makefile @@ -66,18 +66,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBAO): install -m0755 -d $(IDIR_LIBAO)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libao.so.* $(IDIR_LIBAO)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.so.* $(IDIR_LIBAO)/usr/lib/ $(RSTRIP) $(IDIR_LIBAO) $(IPKG_BUILD) $(IDIR_LIBAO) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libao.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/ao $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ao $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libao.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libao.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ao.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ao.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ao.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ao.pc touch $@ diff --git a/package/libart/Makefile b/package/libart/Makefile index bbf2ead77c..558ff21235 100644 --- a/package/libart/Makefile +++ b/package/libart/Makefile @@ -59,19 +59,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBART): install -d -m0755 $(IDIR_LIBART)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.so.* $(IDIR_LIBART)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.so.* $(IDIR_LIBART)/usr/lib/ $(RSTRIP) $(IDIR_LIBART) $(IPKG_BUILD) $(IDIR_LIBART) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libart_lgpl_2.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libart2-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libart2-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libart-2.0 $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libart-2.0 $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libart-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libart-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libart_lgpl_2.so diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile index cefad8cbc3..308bf169c3 100644 --- a/package/libaudiofile/Makefile +++ b/package/libaudiofile/Makefile @@ -62,22 +62,22 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(IPKG_LIBAUDIOFILE): install -m0755 -d $(IDIR_LIBAUDIOFILE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so.* $(IDIR_LIBAUDIOFILE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so.* $(IDIR_LIBAUDIOFILE)/usr/lib/ $(RSTRIP) $(IDIR_LIBAUDIOFILE) $(IPKG_BUILD) $(IDIR_LIBAUDIOFILE) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libaudiofile.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/audiofile-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/audiofile-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/af_vfs.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/audiofile.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/aupvlist.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/af_vfs.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/audiofile.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/aupvlist.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/audiofile.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/audiofile.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/audiofile.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/audiofile.pc touch $@ diff --git a/package/libcli/Makefile b/package/libcli/Makefile index 78fb0b6bf9..398ee092d2 100755 --- a/package/libcli/Makefile +++ b/package/libcli/Makefile @@ -31,15 +31,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBCLI): install -d -m0755 $(IDIR_LIBCLI)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcli* $(IDIR_LIBCLI)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcli* $(IDIR_LIBCLI)/usr/lib $(RSTRIP) $(IDIR_LIBCLI) $(IPKG_BUILD) $(IDIR_LIBCLI) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libcli.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libcli.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libcli.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcli.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcli.so* $(STAGING_DIR)/usr/lib/ install-dev: $(STAGING_DIR)/usr/lib/libcli.so diff --git a/package/libdaemon/Makefile b/package/libdaemon/Makefile index 97fe890c89..272e8c2b75 100644 --- a/package/libdaemon/Makefile +++ b/package/libdaemon/Makefile @@ -63,18 +63,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBDAEMON): install -d -m0755 $(IDIR_LIBDAEMON)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so.* $(IDIR_LIBDAEMON)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so.* $(IDIR_LIBDAEMON)/usr/lib/ $(RSTRIP) $(IDIR_LIBDAEMON) $(IPKG_BUILD) $(IDIR_LIBDAEMON) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libdaemon.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libdaemon $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libdaemon $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdaemon.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdaemon.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdaemon.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libdaemon.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libdaemon.pc touch $@ diff --git a/package/libdb/Makefile b/package/libdb/Makefile index 0fc8687b58..d2ecf93f1b 100644 --- a/package/libdb/Makefile +++ b/package/libdb/Makefile @@ -70,15 +70,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBDB): install -m0755 -d $(IDIR_LIBDB)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdb*.so $(IDIR_LIBDB)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb*.so $(IDIR_LIBDB)/usr/lib/ $(RSTRIP) $(IDIR_LIBDB) $(IPKG_BUILD) $(IDIR_LIBDB) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libdb.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/db.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/db.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdb*.{a,so} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdb*.{a,so} $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/libdb.so install-dev: $(STAGING_DIR)/usr/lib/libdb.so diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile index bb48d4430d..d325a05335 100644 --- a/package/libdnet/Makefile +++ b/package/libdnet/Makefile @@ -66,20 +66,20 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBDNET): install -m0755 -d $(IDIR_LIBDNET)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* $(IDIR_LIBDNET)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* $(IDIR_LIBDNET)/usr/lib/ install -m0755 -d $(IDIR_LIBDNET)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dnet $(IDIR_LIBDNET)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnet $(IDIR_LIBDNET)/usr/sbin/ $(RSTRIP) $(IDIR_LIBDNET) $(IPKG_BUILD) $(IDIR_LIBDNET) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libdnet.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/dnet.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/dnet $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/dnet $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libdnet.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libdnet.so diff --git a/package/libelf/Makefile b/package/libelf/Makefile index f6fd702c49..29057b74f4 100644 --- a/package/libelf/Makefile +++ b/package/libelf/Makefile @@ -67,15 +67,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBELF): install -d -m0755 $(IDIR_LIBELF)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libelf.so.* $(IDIR_LIBELF)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.so.* $(IDIR_LIBELF)/usr/lib/ $(RSTRIP) $(IDIR_LIBELF) $(IPKG_BUILD) $(IDIR_LIBELF) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libelf.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libelf* $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libelf* $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libelf.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.{a,so*} $(STAGING_DIR)/usr/lib/ install-dev: $(STAGING_DIR)/usr/lib/libelf.so diff --git a/package/libevent/Makefile b/package/libevent/Makefile index 7d4d56f13d..487fe559a1 100644 --- a/package/libevent/Makefile +++ b/package/libevent/Makefile @@ -59,16 +59,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBEVENT): install -d -m0755 $(IDIR_LIBEVENT)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so.* $(IDIR_LIBEVENT)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so.* $(IDIR_LIBEVENT)/usr/lib/ $(RSTRIP) $(IDIR_LIBEVENT) $(IPKG_BUILD) $(IDIR_LIBEVENT) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libevent.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/event.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/event.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libevent.{a,so} $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent.{a,so} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libevent.so diff --git a/package/libffi-sable/Makefile b/package/libffi-sable/Makefile index 26bd2d9db8..402ce56f9e 100644 --- a/package/libffi-sable/Makefile +++ b/package/libffi-sable/Makefile @@ -62,15 +62,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBFFI_SABLE): install -m0755 -d $(IDIR_LIBFFI_SABLE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* $(IDIR_LIBFFI_SABLE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.so.* $(IDIR_LIBFFI_SABLE)/usr/lib/ $(RSTRIP) $(IDIR_LIBFFI_SABLE) $(IPKG_BUILD) $(IDIR_LIBFFI_SABLE) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libffi.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/ffi{,target}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ffi{,target}.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libffi.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libffi.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libffi.so diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile index 6a3028797a..bf35eef234 100644 --- a/package/libgcrypt/Makefile +++ b/package/libgcrypt/Makefile @@ -62,19 +62,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGCRYPT): install -m0755 -d $(IDIR_LIBGCRYPT)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.so.* $(IDIR_LIBGCRYPT)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.so.* $(IDIR_LIBGCRYPT)/usr/lib/ $(RSTRIP) $(IDIR_LIBGCRYPT) $(IPKG_BUILD) $(IDIR_LIBGCRYPT) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgcrypt.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gcrypt*.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gcrypt*.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/share/aclocal - cp -fpR $(PKG_INSTALL_DIR)/usr/share/aclocal/libgcrypt.m4 $(STAGING_DIR)/usr/share/aclocal/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgcrypt.m4 $(STAGING_DIR)/usr/share/aclocal/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgcrypt.so diff --git a/package/libgd/Makefile b/package/libgd/Makefile index aedb0af117..0d31287df0 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -67,18 +67,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGD): install -d -m0755 $(IDIR_LIBGD)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgd.so.* $(IDIR_LIBGD)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.so.* $(IDIR_LIBGD)/usr/lib/ $(RSTRIP) $(IDIR_LIBGD) $(IPKG_BUILD) $(IDIR_LIBGD) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgd.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/entities.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gd*.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/entities.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gd*.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgd.so diff --git a/package/libgdbm/Makefile b/package/libgdbm/Makefile index dd8ddce1a3..9611e843ad 100644 --- a/package/libgdbm/Makefile +++ b/package/libgdbm/Makefile @@ -62,15 +62,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGDBM): $(STAGING_DIR)/usr/lib/libgdbm.so install -m0755 -d $(IDIR_LIBGDBM)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(IDIR_LIBGDBM)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(IDIR_LIBGDBM)/usr/lib/ $(RSTRIP) $(IDIR_LIBGDBM) $(IPKG_BUILD) $(IDIR_LIBGDBM) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgdbm.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.{a,so*} $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/libgdbm.so install-dev: $(STAGING_DIR)/usr/lib/libgdbm.so diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index 6b34bb5e69..eb127d3f17 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -63,19 +63,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBGPG_ERROR): install -m0755 -d $(IDIR_LIBGPG_ERROR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* $(IDIR_LIBGPG_ERROR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* $(IDIR_LIBGPG_ERROR)/usr/lib/ $(RSTRIP) $(IDIR_LIBGPG_ERROR) $(IPKG_BUILD) $(IDIR_LIBGPG_ERROR) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libgpg-error.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/gpg-error.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/gpg-error.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/share/aclocal - cp -fpR $(PKG_INSTALL_DIR)/usr/share/aclocal/gpg-error.m4 $(STAGING_DIR)/usr/share/aclocal/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/gpg-error.m4 $(STAGING_DIR)/usr/share/aclocal/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libgpg-error.so diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile index 42c9e68624..b4281652c4 100644 --- a/package/libid3tag/Makefile +++ b/package/libid3tag/Makefile @@ -63,16 +63,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBID3TAG): install -m0755 -d $(IDIR_LIBID3TAG)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so.* $(IDIR_LIBID3TAG)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so.* $(IDIR_LIBID3TAG)/usr/lib/ $(RSTRIP) $(IDIR_LIBID3TAG) $(IPKG_BUILD) $(IDIR_LIBID3TAG) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libid3tag.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/id3tag.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/id3tag.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3tag.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libid3tag.so diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile index dddc3ce885..60b3710c99 100644 --- a/package/liblzo/Makefile +++ b/package/liblzo/Makefile @@ -60,15 +60,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBLZO): install -d -m0755 $(IDIR_LIBLZO)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/liblzo.so.* $(IDIR_LIBLZO)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo.so.* $(IDIR_LIBLZO)/usr/lib $(RSTRIP) $(IDIR_LIBLZO) $(IPKG_BUILD) $(IDIR_LIBLZO) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/liblzo.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/lzo*.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/lzo*.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/liblzo.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo.{a,so*} $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/liblzo.so install-dev: $(STAGING_DIR)/usr/lib/liblzo.so diff --git a/package/libmad/Makefile b/package/libmad/Makefile index 251f9834af..91983eac53 100644 --- a/package/libmad/Makefile +++ b/package/libmad/Makefile @@ -74,16 +74,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBMAD): install -m0755 -d $(IDIR_LIBMAD)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(IDIR_LIBMAD)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(IDIR_LIBMAD)/usr/lib/ $(RSTRIP) $(IDIR_LIBMAD) $(IPKG_BUILD) $(IDIR_LIBMAD) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libmad.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/mad.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/mad.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libmad.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libmad.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libmad.so diff --git a/package/libnet/Makefile b/package/libnet/Makefile index cb6e29e04d..4e89b35411 100644 --- a/package/libnet/Makefile +++ b/package/libnet/Makefile @@ -75,17 +75,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBNET): install -m0755 -d $(IDIR_LIBNET)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(IDIR_LIBNET)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.so.* $(IDIR_LIBNET)/usr/lib/ $(RSTRIP) $(IDIR_LIBNET) $(IPKG_BUILD) $(IDIR_LIBNET) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libnet.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libnet-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libnet* $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libnet* $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnet.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libnet.so diff --git a/package/libnids/Makefile b/package/libnids/Makefile index 3748e93e09..c7e271e5ef 100644 --- a/package/libnids/Makefile +++ b/package/libnids/Makefile @@ -62,15 +62,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBNIDS): install -m0755 -d $(IDIR_LIBNIDS)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnids.so.* $(IDIR_LIBNIDS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnids.so.* $(IDIR_LIBNIDS)/usr/lib/ $(RSTRIP) $(IDIR_LIBNIDS) $(IPKG_BUILD) $(IDIR_LIBNIDS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libnids.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/nids.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/nids.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnids.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnids.{a,so*} $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/libnids.so install-dev: $(STAGING_DIR)/usr/lib/libnids.so diff --git a/package/libogg/Makefile b/package/libogg/Makefile index 6fe529b816..4459aa25f3 100644 --- a/package/libogg/Makefile +++ b/package/libogg/Makefile @@ -62,18 +62,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBOGG): install -m0755 -d $(IDIR_LIBOGG)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libogg.so.* $(IDIR_LIBOGG)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libogg.so.* $(IDIR_LIBOGG)/usr/lib/ $(RSTRIP) $(IDIR_LIBOGG) $(IPKG_BUILD) $(IDIR_LIBOGG) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libogg.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/ogg $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ogg $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libogg.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libogg.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libogg.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libogg.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ogg.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ogg.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc touch $@ diff --git a/package/libosip2/Makefile b/package/libosip2/Makefile index 6fbb73363a..bacf072872 100644 --- a/package/libosip2/Makefile +++ b/package/libosip2/Makefile @@ -65,17 +65,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBOSIP2): install -m0755 -d $(IDIR_LIBOSIP2)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(IDIR_LIBOSIP2)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(IDIR_LIBOSIP2)/usr/lib/ $(RSTRIP) $(IDIR_LIBOSIP2) $(IPKG_BUILD) $(IDIR_LIBOSIP2) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libosip2.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libosip2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libosip2.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libosip2.so diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 42bac46909..670bca0cdb 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -65,15 +65,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBPCAP): install -m0755 -d $(IDIR_LIBPCAP)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(IDIR_LIBPCAP)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(IDIR_LIBPCAP)/usr/lib/ $(RSTRIP) $(IDIR_LIBPCAP) $(IPKG_BUILD) $(IDIR_LIBPCAP) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libpcap.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/pcap* $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/pcap* $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.{a,so*} $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/libpcap.so install-dev: $(STAGING_DIR)/usr/lib/libpcap.so diff --git a/package/libpng/Makefile b/package/libpng/Makefile index 228255c301..8033d42c41 100644 --- a/package/libpng/Makefile +++ b/package/libpng/Makefile @@ -60,20 +60,20 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBPNG): install -d -m0755 $(IDIR_LIBPNG)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.so.* $(IDIR_LIBPNG)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.so.* $(IDIR_LIBPNG)/usr/lib/ $(RSTRIP) $(IDIR_LIBPNG) $(IPKG_BUILD) $(IDIR_LIBPNG) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libpng.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libpng $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/png{,conf}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libpng $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpng{,12}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,^[ILR]_opts=".\+",,g' $(STAGING_DIR)/usr/bin/libpng*-config touch $@ diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile index ad8f44e20d..7e6b8d42e1 100644 --- a/package/libpthread/Makefile +++ b/package/libpthread/Makefile @@ -25,8 +25,8 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(IPKG_LIBPTHREAD): $(PKG_BUILD_DIR)/.built mkdir -p $(IDIR_LIBPTHREAD)/lib - cp -fpR $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/ - cp -fpR $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/ + $(CP) $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/ + $(CP) $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/ $(RSTRIP) $(IDIR_LIBPTHREAD) $(IPKG_BUILD) $(IDIR_LIBPTHREAD) $(PACKAGE_DIR) diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile index 97a7caef4d..9402aa53a9 100644 --- a/package/libtasn1/Makefile +++ b/package/libtasn1/Makefile @@ -70,19 +70,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBTASN1): install -m0755 -d $(IDIR_LIBTASN1)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libtasn1.so.* $(IDIR_LIBTASN1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.so.* $(IDIR_LIBTASN1)/usr/lib/ $(RSTRIP) $(IDIR_LIBTASN1) $(IPKG_BUILD) $(IDIR_LIBTASN1) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libtasn1.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libtasn1.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libtasn1.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libtasn1.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/share/aclocal - cp -fpR $(PKG_INSTALL_DIR)/usr/share/aclocal/libtasn1.m4 $(STAGING_DIR)/usr/share/aclocal/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libtasn1.m4 $(STAGING_DIR)/usr/share/aclocal/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libtasn1.so diff --git a/package/libtool/Makefile b/package/libtool/Makefile index b5926aa0bc..f84d1711ee 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -57,15 +57,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBLTDL): install -m0755 -d $(IDIR_LIBLTDL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libltdl.so.* $(IDIR_LIBLTDL)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libltdl.so.* $(IDIR_LIBLTDL)/usr/lib/ $(RSTRIP) $(IDIR_LIBLTDL) $(IPKG_BUILD) $(IDIR_LIBLTDL) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libltdl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/ltdl.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ltdl.h $(STAGING_DIR)/usr/include/ mkdir -p $(I_LIBLTDL_DEV)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libltdl.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libltdl.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libltdl.so diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile index d09f60d64a..6e862722e6 100644 --- a/package/libupnp/Makefile +++ b/package/libupnp/Makefile @@ -30,19 +30,19 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(IPKG_LIBUPNP): install -m0755 -d $(IDIR_LIBUPNP)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(IDIR_LIBUPNP)/usr/lib/ ; \ - cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(IDIR_LIBUPNP)/usr/lib/ ; \ - cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(IDIR_LIBUPNP)/usr/lib/ ; \ + $(CP) $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(IDIR_LIBUPNP)/usr/lib/ ; \ + $(CP) $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(IDIR_LIBUPNP)/usr/lib/ ; \ + $(CP) $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(IDIR_LIBUPNP)/usr/lib/ ; \ $(RSTRIP) $(IDIR_LIBUPNP) $(IPKG_BUILD) $(IDIR_LIBUPNP) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libupnp.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include/upnp - cp -fpR $(PKG_BUILD_DIR)/upnp/inc/*.h $(STAGING_DIR)/usr/include/upnp/ + $(CP) $(PKG_BUILD_DIR)/upnp/inc/*.h $(STAGING_DIR)/usr/include/upnp/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(STAGING_DIR)/usr/lib/ ; \ - cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(STAGING_DIR)/usr/lib/ ; \ - cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(STAGING_DIR)/usr/lib/ ; \ + $(CP) $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(STAGING_DIR)/usr/lib/ ; \ + $(CP) $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(STAGING_DIR)/usr/lib/ ; \ + $(CP) $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(STAGING_DIR)/usr/lib/ ; \ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libupnp.so diff --git a/package/libusb/Makefile b/package/libusb/Makefile index 55af3d6215..e6cf4ba2bb 100644 --- a/package/libusb/Makefile +++ b/package/libusb/Makefile @@ -61,17 +61,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBUSB): install -m0755 -d $(IDIR_LIBUSB)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libusb*.so.* $(IDIR_LIBUSB)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.so.* $(IDIR_LIBUSB)/usr/lib/ $(RSTRIP) $(IDIR_LIBUSB) $(IPKG_BUILD) $(IDIR_LIBUSB) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libusb.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/usb.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/usb.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libusb.so diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index 204d137ecf..ec36018f1c 100644 --- a/package/libvorbis/Makefile +++ b/package/libvorbis/Makefile @@ -70,18 +70,18 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBVORBIS): install -m0755 -d $(IDIR_LIBVORBIS)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbis.so.* $(IDIR_LIBVORBIS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbis.so.* $(IDIR_LIBVORBIS)/usr/lib/ $(RSTRIP) $(IDIR_LIBVORBIS) $(IPKG_BUILD) $(IDIR_LIBVORBIS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libvorbis.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/vorbis $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/vorbis $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbis.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbis{,enc,file}.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbis.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbis{,enc,file}.so* $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/vorbis{,enc,file}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/vorbis{,enc,file}.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/vorbis{,enc,file}.pc $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/vorbis{,enc,file}.pc touch $@ diff --git a/package/libvorbisidec/Makefile b/package/libvorbisidec/Makefile index 4c1fc0bcbe..d668a0e9b7 100644 --- a/package/libvorbisidec/Makefile +++ b/package/libvorbisidec/Makefile @@ -62,16 +62,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBVORBISIDEC): install -m0755 -d $(IDIR_LIBVORBISIDEC)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.so.* $(IDIR_LIBVORBISIDEC)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.so.* $(IDIR_LIBVORBISIDEC)/usr/lib/ $(RSTRIP) $(IDIR_LIBVORBISIDEC) $(IPKG_BUILD) $(IDIR_LIBVORBISIDEC) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libvorbisidec.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/tremor $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/tremor $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libvorbisidec.so diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index d349caa7df..c08d5fe8b2 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -89,19 +89,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBXML2): install -m0755 -d $(IDIR_LIBXML2)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(IDIR_LIBXML2)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(IDIR_LIBXML2)/usr/lib/ $(RSTRIP) $(IDIR_LIBXML2) $(IPKG_BUILD) $(IDIR_LIBXML2) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libxml2.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir}/libxml2,,g' $(STAGING_DIR)/usr/bin/xml2-config $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/bin/xml2-config $(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(STAGING_DIR)/usr/bin/xml2-config diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile index 91738fc1c8..dc6544810f 100644 --- a/package/libxslt/Makefile +++ b/package/libxslt/Makefile @@ -70,19 +70,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBXSLT): install -m0755 -d $(IDIR_LIBXSLT)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* $(IDIR_LIBXSLT)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* $(IDIR_LIBXSLT)/usr/lib/ $(RSTRIP) $(IDIR_LIBXSLT) $(IPKG_BUILD) $(IDIR_LIBXSLT) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libxslt.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/xslt-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xslt-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libxslt $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libxslt $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libxslt.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxslt.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxslt.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxslt.pc $(STAGING_DIR)/usr/lib/pkgconfig/ $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/bin/xslt-config $(SED) 's,-I$(STAGING_DIR)/usr/include,,g' $(STAGING_DIR)/usr/bin/xslt-config $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/bin/xslt-config diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile index 401895c388..97fa3610ad 100644 --- a/package/lighttpd/Makefile +++ b/package/lighttpd/Makefile @@ -122,10 +122,10 @@ $(IPKG_LIGHTTPD): install -m0755 ./files/lighttpd.init $(IDIR_LIGHTTPD)/etc/init.d/lighttpd install -m0755 -d $(IDIR_LIGHTTPD)/usr/lib/lighttpd for m in dirlisting indexfile staticfile; do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$m.so $(IDIR_LIGHTTPD)/usr/lib/lighttpd/ ; \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lighttpd/mod_$$m.so $(IDIR_LIGHTTPD)/usr/lib/lighttpd/ ; \ done install -m0755 -d $(IDIR_LIGHTTPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/lighttpd $(IDIR_LIGHTTPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/lighttpd $(IDIR_LIGHTTPD)/usr/sbin/ $(RSTRIP) $(IDIR_LIGHTTPD) $(IPKG_BUILD) $(IDIR_LIGHTTPD) $(PACKAGE_DIR) diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index 3c7bf9c5b5..93da3afcd4 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -56,13 +56,13 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LINUX_ATM): install -d -m0755 $(IDIR_LINUX_ATM)/usr/lib - cp $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(IDIR_LINUX_ATM)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.so.1 $(IDIR_LINUX_ATM)/usr/lib $(RSTRIP) $(IDIR_LINUX_ATM)/ $(IPKG_BUILD) $(IDIR_LINUX_ATM) $(PACKAGE_DIR) $(IPKG_BR2684CTL): install -d -m0755 $(IDIR_BR2684CTL)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(IDIR_BR2684CTL)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/br2684ctl $(IDIR_BR2684CTL)/usr/sbin/ install -d -m0755 $(IDIR_BR2684CTL)/etc/hotplug.d/net install -m0644 ./files/br2684.init $(IDIR_BR2684CTL)/etc/hotplug.d/net/30-br2684 $(RSTRIP) $(IDIR_BR2684CTL)/ @@ -70,9 +70,9 @@ $(IPKG_BR2684CTL): $(STAGING_DIR)/usr/lib/libatm.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/atm{,d,sap}.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libatm.so diff --git a/package/linux-atm/patches/300-no_autotools.patch b/package/linux-atm/patches/300-no_autotools.patch index 57f8ecb897..a085eca7db 100644 --- a/package/linux-atm/patches/300-no_autotools.patch +++ b/package/linux-atm/patches/300-no_autotools.patch @@ -836,7 +836,7 @@ diff -urN linux-atm.old/aclocal.m4 linux-atm.dev/aclocal.m4 -# serial 46 AC_PROG_LIBTOOL +# serial 47 AC_PROG_LIBTOOL -+# Debian $Rev: 214 $ ++# Debian $Rev$ + +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) diff --git a/package/lrzsz/Makefile b/package/lrzsz/Makefile index 3a399c9a35..bc4fb112bf 100644 --- a/package/lrzsz/Makefile +++ b/package/lrzsz/Makefile @@ -59,8 +59,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LRZSZ): install -d -m0755 $(IDIR_LRZSZ)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/lrz $(IDIR_LRZSZ)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/lsz $(IDIR_LRZSZ)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/lrz $(IDIR_LRZSZ)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/lsz $(IDIR_LRZSZ)/usr/bin/ (cd $(IDIR_LRZSZ)/usr/bin; \ ln -fs lrz lrx; \ ln -fs lrz lrb; \ diff --git a/package/lua/Makefile b/package/lua/Makefile index 4896006f97..ae6d085cf9 100644 --- a/package/lua/Makefile +++ b/package/lua/Makefile @@ -57,19 +57,19 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(IPKG_LIBLUA): install -d -m0755 $(IDIR_LIBLUA)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.so.* $(IDIR_LIBLUA)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.so.* $(IDIR_LIBLUA)/usr/lib/ $(RSTRIP) $(IDIR_LIBLUA) $(IPKG_BUILD) $(IDIR_LIBLUA) $(PACKAGE_DIR) $(IPKG_LUA): install -d -m0755 $(IDIR_LUA)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/lua $(IDIR_LUA)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/lua $(IDIR_LUA)/usr/bin/ $(RSTRIP) $(IDIR_LUA) $(IPKG_BUILD) $(IDIR_LUA) $(PACKAGE_DIR) $(IPKG_LUAC): install -d -m0755 $(IDIR_LUAC)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/luac $(IDIR_LUAC)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/luac $(IDIR_LUAC)/usr/bin/ $(RSTRIP) $(IDIR_LUAC) $(IPKG_BUILD) $(IDIR_LUAC) $(PACKAGE_DIR) @@ -82,10 +82,10 @@ $(IPKG_LUA_EXAMPLES): $(STAGING_DIR)/usr/lib/liblua.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/lua{,lib}.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/lua{,lib}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/lauxlib.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblua{,lib}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/liblua.so diff --git a/package/macchanger/Makefile b/package/macchanger/Makefile index aaa74eb194..75cbb9c8db 100755 --- a/package/macchanger/Makefile +++ b/package/macchanger/Makefile @@ -47,6 +47,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_MACCHANGER): mkdir -p $(IDIR_MACCHANGER) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_MACCHANGER)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_MACCHANGER)/ $(RSTRIP) $(IDIR_MACCHANGER) $(IPKG_BUILD) $(IDIR_MACCHANGER) $(PACKAGE_DIR) diff --git a/package/maradns/Makefile b/package/maradns/Makefile index 9ebf32d9f5..4625ed7c46 100644 --- a/package/maradns/Makefile +++ b/package/maradns/Makefile @@ -66,8 +66,8 @@ $(IPKG_MARADNS): install -d -m0755 $(IDIR_MARADNS)/etc/init.d install -m0755 ./files/maradns.init $(IDIR_MARADNS)/etc/init.d/S60maradns install -d -m0755 $(IDIR_MARADNS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone} $(IDIR_MARADNS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/{askmara,getzone} $(IDIR_MARADNS)/usr/bin/ install -d -m0755 $(IDIR_MARADNS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(IDIR_MARADNS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/{maradns,zoneserver} $(IDIR_MARADNS)/usr/sbin/ $(RSTRIP) $(IDIR_MARADNS) $(IPKG_BUILD) $(IDIR_MARADNS) $(PACKAGE_DIR) diff --git a/package/matrixssl/Makefile b/package/matrixssl/Makefile index dcb8214529..89bd39a92c 100644 --- a/package/matrixssl/Makefile +++ b/package/matrixssl/Makefile @@ -29,16 +29,16 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(IPKG_LIBMATRIXSSL): install -d -m0755 $(IDIR_LIBMATRIXSSL)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(IDIR_LIBMATRIXSSL)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(IDIR_LIBMATRIXSSL)/usr/lib/ $(RSTRIP) $(IDIR_LIBMATRIXSSL) $(IPKG_BUILD) $(IDIR_LIBMATRIXSSL) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libmatrixssl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include/matrixSsl - cp -fpR $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl + $(CP) $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl ln -sf matrixSsl/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl.h mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/usr/lib + $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/usr/lib install-dev: $(STAGING_DIR)/usr/lib/libmatrixssl.so diff --git a/package/microcom/Makefile b/package/microcom/Makefile index 493f57ddf4..ebd7ddffec 100644 --- a/package/microcom/Makefile +++ b/package/microcom/Makefile @@ -26,7 +26,7 @@ $(PKG_BUILD_DIR)/.prepared: touch $@ $(PKG_BUILD_DIR)/.configured: - cp $(PKG_BUILD_DIR)/Makefile $(PKG_BUILD_DIR)/Makefile.tmp + $(CP) $(PKG_BUILD_DIR)/Makefile $(PKG_BUILD_DIR)/Makefile.tmp sed 's~gcc~$$(CC)~' $(PKG_BUILD_DIR)/Makefile.tmp > $(PKG_BUILD_DIR)/Makefile touch $@ diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile index 2261b54cd6..053ac9116b 100644 --- a/package/mini_httpd/Makefile +++ b/package/mini_httpd/Makefile @@ -21,7 +21,7 @@ $(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,$(PKG_VERSION)- $(PKG_BUILD_DIR)/.configured: - cp -f ./files/matrixssl_helper.{c,h} $(PKG_BUILD_DIR)/ + $(CP) ./files/matrixssl_helper.{c,h} $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/.built: diff --git a/package/miredo/Makefile b/package/miredo/Makefile index 17c28f68f2..4b9837663e 100644 --- a/package/miredo/Makefile +++ b/package/miredo/Makefile @@ -71,21 +71,21 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_MIREDO): install -d -m0755 $(IDIR_MIREDO)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/miredo.conf-dist $(IDIR_MIREDO)/etc/miredo.conf + $(CP) $(PKG_INSTALL_DIR)/etc/miredo.conf-dist $(IDIR_MIREDO)/etc/miredo.conf install -d -m0755 $(IDIR_MIREDO)/etc/init.d install -m0755 ./files/miredo.init $(IDIR_MIREDO)/etc/init.d/miredo install -d -m0755 $(IDIR_MIREDO)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/miredo $(IDIR_MIREDO)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/miredo $(IDIR_MIREDO)/usr/sbin/ $(RSTRIP) $(IDIR_MIREDO) $(IPKG_BUILD) $(IDIR_MIREDO) $(PACKAGE_DIR) $(IPKG_MIREDO_SERVER): install -d -m0755 $(IDIR_MIREDO_SERVER)/etc/ - cp -fpR $(PKG_INSTALL_DIR)/etc/miredo-server.conf-dist $(IDIR_MIREDO_SERVER)/etc/miredo-server.conf + $(CP) $(PKG_INSTALL_DIR)/etc/miredo-server.conf-dist $(IDIR_MIREDO_SERVER)/etc/miredo-server.conf install -d -m0755 $(IDIR_MIREDO_SERVER)/etc/init.d install -m0755 ./files/miredo-server.init $(IDIR_MIREDO_SERVER)/etc/init.d/miredo-server install -d -m0755 $(IDIR_MIREDO_SERVER)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/miredo-server $(IDIR_MIREDO_SERVER)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/miredo-server $(IDIR_MIREDO_SERVER)/usr/sbin/ $(RSTRIP) $(IDIR_MIREDO_SERVER) $(IPKG_BUILD) $(IDIR_MIREDO_SERVER) $(PACKAGE_DIR) diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 71775379fb..1e97df4963 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -102,8 +102,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_MPD): install -d -m0755 $(IDIR_MPD)/usr/bin install -d -m0755 $(IDIR_MPD)/etc - cp -fp $(PKG_INSTALL_DIR)/usr/bin/mpd $(IDIR_MPD)/usr/bin - cp -fp $(PKG_BUILD_DIR)/doc/mpdconf.example $(IDIR_MPD)/etc/mpd.conf + $(CP) $(PKG_INSTALL_DIR)/usr/bin/mpd $(IDIR_MPD)/usr/bin + $(CP) $(PKG_BUILD_DIR)/doc/mpdconf.example $(IDIR_MPD)/etc/mpd.conf echo "Depends: $(PKG_DEPENDS)" >> $(IDIR_MPD)/CONTROL/control $(RSTRIP) $(IDIR_MPD) $(IPKG_BUILD) $(IDIR_MPD) $(PACKAGE_DIR) diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index 723e7b03c2..8b6ab7039e 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -39,6 +39,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_MRD6): mkdir -p $(IDIR_MRD6)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/ $(IDIR_MRD6)/ + $(CP) $(PKG_INSTALL_DIR)/ $(IDIR_MRD6)/ $(RSTRIP) $(IDIR_MRD6)/ $(IPKG_BUILD) $(IDIR_MRD6) $(PACKAGE_DIR) diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile index 7a2ab9b43f..fb07500863 100644 --- a/package/mt-daapd/Makefile +++ b/package/mt-daapd/Makefile @@ -73,9 +73,9 @@ $(IPKG_MT_DAAPD): install -m0755 -d $(IDIR_MT_DAAPD)/etc/init.d install -m0755 ./files/mt-daapd.init $(IDIR_MT_DAAPD)/etc/init.d/mt-daapd install -m0755 -d $(IDIR_MT_DAAPD)/usr/share - cp -fpR $(PKG_INSTALL_DIR)/usr/share/mt-daapd $(IDIR_MT_DAAPD)/usr/share/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/mt-daapd $(IDIR_MT_DAAPD)/usr/share/ install -m0755 -d $(IDIR_MT_DAAPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/mt-daapd $(IDIR_MT_DAAPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mt-daapd $(IDIR_MT_DAAPD)/usr/sbin/ $(RSTRIP) $(IDIR_MT_DAAPD) $(IPKG_BUILD) $(IDIR_MT_DAAPD) $(PACKAGE_DIR) diff --git a/package/mtr/Makefile b/package/mtr/Makefile index f49f2ed869..f0885624bb 100644 --- a/package/mtr/Makefile +++ b/package/mtr/Makefile @@ -68,7 +68,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_MTR): install -d -m0755 $(IDIR_MTR)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/mtr $(IDIR_MTR)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mtr $(IDIR_MTR)/usr/sbin/ $(RSTRIP) $(IDIR_MTR) $(IPKG_BUILD) $(IDIR_MTR) $(PACKAGE_DIR) diff --git a/package/mysql/Makefile b/package/mysql/Makefile index ab8d6e5006..ad6b5297be 100644 --- a/package/mysql/Makefile +++ b/package/mysql/Makefile @@ -107,17 +107,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBMYSQLCLIENT): install -d -m0755 $(IDIR_LIBMYSQLCLIENT)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/ $(RSTRIP) $(IDIR_LIBMYSQLCLIENT) $(IPKG_BUILD) $(IDIR_LIBMYSQLCLIENT) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/mysql $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/mysql $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/mysql $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql $(STAGING_DIR)/usr/lib/ rm -f $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.la touch $@ diff --git a/package/nano/Makefile b/package/nano/Makefile index 5ecad7ec43..aec6fa8e62 100644 --- a/package/nano/Makefile +++ b/package/nano/Makefile @@ -66,7 +66,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_NANO): install -d -m0755 $(IDIR_NANO)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/nano $(IDIR_NANO)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/nano $(IDIR_NANO)/usr/bin/ $(RSTRIP) $(IDIR_NANO) $(IPKG_BUILD) $(IDIR_NANO) $(PACKAGE_DIR) diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile index 39674bfd9e..4223b8033b 100644 --- a/package/ncurses/Makefile +++ b/package/ncurses/Makefile @@ -115,11 +115,11 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBNCURSES): install -d -m0755 $(IDIR_LIBNCURSES)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}*.so.* $(IDIR_LIBNCURSES)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}*.so.* $(IDIR_LIBNCURSES)/usr/lib/ install -d -m0755 $(IDIR_LIBNCURSES)/usr/share/terminfo for f in a/ansi d/dumb l/linux r/rxvt s/screen v/vt100 v/vt102 x/xterm x/xterm-color; do \ install -d -m0755 $(IDIR_LIBNCURSES)/usr/share/terminfo/`dirname $${f}`; \ - cp -fpR $(PKG_INSTALL_DIR)/usr/share/terminfo/$${f} \ + $(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$${f} \ $(IDIR_LIBNCURSES)/usr/share/terminfo/$${f}; \ done $(RSTRIP) $(IDIR_LIBNCURSES) @@ -127,15 +127,15 @@ $(IPKG_LIBNCURSES): $(STAGING_DIR)/usr/lib/libncurses.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/curses.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/{ncurses,panel}.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/panel.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/menu.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/curses.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/{ncurses,panel}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/panel.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/term{,cap}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/unctrl.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/menu.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurses.so $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libncurses.so diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 0b4914d6c8..25a1cc6d1b 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -150,7 +150,7 @@ endif $(IPKG_LIBNETSNMP): install -d -m0755 $(IDIR_LIBNETSNMP)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.so.* $(IDIR_LIBNETSNMP)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.so.* $(IDIR_LIBNETSNMP)/usr/lib/ $(RSTRIP) $(IDIR_LIBNETSNMP) $(IPKG_BUILD) $(IDIR_LIBNETSNMP) $(PACKAGE_DIR) @@ -180,17 +180,17 @@ $(IPKG_SNMPD_STATIC): $(IPKG_SNMP_UTILS): install -d -m0755 $(IDIR_SNMP_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(IDIR_SNMP_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(IDIR_SNMP_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_SNMP_UTILS) $(IPKG_BUILD) $(IDIR_SNMP_UTILS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libnetsnmp.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/net-snmp-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/net-snmp $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/net-snmp $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libnetsnmp.so diff --git a/package/netstat-nat/Makefile b/package/netstat-nat/Makefile index a6fa4e8842..3e0ab204c7 100644 --- a/package/netstat-nat/Makefile +++ b/package/netstat-nat/Makefile @@ -58,7 +58,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_NETSTAT-NAT): install -d -m0755 $(IDIR_NETSTAT-NAT)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/netstat-nat $(IDIR_NETSTAT-NAT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/netstat-nat $(IDIR_NETSTAT-NAT)/usr/bin/ $(RSTRIP) $(IDIR_NETSTAT-NAT) $(IPKG_BUILD) $(IDIR_NETSTAT-NAT) $(PACKAGE_DIR) diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 659bff9580..23997b88fe 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -67,10 +67,10 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_NMAP): install -d -m0755 $(IDIR_NMAP)/usr/share/nmap for file in mac-prefixes os-fingerprints protocols rpc service-probes services; do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/share/nmap/nmap-$$file $(IDIR_NMAP)/usr/share/nmap; \ + $(CP) $(PKG_INSTALL_DIR)/usr/share/nmap/nmap-$$file $(IDIR_NMAP)/usr/share/nmap; \ done install -d -m0755 $(IDIR_NMAP)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/nmap $(IDIR_NMAP)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/nmap $(IDIR_NMAP)/usr/bin/ $(RSTRIP) $(IDIR_NMAP) $(IPKG_BUILD) $(IDIR_NMAP) $(PACKAGE_DIR) diff --git a/package/nocatsplash/Makefile b/package/nocatsplash/Makefile index 8820413e4d..4d2120e776 100644 --- a/package/nocatsplash/Makefile +++ b/package/nocatsplash/Makefile @@ -58,7 +58,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_NOCATSPLASH): mkdir -p $(IDIR_NOCATSPLASH) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_NOCATSPLASH)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_NOCATSPLASH)/ $(RSTRIP) $(IDIR_NOCATSPLASH) $(IPKG_BUILD) $(IDIR_NOCATSPLASH) $(PACKAGE_DIR) diff --git a/package/nvram/Makefile b/package/nvram/Makefile index 3e4c2d3fe8..dd460fc06d 100644 --- a/package/nvram/Makefile +++ b/package/nvram/Makefile @@ -13,7 +13,7 @@ $(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp -a ./src/* $(PKG_BUILD_DIR) + $(CP) ./src/* $(PKG_BUILD_DIR) touch $@ $(PKG_BUILD_DIR)/.configured: @@ -27,9 +27,9 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_NVRAM): mkdir -p $(IDIR_NVRAM)/usr/lib - cp $(PKG_BUILD_DIR)/*.so $(IDIR_NVRAM)/usr/lib + $(CP) $(PKG_BUILD_DIR)/*.so $(IDIR_NVRAM)/usr/lib mkdir -p $(IDIR_NVRAM)/usr/sbin - cp $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin $(RSTRIP) $(IDIR_NVRAM) $(IPKG_BUILD) $(IDIR_NVRAM) $(PACKAGE_DIR) @@ -37,6 +37,6 @@ $(IPKG_NVRAM): compile-targets: install-dev install-dev: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/lib - cp $(PKG_BUILD_DIR)/*.so $(STAGING_DIR)/usr/lib + $(CP) $(PKG_BUILD_DIR)/*.so $(STAGING_DIR)/usr/lib diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile index 0c427a32ed..a5092c8758 100644 --- a/package/olsrd/Makefile +++ b/package/olsrd/Makefile @@ -61,9 +61,9 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_OLSRD): install -d -m0755 $(IDIR_OLSRD)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/olsrd.conf $(IDIR_OLSRD)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/olsrd.conf $(IDIR_OLSRD)/etc/ install -d -m0755 $(IDIR_OLSRD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/olsrd $(IDIR_OLSRD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/olsrd $(IDIR_OLSRD)/usr/sbin/ install -d -m0755 $(IDIR_OLSRD)/etc/init.d install -m0755 ./files/olsrd.init $(IDIR_OLSRD)/etc/init.d/S60olsrd $(RSTRIP) $(IDIR_OLSRD) @@ -73,4 +73,4 @@ $(IPKG_OLSRD_MOD_SECURE): $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/olsrd_secure_key $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/olsrd_secure_key: install -d -m0755 $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d - cp -fpR ./files/olsrd_secure_key $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/ + $(CP) ./files/olsrd_secure_key $(IDIR_OLSRD_MOD_SECURE)/etc/olsrd.d/ diff --git a/package/opencdk/Makefile b/package/opencdk/Makefile index c313c49d22..c40b0c24eb 100644 --- a/package/opencdk/Makefile +++ b/package/opencdk/Makefile @@ -71,17 +71,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBOPENCDK): install -m0755 -d $(IDIR_LIBOPENCDK)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libopencdk.so.* $(IDIR_LIBOPENCDK)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopencdk.so.* $(IDIR_LIBOPENCDK)/usr/lib/ $(RSTRIP) $(IDIR_LIBOPENCDK) $(IPKG_BUILD) $(IDIR_LIBOPENCDK) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libopencdk.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/opencdk-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/opencdk-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/opencdk.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/opencdk.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libopencdk.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopencdk.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libopencdk.so diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 5909ee530f..5eac5807e8 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -109,25 +109,25 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBOPENLDAP): mkdir -p $(IDIR_LIBOPENLDAP)/etc/openldap - cp -fpR $(PKG_INSTALL_DIR)/etc/openldap/ldap.conf $(IDIR_LIBOPENLDAP)/etc/openldap/ + $(CP) $(PKG_INSTALL_DIR)/etc/openldap/ldap.conf $(IDIR_LIBOPENLDAP)/etc/openldap/ mkdir -p $(IDIR_LIBOPENLDAP)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.so.* $(IDIR_LIBOPENLDAP)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.so.* $(IDIR_LIBOPENLDAP)/usr/lib/ mkdir -p $(IDIR_LIBOPENLDAP)/usr/share/openldap - cp -fpR $(PKG_INSTALL_DIR)/usr/share/openldap/* $(IDIR_LIBOPENLDAP)/usr/share/openldap/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/openldap/* $(IDIR_LIBOPENLDAP)/usr/share/openldap/ $(RSTRIP) $(IDIR_LIBOPENLDAP) $(IPKG_BUILD) $(IDIR_LIBOPENLDAP) $(PACKAGE_DIR) $(IPKG_OPENLDAP_UTILS): mkdir -p $(IDIR_OPENLDAP_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ldap* $(IDIR_OPENLDAP_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ldap* $(IDIR_OPENLDAP_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_OPENLDAP_UTILS) $(IPKG_BUILD) $(IDIR_OPENLDAP_UTILS) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libldap.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libldap.so diff --git a/package/openser/Makefile b/package/openser/Makefile index 29d72864f5..d3b482678f 100644 --- a/package/openser/Makefile +++ b/package/openser/Makefile @@ -42,17 +42,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_OPENSER): mkdir -p $(IDIR_OPENSER)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_OPENSER)/usr/sbin/ - cp -fpR $(PKG_BUILD_DIR)/utils/gen_ha1/gen_ha1 $(IDIR_OPENSER)/usr/sbin/openser_gen_ha1 - cp -fpR $(PKG_BUILD_DIR)/scripts/sc $(IDIR_OPENSER)/usr/sbin/openserctl + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_OPENSER)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/utils/gen_ha1/gen_ha1 $(IDIR_OPENSER)/usr/sbin/openser_gen_ha1 + $(CP) $(PKG_BUILD_DIR)/scripts/sc $(IDIR_OPENSER)/usr/sbin/openserctl chmod 744 $(IDIR_OPENSER)/usr/sbin/openserctl - cp -fpR $(PKG_BUILD_DIR)/scripts/sc.dbtext $(IDIR_OPENSER)/usr/sbin/dbtextctl + $(CP) $(PKG_BUILD_DIR)/scripts/sc.dbtext $(IDIR_OPENSER)/usr/sbin/dbtextctl chmod 744 $(IDIR_OPENSER)/usr/sbin/dbtextctl mkdir -p $(IDIR_OPENSER)/usr/lib/openser/modules (cd $(PKG_BUILD_DIR);\ - cp -a $(OPENSER_MODULE_FILES) $(IDIR_OPENSER)/usr/lib/openser/modules/; \ + $(CP) $(OPENSER_MODULE_FILES) $(IDIR_OPENSER)/usr/lib/openser/modules/; \ ) mkdir -p $(IDIR_OPENSER)/etc/openser - cp -fpR $(PKG_BUILD_DIR)/etc/openser.cfg $(IDIR_OPENSER)/etc/openser/ + $(CP) $(PKG_BUILD_DIR)/etc/openser.cfg $(IDIR_OPENSER)/etc/openser/ $(RSTRIP) $(IDIR_OPENSER) $(IPKG_BUILD) $(IDIR_OPENSER) $(PACKAGE_DIR) diff --git a/package/openssh/Makefile b/package/openssh/Makefile index c0d296d230..1dca669fe1 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -81,42 +81,42 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_OPENSSH_CLIENT): install -m0700 -d $(IDIR_OPENSSH_CLIENT)/etc/ssh - cp -fpR $(PKG_INSTALL_DIR)/etc/ssh/ssh_config $(IDIR_OPENSSH_CLIENT)/etc/ssh/ + $(CP) $(PKG_INSTALL_DIR)/etc/ssh/ssh_config $(IDIR_OPENSSH_CLIENT)/etc/ssh/ install -m0755 -d $(IDIR_OPENSSH_CLIENT)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh $(IDIR_OPENSSH_CLIENT)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/scp $(IDIR_OPENSSH_CLIENT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh $(IDIR_OPENSSH_CLIENT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/scp $(IDIR_OPENSSH_CLIENT)/usr/bin/ $(RSTRIP) $(IDIR_OPENSSH_CLIENT) $(IPKG_BUILD) $(IDIR_OPENSSH_CLIENT) $(PACKAGE_DIR) $(IPKG_OPENSSH_CLIENT_UTILS): install -m0755 -d $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh-add $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh-agent $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh-keyscan $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-add $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-agent $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keyscan $(IDIR_OPENSSH_CLIENT_UTILS)/usr/bin/ $(RSTRIP) $(IDIR_OPENSSH_CLIENT_UTILS) $(IPKG_BUILD) $(IDIR_OPENSSH_CLIENT_UTILS) $(PACKAGE_DIR) $(IPKG_OPENSSH_SERVER): install -m0700 -d $(IDIR_OPENSSH_SERVER)/etc/ssh - cp -fpR $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(IDIR_OPENSSH_SERVER)/etc/ssh/ + $(CP) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(IDIR_OPENSSH_SERVER)/etc/ssh/ install -m0755 -d $(IDIR_OPENSSH_SERVER)/etc/init.d install -m0755 ./files/S50sshd $(IDIR_OPENSSH_SERVER)/etc/init.d/ install -m0755 -d $(IDIR_OPENSSH_SERVER)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(IDIR_OPENSSH_SERVER)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/ssh-keygen $(IDIR_OPENSSH_SERVER)/usr/bin/ install -m0755 -d $(IDIR_OPENSSH_SERVER)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/sshd $(IDIR_OPENSSH_SERVER)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/sshd $(IDIR_OPENSSH_SERVER)/usr/sbin/ $(RSTRIP) $(IDIR_OPENSSH_SERVER) $(IPKG_BUILD) $(IDIR_OPENSSH_SERVER) $(PACKAGE_DIR) $(IPKG_OPENSSH_SFTP_CLIENT): install -m0755 -d $(IDIR_OPENSSH_SFTP_CLIENT)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/sftp $(IDIR_OPENSSH_SFTP_CLIENT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/sftp $(IDIR_OPENSSH_SFTP_CLIENT)/usr/bin/ $(RSTRIP) $(IDIR_OPENSSH_SFTP_CLIENT) $(IPKG_BUILD) $(IDIR_OPENSSH_SFTP_CLIENT) $(PACKAGE_DIR) $(IPKG_OPENSSH_SFTP_SERVER): install -m0755 -d $(IDIR_OPENSSH_SFTP_SERVER)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/sftp-server $(IDIR_OPENSSH_SFTP_SERVER)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/sftp-server $(IDIR_OPENSSH_SFTP_SERVER)/usr/lib/ install -m0755 -d $(IDIR_OPENSSH_SFTP_SERVER)/usr/libexec ln -sf ../lib/sftp-server $(IDIR_OPENSSH_SFTP_SERVER)/usr/libexec/sftp-server $(RSTRIP) $(IDIR_OPENSSH_SFTP_SERVER) diff --git a/package/openssl/Makefile b/package/openssl/Makefile index f822e9ad54..bc8b43c1dd 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -63,26 +63,26 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBOPENSSL): install -d -m0755 $(IDIR_LIBOPENSSL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(IDIR_LIBOPENSSL)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(IDIR_LIBOPENSSL)/usr/lib/ chmod 0644 $(IDIR_LIBOPENSSL)/usr/lib/* $(RSTRIP) $(IDIR_LIBOPENSSL) $(IPKG_BUILD) $(IDIR_LIBOPENSSL) $(PACKAGE_DIR) $(IPKG_OPENSSL_UTIL): install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl - cp -fpR $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(IDIR_OPENSSL_UTIL)/etc/ssl/ + $(CP) $(PKG_INSTALL_DIR)/etc/ssl/openssl.cnf $(IDIR_OPENSSL_UTIL)/etc/ssl/ install -d -m0755 $(IDIR_OPENSSL_UTIL)/etc/ssl/certs install -d -m0700 $(IDIR_OPENSSL_UTIL)/etc/ssl/private install -d -m0755 $(IDIR_OPENSSL_UTIL)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/openssl $(IDIR_OPENSSL_UTIL)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/openssl $(IDIR_OPENSSL_UTIL)/usr/bin/ $(RSTRIP) $(IDIR_OPENSSL_UTIL) $(IPKG_BUILD) $(IDIR_OPENSSL_UTIL) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libssl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/openssl $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/openssl $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libssl.so diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 037cb0d73f..a34bf4436c 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -81,7 +81,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_OPENVPN): install -d -m0755 $(IDIR_OPENVPN)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/ $(RSTRIP) $(IDIR_OPENVPN) echo "Depends: $(PKG_DEPEND)" >> $(IDIR_OPENVPN)/CONTROL/control $(IPKG_BUILD) $(IDIR_OPENVPN) $(PACKAGE_DIR) diff --git a/package/osiris/Makefile b/package/osiris/Makefile index ba0db6c22f..54a4a99c14 100644 --- a/package/osiris/Makefile +++ b/package/osiris/Makefile @@ -68,6 +68,6 @@ $(IPKG_OSIRISD): install -d -m0755 $(IDIR_OSIRISD)/etc/init.d install -m0755 ./files/osirisd.init $(IDIR_OSIRISD)/etc/init.d/osirisd install -d -m0755 $(IDIR_OSIRISD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(IDIR_OSIRISD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/osirisd $(IDIR_OSIRISD)/usr/sbin/ $(RSTRIP) $(IDIR_OSIRISD) $(IPKG_BUILD) $(IDIR_OSIRISD) $(PACKAGE_DIR) diff --git a/package/p910nd/Makefile b/package/p910nd/Makefile index 917b0fa020..491e6e5193 100644 --- a/package/p910nd/Makefile +++ b/package/p910nd/Makefile @@ -33,7 +33,7 @@ $(IPKG_P910ND): install -m0755 ./files/p910nd.init $(IDIR_P910ND)/etc/init.d/p910nd install -d -m0755 $(IDIR_P910ND)/usr/sbin ln -sf p910nd $(IDIR_P910ND)/etc/init.d/S$(PKG_INIT_PRIO)p910nd - cp -fpR $(PKG_BUILD_DIR)/p910nd $(IDIR_P910ND)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/p910nd $(IDIR_P910ND)/usr/sbin $(RSTRIP) $(IDIR_P910ND) $(IPKG_BUILD) $(IDIR_P910ND) $(PACKAGE_DIR) diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile index 6318344560..b77618242e 100644 --- a/package/pciutils/Makefile +++ b/package/pciutils/Makefile @@ -29,7 +29,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_PCIUTILS): install -d -m0755 $(IDIR_PCIUTILS)/usr/sbin install -d -m0755 $(IDIR_PCIUTILS)/usr/share - cp -fpR $(PKG_BUILD_DIR)/{lspci,setpci} $(IDIR_PCIUTILS)/usr/sbin/ - cp -fpR $(PKG_BUILD_DIR)/pci.ids $(IDIR_PCIUTILS)/usr/share/ + $(CP) $(PKG_BUILD_DIR)/{lspci,setpci} $(IDIR_PCIUTILS)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/pci.ids $(IDIR_PCIUTILS)/usr/share/ $(RSTRIP) $(IDIR_PCIUTILS)/ $(IPKG_BUILD) $(IDIR_PCIUTILS) $(PACKAGE_DIR) diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile index cc74db1f58..b99633a5fa 100644 --- a/package/pcmcia-cs/Makefile +++ b/package/pcmcia-cs/Makefile @@ -47,10 +47,10 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_PCMCIA_UTILS): install -m0755 -d $(IDIR_PCMCIA_UTILS)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/pcmcia $(IDIR_PCMCIA_UTILS)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/pcmcia $(IDIR_PCMCIA_UTILS)/etc/ install -m0755 -d $(IDIR_PCMCIA_UTILS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/cardctl $(IDIR_PCMCIA_UTILS)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/cardmgr $(IDIR_PCMCIA_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/cardctl $(IDIR_PCMCIA_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/cardmgr $(IDIR_PCMCIA_UTILS)/usr/sbin/ $(RSTRIP) $(IDIR_PCMCIA_UTILS) $(IPKG_BUILD) $(IDIR_PCMCIA_UTILS) $(PACKAGE_DIR) diff --git a/package/pcre/Makefile b/package/pcre/Makefile index b24d7d8a2a..3cd030481b 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -67,17 +67,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBPCRE): install -d -m0755 $(IDIR_LIBPCRE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(IDIR_LIBPCRE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.so.* $(IDIR_LIBPCRE)/usr/lib/ $(RSTRIP) $(IDIR_LIBPCRE) $(IPKG_BUILD) $(IDIR_LIBPCRE) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libpcre.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/pcre{,posix}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/pcre{,posix}.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcre{,posix}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libpcre.so diff --git a/package/peercast/Makefile b/package/peercast/Makefile index 575a4041a9..36d78163d0 100644 --- a/package/peercast/Makefile +++ b/package/peercast/Makefile @@ -64,9 +64,9 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_PEERCAST): install -m0755 -d $(IDIR_PEERCAST)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/peercast $(IDIR_PEERCAST)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/peercast $(IDIR_PEERCAST)/usr/sbin/ install -m0755 -d $(IDIR_PEERCAST)/usr/share/peercast/html - cp -fpR $(PKG_INSTALL_DIR)/usr/share/peercast/html/en $(IDIR_PEERCAST)/usr/share/peercast/html/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/peercast/html/en $(IDIR_PEERCAST)/usr/share/peercast/html/ install -m0755 -d $(IDIR_PEERCAST)/etc install -m0644 ./files/peercast.ini $(IDIR_PEERCAST)/etc/ install -m0755 -d $(IDIR_PEERCAST)/etc/init.d diff --git a/package/peerguardian/Makefile b/package/peerguardian/Makefile index ee34f07396..1410494ae0 100755 --- a/package/peerguardian/Makefile +++ b/package/peerguardian/Makefile @@ -49,6 +49,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_PEERGUARDIAN): mkdir -p $(IDIR_PEERGUARDIAN) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_PEERGUARDIAN)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_PEERGUARDIAN)/ $(RSTRIP) $(IDIR_PEERGUARDIAN)/ $(IPKG_BUILD) $(IDIR_PEERGUARDIAN) $(PACKAGE_DIR) diff --git a/package/php4/Makefile b/package/php4/Makefile index 2644aa4451..cd42c1a7cb 100644 --- a/package/php4/Makefile +++ b/package/php4/Makefile @@ -263,7 +263,7 @@ $(IPKG_PHP4_CLI): install -m0755 -d $(IDIR_PHP4_CLI)/etc install -m0644 ./files/php.ini $(IDIR_PHP4_CLI)/etc/ install -m0755 -d $(IDIR_PHP4_CLI)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP4_CLI)/usr/bin/php + $(CP) $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP4_CLI)/usr/bin/php $(RSTRIP) $(IDIR_PHP4_CLI) $(IPKG_BUILD) $(IDIR_PHP4_CLI) $(PACKAGE_DIR) @@ -271,7 +271,7 @@ $(IPKG_PHP4_CGI): install -m0755 -d $(IDIR_PHP4_CGI)/etc install -m0644 ./files/php.ini $(IDIR_PHP4_CGI)/etc/ install -m0755 -d $(IDIR_PHP4_CGI)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP4_CGI)/usr/bin/php + $(CP) $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP4_CGI)/usr/bin/php $(RSTRIP) $(IDIR_PHP4_CGI) $(IPKG_BUILD) $(IDIR_PHP4_CGI) $(PACKAGE_DIR) @@ -281,7 +281,7 @@ $(IPKG_PHP4_FASTCGI): install -m0755 -d $(IDIR_PHP4_FASTCGI)/etc/init.d install -m0755 ./files/php.init $(IDIR_PHP4_FASTCGI)/etc/init.d/php install -m0755 -d $(IDIR_PHP4_FASTCGI)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/php-fastcgi $(IDIR_PHP4_FASTCGI)/usr/sbin/php + $(CP) $(PKG_BUILD_DIR)/php-fastcgi $(IDIR_PHP4_FASTCGI)/usr/sbin/php $(RSTRIP) $(IDIR_PHP4_FASTCGI) $(IPKG_BUILD) $(IDIR_PHP4_FASTCGI) $(PACKAGE_DIR) diff --git a/package/php5/Makefile b/package/php5/Makefile index db863ae4a5..bc48855d45 100644 --- a/package/php5/Makefile +++ b/package/php5/Makefile @@ -267,7 +267,7 @@ $(IPKG_PHP5_CLI): install -m0755 -d $(IDIR_PHP5_CLI)/etc install -m0644 ./files/php.ini $(IDIR_PHP5_CLI)/etc/ install -m0755 -d $(IDIR_PHP5_CLI)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP5_CLI)/usr/bin/php + $(CP) $(PKG_BUILD_DIR)/php-cli $(IDIR_PHP5_CLI)/usr/bin/php $(RSTRIP) $(IDIR_PHP5_CLI) $(IPKG_BUILD) $(IDIR_PHP5_CLI) $(PACKAGE_DIR) @@ -275,7 +275,7 @@ $(IPKG_PHP5_CGI): install -m0755 -d $(IDIR_PHP5_CGI)/etc install -m0644 ./files/php.ini $(IDIR_PHP5_CGI)/etc/ install -m0755 -d $(IDIR_PHP5_CGI)/usr/bin - cp -fpR $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP5_CGI)/usr/bin/php + $(CP) $(PKG_BUILD_DIR)/php-cgi $(IDIR_PHP5_CGI)/usr/bin/php $(RSTRIP) $(IDIR_PHP5_CGI) $(IPKG_BUILD) $(IDIR_PHP5_CGI) $(PACKAGE_DIR) @@ -285,7 +285,7 @@ $(IPKG_PHP5_FASTCGI): install -m0755 -d $(IDIR_PHP5_FASTCGI)/etc/init.d install -m0755 ./files/php.init $(IDIR_PHP5_FASTCGI)/etc/init.d/php install -m0755 -d $(IDIR_PHP5_FASTCGI)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/php-fastcgi $(IDIR_PHP5_FASTCGI)/usr/sbin/php + $(CP) $(PKG_BUILD_DIR)/php-fastcgi $(IDIR_PHP5_FASTCGI)/usr/sbin/php $(RSTRIP) $(IDIR_PHP5_FASTCGI) $(IPKG_BUILD) $(IDIR_PHP5_FASTCGI) $(PACKAGE_DIR) diff --git a/package/pipacs/Makefile b/package/pipacs/Makefile index 5ec35b9956..fe2219d9f5 100644 --- a/package/pipacs/Makefile +++ b/package/pipacs/Makefile @@ -13,7 +13,7 @@ $(eval $(call PKG_template,PIPACS,pipacs,$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp -a ./src/* $(PKG_BUILD_DIR) + $(CP) ./src/* $(PKG_BUILD_DIR) touch $@ $(PKG_BUILD_DIR)/.configured: diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile index 04e75366d5..4a86c3ae9d 100644 --- a/package/pmacct/Makefile +++ b/package/pmacct/Makefile @@ -161,6 +161,6 @@ $(PKG_BUILD_DIR)/.built: $(BUILD_TARGETS) $(IPKG_PMACCT_CLIENT): install -d -m0755 $(IDIR_PMACCT_CLIENT)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/pmacct $(IDIR_PMACCT_CLIENT)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/pmacct $(IDIR_PMACCT_CLIENT)/usr/sbin/ $(RSTRIP) $(IDIR_PMACCT_CLIENT) $(IPKG_BUILD) $(IDIR_PMACCT_CLIENT) $(PACKAGE_DIR) diff --git a/package/popt/Makefile b/package/popt/Makefile index 2dec25bbb6..75ea1a082d 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -59,15 +59,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBPOPT): install -d -m0755 $(IDIR_LIBPOPT)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.so.* $(IDIR_LIBPOPT)/usr/lib/ $(RSTRIP) $(IDIR_LIBPOPT) $(IPKG_BUILD) $(IDIR_LIBPOPT) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libpopt.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/popt.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/popt.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpopt.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpopt.{a,so*} $(STAGING_DIR)/usr/lib/ touch $(STAGING_DIR)/usr/lib/libpopt.so install-dev: $(STAGING_DIR)/usr/lib/libpopt.so diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile index 12452596e3..18cfec71e6 100644 --- a/package/portsentry/Makefile +++ b/package/portsentry/Makefile @@ -27,8 +27,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_PORTSENTRY): mkdir -p $(IDIR_PORTSENTRY)/usr/bin mkdir -p $(IDIR_PORTSENTRY)/etc - cp $(PKG_BUILD_DIR)/$(PKG_NAME).conf $(IDIR_PORTSENTRY)/etc/ - cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_PORTSENTRY)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME).conf $(IDIR_PORTSENTRY)/etc/ + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_PORTSENTRY)/usr/bin/ $(STRIP) $(IDIR_PORTSENTRY)/usr/bin/* $(IPKG_BUILD) $(IDIR_PORTSENTRY) $(PACKAGE_DIR) diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile index 5f269b1b9b..2cb3f6d0e3 100644 --- a/package/postgresql/Makefile +++ b/package/postgresql/Makefile @@ -88,27 +88,27 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBPQ): install -d -m0755 $(IDIR_LIBPQ)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpq.so.* $(IDIR_LIBPQ)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.so.* $(IDIR_LIBPQ)/usr/lib/ $(RSTRIP) $(IDIR_LIBPQ) $(IPKG_BUILD) $(IDIR_LIBPQ) $(PACKAGE_DIR) $(IPKG_PGSQL_CLI): install -d -m0755 $(IDIR_PGSQL_CLI)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/psql $(IDIR_PGSQL_CLI)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/psql $(IDIR_PGSQL_CLI)/usr/bin/ $(RSTRIP) $(IDIR_PGSQL_CLI) $(IPKG_BUILD) $(IDIR_PGSQL_CLI) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libpq.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/pg_config $(STAGING_DIR)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/pg_config $(STAGING_DIR)/usr/bin/ mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libpq $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/pg_config.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/postgres_ext.h $(STAGING_DIR)/usr/include/ - cp -fpR $(PKG_INSTALL_DIR)/usr/include/postgresql $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libpq-fe.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/pg_config.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/postgres_ext.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/postgresql $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libpq.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpq.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libpq.so diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 56a9afb245..4a0b0537ad 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -116,19 +116,19 @@ $(IPKG_PPP_MOD_RADIUS): $(IDIR_PPP_MOD_RADIUS)/etc/ppp/radius.conf $(IPKG_CHAT): install -d -m0755 $(IDIR_CHAT)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/chat $(IDIR_CHAT)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/chat $(IDIR_CHAT)/usr/sbin/ $(RSTRIP) $(IDIR_CHAT) $(IPKG_BUILD) $(IDIR_CHAT) $(PACKAGE_DIR) $(IPKG_PPPDUMP): install -d -m0755 $(IDIR_PPPDUMP)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppdump $(IDIR_PPPDUMP)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppdump $(IDIR_PPPDUMP)/usr/sbin/ $(RSTRIP) $(IDIR_PPPDUMP) $(IPKG_BUILD) $(IDIR_PPPDUMP) $(PACKAGE_DIR) $(IPKG_PPPSTATS): $(IPKG_PPP) install -d -m0755 $(IDIR_PPPSTATS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppstats $(IDIR_PPPSTATS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppstats $(IDIR_PPPSTATS)/usr/sbin/ $(RSTRIP) $(IDIR_PPPSTATS) $(IPKG_BUILD) $(IDIR_PPPSTATS) $(PACKAGE_DIR) diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index a115bd511f..32e301d75d 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -63,7 +63,7 @@ $(IPKG_PPTPD): install -d -m0755 $(IDIR_PPTPD)/etc/ppp install -m0644 ./files/options.pptpd $(IDIR_PPTPD)/etc/ppp/ install -d -m0755 $(IDIR_PPTPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(IDIR_PPTPD)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(IDIR_PPTPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpd $(IDIR_PPTPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pptpctrl $(IDIR_PPTPD)/usr/sbin/ $(RSTRIP) $(IDIR_PPTPD) $(IPKG_BUILD) $(IDIR_PPTPD) $(PACKAGE_DIR) diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile index 8330cb07b7..4a2a3fe63f 100644 --- a/package/ptunnel/Makefile +++ b/package/ptunnel/Makefile @@ -64,6 +64,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_PTUNNEL): install -m0755 -d $(IDIR_PTUNNEL)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ptunnel $(IDIR_PTUNNEL)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ptunnel $(IDIR_PTUNNEL)/usr/sbin/ $(RSTRIP) $(IDIR_PTUNNEL) $(IPKG_BUILD) $(IDIR_PTUNNEL) $(PACKAGE_DIR) diff --git a/package/quagga/Makefile b/package/quagga/Makefile index 32d6d6603e..51b424b68c 100644 --- a/package/quagga/Makefile +++ b/package/quagga/Makefile @@ -71,10 +71,10 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_QUAGGA): install -d -m0755 $(IDIR_QUAGGA)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(IDIR_QUAGGA)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libzebra.so.* $(IDIR_QUAGGA)/usr/lib/ install -d -m0755 $(IDIR_QUAGGA)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/zebra $(IDIR_QUAGGA)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(IDIR_QUAGGA)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/zebra $(IDIR_QUAGGA)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/watchquagga $(IDIR_QUAGGA)/usr/sbin/ # avoid /etc being set to 0750 install -d -m0755 $(IDIR_QUAGGA)/etc/quagga/ chmod 0750 $(IDIR_QUAGGA)/etc/quagga/ @@ -86,38 +86,38 @@ $(IPKG_QUAGGA): $(IPKG_QUAGGA_BGPD): install -d -m0755 $(IDIR_QUAGGA_BGPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(IDIR_QUAGGA_BGPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/bgpd $(IDIR_QUAGGA_BGPD)/usr/sbin/ $(RSTRIP) $(IDIR_QUAGGA_BGPD) $(IPKG_BUILD) $(IDIR_QUAGGA_BGPD) $(PACKAGE_DIR) $(IPKG_QUAGGA_OSPFD): install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(IDIR_QUAGGA_OSPFD)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libospf.so.* $(IDIR_QUAGGA_OSPFD)/usr/lib/ install -d -m0755 $(IDIR_QUAGGA_OSPFD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(IDIR_QUAGGA_OSPFD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospfd $(IDIR_QUAGGA_OSPFD)/usr/sbin/ $(RSTRIP) $(IDIR_QUAGGA_OSPFD) $(IPKG_BUILD) $(IDIR_QUAGGA_OSPFD) $(PACKAGE_DIR) $(IPKG_QUAGGA_OSPF6D): install -d -m0755 $(IDIR_QUAGGA_OSPF6D)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(IDIR_QUAGGA_OSPF6D)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ospf6d $(IDIR_QUAGGA_OSPF6D)/usr/sbin/ $(RSTRIP) $(IDIR_QUAGGA_OSPF6D) $(IPKG_BUILD) $(IDIR_QUAGGA_OSPF6D) $(PACKAGE_DIR) $(IPKG_QUAGGA_RIPD): install -d -m0755 $(IDIR_QUAGGA_RIPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ripd $(IDIR_QUAGGA_RIPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripd $(IDIR_QUAGGA_RIPD)/usr/sbin/ $(RSTRIP) $(IDIR_QUAGGA_RIPD) $(IPKG_BUILD) $(IDIR_QUAGGA_RIPD) $(PACKAGE_DIR) $(IPKG_QUAGGA_RIPNGD): install -d -m0755 $(IDIR_QUAGGA_RIPNGD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(IDIR_QUAGGA_RIPNGD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ripngd $(IDIR_QUAGGA_RIPNGD)/usr/sbin/ $(RSTRIP) $(IDIR_QUAGGA_RIPNGD) $(IPKG_BUILD) $(IDIR_QUAGGA_RIPNGD) $(PACKAGE_DIR) $(IPKG_QUAGGA_VTYSH): install -d -m0755 $(IDIR_QUAGGA_VTYSH)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/vtysh $(IDIR_QUAGGA_VTYSH)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/vtysh $(IDIR_QUAGGA_VTYSH)/usr/bin/ $(RSTRIP) $(IDIR_QUAGGA_VTYSH) $(IPKG_BUILD) $(IDIR_QUAGGA_VTYSH) $(PACKAGE_DIR) diff --git a/package/raddump/Makefile b/package/raddump/Makefile index 6908704301..1526ea80a8 100755 --- a/package/raddump/Makefile +++ b/package/raddump/Makefile @@ -50,6 +50,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_RADDUMP): mkdir -p $(IDIR_RADDUMP) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_RADDUMP)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_RADDUMP)/ $(RSTRIP) $(IDIR_RADDUMP) $(IPKG_BUILD) $(IDIR_RADDUMP) $(PACKAGE_DIR) diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile index 44effa8676..b91cd83a43 100644 --- a/package/rarpd/Makefile +++ b/package/rarpd/Makefile @@ -65,7 +65,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_RARPD): install -d -m0755 $(IDIR_RARPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/rarpd $(IDIR_RARPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rarpd $(IDIR_RARPD)/usr/sbin/ install -d -m0755 $(IDIR_RARPD)/etc/default install -m644 ./files/rarpd.default $(IDIR_RARPD)/etc/default/rarpd install -d -m0755 $(IDIR_RARPD)/etc/init.d diff --git a/package/readline/Makefile b/package/readline/Makefile index e9c8fdb3f9..2e044a1844 100644 --- a/package/readline/Makefile +++ b/package/readline/Makefile @@ -60,15 +60,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBREADLINE): install -m0755 -d $(IDIR_LIBREADLINE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.so.* $(IDIR_LIBREADLINE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.so.* $(IDIR_LIBREADLINE)/usr/lib/ $(RSTRIP) $(IDIR_LIBREADLINE) $(IPKG_BUILD) $(IDIR_LIBREADLINE) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libreadline.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/readline $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libreadline.so diff --git a/package/reaim/Makefile b/package/reaim/Makefile index dc1a0927b8..959e0de91d 100644 --- a/package/reaim/Makefile +++ b/package/reaim/Makefile @@ -36,7 +36,7 @@ $(IPKG_REAIM): install -m0755 ./files/reaim.init $(IDIR_REAIM)/etc/init.d/reaim ln -sf reaim $(IDIR_REAIM)/etc/init.d/S63reaim install -d -m0755 $(IDIR_REAIM)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/reaim $(IDIR_REAIM)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/reaim $(IDIR_REAIM)/usr/sbin/ $(RSTRIP) $(IDIR_REAIM) $(IPKG_BUILD) $(IDIR_REAIM) $(PACKAGE_DIR) diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile index e556afd472..1b829d8363 100644 --- a/package/rp-pppoe/Makefile +++ b/package/rp-pppoe/Makefile @@ -66,8 +66,8 @@ $(IPKG_PPPOE_CLIENT): install -d -m0755 $(IDIR_PPPOE_CLIENT)/etc/ppp install -m0644 $(PKG_INSTALL_DIR)/etc/pppoe.conf $(IDIR_PPPOE_CLIENT)/etc/ install -d -m0755 $(IDIR_PPPOE_CLIENT)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppoe $(IDIR_PPPOE_CLIENT)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/adsl-* $(IDIR_PPPOE_CLIENT)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe $(IDIR_PPPOE_CLIENT)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/adsl-* $(IDIR_PPPOE_CLIENT)/usr/sbin/ $(RSTRIP) $(IDIR_PPPOE_CLIENT) $(IPKG_BUILD) $(IDIR_PPPOE_CLIENT) $(PACKAGE_DIR) @@ -77,7 +77,7 @@ $(IPKG_PPPOE_RELAY): install -d -m0755 $(IDIR_PPPOE_RELAY)/etc/init.d install -m0755 ./files/pppoe-relay.init $(IDIR_PPPOE_RELAY)/etc/init.d/pppoe-relay install -d -m0755 $(IDIR_PPPOE_RELAY)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppoe-relay $(IDIR_PPPOE_RELAY)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-relay $(IDIR_PPPOE_RELAY)/usr/sbin/ $(RSTRIP) $(IDIR_PPPOE_RELAY) $(IPKG_BUILD) $(IDIR_PPPOE_RELAY) $(PACKAGE_DIR) @@ -89,13 +89,13 @@ $(IPKG_PPPOE_SERVER): install -d -m0755 $(IDIR_PPPOE_SERVER)/etc/ppp install -m0644 $(PKG_INSTALL_DIR)/etc/ppp/pppoe-server-options $(IDIR_PPPOE_SERVER)/etc/ppp/ install -d -m0755 $(IDIR_PPPOE_SERVER)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppoe-server $(IDIR_PPPOE_SERVER)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-server $(IDIR_PPPOE_SERVER)/usr/sbin/ $(RSTRIP) $(IDIR_PPPOE_SERVER) $(IPKG_BUILD) $(IDIR_PPPOE_SERVER) $(PACKAGE_DIR) $(IPKG_PPPOE_SNIFF): install -d -m0755 $(IDIR_PPPOE_SNIFF)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/pppoe-sniff $(IDIR_PPPOE_SNIFF)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-sniff $(IDIR_PPPOE_SNIFF)/usr/sbin/ $(RSTRIP) $(IDIR_PPPOE_SNIFF) $(IPKG_BUILD) $(IDIR_PPPOE_SNIFF) $(PACKAGE_DIR) diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile index cc2e19ac43..9f105dbe09 100644 --- a/package/rrdcollect/Makefile +++ b/package/rrdcollect/Makefile @@ -72,7 +72,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_RRDCOLLECT): install -d -m0755 $(IDIR_RRDCOLLECT)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(IDIR_RRDCOLLECT)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/rrdcollect $(IDIR_RRDCOLLECT)/usr/sbin/ $(RSTRIP) $(IDIR_RRDCOLLECT) $(IPKG_BUILD) $(IDIR_RRDCOLLECT) $(PACKAGE_DIR) diff --git a/package/rrdcollect/files/rrdcollect.conf b/package/rrdcollect/files/rrdcollect.conf index e34c9bff7b..1b374548ee 100644 --- a/package/rrdcollect/files/rrdcollect.conf +++ b/package/rrdcollect/files/rrdcollect.conf @@ -19,15 +19,15 @@ exec:///bin/df # LAN: vlan0, WAN: vlan1, WIFI: eth1 file:///proc/net/dev -" vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo -" vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo -" eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo -#" tun0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo +"vlan0: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo +"vlan1: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo +"eth1: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo +#"tun0: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo file:///proc/slabinfo "ip_conntrack %d %*d %*d %*d %*d %*d" SYS.rrd:con "arp_cache %d %*d %*d %*d %*d %*d" SYS.rrd:arp file:///proc/interrupts -" 4: %d MIPS eth1" SYS.rrd:irw -" 5: %d MIPS eth0" SYS.rrd:ire +"4: %d MIPS eth1" SYS.rrd:irw +"5: %d MIPS eth0" SYS.rrd:ire diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile index eaa0e32b7d..3bea4aa9a6 100644 --- a/package/rrdtool/Makefile +++ b/package/rrdtool/Makefile @@ -71,32 +71,32 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_RRDTOOL): install -d -m0755 $(IDIR_RRDTOOL)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL)/usr/bin/ $(RSTRIP) $(IDIR_RRDTOOL) $(IPKG_BUILD) $(IDIR_RRDTOOL) $(PACKAGE_DIR) $(IPKG_RRDCGI): install -d -m0755 $(IDIR_RRDCGI)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI)/usr/bin/ $(RSTRIP) $(IDIR_RRDCGI) $(IPKG_BUILD) $(IDIR_RRDCGI) $(PACKAGE_DIR) $(IPKG_LIBRRD): install -d -m0755 $(IDIR_LIBRRD)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD)/usr/lib/ install -d -m0755 $(IDIR_LIBRRD)/usr/share/rrdtool/fonts - cp -fpR $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \ + $(CP) $(PKG_BUILD_DIR)/src/DejaVuSansMono-Roman.ttf \ $(IDIR_LIBRRD)/usr/share/rrdtool/fonts/ $(RSTRIP) $(IDIR_LIBRRD) $(IPKG_BUILD) $(IDIR_LIBRRD) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/librrd.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/librrd.so diff --git a/package/rrdtool1/Makefile b/package/rrdtool1/Makefile index 0dc0a47a50..b0eb9fcc71 100644 --- a/package/rrdtool1/Makefile +++ b/package/rrdtool1/Makefile @@ -68,29 +68,29 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_RRDTOOL1): install -d -m0755 $(IDIR_RRDTOOL1)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL1)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdtool $(IDIR_RRDTOOL1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdupdate $(IDIR_RRDTOOL1)/usr/bin/ $(RSTRIP) $(IDIR_RRDTOOL1) $(IPKG_BUILD) $(IDIR_RRDTOOL1) $(PACKAGE_DIR) $(IPKG_RRDCGI1): install -d -m0755 $(IDIR_RRDCGI1)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/rrdcgi $(IDIR_RRDCGI1)/usr/bin/ $(RSTRIP) $(IDIR_RRDCGI1) $(IPKG_BUILD) $(IDIR_RRDCGI1) $(PACKAGE_DIR) $(IPKG_LIBRRD1): install -d -m0755 $(IDIR_LIBRRD1)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so.* $(IDIR_LIBRRD1)/usr/lib/ $(RSTRIP) $(IDIR_LIBRRD1) $(IPKG_BUILD) $(IDIR_LIBRRD1) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/librrd.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/rrd.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/librrd.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/librrd.so diff --git a/package/rsync/Makefile b/package/rsync/Makefile index bd0bfab920..0089326e31 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -58,6 +58,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_RSYNC): install -d -m0755 $(IDIR_RSYNC)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_RSYNC)/usr/bin + $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(IDIR_RSYNC)/usr/bin $(RSTRIP) $(IDIR_RSYNC) $(IPKG_BUILD) $(IDIR_RSYNC) $(PACKAGE_DIR) diff --git a/package/sablevm-classpath/Makefile b/package/sablevm-classpath/Makefile index 13fa555135..cbe7634028 100644 --- a/package/sablevm-classpath/Makefile +++ b/package/sablevm-classpath/Makefile @@ -64,21 +64,21 @@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install - cp ./files/mini.classlist $(PKG_BUILD_DIR)/lib/ + $(CP) ./files/mini.classlist $(PKG_BUILD_DIR)/lib/ cd $(PKG_BUILD_DIR)/lib ; fastjar -Mcf mini.jar -@ < mini.classlist touch $@ $(IPKG_LIBSABLEVM_CLASSPATH): install -d -m0755 $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/sablevm-classpath - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/sablevm-classpath/libjava*.so $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/sablevm-classpath/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/sablevm-classpath/libjava*.so $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/sablevm-classpath/ install -d -m0755 $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/security - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/security/classpath.security $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/security/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/security/classpath.security $(IDIR_LIBSABLEVM_CLASSPATH)/usr/lib/security/ $(RSTRIP) $(IDIR_LIBSABLEVM_CLASSPATH) $(IPKG_BUILD) $(IDIR_LIBSABLEVM_CLASSPATH) $(PACKAGE_DIR) $(IPKG_SABLEVM_CLASSPATH_FULL): install -d -m0755 $(IDIR_SABLEVM_CLASSPATH_FULL)/usr/share/sablevm-classpath - cp -fpR $(PKG_INSTALL_DIR)/usr/share/sablevm-classpath/{libclasspath,resources}.jar \ + $(CP) $(PKG_INSTALL_DIR)/usr/share/sablevm-classpath/{libclasspath,resources}.jar \ $(IDIR_SABLEVM_CLASSPATH_FULL)/usr/share/sablevm-classpath/ $(IPKG_BUILD) $(IDIR_SABLEVM_CLASSPATH_FULL) $(PACKAGE_DIR) diff --git a/package/sablevm/Makefile b/package/sablevm/Makefile index e57fdb2256..7eec3f4924 100644 --- a/package/sablevm/Makefile +++ b/package/sablevm/Makefile @@ -61,8 +61,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SABLEVM): install -m0755 -d $(IDIR_SABLEVM)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(IDIR_SABLEVM)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/{java-,}sablevm $(IDIR_SABLEVM)/usr/bin/ install -m0755 -d $(IDIR_SABLEVM)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsablevm-*.so $(IDIR_SABLEVM)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsablevm-*.so $(IDIR_SABLEVM)/usr/lib/ $(RSTRIP) $(IDIR_SABLEVM) $(IPKG_BUILD) $(IDIR_SABLEVM) $(PACKAGE_DIR) diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index b3d10b5847..31ac686939 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -63,8 +63,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SANE_BACKENDS): install -d -m0755 $(IDIR_SANE_BACKENDS)/etc/sane.d - cp -fpR $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(IDIR_SANE_BACKENDS)/etc/sane.d/ + $(CP) $(PKG_INSTALL_DIR)/etc/sane.d/*.conf $(IDIR_SANE_BACKENDS)/etc/sane.d/ install -d -m0755 $(IDIR_SANE_BACKENDS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/saned $(IDIR_SANE_BACKENDS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/saned $(IDIR_SANE_BACKENDS)/usr/sbin/ $(RSTRIP) $(IDIR_SANE_BACKENDS) $(IPKG_BUILD) $(IDIR_SANE_BACKENDS) $(PACKAGE_DIR) diff --git a/package/scdp/Makefile b/package/scdp/Makefile index ce09d2ef9a..c8909c6fef 100644 --- a/package/scdp/Makefile +++ b/package/scdp/Makefile @@ -60,6 +60,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SCDP): install -d -m0755 $(IDIR_SCDP)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/scdp $(IDIR_SCDP)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/scdp $(IDIR_SCDP)/usr/bin/ $(RSTRIP) $(IDIR_SCDP) $(IPKG_BUILD) $(IDIR_SCDP) $(PACKAGE_DIR) diff --git a/package/sdk/Makefile b/package/sdk/Makefile index cec93b9d87..3f62aec115 100644 --- a/package/sdk/Makefile +++ b/package/sdk/Makefile @@ -20,13 +20,13 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: ) rm -rf $(SDK_BUILD_DIR) mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/examples $(SDK_BUILD_DIR)/package - cp -a $(STAGING_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/ - cp -a $(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/ + $(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 diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile index 435b340c93..f28b26913e 100644 --- a/package/serdisplib/Makefile +++ b/package/serdisplib/Makefile @@ -56,15 +56,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SERDISPLIB): install -d -m0755 $(IDIR_SERDISPLIB)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/lib/libserdisp.so.* $(IDIR_SERDISPLIB)/usr/lib + $(CP) $(PKG_BUILD_DIR)/lib/libserdisp.so.* $(IDIR_SERDISPLIB)/usr/lib $(RSTRIP) $(IDIR_SERDISPLIB) $(IPKG_BUILD) $(IDIR_SERDISPLIB) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libserdisp.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_BUILD_DIR)/include/serdisplib $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/include/serdisplib $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/lib/libserdisp.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/lib/libserdisp.{a,so*} $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libserdisp.so diff --git a/package/shfs/Makefile b/package/shfs/Makefile index fd6f3e46d7..b1509a7c4a 100644 --- a/package/shfs/Makefile +++ b/package/shfs/Makefile @@ -35,8 +35,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SHFS_UTILS): install -m0755 -d $(IDIR_SHFS_UTILS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/shfs{,u}mount $(IDIR_SHFS_UTILS)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/mount.shfs $(IDIR_SHFS_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/shfs{,u}mount $(IDIR_SHFS_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/mount.shfs $(IDIR_SHFS_UTILS)/usr/sbin/ $(RSTRIP) $(IDIR_SHFS_UTILS) $(IPKG_BUILD) $(IDIR_SHFS_UTILS) $(PACKAGE_DIR) diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile index ac45a255f4..78571a621f 100644 --- a/package/siproxd/Makefile +++ b/package/siproxd/Makefile @@ -58,11 +58,11 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SIPROXD): install -d -m0755 $(IDIR_SIPROXD)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/siproxd.conf.example $(IDIR_SIPROXD)/etc/siproxd.conf - cp -fpR $(PKG_INSTALL_DIR)/etc/siproxd_passwd.cfg $(IDIR_SIPROXD)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/siproxd.conf.example $(IDIR_SIPROXD)/etc/siproxd.conf + $(CP) $(PKG_INSTALL_DIR)/etc/siproxd_passwd.cfg $(IDIR_SIPROXD)/etc/ install -d -m0755 $(IDIR_SIPROXD)/etc/init.d install -m0755 files/siproxd.init $(IDIR_SIPROXD)/etc/init.d/siproxd install -d -m0755 $(IDIR_SIPROXD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/siproxd $(IDIR_SIPROXD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/siproxd $(IDIR_SIPROXD)/usr/sbin/ $(RSTRIP) $(IDIR_SIPROXD) $(IPKG_BUILD) $(IDIR_SIPROXD) $(PACKAGE_DIR) diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile index 857f685f5b..c0dd1c1350 100644 --- a/package/sipsak/Makefile +++ b/package/sipsak/Makefile @@ -61,6 +61,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SIPSAK): install -d -m0755 $(IDIR_SIPSAK)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/sipsak $(IDIR_SIPSAK)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/sipsak $(IDIR_SIPSAK)/usr/bin/ $(RSTRIP) $(IDIR_SIPSAK) $(IPKG_BUILD) $(IDIR_SIPSAK) $(PACKAGE_DIR) diff --git a/package/slurm/Makefile b/package/slurm/Makefile index d3244a112d..91467adfb8 100644 --- a/package/slurm/Makefile +++ b/package/slurm/Makefile @@ -64,7 +64,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SLURM): install -d -m0755 $(IDIR_SLURM)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/slurm $(IDIR_SLURM)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/slurm $(IDIR_SLURM)/usr/bin/ $(RSTRIP) $(IDIR_SLURM) $(IPKG_BUILD) $(IDIR_SLURM) $(PACKAGE_DIR) diff --git a/package/socat/Makefile b/package/socat/Makefile index 968d35e3e8..034a6186a4 100644 --- a/package/socat/Makefile +++ b/package/socat/Makefile @@ -60,7 +60,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_SOCAT): install -d -m0755 $(IDIR_SOCAT)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/socat $(IDIR_SOCAT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/socat $(IDIR_SOCAT)/usr/bin/ $(RSTRIP) $(IDIR_SOCAT) $(IPKG_BUILD) $(IDIR_SOCAT) $(PACKAGE_DIR) diff --git a/package/speex/Makefile b/package/speex/Makefile index a79ee02da4..87a3de9679 100644 --- a/package/speex/Makefile +++ b/package/speex/Makefile @@ -61,17 +61,17 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBSPEEX): install -d -m0755 $(IDIR_LIBSPEEX)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(IDIR_LIBSPEEX)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(IDIR_LIBSPEEX)/usr/lib/ $(RSTRIP) $(IDIR_LIBSPEEX) $(IPKG_BUILD) $(IDIR_LIBSPEEX) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libspeex.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/speex $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/speex.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libspeex.so diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile index b85d8944f5..aefb458a17 100644 --- a/package/sqlite/Makefile +++ b/package/sqlite/Makefile @@ -67,23 +67,23 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBSQLITE): install -d -m0755 $(IDIR_LIBSQLITE)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.* $(IDIR_LIBSQLITE)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.* $(IDIR_LIBSQLITE)/usr/lib/ $(RSTRIP) $(IDIR_LIBSQLITE) $(IPKG_BUILD) $(IDIR_LIBSQLITE) $(PACKAGE_DIR) $(IPKG_SQLITE_CLI): install -d -m0755 $(IDIR_SQLITE_CLI)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(IDIR_SQLITE_CLI)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(IDIR_SQLITE_CLI)/usr/bin/ $(RSTRIP) $(IDIR_SQLITE_CLI) $(IPKG_BUILD) $(IDIR_SQLITE_CLI) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libsqlite3.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite3.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libsqlite3.so diff --git a/package/sqlite2/Makefile b/package/sqlite2/Makefile index 5b5f599b1f..41a7382c96 100644 --- a/package/sqlite2/Makefile +++ b/package/sqlite2/Makefile @@ -66,23 +66,23 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBSQLITE2): install -d -m0755 $(IDIR_LIBSQLITE2)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsqlite.so.* $(IDIR_LIBSQLITE2)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.so.* $(IDIR_LIBSQLITE2)/usr/lib/ $(RSTRIP) $(IDIR_LIBSQLITE2) $(IPKG_BUILD) $(IDIR_LIBSQLITE2) $(PACKAGE_DIR) $(IPKG_SQLITE2_CLI): install -d -m0755 $(IDIR_SQLITE2_CLI)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/sqlite $(IDIR_SQLITE2_CLI)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite $(IDIR_SQLITE2_CLI)/usr/bin/ $(RSTRIP) $(IDIR_SQLITE2_CLI) $(IPKG_BUILD) $(IDIR_SQLITE2_CLI) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libsqlite.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/sqlite.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libsqlite.{a,so*} $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.{a,so*} $(STAGING_DIR)/usr/lib/ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite.pc $(STAGING_DIR)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/sqlite.pc $(STAGING_DIR)/usr/lib/pkgconfig/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libsqlite.so diff --git a/package/srelay/Makefile b/package/srelay/Makefile index 485ea26abe..9dc0b9545b 100644 --- a/package/srelay/Makefile +++ b/package/srelay/Makefile @@ -53,15 +53,15 @@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ CC=$(TARGET_CC) \ all - cp $(PKG_BUILD_DIR)/srelay $(PKG_INSTALL_DIR) + $(CP) $(PKG_BUILD_DIR)/srelay $(PKG_INSTALL_DIR) touch $@ $(IPKG_SRELAY): install -m0755 -d $(IDIR_SRELAY)/usr/bin install -m0755 -d $(IDIR_SRELAY)/etc/init.d - cp -fpR $(PKG_INSTALL_DIR)/srelay $(IDIR_SRELAY)/usr/bin/ - cp -fpR files/srelay.init $(IDIR_SRELAY)/etc/init.d/S$(PKG_INIT_LEVEL)srelay - cp -fpR files/srelay.conf $(IDIR_SRELAY)/etc + $(CP) $(PKG_INSTALL_DIR)/srelay $(IDIR_SRELAY)/usr/bin/ + $(CP) files/srelay.init $(IDIR_SRELAY)/etc/init.d/S$(PKG_INIT_LEVEL)srelay + $(CP) files/srelay.conf $(IDIR_SRELAY)/etc chmod 755 $(IDIR_SRELAY)/etc/init.d/S$(PKG_INIT_LEVEL)srelay $(RSTRIP) $(IDIR_SRELAY) $(IPKG_BUILD) $(IDIR_SRELAY) $(PACKAGE_DIR) diff --git a/package/ssmtp/Makefile b/package/ssmtp/Makefile index 54235e506f..3204ca8786 100644 --- a/package/ssmtp/Makefile +++ b/package/ssmtp/Makefile @@ -59,7 +59,7 @@ $(IPKG_SSMTP): install -m0644 $(PKG_BUILD_DIR)/ssmtp.conf $(IDIR_SSMTP)/etc/ssmtp/ install -m0644 $(PKG_BUILD_DIR)/revaliases $(IDIR_SSMTP)/etc/ssmtp/ install -m0755 -d $(IDIR_SSMTP)/usr/sbin - cp -fpR $(PKG_BUILD_DIR)/ssmtp $(IDIR_SSMTP)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/ssmtp $(IDIR_SSMTP)/usr/sbin/ ln -sf ssmtp $(IDIR_SSMTP)/usr/sbin/sendmail $(RSTRIP) $(IDIR_SSMTP) $(IPKG_BUILD) $(IDIR_SSMTP) $(PACKAGE_DIR) diff --git a/package/strace/Makefile b/package/strace/Makefile index 000334d955..d356f918ad 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -53,7 +53,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_STRACE): mkdir -p $(IDIR_STRACE)/usr/sbin - cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_STRACE)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_STRACE)/usr/sbin/ $(STRIP) $(IDIR_STRACE)/usr/sbin/* $(IPKG_BUILD) $(IDIR_STRACE) $(PACKAGE_DIR) diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile index cbd68d4f63..9eb1d77533 100644 --- a/package/tcp_wrappers/Makefile +++ b/package/tcp_wrappers/Makefile @@ -41,16 +41,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LIBWRAP): install -d -m0755 $(IDIR_LIBWRAP)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/shared/libwrap.so.* $(IDIR_LIBWRAP)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/shared/libwrap.so.* $(IDIR_LIBWRAP)/usr/lib/ $(RSTRIP) $(IDIR_LIBWRAP) $(IPKG_BUILD) $(IDIR_LIBWRAP) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libwrap.a: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_BUILD_DIR)/tcpd.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/tcpd.h $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/libwrap.a $(STAGING_DIR)/usr/lib/ -# cp -fpR $(PKG_BUILD_DIR)/shared/libwrap.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libwrap.a $(STAGING_DIR)/usr/lib/ +# $(CP) $(PKG_BUILD_DIR)/shared/libwrap.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libwrap.a diff --git a/package/tinc/Makefile b/package/tinc/Makefile index 769be77226..912fcc3db0 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -63,7 +63,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_TINC): install -m0755 -d $(IDIR_TINC)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/tincd $(IDIR_TINC)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tincd $(IDIR_TINC)/usr/sbin/ $(RSTRIP) $(IDIR_TINC) $(IPKG_BUILD) $(IDIR_TINC) $(PACKAGE_DIR) diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile index c5f9532f9f..3f2173ac48 100644 --- a/package/tinyproxy/Makefile +++ b/package/tinyproxy/Makefile @@ -75,9 +75,9 @@ $(IPKG_TINYPROXY): $(IDIR_TINYPROXY)/etc/init.d \ $(IDIR_TINYPROXY)/var/log \ $(IDIR_TINYPROXY)/usr/share - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/tinyproxy $(IDIR_TINYPROXY)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/share/tinyproxy $(IDIR_TINYPROXY)/usr/share/ - cp -fpR $(PKG_INSTALL_DIR)/etc/tinyproxy $(IDIR_TINYPROXY)/etc/ - cp -fpR files/$(PKG_NAME).init $(IDIR_TINYPROXY)/etc/init.d/$(PKG_NAME) + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tinyproxy $(IDIR_TINYPROXY)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/tinyproxy $(IDIR_TINYPROXY)/usr/share/ + $(CP) $(PKG_INSTALL_DIR)/etc/tinyproxy $(IDIR_TINYPROXY)/etc/ + $(CP) files/$(PKG_NAME).init $(IDIR_TINYPROXY)/etc/init.d/$(PKG_NAME) $(RSTRIP) $(IDIR_TINYPROXY) $(IPKG_BUILD) $(IDIR_TINYPROXY) $(PACKAGE_DIR) diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile index c5414f3b6b..32098d0001 100644 --- a/package/tmsnc/Makefile +++ b/package/tmsnc/Makefile @@ -55,6 +55,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_TMSNC): mkdir -p $(IDIR_TMSNC) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_TMSNC)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_TMSNC)/ $(RSTRIP) $(IDIR_TMSNC) $(IPKG_BUILD) $(IDIR_TMSNC) $(PACKAGE_DIR) diff --git a/package/tor/Makefile b/package/tor/Makefile index 1eced61efd..d961f37403 100644 --- a/package/tor/Makefile +++ b/package/tor/Makefile @@ -70,7 +70,7 @@ $(IPKG_TOR): install -d -m0755 $(IDIR_TOR)/etc/tor install -m0644 ./files/torrc $(IDIR_TOR)/etc/tor/torrc install -d -m0755 $(IDIR_TOR)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/tor $(IDIR_TOR)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/tor $(IDIR_TOR)/usr/sbin/ $(RSTRIP) $(IDIR_TOR) $(IPKG_BUILD) $(IDIR_TOR) $(PACKAGE_DIR) diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile index 53dbbcdcc9..bb08547321 100644 --- a/package/uclibc++/Makefile +++ b/package/uclibc++/Makefile @@ -32,7 +32,7 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ ) $(PKG_BUILD_DIR)/.configured: - cp ./files/config.$(UCLIBC_TARGET_ARCH) $(PKG_BUILD_DIR)/.config + $(CP) ./files/config.$(UCLIBC_TARGET_ARCH) $(PKG_BUILD_DIR)/.config touch $@ $(PKG_BUILD_DIR)/.built: @@ -46,7 +46,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_UCLIBCXX): install -d -m0755 $(IDIR_UCLIBCXX)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/src/libuClibc++*.so* $(IDIR_UCLIBCXX)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/src/libuClibc++*.so* $(IDIR_UCLIBCXX)/usr/lib/ $(STRIP) $(IDIR_UCLIBCXX)/usr/lib/*.so* mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_UCLIBCXX) $(PACKAGE_DIR) diff --git a/package/udev/Makefile b/package/udev/Makefile index 34cdba6ce1..df3e4afff0 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -38,19 +38,19 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_UDEV): install -d -m0775 $(IDIR_UDEV)/etc/udev - cp -fpR $(PKG_INSTALL_DIR)/etc/udev/* $(IDIR_UDEV)/etc/udev/ + $(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(IDIR_UDEV)/etc/udev/ install -d -m0775 $(IDIR_UDEV)/lib/udev install -d -m0775 $(IDIR_UDEV)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/udev $(IDIR_UDEV)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/udevcontrol $(IDIR_UDEV)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/udevd $(IDIR_UDEV)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/udevsend $(IDIR_UDEV)/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/udevstart $(IDIR_UDEV)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udev $(IDIR_UDEV)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(IDIR_UDEV)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevd $(IDIR_UDEV)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevsend $(IDIR_UDEV)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevstart $(IDIR_UDEV)/sbin/ install -d -m0775 $(IDIR_UDEV)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(IDIR_UDEV)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/udevtest $(IDIR_UDEV)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(IDIR_UDEV)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(IDIR_UDEV)/usr/bin/ install -d -m0775 $(IDIR_UDEV)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(IDIR_UDEV)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(IDIR_UDEV)/usr/sbin/ $(RSTRIP) $(IDIR_UDEV) $(IPKG_BUILD) $(IDIR_UDEV) $(PACKAGE_DIR) diff --git a/package/udp-broadcast-relay/Makefile b/package/udp-broadcast-relay/Makefile index 99033e24c4..040a7e778e 100644 --- a/package/udp-broadcast-relay/Makefile +++ b/package/udp-broadcast-relay/Makefile @@ -26,7 +26,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_UDP_BROADCAST_RELAY): mkdir -p $(IDIR_UDP_BROADCAST_RELAY)/usr/sbin - cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_UDP_BROADCAST_RELAY)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_UDP_BROADCAST_RELAY)/usr/sbin/ $(STRIP) $(IDIR_UDP_BROADCAST_RELAY)/usr/sbin/* $(IPKG_BUILD) $(IDIR_UDP_BROADCAST_RELAY) $(PACKAGE_DIR) diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile index 42d8a86925..893fd5b8f9 100644 --- a/package/ulogd/Makefile +++ b/package/ulogd/Makefile @@ -30,7 +30,7 @@ define IPKG_plugin_template $$(IPKG_$(1)): install -m0755 -d $$(IDIR_$(1))/usr/lib/ulogd for m in $(2); do \ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_$$$${m}.so $$(IDIR_$(1))/usr/lib/ulogd/ ; \ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_$$$${m}.so $$(IDIR_$(1))/usr/lib/ulogd/ ; \ done $(RSTRIP) $$(IDIR_$(1)) $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) @@ -92,15 +92,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ULOGD): install -d -m0755 $(IDIR_ULOGD)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/ulogd.conf $(IDIR_ULOGD)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/ulogd.conf $(IDIR_ULOGD)/etc/ install -d -m0755 $(IDIR_ULOGD)/etc/default install -m0644 ./files/ulogd.default $(IDIR_ULOGD)/etc/default/ulogd install -d -m0755 $(IDIR_ULOGD)/etc/init.d install -m0755 ./files/ulogd.init $(IDIR_ULOGD)/etc/init.d/ulogd ln -sf ulogd $(IDIR_ULOGD)/etc/init.d/S49ulogd install -d -m0755 $(IDIR_ULOGD)/usr/lib/ulogd - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(IDIR_ULOGD)/usr/lib/ulogd/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/ulogd/ulogd_BASE.so $(IDIR_ULOGD)/usr/lib/ulogd/ install -d -m0755 $(IDIR_ULOGD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(IDIR_ULOGD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ulogd $(IDIR_ULOGD)/usr/sbin/ $(RSTRIP) $(IDIR_ULOGD) $(IPKG_BUILD) $(IDIR_ULOGD) $(PACKAGE_DIR) diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile index cc88b5a616..1edc3dd4e8 100644 --- a/package/updatedd/Makefile +++ b/package/updatedd/Makefile @@ -74,7 +74,7 @@ $(IPKG_UPDATEDD): install -d -m0755 $(IDIR_UPDATEDD)/etc/init.d install -m0755 ./files/S55ddns $(IDIR_UPDATEDD)/etc/init.d/ install -d -m0755 $(IDIR_UPDATEDD)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/updatedd $(IDIR_UPDATEDD)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/updatedd $(IDIR_UPDATEDD)/usr/bin/ install -d -m0755 $(IDIR_UPDATEDD)/usr/lib/updatedd $(RSTRIP) $(IDIR_UPDATEDD) $(IPKG_BUILD) $(IDIR_UPDATEDD) $(PACKAGE_DIR) diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile index 8e6112cd97..5ce35bcfb5 100644 --- a/package/usbutils/Makefile +++ b/package/usbutils/Makefile @@ -60,8 +60,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_LSUSB): install -d -m0755 $(IDIR_LSUSB)/usr/share - cp -fpR $(PKG_INSTALL_DIR)/usr/share/usb.ids $(IDIR_LSUSB)/usr/share/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/usb.ids $(IDIR_LSUSB)/usr/share/ install -d -m0755 $(IDIR_LSUSB)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/lsusb $(IDIR_LSUSB)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/lsusb $(IDIR_LSUSB)/usr/sbin/ $(RSTRIP) $(IDIR_LSUSB) $(IPKG_BUILD) $(IDIR_LSUSB) $(PACKAGE_DIR) diff --git a/package/ustl/Makefile b/package/ustl/Makefile index 36b77c9583..f211f812d6 100644 --- a/package/ustl/Makefile +++ b/package/ustl/Makefile @@ -21,8 +21,8 @@ BR2_PACKAGE_USTL:=m $(eval $(call PKG_template,USTL,ustl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - cp ./files/config.h $(PKG_BUILD_DIR)/ - cp ./files/Common.mk $(PKG_BUILD_DIR)/ + $(CP) ./files/config.h $(PKG_BUILD_DIR)/ + $(CP) ./files/Common.mk $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/.built: @@ -37,16 +37,16 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_USTL): install -d -m0755 $(IDIR_USTL)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libustl.so.* $(IDIR_USTL)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.so.* $(IDIR_USTL)/usr/lib/ $(RSTRIP) $(IDIR_USTL) $(IPKG_BUILD) $(IDIR_USTL) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libustl.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/ustl* $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/ustl* $(STAGING_DIR)/usr/include/ mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libustl.a $(STAGING_DIR)/usr/lib/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libustl.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.a $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libustl.so* $(STAGING_DIR)/usr/lib/ touch $@ install-dev: $(STAGING_DIR)/usr/lib/libustl.so diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 7eb180173e..6e8f5abd7f 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -44,20 +44,20 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_FDISK): install -d -m0755 $(IDIR_FDISK)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/fdisk $(IDIR_FDISK)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/fdisk $(IDIR_FDISK)/usr/sbin/ $(RSTRIP) $(IDIR_FDISK) $(IPKG_BUILD) $(IDIR_FDISK) $(PACKAGE_DIR) $(IPKG_LOSETUP): install -d -m0755 $(IDIR_LOSETUP)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/losetup $(IDIR_LOSETUP)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/losetup $(IDIR_LOSETUP)/usr/sbin/ $(RSTRIP) $(IDIR_LOSETUP) $(IPKG_BUILD) $(IDIR_LOSETUP) $(PACKAGE_DIR) $(IPKG_SWAP_UTILS): install -d -m0755 $(IDIR_SWAP_UTILS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/sbin/swap{on,off} $(IDIR_SWAP_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/swap{on,off} $(IDIR_SWAP_UTILS)/usr/sbin/ $(RSTRIP) $(IDIR_SWAP_UTILS) $(IPKG_BUILD) $(IDIR_SWAP_UTILS) $(PACKAGE_DIR) diff --git a/package/vgp/Makefile b/package/vgp/Makefile index 7e75b0d240..29fd8711ec 100755 --- a/package/vgp/Makefile +++ b/package/vgp/Makefile @@ -45,6 +45,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_VGP): mkdir -p $(IDIR_VGP) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_VGP)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_VGP)/ $(RSTRIP) $(IDIR_VGP) $(IPKG_BUILD) $(IDIR_VGP) $(PACKAGE_DIR) diff --git a/package/vnstat/Makefile b/package/vnstat/Makefile index 147017568e..009388e208 100644 --- a/package/vnstat/Makefile +++ b/package/vnstat/Makefile @@ -28,6 +28,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_VNSTAT): install -d -m0755 $(IDIR_VNSTAT)/usr/bin - cp $(PKG_BUILD_DIR)/src/vnstat $(IDIR_VNSTAT)/usr/bin/ + $(CP) $(PKG_BUILD_DIR)/src/vnstat $(IDIR_VNSTAT)/usr/bin/ $(STRIP) $(IDIR_VNSTAT)/usr/bin/* $(IPKG_BUILD) $(IDIR_VNSTAT) $(PACKAGE_DIR) diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile index 55082905de..eb21240c07 100644 --- a/package/vpnc/Makefile +++ b/package/vpnc/Makefile @@ -35,6 +35,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_VPNC): install -d -m0755 $(IDIR_VPNC) - cp -fpR $(PKG_INSTALL_DIR)/* $(IDIR_VPNC)/ + $(CP) $(PKG_INSTALL_DIR)/* $(IDIR_VPNC)/ $(RSTRIP) $(IDIR_VPNC) $(IPKG_BUILD) $(IDIR_VPNC) $(PACKAGE_DIR) diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile index 42044579e0..d3c72c8598 100644 --- a/package/vsftpd/Makefile +++ b/package/vsftpd/Makefile @@ -37,6 +37,6 @@ $(IPKG_VSFTPD): install -d -m0755 $(IDIR_VSFTPD)/etc/init.d install -m0755 ./files/vsftpd.init $(IDIR_VSFTPD)/etc/init.d/vsftpd install -d -m0755 $(IDIR_VSFTPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/vsftpd $(IDIR_VSFTPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/vsftpd $(IDIR_VSFTPD)/usr/sbin/ $(RSTRIP) $(IDIR_VSFTPD) $(IPKG_BUILD) $(IDIR_VSFTPD) $(PACKAGE_DIR) diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile index 5046c18180..415fc40ca7 100644 --- a/package/watchdog/Makefile +++ b/package/watchdog/Makefile @@ -60,12 +60,12 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_WATCHDOG): install -d -m0755 $(IDIR_WATCHDOG)/etc - cp -fpR $(PKG_INSTALL_DIR)/etc/watchdog.conf $(IDIR_WATCHDOG)/etc/ + $(CP) $(PKG_INSTALL_DIR)/etc/watchdog.conf $(IDIR_WATCHDOG)/etc/ install -d -m0755 $(IDIR_WATCHDOG)/etc/init.d install -m0755 ./files/watchdog.init $(IDIR_WATCHDOG)/etc/init.d/watchdog ln -sf watchdog $(IDIR_WATCHDOG)/etc/init.d/S90watchdog install -d -m0755 $(IDIR_WATCHDOG)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/watchdog $(IDIR_WATCHDOG)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/wd_keepalive $(IDIR_WATCHDOG)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/watchdog $(IDIR_WATCHDOG)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/wd_keepalive $(IDIR_WATCHDOG)/usr/sbin/ $(RSTRIP) $(IDIR_WATCHDOG) $(IPKG_BUILD) $(IDIR_WATCHDOG) $(PACKAGE_DIR) diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile index 044b839ad5..0ecb34e1b4 100644 --- a/package/wccpd/Makefile +++ b/package/wccpd/Makefile @@ -60,6 +60,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_WCCPD): install -d -m0755 $(IDIR_WCCPD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/wccpd $(IDIR_WCCPD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/wccpd $(IDIR_WCCPD)/usr/sbin/ $(RSTRIP) $(IDIR_WCCPD) $(IPKG_BUILD) $(IDIR_WCCPD) $(PACKAGE_DIR) diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile index f1b29bc022..3847c8a932 100644 --- a/package/wifidog/Makefile +++ b/package/wifidog/Makefile @@ -66,9 +66,9 @@ $(IPKG_WIFIDOG): install -m0755 -d $(IDIR_WIFIDOG)/usr/bin install -m0755 -d $(IDIR_WIFIDOG)/usr/lib install -m0755 $(PKG_BUILD_DIR)/scripts/init.d/wifidog $(IDIR_WIFIDOG)/usr/bin/wifidog-init - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/wifidog $(IDIR_WIFIDOG)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/wdctl $(IDIR_WIFIDOG)/usr/bin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libhttpd.so* $(IDIR_WIFIDOG)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/wifidog $(IDIR_WIFIDOG)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/wdctl $(IDIR_WIFIDOG)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libhttpd.so* $(IDIR_WIFIDOG)/usr/lib/ $(RSTRIP) $(IDIR_WIFIDOG) $(IPKG_BUILD) $(IDIR_WIFIDOG) $(PACKAGE_DIR) diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index 71f0a2f219..209f800df4 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -24,28 +24,28 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \ - libiw.so.28 iwmulticall + all iwmulticall mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ PREFIX="$(PKG_INSTALL_DIR)" \ INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \ INSTALL_LIB="$(PKG_INSTALL_DIR)/usr/lib" \ - install-iwmulticall + install install-iwmulticall touch $@ $(IPKG_WIRELESS_TOOLS): mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/lib - cp -fpR $(PKG_BUILD_DIR)/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/ mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/ $(RSTRIP) $(IDIR_WIRELESS_TOOLS) $(IPKG_BUILD) $(IDIR_WIRELESS_TOOLS) $(PACKAGE_DIR) install-dev: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/{lib,include} - cp -a $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libiw.so* $(STAGING_DIR)/usr/lib/ ln -sf libiw.so.28 $(STAGING_DIR)/usr/lib/libiw.so - cp -a $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/ + $(CP) $(PKG_BUILD_DIR)/{iwlib,wireless}.h $(STAGING_DIR)/usr/include/ uninstall-dev: rm -f $(STAGING_DIR)/usr/lib/libiw.* diff --git a/package/wiviz/Makefile b/package/wiviz/Makefile index 73a32a470e..d5317f1ba6 100644 --- a/package/wiviz/Makefile +++ b/package/wiviz/Makefile @@ -14,7 +14,7 @@ $(eval $(call PKG_template,WIVIZ,wiviz,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/.configured: @@ -30,9 +30,9 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_WIVIZ): mkdir -p $(IDIR_WIVIZ)/usr/sbin - cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_WIVIZ)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_WIVIZ)/usr/sbin/ $(RSTRIP) $(IDIR_WIVIZ) - cp -fpR ./files/* $(IDIR_WIVIZ) + $(CP) ./files/* $(IDIR_WIVIZ) find $(IDIR_WIVIZ) -name CVS | xargs rm -rf find $(IDIR_WIVIZ) -name .svn | xargs rm -rf $(IPKG_BUILD) $(IDIR_WIVIZ) $(PACKAGE_DIR) diff --git a/package/wol/Makefile b/package/wol/Makefile index 3a8811686e..efdb670378 100644 --- a/package/wol/Makefile +++ b/package/wol/Makefile @@ -61,6 +61,6 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_WOL): install -m0755 -d $(IDIR_WOL)/usr/bin - cp $(PKG_INSTALL_DIR)/usr/bin/wol $(IDIR_WOL)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/wol $(IDIR_WOL)/usr/bin/ $(RSTRIP) $(IDIR_WOL) $(IPKG_BUILD) $(IDIR_WOL) $(PACKAGE_DIR) diff --git a/package/wondershaper/Makefile b/package/wondershaper/Makefile index af441388b1..44533c64df 100644 --- a/package/wondershaper/Makefile +++ b/package/wondershaper/Makefile @@ -28,8 +28,8 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_WONDERSHAPER): install -d -m0755 $(IDIR_WONDERSHAPER)/usr/sbin install -d -m0755 $(IDIR_WONDERSHAPER)/etc/init.d - cp -fpR $(PKG_BUILD_DIR)/wshaper.htb $(IDIR_WONDERSHAPER)/usr/sbin/wshaper - cp -fpR $(PKG_BUILD_DIR)/wshaper.conf $(IDIR_WONDERSHAPER)/etc/wshaper.conf + $(CP) $(PKG_BUILD_DIR)/wshaper.htb $(IDIR_WONDERSHAPER)/usr/sbin/wshaper + $(CP) $(PKG_BUILD_DIR)/wshaper.conf $(IDIR_WONDERSHAPER)/etc/wshaper.conf ln -fs /usr/sbin/wshaper $(IDIR_WONDERSHAPER)/etc/init.d/S60wondershaper $(IPKG_BUILD) $(IDIR_WONDERSHAPER) $(PACKAGE_DIR) diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 34e9fcfdd4..b1a9bd1b33 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - cp -fpR ./files/config $(PKG_BUILD_DIR)/.config + $(CP) ./files/config $(PKG_BUILD_DIR)/.config touch $@ $(PKG_BUILD_DIR)/.built: diff --git a/package/wx200d/Makefile b/package/wx200d/Makefile index 7eb3a4054f..4673e83f28 100644 --- a/package/wx200d/Makefile +++ b/package/wx200d/Makefile @@ -59,12 +59,12 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_WX200D): install -d -m0755 $(IDIR_WX200D)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/wx200 \ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/wx200 \ $(PKG_INSTALL_DIR)/usr/bin/wxstdout \ $(PKG_INSTALL_DIR)/usr/bin/wxfilter \ $(PKG_INSTALL_DIR)/usr/bin/wxdebug $(IDIR_WX200D)/usr/bin/ install -d -m0755 $(IDIR_WX200D)/usr/sbin/ - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/wx200d \ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/wx200d \ $(PKG_INSTALL_DIR)/usr/sbin/wxread $(IDIR_WX200D)/usr/sbin/ $(RSTRIP) $(IDIR_WX200D) $(IPKG_BUILD) $(IDIR_WX200D) $(PACKAGE_DIR) diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile index 3b22beceb9..a3e5d59e6a 100644 --- a/package/xinetd/Makefile +++ b/package/xinetd/Makefile @@ -66,6 +66,6 @@ $(IPKG_XINETD): install -d -m0755 $(IDIR_XINETD)/etc/init.d install -m0755 ./files/xinetd.init $(IDIR_XINETD)/etc/init.d/xinetd install -d -m0755 $(IDIR_XINETD)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/xinetd $(IDIR_XINETD)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xinetd $(IDIR_XINETD)/usr/sbin/ $(RSTRIP) $(IDIR_XINETD) $(IPKG_BUILD) $(IDIR_XINETD) $(PACKAGE_DIR) diff --git a/package/xsupplicant/Makefile b/package/xsupplicant/Makefile index dea7899475..45663eb43c 100644 --- a/package/xsupplicant/Makefile +++ b/package/xsupplicant/Makefile @@ -65,8 +65,8 @@ $(IPKG_XSUPPLICANT): install -d -m0755 $(IDIR_XSUPPLICANT)/etc install -m0644 $(PKG_BUILD_DIR)/etc/xsupplicant.conf $(IDIR_XSUPPLICANT)/etc/ install -d -m0755 $(IDIR_XSUPPLICANT)/usr/bin - cp -fpR $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(IDIR_XSUPPLICANT)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/xsup_* $(IDIR_XSUPPLICANT)/usr/bin/ install -d -m0755 $(IDIR_XSUPPLICANT)/usr/sbin - cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(IDIR_XSUPPLICANT)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/xsupplicant $(IDIR_XSUPPLICANT)/usr/sbin/ $(RSTRIP) $(IDIR_XSUPPLICANT) $(IPKG_BUILD) $(IDIR_XSUPPLICANT) $(PACKAGE_DIR) diff --git a/package/zlib/Makefile b/package/zlib/Makefile index f5a39b2685..cfd82800a8 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -43,15 +43,15 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_ZLIB): install -m0755 -d $(IDIR_ZLIB)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/ $(RSTRIP) $(IDIR_ZLIB) $(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR) $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include - cp -fpR $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(STAGING_DIR)/usr/include mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(STAGING_DIR)/usr/lib touch $(STAGING_DIR)/usr/lib/libz.so install-dev: $(STAGING_DIR)/usr/lib/libz.so diff --git a/rules.mk b/rules.mk index 31c2b4f914..9d924a5b40 100644 --- a/rules.mk +++ b/rules.mk @@ -38,6 +38,7 @@ START_TRACE:=: END_TRACE:=: endif +CP=cp -fpR MAKE1=make MAKEFLAGS=-j$(BR2_JLEVEL) V=$(V) $(EXTRA_MAKEFLAGS) # Strip off the annoying quoting diff --git a/scripts/ipkg b/scripts/ipkg index 6cd1cb440a..7ceaeff69c 100755 --- a/scripts/ipkg +++ b/scripts/ipkg @@ -787,7 +787,7 @@ ipkg_install_file_dest() { echo "Package: $pkg Status: install ok pending" | ipkg_status_update_sd $sd $pkg mkdir -p $IPKG_PENDING_DIR - cp $filename $IPKG_PENDING_DIR + cp -f $filename $IPKG_PENDING_DIR rm -r $IPKG_TMP/$pkg/control rm -r $IPKG_TMP/$pkg/data rmdir $IPKG_TMP/$pkg diff --git a/target/linux/Makefile b/target/linux/Makefile index 626587b5b0..4ef6c45a06 100644 --- a/target/linux/Makefile +++ b/target/linux/Makefile @@ -60,13 +60,13 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: rm -rf $(IB_DIR) mkdir -p $(IB_DIR)/packages mkdir -p $(IB_DIR)/scripts - cp -fpR ./imagebuilder/* $(IB_DIR)/ - cp -fpR $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/ - cp $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/ + $(CP) ./imagebuilder/* $(IB_DIR)/ + $(CP) $(TOPDIR)/bin/packages/*.ipk $(IB_DIR)/packages/ + $(CP) $(TOPDIR)/scripts/ipkg $(IB_DIR)/scripts/ $(MAKE) install-ib - cp $(TOPDIR)/rules.mk $(IB_DIR) - cp -fpR ./image $(IB_DIR)/ - cp $(TOPDIR)/.config $(IB_DIR)/ + $(CP) $(TOPDIR)/rules.mk $(IB_DIR) + $(CP) ./image $(IB_DIR)/ + $(CP) $(TOPDIR)/.config $(IB_DIR)/ find $(IB_DIR) -name .svn | xargs rm -rf find $(IB_DIR) -name CVS | xargs rm -rf (cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2) diff --git a/target/linux/ar531x-2.4/Makefile b/target/linux/ar531x-2.4/Makefile index 989bcc4582..6e6551b193 100644 --- a/target/linux/ar531x-2.4/Makefile +++ b/target/linux/ar531x-2.4/Makefile @@ -12,6 +12,6 @@ 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) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile index daa734107d..10be12117b 100644 --- a/target/linux/ar7-2.4/Makefile +++ b/target/linux/ar7-2.4/Makefile @@ -13,13 +13,13 @@ ATM_FIRMWARE_DIR=sangam-atm-firmware-$(ATM_FIRMWARE_VERSION) $(eval $(call KMOD_template,SANGAM_ATM_A,sangam-atm-annex-a,\ $(MODULES_DIR)/kernel/drivers/atm/tiatm.o \ ,CONFIG_MIPS_SANGAM_ATM,kmod-atm,60,tiatm, \ - cp $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_a.bin $$(I_SANGAM_ATM_A)/lib/modules/ar0700xx.bin \ + $(CP) $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_a.bin $$(I_SANGAM_ATM_A)/lib/modules/ar0700xx.bin \ )) $(eval $(call KMOD_template,SANGAM_ATM_B,sangam-atm-annex-b,\ $(MODULES_DIR)/kernel/drivers/atm/tiatm.o \ ,CONFIG_MIPS_SANGAM_ATM,kmod-atm,60,tiatm, \ - cp $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_b.bin $$(I_SANGAM_ATM_B)/lib/modules/ar0700xx.bin \ + $(CP) $(BUILD_DIR)/$(ATM_FIRMWARE_DIR)/ar0700xx_b.bin $$(I_SANGAM_ATM_B)/lib/modules/ar0700xx.bin \ )) $(eval $(call KMOD_template,CPMAC,cpmac,\ @@ -33,7 +33,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) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile index 111bfd08a5..3e1ee17df2 100644 --- a/target/linux/aruba-2.6/Makefile +++ b/target/linux/aruba-2.6/Makefile @@ -15,9 +15,9 @@ $(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) - @cp config-ramdisk $(LINUX_DIR)/.config + @$(CP) config-ramdisk $(LINUX_DIR)/.config else - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config endif touch $@ diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile index 33d5f1b835..ab68b7ae88 100644 --- a/target/linux/brcm-2.4/Makefile +++ b/target/linux/brcm-2.4/Makefile @@ -30,7 +30,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) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ @@ -56,12 +56,12 @@ $(LINUX_DIR)/.drivers-unpacked: $(LINUX_DIR)/.unpacked zcat $(DL_DIR)/$(LINUX_BINARY_WL_DRIVER) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - # copy binary wlan driver mkdir -p $(LINUX_DIR)/drivers/net/wl - cp -fpR $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl + $(CP) $(BUILD_DIR)/wl/*.o $(LINUX_DIR)/drivers/net/wl touch $@ $(LINUX_DIR)/.drivers-installed: $(LINUX_DIR)/.modules_done mkdir -p $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl - @-[ -f $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/wl.o ] || cp $(LINUX_DIR)/drivers/net/wl/wl.o $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/ + @-[ -f $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/wl.o ] || $(CP) $(LINUX_DIR)/drivers/net/wl/wl.o $(LINUX_BUILD_DIR)/modules/lib/modules/2.4.32/kernel/drivers/net/wl/ touch $@ linux-dirclean: drivers-clean diff --git a/target/linux/brcm-2.6/Makefile b/target/linux/brcm-2.6/Makefile index 9b2e16c0bf..489278a67b 100644 --- a/target/linux/brcm-2.6/Makefile +++ b/target/linux/brcm-2.6/Makefile @@ -14,6 +14,6 @@ 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) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ diff --git a/target/linux/image/Makefile b/target/linux/image/Makefile index 7c65b6e3e1..e64efbf357 100644 --- a/target/linux/image/Makefile +++ b/target/linux/image/Makefile @@ -33,12 +33,13 @@ install-ib: @$(TRACE) target/linux/image/$(BOARD)-install-ib -$(MAKE) -C $(BOARD) IB_DIR="$(IB_DIR)" install-ib mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/kernel[-_]*.ipk $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ install-prepare: find $(KDIR)/root -type f -not -perm +0100 | xargs chmod 0644 find $(KDIR)/root -type f -perm +0100 | xargs chmod 0755 find $(KDIR)/root -type d | xargs chmod 0755 + mkdir -p $(KDIR)/root/tmp chmod 0777 $(KDIR)/root/tmp rebuild: clean prepare compile install diff --git a/target/linux/image/ar7/Makefile b/target/linux/image/ar7/Makefile index 0b73787854..38fce6bdfc 100644 --- a/target/linux/image/ar7/Makefile +++ b/target/linux/image/ar7/Makefile @@ -62,7 +62,7 @@ $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin: $(KDIR)/vmlinux.bin endif $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin: - cp $(KDIR)/vmlinux.bin $@ + $(CP) $(KDIR)/vmlinux.bin $@ ifeq ($(FS),jffs2-8MB) ALIGN:=bs=131072 conv=sync @@ -106,7 +106,7 @@ endif install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).bin install-ib: mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -fpR $(KDIR)/vmlinux.bin $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(KDIR)/vmlinux.bin $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ mkdir -p $(IB_DIR)/staging_dir_$(ARCH) - cp -fpR $(STAGING_DIR)/bin/addpattern $(IB_DIR)/staging_dir_$(ARCH)/bin/ + $(CP) $(STAGING_DIR)/bin/addpattern $(IB_DIR)/staging_dir_$(ARCH)/bin/ diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile index 2a7f2e4682..a2cceaf0c1 100644 --- a/target/linux/image/aruba/Makefile +++ b/target/linux/image/aruba/Makefile @@ -62,5 +62,5 @@ endif install-ib: mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -fpR $(KDIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ - cp -fpR $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(KDIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ + $(CP) $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/target/linux/image/brcm/Makefile b/target/linux/image/brcm/Makefile index b15e10b412..18bd3265c3 100644 --- a/target/linux/image/brcm/Makefile +++ b/target/linux/image/brcm/Makefile @@ -32,7 +32,7 @@ endif $(KDIR)/loader.tmp.gz: - cp $(BUILD_DIR)/loader.gz $@ + $(CP) $(BUILD_DIR)/loader.gz $@ echo -ne "\\x00" >> $@ $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx: $(KDIR)/loader.tmp.gz @@ -73,19 +73,11 @@ FSNAME:=$(patsubst jffs2-%,jffs2,$(FS)) # ifeq ($(FS),squashfs) # $(BIN_DIR)/openwrt-wap54g-$(KERNEL)-$(FSNAME).trx: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx -# cp $< $@ +# $(CP) $< $@ # echo -ne '\x01' >> $@ # # install: $(BIN_DIR)/openwrt-wap54g-$(KERNEL)-$(FSNAME).trx # endif - -ifneq ($(FS),jffs2-8MB) -$(BIN_DIR)/openwrt-wrt54g3g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx - $(STAGING_DIR)/bin/addpattern -4 -p W54F -v v1.99.5 -i $< -o $@ -g - -$(BIN_DIR)/openwrt-wrt54g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx - $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g - $(BIN_DIR)/openwrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx $(STAGING_DIR)/bin/addpattern -4 -p W54s -v v1.05.2 -i $< -o $@ -g @@ -120,8 +112,8 @@ endif install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx install-ib: mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin - cp -fpR $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin + $(CP) -fpR $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -fpR $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/ - cp -fpR $(BUILD_DIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ - cp -fpR $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/ + $(CP) $(BUILD_DIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ + $(CP) $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/target/linux/image/brcm/lzma-loader/Makefile b/target/linux/image/brcm/lzma-loader/Makefile index 134fdde9dd..1d7b6a3196 100644 --- a/target/linux/image/brcm/lzma-loader/Makefile +++ b/target/linux/image/brcm/lzma-loader/Makefile @@ -9,7 +9,7 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) $(PKG_BUILD_DIR)/.prepared: mkdir $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/.prepared @@ -17,10 +17,10 @@ $(PKG_BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/.prepared LD=$(TARGET_CROSS)ld CROSS_COMPILE=$(TARGET_CROSS) $(BUILD_DIR)/loader.gz: $(PKG_BUILD_DIR)/loader.gz - cp $< $@ + $(CP) $< $@ $(BUILD_DIR)/loader.elf: $(PKG_BUILD_DIR)/loader.o - cp $< $@ + $(CP) $< $@ source: prepare: $(PKG_BUILD_DIR)/.prepared diff --git a/target/linux/image/generic/lzma-loader/Makefile b/target/linux/image/generic/lzma-loader/Makefile index daa83535e9..089254bbaf 100644 --- a/target/linux/image/generic/lzma-loader/Makefile +++ b/target/linux/image/generic/lzma-loader/Makefile @@ -9,7 +9,7 @@ PKG_BUILD_DIR := $(KDIR)/$(PKG_NAME)-$(PKG_VERSION) $(PKG_BUILD_DIR)/.prepared: mkdir $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.lzma @@ -21,10 +21,10 @@ $(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.l $(PKG_BUILD_DIR)/vmlinux.lzma: $(KDIR)/vmlinux.lzma - cp $< $@ + $(CP) $< $@ $(KDIR)/loader.elf: $(PKG_BUILD_DIR)/lzma.elf - cp $< $@ + $(CP) $< $@ source: prepare: $(PKG_BUILD_DIR)/.prepared diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk index b6396e66ab..c7d4335d8c 100644 --- a/target/linux/image/jffs2.mk +++ b/target/linux/image/jffs2.mk @@ -36,7 +36,7 @@ jffs2-install: $(KDIR)/root.jffs2-4MB $(KDIR)/root.jffs2-8MB jffs2-install-ib: compile-targets mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin - cp $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin + $(CP) $(STAGING_DIR)/bin/mkfs.jffs2 $(IB_DIR)/staging_dir_$(ARCH)/bin prepare-targets: jffs2-prepare compile-targets: jffs2-compile diff --git a/target/linux/image/jffs2/Makefile b/target/linux/image/jffs2/Makefile index d5f03bef4a..071bacdd47 100644 --- a/target/linux/image/jffs2/Makefile +++ b/target/linux/image/jffs2/Makefile @@ -18,7 +18,7 @@ $(MTD_DIR)/util/mkfs.jffs2: $(MTD_DIR)/.unpacked $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util $(STAGING_DIR)/bin/mkfs.jffs2: $(MTD_DIR)/util/mkfs.jffs2 - cp $< $@ + $(CP) $< $@ source: $(DL_DIR)/$(MTD_SOURCE) prepare: $(MTD_DIR)/.unpacked diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk index 7fe972a45e..0b39aa1611 100644 --- a/target/linux/image/squashfs.mk +++ b/target/linux/image/squashfs.mk @@ -28,7 +28,7 @@ squashfs-install: $(KDIR)/root.squashfs squashfs-install-ib: compile-targets mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin - cp $(STAGING_DIR)/bin/mksquashfs-lzma $(IB_DIR)/staging_dir_$(ARCH)/bin + $(CP) $(STAGING_DIR)/bin/mksquashfs-lzma $(IB_DIR)/staging_dir_$(ARCH)/bin prepare-targets: squashfs-prepare compile-targets: squashfs-compile diff --git a/target/linux/image/squashfs/Makefile b/target/linux/image/squashfs/Makefile index df21fd256c..77792565b3 100644 --- a/target/linux/image/squashfs/Makefile +++ b/target/linux/image/squashfs/Makefile @@ -17,7 +17,7 @@ $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/.unpacke $(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(BUILD_DIR)/lzma $(STAGING_DIR)/bin/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma - cp $< $@ + $(CP) $< $@ source: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) prepare: $(SQUASHFSLZMA_DIR)/.unpacked diff --git a/target/linux/image/x86/Makefile b/target/linux/image/x86/Makefile index 37600c91db..5820d022bc 100644 --- a/target/linux/image/x86/Makefile +++ b/target/linux/image/x86/Makefile @@ -6,7 +6,7 @@ KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) ifeq ($(FS),jffs2-8MB) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img: $(KDIR)/root.$(FS) - cp $^ $@ + $(CP) $^ $@ install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).img @@ -16,7 +16,7 @@ endif ifeq ($(FS),tgz) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz: $(KDIR)/root.tar.gz - cp $^ $@ + $(CP) $^ $@ install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tar.gz @@ -24,7 +24,7 @@ endif $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz: $(KDIR)/bzImage - cp $^ $@ + $(CP) $^ $@ clean: @@ -33,4 +33,4 @@ compile: install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinuz install-ib: mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) - cp -fpR $(KDIR)/bzImage $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ + $(CP) $(KDIR)/bzImage $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/ diff --git a/target/linux/imagebuilder/Makefile b/target/linux/imagebuilder/Makefile index 0ec71199c7..8ed7a5cc02 100644 --- a/target/linux/imagebuilder/Makefile +++ b/target/linux/imagebuilder/Makefile @@ -40,9 +40,9 @@ build: $(IPKG_KERNEL) install `ls packages/$${package}_*`; \ done if [ -d ./files ]; then \ - cp -a --remove-destination ./files/* $(LINUX_BUILD_DIR)/root; \ + $(CP) --remove-destination ./files/* $(LINUX_BUILD_DIR)/root; \ fi if [ -d ./files.$(LIST) ]; then \ - cp -a --remove-destination ./files.$(LIST)/* $(LINUX_BUILD_DIR)/root; \ + $(CP) --remove-destination ./files.$(LIST)/* $(LINUX_BUILD_DIR)/root; \ fi $(MAKE) -S -C image KERNEL="$(KERNEL)" BOARD="$(BOARD)" BIN_DIR="$(BIN_DIR)/$(LIST)" install diff --git a/target/linux/package/base-files/Makefile b/target/linux/package/base-files/Makefile index 994ce53388..637904c2e8 100644 --- a/target/linux/package/base-files/Makefile +++ b/target/linux/package/base-files/Makefile @@ -23,7 +23,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin/jffs2root: $(PKG_BUILD_DIR)/jffs2root mkdir -p $(IDIR_OPENWRT)/sbin - cp $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin + $(CP) $(PKG_BUILD_DIR)/jffs2root $(IDIR_OPENWRT)/sbin $(IPKG_OPENWRT): $(IDIR_OPENWRT)/sbin/jffs2root endif @@ -36,7 +36,7 @@ $(IDIR_OPENWRT): $(SED) s,base-files-arch,base-files-$(BOARD)-$(KERNEL),g $(IDIR_OPENWRT)/CONTROL/control $(IPKG_OPENWRT): $(IDIR_OPENWRT) - [ -d files/$(BOARD)-$(KERNEL) ] && cp -fpR files/$(BOARD)-$(KERNEL)/* $(IDIR_OPENWRT)/ + [ -d files/$(BOARD)-$(KERNEL) ] && $(CP) -fpR files/$(BOARD)-$(KERNEL)/* $(IDIR_OPENWRT)/ find $(IDIR_OPENWRT) -name CVS | xargs rm -rf find $(IDIR_OPENWRT) -name .svn | xargs rm -rf $(RSTRIP) $(IDIR_OPENWRT) @@ -50,4 +50,4 @@ openwrt-install: compile-targets: install-dev $(IPKG_OPENWRT) install-dev: mkdir -p $(STAGING_DIR)/usr/include - cp -fpR ./include/[a-z]* $(STAGING_DIR)/usr/include/ + $(CP) ./include/[a-z]* $(STAGING_DIR)/usr/include/ diff --git a/target/linux/package/bcm43xx-dscape/Makefile b/target/linux/package/bcm43xx-dscape/Makefile index 5856bf7492..3c07e3daae 100644 --- a/target/linux/package/bcm43xx-dscape/Makefile +++ b/target/linux/package/bcm43xx-dscape/Makefile @@ -26,7 +26,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/fwcutter/.built: mkdir -p $(PKG_BUILD_DIR)/fwcutter - cp ./fwcutter/* $(PKG_BUILD_DIR)/fwcutter/ + $(CP) ./fwcutter/* $(PKG_BUILD_DIR)/fwcutter/ $(SCRIPT_DIR)/download.pl "$(PKG_BUILD_DIR)/fwcutter" "$(FIRMWARE_BLOB)" "$(FIRMWARE_BLOB_MD5SUM)" $(FIRMWARE_BLOB_URL) $(MAKE) -C $(PKG_BUILD_DIR)/fwcutter $(PKG_BUILD_DIR)/fwcutter/fwcutter -w $(PKG_BUILD_DIR)/fwcutter $(PKG_BUILD_DIR)/fwcutter/$(FIRMWARE_BLOB) @@ -50,7 +50,7 @@ $(IPKG_KMOD_BCM43XX_DSCAPE): echo rate_control; \ echo bcm43xx; \ ) >& $(IDIR_KMOD_BCM43XX_DSCAPE)/etc/modules.d/50-bcm43xx - cp -fpR $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/modules/$(LINUX_VERSION) + $(CP) $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/modules/$(LINUX_VERSION) install -m0755 -d $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/firmware - cp -fpR $(PKG_BUILD_DIR)/fwcutter/*.fw $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/firmware/ + $(CP) $(PKG_BUILD_DIR)/fwcutter/*.fw $(IDIR_KMOD_BCM43XX_DSCAPE)/lib/firmware/ $(IPKG_BUILD) $(IDIR_KMOD_BCM43XX_DSCAPE) $(PACKAGE_DIR) diff --git a/target/linux/package/diag/Makefile b/target/linux/package/diag/Makefile index 26bdcc952f..3329ee9852 100644 --- a/target/linux/package/diag/Makefile +++ b/target/linux/package/diag/Makefile @@ -27,5 +27,5 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_DIAG): mkdir -p $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION) - cp $(PKG_BUILD_DIR)/diag.o $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/diag.o $(IDIR_KMOD_DIAG)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_DIAG) $(PACKAGE_DIR) diff --git a/target/linux/package/fuse/Makefile b/target/linux/package/fuse/Makefile index 62d6df36d9..b9a57d002d 100644 --- a/target/linux/package/fuse/Makefile +++ b/target/linux/package/fuse/Makefile @@ -74,7 +74,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_FUSE): mkdir -p $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/fuse/fuse.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_FUSE)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_FUSE) $(PACKAGE_DIR) diff --git a/target/linux/package/hostap/Makefile b/target/linux/package/hostap/Makefile index ac031e3bc9..3e8e604984 100644 --- a/target/linux/package/hostap/Makefile +++ b/target/linux/package/hostap/Makefile @@ -34,7 +34,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_HOSTAP): install -m0755 -d $(IDIR_KMOD_HOSTAP)/lib/modules/$(LINUX_VERSION) - cp -fpR \ + $(CP) \ $(PKG_BUILD_DIR)/driver/modules/hostap.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_ccmp.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/driver/modules/hostap_crypt_tkip.$(LINUX_KMOD_SUFFIX) \ @@ -44,14 +44,14 @@ $(IPKG_KMOD_HOSTAP): $(IPKG_KMOD_HOSTAP_PCI): install -m0755 -d $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION) - cp -fpR \ + $(CP) \ $(PKG_BUILD_DIR)/driver/modules/hostap_pci.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_HOSTAP_PCI)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PCI) $(PACKAGE_DIR) $(IPKG_KMOD_HOSTAP_PLX): install -m0755 -d $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION) - cp -fpR \ + $(CP) \ $(PKG_BUILD_DIR)/driver/modules/hostap_plx.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_HOSTAP_PLX)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_HOSTAP_PLX) $(PACKAGE_DIR) diff --git a/target/linux/package/ieee80211-dscape/Makefile b/target/linux/package/ieee80211-dscape/Makefile index 90fe09d3d8..3de9b34fb8 100644 --- a/target/linux/package/ieee80211-dscape/Makefile +++ b/target/linux/package/ieee80211-dscape/Makefile @@ -13,7 +13,7 @@ $(eval $(call PKG_template,KMOD_IEEE80211_DSCAPE,$(PKG_NAME),$(LINUX_VERSION)-$( $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/.configured: @@ -32,12 +32,12 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_IEEE80211_DSCAPE): install -m0755 -d $(IDIR_KMOD_IEEE80211_DSCAPE)/lib/modules/$(LINUX_VERSION) #install -m0755 -d $(IDIR_KMOD_IEEE80211_DSCAPE)/etc/modules.d - cp -fpR $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_IEEE80211_DSCAPE)/lib/modules/$(LINUX_VERSION) + $(CP) $(PKG_BUILD_DIR)/*.ko $(IDIR_KMOD_IEEE80211_DSCAPE)/lib/modules/$(LINUX_VERSION) $(IPKG_BUILD) $(IDIR_KMOD_IEEE80211_DSCAPE) $(PACKAGE_DIR) install-dev: mkdir -p $(STAGING_DIR)/usr/include/ieee80211-dscape - cp -fpR src/include/* $(STAGING_DIR)/usr/include/ieee80211-dscape/ + $(CP) src/include/* $(STAGING_DIR)/usr/include/ieee80211-dscape/ uninstall-dev: rm -rf $(STAGING_DIR)/usr/include/ieee80211-dscape diff --git a/target/linux/package/madwifi/Makefile b/target/linux/package/madwifi/Makefile index da94415408..eabbdd0f2b 100644 --- a/target/linux/package/madwifi/Makefile +++ b/target/linux/package/madwifi/Makefile @@ -77,20 +77,20 @@ $(IPKG_KMOD_MADWIFI): mkdir -p $(IDIR_KMOD_MADWIFI)/usr/sbin install -m0644 ./files/madwifi.modules $(IDIR_KMOD_MADWIFI)/etc/modules.d/20-madwifi install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi - cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \ $(BUS_MODULES) \ $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/ - cp -fpR $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(IDIR_KMOD_MADWIFI)/usr/sbin/ + $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(IDIR_KMOD_MADWIFI)/usr/sbin/ $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR) $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include/madwifi - cp -fpR $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/ + $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/ mkdir -p $(STAGING_DIR)/usr/include/madwifi/net80211 - cp -fpR $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/ + $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/ touch $@ install-dev: $(STAGING_DIR)/usr/include/madwifi/net80211/ieee80211.h diff --git a/target/linux/package/mini_fo/Makefile b/target/linux/package/mini_fo/Makefile index 6fea0655d0..dcd5b91f3a 100644 --- a/target/linux/package/mini_fo/Makefile +++ b/target/linux/package/mini_fo/Makefile @@ -35,7 +35,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_MINI_FO): install -m0755 -d $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION) install -m0755 -d $(IDIR_KMOD_MINI_FO)/etc/modules.d - cp -fpR $(PKG_BUILD_DIR)/mini_fo.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/mini_fo.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_MINI_FO)/lib/modules/$(LINUX_VERSION)/ echo "mini_fo" > $(IDIR_KMOD_MINI_FO)/etc/modules.d/15-mini-fo $(IPKG_BUILD) $(IDIR_KMOD_MINI_FO) $(PACKAGE_DIR) diff --git a/target/linux/package/openswan/Makefile b/target/linux/package/openswan/Makefile index e7faf3e361..9c1b1829f8 100644 --- a/target/linux/package/openswan/Makefile +++ b/target/linux/package/openswan/Makefile @@ -32,5 +32,5 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_OPENSWAN): mkdir -p $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/modobj*/ipsec.$(LINUX_KMOD_SUFFIX) $(IDIR_KMOD_OPENSWAN)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_OPENSWAN) $(PACKAGE_DIR) diff --git a/target/linux/package/shfs/Makefile b/target/linux/package/shfs/Makefile index a0ac839479..4625bdb12e 100644 --- a/target/linux/package/shfs/Makefile +++ b/target/linux/package/shfs/Makefile @@ -40,7 +40,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_SHFS): install -m0755 -d $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_INSTALL_DIR)/lib/modules/$(LINUX_VERSION)/kernel/fs/shfs/shfs.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_SHFS)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_SHFS) $(PACKAGE_DIR) diff --git a/target/linux/package/spca5xx/Makefile b/target/linux/package/spca5xx/Makefile index 95ffe5966f..6b66262a2f 100644 --- a/target/linux/package/spca5xx/Makefile +++ b/target/linux/package/spca5xx/Makefile @@ -33,7 +33,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_SPCA5XX): install -m0755 -d $(IDIR_KMOD_SPCA5XX)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_BUILD_DIR)/spca5xx.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/spca5xx.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_SPCA5XX)/lib/modules/$(LINUX_VERSION)/ $(RSTRIP_KMOD) $(IDIR_KMOD_SPCA5XX) $(IPKG_BUILD) $(IDIR_KMOD_SPCA5XX) $(PACKAGE_DIR) diff --git a/target/linux/package/switch/Makefile b/target/linux/package/switch/Makefile index c86147930e..812fccb2cc 100644 --- a/target/linux/package/switch/Makefile +++ b/target/linux/package/switch/Makefile @@ -13,7 +13,7 @@ $(eval $(call PKG_template,KMOD_SWITCH,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(P $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - cp -fpR ./src/* $(PKG_BUILD_DIR)/ + $(CP) ./src/* $(PKG_BUILD_DIR)/ touch $@ $(PKG_BUILD_DIR)/.configured: @@ -31,7 +31,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_SWITCH): install -m0755 -d $(IDIR_KMOD_SWITCH)/lib/modules/$(LINUX_VERSION) - cp -fpR $(PKG_BUILD_DIR)/*.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/*.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_SWITCH)/lib/modules/$(LINUX_VERSION) $(IPKG_BUILD) $(IDIR_KMOD_SWITCH) $(PACKAGE_DIR) diff --git a/target/linux/package/ueagle-atm/Makefile b/target/linux/package/ueagle-atm/Makefile index 2da1f463e1..3872727f59 100644 --- a/target/linux/package/ueagle-atm/Makefile +++ b/target/linux/package/ueagle-atm/Makefile @@ -34,7 +34,7 @@ $(PKG_BUILD_DIR)/.built: $(IPKG_KMOD_UEAGLE_ATM): install -m0755 -d $(IDIR_KMOD_UEAGLE_ATM)/lib/modules/$(LINUX_VERSION) $(IDIR_KMOD_UEAGLE_ATM)/etc/modules.d install -m0644 ./files/$(PKG_NAME).modules $(IDIR_KMOD_UEAGLE_ATM)/etc/modules.d/10-$(PKG_NAME) - cp -fpR $(PKG_BUILD_DIR)/driver/ueagle-atm.$(LINUX_KMOD_SUFFIX) \ + $(CP) $(PKG_BUILD_DIR)/driver/ueagle-atm.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/usbatm_iso/usbatm.$(LINUX_KMOD_SUFFIX) \ $(IDIR_KMOD_UEAGLE_ATM)/lib/modules/$(LINUX_VERSION)/ $(RSTRIP_KMOD) $(IDIR_KMOD_UEAGLE_ATM) diff --git a/target/linux/package/wlcompat/Makefile b/target/linux/package/wlcompat/Makefile index 718b584aae..cdc02ea229 100644 --- a/target/linux/package/wlcompat/Makefile +++ b/target/linux/package/wlcompat/Makefile @@ -33,11 +33,11 @@ $(IPKG_KMOD_WLCOMPAT): $(PKG_BUILD_DIR)/wlcompat.o mkdir -p $(IDIR_KMOD_WLCOMPAT)/etc/modules.d echo "wlcompat" > $(IDIR_KMOD_WLCOMPAT)/etc/modules.d/30-wlcompat mkdir -p $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION) - cp $(PKG_BUILD_DIR)/wlcompat.o $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/wlcompat.o $(IDIR_KMOD_WLCOMPAT)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_WLCOMPAT) $(PACKAGE_DIR) $(IPKG_KMOD_WLCOMPAT_DEBUG): $(PKG_BUILD_DIR)/wlcompat-debug.o mkdir -p $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION) - cp $(PKG_BUILD_DIR)/wlcompat-debug.o $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION)/ + $(CP) $(PKG_BUILD_DIR)/wlcompat-debug.o $(IDIR_KMOD_WLCOMPAT_DEBUG)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_WLCOMPAT_DEBUG) $(PACKAGE_DIR) diff --git a/target/linux/rules.mk b/target/linux/rules.mk index c9cf9c5e5f..f0f2e72dbb 100644 --- a/target/linux/rules.mk +++ b/target/linux/rules.mk @@ -68,7 +68,7 @@ $$(PKG_$(1)): $(LINUX_DIR)/.modules_done echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control ifneq ($(strip $(3)),) mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION) - cp $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION) + $(CP) $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION) endif ifneq ($(6),) mkdir -p $$(I_$(1))/etc/modules.d diff --git a/target/linux/x86-2.4/Makefile b/target/linux/x86-2.4/Makefile index 97ded843f7..5f20f1e406 100644 --- a/target/linux/x86-2.4/Makefile +++ b/target/linux/x86-2.4/Makefile @@ -19,12 +19,12 @@ 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) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ $(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux $(MAKE) -C $(LINUX_DIR) TOPDIR=$(LINUX_DIR) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage $(MAKE_TRACE) - cp -f $(LINUX_DIR)/arch/i386/boot/bzImage $@ + $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $@ touch $@ compile: $(LINUX_BUILD_DIR)/bzImage diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile index 3bb8c4d231..45a2e1c492 100644 --- a/target/linux/x86-2.6/Makefile +++ b/target/linux/x86-2.6/Makefile @@ -14,12 +14,12 @@ 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) - @cp config $(LINUX_DIR)/.config + @$(CP) config $(LINUX_DIR)/.config touch $@ $(LINUX_BUILD_DIR)/bzImage: $(LINUX_DIR)/vmlinux $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE=$(TARGET_CROSS) ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) bzImage $(MAKE_TRACE) - cp -f $(LINUX_DIR)/arch/i386/boot/bzImage $@ + $(CP) $(LINUX_DIR)/arch/i386/boot/bzImage $@ touch $@ compile: $(LINUX_BUILD_DIR)/bzImage diff --git a/target/lzma/Makefile b/target/lzma/Makefile index 8969e3d241..6e846c31c9 100644 --- a/target/lzma/Makefile +++ b/target/lzma/Makefile @@ -32,7 +32,7 @@ $(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked touch $@ lzma: $(TARGETS) - cp -f $^ $(LZMA_DIR) + $(CP) $^ $(LZMA_DIR) lzma-source: $(DL_DIR)/$(LZMA_SOURCE) @@ -49,5 +49,5 @@ lzma-dirclean: prepare: $(LZMA_DIR)/.unpacked compile: lzma install: lzma - cp $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/ + $(CP) $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/ clean: lzma-dirclean diff --git a/target/utils/Makefile b/target/utils/Makefile index c08bd1a55d..753db53deb 100644 --- a/target/utils/Makefile +++ b/target/utils/Makefile @@ -7,7 +7,7 @@ UTILS_BUILD_DIR:=$(BUILD_DIR)/target-utils prepare: $(UTILS_BUILD_DIR) compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS)) mkdir -p $(STAGING_DIR)/bin - cp -a $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/ + $(CP) $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/ install: compile package: clean: diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 642662e8f1..2d24cdd13e 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -187,7 +187,7 @@ ifeq ($(findstring 3.3.,$(GCC_VERSION)),3.3.) echo staging dir specs file is missing ; \ /bin/false ; \ fi; - cp ./$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs + $(CP) ./$(GCC_VERSION)/specs-$(ARCH)-soft-float $(STAGING_DIR)/lib/gcc-lib/$(REAL_GNU_TARGET_NAME)/$(GCC_VERSION)/specs endif endif # We do another ugly hack here because the standard behaviour is diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index 9f466d321d..27da1d5e9f 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -38,7 +38,7 @@ $(LINUX_HEADERS_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE) touch $(LINUX_HEADERS_DIR)/.unpacked $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.unpacked - -cp -af ./files/config.$(LINUX_HEADERS_ARCH) $(LINUX_HEADERS_DIR)/.config + -$(CP) ./files/config.$(LINUX_HEADERS_ARCH) $(LINUX_HEADERS_DIR)/.config $(MAKE) -C $(LINUX_HEADERS_DIR) ARCH=$(LINUX_HEADERS_ARCH) oldconfig include/linux/version.h touch $(LINUX_HEADERS_DIR)/.configured diff --git a/toolchain/libnotimpl/Makefile b/toolchain/libnotimpl/Makefile index 9ae2bf2407..f68346c371 100644 --- a/toolchain/libnotimpl/Makefile +++ b/toolchain/libnotimpl/Makefile @@ -17,7 +17,7 @@ $(LIBNOTIMPL_DIR)/libnotimpl.a: $(LIBNOTIMPL_OBJS) $(STAGING_DIR)/usr/lib/libnotimpl.a: $(LIBNOTIMPL_DIR)/libnotimpl.a mkdir -p $(STAGING_DIR)/usr/lib - cp -fpR $< $@ + $(CP) $< $@ touch -c $@ source: diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile index 82c979c871..d77f554a12 100644 --- a/toolchain/uClibc/Makefile +++ b/toolchain/uClibc/Makefile @@ -47,7 +47,7 @@ $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(SED) 's,^CROSS=.*,CROSS=$(TARGET_CROSS),g' $(UCLIBC_DIR)/Rules.mak - cp ./files/config.$(ARCH) $(UCLIBC_DIR)/.config + $(CP) ./files/config.$(ARCH) $(UCLIBC_DIR)/.config $(SED) 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \ $(UCLIBC_DIR)/.config ifeq ($(BR2_LARGEFILE),y) diff --git a/toolchain/utils/Makefile b/toolchain/utils/Makefile index b5dae73476..2af6b139df 100644 --- a/toolchain/utils/Makefile +++ b/toolchain/utils/Makefile @@ -12,7 +12,7 @@ prepare: $(UTILS_BUILD_DIR) compile: prepare $(patsubst %,$(UTILS_BUILD_DIR)/%,$(TARGETS)) install: compile mkdir -p $(STAGING_DIR)/bin - cp -a $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/ + $(CP) $(UTILS_BUILD_DIR)/* $(STAGING_DIR)/bin/ package: clean: rm -rf $(UTILS_BUILD_DIR) -- cgit v1.2.3 From cad490a0db13c37f43e753db9c2228eac2cfe98f Mon Sep 17 00:00:00 2001 From: mbm Date: Thu, 2 Feb 2006 10:07:28 +0000 Subject: fixes files from [3112] git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3114 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/Config.in | 3 ++- package/Makefile | 5 +++++ package/atftp/Config.in | 1 + package/atftp/ipkg/atftp.control | 1 + package/atftp/ipkg/atftpd.control | 1 + package/base-files/default/etc/init.d/S45firewall | 8 +++----- package/base-files/default/sbin/mount_root | 2 +- package/dnsmasq/Makefile | 4 ++-- package/rrdcollect/files/rrdcollect.conf | 12 ++++++------ package/wireless-tools/Makefile | 6 +++--- target/linux/image/brcm/Makefile | 10 +++++++++- 11 files changed, 34 insertions(+), 19 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/Config.in b/package/Config.in index 83ef404e1e..6f1c5fe300 100644 --- a/package/Config.in +++ b/package/Config.in @@ -130,6 +130,7 @@ 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" @@ -179,6 +180,7 @@ 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" @@ -254,7 +256,6 @@ source "package/setserial/Config.in" comment "Utilities" source "package/bc/Config.in" source "package/gdbserver/Config.in" -source "package/madwifi-tools/Config.in" source "package/pcmcia-cs/Config.in" # pcmcia-utils source "package/usbutils/Config.in" # lsusb source "package/pciutils/Config.in" diff --git a/package/Makefile b/package/Makefile index f2ad1c2061..5e29f88073 100644 --- a/package/Makefile +++ b/package/Makefile @@ -21,6 +21,7 @@ package-$(BR2_PACKAGE_BWM) += bwm package-$(BR2_PACKAGE_CGILIB) += cgilib package-$(BR2_PACKAGE_CHILLISPOT) += chillispot package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount +package-$(BR2_PACKAGE_CLINKC) += clinkc package-$(BR2_PACKAGE_COLLECTD) += collectd package-$(BR2_PACKAGE_CUPS) += cups package-$(BR2_COMPILE_CURL) += curl @@ -209,6 +210,7 @@ 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_TCPDUMP) += tcpdump @@ -269,6 +271,7 @@ arpwatch-compile: libpcap-compile atftp-compile: readline-compile avahi-compile: libdaemon-compile expat-compile libgdbm-compile bind-compile: openssl-compile +clinkc-compile: expat-compile curl-compile: openssl-compile zlib-compile cyrus-sasl-compile: openssl-compile deco-compile: ncurses-compile @@ -305,6 +308,7 @@ lighttpd-compile: openssl-compile pcre-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 mysql-compile: ncurses-compile zlib-compile readline-compile @@ -345,6 +349,7 @@ 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 tcpdump-compile: libpcap-compile tinc-compile: zlib-compile openssl-compile liblzo-compile tor-compile: libevent-compile openssl-compile zlib-compile diff --git a/package/atftp/Config.in b/package/atftp/Config.in index 32ab9512a3..296faec842 100644 --- a/package/atftp/Config.in +++ b/package/atftp/Config.in @@ -4,6 +4,7 @@ config BR2_COMPILE_ATFTP tristate default n depends BR2_PACKAGE_ATFTP || BR2_PACKAGE_ATFTPD + select BR2_PACKAGE_LIBREADLINE config BR2_PACKAGE_ATFTP prompt "atftp............................. TFTP client" diff --git a/package/atftp/ipkg/atftp.control b/package/atftp/ipkg/atftp.control index d2083fc619..ca4d86a308 100644 --- a/package/atftp/ipkg/atftp.control +++ b/package/atftp/ipkg/atftp.control @@ -2,3 +2,4 @@ Package: atftp Priority: optional Section: net Description: tftp client +Depends: libreadline diff --git a/package/atftp/ipkg/atftpd.control b/package/atftp/ipkg/atftpd.control index efb40299c3..acdd2f1ced 100644 --- a/package/atftp/ipkg/atftpd.control +++ b/package/atftp/ipkg/atftpd.control @@ -2,3 +2,4 @@ Package: atftpd Priority: optional Section: net Description: tftp server +Depends: libreadline diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall index 0110cfc775..2942f3118e 100755 --- a/package/base-files/default/etc/init.d/S45firewall +++ b/package/base-files/default/etc/init.d/S45firewall @@ -81,11 +81,9 @@ iptables -t nat -N postrouting_rule iptables -A FORWARD -j forwarding_rule # allow - # if there is bridge splitting this workaround works too - for iface in $LAN; do - iptables -A FORWARD -i $iface -o $iface -j ACCEPT - [ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT - done + iptables -A FORWARD -i br0 -o br0 -j ACCEPT + [ -z "$WAN" ] || iptables -A FORWARD -i $iface -o $WAN -j ACCEPT + # reject (what to do with anything not allowed earlier) # uses the default -P DROP diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root index 693c694c1b..427ff0444f 100755 --- a/package/base-files/default/sbin/mount_root +++ b/package/base-files/default/sbin/mount_root @@ -30,7 +30,7 @@ if [ "$1" != "failsafe" ]; then pivot_root /jffs /jffs/rom mount none /proc -t proc mount none /dev -t devfs - umount /rom/proc rom/dev >&- + umount /rom/proc /rom/dev >&- fi fi fi diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 215697cdb3..eeaad10e48 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.25 +PKG_VERSION:=2.26 PKG_RELEASE:=1 -PKG_MD5SUM:=a5a387aed551acf91990567a5e8e4fa4 +PKG_MD5SUM:=ae04abb5db4a8cc43c24f432f0c44d5c PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/package/rrdcollect/files/rrdcollect.conf b/package/rrdcollect/files/rrdcollect.conf index 1b374548ee..e34c9bff7b 100644 --- a/package/rrdcollect/files/rrdcollect.conf +++ b/package/rrdcollect/files/rrdcollect.conf @@ -19,15 +19,15 @@ exec:///bin/df # LAN: vlan0, WAN: vlan1, WIFI: eth1 file:///proc/net/dev -"vlan0: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo -"vlan1: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo -"eth1: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo -#"tun0: %d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo +" vlan0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Labi,Lapi,Labo,Lapo +" vlan1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wabi,Wapi,Wabo,Wapo +" eth1:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:Wibi,Wipi,Wibo,Wipo +#" tun0:%d %d %*d %*d %*d %*d %*d %*d %d %d" IF.rrd:tbi,tpi,tbo,tpo file:///proc/slabinfo "ip_conntrack %d %*d %*d %*d %*d %*d" SYS.rrd:con "arp_cache %d %*d %*d %*d %*d %*d" SYS.rrd:arp file:///proc/interrupts -"4: %d MIPS eth1" SYS.rrd:irw -"5: %d MIPS eth0" SYS.rrd:ire +" 4: %d MIPS eth1" SYS.rrd:irw +" 5: %d MIPS eth0" SYS.rrd:ire diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index 209f800df4..24e6f61b13 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -24,18 +24,18 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \ - all iwmulticall + libiw.so.28 iwmulticall mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ PREFIX="$(PKG_INSTALL_DIR)" \ INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \ INSTALL_LIB="$(PKG_INSTALL_DIR)/usr/lib" \ - install install-iwmulticall + install-iwmulticall touch $@ $(IPKG_WIRELESS_TOOLS): mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/ mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/ $(RSTRIP) $(IDIR_WIRELESS_TOOLS) diff --git a/target/linux/image/brcm/Makefile b/target/linux/image/brcm/Makefile index 18bd3265c3..494450f247 100644 --- a/target/linux/image/brcm/Makefile +++ b/target/linux/image/brcm/Makefile @@ -78,6 +78,14 @@ FSNAME:=$(patsubst jffs2-%,jffs2,$(FS)) # # install: $(BIN_DIR)/openwrt-wap54g-$(KERNEL)-$(FSNAME).trx # endif + +ifneq ($(FS),jffs2-8MB) +$(BIN_DIR)/openwrt-wrt54g3g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx + $(STAGING_DIR)/bin/addpattern -4 -p W54F -v v1.99.5 -i $< -o $@ -g + +$(BIN_DIR)/openwrt-wrt54g-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx + $(STAGING_DIR)/bin/addpattern -4 -p W54G -v v4.20.6 -i $< -o $@ -g + $(BIN_DIR)/openwrt-wrt54gs_v4-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx $(STAGING_DIR)/bin/addpattern -4 -p W54s -v v1.05.2 -i $< -o $@ -g @@ -112,7 +120,7 @@ endif install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).trx install-ib: mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin - $(CP) -fpR $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin + $(CP) $(STAGING_DIR)/bin/addpattern $(STAGING_DIR)/bin/trx $(STAGING_DIR)/bin/motorola-bin $(IB_DIR)/staging_dir_$(ARCH)/bin mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) $(CP) $(BUILD_DIR)/loader.gz $(IB_DIR)/build_$(ARCH)/ $(CP) $(BUILD_DIR)/loader.elf $(IB_DIR)/build_$(ARCH)/ -- cgit v1.2.3 From 0bcdd9dc8f86293cb81b4f69a0f3b75fd95ccdb1 Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 16 Mar 2006 21:31:14 +0000 Subject: Updated to latest upstream version, remove uneeded patch as it is now in dnsmasq source code, closes #378 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3386 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 4 ++-- package/dnsmasq/patches/102-domain_wildcard_fix.patch | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 package/dnsmasq/patches/102-domain_wildcard_fix.patch (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index eeaad10e48..393f0f014d 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.26 +PKG_VERSION:=2.27 PKG_RELEASE:=1 -PKG_MD5SUM:=ae04abb5db4a8cc43c24f432f0c44d5c +PKG_MD5SUM:=489198ec87101087043adc98bbe062dc PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/package/dnsmasq/patches/102-domain_wildcard_fix.patch b/package/dnsmasq/patches/102-domain_wildcard_fix.patch deleted file mode 100644 index 041cd67cf0..0000000000 --- a/package/dnsmasq/patches/102-domain_wildcard_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN dnsmasq.old/src/forward.c dnsmasq.dev/src/forward.c ---- dnsmasq.old/src/forward.c 2006-01-16 20:34:04.000000000 +0100 -+++ dnsmasq.dev/src/forward.c 2006-02-05 04:41:37.148190000 +0100 -@@ -164,7 +164,7 @@ - if (namelen >= domainlen && - hostname_isequal(matchstart, serv->domain) && - domainlen >= matchlen && -- (namelen == domainlen || *(serv->domain) == '.' || *(matchstart-1) == '.' )) -+ (namelen == domainlen || *(serv->domain) == '.' || *(matchstart-1) == '.' || domainlen == 0)) - { - unsigned short sflag = serv->addr.sa.sa_family == AF_INET ? F_IPV4 : F_IPV6; - *type = SERV_HAS_DOMAIN; -- cgit v1.2.3 From 676c017ecfced2e37aeec176f8aa6b9df90024f3 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 5 Apr 2006 02:09:22 +0000 Subject: large init script cleanup and merge of whiterussian changes, new dnsmasq config handling git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3588 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/Config.in | 3 - package/Sysconf.in | 31 ---- package/base-files/Makefile | 12 +- package/base-files/default/bin/firstboot | 134 ++++++++++------- package/base-files/default/bin/ipcalc | 32 ++++ package/base-files/default/bin/login | 12 +- package/base-files/default/etc/firewall.user | 29 ---- package/base-files/default/etc/functions.sh | 26 ---- .../base-files/default/etc/hotplug.d/net/10-net | 85 +++++------ package/base-files/default/etc/init.d/S10boot | 9 +- package/base-files/default/etc/init.d/S40network | 16 -- package/base-files/default/etc/init.d/S45firewall | 96 ------------ package/base-files/default/etc/init.d/S50telnet | 2 +- package/base-files/default/etc/init.d/S60cron | 8 +- package/base-files/default/etc/init.d/S98done | 9 ++ package/base-files/default/etc/init.d/S99done | 4 - package/base-files/default/etc/init.d/rcS | 10 +- package/base-files/default/etc/inittab | 1 - package/base-files/default/etc/preinit | 23 +-- package/base-files/default/sbin/halt | 3 - package/base-files/default/sbin/hotplug | 10 +- package/base-files/default/sbin/ifdown | 16 +- package/base-files/default/sbin/ifup | 22 +-- package/base-files/default/sbin/mount_root | 40 +++-- package/base-files/default/usr/lib/common.awk | 66 ++++++++ .../base-files/default/usr/lib/parse-config.awk | 40 +++++ .../default/usr/share/udhcpc/default.script | 37 +++-- package/busybox/config/miscutils/Config.in | 6 + package/busybox/config/networking/Config.in | 4 +- package/busybox/patches/220-awk_bitops.patch | 61 ++++++++ package/busybox/patches/230-passwd_salt.patch | 13 ++ package/busybox/patches/340-lock_util.patch | 167 +++++++++++++++++++++ package/dnsmasq/Makefile | 2 +- package/dnsmasq/files/S50dnsmasq | 30 ---- package/dnsmasq/files/dnsmasq.conf | 8 +- package/dnsmasq/files/dnsmasq.init | 45 ++++++ package/ez-ipupdate/files/ez-ipupdate.hotplug | 6 +- package/iptables/Makefile | 7 + package/iptables/files/firewall.awk | 64 ++++++++ package/iptables/files/firewall.config | 46 ++++++ package/iptables/files/firewall.init | 95 ++++++++++++ package/iptables/files/firewall.user | 31 ++++ package/linux-atm/files/br2684.init | 8 +- package/mtd/mtd.c | 17 ++- package/ntpclient/files/ntpclient.init | 3 +- package/parprouted/files/parprouted.default | 4 +- package/ppp/files/ifup.pppoa | 29 ++-- package/ppp/files/ifup.pppoe | 27 ++-- package/pptp/files/ifup.pptp | 41 ++--- .../base-files/files/ar7-2.4/etc/network.overrides | 28 ---- .../files/aruba-2.6/etc/network.overrides | 26 ---- .../base-files/files/brcm-2.4/etc/init.d/S04nvram | 66 ++++++++ .../files/brcm-2.4/etc/init.d/S05netconfig | 4 +- .../base-files/files/brcm-2.4/etc/init.d/S05nvram | 166 -------------------- .../files/brcm-2.4/etc/network.overrides | 41 ----- .../files/brcm-2.6/etc/init.d/S05netconfig | 4 +- .../files/brcm-2.6/etc/network.overrides | 31 ---- .../base-files/files/x86-2.4/etc/network.overrides | 26 ---- .../base-files/files/x86-2.6/etc/network.overrides | 26 ---- 59 files changed, 1022 insertions(+), 886 deletions(-) delete mode 100644 package/Sysconf.in create mode 100755 package/base-files/default/bin/ipcalc delete mode 100755 package/base-files/default/etc/firewall.user delete mode 100755 package/base-files/default/etc/init.d/S40network delete mode 100755 package/base-files/default/etc/init.d/S45firewall create mode 100755 package/base-files/default/etc/init.d/S98done delete mode 100755 package/base-files/default/etc/init.d/S99done delete mode 100755 package/base-files/default/sbin/halt create mode 100644 package/base-files/default/usr/lib/common.awk create mode 100644 package/base-files/default/usr/lib/parse-config.awk create mode 100644 package/busybox/patches/220-awk_bitops.patch create mode 100644 package/busybox/patches/230-passwd_salt.patch create mode 100644 package/busybox/patches/340-lock_util.patch delete mode 100755 package/dnsmasq/files/S50dnsmasq create mode 100644 package/dnsmasq/files/dnsmasq.init create mode 100644 package/iptables/files/firewall.awk create mode 100644 package/iptables/files/firewall.config create mode 100755 package/iptables/files/firewall.init create mode 100755 package/iptables/files/firewall.user delete mode 100644 target/linux/package/base-files/files/ar7-2.4/etc/network.overrides delete mode 100644 target/linux/package/base-files/files/aruba-2.6/etc/network.overrides create mode 100755 target/linux/package/base-files/files/brcm-2.4/etc/init.d/S04nvram delete mode 100755 target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram delete mode 100644 target/linux/package/base-files/files/brcm-2.4/etc/network.overrides delete mode 100644 target/linux/package/base-files/files/brcm-2.6/etc/network.overrides delete mode 100644 target/linux/package/base-files/files/x86-2.4/etc/network.overrides delete mode 100644 target/linux/package/base-files/files/x86-2.6/etc/network.overrides (limited to 'package/dnsmasq/Makefile') diff --git a/package/Config.in b/package/Config.in index 55fdba073a..619578024e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -333,6 +333,3 @@ config BR2_PACKAGE_IMAGEBUILDER endmenu -source "package/Sysconf.in" - - diff --git a/package/Sysconf.in b/package/Sysconf.in deleted file mode 100644 index 6c0cac3cd8..0000000000 --- a/package/Sysconf.in +++ /dev/null @@ -1,31 +0,0 @@ -# - -menu "Runtime Configuration" - choice - bool "Telnet access" - default BR2_SYSCONF_TELNET_FAILSAFE_ONLY - - config BR2_SYSCONF_TELNET_FAILSAFE_ONLY - bool "open, failsafe only" - - config BR2_SYSCONF_TELNET_OPEN - bool "open" - - endchoice - - menu "Failsafe configuration" - - config BR2_SYSCONF_FAILSAFE_IP - string "IP Address" - default "192.168.1.1" - - config BR2_SYSCONF_FAILSAFE_NETMASK - string "Netmask" - default "255.255.255.0" - - config BR2_SYSCONF_FAILSAFE_MAC - string "MAC Address" - default "00:00:BA:DC:0D:ED" - - endmenu -endmenu diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 1fb0c14498..8517dcc685 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -55,23 +55,25 @@ $(IPKG_BASE): $(CP) ./default/* $(IDIR_BASE) $(SED) 's,$$R,r$(REV),g' $(IDIR_BASE)/etc/banner $(SED) 's,$$S,$(BOARD)-$(KERNEL),g' $(IDIR_BASE)/etc/ipkg.conf - mkdir -p $(IDIR_BASE)/sys - mkdir -p $(IDIR_BASE)/jffs mkdir -p $(IDIR_BASE)/dev + mkdir -p $(IDIR_BASE)/etc/crontabs + mkdir -p $(IDIR_BASE)/jffs + mkdir -p $(IDIR_BASE)/lib + mkdir -p $(IDIR_BASE)/mnt mkdir -p $(IDIR_BASE)/proc mkdir -p $(IDIR_BASE)/tmp - mkdir -p $(IDIR_BASE)/lib mkdir -p $(IDIR_BASE)/usr/lib mkdir -p $(IDIR_BASE)/usr/bin + mkdir -p $(IDIR_BASE)/sys + mkdir -p $(IDIR_BASE)/www ln -sf /tmp/resolv.conf $(IDIR_BASE)/etc/resolv.conf ln -sf /proc/mounts $(IDIR_BASE)/etc/mtab - rm -rf $(IDIR_BASE)/var + rm -f $(IDIR_BASE)/var ln -sf /tmp $(IDIR_BASE)/var -find $(IDIR_BASE) -type d -name CVS | xargs rm -rf -find $(IDIR_BASE) -type d -name .svn | xargs rm -rf -find $(IDIR_BASE) -name '.#*' | xargs rm -f mkdir -p $(IDIR_BASE)/etc - -grep \^BR2_SYSCONF $(TOPDIR)/.config > $(IDIR_BASE)/etc/sysconf $(IPKG_BUILD) $(IDIR_BASE) $(PACKAGE_DIR) $(IPKG_UCLIBC): diff --git a/package/base-files/default/bin/firstboot b/package/base-files/default/bin/firstboot index eff7063b1c..1d9b658b69 100755 --- a/package/base-files/default/bin/firstboot +++ b/package/base-files/default/bin/firstboot @@ -1,62 +1,88 @@ #!/bin/sh # $Id$ -mount | grep squashfs >&- || { - echo "You do not have a squashfs partition; aborting" - echo "(firstboot cannot be run on jffs2 based firmwares)" - return +rom=$(awk '/squashfs/ {print $2}' /proc/mounts) +jffs=$(awk '/jffs2/ {print $2}' /proc/mounts) + +dupe() { # + cd $1 + echo -n "creating directories... " + { + cd $2 + find . -xdev -type d + echo "./dev ./jffs ./mnt ./proc ./tmp ./sys" + # xdev skips mounted directories + cd $1 + } | xargs mkdir -p + echo "done" + + echo -n "setting up symlinks... " + for file in $(cd $2; find . -xdev -type f;); do + case "$file" in + "./rom/note") ;; #nothing + "./etc/config"|\ + "./etc/resolv.conf"|\ + "./usr/lib/ipkg/info") cp -af $2/$file $file;; + *) ln -sf /rom/${file#./*} $file;; + esac + done + for file in $(cd $2; find . -xdev -type l;); do + cp -af $2/${file#./*} $file + done + echo "done" } -[ -f "/tmp/.firstboot" ] && { - echo "firstboot is already running" - return +pivot() { # + mount -o move /proc $1/proc && \ + pivot_root $1 $1$2 && { + mount -o move $2/dev /dev + mount -o move $2/tmp /tmp + } } -touch /tmp/.firstboot -jdev=$(mount | awk '/jffs2/ {print $3}') +mountdp() { # + dev=$1; mnt=$2; shift 2; opt=$* + mount $dev $mnt $opt + dupe $mnt $rom + pivot $mnt /rom +} -if [ -z "$jdev" ]; then - echo -n "Creating jffs2 partition... " - mtd erase OpenWrt >&- 2>&- - mount -t jffs2 /dev/mtdblock/4 /jffs - echo "done" - cd /jffs -else - echo "firstboot has already been run" - echo "jffs2 partition is mounted, only resetting files" - cd $jdev -fi - -exec 2>/dev/null - -mount /dev/mtdblock/2 /rom -o ro - -echo -n "creating directories... " -{ - cd /rom - find . -type d - cd - -} | xargs mkdir -echo "done" - -echo -n "setting up symlinks... " -for file in $(cd /rom; find * -type f; find * -type l;) -do { - case "${file%/*}" in - "usr/lib/ipkg/info"|"etc/config") cp -f /rom/$file $file;; - *) ln -sf /rom/$file $file;; - esac -} done -echo "done" - -touch /tmp/resolv.conf -ln -s /tmp/resolv.conf /etc/resolv.conf - -umount /rom -mount none /jffs/proc -t proc -pivot_root /jffs /jffs/rom -mount none /dev -t devfs -mount none /tmp -t ramfs -umount /rom/proc -umount /rom/tmp -umount /rom/dev +ramoverlay() { + mkdir -p /tmp/root + mountdp /tmp/root /mnt -o bind +} + +[ "${0##*/}" = "firstboot" ] && { + [ -z "$rom" ] && { + echo "You do not have a squashfs partition; aborting" + echo "(firstboot cannot be run on jffs2 based firmwares)" + exit 1 + } + + [ "$1" = "switch2jffs" ] && { + mtd erase OpenWrt + mount -o remount,ro none / # try to avoid fs changing while copying + mount -o bind / /mnt + mount /dev/mtdblock/4 /rom/jffs -t jffs2 + echo -n "copying files ... " + cp -a /mnt/* /rom/jffs + umount /mnt + echo "done" + pivot /rom /mnt + mount -o move /mnt /tmp/root + pivot /jffs /rom + jffs2root --clean + exit 0 + } + + # script run manually + [ \! -z "$jffs" ] && { + echo "firstboot has already been run" + echo "jffs2 partition is mounted, only resetting files" + dupe $jffs $rom + exit 0 + } + + mtd erase OpenWrt + mountdp /dev/mtdblock/4 /jffs -t jffs2 +} diff --git a/package/base-files/default/bin/ipcalc b/package/base-files/default/bin/ipcalc new file mode 100755 index 0000000000..318980e5a2 --- /dev/null +++ b/package/base-files/default/bin/ipcalc @@ -0,0 +1,32 @@ +#!/bin/sh + +awk -f /usr/lib/common.awk -f - $* <limit) end=limit + + print "IP="int2ip(ipaddr) + print "NETMASK="int2ip(netmask) + print "BROADCAST="int2ip(broadcast) + print "NETWORK="int2ip(network) + print "PREFIX="32-bitcount(compl(netmask)) + + # range calculations: + # ipcalc + + if (ARGC > 3) { + print "START="int2ip(start) + print "END="int2ip(end) + } +} +EOF diff --git a/package/base-files/default/bin/login b/package/base-files/default/bin/login index bb065e54a1..8f9281726d 100755 --- a/package/base-files/default/bin/login +++ b/package/base-files/default/bin/login @@ -1,20 +1,16 @@ #!/bin/sh -. /etc/sysconf 2>&- - -[ "$FAILSAFE" != "true" ] && -[ "$BR2_SYSCONF_TELNET_FAILSAFE_ONLY" = "y" ] && +grep '^root:[^!]' /etc/passwd >&- 2>&- +[ "$?" = "0" -a -z "$FAILSAFE" ] && { - grep '^root:[^!]' /etc/passwd >&- 2>&- && - { echo "Login failed." exit 0 - } || { +} || { cat << EOF === IMPORTANT ============================ Use 'passwd' to set your login password this will disable telnet and enable SSH ------------------------------------------ EOF - } } + exec /bin/ash --login diff --git a/package/base-files/default/etc/firewall.user b/package/base-files/default/etc/firewall.user deleted file mode 100755 index 5774f0c64a..0000000000 --- a/package/base-files/default/etc/firewall.user +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -. /etc/functions.sh -. /etc/network.overrides -[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network - -WAN=$(nvram get wan_ifname) -LAN=$(nvram get lan_ifname) - -iptables -F input_rule -iptables -F output_rule -iptables -F forwarding_rule -iptables -t nat -F prerouting_rule -iptables -t nat -F postrouting_rule - -### BIG FAT DISCLAIMER -### The "-i $WAN" literally means packets that came in over the $WAN interface; -### this WILL NOT MATCH packets sent from the LAN to the WAN address. - -### Allow SSH on the WAN interface -# iptables -t nat -A prerouting_rule -i $WAN -p tcp --dport 22 -j ACCEPT -# iptables -A input_rule -i $WAN -p tcp --dport 22 -j ACCEPT - -### Port forwarding -# iptables -t nat -A prerouting_rule -i $WAN -p tcp --dport 22 -j DNAT --to 192.168.1.2 -# iptables -A forwarding_rule -i $WAN -p tcp --dport 22 -d 192.168.1.2 -j ACCEPT - -### DMZ (should be placed after port forwarding / accept rules) -# iptables -t nat -A prerouting_rule -i $WAN -j DNAT --to 192.168.1.2 -# iptables -A forwarding_rule -i $WAN -d 192.168.1.2 -j ACCEPT diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh index e7126473f4..526ca52dda 100755 --- a/package/base-files/default/etc/functions.sh +++ b/package/base-files/default/etc/functions.sh @@ -1,6 +1,4 @@ #!/bin/sh -. /etc/nvram.sh - alias debug=${DEBUG:-:} # valid interface? @@ -13,27 +11,3 @@ if_valid () ( hotplug_dev() { env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net } - -bitcount () { - local c=$1 - echo $(( - c=((c>> 1)&0x55555555)+(c&0x55555555), - c=((c>> 2)&0x33333333)+(c&0x33333333), - c=((c>> 4)&0x0f0f0f0f)+(c&0x0f0f0f0f), - c=((c>> 8)&0x00ff00ff)+(c&0x00ff00ff), - c=((c>>16)&0x0000ffff)+(c&0x0000ffff) - )) -} - -valid_netmask () { - return $((-($1)&~$1)) -} - -ip2int () ( - set $(echo $1 | tr '\.' ' ') - echo $(($1<<24|$2<<16|$3<<8|$4)) -) - -int2ip () { - echo $(($1>>24&255)).$(($1>>16&255)).$(($1>>8&255)).$(($1&255)) -} diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net index 0f384ec46b..4bb69378ff 100644 --- a/package/base-files/default/etc/hotplug.d/net/10-net +++ b/package/base-files/default/etc/hotplug.d/net/10-net @@ -1,32 +1,28 @@ #!/bin/sh -setup_eth() -{ - for part in $(nvram get unused_ifnames); do - [ "$part" = "$INTERFACE" ] && exit 0 - done - ifconfig "$INTERFACE" up 2>&- >&- -} - find_name() { - pppoa_ifname="atm0" # hack for ppp over atm, which has no ${proto}_ifname - interfaces="lan wan wifi $(nvram get ifnames)" - for ifname in $interfaces; do + for ifname in lan wan wifi ${ifnames}; do IFTYPE="${ifname}" - IFPROTO="$(nvram get ${IFTYPE}_proto)" - IFACE="$(nvram get ${IFTYPE}_ifname)" + eval "IFPROTO=\"\${${IFTYPE}_proto}\"" + eval "IFACE=\"\${${IFTYPE}_ifname}\"" case "$IFPROTO" in ""|none);; static|dhcp) [ "${IFACE}" = "$INTERFACE" ] && return 0 [ "${IFACE%%[0-9]*}" = "br" ] && { - for part in $(nvram get ${IFTYPE}_ifnames); do + eval "ifs=\"\${${IFTYPE}_ifnames}\"" + for part in $ifs; do [ "$part" = "$INTERFACE" ] && return 0 done } ;; + pppoa) + [ "$INTERFACE" = "atm0" \ + -a -x /sbin/ifup.${IFPROTO} ] && return 0 + ;; *) - [ "$(nvram get ${IFTYPE}_device)" = "$INTERFACE" \ + eval "device=\"\${${IFTYPE}_device}\"" + [ "$device" = "$INTERFACE" \ -a -x /sbin/ifup.${IFPROTO} ] && return 0 ;; esac @@ -39,17 +35,18 @@ find_name() do_ifup() { if="$3" - if_proto="$(nvram get ${2}_proto)" + eval "if_proto=\"\${${2}_proto}\"" pidfile=/var/run/${if}.pid [ -f $pidfile ] && $DEBUG kill $(cat $pidfile) case "$1" in static) - ip=$(nvram get ${2}_ipaddr) - ip6=$(nvram get ${2}_ip6addr) - netmask=$(nvram get ${2}_netmask) - gateway=$(nvram get ${2}_gateway) + eval "ip=\"\${${2}_ipaddr}\"" + eval "ip6=\"\${${2}_ip6addr}\"" + eval "netmask=\"\${${2}_netmask}\"" + eval "gateway=\"\${${2}_gateway}\"" + eval "dns=\"\${${2}_dns}\"" $DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up [ -n "$ip6" ] && $DEBUG ifconfig $if add $ip6 @@ -58,24 +55,25 @@ do_ifup() { [ -f /tmp/resolv.conf ] || { debug "# --- creating /tmp/resolv.conf ---" - for dns in $(nvram get ${2}_dns); do - echo "nameserver $dns" >> /tmp/resolv.conf + for ns in $dns; do + echo "nameserver $ns" >> /tmp/resolv.conf done } env -i ACTION="ifup" INTERFACE="${2}" PROTO=static /sbin/hotplug "iface" & ;; dhcp) - DHCP_IP=$(nvram get ${2}_ipaddr) - DHCP_NETMASK=$(nvram get ${2}_netmask) + eval "ip=\"\${${2}_ipaddr}\"" + eval "netmask=\"\${${2}_netmask}\"" + eval "hostname=\"\${${2}_hostname}\"" + $DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up - DHCP_ARGS="-i $if ${DHCP_IP:+-r $DHCP_IP} -b -p $pidfile" - DHCP_HOSTNAME=$(nvram get ${2}_hostname) - DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*} - [ -z $DHCP_HOSTNAME ] || DHCP_ARGS="$DHCP_ARGS -H $DHCP_HOSTNAME" - [ "$if_proto" = "pptp" ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &" - ${DEBUG:-eval} "udhcpc $DHCP_ARGS" + args="-i $if ${ip:+-r $ip} -b -p $pidfile" + hostname="${hostname%%.*}" + args="$args${hostname:+ -H $hostname}" + [ "$if_proto" = "pptp" ] && args="$args -n -q" || args="$args -R &" + ${DEBUG:-eval} "udhcpc $args" # hotplug events are handled by /usr/share/udhcpc/default.script ;; *) @@ -88,25 +86,23 @@ do_ifup() { do_register() { - case "${INTERFACE%%[0-9]*}" in - eth) setup_eth;; - esac - [ -z "$IFTYPE" -o -z "$IFPROTO" ] && { find_name || { case "${INTERFACE%%[0-9]*}" in wds) - for tmp in lan wifi; do - [ -z "$IFPROTO" ] && [ "$(nvram get ${tmp}_ifname)" = "br0" ] && { - IFPROTO="$(nvram get ${tmp}_proto)" + for ifname in lan wifi; do + eval "if=\"\${${ifname}_ifname}\"" + [ -z "$IFPROTO" ] && [ "$if" = "br0" ] && { + eval "IFPROTO=\"\${${2}_proto}\"" IFTYPE="${tmp}" } done [ -z "$IFPROTO" ] && return 0 ;; atm) - for tmp in lan wan wifi $(nvram get ifnames); do - [ "$(nvram get ${tmp}_proto)" = "pppoa" ] && { + for tmp in lan wan wifi ${ifnames}; do + eval "if_proto=\"\${${2}_proto}\"" + [ "$if_proto" = "pppoa" ] && { do_ifup "pppoa" "$tmp" "$INTERFACE" return 0 } @@ -122,16 +118,16 @@ do_register() case "${INTERFACE%%[0-9]*}" in ppp|atm);; *) - mac=$(nvram get ${IFTYPE}_hwaddr) + eval "mac=\"\${${IFTYPE}_hwaddr}\"" ${mac:+$DEBUG ifconfig $INTERFACE down hw ether $mac} ;; esac - if="$(nvram get ${IFTYPE}_ifname)" + eval "if=\"\${${IFTYPE}_ifname}\"" if [ "${if%%[0-9]}" = "br" ]; then if_valid "$INTERFACE" && { ifconfig "$if" 2>&- >&- || { - stp=$(nvram get ${IFTYPE}_stp) + eval "stp=\"\${${IFTYPE}_stp}\"" $DEBUG brctl addbr "$if" $DEBUG brctl setfd "$if" 0 $DEBUG brctl stp "$if" "${stp:-0}" @@ -151,8 +147,9 @@ do_register() } do_unregister() { - [ -z "$IFTYPE" -o -z "$IFPROTO" ] && find_name - [ -z "$IFTYPE" -o -z "$IFPROTO" ] && return 0 + [ -z "$IFTYPE" -o -z "$IFPROTO" ] && { + find_name || return 0 + } [ "${IFACE%%[0-9]*}" = "br" ] && { if [ "$INTERFACE" != "$IFACE" ]; then diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot index 02fddee7ba..0cc519d8eb 100755 --- a/package/base-files/default/etc/init.d/S10boot +++ b/package/base-files/default/etc/init.d/S10boot @@ -1,14 +1,9 @@ #!/bin/sh -. /etc/nvram.sh - -[ "$(uname -r|grep -c 2.4)" = "1" ] && { - echo "S" > /proc/jffs2_bbc -} +[ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc vconfig set_name_type VLAN_PLUS_VID_NO_PAD -HOSTNAME=$(nvram get wan_hostname) -HOSTNAME=${HOSTNAME%%.*} +HOSTNAME=${wan_hostname%%.*} echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname mkdir -p /var/run diff --git a/package/base-files/default/etc/init.d/S40network b/package/base-files/default/etc/init.d/S40network deleted file mode 100755 index 168fd2979b..0000000000 --- a/package/base-files/default/etc/init.d/S40network +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -. /etc/functions.sh -[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network -case "$1" in - start|restart) -# ifup lan -# ifup wan -# ifup wifi -# wifi up - - for route in $(nvram get static_route); do { - eval "set $(echo $route | sed 's/:/ /g')" - $DEBUG route add -net $1 netmask $2 gw $3 metric $4 dev $5 - } done - ;; -esac diff --git a/package/base-files/default/etc/init.d/S45firewall b/package/base-files/default/etc/init.d/S45firewall deleted file mode 100755 index 8c67d82b18..0000000000 --- a/package/base-files/default/etc/init.d/S45firewall +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -## Please make changes in /etc/firewall.user -${FAILSAFE:+exit} - -. /etc/functions.sh -. /etc/network.overrides -[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network - -WAN=$(nvram get wan_ifname) -LAN=$(nvram get lan_ifname) - -## CLEAR TABLES -for T in filter nat; do - iptables -t $T -F - iptables -t $T -X -done - -iptables -N input_rule -iptables -N output_rule -iptables -N forwarding_rule - -iptables -t nat -N prerouting_rule -iptables -t nat -N postrouting_rule - -### INPUT -### (connections with the router as destination) - - # base case - iptables -P INPUT DROP - iptables -A INPUT -m state --state INVALID -j DROP - iptables -A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT - iptables -A INPUT -p tcp --tcp-flags SYN SYN --tcp-option \! 2 -j DROP - - # - # insert accept rule or to jump to new accept-check table here - # - iptables -A INPUT -j input_rule - - # allow - iptables -A INPUT ${WAN:+-i \! $WAN} -j ACCEPT # allow from lan/wifi interfaces - iptables -A INPUT -p icmp -j ACCEPT # allow ICMP - iptables -A INPUT -p gre -j ACCEPT # allow GRE - - # reject (what to do with anything not allowed earlier) - iptables -A INPUT -p tcp -j REJECT --reject-with tcp-reset - iptables -A INPUT -j REJECT --reject-with icmp-port-unreachable - -### OUTPUT -### (connections with the router as source) - - # base case - iptables -P OUTPUT DROP - iptables -A OUTPUT -m state --state INVALID -j DROP - iptables -A OUTPUT -m state --state RELATED,ESTABLISHED -j ACCEPT - - # - # insert accept rule or to jump to new accept-check table here - # - iptables -A OUTPUT -j output_rule - - # allow - iptables -A OUTPUT -j ACCEPT #allow everything out - - # reject (what to do with anything not allowed earlier) - iptables -A OUTPUT -p tcp -j REJECT --reject-with tcp-reset - iptables -A OUTPUT -j REJECT --reject-with icmp-port-unreachable - -### FORWARDING -### (connections routed through the router) - - # base case - iptables -P FORWARD DROP - iptables -A FORWARD -m state --state INVALID -j DROP - iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu - iptables -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT - - # - # insert accept rule or to jump to new accept-check table here - # - iptables -A FORWARD -j forwarding_rule - - # allow - iptables -A FORWARD -i br0 -o br0 -j ACCEPT - [ -z "$WAN" ] || iptables -A FORWARD -i $LAN -o $WAN -j ACCEPT - - # reject (what to do with anything not allowed earlier) - # uses the default -P DROP - -### MASQ - iptables -t nat -A PREROUTING -j prerouting_rule - iptables -t nat -A POSTROUTING -j postrouting_rule - [ -z "$WAN" ] || iptables -t nat -A POSTROUTING -o $WAN -j MASQUERADE - -## USER RULES -[ -f /etc/firewall.user ] && . /etc/firewall.user diff --git a/package/base-files/default/etc/init.d/S50telnet b/package/base-files/default/etc/init.d/S50telnet index ff5659ed47..fb9687c8aa 100755 --- a/package/base-files/default/etc/init.d/S50telnet +++ b/package/base-files/default/etc/init.d/S50telnet @@ -1,2 +1,2 @@ #!/bin/sh -if awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null || test $FAILSAFE; then telnetd -l /bin/login; fi +if awk -F: '/^root:/ && $2 !~ /\!/ {exit 1}' /etc/passwd 2>/dev/null; then telnetd -l /bin/login; fi diff --git a/package/base-files/default/etc/init.d/S60cron b/package/base-files/default/etc/init.d/S60cron index 6069b8177e..1752734267 100755 --- a/package/base-files/default/etc/init.d/S60cron +++ b/package/base-files/default/etc/init.d/S60cron @@ -1,6 +1,4 @@ #!/bin/sh -[ -d /etc/crontabs ] || mkdir -p /etc/crontabs -[ -e /var/spool/cron/crontabs ] || { - mkdir -p /var/spool/cron - ln -s /etc/crontabs /var/spool/cron/crontabs -} && crond -c /etc/crontabs +mkdir -p /var/spool/cron +ln -s /etc/crontabs /var/spool/cron/crontabs +crond -c /etc/crontabs diff --git a/package/base-files/default/etc/init.d/S98done b/package/base-files/default/etc/init.d/S98done new file mode 100755 index 0000000000..5d5ab49ce3 --- /dev/null +++ b/package/base-files/default/etc/init.d/S98done @@ -0,0 +1,9 @@ +#!/bin/sh +sysctl -p >&- + +# automagically run firstboot +{ mount|grep "on / type tmpfs" 1>&-; } && { + lock /tmp/.switch2jffs + firstboot switch2jffs + lock -u /tmp/.switch2jffs +} diff --git a/package/base-files/default/etc/init.d/S99done b/package/base-files/default/etc/init.d/S99done deleted file mode 100755 index a260ac3d6f..0000000000 --- a/package/base-files/default/etc/init.d/S99done +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# set leds to normal state -[ -f /proc/sys/diag ] && echo "0x00" > /proc/sys/diag -sysctl -p >&- diff --git a/package/base-files/default/etc/init.d/rcS b/package/base-files/default/etc/init.d/rcS index 10079c5932..b38e449781 100755 --- a/package/base-files/default/etc/init.d/rcS +++ b/package/base-files/default/etc/init.d/rcS @@ -1,8 +1,10 @@ #!/bin/sh -. /etc/nvram.sh -syslog_ip=$(nvram get log_ipaddr) -ipcalc -s "$syslog_ip" || syslog_ip="" -syslogd -C 16 ${syslog_ip:+-L -R $syslog_ip} +${FAILSAFE:+exit} + +[ -f /etc/config/network ] && . /etc/config/network +eval $(ipcalc "$log_ipaddr") +[ "$log_ipaddr" = "$IP" ] || log_ipaddr="" +syslogd -C 16 ${log_ipaddr:+-L -R $log_ipaddr} klogd #${FAILSAFE:+telnetd -l /bin/login; ifup lan; exit} for i in /etc/init.d/S*; do diff --git a/package/base-files/default/etc/inittab b/package/base-files/default/etc/inittab index 5916311e17..39e134cb16 100644 --- a/package/base-files/default/etc/inittab +++ b/package/base-files/default/etc/inittab @@ -1,4 +1,3 @@ ::sysinit:/etc/init.d/rcS -::shutdown:/sbin/halt tts/0::askfirst:/bin/ash --login #tts/1::askfirst:/bin/ash --login diff --git a/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit index ac9039ca71..5b676ca3ac 100755 --- a/package/base-files/default/etc/preinit +++ b/package/base-files/default/etc/preinit @@ -1,24 +1,11 @@ #!/bin/sh -. /etc/nvram.sh export PATH=/bin:/sbin:/usr/bin:/usr/sbin mount none /proc -t proc -insmod diag -[ -f /proc/sys/diag ] && echo 0x01 > /proc/sys/diag -sleep 1 -if [ -f /proc/sys/reset ] && [ $(cat /proc/sys/reset) = 1 -o "$(nvram get failsafe)" = 1 ]; then - export FAILSAFE=true - [ -x /usr/sbin/nvram -a "$(nvram get boot_wait)" != "on" ] && { - nvram set boot_wait=on - nvram commit - } - while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done & -fi -mount_root ${FAILSAFE:+failsafe} - -# automagically run firstboot -[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && { - { mount|grep "on / type jffs2" 1>&-; } || firstboot +[ -f /etc/preinit.arch ] && . /etc/preinit.arch +[ -z "$FAILSAFE" ] || { + echo /bin/true > /proc/sys/kernel/hotplug + telnetd -l /bin/login <> /dev/null 2>&1 } - +mount_root ${FAILSAFE:+failsafe} exec /sbin/init diff --git a/package/base-files/default/sbin/halt b/package/base-files/default/sbin/halt deleted file mode 100755 index 39eed2612e..0000000000 --- a/package/base-files/default/sbin/halt +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -/usr/bin/killall5 -9 -#umount -ar diff --git a/package/base-files/default/sbin/hotplug b/package/base-files/default/sbin/hotplug index 3500f75201..106299343a 100755 --- a/package/base-files/default/sbin/hotplug +++ b/package/base-files/default/sbin/hotplug @@ -1,4 +1,7 @@ #!/bin/sh + +# bypass the normal hotplug path for firmware loading +# would otherwise cause problems with drivers like bcm43xx [ "$1" = "firmware" -a "$ACTION" = "add" ] && { [ -f "/lib/firmware/$FIRMWARE" ] && { echo 1 > "/sys$DEVPATH/loading" @@ -8,13 +11,8 @@ exit 0 } -[ -e /tmp/.failsafe ] && { - export FAILSAFE=true -} || { - [ -e /etc/config/network ] && . /etc/config/network -} . /etc/functions.sh -. /etc/network.overrides +. /etc/config/network PATH=/bin:/sbin:/usr/bin:/usr/sbin LOGNAME=root diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index d0120dcbe8..0d85ca8eab 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -1,26 +1,18 @@ #!/bin/sh [ $# = 0 ] && { echo " $0 "; exit; } . /etc/functions.sh -. /etc/network.overrides -[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network +. /etc/config/network debug "### ifdown $type ###" type=$1 -if_proto=$(nvram get ${type}_proto) -if=$(nvram get ${type}_ifname) +eval "if_proto=\"\${${type}_proto}\"" +eval "if=\"\${${type}_ifname}\"" +[ "${if%%[0-9]}" = "ppp" ] && eval "if=\"\${${type}_device}\"" case "$if_proto" in pppoa) hotplug_dev unregister atm0; exit 0 ;; ""|none) exit 0;; esac -[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${type}_device)" - -if [ "${if%%[0-9]}" = "br" ]; then - for sif in $(nvram get ${type}_ifnames); do - hotplug_dev unregister "$sif" - done -fi - hotplug_dev unregister "$if" diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup index 8ae6416685..a86a7671e8 100755 --- a/package/base-files/default/sbin/ifup +++ b/package/base-files/default/sbin/ifup @@ -1,32 +1,34 @@ #!/bin/sh [ $# = 0 ] && { echo " $0 "; exit; } . /etc/functions.sh -. /etc/network.overrides -[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network +. /etc/config/network ifdown $1 debug "### ifup $type ###" type=$1 -if_proto=$(nvram get ${type}_proto) -if=$(nvram get ${type}_ifname) +eval "if_proto=\"\${${type}_proto}\"" +eval "if=\"\${${type}_ifname}\"" +[ "${if%%[0-9]}" = "ppp" ] && eval "if=\"\${${type}_device}\"" case "$if_proto" in pppoa) hotplug_dev register atm0; exit 0 ;; pppoe) - ifconfig nas0 2>&- >&- || { - hotplug_dev register atm0 - exit 0 + # PPPoE over ATM + [ "$if" = "nas0" ] && { + ifconfig nas0 2>&- >&- || { + hotplug_dev register atm0 + exit 0 + } } ;; none|"") exit 0;; esac -[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${type}_device)" - if [ "${if%%[0-9]}" = "br" ]; then - for sif in $(nvram get ${type}_ifnames); do + eval "ifnames=\"\${${type}_ifnames}\"" + for sif in $ifnames; do hotplug_dev register "$sif" done else diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/default/sbin/mount_root index 427ff0444f..38252e83fe 100755 --- a/package/base-files/default/sbin/mount_root +++ b/package/base-files/default/sbin/mount_root @@ -1,40 +1,34 @@ #!/bin/sh -. /etc/nvram.sh -is_clean() { - grep Broadcom /proc/cpuinfo 2>&- >&- || return 0 - OFFSET="$((0x$(dd if=/dev/mtdblock/1 bs=1 skip=$((0x14)) count=2 2>&- | hexdump | grep 0000000 | cut -d ' ' -f 2) - 1))" - dd if=/dev/mtdblock/1 bs=1 skip=$OFFSET count=1 2>&- | hexdump -v | grep ' 0000' > /dev/null && return 255 || return 0 +is_dirty() { + grep Broadcom /proc/cpuinfo >&- || return 1 + OFFSET="$(($(hexdump -v /dev/mtdblock/1 -s 20 -n 2 -e '"%d"')-1))" + return $(hexdump -v /dev/mtdblock/1 -s $OFFSET -n 1 -e '"%d"') } +size=$(awk '/Mem:/ {l=5242880;print((s=$2/2)&- if [ $? = 0 ] ; then if [ $(cat /proc/mtd | wc -l) = 6 ]; then - echo 5 > /proc/sys/diag - mtd unlock linux mtd erase OpenWrt jffs2root --move else - mtd unlock rootfs mount -o remount,rw /dev/root / fi else - if [ -z "$(nvram get no_root_swap)" ]; then - is_clean || { - mtd erase OpenWrt - mtd unlock linux - jffs2root --clean - } - mtd unlock OpenWrt - mount -t jffs2 /dev/mtdblock/4 /jffs - pivot_root /jffs /jffs/rom - mount none /proc -t proc - mount none /dev -t devfs - umount /rom/proc /rom/dev >&- - fi + . /bin/firstboot + is_dirty + [ $? != 0 ] && { + mount /dev/mtdblock/4 /jffs + pivot /jffs /rom + } || ramoverlay fi fi -mount none /tmp -t tmpfs -o nosuid,nodev,mode=1777,size=50% + +mount none /tmp -t tmpfs -o remount,nosuid,nodev,mode=1777 mkdir -p /dev/pts mount none /dev/pts -t devpts -grep sysfs /proc/filesystems >&- && mount -t sysfs none /sys +mount -t sysfs none /sys 2>&- diff --git a/package/base-files/default/usr/lib/common.awk b/package/base-files/default/usr/lib/common.awk new file mode 100644 index 0000000000..63a8cf23d8 --- /dev/null +++ b/package/base-files/default/usr/lib/common.awk @@ -0,0 +1,66 @@ +function portstr(type, str) { + gsub(/-/, ":", str) + if (insmod_mport != 1) { + print "insmod ipt_multiport >&- 2>&-" + insmod_mport = 1 + } + if (type == "src") return " -m multiport --sports " str + else return " -m multiport --dports " str +} + +function str2ipt(str) { + str2data(str) + _cmd = "" + if (_l["src"] != "") _cmd = _cmd " -s " _l["src"] + if (_l["dest"] != "") _cmd = _cmd " -d " _l["dest"] + if (_l["proto"] != "") { + _cmd = _cmd " -p " _l["proto"] + } + # scripts need to check for proto="" and emit two rules in that case + if ((_l["proto"] == "") || (_l["proto"] == "tcp") || (_l["proto"] == "udp")) { + if (_l["sport"] != "") _cmd = _cmd portstr("src", _l["sport"]) + if (_l["dport"] != "") _cmd = _cmd portstr("dest", _l["dport"]) + } + if (_l["layer7"] != "") { + if (insmod_l7 != 1) { + print "insmod ipt_layer7 >&- 2>&-" + insmod_l7 = 1 + } + _cmd = _cmd " -m layer7 --l7proto " _l["layer7"] + } + return _cmd +} + +function str2data(str) { + delete _l + _n = split(str, _o, "[\t ]") + for (_i = 1; _i <= _n; _i++) { + _n2 = split(_o[_i], _c, "=") + if (_n2 == 2) _l[_c[1]] = _c[2] + } +} + +function bitcount(c) { + c=and(rshift(c, 1),0x55555555)+and(c,0x55555555) + c=and(rshift(c, 2),0x33333333)+and(c,0x33333333) + c=and(rshift(c, 4),0x0f0f0f0f)+and(c,0x0f0f0f0f) + c=and(rshift(c, 8),0x00ff00ff)+and(c,0x00ff00ff) + c=and(rshift(c,16),0x0000ffff)+and(c,0x0000ffff) + return c +} + +function validate_netmask(nm) { + return and(-nm,compl(nm)) +} + +function ip2int(ip) { + for (ret=0,n=split(ip,a,"\."),x=1;x<=n;x++) ret=or(lshift(ret,8),a[x]) + return ret +} + +function int2ip(ip,ret,x) { + ret=and(ip,255) + ip=rshift(ip,8) + for(;x<3;ret=and(ip,255)"."ret,ip=rshift(ip,8),x++); + return ret +} diff --git a/package/base-files/default/usr/lib/parse-config.awk b/package/base-files/default/usr/lib/parse-config.awk new file mode 100644 index 0000000000..bde5c0072b --- /dev/null +++ b/package/base-files/default/usr/lib/parse-config.awk @@ -0,0 +1,40 @@ +{ + line=$0 + gsub(/^[ \t]*/, "") + gsub(/[ \t]*$/, "") +} + +$1 == "@define" { + v[$2] = $3 +} + +$1 == "@ifdef" { + if_open = 1 + if (v[$2] != "") noprint = 0 + else noprint = 1 +} + +$1 == "@ifndef" { + if_open = 1 + if (v[$2] != "") noprint = 1 + else noprint = 0 +} + +$1 == "@else" { + if (noprint == 1) noprint = 0 + else noprint = 1 +} + +($1 !~ /^@/) && (noprint != 1) { + n=split(line "@@", a, /@@/) + for (i=1; i<=n; i++) { + if ((i % 2) == 1) printf a[i] + else printf v[a[i]] + } + print "" +} + +$1 == "@endif" { + if_open = 0 + noprint = 0 +} diff --git a/package/base-files/default/usr/share/udhcpc/default.script b/package/base-files/default/usr/share/udhcpc/default.script index 42d3eaf0c2..4604648e6b 100755 --- a/package/base-files/default/usr/share/udhcpc/default.script +++ b/package/base-files/default/usr/share/udhcpc/default.script @@ -1,18 +1,17 @@ #!/bin/sh [ -z "$1" ] && echo "Error: should be run by udhcpc" && exit 1 +. /etc/config/network RESOLV_CONF="/tmp/resolv.conf" hotplug_event() { - nvram show 2>&- | grep _proto=dhcp | { - while :; do - read FOO - [ -z "$FOO" ] && break - FOO="${FOO%%_*}" - [ "$(nvram get ${FOO}_ifname)" = "${interface}" ] || continue - env -i ACTION="$1" INTERFACE="${FOO}" PROTO=dhcp /sbin/hotplug iface - done - } + for ifname in lan wan wifi ${ifnames}; do + eval "proto=\"\${${ifname}_proto}\"" + eval "if=\"\${${ifname}_ifname}\"" + [ "$proto" = "dhcp" ] || continue + [ "$if" = "$interface" ] || continue + env -i ACTION="$1" INTERFACE="$ifname" PROTO=dhcp /sbin/hotplug iface + done } case "$1" in @@ -26,22 +25,20 @@ case "$1" in broadcast ${broadcast:-+} if [ -n "$router" ] ; then - - if [ "$router" != "$(route -n | grep '^0.0.0.0' | grep $interface | awk '{ print $2 }')" ] ; then - while route del default gw 0.0.0.0 dev $interface 2>&- ; do - echo "removing old default route" - done - for i in $router ; do - route add default gw $i dev $interface - done - fi + echo "deleting routers" + while route del default gw 0.0.0.0 dev $interface >&- 2>&- ; do :; done + + for i in $router ; do + echo "adding router $i" + route add default gw $i dev $interface + done fi echo -n > $RESOLV_CONF ${domain:+echo search $domain} >> $RESOLV_CONF for i in $dns ; do - echo adding dns $i - echo nameserver $i >> $RESOLV_CONF + echo "adding dns $i" + echo "nameserver $i" >> $RESOLV_CONF done hotplug_event ifup diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index 1ffb8c6536..404170188e 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -209,6 +209,12 @@ config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA Enables the 'hdparm -d' option to get/set using_dma flag. This is dangerous stuff, so you should probably say N. +config BUSYBOX_CONFIG_LOCK + bool "lock" + default y + help + Small utility for using locks in scripts + config BUSYBOX_CONFIG_MAKEDEVS bool "makedevs" default n diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index 14e6b5f79a..7e280b76e2 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -395,14 +395,14 @@ endif config BUSYBOX_CONFIG_IPCALC bool "ipcalc" - default y + default n help ipcalc takes an IP address and netmask and calculates the resulting broadcast, network, and host range. config BUSYBOX_CONFIG_FEATURE_IPCALC_FANCY bool " Fancy IPCALC, more options, adds 1 kbyte" - default y + default n depends on BUSYBOX_CONFIG_IPCALC help Adds the options hostname, prefix and silent to the output of "ipcalc". diff --git a/package/busybox/patches/220-awk_bitops.patch b/package/busybox/patches/220-awk_bitops.patch new file mode 100644 index 0000000000..2b85729135 --- /dev/null +++ b/package/busybox/patches/220-awk_bitops.patch @@ -0,0 +1,61 @@ +--- busybox-1.00/editors/awk.c.orig 2004-09-24 05:24:27 -04:00 ++++ busybox-1.00/editors/awk.c 2006-03-08 02:16:52 -05:00 +@@ -271,7 +271,8 @@ + /* builtins */ + enum { + B_a2=0, B_ix, B_ma, B_sp, B_ss, B_ti, B_lo, B_up, +- B_ge, B_gs, B_su ++ B_ge, B_gs, B_su, ++ B_an, B_co, B_ls, B_or, B_rs, B_xo, + }; + + /* tokens and their corresponding info values */ +@@ -311,6 +312,8 @@ + "\5while" NTC + "\4else" NTC + ++ "\3and" "\5compl" "\6lshift" "\2or" ++ "\6rshift" "\3xor" + "\5close" "\6system" "\6fflush" "\5atan2" /* BUILTIN */ + "\3cos" "\3exp" "\3int" "\3log" + "\4rand" "\3sin" "\4sqrt" "\5srand" +@@ -364,6 +367,8 @@ + ST_WHILE, + 0, + ++ OC_B|B_an|P(0x83), OC_B|B_co|P(0x41), OC_B|B_ls|P(0x83), OC_B|B_or|P(0x83), ++ OC_B|B_rs|P(0x83), OC_B|B_xo|P(0x83), + OC_FBLTIN|Sx|F_cl, OC_FBLTIN|Sx|F_sy, OC_FBLTIN|Sx|F_ff, OC_B|B_a2|P(0x83), + OC_FBLTIN|Nx|F_co, OC_FBLTIN|Nx|F_ex, OC_FBLTIN|Nx|F_in, OC_FBLTIN|Nx|F_lg, + OC_FBLTIN|F_rn, OC_FBLTIN|Nx|F_si, OC_FBLTIN|Nx|F_sq, OC_FBLTIN|Nx|F_sr, +@@ -1942,6 +1947,30 @@ + strncpy(s, as[0]+i, n); + s[n] = '\0'; + setvar_p(res, s); ++ break; ++ ++ case B_an: ++ setvar_i(res, (long)getvar_i(av[0]) & (long)getvar_i(av[1])); ++ break; ++ ++ case B_co: ++ setvar_i(res, ~(long)getvar_i(av[0])); ++ break; ++ ++ case B_ls: ++ setvar_i(res, (long)getvar_i(av[0]) << (long)getvar_i(av[1])); ++ break; ++ ++ case B_or: ++ setvar_i(res, (long)getvar_i(av[0]) | (long)getvar_i(av[1])); ++ break; ++ ++ case B_rs: ++ setvar_i(res, (long)((unsigned long)getvar_i(av[0]) >> (unsigned long)getvar_i(av[1]))); ++ break; ++ ++ case B_xo: ++ setvar_i(res, (long)getvar_i(av[0]) ^ (long)getvar_i(av[1])); + break; + + case B_lo: diff --git a/package/busybox/patches/230-passwd_salt.patch b/package/busybox/patches/230-passwd_salt.patch new file mode 100644 index 0000000000..0322a98439 --- /dev/null +++ b/package/busybox/patches/230-passwd_salt.patch @@ -0,0 +1,13 @@ +--- busybox-1.00/loginutils/passwd.c 2006-03-26 06:07:37 -05:00 ++++ busybox-1.00/loginutils/passwd.c 2006-03-26 06:09:03 -05:00 +@@ -386,7 +386,9 @@ + bzero(orig, sizeof(orig)); + + if (algo == 1) { +- cp = pw_encrypt(pass, "$1$"); ++ char salt[6]="$1$\0\0\0"; ++ memcpy(salt+3,crypt_make_salt(),3); ++ cp = pw_encrypt(pass, salt); + } else + cp = pw_encrypt(pass, crypt_make_salt()); + bzero(pass, sizeof pass); diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch new file mode 100644 index 0000000000..f5c0c2e89e --- /dev/null +++ b/package/busybox/patches/340-lock_util.patch @@ -0,0 +1,167 @@ +diff -urN busybox.old/include/applets.h busybox.dev/include/applets.h +--- busybox.old/include/applets.h 2006-04-05 01:06:29.000000000 +0200 ++++ busybox.dev/include/applets.h 2006-04-05 01:19:09.000000000 +0200 +@@ -167,6 +167,7 @@ + USE_LN(APPLET(ln, ln_main, _BB_DIR_BIN, _BB_SUID_NEVER)) + USE_LOADFONT(APPLET(loadfont, loadfont_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) + USE_LOADKMAP(APPLET(loadkmap, loadkmap_main, _BB_DIR_SBIN, _BB_SUID_NEVER)) ++USE_LOCK(APPLET_NOUSAGE(lock, lock_main, _BB_DIR_BIN, _BB_SUID_NEVER)) + USE_LOGGER(APPLET(logger, logger_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) + USE_LOGIN(APPLET(login, login_main, _BB_DIR_BIN, _BB_SUID_ALWAYS)) + USE_LOGNAME(APPLET(logname, logname_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) +diff -urN busybox.old/miscutils/Config.in busybox.dev/miscutils/Config.in +--- busybox.old/miscutils/Config.in 2006-03-22 22:16:24.000000000 +0100 ++++ busybox.dev/miscutils/Config.in 2006-04-05 01:07:12.000000000 +0200 +@@ -209,6 +209,12 @@ + Enables the 'hdparm -d' option to get/set using_dma flag. + This is dangerous stuff, so you should probably say N. + ++config CONFIG_LOCK ++ bool "lock" ++ default y ++ help ++ Small utility for using locks in scripts ++ + config CONFIG_MAKEDEVS + bool "makedevs" + default n +diff -urN busybox.old/miscutils/Makefile.in busybox.dev/miscutils/Makefile.in +--- busybox.old/miscutils/Makefile.in 2006-03-22 22:16:24.000000000 +0100 ++++ busybox.dev/miscutils/Makefile.in 2006-04-05 01:10:50.000000000 +0200 +@@ -20,6 +20,7 @@ + MISCUTILS-$(CONFIG_EJECT) += eject.o + MISCUTILS-$(CONFIG_HDPARM) += hdparm.o + MISCUTILS-$(CONFIG_LAST) += last.o ++MISCUTILS-$(CONFIG_LOCK) += lock.o + MISCUTILS-${CONFIG_LESS} += less.o + MISCUTILS-$(CONFIG_MAKEDEVS) += makedevs.o + MISCUTILS-$(CONFIG_MOUNTPOINT) += mountpoint.o +diff -urN busybox.old/miscutils/lock.c busybox.dev/miscutils/lock.c +--- busybox.old/miscutils/lock.c 1970-01-01 01:00:00.000000000 +0100 ++++ busybox.dev/miscutils/lock.c 2006-04-05 01:07:12.000000000 +0200 +@@ -0,0 +1,125 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "busybox.h" ++ ++static int unlock = 0; ++static int shared = 0; ++static int waitonly = 0; ++static int fd; ++static char *file; ++ ++static void usage(char *name) ++{ ++ fprintf(stderr, "Usage: %s [-suw] \n" ++ " -s Use shared locking\n" ++ " -u Unlock\n" ++ " -w Wait for the lock to become free, don't acquire lock\n" ++ "\n", name); ++ exit(1); ++} ++ ++static void exit_unlock(int sig) ++{ ++ flock(fd, LOCK_UN); ++ unlink(file); ++ exit(0); ++} ++ ++static int do_unlock(void) ++{ ++ FILE *f; ++ int i; ++ ++ f = fopen(file, "r"); ++ fscanf(f, "%d", &i); ++ if (i > 0) ++ kill(i, SIGTERM); ++ fclose(f); ++ ++ return 0; ++} ++ ++static int do_lock(void) ++{ ++ int pid; ++ char pidstr[8]; ++ ++ if ((fd = open(file, O_RDWR | O_CREAT, 0700)) < 0) { ++ fprintf(stderr, "Can't open %s\n", file); ++ return 1; ++ } ++ ++ if (flock(fd, (shared ? LOCK_SH : LOCK_EX)) < 0) { ++ fprintf(stderr, "Can't lock %s\n", file); ++ return 1; ++ } ++ ++ pid = fork(); ++ ++ if (pid < 0) ++ return -1; ++ ++ if (pid == 0) { ++ signal(SIGKILL, exit_unlock); ++ signal(SIGTERM, exit_unlock); ++ signal(SIGINT, exit_unlock); ++ if (waitonly) ++ exit_unlock(0); ++ else ++ while (1) ++ sleep(1); ++ } else { ++ if (!waitonly) { ++ lseek(fd, 0, SEEK_SET); ++ ftruncate(fd, 0); ++ sprintf(pidstr, "%d\n", pid); ++ write(fd, pidstr, strlen(pidstr)); ++ close(fd); ++ } ++ ++ return 0; ++ } ++} ++ ++#ifndef CONFIG_LOCK ++int main(int argc, char **argv) ++#else ++int lock_main(int argc, char **argv) ++#endif ++{ ++ char **args = &argv[1]; ++ int c = argc - 1; ++ ++ while ((*args != NULL) && (*args)[0] == '-') { ++ char *ch = *args; ++ while (*(++ch) > 0) { ++ switch(*ch) { ++ case 'w': ++ waitonly = 1; ++ break; ++ case 's': ++ shared = 1; ++ break; ++ case 'u': ++ unlock = 1; ++ break; ++ } ++ } ++ c--; ++ args++; ++ } ++ ++ if (c != 1) ++ usage(argv[0]); ++ ++ file = *args; ++ if (unlock) ++ return do_unlock(); ++ else ++ return do_lock(); ++} diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 393f0f014d..88bd9f21b9 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -31,6 +31,6 @@ $(IPKG_DNSMASQ): $(STRIP) $(IDIR_DNSMASQ)/usr/sbin/* install -d -m0755 $(IDIR_DNSMASQ)/etc/init.d/ install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf - install -m0755 ./files/S50dnsmasq $(IDIR_DNSMASQ)/etc/init.d/S50dnsmasq + install -m0755 ./files/dnsmasq.init $(IDIR_DNSMASQ)/etc/init.d/S50dnsmasq $(IPKG_BUILD) $(IDIR_DNSMASQ) $(PACKAGE_DIR) diff --git a/package/dnsmasq/files/S50dnsmasq b/package/dnsmasq/files/S50dnsmasq deleted file mode 100755 index 17e331fac8..0000000000 --- a/package/dnsmasq/files/S50dnsmasq +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -. /etc/functions.sh -. /etc/network.overrides -[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network - -# interface to use for DHCP -iface=lan - -ifname=$(nvram get ${iface}_ifname) -ipaddr=$(nvram get ${iface}_ipaddr) -netmask=$(nvram get ${iface}_netmask) - -# check for existing DHCP server -udhcpc -n -q -R -s /bin/true -i $ifname >&- || { - - ipaddr=$(ip2int $ipaddr) - netmask=$(ip2int ${netmask:-255.255.255.0}) - network=$((ipaddr&netmask)) - - start=$(nvram get dhcp_start) - start=$((network+${start:-100})) - end=$(nvram get dhcp_num) - end=$((start+${end:-150})) - - wanproto=$(nvram get wan_proto) - [ -z "$wanproto" -o "$wanproto" = "none" ] || wanif=$(nvram get wan_ifname) - - args="-K -F $(int2ip $start),$(int2ip $end),$(int2ip $netmask),12h ${wanif:+-I ${wanif} }" -} -dnsmasq ${args} diff --git a/package/dnsmasq/files/dnsmasq.conf b/package/dnsmasq/files/dnsmasq.conf index d4a9f082ca..7aed3a3da4 100644 --- a/package/dnsmasq/files/dnsmasq.conf +++ b/package/dnsmasq/files/dnsmasq.conf @@ -9,9 +9,15 @@ local=/lan/ domain=lan expand-hosts +@ifdef dhcp_enable +dhcp-range=@@start@@,@@end@@,@@netmask@@,@@lease@@ +@endif +@ifdef wan_ifname +except-interface=@@wan_ifname@@ +@endif + # enable dhcp (start,end,netmask,leasetime) dhcp-authoritative -#dhcp-range=192.168.1.100,192.168.1.250,255.255.255.0,12h dhcp-leasefile=/tmp/dhcp.leases # use /etc/ethers for static hosts; same format as --dhcp-host diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init new file mode 100644 index 0000000000..17ef43c3d5 --- /dev/null +++ b/package/dnsmasq/files/dnsmasq.init @@ -0,0 +1,45 @@ +#!/bin/sh +. /etc/config/network + +# The following is to automatically configure the DHCP settings +# based on config settings. Feel free to replace all this crap +# with a simple "dnsmasq" and manage everything via the +# /etc/dnsmasq.conf config file + +[ -f /etc/dnsmasq.conf ] || exit + +args="" +iface=lan +eval "ifname=\${${iface}_ifname}" + +dhcp_enable="${dhcp_enable:-1}" +dhcp_start="${dhcp_start:-100}" +dhcp_num="${dhcp_num:-50}" +dhcp_lease="${dhcp_lease:-12h}" + +# if dhcp_enable is unset and there is a dhcp server on the network already, default to dhcp_enable=0 +[ -z "$dhcp_enable" ] && udhcpc -n -q -R -s /bin/true -i $ifname >&- && dhcp_enable="${dhcp_enable:-0}" + +# dhcp_enable=0 disables the dhcp server +( + [ -z "$dhcp_enable" -o "$dhcp_enable" -eq 1 ] && { + # no existing DHCP server? + + # calculate settings + eval "ipaddr=\${${iface}_ipaddr}" + eval "netmask=\${${iface}_netmask}" + eval $(ipcalc $ipaddr $netmask ${dhcp_start:-100} ${dhcp_num:-150}) + + # and pass the args via config parser defines + echo "@define dhcp_enable 1" + echo "@define netmask $NETMASK" + echo "@define start $START" + echo "@define end $END" + echo "@define lease ${dhcp_lease:-12h}" + } + + # ignore requests from wan interface + [ -z "$wan_proto" -o "$wan_proto" = "none" ] || echo "@define wan_ifname $wan_ifname" + + cat /etc/dnsmasq.conf +) | awk -f /usr/lib/parse-config.awk | dnsmasq -C /proc/self/fd/0 diff --git a/package/ez-ipupdate/files/ez-ipupdate.hotplug b/package/ez-ipupdate/files/ez-ipupdate.hotplug index eb7ab326c4..c305458b1a 100644 --- a/package/ez-ipupdate/files/ez-ipupdate.hotplug +++ b/package/ez-ipupdate/files/ez-ipupdate.hotplug @@ -1,10 +1,10 @@ -. /etc/functions.sh NAME=ez-ipupdate CONFIG=/etc/$NAME.conf COMMAND=/usr/sbin/$NAME + [ "$ACTION" = "ifup" -a "$INTERFACE" = "wan" ] && { [ -x $COMMAND ] && [ -r $CONFIG ] && { - IFNAME=$(nvram get ${INTERFACE}_ifname) - $COMMAND -c $CONFIG -i $IFNAME 2>&1 | logger -t $NAME + eval "ifname=\"\${${INTERFACE}_ifname}\"" + $COMMAND -c $CONFIG -i $ifname 2>&1 | logger -t $NAME } & } diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 298a9a9e0f..f16ac8be48 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -72,6 +72,13 @@ $(PKG_BUILD_DIR)/.built: touch $@ $(IPKG_IPTABLES): + install -d -m0755 $(IDIR_IPTABLES)/etc/config + install -m0644 ./files/firewall.config $(IDIR_IPTABLES)/etc/config/firewall + install -d -m0755 $(IDIR_IPTABLES)/etc/init.d + install -m0755 ./files/firewall.init $(IDIR_IPTABLES)/etc/init.d/S45firewall + install -m0755 ./files/firewall.user $(IDIR_IPTABLES)/etc/ + install -d -m0755 $(IDIR_IPTABLES)/usr/lib + install -m0644 ./files/firewall.awk $(IDIR_IPTABLES)/usr/lib install -d -m0755 $(IDIR_IPTABLES)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables diff --git a/package/iptables/files/firewall.awk b/package/iptables/files/firewall.awk new file mode 100644 index 0000000000..1b63f83862 --- /dev/null +++ b/package/iptables/files/firewall.awk @@ -0,0 +1,64 @@ +BEGIN { + print "proto=\"$wan_proto\"" + print "[ -z \"$proto\" -o \"$proto\" = \"none\" ] && exit" + print "ifname=\"$wan_ifname\"" + print "[ -z \"$ifname\" ] && exit" + print "" + print "iptables -X input_$ifname 2>&- >&-" + print "iptables -N input_$ifname" + print "iptables -X forward_$ifname 2>&- >&-" + print "iptables -N forward_$ifname" + print "iptables -t nat -X prerouting_$ifname 2>&- >&-" + print "iptables -t nat -N prerouting_$ifname" + print "" + print "iptables -A input_rule -i \"$ifname\" -j input_$ifname" + print "iptables -A forwarding_rule -i \"$ifname\" -j forward_$ifname" + print "iptables -t nat -A prerouting_rule -i \"$ifname\" -j prerouting_$ifname" + print "" + FS=":" +} + +($1 == "accept") || ($1 == "drop") || ($1 == "forward") { + delete _opt + str2data($2) + if ((_l["proto"] == "") && (_l["sport"] _l["dport"] != "")) { + _opt[0] = " -p tcp" + _opt[1] = " -p udp" + } else { + _opt[0] = "" + } +} + +($1 == "accept") { + target = " -j ACCEPT" + for (o in _opt) { + print "iptables -t nat -A prerouting_$ifname" _opt[o] str2ipt($2) target + print "iptables -A input_$ifname " _opt[o] str2ipt($2) target + print "" + } +} + +($1 == "drop") { + for (o in _opt) { + print "iptables -t nat -A prerouting_$ifname" _opt[o] str2ipt($2) " -j DROP" + print "" + } +} + +($1 == "forward") { + target = " -j DNAT --to " $3 + fwopts = "" + if ($4 != "") { + if ((_l["proto"] == "tcp") || (_l["proto"] == "udp") || (_l["proto"] == "")) { + if (_l["proto"] != "") fwopts = " -p " _l["proto"] + fwopts = fwopts " --dport " $4 + target = target ":" $4 + } + else fwopts = "" + } + for (o in _opt) { + print "iptables -t nat -A prerouting_$ifname" _opt[o] str2ipt($2) target + print "iptables -A forward_$ifname " _opt[o] " -d " $3 fwopts " -j ACCEPT" + print "" + } +} diff --git a/package/iptables/files/firewall.config b/package/iptables/files/firewall.config new file mode 100644 index 0000000000..7edd4ba4e4 --- /dev/null +++ b/package/iptables/files/firewall.config @@ -0,0 +1,46 @@ +# RULE SYNTAX: +# +# forward::[:] +# - forwards all packets matched by to , +# optionally changing the port to +# +# accept: +# - accepts all traffic matched by +# +# drop: +# - drops all traffic matched by +# +# +# MATCHING OPTIONS: +# +# src= +# - match the source ip +# +# dest= +# - match the destination ip +# +# proto= +# - match the protocol by name or number +# +# sport= +# - match the source port(s), see below for syntax +# +# dport= +# - match the destination port(s), see below for syntax +# +# +# +# PORT SYNTAX: +# +# You can enter an arbitrary list of ports and port ranges in the following format: +# - 22,53,993,1000-1024 +# +# If you don't set the protocol to tcp or udp, it will apply to both +# +# +# +# EXAMPLES: +# +# drop:dport=22 src=1.3.3.7 +# accept:proto=tcp dport=22 +# forward:dport=60168:192.168.1.2:60169 diff --git a/package/iptables/files/firewall.init b/package/iptables/files/firewall.init new file mode 100755 index 0000000000..3804d044f8 --- /dev/null +++ b/package/iptables/files/firewall.init @@ -0,0 +1,95 @@ +#!/bin/sh + +## Please make changes in /etc/firewall.user + +. /etc/config/network +WAN="$wan_ifname" +LAN="$lan_ifname" + +## CLEAR TABLES +for T in filter nat; do + iptables -t $T -F + iptables -t $T -X +done + +iptables -N input_rule +iptables -N output_rule +iptables -N forwarding_rule + +iptables -t nat -N prerouting_rule +iptables -t nat -N postrouting_rule + +### INPUT +### (connections with the router as destination) + + # base case + iptables -P INPUT DROP + iptables -A INPUT -m state --state INVALID -j DROP + iptables -A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT + iptables -A INPUT -p tcp --tcp-flags SYN SYN --tcp-option \! 2 -j DROP + + # + # insert accept rule or to jump to new accept-check table here + # + iptables -A INPUT -j input_rule + + # allow + [ -z "$WAN" ] || iptables -A INPUT -i \! $WAN -j ACCEPT # allow from lan/wifi interfaces + iptables -A INPUT -p icmp -j ACCEPT # allow ICMP + iptables -A INPUT -p gre -j ACCEPT # allow GRE + + # reject (what to do with anything not allowed earlier) + iptables -A INPUT -p tcp -j REJECT --reject-with tcp-reset + iptables -A INPUT -j REJECT --reject-with icmp-port-unreachable + +### OUTPUT +### (connections with the router as source) + + # base case + iptables -P OUTPUT DROP + iptables -A OUTPUT -m state --state INVALID -j DROP + iptables -A OUTPUT -m state --state RELATED,ESTABLISHED -j ACCEPT + + # + # insert accept rule or to jump to new accept-check table here + # + iptables -A OUTPUT -j output_rule + + # allow + iptables -A OUTPUT -j ACCEPT #allow everything out + + # reject (what to do with anything not allowed earlier) + iptables -A OUTPUT -p tcp -j REJECT --reject-with tcp-reset + iptables -A OUTPUT -j REJECT --reject-with icmp-port-unreachable + +### FORWARDING +### (connections routed through the router) + + # base case + iptables -P FORWARD DROP + iptables -A FORWARD -m state --state INVALID -j DROP + iptables -A FORWARD -p tcp --tcp-flags SYN,RST SYN -j TCPMSS --clamp-mss-to-pmtu + iptables -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT + + # + # insert accept rule or to jump to new accept-check table here + # + iptables -A FORWARD -j forwarding_rule + + # allow + iptables -A FORWARD -i br0 -o br0 -j ACCEPT + [ -z "$WAN" ] || iptables -A FORWARD -i $LAN -o $WAN -j ACCEPT + + # reject (what to do with anything not allowed earlier) + # uses the default -P DROP + +### MASQ + iptables -t nat -A PREROUTING -j prerouting_rule + iptables -t nat -A POSTROUTING -j postrouting_rule + [ -z "$WAN" ] || iptables -t nat -A POSTROUTING -o $WAN -j MASQUERADE + +## USER RULES +[ -f /etc/firewall.user ] && . /etc/firewall.user +[ -n "$WAN" -a -e /etc/config/firewall ] && { + awk -f /usr/lib/common.awk -f /usr/lib/firewall.awk /etc/config/firewall | ash +} diff --git a/package/iptables/files/firewall.user b/package/iptables/files/firewall.user new file mode 100755 index 0000000000..f13f50bf66 --- /dev/null +++ b/package/iptables/files/firewall.user @@ -0,0 +1,31 @@ +#!/bin/sh +. /etc/config/network + +WAN="$wan_ifname" +LAN="$lan_ifname" + +iptables -F input_rule +iptables -F output_rule +iptables -F forwarding_rule +iptables -t nat -F prerouting_rule +iptables -t nat -F postrouting_rule + +### BIG FAT DISCLAIMER +## The "-i $WAN" is used to match packets that come in via the $WAN interface. +## it WILL NOT MATCH packets sent from the $WAN ip address -- you won't be able +## to see the effects from within the LAN. + +### Open port to WAN +## -- This allows port 22 to be answered by (dropbear on) the router +# iptables -t nat -A prerouting_rule -i $WAN -p tcp --dport 22 -j ACCEPT +# iptables -A input_rule -i $WAN -p tcp --dport 22 -j ACCEPT + +### Port forwarding +## -- This forwards port 8080 on the WAN to port 80 on 192.168.1.2 +# iptables -t nat -A prerouting_rule -i $WAN -p tcp --dport 8080 -j DNAT --to 192.168.1.2:80 +# iptables -A forwarding_rule -i $WAN -p tcp --dport 80 -d 192.168.1.2 -j ACCEPT + +### DMZ +## -- Connections to ports not handled above will be forwarded to 192.168.1.2 +# iptables -t nat -A prerouting_rule -i $WAN -j DNAT --to 192.168.1.2 +# iptables -A forwarding_rule -i $WAN -d 192.168.1.2 -j ACCEPT diff --git a/package/linux-atm/files/br2684.init b/package/linux-atm/files/br2684.init index 88f40e76b6..242e7e5152 100644 --- a/package/linux-atm/files/br2684.init +++ b/package/linux-atm/files/br2684.init @@ -1,16 +1,14 @@ [ "${INTERFACE%%[0-9]*}" = "atm" ] && { case "$ACTION" in register) - [ "$(nvram get pppoe_atm)" = 1 ] && { - VPI=$(nvram get atm_vpi) - VCI=$(nvram get atm_vci) - case "$(nvram get atm_encaps)" in + [ "$pppoe_atm" = 1 ] && { + case "$atm_encaps" in 0|vc) ENCAPS=0 ;; 1|llc) ENCAPS=1 ;; *) ENCAPS=0 ;; esac insmod br2684 2>&- >&- - br2684ctl -c0 -e${ENCAPS} -a${VPI:-8}.${VCI:-35} & + br2684ctl -c0 -e${ENCAPS} -a${atm_vpi:-8}.${atm_vci:-35} & } ;; unregister) diff --git a/package/mtd/mtd.c b/package/mtd/mtd.c index 78d38fb6a9..23e99160a1 100644 --- a/package/mtd/mtd.c +++ b/package/mtd/mtd.c @@ -96,7 +96,7 @@ image_check_bcom(int imagefd, const char *mtd) } /* check if image fits to mtd device */ - fd = mtd_open(mtd, O_RDWR); + fd = mtd_open(mtd, O_RDWR | O_SYNC); if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); exit(1); @@ -113,6 +113,7 @@ image_check_bcom(int imagefd, const char *mtd) return 0; } + close(fd); return 1; } @@ -148,7 +149,7 @@ int mtd_check(char *mtd) struct mtd_info_user mtdInfo; int fd; - fd = mtd_open(mtd, O_RDWR); + fd = mtd_open(mtd, O_RDWR | O_SYNC); if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); return 0; @@ -171,7 +172,7 @@ mtd_unlock(const char *mtd) struct mtd_info_user mtdInfo; struct erase_info_user mtdLockInfo; - fd = mtd_open(mtd, O_RDWR); + fd = mtd_open(mtd, O_RDWR | O_SYNC); if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); exit(1); @@ -222,7 +223,7 @@ mtd_erase(const char *mtd) struct mtd_info_user mtdInfo; struct erase_info_user mtdEraseInfo; - fd = mtd_open(mtd, O_RDWR); + fd = mtd_open(mtd, O_RDWR | O_SYNC); if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); exit(1); @@ -260,8 +261,9 @@ mtd_write(int imagefd, const char *mtd, int quiet) size_t r, w, e; struct mtd_info_user mtdInfo; struct erase_info_user mtdEraseInfo; + int ret = 0; - fd = mtd_open(mtd, O_RDWR); + fd = mtd_open(mtd, O_RDWR | O_SYNC); if(fd < 0) { fprintf(stderr, "Could not open mtd device: %s\n", mtd); exit(1); @@ -318,7 +320,8 @@ mtd_write(int imagefd, const char *mtd, int quiet) } if (!quiet) fprintf(stderr, "\b\b\b\b"); - + + close(fd); return 0; } @@ -463,6 +466,8 @@ int main (int argc, char **argv) break; } + sync(); + if (boot) kill(1, 15); // send SIGTERM to init for reboot diff --git a/package/ntpclient/files/ntpclient.init b/package/ntpclient/files/ntpclient.init index c8505c5cad..a8944c60eb 100644 --- a/package/ntpclient/files/ntpclient.init +++ b/package/ntpclient/files/ntpclient.init @@ -1,9 +1,8 @@ #!/bin/sh -server=$(nvram get ntp_server) case "$ACTION" in ifup) ps x | grep '[n]tpclient' >&- || { - route -n 2>&- | grep '^0.0.0.0' >&- && /usr/sbin/ntpclient -c 1 -s -h ${server:-pool.ntp.org} & + route -n 2>&- | grep '^0.0.0.0' >&- && /usr/sbin/ntpclient -c 1 -s -h ${ntp_server:-pool.ntp.org} & } ;; ifdown) diff --git a/package/parprouted/files/parprouted.default b/package/parprouted/files/parprouted.default index 17169c4b37..7128a56a74 100755 --- a/package/parprouted/files/parprouted.default +++ b/package/parprouted/files/parprouted.default @@ -1,3 +1 @@ -LAN_IF=$(nvram get lan_ifname) -WIFI_IF=$(nvram get wifi_ifname) -OPTIONS="$LAN_IF $WIFI_IF" +OPTIONS="$lan_ifname $wifi_ifname" diff --git a/package/ppp/files/ifup.pppoa b/package/ppp/files/ifup.pppoa index baea25ebf2..277266c0f5 100644 --- a/package/ppp/files/ifup.pppoa +++ b/package/ppp/files/ifup.pppoa @@ -1,11 +1,10 @@ #!/bin/sh [ $# = 0 ] && { echo " $0 "; exit; } -. /etc/functions.sh -. /etc/network.overrides -[ -e /etc/config/network ] && . /etc/config/network +. /etc/config/network type=$1 -[ "$(nvram get ${type}_proto)" = "pppoa" ] || { +eval "proto=\"\${${type}_proto}\"" +[ "$proto" = "pppoa" ] || { echo "$0: ${type}_proto isn't pppoa" exit } @@ -14,32 +13,24 @@ for module in slhc ppp_generic pppoatm; do /sbin/insmod $module 2>&- >&- done -VPI=$(nvram get atm_vpi) -VCI=$(nvram get atm_vci) -USERNAME=$(nvram get ppp_username) -PASSWORD=$(nvram get ppp_passwd) -KEEPALIVE=$(nvram get ppp_redialperiod) -KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 1 lcp-echo-failure $KEEPALIVE} -DEMAND=$(nvram get ppp_demand) -case "$DEMAND" in +KEEPALIVE=${ppp_redialperiod:+lcp-echo-interval $ppp_redialperiod lcp-echo-failure 5} +case "$ppp_demand" in on|1|enabled) - DEMAND=$(nvram get ppp_idletime) - DEMAND=${IDLETIME:+demand idle $IDLETIME} + DEMAND=${ppp_idletime:+demand idle $ppp_idletime} [ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND} ;; *) DEMAND="persist";; esac -MTU=$(nvram get ppp_mtu) -MTU=${MTU:-1500} +MTU=${ppp_mtu:-1500} /usr/sbin/pppd \ - plugin pppoatm.so ${VPI:-8}.${VCI:-35} \ + plugin pppoatm.so ${atm_vpi:-8}.${atm_vci:-35} \ usepeerdns \ defaultroute \ linkname $type \ ipparam $type \ - user "$USERNAME" \ - password "$PASSWORD" \ + user "$ppp_username" \ + password "$ppp_passwd" \ mtu $MTU mru $MTU \ $DEMAND \ $KEEPALIVE diff --git a/package/ppp/files/ifup.pppoe b/package/ppp/files/ifup.pppoe index 1f9cd739c3..0f3c14ed0d 100644 --- a/package/ppp/files/ifup.pppoe +++ b/package/ppp/files/ifup.pppoe @@ -1,11 +1,10 @@ #!/bin/sh [ $# = 0 ] && { echo " $0 "; exit; } -. /etc/functions.sh -. /etc/network.overrides -[ -e /etc/config/network ] && . /etc/config/network +. /etc/config/network type=$1 -[ "$(nvram get ${type}_proto)" = "pppoe" ] || { +eval "proto=\"\${${type}_proto}\"" +[ "$proto" = "pppoe" ] || { echo "$0: ${type}_proto isn't pppoe" exit } @@ -14,22 +13,16 @@ for module in slhc ppp_generic pppox pppoe; do /sbin/insmod $module 2>&- >&- done -IFNAME=$(nvram get ${type}_device) -USERNAME=$(nvram get ppp_username) -PASSWORD=$(nvram get ppp_passwd) -KEEPALIVE=$(nvram get ppp_redialperiod) -KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 1 lcp-echo-failure $KEEPALIVE} -DEMAND=$(nvram get ppp_demand) -case "$DEMAND" in +eval "IFNAME=\"\${${type}_device}\"" +KEEPALIVE=${ppp_redialperiod:+lcp-echo-interval $ppp_redialperiod lcp-echo-failure 5} +case "$ppp_demand" in on|1|enabled) - DEMAND=$(nvram get ppp_idletime) - DEMAND=${IDLETIME:+demand idle $IDLETIME} + DEMAND=${ppp_idletime:+demand idle $ppp_idletime} [ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND} ;; *) DEMAND="persist";; esac -MTU=$(nvram get ppp_mtu) -MTU=${MTU:-1492} +MTU=${ppp_mtu:-1492} ifconfig $IFNAME up /usr/sbin/pppd \ @@ -39,8 +32,8 @@ ifconfig $IFNAME up defaultroute \ linkname $type \ ipparam $type \ - user "$USERNAME" \ - password "$PASSWORD" \ + user "$ppp_username" \ + password "$ppp_passwd" \ mtu $MTU mru $MTU \ $DEMAND \ $KEEPALIVE \ diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp index 9b1ac07c26..a9bc579b56 100644 --- a/package/pptp/files/ifup.pptp +++ b/package/pptp/files/ifup.pptp @@ -1,8 +1,13 @@ #!/bin/sh -. /etc/functions.sh +[ $# = 0 ] && { echo " $0 "; exit; } +. /etc/config/network type=$1 -[ "$(nvram get ${type}_proto)" = "pptp" ] || exit +eval "proto=\"\${${type}_proto}\"" +[ "$proto" = "pptp" ] || { + echo "$0: ${type}_proto isn't pptp" + exit +} [ -d "/var/lock" ] || mkdir -p /var/lock || exit 1 @@ -10,35 +15,21 @@ for module in slhc ppp_generic ppp_async ip_gre; do /sbin/insmod $module 2>&- >&- done -PPTP_PROTO="$(nvram get pptp_proto)" -[ "$PPTP_PROTO" = "static" ] || PPTP_PROTO="" -PPTP_PROTO="${PPTP_PROTO:-dhcp}" -IP=$(nvram get pptp_server_ip) -USERNAME=$(nvram get ppp_username) -PASSWORD=$(nvram get ppp_passwd) -KEEPALIVE=$(nvram get ppp_redialperiod) -KEEPALIVE=${KEEPALIVE:+lcp-echo-interval 10 lcp-echo-failure $KEEPALIVE} -DEMAND=$(nvram get ppp_demand) -case "$DEMAND" in +KEEPALIVE=${ppp_redialperiod:+lcp-echo-interval $ppp_redialperiod lcp-echo-failure 5} +case "$ppp_demand" in on|1|enabled) - DEMAND=$(nvram get ppp_idletime) - DEMAND=${IDLETIME:+demand idle $IDLETIME} + DEMAND=${ppp_idletime:+demand idle $ppp_idletime} [ -f /etc/ppp/filter ] && DEMAND=${DEMAND:+precompiled-active-filter /etc/ppp/filter $DEMAND} ;; *) DEMAND="persist";; esac -MTU=$(nvram get ppp_mtu) -MTU=${MTU:-1452} +MTU=${ppp_mtu:-1452} -do_ifup $PPTP_PROTO $type - -# hack for some buggy ISPs -NETMASK=$(nvram get ${type}_netmask) -IFNAME=$(nvram get ${type}_device) -[ -z "$NETMASK" -o -z "$IFNAME" ] || ifconfig $IFNAME netmask $NETMASK +[ "$pptp_proto" = "static" ] || pptp_proto="dhcp" +do_ifup $pptp_proto $type /usr/sbin/pppd \ - pty "/usr/sbin/pptp $IP --loglevel 0 --nolaunchpppd" \ + pty "/usr/sbin/pptp $pptp_server_ip --loglevel 0 --nolaunchpppd" \ file /etc/ppp/options.pptp \ connect /bin/true \ usepeerdns \ @@ -46,8 +37,8 @@ IFNAME=$(nvram get ${type}_device) replacedefaultroute \ linkname "$type" \ ipparam "$type" \ - user "$USERNAME" \ - password "$PASSWORD" \ + user "$ppp_username" \ + password "$ppp_passwd" \ mtu $MTU mru $MTU \ $DEMAND \ $KEEPALIVE diff --git a/target/linux/package/base-files/files/ar7-2.4/etc/network.overrides b/target/linux/package/base-files/files/ar7-2.4/etc/network.overrides deleted file mode 100644 index 9aa74aa934..0000000000 --- a/target/linux/package/base-files/files/ar7-2.4/etc/network.overrides +++ /dev/null @@ -1,28 +0,0 @@ -# NVRAM overrides -# -# This file handles the NVRAM quirks of various hardware. -# THIS FILE IS NOT A REPLACEMENT FOR NVRAM - -# Load sysconf defaults -[ -f /etc/sysconf ] && . /etc/sysconf - -DEFAULT_lan_proto="static" -DEFAULT_lan_ifname="br0" -DEFAULT_lan_ifnames="eth0" -DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} -DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} -DEFAULT_lan_hwaddr=`echo $(strings /dev/mtdblock/3 | grep -A1 maca | grep :)` -DEFAULT_lan_hwaddr=${DEFAULT_lan_hwaddr##* } -DEFAULT_lan_hwaddr=${DEFAULT_lan_hwaddr:-${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"}} - -# failsafe if reset is held -[ "$FAILSAFE" = "true" ] && { - echo "### YOU ARE IN FAILSAFE MODE ####" - lan_ifname=${DEFAULT_lan_proto} - lan_ifnames=${FAILSAFE_ifnames:-${DEFAULT_lan_ifnames}} - lan_ipaddr=$DEFAULT_lan_ipaddr - lan_netmask=$DEFAULT_lan_netmask - lan_hwaddr=$DEFAULT_lan_hwaddr - wan_ifname="none" - wifi_ifname="none" -} diff --git a/target/linux/package/base-files/files/aruba-2.6/etc/network.overrides b/target/linux/package/base-files/files/aruba-2.6/etc/network.overrides deleted file mode 100644 index 2df6acdd3d..0000000000 --- a/target/linux/package/base-files/files/aruba-2.6/etc/network.overrides +++ /dev/null @@ -1,26 +0,0 @@ -# NVRAM overrides -# -# This file handles the NVRAM quirks of various hardware. -# THIS FILE IS NOT A REPLACEMENT FOR NVRAM - -# Load sysconf defaults -[ -f /etc/sysconf ] && . /etc/sysconf - -DEFAULT_lan_proto="static" -DEFAULT_lan_ifname="br0" -DEFAULT_lan_ifnames="eth0" -DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} -DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} -# DEFAULT_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"} - -# failsafe if reset is held -[ "$FAILSAFE" = "true" ] && { - echo "### YOU ARE IN FAILSAFE MODE ####" - lan_ifname=${DEFAULT_lan_proto} - lan_ifnames=${FAILSAFE_ifnames:-${DEFAULT_lan_ifnames}} - lan_ipaddr=$DEFAULT_lan_ipaddr - lan_netmask=$DEFAULT_lan_netmask - lan_hwaddr=$DEFAULT_lan_hwaddr - wan_ifname="none" - wifi_ifname="none" -} diff --git a/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S04nvram b/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S04nvram new file mode 100755 index 0000000000..4de124735b --- /dev/null +++ b/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S04nvram @@ -0,0 +1,66 @@ +#!/bin/sh +# NVRAM setup +# +# This file handles the NVRAM quirks of various hardware. + +# WGT634u +grep 'mtd0: 00060000' /proc/mtd 2>&- >&- && exit + +alias debug=${DEBUG:-:} + +nvram_default() { + [ -z "$(nvram get $1)" ] && nvram set "$1=$2" +} + +nvram_set() { # for the linksys fixup part + [ "$(nvram get "$1")" = "$2" -a "$2" != "" ] || { + COMMIT=1 + /usr/sbin/nvram set "$1=$2" + } +} + +# work around braindead CFE defaults in linksys routers +boardtype=$(nvram get boardtype) +boardnum=$(nvram get boardnum) +boardflags=$(($(nvram get boardflags))) +adm_switch="$(( ($boardflags & 0x80) >> 7 ))" + +case "$(( $boardtype ))" in + "1800") #0x708 + if [ "$adm_switch" = 0 ]; then + nvram_set sdram_init "$(printf 0x%04x $(( $(/usr/sbin/nvram get sdram_init) | 0x0100 )))" + [ "$COMMIT" = 1 ] && { + nvram_set sdram_config 0x0062 + nvram_set clkfreq 216 + nvram_set sdram_ncdl 0x0 + nvram_set pa0itssit 62 + nvram_set pa0b0 0x15eb + nvram_set pa0b1 0xfa82 + nvram_set pa0b2 0xfe66 + nvram_set pa0maxpwr 0x4e + } + fi + ;; + "1127") #0x467 + nvram_set sdram_init "$(printf 0x%04x $(( $(/usr/sbin/nvram get sdram_init) | 0x0100 )))" + [ "$COMMIT" = 1 ] && { + nvram_set sdram_config 0x0062 + nvram_set sdram_ncdl 0x0 + nvram_set pa0itssit 62 + nvram_set pa0b0 0x168b + nvram_set pa0b1 0xfabf + nvram_set pa0b2 0xfeaf + nvram_set pa0maxpwr 0x4e + } + ;; +esac +[ "$COMMIT" = "1" ] && nvram commit + +# hack for some motorola routers +nvram unset wl0gpio0 + +[ "$(nvram get il0macaddr)" = "00:90:4c:5f:00:2a" ] && { + # if default wifi mac, set two higher than the lan mac + nvram set il0macaddr=$(nvram get et0macaddr| + awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}') +} diff --git a/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05netconfig b/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05netconfig index 51be73b5ba..6a626f54a5 100755 --- a/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05netconfig +++ b/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05netconfig @@ -50,7 +50,7 @@ END { c["vlan1ports"] = "4 5" c["lan_ifnames"] = "vlan0 ath0" } - if (nvram["boardtype"] == "0x0467") { + if ((nvram["boardtype"] == "0x0467") || (nvram["boardtype"] == "0x042f")) { c["vlan0ports"] = "0 1 2 3 5*" c["vlan1ports"] = "4 5" } @@ -101,6 +101,8 @@ END { print "" print "## PPP over Ethernet and PPTP" print "# wan_ifname=\"ppp0\"" + print "# ppp_username=\"my_username\"" + print "# ppp_passwd=\"my_password\"" print "# pptp_server_ip=\"192.168.0.1\"" } ' > /etc/config/network diff --git a/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram b/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram deleted file mode 100755 index b985948d78..0000000000 --- a/target/linux/package/base-files/files/brcm-2.4/etc/init.d/S05nvram +++ /dev/null @@ -1,166 +0,0 @@ -#!/bin/sh -# NVRAM setup -# -# This file handles the NVRAM quirks of various hardware. - -. /etc/network.overrides -alias debug=${DEBUG:-:} - -# WGT634u -grep 'mtd0: 00060000' /proc/mtd 2>&- >&- && exit - -remap () { - for type in lan wifi wan pppoe - do - for s in '' s - do - eval nvram set ${type}_ifname$s=\"$(nvram get ${type}_ifname$s|sed s/$1/$2/g)\" - done - done -} - -nvram_default() { - [ -z "$(nvram get $1)" ] && nvram set "$1=$2" -} - -nvram_set() { # for the linksys fixup part - [ "$(nvram get "$1")" = "$2" -a "$2" != "" ] || { - COMMIT=1 - /usr/sbin/nvram set "$1=$2" - } -} - -# work around braindead CFE defaults in linksys routers -boardtype=$(nvram get boardtype) -boardflags=$(($(nvram get boardflags))) -[ "$boardtype" = "bcm94710dev" ] && boardtype="0xdeadbeef" -adm_switch="$(( ($boardflags & 0x80) >> 7 ))" -case "$(( $boardtype ))" in - "$((0x708))") - if [ "$adm_switch" = 0 ]; then - nvram_set sdram_init "$(printf 0x%04x $(( $(/usr/sbin/nvram get sdram_init) | 0x0100 )))" - [ "$COMMIT" = 1 ] && { - nvram_set sdram_config 0x0062 - nvram_set clkfreq 216 - nvram_set sdram_ncdl 0x0 - nvram_set pa0itssit 62 - nvram_set pa0b0 0x15eb - nvram_set pa0b1 0xfa82 - nvram_set pa0b2 0xfe66 - nvram_set pa0maxpwr 0x4e - } - fi - ;; - "$((0x467))") - nvram_set sdram_init "$(printf 0x%04x $(( $(/usr/sbin/nvram get sdram_init) | 0x0100 )))" - [ "$COMMIT" = 1 ] && { - nvram_set sdram_config 0x0062 - nvram_set sdram_ncdl 0x0 - nvram_set pa0itssit 62 - nvram_set pa0b0 0x168b - nvram_set pa0b1 0xfabf - nvram_set pa0b2 0xfeaf - nvram_set pa0maxpwr 0x4e - } - ;; -esac -[ "$COMMIT" = "1" ] && nvram commit - - -# linksys bug; remove when not using static configuration for lan -nvram set lan_proto="static" - -# hacks for wrt54g 1.x hardware -[ "$(nvram get boardnum)" = "42" \ --a "$(nvram get boardtype)" = "bcm94710dev" ] && { - debug "### wrt54g 1.x hack ###" - nvram set vlan1hwname="et0" - nvram set vlan2hwname="et0" - remap eth0 vlan2 - remap eth1 vlan1 -} - -# hacks for asus wl-500g deluxe -[ "$(nvram get boardtype)" = "bcm95365r" \ --a "$(nvram get boardnum)" = "45" ] && { - debug "### wl-500g deluxe hacks ###" - nvram set vlan0hwname="et0" - nvram set vlan1hwname="et0" - remap eth0.1 vlan0 - remap eth0 vlan1 - - # set up the vlan*ports variables for the asus wl-500g deluxe - # if they don't already exist - nvram_default vlan0ports "1 2 3 4 5*" - nvram_default vlan1ports "0 5" -} - -# hacks for asus -case "$(nvram get productid)" in - WL300g) - debug "### wl-300g hacks ###" - nvram set lan_ifnames="eth0 eth2" - nvram set wan_ifname="none" - ;; - WLHDD) - debug "### wl-hdd hacks ###" - nvram set lan_ifnames="eth1 eth2" - nvram set wan_ifname="none" - ;; - *) - # wl-500g defaults. these are placed here, because WL-HDD and WL-300g - # might have the same nvram settings. - [ "$(nvram get boardnum)" = "asusX" \ - -a "$(nvram get boardtype)" = "bcm94710dev" ] && { - nvram_default wan_device "eth1" - } - ;; -esac - -# hacks for wap54g hardware -[ "$(nvram get boardnum)" = "2" \ --o "$(nvram get boardnum)" = "1024" ] && { - debug "### wap54g hack ###" - nvram set wan_ifname="none" -} - -# hacks for buffalo wla2-g54l -[ "$(nvram get boardnum)" = "00" \ --a "$(nvram get product_name)" = "Product_name" \ --o "$(nvram get product_name)" = "WLA2-G54L" ] && { - debug "### wla2-g54l hacks ###" - nvram set wan_ifname="none" - nvram set lan_ifnames="vlan0" -} - -# needed at least for wrt54gs v1.1 and wrt54g v2.0, v2.2 -[ \! -z "$(nvram get boardrev)" ] && { - nvram_default wl0id 0x4320 -} - -# defaults -nvram_default lan_ifname "br0" -nvram_default lan_ifnames "$FAILSAFE_ifnames" - -nvram_default wan_ifname "vlan1" -nvram_default wan_device "vlan1" -nvram_default wan_proto "dhcp" - -nvram_default wl0_ssid OpenWrt -nvram_default wl0_mode ap -nvram_default wl0_infra 1 -nvram_default wl0_radio 1 - -WAN_PROTO="$(nvram get wan_proto)" -WAN_IFNAME="$(nvram get wan_ifname)" -case "$WAN_PROTO" in - pp*) [ "${WAN_IFNAME%%[0-9]*}" = "ppp" ] || nvram set wan_ifname=ppp0;; - *) [ "${WAN_IFNAME%%[0-9]*}" = "ppp" ] && nvram set wan_ifname="$(nvram get wan_device)";; -esac - -[ "$(nvram get il0macaddr)" = "00:90:4c:5f:00:2a" ] && { - # if default wifi mac, set two higher than the lan mac - nvram set il0macaddr=$(nvram get et0macaddr| - awk '{OFS=FS=":";for(x=7,y=2;--x;){$x=sprintf("%02x",(y+="0x"$x)%256);y/=256}print}') -} - diff --git a/target/linux/package/base-files/files/brcm-2.4/etc/network.overrides b/target/linux/package/base-files/files/brcm-2.4/etc/network.overrides deleted file mode 100644 index 72ef012653..0000000000 --- a/target/linux/package/base-files/files/brcm-2.4/etc/network.overrides +++ /dev/null @@ -1,41 +0,0 @@ -# NVRAM overrides -# -# This file handles the NVRAM quirks of various hardware. -# THIS FILE IS NOT A REPLACEMENT FOR NVRAM - -# Load sysconf defaults -[ -f /etc/sysconf ] && . /etc/sysconf - -# hacks for wrt54g 1.x hardware -[ "$(nvram get boardnum)" = "42" \ --a "$(nvram get boardtype)" = "bcm94710dev" ] && FAILSAFE_ifnames="vlan0 vlan2 eth2" - -# hacks for asus wl-500g deluxe -[ "$(nvram get boardtype)" = "bcm95365r" \ --a "$(nvram get boardnum)" = "45" ] && FAILSAFE_ifnames="vlan0 eth1" - -# hacks for wap54g hardware -[ "$(nvram get boardnum)" = "2" \ --o "$(nvram get boardnum)" = "1024" ] && FAILSAFE_ifnames="eth0 eth1" - -# hack for asus wl-500g hardware -[ "$(nvram get boardnum)" = "asusX" \ --a "$(nvram get boardtype)" = "bcm94710dev" ] && FAILSAFE_ifnames="eth0 eth1 eth2" - -FAILSAFE_ifnames=${FAILSAFE_ifnames:-"vlan0 eth1 eth2"} - -DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} -DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} -DEFAULT_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"} - -# failsafe if reset is held -[ "$FAILSAFE" = "true" ] && { - echo "### YOU ARE IN FAILSAFE MODE ####" - lan_ifname="br0" - lan_ifnames=$FAILSAFE_ifnames - lan_ipaddr=$DEFAULT_lan_ipaddr - lan_netmask=$DEFAULT_lan_netmask - lan_hwaddr=$DEFAULT_lan_hwaddr - wan_ifname="none" - wifi_ifname="none" -} diff --git a/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig b/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig index 51be73b5ba..6a626f54a5 100755 --- a/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig +++ b/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig @@ -50,7 +50,7 @@ END { c["vlan1ports"] = "4 5" c["lan_ifnames"] = "vlan0 ath0" } - if (nvram["boardtype"] == "0x0467") { + if ((nvram["boardtype"] == "0x0467") || (nvram["boardtype"] == "0x042f")) { c["vlan0ports"] = "0 1 2 3 5*" c["vlan1ports"] = "4 5" } @@ -101,6 +101,8 @@ END { print "" print "## PPP over Ethernet and PPTP" print "# wan_ifname=\"ppp0\"" + print "# ppp_username=\"my_username\"" + print "# ppp_passwd=\"my_password\"" print "# pptp_server_ip=\"192.168.0.1\"" } ' > /etc/config/network diff --git a/target/linux/package/base-files/files/brcm-2.6/etc/network.overrides b/target/linux/package/base-files/files/brcm-2.6/etc/network.overrides deleted file mode 100644 index ded748b260..0000000000 --- a/target/linux/package/base-files/files/brcm-2.6/etc/network.overrides +++ /dev/null @@ -1,31 +0,0 @@ -# NVRAM overrides -# -# This file handles the NVRAM quirks of various hardware. -# THIS FILE IS NOT A REPLACEMENT FOR NVRAM - -# Load sysconf defaults -[ -f /etc/sysconf ] && . /etc/sysconf - -DEFAULT_lan_proto="static" -DEFAULT_lan_ifname="br0" -DEFAULT_lan_ifnames="vlan0 ath0" -DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} -DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} -DEFAULT_lan_hwaddr=${DEFAULT_lan_hwaddr:-${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"}} -DEFAULT_vlan0hwname="et0" -DEFAULT_vlan1hwname="et0" -DEFAULT_et0macaddr=$(ifconfig eth0| awk '/eth0/ {print $5 }') -DEFAULT_wan_proto="dhcp" -DEFAULT_wan_ifname="vlan1" - -# failsafe if reset is held -[ "$FAILSAFE" = "true" ] && { - echo "### YOU ARE IN FAILSAFE MODE ####" - lan_ifname=${DEFAULT_lan_proto} - lan_ifnames=${FAILSAFE_ifnames:-${DEFAULT_lan_ifnames}} - lan_ipaddr=$DEFAULT_lan_ipaddr - lan_netmask=$DEFAULT_lan_netmask - lan_hwaddr=$DEFAULT_lan_hwaddr - wan_ifname="none" - wifi_ifname="none" -} diff --git a/target/linux/package/base-files/files/x86-2.4/etc/network.overrides b/target/linux/package/base-files/files/x86-2.4/etc/network.overrides deleted file mode 100644 index e857d5b5f1..0000000000 --- a/target/linux/package/base-files/files/x86-2.4/etc/network.overrides +++ /dev/null @@ -1,26 +0,0 @@ -# NVRAM overrides -# -# This file handles the NVRAM quirks of various hardware. -# THIS FILE IS NOT A REPLACEMENT FOR NVRAM - -# Load sysconf defaults -[ -f /etc/sysconf ] && . /etc/sysconf - -DEFAULT_lan_proto="static" -DEFAULT_lan_ifname="br0" -DEFAULT_lan_ifnames="eth0" -DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} -DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} -DEFAULT_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"} - -# failsafe if reset is held -[ "$FAILSAFE" = "true" ] && { - echo "### YOU ARE IN FAILSAFE MODE ####" - lan_ifname=${DEFAULT_lan_proto} - lan_ifnames=${FAILSAFE_ifnames:-${DEFAULT_lan_ifnames}} - lan_ipaddr=$DEFAULT_lan_ipaddr - lan_netmask=$DEFAULT_lan_netmask - lan_hwaddr=$DEFAULT_lan_hwaddr - wan_ifname="none" - wifi_ifname="none" -} diff --git a/target/linux/package/base-files/files/x86-2.6/etc/network.overrides b/target/linux/package/base-files/files/x86-2.6/etc/network.overrides deleted file mode 100644 index e857d5b5f1..0000000000 --- a/target/linux/package/base-files/files/x86-2.6/etc/network.overrides +++ /dev/null @@ -1,26 +0,0 @@ -# NVRAM overrides -# -# This file handles the NVRAM quirks of various hardware. -# THIS FILE IS NOT A REPLACEMENT FOR NVRAM - -# Load sysconf defaults -[ -f /etc/sysconf ] && . /etc/sysconf - -DEFAULT_lan_proto="static" -DEFAULT_lan_ifname="br0" -DEFAULT_lan_ifnames="eth0" -DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} -DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} -DEFAULT_lan_hwaddr=${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"} - -# failsafe if reset is held -[ "$FAILSAFE" = "true" ] && { - echo "### YOU ARE IN FAILSAFE MODE ####" - lan_ifname=${DEFAULT_lan_proto} - lan_ifnames=${FAILSAFE_ifnames:-${DEFAULT_lan_ifnames}} - lan_ipaddr=$DEFAULT_lan_ipaddr - lan_netmask=$DEFAULT_lan_netmask - lan_hwaddr=$DEFAULT_lan_hwaddr - wan_ifname="none" - wifi_ifname="none" -} -- cgit v1.2.3 From 818b3556538e2a8abb681de491450479bbccebaf Mon Sep 17 00:00:00 2001 From: mbm Date: Tue, 9 May 2006 23:19:52 +0000 Subject: convert to new template git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3744 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Config.in | 10 ---------- package/dnsmasq/Makefile | 35 +++++++++++++++++----------------- package/dnsmasq/ipkg/dnsmasq.conffiles | 1 - package/dnsmasq/ipkg/dnsmasq.control | 4 ---- 4 files changed, 18 insertions(+), 32 deletions(-) delete mode 100644 package/dnsmasq/Config.in delete mode 100644 package/dnsmasq/ipkg/dnsmasq.conffiles delete mode 100644 package/dnsmasq/ipkg/dnsmasq.control (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in deleted file mode 100644 index b20bf73620..0000000000 --- a/package/dnsmasq/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_DNSMASQ - prompt "dnsmasq........................... Lightweight DNS and DHCP server" - tristate - default y - help - A lightweight DNS and DHCP server. It is intended to provide - coupled DNS and DHCP service to a LAN. - - http://www.thekelleys.org.uk/dnsmasq/ - diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 88bd9f21b9..19c6d35627 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -5,32 +5,33 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_VERSION:=2.27 PKG_RELEASE:=1 -PKG_MD5SUM:=489198ec87101087043adc98bbe062dc -PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq +PKG_MD5SUM:=489198ec87101087043adc98bbe062dc PKG_CAT:=zcat include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,DNSMASQ,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \ - BINDIR=/usr/sbin MANDIR=/usr/man - touch $@ - -$(IPKG_DNSMASQ): +define Package/dnsmasq +SECTION:=base +CATEGORY:=Network +DEFAULT:=y +TITLE:=A lightweight DNS and DHCP server +DESCRIPTION:=A lightweight DNS and DHCP server. It is intended to provide \\\ +coupled DNS and DHCP service to a LAN. +URL:=http://www.thekelleys.org.uk/dnsmasq/ +endef + +define Package/dnsmasq/install install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/ - $(STRIP) $(IDIR_DNSMASQ)/usr/sbin/* install -d -m0755 $(IDIR_DNSMASQ)/etc/init.d/ + install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(IDIR_DNSMASQ)/usr/sbin/ install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf install -m0755 ./files/dnsmasq.init $(IDIR_DNSMASQ)/etc/init.d/S50dnsmasq + $(RSTRIP) $(IDIR_DNSMASQ) $(IPKG_BUILD) $(IDIR_DNSMASQ) $(PACKAGE_DIR) +endef +$(eval $(call BuildPackage,dnsmasq)) diff --git a/package/dnsmasq/ipkg/dnsmasq.conffiles b/package/dnsmasq/ipkg/dnsmasq.conffiles deleted file mode 100644 index e30eba8f66..0000000000 --- a/package/dnsmasq/ipkg/dnsmasq.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/dnsmasq.conf diff --git a/package/dnsmasq/ipkg/dnsmasq.control b/package/dnsmasq/ipkg/dnsmasq.control deleted file mode 100644 index 6f61edc656..0000000000 --- a/package/dnsmasq/ipkg/dnsmasq.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: dnsmasq -Priority: essential -Section: net -Description: A lightweight DNS and DHCP server -- cgit v1.2.3 From 2b42215e7af143bc9c1734cfc551e28a27a91af5 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 10 May 2006 19:06:22 +0000 Subject: Convert packages to new template git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3752 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/bridge/Makefile | 6 +- package/busybox/Makefile | 1 - package/dnsmasq/Makefile | 6 +- package/dropbear/Config.in | 14 -- package/dropbear/Makefile | 53 ++++--- package/dropbear/ipkg/dropbear.control | 4 - package/dropbear/ipkg/dropbearconvert.control | 5 - package/ebtables/Makefile | 2 - package/haserl/Config.in | 9 -- package/haserl/Makefile | 59 ++------ package/haserl/ipkg/haserl.control | 4 - package/ipkg/Config.in | 18 --- package/ipkg/Makefile | 67 --------- package/ipkg/ipkg/ipkg.control | 16 -- package/iproute2/Config.in | 21 --- package/iproute2/Makefile | 58 ++++--- package/iproute2/ipkg/ip.control | 4 - package/iproute2/ipkg/tc.control | 5 - package/ipsec-tools/Config.in | 11 -- package/ipsec-tools/Makefile | 41 +++-- package/ipsec-tools/ipkg/ipsec-tools.conffiles | 1 - package/ipsec-tools/ipkg/ipsec-tools.control | 5 - package/ipset/Makefile | 1 - package/iptables/Config.in | 167 --------------------- package/iptables/ipkg/iptables.conffiles | 2 - package/mtd/Config.in | 15 -- package/mtd/Makefile | 35 ++--- package/mtd/ipkg/mtd-static.control | 4 - package/mtd/ipkg/mtd.control | 4 - package/nvram/Config.in | 8 - package/nvram/Makefile | 34 ++--- package/nvram/ipkg/nvram.control | 5 - package/pcmcia-cs/Config.in | 17 --- package/pcmcia-cs/Makefile | 41 +++-- package/pcmcia-cs/ipkg/pcmcia-utils.conffiles | 10 -- package/pcmcia-cs/ipkg/pcmcia-utils.control | 5 - package/pptp/Makefile | 36 ++--- package/robocfg/Config.in | 7 - package/robocfg/Makefile | 26 ++-- package/robocfg/ipkg/robocfg.control | 4 - package/rules.mk | 1 + package/udev/Config.in | 11 -- package/udev/Makefile | 48 +++--- package/udev/ipkg/udev.conffiles | 1 - package/udev/ipkg/udev.control | 4 - package/wificonf/Makefile | 26 ++-- package/wireless-tools/Config.in | 7 - package/wireless-tools/Makefile | 40 +++-- package/wireless-tools/ipkg/wireless-tools.control | 4 - package/zlib/Config.in | 9 -- package/zlib/Makefile | 31 ++-- package/zlib/ipkg/zlib.control | 4 - 52 files changed, 255 insertions(+), 762 deletions(-) delete mode 100644 package/dropbear/Config.in delete mode 100644 package/dropbear/ipkg/dropbear.control delete mode 100644 package/dropbear/ipkg/dropbearconvert.control delete mode 100644 package/haserl/Config.in delete mode 100644 package/haserl/ipkg/haserl.control delete mode 100644 package/ipkg/Config.in delete mode 100644 package/ipkg/Makefile delete mode 100644 package/ipkg/ipkg/ipkg.control delete mode 100644 package/iproute2/Config.in delete mode 100644 package/iproute2/ipkg/ip.control delete mode 100644 package/iproute2/ipkg/tc.control delete mode 100644 package/ipsec-tools/Config.in delete mode 100644 package/ipsec-tools/ipkg/ipsec-tools.conffiles delete mode 100644 package/ipsec-tools/ipkg/ipsec-tools.control delete mode 100644 package/iptables/Config.in delete mode 100644 package/iptables/ipkg/iptables.conffiles delete mode 100644 package/mtd/Config.in delete mode 100644 package/mtd/ipkg/mtd-static.control delete mode 100644 package/mtd/ipkg/mtd.control delete mode 100644 package/nvram/Config.in delete mode 100644 package/nvram/ipkg/nvram.control delete mode 100644 package/pcmcia-cs/Config.in delete mode 100644 package/pcmcia-cs/ipkg/pcmcia-utils.conffiles delete mode 100644 package/pcmcia-cs/ipkg/pcmcia-utils.control delete mode 100644 package/robocfg/Config.in delete mode 100644 package/robocfg/ipkg/robocfg.control delete mode 100644 package/udev/Config.in delete mode 100644 package/udev/ipkg/udev.conffiles delete mode 100644 package/udev/ipkg/udev.control delete mode 100644 package/wireless-tools/Config.in delete mode 100644 package/wireless-tools/ipkg/wireless-tools.control delete mode 100644 package/zlib/Config.in delete mode 100644 package/zlib/ipkg/zlib.control (limited to 'package/dnsmasq/Makefile') diff --git a/package/bridge/Makefile b/package/bridge/Makefile index bd71165b6d..44856c9f16 100644 --- a/package/bridge/Makefile +++ b/package/bridge/Makefile @@ -30,10 +30,8 @@ $(call Build/Configure/Default,--with-linux-headers=$(LINUX_DIR)) endef define Package/busybox/install - mkdir -p $(IDIR_BRIDGE)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/ - $(STRIP) $(IDIR_BRIDGE)/usr/sbin/brctl - $(IPKG_BUILD) $(IDIR_BRIDGE) $(PACKAGE_DIR) + install -m0755 -d $(IDIR_DNSMASQ)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/ endef $(eval $(call BuildPackage,bridge)) diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 3f061b82db..23dcc1cf8d 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -33,7 +33,6 @@ endef define Package/busybox/install $(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(1)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install - $(STRIP) $(1)/bin/busybox endef $(eval $(call BuildPackage,busybox)) diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 19c6d35627..76b1ac0d99 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -25,13 +25,11 @@ URL:=http://www.thekelleys.org.uk/dnsmasq/ endef define Package/dnsmasq/install - install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin - install -d -m0755 $(IDIR_DNSMASQ)/etc/init.d/ + install -m0755 -d $(IDIR_DNSMASQ)/usr/sbin + install -m0755 -d $(IDIR_DNSMASQ)/etc/init.d/ install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(IDIR_DNSMASQ)/usr/sbin/ install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf install -m0755 ./files/dnsmasq.init $(IDIR_DNSMASQ)/etc/init.d/S50dnsmasq - $(RSTRIP) $(IDIR_DNSMASQ) - $(IPKG_BUILD) $(IDIR_DNSMASQ) $(PACKAGE_DIR) endef $(eval $(call BuildPackage,dnsmasq)) diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in deleted file mode 100644 index efdc70b1a6..0000000000 --- a/package/dropbear/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_DROPBEAR - prompt "dropbear.......................... Small SSH 2 client/server" - tristate - default y - help - A small SSH 2 server/client designed for small memory environments. - - http://matt.ucc.asn.au/dropbear/ - -config BR2_PACKAGE_DBCONVERT - prompt "dropbearconvert................. Utility for converting SSH keys" - tristate - default m if CONFIG_DEVEL - depends BR2_PACKAGE_DROPBEAR diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 75eaf6e44c..ea452f2f62 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -5,20 +5,33 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear PKG_VERSION:=0.48.1 PKG_RELEASE:=1 -PKG_MD5SUM:=ca8e53a766faec831882831364568421 -PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/ +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/ +PKG_MD5SUM:=ca8e53a766faec831882831364568421 PKG_CAT:=zcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +define Package/dropbear +SECTION:=base +CATEGORY:=Base system +DEFAULT:=y +TITLE:=Small SSH 2 client/server +DESCRIPTION:=A small SSH 2 server/client designed for small memory environments. +URL:=http://matt.ucc.asn.au/dropbear/ +endef -$(PKG_BUILD_DIR)/.configured: +define Package/dropbearconvert +$(call Package/dropbear) +DEFAULT:=m +TITLE:=Utility for converting SSH keys +DESCRIPTION:=Utility for converting SSH keys +DEPENDS:=zlib +endef + +define Build/Configure $(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h $(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(PKG_BUILD_DIR)/options.h (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ @@ -61,9 +74,9 @@ $(PKG_BUILD_DIR)/.configured: --disable-pututxline \ --disable-zlib \ ); - touch $@ +endef -$(PKG_BUILD_DIR)/.built: +define Buid/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ LD=$(TARGET_CC) \ PROGRAMS="dropbear dbclient dropbearkey scp" \ @@ -71,24 +84,26 @@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ LD=$(TARGET_CC) \ PROGRAMS="dropbearconvert" - touch $@ +endef -$(IPKG_DBCONVERT): - mkdir -p $(IDIR_DBCONVERT)/usr/bin - install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \ - $(IDIR_DBCONVERT)/usr/bin/dropbearconvert - $(IPKG_BUILD) $(IDIR_DBCONVERT) $(PACKAGE_DIR) - -$(IPKG_DROPBEAR): +define Package/dropbear/install mkdir -p $(IDIR_DROPBEAR)/usr/bin mkdir -p $(IDIR_DROPBEAR)/usr/sbin install -m 755 $(PKG_BUILD_DIR)/dropbearmulti \ $(IDIR_DROPBEAR)/usr/sbin/dropbear - $(STRIP) $(IDIR_DROPBEAR)/usr/sbin/dropbear ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/scp ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/ssh ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dbclient ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey mkdir -p $(IDIR_DROPBEAR)/etc/init.d install -m 755 ./files/S50dropbear $(IDIR_DROPBEAR)/etc/init.d/ - $(IPKG_BUILD) $(IDIR_DROPBEAR) $(PACKAGE_DIR) +endef + +define Package/dropbearconvert/install + mkdir -p $(IDIR_DBCONVERT)/usr/bin + install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \ + $(IDIR_DBCONVERT)/usr/bin/dropbearconvert +endef + +$(eval $(call BuildPackage,dropbear)) +$(eval $(call BuildPackage,dropbearconvert)) diff --git a/package/dropbear/ipkg/dropbear.control b/package/dropbear/ipkg/dropbear.control deleted file mode 100644 index 0aa8cc5b82..0000000000 --- a/package/dropbear/ipkg/dropbear.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: dropbear -Priority: optional -Section: net -Description: a small SSH 2 server/client designed for small memory environments. diff --git a/package/dropbear/ipkg/dropbearconvert.control b/package/dropbear/ipkg/dropbearconvert.control deleted file mode 100644 index 9dd5ecd1aa..0000000000 --- a/package/dropbear/ipkg/dropbearconvert.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: dropbearconvert -Priority: optional -Depends: zlib -Section: net -Description: Utility for converting SSH keys diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index 04adbf6e82..e672ac13c1 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -26,8 +26,6 @@ endef define Package/ebtables/install install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin install -m0755 $(PKG_BUILD_DIR)/ebtables $(IDIR_EBTABLES)/usr/sbin/ebtables - $(RSTRIP) $(IDIR_EBTABLES) - $(IPKG_BUILD) $(IDIR_EBTABLES) $(PACKAGE_DIR) ended $(eval $(call BuildPackage,ebtables)) diff --git a/package/haserl/Config.in b/package/haserl/Config.in deleted file mode 100644 index a766be73ff..0000000000 --- a/package/haserl/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HASERL - prompt "haserl............................ A CGI wrapper to embed shell scripts in HTML documents" - tristate - default m if CONFIG_DEVEL - help - A CGI wrapper to embed shell scripts in HTML documents. - - http://haserl.sourceforge.net/ - diff --git a/package/haserl/Makefile b/package/haserl/Makefile index 05c6b47b1e..8f35fbf623 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -5,57 +5,26 @@ include $(TOPDIR)/rules.mk PKG_NAME:=haserl PKG_VERSION:=0.8.0 PKG_RELEASE:=1 -PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea -PKG_SOURCE_URL:=@SF/haserl +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/haserl +PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea 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,HASERL,haserl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -DMAX_UPLOAD_KB=8192" \ - ./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) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install - touch $@ +define Package/haserl +SECTION:=base +# CATEGORY:=FIXME +TITLE:=A CGI wrapper to embed shell scripts in HTML documents +DESCRIPTION:=A CGI wrapper to embed shell scripts in HTML documents. +URL:=http://haserl.sourceforge.net/ +endef -$(IPKG_HASERL): +define Package/haserl/install install -m0755 -d $(IDIR_HASERL)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/haserl $(IDIR_HASERL)/usr/bin/ - $(RSTRIP) $(IDIR_HASERL) - $(IPKG_BUILD) $(IDIR_HASERL) $(PACKAGE_DIR) + install -m0755 $(PKG_INSTALL_DIR)/usr/bin/haserl $(IDIR_HASERL)/usr/bin/ +endef +$(eval $(call BuildPackage,haserl)) diff --git a/package/haserl/ipkg/haserl.control b/package/haserl/ipkg/haserl.control deleted file mode 100644 index 0243b6d754..0000000000 --- a/package/haserl/ipkg/haserl.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: haserl -Priority: optional -Section: web -Description: a CGI wrapper to embed shell scripts in HTML documents diff --git a/package/ipkg/Config.in b/package/ipkg/Config.in deleted file mode 100644 index 4cbd295001..0000000000 --- a/package/ipkg/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_IPKG - prompt "ipkg.............................. The itsy package management system" - tristate - default n if BUSYBOX_CONFIG_IPKG - default y if ! BUSYBOX_CONFIG_IPKG - help - Lightweight package management system - ipkg is the Itsy Package Management System, for handling - installation and removal of packages on a system. It can - recursively follow dependencies and download all packages - necessary to install a particular package. - - ipkg knows how to install both .ipk and .deb packages. - - ipkg is intended to serve the same functions (and more) for - Familiar that dpkg and apt serve for Debian, (while taking - up much less space). - diff --git a/package/ipkg/Makefile b/package/ipkg/Makefile deleted file mode 100644 index 3dddcc5556..0000000000 --- a/package/ipkg/Makefile +++ /dev/null @@ -1,67 +0,0 @@ -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ipkg -PKG_VERSION:=0.99.154 -PKG_RELEASE:=1 -PKG_MD5SUM:=b60aeea3b86cecf0eb26b161d122fbcc - -PKG_SOURCE_URL:=http://www.handhelds.org/packages/ipkg \ - http://www.gtlib.gatech.edu/pub/handhelds.org/packages/ipkg \ - http://ftp.gwdg.de/pub/linux/handhelds/packages/ipkg -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,IPKG,ipkg,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/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) \ - CC=$(TARGET_CC) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install - touch $@ - -$(IPKG_IPKG): - install -d -m0755 $(IDIR_IPKG)/bin - $(CP) $(PKG_INSTALL_DIR)/bin/ipkg-cl $(IDIR_IPKG)/bin/ipkg - install -d -m0755 $(IDIR_IPKG)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipkg.so.* $(IDIR_IPKG)/usr/lib/ - $(RSTRIP) $(IDIR_IPKG) - $(IPKG_BUILD) $(IDIR_IPKG) $(PACKAGE_DIR) diff --git a/package/ipkg/ipkg/ipkg.control b/package/ipkg/ipkg/ipkg.control deleted file mode 100644 index 7bf87d1dd6..0000000000 --- a/package/ipkg/ipkg/ipkg.control +++ /dev/null @@ -1,16 +0,0 @@ -Package: ipkg -Section: base -Priority: required -Essential: yes -Description: lightweight package management system - ipkg is the Itsy Package Management System, for handling - installation and removal of packages on a system. It can - recursively follow dependencies and download all packages - necessary to install a particular package. - . - ipkg knows how to install both .ipk and .deb packages. - . - ipkg is intended to serve the same functions (and more) for - Familiar that dpkg and apt serve for Debian, (while taking - up much less space). - diff --git a/package/iproute2/Config.in b/package/iproute2/Config.in deleted file mode 100644 index 349e3b7df2..0000000000 --- a/package/iproute2/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -menu "iproute2.......................... A collection of utilites for controlling TCP/IP networking and Traffic Control" - -config BR2_COMPILE_IPROUTE2 - tristate - default n - depends BR2_PACKAGE_IPROUTE2_IP || BR2_PACKAGE_IPROUTE2_TC - -config BR2_PACKAGE_IP - prompt "ip.............................. A routing control utility" - tristate - default m if CONFIG_DEVEL - select BR2_COMPILE_IPROUTE2 - -config BR2_PACKAGE_TC - prompt "tc.............................. A traffic control utility" - tristate - default m if CONFIG_DEVEL - select BR2_COMPILE_IPROUTE2 - select BR2_PACKAGE_KMOD_SCHED - -endmenu diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index f829293f4a..0fe03bc825 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -5,19 +5,38 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 PKG_VERSION:=2.6.15-060110 PKG_RELEASE:=1 -PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5 -PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/ +PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5 PKG_CAT:=zcat include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,IP,ip,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,TC,tc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +# define Package/iproute2 +# SECTION:=base +# CATEGORY:=Network +# DEFAULT:=n +# MENU:=1 +# TITLE:=A collection of utilites for controlling TCP/IP networking and Traffic Control +# endef + +define Package/ip +SECTION:=base +CATEGORY:=Network +DEFAULT:=n +DEPENDS:=iproute2 +TITLE:=A routing control utility +endef + +define Package/tc +$(call Package/ip) +# DEPENDS:=kmod-sched +TITLE:=A traffic control utility +endef -$(PKG_BUILD_DIR)/.configured: +define Build/Configure $(SED) "s:-O2:${TARGET_CFLAGS}:g" $(PKG_BUILD_DIR)/Makefile $(SED) "s,-I/usr/include/db3,," $(PKG_BUILD_DIR)/Makefile $(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \ @@ -27,22 +46,23 @@ $(PKG_BUILD_DIR)/.configured: # For now disable compiling of the misc directory because it seems to fail rm -rf $(PKG_BUILD_DIR)/misc $(SED) "s, misc,," $(PKG_BUILD_DIR)/Makefile - touch $@ +endef -$(PKG_BUILD_DIR)/.built: +define Build/Compile $(MAKE) -j1 -C $(PKG_BUILD_DIR)/netem HOSTCC=$(HOSTCC) CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -I ../include -DRESOLVE_HOSTNAMES" $(MAKE) -j1 -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc ip/ip - touch $@ +endef -$(IPKG_IP): - mkdir -p $(IDIR_IP)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/ip/ip $(IDIR_IP)/usr/sbin/ - $(STRIP) $(IDIR_IP)/usr/sbin/* - $(IPKG_BUILD) $(IDIR_IP) $(PACKAGE_DIR) +define Package/ip/install + install -d -m0755 $(IDIR_IP)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/ip/ip $(IDIR_IP)/usr/sbin/ +endef -$(IPKG_TC): - mkdir -p $(IDIR_TC)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/tc/tc $(IDIR_TC)/usr/sbin/ - $(STRIP) $(IDIR_TC)/usr/sbin/* - $(IPKG_BUILD) $(IDIR_TC) $(PACKAGE_DIR) +define Package/tc/install + install -d -m0755 $(IDIR_TC)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/tc/tc $(IDIR_TC)/usr/sbin/ +endef +# $(eval $(call BuildPackage,iproute2)) +# $(eval $(call BuildPackage,ip)) +# $(eval $(call BuildPackage,tc)) diff --git a/package/iproute2/ipkg/ip.control b/package/iproute2/ipkg/ip.control deleted file mode 100644 index 8206dd37a0..0000000000 --- a/package/iproute2/ipkg/ip.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: ip -Section: net -Priority: optional -Description: iproute2 routing control utility diff --git a/package/iproute2/ipkg/tc.control b/package/iproute2/ipkg/tc.control deleted file mode 100644 index 8950da394d..0000000000 --- a/package/iproute2/ipkg/tc.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: tc -Section: net -Priority: optional -Description: iproute2 traffic control utility -Depends: kmod-sched diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in deleted file mode 100644 index bdd3e210f6..0000000000 --- a/package/ipsec-tools/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_IPSEC_TOOLS - prompt "ipsec-tools....................... IPsec management tools" - tristate - depends BR2_LINUX_2_6 - select BR2_PACKAGE_LIBOPENSSL - default m if CONFIG_DEVEL - help - IPsec management tools - - http://ipsec-tools.sourceforge.net/ - diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 06d49e9686..6d27397c0f 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -5,20 +5,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ipsec-tools PKG_VERSION:=0.6.4 PKG_RELEASE:=1 -PKG_MD5SUM:=d0242a943c82c0cbf28005966ff35e21 -PKG_SOURCE_URL:=@SF/ipsec-tools +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@SF/ipsec-tools +PKG_MD5SUM:=d0242a943c82c0cbf28005966ff35e21 PKG_CAT:=bzcat -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,IPSEC_TOOLS,ipsec-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +define Package/ipsec-tools +SECTION:=base +CATEGORY:=Network +DEFAULT:=y +TITLE:=IPsec management tools +DESCRIPTION:=IPsec management tools +URL:=http://ipsec-tools.sourceforge.net/ +endef -$(PKG_BUILD_DIR)/.configured: +define Build/Configure (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \ touch configure.ac; \ touch aclocal.m4; \ @@ -59,27 +64,19 @@ $(PKG_BUILD_DIR)/.configured: --without-libradius \ --without-libpam \ ); - touch $@ +endef -$(PKG_BUILD_DIR)/.built: - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - CFLAGS="$(TARGET_CFLAGS) -Wall" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install - touch $@ - -$(IPKG_IPSEC_TOOLS): +define Package/ipsec-tools/install install -d -m0755 $(IDIR_IPSEC_TOOLS)/etc - $(CP) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(IDIR_IPSEC_TOOLS)/etc/ install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/lib/ + install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(IDIR_IPSEC_TOOLS)/etc/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ - install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/sbin $(CP) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(IDIR_IPSEC_TOOLS)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(IDIR_IPSEC_TOOLS)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(IDIR_IPSEC_TOOLS)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(IDIR_IPSEC_TOOLS)/usr/sbin/ - $(RSTRIP) $(IDIR_IPSEC_TOOLS) - $(IPKG_BUILD) $(IDIR_IPSEC_TOOLS) $(PACKAGE_DIR) +endef + +$(eval $(call BuildPackage,ipsec-tools)) diff --git a/package/ipsec-tools/ipkg/ipsec-tools.conffiles b/package/ipsec-tools/ipkg/ipsec-tools.conffiles deleted file mode 100644 index 434045463a..0000000000 --- a/package/ipsec-tools/ipkg/ipsec-tools.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/racoon.conf diff --git a/package/ipsec-tools/ipkg/ipsec-tools.control b/package/ipsec-tools/ipkg/ipsec-tools.control deleted file mode 100644 index c1cade10bd..0000000000 --- a/package/ipsec-tools/ipkg/ipsec-tools.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: ipsec-tools -Priority: optional -Section: net -Depends: libopenssl -Description: IPsec management tools diff --git a/package/ipset/Makefile b/package/ipset/Makefile index ffaabc6fe9..c938819799 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -28,7 +28,6 @@ define Package/ipset/install $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR=$(IDIR_IPSET) PREFIX=/usr install rm -rf $(IDIR_IPSET)/usr/man - $(IPKG_BUILD) $(IDIR_IPSET) $(PACKAGE_DIR) endef $(eval $(call BuildPackage,ipset)) diff --git a/package/iptables/Config.in b/package/iptables/Config.in deleted file mode 100644 index 6a2a85616b..0000000000 --- a/package/iptables/Config.in +++ /dev/null @@ -1,167 +0,0 @@ -menu "iptables.......................... IPv4 / IPv6 firewall administration" - -config BR2_COMPILE_IPTABLES - bool - default n - depends BR2_PACKAGE_IPTABLES || BR2_PACKAGE_IP6TABLES - -config BR2_PACKAGE_IPTABLES - prompt "iptables.......................... IPv4 firewall administration tool" - tristate - default y - select BR2_COMPILE_IPTABLES - help - IPv4 firewall, NAT, and packet mangling tools. - - http://www.iptables.org/ - -config BR2_PACKAGE_IPTABLES_EXTRA - prompt "iptables-extra.................. Extra Iptables extensions for IPv4 firewalling (meta-package)" - tristate - default m if CONFIG_DEVEL - depends BR2_PACKAGE_IPTABLES - select BR2_PACKAGE_KMOD_IPTABLES_EXTRA - select BR2_PACKAGE_IPTABLES_MOD_CONNTRACK - select BR2_PACKAGE_IPTABLES_MOD_EXTRA - select BR2_PACKAGE_IPTABLES_MOD_FILTER - select BR2_PACKAGE_IPTABLES_MOD_IMQ - select BR2_PACKAGE_IPTABLES_MOD_IPOPT - select BR2_PACKAGE_IPTABLES_MOD_IPSEC - select BR2_PACKAGE_IPTABLES_MOD_NAT - select BR2_PACKAGE_IPTABLES_MOD_ULOG - help - Extra Iptables extensions for IPv4 firewalling (meta-package) - -config BR2_PACKAGE_IPTABLES_MOD_CONNTRACK - prompt "iptables-mod-conntrack.......... Iptables extensions for connection tracking" - tristate - default m if CONFIG_DEVEL - depends BR2_PACKAGE_IPTABLES - select BR2_PACKAGE_KMOD_IPT_CONNTRACK - help - Iptables (IPv4) extensions for connection tracking - - Includes: - * libipt_conntrack - * libipt_helper - * libipt_connmark/CONNMARK - -config BR2_PACKAGE_IPTABLES_MOD_FILTER - prompt "iptables-mod-filter............. Iptables extension for packet content inspection" - tristate - default m if CONFIG_DEVEL - depends BR2_PACKAGE_IPTABLES - select BR2_PACKAGE_KMOD_IPT_FILTER - help - Iptables (IPv4) extension for packet content inspection - - Includes: - * libipt_ipp2p - * libipt_layer7 - -config BR2_PACKAGE_IPTABLES_MOD_IMQ - prompt "iptables-mod-imq................ Iptables extensions for Intermediate Queuing Device QoS-support" - tristate - default m if CONFIG_DEVEL - depends BR2_PACKAGE_IPTABLES - select BR2_PACKAGE_KMOD_IMQ - help - Iptables (IPv4) extensions for Intermediate Queuing Device QoS-support - - Includes: - * libipt_IMQ - -config BR2_PACKAGE_IPTABLES_MOD_IPOPT - prompt "iptables-mod-ipopt.............. Iptables extensions for matching/changing IP packet options" - tristate - default m if CONFIG_DEVEL - depends BR2_PACKAGE_IPTABLES - select BR2_PACKAGE_KMOD_IPT_IPOPT - help - Extra Iptables (IPv4) extensions for matching/changing IP packet options - - Includes: - * libipt_dscp/DSCP - * libipt_ecn/ECN - * libipt_length - * libipt_mac - * libipt_tos/TOS - * libipt_tcpmms - * libipt_ttl/TTL - * libipt_unclean - -config BR2_PACKAGE_IPTABLES_MOD_IPSEC - prompt "iptables-mod-ipsec.............. Iptables extensions for matching special IPsec packets" - tristate - default m if CONFIG_DEVEL - depends BR2_PACKAGE_IPTABLES - select BR2_PACKAGE_KMOD_IPT_IPSEC - help - Iptables (IPv4) extensions for matching special IPsec packets - - Includes: - * libipt_ah - * libipt_esp - -config BR2_PACKAGE_IPTABLES_MOD_NAT - prompt "iptables-mod-nat................ Iptables extensions for different NAT targets" - tristate - default m if CONFIG_DEVEL - depends BR2_PACKAGE_IPTABLES - select BR2_PACKAGE_KMOD_IPT_NAT - help - Iptables (IPv4) extensions for different NAT targets - - Includes: - * libipt_REDIRECT - -config BR2_PACKAGE_IPTABLES_MOD_ULOG - prompt "iptables-mod-ulog............... Iptables extensions for user-space packet logging" - tristate - default m if CONFIG_DEVEL - depends BR2_PACKAGE_IPTABLES - select BR2_PACKAGE_KMOD_IPT_ULOG - help - Iptables (IPv4) extensions for user-space packet logging - - Includes: - * libipt_ULOG - -config BR2_PACKAGE_IPTABLES_MOD_EXTRA - prompt "iptables-mod-extra.............. Other extra Iptables extensions" - tristate - default m if CONFIG_DEVEL - depends BR2_PACKAGE_IPTABLES - select BR2_PACKAGE_KMOD_IPT_EXTRA - help - Other extra Iptables (IPv4) extensions - - Includes: - * libipt_limit - * libipt_owner - * libipt_physdev - * libipt_pkttype - * libipt_recent - -config BR2_PACKAGE_IPTABLES_UTILS - prompt "iptables-utils.................. Save and restore utilities" - tristate - default m if CONFIG_DEVEL - depends BR2_PACKAGE_IPTABLES - help - iptables-save and iptables-restore for Iptables (IPv4) - - http://www.iptables.org/ - -config BR2_PACKAGE_IP6TABLES - prompt "ip6tables......................... IPv6 firewall administration tool" - tristate - default m if CONFIG_DEVEL - select BR2_COMPILE_IPTABLES - select BR2_PACKAGE_KMOD_IPV6 - help - IPv6 firewall, NAT, and packet mangling tools. - - http://www.iptables.org/ - -endmenu diff --git a/package/iptables/ipkg/iptables.conffiles b/package/iptables/ipkg/iptables.conffiles deleted file mode 100644 index 06194ca679..0000000000 --- a/package/iptables/ipkg/iptables.conffiles +++ /dev/null @@ -1,2 +0,0 @@ -/etc/config/firewall -/etc/firewall.user diff --git a/package/mtd/Config.in b/package/mtd/Config.in deleted file mode 100644 index 5420dff561..0000000000 --- a/package/mtd/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_MTD - prompt "mtd............................... Update utility for trx firmware images" - tristate - default y - help - Update utility for trx firmware images. - -config BR2_PACKAGE_MTD_STATIC - prompt "mtd-static........................ Update utility for trx firmware images (statically linked)" - tristate - default n - help - Update utility for trx firmware images (statically linked). To update - from other firmware or older OpenWrt releases. - diff --git a/package/mtd/Makefile b/package/mtd/Makefile index 61e7e74c23..381184b1d3 100644 --- a/package/mtd/Makefile +++ b/package/mtd/Makefile @@ -9,29 +9,20 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,MTD,$(PKG_NAME),$(PKG_RELEASE),$(ARCH))) -$(eval $(call PKG_template,MTD_STATIC,mtd-static,$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.prepared: - mkdir -p $(PKG_BUILD_DIR) - touch $@ - -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: +define Package/mtd +SECTION:=base +CATEGORY:=Util +DEFAULT:=y +TITLE:=Update utility for trx firmware images +DESCRIPTION:=Update utility for trx firmware images. To update \\\ +from other firmware or older OpenWrt releases. +endef + +define Build/Compile $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/mtd mtd.c - $(TARGET_CC) -static $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/mtd-static mtd.c - touch $@ +endef -$(IPKG_MTD): +define Package/mtd/install install -d -m0755 $(IDIR_MTD)/sbin install -m0755 $(PKG_BUILD_DIR)/mtd $(IDIR_MTD)/sbin - $(RSTRIP) $(IDIR_MTD)/sbin/* - $(IPKG_BUILD) $(IDIR_MTD) $(PACKAGE_DIR) - -$(IPKG_MTD_STATIC): - install -d -m0755 $(IDIR_MTD_STATIC)/sbin - install -m0755 $(PKG_BUILD_DIR)/mtd-static $(IDIR_MTD_STATIC)/sbin - $(RSTRIP) $(IDIR_MTD_STATIC)/sbin/* - $(IPKG_BUILD) $(IDIR_MTD_STATIC) $(PACKAGE_DIR) +endef diff --git a/package/mtd/ipkg/mtd-static.control b/package/mtd/ipkg/mtd-static.control deleted file mode 100644 index ded243a8bc..0000000000 --- a/package/mtd/ipkg/mtd-static.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: mtd-static -Priority: optional -Section: sys -Description: Tool for modifying the flash chip (statically linked) diff --git a/package/mtd/ipkg/mtd.control b/package/mtd/ipkg/mtd.control deleted file mode 100644 index 3145581c9b..0000000000 --- a/package/mtd/ipkg/mtd.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: mtd -Priority: optional -Section: sys -Description: Tool for modifying the flash chip diff --git a/package/nvram/Config.in b/package/nvram/Config.in deleted file mode 100644 index be4138275f..0000000000 --- a/package/nvram/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_NVRAM - prompt "nvram............................. Broadcom config utility" - tristate - default y - depends BR2_LINUX_2_4_BRCM - help - control utility for broadcom's 'nvram' config area - diff --git a/package/nvram/Makefile b/package/nvram/Makefile index dd460fc06d..762eb58183 100644 --- a/package/nvram/Makefile +++ b/package/nvram/Makefile @@ -9,30 +9,26 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.prepared: +define Package/nvram +SECTION:=base +# CATEGORY:=FIXME +DEFAULT:=n +TITLE:=Broadcom config utility +DESCRIPTION:=control utility for broadcom's 'nvram' config area +endef + +define Build/Prepare mkdir -p $(PKG_BUILD_DIR) $(CP) ./src/* $(PKG_BUILD_DIR) - touch $@ - -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include" - touch $@ +endef $(IPKG_NVRAM): - mkdir -p $(IDIR_NVRAM)/usr/lib +define Package/nvram/install + install -d -m0755 $(IDIR_NVRAM)/usr/lib + install -d -m0755 $(IDIR_NVRAM)/usr/sbin $(CP) $(PKG_BUILD_DIR)/*.so $(IDIR_NVRAM)/usr/lib - mkdir -p $(IDIR_NVRAM)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin - $(RSTRIP) $(IDIR_NVRAM) - $(IPKG_BUILD) $(IDIR_NVRAM) $(PACKAGE_DIR) - + install -m0755 $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin +endef compile-targets: install-dev install-dev: $(PKG_BUILD_DIR)/.built diff --git a/package/nvram/ipkg/nvram.control b/package/nvram/ipkg/nvram.control deleted file mode 100644 index c7ea64d19c..0000000000 --- a/package/nvram/ipkg/nvram.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: nvram -Priority: optional -Section: sys -Description: NVRAM utility and libraries for Broadcom hardware - diff --git a/package/pcmcia-cs/Config.in b/package/pcmcia-cs/Config.in deleted file mode 100644 index afcfa39ffd..0000000000 --- a/package/pcmcia-cs/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_COMPILE_PCMCIA_CS - tristate - default n - depends BR2_PACKAGE_PCMCIA_UTILS - -config BR2_PACKAGE_PCMCIA_UTILS - prompt "pcmcia-utils...................... PCMCIA/Cardbus management utilities" - tristate - depends BR2_LINUX_PCMCIA_SUPPORT - select BR2_COMPILE_PCMCIA_CS - select BR2_PACKAGE_KMOD_PCMCIA_CORE - default m if CONFIG_DEVEL - help - PCMCIA/Cardbus management utilities - - http://pcmcia-cs.sourceforge.net/ - diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile index b99633a5fa..a9c7ba8001 100644 --- a/package/pcmcia-cs/Makefile +++ b/package/pcmcia-cs/Makefile @@ -5,20 +5,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcmcia-cs PKG_VERSION:=3.2.8 PKG_RELEASE:=1 -PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5 -PKG_SOURCE_URL:=@SF/$(PKG_NAME) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/$(PKG_NAME) +PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5 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,PCMCIA_UTILS,pcmcia-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +define Package/pcmcia-cs +SECTION:=base +# CATEGORY:=FIXME +DEFAULT:=n +TITLE:=PCMCIA/Cardbus management utilities +DESCRIPTION:=PCMCIA/Cardbus management utilities +URL:=http://pcmcia-cs.sourceforge.net/ +endef -$(PKG_BUILD_DIR)/.configured: +define Build/Configure ( cd $(PKG_BUILD_DIR); \ ./Configure \ --noprompt \ @@ -35,22 +40,14 @@ $(PKG_BUILD_DIR)/.configured: --nox11 \ --sysv --rcdir="/etc" \ ) - touch $@ - -$(PKG_BUILD_DIR)/.built: - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - CFLAGS="$(TARGET_CFLAGS)" \ - all install - touch $@ +endef -$(IPKG_PCMCIA_UTILS): +define Package/pcmcia-cs/install install -m0755 -d $(IDIR_PCMCIA_UTILS)/etc - $(CP) $(PKG_INSTALL_DIR)/etc/pcmcia $(IDIR_PCMCIA_UTILS)/etc/ install -m0755 -d $(IDIR_PCMCIA_UTILS)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/sbin/cardctl $(IDIR_PCMCIA_UTILS)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/cardmgr $(IDIR_PCMCIA_UTILS)/usr/sbin/ - $(RSTRIP) $(IDIR_PCMCIA_UTILS) - $(IPKG_BUILD) $(IDIR_PCMCIA_UTILS) $(PACKAGE_DIR) + install -m0644 $(PKG_INSTALL_DIR)/etc/pcmcia $(IDIR_PCMCIA_UTILS)/etc/ + install -m0755 $(PKG_INSTALL_DIR)/sbin/cardctl $(IDIR_PCMCIA_UTILS)/usr/sbin/ + install -m0755 $(PKG_INSTALL_DIR)/sbin/cardmgr $(IDIR_PCMCIA_UTILS)/usr/sbin/ +endef +$(eval $(call BuildPackage,pcmcia-cs)) diff --git a/package/pcmcia-cs/ipkg/pcmcia-utils.conffiles b/package/pcmcia-cs/ipkg/pcmcia-utils.conffiles deleted file mode 100644 index 04ca204799..0000000000 --- a/package/pcmcia-cs/ipkg/pcmcia-utils.conffiles +++ /dev/null @@ -1,10 +0,0 @@ -/etc/pcmcia/config.opts -/etc/pcmcia/ftl.opts -/etc/pcmcia/ide.opts -/etc/pcmcia/ieee1394.opts -/etc/pcmcia/memory.opts -/etc/pcmcia/network.opts -/etc/pcmcia/parport.opts -/etc/pcmcia/scsi.opts -/etc/pcmcia/serial.opts -/etc/pcmcia/wireless.opts diff --git a/package/pcmcia-cs/ipkg/pcmcia-utils.control b/package/pcmcia-cs/ipkg/pcmcia-utils.control deleted file mode 100644 index ba760a61ba..0000000000 --- a/package/pcmcia-cs/ipkg/pcmcia-utils.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: pcmcia-utils -Priority: optional -Section: sys -Depends: kmod-pcmcia-core -Description: PCMCIA/Cardbus management utilities diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 870341c87d..de7c50c2d4 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -5,34 +5,30 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pptp PKG_VERSION:=1.6.0 PKG_RELEASE:=3 -PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 -PKG_SOURCE_URL:=@SF/pptpclient +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/pptpclient +PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 PKG_CAT:=zcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,PPTP,pptp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +define Package/pptp +SECTION:=base +# CATEGORY:=FIXME +TITLE:=PPTP (Point-to-Point Tunneling Protocol) client +DESCRIPTION:=A Point-to-Point Tunneling Protocol Client +URL:=http://pptpclient.sourceforge.net/ +endef -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) \ - CFLAGS="$(TARGET_CFLAGS)" \ - all - touch $@ - -$(IPKG_PPTP): +define Package/pptp/install install -d -m0755 $(IDIR_PPTP)/sbin - install -m0755 ./files/ifup.pptp $(IDIR_PPTP)/sbin/ifup.pptp install -d -m0755 $(IDIR_PPTP)/etc/ppp - install -m0644 ./files/options.pptp $(IDIR_PPTP)/etc/ppp/ install -d -m0755 $(IDIR_PPTP)/usr/sbin + install -m0755 ./files/ifup.pptp $(IDIR_PPTP)/sbin/ifup.pptp + install -m0644 ./files/options.pptp $(IDIR_PPTP)/etc/ppp/ install -m0755 $(PKG_BUILD_DIR)/pptp $(IDIR_PPTP)/usr/sbin/ - $(RSTRIP) $(IDIR_PPTP) - $(IPKG_BUILD) $(IDIR_PPTP) $(PACKAGE_DIR) +endef + +$(eval $(call BuildPackage,pptp)) diff --git a/package/robocfg/Config.in b/package/robocfg/Config.in deleted file mode 100644 index db90c8b113..0000000000 --- a/package/robocfg/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_ROBOCFG - prompt "robocfg........................... BCM5325E/536x switch configuration utility" - tristate - default m if CONFIG_DEVEL - help - Broadcom BCM5325E/536x switch configuration utility - diff --git a/package/robocfg/Makefile b/package/robocfg/Makefile index 54daea8e86..194c022a41 100644 --- a/package/robocfg/Makefile +++ b/package/robocfg/Makefile @@ -10,21 +10,23 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/robocfg include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,ROBOCFG,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.prepared: - mkdir -p $(PKG_BUILD_DIR) - touch $@ - -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: +define Package/robocfg +SECTION:=base +# CATEGORY:=FIXME +DEFAULT:=n +TITLE:=BCM5325E/536x switch configuration utility +DESCRIPTION:=Broadcom BCM5325E/536x switch configuration utility +endef + +define Build/Compile $(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/robocfg robocfg.c - touch $@ +endef -$(IPKG_ROBOCFG): +define Package/robocfg/install install -d -m0755 $(IDIR_ROBOCFG)/sbin install -m0755 $(PKG_BUILD_DIR)/robocfg $(IDIR_ROBOCFG)/sbin/ $(RSTRIP) $(IDIR_ROBOCFG) $(IPKG_BUILD) $(IDIR_ROBOCFG) $(PACKAGE_DIR) +endef + +$(eval $(call BuildPackage,robocfg)) diff --git a/package/robocfg/ipkg/robocfg.control b/package/robocfg/ipkg/robocfg.control deleted file mode 100644 index 0d8b54c975..0000000000 --- a/package/robocfg/ipkg/robocfg.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: robocfg -Priority: optional -Section: net -Description: Broadcom BCM5325E/536x switch configuration utility diff --git a/package/rules.mk b/package/rules.mk index 2acc2b80fd..fe68b07707 100644 --- a/package/rules.mk +++ b/package/rules.mk @@ -146,6 +146,7 @@ $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built $(call Package/$(1)/install,$$(IDIR_$(1))) mkdir -p $(PACKAGE_DIR) + $(RSTRIP) $$(IDIR_$(1)) $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) $$(INFO_$(1)): $$(IPKG_$(1)) diff --git a/package/udev/Config.in b/package/udev/Config.in deleted file mode 100644 index e9601d10c6..0000000000 --- a/package/udev/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_UDEV - prompt "udev.............................. Dynamic device management subsystem" - tristate - default m if CONFIG_DEVEL - select BR2_COMPILE_UTIL_LINUX - help - udev provides a dynamic device directory containing only the files for - actually present devices. It creates or removes device node files in - the /dev directory, or it renames network interfaces. - - http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html diff --git a/package/udev/Makefile b/package/udev/Makefile index 39d79b4c01..9b7c9171ae 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -7,54 +7,44 @@ PKG_VERSION:=077 PKG_RELEASE:=1 PKG_MD5SUM:=61ec646daf7795e9777e8f33975408fe +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \ http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \ ftp://ftp.de.kernel.org/pub/linux/utils/kernel/hotplug/ \ http://ftp.de.kernel.org/pub/linux/utils/kernel/hotplug/ \ ftp://ftp.fr.kernel.org/pub/linux/utils/kernel/hotplug/ \ http://ftp.fr.kernel.org/pub/linux/utils/kernel/hotplug/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_CAT:=bzcat -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,UDEV,udev,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - CROSS="$(TARGET_CROSS)" \ - STRIP="/bin/true" \ - OPTFLAGS="$(TARGET_CFLAGS)" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - INSTALL="install -c" \ - all install - touch $@ - -$(IPKG_UDEV): +define Package/udev +SECTION:=base +# CATEGORY:=FIXME +DEFAULT:=n +TITLE:=Dynamic device management subsystem +DESCRIPTION:=udev provides a dynamic device directory containing only the files for \\\ +actually present devices. It creates or removes device node files in \\\ +the /dev directory, or it renames network interfaces. \\\ +URL:=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +endef + +define Package/udev/install install -d -m0775 $(IDIR_UDEV)/etc/udev - $(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(IDIR_UDEV)/etc/udev/ install -d -m0775 $(IDIR_UDEV)/lib/udev install -d -m0775 $(IDIR_UDEV)/sbin/ + install -d -m0775 $(IDIR_UDEV)/usr/bin/ + install -d -m0775 $(IDIR_UDEV)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(IDIR_UDEV)/etc/udev/ $(CP) $(PKG_INSTALL_DIR)/sbin/udev $(IDIR_UDEV)/sbin/ $(CP) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(IDIR_UDEV)/sbin/ $(CP) $(PKG_INSTALL_DIR)/sbin/udevd $(IDIR_UDEV)/sbin/ $(CP) $(PKG_INSTALL_DIR)/sbin/udevsend $(IDIR_UDEV)/sbin/ $(CP) $(PKG_INSTALL_DIR)/sbin/udevstart $(IDIR_UDEV)/sbin/ - install -d -m0775 $(IDIR_UDEV)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(IDIR_UDEV)/usr/bin/ $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(IDIR_UDEV)/usr/bin/ - install -d -m0775 $(IDIR_UDEV)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(IDIR_UDEV)/usr/sbin/ - $(RSTRIP) $(IDIR_UDEV) - $(IPKG_BUILD) $(IDIR_UDEV) $(PACKAGE_DIR) +endef -mostlyclean: - -$(MAKE) -C $(PKG_BUILD_DIR) clean - rm -f $(PKG_BUILD_DIR)/.built +$(eval $(call BuildPackage,udev)) diff --git a/package/udev/ipkg/udev.conffiles b/package/udev/ipkg/udev.conffiles deleted file mode 100644 index 50a5fb8891..0000000000 --- a/package/udev/ipkg/udev.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/udev/udev.conf diff --git a/package/udev/ipkg/udev.control b/package/udev/ipkg/udev.control deleted file mode 100644 index 7ca98a0aab..0000000000 --- a/package/udev/ipkg/udev.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: udev -Priority: optional -Section: base -Description: Dynamic device management subsystem diff --git a/package/wificonf/Makefile b/package/wificonf/Makefile index 5f8c9a03a6..5e5c667af4 100644 --- a/package/wificonf/Makefile +++ b/package/wificonf/Makefile @@ -9,21 +9,19 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/wificonf include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,WIFICONF,$(PKG_NAME),$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.prepared: - mkdir -p $@ - touch $@ - -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: +define Package/wificonf +SECTION:=base +CATEGORY:=Network +DEFAULT:=y +TITLE:=replacement utility for wlconf +DESCRIPTION:=Replacement utility for wlconf +endef + +define Build/Compile $(TARGET_CC) $(TARGET_CFLAGS) -Iinclude/ -I$(STAGING_DIR)/usr/include -o $(PKG_BUILD_DIR)/wifi wificonf.c -L$(STAGING_DIR)/usr/lib -lnvram -lshared $(STAGING_DIR)/usr/lib/libiw.so - touch $@ +endef -$(IPKG_WIFICONF): +define Package/wificonf/install install -d -m0755 $(IDIR_WIFICONF)/sbin install -m0755 $(PKG_BUILD_DIR)/wifi $(IDIR_WIFICONF)/sbin/ - $(RSTRIP) $(IDIR_WIFICONF) - $(IPKG_BUILD) $(IDIR_WIFICONF) $(PACKAGE_DIR) +endef diff --git a/package/wireless-tools/Config.in b/package/wireless-tools/Config.in deleted file mode 100644 index deed30fda0..0000000000 --- a/package/wireless-tools/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_WIRELESS_TOOLS - prompt "wireless-tools.................... Tools for manipulating Linux Wireless Extensions" - tristate - default y - help - Tools for configuring Wireless Adapters implementing the "Wireless Extension" - diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index 8d1da1990a..f981f7b5b6 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -5,23 +5,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wireless-tools PKG_VERSION:=28 PKG_RELEASE:=1 -PKG_MD5SUM:=599c94497f9c9073c7b052d3dcb7cd16 -PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux +PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28 PKG_SOURCE:=wireless_tools.$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux +PKG_MD5SUM:=599c94497f9c9073c7b052d3dcb7cd16 PKG_CAT:=zcat -PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28 -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,WIRELESS_TOOLS,wireless-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +define Package/wireless-tools +SECTION:=base +CATEGORY:=Network +DEFAULT:=y +TITLE:=Tools for manipulating Linux Wireless Extensions +DESCRIPTION:=Tools for configuring Wireless Adapters implementing the "Wireless Extension" +URL:=http://hplabs.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html +endef -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured +define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \ libiw.so.28 iwmulticall @@ -31,15 +33,14 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \ INSTALL_LIB="$(PKG_INSTALL_DIR)/usr/lib" \ install-iwmulticall - touch $@ +endef -$(IPKG_WIRELESS_TOOLS): - mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/ - mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/sbin - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/ - $(RSTRIP) $(IDIR_WIRELESS_TOOLS) - $(IPKG_BUILD) $(IDIR_WIRELESS_TOOLS) $(PACKAGE_DIR) +define Package/wireless-tools/install + install -d -m0755 $(IDIR_WIRELESS_TOOLS)/usr/lib + install -d -m0755 $(IDIR_WIRELESS_TOOLS)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/ + install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/ +endef install-dev: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/{lib,include} @@ -50,6 +51,3 @@ install-dev: $(PKG_BUILD_DIR)/.built uninstall-dev: rm -f $(STAGING_DIR)/usr/lib/libiw.* rm -f $(STAGING_DIR)/usr/include/{iwlib,wireless}.h - -compile-targets: install-dev -clean-targets: uninstall-dev diff --git a/package/wireless-tools/ipkg/wireless-tools.control b/package/wireless-tools/ipkg/wireless-tools.control deleted file mode 100644 index 5f472d958d..0000000000 --- a/package/wireless-tools/ipkg/wireless-tools.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: wireless-tools -Priority: optional -Section: net -Description: Tools for setting up WiFi cards using the Wireless Extension diff --git a/package/zlib/Config.in b/package/zlib/Config.in deleted file mode 100644 index 4b96d94153..0000000000 --- a/package/zlib/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_ZLIB - prompt "zlib.............................. Library implementing the deflate compression method" - tristate - default m if CONFIG_DEVEL - help - A library implementing the 'deflate' compression method - - http://www.zlib.net/ - diff --git a/package/zlib/Makefile b/package/zlib/Makefile index cfd82800a8..aaa3f4d429 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -5,21 +5,28 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zlib PKG_VERSION:=1.2.3 PKG_RELEASE:=3 -PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.zlib.net \ @SF/zlib -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6 PKG_CAT:=bzcat -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,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +define Package/zlib +SECTION:=base +CATEGORY:=Libraries +DEFAULT:=n +TITLE:=Library implementing the deflate compression method +DESCRIPTION:=A library implementing the 'deflate' compression method +URL:=http://www.zlib.net/ +endef -$(PKG_BUILD_DIR)/.configured: +define Build/Configure (cd $(PKG_BUILD_DIR); \ $(TARGET_CONFIGURE_OPTS) \ LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \ @@ -28,9 +35,9 @@ $(PKG_BUILD_DIR)/.configured: --prefix=/usr \ --shared \ ); - touch $@ +endef -$(PKG_BUILD_DIR)/.built: +define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \ @@ -39,13 +46,12 @@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ install - touch $@ +endef -$(IPKG_ZLIB): +define Package/zlib/install install -m0755 -d $(IDIR_ZLIB)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/ - $(RSTRIP) $(IDIR_ZLIB) - $(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR) +endef $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built mkdir -p $(STAGING_DIR)/usr/include @@ -60,6 +66,3 @@ uninstall-dev: rm -rf $(STAGING_DIR)/usr/include/zconf.h rm -rf $(STAGING_DIR)/usr/include/zlib.h rm -rf $(STAGING_DIR)/usr/lib/libz.* - -compile-targets: install-dev -clean-targets: uninstall-dev diff --git a/package/zlib/ipkg/zlib.control b/package/zlib/ipkg/zlib.control deleted file mode 100644 index 35fcac26e5..0000000000 --- a/package/zlib/ipkg/zlib.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: zlib -Priority: optional -Section: libs -Description: an implementation of the deflate compression method (library) -- cgit v1.2.3 From 44ba04efe200178dd52943b2c1edd8418fbac0ba Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 11 May 2006 16:00:43 +0000 Subject: replace $(IDIR_*) with $(1) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3759 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/bridge/Makefile | 6 +++--- package/dnsmasq/Makefile | 10 +++++----- package/dropbear/Makefile | 22 +++++++++++----------- package/ebtables/Makefile | 4 ++-- package/haserl/Makefile | 4 ++-- package/iproute2/Makefile | 8 ++++---- package/ipsec-tools/Makefile | 20 ++++++++++---------- package/ipset/Makefile | 4 ++-- package/mtd/Makefile | 4 ++-- package/nvram/Makefile | 9 ++++----- package/pcmcia-cs/Makefile | 10 +++++----- package/pptp/Makefile | 12 ++++++------ package/robocfg/Makefile | 8 ++++---- package/udev/Makefile | 28 ++++++++++++++-------------- package/wificonf/Makefile | 4 ++-- package/wireless-tools/Makefile | 8 ++++---- package/zlib/Makefile | 4 ++-- 17 files changed, 82 insertions(+), 83 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/bridge/Makefile b/package/bridge/Makefile index 44856c9f16..65fd8358e8 100644 --- a/package/bridge/Makefile +++ b/package/bridge/Makefile @@ -29,9 +29,9 @@ define Build/Configure $(call Build/Configure/Default,--with-linux-headers=$(LINUX_DIR)) endef -define Package/busybox/install - install -m0755 -d $(IDIR_DNSMASQ)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/ +define Package/bridge/install + install -m0755 -d $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/brctl/brctl $(1)/usr/sbin/ endef $(eval $(call BuildPackage,bridge)) diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 76b1ac0d99..d3ce64736b 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -25,11 +25,11 @@ URL:=http://www.thekelleys.org.uk/dnsmasq/ endef define Package/dnsmasq/install - install -m0755 -d $(IDIR_DNSMASQ)/usr/sbin - install -m0755 -d $(IDIR_DNSMASQ)/etc/init.d/ - install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(IDIR_DNSMASQ)/usr/sbin/ - install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf - install -m0755 ./files/dnsmasq.init $(IDIR_DNSMASQ)/etc/init.d/S50dnsmasq + install -m0755 -d $(1)/usr/sbin + install -m0755 -d $(1)/etc/init.d/ + install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(1)/usr/sbin/ + install -m0644 ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf + install -m0755 ./files/dnsmasq.init $(1)/etc/init.d/S50dnsmasq endef $(eval $(call BuildPackage,dnsmasq)) diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index ea452f2f62..133e67a9fa 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -87,22 +87,22 @@ define Buid/Compile endef define Package/dropbear/install - mkdir -p $(IDIR_DROPBEAR)/usr/bin - mkdir -p $(IDIR_DROPBEAR)/usr/sbin + mkdir -p $(1)/usr/bin + mkdir -p $(1)/usr/sbin install -m 755 $(PKG_BUILD_DIR)/dropbearmulti \ - $(IDIR_DROPBEAR)/usr/sbin/dropbear - ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/scp - ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/ssh - ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dbclient - ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey - mkdir -p $(IDIR_DROPBEAR)/etc/init.d - install -m 755 ./files/S50dropbear $(IDIR_DROPBEAR)/etc/init.d/ + $(1)/usr/sbin/dropbear + ln -sf ../sbin/dropbear $(1)/usr/bin/scp + ln -sf ../sbin/dropbear $(1)/usr/bin/ssh + ln -sf ../sbin/dropbear $(1)/usr/bin/dbclient + ln -sf ../sbin/dropbear $(1)/usr/bin/dropbearkey + mkdir -p $(1)/etc/init.d + install -m 755 ./files/S50dropbear $(1)/etc/init.d/ endef define Package/dropbearconvert/install - mkdir -p $(IDIR_DBCONVERT)/usr/bin + mkdir -p $(1)/usr/bin install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \ - $(IDIR_DBCONVERT)/usr/bin/dropbearconvert + $(1)/usr/bin/dropbearconvert endef $(eval $(call BuildPackage,dropbear)) diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index 4ee6833882..df551154e2 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -24,8 +24,8 @@ URL:=http://ebtables.sourceforge.net/ endef define Package/ebtables/install - install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/ebtables $(IDIR_EBTABLES)/usr/sbin/ebtables + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/ebtables $(1)/usr/sbin/ebtables endef $(eval $(call BuildPackage,ebtables)) diff --git a/package/haserl/Makefile b/package/haserl/Makefile index 8f35fbf623..2bb9fc9319 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -23,8 +23,8 @@ URL:=http://haserl.sourceforge.net/ endef define Package/haserl/install - install -m0755 -d $(IDIR_HASERL)/usr/bin - install -m0755 $(PKG_INSTALL_DIR)/usr/bin/haserl $(IDIR_HASERL)/usr/bin/ + install -m0755 -d $(1)/usr/bin + install -m0755 $(PKG_INSTALL_DIR)/usr/bin/haserl $(1)/usr/bin/ endef $(eval $(call BuildPackage,haserl)) diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 0fe03bc825..c670ee5dac 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -54,13 +54,13 @@ define Build/Compile endef define Package/ip/install - install -d -m0755 $(IDIR_IP)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/ip/ip $(IDIR_IP)/usr/sbin/ + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/ip/ip $(1)/usr/sbin/ endef define Package/tc/install - install -d -m0755 $(IDIR_TC)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/tc/tc $(IDIR_TC)/usr/sbin/ + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/tc/tc $(1)/usr/sbin/ endef # $(eval $(call BuildPackage,iproute2)) diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 6d27397c0f..9e14b40075 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -67,16 +67,16 @@ define Build/Configure endef define Package/ipsec-tools/install - install -d -m0755 $(IDIR_IPSEC_TOOLS)/etc - install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/lib/ - install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(IDIR_IPSEC_TOOLS)/etc/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(IDIR_IPSEC_TOOLS)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(IDIR_IPSEC_TOOLS)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(IDIR_IPSEC_TOOLS)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(IDIR_IPSEC_TOOLS)/usr/sbin/ + install -d -m0755 $(1)/etc + install -d -m0755 $(1)/usr/lib/ + install -d -m0755 $(1)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(1)/etc/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(1)/usr/sbin/ endef $(eval $(call BuildPackage,ipsec-tools)) diff --git a/package/ipset/Makefile b/package/ipset/Makefile index c938819799..3b65a7d37d 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -26,8 +26,8 @@ endef define Package/ipset/install $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR=$(IDIR_IPSET) PREFIX=/usr install - rm -rf $(IDIR_IPSET)/usr/man + DESTDIR=$(1) PREFIX=/usr install + rm -rf $(1)/usr/man endef $(eval $(call BuildPackage,ipset)) diff --git a/package/mtd/Makefile b/package/mtd/Makefile index 381184b1d3..0d684b8f49 100644 --- a/package/mtd/Makefile +++ b/package/mtd/Makefile @@ -23,6 +23,6 @@ define Build/Compile endef define Package/mtd/install - install -d -m0755 $(IDIR_MTD)/sbin - install -m0755 $(PKG_BUILD_DIR)/mtd $(IDIR_MTD)/sbin + install -d -m0755 $(1)/sbin + install -m0755 $(PKG_BUILD_DIR)/mtd $(1)/sbin endef diff --git a/package/nvram/Makefile b/package/nvram/Makefile index 762eb58183..3b9f82dbe0 100644 --- a/package/nvram/Makefile +++ b/package/nvram/Makefile @@ -22,12 +22,11 @@ define Build/Prepare $(CP) ./src/* $(PKG_BUILD_DIR) endef -$(IPKG_NVRAM): define Package/nvram/install - install -d -m0755 $(IDIR_NVRAM)/usr/lib - install -d -m0755 $(IDIR_NVRAM)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/*.so $(IDIR_NVRAM)/usr/lib - install -m0755 $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin + install -d -m0755 $(1)/usr/lib + install -d -m0755 $(1)/usr/sbin + $(CP) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib + install -m0755 $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin endef compile-targets: install-dev diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile index a9c7ba8001..c89ce2913f 100644 --- a/package/pcmcia-cs/Makefile +++ b/package/pcmcia-cs/Makefile @@ -43,11 +43,11 @@ define Build/Configure endef define Package/pcmcia-cs/install - install -m0755 -d $(IDIR_PCMCIA_UTILS)/etc - install -m0755 -d $(IDIR_PCMCIA_UTILS)/usr/sbin - install -m0644 $(PKG_INSTALL_DIR)/etc/pcmcia $(IDIR_PCMCIA_UTILS)/etc/ - install -m0755 $(PKG_INSTALL_DIR)/sbin/cardctl $(IDIR_PCMCIA_UTILS)/usr/sbin/ - install -m0755 $(PKG_INSTALL_DIR)/sbin/cardmgr $(IDIR_PCMCIA_UTILS)/usr/sbin/ + install -m0755 -d $(1)/etc + install -m0755 -d $(1)/usr/sbin + install -m0644 $(PKG_INSTALL_DIR)/etc/pcmcia $(1)/etc/ + install -m0755 $(PKG_INSTALL_DIR)/sbin/cardctl $(1)/usr/sbin/ + install -m0755 $(PKG_INSTALL_DIR)/sbin/cardmgr $(1)/usr/sbin/ endef $(eval $(call BuildPackage,pcmcia-cs)) diff --git a/package/pptp/Makefile b/package/pptp/Makefile index de7c50c2d4..776a668640 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -23,12 +23,12 @@ URL:=http://pptpclient.sourceforge.net/ endef define Package/pptp/install - install -d -m0755 $(IDIR_PPTP)/sbin - install -d -m0755 $(IDIR_PPTP)/etc/ppp - install -d -m0755 $(IDIR_PPTP)/usr/sbin - install -m0755 ./files/ifup.pptp $(IDIR_PPTP)/sbin/ifup.pptp - install -m0644 ./files/options.pptp $(IDIR_PPTP)/etc/ppp/ - install -m0755 $(PKG_BUILD_DIR)/pptp $(IDIR_PPTP)/usr/sbin/ + install -d -m0755 $(1)/sbin + install -d -m0755 $(1)/etc/ppp + install -d -m0755 $(1)/usr/sbin + install -m0755 ./files/ifup.pptp $(1)/sbin/ifup.pptp + install -m0644 ./files/options.pptp $(1)/etc/ppp/ + install -m0755 $(PKG_BUILD_DIR)/pptp $(1)/usr/sbin/ endef $(eval $(call BuildPackage,pptp)) diff --git a/package/robocfg/Makefile b/package/robocfg/Makefile index 194c022a41..8f89e75387 100644 --- a/package/robocfg/Makefile +++ b/package/robocfg/Makefile @@ -23,10 +23,10 @@ define Build/Compile endef define Package/robocfg/install - install -d -m0755 $(IDIR_ROBOCFG)/sbin - install -m0755 $(PKG_BUILD_DIR)/robocfg $(IDIR_ROBOCFG)/sbin/ - $(RSTRIP) $(IDIR_ROBOCFG) - $(IPKG_BUILD) $(IDIR_ROBOCFG) $(PACKAGE_DIR) + install -d -m0755 $(1)/sbin + install -m0755 $(PKG_BUILD_DIR)/robocfg $(1)/sbin/ + $(RSTRIP) $(1) + $(IPKG_BUILD) $(1) $(PACKAGE_DIR) endef $(eval $(call BuildPackage,robocfg)) diff --git a/package/udev/Makefile b/package/udev/Makefile index 9b7c9171ae..620aa1aedd 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -31,20 +31,20 @@ URL:=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html endef define Package/udev/install - install -d -m0775 $(IDIR_UDEV)/etc/udev - install -d -m0775 $(IDIR_UDEV)/lib/udev - install -d -m0775 $(IDIR_UDEV)/sbin/ - install -d -m0775 $(IDIR_UDEV)/usr/bin/ - install -d -m0775 $(IDIR_UDEV)/usr/sbin/ - $(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(IDIR_UDEV)/etc/udev/ - $(CP) $(PKG_INSTALL_DIR)/sbin/udev $(IDIR_UDEV)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(IDIR_UDEV)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/udevd $(IDIR_UDEV)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/udevsend $(IDIR_UDEV)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/sbin/udevstart $(IDIR_UDEV)/sbin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(IDIR_UDEV)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(IDIR_UDEV)/usr/bin/ - $(CP) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(IDIR_UDEV)/usr/sbin/ + install -d -m0775 $(1)/etc/udev + install -d -m0775 $(1)/lib/udev + install -d -m0775 $(1)/sbin/ + install -d -m0775 $(1)/usr/bin/ + install -d -m0775 $(1)/usr/sbin/ + $(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(1)/etc/udev/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udev $(1)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(1)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevd $(1)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevsend $(1)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/sbin/udevstart $(1)/sbin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(1)/usr/sbin/ endef $(eval $(call BuildPackage,udev)) diff --git a/package/wificonf/Makefile b/package/wificonf/Makefile index 5e5c667af4..5fbaf05231 100644 --- a/package/wificonf/Makefile +++ b/package/wificonf/Makefile @@ -22,6 +22,6 @@ define Build/Compile endef define Package/wificonf/install - install -d -m0755 $(IDIR_WIFICONF)/sbin - install -m0755 $(PKG_BUILD_DIR)/wifi $(IDIR_WIFICONF)/sbin/ + install -d -m0755 $(1)/sbin + install -m0755 $(PKG_BUILD_DIR)/wifi $(1)/sbin/ endef diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index f981f7b5b6..39a4ee6b66 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -36,10 +36,10 @@ define Build/Compile endef define Package/wireless-tools/install - install -d -m0755 $(IDIR_WIRELESS_TOOLS)/usr/lib - install -d -m0755 $(IDIR_WIRELESS_TOOLS)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/ - install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/ + install -d -m0755 $(1)/usr/lib + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/libiw.so.28 $(1)/usr/lib/ + install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(1)/usr/sbin/ endef install-dev: $(PKG_BUILD_DIR)/.built diff --git a/package/zlib/Makefile b/package/zlib/Makefile index d3c8714bac..56c0381f56 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -49,8 +49,8 @@ define Build/Compile endef define Package/zlib/install - install -m0755 -d $(IDIR_ZLIB)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/ + install -m0755 -d $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/ endef $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built -- cgit v1.2.3 From c69b4635d3107b5893387d493d79b976d419e475 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 18 Jun 2006 18:27:23 +0000 Subject: add conffiles, use proper optimization flags when building. git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3997 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index d3ce64736b..6efaf370a1 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -24,12 +24,24 @@ coupled DNS and DHCP service to a LAN. URL:=http://www.thekelleys.org.uk/dnsmasq/ endef +define Package/dnsmasq/conffiles +/etc/dnsmasq.conf +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ + BINDIR="/usr/sbin" MANDIR="/usr/man" \ + all +endef + define Package/dnsmasq/install - install -m0755 -d $(1)/usr/sbin - install -m0755 -d $(1)/etc/init.d/ - install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(1)/usr/sbin/ + install -m0755 -d $(1)/etc install -m0644 ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf + install -m0755 -d $(1)/etc/init.d install -m0755 ./files/dnsmasq.init $(1)/etc/init.d/S50dnsmasq + install -m0755 -d $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(1)/usr/sbin/ endef $(eval $(call BuildPackage,dnsmasq)) -- cgit v1.2.3 From 859e8f7f7d8bfbefd610d338d16498190cd51e15 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:16:37 +0000 Subject: build system cleanup. move shared include files into $(TOPDIR)/include, move lzma, mkfs.* into toolchain/ git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4032 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/image.mk | 77 ++++ include/kernel-build.mk | 125 +++++++ include/kernel.mk | 77 ++++ include/modules-2.4.mk | 320 ++++++++++++++++ include/modules-2.6.mk | 357 ++++++++++++++++++ include/netfilter.mk | 116 ++++++ include/package.mk | 300 +++++++++++++++ package/alsa/Makefile | 4 +- package/base-files/Makefile | 4 +- package/bridge/Makefile | 2 +- package/broadcom-wl/Makefile | 4 +- package/busybox/Makefile | 2 +- package/diag/Makefile | 4 +- package/dnsmasq/Makefile | 2 +- package/dropbear/Makefile | 2 +- package/ebtables/Makefile | 2 +- package/fuse/Makefile | 4 +- package/haserl/Makefile | 2 +- package/hostap/Makefile | 4 +- package/hostapd/Makefile | 2 +- package/iproute2/Makefile | 2 +- package/ipsec-tools/Makefile | 2 +- package/ipset/Makefile | 2 +- package/iptables/Makefile | 6 +- package/kernel.mk | 31 -- package/libpcap/Makefile | 2 +- package/linux-atm/Makefile | 2 +- package/madwifi/Makefile | 4 +- package/mini_fo/Makefile | 4 +- package/mtd/Makefile | 2 +- package/nvram/Makefile | 2 +- package/openssl/Makefile | 2 +- package/openswan/Makefile | 4 +- package/pcmcia-cs/Makefile | 2 +- package/ppp/Makefile | 2 +- package/pptp/Makefile | 2 +- package/robocfg/Makefile | 2 +- package/rules.mk | 300 --------------- package/shfs/Makefile | 4 +- package/spca5xx/Makefile | 4 +- package/switch/Makefile | 4 +- package/udev/Makefile | 2 +- package/ueagle-atm/Makefile | 4 +- package/util-linux/Makefile | 2 +- package/wireless-tools/Makefile | 2 +- package/wlcompat/Makefile | 4 +- package/zd1211/Makefile | 4 +- package/zlib/Makefile | 2 +- target/Makefile | 9 +- target/linux/Config.in | 4 +- target/linux/Makefile | 1 + target/linux/ar531x-2.4/Makefile | 5 +- target/linux/ar7-2.4/Makefile | 5 +- target/linux/aruba-2.6/Makefile | 7 +- target/linux/au1000-2.6/Makefile | 7 +- target/linux/brcm-2.4/Makefile | 5 +- target/linux/brcm-2.6/Makefile | 6 +- target/linux/generic-2.4/modules.mk | 320 ---------------- target/linux/generic-2.6/modules.mk | 357 ------------------ target/linux/image/ar7/Makefile | 2 +- target/linux/image/aruba/Makefile | 2 +- target/linux/image/au1000/Makefile | 2 +- target/linux/image/brcm/Makefile | 2 +- target/linux/image/generic/Makefile | 2 +- target/linux/image/image.mk | 55 --- target/linux/image/jffs2.mk | 30 -- target/linux/image/jffs2/Makefile | 29 -- target/linux/image/jffs2/patches/gcc4-fix.patch | 24 -- target/linux/image/rb532/Makefile | 2 +- target/linux/image/squashfs.mk | 25 -- target/linux/image/squashfs/Makefile | 27 -- target/linux/image/squashfs/patches/100-lzma.patch | 25 -- target/linux/image/tgz.mk | 3 - target/linux/image/x86/Makefile | 2 +- target/linux/image/xscale/Makefile | 2 +- target/linux/kernel.mk | 122 ------ target/linux/netfilter.mk | 116 ------ target/linux/rb532-2.6/Makefile | 6 +- target/linux/rules.mk | 85 ----- target/linux/sibyte-2.6/Makefile | 7 +- target/linux/x86-2.4/Makefile | 7 +- target/linux/x86-2.6/Makefile | 7 +- target/linux/xscale-2.6/Makefile | 7 +- target/lzma/Makefile | 53 --- target/lzma/lzma-zlib.patch | 408 --------------------- toolchain/Makefile | 3 +- toolchain/jffs2/Makefile | 29 ++ toolchain/jffs2/patches/100-gcc4_fix.patch | 24 ++ toolchain/lzma/Makefile | 53 +++ toolchain/lzma/patches/100-lzma_zlib.patch | 408 +++++++++++++++++++++ toolchain/squashfs/Makefile | 27 ++ toolchain/squashfs/patches/100-lzma.patch | 25 ++ 92 files changed, 2031 insertions(+), 2131 deletions(-) create mode 100644 include/image.mk create mode 100644 include/kernel-build.mk create mode 100644 include/kernel.mk create mode 100644 include/modules-2.4.mk create mode 100644 include/modules-2.6.mk create mode 100644 include/netfilter.mk create mode 100644 include/package.mk delete mode 100644 package/kernel.mk delete mode 100644 package/rules.mk delete mode 100644 target/linux/generic-2.4/modules.mk delete mode 100644 target/linux/generic-2.6/modules.mk delete mode 100644 target/linux/image/image.mk delete mode 100644 target/linux/image/jffs2.mk delete mode 100644 target/linux/image/jffs2/Makefile delete mode 100644 target/linux/image/jffs2/patches/gcc4-fix.patch delete mode 100644 target/linux/image/squashfs.mk delete mode 100644 target/linux/image/squashfs/Makefile delete mode 100644 target/linux/image/squashfs/patches/100-lzma.patch delete mode 100644 target/linux/image/tgz.mk delete mode 100644 target/linux/kernel.mk delete mode 100644 target/linux/netfilter.mk delete mode 100644 target/linux/rules.mk delete mode 100644 target/lzma/Makefile delete mode 100644 target/lzma/lzma-zlib.patch create mode 100644 toolchain/jffs2/Makefile create mode 100644 toolchain/jffs2/patches/100-gcc4_fix.patch create mode 100644 toolchain/lzma/Makefile create mode 100644 toolchain/lzma/patches/100-lzma_zlib.patch create mode 100644 toolchain/squashfs/Makefile create mode 100644 toolchain/squashfs/patches/100-lzma.patch (limited to 'package/dnsmasq/Makefile') diff --git a/include/image.mk b/include/image.mk new file mode 100644 index 0000000000..f30f0997ee --- /dev/null +++ b/include/image.mk @@ -0,0 +1,77 @@ +include $(TOPDIR)/rules.mk + +KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) + +ifneq ($(CONFIG_BIG_ENDIAN),y) +JFFS2OPTS := --pad --little-endian --squash +SQUASHFS_OPTS := -le +else +JFFS2OPTS := --pad --big-endian --squash +SQUASHFS_OPTS := -be +endif + +ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) + ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y) + define Image/mkfs/jffs2 + rm -rf $(BUILD_DIR)/root/jffs + + $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root + $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root + + $(call Image/Build,jffs2-64k) + $(call Image/Build,jffs2-128k) + endef + endif + + ifeq ($(CONFIG_TARGET_ROOTFS_SQUASHFS),y) + define Image/mkfs/squashfs + @mkdir -p $(BUILD_DIR)/root/jffs + $(STAGING_DIR)/bin/mksquashfs-lzma $(BUILD_DIR)/root $(KDIR)/root.squashfs -nopad -noappend -root-owned $(SQUASHFS_OPTS) + $(call Image/Build,squashfs) + endef + endif + + ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y) + define Image/mkfs/tgz + tar -zcf $(BIN_DIR)/openwrt-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ . + endef + endif +endif + +define Image/mkfs/prepare/default + find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644 + find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755 + find $(BUILD_DIR)/root -type d | xargs chmod 0755 + mkdir -p $(BUILD_DIR)/root/tmp + chmod 0777 $(BUILD_DIR)/root/tmp +endef + +define Image/mkfs/prepare + $(call Image/mkfs/prepare/default) +endef + +define BuildImage +compile: + $(call Build/Compile) + +install: + $(call Image/Prepare) + $(call Image/mkfs/prepare) + $(call Image/BuildKernel) + $(call Image/mkfs/jffs2) + $(call Image/mkfs/squashfs) + $(call Image/mkfs/tgz) + +clean: + $(call Build/Clean) +endef + +compile-targets: +install-targets: +clean-targets: + +source: +prepare: +compile: compile-targets +install: compile install-targets +clean: clean-targets diff --git a/include/kernel-build.mk b/include/kernel-build.mk new file mode 100644 index 0000000000..9fbbe4504c --- /dev/null +++ b/include/kernel-build.mk @@ -0,0 +1,125 @@ +include $(TOPDIR)/include/modules-$(KERNEL).mk + +LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 +LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ + http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ + http://www.kernel.org/pub/linux/kernel/v$(KERNEL) \ + http://www.de.kernel.org/pub/linux/kernel/v$(KERNEL) + +KERNEL_IDIR:=$(KERNEL_BUILD_DIR)/kernel-ipkg +KERNEL_IPKG:=$(KERNEL_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk +INSTALL_TARGETS += $(KERNEL_IPKG) + +$(TARGETS): $(PACKAGE_DIR) + +$(LINUX_DIR): + mkdir -p $@ + +$(PACKAGE_DIR): + mkdir -p $@ + +$(DL_DIR)/$(LINUX_SOURCE): + -mkdir -p $(DL_DIR) + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE) + +$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) + -mkdir -p $(KERNEL_BUILD_DIR) + bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS) - + touch $@ + +ifeq ($(KERNEL),2.4) +$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched + $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \ + $(LINUX_DIR)/Makefile \ + $(LINUX_DIR)/arch/*/Makefile + $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile + $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h + touch $@ + +$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) dep + touch $@ + +$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done +else +$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts + touch $@ +endif + +ramdisk-config: $(LINUX_DIR)/.configured FORCE + mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old + grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config +ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) + echo 'CONFIG_INITRAMFS_SOURCE="../../root"' >> $(LINUX_DIR)/.config + echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config + echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config + mkdir -p $(BUILD_DIR)/root/etc/init.d + $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/ +else + rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs + echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config +endif + +$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install ramdisk-config + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) + +$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux + $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ + touch -c $(LINUX_KERNEL) + +$(LINUX_DIR)/.modules_done: + rm -rf $(KERNEL_BUILD_DIR)/modules + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + touch $(LINUX_DIR)/.modules_done + +$(STAMP_DIR)/.linux-compile: + @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) + ln -sf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux + touch $@ + +$(KERNEL_IPKG): + rm -rf $(KERNEL_IDIR) + mkdir -p $(KERNEL_IDIR)/etc + $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) $(ARCH) + if [ -f ./config/$(BOARD).modules ]; then \ + cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \ + fi + $(IPKG_BUILD) $(KERNEL_IDIR) $(KERNEL_BUILD_DIR) + +$(TOPDIR)/.kernel.mk: + echo "BOARD:=$(BOARD)" > $@ + echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@ + echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ + +pkg-install: FORCE + @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; } + +source: $(DL_DIR)/$(LINUX_SOURCE) +prepare: + @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR) + @$(MAKE) $(LINUX_DIR)/.configured + +compile: prepare $(STAMP_DIR)/.linux-compile + +install: compile $(LINUX_KERNEL) + +mostlyclean: FORCE + rm -f $(STAMP_DIR)/.linux-compile + rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done + rm -f $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked + $(MAKE) -C $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) clean + rm -f $(LINUX_KERNEL) + +rebuild: FORCE + -$(MAKE) mostlyclean + if [ -f $(LINUX_KERNEL) ]; then \ + $(MAKE) clean; \ + fi + $(MAKE) compile $(MAKE_TRACE) + +clean: FORCE + rm -f $(STAMP_DIR)/.linux-compile + rm -rf $(KERNEL_BUILD_DIR) + rm -f $(TARGETS) diff --git a/include/kernel.mk b/include/kernel.mk new file mode 100644 index 0000000000..5c64ee4e12 --- /dev/null +++ b/include/kernel.mk @@ -0,0 +1,77 @@ +ifneq ($(DUMP),1) +include $(TOPDIR)/.kernel.mk + +KERNEL:=unknown +ifneq (,$(findstring 2.4.,$(LINUX_VERSION))) +KERNEL:=2.4 +LINUX_KMOD_SUFFIX=o +endif +ifneq (,$(findstring 2.6.,$(LINUX_VERSION))) +KERNEL:=2.6 +LINUX_KMOD_SUFFIX=ko +endif + +LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ + -e 's/mipsel/mips/' \ + -e 's/mipseb/mips/' \ + -e 's/powerpc/ppc/' \ + -e 's/sh[234]/sh/' \ + -e 's/armeb/arm/' \ +) + +KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) +LINUX_DIR := $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION) + +MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION) +MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR) +TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) +KMOD_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-modules + +LINUX_KERNEL:=$(KERNEL_BUILD_DIR)/vmlinux +endif + +# FIXME: remove this crap +define KMOD_template +ifeq ($$(strip $(4)),) +KDEPEND_$(1):=m +else +KDEPEND_$(1):=$($(4)) +endif + +IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)) $(foreach pkg,$(5),", $(pkg)") + +PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk +I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) + +ifeq ($$(KDEPEND_$(1)),m) +ifneq ($(CONFIG_PACKAGE_KMOD_$(1)),) +TARGETS += $$(PKG_$(1)) +endif +ifeq ($(CONFIG_PACKAGE_KMOD_$(1)),y) +INSTALL_TARGETS += $$(PKG_$(1)) +endif +endif + +$$(PKG_$(1)): $(LINUX_DIR)/.modules_done + rm -rf $$(I_$(1)) + $(SCRIPT_DIR)/make-ipkg-dir.sh $$(I_$(1)) ../control/kmod-$(2).control $(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) $(ARCH) + echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control +ifneq ($(strip $(3)),) + mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION) + $(CP) $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION) +endif +ifneq ($(6),) + mkdir -p $$(I_$(1))/etc/modules.d + for module in $(7); do \ + echo $$$$module >> $$(I_$(1))/etc/modules.d/$(6)-$(2); \ + done + echo "#!/bin/sh" >> $$(I_$(1))/CONTROL/postinst + echo "[ -z \"\$$$$IPKG_INSTROOT\" ] || exit" >> $$(I_$(1))/CONTROL/postinst + echo ". /etc/functions.sh" >> $$(I_$(1))/CONTROL/postinst + echo "load_modules /etc/modules.d/$(6)-$(2)" >> $$(I_$(1))/CONTROL/postinst + chmod 0755 $$(I_$(1))/CONTROL/postinst +endif + $(8) + $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) +endef + diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk new file mode 100644 index 0000000000..71864ad8eb --- /dev/null +++ b/include/modules-2.4.mk @@ -0,0 +1,320 @@ +include $(TOPDIR)/include/netfilter.mk + +# Networking + +$(eval $(call KMOD_template,ATM,atm,\ + $(MODULES_DIR)/kernel/net/atm/atm.o \ + $(MODULES_DIR)/kernel/net/atm/br2684.o \ +,CONFIG_ATM,,50,atm)) + +$(eval $(call KMOD_template,GRE,gre,\ + $(MODULES_DIR)/kernel/net/ipv4/ip_gre.o \ +,CONFIG_NET_IPGRE)) + +$(eval $(call KMOD_template,IMQ,imq,\ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.o \ + $(MODULES_DIR)/kernel/drivers/net/imq.o \ +)) +$(eval $(call KMOD_template,IPIP,ipip,\ + $(MODULES_DIR)/kernel/net/ipv4/ipip.o \ +,CONFIG_NET_IPIP,,60,ipip)) + +$(eval $(call KMOD_template,IPV6,ipv6,\ + $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \ +,CONFIG_IPV6,,20,ipv6)) + +$(eval $(call KMOD_template,PPP,ppp,\ + $(MODULES_DIR)/kernel/drivers/net/ppp_async.o \ + $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o \ + $(MODULES_DIR)/kernel/drivers/net/slhc.o \ + $(MODULES_DIR)/kernel/drivers/net/pppox.o \ +,CONFIG_PPP)) + +$(eval $(call KMOD_template,MPPE,mppe,\ + $(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.o \ +,CONFIG_PPP_MPPE_MPPC)) + +$(eval $(call KMOD_template,PPPOATM,pppoatm,\ + $(MODULES_DIR)/kernel/net/atm/pppoatm.o \ +,CONFIG_PPPOATM)) + +$(eval $(call KMOD_template,PPPOE,pppoe,\ + $(MODULES_DIR)/kernel/drivers/net/pppoe.o \ +,CONFIG_PPPOE)) + +$(eval $(call KMOD_template,SCHED,sched,\ + $(MODULES_DIR)/kernel/net/sched/*.o \ +)) + +$(eval $(call KMOD_template,TUN,tun,\ + $(MODULES_DIR)/kernel/drivers/net/tun.o \ +,CONFIG_TUN,,20,tun)) + +# Filtering / Firewalling + +$(eval $(call KMOD_template,ARPTABLES,arptables,\ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.o \ +,CONFIG_IP_NF_ARPTABLES)) + +$(eval $(call KMOD_template,EBTABLES,ebtables,\ + $(MODULES_DIR)/kernel/net/bridge/netfilter/*.o \ +,CONFIG_BRIDGE_NF_EBTABLES)) + +# metapackage for compatibility ... +$(eval $(call KMOD_template,IPTABLES_EXTRA,iptables-extra,\ +,,kmod-ipt-conntrack kmod-ipt-extra kmod-ipt-filter kmod-ipt-ipopt kmod-ipt-ipsec kmod-ipt-nat kmod-ipt-nat-extra kmod-ipt-queue kmod-ipt-ulogd)) + +$(eval $(call KMOD_template,IPT_CONNTRACK,ipt-conntrack,\ + $(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_EXTRA,ipt-extra,\ + $(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_FILTER,ipt-filter,\ + $(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_IPOPT,ipt-ipopt,\ + $(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\ + $(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_NAT,ipt-nat,\ + $(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_NAT_EXTRA,ipt-nat-extra,\ + $(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +,,,40,$(IPT_NAT_EXTRA-m))) + +$(eval $(call KMOD_template,IPT_QUEUE,ipt-queue,\ + $(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IPT_ULOG,ipt-ulog,\ + $(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ +)) + +$(eval $(call KMOD_template,IP6TABLES,ip6tables,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.o \ +,CONFIG_IP6_NF_IPTABLES,kmod-ipv6)) + + +# Block devices + +$(eval $(call KMOD_template,IDE,ide,\ + $(MODULES_DIR)/kernel/drivers/ide/*.o \ + $(MODULES_DIR)/kernel/drivers/ide/*/*.o \ +,CONFIG_IDE,,20,pdc202xx_old ide-core ide-detect ide-disk)) + +$(eval $(call KMOD_template,LOOP,loop,\ + $(MODULES_DIR)/kernel/drivers/block/loop.o \ +,CONFIG_BLK_DEV_LOOP,,20,loop)) + +$(eval $(call KMOD_template,NBD,nbd,\ + $(MODULES_DIR)/kernel/drivers/block/nbd.o \ +,CONFIG_BLK_DEV_NBD,,20,nbd)) + + +# Crypto + +ifneq ($(wildcard $(MODULES_DIR)/kernel/crypto/*.o),) +CONFIG_CRYPTO:=m +endif +$(eval $(call KMOD_template,CRYPTO,crypto,\ + $(MODULES_DIR)/kernel/crypto/*.o \ +,CONFIG_CRYPTO)) + + +# Filesystems + +$(eval $(call KMOD_template,FS_CIFS,fs-cifs,\ + $(MODULES_DIR)/kernel/fs/cifs/cifs.o \ +,CONFIG_CIFS,,30,cifs)) + +$(eval $(call KMOD_template,FS_MINIX,fs-minix,\ + $(MODULES_DIR)/kernel/fs/minix/*.o \ +,CONFIG_MINIX_FS,,30,minix)) + +$(eval $(call KMOD_template,FS_EXT2,fs-ext2,\ + $(MODULES_DIR)/kernel/fs/ext2/*.o \ +,CONFIG_EXT2_FS,,30,ext2)) + +$(eval $(call KMOD_template,FS_EXT3,fs-ext3,\ + $(MODULES_DIR)/kernel/fs/ext3/*.o \ + $(MODULES_DIR)/kernel/fs/jbd/*.o \ +,CONFIG_EXT3_FS,,30,jbd ext3)) + +$(eval $(call KMOD_template,FS_HFSPLUS,fs-hfsplus,\ + $(MODULES_DIR)/kernel/fs/hfsplus/*.o \ +,CONFIG_HFSPLUS_FS,,30,hfsplus)) + +$(eval $(call KMOD_template,FS_NFS,fs-nfs,\ + $(MODULES_DIR)/kernel/fs/lockd/*.o \ + $(MODULES_DIR)/kernel/fs/nfs/*.o \ + $(MODULES_DIR)/kernel/net/sunrpc/*.o \ +,CONFIG_NFS_FS,,30,sunrpc lockd nfs)) + +$(eval $(call KMOD_template,FS_VFAT,fs-vfat,\ + $(MODULES_DIR)/kernel/fs/vfat/vfat.o \ + $(MODULES_DIR)/kernel/fs/fat/fat.o \ +,CONFIG_VFAT_FS,,30,fat vfat)) + +$(eval $(call KMOD_template,FS_XFS,fs-xfs,\ + $(MODULES_DIR)/kernel/fs/xfs/*.o \ +,CONFIG_XFS_FS,,30,xfs)) + + +# Multimedia + +$(eval $(call KMOD_template,PWC,pwc,\ + $(MODULES_DIR)/kernel/drivers/usb/pwc.o \ +,CONFIG_USB_PWC,kmod-videodev,63,pwc)) + +$(eval $(call KMOD_template,SOUNDCORE,soundcore,\ + $(MODULES_DIR)/kernel/drivers/sound/soundcore.o \ +,CONFIG_SOUND,,30,soundcore)) + +$(eval $(call KMOD_template,VIDEODEV,videodev,\ + $(MODULES_DIR)/kernel/drivers/media/video/videodev.o \ +,CONFIG_VIDEO_DEV,,62,videodev)) + + +# Network devices + +$(eval $(call KMOD_template,NET_3C59X,net-3c59x,\ + $(MODULES_DIR)/kernel/drivers/net/3c59x.o \ +,CONFIG_VORTEX,,10,3c59x)) + +$(eval $(call KMOD_template,NET_8139TOO,net-8139too,\ + $(MODULES_DIR)/kernel/drivers/net/8139too.o \ + $(MODULES_DIR)/kernel/drivers/net/mii.o \ +,CONFIG_8139TOO,,10,mii 8139too)) + +$(eval $(call KMOD_template,NET_AIRO,net-airo,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/airo.o \ +,CONFIG_AIRO,,10,airo)) + +$(eval $(call KMOD_template,NET_E100,net-e100,\ + $(MODULES_DIR)/kernel/drivers/net/e100.o \ +,CONFIG_E100,,10,e100)) + +$(eval $(call KMOD_template,NET_HERMES,net-hermes,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.o \ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.o \ +,CONFIG_HERMES,,10,hermes orinoco)) + +$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-pci,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_pci.o \ +,CONFIG_PCI_HERMES,kmod-net-hermes,11,orinoco_pci)) + +$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-plx,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.o \ +,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx)) + +$(eval $(call KMOD_template,NET_NATSEMI,net-natsemi,\ + $(MODULES_DIR)/kernel/drivers/net/natsemi.o \ +,CONFIG_NATSEMI,,10,natsemi)) + +$(eval $(call KMOD_template,NET_PRISM54,net-prism54,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.o \ +,CONFIG_PRISM54,,10,prism54)) + + +# PCMCIA/CardBus + +$(eval $(call KMOD_template,PCMCIA_CORE,pcmcia-core,\ + $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.o \ + $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.o \ + $(MODULES_DIR)/kernel/drivers/pcmcia/ds.o \ +,CONFIG_PCMCIA,,50,pcmcia_core yenta_socket ds)) + +$(eval $(call KMOD_template,PCMCIA_SERIAL,pcmcia-serial,\ + $(MODULES_DIR)/kernel/drivers/char/pcmcia/serial_cs.o \ +,CONFIG_PCMCIA_SERIAL_CS,kmod-pcmcia-core,51,serial_cs)) + + +# USB + +$(eval $(call KMOD_template,USB,usb-core,\ + $(MODULES_DIR)/kernel/drivers/usb/usbcore.o \ +,CONFIG_USB,,50,usbcore)) + +$(eval $(call KMOD_template,USB_OHCI,usb-ohci,\ + $(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o \ +,CONFIG_USB_OHCI,kmod-usb-core,60,usb-ohci)) + +$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\ + $(MODULES_DIR)/kernel/drivers/usb/host/uhci.o \ +,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci)) + +$(eval $(call KMOD_template,USB2,usb2,\ + $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.o \ +,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd)) + +$(eval $(call KMOD_template,USB_ACM,usb-acm,\ + $(MODULES_DIR)/kernel/drivers/usb/acm.o \ +,CONFIG_USB_ACM)) + +$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\ + $(MODULES_DIR)/kernel/drivers/usb/audio.o \ +,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio)) + +$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\ + $(MODULES_DIR)/kernel/drivers/usb/printer.o \ +,CONFIG_USB_PRINTER,kmod-usb-core,60,printer)) + +$(eval $(call KMOD_template,USB_SERIAL,usb-serial,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.o \ +,CONFIG_USB_SERIAL,kmod-usb-core,60,usbserial)) + +$(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.o \ +,CONFIG_USB_SERIAL_BELKIN,kmod-usb-serial,61,belkin_sa)) + +$(eval $(call KMOD_template,USB_SERIAL_FTDI,usb-serial-ftdi,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.o \ +,CONFIG_USB_SERIAL_FTDI_SIO,kmod-usb-serial,61,ftdi_sio)) + +$(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.o \ +,CONFIG_USB_SERIAL_MCT_U232,kmod-usb-serial,61,mct_u232)) + +$(eval $(call KMOD_template,USB_SERIAL_PL2303,usb-serial-pl2303,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.o \ +,CONFIG_USB_SERIAL_PL2303,kmod-usb-serial,61,pl2303)) + +$(eval $(call KMOD_template,USB_SERIAL_VISOR,usb-serial-visor,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/visor.o \ +,CONFIG_USB_SERIAL_VISOR,kmod-usb-serial,61,visor)) + +$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\ + $(MODULES_DIR)/kernel/drivers/scsi/*.o \ + $(MODULES_DIR)/kernel/drivers/usb/storage/*.o \ +,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage)) + + +# Misc. devices + +$(eval $(call KMOD_template,AX25,ax25,\ + $(MODULES_DIR)/kernel/net/ax25/ax25.o \ + $(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.o \ +,CONFIG_AX25,,90,ax25 mkiss)) + +$(eval $(call KMOD_template,BLUETOOTH,bluetooth,\ + $(MODULES_DIR)/kernel/net/bluetooth/*.o \ + $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/*.o \ + $(MODULES_DIR)/kernel/drivers/bluetooth/*.o \ +,CONFIG_BLUEZ)) + +$(eval $(call KMOD_template,SOFTDOG,softdog,\ + $(MODULES_DIR)/kernel/drivers/char/softdog.o \ +,CONFIG_SOFT_WATCHDOG,,95,softdog)) + + + diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk new file mode 100644 index 0000000000..ec9f5da44f --- /dev/null +++ b/include/modules-2.6.mk @@ -0,0 +1,357 @@ +NF_2_6:=1 +include $(TOPDIR)/include/netfilter.mk + +# Networking + +$(eval $(call KMOD_template,ATM,atm,\ + $(MODULES_DIR)/kernel/net/atm/atm.ko \ + $(MODULES_DIR)/kernel/net/atm/br2684.ko \ + $(MODULES_DIR)/kernel/drivers/atm/atmtcp.ko \ +,CONFIG_ATM,,50,atm)) + +$(eval $(call KMOD_template,GRE,gre,\ + $(MODULES_DIR)/kernel/net/ipv4/ip_gre.ko \ +,CONFIG_NET_IPGRE)) + +$(eval $(call KMOD_template,IMQ,imq,\ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.ko \ + $(MODULES_DIR)/kernel/drivers/net/imq.ko \ +)) + +$(eval $(call KMOD_template,IPIP,ipip,\ + $(MODULES_DIR)/kernel/net/ipv4/ipip.ko \ +,CONFIG_NET_IPIP,,60,ipip)) + +$(eval $(call KMOD_template,IPV6,ipv6,\ + $(MODULES_DIR)/kernel/net/ipv6/ipv6.ko \ +,CONFIG_IPV6,,20,ipv6)) + +$(eval $(call KMOD_template,PPP,ppp,\ + $(MODULES_DIR)/kernel/drivers/net/ppp_async.ko \ + $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko \ + $(MODULES_DIR)/kernel/drivers/net/slhc.ko \ + $(MODULES_DIR)/kernel/lib/crc-ccitt.ko \ +,CONFIG_PPP)) + +#$(eval $(call KMOD_template,MPPE,mppe,\ +# $(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.ko \ +#,CONFIG_PPP_MPPE_MPPC)) + +$(eval $(call KMOD_template,PPPOATM,pppoatm,\ + $(MODULES_DIR)/kernel/net/atm/pppoatm.ko \ +,CONFIG_PPPOATM)) + +$(eval $(call KMOD_template,PPPOE,pppoe,\ + $(MODULES_DIR)/kernel/drivers/net/pppoe.ko \ + $(MODULES_DIR)/kernel/drivers/net/pppox.ko \ +,CONFIG_PPPOE)) + +$(eval $(call KMOD_template,SCHED,sched,\ + $(MODULES_DIR)/kernel/net/sched/*.ko \ +)) + +$(eval $(call KMOD_template,TUN,tun,\ + $(MODULES_DIR)/kernel/drivers/net/tun.ko \ +,CONFIG_TUN,,20,tun)) + + +# Filtering / Firewalling + +$(eval $(call KMOD_template,ARPTABLES,arptables,\ + $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.ko \ +,CONFIG_IP_NF_ARPTABLES)) + +$(eval $(call KMOD_template,EBTABLES,ebtables,\ + $(MODULES_DIR)/kernel/net/bridge/netfilter/*.ko \ +,CONFIG_BRIDGE_NF_EBTABLES)) + +# metapackage for compatibility ... +$(eval $(call KMOD_template,IPTABLES_EXTRA,iptables-extra,\ +,,kmod-ipt-conntrack kmod-ipt-extra kmod-ipt-filter kmod-ipt-ipopt kmod-ipt-ipsec kmod-ipt-nat kmod-ipt-nat-extra kmod-ipt-queue kmod-ipt-ulogd)) + +$(eval $(call KMOD_template,IPT_CONNTRACK,ipt-conntrack,\ + $(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_EXTRA,ipt-extra,\ + $(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_FILTER,ipt-filter,\ + $(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_IPOPT,ipt-ipopt,\ + $(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\ + $(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_NAT,ipt-nat,\ + $(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_NAT_EXTRA,ipt-nat-extra,\ + $(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +,,,40,$(IPT_NAT_EXTRA-m))) + +$(eval $(call KMOD_template,IPT_QUEUE,ipt-queue,\ + $(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IPT_ULOG,ipt-ulog,\ + $(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ +)) + +$(eval $(call KMOD_template,IP6TABLES,ip6tables,\ + $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.ko \ +,CONFIG_IP6_NF_IPTABLES,kmod-ipv6)) + + +# Block devices + +$(eval $(call KMOD_template,IDE,ide,\ + $(MODULES_DIR)/kernel/drivers/ide/*.ko \ + $(MODULES_DIR)/kernel/drivers/ide/*/*.ko \ +,CONFIG_IDE)) + +$(eval $(call KMOD_template,LOOP,loop,\ + $(MODULES_DIR)/kernel/drivers/block/loop.ko \ +,CONFIG_BLK_DEV_LOOP,,20,loop)) + +$(eval $(call KMOD_template,NBD,nbd,\ + $(MODULES_DIR)/kernel/drivers/block/nbd.ko \ +,CONFIG_BLK_DEV_NBD,,20,nbd)) + + +# Crypto + +$(eval $(call KMOD_template,CRYPTO,crypto,\ + $(MODULES_DIR)/kernel/crypto/*.ko \ +)) + + +# Filesystems + +$(eval $(call KMOD_template,FS_CIFS,fs-cifs,\ + $(MODULES_DIR)/kernel/fs/cifs/cifs.ko \ +,CONFIG_CIFS,kmod-nls-base,30,cifs)) + +$(eval $(call KMOD_template,FS_MINIX,fs-minix,\ + $(MODULES_DIR)/kernel/fs/minix/minix.ko \ +,CONFIG_MINIX_FS,,30,minix)) + +$(eval $(call KMOD_template,FS_EXT2,fs-ext2,\ + $(MODULES_DIR)/kernel/fs/ext2/ext2.ko \ +,CONFIG_EXT2_FS,,30,ext2)) + +$(eval $(call KMOD_template,FS_EXT3,fs-ext3,\ + $(MODULES_DIR)/kernel/fs/ext3/ext3.ko \ + $(MODULES_DIR)/kernel/fs/jbd/jbd.ko \ +,CONFIG_EXT3_FS,,30,jbd ext3)) + +$(eval $(call KMOD_template,FS_HFSPLUS,fs-hfsplus,\ + $(MODULES_DIR)/kernel/fs/hfsplus/hfsplus.ko \ +,CONFIG_HFSPLUS_FS,kmod-nls-base,30,hfsplus)) + +$(eval $(call KMOD_template,FS_NFS,fs-nfs,\ + $(MODULES_DIR)/kernel/fs/lockd/lockd.ko \ + $(MODULES_DIR)/kernel/fs/nfs/nfs.ko \ + $(MODULES_DIR)/kernel/net/sunrpc/sunrpc.ko \ +,CONFIG_NFS_FS,,30,sunrpc lockd nfs)) + +$(eval $(call KMOD_template,FS_VFAT,fs-vfat,\ + $(MODULES_DIR)/kernel/fs/fat/fat.ko \ + $(MODULES_DIR)/kernel/fs/vfat/vfat.ko \ +,CONFIG_VFAT_FS,kmod-nls-base,30,fat vfat)) + +$(eval $(call KMOD_template,FS_XFS,fs-xfs,\ + $(MODULES_DIR)/kernel/fs/xfs/xfs.ko \ +,CONFIG_XFS_FS,,30,xfs)) + + +# Multimedia + +$(eval $(call KMOD_template,PWC,pwc,\ + $(MODULES_DIR)/kernel/drivers/usb/media/pwc/pwc.ko \ +,CONFIG_USB_PWC,kmod-videodev,63,pwc)) + +$(eval $(call KMOD_template,SOUNDCORE,soundcore,\ + $(MODULES_DIR)/kernel/sound/soundcore.ko \ +,CONFIG_SOUND,,30,soundcore)) + +$(eval $(call KMOD_template,VIDEODEV,videodev,\ + $(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat.ko \ + $(MODULES_DIR)/kernel/drivers/media/video/v4l2-common.ko \ + $(MODULES_DIR)/kernel/drivers/media/video/videodev.ko \ +,CONFIG_VIDEO_DEV,,62,videodev)) + + +# NLS + +$(eval $(call KMOD_template,NLS_BASE,nls-base,\ + $(MODULES_DIR)/kernel/fs/nls/nls_base.ko \ +,CONFIG_NLS,,20,nls_base)) + +$(eval $(call KMOD_template,NLS_CP437,nls-cp437,\ + $(MODULES_DIR)/kernel/fs/nls/nls_cp437.ko \ +,CONFIG_NLS_CODEPAGE_437,,20,nls_cp437)) + +$(eval $(call KMOD_template,NLS_CP850,nls-cp850,\ + $(MODULES_DIR)/kernel/fs/nls/nls_cp850.ko \ +,CONFIG_NLS_CODEPAGE_850,,20,nls_cp850)) + +$(eval $(call KMOD_template,NLS_ISO8859_1,nls-iso8859-1,\ + $(MODULES_DIR)/kernel/fs/nls/nls_iso8859-1.ko \ +,CONFIG_NLS_ISO8859_1,,20,nls_iso8859-1)) + +$(eval $(call KMOD_template,NLS_ISO8859_15,nls-iso8859-15,\ + $(MODULES_DIR)/kernel/fs/nls/nls_iso8859-15.ko \ +,CONFIG_NLS_ISO8859_15,,20,nls_iso8859-15)) + +$(eval $(call KMOD_template,NLS_UTF8,nls-utf8,\ + $(MODULES_DIR)/kernel/fs/nls/nls_utf8.ko \ +,CONFIG_NLS_UTF8,,20,nls_utf8)) + + +# Network devices + +$(eval $(call KMOD_template,NET_3C59X,net-3c59x,\ + $(MODULES_DIR)/kernel/drivers/net/3c59x.ko \ +,CONFIG_VORTEX,,10,3c59x)) + +$(eval $(call KMOD_template,NET_8139TOO,net-8139too,\ + $(MODULES_DIR)/kernel/drivers/net/8139too.ko \ +,CONFIG_8139TOO,,10,8139too)) + +$(eval $(call KMOD_template,NET_AIRO,net-airo,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/airo.ko \ +,CONFIG_AIRO,,10,airo)) + +$(eval $(call KMOD_template,NET_E100,net-e100,\ + $(MODULES_DIR)/kernel/drivers/net/e100.ko \ +,CONFIG_E100,,10,e100)) + +$(eval $(call KMOD_template,NET_HERMES,net-hermes,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.ko \ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.ko \ +,CONFIG_HERMES,,10,hermes orinoco)) + +$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-pci,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_pci.ko \ +,CONFIG_PCI_HERMES,kmod-net-hermes,11,orinoco_pci)) + +$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-plx,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.ko \ +,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx)) + +$(eval $(call KMOD_template,NET_NATSEMI,net-natsemi,\ + $(MODULES_DIR)/kernel/drivers/net/natsemi.ko \ +,CONFIG_NATSEMI,,10,natsemi)) + +$(eval $(call KMOD_template,NET_PRISM54,net-prism54,\ + $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.ko \ +,CONFIG_PRISM54,,10,prism54)) + + +# PCMCIA/CardBus + +$(eval $(call KMOD_template,PCMCIA_CORE,pcmcia-core,\ + $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia.ko \ + $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.ko \ + $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.ko \ + $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic.ko \ +,CONFIG_PCMCIA,,50,pcmcia_core pcmcia yenta_socket rsrc_nonstatic)) + +$(eval $(call KMOD_template,PCMCIA_SERIAL,pcmcia-serial,\ + $(MODULES_DIR)/kernel/drivers/serial/serial_cs.ko \ +,CONFIG_SERIAL_8250_CS)) + + +# USB + +$(eval $(call KMOD_template,USB,usb-core,\ + $(MODULES_DIR)/kernel/drivers/usb/core/usbcore.ko \ +,CONFIG_USB,,50,usbcore)) + +$(eval $(call KMOD_template,USB_OHCI,usb-ohci,\ + $(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd.ko \ +,CONFIG_USB_OHCI_HCD,kmod-usb-core,60,ohci-hcd)) + +$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\ + $(MODULES_DIR)/kernel/drivers/usb/host/uhci-hcd.ko \ +,CONFIG_USB_UHCI_HCD,kmod-usb-core,60,uhci-hcd)) + +$(eval $(call KMOD_template,USB2,usb2,\ + $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.ko \ +,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd)) + +$(eval $(call KMOD_template,USB_ACM,usb-acm,\ + $(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko \ +,CONFIG_USB_ACM)) + +$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\ + $(MODULES_DIR)/kernel/drivers/usb/class/audio.ko \ +,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio)) + +$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\ + $(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko \ +,CONFIG_USB_PRINTER,kmod-usb-core,60,usblp)) + +$(eval $(call KMOD_template,USB_SERIAL,usb-serial,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.ko \ +,CONFIG_USB_SERIAL,kmod-usb-core,60,usbserial)) + +$(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.ko \ +,CONFIG_USB_SERIAL_BELKIN,kmod-usb-serial,61,belkin_sa)) + +$(eval $(call KMOD_template,USB_SERIAL_FTDI,usb-serial-ftdi,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.ko \ +,CONFIG_USB_SERIAL_FTDI_SIO,kmod-usb-serial,61,ftdi_sio)) + +$(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.ko \ +,CONFIG_USB_SERIAL_MCT_U232,kmod-usb-serial,61,mct_u232)) + +$(eval $(call KMOD_template,USB_SERIAL_PL2303,usb-serial-pl2303,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.ko \ +,CONFIG_USB_SERIAL_PL2303,kmod-usb-serial,61,pl2303)) + +$(eval $(call KMOD_template,USB_SERIAL_VISOR,usb-serial-visor,\ + $(MODULES_DIR)/kernel/drivers/usb/serial/visor.ko \ +,CONFIG_USB_SERIAL_VISOR,kmod-usb-serial,61,visor)) + +$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\ + $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.ko \ + $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.ko \ + $(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.ko \ +,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage)) + +$(eval $(call KMOD_template,USB_ATM,usb-atm,\ + $(MODULES_DIR)/kernel/drivers/usb/atm/usbatm.ko \ + ,CONFIG_USB_ATM,kmod-usb-atm,50,usbatm)) + +$(eval $(call KMOD_template,USB_ATM_SPEEDTOUCH,usb-atm-speedtouch,\ + $(MODULES_DIR)/kernel/drivers/usb/atm/speedtch.ko \ + ,CONFIG_USB_SPEEDTOUCH,kmod-usb-atm-speedtouch,50,speedtch)) + +# Misc. devices + +$(eval $(call KMOD_template,AX25,ax25,\ + $(MODULES_DIR)/kernel/net/ax25/ax25.ko \ + $(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.ko \ +,CONFIG_AX25,,90,ax25 mkiss)) + +$(eval $(call KMOD_template,BLUETOOTH,bluetooth,\ + $(MODULES_DIR)/kernel/net/bluetooth/bluetooth.ko \ + $(MODULES_DIR)/kernel/net/bluetooth/l2cap.ko \ + $(MODULES_DIR)/kernel/net/bluetooth/sco.ko \ + $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.ko \ + $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.ko \ + $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.ko \ +,CONFIG_BT)) + + diff --git a/include/netfilter.mk b/include/netfilter.mk new file mode 100644 index 0000000000..66cb747dea --- /dev/null +++ b/include/netfilter.mk @@ -0,0 +1,116 @@ +# $Id: netfilter.mk 2411 2005-11-11 03:41:43Z nico $ + +ifeq ($(NF_2_6),1) +P_V4:=ipv4/netfilter/ +P_XT:=netfilter/ +else +P_V4:= +P_XT:= +endif + +IPT_CONNTRACK-m := +IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_CONNMARK) += $(P_V4)ipt_connmark +IPT_CONNTRACK-$(CONFIG_IP_NF_TARGET_CONNMARK) += $(P_V4)ipt_CONNMARK +IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_CONNTRACK) += $(P_V4)ipt_conntrack +IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_HELPER) += $(P_V4)ipt_helper +IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_STATE) += $(P_V4)ipt_state +IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_CONNTRACK) += $(P_XT)xt_conntrack +IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += $(P_XT)xt_helper +IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_STATE) += $(P_XT)xt_state + + +IPT_EXTRA-m := +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_CONDITION) += $(P_V4)ipt_condition +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_CONNBYTES) += $(P_V4)ipt_connbytes +IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_CONNBYTES) += $(P_XT)xt_connbytes +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_LIMIT) += $(P_V4)ipt_limit +IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_LIMIT) += $(P_XT)xt_limit +IPT_EXTRA-$(CONFIG_IP_NF_TARGET_LOG) += $(P_V4)ipt_LOG +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_MULTIPORT) += $(P_XT)xt_multiport +IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_MULTIPORT) += $(P_XT)xt_multiport +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_OWNER) += $(P_V4)ipt_owner +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_PHYSDEV) += $(P_V4)ipt_physdev +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_PKTTYPE) += $(P_V4)ipt_pkttype +IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_PKTTYPE) += $(P_XT)xt_pkttype +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_QUOTA) += $(P_V4)ipt_quota +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_RECENT) += $(P_V4)ipt_recent +IPT_EXTRA-$(CONFIG_IP_NF_TARGET_REJECT) += $(P_V4)ipt_REJECT +IPT_EXTRA-$(CONFIG_IP_NF_MATCH_STRING) += $(P_V4)ipt_string +IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_STRING) += $(P_XT)xt_string + +IPT_FILTER-m := +IPT_FILTER-$(CONFIG_IP_NF_MATCH_IPP2P) += $(P_V4)ipt_ipp2p +IPT_FILTER-$(CONFIG_IP_NF_MATCH_LAYER7) += $(P_V4)ipt_layer7 + +IPT_IMQ-m := +IPT_IMQ-$(CONFIG_IP_NF_TARGET_IMQ) += $(P_V4)ipt_IMQ + +IPT_IPOPT-m := +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_DSCP) += $(P_V4)ipt_dscp +IPT_IPOPT-$(CONFIG_IP_NF_TARGET_DSCP) += $(P_V4)ipt_DSCP +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_ECN) += $(P_V4)ipt_ecn +IPT_IPOPT-$(CONFIG_IP_NF_TARGET_ECN) += $(P_V4)ipt_ECN +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_LENGTH) += $(P_V4)ipt_length +IPT_IPOPT-$(CONFIG_NETFILTER_XT_MATCH_LENGTH) += $(P_XT)xt_length +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_MAC) += $(P_V4)ipt_mac +IPT_IPOPT-$(CONFIG_NETFILTER_XT_MATCH_MAC) += $(P_XT)xt_mac +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_MARK) += $(P_V4)ipt_mark +IPT_IPOPT-$(CONFIG_NETFILTER_XT_MATCH_MARK) += $(P_XT)xt_mark +IPT_IPOPT-$(CONFIG_IP_NF_TARGET_MARK) += $(P_V4)ipt_MARK +IPT_IPOPT-$(CONFIG_NETFILTER_XT_TARGET_MARK) += $(P_XT)xt_MARK +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TCPMSS) += $(P_V4)ipt_tcpmss +IPT_IPOPT-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += $(P_XT)xt_tcpmss +IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TCPMSS) += $(P_V4)ipt_TCPMSS +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TOS) += $(P_V4)ipt_tos +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TIME) += $(P_V4)ipt_time +IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TOS) += $(P_V4)ipt_TOS +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TTL) += $(P_V4)ipt_ttl +IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TTL) += $(P_V4)ipt_TTL +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_UNCLEAN) += $(P_V4)ipt_unclean + +IPT_IPSEC-m := +IPT_IPSEC-$(CONFIG_IP_NF_MATCH_AH_ESP) += $(P_V4)ipt_ah $(P_V4)ipt_esp +IPT_IPSEC-$(CONFIG_IP_NF_MATCH_AH) += $(P_V4)ipt_ah +IPT_IPSEC-$(CONFIG_NETFILTER_XT_MATCH_ESP) += $(P_XT)xt_esp + +IPT_NAT-m := +IPT_NAT-$(CONFIG_IP_NF_NAT) += $(P_V4)ipt_SNAT $(P_V4)ipt_DNAT +IPT_NAT-$(CONFIG_IP_NF_TARGET_MASQUERADE) += $(P_V4)ipt_MASQUERADE +IPT_NAT-$(CONFIG_IP_NF_TARGET_MIRROR) += $(P_V4)ipt_MIRROR +IPT_NAT-$(CONFIG_IP_NF_TARGET_REDIRECT) += $(P_V4)ipt_REDIRECT + +IPT_NAT_EXTRA-m := +IPT_NAT_EXTRA-$(CONFIG_IP_NF_AMANDA) += $(P_V4)ip_conntrack_amanda +IPT_NAT_EXTRA-$(CONFIG_IP_NF_CT_PROTO_GRE) += $(P_V4)ip_conntrack_proto_gre +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_PROTO_GRE) += $(P_V4)ip_nat_proto_gre +IPT_NAT_EXTRA-$(CONFIG_IP_NF_H323) += $(P_V4)ip_conntrack_h323 +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_H323) += $(P_V4)ip_nat_h323 +IPT_NAT_EXTRA-$(CONFIG_IP_NF_MMS) += $(P_V4)ip_conntrack_mms +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_MMS) += $(P_V4)ip_nat_mms +IPT_NAT_EXTRA-$(CONFIG_IP_NF_RTSP) += $(P_V4)ip_conntrack_rtsp +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_RTSP) += $(P_V4)ip_nat_rtsp +IPT_NAT_EXTRA-$(CONFIG_IP_NF_PPTP) += $(P_V4)ip_conntrack_pptp +IPT_NAT_EXTRA-$(CONFIG_IP_NF_SIP) += $(P_V4)ip_conntrack_sip +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_PPTP) += $(P_V4)ip_nat_pptp +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_SIP) += $(P_V4)ip_nat_sip +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += $(P_V4)ip_nat_snmp_basic +IPT_NAT_EXTRA-$(CONFIG_IP_NF_SIP) += $(P_V4)ip_conntrack_sip +IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_SIP) += $(P_V4)ip_nat_sip +IPT_NAT_EXTRA-$(CONFIG_IP_NF_TFTP) += $(P_V4)ip_conntrack_tftp + +IPT_QUEUE-m := +IPT_QUEUE-$(CONFIG_IP_NF_QUEUE) += $(P_V4)ip_queue + +IPT_ULOG-m := +IPT_ULOG-$(CONFIG_IP_NF_TARGET_ULOG) += $(P_V4)ipt_ULOG + +IPT_BUILTIN := $(P_V4)ipt_standard +IPT_BUILTIN += $(P_V4)ipt_icmp $(P_V4)ipt_tcp $(P_V4)ipt_udp +IPT_BUILTIN += $(IPT_CONNTRACK-y) +IPT_BUILTIN += $(IPT_EXTRA-y) +IPT_BUILTIN += $(IPT_FILTER-y) +IPT_BUILTIN += $(IPT_IMQ-y) +IPT_BUILTIN += $(IPT_IPOPT-y) +IPT_BUILTIN += $(IPT_IPSEC-y) +IPT_BUILTIN += $(IPT_NAT-y) +IPT_BUILTIN += $(IPT_ULOG-y) diff --git a/include/package.mk b/include/package.mk new file mode 100644 index 0000000000..82298b0249 --- /dev/null +++ b/include/package.mk @@ -0,0 +1,300 @@ +ifneq ($(DUMP),) + all: dumpinfo +else + all: compile +endif + +define Build/DefaultTargets + ifeq ($(DUMP),) + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(TOPDIR)/package/rules.mk),$(PKG_BUILD_DIR)) + ifeq ($(CONFIG_AUTOREBUILD),y) + $(PKG_BUILD_DIR)/.prepared: package-clean + endif + endif + + ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) + ifeq ($(CONFIG_AUTOREBUILD),y) + $(PKG_BUILD_DIR)/.built: package-rebuild + endif + endif + endif + + + $(PKG_BUILD_DIR)/.prepared: + @-rm -rf $(PKG_BUILD_DIR) + @mkdir -p $(PKG_BUILD_DIR) + $(call Build/Prepare) + touch $$@ + + $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared + $(call Build/Configure) + touch $$@ + + $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured + $(call Build/Compile) + touch $$@ + + $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built + $(call Build/InstallDev) + touch $$@ + + ifdef Build/InstallDev + compile-targets: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed + endif + + package-clean: FORCE + $(call Build/Clean) + $(call Build/UninstallDev) + rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed + + package-rebuild: FORCE + @-rm -f $(PKG_BUILD_DIR)/.built + + define Build/DefaultTargets + endef +endef + +define Package/Default + CONFIGFILE:= + SECTION:=opt + CATEGORY:=Extra packages + DEPENDS:= + MAINTAINER:=OpenWrt Developers Team + SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) + ifneq ($(PKG_VERSION),) + ifneq ($(PKG_RELEASE),) + VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) + else + VERSION:=$(PKG_VERSION) + endif + else + VERSION:=$(PKG_RELEASE) + endif + PKGARCH:=$(ARCH) + PRIORITY:=optional + DEFAULT:= + MENU:= + TITLE:= + DESCRIPTION:= +endef + +define BuildIPKGVariable +pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2)) +export pkg_$(subst .,_,$(subst -,_,$(1))_$(2)) +$(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi; +endef + +define BuildPackage + $(eval $(call Package/Default)) + $(eval $(call Package/$(1))) + + $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION, + ifeq ($($(FIELD)),) + $$(error Package/$(1) is missing the $(FIELD) field) + endif + ) + + ifeq ($(PKGARCH),) + PKGARCH:=$(ARCH) + endif + + ifeq ($(DESCRIPTION),) + $(eval DESCRIPTION:=$(TITLE)) + endif + + IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk + IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) + INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list + + ifeq ($(CONFIG_PACKAGE_$(1)),y) + install-targets: $$(INFO_$(1)) + endif + + ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) + compile-targets: $$(IPKG_$(1)) + endif + + IDEPEND_$(1):=$$(strip $$(DEPENDS)) + + DUMPINFO += \ + echo "Package: $(1)"; + + ifneq ($(MENU),) + DUMPINFO += \ + echo "Menu: $(MENU)"; + endif + + ifneq ($(DEFAULT),) + DUMPINFO += \ + echo "Default: $(DEFAULT)"; + endif + + DUMPINFO += \ + echo "Version: $(VERSION)"; \ + echo "Depends: $$(IDEPEND_$(1))"; \ + echo "Build-Depends: $(PKG_BUILDDEP)"; \ + echo "Category: $(CATEGORY)"; \ + echo "Title: $(TITLE)"; \ + echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; + + ifneq ($(URL),) + DUMPINFO += \ + echo; \ + echo "$(URL)"; + endif + + DUMPINFO += \ + echo "@@"; + + ifneq ($(CONFIG),) + DUMPINFO += \ + echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \ + echo "@@"; + endif + + $(eval $(call BuildIPKGVariable,$(1),conffiles)) + $(eval $(call BuildIPKGVariable,$(1),preinst)) + $(eval $(call BuildIPKGVariable,$(1),postinst)) + $(eval $(call BuildIPKGVariable,$(1),prerm)) + $(eval $(call BuildIPKGVariable,$(1),postrm)) + $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared + mkdir -p $$(IDIR_$(1))/CONTROL + echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control + echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control + ( \ + DEPENDS=; \ + for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ + DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ + done; \ + echo "Depends: $$$$DEPENDS" >> $$(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)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control + chmod 644 $$(IDIR_$(1))/CONTROL/control + (cd $$(IDIR_$(1))/CONTROL; \ + $($(1)_COMMANDS) \ + ) + + $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built + $(call Package/$(1)/install,$$(IDIR_$(1))) + mkdir -p $(PACKAGE_DIR) + -find $$(IDIR_$(1)) -name CVS | xargs rm -rf + -find $$(IDIR_$(1)) -name .svn | xargs rm -rf + -find $$(IDIR_$(1)) -name '.#*' | xargs rm -f + $(RSTRIP) $$(IDIR_$(1)) + $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) + + $$(INFO_$(1)): $$(IPKG_$(1)) + $(IPKG) install $$(IPKG_$(1)) + + $(1)-clean: + rm -f $(PACKAGE_DIR)/$(1)_* + + clean: $(1)-clean + + $$(eval $$(call Build/DefaultTargets,$(1))) + +endef + +ifneq ($(strip $(PKG_CAT)),) + define Build/Prepare/Default + @if [ "$(PKG_CAT)" = "unzip" ]; then \ + unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) ; \ + else \ + $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - ; \ + fi + @if [ -d ./patches ]; then \ + $(PATCH) $(PKG_BUILD_DIR) ./patches ; \ + fi + endef +endif + +define Build/Prepare + $(call Build/Prepare/Default) +endef + +define Build/Configure/Default + @(cd $(PKG_BUILD_DIR)/$(3); \ + [ -x configure ] && \ + $(2) \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ + ./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) \ + $(1); \ + true; \ + ) +endef + +define Build/Configure + $(call Build/Configure/Default,) +endef + +define Build/Compile/Default + $(MAKE) -C $(PKG_BUILD_DIR) \ + $(TARGET_CONFIGURE_OPTS) \ + CC=$(TARGET_CC) \ + CROSS="$(TARGET_CROSS)" \ + EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ + ARCH="$(ARCH)" \ + $(1); +endef + +define Build/Compile + $(call Build/Compile/Default,) +endef + +ifneq ($(DUMP),) + dumpinfo: FORCE + @$(DUMPINFO) +else + $(PACKAGE_DIR): + mkdir -p $@ + + ifneq ($(strip $(PKG_SOURCE)),) + source: $(DL_DIR)/$(PKG_SOURCE) + + $(DL_DIR)/$(PKG_SOURCE): + mkdir -p $(DL_DIR) + $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) + + $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) + endif + + source: + prepare: $(PKG_BUILD_DIR)/.prepared + configure: $(PKG_BUILD_DIR)/.configured + + compile-targets: + compile: compile-targets + + install-targets: + install: install-targets + + clean-targets: + clean: FORCE + @$(MAKE) clean-targets + $(call Build/Clean) + rm -rf $(PKG_BUILD_DIR) +endif diff --git a/package/alsa/Makefile b/package/alsa/Makefile index b1b9997c19..5f6a3305b5 100644 --- a/package/alsa/Makefile +++ b/package/alsa/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=alsa-driver PKG_VERSION:=1.0.11 @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_CAT:=bzcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk ifeq ($(LINUX_KARCH),i386) KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-i386/mach-generic -I$(LINUX_DIR)/include/asm-i386/mach-default diff --git a/package/base-files/Makefile b/package/base-files/Makefile index ec3dc88923..bb20894096 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=base-files PKG_RELEASE:=8 @@ -12,7 +12,7 @@ ifeq ($(REV),) REV:=0 endif -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk ifneq ($(DUMP),1) TARGET:=-$(BOARD)-$(KERNEL) diff --git a/package/bridge/Makefile b/package/bridge/Makefile index 65fd8358e8..f2b178a610 100644 --- a/package/bridge/Makefile +++ b/package/bridge/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/bridge PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd PKG_CAT:=zcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/bridge SECTION:=base diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile index 227352b156..6fe22edb0f 100644 --- a/package/broadcom-wl/Makefile +++ b/package/broadcom-wl/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile 2480 2005-11-14 02:07:33Z nbd $ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=broadcom-wl PKG_VERSION:=4.80.9.2 @@ -14,7 +14,7 @@ PKG_SOURCE_URL:=http://downloads.openwrt.org/sources PKG_MD5SUM:=7d9fab2c611369bbe075c3924ea77450 PKG_CAT:=bzcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/kmod-brcm-wl SECTION:=drivers diff --git a/package/busybox/Makefile b/package/busybox/Makefile index aac9d21e32..6b2e0c5be4 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads PKG_MD5SUM:=19a0b475169335f17e421cf644616fe7 PKG_CAT:=bzcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/busybox SECTION:=base diff --git a/package/diag/Makefile b/package/diag/Makefile index 6fed3b51bf..ab28e7218e 100644 --- a/package/diag/Makefile +++ b/package/diag/Makefile @@ -1,14 +1,14 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=kmod-diag PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/kmod-diag SECTION:=drivers diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 6efaf370a1..a05ec0e22c 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_MD5SUM:=489198ec87101087043adc98bbe062dc PKG_CAT:=zcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/dnsmasq SECTION:=base diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index bda4d8fc91..0409e66dbf 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/ PKG_MD5SUM:=ca8e53a766faec831882831364568421 PKG_CAT:=zcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/dropbear SECTION:=base diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index f4359a6675..814ac68a22 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/ebtables PKG_MD5SUM:=f07111fcc1966be669278433c35dcc28 PKG_CAT:=zcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/ebtables SECTION:=base diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 91d4dd6074..b7084236df 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=fuse PKG_VERSION:=2.5.3 @@ -15,7 +15,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/kmod-fuse SECTION:=drivers diff --git a/package/haserl/Makefile b/package/haserl/Makefile index e6215c9547..ec940ea437 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/haserl PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea PKG_CAT:=zcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/haserl SECTION:=base diff --git a/package/hostap/Makefile b/package/hostap/Makefile index 80f820187b..21abfe256b 100644 --- a/package/hostap/Makefile +++ b/package/hostap/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=hostap-driver PKG_VERSION:=0.4.9 @@ -15,7 +15,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/kmod-hostap SECTION:=drivers diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 4a1c3f9265..867cda6922 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/hostapd SECTION:=net diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 1fa638d39d..9cf1eb9909 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/ PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5 PKG_CAT:=zcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/ip SECTION:=base diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 58dccca62a..667884debe 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=bzcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/ipsec-tools SECTION:=base diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 456f8b6be4..d245090a68 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://ipset.netfilter.org PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26 PKG_CAT:=bzcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/ipset SECTION:=base diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 623a64ed84..7490277440 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=iptables PKG_VERSION:=1.3.5 @@ -20,10 +20,10 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_MENU:=IPv4 / IPv6 firewall administration -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk ifeq ($(DUMP),) include $(LINUX_DIR)/.config -include $(TOPDIR)/target/linux/netfilter.mk +include $(TOPDIR)/include/netfilter.mk endif define Package/iptables diff --git a/package/kernel.mk b/package/kernel.mk deleted file mode 100644 index 39f9cc0c9c..0000000000 --- a/package/kernel.mk +++ /dev/null @@ -1,31 +0,0 @@ -ifneq ($(DUMP),1) -include $(BUILD_DIR)/kernel.mk - -KERNEL:=unknown -ifneq (,$(findstring 2.4.,$(LINUX_VERSION))) -KERNEL:=2.4 -LINUX_KMOD_SUFFIX=o -endif -ifneq (,$(findstring 2.6.,$(LINUX_VERSION))) -KERNEL:=2.6 -LINUX_KMOD_SUFFIX=ko -endif - -LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ - -e 's/mipsel/mips/' \ - -e 's/mipseb/mips/' \ - -e 's/powerpc/ppc/' \ - -e 's/sh[234]/sh/' \ - -e 's/armeb/arm/' \ -) - -KERNEL_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) -ifeq ($(LINUX_NAME),) -LINUX_NAME:=linux-$(LINUX_VERSION) -endif -LINUX_DIR := $(KERNEL_BUILD_DIR)/$(LINUX_NAME) - -KMOD_BUILD_DIR := $(KERNEL_BUILD_DIR)/linux-modules -MODULES_DIR := $(KERNEL_BUILD_DIR)/modules/$(MODULES_SUBDIR) -TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) -endif diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index d4d7e21672..2d7aecf551 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/libpcap SECTION:=base diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index e37d5bdceb..15b3f7d4da 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -14,7 +14,7 @@ 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 +include $(TOPDIR)/include/package.mk define Package/linux-atm SECTION:=libs diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index c689054811..7bdb7ec11a 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=madwifi PKG_VERSION:=0.9.0 @@ -54,7 +54,7 @@ MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \ LDOPTS="" \ DOMULTI=1 -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk ifeq ($(findstring AHB,$(BUS)),AHB) define Build/Compile/ahb diff --git a/package/mini_fo/Makefile b/package/mini_fo/Makefile index f2c46c9ec3..0180f81c31 100644 --- a/package/mini_fo/Makefile +++ b/package/mini_fo/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=mini_fo PKG_VERSION:=0.6.2pre1 @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://www.denx.de/twiki/pub/Know/MiniFOHome/ PKG_SOURCE:=mini_fo-0-6-2-pre1.tar.bz2 PKG_CAT:=bzcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/kmod-mini-fo SECTION:=drivers diff --git a/package/mtd/Makefile b/package/mtd/Makefile index f6e94303af..01dfcd6b54 100644 --- a/package/mtd/Makefile +++ b/package/mtd/Makefile @@ -7,7 +7,7 @@ PKG_RELEASE:=4 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/mtd SECTION:=base diff --git a/package/nvram/Makefile b/package/nvram/Makefile index 019800a0c6..cf76c7c812 100644 --- a/package/nvram/Makefile +++ b/package/nvram/Makefile @@ -7,7 +7,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/nvram SECTION:=base diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 82f20d6b0d..39fe6b4c3d 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -20,7 +20,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-rmd160 no-aes192 OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/libopenssl SECTION:=base diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 4a1a42cc07..f81096547b 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=openswan PKG_VERSION:=2.4.5 @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://www.openswan.org/download PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/kmod-openswan SECTION:=drivers diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile index a389fd63e1..2c7b229781 100644 --- a/package/pcmcia-cs/Makefile +++ b/package/pcmcia-cs/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/pcmcia-cs SECTION:=base diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 55986f95c0..edd9a5ea86 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -15,7 +15,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/ppp SECTION:=net diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 08cb43a7c2..6d01ce19f3 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/pptpclient PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 PKG_CAT:=zcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/pptp SECTION:=base diff --git a/package/robocfg/Makefile b/package/robocfg/Makefile index 49f6005699..ca0f83d3dd 100644 --- a/package/robocfg/Makefile +++ b/package/robocfg/Makefile @@ -8,7 +8,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/robocfg -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/robocfg SECTION:=base diff --git a/package/rules.mk b/package/rules.mk deleted file mode 100644 index 82298b0249..0000000000 --- a/package/rules.mk +++ /dev/null @@ -1,300 +0,0 @@ -ifneq ($(DUMP),) - all: dumpinfo -else - all: compile -endif - -define Build/DefaultTargets - ifeq ($(DUMP),) - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . $(TOPDIR)/package/rules.mk),$(PKG_BUILD_DIR)) - ifeq ($(CONFIG_AUTOREBUILD),y) - $(PKG_BUILD_DIR)/.prepared: package-clean - endif - endif - - ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1))) - ifeq ($(CONFIG_AUTOREBUILD),y) - $(PKG_BUILD_DIR)/.built: package-rebuild - endif - endif - endif - - - $(PKG_BUILD_DIR)/.prepared: - @-rm -rf $(PKG_BUILD_DIR) - @mkdir -p $(PKG_BUILD_DIR) - $(call Build/Prepare) - touch $$@ - - $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared - $(call Build/Configure) - touch $$@ - - $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - $(call Build/Compile) - touch $$@ - - $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built - $(call Build/InstallDev) - touch $$@ - - ifdef Build/InstallDev - compile-targets: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed - endif - - package-clean: FORCE - $(call Build/Clean) - $(call Build/UninstallDev) - rm -f $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed - - package-rebuild: FORCE - @-rm -f $(PKG_BUILD_DIR)/.built - - define Build/DefaultTargets - endef -endef - -define Package/Default - CONFIGFILE:= - SECTION:=opt - CATEGORY:=Extra packages - DEPENDS:= - MAINTAINER:=OpenWrt Developers Team - SOURCE:=$(patsubst $(TOPDIR)/%,%,${shell pwd}) - ifneq ($(PKG_VERSION),) - ifneq ($(PKG_RELEASE),) - VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) - else - VERSION:=$(PKG_VERSION) - endif - else - VERSION:=$(PKG_RELEASE) - endif - PKGARCH:=$(ARCH) - PRIORITY:=optional - DEFAULT:= - MENU:= - TITLE:= - DESCRIPTION:= -endef - -define BuildIPKGVariable -pkg_$(subst .,_,$(subst -,_,$(1)))_$(2) = $$(Package/$(1)/$(2)) -export pkg_$(subst .,_,$(subst -,_,$(1))_$(2)) -$(1)_COMMANDS += if [ -n "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" ]; then echo "$$$$$$$$pkg_$(subst .,_,$(subst -,_,$(1)))_$(2)" > $(2); fi; -endef - -define BuildPackage - $(eval $(call Package/Default)) - $(eval $(call Package/$(1))) - - $(foreach FIELD, TITLE CATEGORY PRIORITY VERSION, - ifeq ($($(FIELD)),) - $$(error Package/$(1) is missing the $(FIELD) field) - endif - ) - - ifeq ($(PKGARCH),) - PKGARCH:=$(ARCH) - endif - - ifeq ($(DESCRIPTION),) - $(eval DESCRIPTION:=$(TITLE)) - endif - - IPKG_$(1):=$(PACKAGE_DIR)/$(1)_$(VERSION)_$(PKGARCH).ipk - IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg/$(1) - INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list - - ifeq ($(CONFIG_PACKAGE_$(1)),y) - install-targets: $$(INFO_$(1)) - endif - - ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) - compile-targets: $$(IPKG_$(1)) - endif - - IDEPEND_$(1):=$$(strip $$(DEPENDS)) - - DUMPINFO += \ - echo "Package: $(1)"; - - ifneq ($(MENU),) - DUMPINFO += \ - echo "Menu: $(MENU)"; - endif - - ifneq ($(DEFAULT),) - DUMPINFO += \ - echo "Default: $(DEFAULT)"; - endif - - DUMPINFO += \ - echo "Version: $(VERSION)"; \ - echo "Depends: $$(IDEPEND_$(1))"; \ - echo "Build-Depends: $(PKG_BUILDDEP)"; \ - echo "Category: $(CATEGORY)"; \ - echo "Title: $(TITLE)"; \ - echo "Description: $(DESCRIPTION)" | sed -e 's,\\,\n,g'; - - ifneq ($(URL),) - DUMPINFO += \ - echo; \ - echo "$(URL)"; - endif - - DUMPINFO += \ - echo "@@"; - - ifneq ($(CONFIG),) - DUMPINFO += \ - echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \ - echo "@@"; - endif - - $(eval $(call BuildIPKGVariable,$(1),conffiles)) - $(eval $(call BuildIPKGVariable,$(1),preinst)) - $(eval $(call BuildIPKGVariable,$(1),postinst)) - $(eval $(call BuildIPKGVariable,$(1),prerm)) - $(eval $(call BuildIPKGVariable,$(1),postrm)) - $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared - mkdir -p $$(IDIR_$(1))/CONTROL - echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control - echo "Version: $(VERSION)" >> $$(IDIR_$(1))/CONTROL/control - ( \ - DEPENDS=; \ - for depend in $$(filter-out @%,$$(IDEPEND_$(1))); do \ - DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \ - done; \ - echo "Depends: $$$$DEPENDS" >> $$(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)" | sed -e 's,\\,\n ,g' >> $$(IDIR_$(1))/CONTROL/control - chmod 644 $$(IDIR_$(1))/CONTROL/control - (cd $$(IDIR_$(1))/CONTROL; \ - $($(1)_COMMANDS) \ - ) - - $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built - $(call Package/$(1)/install,$$(IDIR_$(1))) - mkdir -p $(PACKAGE_DIR) - -find $$(IDIR_$(1)) -name CVS | xargs rm -rf - -find $$(IDIR_$(1)) -name .svn | xargs rm -rf - -find $$(IDIR_$(1)) -name '.#*' | xargs rm -f - $(RSTRIP) $$(IDIR_$(1)) - $(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR) - - $$(INFO_$(1)): $$(IPKG_$(1)) - $(IPKG) install $$(IPKG_$(1)) - - $(1)-clean: - rm -f $(PACKAGE_DIR)/$(1)_* - - clean: $(1)-clean - - $$(eval $$(call Build/DefaultTargets,$(1))) - -endef - -ifneq ($(strip $(PKG_CAT)),) - define Build/Prepare/Default - @if [ "$(PKG_CAT)" = "unzip" ]; then \ - unzip -d $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_SOURCE) ; \ - else \ - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR)/.. $(TAR_OPTIONS) - ; \ - fi - @if [ -d ./patches ]; then \ - $(PATCH) $(PKG_BUILD_DIR) ./patches ; \ - fi - endef -endif - -define Build/Prepare - $(call Build/Prepare/Default) -endef - -define Build/Configure/Default - @(cd $(PKG_BUILD_DIR)/$(3); \ - [ -x configure ] && \ - $(2) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ - ./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) \ - $(1); \ - true; \ - ) -endef - -define Build/Configure - $(call Build/Configure/Default,) -endef - -define Build/Compile/Default - $(MAKE) -C $(PKG_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - CC=$(TARGET_CC) \ - CROSS="$(TARGET_CROSS)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ - ARCH="$(ARCH)" \ - $(1); -endef - -define Build/Compile - $(call Build/Compile/Default,) -endef - -ifneq ($(DUMP),) - dumpinfo: FORCE - @$(DUMPINFO) -else - $(PACKAGE_DIR): - mkdir -p $@ - - ifneq ($(strip $(PKG_SOURCE)),) - source: $(DL_DIR)/$(PKG_SOURCE) - - $(DL_DIR)/$(PKG_SOURCE): - mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL) - - $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE) - endif - - source: - prepare: $(PKG_BUILD_DIR)/.prepared - configure: $(PKG_BUILD_DIR)/.configured - - compile-targets: - compile: compile-targets - - install-targets: - install: install-targets - - clean-targets: - clean: FORCE - @$(MAKE) clean-targets - $(call Build/Clean) - rm -rf $(PKG_BUILD_DIR) -endif diff --git a/package/shfs/Makefile b/package/shfs/Makefile index 69f8d83a46..057358b34d 100644 --- a/package/shfs/Makefile +++ b/package/shfs/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=shfs PKG_VERSION:=0.35 @@ -15,7 +15,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/kmod-shfs SECTION:=drivers diff --git a/package/spca5xx/Makefile b/package/spca5xx/Makefile index 93eea633cd..86233fc64a 100644 --- a/package/spca5xx/Makefile +++ b/package/spca5xx/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=spca5xx PKG_VERSION:=20060301 @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://mxhaard.free.fr/spca50x/Download/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk #FIXME: add proper dependency handling on kmod-usb-core & kmod-videodev packages define Package/kmod-spca5xx diff --git a/package/switch/Makefile b/package/switch/Makefile index e8aa6a02a4..cb5f346748 100644 --- a/package/switch/Makefile +++ b/package/switch/Makefile @@ -1,14 +1,14 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=kmod-switch PKG_RELEASE:=1 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/kmod-switch SECTION:=drivers diff --git a/package/udev/Makefile b/package/udev/Makefile index 54e06dcff6..5d397161b1 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -19,7 +19,7 @@ PKG_CAT:=bzcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/udev SECTION:=base diff --git a/package/ueagle-atm/Makefile b/package/ueagle-atm/Makefile index 6f227a1bf4..6d003f6c0d 100644 --- a/package/ueagle-atm/Makefile +++ b/package/ueagle-atm/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile 2767 2005-12-25 02:10:14Z wbx $ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=ueagle-atm PKG_VERSION:=1.0d1 @@ -15,7 +15,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk #FIXME: add dependency on kmod-usb-core define Package/kmod-ueagle-atm diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index ef28bdb69e..673ade433f 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -16,7 +16,7 @@ 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 +include $(TOPDIR)/include/package.mk define Package/fdisk SECTION:=base diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index ad4eddab8c..368d3ebb01 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/wireless-tools SECTION:=base diff --git a/package/wlcompat/Makefile b/package/wlcompat/Makefile index af1f07593f..d5feede6c9 100644 --- a/package/wlcompat/Makefile +++ b/package/wlcompat/Makefile @@ -1,14 +1,14 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=kmod-wlcompat PKG_RELEASE:=3 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/kmod-wlcompat SECTION:=drivers diff --git a/package/zd1211/Makefile b/package/zd1211/Makefile index a71873b9f7..1c79922cfc 100644 --- a/package/zd1211/Makefile +++ b/package/zd1211/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile 3297 2006-03-02 23:42:52Z florian $ include $(TOPDIR)/rules.mk -include $(TOPDIR)/package/kernel.mk +include $(TOPDIR)/include/kernel.mk PKG_NAME:=zd1211 PKG_VERSION:=r69 @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://zd1211.ath.cx/download/ PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz PKG_CAT:=zcat -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk #FIXME: add proper dependency handling on kmod-usb-core packages define Package/kmod-zd1211 diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 02659bb9ac..8e497c2f28 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=bzcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/package/rules.mk +include $(TOPDIR)/include/package.mk define Package/zlib SECTION:=base diff --git a/target/Makefile b/target/Makefile index d64053cbd4..9205f5b986 100644 --- a/target/Makefile +++ b/target/Makefile @@ -5,9 +5,9 @@ all: install $(BIN_DIR): mkdir -p $(BIN_DIR) -TARGETS:=linux utils lzma +TARGETS:=linux utils -linux-compile: utils-install lzma-install +linux-compile: utils-install linux-install: $(BIN_DIR) download: $(patsubst %,%-source,$(TARGETS)) @@ -27,11 +27,6 @@ image_clean: FORCE $(MAKE) -C $(patsubst %-prepare,%,$@) prepare %-compile: %-prepare $(MAKE) -C $(patsubst %-compile,%,$@) compile -%-rebuild: FORCE - $(MAKE) -C $(patsubst %-rebuild,%,$@) rebuild %-install: %-compile $(MAKE) -C $(patsubst %-install,%,$@) install -linux-imagebuilder: FORCE - $(MAKE) -C linux imagebuilder - diff --git a/target/linux/Config.in b/target/linux/Config.in index 946ace3204..23c96b76df 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -13,8 +13,8 @@ menu "Target Root Filesystem" help Build a jffs2 root filesystem - config TARGET_ROOTFS_SQUASHFS_LZMA - bool "squashfs-lzma" + config TARGET_ROOTFS_SQUASHFS + bool "squashfs" default y depends !LINUX_2_6_ARUBA depends !LINUX_2_6_XSCALE diff --git a/target/linux/Makefile b/target/linux/Makefile index 2caee31b36..e1a314d1d8 100644 --- a/target/linux/Makefile +++ b/target/linux/Makefile @@ -30,6 +30,7 @@ source: $(MAKE) -C image/$(BOARD) source prepare: + rm -f $(TOPDIR)/.kernel.mk $(MAKE) -C $(BOARD)-$(KERNEL) prepare compile: diff --git a/target/linux/ar531x-2.4/Makefile b/target/linux/ar531x-2.4/Makefile index 3abb30d487..96a32848e7 100644 --- a/target/linux/ar531x-2.4/Makefile +++ b/target/linux/ar531x-2.4/Makefile @@ -4,10 +4,9 @@ LINUX_VERSION:=2.4.32 LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c -include ../rules.mk include ./config -include ../generic-$(KERNEL)/modules.mk -include ../kernel.mk +include $(TOPDIR)/include/kernel.mk +include $(TOPDIR)/include/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile index 20ad3523ac..c8688da044 100644 --- a/target/linux/ar7-2.4/Makefile +++ b/target/linux/ar7-2.4/Makefile @@ -4,8 +4,8 @@ LINUX_VERSION:=2.4.32 LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c -include ../rules.mk include ./config +include $(TOPDIR)/include/kernel.mk ATM_FIRMWARE_VERSION:=0.4 ATM_FIRMWARE_DIR=sangam-atm-firmware-$(ATM_FIRMWARE_VERSION) @@ -26,8 +26,7 @@ $(eval $(call KMOD_template,CPMAC,cpmac,\ $(MODULES_DIR)/kernel/drivers/net/avalanche_cpmac/avalanche_cpmac.o \ ,CONFIG_MIPS_AVALANCHE_CPMAC,,10,avalanche_cpmac)) -include ../generic-$(KERNEL)/modules.mk -include ../kernel.mk +include $(TOPDIR)/include/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile index 1f68614254..652e4b9132 100644 --- a/target/linux/aruba-2.6/Makefile +++ b/target/linux/aruba-2.6/Makefile @@ -4,12 +4,9 @@ LINUX_VERSION:=2.6.17 LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e -include ../rules.mk include ./config - -include ../generic-$(KERNEL)/modules.mk -include ../kernel.mk - +include $(TOPDIR)/include/kernel.mk +include $(TOPDIR)/include/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) diff --git a/target/linux/au1000-2.6/Makefile b/target/linux/au1000-2.6/Makefile index 39d8d4c8b0..b1ca0fee34 100644 --- a/target/linux/au1000-2.6/Makefile +++ b/target/linux/au1000-2.6/Makefile @@ -4,12 +4,9 @@ LINUX_VERSION:=2.6.17 LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e -include ../rules.mk include ./config - -include ../generic-$(KERNEL)/modules.mk -include ../kernel.mk - +include $(TOPDIR)/include/kernel.mk +include $(TOPDIR)/include/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile index 022f3352c5..20a6210666 100644 --- a/target/linux/brcm-2.4/Makefile +++ b/target/linux/brcm-2.4/Makefile @@ -4,8 +4,8 @@ LINUX_VERSION:=2.4.32 LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c -include ../rules.mk include ./config +include $(TOPDIR)/include/kernel.mk # broadcom specific kmod packages $(eval $(call KMOD_template,LP,lp,\ @@ -15,8 +15,7 @@ $(eval $(call KMOD_template,LP,lp,\ $(MODULES_DIR)/kernel/drivers/char/ppdev.o \ ,CONFIG_PARPORT,,50,parport parport_splink lp)) -include ../generic-$(KERNEL)/modules.mk -include ../kernel.mk +include $(TOPDIR)/include/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked diff --git a/target/linux/brcm-2.6/Makefile b/target/linux/brcm-2.6/Makefile index 1f68614254..a3b8177c20 100644 --- a/target/linux/brcm-2.6/Makefile +++ b/target/linux/brcm-2.6/Makefile @@ -4,11 +4,9 @@ LINUX_VERSION:=2.6.17 LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e -include ../rules.mk include ./config - -include ../generic-$(KERNEL)/modules.mk -include ../kernel.mk +include $(TOPDIR)/include/kernel.mk +include $(TOPDIR)/include/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked diff --git a/target/linux/generic-2.4/modules.mk b/target/linux/generic-2.4/modules.mk deleted file mode 100644 index 540ac715cc..0000000000 --- a/target/linux/generic-2.4/modules.mk +++ /dev/null @@ -1,320 +0,0 @@ -include ../netfilter.mk - -# Networking - -$(eval $(call KMOD_template,ATM,atm,\ - $(MODULES_DIR)/kernel/net/atm/atm.o \ - $(MODULES_DIR)/kernel/net/atm/br2684.o \ -,CONFIG_ATM,,50,atm)) - -$(eval $(call KMOD_template,GRE,gre,\ - $(MODULES_DIR)/kernel/net/ipv4/ip_gre.o \ -,CONFIG_NET_IPGRE)) - -$(eval $(call KMOD_template,IMQ,imq,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.o \ - $(MODULES_DIR)/kernel/drivers/net/imq.o \ -)) -$(eval $(call KMOD_template,IPIP,ipip,\ - $(MODULES_DIR)/kernel/net/ipv4/ipip.o \ -,CONFIG_NET_IPIP,,60,ipip)) - -$(eval $(call KMOD_template,IPV6,ipv6,\ - $(MODULES_DIR)/kernel/net/ipv6/ipv6.o \ -,CONFIG_IPV6,,20,ipv6)) - -$(eval $(call KMOD_template,PPP,ppp,\ - $(MODULES_DIR)/kernel/drivers/net/ppp_async.o \ - $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o \ - $(MODULES_DIR)/kernel/drivers/net/slhc.o \ - $(MODULES_DIR)/kernel/drivers/net/pppox.o \ -,CONFIG_PPP)) - -$(eval $(call KMOD_template,MPPE,mppe,\ - $(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.o \ -,CONFIG_PPP_MPPE_MPPC)) - -$(eval $(call KMOD_template,PPPOATM,pppoatm,\ - $(MODULES_DIR)/kernel/net/atm/pppoatm.o \ -,CONFIG_PPPOATM)) - -$(eval $(call KMOD_template,PPPOE,pppoe,\ - $(MODULES_DIR)/kernel/drivers/net/pppoe.o \ -,CONFIG_PPPOE)) - -$(eval $(call KMOD_template,SCHED,sched,\ - $(MODULES_DIR)/kernel/net/sched/*.o \ -)) - -$(eval $(call KMOD_template,TUN,tun,\ - $(MODULES_DIR)/kernel/drivers/net/tun.o \ -,CONFIG_TUN,,20,tun)) - -# Filtering / Firewalling - -$(eval $(call KMOD_template,ARPTABLES,arptables,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.o \ -,CONFIG_IP_NF_ARPTABLES)) - -$(eval $(call KMOD_template,EBTABLES,ebtables,\ - $(MODULES_DIR)/kernel/net/bridge/netfilter/*.o \ -,CONFIG_BRIDGE_NF_EBTABLES)) - -# metapackage for compatibility ... -$(eval $(call KMOD_template,IPTABLES_EXTRA,iptables-extra,\ -,,kmod-ipt-conntrack kmod-ipt-extra kmod-ipt-filter kmod-ipt-ipopt kmod-ipt-ipsec kmod-ipt-nat kmod-ipt-nat-extra kmod-ipt-queue kmod-ipt-ulogd)) - -$(eval $(call KMOD_template,IPT_CONNTRACK,ipt-conntrack,\ - $(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_EXTRA,ipt-extra,\ - $(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_FILTER,ipt-filter,\ - $(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_IPOPT,ipt-ipopt,\ - $(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\ - $(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_NAT,ipt-nat,\ - $(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_NAT_EXTRA,ipt-nat-extra,\ - $(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -,,,40,$(IPT_NAT_EXTRA-m))) - -$(eval $(call KMOD_template,IPT_QUEUE,ipt-queue,\ - $(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IPT_ULOG,ipt-ulog,\ - $(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/ipv4/netfilter/$(mod).o) \ -)) - -$(eval $(call KMOD_template,IP6TABLES,ip6tables,\ - $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.o \ -,CONFIG_IP6_NF_IPTABLES,kmod-ipv6)) - - -# Block devices - -$(eval $(call KMOD_template,IDE,ide,\ - $(MODULES_DIR)/kernel/drivers/ide/*.o \ - $(MODULES_DIR)/kernel/drivers/ide/*/*.o \ -,CONFIG_IDE,,20,pdc202xx_old ide-core ide-detect ide-disk)) - -$(eval $(call KMOD_template,LOOP,loop,\ - $(MODULES_DIR)/kernel/drivers/block/loop.o \ -,CONFIG_BLK_DEV_LOOP,,20,loop)) - -$(eval $(call KMOD_template,NBD,nbd,\ - $(MODULES_DIR)/kernel/drivers/block/nbd.o \ -,CONFIG_BLK_DEV_NBD,,20,nbd)) - - -# Crypto - -ifneq ($(wildcard $(MODULES_DIR)/kernel/crypto/*.o),) -CONFIG_CRYPTO:=m -endif -$(eval $(call KMOD_template,CRYPTO,crypto,\ - $(MODULES_DIR)/kernel/crypto/*.o \ -,CONFIG_CRYPTO)) - - -# Filesystems - -$(eval $(call KMOD_template,FS_CIFS,fs-cifs,\ - $(MODULES_DIR)/kernel/fs/cifs/cifs.o \ -,CONFIG_CIFS,,30,cifs)) - -$(eval $(call KMOD_template,FS_MINIX,fs-minix,\ - $(MODULES_DIR)/kernel/fs/minix/*.o \ -,CONFIG_MINIX_FS,,30,minix)) - -$(eval $(call KMOD_template,FS_EXT2,fs-ext2,\ - $(MODULES_DIR)/kernel/fs/ext2/*.o \ -,CONFIG_EXT2_FS,,30,ext2)) - -$(eval $(call KMOD_template,FS_EXT3,fs-ext3,\ - $(MODULES_DIR)/kernel/fs/ext3/*.o \ - $(MODULES_DIR)/kernel/fs/jbd/*.o \ -,CONFIG_EXT3_FS,,30,jbd ext3)) - -$(eval $(call KMOD_template,FS_HFSPLUS,fs-hfsplus,\ - $(MODULES_DIR)/kernel/fs/hfsplus/*.o \ -,CONFIG_HFSPLUS_FS,,30,hfsplus)) - -$(eval $(call KMOD_template,FS_NFS,fs-nfs,\ - $(MODULES_DIR)/kernel/fs/lockd/*.o \ - $(MODULES_DIR)/kernel/fs/nfs/*.o \ - $(MODULES_DIR)/kernel/net/sunrpc/*.o \ -,CONFIG_NFS_FS,,30,sunrpc lockd nfs)) - -$(eval $(call KMOD_template,FS_VFAT,fs-vfat,\ - $(MODULES_DIR)/kernel/fs/vfat/vfat.o \ - $(MODULES_DIR)/kernel/fs/fat/fat.o \ -,CONFIG_VFAT_FS,,30,fat vfat)) - -$(eval $(call KMOD_template,FS_XFS,fs-xfs,\ - $(MODULES_DIR)/kernel/fs/xfs/*.o \ -,CONFIG_XFS_FS,,30,xfs)) - - -# Multimedia - -$(eval $(call KMOD_template,PWC,pwc,\ - $(MODULES_DIR)/kernel/drivers/usb/pwc.o \ -,CONFIG_USB_PWC,kmod-videodev,63,pwc)) - -$(eval $(call KMOD_template,SOUNDCORE,soundcore,\ - $(MODULES_DIR)/kernel/drivers/sound/soundcore.o \ -,CONFIG_SOUND,,30,soundcore)) - -$(eval $(call KMOD_template,VIDEODEV,videodev,\ - $(MODULES_DIR)/kernel/drivers/media/video/videodev.o \ -,CONFIG_VIDEO_DEV,,62,videodev)) - - -# Network devices - -$(eval $(call KMOD_template,NET_3C59X,net-3c59x,\ - $(MODULES_DIR)/kernel/drivers/net/3c59x.o \ -,CONFIG_VORTEX,,10,3c59x)) - -$(eval $(call KMOD_template,NET_8139TOO,net-8139too,\ - $(MODULES_DIR)/kernel/drivers/net/8139too.o \ - $(MODULES_DIR)/kernel/drivers/net/mii.o \ -,CONFIG_8139TOO,,10,mii 8139too)) - -$(eval $(call KMOD_template,NET_AIRO,net-airo,\ - $(MODULES_DIR)/kernel/drivers/net/wireless/airo.o \ -,CONFIG_AIRO,,10,airo)) - -$(eval $(call KMOD_template,NET_E100,net-e100,\ - $(MODULES_DIR)/kernel/drivers/net/e100.o \ -,CONFIG_E100,,10,e100)) - -$(eval $(call KMOD_template,NET_HERMES,net-hermes,\ - $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.o \ - $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.o \ -,CONFIG_HERMES,,10,hermes orinoco)) - -$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-pci,\ - $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_pci.o \ -,CONFIG_PCI_HERMES,kmod-net-hermes,11,orinoco_pci)) - -$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-plx,\ - $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.o \ -,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx)) - -$(eval $(call KMOD_template,NET_NATSEMI,net-natsemi,\ - $(MODULES_DIR)/kernel/drivers/net/natsemi.o \ -,CONFIG_NATSEMI,,10,natsemi)) - -$(eval $(call KMOD_template,NET_PRISM54,net-prism54,\ - $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.o \ -,CONFIG_PRISM54,,10,prism54)) - - -# PCMCIA/CardBus - -$(eval $(call KMOD_template,PCMCIA_CORE,pcmcia-core,\ - $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.o \ - $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.o \ - $(MODULES_DIR)/kernel/drivers/pcmcia/ds.o \ -,CONFIG_PCMCIA,,50,pcmcia_core yenta_socket ds)) - -$(eval $(call KMOD_template,PCMCIA_SERIAL,pcmcia-serial,\ - $(MODULES_DIR)/kernel/drivers/char/pcmcia/serial_cs.o \ -,CONFIG_PCMCIA_SERIAL_CS,kmod-pcmcia-core,51,serial_cs)) - - -# USB - -$(eval $(call KMOD_template,USB,usb-core,\ - $(MODULES_DIR)/kernel/drivers/usb/usbcore.o \ -,CONFIG_USB,,50,usbcore)) - -$(eval $(call KMOD_template,USB_OHCI,usb-ohci,\ - $(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o \ -,CONFIG_USB_OHCI,kmod-usb-core,60,usb-ohci)) - -$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\ - $(MODULES_DIR)/kernel/drivers/usb/host/uhci.o \ -,CONFIG_USB_UHCI_ALT,kmod-usb-core,60,uhci)) - -$(eval $(call KMOD_template,USB2,usb2,\ - $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.o \ -,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd)) - -$(eval $(call KMOD_template,USB_ACM,usb-acm,\ - $(MODULES_DIR)/kernel/drivers/usb/acm.o \ -,CONFIG_USB_ACM)) - -$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\ - $(MODULES_DIR)/kernel/drivers/usb/audio.o \ -,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio)) - -$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\ - $(MODULES_DIR)/kernel/drivers/usb/printer.o \ -,CONFIG_USB_PRINTER,kmod-usb-core,60,printer)) - -$(eval $(call KMOD_template,USB_SERIAL,usb-serial,\ - $(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.o \ -,CONFIG_USB_SERIAL,kmod-usb-core,60,usbserial)) - -$(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\ - $(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.o \ -,CONFIG_USB_SERIAL_BELKIN,kmod-usb-serial,61,belkin_sa)) - -$(eval $(call KMOD_template,USB_SERIAL_FTDI,usb-serial-ftdi,\ - $(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.o \ -,CONFIG_USB_SERIAL_FTDI_SIO,kmod-usb-serial,61,ftdi_sio)) - -$(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\ - $(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.o \ -,CONFIG_USB_SERIAL_MCT_U232,kmod-usb-serial,61,mct_u232)) - -$(eval $(call KMOD_template,USB_SERIAL_PL2303,usb-serial-pl2303,\ - $(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.o \ -,CONFIG_USB_SERIAL_PL2303,kmod-usb-serial,61,pl2303)) - -$(eval $(call KMOD_template,USB_SERIAL_VISOR,usb-serial-visor,\ - $(MODULES_DIR)/kernel/drivers/usb/serial/visor.o \ -,CONFIG_USB_SERIAL_VISOR,kmod-usb-serial,61,visor)) - -$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\ - $(MODULES_DIR)/kernel/drivers/scsi/*.o \ - $(MODULES_DIR)/kernel/drivers/usb/storage/*.o \ -,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage)) - - -# Misc. devices - -$(eval $(call KMOD_template,AX25,ax25,\ - $(MODULES_DIR)/kernel/net/ax25/ax25.o \ - $(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.o \ -,CONFIG_AX25,,90,ax25 mkiss)) - -$(eval $(call KMOD_template,BLUETOOTH,bluetooth,\ - $(MODULES_DIR)/kernel/net/bluetooth/*.o \ - $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/*.o \ - $(MODULES_DIR)/kernel/drivers/bluetooth/*.o \ -,CONFIG_BLUEZ)) - -$(eval $(call KMOD_template,SOFTDOG,softdog,\ - $(MODULES_DIR)/kernel/drivers/char/softdog.o \ -,CONFIG_SOFT_WATCHDOG,,95,softdog)) - - - diff --git a/target/linux/generic-2.6/modules.mk b/target/linux/generic-2.6/modules.mk deleted file mode 100644 index b582400bd6..0000000000 --- a/target/linux/generic-2.6/modules.mk +++ /dev/null @@ -1,357 +0,0 @@ -NF_2_6:=1 -include ../netfilter.mk - -# Networking - -$(eval $(call KMOD_template,ATM,atm,\ - $(MODULES_DIR)/kernel/net/atm/atm.ko \ - $(MODULES_DIR)/kernel/net/atm/br2684.ko \ - $(MODULES_DIR)/kernel/drivers/atm/atmtcp.ko \ -,CONFIG_ATM,,50,atm)) - -$(eval $(call KMOD_template,GRE,gre,\ - $(MODULES_DIR)/kernel/net/ipv4/ip_gre.ko \ -,CONFIG_NET_IPGRE)) - -$(eval $(call KMOD_template,IMQ,imq,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.ko \ - $(MODULES_DIR)/kernel/drivers/net/imq.ko \ -)) - -$(eval $(call KMOD_template,IPIP,ipip,\ - $(MODULES_DIR)/kernel/net/ipv4/ipip.ko \ -,CONFIG_NET_IPIP,,60,ipip)) - -$(eval $(call KMOD_template,IPV6,ipv6,\ - $(MODULES_DIR)/kernel/net/ipv6/ipv6.ko \ -,CONFIG_IPV6,,20,ipv6)) - -$(eval $(call KMOD_template,PPP,ppp,\ - $(MODULES_DIR)/kernel/drivers/net/ppp_async.ko \ - $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko \ - $(MODULES_DIR)/kernel/drivers/net/slhc.ko \ - $(MODULES_DIR)/kernel/lib/crc-ccitt.ko \ -,CONFIG_PPP)) - -#$(eval $(call KMOD_template,MPPE,mppe,\ -# $(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.ko \ -#,CONFIG_PPP_MPPE_MPPC)) - -$(eval $(call KMOD_template,PPPOATM,pppoatm,\ - $(MODULES_DIR)/kernel/net/atm/pppoatm.ko \ -,CONFIG_PPPOATM)) - -$(eval $(call KMOD_template,PPPOE,pppoe,\ - $(MODULES_DIR)/kernel/drivers/net/pppoe.ko \ - $(MODULES_DIR)/kernel/drivers/net/pppox.ko \ -,CONFIG_PPPOE)) - -$(eval $(call KMOD_template,SCHED,sched,\ - $(MODULES_DIR)/kernel/net/sched/*.ko \ -)) - -$(eval $(call KMOD_template,TUN,tun,\ - $(MODULES_DIR)/kernel/drivers/net/tun.ko \ -,CONFIG_TUN,,20,tun)) - - -# Filtering / Firewalling - -$(eval $(call KMOD_template,ARPTABLES,arptables,\ - $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.ko \ -,CONFIG_IP_NF_ARPTABLES)) - -$(eval $(call KMOD_template,EBTABLES,ebtables,\ - $(MODULES_DIR)/kernel/net/bridge/netfilter/*.ko \ -,CONFIG_BRIDGE_NF_EBTABLES)) - -# metapackage for compatibility ... -$(eval $(call KMOD_template,IPTABLES_EXTRA,iptables-extra,\ -,,kmod-ipt-conntrack kmod-ipt-extra kmod-ipt-filter kmod-ipt-ipopt kmod-ipt-ipsec kmod-ipt-nat kmod-ipt-nat-extra kmod-ipt-queue kmod-ipt-ulogd)) - -$(eval $(call KMOD_template,IPT_CONNTRACK,ipt-conntrack,\ - $(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_EXTRA,ipt-extra,\ - $(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_FILTER,ipt-filter,\ - $(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_IPOPT,ipt-ipopt,\ - $(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_IPSEC,ipt-ipsec,\ - $(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_NAT,ipt-nat,\ - $(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_NAT_EXTRA,ipt-nat-extra,\ - $(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -,,,40,$(IPT_NAT_EXTRA-m))) - -$(eval $(call KMOD_template,IPT_QUEUE,ipt-queue,\ - $(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IPT_ULOG,ipt-ulog,\ - $(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).ko) \ -)) - -$(eval $(call KMOD_template,IP6TABLES,ip6tables,\ - $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.ko \ -,CONFIG_IP6_NF_IPTABLES,kmod-ipv6)) - - -# Block devices - -$(eval $(call KMOD_template,IDE,ide,\ - $(MODULES_DIR)/kernel/drivers/ide/*.ko \ - $(MODULES_DIR)/kernel/drivers/ide/*/*.ko \ -,CONFIG_IDE)) - -$(eval $(call KMOD_template,LOOP,loop,\ - $(MODULES_DIR)/kernel/drivers/block/loop.ko \ -,CONFIG_BLK_DEV_LOOP,,20,loop)) - -$(eval $(call KMOD_template,NBD,nbd,\ - $(MODULES_DIR)/kernel/drivers/block/nbd.ko \ -,CONFIG_BLK_DEV_NBD,,20,nbd)) - - -# Crypto - -$(eval $(call KMOD_template,CRYPTO,crypto,\ - $(MODULES_DIR)/kernel/crypto/*.ko \ -)) - - -# Filesystems - -$(eval $(call KMOD_template,FS_CIFS,fs-cifs,\ - $(MODULES_DIR)/kernel/fs/cifs/cifs.ko \ -,CONFIG_CIFS,kmod-nls-base,30,cifs)) - -$(eval $(call KMOD_template,FS_MINIX,fs-minix,\ - $(MODULES_DIR)/kernel/fs/minix/minix.ko \ -,CONFIG_MINIX_FS,,30,minix)) - -$(eval $(call KMOD_template,FS_EXT2,fs-ext2,\ - $(MODULES_DIR)/kernel/fs/ext2/ext2.ko \ -,CONFIG_EXT2_FS,,30,ext2)) - -$(eval $(call KMOD_template,FS_EXT3,fs-ext3,\ - $(MODULES_DIR)/kernel/fs/ext3/ext3.ko \ - $(MODULES_DIR)/kernel/fs/jbd/jbd.ko \ -,CONFIG_EXT3_FS,,30,jbd ext3)) - -$(eval $(call KMOD_template,FS_HFSPLUS,fs-hfsplus,\ - $(MODULES_DIR)/kernel/fs/hfsplus/hfsplus.ko \ -,CONFIG_HFSPLUS_FS,kmod-nls-base,30,hfsplus)) - -$(eval $(call KMOD_template,FS_NFS,fs-nfs,\ - $(MODULES_DIR)/kernel/fs/lockd/lockd.ko \ - $(MODULES_DIR)/kernel/fs/nfs/nfs.ko \ - $(MODULES_DIR)/kernel/net/sunrpc/sunrpc.ko \ -,CONFIG_NFS_FS,,30,sunrpc lockd nfs)) - -$(eval $(call KMOD_template,FS_VFAT,fs-vfat,\ - $(MODULES_DIR)/kernel/fs/fat/fat.ko \ - $(MODULES_DIR)/kernel/fs/vfat/vfat.ko \ -,CONFIG_VFAT_FS,kmod-nls-base,30,fat vfat)) - -$(eval $(call KMOD_template,FS_XFS,fs-xfs,\ - $(MODULES_DIR)/kernel/fs/xfs/xfs.ko \ -,CONFIG_XFS_FS,,30,xfs)) - - -# Multimedia - -$(eval $(call KMOD_template,PWC,pwc,\ - $(MODULES_DIR)/kernel/drivers/usb/media/pwc/pwc.ko \ -,CONFIG_USB_PWC,kmod-videodev,63,pwc)) - -$(eval $(call KMOD_template,SOUNDCORE,soundcore,\ - $(MODULES_DIR)/kernel/sound/soundcore.ko \ -,CONFIG_SOUND,,30,soundcore)) - -$(eval $(call KMOD_template,VIDEODEV,videodev,\ - $(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat.ko \ - $(MODULES_DIR)/kernel/drivers/media/video/v4l2-common.ko \ - $(MODULES_DIR)/kernel/drivers/media/video/videodev.ko \ -,CONFIG_VIDEO_DEV,,62,videodev)) - - -# NLS - -$(eval $(call KMOD_template,NLS_BASE,nls-base,\ - $(MODULES_DIR)/kernel/fs/nls/nls_base.ko \ -,CONFIG_NLS,,20,nls_base)) - -$(eval $(call KMOD_template,NLS_CP437,nls-cp437,\ - $(MODULES_DIR)/kernel/fs/nls/nls_cp437.ko \ -,CONFIG_NLS_CODEPAGE_437,,20,nls_cp437)) - -$(eval $(call KMOD_template,NLS_CP850,nls-cp850,\ - $(MODULES_DIR)/kernel/fs/nls/nls_cp850.ko \ -,CONFIG_NLS_CODEPAGE_850,,20,nls_cp850)) - -$(eval $(call KMOD_template,NLS_ISO8859_1,nls-iso8859-1,\ - $(MODULES_DIR)/kernel/fs/nls/nls_iso8859-1.ko \ -,CONFIG_NLS_ISO8859_1,,20,nls_iso8859-1)) - -$(eval $(call KMOD_template,NLS_ISO8859_15,nls-iso8859-15,\ - $(MODULES_DIR)/kernel/fs/nls/nls_iso8859-15.ko \ -,CONFIG_NLS_ISO8859_15,,20,nls_iso8859-15)) - -$(eval $(call KMOD_template,NLS_UTF8,nls-utf8,\ - $(MODULES_DIR)/kernel/fs/nls/nls_utf8.ko \ -,CONFIG_NLS_UTF8,,20,nls_utf8)) - - -# Network devices - -$(eval $(call KMOD_template,NET_3C59X,net-3c59x,\ - $(MODULES_DIR)/kernel/drivers/net/3c59x.ko \ -,CONFIG_VORTEX,,10,3c59x)) - -$(eval $(call KMOD_template,NET_8139TOO,net-8139too,\ - $(MODULES_DIR)/kernel/drivers/net/8139too.ko \ -,CONFIG_8139TOO,,10,8139too)) - -$(eval $(call KMOD_template,NET_AIRO,net-airo,\ - $(MODULES_DIR)/kernel/drivers/net/wireless/airo.ko \ -,CONFIG_AIRO,,10,airo)) - -$(eval $(call KMOD_template,NET_E100,net-e100,\ - $(MODULES_DIR)/kernel/drivers/net/e100.ko \ -,CONFIG_E100,,10,e100)) - -$(eval $(call KMOD_template,NET_HERMES,net-hermes,\ - $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.ko \ - $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.ko \ -,CONFIG_HERMES,,10,hermes orinoco)) - -$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-pci,\ - $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_pci.ko \ -,CONFIG_PCI_HERMES,kmod-net-hermes,11,orinoco_pci)) - -$(eval $(call KMOD_template,NET_HERMES_PCI,net-hermes-plx,\ - $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.ko \ -,CONFIG_PLX_HERMES,kmod-net-hermes,11,orinoco_plx)) - -$(eval $(call KMOD_template,NET_NATSEMI,net-natsemi,\ - $(MODULES_DIR)/kernel/drivers/net/natsemi.ko \ -,CONFIG_NATSEMI,,10,natsemi)) - -$(eval $(call KMOD_template,NET_PRISM54,net-prism54,\ - $(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.ko \ -,CONFIG_PRISM54,,10,prism54)) - - -# PCMCIA/CardBus - -$(eval $(call KMOD_template,PCMCIA_CORE,pcmcia-core,\ - $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia.ko \ - $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.ko \ - $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.ko \ - $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic.ko \ -,CONFIG_PCMCIA,,50,pcmcia_core pcmcia yenta_socket rsrc_nonstatic)) - -$(eval $(call KMOD_template,PCMCIA_SERIAL,pcmcia-serial,\ - $(MODULES_DIR)/kernel/drivers/serial/serial_cs.ko \ -,CONFIG_SERIAL_8250_CS)) - - -# USB - -$(eval $(call KMOD_template,USB,usb-core,\ - $(MODULES_DIR)/kernel/drivers/usb/core/usbcore.ko \ -,CONFIG_USB,,50,usbcore)) - -$(eval $(call KMOD_template,USB_OHCI,usb-ohci,\ - $(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd.ko \ -,CONFIG_USB_OHCI_HCD,kmod-usb-core,60,ohci-hcd)) - -$(eval $(call KMOD_template,USB_UHCI,usb-uhci,\ - $(MODULES_DIR)/kernel/drivers/usb/host/uhci-hcd.ko \ -,CONFIG_USB_UHCI_HCD,kmod-usb-core,60,uhci-hcd)) - -$(eval $(call KMOD_template,USB2,usb2,\ - $(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.ko \ -,CONFIG_USB_EHCI_HCD,kmod-usb-core,60,ehci-hcd)) - -$(eval $(call KMOD_template,USB_ACM,usb-acm,\ - $(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko \ -,CONFIG_USB_ACM)) - -$(eval $(call KMOD_template,USB_AUDIO,usb-audio,\ - $(MODULES_DIR)/kernel/drivers/usb/class/audio.ko \ -,CONFIG_USB_AUDIO,kmod-soundcore kmod-usb-core,61,audio)) - -$(eval $(call KMOD_template,USB_PRINTER,usb-printer,\ - $(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko \ -,CONFIG_USB_PRINTER,kmod-usb-core,60,usblp)) - -$(eval $(call KMOD_template,USB_SERIAL,usb-serial,\ - $(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.ko \ -,CONFIG_USB_SERIAL,kmod-usb-core,60,usbserial)) - -$(eval $(call KMOD_template,USB_SERIAL_BELKIN,usb-serial-belkin,\ - $(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.ko \ -,CONFIG_USB_SERIAL_BELKIN,kmod-usb-serial,61,belkin_sa)) - -$(eval $(call KMOD_template,USB_SERIAL_FTDI,usb-serial-ftdi,\ - $(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.ko \ -,CONFIG_USB_SERIAL_FTDI_SIO,kmod-usb-serial,61,ftdi_sio)) - -$(eval $(call KMOD_template,USB_SERIAL_MCT_U232,usb-serial-mct-u232,\ - $(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.ko \ -,CONFIG_USB_SERIAL_MCT_U232,kmod-usb-serial,61,mct_u232)) - -$(eval $(call KMOD_template,USB_SERIAL_PL2303,usb-serial-pl2303,\ - $(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.ko \ -,CONFIG_USB_SERIAL_PL2303,kmod-usb-serial,61,pl2303)) - -$(eval $(call KMOD_template,USB_SERIAL_VISOR,usb-serial-visor,\ - $(MODULES_DIR)/kernel/drivers/usb/serial/visor.ko \ -,CONFIG_USB_SERIAL_VISOR,kmod-usb-serial,61,visor)) - -$(eval $(call KMOD_template,USB_STORAGE,usb-storage,\ - $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.ko \ - $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.ko \ - $(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.ko \ -,CONFIG_USB_STORAGE,kmod-usb-core,60,scsi_mod sd_mod usb-storage)) - -$(eval $(call KMOD_template,USB_ATM,usb-atm,\ - $(MODULES_DIR)/kernel/drivers/usb/atm/usbatm.ko \ - ,CONFIG_USB_ATM,kmod-usb-atm,50,usbatm)) - -$(eval $(call KMOD_template,USB_ATM_SPEEDTOUCH,usb-atm-speedtouch,\ - $(MODULES_DIR)/kernel/drivers/usb/atm/speedtch.ko \ - ,CONFIG_USB_SPEEDTOUCH,kmod-usb-atm-speedtouch,50,speedtch)) - -# Misc. devices - -$(eval $(call KMOD_template,AX25,ax25,\ - $(MODULES_DIR)/kernel/net/ax25/ax25.ko \ - $(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.ko \ -,CONFIG_AX25,,90,ax25 mkiss)) - -$(eval $(call KMOD_template,BLUETOOTH,bluetooth,\ - $(MODULES_DIR)/kernel/net/bluetooth/bluetooth.ko \ - $(MODULES_DIR)/kernel/net/bluetooth/l2cap.ko \ - $(MODULES_DIR)/kernel/net/bluetooth/sco.ko \ - $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.ko \ - $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.ko \ - $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.ko \ -,CONFIG_BT)) - - diff --git a/target/linux/image/ar7/Makefile b/target/linux/image/ar7/Makefile index 4ac6d3015f..4b22f90df2 100644 --- a/target/linux/image/ar7/Makefile +++ b/target/linux/image/ar7/Makefile @@ -1,4 +1,4 @@ -include ../image.mk +include $(TOPDIR)/include/image.mk PKG_BUILD_DIR:=$(BUILD_DIR)/ar7loader diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile index c8dab056a0..5091d3f40c 100644 --- a/target/linux/image/aruba/Makefile +++ b/target/linux/image/aruba/Makefile @@ -1,4 +1,4 @@ -include ../image.mk +include $(TOPDIR)/include/image.mk LOADADDR = 0x81000000 # RAM start + 16M KERNEL_ENTRY = 0x80100000 diff --git a/target/linux/image/au1000/Makefile b/target/linux/image/au1000/Makefile index 2607ed9eb3..682670a22c 100644 --- a/target/linux/image/au1000/Makefile +++ b/target/linux/image/au1000/Makefile @@ -1,4 +1,4 @@ -include ../image.mk +include $(TOPDIR)/include/image.mk LOADADDR = 0x8108c8f4 # RAM start + 16M KERNEL_ENTRY = 0x80100000 # Default kernel entry in arch/mips/Makefile diff --git a/target/linux/image/brcm/Makefile b/target/linux/image/brcm/Makefile index df2a42ea5c..d219dc354b 100644 --- a/target/linux/image/brcm/Makefile +++ b/target/linux/image/brcm/Makefile @@ -1,4 +1,4 @@ -include ../image.mk +include $(TOPDIR)/include/image.mk define Build/Compile rm -f $(KDIR)/loader.gz diff --git a/target/linux/image/generic/Makefile b/target/linux/image/generic/Makefile index f87fb116dd..b9efc95b9b 100644 --- a/target/linux/image/generic/Makefile +++ b/target/linux/image/generic/Makefile @@ -1,4 +1,4 @@ -include ../image.mk +include $(TOPDIR)/include/image.mk # use default targets for everything diff --git a/target/linux/image/image.mk b/target/linux/image/image.mk deleted file mode 100644 index 92143d64e8..0000000000 --- a/target/linux/image/image.mk +++ /dev/null @@ -1,55 +0,0 @@ -include $(TOPDIR)/rules.mk - -KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) - -ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) -ifeq ($(CONFIG_TARGET_ROOTFS_JFFS2),y) -include $(TOPDIR)/target/linux/image/jffs2.mk -endif - -ifeq ($(CONFIG_TARGET_ROOTFS_SQUASHFS_LZMA),y) -include $(TOPDIR)/target/linux/image/squashfs.mk -endif - -ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y) -include $(TOPDIR)/target/linux/image/tgz.mk -endif -endif - -define Image/mkfs/prepare/default - find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644 - find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755 - find $(BUILD_DIR)/root -type d | xargs chmod 0755 - mkdir -p $(BUILD_DIR)/root/tmp - chmod 0777 $(BUILD_DIR)/root/tmp -endef - -define Image/mkfs/prepare - $(call Image/mkfs/prepare/default) -endef - -define BuildImage -compile: - $(call Build/Compile) - -install: - $(call Image/Prepare) - $(call Image/mkfs/prepare) - $(call Image/BuildKernel) - $(call Image/mkfs/jffs2) - $(call Image/mkfs/squashfs) - $(call Image/mkfs/tgz) - -clean: - $(call Build/Clean) -endef - -compile-targets: -install-targets: -clean-targets: - -source: -prepare: -compile: compile-targets -install: compile install-targets -clean: clean-targets diff --git a/target/linux/image/jffs2.mk b/target/linux/image/jffs2.mk deleted file mode 100644 index a0e14daa90..0000000000 --- a/target/linux/image/jffs2.mk +++ /dev/null @@ -1,30 +0,0 @@ -ifneq ($(CONFIG_BIG_ENDIAN),y) -JFFS2OPTS := --pad --little-endian --squash -else -JFFS2OPTS := --pad --big-endian --squash -endif - -define Image/mkfs/jffs2 - rm -rf $(BUILD_DIR)/root/jffs - - $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root - $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root - - $(call Image/Build,jffs2-64k) - $(call Image/Build,jffs2-128k) -endef - -jffs2-source: FORCE - $(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 source - -$(STAGING_DIR)/bin/mkfs.jffs2: - $(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 compile - -jffs2-clean: FORCE - $(MAKE) -C $(TOPDIR)/target/linux/image/jffs2 clean - rm -f $(KDIR)/root.jffs2* - -source: jffs2-source -compile-targets: $(STAGING_DIR)/bin/mkfs.jffs2 -clean-targets: jffs2-clean - diff --git a/target/linux/image/jffs2/Makefile b/target/linux/image/jffs2/Makefile deleted file mode 100644 index b673c438a6..0000000000 --- a/target/linux/image/jffs2/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -include $(TOPDIR)/rules.mk - -MTD_DIR:=$(BUILD_DIR)/mtd-20050122.orig -MTD_SOURCE=mtd_20050122.orig.tar.gz -MTD_SITE=http://ftp.debian.org/debian/pool/main/m/mtd -MTD_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338 -MKFS_JFFS2=$(MTD_DIR)/util/mkfs.jffs2 - -$(DL_DIR)/$(MTD_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(MTD_SOURCE) $(MTD_MD5SUM) $(MTD_SITE) - -$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) - zcat $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) -xvf - - $(PATCH) $(MTD_DIR) ./patches - touch $(MTD_DIR)/.unpacked - -$(MTD_DIR)/util/mkfs.jffs2: $(MTD_DIR)/.unpacked - $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util - -$(STAGING_DIR)/bin/mkfs.jffs2: $(MTD_DIR)/util/mkfs.jffs2 - $(CP) $< $@ - -source: $(DL_DIR)/$(MTD_SOURCE) -prepare: $(MTD_DIR)/.unpacked -compile: $(MTD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/mkfs.jffs2 -install: -clean: FORCE - rm -rf $(MTD_DIR) $(STAGING_DIR)/bin/mkfs.jffs2 - diff --git a/target/linux/image/jffs2/patches/gcc4-fix.patch b/target/linux/image/jffs2/patches/gcc4-fix.patch deleted file mode 100644 index 50c8edb47e..0000000000 --- a/target/linux/image/jffs2/patches/gcc4-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN mtd-20050122.orig.old/include/mtd/jffs2-user.h mtd-20050122.orig.dev/include/mtd/jffs2-user.h ---- mtd-20050122.orig.old/include/mtd/jffs2-user.h 2004-05-05 13:57:54.000000000 +0200 -+++ mtd-20050122.orig.dev/include/mtd/jffs2-user.h 2005-07-02 10:03:09.000000000 +0200 -@@ -19,8 +19,6 @@ - #undef je32_to_cpu - #undef jemode_to_cpu - --extern int target_endian; -- - #define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); }) - #define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); }) - -diff -urN mtd.old/util/jffs3.h mtd.dev/util/jffs3.h ---- mtd.old/util/jffs3.h 2005-01-22 00:00:13.000000000 +0100 -+++ mtd.dev/util/jffs3.h 2005-07-17 17:48:24.000000000 +0200 -@@ -177,8 +177,6 @@ - #undef je32_to_cpu - #undef jemode_to_cpu - --extern int target_endian; -- - #define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); }) - #define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); }) - diff --git a/target/linux/image/rb532/Makefile b/target/linux/image/rb532/Makefile index ed419c8c6d..53adfc432f 100644 --- a/target/linux/image/rb532/Makefile +++ b/target/linux/image/rb532/Makefile @@ -1,4 +1,4 @@ -include ../image.mk +include $(TOPDIR)/include/image.mk LOADADDR = 0x81000000 # RAM start + 16M KERNEL_ENTRY = 0x80101000 diff --git a/target/linux/image/squashfs.mk b/target/linux/image/squashfs.mk deleted file mode 100644 index e01766c0ca..0000000000 --- a/target/linux/image/squashfs.mk +++ /dev/null @@ -1,25 +0,0 @@ -ifneq ($(CONFIG_BIG_ENDIAN),y) -ENDIAN := le -else -ENDIAN := be -endif - -squashfs-source: FORCE - $(MAKE) -C $(TOPDIR)/target/linux/image/squashfs source - -$(STAGING_DIR)/bin/mksquashfs-lzma: - $(MAKE) -C $(TOPDIR)/target/linux/image/squashfs compile - -squashfs-clean: FORCE - $(MAKE) -C $(TOPDIR)/target/linux/image/squashfs clean - rm -f $(KDIR)/root.squashfs - -define Image/mkfs/squashfs - @mkdir -p $(BUILD_DIR)/root/jffs - $(STAGING_DIR)/bin/mksquashfs-lzma $(BUILD_DIR)/root $(KDIR)/root.squashfs -nopad -noappend -root-owned -$(ENDIAN) - $(call Image/Build,squashfs) -endef - -FILESYSTEMS += squashfs -compile-targets: $(STAGING_DIR)/bin/mksquashfs-lzma -clean-targets: squashfs-clean diff --git a/target/linux/image/squashfs/Makefile b/target/linux/image/squashfs/Makefile deleted file mode 100644 index a2b3671876..0000000000 --- a/target/linux/image/squashfs/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -include $(TOPDIR)/rules.mk - -SQUASHFSLZMA_DIR=$(BUILD_DIR)/squashfs3.0 -SQUASHFSLZMA_SOURCE=squashfs3.0.tar.gz -SQUASHFSLZMA_SITE=@SF/squashfs -SQUASHFSLZMA_MD5SUM=9fd05d0bfbb712f5fb95edafea5bc733 - -$(DL_DIR)/$(SQUASHFSLZMA_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(SQUASHFSLZMA_SOURCE) $(SQUASHFSLZMA_MD5SUM) $(SQUASHFSLZMA_SITE) - -$(SQUASHFSLZMA_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) - zcat $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) | tar -C $(BUILD_DIR) -xvf - - $(PATCH) $(SQUASHFSLZMA_DIR) ./patches - touch $(SQUASHFSLZMA_DIR)/.unpacked - -$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/.unpacked - $(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(BUILD_DIR)/lzma - -$(STAGING_DIR)/bin/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma - $(CP) $< $@ - -source: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) -prepare: $(SQUASHFSLZMA_DIR)/.unpacked -compile: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/mksquashfs-lzma -install: -clean: FORCE - rm -rf $(SQUASHFSLZMA_DIR) diff --git a/target/linux/image/squashfs/patches/100-lzma.patch b/target/linux/image/squashfs/patches/100-lzma.patch deleted file mode 100644 index 85aa21fb92..0000000000 --- a/target/linux/image/squashfs/patches/100-lzma.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Nur squashfs3.0/squashfs-tools/Makefile squashfs3.0-owrt/squashfs-tools/Makefile ---- squashfs3.0/squashfs-tools/Makefile 2006-03-15 22:36:20.000000000 +0100 -+++ squashfs3.0-owrt/squashfs-tools/Makefile 2006-03-21 11:14:08.000000000 +0100 -@@ -1,4 +1,5 @@ - INCLUDEDIR = . -+#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib - - CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 - -@@ -7,6 +8,9 @@ - mksquashfs: mksquashfs.o read_fs.o sort.o - $(CC) mksquashfs.o read_fs.o sort.o -lz -o $@ - -+mksquashfs-lzma: mksquashfs.o read_fs.o sort.o -+ $(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma -o $@ -+ - mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h - - read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h -@@ -17,3 +21,5 @@ - $(CC) unsquashfs.o -lz -o $@ - - unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h -+ -+clean: diff --git a/target/linux/image/tgz.mk b/target/linux/image/tgz.mk deleted file mode 100644 index 39adb69257..0000000000 --- a/target/linux/image/tgz.mk +++ /dev/null @@ -1,3 +0,0 @@ -define Image/mkfs/tgz - tar -zcf $(BIN_DIR)/openwrt-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ . -endef diff --git a/target/linux/image/x86/Makefile b/target/linux/image/x86/Makefile index 69f9bf470e..d76294f150 100644 --- a/target/linux/image/x86/Makefile +++ b/target/linux/image/x86/Makefile @@ -1,4 +1,4 @@ -include ../image.mk +include $(TOPDIR)/include/image.mk define Image/Build cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img diff --git a/target/linux/image/xscale/Makefile b/target/linux/image/xscale/Makefile index 09616d409f..d94d7f07ca 100644 --- a/target/linux/image/xscale/Makefile +++ b/target/linux/image/xscale/Makefile @@ -1,4 +1,4 @@ -include ../image.mk +include $(TOPDIR)/include/image.mk define Image/Build ifneq ($(FS),jffs2-64k) diff --git a/target/linux/kernel.mk b/target/linux/kernel.mk deleted file mode 100644 index cd74fccfb8..0000000000 --- a/target/linux/kernel.mk +++ /dev/null @@ -1,122 +0,0 @@ -LINUX_SOURCE:=$(LINUX_NAME).tar.bz2 -LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ - http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ - http://www.kernel.org/pub/linux/kernel/v$(KERNEL) \ - http://www.de.kernel.org/pub/linux/kernel/v$(KERNEL) - -KERNEL_IDIR:=$(LINUX_BUILD_DIR)/kernel-ipkg - -$(TARGETS): $(PACKAGE_DIR) - -$(LINUX_DIR): - mkdir -p $@ - -$(PACKAGE_DIR): - mkdir -p $@ - -$(DL_DIR)/$(LINUX_SOURCE): - -mkdir -p $(DL_DIR) - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LINUX_SOURCE) $(LINUX_KERNEL_MD5SUM) $(LINUX_SITE) - -$(LINUX_DIR)/.unpacked: $(DL_DIR)/$(LINUX_SOURCE) - -mkdir -p $(LINUX_BUILD_DIR) - bzcat $(DL_DIR)/$(LINUX_SOURCE) | tar -C $(LINUX_BUILD_DIR) $(TAR_OPTIONS) - - touch $@ - -ifeq ($(KERNEL),2.4) -$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched - $(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" \ - $(LINUX_DIR)/Makefile \ - $(LINUX_DIR)/arch/*/Makefile - $(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile - $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_KARCH) oldconfig include/linux/compile.h include/linux/version.h - touch $@ - -$(LINUX_DIR)/.depend_done: $(LINUX_DIR)/.configured - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) dep - touch $@ - -$(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.depend_done -else -$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) oldconfig prepare scripts - touch $@ -endif - -ramdisk-config: $(LINUX_DIR)/.configured FORCE - mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old - grep -v INITRAMFS $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config -ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) - echo 'CONFIG_INITRAMFS_SOURCE="../../root"' >> $(LINUX_DIR)/.config - echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config - echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config - mkdir -p $(BUILD_DIR)/root/etc/init.d - $(CP) ../generic-2.6/files/init $(BUILD_DIR)/root/ -else - rm -f $(BUILD_DIR)/root/init $(BUILD_DIR)/root/etc/init.d/S00initramfs - echo 'CONFIG_INITRAMFS_SOURCE=""' >> $(LINUX_DIR)/.config -endif - -$(LINUX_DIR)/vmlinux: $(STAMP_DIR)/.linux-compile pkg-install ramdisk-config - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) - -$(LINUX_KERNEL): $(LINUX_DIR)/vmlinux - $(TARGET_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ - touch -c $(LINUX_KERNEL) - -$(LINUX_DIR)/.modules_done: - rm -rf $(LINUX_BUILD_DIR)/modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install - touch $(LINUX_DIR)/.modules_done - -$(STAMP_DIR)/.linux-compile: - @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) - ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux - touch $@ - -$(KERNEL_IPKG): - rm -rf $(KERNEL_IDIR) - mkdir -p $(KERNEL_IDIR)/etc - $(SCRIPT_DIR)/make-ipkg-dir.sh $(KERNEL_IDIR) ../control/kernel.control $(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) $(ARCH) - if [ -f ./config/$(BOARD).modules ]; then \ - cp ./config/$(BOARD).modules $(KERNEL_IDIR)/etc/modules; \ - fi - $(IPKG_BUILD) $(KERNEL_IDIR) $(LINUX_BUILD_DIR) - -$(BUILD_DIR)/kernel.mk: $(LINUX_DIR) FORCE - echo "BOARD:=$(BOARD)" > $@ - echo "LINUX_NAME:=$(LINUX_NAME)" >> $@ - echo "LINUX_VERSION:=$(LINUX_VERSION)" >> $@ - echo "LINUX_RELEASE:=$(LINUX_RELEASE)" >> $@ - -pkg-install: FORCE - @{ [ "$(INSTALL_TARGETS)" != "" ] && $(IPKG) install $(INSTALL_TARGETS) || true; } - -source: $(DL_DIR)/$(LINUX_SOURCE) -prepare: $(BUILD_DIR)/kernel.mk - @mkdir -p $(STAMP_DIR) $(PACKAGE_DIR) - @$(MAKE) $(LINUX_DIR)/.configured - -compile: prepare $(STAMP_DIR)/.linux-compile - -install: compile $(LINUX_KERNEL) - -mostlyclean: FORCE - rm -f $(STAMP_DIR)/.linux-compile - rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.modules_done - rm -f $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION)/.drivers-unpacked - $(MAKE) -C $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) clean - rm -f $(LINUX_KERNEL) - -rebuild: FORCE - -$(MAKE) mostlyclean - if [ -f $(LINUX_KERNEL) ]; then \ - $(MAKE) clean; \ - fi - $(MAKE) compile $(MAKE_TRACE) - -clean: FORCE - rm -f $(STAMP_DIR)/.linux-compile - rm -rf $(LINUX_BUILD_DIR) - rm -f $(TARGETS) diff --git a/target/linux/netfilter.mk b/target/linux/netfilter.mk deleted file mode 100644 index 66cb747dea..0000000000 --- a/target/linux/netfilter.mk +++ /dev/null @@ -1,116 +0,0 @@ -# $Id: netfilter.mk 2411 2005-11-11 03:41:43Z nico $ - -ifeq ($(NF_2_6),1) -P_V4:=ipv4/netfilter/ -P_XT:=netfilter/ -else -P_V4:= -P_XT:= -endif - -IPT_CONNTRACK-m := -IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_CONNMARK) += $(P_V4)ipt_connmark -IPT_CONNTRACK-$(CONFIG_IP_NF_TARGET_CONNMARK) += $(P_V4)ipt_CONNMARK -IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_CONNTRACK) += $(P_V4)ipt_conntrack -IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_HELPER) += $(P_V4)ipt_helper -IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_STATE) += $(P_V4)ipt_state -IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_CONNTRACK) += $(P_XT)xt_conntrack -IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += $(P_XT)xt_helper -IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_STATE) += $(P_XT)xt_state - - -IPT_EXTRA-m := -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_CONDITION) += $(P_V4)ipt_condition -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_CONNBYTES) += $(P_V4)ipt_connbytes -IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_CONNBYTES) += $(P_XT)xt_connbytes -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_LIMIT) += $(P_V4)ipt_limit -IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_LIMIT) += $(P_XT)xt_limit -IPT_EXTRA-$(CONFIG_IP_NF_TARGET_LOG) += $(P_V4)ipt_LOG -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_MULTIPORT) += $(P_XT)xt_multiport -IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_MULTIPORT) += $(P_XT)xt_multiport -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_OWNER) += $(P_V4)ipt_owner -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_PHYSDEV) += $(P_V4)ipt_physdev -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_PKTTYPE) += $(P_V4)ipt_pkttype -IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_PKTTYPE) += $(P_XT)xt_pkttype -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_QUOTA) += $(P_V4)ipt_quota -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_RECENT) += $(P_V4)ipt_recent -IPT_EXTRA-$(CONFIG_IP_NF_TARGET_REJECT) += $(P_V4)ipt_REJECT -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_STRING) += $(P_V4)ipt_string -IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_STRING) += $(P_XT)xt_string - -IPT_FILTER-m := -IPT_FILTER-$(CONFIG_IP_NF_MATCH_IPP2P) += $(P_V4)ipt_ipp2p -IPT_FILTER-$(CONFIG_IP_NF_MATCH_LAYER7) += $(P_V4)ipt_layer7 - -IPT_IMQ-m := -IPT_IMQ-$(CONFIG_IP_NF_TARGET_IMQ) += $(P_V4)ipt_IMQ - -IPT_IPOPT-m := -IPT_IPOPT-$(CONFIG_IP_NF_MATCH_DSCP) += $(P_V4)ipt_dscp -IPT_IPOPT-$(CONFIG_IP_NF_TARGET_DSCP) += $(P_V4)ipt_DSCP -IPT_IPOPT-$(CONFIG_IP_NF_MATCH_ECN) += $(P_V4)ipt_ecn -IPT_IPOPT-$(CONFIG_IP_NF_TARGET_ECN) += $(P_V4)ipt_ECN -IPT_IPOPT-$(CONFIG_IP_NF_MATCH_LENGTH) += $(P_V4)ipt_length -IPT_IPOPT-$(CONFIG_NETFILTER_XT_MATCH_LENGTH) += $(P_XT)xt_length -IPT_IPOPT-$(CONFIG_IP_NF_MATCH_MAC) += $(P_V4)ipt_mac -IPT_IPOPT-$(CONFIG_NETFILTER_XT_MATCH_MAC) += $(P_XT)xt_mac -IPT_IPOPT-$(CONFIG_IP_NF_MATCH_MARK) += $(P_V4)ipt_mark -IPT_IPOPT-$(CONFIG_NETFILTER_XT_MATCH_MARK) += $(P_XT)xt_mark -IPT_IPOPT-$(CONFIG_IP_NF_TARGET_MARK) += $(P_V4)ipt_MARK -IPT_IPOPT-$(CONFIG_NETFILTER_XT_TARGET_MARK) += $(P_XT)xt_MARK -IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TCPMSS) += $(P_V4)ipt_tcpmss -IPT_IPOPT-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += $(P_XT)xt_tcpmss -IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TCPMSS) += $(P_V4)ipt_TCPMSS -IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TOS) += $(P_V4)ipt_tos -IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TIME) += $(P_V4)ipt_time -IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TOS) += $(P_V4)ipt_TOS -IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TTL) += $(P_V4)ipt_ttl -IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TTL) += $(P_V4)ipt_TTL -IPT_IPOPT-$(CONFIG_IP_NF_MATCH_UNCLEAN) += $(P_V4)ipt_unclean - -IPT_IPSEC-m := -IPT_IPSEC-$(CONFIG_IP_NF_MATCH_AH_ESP) += $(P_V4)ipt_ah $(P_V4)ipt_esp -IPT_IPSEC-$(CONFIG_IP_NF_MATCH_AH) += $(P_V4)ipt_ah -IPT_IPSEC-$(CONFIG_NETFILTER_XT_MATCH_ESP) += $(P_XT)xt_esp - -IPT_NAT-m := -IPT_NAT-$(CONFIG_IP_NF_NAT) += $(P_V4)ipt_SNAT $(P_V4)ipt_DNAT -IPT_NAT-$(CONFIG_IP_NF_TARGET_MASQUERADE) += $(P_V4)ipt_MASQUERADE -IPT_NAT-$(CONFIG_IP_NF_TARGET_MIRROR) += $(P_V4)ipt_MIRROR -IPT_NAT-$(CONFIG_IP_NF_TARGET_REDIRECT) += $(P_V4)ipt_REDIRECT - -IPT_NAT_EXTRA-m := -IPT_NAT_EXTRA-$(CONFIG_IP_NF_AMANDA) += $(P_V4)ip_conntrack_amanda -IPT_NAT_EXTRA-$(CONFIG_IP_NF_CT_PROTO_GRE) += $(P_V4)ip_conntrack_proto_gre -IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_PROTO_GRE) += $(P_V4)ip_nat_proto_gre -IPT_NAT_EXTRA-$(CONFIG_IP_NF_H323) += $(P_V4)ip_conntrack_h323 -IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_H323) += $(P_V4)ip_nat_h323 -IPT_NAT_EXTRA-$(CONFIG_IP_NF_MMS) += $(P_V4)ip_conntrack_mms -IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_MMS) += $(P_V4)ip_nat_mms -IPT_NAT_EXTRA-$(CONFIG_IP_NF_RTSP) += $(P_V4)ip_conntrack_rtsp -IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_RTSP) += $(P_V4)ip_nat_rtsp -IPT_NAT_EXTRA-$(CONFIG_IP_NF_PPTP) += $(P_V4)ip_conntrack_pptp -IPT_NAT_EXTRA-$(CONFIG_IP_NF_SIP) += $(P_V4)ip_conntrack_sip -IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_PPTP) += $(P_V4)ip_nat_pptp -IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_SIP) += $(P_V4)ip_nat_sip -IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += $(P_V4)ip_nat_snmp_basic -IPT_NAT_EXTRA-$(CONFIG_IP_NF_SIP) += $(P_V4)ip_conntrack_sip -IPT_NAT_EXTRA-$(CONFIG_IP_NF_NAT_SIP) += $(P_V4)ip_nat_sip -IPT_NAT_EXTRA-$(CONFIG_IP_NF_TFTP) += $(P_V4)ip_conntrack_tftp - -IPT_QUEUE-m := -IPT_QUEUE-$(CONFIG_IP_NF_QUEUE) += $(P_V4)ip_queue - -IPT_ULOG-m := -IPT_ULOG-$(CONFIG_IP_NF_TARGET_ULOG) += $(P_V4)ipt_ULOG - -IPT_BUILTIN := $(P_V4)ipt_standard -IPT_BUILTIN += $(P_V4)ipt_icmp $(P_V4)ipt_tcp $(P_V4)ipt_udp -IPT_BUILTIN += $(IPT_CONNTRACK-y) -IPT_BUILTIN += $(IPT_EXTRA-y) -IPT_BUILTIN += $(IPT_FILTER-y) -IPT_BUILTIN += $(IPT_IMQ-y) -IPT_BUILTIN += $(IPT_IPOPT-y) -IPT_BUILTIN += $(IPT_IPSEC-y) -IPT_BUILTIN += $(IPT_NAT-y) -IPT_BUILTIN += $(IPT_ULOG-y) diff --git a/target/linux/rb532-2.6/Makefile b/target/linux/rb532-2.6/Makefile index 9bb7bba71c..4b0901987f 100644 --- a/target/linux/rb532-2.6/Makefile +++ b/target/linux/rb532-2.6/Makefile @@ -4,11 +4,9 @@ LINUX_VERSION:=2.6.17 LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e -include ../rules.mk include ./config - -include ../generic-$(KERNEL)/modules.mk -include ../kernel.mk +include $(TOPDIR)/include/kernel.mk +include $(TOPDIR)/include/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches diff --git a/target/linux/rules.mk b/target/linux/rules.mk deleted file mode 100644 index 166bfe24b6..0000000000 --- a/target/linux/rules.mk +++ /dev/null @@ -1,85 +0,0 @@ -KERNEL:=unknown -ifneq (,$(findstring 2.4.,$(LINUX_VERSION))) -KERNEL:=2.4 -endif -ifneq (,$(findstring 2.6.,$(LINUX_VERSION))) -KERNEL:=2.6 -endif - -MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION) - -LINUX_BUILD_DIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) -ifeq ($(LINUX_NAME),) -LINUX_NAME:=linux-$(LINUX_VERSION) -endif -LINUX_DIR := $(LINUX_BUILD_DIR)/$(LINUX_NAME) -LINUX_KERNEL:=$(LINUX_BUILD_DIR)/vmlinux - -LINUX_TARGET_DIR:=$(LINUX_BUILD_DIR)/root - -LINUX_KARCH:=$(shell echo $(ARCH) | sed -e 's/i[3-9]86/i386/' \ - -e 's/mipsel/mips/' \ - -e 's/mipseb/mips/' \ - -e 's/powerpc/ppc/' \ - -e 's/sh[234]/sh/' \ - -e 's/armeb/arm/' \ -) - -KMOD_BUILD_DIR := $(LINUX_BUILD_DIR)/linux-modules -MODULES_DIR := $(LINUX_BUILD_DIR)/modules/$(MODULES_SUBDIR) -TARGET_MODULES_DIR := $(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) - -ifeq ($(KERNEL),2.6) -LINUX_KMOD_SUFFIX=ko -else -LINUX_KMOD_SUFFIX=o -endif - -define KMOD_template -ifeq ($$(strip $(4)),) -KDEPEND_$(1):=m -else -KDEPEND_$(1):=$($(4)) -endif - -IDEPEND_$(1):=kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)) $(foreach pkg,$(5),", $(pkg)") - -PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk -I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) - -ifeq ($$(KDEPEND_$(1)),m) -ifneq ($(CONFIG_PACKAGE_KMOD_$(1)),) -TARGETS += $$(PKG_$(1)) -endif -ifeq ($(CONFIG_PACKAGE_KMOD_$(1)),y) -INSTALL_TARGETS += $$(PKG_$(1)) -endif -endif - -$$(PKG_$(1)): $(LINUX_DIR)/.modules_done - rm -rf $$(I_$(1)) - $(SCRIPT_DIR)/make-ipkg-dir.sh $$(I_$(1)) ../control/kmod-$(2).control $(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE) $(ARCH) - echo "Depends: $$(IDEPEND_$(1))" >> $$(I_$(1))/CONTROL/control -ifneq ($(strip $(3)),) - mkdir -p $$(I_$(1))/lib/modules/$(LINUX_VERSION) - $(CP) $(3) $$(I_$(1))/lib/modules/$(LINUX_VERSION) -endif -ifneq ($(6),) - mkdir -p $$(I_$(1))/etc/modules.d - for module in $(7); do \ - echo $$$$module >> $$(I_$(1))/etc/modules.d/$(6)-$(2); \ - done - echo "#!/bin/sh" >> $$(I_$(1))/CONTROL/postinst - echo "[ -z \"\$$$$IPKG_INSTROOT\" ] || exit" >> $$(I_$(1))/CONTROL/postinst - echo ". /etc/functions.sh" >> $$(I_$(1))/CONTROL/postinst - echo "load_modules /etc/modules.d/$(6)-$(2)" >> $$(I_$(1))/CONTROL/postinst - chmod 0755 $$(I_$(1))/CONTROL/postinst -endif - $(8) - $(IPKG_BUILD) $$(I_$(1)) $(PACKAGE_DIR) -endef - -KERNEL_IPKG:=$(LINUX_BUILD_DIR)/kernel_$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)_$(ARCH).ipk -INSTALL_TARGETS := $(KERNEL_IPKG) -TARGETS := - diff --git a/target/linux/sibyte-2.6/Makefile b/target/linux/sibyte-2.6/Makefile index 210c195adf..4b0901987f 100644 --- a/target/linux/sibyte-2.6/Makefile +++ b/target/linux/sibyte-2.6/Makefile @@ -4,12 +4,9 @@ LINUX_VERSION:=2.6.17 LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e -include ../rules.mk include ./config - -include ../generic-$(KERNEL)/modules.mk -include ../kernel.mk - +include $(TOPDIR)/include/kernel.mk +include $(TOPDIR)/include/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches diff --git a/target/linux/x86-2.4/Makefile b/target/linux/x86-2.4/Makefile index bcc8bd05d2..a6208dbbbb 100644 --- a/target/linux/x86-2.4/Makefile +++ b/target/linux/x86-2.4/Makefile @@ -4,17 +4,14 @@ LINUX_VERSION:=2.4.32 LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c -include ../rules.mk include ./config +include $(TOPDIR)/include/kernel.mk $(eval $(call KMOD_template,WD1100,wd1100,\ $(MODULES_DIR)/kernel/drivers/char/wd1100.o \ ,CONFIG_WD1100)) - -include ../generic-$(KERNEL)/modules.mk -include ../kernel.mk - +include $(TOPDIR)/include/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile index 7b2f1b068d..ab88d58dfb 100644 --- a/target/linux/x86-2.6/Makefile +++ b/target/linux/x86-2.6/Makefile @@ -4,12 +4,9 @@ LINUX_VERSION:=2.6.17 LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e -include ../rules.mk include ./config - -include ../generic-$(KERNEL)/modules.mk -include ../kernel.mk - +include $(TOPDIR)/include/kernel.mk +include $(TOPDIR)/include/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches diff --git a/target/linux/xscale-2.6/Makefile b/target/linux/xscale-2.6/Makefile index 608a49408b..a4d93efc5f 100644 --- a/target/linux/xscale-2.6/Makefile +++ b/target/linux/xscale-2.6/Makefile @@ -4,12 +4,9 @@ LINUX_VERSION:=2.6.17 LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e -include ../rules.mk include ./config - -include ../generic-$(KERNEL)/modules.mk -include ../kernel.mk - +include $(TOPDIR)/include/kernel.mk +include $(TOPDIR)/include/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches diff --git a/target/lzma/Makefile b/target/lzma/Makefile deleted file mode 100644 index 214967a15d..0000000000 --- a/target/lzma/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -############################################################# -# -# lzma target -# -############################################################# - -include $(TOPDIR)/rules.mk - -LZMA_DIR=$(BUILD_DIR)/lzma -LZMA_SOURCE=lzma432.tar.bz2 -LZMA_SITE=@SF/sevenzip -LZMA_MD5=155c1ebce5bc6710ae7ecc926226d9d7 - -LZMA_LIB_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Lib -LZMA_ALONE_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Alone - -TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma - -$(DL_DIR)/$(LZMA_SOURCE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE) - -$(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) - @rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR) - tar xjf $^ -C $(LZMA_DIR) - patch -d $(LZMA_DIR) -p1 < lzma-zlib.patch - touch $(LZMA_DIR)/.unpacked - -$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built -$(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked - $(MAKE) -C $(LZMA_LIB_DIR) - $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR) - touch $@ - -lzma: $(TARGETS) - $(CP) $^ $(LZMA_DIR) - - -lzma-clean: FORCE - -$(MAKE) -C $(LZMA_LIB_DIR) clean - -$(MAKE) -C $(LZMA_ALONE_DIR) clean - rm -f $(LZMA_DIR)/liblzma.a $(LZMA_DIR)/lzma - -lzma-dirclean: FORCE - rm -rf $(LZMA_DIR) - -############################################################# - -source: $(DL_DIR)/$(LZMA_SOURCE) -prepare: $(LZMA_DIR)/.unpacked -compile: lzma -install: lzma FORCE - $(CP) $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/ -clean: lzma-dirclean diff --git a/target/lzma/lzma-zlib.patch b/target/lzma/lzma-zlib.patch deleted file mode 100644 index 3672a0efbd..0000000000 --- a/target/lzma/lzma-zlib.patch +++ /dev/null @@ -1,408 +0,0 @@ -diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp ---- lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp 2005-09-22 10:55:34.000000000 +0200 -+++ lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp 2006-03-25 11:04:53.000000000 +0100 -@@ -274,12 +274,17 @@ - Byte remainder = (Byte)(properties[0] / 9); - int lp = remainder % 5; - int pb = remainder / 5; -- if (pb > NLength::kNumPosStatesBitsMax) -- return E_INVALIDARG; -- _posStateMask = (1 << pb) - 1; - UInt32 dictionarySize = 0; - for (int i = 0; i < 4; i++) - dictionarySize += ((UInt32)(properties[1 + i])) << (i * 8); -+ return SetDecoderPropertiesRaw(lc, lp, pb, dictionarySize); -+} -+ -+STDMETHODIMP CDecoder::SetDecoderPropertiesRaw(int lc, int lp, int pb, UInt32 dictionarySize) -+{ -+ if (pb > NLength::kNumPosStatesBitsMax) -+ return E_INVALIDARG; -+ _posStateMask = (1 << pb) - 1; - if (!_outWindowStream.Create(dictionarySize)) - return E_OUTOFMEMORY; - if (!_literalDecoder.Create(lp, lc)) -diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.h lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.h ---- lzma/C/7zip/Compress/LZMA/LZMADecoder.h 2005-09-19 08:10:06.000000000 +0200 -+++ lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.h 2006-03-25 11:04:53.000000000 +0100 -@@ -228,6 +228,7 @@ - ICompressProgressInfo *progress); - - STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size); -+ STDMETHOD(SetDecoderPropertiesRaw)(int lc, int lp, int pb, UInt32 dictionarySize); - - STDMETHOD(GetInStreamProcessedSize)(UInt64 *value); - -diff -Nur lzma/C/7zip/Compress/LZMA_Lib/makefile lzma.patched/C/7zip/Compress/LZMA_Lib/makefile ---- lzma/C/7zip/Compress/LZMA_Lib/makefile 1970-01-01 01:00:00.000000000 +0100 -+++ lzma.patched/C/7zip/Compress/LZMA_Lib/makefile 2006-03-25 11:29:46.000000000 +0100 -@@ -0,0 +1,92 @@ -+PROG = liblzma.a -+CXX = g++ -O3 -Wall -+AR = ar -+RM = rm -f -+CFLAGS = -c -I ../../../ -+ -+OBJS = \ -+ ZLib.o \ -+ LZMADecoder.o \ -+ LZMAEncoder.o \ -+ LZInWindow.o \ -+ LZOutWindow.o \ -+ RangeCoderBit.o \ -+ InBuffer.o \ -+ OutBuffer.o \ -+ FileStreams.o \ -+ Alloc.o \ -+ C_FileIO.o \ -+ CommandLineParser.o \ -+ CRC.o \ -+ StreamUtils.o \ -+ String.o \ -+ StringConvert.o \ -+ StringToInt.o \ -+ Vector.o \ -+ -+ -+all: $(PROG) -+ -+$(PROG): $(OBJS) -+ $(AR) r $(PROG) $(OBJS) -+ -+ZLib.o: ZLib.cpp -+ $(CXX) $(CFLAGS) ZLib.cpp -+ -+LZMADecoder.o: ../LZMA/LZMADecoder.cpp -+ $(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp -+ -+LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp -+ $(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp -+ -+LZInWindow.o: ../LZ/LZInWindow.cpp -+ $(CXX) $(CFLAGS) ../LZ/LZInWindow.cpp -+ -+LZOutWindow.o: ../LZ/LZOutWindow.cpp -+ $(CXX) $(CFLAGS) ../LZ/LZOutWindow.cpp -+ -+RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp -+ $(CXX) $(CFLAGS) ../RangeCoder/RangeCoderBit.cpp -+ -+InBuffer.o: ../../Common/InBuffer.cpp -+ $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp -+ -+OutBuffer.o: ../../Common/OutBuffer.cpp -+ $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp -+ -+StreamUtils.o: ../../Common/StreamUtils.cpp -+ $(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp -+ -+FileStreams.o: ../../Common/FileStreams.cpp -+ $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp -+ -+Alloc.o: ../../../Common/Alloc.cpp -+ $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp -+ -+C_FileIO.o: ../../../Common/C_FileIO.cpp -+ $(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp -+ -+CommandLineParser.o: ../../../Common/CommandLineParser.cpp -+ $(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp -+ -+CRC.o: ../../../Common/CRC.cpp -+ $(CXX) $(CFLAGS) ../../../Common/CRC.cpp -+ -+MyWindows.o: ../../../Common/MyWindows.cpp -+ $(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp -+ -+String.o: ../../../Common/String.cpp -+ $(CXX) $(CFLAGS) ../../../Common/String.cpp -+ -+StringConvert.o: ../../../Common/StringConvert.cpp -+ $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp -+ -+StringToInt.o: ../../../Common/StringToInt.cpp -+ $(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp -+ -+Vector.o: ../../../Common/Vector.cpp -+ $(CXX) $(CFLAGS) ../../../Common/Vector.cpp -+ -+clean: -+ -$(RM) $(PROG) $(OBJS) -+ -diff -Nur lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma.patched/C/7zip/Compress/LZMA_Lib/ZLib.cpp ---- lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ lzma.patched/C/7zip/Compress/LZMA_Lib/ZLib.cpp 2006-03-25 11:04:53.000000000 +0100 -@@ -0,0 +1,273 @@ -+/* -+ * lzma zlib simplified wrapper -+ * -+ * Copyright (c) 2005-2006 Oleg I. Vdovikin -+ * -+ * This library is free software; you can redistribute -+ * it and/or modify it under the terms of the GNU Lesser -+ * General Public License as published by the Free Software -+ * Foundation; either version 2.1 of the License, or -+ * (at your option) any later version. -+ * -+ * This library 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 Lesser General Public License -+ * for more details. -+ * -+ * You should have received a copy of the GNU Lesser General -+ * Public License along with this library; if not, write to -+ * the Free Software Foundation, Inc., 59 Temple Place, -+ * Suite 330, Boston, MA 02111-1307 USA -+ */ -+ -+/* -+ * default values for encoder/decoder used by wrapper -+ */ -+ -+#include -+ -+#define ZLIB_LC 3 -+#define ZLIB_LP 0 -+#define ZLIB_PB 2 -+ -+#ifdef WIN32 -+#include -+#else -+#define INITGUID -+#endif -+ -+#include "../../../Common/MyWindows.h" -+#include "../LZMA/LZMADecoder.h" -+#include "../LZMA/LZMAEncoder.h" -+ -+#define STG_E_SEEKERROR ((HRESULT)0x80030019L) -+#define STG_E_MEDIUMFULL ((HRESULT)0x80030070L) -+ -+class CInMemoryStream: -+ public IInStream, -+ public IStreamGetSize, -+ public CMyUnknownImp -+{ -+public: -+ CInMemoryStream(const Bytef *data, UInt64 size) : -+ m_data(data), m_size(size), m_offset(0) {} -+ -+ virtual ~CInMemoryStream() {} -+ -+ MY_UNKNOWN_IMP2(IInStream, IStreamGetSize) -+ -+ STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize) -+ { -+ if (size > m_size - m_offset) -+ size = m_size - m_offset; -+ -+ if (size) { -+ memcpy(data, m_data + m_offset, size); -+ } -+ -+ m_offset += size; -+ -+ if (processedSize) -+ *processedSize = size; -+ -+ return S_OK; -+ } -+ -+ STDMETHOD(ReadPart)(void *data, UInt32 size, UInt32 *processedSize) -+ { -+ return Read(data, size, processedSize); -+ } -+ -+ STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition) -+ { -+ UInt64 _offset; -+ -+ if (seekOrigin == STREAM_SEEK_SET) _offset = offset; -+ else if (seekOrigin == STREAM_SEEK_CUR) _offset = m_offset + offset; -+ else if (seekOrigin == STREAM_SEEK_END) _offset = m_size; -+ else return STG_E_INVALIDFUNCTION; -+ -+ if (_offset < 0 || _offset > m_size) -+ return STG_E_SEEKERROR; -+ -+ m_offset = _offset; -+ -+ if (newPosition) -+ *newPosition = m_offset; -+ -+ return S_OK; -+ } -+ -+ STDMETHOD(GetSize)(UInt64 *size) -+ { -+ *size = m_size; -+ return S_OK; -+ } -+protected: -+ const Bytef *m_data; -+ UInt64 m_size; -+ UInt64 m_offset; -+}; -+ -+class COutMemoryStream: -+ public IOutStream, -+ public CMyUnknownImp -+{ -+public: -+ COutMemoryStream(Bytef *data, UInt64 maxsize) : -+ m_data(data), m_size(0), m_maxsize(maxsize), m_offset(0) {} -+ virtual ~COutMemoryStream() {} -+ -+ MY_UNKNOWN_IMP1(IOutStream) -+ -+ STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize) -+ { -+ if (size > m_maxsize - m_offset) -+ size = m_maxsize - m_offset; -+ -+ if (size) { -+ memcpy(m_data + m_offset, data, size); -+ } -+ -+ m_offset += size; -+ -+ if (m_offset > m_size) -+ m_size = m_offset; -+ -+ if (processedSize) -+ *processedSize = size; -+ -+ return S_OK; -+ } -+ -+ STDMETHOD(WritePart)(const void *data, UInt32 size, UInt32 *processedSize) -+ { -+ return Write(data, size, processedSize); -+ } -+ -+ STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition) -+ { -+ UInt64 _offset; -+ -+ if (seekOrigin == STREAM_SEEK_SET) _offset = offset; -+ else if (seekOrigin == STREAM_SEEK_CUR) _offset = m_offset + offset; -+ else if (seekOrigin == STREAM_SEEK_END) _offset = m_size; -+ else return STG_E_INVALIDFUNCTION; -+ -+ if (_offset < 0 || _offset > m_maxsize) -+ return STG_E_SEEKERROR; -+ -+ m_offset = _offset; -+ -+ if (newPosition) -+ *newPosition = m_offset; -+ -+ return S_OK; -+ } -+ -+ STDMETHOD(SetSize)(Int64 newSize) -+ { -+ if ((UInt64)newSize > m_maxsize) -+ return STG_E_MEDIUMFULL; -+ -+ return S_OK; -+ } -+protected: -+ Bytef *m_data; -+ UInt64 m_size; -+ UInt64 m_maxsize; -+ UInt64 m_offset; -+}; -+ -+ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, -+ const Bytef *source, uLong sourceLen, -+ int level)) -+{ -+ CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen); -+ CMyComPtr inStream = inStreamSpec; -+ -+ COutMemoryStream *outStreamSpec = new COutMemoryStream(dest, *destLen); -+ CMyComPtr outStream = outStreamSpec; -+ -+ NCompress::NLZMA::CEncoder *encoderSpec = -+ new NCompress::NLZMA::CEncoder; -+ CMyComPtr encoder = encoderSpec; -+ -+ PROPID propIDs[] = -+ { -+ NCoderPropID::kDictionarySize, -+ NCoderPropID::kPosStateBits, -+ NCoderPropID::kLitContextBits, -+ NCoderPropID::kLitPosBits, -+ NCoderPropID::kAlgorithm, -+ NCoderPropID::kNumFastBytes, -+ NCoderPropID::kMatchFinder, -+ NCoderPropID::kEndMarker -+ }; -+ const int kNumProps = sizeof(propIDs) / sizeof(propIDs[0]); -+ -+ PROPVARIANT properties[kNumProps]; -+ for (int p = 0; p < 6; p++) -+ properties[p].vt = VT_UI4; -+ properties[0].ulVal = UInt32(1 << (level + 14)); -+ properties[1].ulVal = UInt32(ZLIB_PB); -+ properties[2].ulVal = UInt32(ZLIB_LC); // for normal files -+ properties[3].ulVal = UInt32(ZLIB_LP); // for normal files -+ properties[4].ulVal = UInt32(2); -+ properties[5].ulVal = UInt32(128); -+ -+ properties[6].vt = VT_BSTR; -+ properties[6].bstrVal = (BSTR)(const wchar_t *)L"BT4"; -+ -+ properties[7].vt = VT_BOOL; -+ properties[7].boolVal = VARIANT_TRUE; -+ -+ if (encoderSpec->SetCoderProperties(propIDs, properties, kNumProps) != S_OK) -+ return Z_MEM_ERROR; // should not happen -+ -+ HRESULT result = encoder->Code(inStream, outStream, 0, 0, 0); -+ if (result == E_OUTOFMEMORY) -+ { -+ return Z_MEM_ERROR; -+ } -+ else if (result != S_OK) -+ { -+ return Z_BUF_ERROR; // should not happen -+ } -+ -+ UInt64 fileSize; -+ outStreamSpec->Seek(0, STREAM_SEEK_END, &fileSize); -+ *destLen = fileSize; -+ -+ return Z_OK; -+} -+ -+ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, -+ const Bytef *source, uLong sourceLen)) -+{ -+ CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen); -+ CMyComPtr inStream = inStreamSpec; -+ -+ COutMemoryStream *outStreamSpec = new COutMemoryStream(dest, *destLen); -+ CMyComPtr outStream = outStreamSpec; -+ -+ NCompress::NLZMA::CDecoder *decoderSpec = -+ new NCompress::NLZMA::CDecoder; -+ CMyComPtr decoder = decoderSpec; -+ -+ if (decoderSpec->SetDecoderPropertiesRaw(ZLIB_LC, -+ ZLIB_LP, ZLIB_PB, (1 << 23)) != S_OK) return Z_DATA_ERROR; -+ -+ UInt64 fileSize = *destLen; -+ -+ if (decoder->Code(inStream, outStream, 0, &fileSize, 0) != S_OK) -+ { -+ return Z_DATA_ERROR; -+ } -+ -+ outStreamSpec->Seek(0, STREAM_SEEK_END, &fileSize); -+ *destLen = fileSize; -+ -+ return Z_OK; -+} diff --git a/toolchain/Makefile b/toolchain/Makefile index fac0468285..f9fb3a54d6 100644 --- a/toolchain/Makefile +++ b/toolchain/Makefile @@ -1,6 +1,6 @@ # Main makefile for the toolchain include $(TOPDIR)/rules.mk -TARGETS-y:=sed kernel-headers utils binutils gcc uClibc ipkg-utils libnotimpl +TARGETS-y:=sed kernel-headers utils binutils gcc uClibc ipkg-utils libnotimpl squashfs jffs2 lzma TARGETS-$(CONFIG_GDB) += gdb TARGETS_DOWNLOAD:=$(patsubst %,%-source,$(TARGETS-y)) @@ -17,6 +17,7 @@ binutils-prepare: uClibc-prepare gcc-prepare: binutils-install uClibc-compile: gcc-prepare gcc-compile: uClibc-install +squashfs-compile: lzma-compile TOOLCHAIN_STAMP_DIR:=$(STAGING_DIR)/stampfiles diff --git a/toolchain/jffs2/Makefile b/toolchain/jffs2/Makefile new file mode 100644 index 0000000000..b673c438a6 --- /dev/null +++ b/toolchain/jffs2/Makefile @@ -0,0 +1,29 @@ +include $(TOPDIR)/rules.mk + +MTD_DIR:=$(BUILD_DIR)/mtd-20050122.orig +MTD_SOURCE=mtd_20050122.orig.tar.gz +MTD_SITE=http://ftp.debian.org/debian/pool/main/m/mtd +MTD_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338 +MKFS_JFFS2=$(MTD_DIR)/util/mkfs.jffs2 + +$(DL_DIR)/$(MTD_SOURCE): + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(MTD_SOURCE) $(MTD_MD5SUM) $(MTD_SITE) + +$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE) + zcat $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) -xvf - + $(PATCH) $(MTD_DIR) ./patches + touch $(MTD_DIR)/.unpacked + +$(MTD_DIR)/util/mkfs.jffs2: $(MTD_DIR)/.unpacked + $(MAKE) LINUXDIR=$(LINUX_DIR) -C $(MTD_DIR)/util + +$(STAGING_DIR)/bin/mkfs.jffs2: $(MTD_DIR)/util/mkfs.jffs2 + $(CP) $< $@ + +source: $(DL_DIR)/$(MTD_SOURCE) +prepare: $(MTD_DIR)/.unpacked +compile: $(MTD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/mkfs.jffs2 +install: +clean: FORCE + rm -rf $(MTD_DIR) $(STAGING_DIR)/bin/mkfs.jffs2 + diff --git a/toolchain/jffs2/patches/100-gcc4_fix.patch b/toolchain/jffs2/patches/100-gcc4_fix.patch new file mode 100644 index 0000000000..50c8edb47e --- /dev/null +++ b/toolchain/jffs2/patches/100-gcc4_fix.patch @@ -0,0 +1,24 @@ +diff -urN mtd-20050122.orig.old/include/mtd/jffs2-user.h mtd-20050122.orig.dev/include/mtd/jffs2-user.h +--- mtd-20050122.orig.old/include/mtd/jffs2-user.h 2004-05-05 13:57:54.000000000 +0200 ++++ mtd-20050122.orig.dev/include/mtd/jffs2-user.h 2005-07-02 10:03:09.000000000 +0200 +@@ -19,8 +19,6 @@ + #undef je32_to_cpu + #undef jemode_to_cpu + +-extern int target_endian; +- + #define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); }) + #define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); }) + +diff -urN mtd.old/util/jffs3.h mtd.dev/util/jffs3.h +--- mtd.old/util/jffs3.h 2005-01-22 00:00:13.000000000 +0100 ++++ mtd.dev/util/jffs3.h 2005-07-17 17:48:24.000000000 +0200 +@@ -177,8 +177,6 @@ + #undef je32_to_cpu + #undef jemode_to_cpu + +-extern int target_endian; +- + #define t16(x) ({ uint16_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); }) + #define t32(x) ({ uint32_t __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); }) + diff --git a/toolchain/lzma/Makefile b/toolchain/lzma/Makefile new file mode 100644 index 0000000000..cace2a4e2b --- /dev/null +++ b/toolchain/lzma/Makefile @@ -0,0 +1,53 @@ +############################################################# +# +# lzma target +# +############################################################# + +include $(TOPDIR)/rules.mk + +LZMA_DIR=$(BUILD_DIR)/lzma +LZMA_SOURCE=lzma432.tar.bz2 +LZMA_SITE=@SF/sevenzip +LZMA_MD5=155c1ebce5bc6710ae7ecc926226d9d7 + +LZMA_LIB_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Lib +LZMA_ALONE_DIR=$(LZMA_DIR)/C/7zip/Compress/LZMA_Alone + +TARGETS=$(LZMA_LIB_DIR)/liblzma.a $(LZMA_ALONE_DIR)/lzma + +$(DL_DIR)/$(LZMA_SOURCE): + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(LZMA_SOURCE) $(LZMA_MD5) $(LZMA_SITE) + +$(LZMA_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE) + @rm -rf $(LZMA_DIR) && mkdir -p $(LZMA_DIR) + tar xjf $^ -C $(LZMA_DIR) + $(PATCH) $(LZMA_DIR) ./patches + touch $(LZMA_DIR)/.unpacked + +$(LZMA_ALONE_DIR)/lzma $(LZMA_LIB_DIR)/liblzma.a: $(LZMA_DIR)/.built +$(LZMA_DIR)/.built: $(LZMA_DIR)/.unpacked + $(MAKE) -C $(LZMA_LIB_DIR) + $(MAKE) -f makefile.gcc -C $(LZMA_ALONE_DIR) + touch $@ + +lzma: $(TARGETS) + $(CP) $^ $(LZMA_DIR) + + +lzma-clean: FORCE + -$(MAKE) -C $(LZMA_LIB_DIR) clean + -$(MAKE) -C $(LZMA_ALONE_DIR) clean + rm -f $(LZMA_DIR)/liblzma.a $(LZMA_DIR)/lzma + +lzma-dirclean: FORCE + rm -rf $(LZMA_DIR) + +############################################################# + +source: $(DL_DIR)/$(LZMA_SOURCE) +prepare: $(LZMA_DIR)/.unpacked +compile: lzma +install: lzma FORCE + $(CP) $(LZMA_DIR)/lzma $(STAGING_DIR)/bin/ +clean: lzma-dirclean diff --git a/toolchain/lzma/patches/100-lzma_zlib.patch b/toolchain/lzma/patches/100-lzma_zlib.patch new file mode 100644 index 0000000000..3672a0efbd --- /dev/null +++ b/toolchain/lzma/patches/100-lzma_zlib.patch @@ -0,0 +1,408 @@ +diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp +--- lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp 2005-09-22 10:55:34.000000000 +0200 ++++ lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp 2006-03-25 11:04:53.000000000 +0100 +@@ -274,12 +274,17 @@ + Byte remainder = (Byte)(properties[0] / 9); + int lp = remainder % 5; + int pb = remainder / 5; +- if (pb > NLength::kNumPosStatesBitsMax) +- return E_INVALIDARG; +- _posStateMask = (1 << pb) - 1; + UInt32 dictionarySize = 0; + for (int i = 0; i < 4; i++) + dictionarySize += ((UInt32)(properties[1 + i])) << (i * 8); ++ return SetDecoderPropertiesRaw(lc, lp, pb, dictionarySize); ++} ++ ++STDMETHODIMP CDecoder::SetDecoderPropertiesRaw(int lc, int lp, int pb, UInt32 dictionarySize) ++{ ++ if (pb > NLength::kNumPosStatesBitsMax) ++ return E_INVALIDARG; ++ _posStateMask = (1 << pb) - 1; + if (!_outWindowStream.Create(dictionarySize)) + return E_OUTOFMEMORY; + if (!_literalDecoder.Create(lp, lc)) +diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.h lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.h +--- lzma/C/7zip/Compress/LZMA/LZMADecoder.h 2005-09-19 08:10:06.000000000 +0200 ++++ lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.h 2006-03-25 11:04:53.000000000 +0100 +@@ -228,6 +228,7 @@ + ICompressProgressInfo *progress); + + STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size); ++ STDMETHOD(SetDecoderPropertiesRaw)(int lc, int lp, int pb, UInt32 dictionarySize); + + STDMETHOD(GetInStreamProcessedSize)(UInt64 *value); + +diff -Nur lzma/C/7zip/Compress/LZMA_Lib/makefile lzma.patched/C/7zip/Compress/LZMA_Lib/makefile +--- lzma/C/7zip/Compress/LZMA_Lib/makefile 1970-01-01 01:00:00.000000000 +0100 ++++ lzma.patched/C/7zip/Compress/LZMA_Lib/makefile 2006-03-25 11:29:46.000000000 +0100 +@@ -0,0 +1,92 @@ ++PROG = liblzma.a ++CXX = g++ -O3 -Wall ++AR = ar ++RM = rm -f ++CFLAGS = -c -I ../../../ ++ ++OBJS = \ ++ ZLib.o \ ++ LZMADecoder.o \ ++ LZMAEncoder.o \ ++ LZInWindow.o \ ++ LZOutWindow.o \ ++ RangeCoderBit.o \ ++ InBuffer.o \ ++ OutBuffer.o \ ++ FileStreams.o \ ++ Alloc.o \ ++ C_FileIO.o \ ++ CommandLineParser.o \ ++ CRC.o \ ++ StreamUtils.o \ ++ String.o \ ++ StringConvert.o \ ++ StringToInt.o \ ++ Vector.o \ ++ ++ ++all: $(PROG) ++ ++$(PROG): $(OBJS) ++ $(AR) r $(PROG) $(OBJS) ++ ++ZLib.o: ZLib.cpp ++ $(CXX) $(CFLAGS) ZLib.cpp ++ ++LZMADecoder.o: ../LZMA/LZMADecoder.cpp ++ $(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp ++ ++LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp ++ $(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp ++ ++LZInWindow.o: ../LZ/LZInWindow.cpp ++ $(CXX) $(CFLAGS) ../LZ/LZInWindow.cpp ++ ++LZOutWindow.o: ../LZ/LZOutWindow.cpp ++ $(CXX) $(CFLAGS) ../LZ/LZOutWindow.cpp ++ ++RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp ++ $(CXX) $(CFLAGS) ../RangeCoder/RangeCoderBit.cpp ++ ++InBuffer.o: ../../Common/InBuffer.cpp ++ $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp ++ ++OutBuffer.o: ../../Common/OutBuffer.cpp ++ $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp ++ ++StreamUtils.o: ../../Common/StreamUtils.cpp ++ $(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp ++ ++FileStreams.o: ../../Common/FileStreams.cpp ++ $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp ++ ++Alloc.o: ../../../Common/Alloc.cpp ++ $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp ++ ++C_FileIO.o: ../../../Common/C_FileIO.cpp ++ $(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp ++ ++CommandLineParser.o: ../../../Common/CommandLineParser.cpp ++ $(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp ++ ++CRC.o: ../../../Common/CRC.cpp ++ $(CXX) $(CFLAGS) ../../../Common/CRC.cpp ++ ++MyWindows.o: ../../../Common/MyWindows.cpp ++ $(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp ++ ++String.o: ../../../Common/String.cpp ++ $(CXX) $(CFLAGS) ../../../Common/String.cpp ++ ++StringConvert.o: ../../../Common/StringConvert.cpp ++ $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp ++ ++StringToInt.o: ../../../Common/StringToInt.cpp ++ $(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp ++ ++Vector.o: ../../../Common/Vector.cpp ++ $(CXX) $(CFLAGS) ../../../Common/Vector.cpp ++ ++clean: ++ -$(RM) $(PROG) $(OBJS) ++ +diff -Nur lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma.patched/C/7zip/Compress/LZMA_Lib/ZLib.cpp +--- lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp 1970-01-01 01:00:00.000000000 +0100 ++++ lzma.patched/C/7zip/Compress/LZMA_Lib/ZLib.cpp 2006-03-25 11:04:53.000000000 +0100 +@@ -0,0 +1,273 @@ ++/* ++ * lzma zlib simplified wrapper ++ * ++ * Copyright (c) 2005-2006 Oleg I. Vdovikin ++ * ++ * This library is free software; you can redistribute ++ * it and/or modify it under the terms of the GNU Lesser ++ * General Public License as published by the Free Software ++ * Foundation; either version 2.1 of the License, or ++ * (at your option) any later version. ++ * ++ * This library 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 Lesser General Public License ++ * for more details. ++ * ++ * You should have received a copy of the GNU Lesser General ++ * Public License along with this library; if not, write to ++ * the Free Software Foundation, Inc., 59 Temple Place, ++ * Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++/* ++ * default values for encoder/decoder used by wrapper ++ */ ++ ++#include ++ ++#define ZLIB_LC 3 ++#define ZLIB_LP 0 ++#define ZLIB_PB 2 ++ ++#ifdef WIN32 ++#include ++#else ++#define INITGUID ++#endif ++ ++#include "../../../Common/MyWindows.h" ++#include "../LZMA/LZMADecoder.h" ++#include "../LZMA/LZMAEncoder.h" ++ ++#define STG_E_SEEKERROR ((HRESULT)0x80030019L) ++#define STG_E_MEDIUMFULL ((HRESULT)0x80030070L) ++ ++class CInMemoryStream: ++ public IInStream, ++ public IStreamGetSize, ++ public CMyUnknownImp ++{ ++public: ++ CInMemoryStream(const Bytef *data, UInt64 size) : ++ m_data(data), m_size(size), m_offset(0) {} ++ ++ virtual ~CInMemoryStream() {} ++ ++ MY_UNKNOWN_IMP2(IInStream, IStreamGetSize) ++ ++ STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize) ++ { ++ if (size > m_size - m_offset) ++ size = m_size - m_offset; ++ ++ if (size) { ++ memcpy(data, m_data + m_offset, size); ++ } ++ ++ m_offset += size; ++ ++ if (processedSize) ++ *processedSize = size; ++ ++ return S_OK; ++ } ++ ++ STDMETHOD(ReadPart)(void *data, UInt32 size, UInt32 *processedSize) ++ { ++ return Read(data, size, processedSize); ++ } ++ ++ STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition) ++ { ++ UInt64 _offset; ++ ++ if (seekOrigin == STREAM_SEEK_SET) _offset = offset; ++ else if (seekOrigin == STREAM_SEEK_CUR) _offset = m_offset + offset; ++ else if (seekOrigin == STREAM_SEEK_END) _offset = m_size; ++ else return STG_E_INVALIDFUNCTION; ++ ++ if (_offset < 0 || _offset > m_size) ++ return STG_E_SEEKERROR; ++ ++ m_offset = _offset; ++ ++ if (newPosition) ++ *newPosition = m_offset; ++ ++ return S_OK; ++ } ++ ++ STDMETHOD(GetSize)(UInt64 *size) ++ { ++ *size = m_size; ++ return S_OK; ++ } ++protected: ++ const Bytef *m_data; ++ UInt64 m_size; ++ UInt64 m_offset; ++}; ++ ++class COutMemoryStream: ++ public IOutStream, ++ public CMyUnknownImp ++{ ++public: ++ COutMemoryStream(Bytef *data, UInt64 maxsize) : ++ m_data(data), m_size(0), m_maxsize(maxsize), m_offset(0) {} ++ virtual ~COutMemoryStream() {} ++ ++ MY_UNKNOWN_IMP1(IOutStream) ++ ++ STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize) ++ { ++ if (size > m_maxsize - m_offset) ++ size = m_maxsize - m_offset; ++ ++ if (size) { ++ memcpy(m_data + m_offset, data, size); ++ } ++ ++ m_offset += size; ++ ++ if (m_offset > m_size) ++ m_size = m_offset; ++ ++ if (processedSize) ++ *processedSize = size; ++ ++ return S_OK; ++ } ++ ++ STDMETHOD(WritePart)(const void *data, UInt32 size, UInt32 *processedSize) ++ { ++ return Write(data, size, processedSize); ++ } ++ ++ STDMETHOD(Seek)(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition) ++ { ++ UInt64 _offset; ++ ++ if (seekOrigin == STREAM_SEEK_SET) _offset = offset; ++ else if (seekOrigin == STREAM_SEEK_CUR) _offset = m_offset + offset; ++ else if (seekOrigin == STREAM_SEEK_END) _offset = m_size; ++ else return STG_E_INVALIDFUNCTION; ++ ++ if (_offset < 0 || _offset > m_maxsize) ++ return STG_E_SEEKERROR; ++ ++ m_offset = _offset; ++ ++ if (newPosition) ++ *newPosition = m_offset; ++ ++ return S_OK; ++ } ++ ++ STDMETHOD(SetSize)(Int64 newSize) ++ { ++ if ((UInt64)newSize > m_maxsize) ++ return STG_E_MEDIUMFULL; ++ ++ return S_OK; ++ } ++protected: ++ Bytef *m_data; ++ UInt64 m_size; ++ UInt64 m_maxsize; ++ UInt64 m_offset; ++}; ++ ++ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, ++ const Bytef *source, uLong sourceLen, ++ int level)) ++{ ++ CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen); ++ CMyComPtr inStream = inStreamSpec; ++ ++ COutMemoryStream *outStreamSpec = new COutMemoryStream(dest, *destLen); ++ CMyComPtr outStream = outStreamSpec; ++ ++ NCompress::NLZMA::CEncoder *encoderSpec = ++ new NCompress::NLZMA::CEncoder; ++ CMyComPtr encoder = encoderSpec; ++ ++ PROPID propIDs[] = ++ { ++ NCoderPropID::kDictionarySize, ++ NCoderPropID::kPosStateBits, ++ NCoderPropID::kLitContextBits, ++ NCoderPropID::kLitPosBits, ++ NCoderPropID::kAlgorithm, ++ NCoderPropID::kNumFastBytes, ++ NCoderPropID::kMatchFinder, ++ NCoderPropID::kEndMarker ++ }; ++ const int kNumProps = sizeof(propIDs) / sizeof(propIDs[0]); ++ ++ PROPVARIANT properties[kNumProps]; ++ for (int p = 0; p < 6; p++) ++ properties[p].vt = VT_UI4; ++ properties[0].ulVal = UInt32(1 << (level + 14)); ++ properties[1].ulVal = UInt32(ZLIB_PB); ++ properties[2].ulVal = UInt32(ZLIB_LC); // for normal files ++ properties[3].ulVal = UInt32(ZLIB_LP); // for normal files ++ properties[4].ulVal = UInt32(2); ++ properties[5].ulVal = UInt32(128); ++ ++ properties[6].vt = VT_BSTR; ++ properties[6].bstrVal = (BSTR)(const wchar_t *)L"BT4"; ++ ++ properties[7].vt = VT_BOOL; ++ properties[7].boolVal = VARIANT_TRUE; ++ ++ if (encoderSpec->SetCoderProperties(propIDs, properties, kNumProps) != S_OK) ++ return Z_MEM_ERROR; // should not happen ++ ++ HRESULT result = encoder->Code(inStream, outStream, 0, 0, 0); ++ if (result == E_OUTOFMEMORY) ++ { ++ return Z_MEM_ERROR; ++ } ++ else if (result != S_OK) ++ { ++ return Z_BUF_ERROR; // should not happen ++ } ++ ++ UInt64 fileSize; ++ outStreamSpec->Seek(0, STREAM_SEEK_END, &fileSize); ++ *destLen = fileSize; ++ ++ return Z_OK; ++} ++ ++ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, ++ const Bytef *source, uLong sourceLen)) ++{ ++ CInMemoryStream *inStreamSpec = new CInMemoryStream(source, sourceLen); ++ CMyComPtr inStream = inStreamSpec; ++ ++ COutMemoryStream *outStreamSpec = new COutMemoryStream(dest, *destLen); ++ CMyComPtr outStream = outStreamSpec; ++ ++ NCompress::NLZMA::CDecoder *decoderSpec = ++ new NCompress::NLZMA::CDecoder; ++ CMyComPtr decoder = decoderSpec; ++ ++ if (decoderSpec->SetDecoderPropertiesRaw(ZLIB_LC, ++ ZLIB_LP, ZLIB_PB, (1 << 23)) != S_OK) return Z_DATA_ERROR; ++ ++ UInt64 fileSize = *destLen; ++ ++ if (decoder->Code(inStream, outStream, 0, &fileSize, 0) != S_OK) ++ { ++ return Z_DATA_ERROR; ++ } ++ ++ outStreamSpec->Seek(0, STREAM_SEEK_END, &fileSize); ++ *destLen = fileSize; ++ ++ return Z_OK; ++} diff --git a/toolchain/squashfs/Makefile b/toolchain/squashfs/Makefile new file mode 100644 index 0000000000..a2b3671876 --- /dev/null +++ b/toolchain/squashfs/Makefile @@ -0,0 +1,27 @@ +include $(TOPDIR)/rules.mk + +SQUASHFSLZMA_DIR=$(BUILD_DIR)/squashfs3.0 +SQUASHFSLZMA_SOURCE=squashfs3.0.tar.gz +SQUASHFSLZMA_SITE=@SF/squashfs +SQUASHFSLZMA_MD5SUM=9fd05d0bfbb712f5fb95edafea5bc733 + +$(DL_DIR)/$(SQUASHFSLZMA_SOURCE): + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(SQUASHFSLZMA_SOURCE) $(SQUASHFSLZMA_MD5SUM) $(SQUASHFSLZMA_SITE) + +$(SQUASHFSLZMA_DIR)/.unpacked: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) + zcat $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) | tar -C $(BUILD_DIR) -xvf - + $(PATCH) $(SQUASHFSLZMA_DIR) ./patches + touch $(SQUASHFSLZMA_DIR)/.unpacked + +$(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/.unpacked + $(MAKE) -C $(SQUASHFSLZMA_DIR)/squashfs-tools mksquashfs-lzma LZMAPATH=$(BUILD_DIR)/lzma + +$(STAGING_DIR)/bin/mksquashfs-lzma: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma + $(CP) $< $@ + +source: $(DL_DIR)/$(SQUASHFSLZMA_SOURCE) +prepare: $(SQUASHFSLZMA_DIR)/.unpacked +compile: $(SQUASHFSLZMA_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/mksquashfs-lzma +install: +clean: FORCE + rm -rf $(SQUASHFSLZMA_DIR) diff --git a/toolchain/squashfs/patches/100-lzma.patch b/toolchain/squashfs/patches/100-lzma.patch new file mode 100644 index 0000000000..85aa21fb92 --- /dev/null +++ b/toolchain/squashfs/patches/100-lzma.patch @@ -0,0 +1,25 @@ +diff -Nur squashfs3.0/squashfs-tools/Makefile squashfs3.0-owrt/squashfs-tools/Makefile +--- squashfs3.0/squashfs-tools/Makefile 2006-03-15 22:36:20.000000000 +0100 ++++ squashfs3.0-owrt/squashfs-tools/Makefile 2006-03-21 11:14:08.000000000 +0100 +@@ -1,4 +1,5 @@ + INCLUDEDIR = . ++#LZMAPATH = ../lzma/SRC/7zip/Compress/LZMA_Lib + + CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 + +@@ -7,6 +8,9 @@ + mksquashfs: mksquashfs.o read_fs.o sort.o + $(CC) mksquashfs.o read_fs.o sort.o -lz -o $@ + ++mksquashfs-lzma: mksquashfs.o read_fs.o sort.o ++ $(CXX) mksquashfs.o read_fs.o sort.o -L$(LZMAPATH) -llzma -o $@ ++ + mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h + + read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h +@@ -17,3 +21,5 @@ + $(CC) unsquashfs.o -lz -o $@ + + unsquashfs.o: unsquashfs.c squashfs_fs.h read_fs.h global.h ++ ++clean: -- cgit v1.2.3 From 0b0afa4d818ec18187b09055fbb8d84a01590d6e Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 21 Jun 2006 02:32:39 +0000 Subject: add INCLUDE_DIR variable for $(TOPDIR)/include git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4033 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 2 +- include/modules-2.4.mk | 2 +- include/modules-2.6.mk | 2 +- package/alsa/Makefile | 4 ++-- package/base-files/Makefile | 4 ++-- package/bridge/Makefile | 2 +- package/broadcom-wl/Makefile | 4 ++-- package/busybox/Makefile | 2 +- package/diag/Makefile | 4 ++-- package/dnsmasq/Makefile | 2 +- package/dropbear/Makefile | 2 +- package/ebtables/Makefile | 2 +- package/fuse/Makefile | 4 ++-- package/haserl/Makefile | 2 +- package/hostap/Makefile | 4 ++-- package/hostapd/Makefile | 2 +- package/iproute2/Makefile | 2 +- package/ipsec-tools/Makefile | 2 +- package/ipset/Makefile | 2 +- package/iptables/Makefile | 6 +++--- package/libpcap/Makefile | 2 +- package/linux-atm/Makefile | 2 +- package/madwifi/Makefile | 4 ++-- package/mini_fo/Makefile | 4 ++-- package/mtd/Makefile | 2 +- package/nvram/Makefile | 2 +- package/openssl/Makefile | 2 +- package/openswan/Makefile | 4 ++-- package/pcmcia-cs/Makefile | 2 +- package/ppp/Makefile | 2 +- package/pptp/Makefile | 2 +- package/robocfg/Makefile | 2 +- package/shfs/Makefile | 4 ++-- package/spca5xx/Makefile | 4 ++-- package/switch/Makefile | 4 ++-- package/udev/Makefile | 2 +- package/ueagle-atm/Makefile | 4 ++-- package/util-linux/Makefile | 2 +- package/wireless-tools/Makefile | 2 +- package/wlcompat/Makefile | 4 ++-- package/zd1211/Makefile | 4 ++-- package/zlib/Makefile | 2 +- rules.mk | 1 + target/linux/ar531x-2.4/Makefile | 4 ++-- target/linux/ar7-2.4/Makefile | 4 ++-- target/linux/aruba-2.6/Makefile | 4 ++-- target/linux/au1000-2.6/Makefile | 4 ++-- target/linux/brcm-2.4/Makefile | 4 ++-- target/linux/brcm-2.6/Makefile | 4 ++-- target/linux/image/ar7/Makefile | 2 +- target/linux/image/aruba/Makefile | 2 +- target/linux/image/au1000/Makefile | 2 +- target/linux/image/brcm/Makefile | 2 +- target/linux/image/generic/Makefile | 2 +- target/linux/image/rb532/Makefile | 2 +- target/linux/image/x86/Makefile | 2 +- target/linux/image/xscale/Makefile | 2 +- target/linux/rb532-2.6/Makefile | 4 ++-- target/linux/sibyte-2.6/Makefile | 4 ++-- target/linux/x86-2.4/Makefile | 4 ++-- target/linux/x86-2.6/Makefile | 4 ++-- target/linux/xscale-2.6/Makefile | 4 ++-- 62 files changed, 90 insertions(+), 89 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 9fbbe4504c..fc62127ca2 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -1,4 +1,4 @@ -include $(TOPDIR)/include/modules-$(KERNEL).mk +include $(INCLUDE_DIR)/modules-$(KERNEL).mk LINUX_SOURCE:=linux-$(LINUX_VERSION).tar.bz2 LINUX_SITE=http://www.us.kernel.org/pub/linux/kernel/v$(KERNEL) \ diff --git a/include/modules-2.4.mk b/include/modules-2.4.mk index 71864ad8eb..553db03270 100644 --- a/include/modules-2.4.mk +++ b/include/modules-2.4.mk @@ -1,4 +1,4 @@ -include $(TOPDIR)/include/netfilter.mk +include $(INCLUDE_DIR)/netfilter.mk # Networking diff --git a/include/modules-2.6.mk b/include/modules-2.6.mk index ec9f5da44f..aada707fbc 100644 --- a/include/modules-2.6.mk +++ b/include/modules-2.6.mk @@ -1,5 +1,5 @@ NF_2_6:=1 -include $(TOPDIR)/include/netfilter.mk +include $(INCLUDE_DIR)/netfilter.mk # Networking diff --git a/package/alsa/Makefile b/package/alsa/Makefile index 5f6a3305b5..7046bfee92 100644 --- a/package/alsa/Makefile +++ b/package/alsa/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=alsa-driver PKG_VERSION:=1.0.11 @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_CAT:=bzcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk ifeq ($(LINUX_KARCH),i386) KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-i386/mach-generic -I$(LINUX_DIR)/include/asm-i386/mach-default diff --git a/package/base-files/Makefile b/package/base-files/Makefile index bb20894096..7db0d0503c 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files PKG_RELEASE:=8 @@ -12,7 +12,7 @@ ifeq ($(REV),) REV:=0 endif -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk ifneq ($(DUMP),1) TARGET:=-$(BOARD)-$(KERNEL) diff --git a/package/bridge/Makefile b/package/bridge/Makefile index f2b178a610..c3e682cc7f 100644 --- a/package/bridge/Makefile +++ b/package/bridge/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/bridge PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd PKG_CAT:=zcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/bridge SECTION:=base diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile index 6fe22edb0f..7983943452 100644 --- a/package/broadcom-wl/Makefile +++ b/package/broadcom-wl/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile 2480 2005-11-14 02:07:33Z nbd $ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=broadcom-wl PKG_VERSION:=4.80.9.2 @@ -14,7 +14,7 @@ PKG_SOURCE_URL:=http://downloads.openwrt.org/sources PKG_MD5SUM:=7d9fab2c611369bbe075c3924ea77450 PKG_CAT:=bzcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/kmod-brcm-wl SECTION:=drivers diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 6b2e0c5be4..b444129175 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://www.busybox.net/downloads PKG_MD5SUM:=19a0b475169335f17e421cf644616fe7 PKG_CAT:=bzcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/busybox SECTION:=base diff --git a/package/diag/Makefile b/package/diag/Makefile index ab28e7218e..de6ab8d64f 100644 --- a/package/diag/Makefile +++ b/package/diag/Makefile @@ -1,14 +1,14 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=kmod-diag PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/kmod-diag SECTION:=drivers diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index a05ec0e22c..09770dac28 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_MD5SUM:=489198ec87101087043adc98bbe062dc PKG_CAT:=zcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/dnsmasq SECTION:=base diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 0409e66dbf..b76d3dacf2 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/ PKG_MD5SUM:=ca8e53a766faec831882831364568421 PKG_CAT:=zcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/dropbear SECTION:=base diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index 814ac68a22..87f93defe7 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/ebtables PKG_MD5SUM:=f07111fcc1966be669278433c35dcc28 PKG_CAT:=zcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/ebtables SECTION:=base diff --git a/package/fuse/Makefile b/package/fuse/Makefile index b7084236df..06777c8528 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=fuse PKG_VERSION:=2.5.3 @@ -15,7 +15,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/kmod-fuse SECTION:=drivers diff --git a/package/haserl/Makefile b/package/haserl/Makefile index ec940ea437..53a28a7713 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/haserl PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea PKG_CAT:=zcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/haserl SECTION:=base diff --git a/package/hostap/Makefile b/package/hostap/Makefile index 21abfe256b..612b2b72e0 100644 --- a/package/hostap/Makefile +++ b/package/hostap/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=hostap-driver PKG_VERSION:=0.4.9 @@ -15,7 +15,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/kmod-hostap SECTION:=drivers diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 867cda6922..7fc77f81a3 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/hostapd SECTION:=net diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 9cf1eb9909..bbbcc758c3 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/ PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5 PKG_CAT:=zcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/ip SECTION:=base diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index 667884debe..5567036f83 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=bzcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/ipsec-tools SECTION:=base diff --git a/package/ipset/Makefile b/package/ipset/Makefile index d245090a68..0991148566 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=http://ipset.netfilter.org PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26 PKG_CAT:=bzcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/ipset SECTION:=base diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 7490277440..f1a7de1f4b 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables PKG_VERSION:=1.3.5 @@ -20,10 +20,10 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install PKG_MENU:=IPv4 / IPv6 firewall administration -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) include $(LINUX_DIR)/.config -include $(TOPDIR)/include/netfilter.mk +include $(INCLUDE_DIR)/netfilter.mk endif define Package/iptables diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 2d7aecf551..0ded09a908 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/libpcap SECTION:=base diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index 15b3f7d4da..48a94ed046 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/linux-atm SECTION:=libs diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 7bdb7ec11a..57210c0dd0 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=madwifi PKG_VERSION:=0.9.0 @@ -54,7 +54,7 @@ MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \ LDOPTS="" \ DOMULTI=1 -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk ifeq ($(findstring AHB,$(BUS)),AHB) define Build/Compile/ahb diff --git a/package/mini_fo/Makefile b/package/mini_fo/Makefile index 0180f81c31..2922908631 100644 --- a/package/mini_fo/Makefile +++ b/package/mini_fo/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mini_fo PKG_VERSION:=0.6.2pre1 @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://www.denx.de/twiki/pub/Know/MiniFOHome/ PKG_SOURCE:=mini_fo-0-6-2-pre1.tar.bz2 PKG_CAT:=bzcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/kmod-mini-fo SECTION:=drivers diff --git a/package/mtd/Makefile b/package/mtd/Makefile index 01dfcd6b54..80409a9082 100644 --- a/package/mtd/Makefile +++ b/package/mtd/Makefile @@ -7,7 +7,7 @@ PKG_RELEASE:=4 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/mtd SECTION:=base diff --git a/package/nvram/Makefile b/package/nvram/Makefile index cf76c7c812..11e89363fc 100644 --- a/package/nvram/Makefile +++ b/package/nvram/Makefile @@ -7,7 +7,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/nvram SECTION:=base diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 39fe6b4c3d..78e17a2195 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -20,7 +20,7 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install OPENSSL_NO_CIPHERS:= no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-rmd160 no-aes192 OPENSSL_OPTIONS:= shared no-ec no-err no-fips no-hw no-krb5 no-threads zlib-dynamic no-engines -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/libopenssl SECTION:=base diff --git a/package/openswan/Makefile b/package/openswan/Makefile index f81096547b..61aefe457b 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=openswan PKG_VERSION:=2.4.5 @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://www.openswan.org/download PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/kmod-openswan SECTION:=drivers diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile index 2c7b229781..388b431ef0 100644 --- a/package/pcmcia-cs/Makefile +++ b/package/pcmcia-cs/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/pcmcia-cs SECTION:=base diff --git a/package/ppp/Makefile b/package/ppp/Makefile index edd9a5ea86..813b7227d2 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -15,7 +15,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/ppp SECTION:=net diff --git a/package/pptp/Makefile b/package/pptp/Makefile index 6d01ce19f3..0478b4c2b8 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -12,7 +12,7 @@ PKG_SOURCE_URL:=@SF/pptpclient PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 PKG_CAT:=zcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/pptp SECTION:=base diff --git a/package/robocfg/Makefile b/package/robocfg/Makefile index ca0f83d3dd..8451ac5a95 100644 --- a/package/robocfg/Makefile +++ b/package/robocfg/Makefile @@ -8,7 +8,7 @@ PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/robocfg -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/robocfg SECTION:=base diff --git a/package/shfs/Makefile b/package/shfs/Makefile index 057358b34d..5617693015 100644 --- a/package/shfs/Makefile +++ b/package/shfs/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=shfs PKG_VERSION:=0.35 @@ -15,7 +15,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/kmod-shfs SECTION:=drivers diff --git a/package/spca5xx/Makefile b/package/spca5xx/Makefile index 86233fc64a..001a64f76d 100644 --- a/package/spca5xx/Makefile +++ b/package/spca5xx/Makefile @@ -1,7 +1,7 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=spca5xx PKG_VERSION:=20060301 @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://mxhaard.free.fr/spca50x/Download/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_CAT:=zcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk #FIXME: add proper dependency handling on kmod-usb-core & kmod-videodev packages define Package/kmod-spca5xx diff --git a/package/switch/Makefile b/package/switch/Makefile index cb5f346748..befae3410e 100644 --- a/package/switch/Makefile +++ b/package/switch/Makefile @@ -1,14 +1,14 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=kmod-switch PKG_RELEASE:=1 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/kmod-switch SECTION:=drivers diff --git a/package/udev/Makefile b/package/udev/Makefile index 5d397161b1..0156115362 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -19,7 +19,7 @@ PKG_CAT:=bzcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/udev SECTION:=base diff --git a/package/ueagle-atm/Makefile b/package/ueagle-atm/Makefile index 6d003f6c0d..6d9c739c3c 100644 --- a/package/ueagle-atm/Makefile +++ b/package/ueagle-atm/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile 2767 2005-12-25 02:10:14Z wbx $ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ueagle-atm PKG_VERSION:=1.0d1 @@ -15,7 +15,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk #FIXME: add dependency on kmod-usb-core define Package/kmod-ueagle-atm diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 673ade433f..798e3c8571 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -16,7 +16,7 @@ PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/fdisk SECTION:=base diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index 368d3ebb01..5f1205884c 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=zcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/wireless-tools SECTION:=base diff --git a/package/wlcompat/Makefile b/package/wlcompat/Makefile index d5feede6c9..e6ec27ee81 100644 --- a/package/wlcompat/Makefile +++ b/package/wlcompat/Makefile @@ -1,14 +1,14 @@ # $Id$ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=kmod-wlcompat PKG_RELEASE:=3 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/kmod-wlcompat SECTION:=drivers diff --git a/package/zd1211/Makefile b/package/zd1211/Makefile index 1c79922cfc..ba7308cc01 100644 --- a/package/zd1211/Makefile +++ b/package/zd1211/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile 3297 2006-03-02 23:42:52Z florian $ include $(TOPDIR)/rules.mk -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=zd1211 PKG_VERSION:=r69 @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=http://zd1211.ath.cx/download/ PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz PKG_CAT:=zcat -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk #FIXME: add proper dependency handling on kmod-usb-core packages define Package/kmod-zd1211 diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 8e497c2f28..6c560624f0 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -14,7 +14,7 @@ PKG_CAT:=bzcat PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -include $(TOPDIR)/include/package.mk +include $(INCLUDE_DIR)/package.mk define Package/zlib SECTION:=base diff --git a/rules.mk b/rules.mk index 79807e093d..3f96d320e7 100644 --- a/rules.mk +++ b/rules.mk @@ -46,6 +46,7 @@ TARGET_CFLAGS:=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) OPTIMIZE_FOR_CPU=$(ARCH) HOSTCC:=gcc BASE_DIR:=$(TOPDIR) +INCLUDE_DIR:=$(TOPDIR)/include DL_DIR:=$(BASE_DIR)/dl BUILD_DIR:=$(BASE_DIR)/build_$(ARCH) STAGING_DIR:=$(BASE_DIR)/staging_dir_$(ARCH) diff --git a/target/linux/ar531x-2.4/Makefile b/target/linux/ar531x-2.4/Makefile index 96a32848e7..b33898754b 100644 --- a/target/linux/ar531x-2.4/Makefile +++ b/target/linux/ar531x-2.4/Makefile @@ -5,8 +5,8 @@ LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c include ./config -include $(TOPDIR)/include/kernel.mk -include $(TOPDIR)/include/kernel-build.mk +include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches diff --git a/target/linux/ar7-2.4/Makefile b/target/linux/ar7-2.4/Makefile index c8688da044..02a553a1ee 100644 --- a/target/linux/ar7-2.4/Makefile +++ b/target/linux/ar7-2.4/Makefile @@ -5,7 +5,7 @@ LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c include ./config -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk ATM_FIRMWARE_VERSION:=0.4 ATM_FIRMWARE_DIR=sangam-atm-firmware-$(ATM_FIRMWARE_VERSION) @@ -26,7 +26,7 @@ $(eval $(call KMOD_template,CPMAC,cpmac,\ $(MODULES_DIR)/kernel/drivers/net/avalanche_cpmac/avalanche_cpmac.o \ ,CONFIG_MIPS_AVALANCHE_CPMAC,,10,avalanche_cpmac)) -include $(TOPDIR)/include/kernel-build.mk +include $(INCLUDE_DIR)/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked diff --git a/target/linux/aruba-2.6/Makefile b/target/linux/aruba-2.6/Makefile index 652e4b9132..4d7955b103 100644 --- a/target/linux/aruba-2.6/Makefile +++ b/target/linux/aruba-2.6/Makefile @@ -5,8 +5,8 @@ LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e include ./config -include $(TOPDIR)/include/kernel.mk -include $(TOPDIR)/include/kernel-build.mk +include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches $(MAKE_TRACE) diff --git a/target/linux/au1000-2.6/Makefile b/target/linux/au1000-2.6/Makefile index b1ca0fee34..a301fabcfe 100644 --- a/target/linux/au1000-2.6/Makefile +++ b/target/linux/au1000-2.6/Makefile @@ -5,8 +5,8 @@ LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e include ./config -include $(TOPDIR)/include/kernel.mk -include $(TOPDIR)/include/kernel-build.mk +include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches diff --git a/target/linux/brcm-2.4/Makefile b/target/linux/brcm-2.4/Makefile index 20a6210666..7945db9171 100644 --- a/target/linux/brcm-2.4/Makefile +++ b/target/linux/brcm-2.4/Makefile @@ -5,7 +5,7 @@ LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c include ./config -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk # broadcom specific kmod packages $(eval $(call KMOD_template,LP,lp,\ @@ -15,7 +15,7 @@ $(eval $(call KMOD_template,LP,lp,\ $(MODULES_DIR)/kernel/drivers/char/ppdev.o \ ,CONFIG_PARPORT,,50,parport parport_splink lp)) -include $(TOPDIR)/include/kernel-build.mk +include $(INCLUDE_DIR)/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked diff --git a/target/linux/brcm-2.6/Makefile b/target/linux/brcm-2.6/Makefile index a3b8177c20..35a778fdf2 100644 --- a/target/linux/brcm-2.6/Makefile +++ b/target/linux/brcm-2.6/Makefile @@ -5,8 +5,8 @@ LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e include ./config -include $(TOPDIR)/include/kernel.mk -include $(TOPDIR)/include/kernel-build.mk +include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked diff --git a/target/linux/image/ar7/Makefile b/target/linux/image/ar7/Makefile index 4b22f90df2..a98f53efb6 100644 --- a/target/linux/image/ar7/Makefile +++ b/target/linux/image/ar7/Makefile @@ -1,4 +1,4 @@ -include $(TOPDIR)/include/image.mk +include $(INCLUDE_DIR)/image.mk PKG_BUILD_DIR:=$(BUILD_DIR)/ar7loader diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile index 5091d3f40c..7c735b5cdb 100644 --- a/target/linux/image/aruba/Makefile +++ b/target/linux/image/aruba/Makefile @@ -1,4 +1,4 @@ -include $(TOPDIR)/include/image.mk +include $(INCLUDE_DIR)/image.mk LOADADDR = 0x81000000 # RAM start + 16M KERNEL_ENTRY = 0x80100000 diff --git a/target/linux/image/au1000/Makefile b/target/linux/image/au1000/Makefile index 682670a22c..956d6738e3 100644 --- a/target/linux/image/au1000/Makefile +++ b/target/linux/image/au1000/Makefile @@ -1,4 +1,4 @@ -include $(TOPDIR)/include/image.mk +include $(INCLUDE_DIR)/image.mk LOADADDR = 0x8108c8f4 # RAM start + 16M KERNEL_ENTRY = 0x80100000 # Default kernel entry in arch/mips/Makefile diff --git a/target/linux/image/brcm/Makefile b/target/linux/image/brcm/Makefile index d219dc354b..e4ccffdb65 100644 --- a/target/linux/image/brcm/Makefile +++ b/target/linux/image/brcm/Makefile @@ -1,4 +1,4 @@ -include $(TOPDIR)/include/image.mk +include $(INCLUDE_DIR)/image.mk define Build/Compile rm -f $(KDIR)/loader.gz diff --git a/target/linux/image/generic/Makefile b/target/linux/image/generic/Makefile index b9efc95b9b..a11574b3b4 100644 --- a/target/linux/image/generic/Makefile +++ b/target/linux/image/generic/Makefile @@ -1,4 +1,4 @@ -include $(TOPDIR)/include/image.mk +include $(INCLUDE_DIR)/image.mk # use default targets for everything diff --git a/target/linux/image/rb532/Makefile b/target/linux/image/rb532/Makefile index 53adfc432f..b589f045be 100644 --- a/target/linux/image/rb532/Makefile +++ b/target/linux/image/rb532/Makefile @@ -1,4 +1,4 @@ -include $(TOPDIR)/include/image.mk +include $(INCLUDE_DIR)/image.mk LOADADDR = 0x81000000 # RAM start + 16M KERNEL_ENTRY = 0x80101000 diff --git a/target/linux/image/x86/Makefile b/target/linux/image/x86/Makefile index d76294f150..94d1dade11 100644 --- a/target/linux/image/x86/Makefile +++ b/target/linux/image/x86/Makefile @@ -1,4 +1,4 @@ -include $(TOPDIR)/include/image.mk +include $(INCLUDE_DIR)/image.mk define Image/Build cp $(KDIR)/root.$(1) $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img diff --git a/target/linux/image/xscale/Makefile b/target/linux/image/xscale/Makefile index d94d7f07ca..ba203705e1 100644 --- a/target/linux/image/xscale/Makefile +++ b/target/linux/image/xscale/Makefile @@ -1,4 +1,4 @@ -include $(TOPDIR)/include/image.mk +include $(INCLUDE_DIR)/image.mk define Image/Build ifneq ($(FS),jffs2-64k) diff --git a/target/linux/rb532-2.6/Makefile b/target/linux/rb532-2.6/Makefile index 4b0901987f..11e34e7910 100644 --- a/target/linux/rb532-2.6/Makefile +++ b/target/linux/rb532-2.6/Makefile @@ -5,8 +5,8 @@ LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e include ./config -include $(TOPDIR)/include/kernel.mk -include $(TOPDIR)/include/kernel-build.mk +include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches diff --git a/target/linux/sibyte-2.6/Makefile b/target/linux/sibyte-2.6/Makefile index 4b0901987f..11e34e7910 100644 --- a/target/linux/sibyte-2.6/Makefile +++ b/target/linux/sibyte-2.6/Makefile @@ -5,8 +5,8 @@ LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e include ./config -include $(TOPDIR)/include/kernel.mk -include $(TOPDIR)/include/kernel-build.mk +include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches diff --git a/target/linux/x86-2.4/Makefile b/target/linux/x86-2.4/Makefile index a6208dbbbb..8a690afd01 100644 --- a/target/linux/x86-2.4/Makefile +++ b/target/linux/x86-2.4/Makefile @@ -5,13 +5,13 @@ LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c include ./config -include $(TOPDIR)/include/kernel.mk +include $(INCLUDE_DIR)/kernel.mk $(eval $(call KMOD_template,WD1100,wd1100,\ $(MODULES_DIR)/kernel/drivers/char/wd1100.o \ ,CONFIG_WD1100)) -include $(TOPDIR)/include/kernel-build.mk +include $(INCLUDE_DIR)/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile index ab88d58dfb..04b13a3908 100644 --- a/target/linux/x86-2.6/Makefile +++ b/target/linux/x86-2.6/Makefile @@ -5,8 +5,8 @@ LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e include ./config -include $(TOPDIR)/include/kernel.mk -include $(TOPDIR)/include/kernel-build.mk +include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches diff --git a/target/linux/xscale-2.6/Makefile b/target/linux/xscale-2.6/Makefile index a4d93efc5f..bd17ba7645 100644 --- a/target/linux/xscale-2.6/Makefile +++ b/target/linux/xscale-2.6/Makefile @@ -5,8 +5,8 @@ LINUX_RELEASE:=1 LINUX_KERNEL_MD5SUM:=37ddefe96625502161f075b9d907f21e include ./config -include $(TOPDIR)/include/kernel.mk -include $(TOPDIR)/include/kernel-build.mk +include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/kernel-build.mk $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked [ -d ../generic-$(KERNEL)/patches ] && $(PATCH) $(LINUX_DIR) ../generic-$(KERNEL)/patches -- 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 'package/dnsmasq/Makefile') 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 5aa8ed59a978117d1ea238b5c77ea308f0a6fe66 Mon Sep 17 00:00:00 2001 From: kaloz Date: Fri, 21 Jul 2006 11:10:32 +0000 Subject: upgrade dnsmasq to v2.32 git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4190 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 8d76f378e7..0efb349bc8 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.27 +PKG_VERSION:=2.32 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_MD5SUM:=489198ec87101087043adc98bbe062dc +PKG_MD5SUM:=d1f593a8352db1d6ad3dccc9b775295d PKG_CAT:=zcat include $(INCLUDE_DIR)/package.mk -- cgit v1.2.3 From 001227b7800328fe3db15d62e0948d25dfa596f6 Mon Sep 17 00:00:00 2001 From: mbm Date: Fri, 4 Aug 2006 05:30:27 +0000 Subject: more cleanup (make sure to pass TARGET_PATH and not just TARGET_CC) git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4432 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- include/kernel-build.mk | 4 ++-- include/package.mk | 1 - package/dnsmasq/Makefile | 2 +- package/dropbear/Makefile | 4 ++-- package/libpcap/Makefile | 1 + package/linux-atm/Makefile | 6 +----- package/mtd/Makefile | 6 ------ package/ppp/Makefile | 2 +- package/wireless-tools/Makefile | 3 ++- 9 files changed, 10 insertions(+), 19 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 38ea9a18eb..e3f2d5daed 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -66,7 +66,7 @@ else endif $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.linux-compile pkg-install ramdisk-config - $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH=$(TARGET_PATH) + $(MAKE) -C $(LINUX_DIR) CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(KERNEL_CROSS)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S $< $@ @@ -75,7 +75,7 @@ $(LINUX_KERNEL): $(LINUX_DIR)/vmlinux $(LINUX_DIR)/.modules_done: rm -rf $(KERNEL_BUILD_DIR)/modules $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" modules - $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install + $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" ARCH=$(LINUX_KARCH) PATH="$(TARGET_PATH)" DEPMOD=true INSTALL_MOD_PATH=$(KERNEL_BUILD_DIR)/modules modules_install touch $(LINUX_DIR)/.modules_done modules: $(LINUX_DIR)/.modules_done diff --git a/include/package.mk b/include/package.mk index c0953ae701..fee715043c 100644 --- a/include/package.mk +++ b/include/package.mk @@ -285,7 +285,6 @@ endef define Build/Compile/Default $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CC=$(TARGET_CC) \ CROSS="$(TARGET_CROSS)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ ARCH="$(ARCH)" \ diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 0efb349bc8..f6c2d36c52 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -36,7 +36,7 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ - CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_CONFIGURE_OPTS) \ BINDIR="/usr/sbin" MANDIR="/usr/man" \ all endef diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 48e69e466f..cfb2c4135e 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -81,11 +81,11 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ - LD="$(TARGET_CC)" \ + $(TARGET_CONFIGURE_OPTS) \ PROGRAMS="dropbear dbclient dropbearkey scp" \ MULTI=1 SCPPROGRESS=1 $(MAKE) -C $(PKG_BUILD_DIR) \ - LD="$(TARGET_CC)" \ + $(TARGET_CONFIGURE_OPTS) \ PROGRAMS="dropbearconvert" endef diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 1d9d4371fb..155748a472 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -71,6 +71,7 @@ define Build/Compile mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ CCOPT="$(TARGET_CFLAGS) -I$(BUILD_DIR)/linux/include" \ + PATH=$(TARGET_PATH) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install endef diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index 0b8c59d4e1..56ca90a383 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -44,11 +44,7 @@ define Build/Configure endef define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install + $(call Build/Compile/Default,DESTDIR="$(PKG_INSTALL_DIR)" all install) endef define Package/linux-atm/install diff --git a/package/mtd/Makefile b/package/mtd/Makefile index b3bf6023af..01b9adf98f 100644 --- a/package/mtd/Makefile +++ b/package/mtd/Makefile @@ -29,12 +29,6 @@ define Build/Prepare $(CP) ./src/* $(PKG_BUILD_DIR)/ endef -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ - all -endef - define Package/mtd/install install -d -m0755 $(1)/sbin install -m0755 $(PKG_BUILD_DIR)/mtd $(1)/sbin/ diff --git a/package/ppp/Makefile b/package/ppp/Makefile index a42af41d31..64351a5ca1 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -87,7 +87,7 @@ define Build/Compile rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR)/usr $(MAKE) -C $(PKG_BUILD_DIR) \ - CC="$(TARGET_CC)" \ + $(TARGET_CONFIGURE_OPTS) \ COPTS="$(TARGET_CFLAGS)" \ PRECOMPILED_FILTER=1 \ STAGING_DIR="$(STAGING_DIR)" \ diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index 5884424876..32e7fc05a9 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -35,7 +35,8 @@ define Build/Compile rm -rf $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ - CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -I." \ libiw.so.28 iwmulticall $(MAKE) -C $(PKG_BUILD_DIR) \ PREFIX="$(PKG_INSTALL_DIR)" \ -- cgit v1.2.3 From 1a4ad709447066a9d49d2468d36e18ad23a9d76f Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 3 Sep 2006 18:11:10 +0000 Subject: fix HAVE_ISC_READER related error git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4742 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index f6c2d36c52..2208a06ce4 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.32 +PKG_VERSION:=2.33 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_MD5SUM:=d1f593a8352db1d6ad3dccc9b775295d +PKG_MD5SUM:=45696461b6e6bc929273b1191ca50447 PKG_CAT:=zcat include $(INCLUDE_DIR)/package.mk @@ -37,6 +37,7 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -DHAVE_ISC_READER=1" \ BINDIR="/usr/sbin" MANDIR="/usr/man" \ all endef -- cgit v1.2.3 From 4c48d8a7e0c3bcd02cfab3d7b475d0a8268c4e84 Mon Sep 17 00:00:00 2001 From: nico Date: Sat, 23 Sep 2006 13:41:42 +0000 Subject: standardize Makefile, change section from base to net and category to "base system" git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4820 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 2208a06ce4..3dc22a3a02 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -21,13 +21,13 @@ PKG_CAT:=zcat include $(INCLUDE_DIR)/package.mk define Package/dnsmasq -SECTION:=base -CATEGORY:=Network -DEFAULT:=y -TITLE:=A lightweight DNS and DHCP server -DESCRIPTION:=A lightweight DNS and DHCP server. It is intended to provide \\\ -coupled DNS and DHCP service to a LAN. -URL:=http://www.thekelleys.org.uk/dnsmasq/ + SECTION:=net + CATEGORY:=Base system + DEFAULT:=y + TITLE:=A lightweight DNS and DHCP server + DESCRIPTION:=\ + It is intended to provide coupled DNS and DHCP service to a LAN. + URL:=http://www.thekelleys.org.uk/dnsmasq/ endef define Package/dnsmasq/conffiles @@ -43,12 +43,12 @@ define Build/Compile endef define Package/dnsmasq/install + install -m0755 -d $(1)/usr/sbin + install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(1)/usr/sbin/ install -m0755 -d $(1)/etc install -m0644 ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf install -m0755 -d $(1)/etc/init.d install -m0755 ./files/dnsmasq.init $(1)/etc/init.d/S50dnsmasq - install -m0755 -d $(1)/usr/sbin - install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(1)/usr/sbin/ endef $(eval $(call BuildPackage,dnsmasq)) -- cgit v1.2.3 From 8afb23270d23db6a033ba8fb77e1cf1a1d925a7c Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 24 Sep 2006 20:49:31 +0000 Subject: new (last?) attempt at standardizing Makefiles git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4855 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/alsa/Makefile | 3 +- package/arptables/Makefile | 3 +- package/base-files/Makefile | 47 ++-- package/bridge/Makefile | 3 +- package/broadcom-wl/Makefile | 79 +++--- package/busybox/Makefile | 36 ++- package/dnsmasq/Makefile | 3 +- package/dropbear/Makefile | 3 +- package/ebtables/Makefile | 3 +- package/fuse/Makefile | 5 +- package/gmp/Makefile | 5 +- package/haserl/Makefile | 3 +- package/hostap-utils/Makefile | 3 +- package/hostap/Makefile | 58 ++-- package/hostapd/Makefile | 45 +-- package/iproute2/Makefile | 3 +- package/ipsec-tools/Makefile | 2 +- package/ipset/Makefile | 3 +- package/iptables/Makefile | 196 ++++++------- package/isakmpd/Makefile | 2 +- package/kernel/Makefile | 23 +- package/kernel/modules.mk | 563 ++++++++++++++++++++------------------ package/keynote/Makefile | 6 +- package/libpcap/Makefile | 2 +- package/linux-atm/Makefile | 2 +- package/madwifi/Makefile | 5 +- package/mini_fo/Makefile | 3 +- package/openssl/Makefile | 5 +- package/openswan/Makefile | 3 +- package/pcmcia-cs/Makefile | 2 +- package/ppp/Makefile | 116 ++++---- package/pptp/Makefile | 3 +- package/shfs/Makefile | 2 +- package/spca5xx/Makefile | 3 +- package/udev/Makefile | 2 +- package/ueagle-atm/Makefile | 2 +- package/util-linux/Makefile | 2 +- package/wireless-tools/Makefile | 5 +- package/yamonenv/Makefile | 18 +- package/zd1211/Makefile | 20 +- package/zlib/Makefile | 5 +- toolchain/ext2fs/Makefile | 8 +- toolchain/ipkg-utils/Makefile | 23 +- toolchain/jffs2/Makefile | 11 +- toolchain/kernel-headers/Makefile | 2 +- toolchain/libnotimpl/Makefile | 9 +- toolchain/lzma/Makefile | 15 +- toolchain/mkimage/Makefile | 5 +- toolchain/sed/Makefile | 7 +- toolchain/squashfs/Makefile | 19 +- toolchain/sstrip/Makefile | 7 +- 51 files changed, 760 insertions(+), 643 deletions(-) (limited to 'package/dnsmasq/Makefile') diff --git a/package/alsa/Makefile b/package/alsa/Makefile index ebfb6f872e..d82d87adad 100644 --- a/package/alsa/Makefile +++ b/package/alsa/Makefile @@ -13,12 +13,13 @@ PKG_NAME:=alsa-driver PKG_VERSION:=1.0.11 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/driver/ PKG_MD5SUM:=57534e4297cd683371402220e3753885 PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/kmod-alsa diff --git a/package/arptables/Makefile b/package/arptables/Makefile index c0c898baed..0518e8ea36 100644 --- a/package/arptables/Makefile +++ b/package/arptables/Makefile @@ -11,12 +11,13 @@ PKG_NAME:=arptables PKG_VERSION:=0.0.3 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/ebtables PKG_MD5SUM:=1672244603c8979577aa4738be35a759 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/arptables diff --git a/package/base-files/Makefile b/package/base-files/Makefile index d6e62b5ae5..1e234c65a3 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -11,22 +11,23 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=base-files PKG_RELEASE:=8 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/base-files + +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME) REV:=$(shell LANG=C svn info | awk '/^Revision:/ { print$$2 }' ) ifeq ($(REV),) -REV:=0 + REV:=0 endif include $(INCLUDE_DIR)/package.mk ifneq ($(DUMP),1) -TARGET:=-$(BOARD)-$(KERNEL) -UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null} -LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null} + TARGET:=-$(BOARD)-$(KERNEL) + UCLIBC_VERSION:=${shell cat $(STAGING_DIR)/uclibc_version 2>/dev/null} + LIBGCC_VERSION:=${shell cat $(STAGING_DIR)/gcc_version 2>/dev/null} else -UCLIBC_VERSION:= -LIBGCC_VERSION:= + UCLIBC_VERSION:= + LIBGCC_VERSION:= endif CONFIG_PACKAGE_base-files$(TARGET):=$(CONFIG_PACKAGE_base-files) @@ -35,8 +36,10 @@ define Package/base-files$(TARGET) SECTION:=base CATEGORY:=Base system DEFAULT:=y - TITLE:=OpenWrt system scripts - DESCRIPTION:=Base filesystem for OpenWrt + TITLE:=Base filesystem for OpenWrt + DESCRIPTION:=\ + This package contains a base filesystem and system scripts for OpenWrt. + URL:=http://openwrt.org/ VERSION:=$(PKG_RELEASE)-$(REV) endef @@ -68,7 +71,6 @@ define -xscale-2.6/conffiles /etc/config/network endef - define Package/base-files$(TARGET)/conffiles /etc/banner /etc/hosts @@ -84,37 +86,37 @@ endef define Package/libgcc SECTION:=libs - CATEGORY:=Libraries + CATEGORY:=Base system DEFAULT:=y DEPENDS:=@!NATIVE_TOOLCHAIN TITLE:=GCC support library + URL:=http://gcc.gnu.org/ VERSION:=$(LIBGCC_VERSION)-$(PKG_RELEASE) - DESCRIPTION:=$(TITLE) endef define Package/libpthread - $(call Package/base-files$(TARGET)) - DEFAULT:=n + SECTION:=libs + CATEGORY:=Libraries DEPENDS:=@!NATIVE_TOOLCHAIN - VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) TITLE:=POSIX thread library - DESCRIPTION:=POSIX thread library + URL:=http://uclibc.org/ + VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) endef - define Package/uclibc - $(call Package/base-files$(TARGET)) - VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) + SECTION:=libs + CATEGORY:=Base system + DEFAULT:=y DEPENDS:=@!NATIVE_TOOLCHAIN - TITLE:=C library - DESCRIPTION:=C library for embedded systems + TITLE:=C library embedded systems + URL:=http://uclibc.org/ + VERSION:=$(UCLIBC_VERSION)-$(PKG_RELEASE) endef define Build/Prepare mkdir -p $(PKG_BUILD_DIR) endef - define Build/Compile/ar7 $(TARGET_CC) -o $(PKG_BUILD_DIR)/adam2patcher src/adam2patcher.c endef @@ -132,6 +134,7 @@ define Package/base-files$(TARGET)/install-ar7 mkdir -p $(1)/sbin $(CP) $(PKG_BUILD_DIR)/adam2patcher $(1)/sbin endef + define Package/base-files$(TARGET)/install-brcm rm -f $(1)/etc/config/network mkdir -p $(1)/sbin diff --git a/package/bridge/Makefile b/package/bridge/Makefile index 6c08dc24d0..c186c8e701 100644 --- a/package/bridge/Makefile +++ b/package/bridge/Makefile @@ -12,12 +12,13 @@ PKG_NAME:=bridge PKG_VERSION:=1.0.6 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION) PKG_SOURCE:=bridge-utils-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/bridge PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/bridge-utils-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/bridge diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile index ce447a4ac2..3ef4bcf081 100644 --- a/package/broadcom-wl/Makefile +++ b/package/broadcom-wl/Makefile @@ -14,68 +14,83 @@ PKG_VERSION:=4.80.17.0 PKG_RELEASE:=1 WLC_VERSION:=0.1 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources PKG_MD5SUM:=3183ddb60e3e882b41df1776c89b614c PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk -define Package/kmod-brcm-wl - SECTION:=drivers - CATEGORY:=Drivers - DEPENDS:=@LINUX_2_4_BRCM - DEFAULT:=y +define Package/broadcom-wl/Default + SECTION:=net + CATEGORY:=Kernel drivers + DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo SUBMENU:=Proprietary BCM43xx WiFi driver SUBMENUDEP:=@LINUX_2_4_BRCM - TITLE:=Kernel driver (normal version) - DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset +endef + +define Package/kmod-brcm-wl/Default + $(call Package/broadcom-wl/Default) + SECTION:=kernel + DEPENDS:=@LINUX_2_4_BRCM + TITLE:=Kernel driver for BCM43xx chipsets + DESCRIPTION:=\ + This package contains the proprietary wireless driver for the Broadcom \\\ + BCM43xx chipset VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE) endef +define Package/kmod-brcm-wl + $(call Package/kmod-brcm-wl/Default) + DEFAULT:=y + TITLE+= (normal version) + DESCRIPTION+= (normal version). +endef + define Package/kmod-brcm-wl-mimo - $(call Package/kmod-brcm-wl) - DEFAULT:=m if ALL - TITLE:=Kernel driver (MIMO version) - DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset (MIMO version) + $(call Package/kmod-brcm-wl/Default) + TITLE+= (MIMO version) + DESCRIPTION+= (MIMO version). endef define Package/wlc - $(call Package/kmod-brcm-wl-mimo) + $(call Package/broadcom-wl/Default) DEFAULT:=y - DEPENDS:=kmod-brcm-wl - TITLE:=Setup utility - DESCRIPTION:=Utility for initializing the Broadcom wl driver - VERSION:=$(WLC_VERSION)-$(PKG_RELEASE) + TITLE:=Proprietary Broadcom wl driver setup utility + DESCRIPTION:=\ + This package contains an utility for initializing the proprietary Broadcom \\\ + wl driver. endef define Package/wl - $(call Package/wlc) - TITLE:=Utility for changing the driver's parameters - DESCRIPTION:=Utility for changing the Broadcom wl driver's parameters - VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) + $(call Package/broadcom-wl/Default) + TITLE:=Proprietary Broadcom wl driver config utility + DESCRIPTION:=\ + This package contains the proprietary utility (wl) for configuring the \\\ + proprietary Broadcom wl driver. endef define Package/nas - $(call Package/wl) - DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +nvram - DEFAULT:=m - TITLE:=Proprietary WPA/WPA2 authenticator - DESCRIPTION:=Proprietary WPA/WPA2 authenticator for the Broadcom wl driver -endef - -define Build/Prepare - $(call Build/Prepare/Default) - $(CP) src/* $(PKG_BUILD_DIR)/ + $(call Package/broadcom-wl/Default) + DEPENDS+= +nvram + TITLE:=Proprietary Broadcom WPA/WPA2 authenticator + DESCRIPTION:=\ + This package contains the proprietary WPA/WPA2 authenticator (nas) for the \\\ + proprietary Broadcom wl driver. endef -MAKEFLAGS_KMOD = -C "$(LINUX_DIR)" \ +MAKEFLAGS_KMOD:= -C "$(LINUX_DIR)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ PATH="$(TARGET_PATH)" \ SUBDIRS="$(PKG_BUILD_DIR)/kmod" +define Build/Prepare + $(call Build/Prepare/Default) + $(CP) src/* $(PKG_BUILD_DIR)/ +endef define Build/Compile # Compile the kernel part diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 6e9cf4194a..9e30492e90 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -12,24 +12,26 @@ PKG_NAME:=busybox PKG_VERSION:=1.2.1 PKG_RELEASE:=1 -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:=362b3dc0f2023ddfda901dc1f1a74391 PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/busybox -SECTION:=base -CATEGORY:=Base system -MENU:=1 -DEFAULT:=y -TITLE:=Core utilities for embedded Linux -DESCRIPTION:=The Swiss Army Knife of embedded Linux. \\\ -It slices, it dices, it makes Julian Fries. -URL:=http://busybox.net/ -CONFIG:=\\\ + SECTION:=base + CATEGORY:=Base system + DEFAULT:=y + TITLE:=Core utilities for embedded Linux + DESCRIPTION:=\ + The Swiss Army Knife of embedded Linux. \\\ + It slices, it dices, it makes Julian Fries. + URL:=http://busybox.net/ + MENU:=1 + CONFIG:=\\\ menu "Configuration" \\\ depends on PACKAGE_busybox \\\ source "$(SOURCE)/config/Config.in" \\\ @@ -38,13 +40,19 @@ endef define Build/Configure $(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config - yes '' | $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \ - -C $(PKG_BUILD_DIR) oldconfig + yes '' | $(MAKE) -C $(PKG_BUILD_DIR) \ + CC="$(TARGET_CC)" \ + CROSS="$(TARGET_CROSS)" \ + oldconfig endef define Package/busybox/install - $(MAKE) CC="$(TARGET_CC)" CROSS="$(TARGET_CROSS)" \ - PREFIX="$(1)" EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC="$(TARGET_CC)" \ + CROSS="$(TARGET_CROSS)" \ + EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ + PREFIX="$(1)" \ + install -rm -rf $(1)/lib64 endef diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 3dc22a3a02..6283fdc898 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -12,12 +12,13 @@ PKG_NAME:=dnsmasq PKG_VERSION:=2.33 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_MD5SUM:=45696461b6e6bc929273b1191ca50447 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/dnsmasq diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 73cc10ef8e..b28b44ef9e 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -12,12 +12,13 @@ PKG_NAME:=dropbear PKG_VERSION:=0.48.1 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/ PKG_MD5SUM:=ca8e53a766faec831882831364568421 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/dropbear/Default diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile index 4d5c99ff84..a0e53a48d3 100644 --- a/package/ebtables/Makefile +++ b/package/ebtables/Makefile @@ -12,12 +12,13 @@ PKG_NAME:=ebtables PKG_VERSION:=2.0.8-rc2 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/ebtables PKG_MD5SUM:=f07111fcc1966be669278433c35dcc28 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/ebtables diff --git a/package/fuse/Makefile b/package/fuse/Makefile index 422499d77d..8c6b2ce564 100644 --- a/package/fuse/Makefile +++ b/package/fuse/Makefile @@ -13,12 +13,12 @@ PKG_NAME:=fuse PKG_VERSION:=2.5.3 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c PKG_CAT:=zcat +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -123,8 +123,7 @@ define Build/InstallDev endef define Build/UninstallDev - rm -rf \ - $(STAGING_DIR)/usr/include/fuse{,.h} \ + rm -rf $(STAGING_DIR)/usr/include/fuse{,.h} \ $(STAGING_DIR)/usr/lib/libfuse.{a,so*} \ $(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc endef diff --git a/package/gmp/Makefile b/package/gmp/Makefile index cc13af3549..43afab3c74 100644 --- a/package/gmp/Makefile +++ b/package/gmp/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=gmp PKG_VERSION:=4.1.4 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@GNU/gmp PKG_MD5SUM:=0aa7d3b3f5b5ec5951e7dddd6f65e891 PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -51,8 +51,7 @@ define Build/InstallDev endef define Build/UninstallDev - rm -rf \ - $(STAGING_DIR)/usr/include/gmp* \ + rm -rf $(STAGING_DIR)/usr/include/gmp* \ $(STAGING_DIR)/usr/lib/libgmp.{a,so*} endef diff --git a/package/haserl/Makefile b/package/haserl/Makefile index eeba09b672..83a7d848f8 100644 --- a/package/haserl/Makefile +++ b/package/haserl/Makefile @@ -12,12 +12,13 @@ PKG_NAME:=haserl PKG_VERSION:=0.8.0 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/haserl PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/haserl diff --git a/package/hostap-utils/Makefile b/package/hostap-utils/Makefile index b794ad0d1e..ad142f33d2 100644 --- a/package/hostap-utils/Makefile +++ b/package/hostap-utils/Makefile @@ -11,12 +11,13 @@ PKG_NAME:=hostap-utils PKG_VERSION:=0.4.7 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/ PKG_MD5SUM:=afe041581b8f01666e353bec20917c85 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/hostap-utils diff --git a/package/hostap/Makefile b/package/hostap/Makefile index 90281fe6b5..82e7475a0e 100644 --- a/package/hostap/Makefile +++ b/package/hostap/Makefile @@ -12,30 +12,24 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=hostap-driver PKG_VERSION:=0.4.9 PKG_RELEASE:=1 -PKG_MD5SUM:=c7534dc040ab90218257a78488ecd378 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/ +PKG_MD5SUM:=c7534dc040ab90218257a78488ecd378 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk -define Package/kmod-hostap - SECTION:=drivers - CATEGORY:=Drivers - DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT - TITLE:=Host AP support for Prism2/2.5/3 IEEE 802.11b - DESCRIPTION:=Host AP support for Prism2/2.5/3 IEEE 802.11b \\\ - 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 the card \\\ - to act as an IEEE 802.11 access point. \\\ - \\\ - This option includes the base Host AP driver code that is shared by \\\ - different hardware models. You will also need to enable support for \\\ - PLX/PCI/CS version of the driver to actually use the driver. \\\ +define Package/kmod-hostap/Default + SECTION:=kernel + CATEGORY:=Kernel drivers + DESCRIPTION:=\ + Host AP is a driver for 802.11b wireless cards based on Intersil \\\ + Prism2/2.5/3 chipset. It supports so called Host AP mode that allows the \\\ + card to act as an IEEE 802.11 access point. URL:=http://hostap.epitest.fi/ ifeq ($(KERNEL),2.6) VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE) @@ -44,18 +38,34 @@ define Package/kmod-hostap endif endef +define Package/kmod-hostap + $(call Package/kmod-hostap/Default) + DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT + TITLE:=Host AP support for Prism2/2.5/3 + DESCRIPTION+=\\\ + \\\ + This package contains the base Host AP driver code that is shared by \\\ + different hardware models. You will also need to enable support for \\\ + PLX/PCI/CS version of the driver to actually use the driver. +endef + define Package/kmod-hostap-pci -$(call Package/kmod-hostap) -DEPENDS:=kmod-hostap -TITLE:=Host AP driver for Prism2.5 PCI adaptors -DESCRIPTION:=Host AP driver for Prism2.5 PCI adaptors + $(call Package/kmod-hostap/Default) + DEPENDS:=kmod-hostap + TITLE:=Host AP driver for PCI adaptors + DESCRIPTION+=\\\ + \\\ + This package contains the Host AP driver for Prism2.5 PCI adaptors. endef define Package/kmod-hostap-plx -$(call Package/kmod-hostap) -DEPENDS:=kmod-hostap -TITLE:=Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors -DESCRIPTION:=Host AP driver for Prism2/2.5/3 in PLX9052 based PCI adaptors + $(call Package/kmod-hostap/Default) + DEPENDS:=kmod-hostap + TITLE:=Host AP driver for PLX9052 based PCI adaptors + DESCRIPTION+=\\\ + \\\ + This package contains the Host AP driver for Prism2/2.5/3 in PLX9052 \\\ + based PCI adaptors. endef ifeq ($(KERNEL),2.4) diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index a1161e11fe..ba16193daf 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -11,24 +11,32 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd PKG_VERSION:=0.5.3 PKG_RELEASE:=1 -PKG_MD5SUM:=4e3134e8b0d86e831230f8c620fd81bb -PKG_BUILDDEP:=madwifi -PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/ +PKG_MD5SUM:=4e3134e8b0d86e831230f8c620fd81bb PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILDDEP:=madwifi + include $(INCLUDE_DIR)/package.mk +define Package/hostapd/Default + SECTION:=net + CATEGORY:=Network + TITLE:=IEEE 802.1x Authenticator + URL:=http://hostap.epitest.fi/ +endef + define Package/hostapd -SECTION:=net -CATEGORY:=Network -DEPENDS:=+libopenssl -TITLE:=IEEE 802.1x Authenticator -DESCRIPTION:=IEEE 802.1x/WPA/EAP/RADIUS Authenticator -URL:=http://hostap.epitest.fi/ + $(call Package/hostapd/Default) + DEPENDS:=+libopenssl + TITLE+= (full) + DESCRIPTION:=\ + This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS \\\ + Authenticator. endef define Package/hostapd/conffiles @@ -36,10 +44,11 @@ define Package/hostapd/conffiles endef define Package/hostapd-mini -$(call Package/hostapd) -TITLE:=IEEE 802.1x Authenticator (WPA-PSK only) -DEPENDS:= -DESCRIPTION:=IEEE 802.1x/WPA/EAP/RADIUS Authenticator (WPA-PSK only) + $(call Package/hostapd/Default) + TITLE+= (WPA-PSK only) + DESCRIPTION:=\ + This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator \\\ + (WPA-PSK only). endef define Package/hostapd-mini/conffiles @@ -47,10 +56,12 @@ define Package/hostapd-mini/conffiles endef define Package/hostapd-utils -$(call Package/hostapd) -DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini -TITLE:=IEEE 802.1x Authenticator (utils) -DESCRIPTION:=IEEE 802.1x/WPA/EAP/RADIUS Authenticator (command line utils) + $(call Package/hostapd/Default) + DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini + TITLE+= (utils) + DESCRIPTION:=\ + This package contains a command line utility to control the \\\ + IEEE 802.1x/WPA/EAP/RADIUS Authenticator. endef define Build/ConfigureTarget diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 5e51b9607d..01097c88b9 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -12,12 +12,13 @@ PKG_NAME:=iproute2 PKG_VERSION:=2.6.15-060110 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/ PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/iproute2/Default diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile index d45a40e042..2ae6b27eb5 100644 --- a/package/ipsec-tools/Makefile +++ b/package/ipsec-tools/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=ipsec-tools PKG_VERSION:=0.6.4 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/ipsec-tools PKG_MD5SUM:=d0242a943c82c0cbf28005966ff35e21 PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 30fafb8e5e..f78ab77a05 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -12,12 +12,13 @@ PKG_NAME:=ipset PKG_VERSION:=2.2.3 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2 PKG_SOURCE_URL:=http://ipset.netfilter.org PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26 PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/ipset diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 8d77fb43f4..d198a9271a 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -13,7 +13,6 @@ PKG_NAME:=iptables PKG_VERSION:=1.3.5 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ @@ -22,23 +21,26 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ PKG_MD5SUM:=00fb916fa8040ca992a5ace56d905ea5 PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -PKG_MENU:=IPv4 / IPv6 firewall administration - include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) --include $(LINUX_DIR)/.config -include $(INCLUDE_DIR)/netfilter.mk + -include $(LINUX_DIR)/.config + include $(INCLUDE_DIR)/netfilter.mk endif +define Package/iptables/Default + SECTION:=net + CATEGORY:=Base system + URL:=http://netfilter.org/ +endef + define Package/iptables -SECTION:=net -CATEGORY:=Base system -MENU:=1 -DEFAULT:=y -TITLE:=IPv4 firewall administration tool -URL:=http://netfilter.org/ + $(call Package/iptables/Default) + DEFAULT:=y + TITLE:=IPv4 firewall administration tool + MENU:=1 endef define Package/iptables/conffiles @@ -47,114 +49,120 @@ define Package/iptables/conffiles endef define Package/iptables-mod-conntrack -SECTION:=net -CATEGORY:=Base system -DEPENDS:=iptables +kmod-ipt-conntrack -TITLE:=connection tracking modules -DESCRIPTION:=iptables extensions for connection tracking \\\ -Includes: \\\ - * libipt_conntrack \\\ - * libipt_helper \\\ - * libipt_connmark/CONNMARK + $(call Package/iptables/Default) + DEPENDS:=iptables +kmod-ipt-conntrack + TITLE:=connection tracking modules + DESCRIPTION:=\ + iptables extensions for connection tracking.\\\ + \\\ + Includes: \\\ + - libipt_conntrack \\\ + - libipt_helper \\\ + - libipt_connmark/CONNMARK endef define Package/iptables-mod-filter -SECTION:=net -CATEGORY:=Base system -DEPENDS:=iptables +kmod-ipt-filter -TITLE:=filter modules -DESCRIPTION:=iptables extensions for packet content inspection\\\ -Includes: \\\ - * libipt_ipp2p \\\ - * libipt_layer7 + $(call Package/iptables/Default) + DEPENDS:=iptables +kmod-ipt-filter + TITLE:=filter modules + DESCRIPTION:=\ + iptables extensions for packet content inspection.\\\ + \\\ + Includes: \\\ + - libipt_ipp2p \\\ + - libipt_layer7 endef define Package/iptables-mod-imq -SECTION:=net -CATEGORY:=Base system -DEPENDS:=iptables -TITLE:=IMQ support +kmod-imq -DESCRIPTION:=iptables extension for IMQ support\\\ -Includes: \\\ - * libipt_IMQ + $(call Package/iptables/Default) + DEPENDS:=iptables + TITLE:=IMQ support + DESCRIPTION:=\ + iptables extension for IMQ support.\\\ + \\\ + Includes: \\\ + - libipt_IMQ endef define Package/iptables-mod-ipopt -SECTION:=net -CATEGORY:=Base system -DEPENDS:=iptables +kmod-ipt-ipopt -TITLE:=IP/Packet option modules -DESCRIPTION:=iptables extensions for matching/changing IP packet options\\\ -Includes: \\\ - * libipt_dscp/DSCP \\\ - * libipt_ecn/ECN \\\ - * libipt_length \\\ - * libipt_mac \\\ - * libipt_tos/TOS \\\ - * libipt_tcpmms \\\ - * libipt_ttl/TTL \\\ - * libipt_unclean + $(call Package/iptables/Default) + DEPENDS:=iptables +kmod-ipt-ipopt + TITLE:=IP/Packet option modules + DESCRIPTION:=\ + iptables extensions for matching/changing IP packet options.\\\ + \\\ + Includes: \\\ + - libipt_dscp/DSCP \\\ + - libipt_ecn/ECN \\\ + - libipt_length \\\ + - libipt_mac \\\ + - libipt_tos/TOS \\\ + - libipt_tcpmms \\\ + - libipt_ttl/TTL \\\ + - libipt_unclean endef define Package/iptables-mod-ipsec -SECTION:=net -CATEGORY:=Base system -DEPENDS:=iptables +kmod-ipt-ipsec -TITLE:=IPSec extensions -DESCRIPTION:=iptables extensions for matching ipsec traffic\\\ -Includes: \\\ - * libipt_ah \\\ - * libipt_esp + $(call Package/iptables/Default) + DEPENDS:=iptables +kmod-ipt-ipsec + TITLE:=IPSec extensions + DESCRIPTION:=\ + iptables extensions for matching ipsec traffic.\\\ + \\\ + Includes: \\\ + - libipt_ah \\\ + - libipt_esp endef define Package/iptables-mod-nat -SECTION:=net -CATEGORY:=Base system -DEPENDS:=iptables +kmod-ipt-nat -TITLE:=extra NAT targets -DESCRIPTION:=iptables extensions for different NAT targets\\\ -Includes: \\\ - * libipt_REDIRECT + $(call Package/iptables/Default) + DEPENDS:=iptables +kmod-ipt-nat + TITLE:=extra NAT targets + DESCRIPTION:=\ + iptables extensions for different NAT targets.\\\ + \\\ + Includes: \\\ + - libipt_REDIRECT endef define Package/iptables-mod-ulog -SECTION:=net -CATEGORY:=Base system -DEPENDS:=iptables +kmod-ipt-ulog -TITLE:=user-space packet logging -DESCRIPTION:=iptables extensions for user-space packet logging\\\ -Includes: \\\ - * libipt_ULOG + $(call Package/iptables/Default) + DEPENDS:=iptables +kmod-ipt-ulog + TITLE:=user-space packet logging + DESCRIPTION:=\ + iptables extensions for user-space packet logging.\\\ + \\\ + Includes: \\\ + - libipt_ULOG endef define Package/iptables-mod-extra -SECTION:=net -CATEGORY:=Base system -DEPENDS:=iptables +kmod-ipt-extra -TITLE:=other extra iptables extensions -DESCRIPTION:=other extra iptables extensions\\\ -Includes: \\\ - * libipt_limit \\\ - * libipt_owner \\\ - * libipt_physdev \\\ - * libipt_pkttype \\\ - * libipt_recent + $(call Package/iptables/Default) + DEPENDS:=iptables +kmod-ipt-extra + TITLE:=other extra iptables extensions + DESCRIPTION:=\ + other extra iptables extensions.\\\ + \\\ + Includes: \\\ + - libipt_limit \\\ + - libipt_owner \\\ + - libipt_physdev \\\ + - libipt_pkttype \\\ + - libipt_recent endef define Package/iptables-utils -SECTION:=net -CATEGORY:=Base system -DEPENDS:=iptables -TITLE:=iptables save and restore utilities + $(call Package/iptables/Default) + DEPENDS:=iptables + TITLE:=iptables save and restore utilities endef define Package/ip6tables -SECTION:=net -CATEGORY:=Base system -TITLE:=IPv6 firewall administration tool + $(call Package/iptables/Default) + CATEGORY:=Network + TITLE:=IPv6 firewall administration tool endef - define Build/Configure endef @@ -169,7 +177,6 @@ define Build/Compile all install install-devel endef - define Build/InstallDev $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ @@ -184,7 +191,6 @@ define Build/UninstallDev rm -rf $(STAGING_DIR)/usr/lib/libipq.a endef - define Package/iptables/install install -d -m0755 $(1)/etc/config install -m0644 ./files/firewall.config $(1)/etc/config/firewall @@ -216,15 +222,15 @@ define Package/ip6tables/install endef define BuildPlugin -define Package/$(1)/install + define Package/$(1)/install install -m0755 -d $$(1)/usr/lib/iptables for m in $$(patsubst xt_%,ipt_%,$(2)); do \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so $$(1)/usr/lib/iptables/ ; \ done $(3) -endef + endef -$$(eval $$(call BuildPackage,$(1))) + $$(eval $$(call BuildPackage,$(1))) endef L7_INSTALL:=mkdir -p $$(1)/etc/l7-protocols; \ diff --git a/package/isakmpd/Makefile b/package/isakmpd/Makefile index 0d4a8a58d2..a4e7ff7b03 100644 --- a/package/isakmpd/Makefile +++ b/package/isakmpd/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=isakmpd PKG_VERSION:=20041012 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/i/isakmpd/ PKG_MD5SUM:=e6d25a9e232fb186e1a48dc06453bd57 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/package/kernel/Makefile b/package/kernel/Makefile index f43f4fdf69..bb9fd4f70f 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -17,9 +17,9 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages include $(INCLUDE_DIR)/package.mk ifeq ($(DUMP),) --include $(LINUX_DIR)/.config -NF_KMOD:=1 -include $(INCLUDE_DIR)/netfilter.mk + -include $(LINUX_DIR)/.config + NF_KMOD:=1 + include $(INCLUDE_DIR)/netfilter.mk endif define Build/Prepare @@ -30,9 +30,9 @@ define Build/Compile endef define KernelPackage/Defaults -FILES:= -KCONFIG:=m -AUTOLOAD:= + FILES:= + KCONFIG:=m + AUTOLOAD:= endef define ModuleAutoLoad @@ -72,20 +72,19 @@ define KernelPackage endef ifeq ($(findstring m,$(KCONFIG)),m) - ifneq ($(strip $(FILES)),) - define Package/kmod-$(1)/install + ifneq ($(strip $(FILES)),) + define Package/kmod-$(1)/install mkdir -p $$(1)/lib/modules/$(LINUX_VERSION) $(CP) $$(FILES) $$(1)/lib/modules/$(LINUX_VERSION)/ $(call ModuleAutoLoad,$(1),$$(1),$(AUTOLOAD)) - endef - endif + endef + endif endif $$(eval $$(call BuildPackage,kmod-$(1))) endef define AutoLoad -add_module $(1) "$(2)"; + add_module $(1) "$(2)"; endef include ./modules.mk - diff --git a/package/kernel/modules.mk b/package/kernel/modules.mk index 9475620526..ab32969e35 100644 --- a/package/kernel/modules.mk +++ b/package/kernel/modules.mk @@ -8,427 +8,460 @@ define KernelPackage/crypto -TITLE:=CryptoAPI modules -DESCRIPTION:=CryptoAPI modules -KCONFIG:= \ - $(CONFIG_CRYPTO_HMAC) \ - $(CONFIG_CRYPTO_NULL) \ - $(CONFIG_CRYPTO_MD4) \ - $(CONFIG_CRYPTO_MD5) \ - $(CONFIG_CRYPTO_SHA1) \ - $(CONFIG_CRYPTO_SHA256) \ - $(CONFIG_CRYPTO_SHA512) \ - $(CONFIG_CRYPTO_WP512) \ - $(CONFIG_CRYPTO_TGR192) \ - $(CONFIG_CRYPTO_DES) \ - $(CONFIG_CRYPTO_BLOWFISH) \ - $(CONFIG_CRYPTO_TWOFISH) \ - $(CONFIG_CRYPTO_SERPENT) \ - $(CONFIG_CRYPTO_AES) \ - $(CONFIG_CRYPTO_CAST5) \ - $(CONFIG_CRYPTO_CAST6) \ - $(CONFIG_CRYPTO_TEA) \ - $(CONFIG_CRYPTO_ARC4) \ - $(CONFIG_CRYPTO_KHAZAD) \ - $(CONFIG_CRYPTO_ANUBIS) \ - $(CONFIG_CRYPTO_DEFLATE) \ - $(CONFIG_CRYPTO_MICHAEL_MIC) \ - $(CONFIG_CRYPTO_CRC32C) -FILES:=$(MODULES_DIR)/kernel/crypto/*.$(LINUX_KMOD_SUFFIX) + TITLE:=CryptoAPI modules + KCONFIG:= \ + $(CONFIG_CRYPTO_HMAC) \ + $(CONFIG_CRYPTO_NULL) \ + $(CONFIG_CRYPTO_MD4) \ + $(CONFIG_CRYPTO_MD5) \ + $(CONFIG_CRYPTO_SHA1) \ + $(CONFIG_CRYPTO_SHA256) \ + $(CONFIG_CRYPTO_SHA512) \ + $(CONFIG_CRYPTO_WP512) \ + $(CONFIG_CRYPTO_TGR192) \ + $(CONFIG_CRYPTO_DES) \ + $(CONFIG_CRYPTO_BLOWFISH) \ + $(CONFIG_CRYPTO_TWOFISH) \ + $(CONFIG_CRYPTO_SERPENT) \ + $(CONFIG_CRYPTO_AES) \ + $(CONFIG_CRYPTO_CAST5) \ + $(CONFIG_CRYPTO_CAST6) \ + $(CONFIG_CRYPTO_TEA) \ + $(CONFIG_CRYPTO_ARC4) \ + $(CONFIG_CRYPTO_KHAZAD) \ + $(CONFIG_CRYPTO_ANUBIS) \ + $(CONFIG_CRYPTO_DEFLATE) \ + $(CONFIG_CRYPTO_MICHAEL_MIC) \ + $(CONFIG_CRYPTO_CRC32C) + FILES:=$(MODULES_DIR)/kernel/crypto/*.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,crypto)) define KernelPackage/ide-core -TITLE:=Kernel support for IDE -DESCRIPTION:=Kernel modules for IDE support\\\ - useful for usb mass storage devices (e.g. on WL-HDD)\\\ + TITLE:=Kernel support for IDE + DESCRIPTION:=\ + Useful for usb mass storage devices (e.g. on WL-HDD)\\\ \\\ Includes: \\\ - - ide-core \\\ - - ide-detect \\\ - - ide-disk \\\ - - pdc202xx_old -KCONFIG:=$(CONFIG_IDE) -FILES:=$(MODULES_DIR)/kernel/drivers/ide/*.$(LINUX_KMOD_SUFFIX) -AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk) + - ide-core \\\ + - ide-detect \\\ + - ide-disk + KCONFIG:=$(CONFIG_IDE) + FILES:=$(MODULES_DIR)/kernel/drivers/ide/*.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk) endef $(eval $(call KernelPackage,ide-core)) define KernelPackage/ide-pdc202xx -TITLE:=PDC202xx IDE driver -DESCRIPTION:=PDC202xx IDE driver -KCONFIG:=$(CONFIG_BLK_DEV_PDC202XX_OLD) -FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX) -AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old) + TITLE:=PDC202xx IDE driver + KCONFIG:=$(CONFIG_BLK_DEV_PDC202XX_OLD) + FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old) endef $(eval $(call KernelPackage,ide-pdc202xx)) define KernelPackage/ieee80211softmac -TITLE:=802.11 Networking stack -DESCRIPTION:=802.11 Networking stack\\\ -Includes: \\\ - * ieee80211_crypt \\\ - * ieee80211 \\\ - * ieee80211_crypt_wep \\\ - * ieee80211_crypt_tkip \\\ - * ieee80211_crytp_ccmp \\\ - * ieee80211softmac -KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC) -FILES:=$(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX) -AUTOLOAD:=$(call AutoLoad,10,ieee80211_crypt \ + TITLE:=802.11 Networking stack + DESCRIPTION:=\\\ + \\\ + Includes: \\\ + - ieee80211_crypt \\\ + - ieee80211 \\\ + - ieee80211_crypt_wep \\\ + - ieee80211_crypt_tkip \\\ + - ieee80211_crytp_ccmp \\\ + - ieee80211softmac + KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC) + FILES:=$(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,10, \ + ieee80211_crypt \ ieee80211 \ ieee80211_crypt_wep \ ieee80211_crypt_tkip \ ieee80211_crypt_ccmp \ - ieee80211softmac) + ieee80211softmac \ + ) endef $(eval $(call KernelPackage,ieee80211softmac)) + WIMENU:=Wireless drivers define KernelPackage/bcm43xx -TITLE:=Broadcom BCM43xx driver -DESCRIPTION:=Open source BCM43xx driver\\\ -Includes: \\\ - * bcm43xx -KCONFIG:=$(CONFIG_BCM43XX) -SUBMENU:=$(WIMENU) -FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX) -AUTOLOAD:=$(call Autoload,50,bcm43xx) + TITLE:=Broadcom BCM43xx driver + DESCRIPTION:=\\\ + \\\ + Includes: \\\ + - bcm43xx + KCONFIG:=$(CONFIG_BCM43XX) + FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call Autoload,50,bcm43xx) + SUBMENU:=$(WIMENU) endef $(eval $(call KernelPackage,bcm43xx)) define KernelPackage/ipw2100 -TITLE:=Intel IPw2100 driver -DESCRIPTION:=Intel IPW2100 driver\\\ -Includes: \\\ - * ipw2100 -KCONFIG:=$(CONFIG_IPW2100) -SUBMENU:=$(WIMENU) -FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX) -AUTOLOAD:=$(call Autoload,50,ipw2100) + TITLE:=Intel IPw2100 driver + DESCRIPTION:=\\\ + \\\ + Includes: \\\ + - ipw2100 + KCONFIG:=$(CONFIG_IPW2100) + FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call Autoload,50,ipw2100) + SUBMENU:=$(WIMENU) endef $(eval $(call KernelPackage,ipw2100)) define KernelPackage/ipw2200 -TITLE:=Intel IPw2200 driver -DESCRIPTION:=Intel IPW2200 driver\\\ -Includes: \\\ - * ipw2200 -KCONFIG:=$(CONFIG_IPW2200) -SUBMENU:=$(WIMENU) -FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX) -AUTOLOAD:=$(call Autoload,50,ipw2200) + TITLE:=Intel IPw2200 driver + DESCRIPTION:=\\\ + \\\ + Includes: \\\ + - ipw2200 + KCONFIG:=$(CONFIG_IPW2200) + FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call Autoload,50,ipw2200) + SUBMENU:=$(WIMENU) endef $(eval $(call KernelPackage,ipw2200)) + NFMENU:=Netfilter Extensions define KernelPackage/ipt-conntrack -TITLE:=Modules for connection tracking -DESCRIPTION:=Netfilter (IPv4) kernel modules for connection tracking\\\ -Includes: \\\ - * ipt_conntrack \\\ - * ipt_helper \\\ - * ipt_connmark/CONNMARK -SUBMENU:=$(NFMENU) -FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + TITLE:=Modules for connection tracking + DESCRIPTION:=\ + Netfilter (IPv4) kernel modules for connection tracking\\\ + \\\ + Includes: \\\ + - ipt_conntrack \\\ + - ipt_helper \\\ + - ipt_connmark/CONNMARK + FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + SUBMENU:=$(NFMENU) endef $(eval $(call KernelPackage,ipt-conntrack)) - define KernelPackage/ipt-filter -TITLE:=Modules for packet content inspection -DESCRIPTION:=Netfilter (IPv4) kernel modules for packet content inspection \\\ -Includes: \\\ - * ipt_ipp2p \\\ - * ipt_layer7 -SUBMENU:=$(NFMENU) -FILES:=$(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + TITLE:=Modules for packet content inspection + DESCRIPTION:=\ + Netfilter (IPv4) kernel modules for packet content inspection \\\ + \\\ + Includes: \\\ + - ipt_ipp2p \\\ + - ipt_layer7 + FILES:=$(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + SUBMENU:=$(NFMENU) endef $(eval $(call KernelPackage,ipt-filter)) - define KernelPackage/ipt-ipopt -TITLE:=Modules for matching/changing IP packet options -DESCRIPTION:=Netfilter (IPv4) modules for matching/changing IP packet options \\\ -Includes: \\\ - * ipt_dscp/DSCP \\\ - * ipt_ecn/ECN \\\ - * ipt_length \\\ - * ipt_mac \\\ - * ipt_tos/TOS \\\ - * ipt_tcpmms \\\ - * ipt_ttl/TTL \\\ - * ipt_unclean -SUBMENU:=$(NFMENU) -FILES:=$(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + TITLE:=Modules for matching/changing IP packet options + DESCRIPTION:=\ + Netfilter (IPv4) modules for matching/changing IP packet options \\\ + \\\ + Includes: \\\ + - ipt_dscp/DSCP \\\ + - ipt_ecn/ECN \\\ + - ipt_length \\\ + - ipt_mac \\\ + - ipt_tos/TOS \\\ + - ipt_tcpmms \\\ + - ipt_ttl/TTL \\\ + - ipt_unclean + FILES:=$(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + SUBMENU:=$(NFMENU) endef $(eval $(call KernelPackage,ipt-ipopt)) - define KernelPackage/ipt-ipsec -TITLE:=Modules for matching IPSec packets -DESCRIPTION:=Netfilter (IPv4) modules for matching IPSec packets \\\ -Includes: \\\ - * ipt_ah \\\ - * ipt_esp -SUBMENU:=$(NFMENU) -FILES:=$(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + TITLE:=Modules for matching IPSec packets + DESCRIPTION:=\ + Netfilter (IPv4) modules for matching IPSec packets \\\ + \\\ + Includes: \\\ + - ipt_ah \\\ + - ipt_esp + FILES:=$(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + SUBMENU:=$(NFMENU) endef $(eval $(call KernelPackage,ipt-ipsec)) - define KernelPackage/ipt-nat -TITLE:=Modules for extra NAT targets -DESCRIPTION:=Netfilter (IPv4) modules for extra NAT targets \\\ -Includes: \\\ - * ipt_REDIRECT \\\ - * ipt_NETMAP -SUBMENU:=$(NFMENU) -FILES:=$(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + TITLE:=Modules for extra NAT targets + DESCRIPTION:=\ + Netfilter (IPv4) modules for extra NAT targets \\\ + \\\ + Includes: \\\ + - ipt_REDIRECT \\\ + - ipt_NETMAP + FILES:=$(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + SUBMENU:=$(NFMENU) endef $(eval $(call KernelPackage,ipt-nat)) define KernelPackage/ipt-nathelper -TITLE:=Extra Conntrack and NAT helpers -DESCRIPTION:=Extra Conntrack and NAT helpers (IPv4) \\\ -Includes: \\\ - * ip_conntrack_amanda \\\ - * ip_conntrack_proto_gre \\\ - * ip_nat_proto_gre \\\ - * ip_conntrack_pptp \\\ - * ip_nat_pptp \\\ - * ip_conntrack_sip \\\ - * ip_nat_sip \\\ - * ip_nat_snmp_basic \\\ - * ip_conntrack_tftp -SUBMENU:=$(NFMENU) -FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + TITLE:=Extra Conntrack and NAT helpers + DESCRIPTION:=\ + Extra Netfilter (IPv4) Conntrack and NAT helpers \\\ + \\\ + Includes: \\\ + - ip_conntrack_amanda \\\ + - ip_conntrack_proto_gre \\\ + - ip_nat_proto_gre \\\ + - ip_conntrack_pptp \\\ + - ip_nat_pptp \\\ + - ip_conntrack_sip \\\ + - ip_nat_sip \\\ + - ip_nat_snmp_basic \\\ + - ip_conntrack_tftp + FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + SUBMENU:=$(NFMENU) endef $(eval $(call KernelPackage,ipt-nathelper)) define KernelPackage/ipt-imq -TITLE:=Intermediate Queueing support -DESCRIPTION:=Kernel support for Intermediate Queueing devices -KCONFIG:=$(CONFIG_IP_NF_TARGET_IMQ) -SUBMENU:=$(NFMENU) -FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/imq.$(LINUX_KMOD_SUFFIX) + TITLE:=Intermediate Queueing support + DESCRIPTION:=\ + Kernel support for Intermediate Queueing devices + KCONFIG:=$(CONFIG_IP_NF_TARGET_IMQ) + FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/imq.$(LINUX_KMOD_SUFFIX) + SUBMENU:=$(NFMENU) endef $(eval $(call KernelPackage,ipt-imq)) define KernelPackage/ipt-queue -TITLE:=Module for user-space packet queueing -DESCRIPTION:=Netfilter (IPv4) module for user-space packet queueing \\\ -Includes: \\\ - * ipt_QUEUE -SUBMENU:=$(NFMENU) -FILES:=$(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + TITLE:=Module for user-space packet queueing + DESCRIPTION:=\ + Netfilter (IPv4) module for user-space packet queueing \\\ + \\\ + Includes: \\\ + - ipt_QUEUE + FILES:=$(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + SUBMENU:=$(NFMENU) endef $(eval $(call KernelPackage,ipt-queue)) define KernelPackage/ipt-ulog -TITLE:=Module for user-space packet logging -DESCRIPTION:=Netfilter (IPv4) module for user-space packet logging \\\ -Includes: \\\ - * ipt_ULOG -SUBMENU:=$(NFMENU) -FILES:=$(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + TITLE:=Module for user-space packet logging + DESCRIPTION:=\ + Netfilter (IPv4) module for user-space packet logging \\\ + \\\ + Includes: \\\ + - ipt_ULOG + FILES:=$(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + SUBMENU:=$(NFMENU) endef $(eval $(call KernelPackage,ipt-ulog)) define KernelPackage/ipt-extra -TITLE:=Extra modules -DESCRIPTION:=Other Netfilter (IPv4) kernel modules\\\ -Includes: \\\ - * ipt_limit \\\ - * ipt_owner \\\ - * ipt_physdev \\\ - * ipt_pkttype \\\ - * ipt_recent -SUBMENU:=$(NFMENU) -FILES:=$(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + TITLE:=Extra modules + DESCRIPTION:=\ + Other Netfilter (IPv4) kernel modules\\\ + Includes: \\\ + - ipt_limit \\\ + - ipt_owner \\\ + - ipt_physdev \\\ + - ipt_pkttype \\\ + - ipt_recent + FILES:=$(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + SUBMENU:=$(NFMENU) endef $(eval $(call KernelPackage,ipt-extra)) define KernelPackage/ip6tables -TITLE:=IPv6 modules -DESCRIPTION:=Netfilter IPv6 firewalling support -SUBMENU:=$(NFMENU) -KCONFIG:=$(CONFIG_IP6_NF_IPTABLES) -FILES:=$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX) + TITLE:=IPv6 modules + DESCRIPTION:=\ + Netfilter IPv6 firewalling support + KCONFIG:=$(CONFIG_IP6_NF_IPTABLES) + FILES:=$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX) + SUBMENU:=$(NFMENU) endef $(eval $(call KernelPackage,ip6tables)) define KernelPackage/arptables -TITLE:=ARP firewalling modules -DESCRIPTION:=Kernel modules for ARP firewalling -SUBMENU:=$(NFMENU) -FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX) -KCONFIG:=$(CONFIG_IP_NF_ARPTABLES) + TITLE:=ARP firewalling modules + DESCRIPTION:=\ + Kernel modules for ARP firewalling + FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX) + KCONFIG:=$(CONFIG_IP_NF_ARPTABLES) + SUBMENU:=$(NFMENU) endef $(eval $(call KernelPackage,arptables)) define KernelPackage/ebtables -TITLE:=Bridge firewalling modules -DESCRIPTION:=Kernel modules for Ethernet Bridge firewalling -SUBMENU:=$(NFMENU) -FILES:=$(MODULES_DIR)/kernel/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX) -KCONFIG:=$(CONFIG_BRIDGE_NF_EBTABLES) + TITLE:=Bridge firewalling modules + DESCRIPTION:=\ + Kernel modules for Ethernet Bridge firewalling + FILES:=$(MODULES_DIR)/kernel/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX) + KCONFIG:=$(CONFIG_BRIDGE_NF_EBTABLES) + SUBMENU:=$(NFMENU) endef $(eval $(call KernelPackage,ebtables)) + define KernelPackage/ipv6 -TITLE:=IPv6 support -DESCRIPTION:=Kernel modules for IPv6 support -KCONFIG:=$(CONFIG_IPV6) -FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) + TITLE:=IPv6 support + DESCRIPTION:=\ + Kernel modules for IPv6 support + KCONFIG:=$(CONFIG_IPV6) + FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,ipv6)) + define KernelPackage/gre -TITLE:=GRE support -DESCRIPTION:=Generic Routing Encapsulation support -KCONFIG=$(CONFIG_NET_IPGRE) -FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX) + TITLE:=GRE support + DESCRIPTION:=\ + Generic Routing Encapsulation support + KCONFIG=$(CONFIG_NET_IPGRE) + FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,gre)) + define KernelPackage/tun -TITLE:=Universal TUN/TAP driver -DESCRIPTION:=Kernel support for the TUN/TAP tunneling device -KCONFIG:=$(CONFIG_TUN) -FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX) + TITLE:=Universal TUN/TAP driver + DESCRIPTION:=\ + Kernel support for the TUN/TAP tunneling device + KCONFIG:=$(CONFIG_TUN) + FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,tun)) + define KernelPackage/ppp -TITLE:=PPP modules -DESCRIPTION:=Kernel modules for PPP support -KCONFIG:=$(CONFIG_PPP) + TITLE:=PPP modules + DESCRIPTION:=\ + Kernel modules for PPP support + KCONFIG:=$(CONFIG_PPP) endef define KernelPackage/ppp/2.6 -FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_async.ko $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko $(MODULES_DIR)/kernel/drivers/net/slhc.ko $(MODULES_DIR)/kernel/lib/crc-ccitt.ko -AUTOLOAD:=$(call AutoLoad,30,crc-ccitt) + FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_async.ko $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko $(MODULES_DIR)/kernel/drivers/net/slhc.ko $(MODULES_DIR)/kernel/lib/crc-ccitt.ko + AUTOLOAD:=$(call AutoLoad,30,crc-ccitt) endef define KernelPackage/ppp/2.4 -FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_async.o $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o $(MODULES_DIR)/kernel/drivers/net/slhc.o + FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_async.o $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o $(MODULES_DIR)/kernel/drivers/net/slhc.o endef $(eval $(call KernelPackage,ppp)) + define KernelPackage/pppoe -TITLE:=PPPoE modules -DESCRIPTION:=Kernel modules for PPP over Ethernet support -DEPENDS:=kmod-ppp -KCONFIG:=$(CONFIG_PPPOE) -FILES:=$(MODULES_DIR)/kernel/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/pppox.$(LINUX_KMOD_SUFFIX) + TITLE:=PPPoE support + DESCRIPTION:=\ + Kernel modules for PPPoE (PPP over Ethernet) support + DEPENDS:=kmod-ppp + KCONFIG:=$(CONFIG_PPPOE) + FILES:=$(MODULES_DIR)/kernel/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/pppox.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,pppoe)) + define KernelPackage/pppoa -TITLE:=PPPoA modules -DESCRIPTION:=Kernel modules for PPP over ATM support -DEPENDS:=kmod-ppp -KCONFIG:=$(CONFIG_PPPOATM) -FILES:=$(MODULES_DIR)/kernel/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX) + TITLE:=PPPoA support + DESCRIPTION:=\ + Kernel modules for PPPoA (PPP over ATM) support + DEPENDS:=kmod-ppp + KCONFIG:=$(CONFIG_PPPOATM) + FILES:=$(MODULES_DIR)/kernel/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,pppoa)) define KernelPackage/mppe -TITLE:=Microsoft PPP compression/encryption -DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption -DEPENDS:=kmod-ppp -KCONFIG:=$(CONFIG_PPP_MPPE) + TITLE:=Microsoft PPP compression/encryption + DESCRIPTION:=Kernel modules for Microsoft PPP compression/encryption + DEPENDS:=kmod-ppp + KCONFIG:=$(CONFIG_PPP_MPPE) endef define KernelPackage/mppe/2.4 -FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX) + FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX) endef define KernelPackage/mppe/2.6 -FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX) + FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,mppe)) - NDMENU:=Network Devices - define KernelPackage/natsemi -TITLE:=National Semiconductor DP8381x series -DESCRIPTION:=National Semiconductor DP8381x series PCI Ethernet kernel support -SUBMENU:=$(NDMENU) -FILES:=$(MODULES_DIR)/kernel/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX) -KCONFIG:=$(CONFIG_NATSEMI) -DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + TITLE:=National Semiconductor DP8381x series + DESCRIPTION:=\ + Kernel modules for National Semiconductor DP8381x series PCI Ethernet \\\ + adapters. + FILES:=$(MODULES_DIR)/kernel/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX) + KCONFIG:=$(CONFIG_NATSEMI) + DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + SUBMENU:=$(NDMENU) endef $(eval $(call KernelPackage,natsemi)) define KernelPackage/sis900 -TITLE:=SiS 900 Ethernet support -DESCRIPTION:=Sis 900 kernel ethernet support -SUBMENU:=$(NDMENU) -FILES:=$(MODULES_DIR)/kernel/drivers/net/sis900.$(LINUX_KMOD_SUFFIX) -KCONFIG:=$(CONFIG_SIS900) -DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + TITLE:=SiS 900 Ethernet support + DESCRIPTION:=\ + Kernel modules for Sis 900 Ethernet adapters. + FILES:=$(MODULES_DIR)/kernel/drivers/net/sis900.$(LINUX_KMOD_SUFFIX) + KCONFIG:=$(CONFIG_SIS900) + DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + SUBMENU:=$(NDMENU) endef $(eval $(call KernelPackage,sis900)) - define KernelPackage/via-rhine -TITLE:=Via Rhine ethernet support -DESCRIPTION:=Kernel modules for Via Rhine ethernet chipsets -SUBMENU:=$(NDMENU) -FILES:=$(MODULES_DIR)/kernel/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX) -KCONFIG:=$(CONFIG_VIA_RHINE) -DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + TITLE:=Via Rhine ethernet support + DESCRIPTION:=\ + Kernel modules for Via Rhine Ethernet chipsets. + FILES:=$(MODULES_DIR)/kernel/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX) + KCONFIG:=$(CONFIG_VIA_RHINE) + DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + SUBMENU:=$(NDMENU) endef $(eval $(call KernelPackage,via-rhine)) define KernelPackage/8139too -TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support -DESCRIPTION:=Kernel modules for RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support -SUBMENU:=$(NDMENU) -FILES:=$(MODULES_DIR)/kernel/drivers/net/8139too.$(LINUX_KMOD_SUFFIX) -KCONFIG:=$(CONFIG_8139TOO) -DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support + DESCRIPTION:=\ + Kernel modules for RealTek RTL-8139 PCI Fast Ethernet adapters. + FILES:=$(MODULES_DIR)/kernel/drivers/net/8139too.$(LINUX_KMOD_SUFFIX) + KCONFIG:=$(CONFIG_8139TOO) + DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + SUBMENU:=$(NDMENU) endef $(eval $(call KernelPackage,8139too)) define KernelPackage/e100 -TITLE:=Intel(R) PRO/100+ cards kernel support -DESCRIPTION:=Kernel modules for Intel(R) PRO/100+ cards kernel support -SUBMENU:=$(NDMENU) -FILES:=$(MODULES_DIR)/kernel/drivers/net/e100.$(LINUX_KMOD_SUFFIX) -KCONFIG:=$(CONFIG_E100) -DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + TITLE:=Intel(R) PRO/100+ cards kernel support + DESCRIPTION:=\ + Kernel modules for Intel(R) PRO/100+ Ethernet adapters. + FILES:=$(MODULES_DIR)/kernel/drivers/net/e100.$(LINUX_KMOD_SUFFIX) + KCONFIG:=$(CONFIG_E100) + DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + SUBMENU:=$(NDMENU) endef $(eval $(call KernelPackage,e100)) define KernelPackage/3c59x -TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang -DESCRIPTION:= \ - This option enables driver support for a large number of 10mbps and \ - 10/100mbps EISA, PCI and PCMCIA 3Com network cards: \ - \ - * "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI \ - * "Boomerang" (EtherLink XL 3c900 or 3c905) PCI \ - * "Cyclone" (3c540/3c900/3c905/3c980/3c575/3c656) PCI and Cardbus \ - * "Tornado" (3c905) PCI \ - * "Hurricane" (3c555/3cSOHO) PCI -SUBMENU:=$(NDMENU) -FILES:=$(MODULES_DIR)/kernel/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX) -KCONFIG:=$(CONFIG_3C59X) -DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + TITLE:=3Com 3c590/3c900 series (592/595/597) Vortex/Boomerang + DESCRIPTION:=\ + This option enables driver support for a large number of 10mbps and \\\ + 10/100mbps EISA, PCI and PCMCIA 3Com Ethernet adapters: \\\ + - "Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI \\\ + - "Boomerang" (EtherLink XL 3c900 or 3c905) PCI \\\ + - "Cyclone" (3c540/3c900/3c905/3c980/3c575/3c656) PCI and Cardbus \\\ + - "Tornado" (3c905) PCI \\\ + - "Hurricane" (3c555/3cSOHO) PCI + FILES:=$(MODULES_DIR)/kernel/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX) + KCONFIG:=$(CONFIG_3C59X) + DEPENDS:=@LINUX_2_6_X86||LINUX_2_4_X86 + SUBMENU:=$(NDMENU) endef $(eval $(call KernelPackage,3c59x)) - - - diff --git a/package/keynote/Makefile b/package/keynote/Makefile index c756747d73..38f1f6901d 100644 --- a/package/keynote/Makefile +++ b/package/keynote/Makefile @@ -12,12 +12,13 @@ PKG_NAME:=keynote PKG_VERSION:=2.3 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/ PKG_MD5SUM:=b569066ac2ba1356c2112b118a7d74d0 PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk @@ -55,8 +56,7 @@ define Build/InstallDev endef define Build/UninstallDev - rm -rf \ - $(STAGING_DIR)/usr/include/keynote \ + rm -rf $(STAGING_DIR)/usr/include/keynote \ $(STAGING_DIR)/usr/lib/libkeynote.a endef diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index 4fd1acae19..f8de02d559 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=libpcap PKG_VERSION:=0.9.4 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.tcpdump.org/release/ PKG_MD5SUM:=79025766e8027df154cb1f32de8a7974 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile index 291fe3573c..24a914a71c 100644 --- a/package/linux-atm/Makefile +++ b/package/linux-atm/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=linux-atm PKG_VERSION:=2.4.1 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/linux-atm/ PKG_MD5SUM:=84fef49cc39ff2605204246666f65864 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 431e0a7a4d..a4180063f4 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -13,12 +13,13 @@ PKG_NAME:=madwifi PKG_VERSION:=0.9.2 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_MD5SUM:=a75baacbe07085ddc5cb28e1fb43edbb PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/kmod-madwifi @@ -103,7 +104,7 @@ define Build/InstallDev endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/madwifi + rm -rf $(STAGING_DIR)/usr/include/madwifi endef define Package/kmod-madwifi/install diff --git a/package/mini_fo/Makefile b/package/mini_fo/Makefile index 198f4c94cb..38ad63754b 100644 --- a/package/mini_fo/Makefile +++ b/package/mini_fo/Makefile @@ -13,12 +13,13 @@ PKG_NAME:=mini_fo PKG_VERSION:=0.6.2pre1 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/mini_fo-0-6-2-pre1 PKG_SOURCE:=mini_fo-0-6-2-pre1.tar.bz2 PKG_SOURCE_URL:=http://www.denx.de/twiki/pub/Know/MiniFOHome/ PKG_MD5SUM:=acd12157be25d7b3c8df90914049403e PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/mini_fo-0-6-2-pre1 + include $(INCLUDE_DIR)/package.mk define Package/kmod-mini-fo diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 4b7995af4a..ea3d3192dc 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -12,7 +12,6 @@ PKG_NAME:=openssl PKG_VERSION:=0.9.8b PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.openssl.org/source/ \ ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \ @@ -21,6 +20,7 @@ PKG_SOURCE_URL:=http://www.openssl.org/source/ \ PKG_MD5SUM:=12cedbeb6813a0d7919dbf1f82134b86 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -110,8 +110,7 @@ define Build/InstallDev endef define Build/UninstallDev - rm -rf \ - $(STAGING_DIR)/usr/include/openssl \ + rm -rf $(STAGING_DIR)/usr/include/openssl \ $(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} endef diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 0f7a11a6e5..1ea3b4b4f1 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -13,12 +13,13 @@ PKG_NAME:=openswan PKG_VERSION:=2.4.6 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.openswan.org/download PKG_MD5SUM:=b34d71ca49dedad017879b0e912d40dd PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + PKG_INIT_PRIO:=60 include $(INCLUDE_DIR)/package.mk diff --git a/package/pcmcia-cs/Makefile b/package/pcmcia-cs/Makefile index 5cd77c833a..2241c6f53b 100644 --- a/package/pcmcia-cs/Makefile +++ b/package/pcmcia-cs/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=pcmcia-cs PKG_VERSION:=3.2.8 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 64351a5ca1..680076857e 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -11,76 +11,84 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ppp PKG_VERSION:=2.4.3 PKG_RELEASE:=7 -PKG_BUILDDEP:=libpcap linux-atm -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ PKG_MD5SUM:=848f6c3cafeb6074ffeb293c3af79b7c PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_BUILDDEP:=libpcap linux-atm + include $(INCLUDE_DIR)/package.mk +define Package/ppp/Default + SECTION:=net + CATEGORY:=Network + URL:=http://ppp.samba.org/ +endef + define Package/ppp -SECTION:=net -CATEGORY:=Network -MENU:=1 -DEFAULT:=y -DEPENDS:=+kmod-ppp -TITLE:=PPP daemon -DESCRIPTION:=PPP (Point-to-Point Protocol) daemon -URL:=http://ppp.samba.org/ + $(call Package/ppp/Default) + DEFAULT:=y + DEPENDS:=+kmod-ppp + TITLE:=PPP daemon + DESCRIPTION:=\ + This package contains the PPP (Point-to-Point Protocol) daemon. + MENU:=1 endef define Package/ppp-mod-pppoa -SECTION:=net -CATEGORY:=Network -DEPENDS:=ppp +linux-atm +kmod-pppoa -TITLE:=PPPoA plugin -DESCRIPTION:=PPPoA (PPP over ATM) plugin for ppp + $(call Package/ppp/Default) + DEPENDS:=ppp +linux-atm +kmod-pppoa + TITLE:=PPPoA plugin + DESCRIPTION:=\ + This package contains a PPPoA (PPP over ATM) plugin for ppp. endef define Package/ppp-mod-pppoe -SECTION:=net -CATEGORY:=Network -DEFAULT:=y -DEPENDS:=ppp +kmod-pppoe -TITLE:=PPPoE plugin -DESCRIPTION:=PPPoE (PPP over Ethernet) plugin for ppp + $(call Package/ppp/Default) + DEFAULT:=y + DEPENDS:=ppp +kmod-pppoe + TITLE:=PPPoE plugin + DESCRIPTION:=\ + This package contains a PPPoE (PPP over Ethernet) plugin for ppp. endef define Package/ppp-mod-radius -SECTION:=net -CATEGORY:=Network -DEPENDS:=ppp -TITLE:=RADIUS plugin -DESCRIPTION:=RADIUS (Remote Authentication Dial-In User Service) plugin for ppp + $(call Package/ppp/Default) + DEPENDS:=ppp + TITLE:=RADIUS plugin + DESCRIPTION:=\ + This package contains a RADIUS (Remote Authentication Dial-In User \\\ + Service) plugin for ppp. endef define Package/chat -SECTION:=net -CATEGORY:=Network -DEPENDS:=ppp -TITLE:=Establish conversation with a modem -DESCRIPTION:=Utility to establish conversation with other PPP servers (via a modem) + $(call Package/ppp/Default) + DEPENDS:=ppp + TITLE:=Establish conversation with a modem + DESCRIPTION:=\ + This package contains an utility to establish conversation with other \\\ + PPP servers (via a modem). endef define Package/pppdump -SECTION:=net -CATEGORY:=Network -DEPENDS:=ppp -TITLE:=Read PPP record file -DESCRIPTION:=Utility to read PPP record file + $(call Package/ppp/Default) + DEPENDS:=ppp + TITLE:=Read PPP record file + DESCRIPTION:=\ + This package contains an utility to read PPP record file. endef define Package/pppstats -SECTION:=net -CATEGORY:=Network -DEPENDS:=ppp -TITLE:=Report PPP statistics -DESCRIPTION:=Utility to report PPP statistics + $(call Package/ppp/Default) + DEPENDS:=ppp + TITLE:=Report PPP statistics + DESCRIPTION:=\ + This package contains an utility to report PPP statistics. endef define Build/Compile @@ -96,6 +104,9 @@ define Build/Compile endef define Package/ppp/install + install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION) + install -d -m0755 $(1)/usr/sbin + install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppd $(1)/usr/sbin/ install -d -m0755 $(1)/lib/network install -m0755 ./files/ppp.sh $(1)/lib/network/ install -d -m0755 $(1)/etc/ppp @@ -107,38 +118,35 @@ define Package/ppp/install install -d -m0755 $(1)/etc/ppp/ip-down.d install -m0644 ./files/etc/ppp/options $(1)/etc/ppp/ ln -sf /tmp/resolv.conf $(1)/etc/ppp/resolv.conf - install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION) - install -d -m0755 $(1)/usr/sbin - install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/pppd $(1)/usr/sbin/ endef define Package/ppp-mod-pppoa/install - install -d -m0755 $(1)/lib/network - install -m0755 ./files/pppoa.sh $(1)/lib/network/ install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION) install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/pppoatm.so \ $(1)/usr/lib/pppd/$(PKG_VERSION)/ + install -d -m0755 $(1)/lib/network + install -m0755 ./files/pppoa.sh $(1)/lib/network/ endef define Package/ppp-mod-pppoe/install - install -d -m0755 $(1)/lib/network - install -m0755 ./files/pppoe.sh $(1)/lib/network/ install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION) install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/rp-pppoe.so \ $(1)/usr/lib/pppd/$(PKG_VERSION)/ + install -d -m0755 $(1)/lib/network + install -m0755 ./files/pppoe.sh $(1)/lib/network/ endef define Package/ppp-mod-radius/install + install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION) + install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/radius.so \ + $(1)/usr/lib/pppd/$(PKG_VERSION)/ install -d -m0755 $(1)/etc/ppp - install -m644 ./files/etc/ppp/radius.conf $(1)/etc/ppp/ + install -m0644 ./files/etc/ppp/radius.conf $(1)/etc/ppp/ install -d -m0755 $(1)/etc/ppp/radius - install -m644 ./files/etc/ppp/radius/dictionary* \ + install -m0644 ./files/etc/ppp/radius/dictionary* \ $(1)/etc/ppp/radius/ - install -m600 ./files/etc/ppp/radius/servers \ + install -m0600 ./files/etc/ppp/radius/servers \ $(1)/etc/ppp/radius/ - install -d -m0755 $(1)/usr/lib/pppd/$(PKG_VERSION) - install -m0755 $(PKG_INSTALL_DIR)/usr/lib/pppd/$(PKG_VERSION)/radius.so \ - $(1)/usr/lib/pppd/$(PKG_VERSION)/ endef define Package/chat/install diff --git a/package/pptp/Makefile b/package/pptp/Makefile index b32ab06275..bb0710419b 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -12,12 +12,13 @@ PKG_NAME:=pptp PKG_VERSION:=1.6.0 PKG_RELEASE:=3 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/pptpclient PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk define Package/pptp diff --git a/package/shfs/Makefile b/package/shfs/Makefile index 1a2f7f5f19..f4383a3f96 100644 --- a/package/shfs/Makefile +++ b/package/shfs/Makefile @@ -13,12 +13,12 @@ PKG_NAME:=shfs PKG_VERSION:=0.35 PKG_RELEASE:=2 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/shfs PKG_MD5SUM:=016f49d71bc32eee2b5d11fc1600cfbe PKG_CAT:=zcat +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/package/spca5xx/Makefile b/package/spca5xx/Makefile index d06343324e..643e5863f4 100644 --- a/package/spca5xx/Makefile +++ b/package/spca5xx/Makefile @@ -13,12 +13,13 @@ PKG_NAME:=spca5xx PKG_VERSION:=20060501 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://mxhaard.free.fr/spca50x/Download/ PKG_MD5SUM:=8fcec25715aea10f9ebec5728c37e752 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk #FIXME: add proper dependency handling on kmod-usb-core & kmod-videodev packages diff --git a/package/udev/Makefile b/package/udev/Makefile index e942442032..830ea6a664 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -12,7 +12,6 @@ PKG_NAME:=udev PKG_VERSION:=077 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \ http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \ @@ -23,6 +22,7 @@ PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \ PKG_MD5SUM:=61ec646daf7795e9777e8f33975408fe PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/package/ueagle-atm/Makefile b/package/ueagle-atm/Makefile index d1a0dfbc7f..7e93fe1acd 100644 --- a/package/ueagle-atm/Makefile +++ b/package/ueagle-atm/Makefile @@ -13,12 +13,12 @@ PKG_NAME:=ueagle-atm PKG_VERSION:=1.0d1 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://castet.matthieu.free.fr/eagle/release/ PKG_MD5SUM:=5da1fceb15168f4c7ad407a3e38ddecb PKG_CAT:=zcat +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 18fb251463..8ca8052ea1 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -12,7 +12,6 @@ PKG_NAME:=util-linux PKG_VERSION:=2.12r PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \ http://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \ @@ -21,6 +20,7 @@ PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/$(PKG_NAME)/ \ PKG_MD5SUM:=c261230b27fc0fbcc287c76884caf2d3 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile index 064407b033..c19ff7613d 100644 --- a/package/wireless-tools/Makefile +++ b/package/wireless-tools/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=wireless-tools PKG_VERSION:=28 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28 PKG_SOURCE:=wireless_tools.$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux PKG_MD5SUM:=599c94497f9c9073c7b052d3dcb7cd16 PKG_CAT:=zcat +PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -56,8 +56,7 @@ define Build/InstallDev endef define Build/UninstallDev - rm -f \ - $(STAGING_DIR)/usr/include/{iwlib,wireless}.h \ + rm -f $(STAGING_DIR)/usr/include/{iwlib,wireless}.h \ $(STAGING_DIR)/usr/lib/libiw.so* endef diff --git a/package/yamonenv/Makefile b/package/yamonenv/Makefile index dfb0c82f96..dfb9bbb59a 100644 --- a/package/yamonenv/Makefile +++ b/package/yamonenv/Makefile @@ -12,32 +12,26 @@ PKG_NAME:=yamonenv PKG_VERSION:=20051022 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_SOURCE:=$(PKG_NAME)_gruen.4g__$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://meshcube.org/nylon/stable/sources/ PKG_MD5SUM:=a3e4f24155aa3ba5aa502bc63fdaa6ad PKG_CAT:=zcat -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) include $(INCLUDE_DIR)/package.mk define Package/yamonenv -SECTION:=sys -CATEGORY:=Base system -DEPENDS:=@LINUX_2_6_AU1000@ -TITLE:=YAMON configuration utility -DESCRIPTION:=YAMON bootloader configuration utility -URL:=http://meshcube.org/nylon/stable/sources/ + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=@LINUX_2_6_AU1000@ + TITLE:=YAMON configuration utility + URL:=http://meshcube.org/nylon/stable/sources/ endef define Build/Configure endef -define Build/Compile - $(call Build/Compile/Default,all) -endef - define Package/yamonenv/install install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(1)/usr/sbin/ diff --git a/package/zd1211/Makefile b/package/zd1211/Makefile index 0c94cd14df..e5d2c2724f 100644 --- a/package/zd1211/Makefile +++ b/package/zd1211/Makefile @@ -13,24 +13,26 @@ PKG_NAME:=zd1211 PKG_VERSION:=r69 PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-driver-$(PKG_VERSION).tgz PKG_SOURCE_URL:=http://zd1211.ath.cx/download/ PKG_MD5SUM:=c14133a3d5b27927402a492e84d2467a PKG_CAT:=zcat +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-driver-$(PKG_VERSION) + include $(INCLUDE_DIR)/package.mk #FIXME: add proper dependency handling on kmod-usb-core packages define Package/kmod-zd1211 - SECTION:=drivers - CATEGORY:=Drivers + SECTION:=kernel + CATEGORY:=Kernel drivers DEPENDS:=@LINUX_2_6&&!LINUX_2_6_UML TITLE:=Driver for Zydas 1211 based USB devices - DESCRIPTION:=Driver for Zydas 1211 based USB devices \\\ - Linux driver for the ZyDAS ZD1211 802.11b/g USB-WLAN-Chip.\\\ - Initially contributed by ZyDAS, this driver is actively maintained by the \\\ - open source community. + DESCRIPTION:=\ + This package contains a Linux driver for the ZyDAS ZD1211 802.11b/g \\\ + USB-WLAN-Chip.\\\ + Initially contributed by ZyDAS, this driver is actively maintained by the \\\ + open source community. URL:=http://zd1211.ath.cx/ VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) endef @@ -50,10 +52,10 @@ define Build/Compile endef define Package/kmod-zd1211/install - install -m0755 -d $(1)/lib/modules/$(LINUX_VERSION) + install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION) $(CP) $(PKG_BUILD_DIR)/zd1211.$(LINUX_KMOD_SUFFIX) \ $(1)/lib/modules/$(LINUX_VERSION)/ - install -m0755 -d $(1)/usr/sbin + install -d -m0755 $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/apdbg $(1)/usr/sbin/ $(CP) $(PKG_BUILD_DIR)/sta $(1)/usr/sbin/$(PKG_NAME)-sta endef diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 681af85c74..df4a4753ff 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -12,12 +12,12 @@ PKG_NAME:=zlib PKG_VERSION:=1.2.3 PKG_RELEASE:=3 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6 PKG_CAT:=bzcat +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk @@ -61,8 +61,7 @@ define Build/InstallDev endef define Build/UninstallDev - rm -rf \ - $(STAGING_DIR)/usr/include/z{conf,lib}.h \ + rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h \ $(STAGING_DIR)/usr/lib/libz.{a,so*} endef diff --git a/toolchain/ext2fs/Makefile b/toolchain/ext2fs/Makefile index eebf7a2c88..dd60a7eb9a 100644 --- a/toolchain/ext2fs/Makefile +++ b/toolchain/ext2fs/Makefile @@ -11,12 +11,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=genext2fs PKG_VERSION:=1.4rc1 -PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_MD5SUM:=664431bf6737df1c265500e1f0b5d40c PKG_CAT:=zcat +PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + include $(INCLUDE_DIR)/host-build.mk define Build/Configure @@ -45,7 +46,12 @@ define Build/Compile endef define Build/Install + mkdir -p $(STAGING_DIR)/bin install -m0755 $(PKG_BUILD_DIR)/genext2fs $(STAGING_DIR)/bin/ endef +define Build/Clean + rm -f $(STAGING_DIR)/bin/genext2fs +endef + $(eval $(call HostBuild)) diff --git a/toolchain/ipkg-utils/Makefile b/toolchain/ipkg-utils/Makefile index 4520af176e..06bb2adc0b 100644 --- a/toolchain/ipkg-utils/Makefile +++ b/toolchain/ipkg-utils/Makefile @@ -6,15 +6,15 @@ # include $(TOPDIR)/rules.mk -PKG_NAME := ipkg-utils -PKG_VERSION := 1.7 +PKG_NAME:=ipkg-utils +PKG_VERSION:=1.7 -PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MD5SUM := da3e3ef772973d7370a6ac95f0fef9b8 -PKG_SOURCE_URL := http://handhelds.org/packages/ipkg-utils/ -PKG_CAT := zcat +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://handhelds.org/packages/ipkg-utils/ +PKG_MD5SUM:=da3e3ef772973d7370a6ac95f0fef9b8 +PKG_CAT:=zcat -PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/host-build.mk @@ -23,16 +23,15 @@ define Build/Install echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf echo "option offline_root $(TARGET_DIR)" >> $(STAGING_DIR)/etc/ipkg.conf mkdir -p $(STAGING_DIR)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/ipkg-build $(STAGING_DIR)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/ipkg-buildpackage $(STAGING_DIR)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/ipkg-make-index $(STAGING_DIR)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/ipkg.py $(STAGING_DIR)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/ipkg-build $(STAGING_DIR)/usr/bin/ + install -m0755 $(PKG_BUILD_DIR)/ipkg-buildpackage $(STAGING_DIR)/usr/bin/ + install -m0755 $(PKG_BUILD_DIR)/ipkg-make-index $(STAGING_DIR)/usr/bin/ + install -m0755 $(PKG_BUILD_DIR)/ipkg.py $(STAGING_DIR)/usr/bin/ endef define Build/Clean rm -f $(STAGING_DIR)/etc/ipkg.conf rm -f $(STAGING_DIR)/usr/bin/ipkg* - rm -rf $(PKG_BUILD_DIR) endef $(eval $(call HostBuild)) diff --git a/toolchain/jffs2/Makefile b/toolchain/jffs2/Makefile index 93e2589c20..a0a26776f7 100644 --- a/toolchain/jffs2/Makefile +++ b/toolchain/jffs2/Makefile @@ -10,20 +10,25 @@ PKG_NAME:=mtd PKG_VERSION:=20050122 PKG_SOURCE=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz -PKG_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338 PKG_SOURCE_URL=http://ftp.debian.org/debian/pool/main/m/mtd +PKG_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338 PKG_CAT:=zcat -PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/mtd-20050122.orig +PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig include $(INCLUDE_DIR)/host-build.mk define Build/Compile - $(MAKE) LINUXDIR=$(LINUX_HEADERS_DIR) -C $(PKG_BUILD_DIR)/util + $(MAKE) -C $(PKG_BUILD_DIR)/util LINUXDIR=$(LINUX_HEADERS_DIR) endef define Build/Install + mkdir -p $(STAGING_DIR)/bin $(CP) $(PKG_BUILD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/ endef +define Build/Clean + rm -f $(STAGING_DIR)/bin/mkfs.jffs2 +endef + $(eval $(call HostBuild)) diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index da525d5f37..42791f1e1d 100644 --- a/toolchain/kernel-headers/Makefile +++ b/toolchain/kernel-headers/Makefile @@ -10,12 +10,12 @@ PKG_NAME=kernel-headers PKG_VERSION=2.4.32 PKG_SOURCE=linux-$(PKG_VERSION).tar.bz2 -PKG_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c PKG_SOURCE_URL= \ http://www.de.kernel.org/pub/linux/kernel/v2.4 \ http://www.fi.kernel.org/pub/linux/kernel/v2.4 \ http://www.fr.kernel.org/pub/linux/kernel/v2.4 \ http://www.kernel.org/pub/linux/kernel/v2.4 +PKG_MD5SUM:=38f4d0830e95a20f4bfed17622d5557c PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/linux-$(PKG_VERSION) diff --git a/toolchain/libnotimpl/Makefile b/toolchain/libnotimpl/Makefile index bc515ca080..d55bf4e3fe 100644 --- a/toolchain/libnotimpl/Makefile +++ b/toolchain/libnotimpl/Makefile @@ -6,8 +6,9 @@ # include $(TOPDIR)/rules.mk -PKG_NAME := libnotimpl -PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/libnotimpl +PKG_NAME:=libnotimpl + +PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/libnotimpl include $(INCLUDE_DIR)/host-build.mk @@ -31,9 +32,7 @@ define Build/Install endef define Build/Clean - rm -rf \ - $(STAGING_DIR)/usr/lib/libnotimpl.a \ - $(PKG_BUILD_DIR) + rm -f $(STAGING_DIR)/usr/lib/libnotimpl.a endef $(eval $(call HostBuild)) diff --git a/toolchain/lzma/Makefile b/toolchain/lzma/Makefile index ab8fea0e6a..47f21d1f07 100644 --- a/toolchain/lzma/Makefile +++ b/toolchain/lzma/Makefile @@ -6,14 +6,14 @@ # include $(TOPDIR)/rules.mk -PKG_NAME := lzma -PKG_VERSION := 432 +PKG_NAME:=lzma +PKG_VERSION:=432 -PKG_SOURCE := $(PKG_NAME)$(PKG_VERSION).tar.bz2 -PKG_MD5SUM := 155c1ebce5bc6710ae7ecc926226d9d7 -PKG_SOURCE_URL := @SF/sevenzip +PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@SF/sevenzip +PKG_MD5SUM:=155c1ebce5bc6710ae7ecc926226d9d7 -PKG_BUILD_DIR=$(TOOL_BUILD_DIR)/lzma-$(PKG_VERSION)/lzma +PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/lzma include $(INCLUDE_DIR)/host-build.mk @@ -33,11 +33,12 @@ endef define Build/Install mkdir -p $(STAGING_DIR)/host/lib $(CP) $(LIB_DIR)/liblzma.a $(STAGING_DIR)/host/lib/ + mkdir -p $(STAGING_DIR)/bin $(CP) $(ALONE_DIR)/lzma $(STAGING_DIR)/bin/ endef define Build/Clean - rm -f $(PKG_BUILD_DIR)/liblzma.a $(PKG_BUILD_DIR)/lzma + rm -f $(STAGING_DIR)/host/lib/liblzma.a $(STAGING_DIR)/bin/lzma endef $(eval $(call HostBuild)) diff --git a/toolchain/mkimage/Makefile b/toolchain/mkimage/Makefile index ec27e2716a..71285d2e1a 100644 --- a/toolchain/mkimage/Makefile +++ b/toolchain/mkimage/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/host-build.mk -PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/mkimage +PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/mkimage define Build/Compile $(CC) -O -c src/crc32.c -o $(PKG_BUILD_DIR)/crc32.o @@ -16,7 +16,8 @@ define Build/Compile endef define Build/Install - $(CP) $(PKG_BUILD_DIR)/mkimage $(STAGING_DIR)/bin + mkdir -p $(STAGING_DIR)/bin + $(CP) $(PKG_BUILD_DIR)/mkimage $(STAGING_DIR)/bin/ endef define Build/Clean diff --git a/toolchain/sed/Makefile b/toolchain/sed/Makefile index fdeeeea2ab..b3169918b4 100644 --- a/toolchain/sed/Makefile +++ b/toolchain/sed/Makefile @@ -6,14 +6,15 @@ # include $(TOPDIR)/rules.mk -PKG_NAME := sed -PKG_VERSION := 4.1.2 +PKG_NAME:=sed +PKG_VERSION:=4.1.2 + PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/$(PKG_NAME) PKG_MD5SUM:=928f0e06422f414091917401f1a834d0 PKG_CAT:=zcat -PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/sed-$(PKG_VERSION) +PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) HOST_SED_TARGET=$(strip $(shell ./sedcheck.sh)) diff --git a/toolchain/squashfs/Makefile b/toolchain/squashfs/Makefile index ac5edd9967..8e37a15215 100644 --- a/toolchain/squashfs/Makefile +++ b/toolchain/squashfs/Makefile @@ -6,15 +6,15 @@ # include $(TOPDIR)/rules.mk -PKG_NAME := squashfs -PKG_VERSION := 3.0 +PKG_NAME:=squashfs +PKG_VERSION:=3.0 -PKG_SOURCE := $(PKG_NAME)$(PKG_VERSION).tar.gz -PKG_SOURCE_URL := @SF/squashfs -PKG_MD5SUM := 9fd05d0bfbb712f5fb95edafea5bc733 -PKG_CAT := zcat +PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/squashfs +PKG_MD5SUM:=9fd05d0bfbb712f5fb95edafea5bc733 +PKG_CAT:=zcat -PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/squashfs$(PKG_VERSION) +PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)$(PKG_VERSION) include $(INCLUDE_DIR)/host-build.mk @@ -23,7 +23,12 @@ define Build/Compile endef define Build/Install + mkdir -p $(STAGING_DIR)/bin $(CP) $(PKG_BUILD_DIR)/squashfs-tools/mksquashfs-lzma $(STAGING_DIR)/bin/ endef +define Build/Clean + rm -f $(STAGING_DIR)/bin/mksquashfs-lzma +endef + $(eval $(call HostBuild)) diff --git a/toolchain/sstrip/Makefile b/toolchain/sstrip/Makefile index 49983e9129..dc3ff4f6da 100644 --- a/toolchain/sstrip/Makefile +++ b/toolchain/sstrip/Makefile @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/host-build.mk -PKG_BUILD_DIR := $(TOOL_BUILD_DIR)/sstrip +PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/sstrip OS:=$(shell uname) ifeq ($(OS),Darwin) -CFLAGS += -I./include + CFLAGS += -I./include endif define Build/Compile @@ -19,7 +19,8 @@ define Build/Compile endef define Build/Install - $(CP) $(PKG_BUILD_DIR)/sstrip $(STAGING_DIR)/bin + mkdir -p $(STAGING_DIR)/bin + $(CP) $(PKG_BUILD_DIR)/sstrip $(STAGING_DIR)/bin/ endef define Build/Clean -- cgit v1.2.3