mbr: Remove package, which is not needed any more.
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Sep 2013 23:45:13 +0000 (01:45 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Sep 2013 23:45:13 +0000 (01:45 +0200)
This package was needed to add the MBR to flash images,
which are not available in IPFire 2.15 any more.

config/rootfiles/common/mbr [deleted file]
lfs/mbr [deleted file]
make.sh

diff --git a/config/rootfiles/common/mbr b/config/rootfiles/common/mbr
deleted file mode 100644 (file)
index 231e27d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#usr/sbin/install-mbr
-#usr/share/man/man8/install-mbr.8
diff --git a/lfs/mbr b/lfs/mbr
deleted file mode 100644 (file)
index c43f2fd..0000000
--- a/lfs/mbr
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-#                                                                             #
-# 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        = 1.1.11
-
-THISAPP    = mbr-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 4e406ded185f94c2d2bf5fc793ac1842
-
-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
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
-       @rm -rf $(DIR_APP)
-       @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 2b3be10dbc25fc1f1a670aa4dc5e5e5a266e97e2..2ada02880296d8196dc16fe55b7386635826ccc2 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -801,7 +801,6 @@ buildinstaller() {
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   ipfiremake as86
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   ipfiremake as86
-  ipfiremake mbr
   ipfiremake memtest
   ipfiremake installer
   installmake strip
   ipfiremake memtest
   ipfiremake installer
   installmake strip