From a27e3d6b2a2ac5febb61d874ee5acfcacf100325 Mon Sep 17 00:00:00 2001 From: Christopher Spinrath <christopher.spinrath@rwth-aachen.de> Date: Sun, 1 Mar 2015 15:15:09 +0100 Subject: [PATCH] Delete the bash implementation of patch_all Since all users are converted to the Makefile version, this is safe. --- scripts/common_functions.sh | 23 ----------------------- scripts/fill_offline_repo.sh | 2 +- scripts/remaster_rootfs.sh | 2 +- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/scripts/common_functions.sh b/scripts/common_functions.sh index 0e60658..615a5aa 100644 --- a/scripts/common_functions.sh +++ b/scripts/common_functions.sh @@ -17,29 +17,6 @@ # You should have received a copy of the GNU General Public License # along with lipck. If not, see <http://www.gnu.org/licenses/>. -function patch_all() -{ - PATCH_DIR="$1" - TARGET_DIR="$2" - - if [ ! -d "$PATCH_DIR" ]; then - echo "Nothing to patch here!" - return 0 - fi - - if [ -z "$TARGET_DIR" ]; then - echo "No target directory given, assuming /" - TARGET_DIR="/" - fi - - echo "Patching $TARGET_DIR ..." - for p in "$PATCH_DIR/"* - do - cat "$p" | patch -d "$TARGET_DIR" -p1 - done - echo "done." -} - function install_debs() { DEB_DIR="$1" diff --git a/scripts/fill_offline_repo.sh b/scripts/fill_offline_repo.sh index 408ac6d..fc99461 100755 --- a/scripts/fill_offline_repo.sh +++ b/scripts/fill_offline_repo.sh @@ -30,7 +30,7 @@ test -n "$ARCH" || { echo "$(basename $0): fatal error: no architecture specifi echo echo "==> Fetching packages for offline repository for $ARCH" -#source common functions (e.g. patch_all) +#source common functions if [ -e "$SCRIPT_DIR/scripts/common_functions.sh" ]; then source "$SCRIPT_DIR/scripts/common_functions.sh" fi diff --git a/scripts/remaster_rootfs.sh b/scripts/remaster_rootfs.sh index 0db9063..f5c1bb4 100755 --- a/scripts/remaster_rootfs.sh +++ b/scripts/remaster_rootfs.sh @@ -23,7 +23,7 @@ set -e SCRIPT_DIR="/remaster" CONTRIB_DIR="$SCRIPT_DIR/contrib/" -#source common functions (e.g. patch_all) +#source common functions if [ -e "$SCRIPT_DIR/scripts/common_functions.sh" ]; then source "$SCRIPT_DIR/scripts/common_functions.sh" fi -- GitLab