From 786fab26f047b3a0d6f6f2ebd8e7f3112c01c0bb Mon Sep 17 00:00:00 2001 From: Maciej Kisielewski Date: Wed, 16 Oct 2024 15:19:43 +0200 Subject: [PATCH] simplify the RPM specification file The rpms-* files all started with lines beginning with '#' which would suggest a unix-script-style comment, but when the '#' was applied as an inline comment, the install-rpms script treated that as part of the package name, breaking it. Having those comments also meant that they have to be stripped when processing. This patch moves the content of those comments to a standalone README, simplifying the sytnax of the file so it can be used as-is in the install-rpms script. --- bootstrap/install-rpms/README.md | 19 +++++++++++++++++++ bootstrap/install-rpms/rpms-build | 3 --- bootstrap/install-rpms/rpms-common | 3 --- bootstrap/install-rpms/rpms-devel | 3 --- 4 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 bootstrap/install-rpms/README.md diff --git a/bootstrap/install-rpms/README.md b/bootstrap/install-rpms/README.md new file mode 100644 index 0000000..1b5402f --- /dev/null +++ b/bootstrap/install-rpms/README.md @@ -0,0 +1,19 @@ +# Bootstrapping - RPM installation + +This directory contains all the files required to install necessary RPMs when +building the image. + +In the files with RPM list use a path specification for local rpm, otherwise +it'll be installed from one of the repos used for bootstrapping. + +* `rpms-build` + + Specifies extra rpms to be installed in the build base-image. + +* `rpms-common` + + Specifies common rpms to be installed in all base-images + +* `rpms-devel` + + Specifies extra rpms to be installed in the devel base-image diff --git a/bootstrap/install-rpms/rpms-build b/bootstrap/install-rpms/rpms-build index 461c7b3..55ff873 100644 --- a/bootstrap/install-rpms/rpms-build +++ b/bootstrap/install-rpms/rpms-build @@ -1,4 +1 @@ -# Specify extra rpms to be installed in the build base-image. -# Use a path specification for local rpm, otherwise it'll be installed -# from one of the repos used for bootstrapping. /RPMS/eext-repos-build.rpm diff --git a/bootstrap/install-rpms/rpms-common b/bootstrap/install-rpms/rpms-common index b1f9fe0..fb19476 100644 --- a/bootstrap/install-rpms/rpms-common +++ b/bootstrap/install-rpms/rpms-common @@ -1,6 +1,3 @@ -# Specify common rpms to be installed in all base-images -# Use a path specification for local rpm, otherwise it'll be installed -# from one of the repos used for bootstrapping. autoconf automake coreutils diff --git a/bootstrap/install-rpms/rpms-devel b/bootstrap/install-rpms/rpms-devel index 0a5c7a1..93de7d3 100644 --- a/bootstrap/install-rpms/rpms-devel +++ b/bootstrap/install-rpms/rpms-devel @@ -1,6 +1,3 @@ -# Specify extra rpms to be installed in the devel base-image -# Use a path specification for local rpm, otherwise it'll be installed -# from one of the repos used for bootstrapping. /RPMS/eext-repos-devel.rpm golang sudo