[unstable][PATCH linux-signed 1/9] UBUNTU: [Packaging] generate-control: use stdin and stdout
Agathe Porte
agathe.porte at canonical.com
Tue Oct 8 09:01:24 UTC 2024
To allow for easier testing of the script, use stdin to read
debian/control.stub and stdout to write to debian/control.
Signed-off-by: Agathe Porte <agathe.porte at canonical.com>
---
debian/rules | 2 +-
debian/scripts/generate-control | 241 ++++++++++++++++----------------
2 files changed, 121 insertions(+), 122 deletions(-)
diff --git a/debian/rules b/debian/rules
index 236a129..1d8272a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ unsigned_ver = $(shell echo $(ver) | sed -e 's/+[0-9][0-9]*$$//')
# we have no binary files and we will not run the appropriate targets.
pre-clean:
rm -f debian/control
- ./debian/scripts/generate-control $(series) $(src) $(generate_src) $(ver) $(unsigned_src) $(unsigned_ver) $(abi)
+ ./debian/scripts/generate-control $(series) $(src) $(generate_src) $(ver) $(unsigned_src) $(unsigned_ver) $(abi) < debian/control.stub > debian/control
./debian/scripts/parameterise-ancillaries $(abi) $(generate_src)
rm -rf ./$(unsigned_ver) UNSIGNED SIGNED
rm -f debian/linux-image-*.install \
diff --git a/debian/scripts/generate-control b/debian/scripts/generate-control
index 1f38c58..05bd9e2 100755
--- a/debian/scripts/generate-control
+++ b/debian/scripts/generate-control
@@ -10,132 +10,131 @@ from config import Signing
signing = Signing.load("debian/package.config")
-with open("debian/control.stub") as tfd, open("debian/control", "w") as cfd:
- for line in tfd:
- line = line.replace("@SRCPKGNAME@", source_name)
- line = line.replace("@SERIES@", series)
- if "@DEPENDS@" in line:
- for flavour, archs in signing.flavour_archs:
- print(f' linux-image-unsigned-{abi_version}-{flavour} (= {unsigned_version}) [{" ".join(archs)}],', file=cfd)
- print(f' linux-buildinfo-{abi_version}-{flavour} (= {unsigned_version}) [{" ".join(archs)}],', file=cfd)
- # generate-only build-depends with a profile (activated by parameterise-ancillaries)
- uci_archs = set()
- for _, archs in signing.package_flavour_archs("cvm"):
- uci_archs.update(archs)
- for _, archs in signing.package_flavour_archs("uc"):
- uci_archs.update(archs)
- if uci_archs:
- print(f' ubuntu-core-initramfs [{" ".join(sorted(uci_archs))}] <pkg.linux-generate>,', file=cfd)
- print(f" {generate_name} (= {source_version}) <!pkg.linux-generate>,", file=cfd)
- for flavour, archs in signing.package_flavour_archs("extra"):
- # ubuntu-core-initramfs sometime needs extra modules https://bugs.launchpad.net/bugs/2032760
- print(f' linux-modules-extra-{abi_version}-{flavour} (= {unsigned_version}) [{" ".join(sorted(archs))}] <pkg.linux-generate>,', file=cfd)
- efi_archs = set()
- for (arch, flavour), (stype, binary) in signing.arch_flavour_data:
- if stype == 'efi':
- efi_archs.update([arch])
- if efi_archs:
- print(f' sbsigntool [{" ".join(sorted(efi_archs))}],', file=cfd)
- # For HMACs
- print(f" openssl,", file=cfd)
- else:
- print(line, end='', file=cfd)
+for line in sys.stdin.readlines():
+ line = line.replace("@SRCPKGNAME@", source_name)
+ line = line.replace("@SERIES@", series)
+ if "@DEPENDS@" in line:
+ for flavour, archs in signing.flavour_archs:
+ print(f' linux-image-unsigned-{abi_version}-{flavour} (= {unsigned_version}) [{" ".join(archs)}],')
+ print(f' linux-buildinfo-{abi_version}-{flavour} (= {unsigned_version}) [{" ".join(archs)}],')
+ # generate-only build-depends with a profile (activated by parameterise-ancillaries)
+ uci_archs = set()
+ for _, archs in signing.package_flavour_archs("cvm"):
+ uci_archs.update(archs)
+ for _, archs in signing.package_flavour_archs("uc"):
+ uci_archs.update(archs)
+ if uci_archs:
+ print(f' ubuntu-core-initramfs [{" ".join(sorted(uci_archs))}] <pkg.linux-generate>,')
+ print(f" {generate_name} (= {source_version}) <!pkg.linux-generate>,")
+ for flavour, archs in signing.package_flavour_archs("extra"):
+ # ubuntu-core-initramfs sometime needs extra modules https://bugs.launchpad.net/bugs/2032760
+ print(f' linux-modules-extra-{abi_version}-{flavour} (= {unsigned_version}) [{" ".join(sorted(archs))}] <pkg.linux-generate>,')
+ efi_archs = set()
+ for (arch, flavour), (stype, binary) in signing.arch_flavour_data:
+ if stype == 'efi':
+ efi_archs.update([arch])
+ if efi_archs:
+ print(f' sbsigntool [{" ".join(sorted(efi_archs))}],')
+ # For HMACs
+ print(f" openssl,")
+ else:
+ print(line, end='')
- for flavour, archs in signing.package_flavour_archs("image"):
- print(dedent(f"""\
+for flavour, archs in signing.package_flavour_archs("image"):
+ print(dedent(f"""\
- Package: linux-image-{abi_version}-{flavour}
- Architecture: {" ".join(archs)}
- Depends: ${{unsigned:Depends}}
- Recommends: ${{unsigned:Recommends}}
- Suggests: ${{unsigned:Suggests}}
- Conflicts: ${{unsigned:Conflicts}}
- Provides: ${{unsigned:Provides}}
- Built-Using: {unsigned_name} (= {unsigned_version})
- Description: Signed kernel image {flavour}
- A kernel image for {flavour}. This version of it is signed with
- Canonical's signing key.
- """).rstrip(), file=cfd)
- for flavour, archs in signing.package_flavour_archs("di"):
- print(dedent(f"""\
+ Package: linux-image-{abi_version}-{flavour}
+ Architecture: {" ".join(archs)}
+ Depends: ${{unsigned:Depends}}
+ Recommends: ${{unsigned:Recommends}}
+ Suggests: ${{unsigned:Suggests}}
+ Conflicts: ${{unsigned:Conflicts}}
+ Provides: ${{unsigned:Provides}}
+ Built-Using: {unsigned_name} (= {unsigned_version})
+ Description: Signed kernel image {flavour}
+ A kernel image for {flavour}. This version of it is signed with
+ Canonical's signing key.
+ """).rstrip())
+for flavour, archs in signing.package_flavour_archs("di"):
+ print(dedent(f"""\
- Package: kernel-signed-image-{abi_version}-{flavour}-di
- Package-Type: udeb
- Section: debian-installer
- Priority: extra
- Provides: kernel-signed-image
- Architecture: {" ".join(archs)}
- Built-Using: {unsigned_name} (= {unsigned_version})
- Description: Signed kernel image {flavour} for the Debian installer
- A kernel image for {flavour}. This version of it is signed with
- Canonical's UEFI signing key. It is intended for the Debian installer,
- it does _not_ provide a usable kernel for your full Debian system.
- """).rstrip(), file=cfd)
- for flavour, archs in signing.package_flavour_archs("hmac"):
- print(dedent(f"""\
+ Package: kernel-signed-image-{abi_version}-{flavour}-di
+ Package-Type: udeb
+ Section: debian-installer
+ Priority: extra
+ Provides: kernel-signed-image
+ Architecture: {" ".join(archs)}
+ Built-Using: {unsigned_name} (= {unsigned_version})
+ Description: Signed kernel image {flavour} for the Debian installer
+ A kernel image for {flavour}. This version of it is signed with
+ Canonical's UEFI signing key. It is intended for the Debian installer,
+ it does _not_ provide a usable kernel for your full Debian system.
+ """).rstrip())
+for flavour, archs in signing.package_flavour_archs("hmac"):
+ print(dedent(f"""\
- Package: linux-image-hmac-{abi_version}-{flavour}
- Build-Profiles: <!stage1>
- Architecture: {" ".join(archs)}
- Section: kernel
- Priority: optional
- Depends: ${{misc:Depends}}, ${{shlibs:Depends}}, linux-image-{abi_version}-{flavour}
- Suggests: fips-initramfs-generic
- Description: HMAC file for linux kernel image {abi_version}-{flavour}
- This package contains the HMAC file for Linux kernel image for version
- {abi_version}-{flavour}
- """).rstrip(), file=cfd)
- for flavour, archs in signing.package_flavour_archs("cvm"):
- # Mostly similar to image, but we don't have recommands nor conflicts
- print(dedent(f"""\
+ Package: linux-image-hmac-{abi_version}-{flavour}
+ Build-Profiles: <!stage1>
+ Architecture: {" ".join(archs)}
+ Section: kernel
+ Priority: optional
+ Depends: ${{misc:Depends}}, ${{shlibs:Depends}}, linux-image-{abi_version}-{flavour}
+ Suggests: fips-initramfs-generic
+ Description: HMAC file for linux kernel image {abi_version}-{flavour}
+ This package contains the HMAC file for Linux kernel image for version
+ {abi_version}-{flavour}
+ """).rstrip())
+for flavour, archs in signing.package_flavour_archs("cvm"):
+ # Mostly similar to image, but we don't have recommands nor conflicts
+ print(dedent(f"""\
- Package: linux-image-{abi_version}-{flavour}-fde
- Architecture: {" ".join(archs)}
- Depends: ${{unsigned:Depends}}
- Recommends: ${{cvm:Recommends}}
- Suggests: ${{unsigned:Suggests}}
- Conflicts: ${{cvm:Conflicts}}
- Provides: ${{unsigned:Provides}}
- Built-Using: {unsigned_name} (= {unsigned_version})
- Description: Signed kernel image {flavour} for CVM
- A kernel image for {flavour}. This version of it is signed with
- Canonical's signing key.
- """).rstrip(), file=cfd)
- for flavour, archs in signing.package_flavour_archs("uc"):
- depends = f"linux-modules-{abi_version}-{flavour}"
- for extra_flavour, extra_archs in signing.package_flavour_archs("extra"):
- if extra_flavour == flavour:
- depends += f", linux-modules-extra-{abi_version}-{flavour} [{' '.join(sorted(extra_archs))}]"
- # Mostly similar to image, but we don't have recommands nor conflicts
- print(dedent(f"""\
+ Package: linux-image-{abi_version}-{flavour}-fde
+ Architecture: {" ".join(archs)}
+ Depends: ${{unsigned:Depends}}
+ Recommends: ${{cvm:Recommends}}
+ Suggests: ${{unsigned:Suggests}}
+ Conflicts: ${{cvm:Conflicts}}
+ Provides: ${{unsigned:Provides}}
+ Built-Using: {unsigned_name} (= {unsigned_version})
+ Description: Signed kernel image {flavour} for CVM
+ A kernel image for {flavour}. This version of it is signed with
+ Canonical's signing key.
+ """).rstrip())
+for flavour, archs in signing.package_flavour_archs("uc"):
+ depends = f"linux-modules-{abi_version}-{flavour}"
+ for extra_flavour, extra_archs in signing.package_flavour_archs("extra"):
+ if extra_flavour == flavour:
+ depends += f", linux-modules-extra-{abi_version}-{flavour} [{' '.join(sorted(extra_archs))}]"
+ # Mostly similar to image, but we don't have recommands nor conflicts
+ print(dedent(f"""\
- Package: linux-image-uc-{abi_version}-{flavour}
- Architecture: {" ".join(archs)}
- Depends: {depends}
- Built-Using: {unsigned_name} (= {unsigned_version})
- Description: Signed kernel image {flavour} for Ubuntu Core
- A kernel image for {flavour}. This version of it is signed with
- Canonical's signing key.
- """).rstrip(), file=cfd)
- # XXX: all dbgsym packages _must_ be at the end of debian/control else the
- # build will hang forever on the builder.
- for flavour, archs in signing.package_flavour_archs("image"):
- print(dedent(f"""\
+ Package: linux-image-uc-{abi_version}-{flavour}
+ Architecture: {" ".join(archs)}
+ Depends: {depends}
+ Built-Using: {unsigned_name} (= {unsigned_version})
+ Description: Signed kernel image {flavour} for Ubuntu Core
+ A kernel image for {flavour}. This version of it is signed with
+ Canonical's signing key.
+ """).rstrip())
+# XXX: all dbgsym packages _must_ be at the end of debian/control else the
+# build will hang forever on the builder.
+for flavour, archs in signing.package_flavour_archs("image"):
+ print(dedent(f"""\
- Package: linux-image-{abi_version}-{flavour}-dbgsym
- Section: devel
- Architecture: {" ".join(archs)}
- Depends: linux-image-unsigned-{abi_version}-{flavour}-dbgsym
- Description: Signed kernel image {flavour}
- A link to the debugging symbols for the {flavour} signed kernel.
- """).rstrip(), file=cfd)
- for flavour, archs in signing.package_flavour_archs("cvm"):
- print(dedent(f"""\
+ Package: linux-image-{abi_version}-{flavour}-dbgsym
+ Section: devel
+ Architecture: {" ".join(archs)}
+ Depends: linux-image-unsigned-{abi_version}-{flavour}-dbgsym
+ Description: Signed kernel image {flavour}
+ A link to the debugging symbols for the {flavour} signed kernel.
+ """).rstrip())
+for flavour, archs in signing.package_flavour_archs("cvm"):
+ print(dedent(f"""\
- Package: linux-image-{abi_version}-{flavour}-fde-dbgsym
- Section: devel
- Architecture: {" ".join(archs)}
- Depends: linux-image-unsigned-{abi_version}-{flavour}-dbgsym
- Description: Signed kernel image {flavour} for CVM (debug)
- A link to the debugging symbols for the {flavour} signed kernel.
- """).rstrip(), file=cfd)
+ Package: linux-image-{abi_version}-{flavour}-fde-dbgsym
+ Section: devel
+ Architecture: {" ".join(archs)}
+ Depends: linux-image-unsigned-{abi_version}-{flavour}-dbgsym
+ Description: Signed kernel image {flavour} for CVM (debug)
+ A link to the debugging symbols for the {flavour} signed kernel.
+ """).rstrip())
--
2.45.2
More information about the kernel-team
mailing list