From be2795a6bfb582acccff4898478723ae59f93a8c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Apr 2009 14:25:36 -0700 Subject: sane-srcrevs.inc : Rev up eglibc and add revision for gcc-svn. --- conf/distro/include/sane-srcrevs.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index bb9b75bece..88b3487451 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -39,8 +39,8 @@ SRCREV_pn-dfu-util-native ?= "4160" SRCREV_pn-diversity-daemon ?= "571" SRCREV_pn-diversity-radar ?= "453" SRCREV_pn-eds-dbus ?= "736" -SRCREV_pn-eglibc ?= "7467" -SRCREV_pn-eglibc-initial ?= "7467" +SRCREV_pn-eglibc ?= "8139" +SRCREV_pn-eglibc-initial ?= "8139" SRCREV_pn-enlazar ?= "37" SRCREV_pn-essential-dialer ?= "60" SRCREV_pn-exalt ?= "79" @@ -64,6 +64,12 @@ SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" SRCREV_pn-fso-monitord ?= "0f64979a11d6263c7b7ed0e945a0889744f295f1" SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff" SRCREV_pn-fstests ?= "204" +GCCREV ?= "145550" +SRCREV_pn-gcc ?= ${GCCREV} +SRCREV_pn-gcc-cross ?= ${GCCREV} +SRCREV_pn-gcc-cross-initial ?= ${GCCREV} +SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV} +SRCREV_pn-gcc-cross-sdk ?= ${GCCREV} SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "10302" SRCREV_pn-gpe-conf ?= "9798" -- cgit v1.2.3 From 176aebf4b27991081071ef9df07dc5673fc17864 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 3 Apr 2009 14:27:40 -0700 Subject: binutils-cross-sdk: Make relative, not absolute symlinks for 'as', etc, bump PR While I'm in here, make the cvs recipe use FILESPATHPKG not mung FILESDIR. Acked-by: Florian Boor Acked-by: Khem Raj Signed-off-by: Tom Rini --- recipes/binutils/binutils-cross-sdk.inc | 2 +- recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb | 1 + recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb | 1 + recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb | 2 +- recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb | 1 + recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb | 2 +- recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb | 2 +- recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb | 2 +- recipes/binutils/binutils-cross-sdk_2.18.bb | 2 +- recipes/binutils/binutils-cross-sdk_2.19.1.bb | 2 +- recipes/binutils/binutils-cross-sdk_2.19.bb | 2 +- recipes/binutils/binutils-cross-sdk_cvs.bb | 4 ++-- 12 files changed, 13 insertions(+), 10 deletions(-) diff --git a/recipes/binutils/binutils-cross-sdk.inc b/recipes/binutils/binutils-cross-sdk.inc index 5da1d4fa8f..6e9cda09b8 100644 --- a/recipes/binutils/binutils-cross-sdk.inc +++ b/recipes/binutils/binutils-cross-sdk.inc @@ -17,7 +17,7 @@ do_install () { rm ${D}${prefix}/${TARGET_SYS}/bin/.debug -Rf rm ${D}${prefix}/${TARGET_SYS}/bin/* for l in ${D}${bindir}/*; do - ln -sf "${bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`" + ln -sf "../../${layout_base_bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`" done # Install the libiberty header diff --git a/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb b/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb index f50956680d..f84a61d1f5 100644 --- a/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb +++ b/recipes/binutils/binutils-cross-sdk_2.14.90.0.6.bb @@ -1,2 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb b/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb index f50956680d..f84a61d1f5 100644 --- a/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb +++ b/recipes/binutils/binutils-cross-sdk_2.14.90.0.7.bb @@ -1,2 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb b/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb index f84a61d1f5..40e9889691 100644 --- a/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb +++ b/recipes/binutils/binutils-cross-sdk_2.15.94.0.1.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r1" +PR = "r2" diff --git a/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb b/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb index f50956680d..f84a61d1f5 100644 --- a/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb +++ b/recipes/binutils/binutils-cross-sdk_2.16.91.0.6.bb @@ -1,2 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb b/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb index 574265cf57..cde4e42942 100644 --- a/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb +++ b/recipes/binutils/binutils-cross-sdk_2.16.91.0.7.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5" diff --git a/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb b/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb index 574265cf57..cde4e42942 100644 --- a/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb +++ b/recipes/binutils/binutils-cross-sdk_2.17.50.0.12.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5" diff --git a/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb b/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb index 574265cf57..cde4e42942 100644 --- a/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb +++ b/recipes/binutils/binutils-cross-sdk_2.18.50.0.7.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5" diff --git a/recipes/binutils/binutils-cross-sdk_2.18.bb b/recipes/binutils/binutils-cross-sdk_2.18.bb index 574265cf57..cde4e42942 100644 --- a/recipes/binutils/binutils-cross-sdk_2.18.bb +++ b/recipes/binutils/binutils-cross-sdk_2.18.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r4" +PR = "r5" diff --git a/recipes/binutils/binutils-cross-sdk_2.19.1.bb b/recipes/binutils/binutils-cross-sdk_2.19.1.bb index 76dff5449f..f84a61d1f5 100644 --- a/recipes/binutils/binutils-cross-sdk_2.19.1.bb +++ b/recipes/binutils/binutils-cross-sdk_2.19.1.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r0" +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_2.19.bb b/recipes/binutils/binutils-cross-sdk_2.19.bb index 76dff5449f..f84a61d1f5 100644 --- a/recipes/binutils/binutils-cross-sdk_2.19.bb +++ b/recipes/binutils/binutils-cross-sdk_2.19.bb @@ -1,3 +1,3 @@ require binutils_${PV}.bb require binutils-cross-sdk.inc -PR = "r0" +PR = "r1" diff --git a/recipes/binutils/binutils-cross-sdk_cvs.bb b/recipes/binutils/binutils-cross-sdk_cvs.bb index 6886255c7f..94d2704a6f 100644 --- a/recipes/binutils/binutils-cross-sdk_cvs.bb +++ b/recipes/binutils/binutils-cross-sdk_cvs.bb @@ -1,4 +1,4 @@ require binutils_cvs.bb require binutils-cross-sdk.inc -PR = "r4" -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-cvs" +PR = "r5" +FILESPATHPKG .= ":binutils-cvs" -- cgit v1.2.3 From 439e60b246bcc741e883372f2340fc6ab7af93d3 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 3 Apr 2009 14:31:12 -0700 Subject: gcc-cross-sdk: Fix relocation of the toolchain and bump PR. There's two parts to this. The first is to make relative, not absolute symlinks for 'cpp', etc. The second is that we need to configure without --with-gxx-include-dir and instead install the base C++ headers into the expected location. The path passed to --with-gxx-include-dir will not be relocated and is an absolute. Acked-by: Florian Boor Acked-by: Khem Raj Signed-off-by: Tom Rini --- recipes/gcc/gcc-configure-sdk.inc | 3 +-- recipes/gcc/gcc-cross-sdk_3.3.4.bb | 2 +- recipes/gcc/gcc-cross-sdk_3.4.3.bb | 2 +- recipes/gcc/gcc-cross-sdk_3.4.4.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.1.0.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.1.1.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.1.2.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.2.2.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.2.3.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.2.4.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.3.1.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.3.2.bb | 2 +- recipes/gcc/gcc-cross-sdk_4.3.3.bb | 2 +- recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb | 2 +- recipes/gcc/gcc-package-sdk.inc | 3 ++- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/recipes/gcc/gcc-configure-sdk.inc b/recipes/gcc/gcc-configure-sdk.inc index 75080302ff..d04f6080ee 100644 --- a/recipes/gcc/gcc-configure-sdk.inc +++ b/recipes/gcc/gcc-configure-sdk.inc @@ -4,8 +4,7 @@ require gcc-configure-common.inc USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}' USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d )}' -EXTRA_OECONF_PATHS = "--with-gxx-include-dir=${prefix}/${TARGET_SYS}/${layout_includedir}/c++ \ - --with-sysroot=${prefix}/${TARGET_SYS} \ +EXTRA_OECONF_PATHS = "--with-sysroot=${prefix}/${TARGET_SYS} \ --with-build-time-tools=${CROSS_DIR}/${TARGET_SYS}/bin \ --with-build-sysroot=${STAGING_DIR_TARGET}" diff --git a/recipes/gcc/gcc-cross-sdk_3.3.4.bb b/recipes/gcc/gcc-cross-sdk_3.3.4.bb index f53c5d321a..ed9c18c557 100644 --- a/recipes/gcc/gcc-cross-sdk_3.3.4.bb +++ b/recipes/gcc/gcc-cross-sdk_3.3.4.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_3.4.3.bb b/recipes/gcc/gcc-cross-sdk_3.4.3.bb index 48a7ecd645..0b1f6613bf 100644 --- a/recipes/gcc/gcc-cross-sdk_3.4.3.bb +++ b/recipes/gcc/gcc-cross-sdk_3.4.3.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_3.4.4.bb b/recipes/gcc/gcc-cross-sdk_3.4.4.bb index f6dd0532e3..e3346590d5 100644 --- a/recipes/gcc/gcc-cross-sdk_3.4.4.bb +++ b/recipes/gcc/gcc-cross-sdk_3.4.4.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.1.0.bb b/recipes/gcc/gcc-cross-sdk_4.1.0.bb index 5caec0b5a5..6b6097fb00 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.0.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.0.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.1.1.bb b/recipes/gcc/gcc-cross-sdk_4.1.1.bb index 461008d2d5..a6418f6404 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.1.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.1.2.bb b/recipes/gcc/gcc-cross-sdk_4.1.2.bb index 55c9ceef70..7bc24806bb 100644 --- a/recipes/gcc/gcc-cross-sdk_4.1.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.1.2.bb @@ -1,4 +1,4 @@ -PR = "r9" +PR = "r10" require gcc-${PV}.inc require gcc-cross-sdk.inc diff --git a/recipes/gcc/gcc-cross-sdk_4.2.2.bb b/recipes/gcc/gcc-cross-sdk_4.2.2.bb index 297bd8ece8..a326263c06 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.2.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.2.3.bb b/recipes/gcc/gcc-cross-sdk_4.2.3.bb index ee4ce855af..297bd8ece8 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.3.bb @@ -1,4 +1,4 @@ -PR = "r6" +PR = "r7" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.2.4.bb b/recipes/gcc/gcc-cross-sdk_4.2.4.bb index 3b66660d9b..0a3af9e469 100644 --- a/recipes/gcc/gcc-cross-sdk_4.2.4.bb +++ b/recipes/gcc/gcc-cross-sdk_4.2.4.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.1.bb b/recipes/gcc/gcc-cross-sdk_4.3.1.bb index 13d395833e..876c65c369 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.1.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r13" +PR = "r14" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.2.bb b/recipes/gcc/gcc-cross-sdk_4.3.2.bb index 8057608e0d..ee4ce855af 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.2.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.2.bb @@ -1,4 +1,4 @@ -PR = "r5" +PR = "r6" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb index 29ee187785..7f3e1466ce 100644 --- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb +++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" inherit sdk diff --git a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb index 361b0c10aa..3352e41dcb 100644 --- a/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb +++ b/recipes/gcc/gcc-cross-sdk_csl-arm-2007q3.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" inherit sdk diff --git a/recipes/gcc/gcc-package-sdk.inc b/recipes/gcc/gcc-package-sdk.inc index 0dc19c70b4..3d9cc0c53a 100644 --- a/recipes/gcc/gcc-package-sdk.inc +++ b/recipes/gcc/gcc-package-sdk.inc @@ -48,7 +48,8 @@ do_install () { # Create the ${prefix}/${TARGET_SYS}/bin/* symlinks install -d ${D}${prefix}/${TARGET_SYS}/bin/ for l in ${D}${bindir}/*; do - ln -sf "${bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`" + echo $l + ln -sf "../../${layout_base_bindir}/`basename $l`" "${D}${prefix}/${TARGET_SYS}/bin/`basename $l | sed -e 's,${TARGET_PREFIX},,'`" done ln -sf "${bindir}/${TARGET_PREFIX}gcc${EXEEXT}" "${D}${prefix}/${TARGET_SYS}/bin/cc${EXEEXT}" -- cgit v1.2.3 From da82d156d7c2503696ea21cba1e86b261f4a7c92 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 3 Apr 2009 14:34:10 -0700 Subject: meta-toolchain, canadian-sdk: Move C++ headers into the correct location, bump PR A gcc that has sysroot support expects that the default C++ headers (iostream, etc) are in /include/c++ while regular C headers are still in /usr/include. Acked-by: Florian Boor Acked-by: Khem Raj Signed-off-by: Tom Rini --- recipes/meta/canadian-sdk.bb | 8 +++++++- recipes/meta/meta-toolchain-fso.bb | 2 +- recipes/meta/meta-toolchain-gpe-sbox.bb | 3 ++- recipes/meta/meta-toolchain-gpe.bb | 3 ++- recipes/meta/meta-toolchain-neuros.bb | 2 +- recipes/meta/meta-toolchain-openmoko.bb | 2 +- recipes/meta/meta-toolchain-opie.bb | 1 + recipes/meta/meta-toolchain-sbox.bb | 1 + recipes/meta/meta-toolchain.bb | 6 ++++++ 9 files changed, 22 insertions(+), 6 deletions(-) diff --git a/recipes/meta/canadian-sdk.bb b/recipes/meta/canadian-sdk.bb index 150c75222b..9126c7e872 100644 --- a/recipes/meta/canadian-sdk.bb +++ b/recipes/meta/canadian-sdk.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native zip-native" -PR = "r2" +PR = "r3" inherit canadian-sdk meta @@ -100,6 +100,12 @@ do_populate_sdk() { # gcc-cross-sdk get built :( (30/11/07) ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so + # With sysroot support, gcc expects the default C++ headers to be + # in a specific place. + install -d ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include + mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/usr/include/c++ \ + ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + # Fix or remove broken .la files for i in `find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} -name \*.la`; do sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1${prefix}/${TARGET_SYS}${layout_base_libdir},g" \ diff --git a/recipes/meta/meta-toolchain-fso.bb b/recipes/meta/meta-toolchain-fso.bb index fbfbb0a2cd..4873c429d3 100644 --- a/recipes/meta/meta-toolchain-fso.bb +++ b/recipes/meta/meta-toolchain-fso.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" TOOLCHAIN_TARGET_TASK = "task-fso-toolchain-target" TOOLCHAIN_HOST_TASK = "task-fso-toolchain-host" diff --git a/recipes/meta/meta-toolchain-gpe-sbox.bb b/recipes/meta/meta-toolchain-gpe-sbox.bb index 74ba03825f..29e39c541c 100644 --- a/recipes/meta/meta-toolchain-gpe-sbox.bb +++ b/recipes/meta/meta-toolchain-gpe-sbox.bb @@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-base \ task-sdk-sbox \ @@ -9,4 +10,4 @@ TOOLCHAIN_TARGET_TASK = "\ require meta-toolchain.bb -SDK_SUFFIX = "toolchain-gpe-sbox" \ No newline at end of file +SDK_SUFFIX = "toolchain-gpe-sbox" diff --git a/recipes/meta/meta-toolchain-gpe.bb b/recipes/meta/meta-toolchain-gpe.bb index bcfb1e1b38..7b962bf9f8 100644 --- a/recipes/meta/meta-toolchain-gpe.bb +++ b/recipes/meta/meta-toolchain-gpe.bb @@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-base \ task-sdk-x11 \ @@ -6,4 +7,4 @@ TOOLCHAIN_TARGET_TASK = "\ require meta-toolchain.bb -SDK_SUFFIX = "toolchain-gpe" \ No newline at end of file +SDK_SUFFIX = "toolchain-gpe" diff --git a/recipes/meta/meta-toolchain-neuros.bb b/recipes/meta/meta-toolchain-neuros.bb index 087ddcb325..445a187825 100644 --- a/recipes/meta/meta-toolchain-neuros.bb +++ b/recipes/meta/meta-toolchain-neuros.bb @@ -1,6 +1,6 @@ # Toolchain for neuros-osd devices -PR = "r4" +PR = "r5" TOOLCHAIN_HOST_TASK = "task-sdk-host \ qmake2-sdk uicmoc4-sdk" diff --git a/recipes/meta/meta-toolchain-openmoko.bb b/recipes/meta/meta-toolchain-openmoko.bb index b7e5626f61..b265615700 100644 --- a/recipes/meta/meta-toolchain-openmoko.bb +++ b/recipes/meta/meta-toolchain-openmoko.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target" TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host" diff --git a/recipes/meta/meta-toolchain-opie.bb b/recipes/meta/meta-toolchain-opie.bb index c72208c822..9f4b9ac6d0 100644 --- a/recipes/meta/meta-toolchain-opie.bb +++ b/recipes/meta/meta-toolchain-opie.bb @@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-base \ task-sdk-opie" diff --git a/recipes/meta/meta-toolchain-sbox.bb b/recipes/meta/meta-toolchain-sbox.bb index 1283c599c6..0138329d82 100644 --- a/recipes/meta/meta-toolchain-sbox.bb +++ b/recipes/meta/meta-toolchain-sbox.bb @@ -1,3 +1,4 @@ +PR = "r1" TOOLCHAIN_TARGET_TASK = "\ task-sdk-bare \ task-sdk-sbox" diff --git a/recipes/meta/meta-toolchain.bb b/recipes/meta/meta-toolchain.bb index f892d22fd1..b641be1295 100644 --- a/recipes/meta/meta-toolchain.bb +++ b/recipes/meta/meta-toolchain.bb @@ -117,6 +117,12 @@ do_populate_sdk() { # gcc-cross-sdk get built :( (30/11/07) ln -sf libgcc_s.so.1 ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libgcc_s.so + # With sysroot support, gcc expects the default C++ headers to be + # in a specific place. + install -d ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include + mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/usr/include/c++ \ + ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + # Fix or remove broken .la files for i in `find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} -name \*.la`; do sed -i -e "/^dependency_libs=/s,\([[:space:]']\)${layout_base_libdir},\1${prefix}/${TARGET_SYS}${layout_base_libdir},g" \ -- cgit v1.2.3 From 4c45e60d523f79b0ed9b8d31c6befb18936113a8 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 4 Apr 2009 12:35:09 -0700 Subject: meta-toolchain-gpe-sbox: Drop task-sdk-gpephone (to match m-t-gpe), bump PR Acked-by: Florian Boor Acked-by: Khem Raj Signed-off-by: Tom Rini --- recipes/meta/meta-toolchain-gpe-sbox.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipes/meta/meta-toolchain-gpe-sbox.bb b/recipes/meta/meta-toolchain-gpe-sbox.bb index 29e39c541c..679e50c53b 100644 --- a/recipes/meta/meta-toolchain-gpe-sbox.bb +++ b/recipes/meta/meta-toolchain-gpe-sbox.bb @@ -1,12 +1,11 @@ -PR = "r1" +PR = "r2" TOOLCHAIN_TARGET_TASK = "\ task-sdk-base \ task-sdk-sbox \ task-sdk-sbox-gpe \ task-sdk-x11 \ task-sdk-x11-ext \ - task-sdk-gpe \ - task-sdk-gpephone" + task-sdk-gpe" require meta-toolchain.bb -- cgit v1.2.3 From 28d0f54e301b5063eaf3587c57fd5422ae7fb2b2 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 3 Apr 2009 09:51:11 -0700 Subject: wireless-tools: Fix libiw/ifrename packages, bump PR. We weren't creating the above packages as we needed to use '=+' not '+=' here to take things from the default package. For these additional packages, add files with '=' not '+=' and we only need to add ${sysconfdir}/network to the base package glob. Also we need to run install-static to get libiw.a to be installed. Signed-off-by: Tom Rini --- recipes/wireless-tools/wireless-tools.inc | 21 ++++++++++----------- recipes/wireless-tools/wireless-tools_29.bb | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/recipes/wireless-tools/wireless-tools.inc b/recipes/wireless-tools/wireless-tools.inc index d2a7b89a50..f52c3f16a7 100644 --- a/recipes/wireless-tools/wireless-tools.inc +++ b/recipes/wireless-tools/wireless-tools.inc @@ -31,7 +31,7 @@ do_stage() { } do_install() { - oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install-man install-hdr + oe_runmake PREFIX=${D} install-iwmulticall install-dynamic install-static install-man install-hdr install -d ${D}${sbindir} install -m 0755 ifrename ${D}${sbindir}/ifrename install -d ${D}${sysconfdir}/network/if-pre-up.d @@ -39,13 +39,12 @@ do_install() { install ${WORKDIR}/zzz-wireless.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/zzz-wireless } -PACKAGES += "libiw libiw-dev libiw-doc libiw-dbg ifrename ifrename-dbg ifrename-doc" -FILES_libiw += "${libdir}/*.so.*" -FILES_libiw-dbg += "${libdir}/.debug/*.so.*" -FILES_libiw-dev += "${libdir}/*.a ${libdir}/*.so ${includedir}" -FILES_libiw-doc += "${mandir}/man7" -FILES_ifrename += "${sbindir}/ifrename" -FILES_ifrename-dbg += "${sbindir}/.debug/ifrename" -FILES_ifrename-doc += "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5" -FILES_${PN} += "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network" -FILES_${PN}-doc += "${mandir}/man8" +PACKAGES =+ "libiw libiw-dev libiw-doc libiw-dbg ifrename ifrename-dbg ifrename-doc" +FILES_libiw = "${libdir}/*.so.*" +FILES_libiw-dbg = "${libdir}/.debug/*.so.*" +FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}" +FILES_libiw-doc = "${mandir}/man7" +FILES_ifrename = "${sbindir}/ifrename" +FILES_ifrename-dbg = "${sbindir}/.debug/ifrename" +FILES_ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5" +FILES_${PN} += "${sysconfdir}/network" diff --git a/recipes/wireless-tools/wireless-tools_29.bb b/recipes/wireless-tools/wireless-tools_29.bb index 196a1942d1..fb68127df1 100644 --- a/recipes/wireless-tools/wireless-tools_29.bb +++ b/recipes/wireless-tools/wireless-tools_29.bb @@ -1,3 +1,3 @@ require wireless-tools.inc -PR = "r3" +PR = "r4" -- cgit v1.2.3 From 747d8eec1f2b19751172f958dc518b7c865494f1 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 7 Apr 2009 00:10:28 +0200 Subject: initramfs-kexecboot-image: fix EXTRA_IMAGEDEPENDS for all Zaurus --- conf/machine/include/zaurus-2.6.inc | 4 ++-- conf/machine/include/zaurus-clamshell.inc | 3 +-- recipes/kexecboot/initramfs-kexecboot-image.bb | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 5ce1cdca6a..61b636bebb 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -10,8 +10,8 @@ ERASEBLOCKSIZE_akita = "0x20000" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" -ZAURUS-UPDATER = "zaurus-updater" -EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}" +EXTRA_IMAGEDEPENDS += "zaurus-updater" +KEXECBOOT_IMAGEDEPENDS = "zaurus-updater" SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc index df4e243eef..714380e9aa 100644 --- a/conf/machine/include/zaurus-clamshell.inc +++ b/conf/machine/include/zaurus-clamshell.inc @@ -3,9 +3,8 @@ include conf/machine/include/tune-xscale.inc UBOOT_ENTRYPOINT = "0x80008000" UBOOT_LOADADDRESS = "0x80008000" - -LEGACY_IMAGEDEPENDS = "${ZAURUS-UPDATER} sharp-flash-header-c700" EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" +KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ diff --git a/recipes/kexecboot/initramfs-kexecboot-image.bb b/recipes/kexecboot/initramfs-kexecboot-image.bb index 1aacceaa30..385bd258ea 100644 --- a/recipes/kexecboot/initramfs-kexecboot-image.bb +++ b/recipes/kexecboot/initramfs-kexecboot-image.bb @@ -10,8 +10,8 @@ IMAGE_DEVICE_TABLES_h2200 = "device_table-oldmmc.txt" export IMAGE_BASENAME = "initramfs-kexecboot-image" -#EXTRA_IMAGEDEPENDS = "" -EXTRA_IMAGEDEPENDS = "${LEGACY_IMAGEDEPENDS}" +# avoid to depend from kexecboot +EXTRA_IMAGEDEPENDS = "${KEXECBOOT_IMAGEDEPENDS}" IMAGE_INSTALL = "kexecboot" IMAGE_LINGUAS = "" -- cgit v1.2.3 From 55dc76064537bdd27a8b6a538d0a0f49ea2dfc8c Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Tue, 7 Apr 2009 00:22:54 +0200 Subject: linux-rp.inc: respect do_rm_work task - wlan-ng headers were needed before 2.6.28 - tosa was needing these but now uses 2.6.29 - not needed anymore it seems --- recipes/linux/linux-rp.inc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipes/linux/linux-rp.inc b/recipes/linux/linux-rp.inc index e2af859069..bd08a6f3eb 100644 --- a/recipes/linux/linux-rp.inc +++ b/recipes/linux/linux-rp.inc @@ -147,7 +147,3 @@ do_configure() { yes '' | oe_runmake oldconfig } - -# wlan-ng stuff need compiled kernel sources -do_rm_work() { -} -- cgit v1.2.3 From fbf22c52a21c8f423d8c6683155be9248f21b31a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 7 Apr 2009 09:46:06 +0200 Subject: linux-omap 2.6.29: add patches to fix some bugs in the display driver, XV now works again --- conf/machine/include/omap3.inc | 2 +- ...Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch | 2 +- ...-Add-function-to-get-DSS-logic-clock-rate.patch | 51 ++++++++++ ...-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch | 68 ++++++++++++++ ...6-DSS2-DSI-improve-packet-len-calculation.patch | 58 ++++++++++++ ...2-Disable-video-planes-on-sync-lost-error.patch | 103 +++++++++++++++++++++ ...S2-check-for-ovl-paddr-only-when-enabling.patch | 40 ++++++++ recipes/linux/linux-omap_2.6.29.bb | 6 ++ 8 files changed, 328 insertions(+), 2 deletions(-) create mode 100644 recipes/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch create mode 100644 recipes/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch create mode 100644 recipes/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch create mode 100644 recipes/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch create mode 100644 recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 4e95fb15e4..a0ec5fdda4 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,6 +1,6 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" -MACHINE_KERNEL_PR = "r21" +MACHINE_KERNEL_PR = "r22" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch b/recipes/linux/linux-omap-2.6.29/dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch index 9282964713..26d21d8744 100644 --- a/recipes/linux/linux-omap-2.6.29/dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch +++ b/recipes/linux/linux-omap-2.6.29/dss2/0007-DSS2-Add-DSS2-support-for-SDP-Beagle-Overo-EVM.patch @@ -5668,7 +5668,7 @@ index 071f4b0..267bb6b 100644 + +static struct omap_dss_display_config overo_display_data_lcd = { + .type = OMAP_DISPLAY_TYPE_DPI, -+ .name = "lcd", ++ .name = "lcd43", + .panel_name = "samsung-lte430wq-f0c", + .u.dpi.data_lines = 24, + .panel_enable = overo_panel_enable_lcd, diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch b/recipes/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch new file mode 100644 index 0000000000..3b3fd77a9a --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch @@ -0,0 +1,51 @@ +From 832b763db235da8e62f7b6ab02bcb8ad6bcb7a01 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen +Date: Thu, 2 Apr 2009 16:48:41 +0300 +Subject: [PATCH] DSS2: Add function to get DSS logic clock rate + +--- + drivers/video/omap2/dss/dispc.c | 15 +++++++++++++++ + drivers/video/omap2/dss/dss.h | 1 + + 2 files changed, 16 insertions(+), 0 deletions(-) + +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index 2480a03..1bc23f7 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -1850,6 +1850,21 @@ unsigned long dispc_fclk_rate(void) + return r; + } + ++unsigned long dispc_lclk_rate(void) ++{ ++ int lcd; ++ unsigned long r; ++ u32 l; ++ ++ l = dispc_read_reg(DISPC_DIVISOR); ++ ++ lcd = FLD_GET(l, 23, 16); ++ ++ r = dispc_fclk_rate(); ++ ++ return r / lcd; ++} ++ + unsigned long dispc_pclk_rate(void) + { + int lcd, pcd; +diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h +index bac5ece..0be42b6 100644 +--- a/drivers/video/omap2/dss/dss.h ++++ b/drivers/video/omap2/dss/dss.h +@@ -294,6 +294,7 @@ bool dispc_trans_key_enabled(enum omap_channel ch); + + void dispc_set_lcd_timings(struct omap_video_timings *timings); + unsigned long dispc_fclk_rate(void); ++unsigned long dispc_lclk_rate(void); + unsigned long dispc_pclk_rate(void); + void dispc_set_pol_freq(struct omap_panel *panel); + void find_lck_pck_divs(bool is_tft, unsigned long req_pck, unsigned long fck, +-- +1.5.6.5 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch b/recipes/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch new file mode 100644 index 0000000000..d6b0cbbb41 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch @@ -0,0 +1,68 @@ +From a5c235a6f0094494ae1fc1a1ba4728e0d33dfd3b Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen +Date: Thu, 2 Apr 2009 16:49:27 +0300 +Subject: [PATCH] DSS2: DSI: calculate VP_CLK_RATIO properly + +--- + drivers/video/omap2/dss/dsi.c | 17 +++++++++++------ + 1 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c +index 4442931..aecb89d 100644 +--- a/drivers/video/omap2/dss/dsi.c ++++ b/drivers/video/omap2/dss/dsi.c +@@ -1104,7 +1104,10 @@ int dsi_pll_init(bool enable_hsclk, bool enable_hsdiv) + enable_clocks(1); + dsi_enable_pll_clock(1); + +- /* configure dispc fck and pixel clock to something sane */ ++ /* XXX this should be calculated depending on the screen size, ++ * required framerate and DSI speed. ++ * For now 48MHz is enough for 864x480@60 with 360Mbps/lane ++ * with two lanes */ + r = dispc_calc_clock_div(1, 48 * 1000 * 1000, &cinfo); + if (r) + goto err0; +@@ -1119,7 +1122,7 @@ int dsi_pll_init(bool enable_hsclk, bool enable_hsdiv) + if (r) + goto err0; + +- /* PLL does not come out of reset without this... */ ++ /* XXX PLL does not come out of reset without this... */ + dispc_pck_free_enable(1); + + if (wait_for_bit_change(DSI_PLL_STATUS, 0, 1) != 1) { +@@ -1128,8 +1131,8 @@ int dsi_pll_init(bool enable_hsclk, bool enable_hsdiv) + goto err1; + } + +- /* ... but if left on, we get problems when planes do not +- * fill the whole display. No idea about this XXX */ ++ /* XXX ... but if left on, we get problems when planes do not ++ * fill the whole display. No idea about this */ + dispc_pck_free_enable(0); + + if (enable_hsclk && enable_hsdiv) +@@ -2214,6 +2217,7 @@ static int dsi_proto_config(struct omap_display *display) + { + u32 r; + int buswidth = 0; ++ int div; + + dsi_config_tx_fifo(DSI_FIFO_SIZE_128, + DSI_FIFO_SIZE_0, +@@ -2254,8 +2258,9 @@ static int dsi_proto_config(struct omap_display *display) + r = FLD_MOD(r, 1, 1, 1); /* CS_RX_EN */ + r = FLD_MOD(r, 1, 2, 2); /* ECC_RX_EN */ + r = FLD_MOD(r, 1, 3, 3); /* TX_FIFO_ARBITRATION */ +- /* XXX what should the ratio be */ +- r = FLD_MOD(r, 0, 4, 4); /* VP_CLK_RATIO, VP_PCLK = VP_CLK/2 */ ++ ++ div = dispc_lclk_rate() / dispc_pclk_rate(); ++ r = FLD_MOD(r, div == 2 ? 0 : 1, 4, 4); /* VP_CLK_RATIO */ + r = FLD_MOD(r, buswidth, 7, 6); /* VP_DATA_BUS_WIDTH */ + r = FLD_MOD(r, 0, 8, 8); /* VP_CLK_POL */ + r = FLD_MOD(r, 2, 13, 12); /* LINE_BUFFER, 2 lines */ +-- +1.5.6.5 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch b/recipes/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch new file mode 100644 index 0000000000..bca449f169 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch @@ -0,0 +1,58 @@ +From 6b2c9d84c7accdfe1067fcdc8a00e50674aab4bb Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen +Date: Thu, 2 Apr 2009 17:42:26 +0300 +Subject: [PATCH] DSS2: DSI: improve packet len calculation + +--- + drivers/video/omap2/dss/dsi.c | 21 ++++++++++++++++----- + 1 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c +index aecb89d..66ac6ea 100644 +--- a/drivers/video/omap2/dss/dsi.c ++++ b/drivers/video/omap2/dss/dsi.c +@@ -2624,17 +2624,28 @@ static void dsi_update_screen_dispc(struct omap_display *display, + u16 x, u16 y, u16 w, u16 h) + { + int bytespp = 3; ++ int len; + int total_len; +- int line_packet_len; ++ int packet_payload; ++ int packet_len; + u32 l; + + if (dsi.update_mode == OMAP_DSS_UPDATE_MANUAL) + DSSDBG("dsi_update_screen_dispc(%d,%d %dx%d)\n", + x, y, w, h); + +- /* TODO: one packet could be longer, I think? Max is the line buffer */ +- line_packet_len = w * bytespp + 1; /* 1 byte for DCS cmd */ +- total_len = line_packet_len * h; ++ len = w * h * bytespp; ++ ++ /* XXX: one packet could be longer, I think? Line buffer is ++ * 1024 x 24bits, but we have to put DCS cmd there also. ++ * 1023 * 3 should work, but causes strange color effects. */ ++ packet_payload = min(w, (u16)1020) * bytespp; ++ ++ packet_len = packet_payload + 1; /* 1 byte for DCS cmd */ ++ total_len = (len / packet_payload) * packet_len; ++ ++ if (len % packet_payload) ++ total_len += (len % packet_payload) + 1; + + display->ctrl->setup_update(display, x, y, w, h); + +@@ -2646,7 +2657,7 @@ static void dsi_update_screen_dispc(struct omap_display *display, + l = FLD_VAL(total_len, 23, 0); /* TE_SIZE */ + dsi_write_reg(DSI_VC_TE(1), l); + +- dsi_vc_write_long_header(1, DSI_DT_DCS_LONG_WRITE, line_packet_len, 0); ++ dsi_vc_write_long_header(1, DSI_DT_DCS_LONG_WRITE, packet_len, 0); + + if (dsi.use_te) + l = FLD_MOD(l, 1, 30, 30); /* TE_EN */ +-- +1.5.6.5 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch b/recipes/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch new file mode 100644 index 0000000000..5b68b57da9 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch @@ -0,0 +1,103 @@ +From 85848d329ca3a2d6ee6841cdc11cc5951d187931 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ville=20Syrj=C3=A4l=C3=A4?= +Date: Fri, 3 Apr 2009 19:09:20 +0200 +Subject: [PATCH] DSS2: Disable video planes on sync lost error +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +When encountering the sync lost error disable the display and all video +planes on the affected manager. Afterwards re-enable the display. + +Signed-off-by: Ville Syrjälä +--- + drivers/video/omap2/dss/dispc.c | 50 +++++++++++++++++++++++++++++++++++++++ + 1 files changed, 50 insertions(+), 0 deletions(-) + +diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c +index 1bc23f7..41734f3 100644 +--- a/drivers/video/omap2/dss/dispc.c ++++ b/drivers/video/omap2/dss/dispc.c +@@ -2518,29 +2518,79 @@ static void dispc_error_worker(struct work_struct *work) + } + + if (errors & DISPC_IRQ_SYNC_LOST) { ++ struct omap_overlay_manager *manager = NULL; ++ bool enable = false; ++ + DSSERR("SYNC_LOST, disabling LCD\n"); ++ + for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) { + struct omap_overlay_manager *mgr; + mgr = omap_dss_get_overlay_manager(i); + + if (mgr->id == OMAP_DSS_CHANNEL_LCD) { ++ manager = mgr; ++ enable = mgr->display->state == ++ OMAP_DSS_DISPLAY_ACTIVE; + mgr->display->disable(mgr->display); + break; + } + } ++ ++ if (manager) { ++ for (i = 0; i < omap_dss_get_num_overlays(); ++i) { ++ struct omap_overlay *ovl; ++ ovl = omap_dss_get_overlay(i); ++ ++ if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC)) ++ continue; ++ ++ if (ovl->id != 0 && ovl->manager == manager) ++ dispc_enable_plane(ovl->id, 0); ++ } ++ ++ dispc_go(manager->id); ++ mdelay(50); ++ if (enable) ++ manager->display->enable(manager->display); ++ } + } + + if (errors & DISPC_IRQ_SYNC_LOST_DIGIT) { ++ struct omap_overlay_manager *manager = NULL; ++ bool enable = false; ++ + DSSERR("SYNC_LOST_DIGIT, disabling TV\n"); ++ + for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) { + struct omap_overlay_manager *mgr; + mgr = omap_dss_get_overlay_manager(i); + + if (mgr->id == OMAP_DSS_CHANNEL_DIGIT) { ++ manager = mgr; ++ enable = mgr->display->state == ++ OMAP_DSS_DISPLAY_ACTIVE; + mgr->display->disable(mgr->display); + break; + } + } ++ ++ if (manager) { ++ for (i = 0; i < omap_dss_get_num_overlays(); ++i) { ++ struct omap_overlay *ovl; ++ ovl = omap_dss_get_overlay(i); ++ ++ if (!(ovl->caps & OMAP_DSS_OVL_CAP_DISPC)) ++ continue; ++ ++ if (ovl->id != 0 && ovl->manager == manager) ++ dispc_enable_plane(ovl->id, 0); ++ } ++ ++ dispc_go(manager->id); ++ mdelay(50); ++ if (enable) ++ manager->display->enable(manager->display); ++ } + } + + if (errors & DISPC_IRQ_OCP_ERR) { +-- +1.5.6.5 + diff --git a/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch b/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch new file mode 100644 index 0000000000..088135c0a8 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch @@ -0,0 +1,40 @@ +From 63e15ba8d5f95b13d3abf359da718537d769f112 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen +Date: Tue, 7 Apr 2009 10:01:58 +0300 +Subject: [PATCH] DSS2: check for ovl paddr only when enabling + +It seems Xvideo uses SETUP_PLANE ioctl even when +the fb memory has not been allocated. Sigh. +--- + drivers/video/omap2/dss/overlay.c | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c +index 9209acf..c047206 100644 +--- a/drivers/video/omap2/dss/overlay.c ++++ b/drivers/video/omap2/dss/overlay.c +@@ -281,6 +281,11 @@ int dss_check_overlay(struct omap_overlay *ovl, struct omap_display *display) + + info = &ovl->info; + ++ if (info->paddr == 0) { ++ DSSDBG("check_overlay failed: paddr 0\n"); ++ return -EINVAL; ++ } ++ + display->get_resolution(display, &dw, &dh); + + DSSDBG("check_overlay %d: (%d,%d %dx%d -> %dx%d) disp (%dx%d)\n", +@@ -331,9 +336,6 @@ static int dss_ovl_set_overlay_info(struct omap_overlay *ovl, + int r; + struct omap_overlay_info old_info; + +- if (info->paddr == 0) +- return -EINVAL; +- + old_info = ovl->info; + ovl->info = *info; + +-- +1.5.6.5 + diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb index 23768690c6..bb7f2a416b 100644 --- a/recipes/linux/linux-omap_2.6.29.bb +++ b/recipes/linux/linux-omap_2.6.29.bb @@ -10,6 +10,7 @@ DEFAULT_PREFERENCE_overo = "1" SRCREV = "58cf2f1425abfd3a449f9fe985e48be2d2555022" +# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc PR_append = "+gitr${SRCREV}" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ @@ -33,6 +34,11 @@ SRC_URI_append = " \ file://dss2/0011-DSS2-Allocated-memory-for-Color-Look-up-table.patch;patch=1 \ file://dss2/0012-DSS2-Fix-DMA-rotation.patch;patch=1 \ file://dss2/0013-DSS2-Verify-that-overlay-paddr-0.patch;patch=1 \ + file://dss2/0014-DSS2-Add-function-to-get-DSS-logic-clock-rate.patch;patch=1 \ + file://dss2/0015-DSS2-DSI-calculate-VP_CLK_RATIO-properly.patch;patch=1 \ + file://dss2/0016-DSS2-DSI-improve-packet-len-calculation.patch;patch=1 \ + file://dss2/0017-DSS2-Disable-video-planes-on-sync-lost-error.patch;patch=1 \ + file://dss2/0018-DSS2-check-for-ovl-paddr-only-when-enabling.patch;patch=1 \ file://0001-board-ldp-add-regulator-info-to-get-the-microSD-slo.patch;patch=1 \ file://fix-unaligned-access.diff;patch=1 \ file://make-alignment-visible.diff;patch=1 \ -- cgit v1.2.3 From 6c5e86faf07d37d5e85c4249e3bb52555e9d839b Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Tue, 7 Apr 2009 09:56:17 +0200 Subject: libssh: add libssh-native --- recipes/libssh/libssh-native_0.2.bb | 4 ++++ recipes/libssh/libssh_0.11.bb | 35 ----------------------------------- recipes/libssh/libssh_0.2.bb | 13 +++++++------ 3 files changed, 11 insertions(+), 41 deletions(-) create mode 100644 recipes/libssh/libssh-native_0.2.bb delete mode 100644 recipes/libssh/libssh_0.11.bb diff --git a/recipes/libssh/libssh-native_0.2.bb b/recipes/libssh/libssh-native_0.2.bb new file mode 100644 index 0000000000..289161d329 --- /dev/null +++ b/recipes/libssh/libssh-native_0.2.bb @@ -0,0 +1,4 @@ +require libssh_${PV}.bb +inherit native +DEPENDS = "" + diff --git a/recipes/libssh/libssh_0.11.bb b/recipes/libssh/libssh_0.11.bb deleted file mode 100644 index 833567ebb0..0000000000 --- a/recipes/libssh/libssh_0.11.bb +++ /dev/null @@ -1,35 +0,0 @@ -SECTION = "libs" -DESCRIPTION = "The SSH library is a C library to authenticate in a \ -simple manner to one or more SSH servers. The goal of this project \ -is to provide a library much simpler to use than OpenSSHs one. It \ -includes SFTP support, and a sample SSH client is provided." -DEPENDS = "openssl" -LICENSE = "LGPL" - -DEFAULT_PREFERENCE="-1" - -SRC_URI = "http://www.0xbadc0de.be/libssh/libssh-${PV}.tgz" - -inherit autotools - -EXTRA_OECONF = "--cache-file=${S}/config.cache" - -do_stage () { - set -x - install -d ${STAGING_INCDIR}/libssh - for i in crypto.h libssh.h sftp.h ssh2.h; do - install -m 0644 ${S}/include/libssh/$i ${STAGING_INCDIR}/libssh/ - done - oe_libinstall -so -C libssh libssh ${STAGING_LIBDIR} -} - -do_install () { - oe_runmake "prefix=${D}${prefix}" \ - "exec_prefix=${D}${exec_prefix}" \ - "bindir=${D}${bindir}" \ - "incldir=${D}${includedir}" \ - "infodir=${D}${infodir}" \ - "mandir=${D}${mandir}/man1" \ - "libdir=${D}${libdir}" \ - install -} diff --git a/recipes/libssh/libssh_0.2.bb b/recipes/libssh/libssh_0.2.bb index b776094018..fb0c4c300c 100644 --- a/recipes/libssh/libssh_0.2.bb +++ b/recipes/libssh/libssh_0.2.bb @@ -1,24 +1,25 @@ -# Released under the MIT license (see COPYING.MIT for the terms) - DESCRIPTION = "The SSH library is a C library to authenticate in a \ simple manner to one or more SSH servers. The goal of this project \ is to provide a library much simpler to use than OpenSSHs one. It \ includes SFTP support, and a sample SSH client is provided." - HOMEPAGE = "http://0xbadc0de.be/wiki/libssh:libssh" LICENSE = "LGPL" SECTION = "libs" DEPENDS = "openssl" -SRC_URI = "http://www.0xbadc0de.be/libssh/libssh-${PV}.tgz \ - file://libssh_libdir_fix.patch;patch=1 \ - " + +SRC_URI = "\ + http://www.0xbadc0de.be/libssh/libssh-${PV}.tgz \ + file://libssh_libdir_fix.patch;patch=1 \ +" inherit autotools EXTRA_OECONF = "--cache-file=${S}/config.cache" + do_compile () { oenote make "$@" make "$@" || die "oe_runmake failed" } + do_stage () { install -d ${STAGING_INCDIR}/libssh for i in crypto.h libssh.h sftp.h ssh2.h; do -- cgit v1.2.3 From 8658973a5624fc5af7d4a35b50adccad7d3bb0cc Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Tue, 7 Apr 2009 10:31:59 +0200 Subject: socat: catch up SRC_URI --- conf/checksums.ini | 2 +- recipes/socat/files/ldflags.patch | 32 +++++++++++++++ recipes/socat/files/xioinitialize.patch | 52 +++++++++++++++++++++++++ recipes/socat/files/xioopen.patch | 11 ++++++ recipes/socat/socat-1.3.2.1/ldflags.patch | 32 --------------- recipes/socat/socat-1.3.2.1/xioinitialize.patch | 52 ------------------------- recipes/socat/socat-1.3.2.1/xioopen.patch | 11 ------ recipes/socat/socat_1.3.2.1.bb | 3 +- 8 files changed, 97 insertions(+), 98 deletions(-) create mode 100644 recipes/socat/files/ldflags.patch create mode 100644 recipes/socat/files/xioinitialize.patch create mode 100644 recipes/socat/files/xioopen.patch delete mode 100644 recipes/socat/socat-1.3.2.1/ldflags.patch delete mode 100644 recipes/socat/socat-1.3.2.1/xioinitialize.patch delete mode 100644 recipes/socat/socat-1.3.2.1/xioopen.patch diff --git a/conf/checksums.ini b/conf/checksums.ini index 6ded5a9a5d..0b05edff44 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -21162,7 +21162,7 @@ sha256=489bb2f9fb69922e9befc27ae1b8d19d31c83c586f55b7ecc503cb4f5e767da4 md5=6df271fd6a92d7641d7b060dedf7fec6 sha256=7eedc4ece1c82668c06222ef85457206139253e24a50e5b5d2401a41baee28c1 -[http://www.dest-unreach.org/socat/download/socat-1.3.2.1.tar.bz2] +[http://www.dest-unreach.org/socat/download/Archive/socat-1.3.2.1.tar.bz2] md5=860fe417ea5e9ca2d2b2225192b85b87 sha256=ecfbca297c26eff6cb04c2c45af1ee5c21d4a123a05f8b056a1c81ffcdfa1e3a diff --git a/recipes/socat/files/ldflags.patch b/recipes/socat/files/ldflags.patch new file mode 100644 index 0000000000..6ab4681383 --- /dev/null +++ b/recipes/socat/files/ldflags.patch @@ -0,0 +1,32 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- socat-1.3/Makefile.in~ldflags ++++ socat-1.3/Makefile.in +@@ -33,6 +33,7 @@ + + + CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS) ++LDFLAGS = @LDFLAGS@ + CLIBS = $(LIBS) + #CLIBS = $(LIBS) -lm -lefence + XIOSRCS = xioinitialize.c xiohelp.c xioparam.c xiodiag.c xioopen.c xioopts.c xiosigchld.c xioread.c xiowrite.c \ +@@ -78,13 +79,13 @@ + makedepend @SYSDEFS@ $(CFILES) + + socat: socat.o libxio.a +- $(CC) $(CFLAGS) -o $@ socat.o libxio.a $(CLIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ socat.o libxio.a $(CLIBS) + + procan: procan_main.o procan.o error.o sycls.o sysutils.o utils.o +- $(CC) $(CFLAGS) -o $@ procan_main.o procan.o error.o sycls.o sysutils.o utils.o $(CLIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ procan_main.o procan.o error.o sycls.o sysutils.o utils.o $(CLIBS) + + filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o +- $(CC) $(CFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o $(CLIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o $(CLIBS) + + libxio.a: $(XIOOBJS) $(UTLOBJS) + $(AR) r $@ $(XIOOBJS) $(UTLOBJS) diff --git a/recipes/socat/files/xioinitialize.patch b/recipes/socat/files/xioinitialize.patch new file mode 100644 index 0000000000..24e816cfd7 --- /dev/null +++ b/recipes/socat/files/xioinitialize.patch @@ -0,0 +1,52 @@ +diff -Naur socat-1.3/xioinitialize.c socat-1.3_patched/xioinitialize.c +--- socat-1.3/xioinitialize.c 2003-05-23 08:24:53.000000000 +0200 ++++ socat-1.3_patched/xioinitialize.c 2006-09-09 18:18:19.000000000 +0200 +@@ -19,48 +19,10 @@ + assert(O_WRONLY==1); + assert(O_RDWR==2); + +- /* some assertions about termios */ +-#if WITH_TERMIOS +-#ifdef CRDLY +- assert(3 << opt_crdly.arg3 == CRDLY); +-#endif +-#ifdef TABDLY +- assert(3 << opt_tabdly.arg3 == TABDLY); +-#endif +- assert(3 << opt_csize.arg3 == CSIZE); +- { +- union { +- struct termios termarg; +- tcflag_t flags[4]; +-#if HAVE_TERMIOS_ISPEED +- speed_t speeds[sizeof(struct termios)/sizeof(speed_t)]; +-#endif +- } tdata; +- tdata.termarg.c_iflag = 0x12345678; +- tdata.termarg.c_oflag = 0x23456789; +- tdata.termarg.c_cflag = 0x3456789a; +- tdata.termarg.c_lflag = 0x456789ab; +- assert(tdata.termarg.c_iflag == tdata.flags[0]); +- assert(tdata.termarg.c_oflag == tdata.flags[1]); +- assert(tdata.termarg.c_cflag == tdata.flags[2]); +- assert(tdata.termarg.c_lflag == tdata.flags[3]); +-#if HAVE_TERMIOS_ISPEED +- tdata.termarg.c_ispeed = 0x56789abc; +- tdata.termarg.c_ospeed = 0x6789abcd; +- assert(tdata.termarg.c_ispeed == tdata.speeds[ISPEED_OFFSET]); +- assert(tdata.termarg.c_ospeed == tdata.speeds[OSPEED_OFFSET]); +-#endif +- } +-#endif +- + /* these dependencies required in applyopts() for OFUNC_FCNTL */ + assert(F_GETFD == F_SETFD-1); + assert(F_GETFL == F_SETFL-1); + +- if (Atexit(xioexit) < 0) { +- Error("atexit(xioexit) failed"); +- return -1; +- } + xioinitialized = 1; + return 0; + } diff --git a/recipes/socat/files/xioopen.patch b/recipes/socat/files/xioopen.patch new file mode 100644 index 0000000000..456862653a --- /dev/null +++ b/recipes/socat/files/xioopen.patch @@ -0,0 +1,11 @@ +diff -Naur socat-1.3/xioopen.h socat-1.3_patched/xioopen.h +--- socat-1.3/xioopen.h 2003-02-15 15:26:22.000000000 +0100 ++++ socat-1.3_patched/xioopen.h 2006-09-05 10:49:15.000000000 +0200 +@@ -42,7 +42,6 @@ + extern const char *ddirection[]; + extern const char *filetypenames[]; + extern const struct addrname addressnames[]; +-extern const char *addressgroupnames[]; + extern const struct optname optionnames[]; + + extern int xioopen_makedual(xiofile_t *file); diff --git a/recipes/socat/socat-1.3.2.1/ldflags.patch b/recipes/socat/socat-1.3.2.1/ldflags.patch deleted file mode 100644 index 6ab4681383..0000000000 --- a/recipes/socat/socat-1.3.2.1/ldflags.patch +++ /dev/null @@ -1,32 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- socat-1.3/Makefile.in~ldflags -+++ socat-1.3/Makefile.in -@@ -33,6 +33,7 @@ - - - CFLAGS = @CFLAGS@ $(CCOPTS) $(DEFS) $(INCLS) -+LDFLAGS = @LDFLAGS@ - CLIBS = $(LIBS) - #CLIBS = $(LIBS) -lm -lefence - XIOSRCS = xioinitialize.c xiohelp.c xioparam.c xiodiag.c xioopen.c xioopts.c xiosigchld.c xioread.c xiowrite.c \ -@@ -78,13 +79,13 @@ - makedepend @SYSDEFS@ $(CFILES) - - socat: socat.o libxio.a -- $(CC) $(CFLAGS) -o $@ socat.o libxio.a $(CLIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ socat.o libxio.a $(CLIBS) - - procan: procan_main.o procan.o error.o sycls.o sysutils.o utils.o -- $(CC) $(CFLAGS) -o $@ procan_main.o procan.o error.o sycls.o sysutils.o utils.o $(CLIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ procan_main.o procan.o error.o sycls.o sysutils.o utils.o $(CLIBS) - - filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o -- $(CC) $(CFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o $(CLIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o $(CLIBS) - - libxio.a: $(XIOOBJS) $(UTLOBJS) - $(AR) r $@ $(XIOOBJS) $(UTLOBJS) diff --git a/recipes/socat/socat-1.3.2.1/xioinitialize.patch b/recipes/socat/socat-1.3.2.1/xioinitialize.patch deleted file mode 100644 index 24e816cfd7..0000000000 --- a/recipes/socat/socat-1.3.2.1/xioinitialize.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -Naur socat-1.3/xioinitialize.c socat-1.3_patched/xioinitialize.c ---- socat-1.3/xioinitialize.c 2003-05-23 08:24:53.000000000 +0200 -+++ socat-1.3_patched/xioinitialize.c 2006-09-09 18:18:19.000000000 +0200 -@@ -19,48 +19,10 @@ - assert(O_WRONLY==1); - assert(O_RDWR==2); - -- /* some assertions about termios */ --#if WITH_TERMIOS --#ifdef CRDLY -- assert(3 << opt_crdly.arg3 == CRDLY); --#endif --#ifdef TABDLY -- assert(3 << opt_tabdly.arg3 == TABDLY); --#endif -- assert(3 << opt_csize.arg3 == CSIZE); -- { -- union { -- struct termios termarg; -- tcflag_t flags[4]; --#if HAVE_TERMIOS_ISPEED -- speed_t speeds[sizeof(struct termios)/sizeof(speed_t)]; --#endif -- } tdata; -- tdata.termarg.c_iflag = 0x12345678; -- tdata.termarg.c_oflag = 0x23456789; -- tdata.termarg.c_cflag = 0x3456789a; -- tdata.termarg.c_lflag = 0x456789ab; -- assert(tdata.termarg.c_iflag == tdata.flags[0]); -- assert(tdata.termarg.c_oflag == tdata.flags[1]); -- assert(tdata.termarg.c_cflag == tdata.flags[2]); -- assert(tdata.termarg.c_lflag == tdata.flags[3]); --#if HAVE_TERMIOS_ISPEED -- tdata.termarg.c_ispeed = 0x56789abc; -- tdata.termarg.c_ospeed = 0x6789abcd; -- assert(tdata.termarg.c_ispeed == tdata.speeds[ISPEED_OFFSET]); -- assert(tdata.termarg.c_ospeed == tdata.speeds[OSPEED_OFFSET]); --#endif -- } --#endif -- - /* these dependencies required in applyopts() for OFUNC_FCNTL */ - assert(F_GETFD == F_SETFD-1); - assert(F_GETFL == F_SETFL-1); - -- if (Atexit(xioexit) < 0) { -- Error("atexit(xioexit) failed"); -- return -1; -- } - xioinitialized = 1; - return 0; - } diff --git a/recipes/socat/socat-1.3.2.1/xioopen.patch b/recipes/socat/socat-1.3.2.1/xioopen.patch deleted file mode 100644 index 456862653a..0000000000 --- a/recipes/socat/socat-1.3.2.1/xioopen.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur socat-1.3/xioopen.h socat-1.3_patched/xioopen.h ---- socat-1.3/xioopen.h 2003-02-15 15:26:22.000000000 +0100 -+++ socat-1.3_patched/xioopen.h 2006-09-05 10:49:15.000000000 +0200 -@@ -42,7 +42,6 @@ - extern const char *ddirection[]; - extern const char *filetypenames[]; - extern const struct addrname addressnames[]; --extern const char *addressgroupnames[]; - extern const struct optname optionnames[]; - - extern int xioopen_makedual(xiofile_t *file); diff --git a/recipes/socat/socat_1.3.2.1.bb b/recipes/socat/socat_1.3.2.1.bb index 612987858b..c30fb7a0ec 100644 --- a/recipes/socat/socat_1.3.2.1.bb +++ b/recipes/socat/socat_1.3.2.1.bb @@ -5,11 +5,10 @@ transfer between two independent data channels." LICENSE = "GPL" PR = "r1" -SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ +SRC_URI = "http://www.dest-unreach.org/socat/download/Archive/socat-${PV}.tar.bz2 \ file://xioopen.patch;patch=1 \ file://ldflags.patch;patch=1 \ file://xioinitialize.patch;patch=1" - S = "${WORKDIR}/socat-1.3" inherit autotools -- cgit v1.2.3 From b4c72a2368bd3939ca79bfda13bac01d8ea5fbcb Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Tue, 7 Apr 2009 10:41:22 +0200 Subject: gabriel[-native]: new recipe; proxy for remote dbus access --- conf/distro/include/sane-srcrevs.inc | 2 ++ recipes/gabriel/gabriel-native_svn.bb | 13 +++++++++++++ recipes/gabriel/gabriel_svn.bb | 14 ++++++++++++++ 3 files changed, 29 insertions(+) create mode 100644 recipes/gabriel/gabriel-native_svn.bb create mode 100644 recipes/gabriel/gabriel_svn.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 88b3487451..eb42b334ed 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -64,6 +64,8 @@ SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4" SRCREV_pn-fso-monitord ?= "0f64979a11d6263c7b7ed0e945a0889744f295f1" SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff" SRCREV_pn-fstests ?= "204" +SRCREV_pn-gabriel ?= "38" +SRCREV_pn-gabriel-native ?= "38" GCCREV ?= "145550" SRCREV_pn-gcc ?= ${GCCREV} SRCREV_pn-gcc-cross ?= ${GCCREV} diff --git a/recipes/gabriel/gabriel-native_svn.bb b/recipes/gabriel/gabriel-native_svn.bb new file mode 100644 index 0000000000..a98abb028e --- /dev/null +++ b/recipes/gabriel/gabriel-native_svn.bb @@ -0,0 +1,13 @@ +require gabriel_svn.bb +inherit native +DEPENDS = "libssh-native glib-2.0-native dbus-native dbus-glib-native" + +do_deploy() { + install -d ${DEPLOY_DIR_TOOLS} + install -m 0755 src/gabriel ${DEPLOY_DIR_TOOLS}/gabriel-${PV} + rm -f ${DEPLOY_DIR_TOOLS}/gabriel + ln -sf ./gabriel-${PV} ${DEPLOY_DIR_TOOLS}/gabriel +} + + +addtask deploy before do_package after do_install diff --git a/recipes/gabriel/gabriel_svn.bb b/recipes/gabriel/gabriel_svn.bb new file mode 100644 index 0000000000..1449311f90 --- /dev/null +++ b/recipes/gabriel/gabriel_svn.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Gabriel is a small utility to enable D-Bus clients to connect to a D-Bus \ +daemon running on a remote machine, through SSH. In simple words, gabriel is a proxy for \ +a dbus daemon running on a remote machine." +LICENSE = "GPL" +DEPENDS = "libssh glib-2.0 dbus glib-dbus" +SECTION = "console/network" +PV = "0.0.0+svnr${SRCREV}" + +SRC_URI = "svn://gabriel.svn.sourceforge.net/svnroot/gabriel;module=gabriel;proto=https" +S = "${WORKDIR}/gabriel" + +inherit autotools_stage + +RDEPENDS = "socat" -- cgit v1.2.3 From 6fb6092676258bfe43456d18f2462d8acc95c546 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Tue, 7 Apr 2009 10:43:50 +0200 Subject: task-cli-tools: add socat --- recipes/tasks/task-cli-tools.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/tasks/task-cli-tools.bb b/recipes/tasks/task-cli-tools.bb index 889cd77384..e05fa398b7 100644 --- a/recipes/tasks/task-cli-tools.bb +++ b/recipes/tasks/task-cli-tools.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A set of command line tools, python tools-based tools, debug tool SECTION = "console" LICENSE = "MIT" PV = "1.0" -PR = "r6" +PR = "r7" inherit task @@ -18,6 +18,7 @@ RDEPENDS_${PN} = "\ nfs-utils-client \ powertop \ screen \ + socat \ sysstat \ tcpdump \ " -- cgit v1.2.3 From 1157bf509ea5ed00e1d4e3b048dc1489b67c227a Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Tue, 7 Apr 2009 11:20:01 +0200 Subject: vala-native: bump to 0.6.0 and make git version the default; we need a bootstrap version now though. --- conf/distro/include/sane-srcrevs.inc | 2 +- recipes/vala/vala-bootstrap-native_0.6.0.bb | 4 ++++ recipes/vala/vala-native_0.5.7.bb | 10 ---------- recipes/vala/vala-native_git.bb | 18 +++++++----------- recipes/vala/vala_0.5.7.bb | 2 -- recipes/vala/vala_0.6.0.bb | 2 ++ 6 files changed, 14 insertions(+), 24 deletions(-) create mode 100644 recipes/vala/vala-bootstrap-native_0.6.0.bb delete mode 100644 recipes/vala/vala-native_0.5.7.bb delete mode 100644 recipes/vala/vala_0.5.7.bb create mode 100644 recipes/vala/vala_0.6.0.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index eb42b334ed..cf66f0028b 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -243,7 +243,7 @@ SRCREV_pn-uclibc-initial ?= "25712" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b" -SRCREV_pn-vala-native ?= "54a924505856a839ad02dc95baa482e994e94a57" +SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd" SRCREV_pn-webkit-gtk ?= "42127" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" diff --git a/recipes/vala/vala-bootstrap-native_0.6.0.bb b/recipes/vala/vala-bootstrap-native_0.6.0.bb new file mode 100644 index 0000000000..bc99ebf0a6 --- /dev/null +++ b/recipes/vala/vala-bootstrap-native_0.6.0.bb @@ -0,0 +1,4 @@ +require vala_${PV}.bb + +inherit native +DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala-native_0.5.7.bb b/recipes/vala/vala-native_0.5.7.bb deleted file mode 100644 index 735c93f3f6..0000000000 --- a/recipes/vala/vala-native_0.5.7.bb +++ /dev/null @@ -1,10 +0,0 @@ -require vala_${PV}.bb - -inherit native -DEPENDS = "glib-2.0-native" - -# work around timestamp problem in tarball -do_compile_prepend() { - touch gobject/gobject.vala.stamp -} - diff --git a/recipes/vala/vala-native_git.bb b/recipes/vala/vala-native_git.bb index 66abd5e292..545849b9d3 100644 --- a/recipes/vala/vala-native_git.bb +++ b/recipes/vala/vala-native_git.bb @@ -1,17 +1,13 @@ -require vala_0.5.7.bb -# vala from git always needs the latest released version to compile itself -DEPENDS = "vala-native" - -SRCREV = "e7462e3ed00b75c16c11c27f6d8a640c7f35fafc" -PV := "0.5.7+0.5.8pre02-gitr${SRCREV}" +require vala.inc +inherit native -DEFAULT_PREFERENCE = "-1" +DEPENDS = "glib-2.0-native" +# vala from git always needs the latest released version to compile itself +DEPENDS += "vala-bootstrap-native" +PV = "0.6.0-fso1-gitr${SRCREV}" SRC_URI = "\ - ${FREESMARTPHONE_GIT}/vala;protocol=git;branch=master \ + ${FREESMARTPHONE_GIT}/vala-lang;protocol=git;branch=mickey/0.6/posix \ file://static-dbus-methods.patch;patch=1 \ " S = "${WORKDIR}/git" - -inherit native -DEPENDS = "glib-2.0-native" diff --git a/recipes/vala/vala_0.5.7.bb b/recipes/vala/vala_0.5.7.bb deleted file mode 100644 index 7b2b4e293c..0000000000 --- a/recipes/vala/vala_0.5.7.bb +++ /dev/null @@ -1,2 +0,0 @@ -require vala.inc -PR = "r2" diff --git a/recipes/vala/vala_0.6.0.bb b/recipes/vala/vala_0.6.0.bb new file mode 100644 index 0000000000..7b2b4e293c --- /dev/null +++ b/recipes/vala/vala_0.6.0.bb @@ -0,0 +1,2 @@ +require vala.inc +PR = "r2" -- cgit v1.2.3 From f2b04954af1a03f682ec6d46e550dcbfebb12aa6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 7 Apr 2009 11:42:58 +0200 Subject: systray: as the name implies, a systray module for e17 --- recipes/e17/systray_svn.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 recipes/e17/systray_svn.bb diff --git a/recipes/e17/systray_svn.bb b/recipes/e17/systray_svn.bb new file mode 100644 index 0000000000..3c0a8c7e71 --- /dev/null +++ b/recipes/e17/systray_svn.bb @@ -0,0 +1,8 @@ +LICENSE = "MIT" +PV = "0.0.1+svnr${SRCREV}" + +require e-module.inc + + + + -- cgit v1.2.3 From a28b6666534215705d87da221860f6e199fffa44 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 7 Apr 2009 11:44:16 +0200 Subject: angstrom feed builder: add systray --- contrib/angstrom/build-feeds.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index e3942534dc..8b4cb2ea1e 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -278,6 +278,7 @@ do subversion \ sugar \ sylpheed \ + systray \ task-gpe-pim \ task-openmoko-feed \ task-openmoko-games \ -- cgit v1.2.3 From e7f45a4a42650380405c2eefca76d72068d8e2b0 Mon Sep 17 00:00:00 2001 From: Raffaele Recalcati Date: Tue, 7 Apr 2009 12:23:07 +0200 Subject: linux-omap: add modeline for 720p60 to .28 and .29 --- conf/machine/include/omap3.inc | 3 ++- recipes/linux/linux-omap-2.6.28/modedb-hd720.patch | 13 +++++++++++++ recipes/linux/linux-omap-2.6.29/modedb-hd720.patch | 13 +++++++++++++ recipes/linux/linux-omap_2.6.28.bb | 1 + recipes/linux/linux-omap_2.6.29.bb | 1 + 5 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 recipes/linux/linux-omap-2.6.28/modedb-hd720.patch create mode 100644 recipes/linux/linux-omap-2.6.29/modedb-hd720.patch diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index a0ec5fdda4..8d1eb899de 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,6 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" -MACHINE_KERNEL_PR = "r22" +# Increase this everytime you change something in the kernel +MACHINE_KERNEL_PR = "r23" KERNEL_IMAGETYPE = "uImage" diff --git a/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch b/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch new file mode 100644 index 0000000000..d778423d1b --- /dev/null +++ b/recipes/linux/linux-omap-2.6.28/modedb-hd720.patch @@ -0,0 +1,13 @@ +--- orig/drivers/video/modedb.c.orig 2009-04-07 11:40:10.000000000 +0200 ++++ git/drivers/video/modedb.c 2009-04-07 10:35:29.000000000 +0200 +@@ -44,6 +44,10 @@ + NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2, + 0, FB_VMODE_NONINTERLACED + }, { ++ /* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-D Format 4 */ ++ "hd720", 60, 1280, 720, 13468, 220, 110, 19, 6, 40, 5, ++ 0, FB_VMODE_NONINTERLACED ++ }, { + /* 800x600 @ 56 Hz, 35.15 kHz hsync */ + NULL, 56, 800, 600, 27777, 128, 24, 22, 1, 72, 2, + 0, FB_VMODE_NONINTERLACED diff --git a/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch b/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch new file mode 100644 index 0000000000..d778423d1b --- /dev/null +++ b/recipes/linux/linux-omap-2.6.29/modedb-hd720.patch @@ -0,0 +1,13 @@ +--- orig/drivers/video/modedb.c.orig 2009-04-07 11:40:10.000000000 +0200 ++++ git/drivers/video/modedb.c 2009-04-07 10:35:29.000000000 +0200 +@@ -44,6 +44,10 @@ + NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2, + 0, FB_VMODE_NONINTERLACED + }, { ++ /* 1280x720 @ 60 Hz, 45 kHz hsync, CEA 681-D Format 4 */ ++ "hd720", 60, 1280, 720, 13468, 220, 110, 19, 6, 40, 5, ++ 0, FB_VMODE_NONINTERLACED ++ }, { + /* 800x600 @ 56 Hz, 35.15 kHz hsync */ + NULL, 56, 800, 600, 27777, 128, 24, 22, 1, 72, 2, + 0, FB_VMODE_NONINTERLACED diff --git a/recipes/linux/linux-omap_2.6.28.bb b/recipes/linux/linux-omap_2.6.28.bb index 92de11eb9b..fe586e0f12 100644 --- a/recipes/linux/linux-omap_2.6.28.bb +++ b/recipes/linux/linux-omap_2.6.28.bb @@ -53,6 +53,7 @@ SRC_URI_append = " \ file://ioremap-fix.patch;patch=1 \ file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \ file://mmctiming.patch;patch=1 \ + file://modedb-hd720.patch;patch=1 \ " diff --git a/recipes/linux/linux-omap_2.6.29.bb b/recipes/linux/linux-omap_2.6.29.bb index bb7f2a416b..0948e46060 100644 --- a/recipes/linux/linux-omap_2.6.29.bb +++ b/recipes/linux/linux-omap_2.6.29.bb @@ -101,6 +101,7 @@ SRC_URI_append = " \ # file://isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch;patch=1 \ # file://isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch;patch=1 \ file://0124-leds-gpio-broken-with-current-git.patch;patch=1 \ + file://modedb-hd720.patch;patch=1 \ " -- cgit v1.2.3 From 43fbe6ad1dc0db8f91d2ff503cc7c9e4f15ade04 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 7 Apr 2009 13:25:46 +0200 Subject: initramfs-kexecboot-image: fix parse warning --- recipes/kexecboot/initramfs-kexecboot-image.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/kexecboot/initramfs-kexecboot-image.bb b/recipes/kexecboot/initramfs-kexecboot-image.bb index 385bd258ea..0284f691a7 100644 --- a/recipes/kexecboot/initramfs-kexecboot-image.bb +++ b/recipes/kexecboot/initramfs-kexecboot-image.bb @@ -10,6 +10,8 @@ IMAGE_DEVICE_TABLES_h2200 = "device_table-oldmmc.txt" export IMAGE_BASENAME = "initramfs-kexecboot-image" +KEXECBOOT_IMAGEDEPENDS ?= "" + # avoid to depend from kexecboot EXTRA_IMAGEDEPENDS = "${KEXECBOOT_IMAGEDEPENDS}" IMAGE_INSTALL = "kexecboot" -- cgit v1.2.3 From e1d669119346c6fe36373873ab364716b9a941af Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 7 Apr 2009 13:52:07 +0200 Subject: e17: bump SRCREV to 39886 * runtime tested on beagleboard, feels a bit faster as before * also gets us the blingy new wallpaper2 dialog --- conf/distro/include/sane-srcrevs.inc | 2 +- recipes/e17/e-wm_svn.bb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index cf66f0028b..1f7a5fdf5b 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -256,7 +256,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCREV ?= "39786" +EFL_SRCREV ?= "39886" SRCREV_pn-edb-native ?= "${EFL_SRCREV}" SRCREV_pn-edb ?= "${EFL_SRCREV}" SRCREV_pn-eina-native ?= "${EFL_SRCREV}" diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index e82cf6904e..c9694fce80 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17" DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" PV = "0.16.999.050+svnr${SRCREV}" -PR = "r3" +PR = "r4" inherit e update-alternatives @@ -108,6 +108,7 @@ FILES_${PN} = "\ ${bindir}/* \ ${libdir}/enlightenment/modules/*/*.* \ ${libdir}/enlightenment/modules/*/*/* \ + ${libdir}/enlightenment/preload/e_precache.so \ ${datadir}/locale \ ${datadir}/enlightenment/data/icons \ ${datadir}/enlightenment/data/input_methods \ -- cgit v1.2.3