diff options
| -rw-r--r-- | conf/machine/ep93xx.conf | 7 | ||||
| -rw-r--r-- | packages/glibmm/glibmm_2.4.5.bb | 27 | ||||
| -rw-r--r-- | packages/glibmm/glibmm_2.6.1.bb | 28 | ||||
| -rw-r--r-- | packages/lirc/lirc_0.8.0.bb | 2 | ||||
| -rw-r--r-- | packages/opie-pimconverter/opie-pimconverter.inc | 2 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar.inc | 2 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_1.2.1.bb | 2 | ||||
| -rw-r--r-- | packages/opie-taskbar/opie-taskbar_cvs.bb | 2 |
8 files changed, 11 insertions, 61 deletions
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf index c94315ee10..040f00a6e2 100644 --- a/conf/machine/ep93xx.conf +++ b/conf/machine/ep93xx.conf @@ -9,6 +9,11 @@ IPKG_ARCHS = "all arm armv5te ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" +#don't try to access tty1 +USE_VT = "0" + + + #ship in rootfs: EP93XX_MODULES = "apm \ pcmcia-core \ @@ -23,7 +28,7 @@ SERIAL_CONSOLE = "57600 ttyAM0" # used by some images ROOT_FLASH_SIZE = "8" #extra jffs2 tweaks -EXTRA_IMAGECMD_jffs2 = "--pad=0x500000 " +EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x40000 --pad=0x500000 " #tune for ep93xx cpus #can be used for crunch support later on diff --git a/packages/glibmm/glibmm_2.4.5.bb b/packages/glibmm/glibmm_2.4.5.bb deleted file mode 100644 index d799cfb9f8..0000000000 --- a/packages/glibmm/glibmm_2.4.5.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "C++ bindings for the glib library." -HOMEPAGE = "http://www.gtkmm.org/" -SECTION = "libs" -PRIORITY = "optional" -MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>" -LICENSE = "LGPL" -DEPENDS = "gtk+ libsigc++-2.0" -PR = "r2" - -SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.4/glibmm-${PV}.tar.bz2" - -inherit autotools pkgconfig flow-lossage - -FILES_${PN} = "${libdir}/lib*.so.*" - -LIBV = "2.4.0" - -do_stage () { - oe_libinstall -so -C glib/glibmm libglibmm-2.4 ${STAGING_LIBDIR} - oe_libinstall -so -C tools/extra_defs_gen libglibmm_generate_extra_defs-2.4 ${STAGING_LIBDIR} - - autotools_stage_includes - - install -m 0644 glib/glibmmconfig.h ${STAGING_INCDIR}/glibmm-2.4 - - install -m 0644 scripts/glibmm_check_perl.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/glibmm/glibmm_2.6.1.bb b/packages/glibmm/glibmm_2.6.1.bb deleted file mode 100644 index 58944c0f69..0000000000 --- a/packages/glibmm/glibmm_2.6.1.bb +++ /dev/null @@ -1,28 +0,0 @@ -DEFAULT_PREFERENCE = "-1" -DESCRIPTION = "C++ bindings for the glib library." -HOMEPAGE = "http://www.gtkmm.org/" -SECTION = "libs" -PRIORITY = "optional" -MAINTAINER = "Johan Bilien <jobi@via.ecp.fr>" -LICENSE = "LGPL" -DEPENDS = "gtk+ libsigc++-2.0" -PR = "r3" - -SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.6/glibmm-${PV}.tar.bz2" - -inherit autotools pkgconfig flow-lossage - -FILES_${PN} = "${libdir}/lib*.so.*" - -LIBV = "2.6.0" - -do_stage () { - oe_libinstall -so -C glib/glibmm libglibmm-2.4 ${STAGING_LIBDIR} - oe_libinstall -so -C tools/extra_defs_gen libglibmm_generate_extra_defs-2.4 ${STAGING_LIBDIR} - - autotools_stage_includes - - install -m 0644 glib/glibmmconfig.h ${STAGING_INCDIR}/glibmm-2.6 - - install -m 0644 scripts/glibmm_check_perl.m4 ${STAGING_DATADIR}/aclocal/ -} diff --git a/packages/lirc/lirc_0.8.0.bb b/packages/lirc/lirc_0.8.0.bb index 69d054ceae..2d36b4e74d 100644 --- a/packages/lirc/lirc_0.8.0.bb +++ b/packages/lirc/lirc_0.8.0.bb @@ -44,7 +44,6 @@ do_stage() { do_install_append() { install -d ${D}${sysconfdir}/init.d install ${WORKDIR}/lircd.init ${D}${sysconfdir}/init.d/lircd - install ${WORKDIR}/lircexec.init ${D}${sysconfdir}/init.d/lircexec install -d ${D}${datadir}/lirc/ cp -pPR ${S}/remotes ${D}${datadir}/lirc/ rm -rf ${D}/dev @@ -54,6 +53,7 @@ do_install_append_nslu2() { install -d ${D}${sysconfdir} install ${WORKDIR}/lircd.conf_nslu2 ${D}${sysconfdir}/lircd.conf install ${WORKDIR}/lircrc_nslu2 ${D}${sysconfdir}/lircrc + install ${WORKDIR}/lircexec.init ${D}${sysconfdir}/init.d/lircexec } PACKAGES =+ "lirc-x lirc-exec lirc-remotes" diff --git a/packages/opie-pimconverter/opie-pimconverter.inc b/packages/opie-pimconverter/opie-pimconverter.inc index 2bc2c2249c..4ed8d0a6b5 100644 --- a/packages/opie-pimconverter/opie-pimconverter.inc +++ b/packages/opie-pimconverter/opie-pimconverter.inc @@ -4,7 +4,7 @@ PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" DEPENDS = "sqlite3 sqlite" -RDEPENDS = "sqlite3 libsqlite-bin" +RDEPENDS = "sqlite3 sqlite-bin" APPNAME = "opimconverter" diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc index 56a81a6d6f..ffbe655b76 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -22,7 +22,7 @@ PIXMAP_SIZE_c7x0 = "-640x480" PIXMAP_SIZE_spitz = "-640x480" PIXMAP_SIZE_akita = "-640x480" PIXMAP_SIZE_borzoi = "-640x480" -# PIXMAP_SIZE_tosa = "-640x480" +PIXMAP_SIZE_tosa = "-480x640" PIXMAP_SIZE_simpad = "-800x600" inherit opie update-rc.d diff --git a/packages/opie-taskbar/opie-taskbar_1.2.1.bb b/packages/opie-taskbar/opie-taskbar_1.2.1.bb index 453bc2653c..a3b05d4294 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.1.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.1.bb @@ -1,5 +1,5 @@ include ${PN}.inc - +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index b9e6ff9720..49ca24b725 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ include ${PN}.inc - PV = "${OPIE_CVS_PV}" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ |