-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
1 parent
4b0cbae
commit 786fab2
Showing
4 changed files
with
19 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |