From: Michael Tremer Date: Wed, 13 Aug 2008 15:59:28 +0000 (+0000) Subject: Moved mkinitramfs to src/scripts. X-Git-Tag: v3.0-alpha1~769 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0803fc4bde7ceabda4afb8cc01ce9f8b940cd935;p=ipfire-3.x.git Moved mkinitramfs to src/scripts. Removed shell-wrapper. --- diff --git a/lfs/mkinitramfs b/lfs/mkinitramfs deleted file mode 100644 index ab402ae47..000000000 --- a/lfs/mkinitramfs +++ /dev/null @@ -1,50 +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 . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -PKG_NAME = mkinitramfs -VER = ipfire - -THISAPP = $(PKG_NAME)-$(VER) -DIR_APP = $(DIR_SOURCE)/$(PKG_NAME) - -TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -install : $(TARGET) - -download : - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : - @$(PREBUILD) - install -m 755 $(DIR_APP)/$(PKG_NAME) /sbin/$(PKG_NAME) - @$(POSTBUILD) diff --git a/lfs/scripts b/lfs/scripts index 25e44fb20..59db0957e 100644 --- a/lfs/scripts +++ b/lfs/scripts @@ -32,7 +32,7 @@ THISAPP = $(PKG_NAME)-$(VER) TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) BIN = readhash -SBIN = shell-wrapper +SBIN = mkinitramfs USR_BIN = py-compile setddns.pl vpn-watch USR_SBIN = diff --git a/make.sh b/make.sh index 3ef309770..9d9b3c544 100755 --- a/make.sh +++ b/make.sh @@ -344,7 +344,6 @@ misc_build() { ipfire_make syslinux ipfire_make busybox - ipfire_make mkinitramfs #ipfire_make squidguard ## CAN THIS BE BANISHED BY ANYTHING BETTER? #ipfire_make calamaris ## CAN THIS BE BANISHED BY ANYTHING BETTER? diff --git a/src/mkinitramfs/lsinitramfs b/src/mkinitramfs/lsinitramfs deleted file mode 100644 index 3b82ca1ce..000000000 --- a/src/mkinitramfs/lsinitramfs +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -[[ $# -eq 1 ]] || { echo "Usage: $(basename $0) " ; exit 1 ; } -[[ -f $1 ]] || { echo "$1 does not exist" ; exit 1 ; } - -echo "$1:" -echo "========================================================================" -zcat $1 | cpio --extract --verbose --quiet --list -echo "========================================================================" -zcat $1 | cpio --extract --verbose --quiet --to-stdout init -echo "========================================================================" diff --git a/src/rootfiles/core/02.scripts b/src/rootfiles/core/02.scripts index 8bd686cfb..e5ee5f7d8 100644 --- a/src/rootfiles/core/02.scripts +++ b/src/rootfiles/core/02.scripts @@ -1,5 +1,5 @@ bin/readhash -sbin/shell-wrapper +sbin/mkinitramfs usr/bin/py-compile usr/bin/setddns.pl usr/bin/vpn-watch diff --git a/src/mkinitramfs/mkinitramfs b/src/scripts/mkinitramfs similarity index 100% rename from src/mkinitramfs/mkinitramfs rename to src/scripts/mkinitramfs diff --git a/src/scripts/shell-wrapper b/src/scripts/shell-wrapper deleted file mode 100644 index 340da65a6..000000000 --- a/src/scripts/shell-wrapper +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2008 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 . # -# # -############################################################################### - -( ${@} )