qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 18:35:55 +02:00
Code

cleanup scripts/build a little. make it save un-commit stuff by git stash

Browse Source 
Signed-off-by: Xiangfu Liu <xiangfu@sharism.cc>
This commit is contained in:
Xiangfu Liu 2010-10-22 15:09:16 +08:00
parent f2065c4172
commit 1ceee39ceb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/uboot-xburst/files/drivers/mmc/jz_mmc.c
View File

@ -29,9 +29,7 @@
#include <asm/jz4740.h> #include <asm/jz4740.h>
#include "jz_mmc.h" #include "jz_mmc.h"
#define CFG_MMC_BASE 0x80600000
static int sd2_0 = 0; static int sd2_0 = 0;
static uchar mmc_buf[1024];
static int mmc_ready = 0; static int mmc_ready = 0;
static int use_4bit; /* Use 4-bit data bus */ static int use_4bit; /* Use 4-bit data bus */
/* /*

10
scripts/build
View File

@ -32,8 +32,9 @@ if [ -f "config" ]; then
fi fi
echo "This script will move previous builds to bak/!" echo "This script will move previous builds to bak/!"
echo "This script will reset modifications you made" echo "This script will compile base on last commit"
echo " to files which are part of the repository!" echo " your modifications will backup by git stash"
echo " those modifications will apply again after compile"
echo "This script comes without any kind of warranty!" echo "This script comes without any kind of warranty!"
echo " " echo " "
echo "Are you brave, dude? [NO/yes]" echo "Are you brave, dude? [NO/yes]"
@ -58,8 +59,7 @@ mv .config config
mkdir xburst mkdir xburst
echo "updating git repo..." echo "updating git repo..."
git diff > bak/modify_${DATE_TIME}.patch git stash
git checkout -f
git checkout tracking_backfire git checkout tracking_backfire
git pull > /dev/null git pull > /dev/null
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
@ -122,6 +122,8 @@ if [ "$?" != "0" ]; then
exit 1 exit 1
fi fi
git stash pop
cp .config xburst/config cp .config xburst/config
cp bin/xburst/* xburst/ 2>/dev/null cp bin/xburst/* xburst/ 2>/dev/null
mkdir xburst/files mkdir xburst/files