diff options
25 files changed, 140 insertions, 131 deletions
diff --git a/conf/machine/include/simpad-2.4.conf b/conf/machine/include/simpad-2.4.conf index 06eb56d2b6..06f12f532f 100644 --- a/conf/machine/include/simpad-2.4.conf +++ b/conf/machine/include/simpad-2.4.conf @@ -1,9 +1,14 @@ PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0" +MACHINE_FEATURES_append = "kernel24" +MACHINE_EXTRA_RRECOMMENDS = " kernel-module-sa1100-ir \ + kernel-module-sa1100usb-core kernel-module-usb-eth \ + kernel-module-pcnet-cs kernel-module-8390 " + +USE_DEVFS = "1" + +PREFERRED_PROVIDER_hostap-modules = "hostap-modules" + # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_RDEPENDS += "hostap-modules \ - pcmcia-cs apm hostap-utils wpa-supplicant-nossl" - -USE_DEVFS = "1" diff --git a/conf/machine/include/simpad-2.6.conf b/conf/machine/include/simpad-2.6.conf index 69f04f0730..e485c7bf2a 100644 --- a/conf/machine/include/simpad-2.6.conf +++ b/conf/machine/include/simpad-2.6.conf @@ -1,4 +1,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross" -BOOTSTRAP_EXTRA_RDEPENDS += "udev module-init-tools" +PCMCIA_MANAGER ?= "pcmciautils" + +MACHINE_FEATURES_append = "kernel26" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 2478ce17c9..f99d509c86 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -3,27 +3,21 @@ #@DESCRIPTION: Machine configuration for the SA1100 based SIEMENS SIMpad and Telekom T-Sinus PAD devices MACHINE_KERNEL_VERSION ?= "2.4" -require conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf TARGET_ARCH = "arm" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel" -BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \ -kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ -kernel-module-pcnet-cs kernel-module-8390" +MACHINE_TASK_PROVIDER = "task-base" +MACHINE_FEATURES = " apm pcmcia irda screen touchscreen " + +include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.conf +require conf/machine/include/tune-strongarm.conf -# This is needed for the ramdisk script to work -BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" +ROOT_FLASH_SIZE = "16" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" -EXTRA_IMAGEDEPENDS = "" -SERIAL_CONSOLE = "ttySA0 115200 vt100" GUI_MACHINE_CLASS = "bigscreen" -ROOT_FLASH_SIZE = "16" +SERIAL_CONSOLE = "ttySA0 115200 vt100" USE_VT = "0" -GPE_EXTRA_INSTALL += "suspend-desktop" - -require conf/machine/include/tune-strongarm.conf +PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index adb1356906..3a0b28cc53 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -5,7 +5,7 @@ SECTION = "network" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "expat libdaemon dbus" +DEPENDS = "expat libdaemon dbus glib-2.0" RRECOMMENDS = "libnss-mdns" RRECOMMENDS_avahi-daemon = "libnss-mdns" diff --git a/packages/linux/linux/simpad/linux-2.6.20.SIMpad.ucb1x00-switches.patch b/packages/linux/linux/simpad/linux-2.6.20.SIMpad.ucb1x00-switches.patch index 3f28d9eace..7cf2f28c89 100644 --- a/packages/linux/linux/simpad/linux-2.6.20.SIMpad.ucb1x00-switches.patch +++ b/packages/linux/linux/simpad/linux-2.6.20.SIMpad.ucb1x00-switches.patch @@ -1,6 +1,6 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/Kconfig linux-2.6.20/drivers/mfd/Kconfig --- linux-2.6.20.vanilla/drivers/mfd/Kconfig 2007-02-10 19:01:56.000000000 +0100 -+++ linux-2.6.20/drivers/mfd/Kconfig 2007-02-14 16:30:15.000000000 +0100 ++++ linux-2.6.20/drivers/mfd/Kconfig 2007-02-28 16:36:01.000000000 +0100 @@ -23,4 +23,7 @@ tristate "Touchscreen interface support" depends on MCP_UCB1200 && INPUT @@ -11,7 +11,7 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/Kconfig linux-2.6.20/drivers/mfd/Kcon endmenu diff -uNr linux-2.6.20.vanilla/drivers/mfd/Makefile linux-2.6.20/drivers/mfd/Makefile --- linux-2.6.20.vanilla/drivers/mfd/Makefile 2007-02-10 19:01:56.000000000 +0100 -+++ linux-2.6.20/drivers/mfd/Makefile 2007-02-14 16:30:15.000000000 +0100 ++++ linux-2.6.20/drivers/mfd/Makefile 2007-02-28 16:36:01.000000000 +0100 @@ -6,7 +6,7 @@ obj-$(CONFIG_MCP_SA11X0) += mcp-sa11x0.o obj-$(CONFIG_MCP_UCB1200) += ucb1x00-core.o @@ -23,8 +23,8 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/Makefile linux-2.6.20/drivers/mfd/Mak endif diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drivers/mfd/ucb1x00-switches.c --- linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20/drivers/mfd/ucb1x00-switches.c 2007-02-14 16:32:57.000000000 +0100 -@@ -0,0 +1,204 @@ ++++ linux-2.6.20/drivers/mfd/ucb1x00-switches.c 2007-02-28 16:36:43.000000000 +0100 +@@ -0,0 +1,162 @@ +/* + * linux/drivers/mfd/ucb1x00-switches.c + * @@ -52,6 +52,8 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drive + +#include "ucb1x00.h" + ++static int key [6] = { KEY_PROG1,KEY_PROG2,KEY_UP,KEY_DOWN,KEY_LEFT,KEY_RIGHT }; ++ +struct ucb1x00_switches { + struct input_dev *idev; + struct ucb1x00 *ucb; @@ -63,6 +65,7 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drive + unsigned short int this; + struct ucb1x00_switches *switches = id; + struct input_dev *idev = switches->idev; ++ + ucb1x00_enable(switches->ucb); + + this=~ucb1x00_io_read(switches->ucb); @@ -71,61 +74,16 @@ diff -uNr linux-2.6.20.vanilla/drivers/mfd/ucb1x00-switches.c linux-2.6.20/drive + } + + last=this; -+ switch (idx) { -+ -+ case 0: -+ -+ if -+ ((this & (1<<0)) != 0) input_report_key(idev, KEY_PROG1, 1); -+ else -+ input_report_key(idev, KEY_PROG1, 0); -+ break; -+ -+ case 1: -+ -+ if -+ ((this & (1<<1)) != 0) input_report_key(idev, KEY_PROG2, 1); -+ else -+ input_report_key(idev, KEY_PROG2, 0); -+ break; -+ -+ case 2: -+ -+ if -+ ((this & (1<<2)) != 0) input_report_key(idev, KEY_UP, 1); -+ else -+ input_report_key(idev, KEY_UP, 0); -+ break; -+ -+ case 3: -+ -+ if -+ ((this & (1<<3)) != 0) input_report_key(idev, KEY_DOWN, 1); -+ else -+ input_report_key(idev, KEY_DOWN, 0); -+ break; -+ -+ case 4: -+ -+ if -+ ((this & (1<<4)) != 0) input_report_key(idev, KEY_LEFT, 1); -+ else -+ input_report_key(idev, KEY_LEFT, 0); -+ break; -+ -+ case 5: -+ -+ if -+ ((this & (1<<5)) != 0) input_report_key(idev, KEY_RIGHT, 1); -+ else -+ input_report_key(idev, KEY_RIGHT, 0); -+ break; -+ -+ default: -+ ++ ++ if ((idx >=0) && (idx <=5)) { ++ if ((this & (1<<idx)) != 0) input_report_key(idev, key[idx], 1); ++ else input_report_key(idev, key[idx], 0); ++ } ++ else { + printk(KERN_DEBUG "switches-ucb1x00 is BUGGY!!! \n"); -+ ++ return; + } ++ +} + +static int ucb1x00_switches_add(struct ucb1x00_dev *dev) diff --git a/packages/linux/linux_2.6.20.bb b/packages/linux/linux_2.6.20.bb index 893856a16a..af73514988 100644 --- a/packages/linux/linux_2.6.20.bb +++ b/packages/linux/linux_2.6.20.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Linux Kernel" SECTION = "kernel" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ file://defconfig" diff --git a/packages/mrxvt/files/fix-compile.patch b/packages/mrxvt/files/fix-compile.patch index 25794dc5fd..c849ffd35e 100644 --- a/packages/mrxvt/files/fix-compile.patch +++ b/packages/mrxvt/files/fix-compile.patch @@ -1,19 +1,16 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- mrxvt-0.4.1/src/rxvt.h~fix-compile -+++ mrxvt-0.4.1/src/rxvt.h -@@ -387,15 +387,8 @@ - ** which in turn is unsafe without checking. - ** Untainted defines the type of data that is safe. - */ +Index: mrxvt-0.5.2/src/rxvt.h +=================================================================== +--- mrxvt-0.5.2.orig/src/rxvt.h ++++ mrxvt-0.5.2/src/rxvt.h +@@ -488,15 +488,8 @@ typedef char* XPointer; + * turn is unsafe without checking. Untainted defines the type of data that is + * safe. + */ -#ifdef __GNUC__ -# define $tainted -# define $untainted --# define TAINTED $tainted --# define UNTAINTED $untainted +-# define TAINTED $tainted +-# define UNTAINTED $untainted -#else -# define TAINTED -# define UNTAINTED diff --git a/packages/mrxvt/mrxvt_0.4.1.bb b/packages/mrxvt/mrxvt_0.5.2.bb index 8991295902..4a5b71f0c9 100644 --- a/packages/mrxvt/mrxvt_0.4.1.bb +++ b/packages/mrxvt/mrxvt_0.5.2.bb @@ -3,7 +3,8 @@ HOMEPAGE = "http://materm.sourceforge.net" AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>" LICENSE = "GPL" SECTION = "x11/applications" -DEPENDS = "virtual/libx11 libxext libxpm jpeg libpng" +RDEPENDS = "freetype fontconfig libxft" +DEPENDS = "freetype fontconfig libxft virtual/libx11" PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \ @@ -11,4 +12,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/materm/mrxvt-${PV}.tar.gz \ inherit autotools -EXTRA_OECONF = "--enable-everything --disable-debug" +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-everything \ + --disable-debug" diff --git a/packages/qpe-games/hexatrolic_1.0beta3.bb b/packages/qpe-games/hexatrolic_1.0beta3.bb index 241693504e..e0ca1a4084 100644 --- a/packages/qpe-games/hexatrolic_1.0beta3.bb +++ b/packages/qpe-games/hexatrolic_1.0beta3.bb @@ -14,6 +14,7 @@ S = "${WORKDIR}/${APPNAME}" do_install () { + install -d ${D}${palmtopdir}/apps/Games/ install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/pics/*.png ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games diff --git a/packages/qpe-games/labyrinth_0.7.bb b/packages/qpe-games/labyrinth_0.7.bb index f6e9299b3d..0a43be2795 100644 --- a/packages/qpe-games/labyrinth_0.7.bb +++ b/packages/qpe-games/labyrinth_0.7.bb @@ -12,6 +12,7 @@ SRC_URI = "http://handhelds.org/~zecke/oe_packages/labyrinth-0.7-zecke1.tar.gz" S = "${WORKDIR}/${APPNAME}" do_install () { + install -d ${D}${palmtopdir}/apps/Games/ install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -d ${D}${palmtopdir}/share/games/${APPNAME}/ diff --git a/packages/qpe-games/win4_1.0.1.bb b/packages/qpe-games/win4_1.0.1.bb index 3541ac9610..9813b33435 100644 --- a/packages/qpe-games/win4_1.0.1.bb +++ b/packages/qpe-games/win4_1.0.1.bb @@ -22,6 +22,7 @@ do_compile_prepend() { } do_install () { + install -d ${D}${palmtopdir}/apps/Games/ install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games diff --git a/packages/qpe-games/ziq_1.1ern.bb b/packages/qpe-games/ziq_1.1ern.bb index 972185e1d0..f51805f1d8 100644 --- a/packages/qpe-games/ziq_1.1ern.bb +++ b/packages/qpe-games/ziq_1.1ern.bb @@ -20,6 +20,7 @@ APPDESKTOP = "${S}" do_install () { + install -d ${D}${palmtopdir}/apps/Games/ install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -d ${D}${palmtopdir}/apps/Games install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ diff --git a/packages/qpe-games/zsubhunt_1.0.0ern.bb b/packages/qpe-games/zsubhunt_1.0.0ern.bb index d486058bab..0a52c0017a 100644 --- a/packages/qpe-games/zsubhunt_1.0.0ern.bb +++ b/packages/qpe-games/zsubhunt_1.0.0ern.bb @@ -18,6 +18,7 @@ APPDESKTOP = "${S}" do_install () { + install -d ${D}${palmtopdir}/apps/Games/ install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/pics/*.png ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games diff --git a/packages/qpe-games/ztappy_0.9.3ern.bb b/packages/qpe-games/ztappy_0.9.3ern.bb index 1fe3c5187a..d64a17a7cb 100644 --- a/packages/qpe-games/ztappy_0.9.3ern.bb +++ b/packages/qpe-games/ztappy_0.9.3ern.bb @@ -18,6 +18,7 @@ APPTYPE = "binary" APPDESKTOP = "${S}" do_install () { + install -d ${D}${palmtopdir}/apps/Games/ install -d ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/pics/*.png ${D}${palmtopdir}/pics/${APPNAME}/ install -m 0644 ${S}/${APPNAME}.desktop ${D}${palmtopdir}/apps/Games diff --git a/packages/rglueap/.mtn2git_empty b/packages/rglueap/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/rglueap/.mtn2git_empty diff --git a/packages/rglueap/rglueap_0.1.bb b/packages/rglueap/rglueap_0.1.bb new file mode 100644 index 0000000000..2d6cd2c41b --- /dev/null +++ b/packages/rglueap/rglueap_0.1.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Raw Glue AP" +SECTION = "console/network" +HOMEPAGE = "http://rfakeap.tuxfamily.org/#Raw_Glue_AP" +LICENSE = "GPLv2" +DEPENDS = "libpcap" + +SRC_URI = "http://rfakeap.tuxfamily.org/rglueap-${PV}.tar.gz" + +LDFLAGS += "-lpcap" + +do_install() { + install -d ${D}/${sbindir} + install -m 0755 rglueap ${D}/${sbindir} +} + diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb index 4fbf450cdf..1d05af8c4f 100644 --- a/packages/tasks/task-mokogateway.bb +++ b/packages/tasks/task-mokogateway.bb @@ -3,7 +3,7 @@ ALLOW_EMPTY = "1" PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-mokogateway-everything" -PR = "1" +PR = "2" PACKAGES = "\ task-mokogateway-everything \ @@ -21,10 +21,14 @@ RDEPENDS_task-mokogateway-everything = "${MOKOGATEWAY_PACKAGES}" DESCRIPTION_task-mokogateway-usbnet = "MokoGateway: USB Networking" RDEPENDS_task-mokogateway-usbnet = "\ + iptables \ " RRECOMMENDS_task-mokogateway-usbnet = "\ kernel-module-usbnet \ + kernel-module-cdc-acm \ kernel-module-cdc-ether \ + kernel-module-iptable-nat \ + kernel-module-ipt-masquerade \ " DESCRIPTION_task-mokogateway-bluetooth = "MokoGateway: Bluetooth" diff --git a/packages/tasks/task-sdk-opie.bb b/packages/tasks/task-sdk-opie.bb new file mode 100644 index 0000000000..34fca7bcc6 --- /dev/null +++ b/packages/tasks/task-sdk-opie.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "SDK packages for Opie" +PR = "r6" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +PACKAGES = "task-sdk-opie" + +RDEPENDS_task-sdk-opie := "\ + libopiebluez2 \ + libopiedb2 \ + libopiecore2 \ + libopienet2 \ + libopiepim2 \ + libopieui2 \ + libqpe1 \ + qte \ + libqtaux2 \ + libmailwrapper" diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index 7fa7c11322..a9814d51a1 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "SDK packages for Opie and GPE" +DESCRIPTION = "SDK packages" PR = "r5" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -6,7 +6,6 @@ ALLOW_EMPTY = "1" PACKAGES = "\ task-sdk-bare \ task-sdk-base \ - task-sdk-opie \ task-sdk-x11 \ task-sdk-x11-ext \ task-sdk-gpe" @@ -115,15 +114,3 @@ RDEPENDS_task-sdk-gpe := "\ libgpelaunch-dev \ libgpewidget-dev \ libhandoff-dev" - -RDEPENDS_task-sdk-opie := "\ - libopiebluez2 \ - libopiedb2 \ - libopiecore2 \ - libopienet2 \ - libopiepim2 \ - libopieui2 \ - libqpe1 \ - qte \ - libqtaux2 \ - libmailwrapper" diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 2fd4ad0473..92820e069c 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r4" +PR = "r5" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY = "1" @@ -18,6 +18,7 @@ ALLOW_EMPTY = "1" # The standard firmware contents and additional packages built as requirements # of the firmware are defined here in SLUGOS_STANDARD_RDEPENDS. SLUGOS_STANDARD_RDEPENDS = "" +SLUGOS_STANDARD_RRECOMMENDS = "" # diff, cpio and find are required for reflash and turnup ram. # Removing these probably leaves the system bootable, but standard @@ -27,17 +28,17 @@ SLUGOS_STANDARD_RDEPENDS = "" # udev is the default way of handling devices, there is no guarantee # that the static device table is completely correct (it is just # known to be sufficient for boot.) -SLUGOS_STANDARD_RDEPENDS += "diffutils cpio findutils udev" +SLUGOS_STANDARD_RRECOMMENDS += "diffutils cpio findutils udev" # These lines add support for formatting ext2 and ext3 file systems # on a hard disk attached to the NSLU2. ext3 is the standard Linux # file system. -SLUGOS_STANDARD_RDEPENDS += "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks" +SLUGOS_STANDARD_RRECOMMENDS += "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks" # These lines add support for an X/Y/ZModem package called lrzsz # (this is of use for people with modified NSLU2 hardware which # supports a serial port.) -SLUGOS_STANDARD_RDEPENDS += "lrzsz" +SLUGOS_STANDARD_RRECOMMENDS += "lrzsz" # Filesystem selection. Adding entries here adds the module to the # image. The module must be built as part of nslu2-kernel (i.e. it @@ -55,7 +56,7 @@ SLUGOS_STANDARD_RDEPENDS += "lrzsz" # NOTE: removing kernel-module-nfs from this list will prevent NFS # boot (however you can do a simple flash file system boot - no # attached disk - and install the nfs modules from ssh.) -SLUGOS_STANDARD_RDEPENDS += "\ +SLUGOS_STANDARD_RRECOMMENDS += "\ kernel-module-ext2 \ kernel-module-jbd \ kernel-module-ext3 \ @@ -67,31 +68,25 @@ kernel-module-nls-cp437 \ kernel-module-nls-utf8 \ " -# Until it becomes clear which of the ntfs drivers is the better -# solution, the Linux ntfs driver is commented out. -#SLUGOS_STANDARD_RDEPENDS += "\ -#kernel-module-ntfs \ -#" - # Add daemon required for HW RNG support -SLUGOS_STANDARD_RDEPENDS += "\ +SLUGOS_STANDARD_RRECOMMENDS += "\ rng-tools \ " # Add modules required for usb support -SLUGOS_STANDARD_RDEPENDS += "\ +SLUGOS_STANDARD_RRECOMMENDS += "\ kernel-module-ohci-hcd \ kernel-module-uhci-hcd \ " # Add modules required for IDE support -SLUGOS_STANDARD_RDEPENDS += "\ +SLUGOS_STANDARD_RRECOMMENDS += "\ kernel-module-libata \ kernel-module-pata-artop \ " # Add modules required for Network support -SLUGOS_STANDARD_RDEPENDS += "\ +SLUGOS_STANDARD_RRECOMMENDS += "\ kernel-module-via-velocity \ " @@ -99,20 +94,20 @@ kernel-module-via-velocity \ # NOTE: This module is desirable for systems lacking a physical # console, but is usually only enabled if specific needs or issues # arise. If space in the flash is at a premium, it can be omitted. -SLUGOS_STANDARD_RDEPENDS += "\ +SLUGOS_STANDARD_RRECOMMENDS += "\ kernel-module-netconsole \ " DEPENDS += "${DISTRO_EXTRA_DEPENDS}" -RDEPENDS += "kernel ixp4xx-npe \ +RDEPENDS += "\ + kernel ixp4xx-npe \ base-files base-passwd netbase \ busybox initscripts-slugos slugos-init \ update-modules sysvinit tinylogin \ module-init-tools modutils-initscripts \ ipkg-collateral ipkg ipkg-link \ portmap \ - dropbear \ beep \ e2fsprogs-blkid \ util-linux-mount \ @@ -122,4 +117,7 @@ RDEPENDS += "kernel ixp4xx-npe \ ${SLUGOS_STANDARD_RDEPENDS} \ ${DISTRO_EXTRA_RDEPENDS}" -RRECOMMENDS = "${DISTRO_EXTRA_RRECOMMENDS}" +RRECOMMENDS += "\ + dropbear \ + ${SLUGOS_STANDARD_RRECOMMENDS} \ + ${DISTRO_EXTRA_RRECOMMENDS}" diff --git a/packages/uboot-utils/files/fic-gta01/.mtn2git_empty b/packages/uboot-utils/files/fic-gta01/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uboot-utils/files/fic-gta01/.mtn2git_empty diff --git a/packages/uboot-utils/files/fic-gta01/fw_env.config b/packages/uboot-utils/files/fic-gta01/fw_env.config new file mode 100644 index 0000000000..9fe07672c5 --- /dev/null +++ b/packages/uboot-utils/files/fic-gta01/fw_env.config @@ -0,0 +1,6 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundand +# environment sector is assumed present. + +# MTD device name Device offset Env. size Flash sector size +/dev/mtd1 0x0000 0x4000 0x4000 diff --git a/packages/uboot-utils/files/turbostation/.mtn2git_empty b/packages/uboot-utils/files/turbostation/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/uboot-utils/files/turbostation/.mtn2git_empty diff --git a/packages/uboot-utils/files/turbostation/fw_env.config b/packages/uboot-utils/files/turbostation/fw_env.config new file mode 100644 index 0000000000..97ce8a87d4 --- /dev/null +++ b/packages/uboot-utils/files/turbostation/fw_env.config @@ -0,0 +1,15 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundand +# environment sector is assumed present. + +# MTD device name Device offset Env. size Flash sector size + +# Primary U-Boot environment. You shouldn't need to touch this. If you touch this, +# you should be *very* sure about what you're doing if you don't have a serial +# cable attached! +# /dev/mtd4 0x00000 0x20000 0x20000 + +# Secondary U-Boot environment. This is a *bit* more safe to modify, but can easily +# render your turbostation unbootable! + +/dev/mtd5 0x00000 0x20000 0x20000
\ No newline at end of file diff --git a/packages/uboot-utils/uboot-utils_1.1.2.bb b/packages/uboot-utils/uboot-utils_1.1.2.bb index 4786b238a9..292c97f134 100644 --- a/packages/uboot-utils/uboot-utils_1.1.2.bb +++ b/packages/uboot-utils/uboot-utils_1.1.2.bb @@ -3,12 +3,13 @@ SECTION = "bootloaders" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "mtd-utils" -PR = "2" +PR = "r3" SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2 \ file://fw_env.c.patch;patch=1 \ file://tools-Makefile.patch;patch=1 \ - file://env-Makefile.patch;patch=1 " + file://env-Makefile.patch;patch=1 \ + file://fw_env.config" S = "${WORKDIR}/u-boot-${PV}" EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" @@ -35,7 +36,7 @@ do_stage() { do_install () { install -d ${D}/sbin install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv - install -m 644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config } |