QubesOS/qubes-linux-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/1'

Browse Source 
* origin/pr/1:
  archlinux: ensure /usr/sbin is not use to follow archlinux packaging guidelines
  archlinux: update to match new dependancies and archlinux /usr/lib guidelines
This commit is contained in:
Marek Marczykowski-Górecki 2015-08-02 19:55:54 +02:00
commit f5b65101ad
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,9 +1,9 @@
ifeq ($(shell uname -m),x86_64) ifeq ($(shell uname -m),x86_64)
LIBDIR = /usr/lib64 LIBDIR ?= /usr/lib64
else else
LIBDIR = /usr/lib LIBDIR ?= /usr/lib
endif endif
INCLUDEDIR = /usr/include INCLUDEDIR ?= /usr/include
export LIBDIR INCLUDEDIR export LIBDIR INCLUDEDIR

6
archlinux/PKGBUILD
View File

@ -6,14 +6,14 @@
# Maintainer: Olivier Medoc <o_medoc@yahoo.fr> # Maintainer: Olivier Medoc <o_medoc@yahoo.fr>
pkgname=qubes-vm-utils pkgname=qubes-vm-utils
pkgver=`cat version` pkgver=`cat version`
pkgrel=8 pkgrel=2
epoch= epoch=
pkgdesc="Common Linux files for Qubes VM." pkgdesc="Common Linux files for Qubes VM."
arch=("x86_64") arch=("x86_64")
url="http://qubes-os.org/" url="http://qubes-os.org/"
license=('GPL') license=('GPL')
groups=() groups=()
depends=(qubes-libvchan) depends=(qubes-libvchan imagemagick python2-cairo)
makedepends=(qubes-libvchan) makedepends=(qubes-libvchan)
checkdepends=() checkdepends=()
optdepends=() optdepends=()
@ -43,7 +43,7 @@ make all
package() { package() {
make install DESTDIR=$pkgdir make install DESTDIR=$pkgdir LIBDIR=/usr/lib SBINDIR=/usr/bin
} }

9
archlinux/PKGBUILD-qubes-vm-utils.install
View File

@ -2,13 +2,8 @@
## arg 1: the new package version ## arg 1: the new package version
post_install() { post_install() {
ldconfig ldconfig
if [ -r /etc/qubes-release ]; then /bin/systemctl enable qubes-meminfo-writer-dom0.service > /dev/null 2>&1
# dom0 /bin/systemctl enable qubes-meminfo-writer.service > /dev/null 2>&1
/bin/systemctl enable qubes-meminfo-writer-dom0.service > /dev/null 2>&1
else
# VM
/bin/systemctl enable qubes-meminfo-writer.service > /dev/null 2>&1
fi
} }
post_upgrade() { post_upgrade() {

3
qmemman/Makefile
View File

@ -1,6 +1,7 @@
CC=gcc CC=gcc
CFLAGS=-Wall -Wextra -Werror -g -O3 CFLAGS=-Wall -Wextra -Werror -g -O3
all: meminfo-writer all: meminfo-writer
SBINDIR?=/usr/sbin
_XENSTORE_H=$(shell ls /usr/include/xenstore.h) _XENSTORE_H=$(shell ls /usr/include/xenstore.h)
ifneq "$(_XENSTORE_H)" "" ifneq "$(_XENSTORE_H)" ""
@ -10,7 +11,7 @@ endif
meminfo-writer: meminfo-writer.o meminfo-writer: meminfo-writer.o
$(CC) -g -o meminfo-writer meminfo-writer.o -lxenstore $(CC) -g -o meminfo-writer meminfo-writer.o -lxenstore
install: install:
install -D meminfo-writer $(DESTDIR)/usr/sbin/meminfo-writer install -D meminfo-writer $(DESTDIR)/$(SBINDIR)/meminfo-writer
ifeq (1,${DEBIANBUILD}) ifeq (1,${DEBIANBUILD})
install -d $(DESTDIR)/lib/systemd/system/ install -d $(DESTDIR)/lib/systemd/system/
install -m 0644 qubes-meminfo-writer.service $(DESTDIR)/lib/systemd/system/ install -m 0644 qubes-meminfo-writer.service $(DESTDIR)/lib/systemd/system/