diff options
85 files changed, 4779 insertions, 864 deletions
diff --git a/classes/qmake2.bbclass b/classes/qmake2.bbclass index d0f59d2cd4..cf3419f824 100644 --- a/classes/qmake2.bbclass +++ b/classes/qmake2.bbclass @@ -5,8 +5,7 @@ inherit qmake_base DEPENDS_prepend = "qmake2-native uicmoc4-native " -export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4" -export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++" +export QMAKESPEC = "${CROSS_DATADIR}/qt4/mkspecs/${TARGET_OS}-oe-g++" export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4" export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34" export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4" @@ -14,7 +13,7 @@ export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4" export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2" export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}" -export OE_QMAKE_INCDIR_QT = "${QTDIR}/include" -export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qt4" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qt4" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm" diff --git a/classes/qtopia4core.bbclass b/classes/qtopia4core.bbclass index 86bc7afc2f..181973d72d 100644 --- a/classes/qtopia4core.bbclass +++ b/classes/qtopia4core.bbclass @@ -4,8 +4,8 @@ inherit qmake2 # # override variables set by qmake-base to compile QtopiaCore apps # -export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore4" -export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore4/" +export OE_QMAKE_INCDIR_QT = "${STAGING_INCDIR}/qtopiacore" +export OE_QMAKE_LIBDIR_QT = "${STAGING_LIBDIR}/qtopiacore" export OE_QMAKE_LIBS_QT = "qt" export OE_QMAKE_LIBS_X11 = "" -EXTRA_QMAKEVARS_POST += "LIBS+=-lQtNetwork " +export OE_QMAKE_EXTRA_MODULES = "network" diff --git a/classes/xilinx-bsp.bbclass b/classes/xilinx-bsp.bbclass index fd09946061..f657e5be94 100644 --- a/classes/xilinx-bsp.bbclass +++ b/classes/xilinx-bsp.bbclass @@ -34,7 +34,7 @@ fi case "${XILINX_BOARD}" in ML403) oenote "ML403 board setup" - cp -a ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \ + cp -pPR ${XILINX_BSP_PATH}/ppc405_0/libsrc/linux_2_6_v1_00_a/linux/arch/ppc/platforms/4xx/xparameters/xparameters_ml40x.h \ ${S}/arch/ppc/platforms/4xx/xparameters/xparameters_ml403.h ;; diff --git a/conf/checksums.ini b/conf/checksums.ini index 76eacce219..eadb6a09a9 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -9446,13 +9446,17 @@ sha256=c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b md5=8012acea71b35c18247bd92c4721589d sha256=abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 +[ftp://ftp.trolltech.com/pub/qt/source/qt-x11-opensource-src-4.3.3.tar.gz] +md5=19678fe35170559cd6a6fa531c57799c +sha256=89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570 + [ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.2.0.tar.gz] md5=9519eccf0638c9962f73a7b20da77e0e sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883 -[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.2.tar.gz] -md5=70b729dd5dd8b2b432d685918e1971f1 -sha256=38af7b39e7805d8e3ba81091aa29af8bd38ce7cbbf8e721c8bb7ab810c38d963 +[ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-4.3.3.tar.gz] +md5=f7022c57ec4cf4f1d5f5c8b8a70a9e5f +sha256=2ed9f5006ac9f63db08bce409a3626141d5f6e8d562e25df5bd97cebc65ec10d [http://keepcool.kf.tu-berlin.de/public/mitarbeiter/sadowski/qtopia-squeak-3.4-2_patched.tar.gz] md5=0e2bab65b62784d8714057624373f70d diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index f36ae8c6fe..80f1512acf 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -7,7 +7,7 @@ #@-------------------------------------------------------------------- # The release will the 2007.12 -DISTRO_VERSION = "2007.11RC2.1" +DISTRO_VERSION = "2007.11RC3" DISTRO_REVISION = "51" require conf/distro/include/sane-srcdates.inc diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc index ffb5380a14..97fed90f21 100644 --- a/conf/distro/include/angstrom-2007-preferred-versions.inc +++ b/conf/distro/include/angstrom-2007-preferred-versions.inc @@ -1616,7 +1616,7 @@ PREFERRED_VERSION_qscintilla ?= "1.65-gpl-1.6" PREFERRED_VERSION_qsvn ?= "0.3.0" PREFERRED_VERSION_qt-x11-free ?= "3.3.7" PREFERRED_VERSION_qt-x11-free-native ?= "3.3.5" -PREFERRED_VERSION_qt4-x11-free ?= "4.3.2" +PREFERRED_VERSION_qt4-x11-free ?= "4.3.3" PREFERRED_VERSION_qtplot ?= "0.2" PREFERRED_VERSION_quagga ?= "0.99.8" PREFERRED_VERSION_quake1 ?= "0.0.1" @@ -1893,7 +1893,7 @@ PREFERRED_VERSION_udhcp ?= "0.9.8" PREFERRED_VERSION_ufraw ?= "0.12" PREFERRED_VERSION_uicmoc-native ?= "2.3.10" PREFERRED_VERSION_uicmoc3-native ?= "3.3.5" -PREFERRED_VERSION_uicmoc4-native ?= "4.3.2" +PREFERRED_VERSION_uicmoc4-native ?= "4.3.3" PREFERRED_VERSION_uim ?= "1.3.1" PREFERRED_VERSION_uim-native ?= "1.3.1" PREFERRED_VERSION_uim-tomoe-gtk ?= "0.2.0" diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf index a8a2d60c17..6eeb08825b 100644 --- a/conf/machine/dht-walnut.conf +++ b/conf/machine/dht-walnut.conf @@ -20,6 +20,7 @@ USE_VT = "0" SERIAL_CONSOLE = "115200 ttyS0" PREFERRED_VERSION_u-boot = "1.1.4" +KERNEL_IMAGETYPE = "uImage" #tune for the 405 cpu require conf/machine/include/tune-ppc405.inc diff --git a/packages/atftp/atftp_0.7.bb b/packages/atftp/atftp_0.7.bb index 23bdfaf64b..07040562dd 100644 --- a/packages/atftp/atftp_0.7.bb +++ b/packages/atftp/atftp_0.7.bb @@ -3,10 +3,10 @@ SECTION = "network" PRIORITY = "optional" HOMEPAGE = "http://packages.debian.org/atftp" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.orig.tar.gz \ - ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}-7.diff.gz;patch=1 \ + ${DEBIAN_MIRROR}/main/a/atftp/atftp_${PV}.dfsg-3.diff.gz;patch=1 \ file://atftpd.init" S = "${WORKDIR}/atftp-${PV}" 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/git/git.inc b/packages/git/git.inc index 7115d44b35..3a80c5d950 100644 --- a/packages/git/git.inc +++ b/packages/git/git.inc @@ -3,7 +3,9 @@ SECTION = "console/utils" LICENSE = "GPL" SRC_URI = "http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2 \ - file://autotools.patch;patch=1" + file://autotools.patch;patch=1 \ + file://git-gui-install-mode-arg-spaces.patch;patch=1 \ + " S = "${WORKDIR}/git-${PV}" EXTRA_OEMAKE = "NO_TCLTL=1" 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/qmake/qmake2-native-2.10a/.mtn2git_empty b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qmake/qmake2-native-2.10a/.mtn2git_empty +++ b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/.mtn2git_empty diff --git a/packages/linux/linux-dht-walnut-2.6.20/dht-walnut_defconfig b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/defconfig index b6b752f623..b6b752f623 100644 --- a/packages/linux/linux-dht-walnut-2.6.20/dht-walnut_defconfig +++ b/packages/linux/linux-dht-walnut-2.6.20/dht-walnut/defconfig diff --git a/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty b/packages/linux/linux-dht-walnut/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt/qt4-x11-free-4.1.2/.mtn2git_empty +++ b/packages/linux/linux-dht-walnut/.mtn2git_empty diff --git a/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty b/packages/linux/linux-dht-walnut/dht-walnut/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qt/qt4-x11-free-4.3.2/.mtn2git_empty +++ b/packages/linux/linux-dht-walnut/dht-walnut/.mtn2git_empty diff --git a/packages/linux/li |