From 7da3f98f8b9f253ba6798d987709a677261c6fc0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 24 Jun 2015 09:44:42 +0200 Subject: [PATCH] xen: update to 4.5.1. --- srcpkgs/xen/files/proc-xen.mount | 9 ----- srcpkgs/xen/files/tmpfiles.d-xen.conf | 1 - srcpkgs/xen/files/var-lib-xenstored.mount | 10 ------ srcpkgs/xen/files/xenconsoled.service | 17 --------- srcpkgs/xen/files/xendomU@.service | 13 ------- srcpkgs/xen/files/xendomains.service | 15 -------- srcpkgs/xen/files/xenstored.service | 19 ---------- srcpkgs/xen/template | 43 ++++++----------------- 8 files changed, 11 insertions(+), 116 deletions(-) delete mode 100644 srcpkgs/xen/files/proc-xen.mount delete mode 100644 srcpkgs/xen/files/tmpfiles.d-xen.conf delete mode 100644 srcpkgs/xen/files/var-lib-xenstored.mount delete mode 100644 srcpkgs/xen/files/xenconsoled.service delete mode 100644 srcpkgs/xen/files/xendomU@.service delete mode 100644 srcpkgs/xen/files/xendomains.service delete mode 100644 srcpkgs/xen/files/xenstored.service diff --git a/srcpkgs/xen/files/proc-xen.mount b/srcpkgs/xen/files/proc-xen.mount deleted file mode 100644 index 0eaa59c5fa..0000000000 --- a/srcpkgs/xen/files/proc-xen.mount +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Mount /proc/xen files -ConditionPathExists=/proc/xen -RefuseManualStop=true - -[Mount] -What=xenfs -Where=/proc/xen -Type=xenfs diff --git a/srcpkgs/xen/files/tmpfiles.d-xen.conf b/srcpkgs/xen/files/tmpfiles.d-xen.conf deleted file mode 100644 index 5041017721..0000000000 --- a/srcpkgs/xen/files/tmpfiles.d-xen.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/xen 0755 root root - diff --git a/srcpkgs/xen/files/var-lib-xenstored.mount b/srcpkgs/xen/files/var-lib-xenstored.mount deleted file mode 100644 index 1c2015ca22..0000000000 --- a/srcpkgs/xen/files/var-lib-xenstored.mount +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=mount xenstore file system -ConditionPathExists=/proc/xen -RefuseManualStop=true - -[Mount] -What=xenstore -Where=/var/lib/xenstored -Type=tmpfs -Options=mode=755 diff --git a/srcpkgs/xen/files/xenconsoled.service b/srcpkgs/xen/files/xenconsoled.service deleted file mode 100644 index 0b303d6700..0000000000 --- a/srcpkgs/xen/files/xenconsoled.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Xenconsoled - handles logging from guest consoles and hypervisor -Requires=proc-xen.mount -After=proc-xen.mount xenstored.service -ConditionPathExists=/proc/xen - -[Service] -Type=simple -Environment=XENCONSOLED_ARGS= -Environment=XENCONSOLED_LOG=none -Environment=XENCONSOLED_LOG_DIR=/var/log/xen/console -PIDFile=/var/run/xenconsoled.pid -ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities -ExecStart=/usr/bin/xenconsoled --log=${XENCONSOLED_LOG} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/xen/files/xendomU@.service b/srcpkgs/xen/files/xendomU@.service deleted file mode 100644 index 83eb401850..0000000000 --- a/srcpkgs/xen/files/xendomU@.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=xen domU service for domain %i -Requires=xenstored.service -ConditionVirtualization=xen - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/xl create /etc/xen/conf/%i.cfg -ExecStop=/usr/bin/xl shutdown %i - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/xen/files/xendomains.service b/srcpkgs/xen/files/xendomains.service deleted file mode 100644 index d49bd5593e..0000000000 --- a/srcpkgs/xen/files/xendomains.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Xendomains - start and stop guests on boot and shutdown -Requires=proc-xen.mount xenstored.service -After=proc-xen.mount xenstored.service xenconsoled.service -ConditionPathExists=/proc/xen - -[Service] -Type=oneshot -RemainAfterExit=true -ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities -ExecStart=/etc/xen/scripts/xendomains start -ExecStop=/etc/xen/scripts/xendomains stop - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/xen/files/xenstored.service b/srcpkgs/xen/files/xenstored.service deleted file mode 100644 index 0f954e653a..0000000000 --- a/srcpkgs/xen/files/xenstored.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Xenstored - daemon managing xenstore file system -Requires=proc-xen.mount var-lib-xenstored.mount systemd-tmpfiles-setup.service -After=proc-xen.mount var-lib-xenstored.mount systemd-tmpfiles-setup.service -Before=libvirtd.service libvirt-guests.service -RefuseManualStop=true -ConditionPathExists=/proc/xen - -[Service] -Type=forking -Environment=XENSTORED_ARGS= -PIDFile=/var/run/xenstored.pid -ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities -ExecStart=/usr/bin/xenstored --pid-file /var/run/xenstored.pid $XENSTORED_ARGS -ExecStartPost=/usr/bin/xenstore-write "/local/domain/0/domid" 0 -ExecStartPost=/usr/bin/xenstore-write "/local/domain/0/name" "Domain-0" - -[Install] -WantedBy=multi-user.target diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template index 12d6797e74..30144425d2 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -1,14 +1,14 @@ # Template file for 'xen' pkgname=xen -version=4.5.0 +version=4.5.1 +revision=1 wrksrc="xen-${version}" -revision=2 short_desc="The Xen hypervisor utilities" maintainer="Juan RP " homepage="http://xen.org" license="GPL-2" distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz" -checksum=5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b +checksum=668c11d4fca67ac44329e369f810356eacd37b28d28fb96e66aac77f3c5e1371 only_for_archs="x86_64" @@ -20,7 +20,6 @@ makedepends=" dev86 acpica-utils pixman-devel gcc-multilib" depends="xen-hypervisor" -build_options="systemd" make_dirs=" /var/lib/xenstored 755 root root /var/lib/xen/xenpaging 755 root root @@ -39,29 +38,19 @@ nostrip_files=" pycompile_module="xen grub" do_configure() { - unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS + rm -f ${XBPS_WRAPPERDIR}/strip + unset CC LD AR AS RANLIB CPP CFLAGS CXXFLAGS CPPFLAGS LDFLAGS ./configure ${configure_args} } - do_build() { - if [ "${XBPS_MACHINE}" = "x86_64" ]; then - install -d ${DESTDIR}/usr/lib - cd ${DESTDIR}/usr - ln -sf lib lib64 - fi + rm -f ${XBPS_WRAPPERDIR}/strip cd ${wrksrc} - unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS + unset CC LD AR AS RANLIB CPP CFLAGS CXXFLAGS CPPFLAGS LDFLAGS make ${makejobs} DISTDIR=${wrksrc}/${pkgver}-distdir } - do_install() { - if [ "${XBPS_MACHINE}" = "x86_64" ]; then - install -d ${DESTDIR}/usr/lib - cd ${DESTDIR}/usr - ln -sf lib lib64 - cd ${wrksrc} - fi - unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS + rm -f ${XBPS_WRAPPERDIR}/strip + unset CC LD AR AS RANLIB CPP CFLAGS CXXFLAGS CPPFLAGS LDFLAGS make DESTDIR=${DESTDIR} install # Move example config files into correct directory. @@ -86,18 +75,8 @@ do_install() { mv ${DESTDIR}/etc/bash_completion.d/* \ ${DESTDIR}/usr/share/bash-completion/completions - # Install systemd services. - if [ "$build_option_systemd" ]; then - vmkdir usr/lib/systemd/system - install -m644 ${FILESDIR}/*.{mount,service} ${DESTDIR}/usr/lib/systemd/system - vmkdir usr/lib/modules-load.d - install -m644 ${FILESDIR}/xen.conf ${DESTDIR}/usr/lib/modules-load.d - install -Dm644 ${FILESDIR}/tmpfiles.d-xen.conf \ - ${DESTDIR}/usr/lib/tmpfiles.d/xen.conf - fi - - # Move bins to /usr/bin. - mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin/ + vmkdir usr/lib/modules-load.d + install -m644 ${FILESDIR}/xen.conf ${DESTDIR}/usr/lib/modules-load.d # Drop xen/xm stuff (obsolete). rm -f ${DESTDIR}/usr/bin/{xm,xend}