[oe-commits] org.oe.dev merge of '730a1eb946899965bd1703a6dcb9e962751d914a'
pfalcon commit
openembedded-commits at lists.openembedded.org
Mon Jun 25 14:25:00 UTC 2007
merge of '730a1eb946899965bd1703a6dcb9e962751d914a'
and 'b02088ae9e5847432d378e1127122006d2d82fa9'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: e16d41b741c025bb045c0ff72240614381a6e704
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e16d41b741c025bb045c0ff72240614381a6e704
Files:
1
conf/machine/htcwallaby.conf
packages/gpsbabel/gpsbabel_1.3.3.bb
packages/gtk-webcore/midori_0.0.2.bb
packages/gpsbabel/gpsbabel_1.2.5.bb
packages/libpcap/libpcap-0.9.6/shared.patch
packages/libpcap/libpcap_0.9.6.bb
packages/librsvg/librsvg_2.16.1.bb
packages/linux/ixp4xx-kernel_2.6.21.1.bb
packages/sphyrna/sphyrna_svn.bb
packages/sysvinit/sysvinit_2.86.bb
Diffs:
#
# mt diff -r730a1eb946899965bd1703a6dcb9e962751d914a -re16d41b741c025bb045c0ff72240614381a6e704
#
#
#
# add_file "conf/machine/htcwallaby.conf"
# content [9eb8958a34abb017fe40020f1493f5bd050a6e52]
#
============================================================
--- 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"
#
# mt diff -rb02088ae9e5847432d378e1127122006d2d82fa9 -re16d41b741c025bb045c0ff72240614381a6e704
#
#
#
# add_file "packages/gpsbabel/gpsbabel_1.3.3.bb"
# content [524afce07a57a4126e2b92cbade218085eccfd80]
#
# add_file "packages/gtk-webcore/midori_0.0.2.bb"
# content [348a9809fd18122ce67287221b19ca29e74da891]
#
# patch "packages/gpsbabel/gpsbabel_1.2.5.bb"
# from [eb1e23e231c62d6573be15728669c40c69174b04]
# to [4ebc6ba286326c014c9b5b606b33c04a96c0b418]
#
# patch "packages/libpcap/libpcap-0.9.6/shared.patch"
# from [c1344991671e156ae899553cf45f6900993cc93f]
# to [1e3d8969cb3568ba595f4cd3b9272cfa167df4f8]
#
# patch "packages/libpcap/libpcap_0.9.6.bb"
# from [615ff2491ae59d9cb923396c843bb0aebdf3053f]
# to [722b9181c176704a1a8b52dcb63e595991e439fc]
#
# 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]
#
# patch "packages/sphyrna/sphyrna_svn.bb"
# from [aa2620f930ed684535fe6ae895d8c45aff2b6a3c]
# to [5444a9b2fb67eeeecc67659b5d6198d6db396662]
#
# patch "packages/sysvinit/sysvinit_2.86.bb"
# from [4355933507effe083105a1e8daac54090c91bd50]
# to [5707bcd89b503d0828df317ed882760657f6b666]
#
============================================================
--- 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"
+
+
+
============================================================
--- 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/libpcap/libpcap-0.9.6/shared.patch c1344991671e156ae899553cf45f6900993cc93f
+++ packages/libpcap/libpcap-0.9.6/shared.patch 1e3d8969cb3568ba595f4cd3b9272cfa167df4f8
@@ -11,7 +11,7 @@
+# some defines for shared library compilation - FIXME, if not matching
+MAJ=0.9
-+MIN=5
++MIN=6
+VERSION=$(MAJ).$(MIN)
+LIBNAME=pcap
+LIBRARY=lib$(LIBNAME).a
============================================================
--- packages/libpcap/libpcap_0.9.6.bb 615ff2491ae59d9cb923396c843bb0aebdf3053f
+++ packages/libpcap/libpcap_0.9.6.bb 722b9181c176704a1a8b52dcb63e595991e439fc
@@ -1,11 +1,13 @@ SECTION = "libs/network"
# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
# Released under the MIT license (see packages/COPYING)
DESCRIPTION = "Network Packet Capture Library"
HOMEPAGE = "http://www.tcpdump.org/"
LICENSE = "BSD"
SECTION = "libs/network"
-PR = "r0"
+PR = "r1"
+
+# Don't forget to edit shared.patch to have the correct version number inside
SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz \
file://shared.patch;patch=1"
============================================================
--- packages/librsvg/librsvg_2.16.1.bb 17416b5b6fbe102693620623bef9c34ebcc4e4a7
+++ packages/librsvg/librsvg_2.16.1.bb dcb9af4a2cb708b6a30b261deb07a9e552bf2b95
@@ -1,11 +1,14 @@ LICENSE = "LGPL"
DESCRIPTION = "Library for rendering SVG files"
SECTION = "x11/utils"
DEPENDS = "gtk+ libcroco cairo libart-lgpl libxml2 popt"
LICENSE = "LGPL"
+PR = "r1"
+
+inherit autotools pkgconfig gnome
+
EXTRA_OECONF = "--disable-mozilla-plugin"
-inherit autotools pkgconfig gnome
PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
FILES_${PN} = "${libdir}/*.so.*"
@@ -13,13 +16,14 @@ FILES_rsvg = "${bindir}/rsvg \
${bindir}/rsvg-view \
${bindir}/rsvg-convert \
${datadir}/pixmaps/svg-viewer.svg"
-FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so.*"
+FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
FILES_librsvg-gtk-dev += "${libdir}/gtk-2.0/*.la \
- ${libdir}/gtk-2.0/*/*.la"
-FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug"
+ ${libdir}/gtk-2.0/*/*.la \
+ ${libdir}/gtk-2.0/*/*/*.la \
+ "
+FILES_librsvg-gtk-dbg += "${libdir}/gtk-2.0/.debug \
+ ${libdir}/gtk-2.0/*/*/.debug"
-EXTRA_OECONF = "--disable-mozilla-plugin"
-
do_stage() {
autotools_stage_all
}
============================================================
--- packages/linux/ixp4xx-kernel_2.6.21.1.bb fb1a927268c613e38fc5ad7daadacbaef1a9ff62
+++ packages/linux/ixp4xx-kernel_2.6.21.1.bb 180fead71aac429e5293ec102823510c1ccc8ffb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "861"
+IXP4XX_KERNEL_SVN_REV = "877"
#
# The directory containing the patches to be applied is
# specified below
============================================================
--- packages/sphyrna/sphyrna_svn.bb aa2620f930ed684535fe6ae895d8c45aff2b6a3c
+++ packages/sphyrna/sphyrna_svn.bb 5444a9b2fb67eeeecc67659b5d6198d6db396662
@@ -11,7 +11,10 @@ inherit autotools
inherit autotools
-PACKAGES = "sphyrna-console"
+PACKAGES = "sphyrna-console sphyrna-python"
FILES_sphyrna-console = "${bindir}/hhconsole"
+FILES_sphyrna-python = "${bindir}/decode.py ${libdir}/python2.4/site-packages/sphyrna/*"
+PACKAGE_ARCH_sphyrna-python = "all"
+RDEPENDS_sphyrna-python = "python-core python-re"
============================================================
--- packages/sysvinit/sysvinit_2.86.bb 4355933507effe083105a1e8daac54090c91bd50
+++ packages/sysvinit/sysvinit_2.86.bb 5707bcd89b503d0828df317ed882760657f6b666
@@ -51,7 +51,8 @@ EXTRA_OEMAKE += "'INSTALL=install' \
'usrbindir=${bindir}' \
'usrsbindir=${sbindir}' \
'includedir=${includedir}' \
- 'mandir=${mandir}'"
+ 'mandir=${mandir}' \
+ DISTRO=''"
do_install () {
oe_runmake 'ROOT=${D}' install
More information about the Openembedded-commits
mailing list