-
Notifications
You must be signed in to change notification settings - Fork 152
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Makefiles: Use conditional installs to avoid duplications
Previously some of the packages in the Makefiles were installed with ignoring the exit code. In case there were the either or condition, the second package might have been installed as well, even though it wasn't necessary. This patch changes this by making it conditional, to install the second package only if the first one failed. Signed-off-by: Vinzenz Feenstra <[email protected]>
- Loading branch information
Showing
4 changed files
with
4 additions
and
12 deletions.
There are no files selected for viewing
4 changes: 1 addition & 3 deletions
4
repos/system_upgrade/common/actors/selinux/selinuxapplycustom/Makefile
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,5 +1,3 @@ | ||
install-deps: | ||
yum install -y policycoreutils | ||
-yum install -y policycoreutils-python | ||
-yum install -y python3-policycoreutils | ||
yum install -y policycoreutils policycoreutils-python || yum install -y policycoreutils python3-policycoreutils | ||
|
4 changes: 1 addition & 3 deletions
4
repos/system_upgrade/common/actors/selinux/selinuxcontentscanner/Makefile
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,2 @@ | ||
install-deps: | ||
yum install -y policycoreutils | ||
-yum install -y policycoreutils-python | ||
-yum install -y python3-policycoreutils | ||
yum install -y policycoreutils policycoreutils-python || yum install -y policycoreutils python3-policycoreutils |
4 changes: 1 addition & 3 deletions
4
repos/system_upgrade/common/actors/selinux/selinuxprepare/Makefile
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,2 @@ | ||
install-deps: | ||
yum install -y policycoreutils | ||
-yum install -y policycoreutils-python | ||
-yum install -y python3-policycoreutils | ||
yum install -y policycoreutils policycoreutils-python || yum install -y policycoreutils python3-policycoreutils |
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,5 +1,3 @@ | ||
install-deps: | ||
yum install -y kmod procps-ng policycoreutils findutils | ||
-yum install -y libselinux-python | ||
-yum install -y python3-libselinux | ||
yum install -y kmod procps-ng policycoreutils findutils libselinux-python || yum install -y kmod procps-ng policycoreutils findutils python3-libselinux | ||
|