8000 [BACKPORT] SPEC: Add extra guard for RPM build on Fedora by SchoolGuy · Pull Request #3585 · cobbler/cobbler · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[BACKPORT] SPEC: Add extra guard for RPM build on Fedora #3585

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

Merged
merged 1 commit into from
Feb 10, 2024
Merged

[BACKPORT] SPEC: Add extra guard for RPM build on Fedora #3585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Empty file added changelog.d/3584.fixed
View file
Open in desktop
Empty file.
8 changes: 8 additions & 0 deletions cobbler.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,11 @@ sed -e "s|/var/lib/tftpboot|%{tftpboot_dir}|g" -i config/cobbler/settings.yaml
%endif

%build
%if 0%{?fedora} || 0%{?rhel}
. distro_build_configs.sh FEDORA
%else
. distro_build_configs.sh
%endif

# Check distro specific variables for consistency
[ "${DOCPATH}" != %{_mandir} ] && echo "ERROR: DOCPATH: ${DOCPATH} does not match %{_mandir}"
Expand All @@ -318,7 +322,11 @@ sed -e "s|/var/lib/tftpboot|%{tftpboot_dir}|g" -i config/cobbler/settings.yaml
make man

%install
%if 0%{?fedora} || 0%{?rhel}
. distro_build_configs.sh FEDORA
%else
. distro_build_configs.sh
%endif
%py3_install

# cobbler
Expand Down
2 changes: 1 addition & 1 deletion distro_build_configs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export SYSLINUX_DIR="/usr/share/syslinux"
export GRUB_MOD_FOLDER="/usr/share/grub2"

# First parameter is DISTRO if provided
[ $# -ge 2 ] && DISTRO="$1"
[ $# -ge 1 ] && DISTRO="$1"

if [ "$DISTRO" = "" ] && [ -r /etc/os-release ];then
source /etc/os-release
Expand Down
0