[oe-commits] org.oe.dev merge of '55e46711dc1a18ac2aab5bf8dd32e86e8a99f02f'
oe commit
openembedded-commits at lists.openembedded.org
Thu Nov 15 09:28:28 UTC 2007
merge of '55e46711dc1a18ac2aab5bf8dd32e86e8a99f02f'
and '7bd7c5bb615e623e265a40e19243ad0504689f97'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: f94559e4a48c2ae3cd234fdf608f511fc04df7be
ViewMTN: http://monotone.openembedded.org/revision/info/f94559e4a48c2ae3cd234fdf608f511fc04df7be
Files:
1
contrib/feed-browser/includes/config.inc
packages/ettercap/ettercap-0.6.b
packages/ettercap/ettercap-0.6.b/configure.patch
packages/ettercap/ettercap_0.6.b.bb
packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch
packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch
packages/ettercap/files
packages/desktop-file-utils/desktop-file-utils-native_0.14.bb
packages/ettercap/ettercap-ng_0.7.3.bb
packages/ettercap/files/autotools.patch
packages/openmoko2/openmoko-messages2_svn.bb
classes/insane.bbclass
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
conf/machine/tosa.conf
packages/matchbox-wm/matchbox-wm_0.8.3.bb
packages/matchbox-wm/matchbox-wm_0.8.4.bb
packages/matchbox-wm/matchbox-wm_0.9.2.bb
packages/matchbox-wm/matchbox-wm_0.9.3.bb
packages/matchbox-wm/matchbox-wm_0.9.4.bb
packages/matchbox-wm/matchbox-wm_0.9.5.bb
packages/matchbox-wm/matchbox-wm_0.9.bb
packages/matchbox-wm/matchbox-wm_1.0.bb
packages/matchbox-wm/matchbox-wm_1.1.bb
packages/matchbox-wm/matchbox-wm_1.2.bb
packages/matchbox-wm/matchbox-wm_svn.bb
packages/wifi-radar/wifi-radar_1.9.6.bb
packages/xorg-data/xbitmaps_1.0.1.bb
Diffs:
#
# mt diff -r55e46711dc1a18ac2aab5bf8dd32e86e8a99f02f -rf94559e4a48c2ae3cd234fdf608f511fc04df7be
#
#
#
# patch "contrib/feed-browser/includes/config.inc"
# from [9bcb9f854ff6728529de402c08d7094a7ca86dd5]
# to [c83ad830b6705b298699f4bad3d61b6ea860b1d2]
#
============================================================
--- contrib/feed-browser/includes/config.inc 9bcb9f854ff6728529de402c08d7094a7ca86dd5
+++ contrib/feed-browser/includes/config.inc c83ad830b6705b298699f4bad3d61b6ea860b1d2
@@ -139,4 +139,163 @@ $feeds = array(
)
);
+
+$ipkpath = "/var/www/angstrom/unstable/feed/unsorted";
+$cpu_archs = array('arm-oabi', 'armv4', 'armv4t', 'armv5te', 'armv6', 'armv7', 'avr32', 'bfin', 'i386', 'i486', 'i586', 'i686', 'iwmmxt', 'ppc405', 'ppc603e', 'sparc');
+$device_archs = array(
+ "a1200" => "armv5te",
+ "a780"=> "armv5te",
+ "acern30",
+ "adsp-bf537-stamp" => "bfin",
+ "adzs-bf538f-ezlite" => "bfin",
+ "akita" => "armv5te",
+ "alix",
+ "amsdelta",
+ "asus620",
+ "asus730",
+ "at32stk1000" => "avr32",
+ "at91sam9260ek" => "armv5te",
+ "at91sam9261ek" => "armv5te",
+ "at91sam9263ek" => "armv5te",
+ "atngw100" => "avr32",
+ "aximx50" => "armv5te",
+ "aximx50v" => "armv5te",
+ "borzoi" => "armv5te",
+ "boxer" => "armv5te",
+ "c7x0" => "armv5te",
+ "colinux",
+ "collie",
+ "compulab-pxa270" => "armv5te",
+ "corgi" => "armv5te",
+ "davinci-dvevm",
+ "db1200",
+ "devkitidp-pxa255" => "armv5te",
+ "dht-walnut" => "ppc405",
+ "e680" => "armv5te",
+ "efika" => "ppc603e",
+ "ep93xx" => "armv4t",
+ "epia",
+ "er0100" => "armv5te",
+ "eteng500" => "armv5te",
+ "fic-gta01" => "armv4t",
+ "fic-gta02" => "armv4t",
+ "fsg3be",
+ "geodegx",
+ "geodelx",
+ "guinness",
+ "gumstix-connex" => "armv5te",
+ "gumstix-verdex" => "armv5te",
+ "h1910",
+ "h1940",
+ "h2200" => "armv5te",
+ "h3600" => "arm-oabi",
+ "h3800" => "arm-oabi",
+ "h3900" => "armv5te",
+ "h4000" => "armv5te",
+ "h5000" => "armv5te",
+ "h6300" => "armv4t",
+ "htcalpine",
+ "htcapache",
+ "htcblueangel",
+ "htchimalaya",
+ "htcsable",
+ "htctornado",
+ "htcuniversal" => "armv5te",
+ "htcwallaby",
+ "husky" => "armv5te",
+ "hx2000" => "armv5te",
+ "hx4700" => "armv5te",
+ "i586-generic" => "i586",
+ "i686-generic" => "i586",
+ "ixp4xx",
+ "ixp4xxbe" => "armv5teb",
+ "ixp4xxle" => "armv5te",
+ "jornada56x",
+ "jornada6xx",
+ "jornada7xx",
+ "kb9202" => "armv4t",
+ "ks8695",
+ "lite5200",
+ "logicpd-pxa270" => "armv5te",
+ "looxc550",
+ "lsarm",
+ "lsppchd",
+ "lsppchg",
+ "magicbox",
+ "magician" => "armv5te",
+ "mainstone" => "armv5te",
+ "mnci",
+ "mtx-1",
+ "mtx-2",
+ "mtx-3",
+ "mtx-3a",
+ "mx21ads" => "armv5te",
+ "mx31ads" => "armv6",
+ "n2100",
+ "native",
+ "navman-icn330",
+ "netbook-pro" => "armv5te",
+ "netvista",
+ "nokia770" => "armv5te",
+ "nokia800",
+ "nslu2" => "armv5te",
+ "nslu2be" => "armv5teb",
+ "nslu2le" => "armv5te",
+ "omap1510inn" => "armv5te",
+ "omap1610h2" => "armv5te",
+ "omap1710h3" => "armv5te",
+ "omap2420h4",
+ "omap2430sdp",
+ "omap5912osk" => "armv5te",
+ "palmld" => "armv5te",
+ "palmt650" => "armv5te",
+ "palmt680",
+ "palmtc",
+ "palmtt",
+ "palmtt2",
+ "palmtt3",
+ "palmtt5",
+ "palmtx",
+ "palmz31",
+ "palmz71",
+ "palmz72",
+ "poodle" => "armv5te",
+ "progear",
+ "qemuarm" => "armv5te",
+ "qemux86",
+ "rb500",
+ "rokre2" => "armv5te",
+ "rokre6" => "armv5te",
+ "rt3000",
+ "rx1950",
+ "rx3000",
+ "sarge-at91" => "armv4t",
+ "sequoia",
+ "shark" => "arm-oabi",
+ "shepherd" => "armv5te",
+ "simpad" => "arm-oabi",
+ "smdk2440" => "armv4t",
+ "smdk2443" => "armv4t",
+ "spitz" => "armv5te",
+ "storcenter",
+ "sun4cdm",
+ "terrier" => "armv5te",
+ "titan",
+ "tosa" => "armv5te",
+ "triton",
+ "ts72xx",
+ "turbostation",
+ "wgt634u",
+ "wl500g",
+ "wrap",
+ "wrt54",
+ "x86-32-nocona",
+ "x86-prescott",
+ "x86-uml",
+ "x86",
+ "xilinx-ml403",
+ "xilinx-ml410",
+ "xxs1500",
+ );
+
+?>
-?>
#
# mt diff -r7bd7c5bb615e623e265a40e19243ad0504689f97 -rf94559e4a48c2ae3cd234fdf608f511fc04df7be
#
#
#
# delete "packages/ettercap/ettercap-0.6.b"
#
# delete "packages/ettercap/ettercap-0.6.b/configure.patch"
#
# delete "packages/ettercap/ettercap_0.6.b.bb"
#
# rename "packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch"
# to "packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch"
#
# add_dir "packages/ettercap/files"
#
# add_file "packages/desktop-file-utils/desktop-file-utils-native_0.14.bb"
# content [a2e82b4ea68a494f12d15c7dd824579781660311]
#
# add_file "packages/ettercap/ettercap-ng_0.7.3.bb"
# content [885933dadc1db669a1e36edfed1a6651b48a0aae]
#
# add_file "packages/ettercap/files/autotools.patch"
# content [a46938ba70c1204f0430b669e940422dcf404f4e]
#
# add_file "packages/openmoko2/openmoko-messages2_svn.bb"
# content [ea174dab3e9bcc6065b2012e9fce4ee4eeff15d6]
#
# patch "classes/insane.bbclass"
# from [2b43994e2dd8ae85f612788e116ce44c9b31619d]
# to [969f0ea4a41bb686333bda84032d4f9250a61c3b]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [edc976173fe3b3eaefcad6ce35aff6594210bf8c]
# to [8af2f634c8a91d9c27579c3537ca1e7d3132f5c6]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a5c8530186b1620c562bb7e94df157e23c4b8928]
# to [75aa091df2487affbd25f7f9a213ee1b7e87d774]
#
# patch "conf/distro/openmoko.conf"
# from [fb09004f81fdf9ff14811c7e83335282b3f46b4b]
# to [bedbe8dd945eb5ace788da554ab20d12a1ab3e6d]
#
# patch "conf/machine/tosa.conf"
# from [c4618a42bc1f0559d10723f0315b08046bfc97f4]
# to [bdda7deb7ee9f2d950ee255097efcdfa1cf7a39a]
#
# patch "packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch"
# from [b87e8646dadfb7d5d16757a725aaef9cbc7b7778]
# to [0c5154e470f4e55e2a4fad1e3ff7765a939dc651]
#
# patch "packages/matchbox-wm/matchbox-wm_0.8.3.bb"
# from [11f0e82bf7277f00ee0b1d83b5e68e3f0c9a9998]
# to [ac32ff6ed6dc301adbd233b2350be8b417c8e8bc]
#
# patch "packages/matchbox-wm/matchbox-wm_0.8.4.bb"
# from [11f0e82bf7277f00ee0b1d83b5e68e3f0c9a9998]
# to [ac32ff6ed6dc301adbd233b2350be8b417c8e8bc]
#
# patch "packages/matchbox-wm/matchbox-wm_0.9.2.bb"
# from [d34175fd9e7dc98d24532e81f6b73f9249bcd833]
# to [b61868d3efcb200c6ffe77b9ac981c477a2d1949]
#
# patch "packages/matchbox-wm/matchbox-wm_0.9.3.bb"
# from [239ef84130d55e5d0a21d48b1f3ccda8a7c3cfa2]
# to [2f6e68ee104c265ea1b80cd420646ecc135becf6]
#
# patch "packages/matchbox-wm/matchbox-wm_0.9.4.bb"
# from [62a357c7147f2bbc597d68ef36eba0957ba3cb70]
# to [07c9759d161ba9bd0d2cc7cc6040d278ce8f2f99]
#
# patch "packages/matchbox-wm/matchbox-wm_0.9.5.bb"
# from [6f73f13cd644cb48fa51fef99afb1946bcbd4a6a]
# to [19253c686c438e95da7707f11261101315a019de]
#
# patch "packages/matchbox-wm/matchbox-wm_0.9.bb"
# from [d47c653a293a9012fa9a983fb0bfc387b52f4537]
# to [59d56967ceddf69a4719582ab3c456710c85ba77]
#
# patch "packages/matchbox-wm/matchbox-wm_1.0.bb"
# from [4950e7030b1cbd117a9d000f47194aa320a992df]
# to [33cf62145c1efd3eaeb1414b7575633906beb0a1]
#
# patch "packages/matchbox-wm/matchbox-wm_1.1.bb"
# from [739e15a3c621658a1679e10df4d1e8d7321a66bc]
# to [831232f53fb4bd1b6c17527e9d92fb8c72355ae1]
#
# patch "packages/matchbox-wm/matchbox-wm_1.2.bb"
# from [f76c8f85daaf9e0782a8d564dcc1b6e906534b7a]
# to [36a2cba9690e481018472bdb8535b9f41a7769bf]
#
# patch "packages/matchbox-wm/matchbox-wm_svn.bb"
# from [5bafe560fead96654e15db643aa0ea49f27d227c]
# to [ce0ac84cb055e0cb08930225f22832e6aca6df3c]
#
# patch "packages/wifi-radar/wifi-radar_1.9.6.bb"
# from [221e6edf4928be2b1bce088bd74dd7985772ea37]
# to [1744245b1a014042504064af18845a64c864a03a]
#
# patch "packages/xorg-data/xbitmaps_1.0.1.bb"
# from [613ab066e8981893ec5634d14519baa5129ae981]
# to [47f276f3b54cf30ab254a4d478388c6d462ac6a3]
#
============================================================
--- packages/desktop-file-utils/desktop-file-utils-native_0.14.bb a2e82b4ea68a494f12d15c7dd824579781660311
+++ packages/desktop-file-utils/desktop-file-utils-native_0.14.bb a2e82b4ea68a494f12d15c7dd824579781660311
@@ -0,0 +1,12 @@
+SECTION = "console/utils"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"
+DESCRIPTION = "command line utilities to work with *.desktop files"
+LICENSE = "GPL"
+
+DEPENDS = "glib-2.0-native"
+
+SRC_URI = "http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz"
+
+inherit autotools native
+
+S = "${WORKDIR}/desktop-file-utils-${PV}"
============================================================
--- packages/ettercap/ettercap-ng_0.7.3.bb 885933dadc1db669a1e36edfed1a6651b48a0aae
+++ packages/ettercap/ettercap-ng_0.7.3.bb 885933dadc1db669a1e36edfed1a6651b48a0aae
@@ -0,0 +1,18 @@
+DESCRIPTION = "network sniffer/interceptor/logger for ethernet LANs. It \
+supports active and passive dissection of many protocols (even ciphered ones, \
+like SSH and HTTPS)."
+SECTION = "console/network"
+DEPENDS = "virtual/libiconv libnet libpcap openssl libpcre ncurses zlib libtool"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ettercap/ettercap-NG-${PV}.tar.gz \
+ file://autotools.patch;patch=1"
+
+S = "${WORKDIR}/ettercap-NG-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF += "--disable-gtk"
+
+FILES_${PN} += "${datadir} ${libdir}/ettercap/*.so"
+FILES_${PN}-dbg += "${libdir}/ettercap/.debug"
============================================================
--- packages/ettercap/files/autotools.patch a46938ba70c1204f0430b669e940422dcf404f4e
+++ packages/ettercap/files/autotools.patch a46938ba70c1204f0430b669e940422dcf404f4e
@@ -0,0 +1,173 @@
+diff -ur ettercap-NG-0.7.3/configure.in ettercap-NG-0.7.3-changed/configure.in
+--- ettercap-NG-0.7.3/configure.in 2005-01-13 10:24:28.000000000 +0100
++++ ettercap-NG-0.7.3-changed/configure.in 2007-11-07 11:42:25.000000000 +0100
+@@ -178,6 +178,7 @@
+
+ AC_PROG_CC
+ AM_PROG_CC_STDC
++AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_GCC_TRADITIONAL
+@@ -236,7 +237,7 @@
+ AC_CHECK_HEADERS(sys/poll.h poll.h sys/select.h)
+ AC_CHECK_HEADERS(sys/cdefs.h)
+ dnl nameser NS_GET32 and so on...
+-EC_NS_GET()
++dnl EC_NS_GET()
+
+ dnl ==================================================================
+ dnl Checks for typedefs, structures, and compiler characteristics.
+@@ -379,129 +380,6 @@
+ dnl ==================
+
+
+-dnl ---------
+-dnl libpcap
+-dnl ---------
+-ac_ec_libpcap=default
+-
+-AC_MSG_CHECKING(for libpcap)
+-AC_ARG_WITH(libpcap, AC_HELP_STRING(--with-libpcap=DIR,use libpcap in DIR),
+-[ case "$withval" in
+- no)
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR(["*** ettercap cannot operate without libpcap. ***"])
+- ;;
+- *)
+- if test -f $withval/pcap.h; then
+- owd=`pwd`
+- if cd $withval; then withval=`pwd`; cd $owd; fi
+- PCAPINC="-I$withval"
+- if test "$OS" = "WINDOWS"; then
+- PCAPLIB="-L$withval -lwpcap -lpacket"
+- else
+- PCAPLIB="-L$withval -lpcap"
+- fi
+- ac_ec_libpcap=$withval
+- AC_MSG_RESULT($withval)
+- elif test -f $withval/include/pcap.h; then
+- owd=`pwd`
+- if cd $withval; then withval=`pwd`; cd $owd; fi
+- PCAPINC="-I$withval/include"
+- if test "$OS" = "WINDOWS"; then
+- PCAPLIB="-L$withval/lib -lwpcap -lpacket"
+- else
+- PCAPLIB="-L$withval/lib -lpcap"
+- fi
+- ac_ec_libpcap=$withval
+- AC_MSG_RESULT($withval)
+- else
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR([pcap.h not found in $withval])
+- fi
+- ;;
+- esac ],
+-[ if test -f /usr/include/pcap/pcap.h; then
+- PCAPINC="-I/usr/include/pcap"
+- if test "$OS" = "WINDOWS"; then
+- PCAPLIB="-lwpcap -lpacket"
+- else
+- PCAPLIB="-lpcap"
+- fi
+- elif test -f /usr/include/pcap.h; then
+- if test "$OS" = "WINDOWS"; then
+- PCAPLIB="-lwpcap -lpacket"
+- else
+- PCAPLIB="-lpcap"
+- fi
+- elif test -f /usr/local/include/pcap.h; then
+- PCAPINC="-I/usr/local/include"
+- if test "$OS" = "WINDOWS"; then
+- PCAPLIB="-lwpcap -lpacket"
+- else
+- PCAPLIB="-lpcap"
+- fi
+- else
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR([libpcap not found])
+- fi
+- AC_MSG_RESULT(yes) ]
+-)
+-
+-if test "$OS" = "WINDOWS"; then
+- EC_CHECK_FUNC(wpcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+- EC_CHECK_FUNC(packet, PacketInitPacket, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+- AC_CHECK_LIB(ws2_32, ntohs,, AC_MSG_ERROR([Incorrect ws2_32 version.]))
+- AC_CHECK_LIB(iphlpapi, main)
+-else
+- EC_CHECK_FUNC(pcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+-fi
+-
+-dnl ---------
+-dnl libnet
+-dnl ---------
+-ac_ec_libnet=default
+-
+-AC_MSG_CHECKING(for libnet)
+-AC_ARG_WITH(libnet, AC_HELP_STRING(--with-libnet=DIR,use libnet in DIR),
+-[ case "$withval" in
+- no)
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR(["*** ettercap cannot operate without libnet. ***"])
+- ;;
+- *)
+- if test -f $withval/lnet.h; then
+- owd=`pwd`
+- if cd $withval; then withval=`pwd`; cd $owd; fi
+- LNETINC="-I$withval"
+- LNETLIB="-L$withval -lnet"
+- ac_ec_libnet=$withval
+- AC_MSG_RESULT($withval)
+- elif test -f $withval/include/libnet.h; then
+- owd=`pwd`
+- if cd $withval; then withval=`pwd`; cd $owd; fi
+- LNETINC="-I$withval/include"
+- LNETLIB="-L$withval/lib -L$withval/src -lnet"
+- ac_ec_libnet=$withval
+- AC_MSG_RESULT($withval)
+- else
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR([libnet.h not found in $withval])
+- fi
+- ;;
+- esac ],
+-[ if test -f /usr/include/libnet.h; then
+- AC_MSG_RESULT(yes)
+- LNETINC=""
+- LNETLIB="-lnet"
+- else
+- AC_MSG_RESULT(no)
+- AC_MSG_ERROR([libnet >= 1.1.2.1 not found])
+- fi
+-]
+-)
+-
+-EC_CHECK_FUNC(net, libnet_adv_free_packet, $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required]))
+-
+ dnl ------------------
+ dnl Checks for openssl
+ dnl ------------------
+@@ -794,7 +672,8 @@
+ dnl set up the final vars
+ dnl -----------------------
+ EC_CFLAGS="$DEBUG_FLAGS $PCAPINC $LNETINC $SSLINC $PCREINC $ICONVINC"
+-EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB"
++dnl EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB"
++EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB -lpcap -lnet"
+
+ AC_SUBST(EC_CFLAGS)
+ AC_SUBST(EC_LIBS)
+diff -ur ettercap-NG-0.7.3/src/Makefile.am ettercap-NG-0.7.3-changed/src/Makefile.am
+--- ettercap-NG-0.7.3/src/Makefile.am 2005-01-13 10:18:48.000000000 +0100
++++ ettercap-NG-0.7.3-changed/src/Makefile.am 2007-11-06 20:15:12.000000000 +0100
+@@ -127,8 +127,7 @@
+
+ ettercap_CFLAGS = @EC_CFLAGS@
+
+-ettercap_LDADD = @LIBOBJS@ \
+- os/libec_os.a \
++ettercap_LDADD = missing/strlcpy.o os/libec_os.a \
+ interfaces/daemon/libec_daemon.a \
+ interfaces/text/libec_text.a
+
============================================================
--- packages/openmoko2/openmoko-messages2_svn.bb ea174dab3e9bcc6065b2012e9fce4ee4eeff15d6
+++ packages/openmoko2/openmoko-messages2_svn.bb ea174dab3e9bcc6065b2012e9fce4ee4eeff15d6
@@ -0,0 +1,11 @@
+DESCRIPTION = "The OpenMoko Message application"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r0"
+
+inherit openmoko2
+
+EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}"
+
+FILES_${PN} += "${datadir}/openmoko-messages/ ${datadir}/dbus-1/services/"
============================================================
--- classes/insane.bbclass 2b43994e2dd8ae85f612788e116ce44c9b31619d
+++ classes/insane.bbclass 969f0ea4a41bb686333bda84032d4f9250a61c3b
@@ -21,7 +21,7 @@ inherit package
# We play a special package function
inherit package
-PACKAGE_DEPENDS += "pax-utils-native"
+PACKAGE_DEPENDS += "pax-utils-native desktop-file-utils-native"
#PACKAGE_DEPENDS += chrpath-native"
PACKAGEFUNCS += " do_package_qa "
@@ -308,8 +308,22 @@ def package_qa_check_pcla(path,name,d):
.pc and .la files should not point to the WORKDIR
"""
sane = True
+ # TODO
return sane
+def package_qa_check_desktop(path, name, d):
+ """
+ Run all desktop files through desktop-file-validate.
+ """
+ import bb, os
+ if path.endswith(".desktop"):
+ validate = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True), 'desktop-file-validate')
+ output = os.popen("%s %s" % (validate, path))
+ # This only produces output on errors
+ for l in output:
+ bb.error(l.strip())
+ return True
+
def package_qa_check_staged(path,d):
"""
Check staged la and pc files for sanity
@@ -416,9 +430,13 @@ python do_package_qa () {
walk_sane = True
rdepends_sane = True
for package in packages.split():
+ if bb.data.getVar('INSANE_SKIP_' + package, d, True):
+ bb.note("Package: %s (skipped)" % package)
+ continue
+
bb.note("Checking Package: %s" % package)
path = "%s/install/%s" % (workdir, package)
- if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch], package, d):
+ if not package_qa_walk(path, [package_qa_check_rpath, package_qa_check_devdbg, package_qa_check_perm, package_qa_check_arch, package_qa_check_desktop], package, d):
walk_sane = False
if not package_qa_check_rdepends(package, workdir, d):
rdepends_sane = False
============================================================
--- conf/distro/include/sane-srcdates.inc edc976173fe3b3eaefcad6ce35aff6594210bf8c
+++ conf/distro/include/sane-srcdates.inc 8af2f634c8a91d9c27579c3537ca1e7d3132f5c6
@@ -88,6 +88,7 @@ SRCDATE_python-edje ?= "${EFL_SRCDATE}"
SRCDATE_python-evas ?= "${EFL_SRCDATE}"
SRCDATE_python-ecore ?= "${EFL_SRCDATE}"
SRCDATE_python-edje ?= "${EFL_SRCDATE}"
+SRCDATE_python-emotion ?= "${EFL_SRCDATE}"
SRCDATE_python-ewl ?= "${EFL_SRCDATE}"
SRCDATE_python-etk ?= "${EFL_SRCDATE}"
============================================================
--- conf/distro/include/sane-srcrevs.inc a5c8530186b1620c562bb7e94df157e23c4b8928
+++ conf/distro/include/sane-srcrevs.inc 75aa091df2487affbd25f7f9a213ee1b7e87d774
@@ -48,9 +48,9 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-matchbox-keyboard ?= "1739"
SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
SRCREV_pn-matchbox-panel-2 ?= "1626"
-SRCREV_pn-moko-gtk-engine ?= "3207"
+SRCREV_pn-moko-gtk-engine ?= "3405"
SRCREV_pn-mpd-alsa ?= "6952"
-SRCREV_pn-neod ?= "3358"
+SRCREV_pn-neod ?= "3421"
SRCREV_pn-oh-puzzles ?= "22"
SRCREV_pn-osb-browser ?= "125"
SRCREV_pn-osb-jscore ?= "117"
@@ -81,6 +81,7 @@ SRCREV_pn-openmoko-messages ?= "2276"
SRCREV_pn-openmoko-libs ?= "2367"
SRCREV_pn-openmoko-mediaplayer2 ?= "3300"
SRCREV_pn-openmoko-messages ?= "2276"
+SRCREV_pn-openmoko-messages2 ?= "3424"
SRCREV_pn-openmoko-panel-battery ?= "3360"
SRCREV_pn-openmoko-panel-bt ?= "2896"
SRCREV_pn-openmoko-panel-clock ?= "2567"
@@ -105,7 +106,7 @@ SRCREV_pn-openmoko-today2 ?= "3342"
SRCREV_pn-openmoko-theme-standard2-qvga ?= "3289"
SRCREV_pn-openmoko-today ?= "3056"
SRCREV_pn-openmoko-today2 ?= "3342"
-SRCREV_pn-openmoko-today2-folders ?= "2680"
+SRCREV_pn-openmoko-today2-folders ?= "3414"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "206"
SRCREV_pn-openocd-native ?= "206"
============================================================
--- conf/distro/openmoko.conf fb09004f81fdf9ff14811c7e83335282b3f46b4b
+++ conf/distro/openmoko.conf bedbe8dd945eb5ace788da554ab20d12a1ab3e6d
@@ -24,10 +24,12 @@ FEED_URIS = "\
FEED_URIS = "\
snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \
snapshot-armv4t##http://buildhost.openmoko.org/snapshots/2007.08/ipk/armv4t \
+ snapshot-neo1973##http://buildhost.openmoko.org/snapshots/2007.08/ipk/neo1973 \
snapshot-fic-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/fic-gta01 \
\
updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \
updat%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list