From 18e0a2f32525e5092be322272e7bf9296f050584 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 1 Jul 2013 16:50:08 +0200 Subject: Debranding live sources. --- scripts/build/source | 2 +- scripts/build/source_checksums | 2 +- scripts/build/source_debian-live | 62 ---------------------------------------- scripts/build/source_live | 62 ++++++++++++++++++++++++++++++++++++++++ scripts/build/source_tar | 12 ++++---- 5 files changed, 70 insertions(+), 70 deletions(-) delete mode 100755 scripts/build/source_debian-live create mode 100755 scripts/build/source_live (limited to 'scripts') diff --git a/scripts/build/source b/scripts/build/source index 9866312d1..4d4e9f0e1 100755 --- a/scripts/build/source +++ b/scripts/build/source @@ -48,7 +48,7 @@ lb chroot_hostname install ${@} lb chroot_archives source install ${@} # Preparing images -lb source_debian-live ${@} +lb source_live ${@} lb source_debian ${@} lb source_disk ${@} lb source_hooks ${@} diff --git a/scripts/build/source_checksums b/scripts/build/source_checksums index 96e10e5ea..e3a222aa8 100755 --- a/scripts/build/source_checksums +++ b/scripts/build/source_checksums @@ -41,7 +41,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -for DIRECTORY in source/debian source/debian-live +for DIRECTORY in source/debian source/live do if [ ! -d ${DIRECTORY} ] then diff --git a/scripts/build/source_debian-live b/scripts/build/source_debian-live deleted file mode 100755 index 90c9216a8..000000000 --- a/scripts/build/source_debian-live +++ /dev/null @@ -1,62 +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 debian-live config into source')" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -# Reading configuration files -Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source -Set_defaults - -if [ "${LB_SOURCE}" != "true" ] -then - exit 0 -fi - -Echo_message "Begin copying live-build configuration..." - -# Requiring stage file -Require_stagefile .build/config .build/bootstrap - -# Checking stage file -Check_stagefile .build/source_debian-live - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -# Remove old sources -if [ -d source/debian-live ] -then - rm -rf source/debian-live -fi - -# Copy system configuration -mkdir -p source/debian-live -cp -a config source/debian-live - -if Find_files auto/* -then - cp -a auto source/debian-live -fi - -# Creating stage file -Create_stagefile .build/source_debian-live diff --git a/scripts/build/source_live b/scripts/build/source_live new file mode 100755 index 000000000..d833a5dab --- /dev/null +++ b/scripts/build/source_live @@ -0,0 +1,62 @@ +#!/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 live config into source')" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +# Reading configuration files +Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source +Set_defaults + +if [ "${LB_SOURCE}" != "true" ] +then + exit 0 +fi + +Echo_message "Begin copying live-build configuration..." + +# Requiring stage file +Require_stagefile .build/config .build/bootstrap + +# Checking stage file +Check_stagefile .build/source_live + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +# Remove old sources +if [ -d source/live ] +then + rm -rf source/live +fi + +# Copy system configuration +mkdir -p source/live +cp -a config source/live + +if Find_files auto/* +then + cp -a auto source/live +fi + +# Creating stage file +Create_stagefile .build/source_live diff --git a/scripts/build/source_tar b/scripts/build/source_tar index 9113f22a9..88410058c 100755 --- a/scripts/build/source_tar +++ b/scripts/build/source_tar @@ -51,30 +51,30 @@ Create_lockfile .lock # Remove old source rm -f ${LIVE_IMAGE_NAME}-source.debian.tar.bz2 ${LIVE_IMAGE_NAME}-source.debian.tar.gz ${LIVE_IMAGE_NAME}-source.debian.tar.lz ${LIVE_IMAGE_NAME}-source.debian.tar -rm -f ${LIVE_IMAGE_NAME}-source.debian-live.tar.bz2 ${LIVE_IMAGE_NAME}-source.debian-live.tar.gz ${LIVE_IMAGE_NAME}-source.debian-live.tar.lz ${LIVE_IMAGE_NAME}-source.debian-live.tar +rm -f ${LIVE_IMAGE_NAME}-source.live.tar.bz2 ${LIVE_IMAGE_NAME}-source.live.tar.gz ${LIVE_IMAGE_NAME}-source.live.tar.lz ${LIVE_IMAGE_NAME}-source.live.tar tar cf ${LIVE_IMAGE_NAME}-source.debian.tar source/debian -tar cf ${LIVE_IMAGE_NAME}-source.debian-live.tar source/debian-live +tar cf ${LIVE_IMAGE_NAME}-source.live.tar source/live case "${LB_COMPRESSION}" in bzip2) bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian.tar - bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian-live.tar + bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-source.live.tar ;; gzip) gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian.tar - gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian-live.tar + gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-source.live.tar ;; lzip) lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian.tar - lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian-live.tar + lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-source.live.tar ;; xz) xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian.tar - xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-source.debian-live.tar + xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-source.live.tar ;; none) -- cgit v1.2.3