[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Ltib] Qtopia versioning problem
|
From: |
Stuart Hughes |
|
Subject: |
Re: [Ltib] Qtopia versioning problem |
|
Date: |
Mon, 27 Jul 2009 10:43:53 +0100 |
|
User-agent: |
Thunderbird 2.0.0.16 (X11/20080707) |
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.
You should now be able to say: ./ltib -p qtopia-4 for qtopia-4
or ./ltib -p qtopia for qtopia 2
I don't really like the way this has been packaged as it implies that
you could have both on a system, whereas you can't really as it doesn't
make sense and also the config selection is in a choice-list. However
for now I've left it in this way as the packages have quite a lot of
logic in packages.lkc based on PKG_QTOPIA_4.
I would be tempted to remove qtopia-2 except that qtopia-4 is so very
large compared with 2, and the imx platforms by default actually select
qtopia-2. I must admit though I've never used either.
FYI: when you say: ./ltib -p <pkg> it looks inside all the spec file
names to find a match in the "Name:" field. This is a convenience for
single package mode. If you want to exactly select a package you need
to say ./ltib -p <spefiliename> (e.g. include .spec). When you just run
./ltib the mapping is done using the appropriate selection and pkg_map
files.
Regards, Stuart
Svein Seldal wrote:
Hi guys
I think I might have a problem with the qtopia-4 package related to
ltib. I have noticed that qtopia is being reinstalled each and every
time ltib is run, which is not the way it should be.
All other spec-files does work, but not the qtopia-4 package. If I
specify qtopia (without the "-4") it tries to work on the qtopia v2
package which is something else.
After a quick investigation of the problem, I notice that qtopia package
is first uninstalled when "Processing platform:", and then later
reinstalled when processing each packages individually.
There are two qtopia spec-files: qtopia.spec and qtopia-4.spec (in
dist/lfs5.1/qtopia/), both which is set to build a package named qtopia.
My current configuration enables "PKG_QTOPIA_4" which
config/userspace/pkg_map equals to "qtopia-4".
Herein lies the problem I think: The spec files both builds a package
named qtopia*.rpm which is installed. When rerunning ltib it expects to
find a package named "qtopia-4" installed, however it isn't. "qtopia"
is, which it uninstalls.
I understand that there is designed in some mechanism for handling
muliple versions of the same pacakge (see openswan, mtd-utils, etc.).
However, it seems that there is something not right in this
configuration. Any ideas or pointer for how to fix this?
Nor has "./ltib -p qtopia-4" ever worked. I always get the following error:
"Cannot find spec file that contains the package name qtopia-4.
If necessary please give the whole spec file name (with the .spec
extension)."
- Svein
Snippet of compilation logs:
$ /opt/ltib/usr/bin/rpm --root /home/user/ltib/rootfs --dbpath
/var/lib/rpm -qa --queryformat '%{name} '
base_libs ... qtopia ... ncurses
$ ./ltib -v 2>&1 | tee build.log
mk_buildlist: key=PKG_QTOPIA, sn=qtopia, en=0
mk_buildlist: key=PKG_QTOPIA_4, sn=qtopia-4, en=1
installed = base_libs, ..., ncurses
drop_list = qtopia
Dropping de-selected package qtopia
Processing: qtopia-4
======================
get_spec(qtopia-4)
spec files: [ /home/user/ltib/dist/lfs-5.1/qtopia/qtopia-4.spec, ]
Preparing... #########################################
qtopia #########################################
Index: config/userspace/pkg_map-mx
===================================================================
RCS file: /sources/ltib/ltib/config/userspace/pkg_map-mx,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 pkg_map-mx
--- config/userspace/pkg_map-mx 5 Dec 2008 14:25:50 -0000 1.1.1.3
+++ config/userspace/pkg_map-mx 27 Jul 2009 09:29:01 -0000
@@ -1,7 +1,6 @@
PKG_GDB = gdb-6.6
PKG_MXC_LIB = mxc-lib-mx
PKG_MXC_TEST = mxc-test-mx
-PKG_QTOPIA = qtopia-tslib
PKG_SKELL = skell-mx
PKG_SYSCONFIG = sysconfig-mx
PKG_UDEV = udev-mx
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.1.1.3
diff -u -r1.1.1.3 qtopia-4.spec
--- dist/lfs-5.1/qtopia/qtopia-4.spec 18 Mar 2009 17:53:26 -0000 1.1.1.3
+++ dist/lfs-5.1/qtopia/qtopia-4.spec 27 Jul 2009 09:29:02 -0000
@@ -1,7 +1,7 @@
%define pfx /opt/freescale/rootfs/%{_target_cpu}
Summary : Qtopia
-Name : qtopia
+Name : qtopia-4
Version : 4.3.0
Release : 1
License : GPL
Index: dist/lfs-5.1/qtopia/qtopia-tslib.spec
===================================================================
RCS file: dist/lfs-5.1/qtopia/qtopia-tslib.spec
diff -N dist/lfs-5.1/qtopia/qtopia-tslib.spec
--- dist/lfs-5.1/qtopia/qtopia-tslib.spec 4 Apr 2008 10:51:53 -0000
1.1.1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,230 +0,0 @@
-%define pfx /opt/freescale/rootfs/%{_target_cpu}
-
-Summary : qtopia palmtop environment
-Name : qtopia-free
-Version : 2.2.0
-Release : 1
-License : GPL
-Vendor : Freescale
-Packager : John Rigby
-Group : System Environment/Graphics
-Source : %{name}-src-%{version}.tar.gz
-# These patches can be platform specific but must be safe for application
-# on all platforms.
-Patch1 : qtopia-free-2.2.0-0001-24Aug2006-ppc-qconfig.patch
-Patch2 :
qtopia-free-2.2.0-0002-24Aug2006-ppc-libavcodec-bigendian.patch
-Patch3 : qtopia-free-2.2.0-0003-24Aug2006-qconfig-cursor-mouse.patch
-Patch4 :
qtopia-free-2.2.0-0004-24Aug2006-rgb555-and-swapped-byte-video.patch
-Patch5 : qtopia-free-2.2.0-0005-24Aug2006-mpc5200-nogetospace.patch
-Patch6 : qtopia-free-2.2.0-0006-24Aug2006-native-endian-audio.patch
-Patch7 : qtopia-free-2.2.0-0007-24Aug2006-standard-touchscreen.patch
-Patch8 : qtopia-free-2.2.0-0008-24Aug2006-mxc-touchscreen.patch
-Patch9 : qtopia-free-2.2.0-0009-24Aug2006-mx21-buttons.patch
-Patch10 :
qtopia-free-2.2.0-0010-24Aug2006-dfltmouse-tpanel-and-screensaver.patch
-Patch11 : qtopia-free-2.2.0-0011-24Aug2006-mxc-platform.patch
-Patch12 :
qtopia-free-2.2.0-0012-24Aug2006-mpc5200-platform.patch
-Patch13 : qtopia-free-2.2.0-0013-08Sep2006-mx21-platform.patch
-Patch14 : qtopia-free-2.2.0-0014-29Aug2006-gcc-4.1.1.patch
-Patch15 : qtopia-free-2.2.0-0015-05Sep2006-keep_cursor.patch
-Patch16 : qtopia-free-2.2.0-taskbar.patch
-Patch17 : qtopia-free-2.2.0-linux_input_h
-Patch18 : qtopia-free-2.2.0-ppc64-compiler-include-2.patch
-Patch19 : qtopia-free-2.2.0-disable-dqt-options.patch
-Patch20 : qtopia-free-2.2.0-headers-2.patch
-BuildRoot : %{_tmppath}/%{name}
-Prefix : %{pfx}
-
-%Description
-%{summary}
-
-%Prep
-%setup -n %{name}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-#%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-
-# Define QWS_PLATFORM and specifiy extra qte and qpe configure options
-case "$PLATFORM" in
- imx27ads | imx31ads | imx32ads)
- export QWS_PLATFORM=mxc
- export EXTRA_QTE_CONFIG="-tslib"
- export EXTRA_QPE_CONFIG="-edition pda -displaysize 240x320"
- export QWS_KEYBOARD=USB:/dev/input/event0
- ;;
- imx21ads)
- export QWS_PLATFORM=mx21
- export EXTRA_QTE_CONFIG=
- export EXTRA_QPE_CONFIG="-edition pda -displaysize 240x320"
- export QWS_KEYBOARD=Buttons
- ;;
- mpc5200)
- export QWS_PLATFORM=mpc5200
- export EXTRA_QTE_CONFIG="-rgb555 -swapbytes_video"
- export EXTRA_QPE_CONFIG="-rgb555 -swapbytes_video"
- export QWS_KEYBOARD=TTY
- ;;
- qs875s)
- export QWS_PLATFORM=qs875s
- ;;
-esac
-
-
-echo export EXTRA_QPE_CONFIG=\"$EXTRA_QPE_CONFIG\" > ltibqtopiaconfig
-echo export EXTRA_QTE_CONFIG=\"$EXTRA_QTE_CONFIG\" >> ltibqtopiaconfig
-echo export PKG_QTOPIA_WANT_MOUSE=\"$PKG_QTOPIA_WANT_MOUSE\" >>
ltibqtopiaconfig
-
-echo export QWS_PLATFORM=$QWS_PLATFORM >> ltibqtopiaconfig
-echo export QWS_KEYBOARD=\"$QWS_KEYBOARD\" >> ltibqtopiaconfig
-
-echo note that e2fsprogs-devel and libjpeg/libjpeg-devel are required on host
-
-# tmake and qmake config
-# use linux-arm-g++ configuration as a starting point
-cp -r tmake/lib/qws/linux-arm-g++ tmake/lib/qws/linux-$QWS_PLATFORM-g++
-cp -r qtopia/mkspecs/qws/linux-arm-g++
qtopia/mkspecs/qws/linux-$QWS_PLATFORM-g++
-
-# create generic q/s/l/q/custom-linux-$QWS_PLATFORM-g++.* files if not created
by a patch
-test -e qtopia/src/libraries/qtopia/custom-linux-$QWS_PLATFORM-g++.h \
- || cp qtopia/src/libraries/qtopia/custom-linux-generic-g++.h
qtopia/src/libraries/qtopia/custom-linux-$QWS_PLATFORM-g++.h
-test -e qtopia/src/libraries/qtopia/custom-linux-$QWS_PLATFORM-g++.cpp \
- || cp qtopia/src/libraries/qtopia/custom-linux-generic-g++.cpp
qtopia/src/libraries/qtopia/custom-linux-$QWS_PLATFORM-g++.cpp
-
-
-%Build
-source ./ltibqtopiaconfig
-export UC_QWS_PLATFORM=`perl -e "print uc $QWS_PLATFORM"`
-
-# substitututions for cross build
-perl -p -i -e 's,arm-linux-,$ENV{TOOLCHAIN_PREFIX},;
- s,^((?:QMAKE|TMAKE)_CFLAGS\s+).*,$1 = -pipe -I. -I
$ENV{DEV_IMAGE}/usr/include -DQT_QWS_$ENV{UC_QWS_PLATFORM},;
- s,^((?:QMAKE|TMAKE)_LFLAGS\s+).*,$1 = -L
$ENV{DEV_IMAGE}/usr/lib,;
- s,^((?:QMAKE)_LIBS\s+).*,$1 = -lts,;
- ' tmake/lib/qws/linux-$QWS_PLATFORM-g++/tmake.conf \
- qtopia/mkspecs/qws/linux-$QWS_PLATFORM-g++/qmake.conf
-
-export PATH=$UNSPOOF_PATH
-echo yes | ./configure \
- -qte "-platform linux-x86-g++ -xplatform linux-$QWS_PLATFORM-g++ \
- -depths 16,32 -system-jpeg -no-opengl -no-xft -no-sm -no-qvfb -no-vnc \
- ${EXTRA_QTE_CONFIG} \
- -no-g++-exceptions -no-xft -embedded -qconfig qpe" \
- -qpe "-platform linux-g++ -xplatform linux-$QWS_PLATFORM-g++ \
- -arch $GNUTARCH -no-qvfb -with-libffmpeg -qconfig qpe \
- ${EXTRA_QPE_CONFIG} \
- -l jpeg -l uuid"
-./qtopia/scripts/buildQtopiaTools -check
-make
-
-# Cache the host tools to save time after the first build.
-if [ "$PKG_QTOPIA_WANT_CACHE_HOST_TOOLS" = "y" ]; then
- # This will save tools in ~/.qtopia_220_cache
- ./qtopia/scripts/cacheQtopiaTools
-fi
-
-
-%Install
-source ./ltibqtopiaconfig
-export PATH=$UNSPOOF_PATH
-echo creating qtopia install image
-make install > /dev/null
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/%{pfx}
-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
-#
-# Copyright 2006, Freescale Semiconductor Inc.
-#
-# Set QPE_USE_MOUSE to "y" to use mouse
-# otherwise touchscreen will be used
-#
-export TSLIB_TSDEVICE=/dev/input/event1
-export TSLIB_PLUGINDIR=/usr/lib/ts
-export TSLIB_CONFFILE=/usr/etc/ts.conf
-HOME=/root
-QPE_USE_MOUSE="$PKG_QTOPIA_WANT_MOUSE"
-export HOME QPE_USE_MOUSE
-# make sure usb input, mouse, and ts nodes exist
-mkdir -p /dev/input
-test -c /dev/input/event1 || mknod /dev/input/event1 c 13 65
-test -c /dev/input/mice || mknod /dev/input/mice c 13 63
-test -c /dev/ts || mknod /dev/ts c 11 0
-QTDIR=/opt/Qtopia
-QPEDIR=/opt/Qtopia
-LD_LIBRARY_PATH=/opt/Qtopia/lib
-PATH=/opt/Qtopia/bin:\$PATH
-QWS_SIZE="1024x768"
-export QTDIR QPEDIR LD_LIBRARY_PATH PATH QWS_SIZE
-QWS_KEYBOARD="$QWS_KEYBOARD"
-export QWS_KEYBOARD
-if [ _\$QPE_USE_MOUSE = "_y" ]
-then
-QWS_MOUSE_PROTO="USB:/dev/input/mice"
-export QWS_MOUSE_PROTO
-# overide pointer calibration when using mouse
-touch /etc/pointercal
-else
-# changing the :/dev/ts part will have no effect as it
-# is hardcoded in the source
-QWS_MOUSE_PROTO="TPanel:/dev/ts"
-# hide cursor when using touchscreen
-QWS_HIDE_CURSOR="Yes"
-export QWS_MOUSE_PROTO QWS_HIDE_CURSOR
-if [ -c /dev/vc/0 ]; then
-echo -e -n '\033[?25l' > /dev/vc/0
-echo -e -n '\033[9]' > /dev/vc/0
-fi
-# remove pointercal if it is empty
-[ -f /etc/pointercal -a ! -s /etc/pointercal ] && rm -f /etc/pointercal
-fi
-cd /opt/Qtopia/bin
-./qpe > /dev/null 2>&1 &
-#./qpe &
-EOF
-
-chmod 744 $initscript
-echo '1' > $RPM_BUILD_ROOT/%{pfx}/etc/firstuse
-# setup Storage.conf
-install -d $RPM_BUILD_ROOT/%{pfx}/root/Settings
-cat > $RPM_BUILD_ROOT/%{pfx}/root/Settings/Storage.conf << EOF
-[rootfs]
-Name = Internal Storage
-Removeable = 0
-[/dev/sda1]
-Name = USB Flash Drive
-Removable = 1
-EOF
-
-# make sure the strip scripts are run cross
-export PATH=$SPOOF_PATH
-
-%Clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%Files
-%defattr(-,root,root)
-%{pfx}/*
-
-
Index: dist/lfs-5.1/qtopia/qtopia.spec
===================================================================
RCS file: /sources/ltib/ltib/dist/lfs-5.1/qtopia/qtopia.spec,v
retrieving revision 1.2
diff -u -r1.2 qtopia.spec
--- dist/lfs-5.1/qtopia/qtopia.spec 29 Apr 2009 07:16:07 -0000 1.2
+++ dist/lfs-5.1/qtopia/qtopia.spec 27 Jul 2009 09:29:03 -0000
@@ -1,7 +1,7 @@
%define pfx /opt/freescale/rootfs/%{_target_cpu}
Summary : qtopia palmtop environment
-Name : qtopia-free
+Name : qtopia
Version : 2.2.0
Release : 1
License : GPL