summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-03-25 19:43:58 (UTC)
committer kergoth <kergoth>2003-03-25 19:43:58 (UTC)
commit75131f3afecb643b945ed349465f697efdf293ad (patch) (side-by-side diff)
treefb0428474c4de0ac1477d758fae2b9816ded3a24
parentd3b3e04ed7e4ee191a666202ca90769875a70a5d (diff)
downloadopie-75131f3afecb643b945ed349465f697efdf293ad.zip
opie-75131f3afecb643b945ed349465f697efdf293ad.tar.gz
opie-75131f3afecb643b945ed349465f697efdf293ad.tar.bz2
Correction to the sigsegv handler, & print a segmentation fault message. and increment default qt revision.
Diffstat (more/less context) (show whitespace changes)
-rwxr-xr-xmkipks2
-rw-r--r--qt/qte234-for-opie091-sigsegv.patch6
2 files changed, 5 insertions, 3 deletions
diff --git a/mkipks b/mkipks
index 3fbf160..85eeb5d 100755
--- a/mkipks
+++ b/mkipks
@@ -1,213 +1,213 @@
#!/bin/sh
if [ -z "$QTE_BASEVERSION" ]
then
if [ -e $QTDIR/include/qglobal.h ]
then
QTE_BASEVERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION'|grep -v STR|sed -e 's,#define QT_VERSION\t*,,;' -e 's,.*\([0-9]\)\([0-9]\)\([0-9]\).*,\1.\2.\3,;'`
else
QTE_BASEVERSION=2.3.4
fi
fi
if [ -z "$QTE_VERSION" ]
then
if [ -e $QTDIR/include/qglobal.h ]
then
QTE_VERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION_STR'|sed -e 's,#define QT_VERSION_STR\t*,,;' -e 's,.*"\([^"]*\)".*,\1,;'`
else
QTE_VERSION=2.3.4
fi
fi
-[ -z "$QTE_REVISION" ] && QTE_REVISION=3
+[ -z "$QTE_REVISION" ] && QTE_REVISION=4
DEB_VERSION=2.0
# Have to do this here, since CVS can't store symlinks
mkdir -p $OPIEDIR/etc/rcS.d
ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash
VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h)
VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h)
SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h)
if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h
then
[ -z "$VERSION_CVS" ] && VERSION_CVS="$(date +%Y%m%d)"
SUB_VERSION=$VERSION_CVS
else
VERSION_CVS=""
fi
QPE_VERSION=$VERSION_MAJ.$VERSION_MIN.$VERSION_PAT
ARCH=arm
STRIP=arm-linux-strip
STRIP_FILES="*ARM*not stripped"
TDIR=/tmp/ipk$$
DATADIR=$TDIR
CTRLDIR=$TDIR/CONTROL
IMAGEDIR=
VERB=
LIST=
RPM=
while [ $# -ne 0 ]
do
case "$1" in
-v)
VERB=1
echo >&2 "Packaging for version $VERSION_MAJ.$VERSION_MIN.$VERSION_PAT$VERSION_CVS"
;; -l)
LIST=1
;; -i)
shift
IMAGEDIR=$1
DATADIR=$IMAGEDIR
mkdir -p $IMAGEDIR
;; -classic)
classicopts=-c
;; -rpm)
if [ "$OPIEDIR" != "/opt/Qtopia" ]
then
echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.'
sleep 1
#exit 1
fi
RPM=1
;; -arch)
shift
ARCH=$1
STRIP=
STRIP_FILES=
;; /*)
FILES="$FILES $1"
;; *)
FILES="$FILES $PWD/$1"
esac
shift
done
if [ -z "$FILES" ]
then
FILES=`find $OPIEDIR -name "*.control" -print`
fi
RDIR=$PWD
ORIGDIR=`pwd`
cd $OPIEDIR
for i in $FILES
do
rm -rf $TDIR
mkdir -p $DATADIR
mkdir -p $CTRLDIR
packagename=${i##*/}; packagename=${packagename%.control}
version=$(eval echo '"'$(sed -n -e "s/^Version: *//p" $i)'"')
depends=$(eval echo '"'$(sed -n -e "s/^Depends: *//p" $i)'"')
files=$(eval echo $(sed -n -e "s/^Files://p" $i))
arch=$(eval echo $(sed -n -e "s/^Arch://p" $i))
section=$(sed -n -e "s/^Section: *//p" $i)
provides=$(sed -n -e "s/^Provides: *//p" $i)
conflicts=$(sed -n -e "s/^Conflicts: *//p" $i)
license=$(sed -n -e "s/^License: *//p" $i)
summary=$(sed -n -e "s/^Description: *//p" $i)
package=${packagename}_${version}_$ARCH
ERROR=
if [ -z "$files" ]
then
mkdir -p $DATADIR/usr/share/doc/$packagename
else
for f in $files
do
if [ -d $f ]
then
ffiles=$(find $f -type f -o -type b -o -type c -o -type l)
else
ffiles=$f
fi
for ff in $ffiles
do
case $ff in
*/CVS/*)
continue
;; *~)
continue
;; *.control)
continue
;; $QTDIR/*)
BASE=$(dirname /opt/QtPalmtop/${ff#$QTDIR/})
;; etc/*.d/*)
BASE=$(dirname /$ff)
;; root/*)
BASE=$(dirname ${ff#root})
;; lib/*)
BASE=$(dirname /opt/QtPalmtop/$ff)
;; $OPIEDIR/lib/*)
BASE=$(dirname /opt/QtPalmtop/${ff#$OPIEDIR/})
;; *)
# For SHARP ROM compatibility. Should change to Qtopia.
BASE=/opt/QtPalmtop/$(dirname $ff)
esac
if [ -f $ff -o -b $ff -o -c $ff ]
then
D=$DATADIR$BASE
if [ -x $ff -a -n "$STRIP" ]
then
case $(file $ff) in
$STRIP_FILES)
$STRIP $ff
;; *)
esac
fi
if [ -n "$RPM" ]
then
case "$ff" in
/*) RPMFILES="$RPMFILES $ff"
;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff"
esac
else
mkdir -p $D
if cp -a $ff $D
then
true
else
ERROR=1
fi
fi
else
echo >&2 "$0: $i: No such file: $ff"
ERROR=1
fi
done
done
fi
if [ -z "$ERROR" ]
then
if [ -n "$RPM" ]
then
SPEC=/tmp/mkipks-rpm-$$.spec
echo >$SPEC "Summary: $summary"
echo >>$SPEC "Name: $packagename"
echo >>$SPEC "Group: $section" ##########
echo >>$SPEC "License: $license"
echo >>$SPEC "Version: ${version%-*}"
echo >>$SPEC "Release: ${version#*-}"
echo >>$SPEC "%description"
sed -n -e '/^Description:/,$ p' $i | tail +2 >>$SPEC
echo >>$SPEC "%files"
echo >>$SPEC "%defattr(-,root,root)"
/bin/ls $RPMFILES >>$SPEC
rpm -bb --target $ARCH-unknown-linux $SPEC
# rm $SPEC
elif [ -z "$IMAGEDIR" ]
then
#size=$(du -h -s $DATADIR | sed -e 's/[ ].*//')
if (which mkfs.jffs2 >/dev/null 2>&1); then
size=$(mkfs.jffs2 -r $DATADIR | wc -c)
fi
diff --git a/qt/qte234-for-opie091-sigsegv.patch b/qt/qte234-for-opie091-sigsegv.patch
index 9111b42..085de91 100644
--- a/qt/qte234-for-opie091-sigsegv.patch
+++ b/qt/qte234-for-opie091-sigsegv.patch
@@ -1,27 +1,29 @@
--- ./src/kernel/qwindowsystem_qws.cpp~sigsegv 2003-03-18 18:29:00.000000000 -0600
+++ ./src/kernel/qwindowsystem_qws.cpp 2003-03-18 19:09:08.000000000 -0600
-@@ -843,6 +843,16 @@
+@@ -843,6 +843,18 @@
{
}
+static void catchSegvSignal( int )
+{
+#ifndef QT_NO_QWS_KEYBOARD
+ if ( qwsServer )
+ qwsServer->closeKeyboard();
+#endif
+ QWSServer::closedown();
++ fprintf(stderr, "Segmentation fault.\n");
++ exit(1);
+}
+
+
/*!
\class QWSServer qwindowsystem_qws.h
\brief Server-specific functionality in Qt/Embedded
-@@ -912,6 +922,7 @@
+@@ -912,6 +924,7 @@
}
signal(SIGPIPE, ignoreSignal); //we get it when we read
+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash
#endif
focusw = 0;
mouseGrabber = 0;