Skip to content

Commit

Permalink
makefile: remove obsolete rpm building rules
Browse files Browse the repository at this point in the history
qubes-builder is required, at least to generate .spec from .spec.in

(cherry picked from commit e64bac0)
  • Loading branch information
marmarek committed May 17, 2020
1 parent 3012c3e commit 415bb29
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 25 deletions.
26 changes: 3 additions & 23 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,17 @@
#
#

RPMS_DIR=rpm/
VERSION := $(shell cat version)
MANDIR ?= /usr/share/man
LIBDIR ?= /usr/lib64

DIST_DOM0 ?= fc13

help:
@echo "Qubes GUI main Makefile:" ;\
echo "make rpms <--- make all rpms and sign them";\
echo "make rpms-dom0 <--- create binary rpms for dom0"; \
echo "make rpms-vm <--- create binary rpms for appvm"; \
echo; \
echo "make all <--- build binaries";\
echo "make all <--- install files into \$$DESTDIR";\
echo "make clean <--- clean all the binary files";\
echo "make update-repo-current <-- copy newly generated rpms to qubes yum repo";\
echo "make update-repo-current-testing <-- same, but for -current-testing repo";\
echo "make update-repo-unstable <-- same, but to -testing repo";\
echo "make update-repo-installer -- copy dom0 rpms to installer repo"
@exit 0;

dom0: gui-daemon/qubes-guid shmoverride/shmoverride.so shmoverride/X-wrapper-qubes \
all: gui-daemon/qubes-guid shmoverride/shmoverride.so shmoverride/X-wrapper-qubes \
pulse/pacat-simple-vchan screen-layout-handler/watch-screen-layout-changes

gui-daemon/qubes-guid:
Expand Down Expand Up @@ -72,16 +62,6 @@ install:
install -D screen-layout-handler/qubes-screen-layout-watches.desktop $(DESTDIR)/etc/xdg/autostart/qubes-screen-layout-watches.desktop
$(MAKE) -C window-icon-updater install

rpms: rpms-dom0 rpms-vm
rpm --addsign rpm/x86_64/*$(VERSION)*.rpm
(if [ -d rpm/i686 ] ; then rpm --addsign rpm/i686/*$(VERSION)*.rpm; fi)

rpms-vm:
rpmbuild --define "_rpmdir rpm/" -bb rpm_spec/gui-vm.spec

rpms-dom0:
rpmbuild --define "_rpmdir rpm/" -bb rpm_spec/gui-dom0.spec

tar:
git archive --format=tar --prefix=qubes-gui/ HEAD -o qubes-gui.tar

Expand Down
3 changes: 1 addition & 2 deletions rpm_spec/gui-dom0.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,10 @@ The Qubes GUI virtualization infrastructure that needs to be installed in Dom0.

%build
make clean
make dom0 BACKEND_VMM=@BACKEND_VMM@
make all BACKEND_VMM=@BACKEND_VMM@

%py3_build


%pre

%install
Expand Down

0 comments on commit 415bb29

Please sign in to comment.