From 2fecd44890c07aee209b82945b378dddf879f466 Mon Sep 17 00:00:00 2001 From: Robert C Jennings Date: Thu, 2 May 2019 17:15:12 -0500 Subject: [PATCH] ubuntu-cpc: Allow comments in series files and add comments The addition of disk-image to series files in a prior commit required some explanation. Without comment support in series files that was not possible. This patch adds support for comments and adds those comments as well. --- live-build/ubuntu-cpc/hooks.d/base/series/root-dir | 1 + live-build/ubuntu-cpc/hooks.d/base/series/squashfs | 1 + live-build/ubuntu-cpc/hooks.d/base/series/tarball | 1 + live-build/ubuntu-cpc/hooks.d/make-hooks | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/root-dir b/live-build/ubuntu-cpc/hooks.d/base/series/root-dir index 32a02423..b41635af 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/root-dir +++ b/live-build/ubuntu-cpc/hooks.d/base/series/root-dir @@ -1,2 +1,3 @@ +# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent depends disk-image base/create-root-dir.binary diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/squashfs b/live-build/ubuntu-cpc/hooks.d/base/series/squashfs index aee4ce40..6d2cb910 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/squashfs +++ b/live-build/ubuntu-cpc/hooks.d/base/series/squashfs @@ -1,3 +1,4 @@ +# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent depends disk-image depends root-dir base/root-squashfs.binary diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/tarball b/live-build/ubuntu-cpc/hooks.d/base/series/tarball index b0634f47..184046c2 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/tarball +++ b/live-build/ubuntu-cpc/hooks.d/base/series/tarball @@ -1,3 +1,4 @@ +# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent depends disk-image depends root-dir base/root-xz.binary diff --git a/live-build/ubuntu-cpc/hooks.d/make-hooks b/live-build/ubuntu-cpc/hooks.d/make-hooks index 7796be3d..08ae45be 100755 --- a/live-build/ubuntu-cpc/hooks.d/make-hooks +++ b/live-build/ubuntu-cpc/hooks.d/make-hooks @@ -161,7 +161,7 @@ class MakeHooks: with open(series_file, "r", encoding="utf-8") as fp: for line in fp: line = line.strip() - if not line: + if not line or line.startswith("#"): continue m = re.match(r"^\s*depends\s+(\S+.*)$", line) if m: