1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 03:01:55 +02:00

update everything to the latest version

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@132 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mbm 2004-08-09 04:09:46 +00:00
parent 52a9133ce0
commit fd03e7eeb7
6 changed files with 28 additions and 27 deletions

View File

@ -28,7 +28,7 @@
# #
############################################################# #############################################################
SNAPSHOT:=20040705 SNAPSHOT:=20040807
ARCH:=mipsel ARCH:=mipsel
USE_UCLIBC_SNAPSHOT:=$(SNAPSHOT) USE_UCLIBC_SNAPSHOT:=$(SNAPSHOT)

View File

@ -8,11 +8,7 @@ ifneq ($(strip $(USE_BUSYBOX_SNAPSHOT)),)
# Be aware that this changes daily.... # Be aware that this changes daily....
BUSYBOX_DIR:=$(BUILD_DIR)/busybox BUSYBOX_DIR:=$(BUILD_DIR)/busybox
BUSYBOX_SOURCE:=busybox-$(strip $(USE_BUSYBOX_SNAPSHOT)).tar.bz2 BUSYBOX_SOURCE:=busybox-$(strip $(USE_BUSYBOX_SNAPSHOT)).tar.bz2
#BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
#
# TEMPORARY HACK!
#
BUSYBOX_SITE:=http://openwrt.ksilebo.net/downloads
else else
BUSYBOX_DIR:=$(BUILD_DIR)/busybox-1.00-pre8 BUSYBOX_DIR:=$(BUILD_DIR)/busybox-1.00-pre8
BUSYBOX_SOURCE:=busybox-1.00-pre8.tar.bz2 BUSYBOX_SOURCE:=busybox-1.00-pre8.tar.bz2

View File

@ -6,8 +6,8 @@
DNSMASQ_SITE=http://thekelleys.org.uk/dnsmasq DNSMASQ_SITE=http://thekelleys.org.uk/dnsmasq
ifeq ($(filter $(TARGETS),dnsmasq1),) ifeq ($(filter $(TARGETS),dnsmasq1),)
DNSMASQ_SOURCE=dnsmasq-2.8.tar.gz DNSMASQ_SOURCE=dnsmasq-2.11.tar.gz
DNSMASQ_DIR=$(BUILD_DIR)/dnsmasq-2.8 DNSMASQ_DIR=$(BUILD_DIR)/dnsmasq-2.11
DNSMASQ_VER=dnsmasq2 DNSMASQ_VER=dnsmasq2
else else
DNSMASQ_SOURCE=dnsmasq-1.18.tar.gz DNSMASQ_SOURCE=dnsmasq-1.18.tar.gz

View File

@ -3,9 +3,9 @@
# dropbear_sshd # dropbear_sshd
# #
############################################################# #############################################################
DROPBEAR_SSHD_SOURCE:=dropbear-0.41.tar.bz2 DROPBEAR_SSHD_SOURCE:=dropbear-0.43.tar.bz2
DROPBEAR_SSHD_SITE:=http://matt.ucc.asn.au/dropbear/releases/ DROPBEAR_SSHD_SITE:=http://matt.ucc.asn.au/dropbear/releases/
DROPBEAR_SSHD_DIR:=$(BUILD_DIR)/dropbear-0.41 DROPBEAR_SSHD_DIR:=$(BUILD_DIR)/dropbear-0.43
DROPBEAR_SSHD_CAT:=bzcat DROPBEAR_SSHD_CAT:=bzcat
DROPBEAR_SSHD_BINARY:=dropbearmulti DROPBEAR_SSHD_BINARY:=dropbearmulti
DROPBEAR_SSHD_TARGET_BINARY:=usr/sbin/dropbear DROPBEAR_SSHD_TARGET_BINARY:=usr/sbin/dropbear
@ -18,8 +18,6 @@ dropbear_sshd-source: $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE)
$(DROPBEAR_SSHD_DIR)/.unpacked: $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE) $(DROPBEAR_SSHD_DIR)/.unpacked: $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE)
$(DROPBEAR_SSHD_CAT) $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE) | tar -C $(BUILD_DIR) -xvf - $(DROPBEAR_SSHD_CAT) $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE) | tar -C $(BUILD_DIR) -xvf -
$(SOURCE_DIR)/patch-kernel.sh $(DROPBEAR_SSHD_DIR) $(SOURCE_DIR) dropbear-*.patch
$(SED) 's,^/\* #define DROPBEAR_MULTI.*,#define DROPBEAR_MULTI,g' $(DROPBEAR_SSHD_DIR)/options.h
touch $(DROPBEAR_SSHD_DIR)/.unpacked touch $(DROPBEAR_SSHD_DIR)/.unpacked
$(DROPBEAR_SSHD_DIR)/.configured: $(DROPBEAR_SSHD_DIR)/.unpacked $(DROPBEAR_SSHD_DIR)/.configured: $(DROPBEAR_SSHD_DIR)/.unpacked
@ -43,24 +41,35 @@ $(DROPBEAR_SSHD_DIR)/.configured: $(DROPBEAR_SSHD_DIR)/.unpacked
--infodir=/usr/info \ --infodir=/usr/info \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
--with-shared \ --with-shared \
\
--disable-zlib \
--disable-syslog \
--disable-lastlog \
--disable-utmp \
--disable-utmpx \
--disable-wtmp \
--disable-wtmpx \
--disable-loginfunc \
--disable-pututline \
--disable-pututxline \
); );
touch $(DROPBEAR_SSHD_DIR)/.configured touch $(DROPBEAR_SSHD_DIR)/.configured
$(DROPBEAR_SSHD_DIR)/$(DROPBEAR_SSHD_BINARY): $(DROPBEAR_SSHD_DIR)/.configured $(DROPBEAR_SSHD_DIR)/$(DROPBEAR_SSHD_BINARY): $(DROPBEAR_SSHD_DIR)/.configured
$(MAKE) $(TARGET_CONFIGURE_OPTS) LD=$(TARGET_CC) \ $(MAKE) $(TARGET_CONFIGURE_OPTS) LD=$(TARGET_CC) \
-C $(DROPBEAR_SSHD_DIR) dropbearmulti -C $(DROPBEAR_SSHD_DIR) strip
$(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY): $(DROPBEAR_SSHD_DIR)/$(DROPBEAR_SSHD_BINARY) $(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY): $(DROPBEAR_SSHD_DIR)/$(DROPBEAR_SSHD_BINARY)
#$(MAKE) DESTDIR=$(TARGET_DIR) $(TARGET_CONFIGURE_OPTS) \ #$(MAKE) DESTDIR=$(TARGET_DIR) $(TARGET_CONFIGURE_OPTS) \
# LD=$(TARGET_CC) -C $(DROPBEAR_SSHD_DIR) install # LD=$(TARGET_CC) -C $(DROPBEAR_SSHD_DIR) install
#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ #rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
# $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc # $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
install -d -m 755 $(TARGET_DIR)/usr/sbin # install -d -m 755 $(TARGET_DIR)/usr/sbin
install -d -m 755 $(TARGET_DIR)/usr/bin # install -d -m 755 $(TARGET_DIR)/usr/bin
install -m 755 $(DROPBEAR_SSHD_DIR)/$(DROPBEAR_SSHD_BINARY) \ # install -m 755 $(DROPBEAR_SSHD_DIR)/$(DROPBEAR_SSHD_BINARY) \
$(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY) # $(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY)
ln -sf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearkey # ln -sf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearkey
ln -sf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearconvert # ln -sf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearconvert
dropbear_sshd: uclibc zlib $(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY) dropbear_sshd: uclibc zlib $(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY)

