-
Notifications
You must be signed in to change notification settings - Fork 40
Added rpm package as part of build #1149
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
0e5c922
993c3ea
f271bac
d9b16e5
5531b9b
9da910e
962d0b3
541aa2e
057745d
edb4824
2fa9f22
703956e
5eb36a2
c04a514
eacfd78
eb99671
36ee648
e7315bb
de65cc5
a5b764f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -335,6 +335,7 @@ Option: | |
| with the .rej extension. | ||
| -g, --get-source get the source and apply patch without building. | ||
| -gp, --generate-pax generate a pax.Z file based on the install contents. | ||
| -gr, --generate-rpm generate an RPM package from the pax archive. | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| -h, --help, -? print this information. | ||
| --no-set-active do not change the pinned version. | ||
| --no-install-deps do not install project's runtime dependencies. | ||
|
|
@@ -379,6 +380,7 @@ processOptions() | |
| buildEnvFile="./buildenv" | ||
| getSourceOnly=false | ||
| generatePax=false | ||
| generateRPM=false | ||
| setActive=true | ||
| signPax=false | ||
| forcePatchApply=false | ||
|
|
@@ -476,11 +478,16 @@ processOptions() | |
| "-gp" | "--generate-pax") | ||
| generatePax=true | ||
| ;; | ||
| "-gr" | "--generate-rpm") | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Severity: medium Other Locations
🤖 Was this useful? React with 👍 or 👎, or 🚀 if it prevented an incident/outage. |
||
| generateRPM=true | ||
| generatePax=true | ||
| ;; | ||
| "-s" | "--shell") | ||
| startShell=true | ||
| ;; | ||
| "-sp" | "--sign-pax") | ||
| signPax=true | ||
| generatePax=true | ||
| ;; | ||
| *) | ||
| printError "Unknown option ${1} specified" | ||
|
|
@@ -2310,7 +2317,25 @@ install() | |
| if ! runAndLog "${ZOPEN_PAX_CMD}"; then | ||
| printError "Could not generate pax \"${paxFileName}\"" | ||
| fi | ||
| fi | ||
|
|
||
| if ${generateRPM}; then | ||
| if [ -f "${paxFileName}" ]; then | ||
| printHeader "Generating RPM from ${ZOPEN_INSTALL_DIR}" | ||
| rpm_deps=$(echo "${ZOPEN_RUNTIME_DEPS}" | xargs -n1 | sort -u | xargs) | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Severity: medium 🤖 Was this useful? React with 👍 or 👎, or 🚀 if it prevented an incident/outage. |
||
| cmd="PATH=\"${ZOPEN_ROOTFS}/usr/local/bin:${PATH}\" \"${MYDIR}/zopen-pax2rpm\" \"${paxFileName}\" --summary \"${ZOPEN_NAME} package\" --build --buildroot \"${ZOPEN_ROOT}/rpmbuild\"" | ||
| if [ -n "${rpm_deps}" ]; then | ||
| cmd="${cmd} --requires \"${rpm_deps}\"" | ||
| fi | ||
| if ! runAndLog "${cmd}"; then | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Severity: medium 🤖 Was this useful? React with 👍 or 👎, or 🚀 if it prevented an incident/outage. |
||
| printError "Could not generate RPM from \"${paxFileName}\"" | ||
| fi | ||
| else | ||
| printError "Pax file ${paxFileName} not found. Ensure --generate-pax is also used." | ||
| fi | ||
| fi | ||
|
|
||
| if ${generatePax}; then | ||
| #TODO: Hack so that we can use coreutils md5sum without impacting builds | ||
| ZOPEN_DEPS="${ZOPEN_DEPS} coreutils jq" | ||
| if [ "${signPax}" = "true" ] && ( [ -z "${ZOPEN_GPG_SECRET_KEY_FILE}" ] || [ -z "${ZOPEN_GPG_SECRET_KEY_PASSPHRASE_FILE}" ] || [ -z "${ZOPEN_GPG_PUBLIC_KEY_FILE}" ] || [ ! -r "${ZOPEN_GPG_SECRET_KEY_FILE}" ] || [ ! -r "${ZOPEN_GPG_SECRET_KEY_PASSPHRASE_FILE}" ] || [ ! -r "${ZOPEN_GPG_PUBLIC_KEY_FILE}" ] ); then | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR also adds a top-level
zopen-buildfile that appears as a binary/empty file in the checkout; if it’s intended as an entrypoint wrapper, it may be an accidentally committed artifact or missing content.Severity: medium
🤖 Was this useful? React with 👍 or 👎, or 🚀 if it prevented an incident/outage.