Merge branch 'master' into perl-threads

This commit is contained in:
Arne Fitzenreiter
2011-01-18 22:06:24 +01:00
23 changed files with 126 additions and 25 deletions

View File

@@ -70,6 +70,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
# Fix for braindead board vendors.
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-invalid-id.patch
cd $(DIR_APP) && python setup.py build
cd $(DIR_APP) && python setup.py install

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# #
# 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 #
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
PAK_VER = 20
PAK_VER = 21
DEPS = ""

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2011 IPFire Team <info@ipfire.org> #
# #
# 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 #
@@ -63,7 +63,7 @@ $(TARGET) :
cd $(DIR_APP)/install && install -v -m 0755 install probenic.sh \
probehw.sh downloadsource.sh mountsource.sh mountdest.sh /install/initrd/bin
#Patch ISO Name for download ...
sed -i -e "s|ipfire.iso|$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso|g" \
sed -i -e "s|ipfire.iso|download.ipfire.org/releases/ipfire-2.x/$(VERSION)-core$(CORE)/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso|g" \
/install/initrd/bin/downloadsource.sh
@rm -rf $(DIR_APP)
@$(POSTBUILD)

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
# Copyright (C) 2011 IPFire Team <info@ipfire.org> #
# #
# 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 #
@@ -27,13 +27,13 @@ include Config
VER = 1.00
THISAPP = ipfireseeder-$(VER)
DL_FILE = ipfire-2.7.i586-full-core43.iso.torrent
DL_FILE = ipfire-2.9.i586-full-core44.iso.torrent
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ipfireseeder
PAK_VER = 18
PAK_VER = 20
DEPS = "rtorrent"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0a8d7e52332c12d29847b0a7ab263bc3
$(DL_FILE)_MD5 = 70365fee7ca86b2e059eda81ed804b49
install : $(TARGET)

View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
# #
# 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 #
@@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
PROG = streamripper
PAK_VER = 1
DEPS = "glib libmad libogg libvorbis"
DEPS = "glib libmad libogg libvorbis faad2"
###############################################################################
# Top-level Rules