View File

@ -7,11 +7,7 @@ ifneq ($(strip $(USE_UCLIBC_SNAPSHOT)),)
# Be aware that this changes daily.... # Be aware that this changes daily....
UCLIBC_DIR:=$(BUILD_DIR)/uClibc UCLIBC_DIR:=$(BUILD_DIR)/uClibc
UCLIBC_SOURCE:=uClibc-$(strip $(USE_UCLIBC_SNAPSHOT)).tar.bz2 UCLIBC_SOURCE:=uClibc-$(strip $(USE_UCLIBC_SNAPSHOT)).tar.bz2
#UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots
#
# TEMPORARY HACK!
#
UCLIBC_SITE:=http://openwrt.ksilebo.net/downloads
else else
UCLIBC_DIR:=$(BUILD_DIR)/uClibc-0.9.26 UCLIBC_DIR:=$(BUILD_DIR)/uClibc-0.9.26
UCLIBC_SOURCE:=uClibc-0.9.26.tar.bz2 UCLIBC_SOURCE:=uClibc-0.9.26.tar.bz2
@ -51,7 +47,7 @@ endif
ifeq ($(strip $(USE_UCLIBC_LDSO_0_9_24)),true) ifeq ($(strip $(USE_UCLIBC_LDSO_0_9_24)),true)
$(SOURCE_DIR)/patch-kernel.sh $(UCLIBC_DIR) $(SOURCE_DIR) uClibc-ldso-0.9.24.patch $(SOURCE_DIR)/patch-kernel.sh $(UCLIBC_DIR) $(SOURCE_DIR) uClibc-ldso-0.9.24.patch
endif endif
$(SOURCE_DIR)/patch-kernel.sh $(UCLIBC_DIR) $(SOURCE_DIR) uClibc-ftruncate.patch $(SOURCE_DIR)/patch-kernel.sh $(UCLIBC_DIR) $(SOURCE_DIR) uClibc-sigaction.patch
touch $(UCLIBC_DIR)/.unpacked touch $(UCLIBC_DIR)/.unpacked
$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(LINUX_DIR)/.configured $(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(LINUX_DIR)/.configured

View File

@ -129,7 +129,7 @@ CONFIG_HOTPLUG=y
# CONFIG_HOTPLUG_PCI_COMPAQ is not set # CONFIG_HOTPLUG_PCI_COMPAQ is not set
# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
# CONFIG_HOTPLUG_PCI_ACPI is not set # CONFIG_HOTPLUG_PCI_ACPI is not set
# CONFIG_SYSVIPC is not set CONFIG_SYSVIPC=y
# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BSD_PROCESS_ACCT is not set
CONFIG_SYSCTL=y CONFIG_SYSCTL=y
# CONFIG_PRINT_SYSCALLS is not set # CONFIG_PRINT_SYSCALLS is not set
@ -325,7 +325,7 @@ CONFIG_IP_NF_MATCH_DSTLIMIT=m
CONFIG_IP_NF_MATCH_MAC=m CONFIG_IP_NF_MATCH_MAC=m
CONFIG_IP_NF_MATCH_PKTTYPE=m CONFIG_IP_NF_MATCH_PKTTYPE=m
CONFIG_IP_NF_MATCH_MARK=y CONFIG_IP_NF_MATCH_MARK=y
CONFIG_IP_NF_MATCH_MULTIPORT=m CONFIG_IP_NF_MATCH_MULTIPORT=y
CONFIG_IP_NF_MATCH_TOS=m CONFIG_IP_NF_MATCH_TOS=m
CONFIG_IP_NF_MATCH_CONDITION=m CONFIG_IP_NF_MATCH_CONDITION=m
# CONFIG_IP_NF_MATCH_RANDOM is not set # CONFIG_IP_NF_MATCH_RANDOM is not set