From 0df4dcf1497d8f33d978aa75d68a9f5a4082dabf Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <ml@vdm-design.de>
Date: Mon, 14 Dec 2009 09:44:19 +0000
Subject: aceofpenguins-launcher: update recipe from 0.3 to 0.4

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
---
 recipes/aceofpenguins/aceofpenguins-launcher_0.3.bb | 21 ---------------------
 recipes/aceofpenguins/aceofpenguins-launcher_0.4.bb | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 recipes/aceofpenguins/aceofpenguins-launcher_0.3.bb
 create mode 100644 recipes/aceofpenguins/aceofpenguins-launcher_0.4.bb

(limited to 'recipes')

diff --git a/recipes/aceofpenguins/aceofpenguins-launcher_0.3.bb b/recipes/aceofpenguins/aceofpenguins-launcher_0.3.bb
deleted file mode 100644
index 2e96d81475..0000000000
--- a/recipes/aceofpenguins/aceofpenguins-launcher_0.3.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "EFL launcher for ace-of-penguins"
-HOMEPAGE = "http://shr-project.org"
-SHR_RELEASE ?= "shr"
-LICENSE ?= "GPL"
-DEPENDS = "python-native python-elementary"
-RDEPENDS = "aceofpenguins"
-SECTION = "x11/application"
-
-PACKAGE_ARCH = "all"
-
-PR = "r1"
-
-inherit setuptools
-
-SRC_URI = "http://downloads.vdm-design.de/aceofpenguins-launcher-${PV}.tar.gz"
-
-S = "${WORKDIR}/aceofpenguins-launcher"
-
-FILES_${PN} += "${prefix}/share/pixmaps"
-FILES_${PN} += "${prefix}/share/applications"
-
diff --git a/recipes/aceofpenguins/aceofpenguins-launcher_0.4.bb b/recipes/aceofpenguins/aceofpenguins-launcher_0.4.bb
new file mode 100644
index 0000000000..265b8c6651
--- /dev/null
+++ b/recipes/aceofpenguins/aceofpenguins-launcher_0.4.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "EFL launcher for ace-of-penguins"
+HOMEPAGE = "http://shr-project.org"
+SHR_RELEASE ?= "shr"
+LICENSE ?= "GPL"
+DEPENDS = "python-native python-elementary"
+RDEPENDS = "aceofpenguins"
+SECTION = "x11/application"
+
+PACKAGE_ARCH = "all"
+
+PR = "r0"
+
+inherit setuptools
+
+SRC_URI = "http://downloads.vdm-design.de/aceofpenguins-launcher-${PV}.tar.gz"
+
+S = "${WORKDIR}/aceofpenguins-launcher"
+
+FILES_${PN} += "${prefix}/share/pixmaps"
+FILES_${PN} += "${prefix}/share/applications"
+
-- 
cgit v1.2.3


From fb613b2cfccd5a0e4ae7779770dbe722e63c1735 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 13 Dec 2009 17:37:16 +0100
Subject: wolfenqt: add qt3d demo

---
 recipes/qt4/wolfenqt-e_git.bb |  5 +++++
 recipes/qt4/wolfenqt.inc      | 19 +++++++++++++++++++
 recipes/qt4/wolfenqt_git.bb   |  5 +++++
 3 files changed, 29 insertions(+)
 create mode 100644 recipes/qt4/wolfenqt-e_git.bb
 create mode 100644 recipes/qt4/wolfenqt.inc
 create mode 100644 recipes/qt4/wolfenqt_git.bb

(limited to 'recipes')

diff --git a/recipes/qt4/wolfenqt-e_git.bb b/recipes/qt4/wolfenqt-e_git.bb
new file mode 100644
index 0000000000..661838842a
--- /dev/null
+++ b/recipes/qt4/wolfenqt-e_git.bb
@@ -0,0 +1,5 @@
+WOLFVARIANT = "e"
+require wolfenqt.inc
+
+
+
diff --git a/recipes/qt4/wolfenqt.inc b/recipes/qt4/wolfenqt.inc
new file mode 100644
index 0000000000..e1e08cf6ab
--- /dev/null
+++ b/recipes/qt4/wolfenqt.inc
@@ -0,0 +1,19 @@
+
+PE = "1"
+PV = "0.0"
+PR_append = "+gitr${SRCREV}"
+
+inherit qt4${WOLFVARIANT}
+
+SRCREV = "f43dfa2bfa1f72abd3500dfc94248b17c5f9ae05"
+SRC_URI = "git://gitorious.org/qt-labs/wolfenqt.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 qt3d  ${D}${bindir}/wolfenqt-${WOLFVARIANT}
+}
+
+
+
diff --git a/recipes/qt4/wolfenqt_git.bb b/recipes/qt4/wolfenqt_git.bb
new file mode 100644
index 0000000000..2d762f3dc2
--- /dev/null
+++ b/recipes/qt4/wolfenqt_git.bb
@@ -0,0 +1,5 @@
+WOLFVARIANT = "x11"
+require wolfenqt.inc
+
+
+
-- 
cgit v1.2.3


