[oe-commits] org.oe.dev merge of 'b8b628bfe4824f594298abb40c7545cefd3aa41a'
coredump2 commit
openembedded-commits at lists.openembedded.org
Tue Jun 26 01:21:07 UTC 2007
merge of 'b8b628bfe4824f594298abb40c7545cefd3aa41a'
and 'd2b977e2b47520e4d1f916319fbbf8f5f7202b7c'
Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: c21a3380c4b982a0fc590629a87817dd1de27ba4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c21a3380c4b982a0fc590629a87817dd1de27ba4
Files:
1
conf/distro/hentges-2.0.conf
conf/machine/hentges-2.0_common.conf
conf/machine/hentges-2.0_spitz.conf
packages/images/hentges-console-image.bb
packages/images/hentges-x11-image.bb
packages/tasks/task-hentges-base.bb
packages/tasks/task-hentges-x11.bb
packages/altboot/altboot_1.1.1+wip-SVNR59.bb
packages/altboot/altboot_1.1.1+wip-SVNR66.bb
packages/fbreader/files/zaurus-VGA.patch
packages/fbreader/fbreader_0.8.2a.bb
conf/machine/htcwallaby.conf
packages/bluez/bluez-gnome_0.9.bb
packages/bluez/bluez-hcidump_1.37.bb
packages/bluez/bluez-libs_3.12.bb
packages/bluez/bluez-utils_3.12.bb
packages/gpsbabel/gpsbabel_1.3.3.bb
packages/gtk-webcore/midori_0.0.2.bb
conf/machine/palmld.conf
packages/bluez/bluez-utils_3.11.bb
packages/gpsbabel/gpsbabel_1.2.5.bb
packages/gtk-webcore/osb-nrcore.inc
packages/gtk-webcore/osb-nrcore_svn.bb
packages/keymaps/files/jornada6xx/keymap-uk.map
packages/librsvg/librsvg_2.16.1.bb
packages/linux/ixp4xx-kernel_2.6.21.1.bb
Diffs:
#
# mt diff -rb8b628bfe4824f594298abb40c7545cefd3aa41a -rc21a3380c4b982a0fc590629a87817dd1de27ba4
#
#
#
# delete "conf/distro/hentges-2.0.conf"
#
# delete "conf/machine/hentges-2.0_common.conf"
#
# delete "conf/machine/hentges-2.0_spitz.conf"
#
# delete "packages/images/hentges-console-image.bb"
#
# delete "packages/images/hentges-x11-image.bb"
#
# delete "packages/tasks/task-hentges-base.bb"
#
# delete "packages/tasks/task-hentges-x11.bb"
#
# rename "packages/altboot/altboot_1.1.1+wip-SVNR59.bb"
# to "packages/altboot/altboot_1.1.1+wip-SVNR66.bb"
#
# add_file "packages/fbreader/files/zaurus-VGA.patch"
# content [3993e8eb74f417adf2f1ed86a1db46f5d7a91602]
#
# patch "packages/altboot/altboot_1.1.1+wip-SVNR66.bb"
# from [72d2d7b4a01f0e47e2adec56d30e908f85830f96]
# to [7cb617a49e20203b0f89fb39efef91b8ec68009a]
#
# patch "packages/fbreader/fbreader_0.8.2a.bb"
# from [2281178bcfe616a911377e8d53a105e730186348]
# to [ecb0b59a9f10624f83793fcfa9429e2f50131a9f]
#
============================================================
--- packages/fbreader/files/zaurus-VGA.patch 3993e8eb74f417adf2f1ed86a1db46f5d7a91602
+++ packages/fbreader/files/zaurus-VGA.patch 3993e8eb74f417adf2f1ed86a1db46f5d7a91602
@@ -0,0 +1,13 @@
+--- fbreader-0.8.2a/fbreader/data/default/styles.gpe640x480.xml.orig 2007-06-24 23:55:56.000000000 +0000
++++ fbreader-0.8.2a/fbreader/data/default/styles.gpe640x480.xml 2007-06-24 23:56:22.000000000 +0000
+@@ -1,8 +1,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <DefaultStyles>
+- <base family="Sans" fontSize="16"/>
++ <base family="Sans" fontSize="8"/>
+ <style id="0" name="Regular Paragraph" firstLineIndentDelta="22" allowHyphenations="true"/>
+- <style id="1" name="Title" fontSizeDelta="10" bold="true" spaceBefore="2" spaceAfter="7" alignment="center" allowHyphenations="false"/>
++ <style id="1" name="Title" fontSizeDelta="5" bold="true" spaceBefore="2" spaceAfter="7" alignment="center" allowHyphenations="false"/>
+ <style id="3" name="Poem Title" fontSizeDelta="2" bold="true" spaceBefore="6" spaceAfter="6" leftIndent="40" allowHyphenations="false"/>
+ <style id="2" name="Section Title" fontSizeDelta="6" bold="true" spaceAfter="5" alignment="center" allowHyphenations="false"/>
+ <style id="31" name="Header 1" fontSizeDelta="6" bold="true" spaceAfter="5" alignment="center" allowHyphenations="false"/>
============================================================
--- packages/altboot/altboot_1.1.1+wip-SVNR59.bb 72d2d7b4a01f0e47e2adec56d30e908f85830f96
+++ packages/altboot/altboot_1.1.1+wip-SVNR66.bb 7cb617a49e20203b0f89fb39efef91b8ec68009a
@@ -1,8 +1,8 @@ require altboot.inc
require altboot.inc
-PR = "r9"
+PR = "r0"
-SVN_REV = "59"
+SVN_REV = "66"
SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV}"
do_install() {
============================================================
--- packages/fbreader/fbreader_0.8.2a.bb 2281178bcfe616a911377e8d53a105e730186348
+++ packages/fbreader/fbreader_0.8.2a.bb ecb0b59a9f10624f83793fcfa9429e2f50131a9f
@@ -1,10 +1,10 @@ DEPENDS = "gtk+ enca expat bzip2 libgpew
DESCRIPTION = "FBreader is an ebook reader"
LICENSE = "GPL2"
HOMEPAGE = "http://only.mawhrin.net/fbreader/"
SECTION = "x11/utils"
PRIORITY = "optional"
DEPENDS = "gtk+ enca expat bzip2 libgpewidget"
-PR = "r3"
+PR = "r4"
# The RESOLUTION is defined at compile time which makes
# this package MACHINE specific.
@@ -13,7 +13,13 @@ SRC_URI = "http://only.mawhrin.net/fbrea
SRC_URI = "http://only.mawhrin.net/fbreader/fbreader-sources-${PV}.tgz \
file://fbreader-0.8.2a_buildsys_oe.patch;patch=1 \
file://480x640-buildfix.patch;patch=1"
+
+SRC_URI_append_spitz = "\
+ file://zaurus-VGA.patch;patch=1"
+SRC_URI_append_akita = "\
+ file://zaurus-VGA.patch;patch=1"
+
# Set the defaults
READER_RESOLUTION = "240x320"
READER_ARCH = "openzaurus"
@@ -22,6 +28,8 @@ READER_RESOLUTION_fic-gta01 = "480x640"
# Set device specific overrides
READER_RESOLUTION_fic-gta01 = "480x640"
+READER_RESOLUTION_spitz = "640x480"
+READER_RESOLUTION_akita = "640x480"
FILES_${PN} += "${datadir}/FBReader ${datadir}/zlibrary"
#
# mt diff -rd2b977e2b47520e4d1f916319fbbf8f5f7202b7c -rc21a3380c4b982a0fc590629a87817dd1de27ba4
#
#
#
# add_file "conf/machine/htcwallaby.conf"
# content [9eb8958a34abb017fe40020f1493f5bd050a6e52]
#
# add_file "packages/bluez/bluez-gnome_0.9.bb"
# content [6841233421c5e08a0657919d990abdc76ffac9e7]
#
# add_file "packages/bluez/bluez-hcidump_1.37.bb"
# content [d6f52cd2d74e198d022f5fd58a152c8d4eb73945]
#
# add_file "packages/bluez/bluez-libs_3.12.bb"
# content [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
#
# add_file "packages/bluez/bluez-utils_3.12.bb"
# content [aa68b3366893bffdd6b321059818b96093a30336]
#
# add_file "packages/gpsbabel/gpsbabel_1.3.3.bb"
# content [524afce07a57a4126e2b92cbade218085eccfd80]
#
# add_file "packages/gtk-webcore/midori_0.0.2.bb"
# content [348a9809fd18122ce67287221b19ca29e74da891]
#
# patch "conf/machine/palmld.conf"
# from [02a77c82c88213e378d77a1ca5290686235ef273]
# to [35967f1aae7db5a316327dcc9e656a7fd33fb278]
#
# patch "packages/bluez/bluez-utils_3.11.bb"
# from [d085546d5c9fcdbfd1ae08a896ecbd3be3a0ef29]
# to [4af7630dc6fbe7919102fbb2e9e88a08b5ef7b10]
#
# patch "packages/gpsbabel/gpsbabel_1.2.5.bb"
# from [eb1e23e231c62d6573be15728669c40c69174b04]
# to [4ebc6ba286326c014c9b5b606b33c04a96c0b418]
#
# patch "packages/gtk-webcore/osb-nrcore.inc"
# from [bb74045e42a69c1b0faaf1a4656e7051d34ceec9]
# to [fcbcebe1996ba7e345c0c82426a17e5ae37ba241]
#
# patch "packages/gtk-webcore/osb-nrcore_svn.bb"
# from [fef1b618d40d97762fdae1ef2948fff283d0c81a]
# to [43f8b003f6e8e794c4d18e39398404ddccf10a78]
#
# patch "packages/keymaps/files/jornada6xx/keymap-uk.map"
# from [bc5fb8eabd5a38af564d898db656a4cac3956dc7]
# to [d1c2822f29a65bdd5faddb78981fbb4c573f92f4]
#
# patch "packages/librsvg/librsvg_2.16.1.bb"
# from [17416b5b6fbe102693620623bef9c34ebcc4e4a7]
# to [dcb9af4a2cb708b6a30b261deb07a9e552bf2b95]
#
# patch "packages/linux/ixp4xx-kernel_2.6.21.1.bb"
# from [fb1a927268c613e38fc5ad7daadacbaef1a9ff62]
# to [180fead71aac429e5293ec102823510c1ccc8ffb]
#
============================================================
--- conf/machine/htcwallaby.conf 9eb8958a34abb017fe40020f1493f5bd050a6e52
+++ conf/machine/htcwallaby.conf 9eb8958a34abb017fe40020f1493f5bd050a6e52
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@NAME: HTC Wallaby
+#@DESCRIPTION: Machine configuration for the HTC Wallaby aka XDA aka many other names
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 "
+
+require conf/machine/include/tune-strongarm.conf
+
+ROOT_FLASH_SIZE = "16" #?
+VOLATILE_STORAGE_SIZE = "32"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen phone"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#
+# Modules autoload and other boot properties
+#
+SERIAL_CONSOLE = "115200 ttySA0 vt100"
+USE_VT = "0"
============================================================
--- packages/bluez/bluez-gnome_0.9.bb 6841233421c5e08a0657919d990abdc76ffac9e7
+++ packages/bluez/bluez-gnome_0.9.bb 6841233421c5e08a0657919d990abdc76ffac9e7
@@ -0,0 +1,11 @@
+DESCRIPTION = "BLuetooth configuration applet"
+LICENSE = "GPL+LGPL"
+
+DEPENDS = "dbus-glib gconf libnotify gtk+"
+
+SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+inherit autotools pkgconfig gconf
+
+FILES_${PN} += "${datadir}/gconf"
+
============================================================
--- packages/bluez/bluez-hcidump_1.37.bb d6f52cd2d74e198d022f5fd58a152c8d4eb73945
+++ packages/bluez/bluez-hcidump_1.37.bb d6f52cd2d74e198d022f5fd58a152c8d4eb73945
@@ -0,0 +1,13 @@
+DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool."
+SECTION = "console"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz"
+S = "${WORKDIR}/bluez-hcidump-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}"
+
+inherit autotools
============================================================
--- packages/bluez/bluez-libs_3.12.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
+++ packages/bluez/bluez-libs_3.12.bb dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d
@@ -0,0 +1 @@
+require bluez-libs.inc
============================================================
--- packages/bluez/bluez-utils_3.12.bb aa68b3366893bffdd6b321059818b96093a30336
+++ packages/bluez/bluez-utils_3.12.bb aa68b3366893bffdd6b321059818b96093a30336
@@ -0,0 +1,113 @@
+require bluez-utils.inc
+
+DEPENDS += "glib-2.0"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+ file://hcid.conf \
+ file://02dtl1_cs.sh \
+ "
+PR = "r0"
+
+EXTRA_OECONF = " \
+ --enable-bccmd \
+ --disable-hid2hci \
+ --disable-alsa \
+ --enable-cups \
+ --enable-glib \
+ --disable-sdpd \
+ --enable-network \
+ --enable-serial \
+ --enable-input \
+ --enable-audio \
+ --enable-echo \
+ --enable-configfile \
+ --enable-initscripts \
+ --enable-test \
+ "
+
+# The config options are explained below:
+
+# --enable-obex enable OBEX support
+# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+# --enable-cups install CUPS backend support
+# --enable-bccmd install BCCMD interface utility
+# --enable-avctrl install Audio/Video control utility
+# --enable-hid2hci install HID mode switching utility
+# --enable-dfutool install DFU firmware upgrade utility
+
+# --enable-glib For systems that use and install GLib anyway
+# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server
+
+#Following services can be enabled so far:
+# --enable-network
+# --enable-serial
+# --enable-input
+# --enable-audio
+# --enable-echo
+
+#There is no need to modify any init script. They will be started
+#automatically or on demand. Only /etc/bluetooth/*.service files should
+#be patched to change name or the autostart value.
+# --enable-configfile
+# --enable-initscripts
+
+#For even smaller -doc packages
+# --disable-manpages
+# --disable-pcmciarules
+
+#I haven't seen any embedded device with HID proxy support. So simply
+#disable it:
+# --disable-hid2hci
+
+
+PACKAGES =+ "${PN}-compat"
+
+CONFFILES_${PN} = " \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default/bluetooth \
+ "
+
+CONFFILES_${PN}-compat = " \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
+FILES_${PN} = " \
+ ${base_sbindir}/hcid \
+ ${libdir}/bluetooth \
+ ${sysconfdir}/init.d/bluetooth \
+ ${sysconfdir}/bluetooth/*.service \
+ ${sysconfdir}/bluetooth/hcid.conf \
+ ${sysconfdir}/default \
+ ${sysconfdir}/dbus-1 \
+ ${base_sbindir}/hciattach \
+ "
+
+#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
+FILES_${PN} += "${sysconfdir}/apm/"
+
+FILES_${PN}-dbg += " \
+ ${libdir}/bluetooth/.debug \
+ "
+
+FILES_${PN}-compat = " \
+ ${base_bindir}/sdptool \
+ ${base_bindir}/dund \
+ ${base_bindir}/rctest \
+ ${base_bindir}/ciptool \
+ ${base_bindir}/l2test \
+ ${base_bindir}/rfcomm \
+ ${base_bindir}/hcitool \
+ ${base_bindir}/pand \
+ ${base_bindir}/hidd \
+ ${base_bindir}/l2ping \
+ ${base_sbindir}/hciconfig \
+ ${base_sbindir}/bccmd \
+ ${base_sbindir}/hciemu \
+ ${base_bindir}/passkey-agent \
+ ${sysconfdir}/bluetooth/rfcomm.conf \
+ "
+
+FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth"
+RDEPENDS_bluez-cups-backend = "cups"
+
+
============================================================
--- packages/gpsbabel/gpsbabel_1.3.3.bb 524afce07a57a4126e2b92cbade218085eccfd80
+++ packages/gpsbabel/gpsbabel_1.3.3.bb 524afce07a57a4126e2b92cbade218085eccfd80
@@ -0,0 +1,20 @@
+SECTION = "console/utils"
+DESCRIPTION = "GPS data converter"
+DEPENDS = "expat libusb"
+HOMEPAGE = "http://gpsbabel.sf.net"
+LICENSE = "GPL"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gpsbabel/gpsbabel-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_compile () {
+ oe_runmake EXTRA_CFLAGS="-I${STAGING_INCDIR} -L${STAGING_LIBDIR}"
+}
+
+do_install () {
+ install -d ${D}${bindir}
+ install -m 0744 gpsbabel ${D}${bindir}
+}
============================================================
--- packages/gtk-webcore/midori_0.0.2.bb 348a9809fd18122ce67287221b19ca29e74da891
+++ packages/gtk-webcore/midori_0.0.2.bb 348a9809fd18122ce67287221b19ca29e74da891
@@ -0,0 +1,11 @@
+DESCRIPTION = "Midori is a lightweight web browser."
+LICENSE = "GPLv2"
+
+DEPENDS = "osb-jscore osb-nrcit osb-nrcore libsexy"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz"
+
+
+
============================================================
--- conf/machine/palmld.conf 02a77c82c88213e378d77a1ca5290686235ef273
+++ conf/machine/palmld.conf 35967f1aae7db5a316327dcc9e656a7fd33fb278
@@ -1,16 +1,14 @@
#@TYPE: Machine
#@NAME: Palm LifeDrive
#@DESCRIPTION: Machine configuration for the Palm LifeDrive
+#
+# Hardware-based properties
+#
+
TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda wifi ext2 usbgadget screen"
-
ROOT_FLASH_SIZE = "100"
SERIAL_CONSOLE = "115200 ttyS0"
@@ -20,4 +18,92 @@ require conf/machine/include/tune-xscale
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
require conf/machine/include/tune-xscale.conf
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth pcmcia irda wifi ext2 usbgadget screen"
+
+#
+# Software/packages selection
+#
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+MACHINE_EXTRA_RRECOMMENDS = "\
+ kernel-module-ac97-bus \
+ kernel-module-apm-power \
+ kernel-module-backlight \
+ kernel-module-battery \
+ kernel-module-bcm2035-uart \
+ kernel-module-external-power \
+ kernel-module-gpioed \
+ kernel-module-gpioed-ng \
+ kernel-module-lcd \
+ kernel-module-led-class \
+ kernel-module-leds-palmld \
+ kernel-module-ledtrig-heartbeat \
+ kernel-module-ledtrig-hwtimer \
+ kernel-module-ledtrig-timer \
+ kernel-module-palmld-battery \
+ kernel-module-palmld-ide \
+ kernel-module-palmld-pcmcia \
+ kernel-module-pcmcia-core \
+ kernel-module-pda-power \
+ kernel-module-pxa2xx-core \
+ kernel-module-pxapwm-bl \
+ kernel-module-snd \
+ kernel-module-snd-ac97-codec \
+ kernel-module-snd-page-alloc \
+ kernel-module-snd-pcm \
+ kernel-module-snd-pxa2xx-ac97 \
+ kernel-module-snd-pxa2xx-pcm \
+ kernel-module-snd-seq \
+ kernel-module-snd-seq-device \
+ kernel-module-snd-seq-midi-event \
+ kernel-module-snd-seq-oss \
+ kernel-module-snd-timer \
+ kernel-module-soundcore \
+ kernel-module-wm97xx-ts \
+ "
+
+#
+# Modules autoload and other boot properties
+#
+
+module_conf_wm97xx-ts = "options wm97xx-ts pil=2"
+
+module_autoload_snd-ac97-bus = "snd-ac97-bus"
+module_autoload_apm_power = "apm_power"
+module_autoload_backlight = "backlight"
+module_autoload_battery = "battery"
+module_autoload_bcm2035_uart = "bcm2035_uart"
+module_autoload_gpioed = "gpioed"
+module_autoload_gpioed-ng = "gpioed-ng"
+module_autoload_lcd = "lcd"
+module_autoload_led-class = "led-class"
+module_autoload_leds-palmld = "leds-palmld"
+module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat"
+module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer"
+module_autoload_ledtrig-timer = "ledtrig-timer"
+module_autoload_palmld_battery = "palmld-battery"
+module_autoload_palmld_ide = "palmld-ide"
+module_autoload_palmld_pcmcia = "palmld-pcmcia"
+module_autoload_pcmcia = "pcmcia"
+module_autoload_pcmcia_core = "pcmcia-core"
+module_autoload_pda_power = "pda_power"
+module_autoload_pxa2xx_core = "pxa2xx-core"
+module_autoload_pxapwm_bl = "pxapwm_bl"
+module_autoload_snd = "snd"
+module_autoload_snd-ac97-codec = "snd-ac97-codec"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-page-alloc = "snd-page-alloc"
+module_autoload_snd-pcm = "snd-pcm"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm"
+module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
+module_autoload_snd-seq = "snd-seq"
+module_autoload_snd-seq-device = "snd-seq-device"
+module_autoload_seq-midi-event = "seq-midi-event"
+module_autoload_snd-seq-oss = "snd-seq-oss"
+module_autoload_snd-timer = "snd-timer"
+module_autoload_soundcore = "soundcore"
+module_autoload_wm97xx-ts = "wm97xx-ts"
-module_autoload_sa1100-rtc = "sa1100-rtc"
============================================================
--- packages/bluez/bluez-utils_3.11.bb d085546d5c9fcdbfd1ae08a896ecbd3be3a0ef29
+++ packages/bluez/bluez-utils_3.11.bb 4af7630dc6fbe7919102fbb2e9e88a08b5ef7b10
@@ -1,8 +1,8 @@ DEPENDS += "glib-2.0"
require bluez-utils.inc
DEPENDS += "glib-2.0"
-DEFAULT_PREFERENCE = "-1"
+#DEFAULT_PREFERENCE = "-1"
SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
============================================================
--- packages/gpsbabel/gpsbabel_1.2.5.bb eb1e23e231c62d6573be15728669c40c69174b04
+++ packages/gpsbabel/gpsbabel_1.2.5.bb 4ebc6ba286326c014c9b5b606b33c04a96c0b418
@@ -1,15 +1,17 @@ DESCRIPTION = "GPS data converter"
SECTION = "console/utils"
DESCRIPTION = "GPS data converter"
-DEPENDS = "expat"
+DEPENDS = "expat libusb"
HOMEPAGE = "http://gpsbabel.sf.net"
LICENSE = "GPL"
+PR = "r1"
+
SRC_URI = "${SOURCEFORGE_MIRROR}/gpsbabel/gpsbabel-${PV}.tar.gz"
inherit autotools pkgconfig
do_compile () {
- oe_runmake EXTRA_CFLAGS="-I${STAGING_INCDIR} -L${STAGING_LIBDIR}" INHIBIT_USB=-DNO_USB LIBUSB=
+ oe_runmake EXTRA_CFLAGS="-I${STAGING_INCDIR} -L${STAGING_LIBDIR}"
}
do_install () {
============================================================
--- packages/gtk-webcore/osb-nrcore.inc bb74045e42a69c1b0faaf1a4656e7051d34ceec9
+++ packages/gtk-webcore/osb-nrcore.inc fcbcebe1996ba7e345c0c82426a17e5ae37ba241
@@ -18,6 +18,14 @@ do_configure () {
mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
}
+do_install_append() {
+ #backward compat for some apps
+ ln -sf ${datadir}/gtk-webcore-nrcore ${D}${datadir}/osb-nrcore
+}
+
+FILES_${PN} += "${datadir}/gtk-webcore-nrcore"
+
+
do_stage () {
oe_libinstall -so libnrcore ${STAGING_LIBDIR}
oe_libinstall -so -C kwiq libnrcore_kwiq_gtk ${STAGING_LIBDIR}
@@ -30,3 +38,4 @@ do_stage () {
done
}
+
============================================================
--- packages/gtk-webcore/osb-nrcore_svn.bb fef1b618d40d97762fdae1ef2948fff283d0c81a
+++ packages/gtk-webcore/osb-nrcore_svn.bb 43f8b003f6e8e794c4d18e39398404ddccf10a78
@@ -1,9 +1,9 @@ PV = "0.5.2+svn${SRCDATE}"
require osb-nrcore.inc
DEFAULT_PREFERENCE = "-1"
PV = "0.5.2+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \
file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1 \
============================================================
--- packages/keymaps/files/jornada6xx/keymap-uk.map bc5fb8eabd5a38af564d898db656a4cac3956dc7
+++ packages/keymaps/files/jornada6xx/keymap-uk.map d1c2822f29a65bdd5faddb78981fbb4c573f92f4
@@ -26,14 +26,14 @@ keycode 8 = seven ampersand
alt keycode 7 = Meta_six
keycode 8 = seven ampersand braceleft
control keycode 8 = Control_underscore
- alt keycode 8 = KP_7
+ altgr keycode 8 = KP_7
keycode 9 = eight asterisk bracketleft
control keycode 9 = Delete
- alt keycode 9 = KP_8
+ altgr keycode 9 = KP_8
keycode 10 = nine parenleft bracketright %s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list