Skip to content

Commit

Permalink
simplify the RPM specification file
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mkisielewski-arista committed Oct 16, 2024
1 parent 4b0cbae commit 786fab2
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 9 deletions.
19 changes: 19 additions & 0 deletions bootstrap/install-rpms/README.md
Original file line number Diff line number Diff line change
@@ -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
3 changes: 0 additions & 3 deletions bootstrap/install-rpms/rpms-build
Original file line number Diff line number Diff line change
@@ -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
3 changes: 0 additions & 3 deletions bootstrap/install-rpms/rpms-common
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions bootstrap/install-rpms/rpms-devel
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 786fab2

Please sign in to comment.