Skip to content
This repository was archived by the owner on Jan 16, 2024. It is now read-only.

Commit 6c1ff12

Browse files
committed
F one-infra#39: Add weak dependency support
New variable RECOMMENDS can be used as a weak dependency list on rpm and deb based distros. The package open-vm-tools is moved to RECOMMENDS on el7 and el8 due to the absence of arm64 version of these packages in RH distros. Signed-off-by: Petr Ospalý <pospaly@opennebula.io>
1 parent 72b895d commit 6c1ff12

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

generate.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ else
198198
--rpm-os linux \
199199
--rpm-summary "${SUMMARY}" \
200200
${DEPENDS:+ --depends ${DEPENDS// / --depends }} \
201+
${RECOMMENDS:+ --rpm-tag Recommends:${RECOMMENDS// / --rpm-tag Recommends:}} \
202+
${RECOMMENDS:+ --deb-recommends ${RECOMMENDS// / --deb-recommends }} \
201203
${REPLACES:+ --replaces ${REPLACES// / --replaces }} \
202204
${CONFLICTS:+ --conflicts ${CONFLICTS// / --conflicts }} \
203205
${PROVIDES:+ --provides ${PROVIDES// / --provides }} \

targets.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ case "${TARGET}" in
5353
RELSUFFIX=${RELSUFFIX:-.el7}
5454
TYPE=${TYPE:-rpm}
5555
TAGS=${TAGS:-linux rpm systemd one network-scripts}
56-
DEPENDS=${DEPENDS:-util-linux bash curl bind-utils cloud-utils-growpart parted ruby rubygem-json sudo shadow-utils openssh-server open-vm-tools qemu-guest-agent gawk virt-what}
56+
DEPENDS=${DEPENDS:-util-linux bash curl bind-utils cloud-utils-growpart parted ruby rubygem-json sudo shadow-utils openssh-server qemu-guest-agent gawk virt-what}
57+
RECOMMENDS=${RECOMMENDS:-open-vm-tools}
5758
PROVIDES=${PROVIDES:-}
5859
REPLACES=${REPLACES:-cloud-init}
5960
CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}
@@ -68,7 +69,8 @@ case "${TARGET}" in
6869
RELSUFFIX=${RELSUFFIX:-.el8}
6970
TYPE=${TYPE:-rpm}
7071
TAGS=${TAGS:-linux rpm systemd one network-scripts}
71-
DEPENDS=${DEPENDS:-util-linux bash curl bind-utils cloud-utils-growpart parted ruby rubygem-json sudo shadow-utils openssh-server open-vm-tools qemu-guest-agent network-scripts gawk virt-what}
72+
DEPENDS=${DEPENDS:-util-linux bash curl bind-utils cloud-utils-growpart parted ruby rubygem-json sudo shadow-utils openssh-server qemu-guest-agent network-scripts gawk virt-what}
73+
RECOMMENDS=${RECOMMENDS:-open-vm-tools}
7274
PROVIDES=${PROVIDES:-}
7375
REPLACES=${REPLACES:-cloud-init}
7476
CONFLICTS=${CONFLICTS:-${REPLACES} one-context-ec2}

0 commit comments

Comments
 (0)