[oe-commits] org.oe.dev merge of '47b75b678cf4bede24082e551e04f186734a008c'

[oe commit]

merge of '47b75b678cf4bede24082e551e04f186734a008c'
     and '647847c7187d536c71adab58568757d34b048ac2'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 58cd98da4adf334b3a3a9aa2ca78999544c51106
ViewMTN: http://monotone.openembedded.org/revision/info/58cd98da4adf334b3a3a9aa2ca78999544c51106
Files:
1
conf/machine/h5000.conf
packages/tasks/task-base.bb
packages/opkg
packages/opie-ttf-support/files/02qtttffont-update
packages/opkg/opkg-native_svn.bb
packages/opkg/opkg_svn.bb
conf/distro/include/insane-srcrevs.inc
conf/distro/include/sane-srcrevs.inc
packages/opie-ttf-support/opie-ttf-support_1.1.bb
Diffs:

#
# mt diff -r47b75b678cf4bede24082e551e04f186734a008c -r58cd98da4adf334b3a3a9aa2ca78999544c51106
#
# 
# 
# patch "conf/machine/h5000.conf"
#  from [e03a562f647e39de325cf64e33abb934e96da504]
#    to [b0fe52891e392a5d43162145964546c7517d27e4]
# 
# patch "packages/tasks/task-base.bb"
#  from [1a4f000020453dc9598a87cbb8a1df9e88bc5c96]
#    to [2ebcd1a884302a4643dd61431a84aadea41cb978]
# 
============================================================
--- conf/machine/h5000.conf	e03a562f647e39de325cf64e33abb934e96da504
+++ conf/machine/h5000.conf	b0fe52891e392a5d43162145964546c7517d27e4
@@ -27,6 +27,7 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
 			      kernel-module-h5400-battery \
+			      kernel-module-h5400-bt \
 			      kernel-module-snd-soc-h5000 \
 			      kernel-module-i2c-pxa"
 
============================================================
--- packages/tasks/task-base.bb	1a4f000020453dc9598a87cbb8a1df9e88bc5c96
+++ packages/tasks/task-base.bb	2ebcd1a884302a4643dd61431a84aadea41cb978
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro 
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r59"
+PR = "r60"
 
 inherit task
 


#
# mt diff -r647847c7187d536c71adab58568757d34b048ac2 -r58cd98da4adf334b3a3a9aa2ca78999544c51106
#
# 
# 
# add_dir "packages/opkg"
# 
# add_file "packages/opie-ttf-support/files/02qtttffont-update"
#  content [760cb477c6a25abd5bf01d325d8eacffa61e88a2]
# 
# add_file "packages/opkg/opkg-native_svn.bb"
#  content [79d87dbb482aa284b45489dfb628c62f48c5331d]
# 
# add_file "packages/opkg/opkg_svn.bb"
#  content [13f09ac580bee79985c15dcece8824d84ff9c8fc]
# 
# patch "conf/distro/include/insane-srcrevs.inc"
#  from [b133294ee7d8f57a1c315a6787746b2e85b14249]
#    to [ca43e0353a86049415b045921ad6fd06a123bd35]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [71258720352961f82d4608c48f2cf5a73db718c5]
#    to [58bb9cbbc74e4fd2881360bc832cbb195753094e]
# 
# patch "packages/opie-ttf-support/opie-ttf-support_1.1.bb"
#  from [31bd2beed5a8228f8da31953542c42edf4b43385]
#    to [9f56a6e0e49a3248be7e931114742faffcfe2495]
# 
============================================================
--- packages/opie-ttf-support/files/02qtttffont-update	760cb477c6a25abd5bf01d325d8eacffa61e88a2
+++ packages/opie-ttf-support/files/02qtttffont-update	760cb477c6a25abd5bf01d325d8eacffa61e88a2
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Author: Rolf Leggewie
+
+mkdir -p @@PALMTOPDIR@@/lib/fonts
+
+@@SBINDIR@@/update-qtttffontdir @@DATADIR@@/fonts/truetype > @@PALMTOPDIR@@/lib/fonts/fontdir
============================================================
--- packages/opkg/opkg-native_svn.bb	79d87dbb482aa284b45489dfb628c62f48c5331d
+++ packages/opkg/opkg-native_svn.bb	79d87dbb482aa284b45489dfb628c62f48c5331d
@@ -0,0 +1,8 @@
+require opkg_svn.bb
+
+target_libdir := "${libdir}"
+
+inherit native
+
+EXTRA_OECONF += "--with-opkglibdir=${target_libdir}/opkg -disable-gpg"
+
============================================================
--- packages/opkg/opkg_svn.bb	13f09ac580bee79985c15dcece8824d84ff9c8fc
+++ packages/opkg/opkg_svn.bb	13f09ac580bee79985c15dcece8824d84ff9c8fc
@@ -0,0 +1,26 @@
+DESCRIPTION = "Open Package Manager"
+DESCRIPTION_libipkg = "Open Package Manager Library"
+SECTION = "base"
+LICENSE = "GPL"
+DEPENDS = "curl gpgme"
+PV = "0.0+svnr${SRCREV}"
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http"
+
+S = "${WORKDIR}/opkg"
+
+inherit autotools pkgconfig
+
+do_stage() {
+        oe_libinstall -so libopkg ${STAGING_LIBDIR}
+        install -d ${STAGING_INCDIR}/libopkg/
+        for f in *.h
+        do
+                install -m 0644 $f ${STAGING_INCDIR}/libopkg/
+        done
+}
+
+PACKAGES =+ "libopkg-dev libopkg"
+
+FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
+FILES_libopkg = "${libdir}/*.so.*"
+
============================================================
--- conf/distro/include/insane-srcrevs.inc	b133294ee7d8f57a1c315a6787746b2e85b14249
+++ conf/distro/include/insane-srcrevs.inc	ca43e0353a86049415b045921ad6fd06a123bd35
@@ -81,6 +81,8 @@ SRCREV_pn-openocd-native ?= "${AUTOREV}"
 SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}"
 SRCREV_pn-openocd ?= "${AUTOREV}"
 SRCREV_pn-openocd-native ?= "${AUTOREV}"
