From f2e2efcbbb6c84a121a916aed167398c27985e49 Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Tue, 30 Apr 2019 07:37:52 -0500 Subject: [PATCH] ubuntu-cpc: parallel builds: Re-organize hooks --- .../base/create-root-dir.binary} | 0 .../base/disk-image-ppc64el.binary} | 0 .../base/disk-image-uefi.binary} | 0 .../base/disk-image.binary} | 0 .../base}/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl | 0 .../base}/ovf/ubuntu-ova-v1-vmdk.tmpl | 0 .../base}/ovf/ubuntu-ovf-v1-img.tmpl | 0 .../base/qcow2-image.binary} | 0 .../{hooks => hooks.d/base}/raspi2/mkknlimg | 0 .../base/root-squashfs.binary} | 0 .../base/root-xz.binary} | 0 .../base/vagrant.binary} | 0 .../base/vmdk-image.binary} | 0 .../base/vmdk-ova-image.binary} | 0 .../base/wsl-gz.binary} | 0 .../chroot}/001-divert-sync.chroot_early | 0 .../chroot}/010-write-etc-ec2-version.chroot | 0 .../chroot}/020-pkg-configure.chroot | 0 .../chroot}/025-create-groups.chroot | 0 .../chroot}/052-ssh_authentication.chroot | 0 .../{hooks => hooks.d/chroot}/060-ipv6.chroot | 0 .../chroot}/061-open-iscsi.chroot | 0 .../{hooks => hooks.d/chroot}/099-cleanup.chroot | 0 .../chroot}/100-purge-grub-legacy-ec2-arm.chroot | 0 .../chroot}/999-cpc-fixes.chroot | 0 .../chroot}/999-undivert-sync.chroot | 0 live-build/ubuntu-cpc/hooks/999-extras.binary | 16 ---------------- 27 files changed, 16 deletions(-) rename live-build/ubuntu-cpc/{hooks/031-0-create-root-dir.binary => hooks.d/base/create-root-dir.binary} (100%) mode change 100644 => 100755 rename live-build/ubuntu-cpc/{hooks/034-disk-image-ppc64el.binary => hooks.d/base/disk-image-ppc64el.binary} (100%) rename live-build/ubuntu-cpc/{hooks/033-disk-image-uefi.binary => hooks.d/base/disk-image-uefi.binary} (100%) rename live-build/ubuntu-cpc/{hooks/032-disk-image.binary => hooks.d/base/disk-image.binary} (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/base}/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/base}/ovf/ubuntu-ova-v1-vmdk.tmpl (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/base}/ovf/ubuntu-ovf-v1-img.tmpl (100%) rename live-build/ubuntu-cpc/{hooks/040-qcow2-image.binary => hooks.d/base/qcow2-image.binary} (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/base}/raspi2/mkknlimg (100%) rename live-build/ubuntu-cpc/{hooks/031-2-root-squashfs.binary => hooks.d/base/root-squashfs.binary} (100%) mode change 100644 => 100755 rename live-build/ubuntu-cpc/{hooks/031-1-root-xz.binary => hooks.d/base/root-xz.binary} (100%) mode change 100644 => 100755 rename live-build/ubuntu-cpc/{hooks/042-vagrant.binary => hooks.d/base/vagrant.binary} (100%) rename live-build/ubuntu-cpc/{hooks/040-vmdk-image.binary => hooks.d/base/vmdk-image.binary} (100%) rename live-build/ubuntu-cpc/{hooks/041-vmdk-ova-image.binary => hooks.d/base/vmdk-ova-image.binary} (100%) rename live-build/ubuntu-cpc/{hooks/031-3-wsl-gz.binary => hooks.d/base/wsl-gz.binary} (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/chroot}/001-divert-sync.chroot_early (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/chroot}/010-write-etc-ec2-version.chroot (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/chroot}/020-pkg-configure.chroot (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/chroot}/025-create-groups.chroot (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/chroot}/052-ssh_authentication.chroot (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/chroot}/060-ipv6.chroot (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/chroot}/061-open-iscsi.chroot (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/chroot}/099-cleanup.chroot (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/chroot}/100-purge-grub-legacy-ec2-arm.chroot (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/chroot}/999-cpc-fixes.chroot (100%) rename live-build/ubuntu-cpc/{hooks => hooks.d/chroot}/999-undivert-sync.chroot (100%) delete mode 100755 live-build/ubuntu-cpc/hooks/999-extras.binary diff --git a/live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary b/live-build/ubuntu-cpc/hooks.d/base/create-root-dir.binary old mode 100644 new mode 100755 similarity index 100% rename from live-build/ubuntu-cpc/hooks/031-0-create-root-dir.binary rename to live-build/ubuntu-cpc/hooks.d/base/create-root-dir.binary diff --git a/live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary similarity index 100% rename from live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary rename to live-build/ubuntu-cpc/hooks.d/base/disk-image-ppc64el.binary diff --git a/live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary similarity index 100% rename from live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary rename to live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary diff --git a/live-build/ubuntu-cpc/hooks/032-disk-image.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary similarity index 100% rename from live-build/ubuntu-cpc/hooks/032-disk-image.binary rename to live-build/ubuntu-cpc/hooks.d/base/disk-image.binary diff --git a/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl b/live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl similarity index 100% rename from live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl rename to live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-cloudcfg-vmdk.tmpl diff --git a/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-vmdk.tmpl b/live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl similarity index 100% rename from live-build/ubuntu-cpc/hooks/ovf/ubuntu-ova-v1-vmdk.tmpl rename to live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ova-v1-vmdk.tmpl diff --git a/live-build/ubuntu-cpc/hooks/ovf/ubuntu-ovf-v1-img.tmpl b/live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ovf-v1-img.tmpl similarity index 100% rename from live-build/ubuntu-cpc/hooks/ovf/ubuntu-ovf-v1-img.tmpl rename to live-build/ubuntu-cpc/hooks.d/base/ovf/ubuntu-ovf-v1-img.tmpl diff --git a/live-build/ubuntu-cpc/hooks/040-qcow2-image.binary b/live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary similarity index 100% rename from live-build/ubuntu-cpc/hooks/040-qcow2-image.binary rename to live-build/ubuntu-cpc/hooks.d/base/qcow2-image.binary diff --git a/live-build/ubuntu-cpc/hooks/raspi2/mkknlimg b/live-build/ubuntu-cpc/hooks.d/base/raspi2/mkknlimg similarity index 100% rename from live-build/ubuntu-cpc/hooks/raspi2/mkknlimg rename to live-build/ubuntu-cpc/hooks.d/base/raspi2/mkknlimg diff --git a/live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary b/live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary old mode 100644 new mode 100755 similarity index 100% rename from live-build/ubuntu-cpc/hooks/031-2-root-squashfs.binary rename to live-build/ubuntu-cpc/hooks.d/base/root-squashfs.binary diff --git a/live-build/ubuntu-cpc/hooks/031-1-root-xz.binary b/live-build/ubuntu-cpc/hooks.d/base/root-xz.binary old mode 100644 new mode 100755 similarity index 100% rename from live-build/ubuntu-cpc/hooks/031-1-root-xz.binary rename to live-build/ubuntu-cpc/hooks.d/base/root-xz.binary diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary similarity index 100% rename from live-build/ubuntu-cpc/hooks/042-vagrant.binary rename to live-build/ubuntu-cpc/hooks.d/base/vagrant.binary diff --git a/live-build/ubuntu-cpc/hooks/040-vmdk-image.binary b/live-build/ubuntu-cpc/hooks.d/base/vmdk-image.binary similarity index 100% rename from live-build/ubuntu-cpc/hooks/040-vmdk-image.binary rename to live-build/ubuntu-cpc/hooks.d/base/vmdk-image.binary diff --git a/live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary b/live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary similarity index 100% rename from live-build/ubuntu-cpc/hooks/041-vmdk-ova-image.binary rename to live-build/ubuntu-cpc/hooks.d/base/vmdk-ova-image.binary diff --git a/live-build/ubuntu-cpc/hooks/031-3-wsl-gz.binary b/live-build/ubuntu-cpc/hooks.d/base/wsl-gz.binary similarity index 100% rename from live-build/ubuntu-cpc/hooks/031-3-wsl-gz.binary rename to live-build/ubuntu-cpc/hooks.d/base/wsl-gz.binary diff --git a/live-build/ubuntu-cpc/hooks/001-divert-sync.chroot_early b/live-build/ubuntu-cpc/hooks.d/chroot/001-divert-sync.chroot_early similarity index 100% rename from live-build/ubuntu-cpc/hooks/001-divert-sync.chroot_early rename to live-build/ubuntu-cpc/hooks.d/chroot/001-divert-sync.chroot_early diff --git a/live-build/ubuntu-cpc/hooks/010-write-etc-ec2-version.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/010-write-etc-ec2-version.chroot similarity index 100% rename from live-build/ubuntu-cpc/hooks/010-write-etc-ec2-version.chroot rename to live-build/ubuntu-cpc/hooks.d/chroot/010-write-etc-ec2-version.chroot diff --git a/live-build/ubuntu-cpc/hooks/020-pkg-configure.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/020-pkg-configure.chroot similarity index 100% rename from live-build/ubuntu-cpc/hooks/020-pkg-configure.chroot rename to live-build/ubuntu-cpc/hooks.d/chroot/020-pkg-configure.chroot diff --git a/live-build/ubuntu-cpc/hooks/025-create-groups.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/025-create-groups.chroot similarity index 100% rename from live-build/ubuntu-cpc/hooks/025-create-groups.chroot rename to live-build/ubuntu-cpc/hooks.d/chroot/025-create-groups.chroot diff --git a/live-build/ubuntu-cpc/hooks/052-ssh_authentication.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/052-ssh_authentication.chroot similarity index 100% rename from live-build/ubuntu-cpc/hooks/052-ssh_authentication.chroot rename to live-build/ubuntu-cpc/hooks.d/chroot/052-ssh_authentication.chroot diff --git a/live-build/ubuntu-cpc/hooks/060-ipv6.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/060-ipv6.chroot similarity index 100% rename from live-build/ubuntu-cpc/hooks/060-ipv6.chroot rename to live-build/ubuntu-cpc/hooks.d/chroot/060-ipv6.chroot diff --git a/live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/061-open-iscsi.chroot similarity index 100% rename from live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot rename to live-build/ubuntu-cpc/hooks.d/chroot/061-open-iscsi.chroot diff --git a/live-build/ubuntu-cpc/hooks/099-cleanup.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/099-cleanup.chroot similarity index 100% rename from live-build/ubuntu-cpc/hooks/099-cleanup.chroot rename to live-build/ubuntu-cpc/hooks.d/chroot/099-cleanup.chroot diff --git a/live-build/ubuntu-cpc/hooks/100-purge-grub-legacy-ec2-arm.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/100-purge-grub-legacy-ec2-arm.chroot similarity index 100% rename from live-build/ubuntu-cpc/hooks/100-purge-grub-legacy-ec2-arm.chroot rename to live-build/ubuntu-cpc/hooks.d/chroot/100-purge-grub-legacy-ec2-arm.chroot diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot similarity index 100% rename from live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot rename to live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot diff --git a/live-build/ubuntu-cpc/hooks/999-undivert-sync.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-undivert-sync.chroot similarity index 100% rename from live-build/ubuntu-cpc/hooks/999-undivert-sync.chroot rename to live-build/ubuntu-cpc/hooks.d/chroot/999-undivert-sync.chroot diff --git a/live-build/ubuntu-cpc/hooks/999-extras.binary b/live-build/ubuntu-cpc/hooks/999-extras.binary deleted file mode 100755 index 0d506ea4..00000000 --- a/live-build/ubuntu-cpc/hooks/999-extras.binary +++ /dev/null @@ -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}"