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

* origin/pr/93:
  archlinux: support for new packaging in legacy builder
  Rework Archlinux packaging

Makefile.builder

@@ -1,3 +1,16 @@
 RPM_SPEC_FILES := rpm_spec/qubes-utils.spec rpm_spec/qubes-kernel-vm-support.spec
 ARCH_BUILD_DIRS := archlinux
 DEBIAN_BUILD_DIRS := debian
+
+# Support for new packaging
+ifneq ($(filter $(DISTRIBUTION), archlinux),)
+VERSION := $(file <$(ORIG_SRC)/$(DIST_SRC)/version)
+GIT_TARBALL_NAME ?= qubes-vm-utils-$(VERSION)-1.tar.gz
+SOURCE_COPY_IN := source-archlinux-copy-in
+
+source-archlinux-copy-in: PKGBUILD = $(CHROOT_DIR)/$(DIST_SRC)/$(ARCH_BUILD_DIRS)/PKGBUILD
+source-archlinux-copy-in:
+	cp $(PKGBUILD).in $(CHROOT_DIR)/$(DIST_SRC)/PKGBUILD
+	sed -i "s/@VERSION@/$(VERSION)/g" $(CHROOT_DIR)/$(DIST_SRC)/PKGBUILD
+	sed -i "s/@REL@/1/g" $(CHROOT_DIR)/$(DIST_SRC)/PKGBUILD
+endif

archlinux/PKGBUILD.in

@@ -0,0 +1,65 @@
+# Maintainer: Frédéric Pierret (fepitre) <[email protected]>
+
+pkgname=(qubes-vm-utils qubes-vm-kernel-support)
+pkgver=@VERSION@
+pkgrel=@REL@
+pkgdesc="Common Linux files for Qubes VM."
+arch=("x86_64")
+url="http://qubes-os.org/"
+license=('GPL')
+depends=(
+    gcc
+    make
+    pkgconfig
+    python-setuptools
+    icu
+    qubes-libvchan-xen
+)
+options=('staticlibs')
+_pkgnvr="${pkgname}-${pkgver}-${pkgrel}"
+source=("${_pkgnvr}.tar.gz")
+sha256sums=(SKIP)
+
+build() {
+    cd "${_pkgnvr}"
+    make all
+}
+
+package_qubes-vm-utils() {
+    cd "${_pkgnvr}"
+
+    depends=(
+        graphicsmagick
+        python-cairo
+        python-pillow
+        python-numpy
+        icu
+    )
+    install=archlinux/PKGBUILD-qubes-vm-utils.install
+
+    make install \
+        DESTDIR="$pkgdir" \
+        LIBDIR=/usr/lib \
+        SYSLIBDIR=/usr/lib \
+        SBINDIR=/usr/bin
+}
+
+package_qubes-vm-kernel-support() {
+    cd "${_pkgnvr}"
+
+    depends=(
+        mkinitcpio
+        grub
+    )
+    install=archlinux/PKGBUILD-qubes-vm-kernel-support.install
+
+    mkdir -p "${pkgdir}/usr/lib/initcpio/install/"
+    mkdir -p "${pkgdir}/usr/lib/initcpio/hooks/"
+    mkdir -p "${pkgdir}/usr/lib/qubes/"
+    mkdir -p "${pkgdir}/etc/default"
+
+    install -m 611 "${srcdir}/${_pkgnvr}/archlinux/PKGBUILD-initcpio-install.sh" "${pkgdir}/usr/lib/initcpio/install/qubes"
+    install -m 611 "${srcdir}/${_pkgnvr}/archlinux/PKGBUILD-initcpio-hook.sh" "${pkgdir}/usr/lib/initcpio/hooks/qubes"
+    install -m 755 "${srcdir}/${_pkgnvr}/dracut/full-dmroot/qubes_cow_setup.sh" "${pkgdir}/usr/lib/qubes/qubes_cow_setup.sh"
+    install -m 0644 "${srcdir}/${_pkgnvr}/grub/grub.qubes-kernel-vm-support" "${pkgdir}/etc/default/grub.qubes-kernel-vm-support"
+}