Re: [Ltib] qtopia package build failure while building ltib from CVS (Savannah)

[Stuart Hughes]

Hi Daniel,

I re-worked and build-tested your patch (imx27) and have checked it in 
to Savannah CVS.  Let me know if you think it needs any adjustments. 
I've attached the patch/diff so you can see what changed.

Regards, Stuart

Stuart Hughes wrote:
> Hi Daniel,
>
> I'll rework this patch and apply after posting to the list for comment.
>
> Regards, Stuart
>
> Stuart Hughes wrote:
> > Hi Daniel,
> >
> > This is a useful patch, but some of the assignments (e.g. changing the 
> > device) will break it for other platforms.  I think some more 
> > conditional parametrisation is needed?
> >
> > Regards, Stuart
> >
> > Daniel Widyanto wrote:
> > > Try this patch:
> > > -----------------------------------------------------
> > > diff -ur ltib/dist/lfs-5.1/qtopia/qtopia.spec 
> > > ltib-090605_2255/dist/lfs-5.1/qtopia/qtopia.spec
> > > --- ltib/dist/lfs-5.1/qtopia/qtopia.spec    2009-04-29 
> > > 15:16:07.000000000 +0800
> > > +++ ltib-090605_2255/dist/lfs-5.1/qtopia/qtopia.spec    2009-06-08 
> > > 16:02:31.000000000 +0800
> > > @@ -87,11 +87,14 @@
> > >      qs875s)
> > >      export QWS_PLATFORM=qs875s
> > >      ;;
> > > +    phy3250)
> > > +        export EXTRA_QTE_CONFIG="-tslib"
> > > +        ;;
> > >  esac
> > >  
> > >  # Use toolchain flags when not spoofing
> > > -export EXTRA_CFLAGS=$TOOLCHAIN_CFLAGS
> > > -export EXTRA_LDFLAGS=$TOOLCHAIN_CFLAGS
> > > +export EXTRA_CFLAGS="$TOOLCHAIN_CFLAGS"
> > > +export EXTRA_LDFLAGS="$TOOLCHAIN_CFLAGS"
> > >  
> > >  echo export EXTRA_QPE_CONFIG=\"$EXTRA_QPE_CONFIG\" > ltibqtopiaconfig
> > >  echo export EXTRA_QTE_CONFIG=\"$EXTRA_QTE_CONFIG\" >> ltibqtopiaconfig
> > > @@ -118,7 +121,7 @@
> > >  
> > >  
> > >  %Build
> > > -source ./ltibqtopiaconfig
> > > +. ./ltibqtopiaconfig
> > >  export UC_QWS_PLATFORM=`perl -e "print uc $QWS_PLATFORM"`
> > >  
> > >  #   substitututions for cross build
> > > @@ -160,16 +163,19 @@
> > >  
> > >  
> > >  %Install
> > > -source ./ltibqtopiaconfig
> > > +. ./ltibqtopiaconfig
> > >  export PATH=$UNSPOOF_PATH
> > >  echo creating qtopia install image
> > >  make install  rm -rf $RPM_BUILD_ROOT
> > >  install -d $RPM_BUILD_ROOT/%{pfx}
> > > +
> > > +# Copy the fonts, or Qtopia won't run
> > > +cp -a qt2/lib/fonts/* qtopia/image/opt/Qtopia/lib/fonts/
> > >  cp -a qtopia/image/opt $RPM_BUILD_ROOT/%{pfx}
> > > +
> > >  install -d $RPM_BUILD_ROOT/%{pfx}/etc/rc.d/init.d
> > >  
> > > -#initscript=$RPM_BUILD_ROOT/%{pfx}/etc/rc.d/rc.qpe
> > >  initscript=$RPM_BUILD_ROOT/%{pfx}/etc/rc.d/init.d/qtopia
> > >  cat > $initscript << EOF
> > >  #!/bin/sh
> > > @@ -182,7 +188,7 @@
> > >  # tslib environment
> > >  if [ -n "$PKG_QTOPIA_WANT_TSLIB" ]
> > >  then
> > > -    export TSLIB_TSDEVICE=/dev/input/event1
> > > +    export TSLIB_TSDEVICE=/dev/input/event0
> > >      export TSLIB_PLUGINDIR=/usr/lib/ts
> > >      export TSLIB_CONFFILE=/usr/etc/ts.conf
> > >  fi
> > > @@ -198,7 +204,7 @@
> > >  QPEDIR=/opt/Qtopia
> > >  LD_LIBRARY_PATH=/opt/Qtopia/lib
> > >  PATH=/opt/Qtopia/bin:\$PATH
> > > -QWS_SIZE="1024x768"
> > > +QWS_SIZE="240x320"
> > >  export QTDIR QPEDIR LD_LIBRARY_PATH PATH QWS_SIZE
> > >  QWS_KEYBOARD="$QWS_KEYBOARD"
> > >  export QWS_KEYBOARD
> > > @@ -211,7 +217,7 @@
> > >  else
> > >  # changing the :/dev/ts part will have no effect as it  # is 
> > > hardcoded in the source
> > > -QWS_MOUSE_PROTO="TPanel:/dev/ts"
> > > +QWS_MOUSE_PROTO="TPanel:/dev/input/event0"
> > >  # hide cursor when using touchscreen
> > >  QWS_HIDE_CURSOR="Yes"
> > >  export QWS_MOUSE_PROTO QWS_HIDE_CURSOR
> > > @@ -242,6 +248,12 @@
> > >  [/dev/sda1]
> > >  Name = USB Flash Drive
> > >  Removable = 1
> > > +[/dev/mmcblk0]
> > > +Name = SD Card
> > > +Removable = 1
> > > +Applications = 0
> > > +Documents = 1
> > > +ContentDatabase = 0
> > >  EOF
> > >  
> > >  # make sure the strip scripts are run cross
> > > -----------------------------------------------------
> > >
> > > Regards,
> > > -daniel
> > >
> > > -----Original Message-----
> > > From: address@hidden 
> > > [mailto:address@hidden On Behalf Of 
> > > address@hidden
> > > Sent: Monday, August 24, 2009 12:28 PM
> > > To: Stuart Hughes
> > > Cc: address@hidden
> > > Subject: Re: [Ltib] qtopia package build failure while building ltib 
> > > from CVS (Savannah)
> > >
> > > Hi Stuart,
> > >
> > > I am using Ubuntu linux but the shell is "/bin/bash". I wnet ahead and
> > > applied your patch and after that I am running into a new issue 
> > > mentioned
> > > below.
> > >
> > >
> > >
> > > _______________________________________________
> > > LTIB home page: http://ltib.org
> > >
> > > Ltib mailing list
> > > address@hidden
> > > http://lists.nongnu.org/mailman/listinfo/ltib
> >
> >
> > _______________________________________________
> > LTIB home page: http://ltib.org
> >
> > Ltib mailing list
> > address@hidden
> > http://lists.nongnu.org/mailman/listinfo/ltib
>
>
> _______________________________________________
> LTIB home page: http://ltib.org
>
> Ltib mailing list
> address@hidden
> http://lists.nongnu.org/mailman/listinfo/ltib
Index: dist/lfs-5.1/qtopia/qtopia.spec
===================================================================
RCS file: /sources/ltib/ltib/dist/lfs-5.1/qtopia/qtopia.spec,v
retrieving revision 1.4
diff -u -r1.4 qtopia.spec
--- dist/lfs-5.1/qtopia/qtopia.spec     21 Aug 2009 08:02:28 -0000      1.4
+++ dist/lfs-5.1/qtopia/qtopia.spec     25 Aug 2009 08:18:45 -0000
@@ -87,11 +87,14 @@
     qs875s)
        export QWS_PLATFORM=qs875s
        ;;
+    phy3250)
+       export EXTRA_QTE_CONFIG="-tslib"
+       ;;
 esac
 
 # Use toolchain flags when not spoofing
-export EXTRA_CFLAGS=$TOOLCHAIN_CFLAGS
-export EXTRA_LDFLAGS=$TOOLCHAIN_CFLAGS
+export EXTRA_CFLAGS="$TOOLCHAIN_CFLAGS"
+export EXTRA_LDFLAGS="$TOOLCHAIN_CFLAGS"
 
 echo export EXTRA_QPE_CONFIG=\"$EXTRA_QPE_CONFIG\" > ltibqtopiaconfig
 echo export EXTRA_QTE_CONFIG=\"$EXTRA_QTE_CONFIG\" >> ltibqtopiaconfig
@@ -118,7 +121,7 @@
 
 
 %Build
-source ./ltibqtopiaconfig
+. ./ltibqtopiaconfig
 export UC_QWS_PLATFORM=`perl -e "print uc $QWS_PLATFORM"`
 
 #   substitututions for cross build
@@ -160,16 +163,32 @@
 
 
 %Install
-source ./ltibqtopiaconfig
+case "$PLATFORM" in
+    phy3250)
+       TSDEVICE=/dev/input/event0
+       QWS_SIZE="240x320"
+       QWS_TS_PROTO="TPanel:$TSDEVICE"
+       ;;
+    *)
+       TSDEVICE=/dev/input/event1
+       QWS_SIZE="1024x768"
+       QWS_TS_PROTO="TPanel:/dev/ts"
+       ;;
+esac
+    
+. ./ltibqtopiaconfig
 export PATH=$UNSPOOF_PATH
 echo creating qtopia install image
 make install 
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/%{pfx}
+
+# Copy the fonts, or Qtopia won't run
+cp -a qt2/lib/fonts/* qtopia/image/opt/Qtopia/lib/fonts/
 cp -a qtopia/image/opt $RPM_BUILD_ROOT/%{pfx}
+
 install -d $RPM_BUILD_ROOT/%{pfx}/etc/rc.d/init.d
 
-#initscript=$RPM_BUILD_ROOT/%{pfx}/etc/rc.d/rc.qpe
 initscript=$RPM_BUILD_ROOT/%{pfx}/etc/rc.d/init.d/qtopia
 cat > $initscript << EOF
 #!/bin/sh
@@ -182,7 +201,7 @@
 # tslib environment
 if [ -n "$PKG_QTOPIA_WANT_TSLIB" ]
 then
-    export TSLIB_TSDEVICE=/dev/input/event1
+    export TSLIB_TSDEVICE=$TSDEVICE
     export TSLIB_PLUGINDIR=/usr/lib/ts
     export TSLIB_CONFFILE=/usr/etc/ts.conf
 fi
@@ -198,7 +217,7 @@
 QPEDIR=/opt/Qtopia
 LD_LIBRARY_PATH=/opt/Qtopia/lib
 PATH=/opt/Qtopia/bin:\$PATH
-QWS_SIZE="1024x768"
+QWS_SIZE="$QWS_SIZE"
 export QTDIR QPEDIR LD_LIBRARY_PATH PATH QWS_SIZE
 QWS_KEYBOARD="$QWS_KEYBOARD"
 export QWS_KEYBOARD
@@ -211,7 +230,7 @@
 else
 # changing the :/dev/ts part will have no effect as it 
 # is hardcoded in the source
-QWS_MOUSE_PROTO="TPanel:/dev/ts"
+QWS_MOUSE_PROTO="$QWS_TS_PROTO"
 # hide cursor when using touchscreen
 QWS_HIDE_CURSOR="Yes"
 export QWS_MOUSE_PROTO QWS_HIDE_CURSOR
@@ -242,6 +261,12 @@
 [/dev/sda1]
 Name = USB Flash Drive
 Removable = 1
+[/dev/mmcblk0]
+Name = SD Card
+Removable = 1
+Applications = 0
+Documents = 1
+ContentDatabase = 0
 EOF
 
 # make sure the strip scripts are run cross