summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2012-02-28 11:42:55 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:10:04 +0000
commitc1705317f9456f761da2094e886a07939291e53a (patch)
tree6aaed86a9e0c3388f2d9e6e5d937c0a6fad4ae6f
parent8d4db8e6dcd2d25637cb77515fe776552f2fdd6d (diff)
downloadopenembedded-core-c1705317f9456f761da2094e886a07939291e53a.tar.gz
openembedded-core-c1705317f9456f761da2094e886a07939291e53a.tar.bz2
openembedded-core-c1705317f9456f761da2094e886a07939291e53a.tar.xz
openembedded-core-c1705317f9456f761da2094e886a07939291e53a.zip
scripts/prserv-tool: Adepted to new bitbake cache.
Adepted to the new bitbake cache mechanism which is based on file content but not on file timp stamps any more. Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/bitbake-prserv-tool28
1 files changed, 17 insertions, 11 deletions
diff --git a/scripts/bitbake-prserv-tool b/scripts/bitbake-prserv-tool
index 6c0584c01..f3855df0c 100755
--- a/scripts/bitbake-prserv-tool
+++ b/scripts/bitbake-prserv-tool
@@ -9,16 +9,23 @@ help ()
echo -e "\timport <file>: import the AUTOPR values from the exported file into the PR service."
}
-export ()
+clean_cache()
+{
+ s=`bitbake -e | grep ^CACHE= | cut -f2 -d\"`
+ if [ "x${s}" != "x" ]; then
+ rm -rf ${s}
+ fi
+}
+
+do_export ()
{
file=$1
[ "x${file}" == "x" ] && help && exit 1
rm -f ${file}
- touch dummy.inc
- bitbake -R conf/prexport.conf -R dummy.inc -p
- s=`bitbake -R conf/prexport.conf -R dummy.inc -e | grep ^PRSERV_DUMPFILE= | cut -f2 -d\"`
- rm -f dummy.inc
+ clean_cache
+ bitbake -R conf/prexport.conf -p
+ s=`bitbake -R conf/prexport.conf -e | grep ^PRSERV_DUMPFILE= | cut -f2 -d\"`
if [ "x${s}" != "x" ];
then
[ -e $s ] && mv -f $s $file && echo "Exporting to file $file succeeded!"
@@ -28,15 +35,14 @@ export ()
return 1
}
-import ()
+do_import ()
{
file=$1
[ "x${file}" == "x" ] && help && exit 1
- touch dummy.inc
- bitbake -R conf/primport.conf -R dummy.inc -R $file -p
+ clean_cache
+ bitbake -R conf/primport.conf -R $file -p
ret=$?
- rm -f dummy.inc
[ $ret -eq 0 ] && echo "Importing from file $file succeeded!" || echo "Importing from file $file failed!"
return $ret
}
@@ -45,10 +51,10 @@ import ()
case $1 in
export)
- export $2
+ do_export $2
;;
import)
- import $2
+ do_import $2
;;
*)
help