Skip to content

[WIP] ... #3519

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
debarshiray wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[WIP] ... #3519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e29f6de
build, spec: Rename a build flag to match its purpose (part 1)
debarshiray Feb 25, 2025
5653f4c
build: Rename a build flag to match its purpose (part 2)
debarshiray Feb 25, 2025
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
18 changes: 9 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ OS_DIST ?= $(shell rpm --eval='%dist')
PYTHON_VER ?= $(shell $(PYTHON) -c 'import sys; print("python%s.%s" % sys.version_info[:2])')

ifeq ($(OS_DIST), debian)
PYTHON_SITELIB ?= $(PREFIX)/lib/$(PYTHON_VER)/site-packages
PYTHON_SITEARCH ?= $(PREFIX)/lib/$(PYTHON_VER)/site-packages
else
PYTHON_SITELIB ?= $(PREFIX)/lib64/$(PYTHON_VER)/site-packages
PYTHON_SITEARCH ?= $(PREFIX)/lib64/$(PYTHON_VER)/site-packages
endif
DNF_PLUGIN_PYTHON_SITELIB ?= $(PREFIX)/lib/$(PYTHON_VER)/site-packages
PYTHON_SITELIB ?= $(PREFIX)/lib/$(PYTHON_VER)/site-packages
# Note the underscore used instead of a hyphen
PYTHON_INST_DIR = $(PYTHON_SITELIB)/subscription_manager
PYTHON_INST_DIR = $(PYTHON_SITEARCH)/subscription_manager

# Where various bits of code live in the git repo
SRC_DIR := src/subscription_manager
Expand Down Expand Up @@ -159,14 +159,14 @@ install-plugins:

if [ "$(INSTALL_DNF_PLUGINS)" = "true" ] ; then \
echo "Installing DNF plugins" ; \
install -d $(DESTDIR)/$(DNF_PLUGIN_PYTHON_SITELIB)/dnf-plugins/ ; \
install -d $(DESTDIR)/$(PYTHON_SITELIB)/dnf-plugins/ ; \
install -d $(DESTDIR)/etc/dnf/plugins/ ; \
install -m 644 -p src/plugins/dnf/product_id.py \
$(DESTDIR)/$(DNF_PLUGIN_PYTHON_SITELIB)/dnf-plugins/product-id.py ; \
$(DESTDIR)/$(PYTHON_SITELIB)/dnf-plugins/product-id.py ; \
install -m 644 -p src/plugins/dnf/subscription_manager.py \
$(DESTDIR)/$(DNF_PLUGIN_PYTHON_SITELIB)/dnf-plugins/subscription-manager.py ; \
$(DESTDIR)/$(PYTHON_SITELIB)/dnf-plugins/subscription-manager.py ; \
install -m 644 -p src/plugins/dnf/upload_profile.py \
$(DESTDIR)/$(DNF_PLUGIN_PYTHON_SITELIB)/dnf-plugins/upload-profile.py ; \
$(DESTDIR)/$(PYTHON_SITELIB)/dnf-plugins/upload-profile.py ; \
install -m 644 etc-conf/plugin/product-id.conf $(DESTDIR)/etc/dnf/plugins/ ; \
install -m 644 etc-conf/plugin/subscription-manager.conf $(DESTDIR)/etc/dnf/plugins/ ; \
fi;
Expand Down Expand Up @@ -207,7 +207,7 @@ install-via-setup: install-subpackages-via-setup
mv $(DESTDIR)/$(PREFIX)/bin/rhsm-service $(DESTDIR)/$(LIBEXEC_DIR)/
mv $(DESTDIR)/$(PREFIX)/bin/rhsm-facts-service $(DESTDIR)/$(LIBEXEC_DIR)/
mv $(DESTDIR)/$(PREFIX)/bin/rhsm-package-profile-uploader $(DESTDIR)/$(LIBEXEC_DIR)/
find $(DESTDIR)/$(PYTHON_SITELIB) -name requires.txt -exec sed -i '/dbus-python/d' {} \;
find $(DESTDIR)/$(PYTHON_SITEARCH) -name requires.txt -exec sed -i '/dbus-python/d' {} \;


.PHONY: install-subpackages-via-setup
Expand Down
2 changes: 1 addition & 1 deletion subscription-manager.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ popd
%install
make -f Makefile install VERSION=%{version}-%{release} \
PYTHON=%{__python} PREFIX=%{_prefix} \
DESTDIR=%{buildroot} PYTHON_SITELIB=%{python_sitearch} \
DESTDIR=%{buildroot} PYTHON_SITEARCH=%{python_sitearch} \
OS_VERSION=%{?fedora}%{?rhel}%{?suse_version} OS_DIST=%{dist} \
COMPLETION_DIR=%{completion_dir} \
RUN_DIR=%{run_dir} \
Expand Down