From 1e04939721c282ee2c612d9ad06b8ba1e9aac06c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 4 Nov 2013 18:33:48 +0100 Subject: Rewriting binary_includes in python. --- scripts/build/binary | 2 +- scripts/build/binary_includes | 57 ------------------------------------------- 2 files changed, 1 insertion(+), 58 deletions(-) delete mode 100755 scripts/build/binary_includes (limited to 'scripts/build') diff --git a/scripts/build/binary b/scripts/build/binary index 4ecf38779..62d20d68f 100755 --- a/scripts/build/binary +++ b/scripts/build/binary @@ -67,7 +67,7 @@ lb binary_syslinux ${@} lb binary_disk ${@} lb binary_loadlin ${@} lb binary_win32-loader ${@} -lb binary_includes ${@} +lb binary-includes ${@} lb binary-hooks ${@} lb binary_checksums ${@} diff --git a/scripts/build/binary_includes b/scripts/build/binary_includes deleted file mode 100755 index e9c57b141..000000000 --- a/scripts/build/binary_includes +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2013 Daniel Baumann -## -## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -set -e - -# Including common functions -[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh - -# Setting static variables -DESCRIPTION="$(Echo 'copy files into binary')" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -# Reading configuration files -Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source -Set_defaults - -Echo_message "Begin copying binary includes..." - -# Requiring stage file -Require_stagefile .build/config .build/bootstrap - -# Checking stage file -Check_stagefile .build/includes.binary - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -if Find_files config/includes.binary/ -then - # Copying includes - cd config/includes.binary - find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/binary - cd "${OLDPWD}" - - # Removing symlinks - case "${LIVE_IMAGE_TYPE}" in - hdd*) - find binary -type l | xargs rm -f - ;; - esac - - # Creating stage file - Create_stagefile .build/binary_includes -fi -- cgit v1.2.3