ubuntu-cpc: parallel builds: Re-organize hooks

6 years ago · f2e2efcbbb
parent 5611a31a26
commit f2e2efcbbb
27 changed files with 0 additions and 16 deletions
--- a/live-build/ubuntu-cpc/hooks.d/base/create-root-dir.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/create-root-dir.binary
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary
--- a/live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl
+++ b/live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl
--- a/live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl
+++ b/live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl
--- a/live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ovf-v1-img.tmpl
+++ b/live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ovf-v1-img.tmpl
--- a/live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary
--- a/live-build/ubuntu-cpc/hooks.d/base/raspi2/mkknlimg
+++ b/live-build/ubuntu-cpc/hooks.d/base/raspi2/mkknlimg
--- a/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary
--- a/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary
--- a/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary
--- a/live-build/ubuntu-cpc/hooks.d/base/vmdk-image.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/vmdk-image.binary
--- a/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary
--- a/live-build/ubuntu-cpc/hooks.d/base/wsl-gz.binary
+++ b/live-build/ubuntu-cpc/hooks.d/base/wsl-gz.binary
--- a/live-build/ubuntu-cpc/hooks.d/chroot/001-divert-sync.chroot_early
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/001-divert-sync.chroot_early
--- a/live-build/ubuntu-cpc/hooks.d/chroot/010-write-etc-ec2-version.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/010-write-etc-ec2-version.chroot
--- a/live-build/ubuntu-cpc/hooks.d/chroot/020-pkg-configure.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/020-pkg-configure.chroot
--- a/live-build/ubuntu-cpc/hooks.d/chroot/025-create-groups.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/025-create-groups.chroot
--- a/live-build/ubuntu-cpc/hooks.d/chroot/052-ssh_authentication.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/052-ssh_authentication.chroot
--- a/live-build/ubuntu-cpc/hooks.d/chroot/060-ipv6.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/060-ipv6.chroot
--- a/live-build/ubuntu-cpc/hooks.d/chroot/061-open-iscsi.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/061-open-iscsi.chroot
--- a/live-build/ubuntu-cpc/hooks.d/chroot/099-cleanup.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/099-cleanup.chroot
--- a/live-build/ubuntu-cpc/hooks.d/chroot/100-purge-grub-legacy-ec2-arm.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/100-purge-grub-legacy-ec2-arm.chroot
--- a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
--- a/live-build/ubuntu-cpc/hooks.d/chroot/999-undivert-sync.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-undivert-sync.chroot
--- a/live-build/ubuntu-cpc/hooks/999-extras.binary
+++ b/live-build/ubuntu-cpc/hooks/999-extras.binary
@ -1,16 +0,0 @@
-#!/bin/bash
-# Execute extra binary hooks.
-
-my_dir=$(dirname $(readlink -f ${0}))
-extra_d=${my_dir}/extra
-
-if [ ! -d ${my_dir}/extra ]; then
-    exit 0
-fi
-
-export IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
-export CLOUD_IMG_STR="$IMAGE_STR"
-export FS_LABEL="cloudimg-rootfs"
-
-# Cleaner execution
-/bin/run-parts --exit-on-error --regex ".*\.binary" "${extra_d}"