debian: add 'rpm' as dependency
- clean Makefile
This commit is contained in:
parent
704930852c
commit
8c3d181266
2
.gitignore
vendored
2
.gitignore
vendored
@ -7,3 +7,5 @@ deb/*
|
|||||||
.coverage
|
.coverage
|
||||||
*.egg-info
|
*.egg-info
|
||||||
__pycache__
|
__pycache__
|
||||||
|
debian/changelog.*
|
||||||
|
pkgs
|
||||||
|
28
Makefile
28
Makefile
@ -1,5 +1,3 @@
|
|||||||
RPMS_DIR=rpm/
|
|
||||||
|
|
||||||
VERSION := $(shell cat version)
|
VERSION := $(shell cat version)
|
||||||
|
|
||||||
LIBDIR ?= /usr/lib
|
LIBDIR ?= /usr/lib
|
||||||
@ -10,30 +8,6 @@ PYTHON ?= /usr/bin/python3
|
|||||||
# This makefile uses some bash-isms, make uses /bin/sh by default.
|
# This makefile uses some bash-isms, make uses /bin/sh by default.
|
||||||
SHELL = /bin/bash
|
SHELL = /bin/bash
|
||||||
|
|
||||||
help:
|
|
||||||
@echo "make rpms -- generate binary rpm packages"
|
|
||||||
@echo "make rpms-vm -- generate binary rpm packages for VM"
|
|
||||||
@echo "make clean -- cleanup"
|
|
||||||
@echo "make install-vm -- install VM related files"
|
|
||||||
@echo ""
|
|
||||||
@echo "You must have lsb_release, rpm-sign and pandoc installed."
|
|
||||||
|
|
||||||
rpms: rpms-vm
|
|
||||||
|
|
||||||
rpms-vm:
|
|
||||||
[ "$$BACKEND_VMM" != "" ] || { echo "error: you must define variable BACKEND_VMM" >&2 ; exit 1 ; }
|
|
||||||
lsb_release >/dev/null 2>&1 || { echo "error: you need lsb_release (package lsb) installed" >&2 ; exit 1 ; }
|
|
||||||
type pandoc >/dev/null 2>&1 || { echo "error: you need pandoc installed" >&2 ; exit 1 ; }
|
|
||||||
type rpmsign >/dev/null 2>&1 || { echo "error: you need rpm-sign installed" >&2 ; exit 1 ; }
|
|
||||||
rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-vm.spec
|
|
||||||
rpmbuild --define "_rpmdir $(RPMS_DIR)" -bb rpm_spec/core-vm-doc.spec
|
|
||||||
[ "$$SKIP_SIGNING" != "" ] || rpm --addsign \
|
|
||||||
$(RPMS_DIR)/x86_64/qubes-core-vm-*$(VERSION)*.rpm \
|
|
||||||
$(RPMS_DIR)/x86_64/qubes-core-vm-doc-*$(VERSION)*.rpm
|
|
||||||
|
|
||||||
rpms-dom0:
|
|
||||||
@true
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
make -C misc clean
|
make -C misc clean
|
||||||
make -C qubes-rpc clean
|
make -C qubes-rpc clean
|
||||||
@ -42,6 +16,8 @@ clean:
|
|||||||
rm -rf test-packages/__pycache__
|
rm -rf test-packages/__pycache__
|
||||||
rm -rf test-packages/qubesagent.egg-info
|
rm -rf test-packages/qubesagent.egg-info
|
||||||
rm -rf __pycache__
|
rm -rf __pycache__
|
||||||
|
rm -rf debian/changelog.*
|
||||||
|
rm -rf pkgs
|
||||||
rm -f .coverage
|
rm -f .coverage
|
||||||
|
|
||||||
all:
|
all:
|
||||||
|
1
debian/control
vendored
1
debian/control
vendored
@ -108,6 +108,7 @@ Package: qubes-core-agent-dom0-updates
|
|||||||
Architecture: any
|
Architecture: any
|
||||||
Depends:
|
Depends:
|
||||||
fakeroot,
|
fakeroot,
|
||||||
|
rpm,
|
||||||
dnf | yum,
|
dnf | yum,
|
||||||
dnf | yum-utils,
|
dnf | yum-utils,
|
||||||
qubes-core-qrexec,
|
qubes-core-qrexec,
|
||||||
|
Loading…
Reference in New Issue
Block a user