From 98cb9dac553b9976869cad4b058545b59efa245e Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 13 Dec 2009 17:37:22 +0100
Subject: qt 4.6.0: fix packaging, staging and x11 build

---
 recipes/qt4/qt-4.6.0.inc               |  2 --
 recipes/qt4/qt4-embedded-gles_4.6.0.bb |  2 +-
 recipes/qt4/qt4-embedded_4.6.0.bb      |  1 +
 recipes/qt4/qt4-x11-free-gles_4.6.0.bb |  2 +-
 recipes/qt4/qt4-x11-free_4.6.0.bb      |  1 +
 recipes/qt4/qt4.inc                    | 56 ++--------------------------------
 6 files changed, 6 insertions(+), 58 deletions(-)

(limited to 'recipes')

diff --git a/recipes/qt4/qt-4.6.0.inc b/recipes/qt4/qt-4.6.0.inc
index 97ad6cdd74..b29b708d74 100644
--- a/recipes/qt4/qt-4.6.0.inc
+++ b/recipes/qt4/qt-4.6.0.inc
@@ -1,7 +1,5 @@
 DEFAULT_PREFERENCE = "-1"
 
-require qt4-embedded.inc
-
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
            file://0001-cross-compile.patch;patch=1 \
            file://0002-fix-resinit-declaration.patch;patch=1 \
diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
index f988f9828b..f819c66212 100644
--- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb
+++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb
@@ -1,4 +1,4 @@
-
+require qt4-embedded.inc
 PR = "${INC_PR}.0"
 
 QT_GLFLAGS = "-opengl es2 -openvg"
diff --git a/recipes/qt4/qt4-embedded_4.6.0.bb b/recipes/qt4/qt4-embedded_4.6.0.bb
index 3bde65014d..58fda71ad1 100644
--- a/recipes/qt4/qt4-embedded_4.6.0.bb
+++ b/recipes/qt4/qt4-embedded_4.6.0.bb
@@ -1,3 +1,4 @@
+require qt4-embedded.inc
 
 PR = "${INC_PR}.0"
 
diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
index 36b6ec5a25..fcb935b8c7 100644
--- a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
+++ b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb
@@ -1,4 +1,4 @@
-
+require qt4-x11-free.inc
 PR = "${INC_PR}.0"
 
 QT_GLFLAGS = "-opengl es2 -openvg"
diff --git a/recipes/qt4/qt4-x11-free_4.6.0.bb b/recipes/qt4/qt4-x11-free_4.6.0.bb
index 1b5b4524c8..80a25303bb 100644
--- a/recipes/qt4/qt4-x11-free_4.6.0.bb
+++ b/recipes/qt4/qt4-x11-free_4.6.0.bb
@@ -1,3 +1,4 @@
+require qt4-x11-free.inc
 PR = "${INC_PR}.0"
 
 require qt-4.6.0.inc
diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc
index 7d600a825c..0671a6c570 100644
--- a/recipes/qt4/qt4.inc
+++ b/recipes/qt4/qt4.inc
@@ -71,6 +71,7 @@ python __anonymous () {
 }
 
 OTHER_PACKAGES = "\
+             ${QT_BASE_NAME}-tools \
              ${QT_BASE_NAME}-assistant \
              ${QT_BASE_NAME}-common \
              ${QT_BASE_NAME}-dbus \
@@ -95,6 +96,7 @@ RRECOMMENDS_${PN} = "${LIB_PACKAGES} ${OTHER_PACKAGES}"
 RRECOMMENDS_${PN}-dev = "${DEV_PACKAGES}"
 RRECOMMENDS_${PN}-dbg = "${DBG_PACKAGES}"
 
