Ed W <li...@wildgooses.com> wrote:

> Does this work for you? It requires a tiny bit of scripting, but should
> be workable?

My current workflow (could be simplified by a small script):

(git clone git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-3.0.y.git)
git clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git
cd aufs3-standalone
git checkout origin/aufs3.0
cd ../linux-3.0.y
patch -p1 <../aufs3-standalone/aufs3-kbuild.patch 
patch -p1 <../aufs3-standalone/aufs3-base.patch
patch -p1 <../aufs3-standalone/aufs3-proc_map.patch
patch -p1 <../aufs3-standalone/aufs3-standalone.patch 
cp -a ../aufs3-standalone/{Documentation,fs} .
cp ../aufs3-standalone/include/linux/aufs_type.h include/linux/

git add Documentation/ABI/testing/debugfs-aufs \
Documentation/ABI/testing/sysfs-aufs Documentation/filesystems/aufs/ \
fs/aufs/ include/linux/aufs_type.h

git commit -a

Works fine but is kind of ugly.

And this is what I used to have:
(git clone 
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6-stable.git)
(git remote add aufs2-2.6 git://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-2.6.git)
git remote update
git merge aufs2-2.6/aufs2.1-<whatever>

Sven

-- 
"The only thing we have to fear is fear itself" (Franklin D. Roosevelt)


/me is giggls@ircnet, http://sven.gegg.us/ on the Web

------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management 
Up to 160% more powerful than alternatives and 25% more efficient. 
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev

Reply via email to