diff options
| -rw-r--r-- | conf/distro/include/moko-autorev.inc | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 1 | ||||
| -rw-r--r-- | packages/pidgin/pidgin.inc | 69 | ||||
| -rw-r--r-- | packages/pidgin/pidgin_2.5.1.bb | 26 | ||||
| -rw-r--r-- | packages/wmiconfig/wmiconfig_svn.bb | 15 |
5 files changed, 65 insertions, 48 deletions
diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index b63b9e0fe5..59968f508f 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -67,3 +67,5 @@ SRCREV_pn-u-boot-openmoko ?= "${AUTOREV}" SRCREV_pn-u-boot-openmoko-devel ?= "${AUTOREV}" SRCREV_pn-usbpath ?= "${AUTOREV}" SRCREV_pn-usbpath-native ?= "${AUTOREV}" +SRCREV_pn-wmiconfig ?= "${AUTOREV}" + diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index f6023e5865..3606324520 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -214,6 +214,7 @@ SRCREV_pn-webkit-qtopia ?= "28656" SRCREV_pn-wesnoth ?= "22021" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" +SRCREV_pn-wmiconfig ?= "4522" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "7fa46527131177dfba7e711d1530205a9efc5e79" SRCREV_pn-zhone ?= "929c78f2e83faef526064231c17958eaef72eba3" diff --git a/packages/pidgin/pidgin.inc b/packages/pidgin/pidgin.inc index 7e99ba7eed..913cf1c248 100644 --- a/packages/pidgin/pidgin.inc +++ b/packages/pidgin/pidgin.inc @@ -1,12 +1,12 @@ -SECTION = "x11/network" DESCRIPTION = "multi-protocol instant messaging client" +SECTION = "x11/network" LICENSE = "GPL" - DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus" -RRECOMMENDS_${PN} = "libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp" + +inherit autotools gettext pkgconfig gconf EXTRA_OECONF = " \ - --disable-audio \ + --disable-audio \ --disable-perl \ --disable-tcl \ --disable-deprecated \ @@ -33,54 +33,51 @@ FILES_libpurple-dev = "${libdir}/libpurple*.la \ ${libdir}/purple-2/liboscar.so \ ${datadir}/aclocal" FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \ - ${libdir}/purple-2/.debug" + ${libdir}/purple-2/.debug" FILES_libgnt = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" FILES_libgnt-dev = "${libdir}/gnt/*.la" FILES_libgnt-dbg = "${libdir}/gnt/.debug \ -FILES_finch = "${bindir}/finch" -FILES_finch-dev = "${libdir}/finch/*.la" -FILES_finch-dbg = "${bindir}/.debug/finch \ - ${libdir}/finch/.debug" +FILES_finch = "${bindir}/finch" +FILES_finch-dev = "${libdir}/finch/*.la" +FILES_finch-dbg = "${bindir}/.debug/finch \ + ${libdir}/finch/.debug" FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ ${datadir}/applications" -RRECOMMENDS_${PN} += "${PN}-data " +RRECOMMENDS_${PN} = "${PN}-data libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp" + FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons" FILES_${PN}-dev += "${libdir}/${PN}/*.la" -inherit autotools gettext pkgconfig gconf - PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*" python populate_packages_prepend () { root = bb.data.expand('${libdir}/pidgin', d) - purple = bb.data.expand('${libdir}/purple-2', d) - finch = bb.data.expand('${libdir}/finch', d) + purple = bb.data.expand('${libdir}/purple-2', d) + finch = bb.data.expand('${libdir}/finch', d) do_split_packages(d, root, '^([^l][^i][^b].*)\.so$', - output_pattern='pidgin-plugin-%s', - description='Pidgin plugin %s', - prepend=True, extra_depends='') + output_pattern='pidgin-plugin-%s', + description='Pidgin plugin %s', + prepend=True, extra_depends='') - do_split_packages(d, purple, '^lib(.*)\.so$', - output_pattern='libpurple-protocol-%s', - description='Libpurple protocol plugin for %s', - prepend=True, extra_depends='') + do_split_packages(d, purple, '^lib(.*)\.so$', + output_pattern='libpurple-protocol-%s', + description='Libpurple protocol plugin for %s', + prepend=True, extra_depends='') do_split_packages(d, purple, '^(ssl-.*)\.so$', - output_pattern='libpurple-plugin-%s', - description='libpurple plugin %s', - prepend=True, extra_depends='libpurple-plugin-ssl') - - do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', - output_pattern='libpurple-plugin-%s', - description='libpurple plugin %s', - prepend=True, extra_depends='') - - do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', - output_pattern='finch-plugin-%s', - description='Finch plugin %s', - prepend=True, extra_depends='') - - + output_pattern='libpurple-plugin-%s', + description='libpurple plugin %s', + prepend=True, extra_depends='libpurple-plugin-ssl') + + do_split_packages(d, purple, '^([^l][^i][^b].*)\.so$', + output_pattern='libpurple-plugin-%s', + description='libpurple plugin %s', + prepend=True, extra_depends='') + + do_split_packages(d, finch, '^([^l][^i][^b].*)\.so$', + output_pattern='finch-plugin-%s', + description='Finch plugin %s', + prepend=True, extra_depends='') } diff --git a/packages/pidgin/pidgin_2.5.1.bb b/packages/pidgin/pidgin_2.5.1.bb index dc919eaaf9..17d0270456 100644 --- a/packages/pidgin/pidgin_2.5.1.bb +++ b/packages/pidgin/pidgin_2.5.1.bb @@ -1,15 +1,17 @@ require pidgin.inc -SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.patch;patch=1 \ - file://gconf-no-errors.patch;patch=1 \ - file://pidgin.desktop-set-icon.patch;patch=1 \ - file://purple-OE-branding-25.patch;patch=1 \ - file://pidgin-cross-python.patch;patch=1 \ - " +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ + file://sanitize-configure.ac.patch;patch=1 \ + file://gconf-no-errors.patch;patch=1 \ + file://pidgin.desktop-set-icon.patch;patch=1 \ + file://purple-OE-branding-25.patch;patch=1 \ + file://pidgin-cross-python.patch;patch=1 \ +" -EXTRA_OECONF += " --disable-gtkspell \ - --disable-meanwhile \ - --disable-nm \ - --disable-screensaver \ - " +EXTRA_OECONF += "\ + --disable-gtkspell \ + --disable-meanwhile \ + --disable-nm \ + --disable-screensaver \ +" diff --git a/packages/wmiconfig/wmiconfig_svn.bb b/packages/wmiconfig/wmiconfig_svn.bb new file mode 100644 index 0000000000..bcf78679b9 --- /dev/null +++ b/packages/wmiconfig/wmiconfig_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Atheros 6K Wifi configuration utility" +LICENSE = "GPL" +SECTION = "console/network" +PV = "0.0.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=AR6kSDK.build_sw.18;proto=http" +S = "${WORKDIR}/AR6kSDK.build_sw.18/host/tools/wmiconfig" + +export CC := "${CC}" + +do_install() { + install -d ${D}${bindir} + install -m 0755 wmiconfig ${D}${bindir} +} + |