From f2ab614b46212a977026117aba71968fc8bf361c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 18 Jan 2011 19:59:44 +0100 Subject: [PATCH 1/2] fireinfo: Update to 2.0.3. --- lfs/fireinfo | 8 ++------ src/patches/fireinfo-invalid-id.patch | 18 ------------------ 2 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 src/patches/fireinfo-invalid-id.patch diff --git a/lfs/fireinfo b/lfs/fireinfo index 97b5a8705..0c55e007c 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -24,7 +24,7 @@ include Config -VER = 2.0.2 +VER = 2.0.3 THISAPP = fireinfo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = ed29f591ccfeeb6386a61eafcc5dc398 +$(DL_FILE)_MD5 = f9ce8b96350dd5af1e5c095806128cd0 install : $(TARGET) @@ -70,10 +70,6 @@ $(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 diff --git a/src/patches/fireinfo-invalid-id.patch b/src/patches/fireinfo-invalid-id.patch deleted file mode 100644 index 669deb62e..000000000 --- a/src/patches/fireinfo-invalid-id.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit ac68f90a0229083d755e7e2e8980822405ac2da8 -Author: Michael Tremer -Date: Tue Jan 18 19:11:06 2011 +0100 - - Add invalid ID: 00020003-0004-0005-0006-000700080009. - -diff --git a/fireinfo/system.py b/fireinfo/system.py -index 135c29b..690eae2 100644 ---- a/fireinfo/system.py -+++ b/fireinfo/system.py -@@ -41,6 +41,7 @@ INVALID_ID_STRINGS = ( - "N/A", "n/a", - "12345", "54321", "202020", - "Chassis", "chassis", -+ "00020003-0004-0005-0006-000700080009", - ) - - class Singleton(type): From 5d547072c3e454549eb0ac0c36827ebcba8eba4a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 19 Jan 2011 01:27:23 +0100 Subject: [PATCH 2/2] parted: New package. --- config/rootfiles/packages/parted | 48 ++++++++++++++++++++ lfs/parted | 77 ++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 126 insertions(+) create mode 100644 config/rootfiles/packages/parted create mode 100644 lfs/parted diff --git a/config/rootfiles/packages/parted b/config/rootfiles/packages/parted new file mode 100644 index 000000000..74164e0b7 --- /dev/null +++ b/config/rootfiles/packages/parted @@ -0,0 +1,48 @@ +#usr/include/parted +#usr/include/parted/constraint.h +#usr/include/parted/debug.h +#usr/include/parted/device.h +#usr/include/parted/disk.h +#usr/include/parted/exception.h +#usr/include/parted/filesys.h +#usr/include/parted/geom.h +#usr/include/parted/natmath.h +#usr/include/parted/parted.h +#usr/include/parted/timer.h +#usr/include/parted/unit.h +#usr/lib/libparted.a +#usr/lib/libparted.la +#usr/lib/libparted.so +usr/lib/libparted.so.0 +usr/lib/libparted.so.0.0.1 +#usr/lib/pkgconfig/libparted.pc +usr/sbin/parted +usr/sbin/partprobe +#usr/share/info/parted.info +#usr/share/locale/ca/LC_MESSAGES/parted.mo +#usr/share/locale/cs/LC_MESSAGES/parted.mo +#usr/share/locale/da/LC_MESSAGES/parted.mo +#usr/share/locale/de/LC_MESSAGES/parted.mo +#usr/share/locale/es/LC_MESSAGES/parted.mo +#usr/share/locale/fr/LC_MESSAGES/parted.mo +#usr/share/locale/gl/LC_MESSAGES/parted.mo +#usr/share/locale/id/LC_MESSAGES/parted.mo +#usr/share/locale/it/LC_MESSAGES/parted.mo +#usr/share/locale/ja/LC_MESSAGES/parted.mo +#usr/share/locale/nl/LC_MESSAGES/parted.mo +#usr/share/locale/nn/LC_MESSAGES/parted.mo +#usr/share/locale/pl/LC_MESSAGES/parted.mo +#usr/share/locale/pt/LC_MESSAGES/parted.mo +#usr/share/locale/pt_BR/LC_MESSAGES/parted.mo +#usr/share/locale/ro/LC_MESSAGES/parted.mo +#usr/share/locale/ru/LC_MESSAGES/parted.mo +#usr/share/locale/rw/LC_MESSAGES/parted.mo +#usr/share/locale/sk/LC_MESSAGES/parted.mo +#usr/share/locale/sv/LC_MESSAGES/parted.mo +#usr/share/locale/tr/LC_MESSAGES/parted.mo +#usr/share/locale/uk/LC_MESSAGES/parted.mo +#usr/share/locale/vi/LC_MESSAGES/parted.mo +#usr/share/locale/zh_CN/LC_MESSAGES/parted.mo +#usr/share/locale/zh_TW/LC_MESSAGES/parted.mo +#usr/share/man/man8/parted.8 +#usr/share/man/man8/partprobe.8 diff --git a/lfs/parted b/lfs/parted new file mode 100644 index 000000000..7a70d9927 --- /dev/null +++ b/lfs/parted @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.3 + +THISAPP = parted-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 30ceb6df7e8681891e865e2fe5a7903d + +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) && ./configure --prefix=/usr --disable-device-mapper + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index fe473aeec..13d79e088 100755 --- a/make.sh +++ b/make.sh @@ -685,6 +685,7 @@ buildipfire() { ipfiremake miniupnpd ipfiremake client175 ipfiremake powertop + ipfiremake parted echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild