diff options
Diffstat (limited to 'packages')
34 files changed, 140 insertions, 136 deletions
diff --git a/packages/busybox/busybox_1.00.bb b/packages/busybox/busybox_1.00.bb index ca2db7e760..262d6afff1 100644 --- a/packages/busybox/busybox_1.00.bb +++ b/packages/busybox/busybox_1.00.bb @@ -94,7 +94,7 @@ pkg_prerm_${PN} () { # providing its files, this will make update-alternatives work, but the update-rc.d part # for syslog, httpd and/or udhcpd will fail if there is no other package providing sh tmpdir=`mktemp -d /tmp/busyboxrm-XXXXXX` - cp -a /bin/busybox $tmpdir/ + cp -pPR /bin/busybox $tmpdir/ ln -s /bin/busybox $tmpdir/[ ln -s /bin/busybox $tmpdir/test ln -s /bin/busybox $tmpdir/head diff --git a/packages/gallery/gallery_1.5.5.bb b/packages/gallery/gallery_1.5.5.bb index 9aba2a2f0a..5756e98567 100644 --- a/packages/gallery/gallery_1.5.5.bb +++ b/packages/gallery/gallery_1.5.5.bb @@ -32,7 +32,7 @@ do_compile() { # do_install() { mkdir -p ${D}/${DEST_DIR} ${D}/etc/apache2/modules.d - cp -a ${S} ${D}/${DEST_DIR} + cp -pPR ${S} ${D}/${DEST_DIR} cp ${FILESDIR}/gallery.conf ${D}/etc/apache2/modules.d/95_gallery.conf } diff --git a/packages/glibc/eglibc-package.bbclass b/packages/glibc/eglibc-package.bbclass index a859ac2ca9..702d354591 100644 --- a/packages/glibc/eglibc-package.bbclass +++ b/packages/glibc/eglibc-package.bbclass @@ -150,14 +150,14 @@ do_prep_locale_tree() { treedir=${WORKDIR}/locale-tree rm -rf $treedir mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale - cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n + cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n # unzip to avoid parsing errors for i in $treedir/${datadir}/i18n/charmaps/*gz; do gunzip $i done - ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib + ls ${D}/lib/* | xargs -iBLAH cp -pPR BLAH $treedir/lib if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* ]; then - cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib + cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib fi install -m 0755 ${D}${bindir}/localedef $treedir/bin } @@ -166,7 +166,7 @@ do_collect_bins_from_locale_tree() { treedir=${WORKDIR}/locale-tree mkdir -p ${D}${libdir} - cp -a $treedir/${libdir}/locale ${D}${libdir} + cp -pPR $treedir/${libdir}/locale ${D}${libdir} } python package_do_split_gconvs () { diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index b96aae37b9..50fae44bf3 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -141,17 +141,17 @@ do_prep_locale_tree() { treedir=${WORKDIR}/locale-tree rm -rf $treedir mkdir -p $treedir/bin $treedir/lib $treedir/${datadir} $treedir/${libdir}/locale - cp -a ${D}${datadir}/i18n $treedir/${datadir}/i18n + cp -pPR ${D}${datadir}/i18n $treedir/${datadir}/i18n # unzip to avoid parsing errors for i in $treedir/${datadir}/i18n/charmaps/*gz; do gunzip $i done - ls ${D}/lib/* | xargs -iBLAH cp -a BLAH $treedir/lib + ls ${D}/lib/* | xargs -iBLAH cp -pPR BLAH $treedir/lib if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so ]; then - cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib + cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib fi if [ -f ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then - cp -a ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib + cp -pPR ${CROSS_DIR}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib fi install -m 0755 ${D}${bindir}/localedef $treedir/bin } @@ -160,7 +160,7 @@ do_collect_bins_from_locale_tree() { treedir=${WORKDIR}/locale-tree mkdir -p ${D}${libdir} - cp -a $treedir/${libdir}/locale ${D}${libdir} + cp -pPR $treedir/${libdir}/locale ${D}${libdir} } python package_do_split_gconvs () { diff --git a/packages/linux/linux-dht-walnut_2.6.20.bb b/packages/linux/linux-dht-walnut_2.6.20.bb index 89a776e075..ca94ee809f 100644 --- a/packages/linux/linux-dht-walnut_2.6.20.bb +++ b/packages/linux/linux-dht-walnut_2.6.20.bb @@ -35,11 +35,11 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-efika_2.6.20.20.bb b/packages/linux/linux-efika_2.6.20.20.bb index 630e5a6274..8ef0af6c78 100644 --- a/packages/linux/linux-efika_2.6.20.20.bb +++ b/packages/linux/linux-efika_2.6.20.20.bb @@ -63,12 +63,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } do_deploy() { diff --git a/packages/linux/linux-efika_2.6.20.bb b/packages/linux/linux-efika_2.6.20.bb index ddf3ee3257..87c769a1ae 100644 --- a/packages/linux/linux-efika_2.6.20.bb +++ b/packages/linux/linux-efika_2.6.20.bb @@ -60,12 +60,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-efika_2.6.21+git.bb b/packages/linux/linux-efika_2.6.21+git.bb index 80a4e69a4a..5f8427ef1e 100644 --- a/packages/linux/linux-efika_2.6.21+git.bb +++ b/packages/linux/linux-efika_2.6.21+git.bb @@ -47,12 +47,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } do_deploy() { diff --git a/packages/linux/linux-magicbox_2.6.18.6.bb b/packages/linux/linux-magicbox_2.6.18.6.bb index 9410294020..bd9a1c4060 100644 --- a/packages/linux/linux-magicbox_2.6.18.6.bb +++ b/packages/linux/linux-magicbox_2.6.18.6.bb @@ -44,11 +44,11 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-magicbox_2.6.19.2.bb b/packages/linux/linux-magicbox_2.6.19.2.bb index 82576776f3..2c79a94e10 100644 --- a/packages/linux/linux-magicbox_2.6.19.2.bb +++ b/packages/linux/linux-magicbox_2.6.19.2.bb @@ -77,11 +77,11 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers as still split install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } @@ -93,7 +93,7 @@ do_install_append () { powerpc${TARGET_VENDOR}-${TARGET_OS}-objcopy -O binary -R .note -R .comment -S ${DEPLOY_DIR_IMAGE}/vmlinux \ ${DEPLOY_DIR_IMAGE}/linux.bin gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin - cp -a ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/linux-${PV}-${MACHINE}-${DATETIME}.bin.gz + cp -pPR ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/linux-${PV}-${MACHINE}-${DATETIME}.bin.gz mkimage -A ppc -O linux -T kernel -C gzip -a 00000000 -e 00000000 -n "magicbox"-${PV} \ -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${MACHINE}-${DATETIME}.bin rm ${DEPLOY_DIR_IMAGE}/vmlinux diff --git a/packages/linux/linux-ml403-mvista-2.6.x_git.bb b/packages/linux/linux-ml403-mvista-2.6.x_git.bb index 76fa75f65d..77b0bbc326 100644 --- a/packages/linux/linux-ml403-mvista-2.6.x_git.bb +++ b/packages/linux/linux-ml403-mvista-2.6.x_git.bb @@ -33,12 +33,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-ml403-slab-2.6.x_git.bb b/packages/linux/linux-ml403-slab-2.6.x_git.bb index 75233492eb..f0408f365c 100644 --- a/packages/linux/linux-ml403-slab-2.6.x_git.bb +++ b/packages/linux/linux-ml403-slab-2.6.x_git.bb @@ -56,12 +56,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/linux/linux-sequoia_2.6.21.bb b/packages/linux/linux-sequoia_2.6.21.bb index 1fa520e914..49c7878ca2 100644 --- a/packages/linux/linux-sequoia_2.6.21.bb +++ b/packages/linux/linux-sequoia_2.6.21.bb @@ -31,12 +31,12 @@ do_stage_append () { #need ppc platforms includes + friends in order for external kernel modules to compile as headers a$ install -d ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/ppc ${STAGING_KERNEL_DIR}/arch/ - cp -a arch/powerpc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/ + cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/ install -d ${STAGING_KERNEL_DIR}/include/asm - cp -a include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ - cp -a include/asm-ppc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/ + cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/ } diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb index c483ea26a6..47d9a93a15 100644 --- a/packages/meta/external-toolchain.bb +++ b/packages/meta/external-toolchain.bb @@ -30,21 +30,21 @@ do_stage() { install -d ${STAGING_DIR}/pkgdata/ install -d ${STAGING_DIR_TARGET}/shlibs/ - cp -ar ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/ - cp -ar ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/ + cp -pPRr ${prefix}/pkgdata/* ${STAGING_DIR}/pkgdata/ + cp -pPRr ${prefix}/${TARGET_SYS}/shlibs/* ${STAGING_DIR_TARGET}/shlibs/ if [ -d ${prefix}/ipk ]; then install -d ${DEPLOY_DIR_IPK}/ - cp -ar ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/ + cp -pPRr ${prefix}/ipk/* ${DEPLOY_DIR_IPK}/ fi if [ -d ${prefix}/deb ]; then install -d ${DEPLOY_DIR_DEB}/ - cp -ar ${prefix}/deb/* ${DEPLOY_DIR_DEB}/ + cp -pPRr ${prefix}/deb/* ${DEPLOY_DIR_DEB}/ fi if [ -d ${prefix}/pstage -a "x${DEPLOY_DIR_PSTAGE}" != "x" ]; then install -d ${DEPLOY_DIR_PSTAGE}/ - cp -ar ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/ + cp -pPRr ${prefix}/pstage/* ${DEPLOY_DIR_PSTAGE}/ fi } diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb index c05b6d3618..4c2c5aad46 100644 --- a/packages/openmoko2/openmoko-sample2_svn.bb +++ b/packages/openmoko2/openmoko-sample2_svn.bb @@ -13,12 +13,12 @@ PACKAGE_ARCH_${PN}-src = "all" do_configure_prepend() { install -d ${WORKDIR}/source - cp -a ${S} ${WORKDIR}/source/ + cp -pPR ${S} ${WORKDIR}/source/ find ${WORKDIR}/source -name ".svn"|xargs rm -rf } do_install_append() { install -d ${D}/usr/local/openmoko/source/ - cp -a ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/ + cp -pPR ${WORKDIR}/source/* ${D}/usr/local/openmoko/source/ } diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc new file mode 100644 index 0000000000..eb4744ca58 --- /dev/null +++ b/packages/qmake/qmake2-native.inc @@ -0,0 +1,68 @@ +DESCRIPTION = "TrollTech Makefile Generator" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +SECTION = "devel" +LICENSE = "GPL" +PR = "r2" + +QTVER = "qtopia-core-opensource-src-${QTVERSION}" + +FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native" +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ + file://0001-fix-mkspecs.patch;patch=1 \ + file://use-lflags-last.patch;patch=1 \ + file://linux-oe-qmake.conf" +S = "${WORKDIR}/${QTVER}" + +# we need the real target system here +CROSS_SYS := "${TARGET_SYS}" +inherit autotools cross + +export QTDIR = "${S}" +EXTRA_OEMAKE = "-e" + +do_configure() { + # Install the OE build templates + for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ + do + install -d ${S}/mkspecs/$template + install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf + ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h + done + + QMAKESPEC= + PLATFORM=${HOST_OS}-oe-g++ + export PLATFORM + # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M: + export OE_QMAKE_CC="${CC}" + export OE_QMAKE_CFLAGS="${CFLAGS}" + export OE_QMAKE_CXX="${CXX}" + export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}" + export OE_QMAKE_LDFLAGS="${LDFLAGS}" + export OE_QMAKE_LINK="${CCLD}" + export OE_QMAKE_AR="${AR}" + export OE_QMAKE_STRIP="${STRIP}" + export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" + export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" + export OE_QMAKE_RCC="non-existant" + export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" + export OE_QMAKE_RPATH="-Wl,-rpath-link," + echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" +} + +do_compile() { + : +} + +do_stage() { + install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 + install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4 + install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/ + cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ + install -d ${STAGING_DIR}/${HOST_SYS}/qt4/ + cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/ +} + +do_install() { + : +} diff --git a/packages/qmake/qmake2-native-2.10a/.mtn2git_empty b/packages/qmake/qmake2-native/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qmake/qmake2-native-2.10a/.mtn2git_empty +++ b/packages/qmake/qmake2-native/.mtn2git_empty diff --git a/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch b/packages/qmake/qmake2-native/0001-fix-mkspecs.patch index abebfdfa27..abebfdfa27 100644 --- a/packages/qmake/qmake2-native-2.10a/0001-fix-mkspecs.patch +++ b/packages/qmake/qmake2-native/0001-fix-mkspecs.patch diff --git a/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf b/packages/qmake/qmake2-native/linux-oe-qmake.conf index f58481a693..f58481a693 100644 --- a/packages/qmake/qmake2-native-2.10a/linux-oe-qmake.conf +++ b/packages/qmake/qmake2-native/linux-oe-qmake.conf diff --git a/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch b/packages/qmake/qmake2-native/use-lflags-last.patch index 4197dbbf64..4197dbbf64 100644 --- a/packages/qmake/qmake2-native-2.10a/use-lflags-last.patch +++ b/packages/qmake/qmake2-native/use-lflags-last.patch diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb index d9071193a9..89b2ae5a82 100644 --- a/packages/qmake/qmake2-native_2.10a.bb +++ b/packages/qmake/qmake2-native_2.10a.bb @@ -1,67 +1,2 @@ -DESCRIPTION = "TrollTech Makefile Generator" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -SECTION = "devel" -LICENSE = "GPL" -PR = "r2" - -QTVER = "qtopia-core-opensource-src-4.3.2" - -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ - file://0001-fix-mkspecs.patch;patch=1 \ - file://use-lflags-last.patch;patch=1 \ - file://linux-oe-qmake.conf" -S = "${WORKDIR}/${QTVER}" - -# we need the real target system here -CROSS_SYS := "${TARGET_SYS}" -inherit autotools cross - -export QTDIR = "${S}" -EXTRA_OEMAKE = "-e" - -do_configure() { - # Install the OE build templates - for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ - do - install -d ${S}/mkspecs/$template - install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h - done - - QMAKESPEC= - PLATFORM=${HOST_OS}-oe-g++ - export PLATFORM - # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M: - export OE_QMAKE_CC="${CC}" - export OE_QMAKE_CFLAGS="${CFLAGS}" - export OE_QMAKE_CXX="${CXX}" - export OE_QMAKE_CXXFLAGS="-fno-exceptions -fno-rtti ${CXXFLAGS}" - export OE_QMAKE_LDFLAGS="${LDFLAGS}" - export OE_QMAKE_LINK="${CCLD}" - export OE_QMAKE_AR="${AR}" - export OE_QMAKE_STRIP="${STRIP}" - export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic" - export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc" - export OE_QMAKE_RCC="non-existant" - export OE_QMAKE_QMAKE="${STAGING_BINDIR_NATIVE}/qmake" - export OE_QMAKE_RPATH="-Wl,-rpath-link," - echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" -} - -do_compile() { - : -} - -do_stage() { - install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 - install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4 - install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/ - cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ - install -d ${STAGING_DIR}/${HOST_SYS}/qt4/ - cp -PfR mkspecs ${STAGING_DIR}/${HOST_SYS}/qt4/ -} - -do_install() { - : -} +QTVERSION="4.3.3" +require ${PN}.inc diff --git a/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty b/packages/qt/qt4-x11-free-4.3.3/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty +++ b/packages/qt/qt4-x11-free-4.3.3/.mtn2git_empty diff --git a/packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch b/packages/qt/qt4-x11-free-4.3.3/0001-cross-compile.patch index 6e2b8e755e..6e2b8e755e 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0001-cross-compile.patch +++ b/packages/qt/qt4-x11-free-4.3.3/0001-cross-compile.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch b/packages/qt/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch index e479a64a2b..e479a64a2b 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0002-fix-resinit-declaration.patch +++ b/packages/qt/qt4-x11-free-4.3.3/0002-fix-resinit-declaration.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch b/packages/qt/qt4-x11-free-4.3.3/0003-no-tools.patch index 5412c90377..5412c90377 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0003-no-tools.patch +++ b/packages/qt/qt4-x11-free-4.3.3/0003-no-tools.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch b/packages/qt/qt4-x11-free-4.3.3/0004-no-qmake.patch index 359f6df9d5..359f6df9d5 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0004-no-qmake.patch +++ b/packages/qt/qt4-x11-free-4.3.3/0004-no-qmake.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch b/packages/qt/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch index 93692699dc..93692699dc 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0005-fix-mkspecs.patch +++ b/packages/qt/qt4-x11-free-4.3.3/0005-fix-mkspecs.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch b/packages/qt/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch index cc8e115fee..cc8e115fee 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0006-freetype-host-includes.patch +++ b/packages/qt/qt4-x11-free-4.3.3/0006-freetype-host-includes.patch diff --git a/packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch b/packages/qt/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch index 35b71d9694..35b71d9694 100644 --- a/packages/qt/qt4-x11-free-4.3.2/0007-openssl-host-includes.patch +++ b/packages/qt/qt4-x11-free-4.3.3/0007-openssl-host-includes.patch diff --git a/packages/qt/qt4-x11-free_4.3.2.bb b/packages/qt/qt4-x11-free_4.3.3.bb index 2fa53a4d54..2fa53a4d54 100644 --- a/packages/qt/qt4-x11-free_4.3.2.bb +++ b/packages/qt/qt4-x11-free_4.3.3.bb diff --git a/packages/qte/qtopia-core_4.2.0.bb b/packages/qte/qtopia-core_4.2.0.bb index ab07ecf35d..509230f3ea 100644 --- a/packages/qte/qtopia-core_4.2.0.bb +++ b/packages/qte/qtopia-core_4.2.0.bb @@ -198,7 +198,7 @@ do_stage() { mkdir -p ${STAGE_TEMP} oe_runmake install INSTALL_ROOT=${STAGE_TEMP} - cp -af ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR} + cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR} for i in ${STAGE_TEMP}/${libdir}/*.la do diff --git a/packages/qte/qtopia-core_4.3.2.bb b/packages/qte/qtopia-core_4.3.3.bb index c486ba164f..2995988b42 100644 --- a/packages/qte/qtopia-core_4.3.2.bb +++ b/packages/qte/qtopia-core_4.3.3.bb @@ -210,7 +210,7 @@ do_stage() { install -d ${STAGING_INCDIR}/qtopiacore4 install -d ${STAGING_LIBDIR}/qtopiacore4 - cp -af ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/qtopiacore4/ + cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/qtopiacore4/ for i in ${STAGE_TEMP}/${libdir}/*.la do diff --git a/packages/uicmoc/uicmoc4-native.inc b/packages/uicmoc/uicmoc4-native.inc index 8f0c715a89..298c103fb1 100644 --- a/packages/uicmoc/uicmoc4-native.inc +++ b/packages/uicmoc/uicmoc4-native.inc @@ -27,8 +27,8 @@ EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \ EXTRA_OEMAKE = " " do_configure() { - sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" + sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro + echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" } TOBUILD = "\ @@ -45,17 +45,18 @@ TOBUILD = "\ " do_compile() { - unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS - for i in ${TOBUILD}; do - cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" - done + unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS + for i in ${TOBUILD}; + do + cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}" + done } do_stage() { - install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 - install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 - install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 - install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 - install -d ${STAGING_DIR_NATIVE}/qt4/ - install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/ + install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 + install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 + install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34 + install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 + install -d ${STAGING_DIR_NATIVE}/qt4/ + install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR_NATIVE}/qt4/ } diff --git a/packages/uicmoc/uicmoc4-native_4.3.2.bb b/packages/uicmoc/uicmoc4-native_4.3.3.bb index 1950f63068..1950f63068 100644 --- a/packages/uicmoc/uicmoc4-native_4.3.2.bb +++ b/packages/uicmoc/uicmoc4-native_4.3.3.bb |