Add lvm2 and multipath-tools (for kpartx)

diff --git a/config/rootfiles/common/lvm2 b/config/rootfiles/common/lvm2
new file mode 100644 (file)
index 0000000..8ccafc7
--- /dev/null
+++ b/config/rootfiles/common/lvm2
@@ -0,0 +1,103 @@
+#etc/lvm
+#etc/lvm/lvm.conf
+#usr/include/libdevmapper.h
+#usr/lib/libdevmapper.so
+usr/lib/libdevmapper.so.1.02
+#usr/lib/pkgconfig/devmapper.pc
+#usr/sbin/dmsetup
+#usr/sbin/fsadm
+#usr/sbin/lvchange
+#usr/sbin/lvconvert
+#usr/sbin/lvcreate
+#usr/sbin/lvdisplay
+#usr/sbin/lvextend
+#usr/sbin/lvm
+#usr/sbin/lvmchange
+#usr/sbin/lvmconf
+#usr/sbin/lvmdiskscan
+#usr/sbin/lvmdump
+#usr/sbin/lvmsadc
+#usr/sbin/lvmsar
+#usr/sbin/lvreduce
+#usr/sbin/lvremove
+#usr/sbin/lvrename
+#usr/sbin/lvresize
+#usr/sbin/lvs
+#usr/sbin/lvscan
+#usr/sbin/pvchange
+#usr/sbin/pvck
+#usr/sbin/pvcreate
+#usr/sbin/pvdisplay
+#usr/sbin/pvmove
+#usr/sbin/pvremove
+#usr/sbin/pvresize
+#usr/sbin/pvs
+#usr/sbin/pvscan
+#usr/sbin/vgcfgbackup
+#usr/sbin/vgcfgrestore
+#usr/sbin/vgchange
+#usr/sbin/vgck
+#usr/sbin/vgconvert
+#usr/sbin/vgcreate
+#usr/sbin/vgdisplay
+#usr/sbin/vgexport
+#usr/sbin/vgextend
+#usr/sbin/vgimport
+#usr/sbin/vgimportclone
+#usr/sbin/vgmerge
+#usr/sbin/vgmknodes
+#usr/sbin/vgreduce
+#usr/sbin/vgremove
+#usr/sbin/vgrename
+#usr/sbin/vgs
+#usr/sbin/vgscan
+#usr/sbin/vgsplit
+#usr/share/man/man5/lvm.conf.5
+#usr/share/man/man8/dmsetup.8
+#usr/share/man/man8/fsadm.8
+#usr/share/man/man8/lvchange.8
+#usr/share/man/man8/lvconvert.8
+#usr/share/man/man8/lvcreate.8
+#usr/share/man/man8/lvdisplay.8
+#usr/share/man/man8/lvextend.8
+#usr/share/man/man8/lvm.8
+#usr/share/man/man8/lvmchange.8
+#usr/share/man/man8/lvmconf.8
+#usr/share/man/man8/lvmdiskscan.8
+#usr/share/man/man8/lvmdump.8
+#usr/share/man/man8/lvmsadc.8
+#usr/share/man/man8/lvmsar.8
+#usr/share/man/man8/lvreduce.8
+#usr/share/man/man8/lvremove.8
+#usr/share/man/man8/lvrename.8
+#usr/share/man/man8/lvresize.8
+#usr/share/man/man8/lvs.8
+#usr/share/man/man8/lvscan.8
+#usr/share/man/man8/pvchange.8
+#usr/share/man/man8/pvck.8
+#usr/share/man/man8/pvcreate.8
+#usr/share/man/man8/pvdisplay.8
+#usr/share/man/man8/pvmove.8
+#usr/share/man/man8/pvremove.8
+#usr/share/man/man8/pvresize.8
+#usr/share/man/man8/pvs.8
+#usr/share/man/man8/pvscan.8
+#usr/share/man/man8/vgcfgbackup.8
+#usr/share/man/man8/vgcfgrestore.8
+#usr/share/man/man8/vgchange.8
+#usr/share/man/man8/vgck.8
+#usr/share/man/man8/vgconvert.8
+#usr/share/man/man8/vgcreate.8
+#usr/share/man/man8/vgdisplay.8
+#usr/share/man/man8/vgexport.8
+#usr/share/man/man8/vgextend.8
+#usr/share/man/man8/vgimport.8
+#usr/share/man/man8/vgimportclone.8
+#usr/share/man/man8/vgmerge.8
+#usr/share/man/man8/vgmknodes.8
+#usr/share/man/man8/vgreduce.8
+#usr/share/man/man8/vgremove.8
+#usr/share/man/man8/vgrename.8
+#usr/share/man/man8/vgs.8
+#usr/share/man/man8/vgscan.8
+#usr/share/man/man8/vgsplit.8

diff --git a/config/rootfiles/common/multipath-tools b/config/rootfiles/common/multipath-tools
new file mode 100644 (file)
index 0000000..b889621
--- /dev/null
+++ b/config/rootfiles/common/multipath-tools
@@ -0,0 +1,4 @@
+#etc/udev/rules.d/kpartx.rules
+#lib/udev/kpartx_id
+#sbin/kpartx
+#usr/share/man/man8/kpartx.8.gz

diff --git a/lfs/lvm2 b/lfs/lvm2
new file mode 100644 (file)
index 0000000..6314db0
--- /dev/null
+++ b/lfs/lvm2
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.02.95
+
+THISAPP    = LVM2.$(VER)
+DL_FILE    = $(THISAPP).tgz
+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 = bd470a802046c807603618a443732ea7
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# 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 axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && \
+               ./configure \
+                       --prefix=/usr \
+                       --with-usrlibdir=/usr/lib \
+                       --enable-pkgconfig
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/lfs/multipath-tools b/lfs/multipath-tools
new file mode 100644 (file)
index 0000000..ac00e2b
--- /dev/null
+++ b/lfs/multipath-tools
@@ -0,0 +1,79 @@
+###############################################################################
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 120613
+
+THISAPP    = multipath-tools-$(VER)
+DL_FILE    = $(THISAPP).tgz
+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 = 84632b08dbca9fa04179edd8c469c92a
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# 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 axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP)/kpartx && make $(MAKETUNING)
+       cd $(DIR_APP)/kpartx && make install PREFIX=/usr
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index e16e51b95f1bd6f2aa93e92e6b6f8d53f1ea72fe..b55bbdb857f00a01536fe05b5c603f073f2d8ea2 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -376,7 +376,6 @@ buildbase() {
     lfsmake2 vim
     lfsmake2 xz
     lfsmake2 paxctl
-    lfsmake2 grub
 }
 
 buildipfire() {
@@ -400,6 +399,9 @@ buildipfire() {
   ipfiremake cpio
   ipfiremake mdadm
   ipfiremake dracut
+  ipfiremake lvm2
+  ipfiremake multipath-tools
+  ipfiremake grub
 
   case "${TARGET_ARCH}" in
        i586)