root
10 years ago
parent
4f498ac97a
commit
21f155b606
@ -1 +0,0 @@
|
||||
DIST djbdns-1.05-man-20031023.tar.gz 17170 SHA256 ba1c58f14bc928908d8618230f400d73cfe2200ed800a272b63048e3e50be569 SHA512 98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183 WHIRLPOOL b611e37e7422a4ae405fa15a4b9ff7eb8d0007d81310d044bc1982fe70dada1e4646cf22832e8e5320bae8d2e328eb87d59eb51c3d390f1089f30548053b839b
|
||||
@ -1,19 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-doc/djbdns-man/djbdns-man-20031023.ebuild,v 1.15 2010/10/19 06:43:31 leio Exp $
|
||||
|
||||
S=${WORKDIR}/${PN}
|
||||
DESCRIPTION="Man pages for djbdns"
|
||||
SRC_URI="http://smarden.org/pape/djb/manpages/djbdns-1.05-man-${PV}.tar.gz"
|
||||
HOMEPAGE="http://smarden.org/pape/djb/manpages/"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="public-domain"
|
||||
KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
|
||||
IUSE=""
|
||||
|
||||
src_install() {
|
||||
dodoc README
|
||||
|
||||
doman *.8 *.5 *.1
|
||||
}
|
||||
@ -1,162 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.4.ebuild,v 1.4 2014/07/09 07:46:17 dlan Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
PYTHON_REQ_USE='xml,threads'
|
||||
|
||||
inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
|
||||
|
||||
XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
|
||||
LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
|
||||
GRUB_URL=mirror://gnu-alpha/grub
|
||||
|
||||
UPSTREAM_VER=
|
||||
GENTOO_VER=
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-pvgrub/}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
|
||||
SRC_URI="
|
||||
http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
$GRUB_URL/grub-0.97.tar.gz
|
||||
$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
|
||||
$LIBPCI_URL/pciutils-2.2.9.tar.bz2
|
||||
$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
|
||||
$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}
|
||||
"
|
||||
|
||||
S="${WORKDIR}/xen-${PV}"
|
||||
|
||||
DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="custom-cflags"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
sys-devel/bin86"
|
||||
|
||||
RDEPEND=">=app-emulation/xen-4.2.1"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
retar-externals() {
|
||||
# Purely to unclutter src_prepare
|
||||
local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz zlib-1.2.3.tar.gz"
|
||||
|
||||
# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
|
||||
sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
|
||||
-i "${WORKDIR}"/zlib-1.2.3/configure
|
||||
sed -e 's:^AR=ar rc:AR=ar:' \
|
||||
-e s':$(AR) $@:$(AR) rc $@:' \
|
||||
-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
|
||||
einfo "zlib Makefile edited"
|
||||
|
||||
cd "${WORKDIR}"
|
||||
tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
|
||||
tar czp grub-0.97 -f grub-0.97.tar.gz
|
||||
tar czp lwip -f lwip-1.3.0.tar.gz
|
||||
tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
|
||||
mv $set "${S}"/stubdom/
|
||||
einfo "tarballs moved to source"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \;
|
||||
fi
|
||||
|
||||
# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
|
||||
cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
|
||||
|
||||
# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.2.1-externals.patch
|
||||
|
||||
# Drop .config and Fix gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
|
||||
|
||||
# fix jobserver in Makefile
|
||||
epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
|
||||
|
||||
# gcc warnings/QA fix
|
||||
epatch "${FILESDIR}"/${PN}-4.2.3-qa.patch
|
||||
|
||||
#Substitute for internal downloading. pciutils copied only due to the only .bz2
|
||||
cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
|
||||
retar-externals || die "re-tar procedure failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use custom-cflags || unset CFLAGS
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
|
||||
|
||||
if use x86; then
|
||||
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
|
||||
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
|
||||
elif use amd64; then
|
||||
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
|
||||
XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
|
||||
if has_multilib_profile; then
|
||||
multilib_toolchain_setup x86
|
||||
emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
|
||||
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use x86; then
|
||||
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
|
||||
fi
|
||||
if use amd64; then
|
||||
emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
|
||||
if has_multilib_profile; then
|
||||
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the offical wiki page:"
|
||||
elog "http://www.gentoo.org/doc/en/xen-guide.xml"
|
||||
elog "http://wiki.xen.org/wiki/Main_Page"
|
||||
}
|
||||
@ -1,139 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.3.2.ebuild,v 1.4 2014/09/11 05:15:57 dlan Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
PYTHON_REQ_USE='xml,threads'
|
||||
|
||||
inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
|
||||
|
||||
XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
|
||||
LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
|
||||
GRUB_URL=mirror://gnu-alpha/grub
|
||||
SRC_URI="
|
||||
http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
$GRUB_URL/grub-0.97.tar.gz
|
||||
$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
|
||||
$LIBPCI_URL/pciutils-2.2.9.tar.bz2
|
||||
$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
|
||||
$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
|
||||
$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz"
|
||||
|
||||
S="${WORKDIR}/xen-${PV}"
|
||||
|
||||
DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 -x86"
|
||||
IUSE="custom-cflags"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="sys-devel/gettext
|
||||
sys-devel/bin86
|
||||
sys-apps/texinfo"
|
||||
|
||||
RDEPEND=">=app-emulation/xen-4.2.1"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
retar-externals() {
|
||||
# Purely to unclutter src_prepare
|
||||
local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
|
||||
|
||||
# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
|
||||
sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
|
||||
-i "${WORKDIR}"/zlib-1.2.3/configure
|
||||
sed -e 's:^AR=ar rc:AR=ar:' \
|
||||
-e s':$(AR) $@:$(AR) rc $@:' \
|
||||
-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
|
||||
einfo "zlib Makefile edited"
|
||||
|
||||
cd "${WORKDIR}"
|
||||
tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
|
||||
tar czp grub-0.97 -f grub-0.97.tar.gz
|
||||
tar czp lwip -f lwip-1.3.0.tar.gz
|
||||
tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
|
||||
tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
|
||||
mv $set "${S}"/stubdom/
|
||||
einfo "tarballs moved to source"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \;
|
||||
fi
|
||||
|
||||
# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
|
||||
cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
|
||||
|
||||
# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
|
||||
|
||||
# Drop .config and Fix gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch
|
||||
|
||||
# fix jobserver in Makefile
|
||||
epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
|
||||
|
||||
# gcc warnings/QA fix
|
||||
epatch "${FILESDIR}"/${PN}-4.3.1-qa.patch
|
||||
|
||||
#Substitute for internal downloading. pciutils copied only due to the only .bz2
|
||||
cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
|
||||
retar-externals || die "re-tar procedure failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
use custom-cflags || unset CFLAGS
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
|
||||
|
||||
if use x86; then
|
||||
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
|
||||
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
|
||||
elif use amd64; then
|
||||
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
|
||||
XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
|
||||
if has_multilib_profile; then
|
||||
multilib_toolchain_setup x86
|
||||
emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
|
||||
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use x86; then
|
||||
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
|
||||
fi
|
||||
if use amd64; then
|
||||
emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
|
||||
if has_multilib_profile; then
|
||||
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the offical wiki page:"
|
||||
elog "https://wiki.gentoo.org/wiki/Xen"
|
||||
elog "http://wiki.xen.org/wiki/Main_Page"
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
|
||||
index cbd60b4..d2b83dd 100644
|
||||
--- a/tools/libfsimage/common/Makefile
|
||||
+++ b/tools/libfsimage/common/Makefile
|
||||
@@ -5,7 +5,7 @@ MAJOR = 1.0
|
||||
MINOR = 0
|
||||
|
||||
LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
|
||||
-LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
|
||||
+LDFLAGS-$(CONFIG_Linux) =
|
||||
LDFLAGS = $(LDFLAGS-y)
|
||||
|
||||
CFLAGS += $(PTHREAD_CFLAGS)
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
2011-10-22 Ralf Glauberman <ralfglauberman@gmx.de>
|
||||
|
||||
#360805 Don't compile ipxe with pie on hardened.
|
||||
* /tools/firmware/etherboot/patches/ipxe-nopie.patche New patch
|
||||
* /tools/firmware/etherboot/patches/series Add ipxe-nopie.patch
|
||||
|
||||
--- a/tools/firmware/etherboot/patches/ipxe-nopie.patch 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ b/tools/firmware/etherboot/patches/ipxe-nopie.patch 2011-03-27 17:45:13.929697782 +0200
|
||||
@@ -0,0 +1,11 @@
|
||||
+--- ipxe/src/Makefile~ 2011-03-27 17:41:52.000000000 +0200
|
||||
++++ ipxe/src/Makefile 2011-03-27 17:43:20.869446433 +0200
|
||||
+@@ -4,7 +4,7 @@
|
||||
+ #
|
||||
+
|
||||
+ CLEANUP :=
|
||||
+-CFLAGS :=
|
||||
++CFLAGS := -nopie
|
||||
+ ASFLAGS :=
|
||||
+ LDFLAGS :=
|
||||
+ MAKEDEPS := Makefile
|
||||
--- a/tools/firmware/etherboot/patches/series 2011-03-25 11:42:50.000000000 +0100
|
||||
+++ b/tools/firmware/etherboot/patches/series 2011-03-27 17:45:45.140446216 +0200
|
||||
@@ -1,4 +1,5 @@
|
||||
boot_prompt_option.patch
|
||||
build_fix_1.patch
|
||||
build_fix_2.patch
|
||||
build_fix_3.patch
|
||||
+ipxe-nopie.patch
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
diff -ur xen-4.3.0.orig/tools/qemu-xen/.gitignore xen-4.3.0/tools/qemu-xen/.gitignore
|
||||
--- tools/qemu-xen/.gitignore 2013-06-28 19:23:16.000000000 +0800
|
||||
+++ tools/qemu-xen/.gitignore 2013-07-26 23:05:24.487998947 +0800
|
||||
@@ -37,7 +37,7 @@
|
||||
qemu-img-cmds.h
|
||||
qemu-io
|
||||
qemu-ga
|
||||
-qemu-bridge-helper
|
||||
+xen-bridge-helper
|
||||
qemu-monitor.texi
|
||||
vscclient
|
||||
QMP/qmp-commands.txt
|
||||
diff -ur xen-4.3.0.orig/tools/qemu-xen/Makefile xen-4.3.0/tools/qemu-xen/Makefile
|
||||
--- tools/qemu-xen/Makefile 2013-06-28 19:23:16.000000000 +0800
|
||||
+++ tools/qemu-xen/Makefile 2013-07-26 23:03:35.800991899 +0800
|
||||
@@ -50,7 +50,7 @@
|
||||
|
||||
LIBS+=-lz $(LIBS_TOOLS)
|
||||
|
||||
-HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
|
||||
+HELPERS-$(CONFIG_LINUX) = xen-bridge-helper$(EXESUF)
|
||||
|
||||
ifdef BUILD_DOCS
|
||||
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
|
||||
@@ -195,7 +195,7 @@
|
||||
qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y) libqemustub.a
|
||||
qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) libqemustub.a
|
||||
|
||||
-qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
|
||||
+xen-bridge-helper$(EXESUF): xen-bridge-helper.o
|
||||
|
||||
vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) libcacard/vscclient.o libqemustub.a
|
||||
$(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK $@")
|
||||
diff -ur xen-4.3.0.orig/tools/qemu-xen/net.h xen-4.3.0/tools/qemu-xen/net.h
|
||||
--- tools/qemu-xen/net.h 2013-06-28 19:23:16.000000000 +0800
|
||||
+++ tools/qemu-xen/net.h 2013-07-26 23:05:01.823997477 +0800
|
||||
@@ -163,7 +163,7 @@
|
||||
|
||||
#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
|
||||
#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
|
||||
-#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper"
|
||||
+#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/xen-bridge-helper"
|
||||
#define DEFAULT_BRIDGE_INTERFACE "br0"
|
||||
|
||||
void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
|
||||
diff -ur xen-4.3.0.orig/tools/qemu-xen/qemu-bridge-helper.c xen-4.3.0/tools/qemu-xen/qemu-bridge-helper.c
|
||||
--- tools/qemu-xen/qemu-bridge-helper.c 2013-06-28 19:23:16.000000000 +0800
|
||||
+++ tools/qemu-xen/qemu-bridge-helper.c 2013-07-26 23:04:11.880994239 +0800
|
||||
@@ -67,7 +67,7 @@
|
||||
static void usage(void)
|
||||
{
|
||||
fprintf(stderr,
|
||||
- "Usage: qemu-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n");
|
||||
+ "Usage: xen-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n");
|
||||
}
|
||||
|
||||
static int parse_acl_file(const char *filename, ACLList *acl_list)
|
||||
diff -ur xen-4.3.0.orig/tools/qemu-xen/qemu-options.hx xen-4.3.0/tools/qemu-xen/qemu-options.hx
|
||||
--- tools/qemu-xen/qemu-options.hx 2013-06-28 19:23:16.000000000 +0800
|
||||
+++ tools/qemu-xen/qemu-options.hx 2013-07-26 23:05:17.239998477 +0800
|
||||
@@ -1560,7 +1560,7 @@
|
||||
|
||||
If running QEMU as an unprivileged user, use the network helper
|
||||
@var{helper} to configure the TAP interface. The default network
|
||||
-helper executable is @file{/usr/local/libexec/qemu-bridge-helper}.
|
||||
+helper executable is @file{/usr/local/libexec/xen-bridge-helper}.
|
||||
|
||||
@option{fd}=@var{h} can be used to specify the handle of an already
|
||||
opened host TAP interface.
|
||||
@@ -1584,7 +1584,7 @@
|
||||
#launch a QEMU instance with the default network helper to
|
||||
#connect a TAP device to bridge br0
|
||||
qemu-system-i386 linux.img \
|
||||
- -net nic -net tap,"helper=/usr/local/libexec/qemu-bridge-helper"
|
||||
+ -net nic -net tap,"helper=/usr/local/libexec/xen-bridge-helper"
|
||||
@end example
|
||||
|
||||
@item -netdev bridge,id=@var{id}[,br=@var{bridge}][,helper=@var{helper}]
|
||||
@@ -1593,7 +1593,7 @@
|
||||
|
||||
Use the network helper @var{helper} to configure the TAP interface and
|
||||
attach it to the bridge. The default network helper executable is
|
||||
-@file{/usr/local/libexec/qemu-bridge-helper} and the default bridge
|
||||
+@file{/usr/local/libexec/xen-bridge-helper} and the default bridge
|
||||
device is @file{br0}.
|
||||
|
||||
Examples:
|
||||
@ -1,245 +0,0 @@
|
||||
# Fix gcc-4.6
|
||||
diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk
|
||||
--- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800
|
||||
+++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
# Define some default flags.
|
||||
# NB. '-Wcast-qual' is nasty, so I omitted it.
|
||||
-DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
|
||||
+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
|
||||
DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
|
||||
DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
|
||||
DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
|
||||
diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile
|
||||
--- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800
|
||||
+++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800
|
||||
@@ -73,7 +73,7 @@
|
||||
|
||||
-include $(XEN_TARGET_ARCH)/Makefile
|
||||
|
||||
-CFLAGS += -Werror -Wmissing-prototypes
|
||||
+CFLAGS += -Wmissing-prototypes
|
||||
CFLAGS += -I. $(CFLAGS_xeninclude)
|
||||
|
||||
# Needed for posix_fadvise64() in xc_linux.c
|
||||
# Drop .config
|
||||
diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk
|
||||
--- Config.mk 2012-09-17 18:23:12.000000000 +0800
|
||||
+++ Config.mk 2012-12-05 14:01:10.641260261 +0800
|
||||
@@ -7,7 +7,6 @@ Drop .config
|
||||
# fallback for older make
|
||||
realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
|
||||
|
||||
--include $(XEN_ROOT)/.config
|
||||
|
||||
# A debug build of Xen and tools?
|
||||
debug ?= n
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
# Tools to run on system hosting the build
|
||||
HOSTCC = gcc
|
||||
-HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
|
||||
+HOSTCFLAGS = -Wstrict-prototypes -O2 -fomit-frame-pointer
|
||||
HOSTCFLAGS += -fno-strict-aliasing
|
||||
|
||||
DISTDIR ?= $(XEN_ROOT)/dist
|
||||
@@ -156,7 +156,7 @@
|
||||
|
||||
CFLAGS += -std=gnu99
|
||||
|
||||
-CFLAGS += -Wall -Wstrict-prototypes
|
||||
+CFLAGS += -Wstrict-prototypes
|
||||
|
||||
# Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...'
|
||||
# and is over-zealous with the printf format lint
|
||||
diff -ur xen-4.2.1.orig/tools/blktap2/drivers/Makefile xen-4.2.1/tools/blktap2/drivers/Makefile
|
||||
--- tools/blktap2/drivers/Makefile 2012-12-17 23:00:11.000000000 +0800
|
||||
+++ tools/blktap2/drivers/Makefile 2013-01-30 12:31:43.539941099 +0800
|
||||
@@ -9,7 +9,7 @@
|
||||
LOCK_UTIL = lock-util
|
||||
INST_DIR = $(SBINDIR)
|
||||
|
||||
-CFLAGS += -Werror -g
|
||||
+CFLAGS += -g
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers
|
||||
diff -ur xen-4.2.1.orig/tools/debugger/gdbsx/Rules.mk xen-4.2.1/tools/debugger/gdbsx/Rules.mk
|
||||
--- tools/debugger/gdbsx/Rules.mk 2012-12-17 23:00:22.000000000 +0800
|
||||
+++ tools/debugger/gdbsx/Rules.mk 2013-01-30 12:31:43.516941098 +0800
|
||||
@@ -1,4 +1,4 @@
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror -Wmissing-prototypes
|
||||
+CFLAGS += -Wmissing-prototypes
|
||||
# (gcc 4.3x and later) -Wconversion -Wno-sign-conversion
|
||||
diff -ur xen-4.2.1.orig/tools/debugger/xenitp/Makefile xen-4.2.1/tools/debugger/xenitp/Makefile
|
||||
--- tools/debugger/xenitp/Makefile 2012-12-17 23:00:22.000000000 +0800
|
||||
+++ tools/debugger/xenitp/Makefile 2013-01-30 12:31:43.516941098 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=$(CURDIR)/../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-#CFLAGS += -Werror -g -O0
|
||||
+#CFLAGS += -g -O0
|
||||
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
|
||||
diff -ur xen-4.2.1.orig/tools/libaio/harness/Makefile xen-4.2.1/tools/libaio/harness/Makefile
|
||||
--- tools/libaio/harness/Makefile 2012-12-17 23:00:35.000000000 +0800
|
||||
+++ tools/libaio/harness/Makefile 2013-01-30 12:31:43.541941099 +0800
|
||||
@@ -4,7 +4,7 @@
|
||||
HARNESS_SRCS:=main.c
|
||||
# io_queue.c
|
||||
|
||||
-CFLAGS=-Wall -Werror -g -O -laio
|
||||
+CFLAGS=-Wall -g -O -laio
|
||||
#-lpthread -lrt
|
||||
|
||||
all: $(PROGS)
|
||||
diff -ur xen-4.2.1.orig/tools/libfsimage/Rules.mk xen-4.2.1/tools/libfsimage/Rules.mk
|
||||
--- tools/libfsimage/Rules.mk 2012-12-17 23:00:36.000000000 +0800
|
||||
+++ tools/libfsimage/Rules.mk 2013-01-30 12:31:43.515941097 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\"
|
||||
-CFLAGS += -Werror -D_GNU_SOURCE
|
||||
+CFLAGS += -D_GNU_SOURCE
|
||||
LDFLAGS += -L../common/
|
||||
|
||||
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
|
||||
diff -ur xen-4.2.1.orig/tools/libxl/Makefile xen-4.2.1/tools/libxl/Makefile
|
||||
--- tools/libxl/Makefile 2012-12-17 23:01:08.000000000 +0800
|
||||
+++ tools/libxl/Makefile 2013-01-30 12:31:43.541941099 +0800
|
||||
@@ -11,7 +11,7 @@
|
||||
XLUMAJOR = 1.0
|
||||
XLUMINOR = 1
|
||||
|
||||
-CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
|
||||
+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \
|
||||
-Wno-declaration-after-statement -Wformat-nonliteral
|
||||
CFLAGS += -I. -fPIC
|
||||
|
||||
diff -ur xen-4.2.1.orig/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.2.1/tools/qemu-xen/pc-bios/optionrom/Makefile
|
||||
--- tools/qemu-xen/pc-bios/optionrom/Makefile 2012-09-11 02:10:52.000000000 +0800
|
||||
+++ tools/qemu-xen/pc-bios/optionrom/Makefile 2013-01-30 12:31:43.528941098 +0800
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
.PHONY : all clean build-all
|
||||
|
||||
-CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
|
||||
+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin
|
||||
CFLAGS += -I$(SRC_PATH)
|
||||
CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector)
|
||||
QEMU_CFLAGS = $(CFLAGS)
|
||||
diff -ur xen-4.2.1.orig/tools/vtpm/Rules.mk xen-4.2.1/tools/vtpm/Rules.mk
|
||||
--- tools/vtpm/Rules.mk 2012-12-17 23:01:35.000000000 +0800
|
||||
+++ tools/vtpm/Rules.mk 2013-01-30 12:31:43.515941097 +0800
|
||||
@@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
# General compiler flags
|
||||
-CFLAGS = -Werror -g3
|
||||
+CFLAGS = -g3
|
||||
|
||||
# Generic project files
|
||||
HDRS = $(wildcard *.h)
|
||||
diff -ur xen-4.2.1.orig/tools/vtpm_manager/Rules.mk xen-4.2.1/tools/vtpm_manager/Rules.mk
|
||||
--- tools/vtpm_manager/Rules.mk 2012-12-17 23:01:35.000000000 +0800
|
||||
+++ tools/vtpm_manager/Rules.mk 2013-01-30 12:31:43.511941097 +0800
|
||||
@@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
# General compiler flags
|
||||
-CFLAGS = -Werror -g3
|
||||
+CFLAGS = -g3
|
||||
|
||||
# Generic project files
|
||||
HDRS = $(wildcard *.h)
|
||||
diff -ur xen-4.2.1.orig/tools/xenstat/xentop/Makefile xen-4.2.1/tools/xenstat/xentop/Makefile
|
||||
--- tools/xenstat/xentop/Makefile 2012-12-17 23:01:35.000000000 +0800
|
||||
+++ tools/xenstat/xentop/Makefile 2013-01-30 12:31:43.535941098 +0800
|
||||
@@ -18,7 +18,7 @@
|
||||
all install xentop:
|
||||
else
|
||||
|
||||
-CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat)
|
||||
+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat)
|
||||
LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS)
|
||||
CFLAGS += -DHOST_$(XEN_OS)
|
||||
|
||||
diff -ur xen-4.2.1.orig/xen/arch/arm/Rules.mk xen-4.2.1/xen/arch/arm/Rules.mk
|
||||
--- xen/arch/arm/Rules.mk 2012-12-17 23:01:37.000000000 +0800
|
||||
+++ xen/arch/arm/Rules.mk 2013-01-30 12:31:43.498941097 +0800
|
||||
@@ -9,7 +9,7 @@
|
||||
HAS_DEVICE_TREE := y
|
||||
|
||||
CFLAGS += -fno-builtin -fno-common -Wredundant-decls
|
||||
-CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
|
||||
+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
|
||||
CFLAGS += -I$(BASEDIR)/include
|
||||
|
||||
# Prevent floating-point variables from creeping into Xen.
|
||||
diff -ur xen-4.2.1.orig/xen/arch/x86/Rules.mk xen-4.2.1/xen/arch/x86/Rules.mk
|
||||
--- xen/arch/x86/Rules.mk 2012-12-17 23:01:37.000000000 +0800
|
||||
+++ xen/arch/x86/Rules.mk 2013-01-30 12:31:43.490941096 +0800
|
||||
@@ -24,7 +24,7 @@
|
||||
endif
|
||||
|
||||
CFLAGS += -fno-builtin -fno-common -Wredundant-decls
|
||||
-CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
|
||||
+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
|
||||
CFLAGS += -I$(BASEDIR)/include
|
||||
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
|
||||
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
|
||||
diff -ur xen-4.2.1.orig/xen/include/Makefile xen-4.2.1/xen/include/Makefile
|
||||
--- xen/include/Makefile 2012-12-17 23:01:55.000000000 +0800
|
||||
+++ xen/include/Makefile 2013-01-30 12:31:43.502941097 +0800
|
||||
@@ -78,7 +78,7 @@
|
||||
all: headers.chk
|
||||
|
||||
headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile
|
||||
- for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new
|
||||
+ for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new
|
||||
mv $@.new $@
|
||||
|
||||
endif
|
||||
diff -ur xen-4.2.1.orig/tools/tests/mce-test/tools/Makefile xen-4.2.1/tools/tests/mce-test/tools/Makefile
|
||||
--- tools/tests/mce-test/tools/Makefile 2012-12-17 23:01:35.000000000 +0800
|
||||
+++ tools/tests/mce-test/tools/Makefile 2013-01-30 13:01:44.890020152 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=$(CURDIR)/../../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
CFLAGS += $(CFLAGS_libxenguest)
|
||||
CFLAGS += $(CFLAGS_libxenstore)
|
||||
diff -ur xen-4.2.1.orig/tools/tests/mem-sharing/Makefile xen-4.2.1/tools/tests/mem-sharing/Makefile
|
||||
--- tools/tests/mem-sharing/Makefile 2012-12-17 23:01:35.000000000 +0800
|
||||
+++ tools/tests/mem-sharing/Makefile 2013-01-30 13:01:44.890020152 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=$(CURDIR)/../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
CFLAGS += $(CFLAGS_xeninclude)
|
||||
diff -ur xen-4.2.1.orig/tools/tests/xen-access/Makefile xen-4.2.1/tools/tests/xen-access/Makefile
|
||||
--- tools/tests/xen-access/Makefile 2012-12-17 23:01:35.000000000 +0800
|
||||
+++ tools/tests/xen-access/Makefile 2013-01-30 13:01:44.891020152 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=$(CURDIR)/../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
CFLAGS += $(CFLAGS_libxenguest)
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -ur xen-4.2.2.orig/tools/debugger/gdbsx/xg/xg_main.c xen-4.2.2/tools/debugger/gdbsx/xg/xg_main.c
|
||||
--- tools/debugger/gdbsx/xg/xg_main.c 2013-04-24 00:42:55.000000000 +0800
|
||||
+++ tools/debugger/gdbsx/xg/xg_main.c 2013-05-16 00:22:39.263704336 +0800
|
||||
@@ -50,6 +50,7 @@
|
||||
#include "xg_public.h"
|
||||
#include <xen/version.h>
|
||||
#include <xen/domctl.h>
|
||||
+#include <sys/types.h>
|
||||
#include <xen/sys/privcmd.h>
|
||||
#include <xen/foreign/x86_32.h>
|
||||
#include <xen/foreign/x86_64.h>
|
||||
@ -1,24 +0,0 @@
|
||||
diff -ur xen-4.2.1.orig/tools/examples/xend-config.sxp xen-4.2.1/tools/examples/xend-config.sxp
|
||||
--- tools/examples/xend-config.sxp 2012-12-17 23:00:23.000000000 +0800
|
||||
+++ tools/examples/xend-config.sxp 2013-06-27 21:32:50.198221774 +0800
|
||||
@@ -200,7 +200,7 @@
|
||||
#(network-script network-nat)
|
||||
#(vif-script vif-nat)
|
||||
|
||||
-# dom0-min-mem is the lowest permissible memory level (in MB) for dom0.
|
||||
+# dom0-min-mem is the lowest permissible memory level (in kb) for dom0.
|
||||
# This is a minimum both for auto-ballooning (as enabled by
|
||||
# enable-dom0-ballooning below) and for xm mem-set when applied to dom0.
|
||||
(dom0-min-mem 196)
|
||||
diff -ur xen-4.2.1.orig/tools/python/xen/xend/tests/xend-config.sxp xen-4.2.1/tools/python/xen/xend/tests/xend-config.sxp
|
||||
--- tools/python/xen/xend/tests/xend-config.sxp 2012-12-17 23:01:27.000000000 +0800
|
||||
+++ tools/python/xen/xend/tests/xend-config.sxp 2013-06-27 21:32:02.726225130 +0800
|
||||
@@ -116,7 +116,7 @@
|
||||
|
||||
|
||||
# Dom0 will balloon out when needed to free memory for domU.
|
||||
-# dom0-min-mem is the lowest memory level (in MB) dom0 will get down to.
|
||||
+# dom0-min-mem is the lowest memory level (in kb) dom0 will get down to.
|
||||
# If dom0-min-mem=0, dom0 will never balloon out.
|
||||
(dom0-min-mem 196)
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile
|
||||
--- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800
|
||||
+++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800
|
||||
@@ -14,13 +14,13 @@
|
||||
.PHONY: blowfish.h
|
||||
blowfish.h:
|
||||
rm -f blowfish.bin
|
||||
- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all
|
||||
+ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all
|
||||
(echo "static unsigned int blowfish32_code[] = {"; \
|
||||
od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
|
||||
echo "};") >$@
|
||||
rm -f blowfish.bin
|
||||
ifeq ($(XEN_COMPILE_ARCH),x86_64)
|
||||
- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all
|
||||
+ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all
|
||||
(echo "static unsigned int blowfish64_code[] = {"; \
|
||||
od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
|
||||
echo "};") >>$@
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile xen-4.2.0/tools/qemu-xen-traditional/Makefile
|
||||
--- tools/qemu-xen-traditional/Makefile 2012-09-07 00:05:30.000000000 +0800
|
||||
+++ tools/qemu-xen-traditional/Makefile 2012-11-22 06:12:29.433599695 +0800
|
||||
@@ -243,7 +243,7 @@
|
||||
install: all $(if $(BUILD_DOCS),install-doc)
|
||||
mkdir -p "$(DESTDIR)$(bindir)"
|
||||
ifneq ($(TOOLS),)
|
||||
- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
|
||||
+ $(INSTALL) -m 755 $(TOOLS) "$(DESTDIR)$(bindir)"
|
||||
endif
|
||||
ifneq ($(BLOBS),)
|
||||
mkdir -p "$(DESTDIR)$(datadir)"
|
||||
diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile.target xen-4.2.0/tools/qemu-xen-traditional/Makefile.target
|
||||
--- tools/qemu-xen-traditional/Makefile.target 2012-09-07 00:05:30.000000000 +0800
|
||||
+++ tools/qemu-xen-traditional/Makefile.target 2012-11-22 06:26:45.302521231 +0800
|
||||
@@ -755,7 +755,7 @@
|
||||
|
||||
install: all install-hook
|
||||
ifneq ($(PROGS),)
|
||||
- $(INSTALL) -m 755 -s $(PROGS) "$(DESTDIR)$(bindir)"
|
||||
+ $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
|
||||
endif
|
||||
|
||||
# Include automatically generated dependency files
|
||||
diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/Makefile.target
|
||||
--- tools/qemu-xen/Makefile.target 2012-09-11 02:10:52.000000000 +0800
|
||||
+++ tools/qemu-xen/Makefile.target 2012-11-22 07:13:38.894263291 +0800
|
||||
@@ -437,9 +437,6 @@
|
||||
install: all
|
||||
ifneq ($(PROGS),)
|
||||
$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
|
||||
-ifneq ($(STRIP),)
|
||||
- $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS))
|
||||
-endif
|
||||
endif
|
||||
ifdef CONFIG_TRACE_SYSTEMTAP
|
||||
ifdef CONFIG_TRACE_SYSTEMTAP
|
||||
@ -1,502 +0,0 @@
|
||||
# Fix gcc-4.6
|
||||
diff -ur xen-4.2.0.orig/extras/mini-os/minios.mk xen-4.2.0/extras/mini-os/minios.mk
|
||||
--- extras/mini-os/minios.mk 2012-09-17 18:21:17.000000000 +0800
|
||||
+++ extras/mini-os/minios.mk 2012-12-05 14:01:10.653260260 +0800
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
# Define some default flags.
|
||||
# NB. '-Wcast-qual' is nasty, so I omitted it.
|
||||
-DEF_CFLAGS += -fno-builtin -Wall -Werror -Wredundant-decls -Wno-format -Wno-redundant-decls
|
||||
+DEF_CFLAGS += -fno-builtin -Wall -Wredundant-decls -Wno-format -Wno-redundant-decls
|
||||
DEF_CFLAGS += $(call cc-option,$(CC),-fno-stack-protector,)
|
||||
DEF_CFLAGS += $(call cc-option,$(CC),-fgnu89-inline)
|
||||
DEF_CFLAGS += -Wstrict-prototypes -Wnested-externs -Wpointer-arith -Winline
|
||||
diff -ur xen-4.2.0.orig/tools/libxc/Makefile xen-4.2.0/tools/libxc/Makefile
|
||||
--- tools/libxc/Makefile 2012-09-17 18:21:18.000000000 +0800
|
||||
+++ tools/libxc/Makefile 2012-12-05 14:01:10.653260260 +0800
|
||||
@@ -85,7 +85,7 @@
|
||||
|
||||
-include $(XEN_TARGET_ARCH)/Makefile
|
||||
|
||||
-CFLAGS += -Werror -Wmissing-prototypes
|
||||
+CFLAGS += -Wmissing-prototypes
|
||||
CFLAGS += -I. $(CFLAGS_xeninclude)
|
||||
|
||||
# Needed for posix_fadvise64() in xc_linux.c
|
||||
# Drop .config
|
||||
diff -ur xen-4.2.0.orig/Config.mk xen-4.2.0/Config.mk
|
||||
--- Config.mk 2012-09-17 18:23:12.000000000 +0800
|
||||
+++ Config.mk 2012-12-05 14:01:10.641260261 +0800
|
||||
@@ -7,7 +7,6 @@ Drop .config
|
||||
# fallback for older make
|
||||
realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
|
||||
|
||||
--include $(XEN_ROOT)/.config
|
||||
|
||||
# A debug build of Xen and tools?
|
||||
debug ?= n
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
# Tools to run on system hosting the build
|
||||
HOSTCC = gcc
|
||||
-HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
|
||||
+HOSTCFLAGS = -Wstrict-prototypes -O2 -fomit-frame-pointer
|
||||
HOSTCFLAGS += -fno-strict-aliasing
|
||||
|
||||
DISTDIR ?= $(XEN_ROOT)/dist
|
||||
@@ -156,7 +156,7 @@
|
||||
|
||||
CFLAGS += -std=gnu99
|
||||
|
||||
-CFLAGS += -Wall -Wstrict-prototypes
|
||||
+CFLAGS += -Wstrict-prototypes
|
||||
|
||||
# Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...'
|
||||
# and is over-zealous with the printf format lint
|
||||
diff -ur xen-4.2.1.orig/tools/blktap2/drivers/Makefile xen-4.2.1/tools/blktap2/drivers/Makefile
|
||||
--- tools/blktap2/drivers/Makefile 2012-12-17 23:00:11.000000000 +0800
|
||||
+++ tools/blktap2/drivers/Makefile 2013-01-30 12:31:43.539941099 +0800
|
||||
@@ -9,7 +9,7 @@
|
||||
LOCK_UTIL = lock-util
|
||||
INST_DIR = $(SBINDIR)
|
||||
|
||||
-CFLAGS += -Werror -g
|
||||
+CFLAGS += -g
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -fno-strict-aliasing
|
||||
CFLAGS += -I$(BLKTAP_ROOT)/include -I$(BLKTAP_ROOT)/drivers
|
||||
diff -ur xen-4.2.1.orig/tools/debugger/gdbsx/Rules.mk xen-4.2.1/tools/debugger/gdbsx/Rules.mk
|
||||
--- tools/debugger/gdbsx/Rules.mk 2012-12-17 23:00:22.000000000 +0800
|
||||
+++ tools/debugger/gdbsx/Rules.mk 2013-01-30 12:31:43.516941098 +0800
|
||||
@@ -1,4 +1,4 @@
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror -Wmissing-prototypes
|
||||
+CFLAGS += -Wmissing-prototypes
|
||||
# (gcc 4.3x and later) -Wconversion -Wno-sign-conversion
|
||||
diff -ur xen-4.2.1.orig/tools/libaio/harness/Makefile xen-4.2.1/tools/libaio/harness/Makefile
|
||||
--- tools/libaio/harness/Makefile 2012-12-17 23:00:35.000000000 +0800
|
||||
+++ tools/libaio/harness/Makefile 2013-01-30 12:31:43.541941099 +0800
|
||||
@@ -4,7 +4,7 @@
|
||||
HARNESS_SRCS:=main.c
|
||||
# io_queue.c
|
||||
|
||||
-CFLAGS=-Wall -Werror -g -O -laio
|
||||
+CFLAGS=-Wall -g -O -laio
|
||||
#-lpthread -lrt
|
||||
|
||||
all: $(PROGS)
|
||||
diff -ur xen-4.2.1.orig/tools/libfsimage/Rules.mk xen-4.2.1/tools/libfsimage/Rules.mk
|
||||
--- tools/libfsimage/Rules.mk 2012-12-17 23:00:36.000000000 +0800
|
||||
+++ tools/libfsimage/Rules.mk 2013-01-30 12:31:43.515941097 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
CFLAGS += -Wno-unknown-pragmas -I$(XEN_ROOT)/tools/libfsimage/common/ -DFSIMAGE_FSDIR=\"$(FSDIR)\"
|
||||
-CFLAGS += -Werror -D_GNU_SOURCE
|
||||
+CFLAGS += -D_GNU_SOURCE
|
||||
LDFLAGS += -L../common/
|
||||
|
||||
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
|
||||
diff -ur xen-4.2.1.orig/tools/libxl/Makefile xen-4.2.1/tools/libxl/Makefile
|
||||
--- tools/libxl/Makefile 2012-12-17 23:01:08.000000000 +0800
|
||||
+++ tools/libxl/Makefile 2013-01-30 12:31:43.541941099 +0800
|
||||
@@ -11,7 +11,7 @@
|
||||
XLUMAJOR = 1.0
|
||||
XLUMINOR = 1
|
||||
|
||||
-CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
|
||||
+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \
|
||||
-Wno-declaration-after-statement -Wformat-nonliteral
|
||||
CFLAGS += -I. -fPIC
|
||||
|
||||
diff -ur xen-4.2.1.orig/tools/qemu-xen/pc-bios/optionrom/Makefile xen-4.2.1/tools/qemu-xen/pc-bios/optionrom/Makefile
|
||||
--- tools/qemu-xen/pc-bios/optionrom/Makefile 2012-09-11 02:10:52.000000000 +0800
|
||||
+++ tools/qemu-xen/pc-bios/optionrom/Makefile 2013-01-30 12:31:43.528941098 +0800
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
.PHONY : all clean build-all
|
||||
|
||||
-CFLAGS := -Wall -Wstrict-prototypes -Werror -fomit-frame-pointer -fno-builtin
|
||||
+CFLAGS := -Wall -Wstrict-prototypes -fomit-frame-pointer -fno-builtin
|
||||
CFLAGS += -I$(SRC_PATH)
|
||||
CFLAGS += $(call cc-option, $(CFLAGS), -fno-stack-protector)
|
||||
QEMU_CFLAGS = $(CFLAGS)
|
||||
diff -ur xen-4.2.1.orig/tools/xenstat/xentop/Makefile xen-4.2.1/tools/xenstat/xentop/Makefile
|
||||
--- tools/xenstat/xentop/Makefile 2012-12-17 23:01:35.000000000 +0800
|
||||
+++ tools/xenstat/xentop/Makefile 2013-01-30 12:31:43.535941098 +0800
|
||||
@@ -18,7 +18,7 @@
|
||||
all install xentop:
|
||||
else
|
||||
|
||||
-CFLAGS += -DGCC_PRINTF -Wall -Werror $(CFLAGS_libxenstat)
|
||||
+CFLAGS += -DGCC_PRINTF -Wall $(CFLAGS_libxenstat)
|
||||
LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS)
|
||||
CFLAGS += -DHOST_$(XEN_OS)
|
||||
|
||||
diff -ur xen-4.2.1.orig/xen/arch/arm/Rules.mk xen-4.2.1/xen/arch/arm/Rules.mk
|
||||
--- xen/arch/arm/Rules.mk 2012-12-17 23:01:37.000000000 +0800
|
||||
+++ xen/arch/arm/Rules.mk 2013-01-30 12:31:43.498941097 +0800
|
||||
@@ -9,7 +9,7 @@
|
||||
HAS_DEVICE_TREE := y
|
||||
|
||||
CFLAGS += -fno-builtin -fno-common -Wredundant-decls
|
||||
-CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
|
||||
+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
|
||||
CFLAGS += -I$(BASEDIR)/include
|
||||
|
||||
# Prevent floating-point variables from creeping into Xen.
|
||||
diff -ur xen-4.2.1.orig/xen/arch/x86/Rules.mk xen-4.2.1/xen/arch/x86/Rules.mk
|
||||
--- xen/arch/x86/Rules.mk 2012-12-17 23:01:37.000000000 +0800
|
||||
+++ xen/arch/x86/Rules.mk 2013-01-30 12:31:43.490941096 +0800
|
||||
@@ -24,7 +24,7 @@
|
||||
endif
|
||||
|
||||
CFLAGS += -fno-builtin -fno-common -Wredundant-decls
|
||||
-CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
|
||||
+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
|
||||
CFLAGS += -I$(BASEDIR)/include
|
||||
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
|
||||
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
|
||||
diff -ur xen-4.2.1.orig/xen/include/Makefile xen-4.2.1/xen/include/Makefile
|
||||
--- xen/include/Makefile 2012-12-17 23:01:55.000000000 +0800
|
||||
+++ xen/include/Makefile 2013-01-30 12:31:43.502941097 +0800
|
||||
@@ -78,7 +78,7 @@
|
||||
all: headers.chk
|
||||
|
||||
headers.chk: $(filter-out public/arch-% public/%ctl.h public/xsm/% public/%hvm/save.h, $(wildcard public/*.h public/*/*.h) $(public-y)) Makefile
|
||||
- for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -Werror -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new
|
||||
+ for i in $(filter %.h,$^); do $(CC) -ansi -include stdint.h -Wall -W -S -o /dev/null -xc $$i || exit 1; echo $$i; done >$@.new
|
||||
mv $@.new $@
|
||||
|
||||
endif
|
||||
diff -ur xen-4.2.1.orig/tools/tests/mce-test/tools/Makefile xen-4.2.1/tools/tests/mce-test/tools/Makefile
|
||||
--- tools/tests/mce-test/tools/Makefile 2012-12-17 23:01:35.000000000 +0800
|
||||
+++ tools/tests/mce-test/tools/Makefile 2013-01-30 13:01:44.890020152 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=$(CURDIR)/../../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
CFLAGS += $(CFLAGS_libxenguest)
|
||||
CFLAGS += $(CFLAGS_libxenstore)
|
||||
diff -ur xen-4.2.1.orig/tools/tests/mem-sharing/Makefile xen-4.2.1/tools/tests/mem-sharing/Makefile
|
||||
--- tools/tests/mem-sharing/Makefile 2012-12-17 23:01:35.000000000 +0800
|
||||
+++ tools/tests/mem-sharing/Makefile 2013-01-30 13:01:44.890020152 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=$(CURDIR)/../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
CFLAGS += $(CFLAGS_xeninclude)
|
||||
diff -ur xen-4.2.1.orig/tools/tests/xen-access/Makefile xen-4.2.1/tools/tests/xen-access/Makefile
|
||||
--- tools/tests/xen-access/Makefile 2012-12-17 23:01:35.000000000 +0800
|
||||
+++ tools/tests/xen-access/Makefile 2013-01-30 13:01:44.891020152 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=$(CURDIR)/../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS +=
|
||||
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
CFLAGS += $(CFLAGS_libxenguest)
|
||||
diff -ur xen-4.3.0.orig/tools/firmware/Rules.mk xen-4.3.0/tools/firmware/Rules.mk
|
||||
--- tools/firmware/Rules.mk 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ ttools/firmware/Rules.mk 2013-07-20 20:28:57.811836505 +0800
|
||||
@@ -11,8 +11,6 @@
|
||||
CFLAGS += -DNDEBUG
|
||||
endif
|
||||
|
||||
-CFLAGS += -Werror
|
||||
-
|
||||
$(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
|
||||
|
||||
# Extra CFLAGS suitable for an embedded type of environment.
|
||||
diff -ur xen-4.3.0.orig/tools/memshr/Makefile xen-4.3.0/tools/memshr/Makefile
|
||||
--- tools/memshr/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/memshr/Makefile 2013-07-22 23:04:20.165369499 +0800
|
||||
@@ -3,7 +3,6 @@
|
||||
|
||||
LIBMEMSHR-BUILD := libmemshr.a
|
||||
|
||||
-CFLAGS += -Werror
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += $(CFLAGS_xeninclude)
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
diff -ur xen-4.3.0.orig/tools/misc/Makefile xen-4.3.0/tools/misc/Makefile
|
||||
--- tools/misc/Makefile 2013-07-22 23:01:09.019357104 +0800
|
||||
+++ tools/misc/Makefile 2013-07-22 23:03:43.645367131 +0800
|
||||
@@ -1,8 +1,6 @@
|
||||
XEN_ROOT=$(CURDIR)/../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
-
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
CFLAGS += $(CFLAGS_xeninclude)
|
||||
CFLAGS += $(CFLAGS_libxenstore)
|
||||
diff -ur xen-4.3.0.orig/tools/xenpaging/Makefile xen-4.3.0/tools/xenpaging/Makefile
|
||||
--- tools/xenpaging/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/xenpaging/Makefile 2013-07-22 23:04:51.893371557 +0800
|
||||
@@ -11,7 +11,6 @@
|
||||
SRCS += file_ops.c xenpaging.c policy_$(POLICY).c
|
||||
SRCS += pagein.c
|
||||
|
||||
-CFLAGS += -Werror
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -g
|
||||
|
||||
diff -ur xen-4.3.0.orig/tools/xenpmd/Makefile xen-4.3.0/tools/xenpmd/Makefile
|
||||
--- tools/xenpmd/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/xenpmd/Makefile 2013-07-22 23:05:13.357372949 +0800
|
||||
@@ -1,7 +1,6 @@
|
||||
XEN_ROOT=$(CURDIR)/../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
CFLAGS += $(CFLAGS_libxenstore)
|
||||
|
||||
LDLIBS += $(LDLIBS_libxenstore)
|
||||
|
||||
diff -ur xen-4.3.0.orig/tools/blktap2/control/Makefile xen-4.3.0/tools/blktap2/control/Makefile
|
||||
--- tools/blktap2/control/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/blktap2/control/Makefile 2013-07-22 23:31:55.225476829 +0800
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
IBIN = tap-ctl
|
||||
|
||||
-CFLAGS += -Werror
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -I../include -I../drivers
|
||||
CFLAGS += $(CFLAGS_xeninclude)
|
||||
diff -ur xen-4.3.0.orig/tools/blktap2/lvm/Makefile xen-4.3.0/tools/blktap2/lvm/Makefile
|
||||
--- tools/blktap2/lvm/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/blktap2/lvm/Makefile 2013-07-22 23:31:02.329473398 +0800
|
||||
@@ -6,7 +6,6 @@
|
||||
TEST := lvm-util
|
||||
endif
|
||||
|
||||
-CFLAGS += -Werror
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -I../include
|
||||
CFLAGS += -D_GNU_SOURCE
|
||||
diff -ur xen-4.3.0.orig/tools/blktap2/vhd/lib/Makefile xen-4.3.0/tools/blktap2/vhd/lib/Makefile
|
||||
--- tools/blktap2/vhd/lib/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/blktap2/vhd/lib/Makefile 2013-07-22 23:32:23.889478688 +0800
|
||||
@@ -12,7 +12,6 @@
|
||||
|
||||
INST-DIR = $(LIBDIR)
|
||||
|
||||
-CFLAGS += -Werror
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -I../../include
|
||||
CFLAGS += -D_GNU_SOURCE
|
||||
diff -ur xen-4.3.0.orig/tools/blktap2/vhd/Makefile xen-4.3.0/tools/blktap2/vhd/Makefile
|
||||
--- tools/blktap2/vhd/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/blktap2/vhd/Makefile 2013-07-22 23:31:21.641474651 +0800
|
||||
@@ -8,7 +8,6 @@
|
||||
IBIN = vhd-util vhd-update
|
||||
INST_DIR = $(SBINDIR)
|
||||
|
||||
-CFLAGS += -Werror
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -I../include
|
||||
CFLAGS += -D_GNU_SOURCE
|
||||
diff -ur xen-4.3.0.orig/tools/console/Makefile xen-4.3.0/tools/console/Makefile
|
||||
--- tools/console/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/console/Makefile 2013-07-22 23:30:14.392470290 +0800
|
||||
@@ -1,8 +1,6 @@
|
||||
XEN_ROOT=$(CURDIR)/../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
-
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
CFLAGS += $(CFLAGS_libxenstore)
|
||||
LDLIBS += $(LDLIBS_libxenctrl)
|
||||
diff -ur xen-4.3.0.orig/tools/libxen/Makefile.dist xen-4.3.0/tools/libxen/Makefile.dist
|
||||
--- tools/libxen/Makefile.dist 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/libxen/Makefile.dist 2013-07-22 23:29:08.184465996 +0800
|
||||
@@ -22,7 +22,7 @@
|
||||
CFLAGS = -Iinclude \
|
||||
$(shell xml2-config --cflags) \
|
||||
$(shell curl-config --cflags) \
|
||||
- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC
|
||||
+ -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC
|
||||
|
||||
LDFLAGS = $(shell xml2-config --libs) \
|
||||
$(shell curl-config --libs)
|
||||
diff -ur xen-4.3.0.orig/tools/ocaml/common.make xen-4.3.0/tools/ocaml/common.make
|
||||
--- tools/ocaml/common.make 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/ocaml/common.make 2013-07-22 23:28:35.280463862 +0800
|
||||
@@ -9,7 +9,7 @@
|
||||
OCAMLYACC ?= ocamlyacc
|
||||
OCAMLFIND ?= ocamlfind
|
||||
|
||||
-CFLAGS += -fPIC -Werror -I$(shell ocamlc -where)
|
||||
+CFLAGS += -fPIC -I$(shell ocamlc -where)
|
||||
|
||||
OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^ *\(-g\) .*/\1/p')
|
||||
OCAMLOPTFLAGS = $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -cc $(CC) -w F -warn-error F
|
||||
diff -ur xen-4.3.0.orig/tools/python/setup.py xen-4.3.0/tools/python/setup.py
|
||||
--- tools/python/setup.py 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/python/setup.py 2013-07-22 23:32:49.305480336 +0800
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
XEN_ROOT = "../.."
|
||||
|
||||
-extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
|
||||
+extra_compile_args = [ "-fno-strict-aliasing" ]
|
||||
|
||||
PATH_XEN = XEN_ROOT + "/tools/include"
|
||||
PATH_LIBXC = XEN_ROOT + "/tools/libxc"
|
||||
diff -ur xen-4.3.0.orig/tools/xcutils/Makefile xen-4.3.0/tools/xcutils/Makefile
|
||||
--- tools/xcutils/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/xcutils/Makefile 2013-07-22 23:29:45.024468385 +0800
|
||||
@@ -13,8 +13,6 @@
|
||||
|
||||
PROGRAMS = xc_restore xc_save readnotes lsevtchn
|
||||
|
||||
-CFLAGS += -Werror
|
||||
-
|
||||
CFLAGS_xc_restore.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
|
||||
CFLAGS_xc_save.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
|
||||
CFLAGS_readnotes.o := $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest)
|
||||
diff -ur xen-4.3.0.orig/tools/xentrace/Makefile xen-4.3.0/tools/xentrace/Makefile
|
||||
--- tools/xentrace/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/xentrace/Makefile 2013-07-22 23:30:28.216471186 +0800
|
||||
@@ -1,8 +1,6 @@
|
||||
XEN_ROOT=$(CURDIR)/../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
-
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
LDLIBS += $(LDLIBS_libxenctrl)
|
||||
|
||||
diff -ur xen-4.3.0.orig/tools/pygrub/setup.py xen-4.3.0/tools/pygrub/setup.py
|
||||
--- tools/pygrub/setup.py 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/pygrub/setup.py 2013-07-22 23:47:45.664538464 +0800
|
||||
@@ -3,7 +3,7 @@
|
||||
import os
|
||||
import sys
|
||||
|
||||
-extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
|
||||
+extra_compile_args = [ "-fno-strict-aliasing" ]
|
||||
|
||||
XEN_ROOT = "../.."
|
||||
|
||||
diff -ur xen-4.3.0.orig/tools/blktap/drivers/Makefile xen-4.3.0/tools/blktap/drivers/Makefile
|
||||
--- tools/blktap/drivers/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/blktap/drivers/Makefile 2013-07-23 00:40:47.810744824 +0800
|
||||
@@ -4,7 +4,6 @@
|
||||
IBIN = blktapctrl tapdisk
|
||||
QCOW_UTIL = img2qcow qcow2raw qcow-create
|
||||
|
||||
-CFLAGS += -Werror
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -I../lib
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
diff -ur xen-4.3.0.orig/tools/blktap/lib/Makefile xen-4.3.0/tools/blktap/lib/Makefile
|
||||
--- tools/blktap/lib/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/blktap/lib/Makefile 2013-07-23 00:41:56.513749279 +0800
|
||||
@@ -13,7 +13,6 @@
|
||||
SRCS :=
|
||||
SRCS += xenbus.c blkif.c xs_api.c
|
||||
|
||||
-CFLAGS += -Werror
|
||||
CFLAGS += -Wno-unused
|
||||
CFLAGS += -fPIC
|
||||
# get asprintf():
|
||||
diff -ur xen-4.3.0.orig/tools/configure xen-4.3.0/tools/configure
|
||||
--- tools/configure 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/configure 2013-07-23 00:39:37.435740260 +0800
|
||||
@@ -7621,7 +7621,6 @@
|
||||
|
||||
saved_CPPFLAGS="$CPPFLAGS"
|
||||
|
||||
- CPPFLAGS="$CPPFLAGS -Werror"
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "libutil.h" "ac_cv_header_libutil_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_libutil_h" = x""yes; then :
|
||||
|
||||
diff -ur xen-4.3.0.orig/tools/flask/utils/Makefile xen-4.3.0/tools/flask/utils/Makefile
|
||||
--- ools/flask/utils/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/flask/utils/Makefile 2013-07-23 00:40:03.929741978 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
XEN_ROOT=$(CURDIR)/../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Wall -g -Werror
|
||||
+CFLAGS += -Wall
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
|
||||
TESTDIR = testsuite/tmp
|
||||
diff -ur xen-4.3.0.orig/tools/misc/lomount/Makefile xen-4.3.0/tools/misc/lomount/Makefile
|
||||
--- tools/misc/lomount/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/misc/lomount/Makefile 2013-07-23 00:42:05.378749854 +0800
|
||||
@@ -1,8 +1,6 @@
|
||||
XEN_ROOT=$(CURDIR)/../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
-
|
||||
.PHONY: all
|
||||
all: build
|
||||
|
||||
@@ -20,4 +18,4 @@
|
||||
lomount: lomount.o
|
||||
$(CC) $(CFLAGS) -o $@ $<
|
||||
|
||||
--include $(DEPS)
|
||||
\ No newline at end of file
|
||||
+-include $(DEPS)
|
||||
diff -ur xen-4.3.0.orig/tools/qemu-xen-traditional/configure xen-4.3.0/tools/qemu-xen-traditional/configure
|
||||
--- tools/qemu-xen-traditional/configure 2013-06-18 00:39:51.000000000 +0800
|
||||
+++ tools/qemu-xen-traditional/configure 2013-07-23 00:43:39.570755962 +0800
|
||||
@@ -1150,7 +1150,6 @@
|
||||
echo "sparse enabled $sparse"
|
||||
echo "profiler $profiler"
|
||||
echo "static build $static"
|
||||
-echo "-Werror enabled $werror"
|
||||
if test "$darwin" = "yes" ; then
|
||||
echo "Cocoa support $cocoa"
|
||||
fi
|
||||
diff -ur xen-4.3.0.orig/tools/xenbackendd/Makefile xen-4.3.0/tools/xenbackendd/Makefile
|
||||
--- tools/xenbackendd/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/xenbackendd/Makefile 2013-07-23 00:44:16.410758351 +0800
|
||||
@@ -12,7 +12,6 @@
|
||||
XEN_ROOT=$(CURDIR)/../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
CFLAGS += $(CFLAGS_libxenstore)
|
||||
CPPFLAGS += -DXEN_SCRIPT_DIR="\"$(XEN_SCRIPT_DIR)\""
|
||||
LDLIBS += $(LDLIBS_libxenstore)
|
||||
diff -ur xen-4.3.0.orig/tools/xenmon/Makefile xen-4.3.0/tools/xenmon/Makefile
|
||||
--- tools/xenmon/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/xenmon/Makefile 2013-07-23 00:44:51.114760602 +0800
|
||||
@@ -13,7 +13,6 @@
|
||||
XEN_ROOT=$(CURDIR)/../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
|
||||
-CFLAGS += -Werror
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
LDLIBS += $(LDLIBS_libxenctrl)
|
||||
|
||||
diff -ur xen-4.3.0.orig/tools/xenstore/Makefile xen-4.3.0/tools/xenstore/Makefile
|
||||
--- ools/xenstore/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/xenstore/Makefile 2013-07-23 00:45:25.938762860 +0800
|
||||
@@ -4,7 +4,6 @@
|
||||
MAJOR = 3.0
|
||||
MINOR = 3
|
||||
|
||||
-CFLAGS += -Werror
|
||||
CFLAGS += -I.
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
diff -ur xen-4.2.0.orig/tools/tests/x86_emulator/Makefile xen-4.2.0/tools/tests/x86_emulator/Makefile
|
||||
--- tools/tests/x86_emulator/Makefile 2012-09-17 18:21:19.000000000 +0800
|
||||
+++ tools/tests/x86_emulator/Makefile 2012-11-24 05:06:24.355778737 +0800
|
||||
@@ -14,13 +14,13 @@
|
||||
.PHONY: blowfish.h
|
||||
blowfish.h:
|
||||
rm -f blowfish.bin
|
||||
- XEN_TARGET_ARCH=x86_32 make -f blowfish.mk all
|
||||
+ XEN_TARGET_ARCH=x86_32 $(MAKE) -f blowfish.mk all
|
||||
(echo "static unsigned int blowfish32_code[] = {"; \
|
||||
od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
|
||||
echo "};") >$@
|
||||
rm -f blowfish.bin
|
||||
ifeq ($(XEN_COMPILE_ARCH),x86_64)
|
||||
- XEN_TARGET_ARCH=x86_64 make -f blowfish.mk all
|
||||
+ XEN_TARGET_ARCH=x86_64 $(MAKE) -f blowfish.mk all
|
||||
(echo "static unsigned int blowfish64_code[] = {"; \
|
||||
od -v -t x blowfish.bin | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$$/,/';\
|
||||
echo "};") >>$@
|
||||
|
||||
diff -ur xen-4.2.0.orig/tools/firmware/vgabios/Makefile xen-4.2.0/tools/firmware/vgabios/Makefile
|
||||
--- tools/firmware/vgabios/Makefile 2013-02-04 13:56:50.973533544 +0800
|
||||
+++ tools/firmware/vgabios/Makefile 2013-02-04 13:57:21.380535958 +0800
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
.PHONY: release
|
||||
release:
|
||||
- VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" make bios cirrus-bios
|
||||
+ VGABIOS_VERS=\"-DVGABIOS_VERS=\\\"$(RELVERS)\\\"\" $(MAKE) bios cirrus-bios
|
||||
/bin/rm -f *.o *.s *.ld86 \
|
||||
temp.awk.* vgabios.*.orig _vgabios_.*.c core *.bak .#*
|
||||
cp VGABIOS-lgpl-latest.bin ../$(RELEASE).bin
|
||||
@ -1,13 +0,0 @@
|
||||
diff -ur xen-4.2.0.orig/tools/qemu-xen/Makefile.target xen-4.2.0/tools/qemu-xen/Makefile.target
|
||||
--- tools/qemu-xen/Makefile.target 2012-09-11 02:10:52.000000000 +0800
|
||||
+++ tools/qemu-xen/Makefile.target 2012-11-22 07:13:38.894263291 +0800
|
||||
@@ -437,9 +437,6 @@
|
||||
install: all
|
||||
ifneq ($(PROGS),)
|
||||
$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
|
||||
-ifneq ($(STRIP),)
|
||||
- $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS))
|
||||
-endif
|
||||
endif
|
||||
ifdef CONFIG_TRACE_SYSTEMTAP
|
||||
ifdef CONFIG_TRACE_SYSTEMTAP
|
||||
@ -1,79 +0,0 @@
|
||||
diff --git a/tools/qemu-xen/Makefile b/tools/qemu-xen/Makefile
|
||||
index 4d257f1..db2c2ad 100644
|
||||
--- a/tools/qemu-xen/Makefile
|
||||
+++ b/tools/qemu-xen/Makefile
|
||||
@@ -62,7 +62,7 @@ $(call set-vpath, $(SRC_PATH))
|
||||
|
||||
LIBS+=-lz $(LIBS_TOOLS)
|
||||
|
||||
-HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
|
||||
+HELPERS-$(CONFIG_LINUX) = xen-bridge-helper$(EXESUF)
|
||||
|
||||
ifdef BUILD_DOCS
|
||||
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 QMP/qmp-commands.txt
|
||||
@@ -186,7 +186,7 @@ qemu-img$(EXESUF): qemu-img.o $(block-obj-y) libqemuutil.a libqemustub.a
|
||||
qemu-nbd$(EXESUF): qemu-nbd.o $(block-obj-y) libqemuutil.a libqemustub.a
|
||||
qemu-io$(EXESUF): qemu-io.o $(block-obj-y) libqemuutil.a libqemustub.a
|
||||
|
||||
-qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
|
||||
+xen-bridge-helper$(EXESUF): xen-bridge-helper.o
|
||||
|
||||
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o libqemuutil.a libqemustub.a
|
||||
fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
|
||||
diff --git a/tools/qemu-xen/include/net/net.h b/tools/qemu-xen/include/net/net.h
|
||||
index 30e4b04..6691ff0 100644
|
||||
--- a/tools/qemu-xen/include/net/net.h
|
||||
+++ b/tools/qemu-xen/include/net/net.h
|
||||
@@ -178,7 +178,7 @@ NetClientState *net_hub_port_find(int hub_id);
|
||||
|
||||
#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
|
||||
#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
|
||||
-#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper"
|
||||
+#define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/xen-bridge-helper"
|
||||
#define DEFAULT_BRIDGE_INTERFACE "br0"
|
||||
|
||||
void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd);
|
||||
diff --git a/tools/qemu-xen/qemu-bridge-helper.c b/tools/qemu-xen/qemu-bridge-helper.c
|
||||
index 6a0974e..74b4635 100644
|
||||
--- a/tools/qemu-xen/qemu-bridge-helper.c
|
||||
+++ b/tools/qemu-xen/qemu-bridge-helper.c
|
||||
@@ -67,7 +67,7 @@ typedef QSIMPLEQ_HEAD(ACLList, ACLRule) ACLList;
|
||||
static void usage(void)
|
||||
{
|
||||
fprintf(stderr,
|
||||
- "Usage: qemu-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n");
|
||||
+ "Usage: xen-bridge-helper [--use-vnet] --br=bridge --fd=unixfd\n");
|
||||
}
|
||||
|
||||
static int parse_acl_file(const char *filename, ACLList *acl_list)
|
||||
diff --git a/tools/qemu-xen/qemu-options.hx b/tools/qemu-xen/qemu-options.hx
|
||||
index d15338e..f7104f1 100644
|
||||
--- a/tools/qemu-xen/qemu-options.hx
|
||||
+++ b/tools/qemu-xen/qemu-options.hx
|
||||
@@ -1601,7 +1601,7 @@ to disable script execution.
|
||||
|
||||
If running QEMU as an unprivileged user, use the network helper
|
||||
@var{helper} to configure the TAP interface. The default network
|
||||
-helper executable is @file{/usr/local/libexec/qemu-bridge-helper}.
|
||||
+helper executable is @file{/usr/local/libexec/xen-bridge-helper}.
|
||||
|
||||
@option{fd}=@var{h} can be used to specify the handle of an already
|
||||
opened host TAP interface.
|
||||
@@ -1625,7 +1625,7 @@ qemu-system-i386 linux.img \
|
||||
#launch a QEMU instance with the default network helper to
|
||||
#connect a TAP device to bridge br0
|
||||
qemu-system-i386 linux.img \
|
||||
- -net nic -net tap,"helper=/usr/local/libexec/qemu-bridge-helper"
|
||||
+ -net nic -net tap,"helper=/usr/local/libexec/xen-bridge-helper"
|
||||
@end example
|
||||
|
||||
@item -netdev bridge,id=@var{id}[,br=@var{bridge}][,helper=@var{helper}]
|
||||
@@ -1634,7 +1634,7 @@ Connect a host TAP network interface to a host bridge device.
|
||||
|
||||
Use the network helper @var{helper} to configure the TAP interface and
|
||||
attach it to the bridge. The default network helper executable is
|
||||
-@file{/usr/local/libexec/qemu-bridge-helper} and the default bridge
|
||||
+@file{/usr/local/libexec/xen-bridge-helper} and the default bridge
|
||||
device is @file{br0}.
|
||||
|
||||
Examples:
|
||||
@ -1,11 +0,0 @@
|
||||
--- xen-3.4.0/tools/hotplug/Linux/network-bridge.orig 2009-05-18 15:05:38.000000000 +0400
|
||||
+++ xen-3.4.0/tools/hotplug/Linux/network-bridge 2009-06-09 23:16:05.000000000 +0400
|
||||
@@ -101,7 +101,7 @@
|
||||
tdev=tmpbridge
|
||||
|
||||
get_ip_info() {
|
||||
- addr_pfx=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e 's/ .*//'`
|
||||
+ addr_pfx=`ip addr show dev $1 | egrep '^ *inet ' | sed -e 's/ *inet //' -e "s/$1//"`
|
||||
gateway=`ip route show dev $1 | fgrep default | sed 's/default via //'`
|
||||
}
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
|
||||
index cb13212..d83c51a 100644
|
||||
--- a/tools/firmware/Makefile
|
||||
+++ b/tools/firmware/Makefile
|
||||
@@ -22,7 +22,6 @@ ovmf-dir:
|
||||
cp ovmf-makefile ovmf-dir/Makefile;
|
||||
|
||||
seabios-dir:
|
||||
- GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_TAG) seabios-dir
|
||||
cp seabios-config seabios-dir/.config;
|
||||
|
||||
.PHONY: all
|
||||
@ -1,12 +0,0 @@
|
||||
diff -ur xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile xen-4.2.0/tools/qemu-xen-traditional/Makefile
|
||||
--- xen-4.2.0.orig/tools/qemu-xen-traditional/Makefile 2012-09-07 00:05:30.000000000 +0800
|
||||
+++ xen-4.2.0/tools/qemu-xen-traditional/Makefile 2013-01-29 11:12:20.502989453 +0800
|
||||
@@ -275,7 +275,7 @@
|
||||
|
||||
# documentation
|
||||
%.html: %.texi
|
||||
- texi2html -monolithic -number $<
|
||||
+ texi2html -monolithic $<
|
||||
|
||||
%.info: %.texi
|
||||
makeinfo $< -o $@
|
||||
@ -1,26 +0,0 @@
|
||||
diff --git a/tools/qemu-xen/po/Makefile b/tools/qemu-xen/po/Makefile
|
||||
index 705166e..2e7cdcb 100644
|
||||
--- a/tools/qemu-xen/po/Makefile
|
||||
+++ b/tools/qemu-xen/po/Makefile
|
||||
@@ -30,7 +30,7 @@ install: $(OBJS)
|
||||
for obj in $(OBJS); do \
|
||||
base=`basename $$obj .mo`; \
|
||||
$(INSTALL) -d $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES; \
|
||||
- $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/qemu.mo; \
|
||||
+ $(INSTALL) -m644 $$obj $(DESTDIR)$(prefix)/share/locale/$$base/LC_MESSAGES/xenqemu.mo; \
|
||||
done
|
||||
|
||||
%.mo: %.po
|
||||
diff --git a/tools/qemu-xen/ui/gtk.c b/tools/qemu-xen/ui/gtk.c
|
||||
index c38146f..d3c331b 100644
|
||||
--- a/tools/qemu-xen/ui/gtk.c
|
||||
+++ b/tools/qemu-xen/ui/gtk.c
|
||||
@@ -31,7 +31,7 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
-#define GETTEXT_PACKAGE "qemu"
|
||||
+#define GETTEXT_PACKAGE "xenqemu"
|
||||
#define LOCALEDIR "po"
|
||||
|
||||
#include "qemu-common.h"
|
||||
@ -1,29 +0,0 @@
|
||||
diff -ur xen-4.2.2.orig/tools/qemu-xen/qemu-options.hx xen-4.2.2/tools/qemu-xen/qemu-options.hx
|
||||
--- tools/qemu-xen/qemu-options.hx 2013-04-06 07:39:54.000000000 +0800
|
||||
+++ tools/qemu-xen/qemu-options.hx 2013-05-17 22:16:56.924728753 +0800
|
||||
@@ -1799,18 +1799,13 @@
|
||||
devices.
|
||||
|
||||
Syntax for specifying a sheepdog device
|
||||
-@table @list
|
||||
-``sheepdog:<vdiname>''
|
||||
-
|
||||
-``sheepdog:<vdiname>:<snapid>''
|
||||
-
|
||||
-``sheepdog:<vdiname>:<tag>''
|
||||
-
|
||||
-``sheepdog:<host>:<port>:<vdiname>''
|
||||
-
|
||||
-``sheepdog:<host>:<port>:<vdiname>:<snapid>''
|
||||
-
|
||||
-``sheepdog:<host>:<port>:<vdiname>:<tag>''
|
||||
+@table @code
|
||||
+@item sheepdog:<vdiname>
|
||||
+@item sheepdog:<vdiname>:<snapid>
|
||||
+@item sheepdog:<vdiname>:<tag>
|
||||
+@item sheepdog:<host>:<port>:<vdiname>
|
||||
+@item sheepdog:<host>:<port>:<vdiname>:<snapid>
|
||||
+@item sheepdog:<host>:<port>:<vdiname>:<tag>
|
||||
@end table
|
||||
|
||||
Example
|
||||
@ -1,33 +0,0 @@
|
||||
--- xen-4.2.0/tools/firmware/hvmloader/Makefile.orig 2012-05-27 21:57:04.481812859 +0100
|
||||
+++ xen-4.2.0/tools/firmware/hvmloader/Makefile 2012-06-02 18:52:44.935034128 +0100
|
||||
@@ -48,7 +48,7 @@
|
||||
else
|
||||
CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.bin
|
||||
endif
|
||||
-ETHERBOOT_ROMS := $(addprefix ../etherboot/ipxe/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS)))
|
||||
+ETHERBOOT_ROMS := $(addprefix /usr/share/ipxe/, $(addsuffix .rom, $(ETHERBOOT_NICS)))
|
||||
endif
|
||||
|
||||
ROMS :=
|
||||
--- xen-4.2.0/Config.mk.orig 2012-05-27 21:57:04.479812884 +0100
|
||||
+++ xen-4.2.0/Config.mk 2012-06-02 18:55:14.087169469 +0100
|
||||
@@ -206,7 +206,7 @@
|
||||
# Wed Jun 26 16:30:45 2013 +0100
|
||||
# xen: Don't perform SMP setup.
|
||||
|
||||
-ETHERBOOT_NICS ?= rtl8139 8086100e
|
||||
+ETHERBOOT_NICS ?= 10ec8139 8086100e
|
||||
|
||||
# Specify which qemu-dm to use. This may be `ioemu' to use the old
|
||||
# Mercurial in-tree version, or a local directory, or a git URL.
|
||||
--- xen-4.2.0/tools/firmware/Makefile.orig 2012-05-27 21:57:04.480812871 +0100
|
||||
+++ xen-4.2.0/tools/firmware/Makefile 2012-06-02 19:03:52.254691484 +0100
|
||||
@@ -10,7 +10,7 @@
|
||||
#SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
|
||||
SUBDIRS-$(CONFIG_ROMBIOS) += rombios
|
||||
SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
|
||||
-SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
|
||||
+#SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
|
||||
SUBDIRS-y += hvmloader
|
||||
|
||||
ovmf:
|
||||
@ -1,22 +0,0 @@
|
||||
--- xen-4.2.0/tools/firmware/Makefile.orig 2012-05-12 16:40:47.000000000 +0100
|
||||
+++ xen-4.2.0/tools/firmware/Makefile 2012-05-27 21:55:23.438076078 +0100
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
SUBDIRS-y :=
|
||||
SUBDIRS-$(CONFIG_OVMF) += ovmf
|
||||
-SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
|
||||
+#SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
|
||||
SUBDIRS-$(CONFIG_ROMBIOS) += rombios
|
||||
SUBDIRS-$(CONFIG_ROMBIOS) += vgabios
|
||||
SUBDIRS-$(CONFIG_ROMBIOS) += etherboot
|
||||
--- xen-4.2.0/tools/firmware/hvmloader/Makefile.orig 2012-05-12 16:40:47.000000000 +0100
|
||||
+++ xen-4.2.0/tools/firmware/hvmloader/Makefile 2012-05-27 21:53:45.625298906 +0100
|
||||
@@ -70,7 +70,7 @@
|
||||
ifeq ($(CONFIG_SEABIOS),y)
|
||||
OBJS += seabios.o
|
||||
CFLAGS += -DENABLE_SEABIOS
|
||||
-SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin
|
||||
+SEABIOS_ROM := /usr/share/seabios/bios.bin
|
||||
ROMS += $(SEABIOS_ROM)
|
||||
endif
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -ur xen-4.1.1.orig//tools/hotplug/Linux/network-bridge xen-4.1.1/tools/hotplug/Linux/network-bridge
|
||||
--- xen-4.1.1.orig//tools/hotplug/Linux/network-bridge 2011-10-14 02:28:43.481714285 +0800
|
||||
+++ xen-4.1.1/tools/hotplug/Linux/network-bridge 2011-10-16 01:06:11.226673108 +0800
|
||||
@@ -216,7 +216,7 @@
|
||||
return
|
||||
fi
|
||||
|
||||
- if [ `brctl show | wc -l` != 1 ]; then
|
||||
+ if [ `brctl show | grep $netdev | wc -l` != 0 ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From: Roger Pau Monne
|
||||
Subject: [Qemu-devel] [PATCH RFC 2/3] xen_disk: fix memory leak
|
||||
Date: Mon, 31 Dec 2012 13:16:13 +0100
|
||||
|
||||
On ioreq_release the full ioreq
|
||||
was memset to 0, loosing all the data
|
||||
and memory allocations inside the QEMUIOVector, which leads to a
|
||||
memory leak. Create a new function to specifically reset ioreq.
|
||||
|
||||
Reported-by: Maik Wessler <address@hidden>
|
||||
Signed-off-by: Roger Pau Monné <address@hidden>
|
||||
Cc: address@hidden
|
||||
Cc: Stefano Stabellini <address@hidden>
|
||||
Cc: Anthony PERARD <address@hidden>
|
||||
---
|
||||
hw/xen_disk.c | 28 ++++++++++++++++++++++++++--
|
||||
1 files changed, 26 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/hw/xen_disk.c b/hw/xen_disk.c
|
||||
index a159ee5..1eb485a 100644
|
||||
--- a/tools/qemu-xen/hw/xen_disk.c
|
||||
+++ b/tools/qemu-xen/hw/xen_disk.c
|
||||
@@ -113,6 +113,31 @@ struct XenBlkDev {
|
||||
|
||||
/* ------------------------------------------------------------- */
|
||||
|
||||
+static void ioreq_reset(struct ioreq *ioreq)
|
||||
+{
|
||||
+ memset(&ioreq->req, 0, sizeof(ioreq->req));
|
||||
+ ioreq->status = 0;
|
||||
+ ioreq->start = 0;
|
||||
+ ioreq->presync = 0;
|
||||
+ ioreq->postsync = 0;
|
||||
+ ioreq->mapped = 0;
|
||||
+
|
||||
+ memset(ioreq->domids, 0, sizeof(ioreq->domids));
|
||||
+ memset(ioreq->refs, 0, sizeof(ioreq->refs));
|
||||
+ ioreq->prot = 0;
|
||||
+ memset(ioreq->page, 0, sizeof(ioreq->page));
|
||||
+ ioreq->pages = NULL;
|
||||
+
|
||||
+ ioreq->aio_inflight = 0;
|
||||
+ ioreq->aio_errors = 0;
|
||||
+
|
||||
+ ioreq->blkdev = NULL;
|
||||
+ memset(&ioreq->list, 0, sizeof(ioreq->list));
|
||||
+ memset(&ioreq->acct, 0, sizeof(ioreq->acct));
|
||||
+
|
||||
+ qemu_iovec_reset(&ioreq->v);
|
||||
+}
|
||||
+
|
||||
static struct ioreq *ioreq_start(struct XenBlkDev *blkdev)
|
||||
{
|
||||
struct ioreq *ioreq = NULL;
|
||||
@@ -130,7 +155,6 @@ static struct ioreq *ioreq_start(struct XenBlkDev *blkdev)
|
||||
/* get one from freelist */
|
||||
ioreq = QLIST_FIRST(&blkdev->freelist);
|
||||
QLIST_REMOVE(ioreq, list);
|
||||
- qemu_iovec_reset(&ioreq->v);
|
||||
}
|
||||
QLIST_INSERT_HEAD(&blkdev->inflight, ioreq, list);
|
||||
blkdev->requests_inflight++;
|
||||
@@ -154,7 +178,7 @@ static void ioreq_release(struct ioreq *ioreq, bool finish)
|
||||
struct XenBlkDev *blkdev = ioreq->blkdev;
|
||||
|
||||
QLIST_REMOVE(ioreq, list);
|
||||
- memset(ioreq, 0, sizeof(*ioreq));
|
||||
+ ioreq_reset(ioreq);
|
||||
ioreq->blkdev = blkdev;
|
||||
QLIST_INSERT_HEAD(&blkdev->freelist, ioreq, list);
|
||||
if (finish) {
|
||||
--
|
||||
1.7.7.5 (Apple Git-26)
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
fix invalid installs of docs/man and config into /usr/local
|
||||
|
||||
--- xen-4.2.2-orig/tools/Makefile 2013-04-23 18:42:55.000000000 +0200
|
||||
+++ xen-4.2.2/tools/Makefile 2013-07-29 17:01:33.764093405 +0200
|
||||
@@ -199,6 +199,9 @@
|
||||
--bindir=$(LIBEXEC) \
|
||||
--datadir=$(SHAREDIR)/qemu-xen \
|
||||
--disable-kvm \
|
||||
+ --mandir=/usr/share/man \
|
||||
+ --docdir=/usr/share/doc/xen \
|
||||
+ --sysconfdir=/etc \
|
||||
--python=$(PYTHON) \
|
||||
$(IOEMU_CONFIGURE_CROSS); \
|
||||
$(MAKE) all
|
||||
diff --git a/tools/qemu-xen-traditional/configure b/tools/qemu-xen-traditional/configure
|
||||
index 904e019..b70ee25 100755
|
||||
--- a/tools/qemu-xen-traditional/configure
|
||||
+++ b/tools/qemu-xen-traditional/configure
|
||||
@@ -1107,10 +1107,7 @@ elif $cc $ARCH_CFLAGS -o $TMPE $TMPC -lrt > /dev/null 2> /dev/null ; then
|
||||
rt=yes
|
||||
fi
|
||||
|
||||
-if test "$rt" = "yes" ; then
|
||||
- # Hack, we should have a general purpose LIBS for this sort of thing
|
||||
- AIOLIBS="$AIOLIBS -lrt"
|
||||
-fi
|
||||
+AIOLIBS="$AIOLIBS -lrt"
|
||||
|
||||
if test "$mingw32" = "yes" ; then
|
||||
if test -z "$prefix" ; then
|
||||
@ -1,48 +0,0 @@
|
||||
diff --git a/tools/qemu-xen/configure b/tools/qemu-xen/configure
|
||||
index ea2f8f8..9726440 100755
|
||||
--- a/tools/qemu-xen/configure
|
||||
+++ b/tools/qemu-xen/configure
|
||||
@@ -2459,17 +2459,41 @@ fi
|
||||
|
||||
|
||||
##########################################
|
||||
+# Do we need libm
|
||||
+cat > $TMPC << EOF
|
||||
+#include <math.h>
|
||||
+int main(void) { return isnan(sin(0.0)); }
|
||||
+EOF
|
||||
+if compile_prog "" "" ; then
|
||||
+ :
|
||||
+elif compile_prog "" "-lm" ; then
|
||||
+ LIBS="-lm $LIBS"
|
||||
+ libs_qga="-lm $libs_qga"
|
||||
+else
|
||||
+ error_exit "libm check failed"
|
||||
+fi
|
||||
+
|
||||
+##########################################
|
||||
# Do we need librt
|
||||
+# uClibc provides 2 versions of clock_gettime(), one with realtime
|
||||
+# support and one without. This means that the clock_gettime() don't
|
||||
+# need -lrt. We still need it for timer_create() so we check for this
|
||||
+# function in addition.
|
||||
cat > $TMPC <<EOF
|
||||
#include <signal.h>
|
||||
#include <time.h>
|
||||
-int main(void) { clockid_t id; return clock_gettime(id, NULL); }
|
||||
+int main(void) {
|
||||
+ timer_create(CLOCK_REALTIME, NULL, NULL);
|
||||
+ return clock_gettime(CLOCK_REALTIME, NULL);
|
||||
+}
|
||||
EOF
|
||||
|
||||
if compile_prog "" "" ; then
|
||||
:
|
||||
-elif compile_prog "" "-lrt" ; then
|
||||
+# we need pthread for static linking. use previous pthread test result
|
||||
+elif compile_prog "" "-lrt $pthread_lib" ; then
|
||||
LIBS="-lrt $LIBS"
|
||||
+ libs_qga="-lrt $libs_qga"
|
||||
fi
|
||||
|
||||
if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
|
||||
@ -1,13 +0,0 @@
|
||||
--- xen-4.2.4.org/tools/hotplug/Linux/Makefile 2014-05-22 05:39:57.090009337 +0000
|
||||
+++ xen-4.2.4/tools/hotplug/Linux/Makefile 2014-05-22 05:41:03.816009464 +0000
|
||||
@@ -31,8 +31,8 @@
|
||||
XEN_HOTPLUG_SCRIPTS = xen-backend.agent
|
||||
|
||||
UDEVVER = 0
|
||||
-ifeq ($(shell [ -x /sbin/udevadm ] && echo 1),1)
|
||||
-UDEVVER = $(shell /sbin/udevadm info -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' )
|
||||
+ifeq ($(shell [ -x $(shell which udevadm) ] && echo 1),1)
|
||||
+UDEVVER = $(shell $(shell which udevadm) info -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' )
|
||||
endif
|
||||
ifeq ($(shell [ -x /usr/bin/udevinfo ] && echo 1),1)
|
||||
UDEVVER = $(shell /usr/bin/udevinfo -V | sed -e 's/^[^0-9]* \([0-9]\{1,\}\)[^0-9]\{0,\}/\1/' )
|
||||
@ -1,84 +0,0 @@
|
||||
diff -ur xen-4.3.0.orig/tools/debugger/gdbsx/gx/Makefile xen-4.3.0/tools/debugger/gdbsx/gx/Makefile
|
||||
--- tools/debugger/gdbsx/gx/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/debugger/gdbsx/gx/Makefile 2013-07-23 16:14:53.930752663 +0800
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
GX_OBJS := gx_comm.o gx_main.o gx_utils.o gx_local.o
|
||||
GX_HDRS := $(wildcard *.h)
|
||||
+AR="ar"
|
||||
|
||||
.PHONY: all
|
||||
all: gx_all.a
|
||||
@@ -16,5 +17,5 @@
|
||||
# $(CC) -c $(CFLAGS) -o $@ $<
|
||||
|
||||
gx_all.a: $(GX_OBJS) Makefile $(GX_HDRS)
|
||||
- ar cr $@ $(GX_OBJS) # problem with ld using -m32
|
||||
+ $(AR) cr $@ $(GX_OBJS) # problem with ld using -m32
|
||||
|
||||
diff -ur xen-4.3.0.orig/tools/firmware/rombios/Makefile xen-4.3.0/tools/firmware/rombios/Makefile
|
||||
--- tools/firmware/rombios/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/firmware/rombios/Makefile 2013-07-23 21:57:21.258085143 +0800
|
||||
@@ -1,5 +1,6 @@
|
||||
XEN_ROOT = $(CURDIR)/../../..
|
||||
include $(XEN_ROOT)/tools/Rules.mk
|
||||
+CC="gcc"
|
||||
|
||||
SUBDIRS := 32bit
|
||||
|
||||
@@ -16,7 +17,7 @@
|
||||
rm -f $(DEPS)
|
||||
|
||||
BIOS-bochs-latest: rombios.c biossums 32bitgateway.c tcgbios.c
|
||||
- gcc -DBX_SMP_PROCESSORS=1 -E -P $< > _rombios_.c
|
||||
+ $(CC) -DBX_SMP_PROCESSORS=1 -E -P $< > _rombios_.c
|
||||
bcc -o rombios.s -C-c -D__i86__ -0 -S _rombios_.c
|
||||
sed -e 's/^\.text//' -e 's/^\.data//' rombios.s > _rombios_.s
|
||||
as86 _rombios_.s -b tmp.bin -u- -w- -g -0 -j -O -l rombios.txt
|
||||
@@ -26,6 +27,6 @@
|
||||
rm -f _rombios_.s
|
||||
|
||||
biossums: biossums.c
|
||||
- gcc -o biossums biossums.c
|
||||
+ $(CC) -o biossums biossums.c
|
||||
|
||||
-include $(DEPS)
|
||||
diff -ur xen-4.3.0.orig/tools/firmware/vgabios/Makefile xen-4.3.0/tools/firmware/vgabios/Makefile
|
||||
--- tools/firmware/vgabios/Makefile 2013-07-09 18:46:56.000000000 +0800
|
||||
+++ tools/firmware/vgabios/Makefile 2013-07-23 22:42:39.041261388 +0800
|
||||
@@ -37,7 +37,7 @@
|
||||
tar czvf ../$(RELEASE).tgz --exclude CVS -C .. $(RELEASE)/
|
||||
|
||||
vgabios.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h
|
||||
- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) > _vgabios_.c
|
||||
+ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE $(VGABIOS_DATE) > _vgabios_.c
|
||||
$(BCC) -o vgabios.s -C-c -D__i86__ -S -0 _vgabios_.c
|
||||
sed -e 's/^\.text//' -e 's/^\.data//' vgabios.s > _vgabios_.s
|
||||
$(AS86) _vgabios_.s -b vgabios.bin -u -w- -g -0 -j -O -l vgabios.txt
|
||||
@@ -47,7 +47,7 @@
|
||||
ls -l VGABIOS-lgpl-latest.bin
|
||||
|
||||
vgabios.debug.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h
|
||||
- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) > _vgabios-debug_.c
|
||||
+ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DVBE -DDEBUG $(VGABIOS_DATE) > _vgabios-debug_.c
|
||||
$(BCC) -o vgabios-debug.s -C-c -D__i86__ -S -0 _vgabios-debug_.c
|
||||
sed -e 's/^\.text//' -e 's/^\.data//' vgabios-debug.s > _vgabios-debug_.s
|
||||
$(AS86) _vgabios-debug_.s -b vgabios.debug.bin -u -w- -g -0 -j -O -l vgabios.debug.txt
|
||||
@@ -57,7 +57,7 @@
|
||||
ls -l VGABIOS-lgpl-latest.debug.bin
|
||||
|
||||
vgabios-cirrus.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
|
||||
- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus_.c
|
||||
+ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus_.c
|
||||
$(BCC) -o vgabios-cirrus.s -C-c -D__i86__ -S -0 _vgabios-cirrus_.c
|
||||
sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus.s > _vgabios-cirrus_.s
|
||||
$(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -g -0 -j -O -l vgabios-cirrus.txt
|
||||
@@ -67,7 +67,7 @@
|
||||
ls -l VGABIOS-lgpl-latest.cirrus.bin
|
||||
|
||||
vgabios-cirrus.debug.bin: biossums vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
|
||||
- $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c
|
||||
+ $(CC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG -DPCIBIOS $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c
|
||||
$(BCC) -o vgabios-cirrus-debug.s -C-c -D__i86__ -S -0 _vgabios-cirrus-debug_.c
|
||||
sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus-debug.s > _vgabios-cirrus-debug_.s
|
||||
$(AS86) _vgabios-cirrus-debug_.s -b vgabios-cirrus.debug.bin -u -w- -g -0 -j -O -l vgabios-cirrus.debug.txt
|
||||
@ -1,48 +0,0 @@
|
||||
diff --git a/tools/configure b/tools/configure
|
||||
index afc3000..6187468 100755
|
||||
--- a/tools/configure
|
||||
+++ b/tools/configure
|
||||
@@ -4615,7 +4615,7 @@ if test x"${PERL}" = x"no"
|
||||
then
|
||||
as_fn_error $? "Unable to find perl, please install perl" "$LINENO" 5
|
||||
fi
|
||||
-if test "x$xapi" = "xy"; then :
|
||||
+if test "x$xenapi" = "xy"; then :
|
||||
|
||||
# Extract the first word of "curl-config", so it can be a program name with args.
|
||||
set dummy curl-config; ac_word=$2
|
||||
diff --git a/tools/configure.ac b/tools/configure.ac
|
||||
index 0754f0e..cc884f7 100644
|
||||
--- a/tools/configure.ac
|
||||
+++ b/tools/configure.ac
|
||||
@@ -150,7 +150,7 @@ AC_PROG_INSTALL
|
||||
AC_PATH_PROG([BISON], [bison])
|
||||
AC_PATH_PROG([FLEX], [flex])
|
||||
AX_PATH_PROG_OR_FAIL([PERL], [perl])
|
||||
-AS_IF([test "x$xapi" = "xy"], [
|
||||
+AS_IF([test "x$xenapi" = "xy"], [
|
||||
AX_PATH_PROG_OR_FAIL([CURL], [curl-config])
|
||||
AX_PATH_PROG_OR_FAIL([XML], [xml2-config])
|
||||
])
|
||||
diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile
|
||||
index b66f0bc..94b854b 100644
|
||||
--- a/tools/libxen/Makefile
|
||||
+++ b/tools/libxen/Makefile
|
||||
@@ -22,12 +22,15 @@ MAJOR = 1.0
|
||||
MINOR = 0
|
||||
|
||||
CFLAGS += -Iinclude \
|
||||
- $(shell $(XML2_CONFIG) --cflags) \
|
||||
- $(shell $(CURL_CONFIG) --cflags) \
|
||||
-fPIC
|
||||
|
||||
+ifeq ($(LIBXENAPI_BINDINGS),y)
|
||||
+CFLAGS += $(shell $(XML2_CONFIG) --cflags) \
|
||||
+ $(shell $(CURL_CONFIG) --cflags)
|
||||
+
|
||||
LDFLAGS += $(shell $(XML2_CONFIG) --libs) \
|
||||
$(shell $(CURL_CONFIG) --libs)
|
||||
+endif
|
||||
|
||||
LIBXENAPI_HDRS = $(wildcard include/xen/api/*.h) include/xen/api/xen_all.h
|
||||
LIBXENAPI_OBJS = $(patsubst %.c, %.o, $(wildcard src/*.c))
|
||||
@ -1,52 +0,0 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/files/xend.initd-r2,v 1.5 2014/01/02 04:58:53 idella4 Exp $
|
||||
|
||||
extra_commands="status"
|
||||
|
||||
depend() {
|
||||
need net xenconsoled xenstored
|
||||
before xendomains sshd
|
||||
}
|
||||
|
||||
await_daemons_up() {
|
||||
for ((i=0; i<5; i++)); do
|
||||
sleep 1
|
||||
/usr/sbin/xend status && return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
is_privileged_domain() {
|
||||
grep -qsE '^control_d$' /proc/xen/capabilities
|
||||
return $?
|
||||
}
|
||||
|
||||
start() {
|
||||
if is_privileged_domain ; then
|
||||
ebegin "Starting Xen control daemon"
|
||||
/usr/sbin/xend start
|
||||
/usr/sbin/xend status || await_daemons_up
|
||||
eend $?
|
||||
else
|
||||
eerror "Can't start xend - this is not a privileged domain."
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
stop() {
|
||||
if [ "$(xm list | wc -l)" -gt 2 ]; then
|
||||
ebegin " Stopping all domains"
|
||||
/usr/sbin/xl shutdown -a -w >/dev/null
|
||||
eend $?
|
||||
fi
|
||||
|
||||
ebegin "Stopping Xen control daemon"
|
||||
/usr/sbin/xend stop
|
||||
eend $?
|
||||
}
|
||||
|
||||
status() {
|
||||
is_privileged_domain && /usr/sbin/xend status
|
||||
}
|
||||
@ -1,411 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r6.ebuild,v 1.4 2014/07/30 19:20:10 ssuominen Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
PYTHON_REQ_USE='xml,threads'
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
KEYWORDS="amd64 x86"
|
||||
UPSTREAM_VER=3
|
||||
GENTOO_VER=
|
||||
SEABIOS_VER=1.6.3.2
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
|
||||
http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
S="${WORKDIR}/xen-${PV}"
|
||||
fi
|
||||
|
||||
inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
|
||||
|
||||
DESCRIPTION="Xend daemon and tools"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
DOCS=( README docs/README.xen-bugtool )
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend system-seabios"
|
||||
|
||||
REQUIRED_USE="hvm? ( qemu )
|
||||
${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="dev-libs/lzo:2
|
||||
dev-libs/glib:2
|
||||
dev-libs/yajl
|
||||
dev-libs/libgcrypt:0
|
||||
dev-python/lxml[${PYTHON_USEDEP}]
|
||||
dev-python/pypam[${PYTHON_USEDEP}]
|
||||
sys-libs/zlib
|
||||
sys-power/iasl
|
||||
system-seabios? ( sys-firmware/seabios )
|
||||
sys-firmware/ipxe
|
||||
dev-ml/findlib
|
||||
hvm? ( media-libs/libsdl )
|
||||
${PYTHON_DEPS}
|
||||
api? ( dev-libs/libxml2
|
||||
net-misc/curl )
|
||||
${PYTHON_DEPS}
|
||||
pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
|
||||
sys-devel/bin86
|
||||
sys-devel/dev86
|
||||
dev-lang/perl
|
||||
app-misc/pax-utils
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
dev-tex/latex2html[png,gif]
|
||||
media-gfx/transfig
|
||||
media-gfx/graphviz
|
||||
dev-tex/xcolor
|
||||
dev-texlive/texlive-latexextra
|
||||
virtual/latex-base
|
||||
dev-tex/latexmk
|
||||
dev-texlive/texlive-latex
|
||||
dev-texlive/texlive-pictures
|
||||
dev-texlive/texlive-latexrecommended
|
||||
)
|
||||
hvm? ( x11-proto/xproto
|
||||
!net-libs/libiscsi )"
|
||||
RDEPEND="sys-apps/iproute2
|
||||
net-misc/bridge-utils
|
||||
ocaml? ( >=dev-lang/ocaml-4 )
|
||||
screen? (
|
||||
app-misc/screen
|
||||
app-admin/logrotate
|
||||
)
|
||||
virtual/udev"
|
||||
|
||||
# hvmloader is used to bootstrap a fully virtualized kernel
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
export "CONFIG_LOMOUNT=y"
|
||||
|
||||
if has_version dev-libs/libgcrypt:0; then
|
||||
export "CONFIG_GCRYPT=y"
|
||||
fi
|
||||
|
||||
if use qemu; then
|
||||
export "CONFIG_IOEMU=y"
|
||||
else
|
||||
export "CONFIG_IOEMU=n"
|
||||
fi
|
||||
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64 ; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
use api && export "LIBXENAPI_BINDINGS=y"
|
||||
use flask && export "FLASK_ENABLE=y"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo
|
||||
fi
|
||||
|
||||
# Drop .config, fixes to gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch
|
||||
|
||||
# Xend
|
||||
if ! use xend; then
|
||||
sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
|
||||
-i tools/misc/Makefile || die "Disabling xend failed"
|
||||
sed -e 's:^XEND_INITD:#XEND_INITD:' \
|
||||
-i tools/examples/Makefile || die "Disabling xend failed"
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
|
||||
# try and remove all the default cflags
|
||||
find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
|
||||
-exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} + || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
if ! use pygrub; then
|
||||
sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
|
||||
fi
|
||||
|
||||
# Disable hvm support on systems that don't support x86_32 binaries.
|
||||
if ! use hvm; then
|
||||
sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
|
||||
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
|
||||
# Bug 351648
|
||||
elif ! use x86 && ! has x86 $(get_all_abis); then
|
||||
mkdir -p "${WORKDIR}"/extra-headers/gnu || die
|
||||
touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
|
||||
export CPATH="${WORKDIR}"/extra-headers
|
||||
fi
|
||||
|
||||
# Don't bother with qemu, only needed for fully virtualised guests
|
||||
if ! use qemu; then
|
||||
sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
|
||||
sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
|
||||
fi
|
||||
|
||||
# Fix texi2html build error with new texi2html, qemu.doc.html
|
||||
epatch "${FILESDIR}"/${PN}-4-docfix.patch \
|
||||
"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
|
||||
|
||||
# Fix network broadcast on bridged networks
|
||||
epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
|
||||
|
||||
# Bug 496708
|
||||
epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
|
||||
use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
|
||||
|
||||
# Fix bridge by idella4, bug #362575
|
||||
epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
|
||||
|
||||
# Don't build ipxe with pie on hardened, Bug #360805
|
||||
if gcc-specs-pie; then
|
||||
epatch "${FILESDIR}"/ipxe-nopie.patch
|
||||
fi
|
||||
|
||||
# Prevent double stripping of files at install
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
|
||||
|
||||
# fix jobserver in Makefile
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch
|
||||
|
||||
# add missing header, Bug #467200
|
||||
epatch "${FILESDIR}"/xen-4-ulong.patch \
|
||||
"${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch
|
||||
|
||||
# Set dom0-min-mem to kb; Bug #472982
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
|
||||
|
||||
# Bug 463840
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-install.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-rt-link.patch
|
||||
|
||||
# Bug 379537
|
||||
epatch "${FILESDIR}"/fix-gold-ld.patch
|
||||
|
||||
# Bug 510976
|
||||
epatch "${FILESDIR}"/${P}-udev-rules.patch
|
||||
|
||||
# bundled seabios
|
||||
epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch
|
||||
mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
|
||||
pushd tools/firmware/ > /dev/null
|
||||
ln -s seabios-dir-remote seabios-dir || die
|
||||
popd > /dev/null
|
||||
|
||||
# Bug 472438
|
||||
sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
|
||||
-i Config.mk || die
|
||||
|
||||
# Bug 445986
|
||||
sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
|
||||
|
||||
# fix QA warning, create /var/run/, /var/lock dynamically
|
||||
sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
|
||||
tools/libxl/Makefile || die
|
||||
|
||||
sed -i -e "/\/var\/run\//d" \
|
||||
tools/xenstore/Makefile \
|
||||
tools/pygrub/Makefile || die
|
||||
|
||||
sed -i -e "/\/var\/lock\/subsys/d" \
|
||||
tools/Makefile || die
|
||||
|
||||
# xencommons, Bug #492332, sed lighter weight than patching
|
||||
sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
|
||||
-i tools/hotplug/Linux/init.d/xencommons || die
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export VARTEXFONTS="${T}/fonts"
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
use custom-cflags || unset CFLAGS
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
unset LDFLAGS
|
||||
unset CFLAGS
|
||||
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
|
||||
|
||||
use doc && emake -C docs txt html
|
||||
emake -C docs man-pages
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Override auto-detection in the build system, bug #382573
|
||||
export INITD_DIR=/tmp/init.d
|
||||
export CONFIG_LEAF_DIR=../tmp/default
|
||||
|
||||
# Let the build system compile installed Python modules.
|
||||
local PYTHONDONTWRITEBYTECODE
|
||||
export PYTHONDONTWRITEBYTECODE
|
||||
|
||||
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \
|
||||
XEN_PYTHON_NATIVE_INSTALL=y install-tools
|
||||
# Fix the remaining Python shebangs.
|
||||
python_fix_shebang "${ED}"
|
||||
|
||||
# Remove RedHat-specific stuff
|
||||
rm -rf "${D}"tmp || die
|
||||
|
||||
# uncomment lines in xl.conf
|
||||
sed -e 's:^#autoballoon=1:autoballoon=1:' \
|
||||
-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
|
||||
-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
|
||||
-i tools/examples/xl.conf || die
|
||||
|
||||
# Reset bash completion dir; Bug 472438
|
||||
mv "${D}"bash-completion "${D}"usr/share/ || die
|
||||
|
||||
if use doc; then
|
||||
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
|
||||
|
||||
dohtml -r docs/
|
||||
docinto pdf
|
||||
dodoc ${DOCS[@]}
|
||||
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
|
||||
fi
|
||||
|
||||
rm -rf "${D}"/usr/share/doc/xen/
|
||||
doman docs/man?/*
|
||||
|
||||
if use xend; then
|
||||
newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
|
||||
fi
|
||||
newconfd "${FILESDIR}"/xendomains.confd xendomains
|
||||
newconfd "${FILESDIR}"/xenstored.confd xenstored
|
||||
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
|
||||
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
|
||||
newinitd "${FILESDIR}"/xenstored.initd xenstored
|
||||
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
|
||||
newinitd "${FILESDIR}"/xencommons.initd xencommons
|
||||
newconfd "${FILESDIR}"/xencommons.confd xencommons
|
||||
|
||||
if use screen; then
|
||||
cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
|
||||
cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
|
||||
keepdir /var/log/xen-consoles
|
||||
fi
|
||||
|
||||
if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
|
||||
mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
|
||||
mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die
|
||||
fi
|
||||
|
||||
# For -static-libs wrt Bug 384355
|
||||
if ! use static-libs; then
|
||||
rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
|
||||
fi
|
||||
|
||||
# xend expects these to exist
|
||||
keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
|
||||
|
||||
# for xendomains
|
||||
keepdir /etc/xen/auto
|
||||
|
||||
# Temp QA workaround
|
||||
dodir "$(get_udevdir)"
|
||||
mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
|
||||
rm -rf "${D}"/etc/udev
|
||||
|
||||
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
|
||||
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
|
||||
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the offical wiki page:"
|
||||
elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml"
|
||||
elog "http://wiki.xen.org/wiki/Main_Page"
|
||||
elog ""
|
||||
elog "Recommended to utilise the xencommons script to config sytem at boot."
|
||||
elog "Add by use of rc-update on completion of the install"
|
||||
|
||||
if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
|
||||
echo
|
||||
ewarn "xend may not work when python is built with stack smashing protection (ssp)."
|
||||
ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
|
||||
ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
|
||||
fi
|
||||
|
||||
# TODO: we need to have the current Python slot here.
|
||||
if ! has_version "dev-lang/python[ncurses]"; then
|
||||
echo
|
||||
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
|
||||
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
|
||||
fi
|
||||
|
||||
if has_version "sys-apps/iproute2[minimal]"; then
|
||||
echo
|
||||
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
|
||||
ewarn "will not work until you rebuild iproute2 without USE=minimal."
|
||||
fi
|
||||
|
||||
if ! use hvm; then
|
||||
echo
|
||||
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
|
||||
elog "support enable the hvm use flag."
|
||||
elog "An x86 or amd64 system is required to build HVM support."
|
||||
fi
|
||||
|
||||
if use xend; then
|
||||
echo
|
||||
elog "xend capability has been enabled and installed"
|
||||
fi
|
||||
|
||||
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
|
||||
echo
|
||||
elog "xensv is broken upstream (Gentoo bug #142011)."
|
||||
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
|
||||
fi
|
||||
}
|
||||
@ -1,411 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.4-r7.ebuild,v 1.1 2014/08/19 14:16:01 dlan Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
PYTHON_REQ_USE='xml,threads'
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
UPSTREAM_VER=4
|
||||
GENTOO_VER=
|
||||
SEABIOS_VER=1.6.3.2
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
|
||||
http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
S="${WORKDIR}/xen-${PV}"
|
||||
fi
|
||||
|
||||
inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
|
||||
|
||||
DESCRIPTION="Xend daemon and tools"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
DOCS=( README docs/README.xen-bugtool )
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs xend system-seabios"
|
||||
|
||||
REQUIRED_USE="hvm? ( qemu )
|
||||
${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="dev-libs/lzo:2
|
||||
dev-libs/glib:2
|
||||
dev-libs/yajl
|
||||
dev-libs/libgcrypt:0
|
||||
dev-python/lxml[${PYTHON_USEDEP}]
|
||||
dev-python/pypam[${PYTHON_USEDEP}]
|
||||
sys-libs/zlib
|
||||
sys-power/iasl
|
||||
system-seabios? ( sys-firmware/seabios )
|
||||
sys-firmware/ipxe
|
||||
dev-ml/findlib
|
||||
hvm? ( media-libs/libsdl )
|
||||
${PYTHON_DEPS}
|
||||
api? ( dev-libs/libxml2
|
||||
net-misc/curl )
|
||||
${PYTHON_DEPS}
|
||||
pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
|
||||
sys-devel/bin86
|
||||
sys-devel/dev86
|
||||
dev-lang/perl
|
||||
app-misc/pax-utils
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
dev-tex/latex2html[png,gif]
|
||||
media-gfx/transfig
|
||||
media-gfx/graphviz
|
||||
dev-tex/xcolor
|
||||
dev-texlive/texlive-latexextra
|
||||
virtual/latex-base
|
||||
dev-tex/latexmk
|
||||
dev-texlive/texlive-latex
|
||||
dev-texlive/texlive-pictures
|
||||
dev-texlive/texlive-latexrecommended
|
||||
)
|
||||
hvm? ( x11-proto/xproto
|
||||
!net-libs/libiscsi )"
|
||||
RDEPEND="sys-apps/iproute2
|
||||
net-misc/bridge-utils
|
||||
ocaml? ( >=dev-lang/ocaml-4 )
|
||||
screen? (
|
||||
app-misc/screen
|
||||
app-admin/logrotate
|
||||
)
|
||||
virtual/udev"
|
||||
|
||||
# hvmloader is used to bootstrap a fully virtualized kernel
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
export "CONFIG_LOMOUNT=y"
|
||||
|
||||
if has_version dev-libs/libgcrypt:0; then
|
||||
export "CONFIG_GCRYPT=y"
|
||||
fi
|
||||
|
||||
if use qemu; then
|
||||
export "CONFIG_IOEMU=y"
|
||||
else
|
||||
export "CONFIG_IOEMU=n"
|
||||
fi
|
||||
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64 ; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
use api && export "LIBXENAPI_BINDINGS=y"
|
||||
use flask && export "FLASK_ENABLE=y"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo
|
||||
fi
|
||||
|
||||
# Drop .config, fixes to gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4-fix_dotconfig-gcc.patch
|
||||
|
||||
# Xend
|
||||
if ! use xend; then
|
||||
sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
|
||||
-i tools/misc/Makefile || die "Disabling xend failed"
|
||||
sed -e 's:^XEND_INITD:#XEND_INITD:' \
|
||||
-i tools/examples/Makefile || die "Disabling xend failed"
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
|
||||
# try and remove all the default cflags
|
||||
find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
|
||||
-exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} + || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
if ! use pygrub; then
|
||||
sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
|
||||
fi
|
||||
|
||||
# Disable hvm support on systems that don't support x86_32 binaries.
|
||||
if ! use hvm; then
|
||||
sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
|
||||
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
|
||||
# Bug 351648
|
||||
elif ! use x86 && ! has x86 $(get_all_abis); then
|
||||
mkdir -p "${WORKDIR}"/extra-headers/gnu || die
|
||||
touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
|
||||
export CPATH="${WORKDIR}"/extra-headers
|
||||
fi
|
||||
|
||||
# Don't bother with qemu, only needed for fully virtualised guests
|
||||
if ! use qemu; then
|
||||
sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
|
||||
sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
|
||||
fi
|
||||
|
||||
# Fix texi2html build error with new texi2html, qemu.doc.html
|
||||
epatch "${FILESDIR}"/${PN}-4-docfix.patch \
|
||||
"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
|
||||
|
||||
# Fix network broadcast on bridged networks
|
||||
epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
|
||||
|
||||
# Bug 496708
|
||||
epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
|
||||
use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
|
||||
|
||||
# Fix bridge by idella4, bug #362575
|
||||
epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
|
||||
|
||||
# Don't build ipxe with pie on hardened, Bug #360805
|
||||
if gcc-specs-pie; then
|
||||
epatch "${FILESDIR}"/ipxe-nopie.patch
|
||||
fi
|
||||
|
||||
# Prevent double stripping of files at install
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
|
||||
|
||||
# fix jobserver in Makefile
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-jserver.patch
|
||||
|
||||
# add missing header, Bug #467200
|
||||
epatch "${FILESDIR}"/xen-4-ulong.patch \
|
||||
"${FILESDIR}"/${PN}-4.2-xen_disk_leak.patch
|
||||
|
||||
# Set dom0-min-mem to kb; Bug #472982
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
|
||||
|
||||
# Bug 463840
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-install.patch
|
||||
epatch "${FILESDIR}"/${PN}-4.2.2-rt-link.patch
|
||||
|
||||
# Bug 379537
|
||||
epatch "${FILESDIR}"/fix-gold-ld.patch
|
||||
|
||||
# Bug 510976
|
||||
epatch "${FILESDIR}"/${P}-udev-rules.patch
|
||||
|
||||
# bundled seabios
|
||||
epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch
|
||||
mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
|
||||
pushd tools/firmware/ > /dev/null
|
||||
ln -s seabios-dir-remote seabios-dir || die
|
||||
popd > /dev/null
|
||||
|
||||
# Bug 472438
|
||||
sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
|
||||
-i Config.mk || die
|
||||
|
||||
# Bug 445986
|
||||
sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
|
||||
|
||||
# fix QA warning, create /var/run/, /var/lock dynamically
|
||||
sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
|
||||
tools/libxl/Makefile || die
|
||||
|
||||
sed -i -e "/\/var\/run\//d" \
|
||||
tools/xenstore/Makefile \
|
||||
tools/pygrub/Makefile || die
|
||||
|
||||
sed -i -e "/\/var\/lock\/subsys/d" \
|
||||
tools/Makefile || die
|
||||
|
||||
# xencommons, Bug #492332, sed lighter weight than patching
|
||||
sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
|
||||
-i tools/hotplug/Linux/init.d/xencommons || die
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export VARTEXFONTS="${T}/fonts"
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
use custom-cflags || unset CFLAGS
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
unset LDFLAGS
|
||||
unset CFLAGS
|
||||
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
|
||||
|
||||
use doc && emake -C docs txt html
|
||||
emake -C docs man-pages
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Override auto-detection in the build system, bug #382573
|
||||
export INITD_DIR=/tmp/init.d
|
||||
export CONFIG_LEAF_DIR=../tmp/default
|
||||
|
||||
# Let the build system compile installed Python modules.
|
||||
local PYTHONDONTWRITEBYTECODE
|
||||
export PYTHONDONTWRITEBYTECODE
|
||||
|
||||
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \
|
||||
XEN_PYTHON_NATIVE_INSTALL=y install-tools
|
||||
# Fix the remaining Python shebangs.
|
||||
python_fix_shebang "${ED}"
|
||||
|
||||
# Remove RedHat-specific stuff
|
||||
rm -rf "${D}"tmp || die
|
||||
|
||||
# uncomment lines in xl.conf
|
||||
sed -e 's:^#autoballoon=1:autoballoon=1:' \
|
||||
-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
|
||||
-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
|
||||
-i tools/examples/xl.conf || die
|
||||
|
||||
# Reset bash completion dir; Bug 472438
|
||||
mv "${D}"bash-completion "${D}"usr/share/ || die
|
||||
|
||||
if use doc; then
|
||||
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
|
||||
|
||||
dohtml -r docs/
|
||||
docinto pdf
|
||||
dodoc ${DOCS[@]}
|
||||
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
|
||||
fi
|
||||
|
||||
rm -rf "${D}"/usr/share/doc/xen/
|
||||
doman docs/man?/*
|
||||
|
||||
if use xend; then
|
||||
newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
|
||||
fi
|
||||
newconfd "${FILESDIR}"/xendomains.confd xendomains
|
||||
newconfd "${FILESDIR}"/xenstored.confd xenstored
|
||||
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
|
||||
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
|
||||
newinitd "${FILESDIR}"/xenstored.initd xenstored
|
||||
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
|
||||
newinitd "${FILESDIR}"/xencommons.initd xencommons
|
||||
newconfd "${FILESDIR}"/xencommons.confd xencommons
|
||||
|
||||
if use screen; then
|
||||
cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
|
||||
cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
|
||||
keepdir /var/log/xen-consoles
|
||||
fi
|
||||
|
||||
if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
|
||||
mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
|
||||
mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die
|
||||
fi
|
||||
|
||||
# For -static-libs wrt Bug 384355
|
||||
if ! use static-libs; then
|
||||
rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
|
||||
fi
|
||||
|
||||
# xend expects these to exist
|
||||
keepdir /var/run/xenstored /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
|
||||
|
||||
# for xendomains
|
||||
keepdir /etc/xen/auto
|
||||
|
||||
# Temp QA workaround
|
||||
dodir "$(get_udevdir)"
|
||||
mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
|
||||
rm -rf "${D}"/etc/udev
|
||||
|
||||
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
|
||||
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
|
||||
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the offical wiki page:"
|
||||
elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml"
|
||||
elog "http://wiki.xen.org/wiki/Main_Page"
|
||||
elog ""
|
||||
elog "Recommended to utilise the xencommons script to config sytem at boot."
|
||||
elog "Add by use of rc-update on completion of the install"
|
||||
|
||||
if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
|
||||
echo
|
||||
ewarn "xend may not work when python is built with stack smashing protection (ssp)."
|
||||
ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
|
||||
ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
|
||||
fi
|
||||
|
||||
# TODO: we need to have the current Python slot here.
|
||||
if ! has_version "dev-lang/python[ncurses]"; then
|
||||
echo
|
||||
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
|
||||
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
|
||||
fi
|
||||
|
||||
if has_version "sys-apps/iproute2[minimal]"; then
|
||||
echo
|
||||
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
|
||||
ewarn "will not work until you rebuild iproute2 without USE=minimal."
|
||||
fi
|
||||
|
||||
if ! use hvm; then
|
||||
echo
|
||||
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
|
||||
elog "support enable the hvm use flag."
|
||||
elog "An x86 or amd64 system is required to build HVM support."
|
||||
fi
|
||||
|
||||
if use xend; then
|
||||
echo
|
||||
elog "xend capability has been enabled and installed"
|
||||
fi
|
||||
|
||||
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
|
||||
echo
|
||||
elog "xensv is broken upstream (Gentoo bug #142011)."
|
||||
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
|
||||
fi
|
||||
}
|
||||
@ -1,354 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.5.ebuild,v 1.2 2014/09/12 02:21:28 dlan Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
PYTHON_REQ_USE='xml,threads'
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
UPSTREAM_VER=
|
||||
# xen-tools's gentoo patches tarball
|
||||
GENTOO_VER=0
|
||||
# xen-tools's gentoo patches version which apply to this specific ebuild
|
||||
GENTOO_GPV=0
|
||||
SEABIOS_VER=1.6.3.2
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
|
||||
http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
S="${WORKDIR}/xen-${PV}"
|
||||
fi
|
||||
|
||||
inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
|
||||
|
||||
DESCRIPTION="Xend daemon and tools"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
DOCS=( README docs/README.xen-bugtool )
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="api custom-cflags debug doc flask hvm qemu ocaml pygrub screen static-libs system-seabios"
|
||||
|
||||
REQUIRED_USE="hvm? ( qemu )
|
||||
${PYTHON_REQUIRED_USE}"
|
||||
|
||||
DEPEND="dev-libs/lzo:2
|
||||
dev-libs/glib:2
|
||||
dev-libs/yajl
|
||||
dev-libs/libgcrypt:0
|
||||
dev-python/lxml[${PYTHON_USEDEP}]
|
||||
dev-python/pypam[${PYTHON_USEDEP}]
|
||||
sys-libs/zlib
|
||||
sys-power/iasl
|
||||
system-seabios? ( sys-firmware/seabios )
|
||||
sys-firmware/ipxe
|
||||
dev-ml/findlib
|
||||
hvm? ( media-libs/libsdl )
|
||||
${PYTHON_DEPS}
|
||||
api? ( dev-libs/libxml2
|
||||
net-misc/curl )
|
||||
${PYTHON_DEPS}
|
||||
pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
|
||||
sys-devel/bin86
|
||||
sys-devel/dev86
|
||||
dev-lang/perl
|
||||
app-misc/pax-utils
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
dev-tex/latex2html[png,gif]
|
||||
media-gfx/transfig
|
||||
media-gfx/graphviz
|
||||
dev-tex/xcolor
|
||||
dev-texlive/texlive-latexextra
|
||||
virtual/latex-base
|
||||
dev-tex/latexmk
|
||||
dev-texlive/texlive-latex
|
||||
dev-texlive/texlive-pictures
|
||||
dev-texlive/texlive-latexrecommended
|
||||
)
|
||||
hvm? ( x11-proto/xproto
|
||||
!net-libs/libiscsi )"
|
||||
RDEPEND="sys-apps/iproute2
|
||||
net-misc/bridge-utils
|
||||
ocaml? ( >=dev-lang/ocaml-4 )
|
||||
screen? (
|
||||
app-misc/screen
|
||||
app-admin/logrotate
|
||||
)
|
||||
virtual/udev"
|
||||
|
||||
# hvmloader is used to bootstrap a fully virtualized kernel
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
export "CONFIG_LOMOUNT=y"
|
||||
|
||||
if has_version dev-libs/libgcrypt:0; then
|
||||
export "CONFIG_GCRYPT=y"
|
||||
fi
|
||||
|
||||
if use qemu; then
|
||||
export "CONFIG_IOEMU=y"
|
||||
else
|
||||
export "CONFIG_IOEMU=n"
|
||||
fi
|
||||
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64 ; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
use api && export "LIBXENAPI_BINDINGS=y"
|
||||
use flask && export "FLASK_ENABLE=y"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
|
||||
source "${FILESDIR}"/gentoo-patches.conf
|
||||
_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
|
||||
for i in ${!_gpv}; do
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo/$i
|
||||
done
|
||||
fi
|
||||
|
||||
use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch
|
||||
|
||||
if gcc-specs-pie; then
|
||||
epatch "${WORKDIR}"/patches-gentoo/ipxe-nopie.patch
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
|
||||
# try and remove all the default cflags
|
||||
find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
|
||||
-exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} + || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
if ! use pygrub; then
|
||||
sed -e '/^SUBDIRS-$(PYTHON_TOOLS) += pygrub$/d' -i tools/Makefile || die
|
||||
fi
|
||||
|
||||
# Disable hvm support on systems that don't support x86_32 binaries.
|
||||
if ! use hvm; then
|
||||
sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
|
||||
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
|
||||
# Bug 351648
|
||||
elif ! use x86 && ! has x86 $(get_all_abis); then
|
||||
mkdir -p "${WORKDIR}"/extra-headers/gnu || die
|
||||
touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
|
||||
export CPATH="${WORKDIR}"/extra-headers
|
||||
fi
|
||||
|
||||
# Don't bother with qemu, only needed for fully virtualised guests
|
||||
if ! use qemu; then
|
||||
sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
|
||||
sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
|
||||
fi
|
||||
|
||||
mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
|
||||
pushd tools/firmware/ > /dev/null
|
||||
ln -s seabios-dir-remote seabios-dir || die
|
||||
popd > /dev/null
|
||||
|
||||
# Bug 472438
|
||||
sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
|
||||
-i Config.mk || die
|
||||
|
||||
# Bug 445986
|
||||
sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' -i tools/firmware/Makefile || die
|
||||
|
||||
# fix QA warning, create /var/run/, /var/lock dynamically
|
||||
sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
|
||||
tools/libxl/Makefile || die
|
||||
|
||||
sed -i -e "/\/var\/run\//d" \
|
||||
tools/xenstore/Makefile \
|
||||
tools/pygrub/Makefile || die
|
||||
|
||||
sed -i -e "/\/var\/lock\/subsys/d" \
|
||||
tools/Makefile || die
|
||||
|
||||
# xencommons, Bug #492332, sed lighter weight than patching
|
||||
sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
|
||||
-i tools/hotplug/Linux/init.d/xencommons || die
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export VARTEXFONTS="${T}/fonts"
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
use custom-cflags || unset CFLAGS
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
unset LDFLAGS
|
||||
unset CFLAGS
|
||||
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
|
||||
|
||||
use doc && emake -C docs txt html
|
||||
emake -C docs man-pages
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Override auto-detection in the build system, bug #382573
|
||||
export INITD_DIR=/tmp/init.d
|
||||
export CONFIG_LEAF_DIR=../tmp/default
|
||||
|
||||
# Let the build system compile installed Python modules.
|
||||
local PYTHONDONTWRITEBYTECODE
|
||||
export PYTHONDONTWRITEBYTECODE
|
||||
|
||||
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" install-tools \
|
||||
XEN_PYTHON_NATIVE_INSTALL=y install-tools
|
||||
# Fix the remaining Python shebangs.
|
||||
python_fix_shebang "${ED}"
|
||||
|
||||
# Remove RedHat-specific stuff
|
||||
rm -rf "${D}"tmp || die
|
||||
|
||||
# uncomment lines in xl.conf
|
||||
sed -e 's:^#autoballoon=1:autoballoon=1:' \
|
||||
-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
|
||||
-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
|
||||
-i tools/examples/xl.conf || die
|
||||
|
||||
# Reset bash completion dir; Bug 472438
|
||||
mv "${D}"bash-completion "${D}"usr/share/ || die
|
||||
|
||||
if use doc; then
|
||||
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
|
||||
|
||||
dohtml -r docs/
|
||||
docinto pdf
|
||||
dodoc ${DOCS[@]}
|
||||
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
|
||||
fi
|
||||
|
||||
rm -rf "${D}"/usr/share/doc/xen/
|
||||
doman docs/man?/*
|
||||
|
||||
newconfd "${FILESDIR}"/xendomains.confd xendomains
|
||||
newconfd "${FILESDIR}"/xenstored.confd xenstored
|
||||
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
|
||||
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
|
||||
newinitd "${FILESDIR}"/xenstored.initd xenstored
|
||||
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
|
||||
newinitd "${FILESDIR}"/xencommons.initd xencommons
|
||||
newconfd "${FILESDIR}"/xencommons.confd xencommons
|
||||
|
||||
if use screen; then
|
||||
cat "${FILESDIR}"/xendomains-screen.confd >> "${ED}"/etc/conf.d/xendomains || die
|
||||
cp "${FILESDIR}"/xen-consoles.logrotate "${ED}"/etc/xen/ || die
|
||||
keepdir /var/log/xen-consoles
|
||||
fi
|
||||
|
||||
if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
|
||||
mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
|
||||
mv "${D}"usr/lib/xen/bin/qemu* "${D}"usr/$(get_libdir)/xen/bin/ || die
|
||||
fi
|
||||
|
||||
# For -static-libs wrt Bug 384355
|
||||
if ! use static-libs; then
|
||||
rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
|
||||
fi
|
||||
|
||||
# xend expects these to exist
|
||||
keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
|
||||
|
||||
# for xendomains
|
||||
keepdir /etc/xen/auto
|
||||
|
||||
# Temp QA workaround
|
||||
dodir "$(get_udevdir)"
|
||||
mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
|
||||
rm -rf "${D}"/etc/udev
|
||||
|
||||
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
|
||||
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
|
||||
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the offical wiki page:"
|
||||
elog "http://www.gentoo.org/doc/en/xen-gu"${D}"usr/ide.xml"
|
||||
elog "http://wiki.xen.org/wiki/Main_Page"
|
||||
elog ""
|
||||
elog "Recommended to utilise the xencommons script to config sytem at boot."
|
||||
elog "Add by use of rc-update on completion of the install"
|
||||
|
||||
# TODO: we need to have the current Python slot here.
|
||||
if ! has_version "dev-lang/python[ncurses]"; then
|
||||
echo
|
||||
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
|
||||
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
|
||||
fi
|
||||
|
||||
if has_version "sys-apps/iproute2[minimal]"; then
|
||||
echo
|
||||
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
|
||||
ewarn "will not work until you rebuild iproute2 without USE=minimal."
|
||||
fi
|
||||
|
||||
if ! use hvm; then
|
||||
echo
|
||||
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
|
||||
elog "support enable the hvm use flag."
|
||||
elog "An x86 or amd64 system is required to build HVM support."
|
||||
fi
|
||||
|
||||
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
|
||||
echo
|
||||
elog "xensv is broken upstream (Gentoo bug #142011)."
|
||||
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
|
||||
fi
|
||||
}
|
||||
@ -1,445 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2-r5.ebuild,v 1.4 2014/10/07 05:58:38 idella4 Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
PYTHON_REQ_USE='xml,threads'
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
KEYWORDS="amd64 -x86"
|
||||
UPSTREAM_VER=3
|
||||
GENTOO_VER=
|
||||
SEABIOS_VER=1.7.1-stable-xen
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
|
||||
http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
S="${WORKDIR}/xen-${PV}"
|
||||
fi
|
||||
|
||||
inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
|
||||
|
||||
DESCRIPTION="Xend daemon and tools"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
DOCS=( README docs/README.xen-bugtool )
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
|
||||
# >=dev-lang/ocaml-4 stable
|
||||
# Masked in profiles/eapi-5-files instead
|
||||
IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend system-seabios"
|
||||
|
||||
REQUIRED_USE="hvm? ( qemu )
|
||||
${PYTHON_REQUIRED_USE}
|
||||
pygrub? ( python )"
|
||||
|
||||
DEPEND="dev-libs/lzo:2
|
||||
dev-libs/glib:2
|
||||
dev-libs/yajl
|
||||
dev-libs/libgcrypt:0
|
||||
dev-python/lxml[${PYTHON_USEDEP}]
|
||||
pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
|
||||
sys-libs/zlib
|
||||
sys-power/iasl
|
||||
system-seabios? ( sys-firmware/seabios )
|
||||
sys-firmware/ipxe
|
||||
hvm? ( media-libs/libsdl )
|
||||
${PYTHON_DEPS}
|
||||
api? ( dev-libs/libxml2
|
||||
net-misc/curl )
|
||||
pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
|
||||
sys-devel/bin86
|
||||
sys-devel/dev86
|
||||
dev-lang/perl
|
||||
app-misc/pax-utils
|
||||
dev-python/markdown[${PYTHON_USEDEP}]
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
dev-tex/latex2html[png,gif]
|
||||
media-gfx/graphviz
|
||||
dev-tex/xcolor
|
||||
media-gfx/transfig
|
||||
dev-texlive/texlive-latexextra
|
||||
virtual/latex-base
|
||||
dev-tex/latexmk
|
||||
dev-texlive/texlive-latex
|
||||
dev-texlive/texlive-pictures
|
||||
dev-texlive/texlive-latexrecommended
|
||||
)
|
||||
hvm? ( x11-proto/xproto
|
||||
!net-libs/libiscsi )
|
||||
qemu? ( x11-libs/pixman )
|
||||
ocaml? ( dev-ml/findlib
|
||||
>=dev-lang/ocaml-4 )"
|
||||
RDEPEND="sys-apps/iproute2
|
||||
net-misc/bridge-utils
|
||||
screen? (
|
||||
app-misc/screen
|
||||
app-admin/logrotate
|
||||
)
|
||||
virtual/udev"
|
||||
|
||||
# hvmloader is used to bootstrap a fully virtualized kernel
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
export "CONFIG_LOMOUNT=y"
|
||||
|
||||
if has_version dev-libs/libgcrypt:0; then
|
||||
export "CONFIG_GCRYPT=y"
|
||||
fi
|
||||
|
||||
if use qemu; then
|
||||
export "CONFIG_IOEMU=y"
|
||||
else
|
||||
export "CONFIG_IOEMU=n"
|
||||
fi
|
||||
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64 ; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo
|
||||
fi
|
||||
|
||||
# Drop .config, fixes to gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch
|
||||
|
||||
# Fix texi2html build error with new texi2html, qemu.doc.html
|
||||
epatch "${FILESDIR}"/${PN}-4-docfix.patch \
|
||||
"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
|
||||
|
||||
# Fix network broadcast on bridged networks
|
||||
epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
|
||||
|
||||
# Bug 496708
|
||||
epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
|
||||
use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
|
||||
|
||||
# Fix bridge by idella4, bug #362575
|
||||
epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
|
||||
|
||||
# Prevent double stripping of files at install
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
|
||||
|
||||
# fix jobserver in Makefile
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch
|
||||
|
||||
# add missing header
|
||||
epatch "${FILESDIR}"/xen-4-ulong.patch
|
||||
|
||||
# Set dom0-min-mem to kb; Bug #472982
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
|
||||
|
||||
# Bug 477676
|
||||
epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch
|
||||
|
||||
# Bug 379537
|
||||
epatch "${FILESDIR}"/fix-gold-ld.patch
|
||||
|
||||
# Prevent file collision with qemu package Bug 478064
|
||||
epatch "${FILESDIR}"/qemu-bridge.patch
|
||||
mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
|
||||
|
||||
# bundled seabios
|
||||
epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch
|
||||
mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
|
||||
pushd tools/firmware/ > /dev/null
|
||||
ln -s seabios-dir-remote seabios-dir || die
|
||||
popd > /dev/null
|
||||
|
||||
# Xend
|
||||
if ! use xend; then
|
||||
sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
|
||||
-i tools/misc/Makefile || die "Disabling xend failed"
|
||||
sed -e 's:^XEND_INITD:#XEND_INITD:' \
|
||||
-i tools/examples/Makefile || die "Disabling xend failed"
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
|
||||
# try and remove all the default cflags
|
||||
find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
|
||||
-exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} + || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
if ! use pygrub; then
|
||||
sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
|
||||
fi
|
||||
|
||||
if ! use python; then
|
||||
sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
|
||||
fi
|
||||
|
||||
# Disable hvm support on systems that don't support x86_32 binaries.
|
||||
if ! use hvm; then
|
||||
sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
|
||||
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
|
||||
# Bug 351648
|
||||
elif ! use x86 && ! has x86 $(get_all_abis); then
|
||||
mkdir -p "${WORKDIR}"/extra-headers/gnu || die
|
||||
touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
|
||||
export CPATH="${WORKDIR}"/extra-headers
|
||||
fi
|
||||
|
||||
# Don't bother with qemu, only needed for fully virtualised guests
|
||||
if ! use qemu; then
|
||||
sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
|
||||
sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
|
||||
fi
|
||||
|
||||
# Bug 472438
|
||||
sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
|
||||
-i Config.mk || die
|
||||
|
||||
use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die
|
||||
use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
|
||||
sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
|
||||
-i tools/firmware/Makefile || die
|
||||
|
||||
# xencommons, Bug #492332, sed lighter weight than patching
|
||||
sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
|
||||
-i tools/hotplug/Linux/init.d/xencommons || die
|
||||
|
||||
# Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844
|
||||
sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \
|
||||
-i tools/libxl/libxl_bootloader.c || die
|
||||
|
||||
# fix QA warning, create /var/run/, /var/lock dynamically
|
||||
sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
|
||||
tools/libxl/Makefile || die
|
||||
|
||||
sed -i -e "/\/var\/run\//d" \
|
||||
tools/xenstore/Makefile \
|
||||
tools/pygrub/Makefile || die
|
||||
|
||||
sed -i -e "/\/var\/lock\/subsys/d" \
|
||||
tools/Makefile || die
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="--prefix=/usr --disable-werror"
|
||||
|
||||
if use ocaml
|
||||
then
|
||||
myconf="${myconf} $(use_enable ocaml ocamltools)"
|
||||
else
|
||||
myconf="${myconf} --disable-ocamltools"
|
||||
fi
|
||||
|
||||
if ! use pam
|
||||
then
|
||||
myconf="${myconf} --disable-pam"
|
||||
fi
|
||||
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export VARTEXFONTS="${T}/fonts"
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
use custom-cflags || unset CFLAGS
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
unset LDFLAGS
|
||||
unset CFLAGS
|
||||
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
|
||||
|
||||
use doc && emake -C docs txt html
|
||||
emake -C docs man-pages
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Override auto-detection in the build system, bug #382573
|
||||
export INITD_DIR=/tmp/init.d
|
||||
export CONFIG_LEAF_DIR=../tmp/default
|
||||
|
||||
# Let the build system compile installed Python modules.
|
||||
local PYTHONDONTWRITEBYTECODE
|
||||
export PYTHONDONTWRITEBYTECODE
|
||||
|
||||
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
|
||||
XEN_PYTHON_NATIVE_INSTALL=y install-tools
|
||||
|
||||
# Fix the remaining Python shebangs.
|
||||
python_fix_shebang "${D}"
|
||||
|
||||
# Remove RedHat-specific stuff
|
||||
rm -rf "${D}"tmp || die
|
||||
|
||||
# uncomment lines in xl.conf
|
||||
sed -e 's:^#autoballoon=1:autoballoon=1:' \
|
||||
-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
|
||||
-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
|
||||
-i tools/examples/xl.conf || die
|
||||
|
||||
# Reset bash completion dir; Bug 472438
|
||||
mv "${D}"bash-completion "${D}"usr/share/ || die
|
||||
|
||||
if use doc; then
|
||||
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
|
||||
|
||||
dohtml -r docs/
|
||||
docinto pdf
|
||||
dodoc ${DOCS[@]}
|
||||
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
|
||||
fi
|
||||
|
||||
rm -rf "${D}"/usr/share/doc/xen/
|
||||
doman docs/man?/*
|
||||
|
||||
if use xend; then
|
||||
newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
|
||||
fi
|
||||
newconfd "${FILESDIR}"/xendomains.confd xendomains
|
||||
newconfd "${FILESDIR}"/xenstored.confd xenstored
|
||||
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
|
||||
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
|
||||
newinitd "${FILESDIR}"/xenstored.initd xenstored
|
||||
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
|
||||
newinitd "${FILESDIR}"/xencommons.initd xencommons
|
||||
newconfd "${FILESDIR}"/xencommons.confd xencommons
|
||||
newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
|
||||
newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
|
||||
|
||||
if use screen; then
|
||||
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
|
||||
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
|
||||
keepdir /var/log/xen-consoles
|
||||
fi
|
||||
|
||||
# Move files built with use qemu, Bug #477884
|
||||
if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
|
||||
mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
|
||||
mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die
|
||||
fi
|
||||
|
||||
# For -static-libs wrt Bug 384355
|
||||
if ! use static-libs; then
|
||||
rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
|
||||
fi
|
||||
|
||||
# xend expects these to exist
|
||||
keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
|
||||
|
||||
# for xendomains
|
||||
keepdir /etc/xen/auto
|
||||
|
||||
# Temp QA workaround
|
||||
dodir "$(get_udevdir)"
|
||||
mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
|
||||
rm -rf "${D}"/etc/udev
|
||||
|
||||
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
|
||||
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
|
||||
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the offical wiki page:"
|
||||
elog "https://wiki.gentoo.org/wiki/Xen"
|
||||
elog "http://wiki.xen.org/wiki/Main_Page"
|
||||
elog ""
|
||||
elog "Recommended to utilise the xencommons script to config sytem At boot"
|
||||
elog "Add by use of rc-update on completion of the install"
|
||||
|
||||
if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
|
||||
echo
|
||||
ewarn "xend may not work when python is built with stack smashing protection (ssp)."
|
||||
ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
|
||||
ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
|
||||
fi
|
||||
|
||||
# TODO: we need to have the current Python slot here.
|
||||
if ! has_version "dev-lang/python[ncurses]"; then
|
||||
echo
|
||||
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
|
||||
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
|
||||
fi
|
||||
|
||||
if has_version "sys-apps/iproute2[minimal]"; then
|
||||
echo
|
||||
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
|
||||
ewarn "will not work until you rebuild iproute2 without USE=minimal."
|
||||
fi
|
||||
|
||||
if ! use hvm; then
|
||||
echo
|
||||
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
|
||||
elog "support enable the hvm use flag."
|
||||
elog "An x86 or amd64 system is required to build HVM support."
|
||||
fi
|
||||
|
||||
if use xend; then
|
||||
elog"";elog "xend capability has been enabled and installed"
|
||||
fi
|
||||
|
||||
if use qemu; then
|
||||
elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
|
||||
elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
|
||||
elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
|
||||
elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
|
||||
fi
|
||||
|
||||
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
|
||||
echo
|
||||
elog "xensv is broken upstream (Gentoo bug #142011)."
|
||||
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
|
||||
fi
|
||||
}
|
||||
@ -1,445 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.2-r6.ebuild,v 1.2 2014/10/07 05:58:38 idella4 Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
PYTHON_REQ_USE='xml,threads'
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
KEYWORDS="~amd64 -x86"
|
||||
UPSTREAM_VER=4
|
||||
GENTOO_VER=
|
||||
SEABIOS_VER=1.7.1-stable-xen
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
|
||||
http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
S="${WORKDIR}/xen-${PV}"
|
||||
fi
|
||||
|
||||
inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
|
||||
|
||||
DESCRIPTION="Xend daemon and tools"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
DOCS=( README docs/README.xen-bugtool )
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
|
||||
# >=dev-lang/ocaml-4 stable
|
||||
# Masked in profiles/eapi-5-files instead
|
||||
IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs xend system-seabios"
|
||||
|
||||
REQUIRED_USE="hvm? ( qemu )
|
||||
${PYTHON_REQUIRED_USE}
|
||||
pygrub? ( python )"
|
||||
|
||||
DEPEND="dev-libs/lzo:2
|
||||
dev-libs/glib:2
|
||||
dev-libs/yajl
|
||||
dev-libs/libgcrypt:0
|
||||
dev-python/lxml[${PYTHON_USEDEP}]
|
||||
pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
|
||||
sys-libs/zlib
|
||||
sys-power/iasl
|
||||
system-seabios? ( sys-firmware/seabios )
|
||||
sys-firmware/ipxe
|
||||
hvm? ( media-libs/libsdl )
|
||||
${PYTHON_DEPS}
|
||||
api? ( dev-libs/libxml2
|
||||
net-misc/curl )
|
||||
pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
|
||||
sys-devel/bin86
|
||||
sys-devel/dev86
|
||||
dev-lang/perl
|
||||
app-misc/pax-utils
|
||||
dev-python/markdown[${PYTHON_USEDEP}]
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
dev-tex/latex2html[png,gif]
|
||||
media-gfx/graphviz
|
||||
dev-tex/xcolor
|
||||
media-gfx/transfig
|
||||
dev-texlive/texlive-latexextra
|
||||
virtual/latex-base
|
||||
dev-tex/latexmk
|
||||
dev-texlive/texlive-latex
|
||||
dev-texlive/texlive-pictures
|
||||
dev-texlive/texlive-latexrecommended
|
||||
)
|
||||
hvm? ( x11-proto/xproto
|
||||
!net-libs/libiscsi )
|
||||
qemu? ( x11-libs/pixman )
|
||||
ocaml? ( dev-ml/findlib
|
||||
>=dev-lang/ocaml-4 )"
|
||||
RDEPEND="sys-apps/iproute2
|
||||
net-misc/bridge-utils
|
||||
screen? (
|
||||
app-misc/screen
|
||||
app-admin/logrotate
|
||||
)
|
||||
virtual/udev"
|
||||
|
||||
# hvmloader is used to bootstrap a fully virtualized kernel
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
export "CONFIG_LOMOUNT=y"
|
||||
|
||||
if has_version dev-libs/libgcrypt:0; then
|
||||
export "CONFIG_GCRYPT=y"
|
||||
fi
|
||||
|
||||
if use qemu; then
|
||||
export "CONFIG_IOEMU=y"
|
||||
else
|
||||
export "CONFIG_IOEMU=n"
|
||||
fi
|
||||
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64 ; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo
|
||||
fi
|
||||
|
||||
# Drop .config, fixes to gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.3-fix_dotconfig-gcc.patch
|
||||
|
||||
# Fix texi2html build error with new texi2html, qemu.doc.html
|
||||
epatch "${FILESDIR}"/${PN}-4-docfix.patch \
|
||||
"${FILESDIR}"/${PN}-4-qemu-xen-doc.patch
|
||||
|
||||
# Fix network broadcast on bridged networks
|
||||
epatch "${FILESDIR}/${PN}-3.4.0-network-bridge-broadcast.patch"
|
||||
|
||||
# Bug 496708
|
||||
epatch "${FILESDIR}"/${PN}-4-unbundle-ipxe.patch
|
||||
use system-seabios && epatch "${FILESDIR}"/${PN}-4-unbundle-seabios.patch
|
||||
|
||||
# Fix bridge by idella4, bug #362575
|
||||
epatch "${FILESDIR}/${PN}-4.1.1-bridge.patch"
|
||||
|
||||
# Prevent double stripping of files at install
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.2.0-nostrip.patch
|
||||
|
||||
# fix jobserver in Makefile
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.3-jserver.patch
|
||||
|
||||
# add missing header
|
||||
epatch "${FILESDIR}"/xen-4-ulong.patch
|
||||
|
||||
# Set dom0-min-mem to kb; Bug #472982
|
||||
epatch "${FILESDIR}"/${PN/-tools/}-4.2-configsxp.patch
|
||||
|
||||
# Bug 477676
|
||||
epatch "${FILESDIR}"/${PN}-4.3-ar-cc.patch
|
||||
|
||||
# Bug 379537
|
||||
epatch "${FILESDIR}"/fix-gold-ld.patch
|
||||
|
||||
# Prevent file collision with qemu package Bug 478064
|
||||
epatch "${FILESDIR}"/qemu-bridge.patch
|
||||
mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
|
||||
|
||||
# bundled seabios
|
||||
epatch "${FILESDIR}"/${PN}-4-anti-seabios-download.patch
|
||||
mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
|
||||
pushd tools/firmware/ > /dev/null
|
||||
ln -s seabios-dir-remote seabios-dir || die
|
||||
popd > /dev/null
|
||||
|
||||
# Xend
|
||||
if ! use xend; then
|
||||
sed -e 's:xm xen-bugtool xen-python-path xend:xen-bugtool xen-python-path:' \
|
||||
-i tools/misc/Makefile || die "Disabling xend failed"
|
||||
sed -e 's:^XEND_INITD:#XEND_INITD:' \
|
||||
-i tools/examples/Makefile || die "Disabling xend failed"
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
|
||||
# try and remove all the default cflags
|
||||
find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
|
||||
-exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} + || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
if ! use pygrub; then
|
||||
sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
|
||||
fi
|
||||
|
||||
if ! use python; then
|
||||
sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
|
||||
fi
|
||||
|
||||
# Disable hvm support on systems that don't support x86_32 binaries.
|
||||
if ! use hvm; then
|
||||
sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
|
||||
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
|
||||
# Bug 351648
|
||||
elif ! use x86 && ! has x86 $(get_all_abis); then
|
||||
mkdir -p "${WORKDIR}"/extra-headers/gnu || die
|
||||
touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
|
||||
export CPATH="${WORKDIR}"/extra-headers
|
||||
fi
|
||||
|
||||
# Don't bother with qemu, only needed for fully virtualised guests
|
||||
if ! use qemu; then
|
||||
sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
|
||||
sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
|
||||
fi
|
||||
|
||||
# Bug 472438
|
||||
sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
|
||||
-i Config.mk || die
|
||||
|
||||
use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die
|
||||
use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
|
||||
sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
|
||||
-i tools/firmware/Makefile || die
|
||||
|
||||
# xencommons, Bug #492332, sed lighter weight than patching
|
||||
sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
|
||||
-i tools/hotplug/Linux/init.d/xencommons || die
|
||||
|
||||
# Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844
|
||||
sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \
|
||||
-i tools/libxl/libxl_bootloader.c || die
|
||||
|
||||
# fix QA warning, create /var/run/, /var/lock dynamically
|
||||
sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
|
||||
tools/libxl/Makefile || die
|
||||
|
||||
sed -i -e "/\/var\/run\//d" \
|
||||
tools/xenstore/Makefile \
|
||||
tools/pygrub/Makefile || die
|
||||
|
||||
sed -i -e "/\/var\/lock\/subsys/d" \
|
||||
tools/Makefile || die
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="--prefix=/usr --disable-werror"
|
||||
|
||||
if use ocaml
|
||||
then
|
||||
myconf="${myconf} $(use_enable ocaml ocamltools)"
|
||||
else
|
||||
myconf="${myconf} --disable-ocamltools"
|
||||
fi
|
||||
|
||||
if ! use pam
|
||||
then
|
||||
myconf="${myconf} --disable-pam"
|
||||
fi
|
||||
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export VARTEXFONTS="${T}/fonts"
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
use custom-cflags || unset CFLAGS
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
unset LDFLAGS
|
||||
unset CFLAGS
|
||||
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
|
||||
|
||||
use doc && emake -C docs txt html
|
||||
emake -C docs man-pages
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Override auto-detection in the build system, bug #382573
|
||||
export INITD_DIR=/tmp/init.d
|
||||
export CONFIG_LEAF_DIR=../tmp/default
|
||||
|
||||
# Let the build system compile installed Python modules.
|
||||
local PYTHONDONTWRITEBYTECODE
|
||||
export PYTHONDONTWRITEBYTECODE
|
||||
|
||||
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
|
||||
XEN_PYTHON_NATIVE_INSTALL=y install-tools
|
||||
|
||||
# Fix the remaining Python shebangs.
|
||||
python_fix_shebang "${D}"
|
||||
|
||||
# Remove RedHat-specific stuff
|
||||
rm -rf "${D}"tmp || die
|
||||
|
||||
# uncomment lines in xl.conf
|
||||
sed -e 's:^#autoballoon=1:autoballoon=1:' \
|
||||
-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
|
||||
-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
|
||||
-i tools/examples/xl.conf || die
|
||||
|
||||
# Reset bash completion dir; Bug 472438
|
||||
mv "${D}"bash-completion "${D}"usr/share/ || die
|
||||
|
||||
if use doc; then
|
||||
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
|
||||
|
||||
dohtml -r docs/
|
||||
docinto pdf
|
||||
dodoc ${DOCS[@]}
|
||||
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
|
||||
fi
|
||||
|
||||
rm -rf "${D}"/usr/share/doc/xen/
|
||||
doman docs/man?/*
|
||||
|
||||
if use xend; then
|
||||
newinitd "${FILESDIR}"/xend.initd-r2 xend || die "Couldn't install xen.initd"
|
||||
fi
|
||||
newconfd "${FILESDIR}"/xendomains.confd xendomains
|
||||
newconfd "${FILESDIR}"/xenstored.confd xenstored
|
||||
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
|
||||
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
|
||||
newinitd "${FILESDIR}"/xenstored.initd xenstored
|
||||
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
|
||||
newinitd "${FILESDIR}"/xencommons.initd xencommons
|
||||
newconfd "${FILESDIR}"/xencommons.confd xencommons
|
||||
newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
|
||||
newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
|
||||
|
||||
if use screen; then
|
||||
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
|
||||
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
|
||||
keepdir /var/log/xen-consoles
|
||||
fi
|
||||
|
||||
# Move files built with use qemu, Bug #477884
|
||||
if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
|
||||
mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
|
||||
mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die
|
||||
fi
|
||||
|
||||
# For -static-libs wrt Bug 384355
|
||||
if ! use static-libs; then
|
||||
rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
|
||||
fi
|
||||
|
||||
# xend expects these to exist
|
||||
keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
|
||||
|
||||
# for xendomains
|
||||
keepdir /etc/xen/auto
|
||||
|
||||
# Temp QA workaround
|
||||
dodir "$(get_udevdir)"
|
||||
mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
|
||||
rm -rf "${D}"/etc/udev
|
||||
|
||||
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
|
||||
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
|
||||
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the offical wiki page:"
|
||||
elog "https://wiki.gentoo.org/wiki/Xen"
|
||||
elog "http://wiki.xen.org/wiki/Main_Page"
|
||||
elog ""
|
||||
elog "Recommended to utilise the xencommons script to config sytem At boot"
|
||||
elog "Add by use of rc-update on completion of the install"
|
||||
|
||||
if [[ "$(scanelf -s __guard -q "${PYTHON}")" ]] ; then
|
||||
echo
|
||||
ewarn "xend may not work when python is built with stack smashing protection (ssp)."
|
||||
ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
|
||||
ewarn "This problem may be resolved as of Xen 3.0.4, if not post in the bug."
|
||||
fi
|
||||
|
||||
# TODO: we need to have the current Python slot here.
|
||||
if ! has_version "dev-lang/python[ncurses]"; then
|
||||
echo
|
||||
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
|
||||
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
|
||||
fi
|
||||
|
||||
if has_version "sys-apps/iproute2[minimal]"; then
|
||||
echo
|
||||
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
|
||||
ewarn "will not work until you rebuild iproute2 without USE=minimal."
|
||||
fi
|
||||
|
||||
if ! use hvm; then
|
||||
echo
|
||||
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
|
||||
elog "support enable the hvm use flag."
|
||||
elog "An x86 or amd64 system is required to build HVM support."
|
||||
fi
|
||||
|
||||
if use xend; then
|
||||
elog"";elog "xend capability has been enabled and installed"
|
||||
fi
|
||||
|
||||
if use qemu; then
|
||||
elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
|
||||
elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
|
||||
elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
|
||||
elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
|
||||
fi
|
||||
|
||||
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
|
||||
echo
|
||||
elog "xensv is broken upstream (Gentoo bug #142011)."
|
||||
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
|
||||
fi
|
||||
}
|
||||
@ -1,395 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.3.3.ebuild,v 1.3 2014/10/07 05:58:38 idella4 Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
PYTHON_REQ_USE='xml,threads'
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
KEYWORDS="~amd64 -x86"
|
||||
UPSTREAM_VER=
|
||||
# xen-tools's gentoo patches tarball
|
||||
GENTOO_VER=0
|
||||
# xen-tools's gentoo patches version which apply to this specific ebuild
|
||||
GENTOO_GPV=0
|
||||
SEABIOS_VER=1.7.1-stable-xen
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${PN/-tools/}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
|
||||
http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
S="${WORKDIR}/xen-${PV}"
|
||||
fi
|
||||
|
||||
inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass}
|
||||
|
||||
DESCRIPTION="Xend daemon and tools"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
DOCS=( README docs/README.xen-bugtool )
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
|
||||
# >=dev-lang/ocaml-4 stable
|
||||
# Masked in profiles/eapi-5-files instead
|
||||
IUSE="api custom-cflags debug doc flask hvm qemu ocaml +pam python pygrub screen static-libs system-seabios"
|
||||
|
||||
REQUIRED_USE="hvm? ( qemu )
|
||||
${PYTHON_REQUIRED_USE}
|
||||
pygrub? ( python )"
|
||||
|
||||
DEPEND="dev-libs/lzo:2
|
||||
dev-libs/glib:2
|
||||
dev-libs/yajl
|
||||
dev-libs/libgcrypt:0
|
||||
dev-python/lxml[${PYTHON_USEDEP}]
|
||||
pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
|
||||
sys-libs/zlib
|
||||
sys-power/iasl
|
||||
system-seabios? ( sys-firmware/seabios )
|
||||
sys-firmware/ipxe
|
||||
hvm? ( media-libs/libsdl )
|
||||
${PYTHON_DEPS}
|
||||
api? ( dev-libs/libxml2
|
||||
net-misc/curl )
|
||||
pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
|
||||
sys-devel/bin86
|
||||
sys-devel/dev86
|
||||
dev-lang/perl
|
||||
app-misc/pax-utils
|
||||
dev-python/markdown[${PYTHON_USEDEP}]
|
||||
doc? (
|
||||
app-doc/doxygen
|
||||
dev-tex/latex2html[png,gif]
|
||||
media-gfx/graphviz
|
||||
dev-tex/xcolor
|
||||
media-gfx/transfig
|
||||
dev-texlive/texlive-latexextra
|
||||
virtual/latex-base
|
||||
dev-tex/latexmk
|
||||
dev-texlive/texlive-latex
|
||||
dev-texlive/texlive-pictures
|
||||
dev-texlive/texlive-latexrecommended
|
||||
)
|
||||
hvm? ( x11-proto/xproto
|
||||
!net-libs/libiscsi )
|
||||
qemu? ( x11-libs/pixman )
|
||||
ocaml? ( dev-ml/findlib
|
||||
>=dev-lang/ocaml-4 )"
|
||||
RDEPEND="sys-apps/iproute2
|
||||
net-misc/bridge-utils
|
||||
screen? (
|
||||
app-misc/screen
|
||||
app-admin/logrotate
|
||||
)
|
||||
virtual/udev"
|
||||
|
||||
# hvmloader is used to bootstrap a fully virtualized kernel
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="usr/lib/xen/boot/hvmloader"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
export "CONFIG_LOMOUNT=y"
|
||||
|
||||
if has_version dev-libs/libgcrypt:0; then
|
||||
export "CONFIG_GCRYPT=y"
|
||||
fi
|
||||
|
||||
if use qemu; then
|
||||
export "CONFIG_IOEMU=y"
|
||||
else
|
||||
export "CONFIG_IOEMU=n"
|
||||
fi
|
||||
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64 ; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
|
||||
source "${FILESDIR}"/gentoo-patches.conf
|
||||
_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
|
||||
for i in ${!_gpv}; do
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo/$i
|
||||
done
|
||||
fi
|
||||
|
||||
# Bug 496708
|
||||
use system-seabios && epatch "${WORKDIR}"/patches-gentoo/${PN}-4-unbundle-seabios.patch
|
||||
|
||||
# Bug 478064
|
||||
mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
|
||||
|
||||
mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
|
||||
pushd tools/firmware/ > /dev/null
|
||||
ln -s seabios-dir-remote seabios-dir || die
|
||||
popd > /dev/null
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
|
||||
# try and remove all the default cflags
|
||||
find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
|
||||
-exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} + || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
if ! use pygrub; then
|
||||
sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
|
||||
fi
|
||||
|
||||
if ! use python; then
|
||||
sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
|
||||
fi
|
||||
|
||||
# Disable hvm support on systems that don't support x86_32 binaries.
|
||||
if ! use hvm; then
|
||||
sed -e '/^CONFIG_IOEMU := y$/d' -i config/*.mk || die
|
||||
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
|
||||
# Bug 351648
|
||||
elif ! use x86 && ! has x86 $(get_all_abis); then
|
||||
mkdir -p "${WORKDIR}"/extra-headers/gnu || die
|
||||
touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
|
||||
export CPATH="${WORKDIR}"/extra-headers
|
||||
fi
|
||||
|
||||
# Don't bother with qemu, only needed for fully virtualised guests
|
||||
if ! use qemu; then
|
||||
sed -e "/^CONFIG_IOEMU := y$/d" -i config/*.mk || die
|
||||
sed -e "s:install-tools\: tools/ioemu-dir:install-tools\: :g" -i Makefile || die
|
||||
fi
|
||||
|
||||
# Bug 472438
|
||||
sed -e 's:^BASH_COMPLETION_DIR ?= $(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(SHARE_DIR)/bash-completion:' \
|
||||
-i Config.mk || die
|
||||
|
||||
use flask || sed -e "/SUBDIRS-y += flask/d" -i tools/Makefile || die
|
||||
use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
|
||||
sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
|
||||
-i tools/firmware/Makefile || die
|
||||
|
||||
# xencommons, Bug #492332, sed lighter weight than patching
|
||||
sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
|
||||
-i tools/hotplug/Linux/init.d/xencommons || die
|
||||
|
||||
# Bug 493232 fix from http://bugzilla.xensource.com/bugzilla/show_bug.cgi?id=1844
|
||||
sed -e 's:bl->argsspace = 7 + :bl->argsspace = 9 + :' \
|
||||
-i tools/libxl/libxl_bootloader.c || die
|
||||
|
||||
# fix QA warning, create /var/run/, /var/lock dynamically
|
||||
sed -i -e "/\$(INSTALL_DIR) \$(DESTDIR)\$(XEN_RUN_DIR)/d" \
|
||||
tools/libxl/Makefile || die
|
||||
|
||||
sed -i -e "/\/var\/run\//d" \
|
||||
tools/xenstore/Makefile \
|
||||
tools/pygrub/Makefile || die
|
||||
|
||||
sed -i -e "/\/var\/lock\/subsys/d" \
|
||||
tools/Makefile || die
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf="--prefix=/usr --disable-werror"
|
||||
|
||||
if use ocaml
|
||||
then
|
||||
myconf="${myconf} $(use_enable ocaml ocamltools)"
|
||||
else
|
||||
myconf="${myconf} --disable-ocamltools"
|
||||
fi
|
||||
|
||||
if ! use pam
|
||||
then
|
||||
myconf="${myconf} --disable-pam"
|
||||
fi
|
||||
|
||||
econf ${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
export VARTEXFONTS="${T}/fonts"
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
use custom-cflags || unset CFLAGS
|
||||
if test-flag-CC -fno-strict-overflow; then
|
||||
append-flags -fno-strict-overflow
|
||||
fi
|
||||
|
||||
unset LDFLAGS
|
||||
unset CFLAGS
|
||||
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
|
||||
|
||||
use doc && emake -C docs txt html
|
||||
emake -C docs man-pages
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# Override auto-detection in the build system, bug #382573
|
||||
export INITD_DIR=/tmp/init.d
|
||||
export CONFIG_LEAF_DIR=../tmp/default
|
||||
|
||||
# Let the build system compile installed Python modules.
|
||||
local PYTHONDONTWRITEBYTECODE
|
||||
export PYTHONDONTWRITEBYTECODE
|
||||
|
||||
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
|
||||
XEN_PYTHON_NATIVE_INSTALL=y install-tools
|
||||
|
||||
# Fix the remaining Python shebangs.
|
||||
python_fix_shebang "${D}"
|
||||
|
||||
# Remove RedHat-specific stuff
|
||||
rm -rf "${D}"tmp || die
|
||||
|
||||
# uncomment lines in xl.conf
|
||||
sed -e 's:^#autoballoon=1:autoballoon=1:' \
|
||||
-e 's:^#lockfile="/var/lock/xl":lockfile="/var/lock/xl":' \
|
||||
-e 's:^#vifscript="vif-bridge":vifscript="vif-bridge":' \
|
||||
-i tools/examples/xl.conf || die
|
||||
|
||||
# Reset bash completion dir; Bug 472438
|
||||
mv "${D}"bash-completion "${D}"usr/share/ || die
|
||||
|
||||
if use doc; then
|
||||
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
|
||||
|
||||
dohtml -r docs/
|
||||
docinto pdf
|
||||
dodoc ${DOCS[@]}
|
||||
[ -d "${D}"/usr/share/doc/xen ] && mv "${D}"/usr/share/doc/xen/* "${D}"/usr/share/doc/${PF}/html
|
||||
fi
|
||||
|
||||
rm -rf "${D}"/usr/share/doc/xen/
|
||||
doman docs/man?/*
|
||||
|
||||
newconfd "${FILESDIR}"/xendomains.confd xendomains
|
||||
newconfd "${FILESDIR}"/xenstored.confd xenstored
|
||||
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
|
||||
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
|
||||
newinitd "${FILESDIR}"/xenstored.initd xenstored
|
||||
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
|
||||
newinitd "${FILESDIR}"/xencommons.initd xencommons
|
||||
newconfd "${FILESDIR}"/xencommons.confd xencommons
|
||||
newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
|
||||
newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
|
||||
|
||||
if use screen; then
|
||||
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
|
||||
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
|
||||
keepdir /var/log/xen-consoles
|
||||
fi
|
||||
|
||||
# Move files built with use qemu, Bug #477884
|
||||
if [[ "${ARCH}" == 'amd64' ]] && use qemu; then
|
||||
mkdir -p "${D}"usr/$(get_libdir)/xen/bin || die
|
||||
mv "${D}"usr/lib/xen/bin/* "${D}"usr/$(get_libdir)/xen/bin/ || die
|
||||
fi
|
||||
|
||||
# For -static-libs wrt Bug 384355
|
||||
if ! use static-libs; then
|
||||
rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
|
||||
fi
|
||||
|
||||
# xend expects these to exist
|
||||
keepdir /var/lib/xenstored /var/xen/dump /var/lib/xen /var/log/xen
|
||||
|
||||
# for xendomains
|
||||
keepdir /etc/xen/auto
|
||||
|
||||
# Temp QA workaround
|
||||
dodir "$(get_udevdir)"
|
||||
mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
|
||||
rm -rf "${D}"/etc/udev
|
||||
|
||||
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
|
||||
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
|
||||
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the offical wiki page:"
|
||||
elog "https://wiki.gentoo.org/wiki/Xen"
|
||||
elog "http://wiki.xen.org/wiki/Main_Page"
|
||||
elog ""
|
||||
elog "Recommended to utilise the xencommons script to config sytem At boot"
|
||||
elog "Add by use of rc-update on completion of the install"
|
||||
|
||||
# TODO: we need to have the current Python slot here.
|
||||
if ! has_version "dev-lang/python[ncurses]"; then
|
||||
echo
|
||||
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
|
||||
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
|
||||
fi
|
||||
|
||||
if has_version "sys-apps/iproute2[minimal]"; then
|
||||
echo
|
||||
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
|
||||
ewarn "will not work until you rebuild iproute2 without USE=minimal."
|
||||
fi
|
||||
|
||||
if ! use hvm; then
|
||||
echo
|
||||
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
|
||||
elog "support enable the hvm use flag."
|
||||
elog "An x86 or amd64 system is required to build HVM support."
|
||||
fi
|
||||
|
||||
if use qemu; then
|
||||
elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
|
||||
elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
|
||||
elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
|
||||
elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
|
||||
fi
|
||||
|
||||
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
|
||||
echo
|
||||
elog "xensv is broken upstream (Gentoo bug #142011)."
|
||||
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
|
||||
fi
|
||||
}
|
||||
@ -1,155 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.4-r4.ebuild,v 1.3 2014/07/12 11:01:22 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
KEYWORDS="amd64 x86"
|
||||
UPSTREAM_VER=3
|
||||
GENTOO_VER=
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
fi
|
||||
|
||||
inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
|
||||
|
||||
DESCRIPTION="The Xen virtual machine monitor"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="custom-cflags debug efi flask pae xsm"
|
||||
|
||||
DEPEND="${PYTHON_DEPS}
|
||||
efi? ( >=sys-devel/binutils-2.22[multitarget] )
|
||||
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
|
||||
RDEPEND=""
|
||||
PDEPEND="~app-emulation/xen-tools-${PV}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="boot/xen-syms-${PV}"
|
||||
|
||||
REQUIRED_USE="
|
||||
flask? ( xsm )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
python-any-r1_pkg_setup
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]]; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use flask ; then
|
||||
export "XSM_ENABLE=y"
|
||||
export "FLASK_ENABLE=y"
|
||||
elif use xsm ; then
|
||||
export "XSM_ENABLE=y"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo
|
||||
fi
|
||||
|
||||
# Drop .config and fix gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
|
||||
|
||||
if use efi; then
|
||||
epatch "${FILESDIR}"/${PN}-4.2-efi.patch
|
||||
export EFI_VENDOR="gentoo"
|
||||
export EFI_MOUNTPOINT="boot"
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \; || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
# not strictly necessary to fix this
|
||||
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
use pae && myopt="${myopt} pae=y"
|
||||
|
||||
if use custom-cflags; then
|
||||
filter-flags -fPIE -fstack-protector
|
||||
replace-flags -O3 -O2
|
||||
else
|
||||
unset CFLAGS
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Send raw LDFLAGS so that --as-needed works
|
||||
emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
use pae && myopt="${myopt} pae=y"
|
||||
|
||||
# The 'make install' doesn't 'mkdir -p' the subdirs
|
||||
if use efi; then
|
||||
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
|
||||
fi
|
||||
|
||||
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the unoffical wiki page:"
|
||||
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
|
||||
elog " http://en.gentoo-wiki.com/wiki/Xen/"
|
||||
|
||||
use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
|
||||
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
|
||||
}
|
||||
@ -1,155 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.4-r5.ebuild,v 1.3 2014/08/20 15:59:53 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
KEYWORDS="amd64 x86"
|
||||
UPSTREAM_VER=4
|
||||
GENTOO_VER=
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
fi
|
||||
|
||||
inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
|
||||
|
||||
DESCRIPTION="The Xen virtual machine monitor"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="custom-cflags debug efi flask pae xsm"
|
||||
|
||||
DEPEND="${PYTHON_DEPS}
|
||||
efi? ( >=sys-devel/binutils-2.22[multitarget] )
|
||||
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
|
||||
RDEPEND=""
|
||||
PDEPEND="~app-emulation/xen-tools-${PV}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="boot/xen-syms-${PV}"
|
||||
|
||||
REQUIRED_USE="
|
||||
flask? ( xsm )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
python-any-r1_pkg_setup
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]]; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use flask ; then
|
||||
export "XSM_ENABLE=y"
|
||||
export "FLASK_ENABLE=y"
|
||||
elif use xsm ; then
|
||||
export "XSM_ENABLE=y"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo
|
||||
fi
|
||||
|
||||
# Drop .config and fix gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
|
||||
|
||||
if use efi; then
|
||||
epatch "${FILESDIR}"/${PN}-4.2-efi.patch
|
||||
export EFI_VENDOR="gentoo"
|
||||
export EFI_MOUNTPOINT="boot"
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \; || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
# not strictly necessary to fix this
|
||||
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
use pae && myopt="${myopt} pae=y"
|
||||
|
||||
if use custom-cflags; then
|
||||
filter-flags -fPIE -fstack-protector
|
||||
replace-flags -O3 -O2
|
||||
else
|
||||
unset CFLAGS
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Send raw LDFLAGS so that --as-needed works
|
||||
emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
use pae && myopt="${myopt} pae=y"
|
||||
|
||||
# The 'make install' doesn't 'mkdir -p' the subdirs
|
||||
if use efi; then
|
||||
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
|
||||
fi
|
||||
|
||||
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the unoffical wiki page:"
|
||||
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
|
||||
elog " http://en.gentoo-wiki.com/wiki/Xen/"
|
||||
|
||||
use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
|
||||
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
|
||||
}
|
||||
@ -1,155 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.5.ebuild,v 1.1 2014/09/11 05:22:42 dlan Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
UPSTREAM_VER=
|
||||
GENTOO_VER=
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
fi
|
||||
|
||||
inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
|
||||
|
||||
DESCRIPTION="The Xen virtual machine monitor"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="custom-cflags debug efi flask pae xsm"
|
||||
|
||||
DEPEND="${PYTHON_DEPS}
|
||||
efi? ( >=sys-devel/binutils-2.22[multitarget] )
|
||||
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
|
||||
RDEPEND=""
|
||||
PDEPEND="~app-emulation/xen-tools-${PV}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="boot/xen-syms-${PV}"
|
||||
|
||||
REQUIRED_USE="
|
||||
flask? ( xsm )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
python-any-r1_pkg_setup
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]]; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use flask ; then
|
||||
export "XSM_ENABLE=y"
|
||||
export "FLASK_ENABLE=y"
|
||||
elif use xsm ; then
|
||||
export "XSM_ENABLE=y"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo
|
||||
fi
|
||||
|
||||
# Drop .config and fix gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
|
||||
|
||||
if use efi; then
|
||||
epatch "${FILESDIR}"/${PN}-4.2-efi.patch
|
||||
export EFI_VENDOR="gentoo"
|
||||
export EFI_MOUNTPOINT="boot"
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \; || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
# not strictly necessary to fix this
|
||||
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
use pae && myopt="${myopt} pae=y"
|
||||
|
||||
if use custom-cflags; then
|
||||
filter-flags -fPIE -fstack-protector
|
||||
replace-flags -O3 -O2
|
||||
else
|
||||
unset CFLAGS
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Send raw LDFLAGS so that --as-needed works
|
||||
emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
use pae && myopt="${myopt} pae=y"
|
||||
|
||||
# The 'make install' doesn't 'mkdir -p' the subdirs
|
||||
if use efi; then
|
||||
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
|
||||
fi
|
||||
|
||||
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the unoffical wiki page:"
|
||||
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
|
||||
elog " http://en.gentoo-wiki.com/wiki/Xen/"
|
||||
|
||||
use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
|
||||
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
|
||||
}
|
||||
@ -1,151 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.2-r4.ebuild,v 1.2 2014/07/12 11:06:43 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
# Set to match entry in stable 4.3.1-r1, Bug 493944
|
||||
KEYWORDS="amd64 -x86"
|
||||
UPSTREAM_VER=3
|
||||
GENTOO_VER=
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
fi
|
||||
|
||||
inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
|
||||
|
||||
DESCRIPTION="The Xen virtual machine monitor"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="custom-cflags debug efi flask xsm"
|
||||
|
||||
DEPEND="${PYTHON_DEPS}
|
||||
efi? ( >=sys-devel/binutils-2.22[multitarget] )
|
||||
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
|
||||
RDEPEND=""
|
||||
PDEPEND="~app-emulation/xen-tools-${PV}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="boot/xen-syms-${PV}"
|
||||
|
||||
REQUIRED_USE="flask? ( xsm )"
|
||||
|
||||
pkg_setup() {
|
||||
python-any-r1_pkg_setup
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]]; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use flask ; then
|
||||
export "XSM_ENABLE=y"
|
||||
export "FLASK_ENABLE=y"
|
||||
elif use xsm ; then
|
||||
export "XSM_ENABLE=y"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo
|
||||
fi
|
||||
|
||||
# Drop .config and fix gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch
|
||||
|
||||
if use efi; then
|
||||
epatch "${FILESDIR}"/${PN}-4.2-efi.patch
|
||||
export EFI_VENDOR="gentoo"
|
||||
export EFI_MOUNTPOINT="boot"
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \; || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
# not strictly necessary to fix this
|
||||
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
if use custom-cflags; then
|
||||
filter-flags -fPIE -fstack-protector
|
||||
replace-flags -O3 -O2
|
||||
else
|
||||
unset CFLAGS
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Send raw LDFLAGS so that --as-needed works
|
||||
emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
# The 'make install' doesn't 'mkdir -p' the subdirs
|
||||
if use efi; then
|
||||
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
|
||||
fi
|
||||
|
||||
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the unoffical wiki page:"
|
||||
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
|
||||
elog " http://en.gentoo-wiki.com/wiki/Xen/"
|
||||
|
||||
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
|
||||
}
|
||||
@ -1,151 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.2-r5.ebuild,v 1.2 2014/08/20 15:49:47 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
# Set to match entry in stable 4.3.1-r1, Bug 493944
|
||||
KEYWORDS="amd64 -x86"
|
||||
UPSTREAM_VER=4
|
||||
GENTOO_VER=
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
fi
|
||||
|
||||
inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
|
||||
|
||||
DESCRIPTION="The Xen virtual machine monitor"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="custom-cflags debug efi flask xsm"
|
||||
|
||||
DEPEND="${PYTHON_DEPS}
|
||||
efi? ( >=sys-devel/binutils-2.22[multitarget] )
|
||||
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
|
||||
RDEPEND=""
|
||||
PDEPEND="~app-emulation/xen-tools-${PV}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="boot/xen-syms-${PV}"
|
||||
|
||||
REQUIRED_USE="flask? ( xsm )"
|
||||
|
||||
pkg_setup() {
|
||||
python-any-r1_pkg_setup
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]]; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use flask ; then
|
||||
export "XSM_ENABLE=y"
|
||||
export "FLASK_ENABLE=y"
|
||||
elif use xsm ; then
|
||||
export "XSM_ENABLE=y"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo
|
||||
fi
|
||||
|
||||
# Drop .config and fix gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch
|
||||
|
||||
if use efi; then
|
||||
epatch "${FILESDIR}"/${PN}-4.2-efi.patch
|
||||
export EFI_VENDOR="gentoo"
|
||||
export EFI_MOUNTPOINT="boot"
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \; || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
# not strictly necessary to fix this
|
||||
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
if use custom-cflags; then
|
||||
filter-flags -fPIE -fstack-protector
|
||||
replace-flags -O3 -O2
|
||||
else
|
||||
unset CFLAGS
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Send raw LDFLAGS so that --as-needed works
|
||||
emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
# The 'make install' doesn't 'mkdir -p' the subdirs
|
||||
if use efi; then
|
||||
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
|
||||
fi
|
||||
|
||||
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the unoffical wiki page:"
|
||||
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
|
||||
elog " http://en.gentoo-wiki.com/wiki/Xen/"
|
||||
|
||||
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
|
||||
}
|
||||
@ -1,151 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.3.3.ebuild,v 1.1 2014/09/11 05:22:42 dlan Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
# Set to match entry in stable 4.3.1-r1, Bug 493944
|
||||
KEYWORDS="~amd64 -x86"
|
||||
UPSTREAM_VER=
|
||||
GENTOO_VER=
|
||||
|
||||
[[ -n ${UPSTREAM_VER} ]] && \
|
||||
UPSTREAM_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
|
||||
[[ -n ${GENTOO_VER} ]] && \
|
||||
GENTOO_PATCHSET_URI="http://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz"
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
|
||||
${UPSTREAM_PATCHSET_URI}
|
||||
${GENTOO_PATCHSET_URI}"
|
||||
fi
|
||||
|
||||
inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
|
||||
|
||||
DESCRIPTION="The Xen virtual machine monitor"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="custom-cflags debug efi flask xsm"
|
||||
|
||||
DEPEND="${PYTHON_DEPS}
|
||||
efi? ( >=sys-devel/binutils-2.22[multitarget] )
|
||||
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
|
||||
RDEPEND=""
|
||||
PDEPEND="~app-emulation/xen-tools-${PV}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="boot/xen-syms-${PV}"
|
||||
|
||||
REQUIRED_USE="flask? ( xsm )"
|
||||
|
||||
pkg_setup() {
|
||||
python-any-r1_pkg_setup
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]]; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use flask ; then
|
||||
export "XSM_ENABLE=y"
|
||||
export "FLASK_ENABLE=y"
|
||||
elif use xsm ; then
|
||||
export "XSM_ENABLE=y"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Upstream's patchset
|
||||
if [[ -n ${UPSTREAM_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
EPATCH_OPTS="-p1" \
|
||||
epatch "${WORKDIR}"/patches-upstream
|
||||
fi
|
||||
|
||||
# Gentoo's patchset
|
||||
if [[ -n ${GENTOO_VER} ]]; then
|
||||
EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" \
|
||||
epatch "${WORKDIR}"/patches-gentoo
|
||||
fi
|
||||
|
||||
# Drop .config and fix gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-fix_dotconfig-gcc.patch
|
||||
|
||||
if use efi; then
|
||||
epatch "${FILESDIR}"/${PN}-4.2-efi.patch
|
||||
export EFI_VENDOR="gentoo"
|
||||
export EFI_MOUNTPOINT="boot"
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \; || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
# not strictly necessary to fix this
|
||||
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
if use custom-cflags; then
|
||||
filter-flags -fPIE -fstack-protector
|
||||
replace-flags -O3 -O2
|
||||
else
|
||||
unset CFLAGS
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Send raw LDFLAGS so that --as-needed works
|
||||
emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
|
||||
# The 'make install' doesn't 'mkdir -p' the subdirs
|
||||
if use efi; then
|
||||
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
|
||||
fi
|
||||
|
||||
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the unoffical wiki page:"
|
||||
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
|
||||
elog " http://en.gentoo-wiki.com/wiki/Xen/"
|
||||
|
||||
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
|
||||
}
|
||||
@ -1 +1 @@
|
||||
DIST QtBitcoinTrader-1.07.96.4.tar.gz 541157 SHA256 69c5323459447d22d8de91a351edf80f387ddb638a54f8ccdf7309d474f1e6a5 SHA512 5fd0632b44886d75f290a95456de86a8b9b00e3977d17d65686fcacc2ebe98eb9f4ee1e35468bfcf52b06838640ccaf2a47085c23270e28874184aad74f149ce WHIRLPOOL 857425590c6b4645aa24a56f801a199807d2495725f1a7772a59c8e7202683e68bcaef5096f859f3cbb77f04a3aaa029ea31e7a491d46ae8d471f4e2afc0801f
|
||||
DIST QtBitcoinTrader-1.08.01.tar.gz 1251226 SHA256 8c479587e57d95c8c1d2ba0b2243d56bc347847ffe07ee9128a79ba7a58aec02 SHA512 245db8a36eb556bb244cdbaf140570ccf4d6acb70afbeb84339f5a6e3a68ab99793c4b35d2067445c45cd4652a7ba7b1a262cef3aaf24ae849acbe613c577c96 WHIRLPOOL 9b2af4dd5e921dd6e5e8adda25100e3d63492103eb99d2db1a1c47a01c59d135d153200ed1156e22e2ba3550c6a681adc84031e2e7f9fbdbedc52659a6e74e61
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/QtBitcoinTrader/QtBitcoinTrader-1.07.96.4.ebuild,v 1.1 2013/12/14 03:28:27 alexxy Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ $PV = *9999* ]]; then
|
||||
eclass=git-2
|
||||
EGIT_REPO_URI="
|
||||
git://github.com/JulyIGHOR/QtBitcoinTrader.git
|
||||
https://github.com/JulyIGHOR/QtBitcoinTrader.git"
|
||||
EGIT_BRANCH="testing"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
eclass=vcs-snapshot
|
||||
SRC_URI="https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
inherit base fdo-mime qt4-r2 ${eclass}
|
||||
|
||||
DESCRIPTION="Mt.Gox and BTC-e Bitcoin Trading Client"
|
||||
HOMEPAGE="https://github.com/JulyIGHOR/QtBitcoinTrader"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qtmultimedia:4"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
eqmake4 \
|
||||
src/${PN}_Desktop.pro \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
DESKTOPDIR="${EPREFIX}/usr/share/applications" \
|
||||
ICONDIR="${EPREFIX}/usr/share/pixmaps"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -0,0 +1,76 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/QtBitcoinTrader/QtBitcoinTrader-1.08.01.ebuild,v 1.1 2014/10/14 19:34:24 alexxy Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ $PV = *9999* ]]; then
|
||||
eclass=git-2
|
||||
EGIT_REPO_URI="
|
||||
git://github.com/JulyIGHOR/QtBitcoinTrader.git
|
||||
https://github.com/JulyIGHOR/QtBitcoinTrader.git"
|
||||
EGIT_BRANCH="testing"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
eclass=vcs-snapshot
|
||||
SRC_URI="https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
inherit base fdo-mime qmake-utils ${eclass}
|
||||
|
||||
DESCRIPTION="Mt.Gox and BTC-e Bitcoin Trading Client"
|
||||
HOMEPAGE="https://github.com/JulyIGHOR/QtBitcoinTrader"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
IUSE="qt4 qt5"
|
||||
|
||||
REQUIRED_USE="
|
||||
^^ ( qt4 qt5 )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/openssl
|
||||
sys-libs/zlib
|
||||
qt4? (
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qtmultimedia:4
|
||||
dev-qt/qtscript:4
|
||||
)
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtnetwork:5
|
||||
dev-qt/qtscript:5
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtmultimedia:5
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
if use qt4; then
|
||||
eqmake4 \
|
||||
src/${PN}_Desktop.pro \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
DESKTOPDIR="${EPREFIX}/usr/share/applications" \
|
||||
ICONDIR="${EPREFIX}/usr/share/pixmaps"
|
||||
elif use qt5; then
|
||||
eqmake5 \
|
||||
src/${PN}_Desktop.pro \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
DESKTOPDIR="${EPREFIX}/usr/share/applications" \
|
||||
ICONDIR="${EPREFIX}/usr/share/pixmaps"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake INSTALL_ROOT="${D}" install
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST bibletime-2.10.0.tar.xz 3252312 SHA256 89763b17e91b6fe8a791c69d9357bcaf548abb7c1007a1c47efd834a2ec9f1fc SHA512 7c3e7a60d0d8bdcfab4f90eefd9b1dcff5b57c35e4a7224b2eec094a0bf9b9ca9757d9b37317689e4cf0283a132a274ec81a3ba5fea0feb6dd2735e2378c3098 WHIRLPOOL f342e21223cc911f8c80de9a8ecd521aa38a8aeee08238522a389f28a02d3c71580e2ebc9642a042607fbb8219344ddc9c29cacf6f9ef4df1dd78dc379224699
|
||||
DIST bibletime-2.10.1.tar.xz 3252680 SHA256 86d2d53913c08bce9f67c0d897639091d84e9d330527636cecd2b9008bf7ca91 SHA512 50f84eb1aefe911f1336ec7a23ea34ade1628383f35dca25330984787221214c0bc0cbc9f88f9540336949df02e76e769b7998d2eef3a15862e3038541564cc9 WHIRLPOOL 2ffc1b1b516d7fa94e842c957dc0be47be5e29ea015fcee2ff291093d0afc201af59d70b055193b420ff3acbc62386980b540eeb63ed92dbd1a741fb68b5be54
|
||||
DIST bibletime-2.9.1.tar.bz2 5968979 SHA256 308a86d4a1f63203e01438e75be8306377927498b5d0ae8769a4df3c828013b5 SHA512 6099e48fc3d54cb8362ec1a3965b372e60fd136d036dfd8d94b5e443ee5f27eb092162b653160bfc71d5366f79af35e22ee40d64ecd681f184bc4e90c1cd9e0a WHIRLPOOL 0677646ce099297321c4a519364b41254544f6d8660d72f9e76b6a8eafd08205915f40aef5bbc6463199ca0d272e28b926b13b0637ecdef1bc822256363cecf2
|
||||
|
||||
@ -0,0 +1,68 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/bibletime/bibletime-2.10.1.ebuild,v 1.1 2014/10/15 04:04:26 creffett Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit cmake-utils
|
||||
|
||||
DESCRIPTION="Qt Bible study application using the SWORD library"
|
||||
HOMEPAGE="http://www.bibletime.info/"
|
||||
SRC_URI="mirror://sourceforge/project/bibletime/BibleTime%202/BibleTime%202%20source%20code/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="debug qt5"
|
||||
|
||||
# bug 313657
|
||||
# RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
>=app-text/sword-1.6.0
|
||||
>=dev-cpp/clucene-2.3.3.4
|
||||
qt5? (
|
||||
dev-qt/linguist-tools:5
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtdbus:5
|
||||
dev-qt/qtprintsupport:5
|
||||
dev-qt/qtwidgets:5
|
||||
)
|
||||
!qt5? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtdbus:4
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qtwebkit:4
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
dev-libs/boost
|
||||
dev-libs/icu:=
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
qt5? (
|
||||
dev-qt/qttest:5
|
||||
)
|
||||
!qt5? (
|
||||
dev-qt/qttest:4
|
||||
)
|
||||
"
|
||||
|
||||
DOCS=( ChangeLog README )
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
|
||||
-i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
|
||||
epatch "${FILESDIR}/${PN}-2.10.1-qt5-printsupport.patch"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DUSE_QT_WEBKIT=ON
|
||||
)
|
||||
if use !qt5; then
|
||||
mycmakeargs+=(-DBT_FORCE_USE_QT4=)
|
||||
fi
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
diff -ruN bibletime-2.10.1-orig/CMakeLists.txt bibletime-2.10.1/CMakeLists.txt
|
||||
--- bibletime-2.10.1-orig/CMakeLists.txt 2014-10-14 21:20:59.068697225 -0400
|
||||
+++ bibletime-2.10.1/CMakeLists.txt 2014-10-14 21:23:20.045693427 -0400
|
||||
@@ -172,12 +172,14 @@
|
||||
)
|
||||
|
||||
IF(${BIBLETIME_FRONTEND} STREQUAL "MOBILE")
|
||||
- qt5_use_modules("bibletime" Widgets Qml Quick Network)
|
||||
+ qt5_use_modules("bibletime" Widgets Qml Quick Network PrintSupport)
|
||||
ELSE()
|
||||
IF(BT_Use_DBus)
|
||||
- qt5_use_modules("bibletime" DBus Widgets WebKit WebKitWidgets Xml Network)
|
||||
+ qt5_use_modules("bibletime" DBus Widgets WebKit WebKitWidgets Xml
|
||||
+ Network PrintSupport)
|
||||
ELSE()
|
||||
- qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network)
|
||||
+ qt5_use_modules("bibletime" Widgets WebKit WebKitWidgets Xml Network
|
||||
+ PrintSupport)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
ELSE()
|
||||
@ -1,2 +1,3 @@
|
||||
DIST sword-1.6.2.tar.gz 1965427 SHA256 af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9 SHA512 3a62364ce528540a338a163d5fe48ce4a0263c8af6d5a955ab6b5182f122a65130683d6cc6a8eb9fe3a41661d3bd3fe5bf830aa8329c2b8a6d47f010461b32b4 WHIRLPOOL 50fc2cc6a18a269c7f1eca16ed2f659b84ed0a53d520b4e7935bf0af10c96e9c0b2f26c7e3088edf8311564620fb778fc1f63c0b78c449ad165fee9843fb753d
|
||||
DIST sword-1.7.2.tar.gz 2127944 SHA256 ac7aace0ecb7a405d4b4b211ee1ae5b2250bb5c57c9197179747c9e830787871 SHA512 1ee9565f36d113c9b21883a78004e895ab2f74d9c9f1909058c204e38647a96938de2e544a68858d2c4b048b67ba868049c1c09f0067bc9819a5a85f75285ebe WHIRLPOOL 894e4d96b2ff61ac19de853ff6b17aa2279fb7b5b571c1030ba18daefbea8997bd61d386ff3a1dff49d997c69d6acf2a83094ad6ec5c593acca3dc7fb1d488a0
|
||||
DIST sword-1.7.3.tar.gz 2149459 SHA256 5a3d87ff155d5ecb0cfec052ba333b2b74d9273e2cc66fb1ca75747dfd8ea9ea SHA512 4805215954211584ed6b00869a31e1d317d9fa460db2d2e8c5c396f0154979949ec8b770ac8c6ff20106d8beea75d2a824c7e6b6ce5138fc3e558ab4b5614f2a WHIRLPOOL a0ccc912f72835cc30045c21da9aff6209cac8d356f6c71031761e7e884916a4707712d0d22df01281f5ea5e29759d01951d5e9908c85332fc569c1a9543abe6
|
||||
|
||||
@ -0,0 +1,78 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.7.3.ebuild,v 1.1 2014/10/14 18:37:32 creffett Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils flag-o-matic
|
||||
|
||||
DESCRIPTION="Library for Bible reading software"
|
||||
HOMEPAGE="http://www.crosswire.org/sword/"
|
||||
SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
|
||||
IUSE="curl debug doc icu static-libs"
|
||||
|
||||
RDEPEND="sys-libs/zlib
|
||||
curl? ( net-misc/curl )
|
||||
icu? ( dev-libs/icu:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
DOCS="AUTHORS CODINGSTYLE ChangeLog README"
|
||||
|
||||
RESTRICT="test" #Restricting for now, see bug 313207
|
||||
|
||||
src_prepare() {
|
||||
sed -i \
|
||||
-e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
|
||||
-e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
|
||||
configure || die
|
||||
|
||||
sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
|
||||
sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
|
||||
|
||||
cat <<-EOF > "${T}"/${PN}.conf
|
||||
[Install]
|
||||
DataPath=${EPREFIX}/usr/share/${PN}/
|
||||
EOF
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# TODO: Why is this here and can we remove it?
|
||||
strip-flags
|
||||
|
||||
econf \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable debug) \
|
||||
--with-zlib \
|
||||
$(use_with icu) \
|
||||
--with-conf \
|
||||
$(use_with curl)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
find "${ED}" -name '*.la' -exec rm -f {} +
|
||||
|
||||
if use doc; then
|
||||
rm -rf examples/.cvsignore
|
||||
rm -rf examples/cmdline/.cvsignore
|
||||
rm -rf examples/cmdline/.deps
|
||||
cp -R samples examples "${ED}"/usr/share/doc/${PF}/
|
||||
fi
|
||||
|
||||
insinto /etc
|
||||
doins "${T}"/${PN}.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Check out http://www.crosswire.org/sword/modules/"
|
||||
elog "to download modules that you would like to use with SWORD."
|
||||
elog "Follow module installation instructions found on"
|
||||
elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST xiphos-3.1.5.tar.gz 6720533 SHA256 2887426908e269f25d2d191be445112027b2b7e80356823d4942b1803a359d8c SHA512 2183125a1076660cf0448ee5f2df3ded9ee58c389716a8ceefe0185989d6c8267f19082add3fa8a7a9da57693f82b47e26c0fe77154e961b84234afbdf5b3a1d WHIRLPOOL 6a66671ab99cc62f0beb6bdfffcec2ff1048cae66ad6304fd788d005c0d0bf81273856af6373eba0bdf5fd6df0176894e1a99fe633fcd1fbad46c78b89848bbf
|
||||
DIST xiphos-3.1.6.tar.gz 6873107 SHA256 21f0024d57b3976526093279ef7ab7f3ed8afe07436ab983bd3049a14c3bdfe5 SHA512 5c25850ba549723993c7574c8629cfa75f4152a46173bfbbed9b62205041edebb34671e8aa5baade7b0aa8fbb218ff7b24292dc0e63ee2bb7e0219a8512feda9 WHIRLPOOL 3d1741e0d07983edfaacb3de85fac1f01352ffa5cb80596eb23b21c6b68a76069eae65d2892a9b987cb8ea41818bd3e92731929cb1c698a37d7886364339241f
|
||||
DIST xiphos-3.2.2.tar.gz 7088153 SHA256 2326efd2bad1b27d6c4231cba68077f71f91ee31f73bdada1cbe2c3bd11eadc6 SHA512 14dd33f99217de4062e6ff6c4030fce748f57bc7e4a984aa7927acb7779f3720da21a51eb2943d5be93eac702dcc32b023f9e39a91acb7182ce59b3c90941dbf WHIRLPOOL 488f3fb65b591a9122cc8fc8a1c118cb461ce1890205d53d5957633bb8ff240166616e4de3169afccf5799fb2db40e1e90ac8cef61f3f133e135dd9578227de8
|
||||
|
||||
@ -0,0 +1,91 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/xiphos/xiphos-3.2.2.ebuild,v 1.1 2014/10/14 19:01:57 creffett Exp $
|
||||
|
||||
# TODO: waf-utils.eclass ?
|
||||
|
||||
EAPI=5
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
|
||||
|
||||
DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
|
||||
HOMEPAGE="http://xiphos.org/"
|
||||
SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE="dbus debug webkit"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
>=app-text/sword-1.7.3
|
||||
>=dev-libs/glib-2
|
||||
dev-libs/libxml2
|
||||
gnome-base/gconf
|
||||
gnome-extra/gtkhtml:4.0
|
||||
>=gnome-extra/libgsf-1.14
|
||||
x11-libs/gtk+:3
|
||||
dbus? ( dev-libs/dbus-glib )
|
||||
webkit? ( net-libs/webkit-gtk:3 )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/docbook2X
|
||||
app-text/gnome-doc-utils
|
||||
app-text/rarian
|
||||
dev-libs/libxslt
|
||||
dev-util/intltool
|
||||
virtual/pkgconfig
|
||||
sys-devel/gettext
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i \
|
||||
-e '/FLAGS_DEBUG/s:-g:-Wall:' \
|
||||
-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
|
||||
wscript || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
|
||||
|
||||
tc-export AR CC CPP CXX RANLIB
|
||||
|
||||
local backend=gtkhtml
|
||||
use webkit && backend=webkit
|
||||
|
||||
CCFLAGS="${CFLAGS}" \
|
||||
LINKFLAGS="${LDFLAGS}" \
|
||||
SGML2MAN="$(type -P docbook2man.pl)" \
|
||||
./waf -v \
|
||||
--prefix=/usr \
|
||||
--gtk=3 \
|
||||
--debug-level=$(use debug && echo debug || echo release) \
|
||||
$(use dbus || echo --disable-dbus) \
|
||||
configure || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
./waf -v build || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
./waf -v --destdir="${D}" install || die
|
||||
|
||||
doman ${PN}.1
|
||||
dodoc AUTHORS ChangeLog README RELEASE-NOTES TODO
|
||||
|
||||
dodoc Xiphos.ogg
|
||||
docompress -x /usr/share/doc/${PF}/Xiphos.ogg
|
||||
|
||||
rm -rf "${ED}"/usr/share/doc/${PN}
|
||||
}
|
||||
|
||||
pkg_preinst() { gnome2_icon_savelist; }
|
||||
pkg_postinst() { gnome2_icon_cache_update; }
|
||||
pkg_postrm() { gnome2_icon_cache_update; }
|
||||
@ -0,0 +1 @@
|
||||
DIST etcd-0.4.6.zip 3184823 SHA256 9134701506a6e9f569ef62d3bb4c43f594f30d66ce67060403998233dbfc0ed6 SHA512 5c25b99c826daa20493645e0e2bec38fd06c17029c3677f65f451fe132441d19e00eebd04c462936c22caeaf327b56cf47027ca8080508dc742a5e6a7d3f89c6 WHIRLPOOL 5ab7fb2d51ca1be4c2a54a37953a0154e06eb094d81ebb94f9260c0f786104d273e214f1ee20cd4a46018e6323d23fe697d54f2903c1acadac9ec2c34611abd6
|
||||
@ -0,0 +1,46 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/etcd/etcd-0.4.6.ebuild,v 1.1 2014/10/15 11:36:53 zmedico Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit user systemd
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
DESCRIPTION="A highly-available key value store for shared configuration and service discovery"
|
||||
HOMEPAGE="https://github.com/coreos/etcd/"
|
||||
SRC_URI="https://github.com/coreos/etcd/archive/v${PV}.zip -> ${P}.zip"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
DEPEND=">=dev-lang/go-1.2"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup ${PN}
|
||||
enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -e "s:^\(go install\)\(.*\)$:\\1 -x -ldflags=\"-v -linkmode=external -extldflags '${LDFLAGS}'\" \\2:" \
|
||||
-i build || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
CGO_CFLAGS="${CFLAGS}" ./build || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin bin/${PN}
|
||||
newbin bin/bench ${PN}-bench
|
||||
dodoc -r CHANGELOG Documentation README.md
|
||||
systemd_dounit "${FILESDIR}/${PN}.service"
|
||||
systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
|
||||
newinitd "${FILESDIR}"/${PN}.initd ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}.confd ${PN}
|
||||
dodir /var/lib/${PN}
|
||||
fowners ${PN}:${PN} /var/lib/${PN}
|
||||
fperms 755 /var/lib/${PN}
|
||||
dodir /var/log/${PN}
|
||||
fowners ${PN}:${PN} /var/log/${PN}
|
||||
fperms 755 /var/log/${PN}
|
||||
}
|
||||
@ -0,0 +1,2 @@
|
||||
d /var/lib/etcd 0755 etcd etcd - -
|
||||
d /var/run/etcd 0755 etcd etcd - -
|
||||
@ -0,0 +1,7 @@
|
||||
# Name of this node in the etcd cluster.
|
||||
ETCD_NAME=etcd
|
||||
|
||||
# Path to the data directory.
|
||||
ETCD_DATA_DIR=/var/lib/etcd
|
||||
|
||||
ETCD_OPTS=""
|
||||
@ -0,0 +1,54 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/etcd/files/etcd.initd,v 1.1 2014/10/15 11:36:53 zmedico Exp $
|
||||
|
||||
SVCNAME=etcd
|
||||
PIDPATH=/var/run/${SVCNAME}
|
||||
PIDFILE=${PIDPATH}/${SVCNAME}.pid
|
||||
LOGPATH=/var/log/${SVCNAME}
|
||||
DATADIR=/var/lib/${SVCNAME}
|
||||
USER=$SVCNAME
|
||||
|
||||
depend() {
|
||||
need net
|
||||
need localmount
|
||||
after bootmisc
|
||||
}
|
||||
|
||||
start() {
|
||||
if [ ! -d "$PIDPATH" ] ; then
|
||||
mkdir -p "$PIDPATH"
|
||||
chown $USER:$USER "$PIDPATH"
|
||||
fi
|
||||
if [ ! -d "$LOGPATH" ] ; then
|
||||
mkdir -p "$LOGPATH"
|
||||
chown $USER:$USER "$LOGPATH"
|
||||
fi
|
||||
if [ ! -d "$ETCD_DATA_DIR" ] ; then
|
||||
mkdir -p "$ETCD_DATA_DIR"
|
||||
chown $USER:$USER "$ETCD_DATA_DIR"
|
||||
fi
|
||||
|
||||
ebegin "Starting $SVCNAME"
|
||||
start-stop-daemon --start \
|
||||
--pidfile "$PIDFILE" \
|
||||
--user $USER \
|
||||
--chdir "$ETCD_DATA_DIR" \
|
||||
-1 "$LOGPATH/$SVCNAME.log" \
|
||||
-2 "$LOGPATH/$SVCNAME.err" \
|
||||
--background \
|
||||
--make-pidfile \
|
||||
--exec /usr/bin/etcd -- \
|
||||
-name=$ETCD_NAME \
|
||||
-data-dir="$ETCD_DATA_DIR" \
|
||||
$ETCD_OPTS
|
||||
eend $? "Failed to start $SVCNAME"
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Stopping $SVCNAME"
|
||||
start-stop-daemon --stop --pidfile $PIDFILE
|
||||
eend $? "Failed to stop $SVCNAME"
|
||||
rm -f "$PIDFILE"
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
[Unit]
|
||||
Description=etcd
|
||||
|
||||
[Service]
|
||||
User=etcd
|
||||
PermissionsStartOnly=true
|
||||
Environment=ETCD_DATA_DIR=/var/lib/etcd
|
||||
Environment=ETCD_NAME=%m
|
||||
ExecStart=/usr/bin/etcd
|
||||
Restart=always
|
||||
RestartSec=10s
|
||||
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<upstream>
|
||||
<bugs-to>https://github.com/coreos/etcd/issues</bugs-to>
|
||||
<changelog>https://raw.githubusercontent.com/coreos/etcd/master/CHANGELOG</changelog>
|
||||
<doc>https://github.com/coreos/etcd/blob/master/README.md/</doc>
|
||||
</upstream>
|
||||
<maintainer>
|
||||
<email>zmedico@gentoo.org</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -1,66 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.52.8-r1.ebuild,v 1.2 2014/08/10 20:00:58 slyfox Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit autotools eutils
|
||||
|
||||
MY_PN="iODBC"
|
||||
|
||||
DESCRIPTION="ODBC Interface for Linux"
|
||||
HOMEPAGE="http://www.iodbc.org/"
|
||||
SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
LICENSE="|| ( LGPL-2 BSD )"
|
||||
SLOT="0"
|
||||
IUSE="gtk"
|
||||
|
||||
RDEPEND=">=sys-libs/readline-4.1
|
||||
>=sys-libs/ncurses-5.2
|
||||
gtk? ( x11-libs/gtk+:2 )"
|
||||
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS="AUTHORS ChangeLog NEWS README"
|
||||
|
||||
S="${WORKDIR}/${MY_PN}-${PV}"
|
||||
|
||||
src_prepare() {
|
||||
sed -i.orig \
|
||||
-e '/^cd "$PREFIX"/,/^esac/d' \
|
||||
iodbc/install_libodbc.sh || die "sed failed"
|
||||
epatch \
|
||||
"${FILESDIR}"/libiodbc-3.52.7-debian_bug501100.patch \
|
||||
"${FILESDIR}"/libiodbc-3.52.7-debian_bug508480.patch \
|
||||
"${FILESDIR}"/libiodbc-3.52.7-gtk.patch \
|
||||
"${FILESDIR}"/libiodbc-3.52.7-multilib.patch \
|
||||
"${FILESDIR}"/libiodbc-3.52.7-unicode_includes.patch \
|
||||
"${FILESDIR}"/libiodbc-3.52.8-gtk-parallel-make.patch \
|
||||
"${FILESDIR}"/libiodbc-3.52.8-runtime-failures.patch \
|
||||
"${FILESDIR}"/fix-runpaths.patch
|
||||
chmod -x include/*.h || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--disable-static \
|
||||
--enable-odbc3 \
|
||||
--enable-pthreads \
|
||||
--with-layout=gentoo \
|
||||
--with-iodbc-inidir=yes \
|
||||
$(use_enable gtk gui)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
prune_libtool_files
|
||||
|
||||
# Install lintian overrides
|
||||
insinto /usr/share/lintian/overrides
|
||||
newins debian/iodbc.lintian-overrides iodbc
|
||||
newins debian/libiodbc2.lintian-overrides libiodbc2
|
||||
|
||||
}
|
||||
@ -1,66 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.52.8.ebuild,v 1.3 2014/08/10 20:00:58 slyfox Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit autotools eutils
|
||||
|
||||
MY_PN="iODBC"
|
||||
|
||||
DESCRIPTION="ODBC Interface for Linux"
|
||||
HOMEPAGE="http://www.iodbc.org/"
|
||||
SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
LICENSE="|| ( LGPL-2 BSD )"
|
||||
SLOT="0"
|
||||
IUSE="gtk static-libs"
|
||||
|
||||
RDEPEND=">=sys-libs/readline-4.1
|
||||
>=sys-libs/ncurses-5.2
|
||||
gtk? ( x11-libs/gtk+:2 )"
|
||||
|
||||
DEPEND="app-admin/chrpath
|
||||
${RDEPEND}"
|
||||
|
||||
DOCS="AUTHORS ChangeLog NEWS README"
|
||||
|
||||
S="${WORKDIR}/${MY_PN}-${PV}"
|
||||
|
||||
src_prepare() {
|
||||
sed -i.orig \
|
||||
-e '/^cd "$PREFIX"/,/^esac/d' \
|
||||
iodbc/install_libodbc.sh || die "sed failed"
|
||||
epatch \
|
||||
"${FILESDIR}"/libiodbc-3.52.7-debian_bug501100.patch \
|
||||
"${FILESDIR}"/libiodbc-3.52.7-debian_bug508480.patch \
|
||||
"${FILESDIR}"/libiodbc-3.52.7-gtk.patch \
|
||||
"${FILESDIR}"/libiodbc-3.52.7-multilib.patch \
|
||||
"${FILESDIR}"/libiodbc-3.52.7-unicode_includes.patch \
|
||||
"${FILESDIR}"/libiodbc-3.52.8-gtk-parallel-make.patch \
|
||||
"${FILESDIR}"/libiodbc-3.52.8-runtime-failures.patch
|
||||
chmod -x include/*.h || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--enable-odbc3 \
|
||||
--enable-pthreads \
|
||||
--with-layout=gentoo \
|
||||
--with-iodbc-inidir=yes \
|
||||
$(use_enable gtk gui) \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
prune_libtool_files
|
||||
|
||||
# Install lintian overrides
|
||||
insinto /usr/share/lintian/overrides
|
||||
newins debian/iodbc.lintian-overrides iodbc
|
||||
newins debian/libiodbc2.lintian-overrides libiodbc2
|
||||
|
||||
}
|
||||
@ -1,10 +1,11 @@
|
||||
DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43
|
||||
DIST nss-3.15.4-pem-support-20140109.patch.xz 28400 SHA256 bcdd3decd9a7e33e240af899ead32fb92c9bf623bc99fc4b60ca4e08bcf92b82 SHA512 59066b73357ae96d3f18749b8f3bd07548d8f5e6a7b8b1f2bf227ac95ee6d3ad8ccfa60471de41f7b73f37db8e80e948c34109c69e96e958be094140e026504e WHIRLPOOL b08f463a6f699957737f3d7dda8e25e15658097d8a538c2596b94c55777afdf6526ab041e617c54ae709bdce4f1acc2aa19da619eb98e128a1d0cd0dc1de230d
|
||||
DIST nss-3.15.4.tar.gz 6366271 SHA256 14d69a0735c5af6b3cc12591f7ebf272203e889f09104182148091d0af682d7c SHA512 21ca81b636f7e230715556bc874d5c1c4f370c6fe57a39cb12fa349d0414a88e13aa931060613a793f7267868e026eaf167cbab5f2a5e8759e7a4b176d97fc6a WHIRLPOOL 7ebf8a60e7db5ee8e90137430f1b97d591fc11d02771aac027a1ff702f17ff74a8c78f4f77fb92aab1d10d6e0ff63d2e72e4bbf3d489ba60d778cb02868c2ec6
|
||||
DIST nss-3.16.2.1.tar.gz 6423480 SHA256 dc42c6c54ce1d8f2b5a5c116629e8e5e2a09cbd19e5390dd3badaf8fc874c087 SHA512 925f1e9e5986763227bacbf8200ab5fa3ac3edbfeba20d3278cea31ed7897f3663de4e08551b26af174e1f1af0b32afcbba7b7770e7b2034f7bbb002f2ced32d WHIRLPOOL ffba118c08b80420e1632ccbc232cdcb9a30ca66a28cc8eb9dfc31523ef1e5f98f9fc99a1ee74d98433ccfac4bbe5bfa032eaf958ae6e3122343d7cfade9afed
|
||||
DIST nss-3.16.3.tar.gz 6426732 SHA256 657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60 SHA512 2e829b021319a9d8c0cedec742f84c54815eed8e3b1042b5045f08746e5768286001e9517d2b69c2a5d705cd632c98f3a9227e651a492bae3ef638cc706fe31f WHIRLPOOL bd8fe296baf79b4cad2224a921bf6d0a6b6a1f13df5b64131f59964541d2ec1ae506a79a5a3b8dc08a47c8fcdfa5eafb866727fcf26c37d4e5e91a7ebb7886b3
|
||||
DIST nss-3.16.5.tar.gz 6429830 SHA256 e744b9fb2a6291d7eaf1b3f0157082f4214984db33f896e4adf3141340d64196 SHA512 687513e2e4ac8139d045a9f4af3440db0dbcd1e8b1834da1a1a3c9f948929c00464b2a6e857bc9f83125df52f30d1ed91786f22fcdf24f148a7ed5cc474f0c75 WHIRLPOOL 77b484b55e39f97de639b7f40ad66a79b6931528374d0dfa6afaec4bc0f11280ffd0ffc5ba342d64541e0ea59659e99f2c8bf5181f9b34e095bda2321e42b3d4
|
||||
DIST nss-3.16.6.tar.gz 6429976 SHA256 955b4cd8c5769d94b0455767efbe315ca6956ba24c15a3494e62fcccc989e752 SHA512 c629d4810b23db5af4818573dc3b10ca3f99072aa679f1df930cbd16ebcc529e9fd77ccf1aeabc821cd8f8cd3e452e06ace8ef10ade173ae91a0c91134bc281e WHIRLPOOL 6c611b61430591887dfb5a4c5196a18bf1e656986671b65d253a5999f5304422b5cad8d8c12411b35580c52104ae501e3e8c0b857486659bd7b0aa8697bfe016
|
||||
DIST nss-3.16.tar.gz 6378110 SHA256 2bb4faa200962caacf0454f1e870e74aa9a543809e5c440f7978bcce58e0bfe8 SHA512 e3dcde8213f7f131fe2f714ff2f45c6d7b9b2167e51dbf0e1a750cc4f83d9fa35e69408850de6600f55fbc9e26b29dc344548cb64849d6e3252476eadd7ee57f WHIRLPOOL d30b53ec36cacff9756b43780d904e32760cd5d0b75f1888b6fb80e0a87ce828f4e6189de63880ddce90bdf5d90123ff7e9fdf600f4df02ce59702898f08c11e
|
||||
DIST nss-3.17.1.tar.gz 6927105 SHA256 0e210afba7cd1e033a08f61fcd1f466639649fc413e72aa050f3d52c19376e5f SHA512 398b2af3f358ba687a24fdd97cbf77cc22c36c6b6dc4bd72307a8108a503428c0e92567c4665366062206826827905cea2304ba98673333098ee2da8ffcfd3a4 WHIRLPOOL 417352164e92120669a12a236530d692c987b5cd60b6035d30dd26ed5d950cccbc169c6f0ac6451253dfad3febfdde9dac7f73d06806f9455430f92ccbe2b487
|
||||
DIST nss-3.17.2.tar.gz 6927414 SHA256 134929e44e44b968a4883f4ee513a71ae45d55b486cee41ee8e26c3cc84dab8b SHA512 a3d165bb2c578e7b5d90349729e85a2fce09260d069093080c76cce3b8a996c6489232324fd6a0c69b959321bcdf5f1806054f165cd6ce851fe4ffeb2883ae7f WHIRLPOOL 01b3cc546aa2dd0974caa2267aa9874b01cf6096f307a114393ba5a98adc216e0f2b217631b89b20752be5881f70fc1a7e94e0e90618707d5f9b9d18fd55d859
|
||||
DIST nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 27506 SHA256 50d9ec26a75835e900302f631456e278e13d4b435b8f98aa69f79dd439ddc6ab SHA512 0158a140f112a905f7db5a4f4d04f49f6742db1d2665ddf6c32913c367f0b93a57f86ba13b9883a42a528aff44c48196941d7c0fd7a27005db6adaf07802e501 WHIRLPOOL 279ef11d2d6f0cb7c192189d64bc6971cdada7417b93a65a3ff0ba4548b736b53b9812803024c2349114e94e0864f2b58c23812687ed3f75cf28334b0f6e11ac
|
||||
DIST nss-pem-3ade37c5c4ca5a6094e3f4b2e4591405db1867dd.tar.bz2 28849 SHA256 0388cb01d6158fad92b6ee13241531c7dba66a4be64e85160ded212c3febadc4 SHA512 6994bd7435ad0cff9f5aed509c5f7ea438a6829188bea94d57020e8df6d75631b289363b6f68c3c96da67c958af967c624147d3604b734d8f0b57688f74e7c95 WHIRLPOOL a168e137981f4bc4cc6735bcc234b3fe14ea0cc91768926cdaae3f124ba1dfcd06be029c3805ded20df600c8655bb2d97beb69a0c6b7f2441e7ee4c651cd7868
|
||||
|
||||
@ -0,0 +1,321 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.17.2.ebuild,v 1.1 2014/10/14 21:10:22 axs Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
|
||||
|
||||
NSPR_VER="4.10.6-r1"
|
||||
RTM_NAME="NSS_${PV//./_}_RTM"
|
||||
# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
|
||||
PEM_GIT_REV="015ae754dd9f6fbcd7e52030ec9732eb27fc06a8"
|
||||
PEM_P="${PN}-pem-${PEM_GIT_REV}"
|
||||
|
||||
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
|
||||
HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
|
||||
SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
|
||||
cacert? ( http://dev.gentoo.org/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
|
||||
nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/${PEM_P}.tar.bz2 )"
|
||||
|
||||
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="+cacert +nss-pem utils"
|
||||
|
||||
DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
|
||||
>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]"
|
||||
RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
|
||||
>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
|
||||
abi_x86_32? (
|
||||
!<=app-emulation/emul-linux-x86-baselibs-20140508-r12
|
||||
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
|
||||
)"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
S="${WORKDIR}/${P}/${PN}"
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/nss-config
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
if use nss-pem ; then
|
||||
mv "${PEM_P}"/nss/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Custom changes for gentoo
|
||||
epatch "${FILESDIR}/${PN}-3.17.1-gentoo-fixups.patch"
|
||||
epatch "${FILESDIR}/${PN}-3.15-gentoo-fixup-warnings.patch"
|
||||
use cacert && epatch "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
|
||||
use nss-pem && epatch "${FILESDIR}/${PN}-3.15.4-enable-pem.patch"
|
||||
epatch "${FILESDIR}/nss-3.14.2-solaris-gcc.patch"
|
||||
|
||||
pushd coreconf >/dev/null || die
|
||||
# hack nspr paths
|
||||
echo 'INCLUDES += -I$(DIST)/include/dbm' \
|
||||
>> headers.mk || die "failed to append include"
|
||||
|
||||
# modify install path
|
||||
sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
|
||||
-i source.mk || die
|
||||
|
||||
# Respect LDFLAGS
|
||||
sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
|
||||
popd >/dev/null || die
|
||||
|
||||
# Fix pkgconfig file for Prefix
|
||||
sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
|
||||
config/Makefile || die
|
||||
|
||||
# use host shlibsign if need be #436216
|
||||
if tc-is-cross-compiler ; then
|
||||
sed -i \
|
||||
-e 's:"${2}"/shlibsign:shlibsign:' \
|
||||
cmd/shlibsign/sign.sh || die
|
||||
fi
|
||||
|
||||
# dirty hack
|
||||
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
|
||||
lib/ssl/config.mk || die
|
||||
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
|
||||
cmd/platlibs.mk || die
|
||||
|
||||
multilib_copy_sources
|
||||
|
||||
strip-flags
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# Ensure we stay multilib aware
|
||||
sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
|
||||
}
|
||||
|
||||
nssarch() {
|
||||
# Most of the arches are the same as $ARCH
|
||||
local t=${1:-${CHOST}}
|
||||
case ${t} in
|
||||
aarch64*)echo "aarch64";;
|
||||
hppa*) echo "parisc";;
|
||||
i?86*) echo "i686";;
|
||||
x86_64*) echo "x86_64";;
|
||||
*) tc-arch ${t};;
|
||||
esac
|
||||
}
|
||||
|
||||
nssbits() {
|
||||
local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
|
||||
if [[ ${1} == BUILD_ ]]; then
|
||||
cc=$(tc-getBUILD_CC)
|
||||
else
|
||||
cc=$(tc-getCC)
|
||||
fi
|
||||
echo > "${T}"/test.c || die
|
||||
${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
|
||||
case $(file "${T}/${1}test.o") in
|
||||
*32-bit*x86-64*) echo USE_X32=1;;
|
||||
*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
|
||||
*32-bit*|*ppc*|*i386*) ;;
|
||||
*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
|
||||
esac
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
# use ABI to determine bit'ness, or fallback if unset
|
||||
local buildbits mybits
|
||||
case "${ABI}" in
|
||||
n32) mybits="USE_N32=1";;
|
||||
x32) mybits="USE_X32=1";;
|
||||
s390x|*64) mybits="USE_64=1";;
|
||||
${DEFAULT_ABI})
|
||||
einfo "Running compilation test to determine bit'ness"
|
||||
mybits=$(nssbits)
|
||||
;;
|
||||
esac
|
||||
# bitness of host may differ from target
|
||||
if tc-is-cross-compiler; then
|
||||
buildbits=$(nssbits BUILD_)
|
||||
fi
|
||||
|
||||
local makeargs=(
|
||||
CC="$(tc-getCC)"
|
||||
AR="$(tc-getAR) rc \$@"
|
||||
RANLIB="$(tc-getRANLIB)"
|
||||
OPTIMIZER=
|
||||
${mybits}
|
||||
)
|
||||
|
||||
# Take care of nspr settings #436216
|
||||
local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
|
||||
unset NSPR_INCLUDE_DIR
|
||||
|
||||
# Do not let `uname` be used.
|
||||
if use kernel_linux ; then
|
||||
makeargs+=(
|
||||
OS_TARGET=Linux
|
||||
OS_RELEASE=2.6
|
||||
OS_TEST="$(nssarch)"
|
||||
)
|
||||
fi
|
||||
|
||||
export BUILD_OPT=1
|
||||
export NSS_USE_SYSTEM_SQLITE=1
|
||||
export NSDISTMODE=copy
|
||||
export NSS_ENABLE_ECC=1
|
||||
export FREEBL_NO_DEPEND=1
|
||||
export ASFLAGS=""
|
||||
|
||||
local d
|
||||
|
||||
# Build the host tools first.
|
||||
LDFLAGS="${BUILD_LDFLAGS}" \
|
||||
XCFLAGS="${BUILD_CFLAGS}" \
|
||||
NSPR_LIB_DIR="${T}/fakedir" \
|
||||
emake -j1 -C coreconf \
|
||||
CC="$(tc-getBUILD_CC)" \
|
||||
${buildbits:-${mybits}}
|
||||
makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
|
||||
|
||||
# Then build the target tools.
|
||||
for d in . lib/dbm ; do
|
||||
CPPFLAGS="${myCPPFLAGS}" \
|
||||
XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
|
||||
NSPR_LIB_DIR="${T}/fakedir" \
|
||||
emake -j1 "${makeargs[@]}" -C ${d}
|
||||
done
|
||||
}
|
||||
|
||||
# Altering these 3 libraries breaks the CHK verification.
|
||||
# All of the following cause it to break:
|
||||
# - stripping
|
||||
# - prelink
|
||||
# - ELF signing
|
||||
# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
|
||||
# Either we have to NOT strip them, or we have to forcibly resign after
|
||||
# stripping.
|
||||
#local_libdir="$(get_libdir)"
|
||||
#export STRIP_MASK="
|
||||
# */${local_libdir}/libfreebl3.so*
|
||||
# */${local_libdir}/libnssdbm3.so*
|
||||
# */${local_libdir}/libsoftokn3.so*"
|
||||
|
||||
export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
|
||||
|
||||
generate_chk() {
|
||||
local shlibsign="$1"
|
||||
local libdir="$2"
|
||||
einfo "Resigning core NSS libraries for FIPS validation"
|
||||
shift 2
|
||||
local i
|
||||
for i in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
local libname=lib${i}.so
|
||||
local chkname=lib${i}.chk
|
||||
"${shlibsign}" \
|
||||
-i "${libdir}"/${libname} \
|
||||
-o "${libdir}"/${chkname}.tmp \
|
||||
&& mv -f \
|
||||
"${libdir}"/${chkname}.tmp \
|
||||
"${libdir}"/${chkname} \
|
||||
|| die "Failed to sign ${libname}"
|
||||
done
|
||||
}
|
||||
|
||||
cleanup_chk() {
|
||||
local libdir="$1"
|
||||
shift 1
|
||||
local i
|
||||
for i in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
local libfname="${libdir}/lib${i}.so"
|
||||
# If the major version has changed, then we have old chk files.
|
||||
[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
|
||||
&& rm -f "${libfname}.chk"
|
||||
done
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
pushd dist >/dev/null || die
|
||||
|
||||
dodir /usr/$(get_libdir)
|
||||
cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
|
||||
cp -L -t "${ED}"/usr/$(get_libdir) */lib/{libcrmf,libfreebl}.a || die "copying libs failed"
|
||||
|
||||
# Install nss-config and pkgconfig file
|
||||
dodir /usr/bin
|
||||
cp -L */bin/nss-config "${ED}"/usr/bin || die
|
||||
dodir /usr/$(get_libdir)/pkgconfig
|
||||
cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
|
||||
|
||||
# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
|
||||
# bug 517266
|
||||
sed -e 's#Libs:#Libs: -lfreebl#' \
|
||||
-e 's#Cflags:#Cflags: -I${includedir}/private#' \
|
||||
*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
|
||||
|| die "could not create nss-softokn.pc"
|
||||
|
||||
# all the include files
|
||||
insinto /usr/include/nss
|
||||
doins public/nss/*.h
|
||||
insinto /usr/include/nss/private
|
||||
doins private/nss/{blapi,alghmac}.h
|
||||
|
||||
popd >/dev/null || die
|
||||
|
||||
local f nssutils
|
||||
# Always enabled because we need it for chk generation.
|
||||
nssutils="shlibsign"
|
||||
|
||||
if multilib_is_native_abi ; then
|
||||
if use utils; then
|
||||
# The tests we do not need to install.
|
||||
#nssutils_test="bltest crmftest dbtest dertimetest
|
||||
#fipstest remtest sdrtest"
|
||||
nssutils="addbuiltin atob baddbdir btoa certcgi certutil checkcert
|
||||
cmsutil conflict crlutil derdump digest makepqg mangle modutil multinit
|
||||
nonspr10 ocspclnt oidcalc p7content p7env p7sign p7verify pk11mode
|
||||
pk12util pp rsaperf selfserv shlibsign signtool signver ssltap strsclnt
|
||||
symkeyutil tstclnt vfychain vfyserv"
|
||||
fi
|
||||
pushd dist/*/bin >/dev/null || die
|
||||
for f in ${nssutils}; do
|
||||
dobin ${f}
|
||||
done
|
||||
popd >/dev/null || die
|
||||
fi
|
||||
|
||||
# Prelink breaks the CHK files. We don't have any reliable way to run
|
||||
# shlibsign after prelink.
|
||||
local l libs=() liblist
|
||||
for l in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
|
||||
done
|
||||
liblist=$(printf '%s:' "${libs[@]}")
|
||||
echo -e "PRELINK_PATH_MASK=${liblist%:}" > "${T}/90nss-${ABI}"
|
||||
doenvd "${T}/90nss-${ABI}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
multilib_pkg_postinst() {
|
||||
# We must re-sign the libraries AFTER they are stripped.
|
||||
local shlibsign="${EROOT}/usr/bin/shlibsign"
|
||||
# See if we can execute it (cross-compiling & such). #436216
|
||||
"${shlibsign}" -h >&/dev/null
|
||||
if [[ $? -gt 1 ]] ; then
|
||||
shlibsign="shlibsign"
|
||||
fi
|
||||
generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
|
||||
}
|
||||
|
||||
multilib_foreach_abi multilib_pkg_postinst
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
multilib_pkg_postrm() {
|
||||
cleanup_chk "${EROOT}"/usr/$(get_libdir)
|
||||
}
|
||||
|
||||
multilib_foreach_abi multilib_pkg_postrm
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/LaTeX-Driver/LaTeX-Driver-0.200.4.ebuild,v 1.1 2014/10/14 21:04:47 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=EINHVERFR
|
||||
MODULE_VERSION=0.200.4
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Perl encapsulation of invoking the Latex programs"
|
||||
|
||||
LICENSE="|| ( GPL-1+ Artistic )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-perl/Class-Accessor
|
||||
dev-perl/Exception-Class
|
||||
dev-perl/File-Slurp
|
||||
virtual/perl-File-Spec
|
||||
dev-perl/File-pushd
|
||||
virtual/perl-Getopt-Long
|
||||
dev-perl/Readonly
|
||||
virtual/perl-parent
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
"
|
||||
SRC_TEST="do"
|
||||
@ -0,0 +1 @@
|
||||
DIST LaTeX-Driver-0.200.4.tar.gz 63968 SHA256 f853501847ace834b786090bae6300edfbf020d9dec710497a4684ca4598b77b SHA512 7ed52118076460d84aa465cbe6c637d7289e2197aff0a40a654d4fdcea9e7a96ab945c7552709ba7cc65f818828e4107477da47b3fe184e474d4baf105048993 WHIRLPOOL 73e7102d817d3cbe7ea3496b245050c9261509d0f3df7e31945048fd811f1058cbd27eb194d6963e9b0faef5ee202b6dffc7f634e8cae6651dbfd283221c57ab
|
||||
@ -1,7 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>maintainer-needed@gentoo.org</email>
|
||||
</maintainer>
|
||||
<herd>perl</herd>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,28 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/LaTeX-Encode/LaTeX-Encode-0.91.6.ebuild,v 1.1 2014/10/14 21:20:31 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=EINHVERFR
|
||||
MODULE_VERSION=0.091.6
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Encode characters for LaTeX formatting"
|
||||
|
||||
LICENSE="|| ( GPL-1+ Artistic )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
virtual/perl-Getopt-Long
|
||||
dev-perl/HTML-Parser
|
||||
dev-perl/Pod-LaTeX
|
||||
dev-perl/Readonly
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
"
|
||||
|
||||
SRC_TEST="do"
|
||||
@ -0,0 +1 @@
|
||||
DIST LaTeX-Encode-0.091.6.tar.gz 45887 SHA256 85b27f5fff1149016b5edb07ffb73cc7916f9525b66b0c7a07dbac5c0cf1fe52 SHA512 a0d6bb32a72aba07256b86fee134795792e52e90ddafd344f8bdc4aba318ac35a2fa62e47ac4586956f78db79ed6382bf859fe5151cc1319ca5a92f5712fd9ea WHIRLPOOL 01991a3d23fc674b804280763cbbf0f7335d7ebcfa4795be69dbb60ca76469c337450f24f3886da78181de2b5d23057b7671c81a83ec0b7837013e4f44f81fbb
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>perl</herd>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/LaTeX-Table/LaTeX-Table-1.0.6.ebuild,v 1.1 2014/10/14 21:37:04 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=LIMAONE
|
||||
MODULE_VERSION=v1.0.6
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Perl extension for the automatic generation of LaTeX tables"
|
||||
|
||||
LICENSE="|| ( GPL-1+ Artistic )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
virtual/perl-Carp
|
||||
virtual/perl-Module-Pluggable
|
||||
dev-perl/Moose
|
||||
dev-perl/MooseX-FollowPBP
|
||||
virtual/perl-Scalar-List-Utils
|
||||
dev-perl/Template-Toolkit
|
||||
virtual/perl-version
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-File-Spec
|
||||
virtual/perl-Module-Build
|
||||
test? ( dev-perl/Test-NoWarnings )
|
||||
"
|
||||
|
||||
SRC_TEST="do"
|
||||
@ -0,0 +1 @@
|
||||
DIST LaTeX-Table-v1.0.6.tar.gz 427725 SHA256 d6cca901d4787c646e8a6a633c44392e1ae9757bff6b18a06b13f2315d79433f SHA512 589b2b5f065348d15959af3d83040b54ab986bb8c5ec0c1e51f7a315230266dce5d6d3b43c9293ad2f6163fa3bddae62b825306c5a0a519f38903b50988f003a WHIRLPOOL c8669f6683dc012c48a07711287b9734fc8804ea9bcc7510b52df5cc1b3b67df010c01e5a88cc79d352ccab6eeecf96b6576a3461650f1e9bda832d980e31d33
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>perl</herd>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1 @@
|
||||
DIST MooseX-FollowPBP-0.05.tar.gz 9517 SHA256 fb324951e7be22299f5f688b3ec3491da47360f9c4a23a59b6b928d28d3e2047 SHA512 40edd8219c6afc032901b3a692fb51aa0867eb5bb91d17fc806cb74a19a034ab11992fbaa8f3b2f711b667abe9cc911f819b1f0b572f152b199e226cf6dcb7f2 WHIRLPOOL 34ab20b32500e536d443ecc6ad2a4381d19cfdbf7a463d3773e59b728498ab262b151b8c0ff1348a8bc2c22ed61c44c9aca99e1e1972762ea8d43daaa68f0c67
|
||||
@ -0,0 +1,25 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/MooseX-FollowPBP/MooseX-FollowPBP-0.50.0.ebuild,v 1.1 2014/10/14 21:33:14 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=DROLSKY
|
||||
MODULE_VERSION=0.05
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Name your accessors get_foo() and set_foo(), whatever that may mean"
|
||||
|
||||
LICENSE="Artistic-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
dev-perl/Moose
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
"
|
||||
|
||||
SRC_TEST="do"
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>perl</herd>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1 @@
|
||||
DIST Pod-LaTeX-0.61.tar.gz 32618 SHA256 15a840ea1c8a76cd3c865fbbf2fec33b03615c0daa50f9c800c54e0cf0659d46 SHA512 c9b5d8b50f630e25e1f913d95d83a1323e71d2c5a3a794a543bdc9962800e5979b3e58595e7a653a96f9aea1f321c1564e2062e9b9d70d8c4d1c6729cb8df498 WHIRLPOOL fa523640c5c2cdbc2306ffefb17740dc1fd7d6e0f7cd7d6bbcfa71e4ff0a6b1899e5ff5b9882b746db73a0a71d90ffe6292618dcb6a3ecc77b4f3abcbd66fe37
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Pod-LaTeX/Pod-LaTeX-0.610.0.ebuild,v 1.1 2014/10/14 21:17:40 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=TJENNESS
|
||||
MODULE_VERSION=0.61
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="Convert Pod data to formatted LaTeX"
|
||||
|
||||
LICENSE="|| ( GPL-1+ Artistic )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
virtual/perl-Pod-Parser
|
||||
virtual/perl-if
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-Module-Build
|
||||
"
|
||||
|
||||
SRC_TEST="do"
|
||||
@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>perl</herd>
|
||||
</pkgmetadata>
|
||||
@ -1 +1,2 @@
|
||||
DIST Template-Latex-2.17.tar.gz 12875 SHA256 f973f2779768d29cf46f794a58700037dfe401fd7f3721b0d23cbfddbb4c16f1 SHA512 19fe8e2a7dc51ec734c25d2d4fb3a01df3751be49d9b4c0ee90e792b321079e28ce29656b08f80e6205f6edad5e7f5ff91335fcb9821373e729ddb5482a7c1d6 WHIRLPOOL 57f8a024e86a0e3b142f9fba6d40f8aa99b11318107dc2feb0a0bf16433f66f8e022ee52b11e1d7b8da6b485102fc574a4eeb8ae35e0f17f3cfcdd7e34634dac
|
||||
DIST Template-Plugin-Latex-3.06.tar.gz 20487 SHA256 8d083ea7f465df817b173bf51ab4f8ab7e00063cf701f1c477a411d2225337bd SHA512 13baa205d2095eb25fb746bfd03dd9f75d7c48cf775cc0b2d5874e9e6a76f69971925729709136dc53276b210855dbc7bf71d79bb0aa3dd28c8383c8569a7441 WHIRLPOOL 4c4f8d8f610a0bdae276779675eb8aad793478f9b5890803fdc8e9b6036087c37b28bdf478bebfbb272cb31d27f305df26883f166086d171d01f7b94ded5438c
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Template-Plugin-Latex/Template-Plugin-Latex-3.60.0.ebuild,v 1.1 2014/10/14 21:41:55 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR=EINHVERFR
|
||||
MODULE_VERSION=3.06
|
||||
inherit perl-module eutils
|
||||
|
||||
DESCRIPTION="LaTeX support for the Template Toolkit"
|
||||
|
||||
LICENSE="|| ( Artistic GPL-2 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="
|
||||
dev-perl/LaTeX-Driver
|
||||
dev-perl/LaTeX-Encode
|
||||
dev-perl/LaTeX-Table
|
||||
>=dev-perl/Template-Toolkit-2.16
|
||||
virtual/latex-base
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/perl-ExtUtils-MakeMaker
|
||||
test? ( virtual/perl-Test-Harness )
|
||||
"
|
||||
|
||||
SRC_TEST="do"
|
||||
@ -0,0 +1 @@
|
||||
DIST python-etcd-0.3.2.zip 35994 SHA256 e86c560303bbc7058c64b47e57393ebcfe5213756236c1344c9c97a6029737bb SHA512 0a110e33cccc555a52ec9a5c8ff1c1702bcebbba80f8b948fd72e78baa5fb00e1bb96be08f3839d07230ea905518ec4247a94d7def39f979fe83e01c52da609b WHIRLPOOL 3c70734d23086d2cad0d570d6361ab73f650994c1f30af31a3e1fda22b046f4d72193aa0ef479650788727079593beb261557daa2e0054e0f6381f945cf0052a
|
||||
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<upstream>
|
||||
<bugs-to>https://github.com/jplana/python-etcd/issues</bugs-to>
|
||||
<changelog>https://raw.githubusercontent.com/jplana/python-etcd/master/NEWS.txt</changelog>
|
||||
<doc>http://python-etcd.readthedocs.org/</doc>
|
||||
</upstream>
|
||||
<maintainer>
|
||||
<email>zmedico@gentoo.org</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-etcd/python-etcd-0.3.2.ebuild,v 1.1 2014/10/15 07:02:05 zmedico Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="A python client for etcd"
|
||||
HOMEPAGE="https://github.com/jplana/python-etcd"
|
||||
SRC_URI="https://github.com/jplana/python-etcd/archive/${PV}.zip -> ${P}.zip"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~arm-linux ~x86-linux"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/urllib3-1.7[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue