diff options
44 files changed, 435 insertions, 140 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 33e655dcb6..7535f63a01 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -2,18 +2,19 @@ #@NAME: OpenSlug #@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2 +DISTRO_NAME = "OpenSlug" +DISTRO_VERSION = "2.4-beta" +DISTRO_TYPE ?= "beta" + # Add to the user's feeds from local.conf (there may be none) -# not all available yet -#FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross" -#FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native" -FEED_URIS_append_linux += "oe##http://ipkg.nslu2-linux.org/feeds/openslug/oe" +FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_VERSION}" +FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_VERSION}" + # -# if you are very very brave: -#FEED_URIS_append_linux += "unstable##http://ipkg.nslu2-linux.org/feeds/openslug/unstable" +# Uncomment the following to get the unstable feeds +#FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/unstable" +#FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/openslug/native/unstable" -DISTRO_NAME = "OpenSlug" -DISTRO_VERSION = "2.2-beta" -DISTRO_TYPE ?= "beta" TARGET_FPU_local ?= "soft" TARGET_FPU := "${TARGET_FPU_local}" @@ -32,6 +33,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DE OPENSLUG_EXTRA_DEPENDS ?= "e2fsprogs reiserfsprogs upslug-native lrzsz" +# CMDLINE* macros define the kernel command line. CMDLINE_DEBUG is provided +# to enable/disable debugging in the distro. Here noirqdebug is used to +# remove the messages about unhandled interrupts - people debugging interrupt +# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) +CMDLINE_DEBUG = "noirqdebug" + # Filesystem support modules are listed in here for easy removal, # as is the lrzsz serial package and other kernel modules which are # not absolutely required for boot. diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index a922d5b4da..7a39104c63 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -6,7 +6,6 @@ IPKG_ARCHS = "all arm armv4 armv5te" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" PREFERRED_PROVIDER_virtual/bootloader = "" -#PREFERRED_PROVIDER_virtual/tslib = "tslib-maemo" XSERVER = "xserver-kdrive-omap" @@ -26,17 +25,18 @@ ROOT_FLASH_SIZE = "123" EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no-cleanmarkers" # serial console port on devboard rev. B3 -SERIAL_CONSOLE = "115200 tts/0" +#SERIAL_CONSOLE = "115200 tts/0" +SERIAL_CONSOLE = "115200 ttyS0" #build omap1 till nokia releases the patches PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils nokia770-init \ +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel sysfsutils nokia770-init \ pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" -BOOTSTRAP_EXTRA_RDEPENDS = "udev sysfsutils nokia770-init \ -pcmcia-cs apm ppp wireless-tools udev-utils console-tools" +BOOTSTRAP_EXTRA_RDEPENDS = "sysfsutils nokia770-init \ +pcmcia-cs apm ppp wireless-tools console-tools" # NFS Modules #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 1484ac191c..2ce73ac836 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -19,6 +19,14 @@ IMAGE_ROOTFS_SIZE_ext2.gz = "10240" TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" PACKAGE_ARCH = "armeb" +# Optimization settings. Os works fine and is significantly +# better than O2. The other settings are somewhat arbitrary. +# The optimisations chosen here include the ones which 'break' +# symbolic debugging (because the compiler does not include +# enough information to allow the debugger to know where given +# values are.) +FULL_OPTIMIZATION = "-fomit-frame-pointer -frename-registers -fweb -funit-at-a-time -Os" + SERIAL_CONSOLE = "115200 ttyS0" KERNEL_CONSOLE = "ttyS0,115200n8" USE_VT = "0" diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/tosa-2.4.conf index e33de0582e..22ade477e2 100644 --- a/conf/machine/tosa-2.4.conf +++ b/conf/machine/tosa-2.4.conf @@ -1,6 +1,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" -BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules \ + +BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules wlan-ng-utils virtual/kernel hostap-modules \ orinoco-modules sharp-sdmmc-support usbutils" BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm \ kernel-module-evdev kernel-module-net-fd \ diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index 3ce5924d04..7b6761b250 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -27,8 +27,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel- # Infrared Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \ kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" -# PPP Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async" #USB Gadget Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \ diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index d546ed5c09..ec58e08bef 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r37" +PR = "r38" LICENSE = "GPL" SRC_URI = " \ @@ -126,6 +126,7 @@ do_install_append_openslug() { rm -r ${D}/mnt/* rmdir ${D}/home/root install -m 0755 -d ${D}/root + ln -s ../root ${D}/home/root } PACKAGES = "${PN}-doc ${PN}" diff --git a/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch b/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch index e8b6ba59b5..0f97865c3f 100644 --- a/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch +++ b/packages/bind/bind-9.3.1/lib_dns_Makefile.in.patch @@ -5,7 +5,7 @@ gen: gen.c - ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS} -+ cc ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS} ++ ${BUILD_CC} ${EXT_CFLAGS} ${BUILD_CFLAGS} ${ALL_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS} rbtdb64.@O@: rbtdb.c diff --git a/packages/classpath/classpath_0.16.bb b/packages/classpath/classpath_0.17.bb index ec29ad9cb8..ec29ad9cb8 100644 --- a/packages/classpath/classpath_0.16.bb +++ b/packages/classpath/classpath_0.17.bb diff --git a/packages/flite/flite-1.2/configure-with-audio.patch b/packages/flite/flite-1.2/configure-with-audio.patch new file mode 100644 index 0000000000..4f320ac068 --- /dev/null +++ b/packages/flite/flite-1.2/configure-with-audio.patch @@ -0,0 +1,20 @@ +*** flite-1.2-release/configure.in~ Tue Feb 18 01:45:45 2003 +--- flite-1.2-release/configure.in Mon Jul 18 22:01:25 2005 +*************** +*** 144,150 **** + dnl + AC_ARG_WITH( audio, + [ --with-audio with specific audio support (none linux freebsd etc) ], +! AUDIODRIVER=$with_audio ) + + if test "x$AUDIODEFS" = x; then + case "$AUDIODRIVER" in +--- 144,151 ---- + dnl + AC_ARG_WITH( audio, + [ --with-audio with specific audio support (none linux freebsd etc) ], +! [AUDIODRIVER=$with_audio +! AUDIODEFS=]) + + if test "x$AUDIODEFS" = x; then + case "$AUDIODRIVER" in diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb index b8696fd829..c9a3e71e92 100644 --- a/packages/flite/flite_1.2.bb +++ b/packages/flite/flite_1.2.bb @@ -1,14 +1,15 @@ -SECTION = "console/utils" -HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/" -DESCRIPTION = "festival light speech synthesizer" +DESCRIPTION = "flite - the festival light speech synthesizer" PRIORITY = "optional" +HOMEPAGE = "http://fife.speech.cs.cmu.edu/flite/" +SECTION = "console/utils" LICENSE = "flite" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" -PR = "r1" +MAINTAINER = "Patrick Ohly <Patrick.Ohly@gmx.de>" +PR = "r2" PARALLEL_MAKE = "" SRC_URI = "http://www.speech.cs.cmu.edu/flite/packed/flite-${PV}/flite-${PV}-release.tar.bz2 \ + file://configure-with-audio.patch;patch=1 \ file://fix-read-only-assignments.patch;patch=1" S = "${WORKDIR}/flite-${PV}-release" diff --git a/packages/ftpd-topfield/files/init b/packages/ftpd-topfield/files/init index a4cd501e10..0816e8bb7d 100644 --- a/packages/ftpd-topfield/files/init +++ b/packages/ftpd-topfield/files/init @@ -2,7 +2,7 @@ DAEMON=/usr/sbin/ftpd-topfield NAME=ftpd-topfield DESC="FTP daemon for the Topfield PVR" -ARGS="-D -e" +ARGS="-D -P 21 -e" test -f $DAEMON || exit 0 diff --git a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb b/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb index 625cbe28fb..6a6665c8ed 100644 --- a/packages/ftpd-topfield/ftpd-topfield_0.5.1.bb +++ b/packages/ftpd-topfield/ftpd-topfield_0.5.2.bb @@ -8,7 +8,7 @@ LICENSE = "MIT" DEPENDS = "libusb" -SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_5_1 \ +SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_5_2 \ cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=LIBTOPFIELD_0_5_0 \ file://init" diff --git a/packages/gaim/files/desktop-name_1.4.0.patch b/packages/gaim/files/desktop-name_1.4.0.patch new file mode 100644 index 0000000000..3cfaa5771e --- /dev/null +++ b/packages/gaim/files/desktop-name_1.4.0.patch @@ -0,0 +1,11 @@ +--- gaim-1.4.0/gaim.desktop.old 2005-07-15 00:58:50.000000000 +0200 ++++ gaim-1.4.0/gaim.desktop 2005-07-15 00:59:35.000000000 +0200 +@@ -7,7 +7,7 @@ + Terminal=false + Type=Application + +-Name=Gaim Internet Messenger ++Name=Gaim + Name[ca]=Missatger d'Internet Gaim + Name[cs]=Gaim Internet Messenger + Name[da]=Gaim - internet beskeder diff --git a/packages/gaim/gaim_1.4.0.bb b/packages/gaim/gaim_1.4.0.bb new file mode 100644 index 0000000000..ec55ea5b94 --- /dev/null +++ b/packages/gaim/gaim_1.4.0.bb @@ -0,0 +1,9 @@ +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \ + file://desktop-name_1.4.0.patch;patch=1" + +include gaim.inc + +CFLAGS += "-D_GNU_SOURCE" + diff --git a/packages/gpgme/gpgme_1.0.3.bb b/packages/gpgme/gpgme_1.0.3.bb new file mode 100644 index 0000000000..8292991a89 --- /dev/null +++ b/packages/gpgme/gpgme_1.0.3.bb @@ -0,0 +1,22 @@ +LICENSE = "GPL" +SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz" +PR = "r1" + +DEPENDS = "libgpg-error pth libassuan" + +EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm" + +inherit autotools binconfig + +do_stage() { + autotools_stage_includes + + install -d ${STAGING_LIBDIR} + oe_libinstall -C gpgme -so libgpgme ${STAGING_LIBDIR} + oe_libinstall -C gpgme -so libgpgme-pth ${STAGING_LIBDIR} + oe_libinstall -C gpgme -so libgpgme-pthread ${STAGING_LIBDIR} + + install -d ${STAGING_DATADIR}/aclocal + install -m 0644 gpgme/gpgme.m4 ${STAGING_DATADIR}/aclocal/ +} + diff --git a/packages/gpsd/gpsd_2.26.bb b/packages/gpsd/gpsd_2.28.bb index cd5e223142..cd5e223142 100644 --- a/packages/gpsd/gpsd_2.26.bb +++ b/packages/gpsd/gpsd_2.28.bb diff --git a/packages/gpsdrive/gpsdrive_2.10pre3.bb b/packages/gpsdrive/gpsdrive_2.10pre3.bb new file mode 100644 index 0000000000..0dc0bdbe7d --- /dev/null +++ b/packages/gpsdrive/gpsdrive_2.10pre3.bb @@ -0,0 +1,30 @@ +inherit autotools pkgconfig + +PR = "r0" +DEFAULT_PREFERENCE="-1" + +PACKAGES += "gpsdrive-add" +DESCRIPTION = "GPS navigation/map display software" +DEPENDS = "virtual/libc gtk+ pcre gpsd" +RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" +SECTION = "x11" +PRIORITY = "optional" +LICENSE = "GPL" + +SRC_URI = "http://www.ostertag.name/tweety/Projekte/gpsdrive/gpsdrive-2.10pre3.tar.gz \ + file://gpsdrive.desktop" + +CFLAGS += "-D_GNU_SOURCE" + +FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications" +FILES_${PN} += "${datadir}/${PN}" + +FILES_gpsdrive-add = "${libdir}" + +EXTRA_OECONF = "--disable-garmin" + +do_install_append () { + mkdir -p ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/gpsdrive.desktop ${D}${datadir}/applications/gpsdrive.desktop +} diff --git a/packages/kdepimpi/kdepimpi_2.1.13.bb b/packages/kdepimpi/kdepimpi_2.1.16.bb index f3dde1a2fd..f3dde1a2fd 100644 --- a/packages/kdepimpi/kdepimpi_2.1.13.bb +++ b/packages/kdepimpi/kdepimpi_2.1.16.bb diff --git a/packages/kdepimpi/pwmpi_2.1.13.bb b/packages/kdepimpi/pwmpi_2.1.16.bb index 904f640955..904f640955 100644 --- a/packages/kdepimpi/pwmpi_2.1.13.bb +++ b/packages/kdepimpi/pwmpi_2.1.16.bb diff --git a/packages/libgpelaunch/libgpelaunch_0.12.bb b/packages/libgpelaunch/libgpelaunch_0.12.bb index 3178955d79..d42414d0d0 100644 --- a/packages/libgpelaunch/libgpelaunch_0.12.bb +++ b/packages/libgpelaunch/libgpelaunch_0.12.bb @@ -2,7 +2,7 @@ LICENSE = "LGPL" DESCRIPTION = "GPE program launcher library" SECTION = "libs" MAINTAINER = "Philip Blundell <pb@handhelds.org>" -DEPENDS = "gtk+ startup-notification" +DEPENDS = "gtk+ libgpewidget startup-notification" inherit autotools pkgconfig diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 index 8e4712da4f..b6b7cbc17d 100644 --- a/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.12-mm1/defconfig-c7x0 @@ -724,13 +724,13 @@ CONFIG_PCMCIA_PCNET=m # Wan interfaces # # CONFIG_WAN is not set -CONFIG_PPP=m +CONFIG_PPP=y # CONFIG_PPP_MULTILINK is not set # CONFIG_PPP_FILTER is not set -CONFIG_PPP_ASYNC=m +CONFIG_PPP_ASYNC=y # CONFIG_PPP_SYNC_TTY is not set # CONFIG_PPP_DEFLATE is not set -CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_BSDCOMP=y # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb index fc519ecfbc..fe94202c9d 100644 --- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r4" +PR = "r5" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc index 44f466ef49..f5d7135c88 100644 --- a/packages/linux/nslu2-kernel.inc +++ b/packages/linux/nslu2-kernel.inc @@ -211,10 +211,12 @@ inherit kernel ARCH = "arm" KERNEL_IMAGETYPE = "zImage" -# To specify the console set KERNEL_CONSOLE in the .bb -# file. The default is currently set in machine/nslu2.conf +# To specify the console set KERNEL_CONSOLE in the .bb file. +# CMDLINE_ROOT contains the boot options CMDLINE_ROOT ?= "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc reboot=s" -CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}" +# Add distro specific debug (or non-debug) options to this +CMDLINE_DEBUG ?= "" +CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}" # Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as # required. Notice that this has to be done for each separately built diff --git a/packages/lzma/lzma-native_4.17.bb b/packages/lzma/lzma-native_4.17.bb index a47cd1d8da..174ed700e4 100644 --- a/packages/lzma/lzma-native_4.17.bb +++ b/packages/lzma/lzma-native_4.17.bb @@ -1,19 +1,22 @@ DESCRIPTION = "LZMA is a general compression method. LZMA provides high compression ratio and very fast decompression." HOMEPAGE = "http://www.7-zip.org/" LICENSE = "LGPL" +PR = "r1" SRC_URI = "http://www.7-zip.org/dl/lzma417.tar.bz2 \ - file://lzma-406-zlib-stream.patch;patch=1" -S = "${WORKDIR}" + file://lzma-406-zlib-stream.patch;patch=1;pnum=2" +S = "${WORKDIR}/SRC" inherit native +CFLAGS += "-c -I${S}" + do_compile() { - make -C ${S}/SRC/7zip/Compress/LZMA_Alone - make -C ${S}/SRC/7zip/Compress/LZMA_Lib + oe_runmake -C 7zip/Compress/LZMA_Alone + oe_runmake -C 7zip/Compress/LZMA_Lib } do_stage () { - install -m 0755 ${S}/SRC/7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR} - oe_libinstall -a ${S}/SRC/7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR} + install -m 0755 7zip/Compress/LZMA_Alone/lzma ${STAGING_BINDIR} + oe_libinstall -a 7zip/Compress/LZMA_Lib/liblzma ${STAGING_LIBDIR} } diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb index 59f4ad9a24..9824134862 100644 --- a/packages/meta/gpe-image.bb +++ b/packages/meta/gpe-image.bb @@ -17,11 +17,11 @@ GPE_EXTRA_THEMES = "gtk-theme-industrial matchbox-themes-extra-industrial" #GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone" #GPE_EXTRA_INSTALL_bigscreen = "firefox linphone" -GPE_EXTRA_DEPENDS_bigscreen = "minimo figment" -GPE_EXTRA_INSTALL_bigscreen = "minimo figment gpe-task-games ${GPE_EXTRA_THEMES}" +GPE_EXTRA_DEPENDS_bigscreen = "figment" +GPE_EXTRA_INSTALL_bigscreen = " figment gpe-task-games ${GPE_EXTRA_THEMES}" -GPE_EXTRA_DEPENDS_smallscreen = "minimo figment linphone-hh" -GPE_EXTRA_INSTALL_smallscreen = "minimo figment linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}" +GPE_EXTRA_DEPENDS_smallscreen = "gpe-mini-browser figment linphone-hh" +GPE_EXTRA_INSTALL_smallscreen = "gpe-mini-browser figment linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}" #h3900 has 32mb of *useable* flash #GPE_EXTRA_DEPENDS_append_h3900 = " vlc-gpe " diff --git a/packages/mozilla/minimo/host_ldflags_fix.patch b/packages/mozilla/minimo/host_ldflags_fix.patch index 06028c9bf9..f4ff51fae1 100644 --- a/packages/mozilla/minimo/host_ldflags_fix.patch +++ b/packages/mozilla/minimo/host_ldflags_fix.patch @@ -1,9 +1,4 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- mozilla/nsprpub/config/rules.mk~host_ldflags_fix.patch +--- mozilla/nsprpub/config/rules.mk.old +++ mozilla/nsprpub/config/rules.mk @@ -87,6 +87,9 @@ CCC=$(HOST_CXX) @@ -15,12 +10,12 @@ endif endif endif ---- mozilla/configure.in~host_ldflags_fix.patch +--- mozilla/configure.in.old +++ mozilla/configure.in -@@ -5496,12 +5496,17 @@ +@@ -6098,12 +6098,17 @@ if test -n "$CROSS_COMPILE"; then - if test -z "$HOST_LIBIDL_CONFIG"; then + if test -z "$HOST_LIBIDL_CONFIG"; then + AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined]) HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" fi @@ -35,12 +30,12 @@ HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" HOST_LIBIDL_LIBS="$LIBIDL_LIBS" fi ---- mozilla/configure~host_ldflags_fix.patch +--- mozilla/configure.old +++ mozilla/configure -@@ -16289,11 +16289,18 @@ +@@ -17604,11 +17604,18 @@ if test -n "$CROSS_COMPILE"; then - if test -z "$HOST_LIBIDL_CONFIG"; then + if test -z "$HOST_LIBIDL_CONFIG"; then + echo "HOST_LIBIDL_CONFIG nto defined" HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" fi diff --git a/packages/openslug-init/openslug-init-0.10/functions b/packages/openslug-init/openslug-init-0.10/functions index ac8e195abd..55f3397462 100755 --- a/packages/openslug-init/openslug-init-0.10/functions +++ b/packages/openslug-init/openslug-init-0.10/functions @@ -209,10 +209,13 @@ ifup(){ # is not left running so this will only work for # the lease length time! ifconfig "$iface" up - test -n "$hostname" && HOSTNAME="-H $hostname" - # The script writes the required shell variable assignments - # to file descriptor 9 - eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null) + if test "$(config boot)" != static + then + test -n "$hostname" && HOSTNAME="-H $hostname" + # The script writes the required shell variable assignments + # to file descriptor 9 + eval $(udhcpc -i "$iface" -n -q -r "$ip" $HOSTNAME -s /boot/udhcpc.script 9>&1 >/dev/null) + fi test -n "$broadcast" && BROADCAST="broadcast $broadcast" test -n "$subnet" && NETMASK="netmask $subnet" @@ -236,11 +239,18 @@ ifdown(){ ifconfig "$1" down } # -# mountflash "flash root directory" {mount options} +# mountflash "flash device" "flash root directory" {mount options} # Finds and mounts the flash file system on the given directory mountflash() { local ffsdev ffsdir + ffsdev="$1" + test -n "$ffsdev" -a -b "$ffsdev" || { + echo "$0: unable to find flash file system to copy ($ffsdev)" >&2 + return 1 + } + shift + ffsdir="$1" test -n "$ffsdir" -a -d "$ffsdir" || { echo "$0: mountflash $ffsdir: not a directory (internal error)" >&2 @@ -248,14 +258,71 @@ mountflash() { } shift - ffsdev="$(mtblockdev Flashdisk)" - test -n "$ffsdev" -a -b "$ffsdev" || { - echo "$0: unable to find flash file system to copy ($ffsdev)" >&2 - return 1 - } mount -t jffs2 "$@" "$ffsdev" "$ffsdir" || { echo "$0: $ffsdev: unable to mount flash file system on $ffsdir" >&2 return 1 } return 0 } +# +# umountflash [-r] "flash device" +# unmount any instance of the given flash device, if -r is specified a mount on +# root is an error, otherwise a mount on root is ignored (and remains). +umountflash() { + local rootok ffsno ffsdev + rootok=1 + case "$1" in + -r) rootok= + shift;; + esac + # + # The argument is ffsdev + ffsdev="$1" + ffsno="$(devio "<<$ffsdev" prd)" + test -n "$ffsno" -a "$ffsno" -ge 0 || { + echo "$0: $ffsdev: device number $ffsno is not valid, cannot continue." >&2 + return 1 + } + # + # Make sure that Flashdisk isn't mounted on / + if test -z "$rootok" -a "$(devio "<</etc/init.d/sysconfsetup" prd)" -eq "$ffsno" + then + echo "$0: $ffsdev is mounted on /, use turnup ram" >&2 + return 1 + fi + # + # The function is currently always used interactively, so output + echo "$0: umounting any existing mount of $ffsdev" >&2 + # + # check each mount point, do this last first because otherwise nested + # mounts of ffsdev cannot be umounted. + ffs_umount() { + local device mp type options stuff + + read device mp type options stuff + test -z "$device" && return 0 + + # handle following entries first + ffs_umount || return 1 + + # handle this entry, since this is currently only used for unmounting + # the flash root partition we know a file which must exist... + case |