+FILES_${QT_BASE_NAME}-tools                = "${bindir}/uic* ${bindir}/moc ${bindir}/rcc ${bindir}/qttracereplay"
 FILES_${QT_BASE_NAME}-assistant            = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"
 FILES_${QT_BASE_NAME}-assistant-dbg        = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator"
 FILES_${QT_BASE_NAME}-common               = "${bindir}/qtconfig"
@@ -257,58 +259,4 @@ do_install() {
     touch ${D}/${libdir}/fonts/fontdir
 }
 
-STAGE_TEMP = "${WORKDIR}/temp-staging"
-do_stage() {
-    rm -rf ${STAGE_TEMP}
-    mkdir -p ${STAGE_TEMP}
-    oe_runmake install INSTALL_ROOT=${STAGE_TEMP}
-
-    # fix pkgconfig, libtool and prl files
-    sed -i -e s#-L${S}/lib##g \
-           -e s#-L${STAGING_LIBDIR}##g \
-           -e s#-L${libdir}##g \
-           -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \
-           ${STAGE_TEMP}${libdir}/*.la ${STAGE_TEMP}${libdir}/*.prl ${STAGE_TEMP}${libdir}/pkgconfig/*.pc
-
-    # fix pkgconfig files
-    sed -i -e s#"moc_location=.*$"## \
-           -e s#"uic_location=.*$"## \
-           ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc
-    for name in ${QT_LIB_NAMES}; do
-           sed -i -e "/Requires/s#${name}#${name}${QT_LIBINFIX}#"g ${D}${libdir}/pkgconfig/*.pc
-    done
-
-    # fix libtool files
-    sed -i -e s#installed=yes#installed=no#g ${STAGE_TEMP}/${libdir}/*.la
-
-    # install headers
-    install -d ${STAGING_INCDIR}
-    cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/
-
-    # install libraries
-    install -d ${STAGING_LIBDIR}
-    for i in ${STAGE_TEMP}/${libdir}/*.prl; do
-        cp -pPRf $i ${STAGING_LIBDIR}
-        cp -pPRf ${STAGE_TEMP}/${libdir}/$(basename $i .prl).la ${STAGING_LIBDIR} || true
-        oe_libinstall -C ${STAGE_TEMP}/${libdir} -a $(basename $i .prl) ${STAGING_LIBDIR} || true
-        oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .prl) ${STAGING_LIBDIR} || true
-    done
-
-    # install pkgconfig files
-    install -d ${STAGING_LIBDIR}/pkgconfig
-    cp -pPRf ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/
-
-    # install mkspecs
-    install -d ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs
-    cp -pPRf ${STAGE_TEMP}/${datadir}/${QT_DIR_NAME}/mkspecs/* ${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs/
-
-    rm -rf ${STAGE_TEMP}
-
-    # FIXME: install symlinks to tools?
-    #install -d ${STAGING_DATADIR}/${QT_DIR_NAME}/bin
-    #ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 ${STAGING_DATADIR}/${QT_DIR_NAME}/bin/qmake
-    #for qttool in moc uic uic3 rcc lrelease lupdate; do
-    #     ln -sf ${STAGING_BINDIR_NATIVE}/${qttool}4 ${STAGING_DATADIR}/${QT_DIR_NAME}/bin/${qttool}
-    #done
-}
 
-- 
cgit v1.2.3


From 0c6638d2f55676721a173e90eb9c0c3f0e3fef75 Mon Sep 17 00:00:00 2001
From: Frederik Sdun <frederik.sdun@googlemail.com>
Date: Sun, 6 Dec 2009 09:34:37 +0000
Subject: gabriel: fix depency

Signed-off-by: Frederik 'playya' Sdun <Frederik.Sdun@googlemail.com>
Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
---
 recipes/gabriel/gabriel_svn.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'recipes')

diff --git a/recipes/gabriel/gabriel_svn.bb b/recipes/gabriel/gabriel_svn.bb
index 94fdfe99e7..f525885fb0 100644
--- a/recipes/gabriel/gabriel_svn.bb
+++ b/recipes/gabriel/gabriel_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Gabriel is a small utility to enable D-Bus clients to connect to
 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"
+DEPENDS = "libssh glib-2.0 dbus dbus-glib"
 SECTION = "console/network"
 PV = "0.0.0+svnr${SRCPV}"
 
-- 
cgit v1.2.3


From 6a540928ca985f9bbdaba8d08a1a61d6245aa0ff Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Mon, 14 Dec 2009 14:23:56 +0100
Subject: libgles-omap3: add compatible machine

---
 recipes/powervr-drivers/libgles-omap3.inc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'recipes')

diff --git a/recipes/powervr-drivers/libgles-omap3.inc b/recipes/powervr-drivers/libgles-omap3.inc
index ddec910efe..360cb7790e 100644
--- a/recipes/powervr-drivers/libgles-omap3.inc
+++ b/recipes/powervr-drivers/libgles-omap3.inc
@@ -1,6 +1,7 @@
 DESCRIPTION = "libGLES for the omap3"
 LICENCE = "proprietary-binary"
 
+COMPATIBLE_MACHINE = "(am3517-evm|beagleboard|cm-t35|igep0020|omap3-pandora|omap3-touchbook|omap3evm|omapzoom|omapzoom2|overo|palmpre)"
 RDEPENDS_${PN} += "devmem2"
 
 #HACK! These are binaries, so we can't guarantee that LDFLAGS match :(
-- 
cgit v1.2.3


From 906cc165bed44fadbcfc7fecde1405869c6f3f21 Mon Sep 17 00:00:00 2001
From: Klaus Kurzmann <mok@fluxnetz.de>
Date: Mon, 14 Dec 2009 15:33:19 +0100
Subject: initscripts-shr: add initscript to set usb gadget mode for palmpre

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
---
 recipes/shr/initscripts-shr/palmpre/usb-gadget.sh | 10 ++++++++++
 recipes/shr/initscripts-shr_0.0.1.bb              |  8 +++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 recipes/shr/initscripts-shr/palmpre/usb-gadget.sh

(limited to 'recipes')

diff --git a/recipes/shr/initscripts-shr/palmpre/usb-gadget.sh b/recipes/shr/initscripts-shr/palmpre/usb-gadget.sh
new file mode 100644
index 0000000000..d7554954d6
--- /dev/null
+++ b/recipes/shr/initscripts-shr/palmpre/usb-gadget.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# usb gadget configuration:
+# there already different configurations on the palm pre defined,
+# we choose nr 5 cause it provides the usbnet, novacom
+# and storage gadget
+if [ -e /sys/class/usb_gadget/config_num ]; then
+	echo 5 > /sys/class/usb_gadget/config_num
+fi
+
diff --git a/recipes/shr/initscripts-shr_0.0.1.bb b/recipes/shr/initscripts-shr_0.0.1.bb
index f1be1c2fc7..89df6ce375 100644
--- a/recipes/shr/initscripts-shr_0.0.1.bb
+++ b/recipes/shr/initscripts-shr_0.0.1.bb
@@ -5,7 +5,7 @@ DEPENDS = ""
 RDEPENDS = ""
 LICENSE = "GPL"
 PV = "0.0.1"
-PR = "r13"
+PR = "r14"
 
 RPROVIDES_${PN} = "initscripts"
 RCONFLICTS_${PN} = "initscripts"
@@ -33,6 +33,7 @@ SRC_URI = "file://alignment.sh \
 	   file://umountfs \
 	   file://umountnfs.sh \
 	   "
+SRC_URI_append_palmpre = " file://usb-gadget.sh"
 
 inherit base
 
@@ -76,6 +77,11 @@ do_install () {
 	install -m 0755	${WORKDIR}/umountfs		${D}${sysconfdir}/init.d
 	install -m 0755	${WORKDIR}/umountnfs.sh		${D}${sysconfdir}/init.d
 
+	if [ "${MACHINE}" == "palmpre" ]; then
+		install -m 0755 ${WORKDIR}/usb-gadget.sh ${D}${sysconfdir}/init.d
+		ln -sf ../init.d/usb-gadget.sh ${D}${sysconfdir}/rcS.d/S00usb-gadget.sh
+	fi
+
 #
 # Create runlevel links
 #
-- 
cgit v1.2.3


From 05c9fdb38f22d7be64387c469974c4364dfafe73 Mon Sep 17 00:00:00 2001
From: Klaus Kurzmann <mok@fluxnetz.de>
Date: Mon, 14 Dec 2009 17:42:28 +0100
Subject: fbreader: add 0.12.1

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
---
 recipes/fbreader/fbreader-0.12.1/Makefile.patch | 22 ++++++++++++++++
 recipes/fbreader/fbreader_0.12.1.bb             | 35 +++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 recipes/fbreader/fbreader-0.12.1/Makefile.patch
 create mode 100644 recipes/fbreader/fbreader_0.12.1.bb

(limited to 'recipes')

diff --git a/recipes/fbreader/fbreader-0.12.1/Makefile.patch b/recipes/fbreader/fbreader-0.12.1/Makefile.patch
new file mode 100644
index 0000000000..0e498c7125
--- /dev/null
+++ b/recipes/fbreader/fbreader-0.12.1/Makefile.patch
@@ -0,0 +1,22 @@
+diff -uri fbreader-0.12.1.orig/fbreader/Makefile fbreader-0.12.1/fbreader/Makefile
+--- fbreader-0.12.1.orig/fbreader/Makefile	2009-12-13 09:03:11.000000000 +0100
++++ fbreader-0.12.1/fbreader/Makefile	2009-12-14 17:18:47.548638783 +0100
+@@ -37,7 +37,6 @@
+ 	@install $(TARGET) $(DESTDIR)$(BINDIR)/FBReader
+ 	@install -d $(FBSHAREDIR)
+ 	@install -d $(FBSHAREDIR)/help
+-	@./scripts/install_help.sh $(VARIANT) $(FBSHAREDIR)/help
+ 	@install -d $(FBSHAREDIR)/network
+ 	@install -m 0644 $(wildcard data/network/*.xml) $(FBSHAREDIR)/network
+ 	@install -d $(FBSHAREDIR)/network/certificates
+@@ -58,8 +57,8 @@
+ 	@install -d $(FBSHAREDIR)/resources
+ 	@install -m 0644 $(wildcard data/resources/*.xml) $(FBSHAREDIR)/resources
+ 	@install -d $(DESTDIR)$(APPIMAGEDIR_REAL)
+-	@install -m 0644 $(wildcard data/icons/toolbar/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+-	@install -m 0644 $(wildcard data/icons/filetree/$(VARIANT)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
++	@install -m 0644 $(wildcard data/icons/toolbar/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
++	@install -m 0644 $(wildcard data/icons/filetree/$(TARGET_ARCH)/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+ 	@install -m 0644 $(wildcard data/icons/booktree/new/*.*) $(DESTDIR)$(APPIMAGEDIR_REAL)
+ 	@make -C $(TARGET_ARCH) RESOLUTION=$(RESOLUTION) install
+ 
diff --git a/recipes/fbreader/fbreader_0.12.1.bb b/recipes/fbreader/fbreader_0.12.1.bb
new file mode 100644
index 0000000000..c1c3025a1a
--- /dev/null
+++ b/recipes/fbreader/fbreader_0.12.1.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "FBreader is an ebook reader"
+HOMEPAGE = "http://www.fbreader.org"
+SECTION = "x11/utils"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi"
+
+SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \
+file://Makefile.patch;patch=1"
+	   
+# Set the defaults
+READER_RESOLUTION ?= "1024x600"
+READER_ARCH       ?= "desktop"
+READER_UI         ?= "gtk"
+READER_STATUS	  ?= "release"
+
+FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary ${libdir}/zlibrary"
+
+CFLAGS_append = " RESOLUTION=${READER_RESOLUTION} INSTALLDIR=${prefix}"
+EXTRA_OEMAKE = "CC='${CXX}' LD='${CXX}' OE_CFLAGS='${CXXFLAGS}' INCPATH='${STAGING_INCDIR}' LIBPATH='${STAGING_LIBDIR}'"
+
+inherit pkgconfig
+
+do_configure() {
+	cd ${WORKDIR}/${PN}-${PV}
+	mv makefiles/target.mk makefiles/target.mk.orig
+	
+	echo "TARGET_ARCH = ${READER_ARCH}" > makefiles/target.mk	
+	echo "UI_TYPE = ${READER_UI}" >> makefiles/target.mk
+	echo "TARGET_STATUS = ${READER_STATUS}" >> makefiles/target.mk
+}
+
+do_install() {
+        oe_runmake install DESTDIR=${D} RESOLUTION=${READER_RESOLUTION}
+}
-- 
cgit v1.2.3


From 27e3eff536a83312ad24052570d5056f8bfe8544 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 14 Dec 2009 11:19:24 -0800
Subject: iproute2: Use $CC in configure tests.

* Switch to INC_PR
* honor LDFLAGS env var.
* Use CC env var in configure tests
  currently it uses native gcc which
  is wrong in cross compilation context.
* Fix PR 5147

Signed-off-by: Erik Boto <erik.boto@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../iproute2-2.6.29/use-cross-compiler.patch       | 53 ++++++++++++++++++++++
 recipes/iproute2/iproute2.inc                      |  2 +
 recipes/iproute2/iproute2_2.6.18.bb                |  2 +-
 recipes/iproute2/iproute2_2.6.20.bb                |  2 +-
 recipes/iproute2/iproute2_2.6.22.bb                |  2 +-
 recipes/iproute2/iproute2_2.6.29.bb                |  3 +-
 6 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 recipes/iproute2/iproute2-2.6.29/use-cross-compiler.patch

(limited to 'recipes')

diff --git a/recipes/iproute2/iproute2-2.6.29/use-cross-compiler.patch b/recipes/iproute2/iproute2-2.6.29/use-cross-compiler.patch
new file mode 100644
index 0000000000..be5d31d5e1
--- /dev/null
+++ b/recipes/iproute2/iproute2-2.6.29/use-cross-compiler.patch
@@ -0,0 +1,53 @@
+Patch to tc/Makefile is from 
+http://bugs.gentoo.org/236861
+
+configure patch is based on suggestion from
+PR 5117
+
+http://bugs.openembedded.org/show_bug.cgi?id=5147
+
+-Khem
+Index: iproute2-2.6.29/configure
+===================================================================
+--- iproute2-2.6.29.orig/configure	2009-12-14 11:07:42.000000000 -0800
++++ iproute2-2.6.29/configure	2009-12-14 11:08:38.000000000 -0800
+@@ -16,7 +16,7 @@ int main(int argc, char **argv) {
+ 	return 0;
+ }
+ EOF
+-gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 
++$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
+ if [ $? -eq 0 ]
+ then
+     echo "TC_CONFIG_ATM:=y" >>Config
+@@ -49,7 +49,7 @@ int main(int argc, char **argv) {
+ }
+ 
+ EOF
+-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
+ 
+ if [ $? -eq 0 ]
+ then
+@@ -81,7 +81,7 @@ int main(int argc, char **argv) {
+ }
+ 
+ EOF
+-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
+ 
+ if [ $? -eq 0 ]
+ then
+Index: iproute2-2.6.29/tc/Makefile
+===================================================================
+--- iproute2-2.6.29.orig/tc/Makefile	2009-12-14 11:10:27.000000000 -0800
++++ iproute2-2.6.29/tc/Makefile	2009-12-14 11:11:39.000000000 -0800
+@@ -100,7 +100,7 @@ clean:
+ 	rm -f emp_ematch.yacc.output
+ 
+ q_atm.so: q_atm.c
+-	$(CC) $(CFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
+ 
+ %.yacc.c: %.y
+ 	$(YACC) $(YACCFLAGS) -o $@ $<
diff --git a/recipes/iproute2/iproute2.inc b/recipes/iproute2/iproute2.inc
index 8c8519f230..9792bad4d6 100644
--- a/recipes/iproute2/iproute2.inc
+++ b/recipes/iproute2/iproute2.inc
@@ -4,6 +4,8 @@ SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "flex-native bison-native"
 
+INC_PR = "r3"
+
 # Set the DATE in the .bb file
 SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}-${DATE}.tar.gz"
 
diff --git a/recipes/iproute2/iproute2_2.6.18.bb b/recipes/iproute2/iproute2_2.6.18.bb
index d442a091db..32e871118e 100644
--- a/recipes/iproute2/iproute2_2.6.18.bb
+++ b/recipes/iproute2/iproute2_2.6.18.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "${INC_PR}.0"
 
 require iproute2.inc
 
diff --git a/recipes/iproute2/iproute2_2.6.20.bb b/recipes/iproute2/iproute2_2.6.20.bb
index e72dfccdde..dd1a504142 100644
--- a/recipes/iproute2/iproute2_2.6.20.bb
+++ b/recipes/iproute2/iproute2_2.6.20.bb
@@ -1,6 +1,6 @@
 require iproute2.inc
 
-PR = "r2"
+PR = "${INC_PR}.0"
 DATE = "070313"
 
 SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
diff --git a/recipes/iproute2/iproute2_2.6.22.bb b/recipes/iproute2/iproute2_2.6.22.bb
index 1ee0ce7ab2..55e3a7575d 100644
--- a/recipes/iproute2/iproute2_2.6.22.bb
+++ b/recipes/iproute2/iproute2_2.6.22.bb
@@ -1,6 +1,6 @@
 require iproute2.inc
 
-PR = "r1"
+PR = "${INC_PR}.0"
 DATE = "070710"
 
 SRC_URI_append = " file://new-flex-fix.patch;patch=1 \
diff --git a/recipes/iproute2/iproute2_2.6.29.bb b/recipes/iproute2/iproute2_2.6.29.bb
index d02573a359..d38dde880f 100644
--- a/recipes/iproute2/iproute2_2.6.29.bb
+++ b/recipes/iproute2/iproute2_2.6.29.bb
@@ -1,10 +1,11 @@
 require iproute2.inc
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://developer.osdl.org/dev/iproute2/download/${P}.tar.bz2 \
 	   file://new-flex-fix.patch;patch=1 \
 	   file://compilation-fix.patch;patch=1 \
+	   file://use-cross-compiler.patch;patch=1 \
 	  "
 
 S = "${WORKDIR}/iproute2-${PV}"
-- 
cgit v1.2.3


From 7144e15e91b327e75a5270db8457a2c5cfa62f9a Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 14 Dec 2009 11:31:07 -0800
Subject: uclibc-nptl: Move to current tip of branch

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch | 12 ------------
 recipes/uclibc/uclibc.inc                          |  3 +++
 recipes/uclibc/uclibc_nptl.bb                      |  3 +--
 3 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch

(limited to 'recipes')

diff --git a/recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch b/recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch
deleted file mode 100644
index 8c2b85db13..0000000000
--- a/recipes/uclibc/uclibc-nptl/uclibc_rpc_thread.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: git/libc/inet/rpc/rpc_thread.c
-===================================================================
---- git.orig/libc/inet/rpc/rpc_thread.c	2009-12-04 13:13:09.000000000 -0800
-+++ git/libc/inet/rpc/rpc_thread.c	2009-12-04 13:13:17.000000000 -0800
-@@ -14,6 +14,7 @@
- #ifdef __UCLIBC_HAS_THREADS__
- 
- #include <bits/libc-tsd.h>
-+#include <bits/libc-lock.h>
- 
- /* Variable used in non-threaded applications or for the first thread.  */
- static struct rpc_thread_variables __libc_tsd_RPC_VARS_mem;
diff --git a/recipes/uclibc/uclibc.inc b/recipes/uclibc/uclibc.inc
index 903aea27b9..2045007e72 100644
--- a/recipes/uclibc/uclibc.inc
+++ b/recipes/uclibc/uclibc.inc
@@ -181,3 +181,6 @@ do_install() {
 	chmod +x ${D}/${base_libdir}/*
 }
 
+get_monotonic_srcrev () {
+    	(cd ${S}; eval `git rev-list HEAD|wc -l`)
+}
diff --git a/recipes/uclibc/uclibc_nptl.bb b/recipes/uclibc/uclibc_nptl.bb
index a910590ab8..b1bb497d05 100644
--- a/recipes/uclibc/uclibc_nptl.bb
+++ b/recipes/uclibc/uclibc_nptl.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.30"
-SRCREV="b3d31460fbf188997c7337296a61409529f7c974"
+SRCREV="b3b9101a9c495f52c06cb2de27fcf45e6e5f0bf9"
 PV = "${UCLIBC_BASE}+gitr${SRCREV}"
 DEFAULT_PREFERENCE = "-1"
 #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
@@ -34,7 +34,6 @@ SRC_URI = "git://uclibc.org/uClibc.git;protocol=git;branch=nptl \
 	file://uclibc-arm-ftruncate64.patch;patch=1 \
 	file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch;patch=1 \
 	file://uclibc_arm_remove_duplicate_sysdep_defs.patch;patch=1 \
-	file://uclibc_rpc_thread.patch;patch=1 \
 	file://installfix.patch;patch=1 \
 	"
 
-- 
cgit v1.2.3