Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x

This commit is contained in:
Jan Paul Tuecking
2010-08-16 19:20:21 +02:00
46 changed files with 6523 additions and 5156 deletions

View File

@@ -40,7 +40,7 @@ DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
PROG = alsa
PAK_VER = 7
PAK_VER = 8
DEPS = ""

View File

@@ -30,7 +30,7 @@ else
VERSUFIX=ipfire
endif
VER = 2.6.34.1
VER = 2.6.35-1
THISAPP = compat-wireless-$(VER)
DL_FILE = compat-wireless-$(VER).tar.bz2
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 80ceb675aeba45847258770441352af6
$(DL_FILE)_MD5 = 41c51280e5aa140c62a2a9871e2ae505
install : $(TARGET)

View File

@@ -27,13 +27,13 @@ include Config
VER = 1.00
THISAPP = ipfireseeder-$(VER)
DL_FILE = ipfire-2.7.i586-full-core38.iso.torrent
DL_FILE = ipfire-2.7.i586-full-core39.iso.torrent
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ipfireseeder
PAK_VER = 12
PAK_VER = 13
DEPS = "rtorrent"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0848aee5e93b9716ce70f6dcdf2f5863
$(DL_FILE)_MD5 = fb86055370d1cd5c0736c47b3e4f68f6
install : $(TARGET)

View File

@@ -30,11 +30,7 @@ THISAPP = libaal-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(LFS_PASS)" "install"
TARGET = $(DIR_INFO)/$(THISAPP)-install
else
TARGET = $(DIR_INFO)/$(THISAPP)
endif
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
@@ -74,14 +70,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
ifeq "$(LFS_PASS)" "install"
cd $(DIR_APP) && ./configure --prefix=/opt/$(MACHINE)-uClibc
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
else
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -147,6 +147,9 @@ endif
# Huawei (Vodafone) K3765 & K4505 Usbids
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch
# Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch
# Cleanup kernel source
cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config

View File

@@ -88,6 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Blacklist ath5k or madwifi for switching between the drivers
echo 'blacklist ath_pci' >> /etc/modprobe.d/madwifi
echo '#blacklist ath5k' >> /etc/modprobe.d/madwifi
echo '#blacklist ath9k' >> /etc/modprobe.d/madwifi
# create madwifi symlink for hostapd build
cd $(DIR_SRC) && ln -sf $(THISAPP) madwifi

View File

@@ -24,7 +24,7 @@
include Config
VER = 2.4.3
VER = 2.7
THISAPP = Python-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 141c683447d5e76be1d2bd4829574f02
$(DL_FILE)_MD5 = 0e8c9ec32abf5b732bea7d91b38c3339
install : $(TARGET)
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gdbm-1.patch
cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared --disable-nls
cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)

View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python-clientform
PAK_VER = 1
PAK_VER = 2
DEPS = ""

View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python-feedparser
PAK_VER = 1
PAK_VER = 2
DEPS = "python-mechanize"

View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python-mechanize
PAK_VER = 1
PAK_VER = 2
DEPS = "python-clientform"

View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/rssdler040
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python-rssdler
PAK_VER = 1
PAK_VER = 2
DEPS = "python-feedparser python-mechanize"

View File

@@ -24,15 +24,15 @@
include Config
VER = 0.6c8
VER = 0.6c11
THISAPP = setuptools-$(VER)
DL_FILE = $(THISAPP)-py2.4.egg
DL_FILE = $(THISAPP)-py2.7.egg
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python-setuptools
PAK_VER = 1
PAK_VER = 2
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = cba38d74f7d483c06e9daa6070cce6de
$(DL_FILE)_MD5 = fe1f997bc722265116870bc7919059ea
install : $(TARGET)

View File

@@ -30,11 +30,7 @@ THISAPP = reiser4progs-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(LFS_PASS)" "install"
TARGET = $(DIR_INFO)/$(THISAPP)-install
else
TARGET = $(DIR_INFO)/$(THISAPP)
endif
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
@@ -74,18 +70,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
ifeq "$(LFS_PASS)" "install"
cd $(DIR_APP) && ./configure --prefix=/opt/$(MACHINE)-uClibc \
--with-libaal=/opt/$(MACHINE)-uClibc \
--without-readline --disable-shared \
--sbindir=/install/initrd/sbin
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
-rm -f /install/initrd/{debugfs.,measurefs.,make_}reiser4
else
cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin --enable-static
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
endif
@rm -rf $(DIR_APP)
@$(POSTBUILD)