Comment 57 for bug 378240

Revision history for this message
Boris Derzhavets (bderzhavets) wrote : Re: Please merge xen-3.4 (3.4.0-2) from debian unstable

Adding “VHD & ZFS 24″ support to Xen 4.0.*.rc* source & kernels packaged for Ubuntu Virtualusr’s Blog

--- packageXen40x.sh.orig 2010-07-16 15:33:03.756414641 +0400
+++ packageXen40x.sh 2010-07-16 15:40:31.546289159 +0400
@@ -35,6 +35,8 @@
 [ -r mk_ub_pgk_source.sh ] && sh mk_ub_pgk_source.sh $SDSC

 # Retreive latest release tag if not specified
+cp fsimage-zfs-24.patch1 $WRKD
+cp blktap2_ctrl_func.patch-xen-testing-4.x.patch1 $WRKD
 cd $WRKD
 [ ! -d $REPOS -a -d ../$REPOS ] && ln -sv ../$REPOS .
 if [ -z "$LREL" ]; then
@@ -43,7 +45,7 @@
  [ -d $REPOS ] || hg clone $REPURL #http://xenbits.xensource.com/$REPOS
  cd $WRKD/$REPOS
  LREL=$(hg tags | sed '/^tip\b /d' | sed -n '1 s/ *.*//p') # RELEASE-4.0.0
- hg pull; hg update
+ hg pull; hg update;
 fi
 RELTAG=$(echo $LREL | sed 's/^RELEASE-//;s/-\([^-]*\)$/\1/') # 4.0.0

@@ -66,6 +68,9 @@
 cd $WRKD/$DEBDIRNAM
 echo Info: Patch with debian diff $UDIFNAME ...
 zcat $STARTDIR/$UDIFNAME | patch -p1
+echo "Info: ZFS & VHD patching"
+ patch -p1 -s -i $WRKD/fsimage-zfs-24.patch1;
+ patch -p1 -s -i $WRKD/blktap2_ctrl_func.patch-xen-testing-4.x.patch1;
 echo Info: Tag change log with the version: $RELTAG-0ubuntu1
 test "$RELTAG" != "4.0.0" && \
  dch -b --newversion $RELTAG-0ubuntu1 "Automated rebuild atempt for new upstream version."