Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9ba6d24720e0a2f45d7b08546e439c14035dafd1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9ba6d24720e0a2f45d7b08546e439c14035dafd1)
  • Date: Sun, 26 Oct 2014 11:02:38 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

utils/xen/DEPENDS | 1 +
utils/xen/DETAILS | 7 ++++++-
utils/xen/HISTORY | 7 +++++++
utils/xen/PREPARE | 7 +++++++
utils/xen/PRE_BUILD | 6 +++---
utils/xen/prefix.patch | 10 ++++++++++
6 files changed, 34 insertions(+), 4 deletions(-)

New commits:
commit d0b36e12f4657af806080891b3959d22311eef8a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xen: added 4.2 branch

diff --git a/utils/xen/DEPENDS b/utils/xen/DEPENDS
index 7524bd3..5541bb8 100755
--- a/utils/xen/DEPENDS
+++ b/utils/xen/DEPENDS
@@ -7,6 +7,7 @@ depends iproute2 &&
depends dev86 &&
depends curl &&
depends UDEV &&
+depends yajl &&

if [[ $XEN_HVM == y ]]; then
depends iasl &&
diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index 7b0c90e..7b7f28c 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,6 +1,11 @@
SPELL=xen
+if [[ $XEN_BRANCH == "4.2" ]]; then
+ VERSION=4.2.5
+ SECURITY_PATCH=1
+else
VERSION=4.4.0
SECURITY_PATCH=9
+fi
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
@@ -8,7 +13,7 @@
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"

SOURCE_URL[0]=http://bits.xensource.com/oss-${SPELL}/release/${VERSION}/${SOURCE}
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
- WEB_SITE=http://www.xen.org
+ WEB_SITE=http://www.xenproject.org/
ENTERED=20041110
LICENSE[0]=GPL
KEYWORDS="xen"
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 3e4790e..1ef42e4 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,10 @@
+2014-09-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.5 (4.2); SECURITY_PATCH++
+ * DEPENDS: added missing yajl dependency
+ * PREPARE: added branching
+ * PRE_BUILD: apply patch
+ * prefix.patch: added, to fix man/conf installation path
+
2014-07-07 Ismael Luceno <ismael AT sourcemage.org>
* BUILD, PRE_BUILD: Run the configure script, it runs subdirs in turn

diff --git a/utils/xen/PREPARE b/utils/xen/PREPARE
new file mode 100755
index 0000000..51758ea
--- /dev/null
+++ b/utils/xen/PREPARE
@@ -0,0 +1,7 @@
+config_query_list XEN_BRANCH "Which branch of $SPELL do you want to build?" \
+ 4.4 \
+ 4.2 &&
+
+if [[ -z "$XEN_BRANCH" ]]; then
+ XEN_BRANCH="4.4"
+fi
diff --git a/utils/xen/PRE_BUILD b/utils/xen/PRE_BUILD
index c7f9a4a..766d895 100755
--- a/utils/xen/PRE_BUILD
+++ b/utils/xen/PRE_BUILD
@@ -1,8 +1,8 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

+patch -p0 < "$SPELL_DIRECTORY/prefix.patch" &&
+
if [[ $XEN_UPINIT != y ]]; then
sedit "s:all install-initd:all:" tools/hotplug/Linux/Makefile
-fi &&
-
-sedit 's/lib64/lib/' config/StdGNU.mk
+fi
diff --git a/utils/xen/prefix.patch b/utils/xen/prefix.patch
new file mode 100644
index 0000000..1e9c664
--- /dev/null
+++ b/utils/xen/prefix.patch
@@ -0,0 +1,10 @@
+--- tools/Makefile.orig 2014-09-02 10:22:57.000000000 +0400
++++ tools/Makefile 2014-09-04 12:19:29.467506379 +0400
+@@ -188,6 +188,7 @@
+ fi; \
+ cd qemu-xen-dir; \
+ $$source/configure --enable-xen --target-list=i386-softmmu \
++ --prefix="$(PREFIX)" --sysconfdir="/etc" \
+ --source-path=$$source \
+ --extra-cflags="-I$(XEN_ROOT)/tools/include \
+ -I$(XEN_ROOT)/tools/libxc \



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (9ba6d24720e0a2f45d7b08546e439c14035dafd1), Vlad Glagolev, 10/26/2014

Archive powered by MHonArc 2.6.24.

Top of Page