+SRCREV_pn-opkg ?= "${AUTOREV}"
+SRCREV_pn-opkg-native ?= "${AUTOREV}"
 SRCREV_pn-psplash ?= "${AUTOREV}"
 SRCREV_pn-settings-daemon ?= "${AUTOREV}"
 SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc	71258720352961f82d4608c48f2cf5a73db718c5
+++ conf/distro/include/sane-srcrevs.inc	58bb9cbbc74e4fd2881360bc832cbb195753094e
@@ -118,6 +118,8 @@ SRCREV_pn-openocd-native ?= "206"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "206"
 SRCREV_pn-openocd-native ?= "206"
+SRCREV_pn-opkg ?= "4019"
+SRCREV_pn-opkg-native ?= "4019"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-python-formencode = "3148"
============================================================
--- packages/opie-ttf-support/opie-ttf-support_1.1.bb	31bd2beed5a8228f8da31953542c42edf4b43385
+++ packages/opie-ttf-support/opie-ttf-support_1.1.bb	9f56a6e0e49a3248be7e931114742faffcfe2495
@@ -1,9 +1,10 @@ DEPENDS = "freetype"
 DESCRIPTION = "Meta-package for Opie TTF support"
 SECTION = "opie/fonts"
 DEPENDS = "freetype"
-PR = "r4"
+PR = "r5"
 
-SRC_URI = "file://update-qtttffontdir.c"
+SRC_URI = "file://update-qtttffontdir.c \
+           file://02qtttffont-update"
 S = "${WORKDIR}"
 
 do_compile() {
@@ -11,23 +12,15 @@ do_install() {
 }
 
 do_install() {
-
-        echo "
-#!/bin/sh
-# Author: Rolf Leggewie
-
-${sbindir}/update-qtttffontdir ${datadir}/fonts/truetype > ${palmtopdir}/lib/fonts/fontdir
-" > ${WORKDIR}/02qtttffont-update
-
         install -d ${D}${sbindir}
         install -d ${D}${sysconfdir}/update-fonts-common.d/
         install -m 0755 update-qtttffontdir ${D}${sbindir}
         install -m 0755 02qtttffont-update ${D}${sysconfdir}/update-fonts-common.d/
+        sed -i 's!@@SBINDIR@@!${sbindir}!g' ${D}${sysconfdir}/update-fonts-common.d/02qtttffont-update
+        sed -i 's!@@PALMTOPDIR@@!${palmtopdir}!g' ${D}${sysconfdir}/update-fonts-common.d/02qtttffont-update
+        sed -i 's!@@DATADIR@@!${datadir}!g' ${D}${sysconfdir}/update-fonts-common.d/02qtttffont-update
 }
 
 pkg_postinst() {
-        if ! [ -d ${palmtopdir}/lib/fonts ]; then
-            mkdir -p ${palmtopdir}/lib/fonts
-        fi
         ${sysconfdir}/update-fonts-common.d/02qtttffont-update
 }