Menu
▾
▴
[Ipcop-svn] SF.net SVN: ipcop:[3365] ipcop/trunk
|
From: <ow...@us...> - 2009-07-30 14:58:54
|
Revision: 3365
http://ipcop.svn.sourceforge.net/ipcop/?rev=3365&view=rev
Author: owes
Date: 2009-07-30 14:58:46 +0000 (Thu, 30 Jul 2009)
Log Message:
-----------
Drop discover
Modified Paths:
--------------
ipcop/trunk/make.sh
Removed Paths:
-------------
ipcop/trunk/config/rootfiles/common/discover
ipcop/trunk/lfs/discover
ipcop/trunk/src/patches/discover-data-2.2008.06.25_6300esb-fixes.patch
ipcop/trunk/src/patches/discover-data-2.2008.06.25_de4x5-fixes.patch
Deleted: ipcop/trunk/config/rootfiles/common/discover
===================================================================
--- ipcop/trunk/config/rootfiles/common/discover 2009-07-30 14:57:21 UTC (rev 3364)
+++ ipcop/trunk/config/rootfiles/common/discover 2009-07-30 14:58:46 UTC (rev 3365)
@@ -1,131 +0,0 @@
-#etc/discover-modprobe.conf
-#etc/discover.conf.d
-#etc/discover.conf.d/00discover
-#usr/bin/discover
-#usr/bin/discover-config
-#usr/bin/discover-static
-#usr/bin/discover-xml
-#usr/include/discover
-#usr/include/discover/curl.h
-#usr/include/discover/device.h
-#usr/include/discover/discover-conf.h
-#usr/include/discover/discover-xml.h
-#usr/include/discover/discover.h
-#usr/include/discover/load-url.h
-#usr/include/discover/stack.h
-#usr/include/discover/sysdep.h
-#usr/include/discover/url-xml.h
-#usr/include/discover/utils.h
-#usr/lib/libdiscover.a
-#usr/lib/libdiscover.la
-usr/lib/libdiscover.so
-usr/lib/libdiscover.so.2
-usr/lib/libdiscover.so.2.0.1
-#usr/sbin/discover-modprobe
-#usr/sbin/discover-pkginstall
-#usr/share/discover
-usr/share/discover/ata-busclass.xml
-usr/share/discover/ata-device.xml
-usr/share/discover/ata-vendor.xml
-usr/share/discover/dtd
-usr/share/discover/dtd/conffile.dtd
-usr/share/discover/dtd/discover.dtd
-#usr/share/discover/init-discover
-usr/share/discover/list.xml
-usr/share/discover/pci-busclass.xml
-usr/share/discover/pci-device-deb.xml
-usr/share/discover/pci-device.xml
-usr/share/discover/pci-vendor.xml
-usr/share/discover/pcmcia-busclass.xml
-usr/share/discover/pcmcia-device.xml
-usr/share/discover/pcmcia-vendor.xml
-usr/share/discover/scsi-busclass.xml
-usr/share/discover/scsi-device.xml
-usr/share/discover/scsi-vendor.xml
-usr/share/discover/usb-busclass.xml
-usr/share/discover/usb-device.xml
-usr/share/discover/usb-vendor.xml
-#usr/share/doc/discover
-#usr/share/doc/discover/api-reference
-#usr/share/doc/discover/api-reference/annotated.html
-#usr/share/doc/discover/api-reference/busclass-xml_8c-source.html
-#usr/share/doc/discover/api-reference/busclass-xml_8c.html
-#usr/share/doc/discover/api-reference/conf_8c-source.html
-#usr/share/doc/discover/api-reference/conf_8c.html
-#usr/share/doc/discover/api-reference/core_8c-source.html
-#usr/share/doc/discover/api-reference/core_8c.html
-#usr/share/doc/discover/api-reference/device-xml_8c-source.html
-#usr/share/doc/discover/api-reference/device-xml_8c.html
-#usr/share/doc/discover/api-reference/device_8c-source.html
-#usr/share/doc/discover/api-reference/device_8c.html
-#usr/share/doc/discover/api-reference/dir_000000.html
-#usr/share/doc/discover/api-reference/dir_000001.html
-#usr/share/doc/discover/api-reference/dir_000002.html
-#usr/share/doc/discover/api-reference/dir_000003.html
-#usr/share/doc/discover/api-reference/dir_000004.html
-#usr/share/doc/discover/api-reference/dirs.html
-#usr/share/doc/discover/api-reference/discover-conf_8h-source.html
-#usr/share/doc/discover/api-reference/discover-conf_8h.html
-#usr/share/doc/discover/api-reference/discover-xml_8h-source.html
-#usr/share/doc/discover/api-reference/discover-xml_8h.html
-#usr/share/doc/discover/api-reference/discover_8h-source.html
-#usr/share/doc/discover/api-reference/discover_8h.html
-#usr/share/doc/discover/api-reference/doxygen.css
-#usr/share/doc/discover/api-reference/doxygen.png
-#usr/share/doc/discover/api-reference/files.html
-#usr/share/doc/discover/api-reference/functions.html
-#usr/share/doc/discover/api-reference/functions_rela.html
-#usr/share/doc/discover/api-reference/functions_vars.html
-#usr/share/doc/discover/api-reference/globals.html
-#usr/share/doc/discover/api-reference/globals_defs.html
-#usr/share/doc/discover/api-reference/globals_enum.html
-#usr/share/doc/discover/api-reference/globals_eval.html
-#usr/share/doc/discover/api-reference/globals_func.html
-#usr/share/doc/discover/api-reference/globals_type.html
-#usr/share/doc/discover/api-reference/group__busclass__xml.html
-#usr/share/doc/discover/api-reference/group__conf.html
-#usr/share/doc/discover/api-reference/group__core.html
-#usr/share/doc/discover/api-reference/group__device.html
-#usr/share/doc/discover/api-reference/group__device__xml.html
-#usr/share/doc/discover/api-reference/group__sysdeps.html
-#usr/share/doc/discover/api-reference/group__types.html
-#usr/share/doc/discover/api-reference/group__url__xml.html
-#usr/share/doc/discover/api-reference/group__vendor__xml.html
-#usr/share/doc/discover/api-reference/group__version__cmp.html
-#usr/share/doc/discover/api-reference/index.html
-#usr/share/doc/discover/api-reference/load-url_8c-source.html
-#usr/share/doc/discover/api-reference/load-url_8c.html
-#usr/share/doc/discover/api-reference/modules.html
-#usr/share/doc/discover/api-reference/stack_8c-source.html
-#usr/share/doc/discover/api-reference/stack_8c.html
-#usr/share/doc/discover/api-reference/structdiscover__bus__map.html
-#usr/share/doc/discover/api-reference/structdiscover__error.html
-#usr/share/doc/discover/api-reference/structdiscover__sysdep__data.html
-#usr/share/doc/discover/api-reference/structdiscover__sysdep__device__data.html
-#usr/share/doc/discover/api-reference/stubs_8c-source.html
-#usr/share/doc/discover/api-reference/stubs_8c.html
-#usr/share/doc/discover/api-reference/sysdep_8c-source.html
-#usr/share/doc/discover/api-reference/sysdep_8c.html
-#usr/share/doc/discover/api-reference/sysdep_8h-source.html
-#usr/share/doc/discover/api-reference/sysdep_8h.html
-#usr/share/doc/discover/api-reference/url-xml_8c-source.html
-#usr/share/doc/discover/api-reference/url-xml_8c.html
-#usr/share/doc/discover/api-reference/vendor-xml_8c-source.html
-#usr/share/doc/discover/api-reference/vendor-xml_8c.html
-#usr/share/doc/discover/api-reference/version-cmp_8c-source.html
-#usr/share/doc/discover/api-reference/version-cmp_8c.html
-#usr/share/doc/discover/guide.html
-#usr/share/doc/discover/guide.txt
-#usr/share/man/man1/discover-config.1
-#usr/share/man/man1/discover.1
-#usr/share/man/man5/discover-modprobe.conf.5
-#usr/share/man/man5/discover.conf.5
-#usr/share/man/man8/discover-modprobe.8
-#usr/share/tools
-#usr/share/tools/discover-updater.pl
-#usr/share/tools/lst2xml
-#usr/share/tools/merge-lst-to-xml
-#usr/share/tools/mkshorthwlist
-#usr/share/tools/reduce-xml
-#usr/share/tools/trim26lst
-#usr/share/tools/xml2lst
Deleted: ipcop/trunk/lfs/discover
===================================================================
--- ipcop/trunk/lfs/discover 2009-07-30 14:57:21 UTC (rev 3364)
+++ ipcop/trunk/lfs/discover 2009-07-30 14:58:46 UTC (rev 3365)
@@ -1,136 +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 <ro...@su...> #
-# #
-# Modifications by: #
-# ??-12-2003 Mark Wormgoor < ma...@wo...> #
-# - Modified Makefile for IPCop build #
-# #
-# $Id$
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-PKG_NAME = discover
-VER = 2.1.2
-HOST_ARCH = all
-OTHER_SRC = yes
-
-THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(PKG_NAME)_$(VER).orig.tar.gz
-DL_FROM = $(URL_DEBIAN)/d
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-
-# PATCH1 = $(PKG_NAME)_$(VER)-2.diff.gz
-
-DATA_VER = 2008.06.25
-DATAAPP = $(PKG_NAME)-data-2.$(DATA_VER)
-DATA_DL_FILE = $(PKG_NAME)-data_2.$(DATA_VER).tar.gz
-DATA_DIR = $(DIR_APP)/trunk
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE) \
- $(DATA_DL_FILE)
-# we don't need the diff patch actually, no patches on debian/patches to apply
-
-$(DL_FILE) = $(DL_FROM)/$(PKG_NAME)/$(DL_FILE)
-# $(PATCH1) = $(DL_FROM)/$(PKG_NAME)/$(PATCH1)
-$(DATA_DL_FILE) = $(DL_FROM)/$(PKG_NAME)-data/$(DATA_DL_FILE)
-
-$(DL_FILE)_MD5 = af78b63cc8db31b11d7e25958423611e
-# $(PATCH1)_MD5 = 598be78eb4b87efd96f720606e76941e
-$(DATA_DL_FILE)_MD5 = c4d45317a2229b30859fdd1bb31bdb04
-
-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) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP)
- @cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- @cd $(DIR_APP) && tar zxf $(DIR_DL)/$(DATA_DL_FILE)
-
- # First install the xml data files (by default in /usr/share/discover)
- cd $(DATA_DIR) && make install
-
- # There is no patches actually in the diff, so the diff is useless
- # Now patch, compile and install discover
- # cd $(DIR_APP) && gzip -dc $(DIR_DL)/$(PATCH1) | patch -Np1
- # if there was debian/patches, we need to apply there like made in lfs/grub
-
- cd $(DIR_APP) && ./configure --prefix=/usr \
- --disable-nls \
- --disable-curl \
- --datadir=/usr/share \
- --sysconfdir=/etc
- cd $(DIR_APP) && make
- cd $(DIR_APP) && make install
-
- # Fix some incorrect entries
- sed -i -e "s,qlogicfc,qla2xxx,g" \
- -e "s,sym53c8xx_2,sym53c8xx,g" \
- -e "s,usb-uhci,uhci-hcd,g" \
- -e "s,usb-ohci,ohci-hcd,g" \
- -e "s,usb-ehci,ehci-hcd,g" \
- /usr/share/discover/pci-device.xml
-
- # Change driver to tulip for 1011:0009 and 1011:0019
- cd /usr/share/discover && patch -Np1 -i $(DIR_PATCHES)/$(DATAAPP)_de4x5-fixes.patch
- # Change driver to ata_piix for 8086:25a3 and 8086:25b0
- cd /usr/share/discover && patch -Np1 -i $(DIR_PATCHES)/$(DATAAPP)_6300esb-fixes.patch
-
- # Strip PCI devices we are not interested in to save ~ 200 kB compressed and 1800 kB uncompressed
- /usr/local/bin/discover-data-shrink.pl /usr/share/discover/pci-device.xml \
- /usr/share/discover/pci-device.xml
- # Save 4kB when compressed, 120kB uncompressed
- sed -i -e '/last-updated/d' /usr/share/discover/pci-device.xml
-
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
Modified: ipcop/trunk/make.sh
===================================================================
--- ipcop/trunk/make.sh 2009-07-30 14:57:21 UTC (rev 3364)
+++ ipcop/trunk/make.sh 2009-07-30 14:58:46 UTC (rev 3365)
@@ -1844,7 +1844,6 @@
chroot_make newt
chroot_make busybox
chroot_make ipcop-lang
- chroot_make discover
chroot_make Python
chroot_make mklibs
chroot_make klibc
Deleted: ipcop/trunk/src/patches/discover-data-2.2008.06.25_6300esb-fixes.patch
===================================================================
--- ipcop/trunk/src/patches/discover-data-2.2008.06.25_6300esb-fixes.patch 2009-07-30 14:57:21 UTC (rev 3364)
+++ ipcop/trunk/src/patches/discover-data-2.2008.06.25_6300esb-fixes.patch 2009-07-30 14:58:46 UTC (rev 3365)
@@ -1,20 +0,0 @@
---- discover-6300esb/pci-device.xml 2009-06-15 12:53:29.000000000 +0200
-+++ discover/pci-device.xml 2009-06-15 12:56:42.000000000 +0200
-@@ -32942,7 +32942,7 @@
- <device vendor='8086' model='25a3' model_name='6300ESB SATA Storage Controller' busclass='0101'>
- <data class='linux'>
- <data class='module'>
-- <data class='name'>piix</data>
-+ <data class='name'>ata_piix</data>
- </data>
- <data class='last-updated'>2006-08-14</data>
- <data class='last-updated-by'>pe...@hu...</data>
-@@ -33029,7 +33029,7 @@
- <device vendor='8086' model='25b0' model_name='6300ESB SATA RAID Controller' busclass='0101'>
- <data class='linux'>
- <data class='module'>
-- <data class='name'>piix</data>
-+ <data class='name'>ata_piix</data>
- </data>
- <data class='last-updated'>2004-11-19</data>
- <data class='last-updated-by'>imu...@pr...</data>
Deleted: ipcop/trunk/src/patches/discover-data-2.2008.06.25_de4x5-fixes.patch
===================================================================
--- ipcop/trunk/src/patches/discover-data-2.2008.06.25_de4x5-fixes.patch 2009-07-30 14:57:21 UTC (rev 3364)
+++ ipcop/trunk/src/patches/discover-data-2.2008.06.25_de4x5-fixes.patch 2009-07-30 14:58:46 UTC (rev 3365)
@@ -1,28 +0,0 @@
---- discover-de4x5/pci-device.xml 2009-06-08 21:19:07.000000000 +0200
-+++ discover/pci-device.xml 2009-06-08 21:44:59.000000000 +0200
-@@ -6337,7 +6337,7 @@
- <device vendor='1011' model='0009' model_name='DECchip 21140 [FasterNet]' busclass='0200'>
- <data class='linux'>
- <data class='module'>
-- <data class='name'>de4x5</data>
-+ <data class='name'>tulip</data>
- </data>
- <data class='last-updated'>2004-11-19</data>
- <data class='last-updated-by'>imu...@pr...</data>
-@@ -6359,7 +6359,6 @@
- <device vendor='1011' model='0009' subvendor='11f6' subdevice='0503' model_name='DECchip 21140 [FasterNet]' subsystem_name='Freedomline Fast Ethernet'/>
- <device vendor='1011' model='0009' subvendor='1282' subdevice='9100' model_name='DECchip 21140 [FasterNet]' subsystem_name='AEF-380TXD Fast Ethernet'/>
- <device vendor='1011' model='0009' subvendor='1385' subdevice='1100' model_name='DECchip 21140 [FasterNet]' subsystem_name='FA310TX Fast Ethernet'/>
-- <device vendor='1011' model='0009' subvendor='2646' subdevice='0001' model_name='DECchip 21140 [FasterNet]' subsystem_name='KNE100TX Fast Ethernet' busclass='0200'/>
- <device vendor='1011' model='000a' model_name='21230 Video Codec'/>
- <device vendor='1011' model='000d' model_name='PBXGB [TGA2]' busclass='0400'>
- <data class='xfree86'>
-@@ -6398,7 +6397,7 @@
- <device vendor='1011' model='0019' model_name='DECchip 21142/43' busclass='0200'>
- <data class='linux'>
- <data class='module'>
-- <data class='name'>de4x5</data>
-+ <data class='name'>tulip</data>
- </data>
- <!-- ia64 and hppa need to use the tulip module. See #235285 and #394032
- <data class='module'>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|