summaryrefslogtreecommitdiff
path: root/scripts/build
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/build')
-rwxr-xr-xscripts/build/lb_binary_local-hooks4
-rwxr-xr-xscripts/build/lb_chroot_local-hooks4
-rwxr-xr-xscripts/build/lb_config3
3 files changed, 5 insertions, 6 deletions
diff --git a/scripts/build/lb_binary_local-hooks b/scripts/build/lb_binary_local-hooks
index e3c08c292..f9a8f61a3 100755
--- a/scripts/build/lb_binary_local-hooks
+++ b/scripts/build/lb_binary_local-hooks
@@ -39,9 +39,9 @@ Check_lockfile .lock
Create_lockfile .lock
# Processing local-hooks
-if Find_files config/binary_local-hooks/*
+if Find_files config/hooks/*.binary
then
- for HOOK in config/binary_local-hooks/*
+ for HOOK in config/hooks/*.binary
do
# Making hook executable
if [ ! -x "${HOOK}" ]
diff --git a/scripts/build/lb_chroot_local-hooks b/scripts/build/lb_chroot_local-hooks
index c6482c569..f7bc57468 100755
--- a/scripts/build/lb_chroot_local-hooks
+++ b/scripts/build/lb_chroot_local-hooks
@@ -39,12 +39,12 @@ Check_lockfile .lock
Create_lockfile .lock
# Processing local-hooks
-if Find_files config/chroot_local-hooks/*
+if Find_files config/hooks/*.chroot
then
# Restoring cache
Restore_cache cache/packages_chroot
- for HOOK in config/chroot_local-hooks/*
+ for HOOK in config/hooks/*.chroot
do
# Copying hook
cp "${HOOK}" chroot/root
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index ad144aa3b..0e478a30f 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -1150,7 +1150,7 @@ EOF
# Creating lb_chroot_* configuration
mkdir -p config/archives
mkdir -p config/chroot_apt
-mkdir -p config/chroot_local-hooks
+mkdir -p config/hooks
mkdir -p config/chroot_local-includes
mkdir -p config/chroot_local-patches
mkdir -p config/chroot_packages
@@ -1223,7 +1223,6 @@ mkdir -p config/binary_debian-installer
mkdir -p config/binary_debian-installer-includes
mkdir -p config/binary_grub
mkdir -p config/binary_local-debs
-mkdir -p config/binary_local-hooks
mkdir -p config/binary_local-includes
mkdir -p config/package-lists
mkdir -p config/binary_local-udebs