diff options
author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-07-31 17:12:06 +0100 |
---|---|---|
committer | Chris Lamb <chris@chris-lamb.co.uk> | 2008-07-31 17:12:06 +0100 |
commit | 04b07370873d7923cf9b4b5f55d2eb1746d85b31 (patch) | |
tree | b5f4679c97ecafa77f91e08f8c830202d7c8f8f6 | |
parent | 3199a409fade444b1aecc2c6e3a87b8bd54429e0 (diff) | |
download | vyos-live-build-04b07370873d7923cf9b4b5f55d2eb1746d85b31.tar.gz vyos-live-build-04b07370873d7923cf9b4b5f55d2eb1746d85b31.zip |
Add lh_chroot_local-patches helper to apply local patches against chroot.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
-rwxr-xr-x | helpers/lh_chroot | 1 | ||||
-rwxr-xr-x | helpers/lh_chroot_local-patches | 70 | ||||
-rwxr-xr-x | helpers/lh_config | 1 |
3 files changed, 72 insertions, 0 deletions
diff --git a/helpers/lh_chroot b/helpers/lh_chroot index 7dee5b3ba..7a527be7c 100755 --- a/helpers/lh_chroot +++ b/helpers/lh_chroot @@ -54,6 +54,7 @@ lh_chroot_local-packages ${*} lh_chroot_install-packages ${*} lh_chroot_localization ${*} lh_chroot_local-includes ${*} +lh_chroot_local-patches ${*} lh_chroot_sysvinit ${*} lh_chroot_local-hooks ${*} lh_chroot_hooks ${*} diff --git a/helpers/lh_chroot_local-patches b/helpers/lh_chroot_local-patches new file mode 100755 index 000000000..caa618017 --- /dev/null +++ b/helpers/lh_chroot_local-patches @@ -0,0 +1,70 @@ +#!/bin/sh + +# lh_chroot_local-patches(1) - apply local patches against chroot +# Copyright (C) 2006-2008 Daniel Baumann <daniel@debian.org> +# +# live-helper 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 +LH_BASE="${LH_BASE:-/usr/share/live-helper}" + +for FUNCTION in "${LH_BASE}"/functions/*.sh +do + . "${FUNCTION}" +done + +# Setting static variables +DESCRIPTION="apply local patches against chroot" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +# Reading configuration files +Read_conffile config/all config/common config/bootstrap config/chroot config/binary config/source +Set_defaults + +Echo_message "Begin applying chroot local patches..." + +# Requiring stage file +Require_stagefile .stage/bootstrap + +# Checking stage file +Check_stagefile .stage/chroot_local-patches + +# Checking lock file +Check_lockfile .lock + +# Creating lock file +Create_lockfile .lock + +if ls -A config/chroot_local-patches/ | grep -qs . +then + # Restoring cache + Restore_cache cache/packages_chroot + + # Checking depends + Check_package chroot/usr/bin/patch patch + + # Installing depends + Install_package + + for PATCH in config/chroot_local-patches/* + do + Echo_message "Applying patch ${PATCH}..." + Chroot "patch -p1" < ${PATCH} + done + + # Removing depends + Remove_package + + # Saving cache + Save_cache cache/packages_chroot + + # Creating stage file + Create_stagefile .stage/chroot_local-patches +fi diff --git a/helpers/lh_config b/helpers/lh_config index 310c7caf3..3d09abaeb 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -874,6 +874,7 @@ EOF mkdir -p config/chroot_apt mkdir -p config/chroot_local-hooks mkdir -p config/chroot_local-includes +mkdir -p config/chroot_local-patches mkdir -p config/chroot_local-packages mkdir -p config/chroot_local-packageslists mkdir -p config/chroot_local-preseed |