Re: [Ltib] Qtopia versioning problem

[Svein Seldal]

Stuart Hughes wrote:
> Hi Svein,
>
> There was a bug in the way qtopia was packaged.  I have committed the 
> attached patch to Savannah CVS, please give it a try and let me know if 
> any problems.

Tested and unfortunately bugs. Proposal to fix attached.

Please also note Freescale has made more changes and improvements to the 
spec-file compared to the one in CVS. I have not included any of these 
changes in this patch -- we'll leave it to Freescale to merge it out.


- Svein



The attached patch fixes two issues for building Qtopia:

 - Package name has been renamed to "qtopia-4", which makes
   the references to the sources wrong. Fixed.

 - Qtopia will now build in separate build directory as per
   Qtopia recommendation. Reliability of build seems better.

 Signed-off-by: Svein Seldal <address@hidden>
---

? qtopia-4.patch
Index: dist/lfs-5.1/qtopia/qtopia-4.spec
===================================================================
RCS file: /sources/ltib/ltib/dist/lfs-5.1/qtopia/qtopia-4.spec,v
retrieving revision 1.2
diff -u -r1.2 qtopia-4.spec
--- dist/lfs-5.1/qtopia/qtopia-4.spec   27 Jul 2009 09:30:42 -0000      1.2
+++ dist/lfs-5.1/qtopia/qtopia-4.spec   30 Jul 2009 00:49:38 -0000
@@ -8,7 +8,7 @@
 Vendor          : Freescale
 Packager        : John Rigby, John Faith
 Group           : System Environment/Graphics
-Source          : %{name}-opensource-src-%{version}.tar.gz
+Source          : qtopia-opensource-src-%{version}.tar.gz
 #Source1                       : helix-20070404cvs.tar.bz2
 
 # These patches can be platform specific but must be safe for application
@@ -38,7 +38,8 @@
 %{summary}
 
 %Prep
-%setup -n %{name}-opensource-%{version}
+%setup -c qtopia-opensource-%{version}
+cd qtopia-opensource-%{version}
 %patch1 -p1
 #%patch2 -p1
 #%patch3 -p1
@@ -268,20 +269,25 @@
 #cd src/3rdparty/libraries/helix
 #ln -s ../../../../../helix-20070404cvs src
 
+# Create build dir
+mkdir ../build
+
 exit 0
 
 
 %Build
-source ./ltibqtopiaconfig
+cd build
+QSRC=../qtopia-opensource-%{version}
+. $QSRC/ltibqtopiaconfig
 
 export PATH=$UNSPOOF_PATH
 # Unset compiler to prevent gcc being used when the cross
 # tools should be used. (Trolltech issue# 138807)
 unset CC CXX
 if [ "$EXTRA_QTE_CONFIG" = "" ] ; then
-       echo yes | ./configure -device $QWS_PLATFORM -verbose
+       echo yes | $QSRC/configure -device $QWS_PLATFORM -verbose
 else
-       echo yes | ./configure -device $QWS_PLATFORM -verbose 
-extra-qtopiacore-config "${EXTRA_QTE_CONFIG} -I ${DEV_IMAGE}/usr/include -L 
${DEV_IMAGE}/usr/lib"
+       echo yes | $QSRC/configure -device $QWS_PLATFORM -verbose 
-extra-qtopiacore-config "${EXTRA_QTE_CONFIG} -I ${DEV_IMAGE}/usr/include -L 
${DEV_IMAGE}/usr/lib"
 fi
 
 # For debugging
@@ -289,13 +295,16 @@
 
 # Build root env var required by helix
 #export 
BUILD_ROOT=$RPM_BUILD_DIR/$RPM_PACKAGE_NAME-$RPM_PACKAGE_VERSION/src/3rdparty/libraries/helix/helixbuild/build
-make -j1
+make
 
 exit 0
 
 
 %Install
-source ./ltibqtopiaconfig
+cd build
+QSRC=../qtopia-opensource-%{version}
+. $QSRC/ltibqtopiaconfig
+
 export PATH=$UNSPOOF_PATH
 echo creating qtopia install image
 make install > /dev/null