From be91126febe6383e9eed9e1bbabe7bdf8597ac3a Mon Sep 17 00:00:00 2001 From: ms Date: Wed, 8 Aug 2007 19:12:48 +0000 Subject: [PATCH] Einen im Kernel enthaltenen Treiber entfernt. Vorgerueckt auf Testing 5. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@747 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- doc/packages-list.txt | 2 +- lfs/promise-sata-300-tx | 85 -------------------------------- make.sh | 4 +- src/install+setup/install/main.c | 8 +-- src/pakfire/pakfire.conf | 4 +- 5 files changed, 8 insertions(+), 95 deletions(-) delete mode 100644 lfs/promise-sata-300-tx diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 411954dff..562f37303 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -1,4 +1,4 @@ -== List of softwares used to build IPFire Version: 2.0t4 == +== List of softwares used to build IPFire Version: 2.0a4 == * Archive-Tar-1.29 * Archive-Zip-1.16 * BerkeleyDB-0.27 diff --git a/lfs/promise-sata-300-tx b/lfs/promise-sata-300-tx deleted file mode 100644 index 2352ac320..000000000 --- a/lfs/promise-sata-300-tx +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# This file is part of the IPCop Firewall. # -# # -# IPCop 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. # -# # -# IPCop 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 IPCop; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Makefiles are based on LFSMake, which is # -# Copyright (C) 2002 Rod Roard # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = linux2.6-src-x86_v1.01.0.20 - -THISAPP = promise_sataii150-300-tx-series-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/ut_mod -ifeq "$(SMP)" "1" - TARGET = $(DIR_INFO)/$(THISAPP)-smp -else - TARGET = $(DIR_INFO)/$(THISAPP) -endif - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 451b836549171756ef85d13db1b85eda - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make -ifeq "$(SMP)" "1" - cd $(DIR_APP) && cp -f ulsata2.ko /lib/modules/$(KVER)-smp/kernel/drivers/scsi/ulsata2.ko -else - cd $(DIR_APP) && cp -f ulsata2.ko /lib/modules/$(KVER)/kernel/drivers/scsi/ulsata2.ko -endif - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 1ef357e68..2e1d2534a 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.0a4" # Version number +VERSION="2.0t5" # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level @@ -333,7 +333,6 @@ buildipfire() { ipfiremake fcdslsl SMP=1 ipfiremake fcdslusb SMP=1 ipfiremake fcdslslusb SMP=1 -# ipfiremake promise-sata-300-tx SMP=1 ipfiremake r8169 SMP=1 ipfiremake zaptel SMP=1 ipfiremake fuse SMP=1 @@ -344,7 +343,6 @@ buildipfire() { ipfiremake fcdslsl ipfiremake fcdslusb ipfiremake fcdslslusb -# ipfiremake promise-sata-300-tx ipfiremake r8169 ipfiremake zaptel ipfiremake fuse diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 0a944da93..6732c8aac 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -320,12 +320,12 @@ int main(int argc, char *argv[]) sprintf(message, ctr[TR_PREPARE_HARDDISK], hdparams.devnode_disk); if (unattended) { hardyn = 1; + } else { + yesnoharddisk[0] = ctr[TR_NO]; + yesnoharddisk[1] = ctr[TR_YES]; + yesnoharddisk[2] = NULL; } - yesnoharddisk[0] = ctr[TR_NO]; - yesnoharddisk[1] = ctr[TR_YES]; - yesnoharddisk[2] = NULL; - while (! hardyn) { rc = newtWinMenu(title, message, 50, 5, 5, 6, yesnoharddisk, diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index 1920533c8..5c758e997 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -1,8 +1,8 @@ -#!/usr/bin/perl -w +#!/usr/bin/perl package Conf; -$version = "2.0alpha4"; +$version = "2.0testing5"; $mainserver = "pakfire.ipfire.org";