git.openpandora.org
/
pandora-libraries.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
only turn on wl/bt if it was on before
[pandora-libraries.git]
/
testdata
/
scripts
/
pnd_make.sh
diff --git
a/testdata/scripts/pnd_make.sh
b/testdata/scripts/pnd_make.sh
index
c5e5111
..
3a0ce2c
100755
(executable)
--- a/
testdata/scripts/pnd_make.sh
+++ b/
testdata/scripts/pnd_make.sh
@@
-2,7
+2,7
@@
######adjust path of genpxml.sh if you want to use that "feture"#####
######adjust path of genpxml.sh if you want to use that "feture"#####
-TEMP=`getopt -o p:d:x:i: -- "$@"`
+TEMP=`getopt -o p:d:x:i:
c
-- "$@"`
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
@@
-13,7
+13,7
@@
while true ; do
-d) echo "FOLDER set to $2" ;FOLDER=$2;shift 2 ;;
-x) echo "PXML set to $2" ;PXML=$2;shift 2 ;;
-i) echo "ICON set to $2" ;ICON=$2;shift 2 ;;
-d) echo "FOLDER set to $2" ;FOLDER=$2;shift 2 ;;
-x) echo "PXML set to $2" ;PXML=$2;shift 2 ;;
-i) echo "ICON set to $2" ;ICON=$2;shift 2 ;;
- -c) echo "-c set, will create compressed squasfs image instead of iso $2" ;SQUASH=1;shift
2
;;
+ -c) echo "-c set, will create compressed squasfs image instead of iso $2" ;SQUASH=1;shift
1
;;
--) shift ; break ;;
*) echo "Error while parsing arguments! $2" ; exit 1 ;;
esac
--) shift ; break ;;
*) echo "Error while parsing arguments! $2" ; exit 1 ;;
esac
@@
-41,7
+41,11
@@
if [ ! -f $PXML ]; then echo "$PXML doesnt exist"; exit 1; fi #check if pxml act
if [ ! $SQUASH ]; then
mkisofs -o $PNDNAME.iso -R $FOLDER
else
if [ ! $SQUASH ]; then
mkisofs -o $PNDNAME.iso -R $FOLDER
else
- mksquashfs $FOLDER $PNDNAME.iso
+ if [ $(mksquashfs -version | awk '{if ($3 >= 4) print 1}') = 1 ]; then
+ echo "your squashfs version is older then version 4, pleas upgrade to 4.0 or later"
+ exit 1
+ fi
+ mksquashfs -no-recovery -nopad $FOLDER $PNDNAME.iso
fi
#append pxml to iso
cat $PNDNAME.iso $PXML > $PNDNAME
fi
#append pxml to iso
cat $PNDNAME.iso $PXML > $PNDNAME