Commit 20818fff authored by alex@thinkpad's avatar alex@thinkpad
Browse files

QEMU: renamed EOS patches to qemu-2.5.0-eos.patch

--HG--
branch : qemu
parent 6d42f7394e01
......@@ -65,7 +65,7 @@ The default directory structure looks like this::
└── ... # other scripts / utilities
The sources are stored in the Magic Lantern tree, under ``contrib/qemu``. Our modifications to QEMU sources
are stored as a patch file (``qemu-2.5.0.patch``), while the new files are stored directly. The install script
are stored as a patch file (``qemu-2.5.0-eos.patch``), while the new files are stored directly. The install script
copies the following files:
.. code:: shell
......
......@@ -540,7 +540,7 @@ patch -N -p1 < ../$ML_PATH/contrib/qemu/$QEMU_NAME-recent-gcc.patch
git add -u . && git commit -q -m "$QEMU_NAME patched for recent compilers"
echo "Patching $QEMU_NAME for EOS emulation..."
patch -N -p1 < ../$ML_PATH/contrib/qemu/$QEMU_NAME.patch
patch -N -p1 < ../$ML_PATH/contrib/qemu/$QEMU_NAME-eos.patch
# don't commit this one - we'll use "git diff" to update the above patch
cd ..
......
......@@ -14,7 +14,7 @@ cp -v --parents tests/*.sh tests/*.py $ML_PATH/contrib/qemu/
cp -v --parents tests/*/*.md5 $ML_PATH/contrib/qemu/
cd $QEMU_PATH
git diff > ../$ML_PATH/contrib/qemu/$QEMU_PATH.patch
git diff > ../$ML_PATH/contrib/qemu/$QEMU_PATH-eos.patch
cd ..
cd $ML_PATH/contrib/qemu/
......
......@@ -20,8 +20,8 @@ if [ "$1" != "-q" ]; then
# discard local changes and re-apply our patch
DATE=$(date '+%Y-%m-%d_%H-%M-%S')
cd $QEMU_NAME
git diff > $QEMU_NAME-$DATE.patch
echo "Local changes backed up to $QEMU_NAME/$QEMU_NAME-$DATE.patch"
git diff > $QEMU_NAME-eos-$DATE.patch
echo "Local changes backed up to $QEMU_NAME/$QEMU_NAME-eos-$DATE.patch"
git checkout .
patch -N -p1 < ../$ML_PATH/contrib/qemu/$QEMU_NAME.patch
patch -N -p1 < ../$ML_PATH/contrib/qemu/$QEMU_NAME-eos.patch
fi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment