Skip to content

Adjusted rpm packaging for use in minimal container instances #2236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
craigcomstock wants to merge 3 commits into
base: master
Choose a base branch
from
+5 −3
Draft

Adjusted rpm packaging for use in minimal container instances #2236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01b4363
Added cfengine-nova-hub package requires for openssl command that is …
craigcomstock May 5, 2026
0316279
Added /usr/bin/hostname to Requires for redhat packages
craigcomstock May 5, 2026
8c6e84e
Added check for existence of chkconfig command before using it to add…
craigcomstock May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Requires: hostname
%if %{?rhel}%{!?rhel:0} >= 8
Recommends: gzip
%endif
Requires(pre): /usr/sbin/useradd, /usr/sbin/userdel, /usr/bin/getent
Requires(pre): /usr/sbin/useradd, /usr/sbin/userdel, /usr/bin/getent, /usr/bin/hostname
Requires(post): /usr/sbin/usermod, /bin/sed

# we require selinux-policy package version that matches or exceeds our build system version
Expand All @@ -35,6 +35,7 @@ Requires: selinux-policy >= @@SELINUX_POLICY_VERSION@@
%if %{?rhel}%{!?rhel:0} == 8
Requires: libssl.so.1.1()(64bit) libssl.so.1.1(OPENSSL_1_1_0)(64bit) libssl.so.1.1(OPENSSL_1_1_1)(64bit)
Requires: libcrypto.so.1.1()(64bit) libcrypto.so.1.1(OPENSSL_1_1_0)(64bit)
Requires: openssl
%endif

# We build against systems with the latest available dependencies such as OpenSSL.
Expand All @@ -44,6 +45,7 @@ Requires: libcrypto.so.1.1()(64bit) libcrypto.so.1.1(OPENSSL_1_1_0)(64bit)
%if %{?rhel}%{!?rhel:0} > 8
Requires: libcrypto.so.3()(64bit) libcrypto.so.3(OPENSSL_@@OPENSSL_VERSION@@)(64bit)
Requires: libssl.so.3()(64bit) libssl.so.3(OPENSSL_@@OPENSSL_VERSION@@)(64bit)
Requires: openssl
%endif

# cfbs/Build requires Python 3.5+ (not available on RHEL 6)
Expand Down
2 changes: 1 addition & 1 deletion packaging/common/cfengine-hub/postinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@ if ! is_upgrade; then
else
case "`os_type`" in
redhat)
chkconfig --add cfengine3
test -x /sbin/chkconfig && test -f /etc/init.d/cfengine3 && chkconfig --add cfengine3
;;
debian)
update-rc.d cfengine3 defaults
Expand Down
2 changes: 1 addition & 1 deletion packaging/common/cfengine-non-hub/postinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ case `os_type` in
case `os_type` in
redhat)
if ! is_upgrade; then
chkconfig --add cfengine3
test -x /sbin/chkconfig && test -f /etc/init.d/cfengine3 && chkconfig --add cfengine3
fi
;;
debian)
Expand Down
Loading