summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/arm-kernel-shim/arm-kernel-shim_1.4.bb77
-rw-r--r--packages/gdado/.mtn2git_empty (renamed from packages/gloox/.mtn2git_empty)0
-rw-r--r--packages/gdado/gdado_2.2.bb15
-rw-r--r--packages/gloox/gloox_0.8.1.bb15
-rw-r--r--packages/gnome/gconf-dbus_svn.bb27
-rw-r--r--packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb2
-rw-r--r--packages/iksemel/.mtn2git_empty0
-rw-r--r--packages/iksemel/iksemel_1.2.bb14
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.20.bb2
-rw-r--r--packages/nunome/nunome_1.0.2.bb (renamed from packages/nunome/nunome_1.0.1.bb)3
10 files changed, 108 insertions, 47 deletions
diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb
new file mode 100644
index 0000000000..3b20d33a7c
--- /dev/null
+++ b/packages/arm-kernel-shim/arm-kernel-shim_1.4.bb
@@ -0,0 +1,77 @@
+DESCRIPTION = "ARM Kernel Shim"
+SECTION = ""
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+# PR = "r0"
+
+COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
+
+SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \
+ file://passthrough-atags.patch;patch=1 \
+ file://cmdline_if_none.patch;patch=1 \
+ file://config-nslu2.h \
+ file://config-nas100d.h \
+ file://config-dsmg600.h \
+ file://config-fsg3.h"
+
+S = ${WORKDIR}/arm-kernel-shim-${PV}/1.3
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+ mv ${S}/config.h ${S}/config.h.orig
+ # NSLU2
+ if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+ sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+ ${WORKDIR}/config-nslu2.h > ${S}/config.h
+ else
+ sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+ ${WORKDIR}/config-nslu2.h > ${S}/config.h
+ fi
+ rm -f ${S}/main.o
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed"
+ # NAS100d
+ if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+ sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+ ${WORKDIR}/config-nas100d.h > ${S}/config.h
+ else
+ sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+ ${WORKDIR}/config-nas100d.h > ${S}/config.h
+ fi
+ rm -f ${S}/main.o
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed"
+ # DSMG-600
+ if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+ sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+ ${WORKDIR}/config-dsmg600.h > ${S}/config.h
+ else
+ sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+ ${WORKDIR}/config-dsmg600.h > ${S}/config.h
+ fi
+ rm -f ${S}/main.o
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed"
+ # FSG-3
+ if [ ${SITEINFO_ENDIANESS} == "be" ] ; then
+ sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
+ ${WORKDIR}/config-fsg3.h > ${S}/config.h
+ else
+ sed -e 's|//#define FORCE_LITTLEENDIAN|#define FORCE_LITTLEENDIAN|' \
+ ${WORKDIR}/config-fsg3.h > ${S}/config.h
+ fi
+ rm -f ${S}/main.o
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed"
+ mv ${S}/config.h.orig ${S}/config.h
+}
+
+do_populate_staging() {
+ install -d ${STAGING_LOADER_DIR}
+ cp ${S}/arm-kernel-shim-nslu2.bin ${STAGING_LOADER_DIR}/
+ cp ${S}/arm-kernel-shim-nas100d.bin ${STAGING_LOADER_DIR}/
+ cp ${S}/arm-kernel-shim-dsmg600.bin ${STAGING_LOADER_DIR}/
+ cp ${S}/arm-kernel-shim-fsg3.bin ${STAGING_LOADER_DIR}/
+}
diff --git a/packages/gloox/.mtn2git_empty b/packages/gdado/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/gloox/.mtn2git_empty
+++ b/packages/gdado/.mtn2git_empty
diff --git a/packages/gdado/gdado_2.2.bb b/packages/gdado/gdado_2.2.bb
new file mode 100644
index 0000000000..feaa6ed991
--- /dev/null
+++ b/packages/gdado/gdado_2.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "gtk+ based dice roller for RPG games"
+HOMEPAGE = "http://gdado.sf.net"
+SECTION = "x11/games"
+LICENSE = "GPLv2"
+DEPENDS = "libgnomeui gtk+"
+PR = "r1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/gdado/gdado-${PV}.tar.gz"
+
+inherit autotools
+
+do_install_prepend() {
+ sed -i -e "s|Icon=gdado.png|Icon=${datadir}/pixmaps/gdado/gdado.png|" \
+ gdado.desktop
+}
+
diff --git a/packages/gloox/gloox_0.8.1.bb b/packages/gloox/gloox_0.8.1.bb
deleted file mode 100644
index 09004a8182..0000000000
--- a/packages/gloox/gloox_0.8.1.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "GPL"
-DESCRIPTION = "full-featured Jabber/XMPP client library."
-SECTION = "networking"
-PRIORITY = "optional"
-PR = "r0"
-
-DEPENDS = "iksemel libidn gnutls"
-
-inherit autotools pkgconfig
-
-SRC_URI = "http://camaya.net/download/${P}.tar.bz2"
-
-do_stage () {
- autotools_stage_all
-}
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index 87daa1d227..0bb9765749 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -6,13 +6,10 @@ PROVIDES = "gconf"
RPROVIDES_${PN} = "gconf"
RPROVIDES_${PN}-dev = "gconf-dev"
-PV = "2.10.0+svn${SRCDATE}"
+PV = "2.16.0+svn${SRCDATE}"
PR = "r0"
SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
- file://gconf-dbus-update.patch;patch=1;pnum=0 \
- file://xml-backend-locks-compile-fix.patch;patch=1 \
- file://xml-backend-oldxml-Makefile.patch \
file://69gconfd-dbus"
inherit pkgconfig autotools
@@ -20,23 +17,22 @@ S = "${WORKDIR}/trunk"
PARALLEL_MAKE = ""
-FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
-FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug"
+FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so \
+ ${libdir}/GConf-dbus/2/*.so \
+ ${libdir}/dbus-1.0 \
+ ${sysconfdir} \
+ ${datadir}/dbus*"
+FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug \
+ ${libdir}/GConf-dbus/2/.debug ""
EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
-HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
-
-do_compile_prepend() {
- cd ${S}
- patch -p1 < ../xml-backend-oldxml-Makefile.patch
+do_configure_prepend() {
+ touch ${S}/gtk-doc.make
}
do_stage() {
- oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
- install -d ${STAGING_INCDIR}/gconf/2/gconf/
- ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
- install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+ autotools_stage_all
}
do_install_append () {
@@ -45,3 +41,4 @@ do_install_append () {
install -d ${D}/${datadir}/dbus-1.0/services/
install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
}
+
diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb
index b2ee49cf69..90fb6faf14 100644
--- a/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb
+++ b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb
@@ -6,6 +6,8 @@ DEPENDS = "gtk+ libgpewidget"
PR = "r1"
PV = "0.28+svn-${SRCDATE}"
+DEFAULT_PREFERENCE = "-1"
+
SRC_URI += "${GPE_SVN} \
file://svn-build.patch;patch=1"
diff --git a/packages/iksemel/.mtn2git_empty b/packages/iksemel/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/iksemel/.mtn2git_empty
+++ /dev/null
diff --git a/packages/iksemel/iksemel_1.2.bb b/packages/iksemel/iksemel_1.2.bb
deleted file mode 100644
index 903d8f046d..0000000000
--- a/packages/iksemel/iksemel_1.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-LICENSE = "LGPL"
-DESCRIPTION = "A simple, powerful XML-parsing library written in C."
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS = "glibc gnutls"
-PR = "r0"
-
-inherit pkgconfig autotools
-
-SRC_URI = "http://files.jabberstudio.org/iksemel/${P}.tar.gz"
-
-do_stage () {
- autotools_stage_all
-}
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index e5868232f2..8e6f1b27df 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.bb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "800"
+IXP4XX_KERNEL_SVN_REV = "821"
#
# The directory containing the patches to be applied is
# specified below
diff --git a/packages/nunome/nunome_1.0.1.bb b/packages/nunome/nunome_1.0.2.bb
index d8421c12f5..ae29277291 100644
--- a/packages/nunome/nunome_1.0.1.bb
+++ b/packages/nunome/nunome_1.0.2.bb
@@ -4,9 +4,8 @@ PRIORITY = "optional"
LICENSE = "GPL"
HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/"
RDEPENDS = "virtual/japanese-font"
-PR = "r2"
-SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-Qtopia-src-cleaned.tar.bz2 \
+SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-${PV}.tar.bz2 \
file://nunome.patch;patch=1"
S = "${WORKDIR}/nunome"