diff options
Diffstat (limited to 'packages')
42 files changed, 666 insertions, 549 deletions
diff --git a/packages/devio/devio-native.inc b/packages/devio/devio-native.inc index 1ba886c1ee..49987e6f0a 100644 --- a/packages/devio/devio-native.inc +++ b/packages/devio/devio-native.inc @@ -1,4 +1,5 @@ # Set the installation dir back to the default sbindir = "${exec_prefix}/sbin" +bindir = "${exec_prefix}/bin" inherit native diff --git a/packages/devio/devio-native_1.2.bb b/packages/devio/devio-native_1.2.bb new file mode 100644 index 0000000000..34d931be9d --- /dev/null +++ b/packages/devio/devio-native_1.2.bb @@ -0,0 +1,3 @@ +# This package builds the devio program for the build architecture +include devio.inc +include devio-native.inc diff --git a/packages/devio/devio.inc b/packages/devio/devio.inc index fadbd4892d..9d346dc43a 100644 --- a/packages/devio/devio.inc +++ b/packages/devio/devio.inc @@ -15,6 +15,10 @@ PACKAGES = "${PN}" # Set the install dir to /sbin, not /usr/sbin, because devio is used # during bootstrap (we want it to be posible to mount /usr separately) -sbindir = "/sbin" +sbindir = "${base_sbindir}" + +# From 1.2 devio installs to bindir, not sbindir, so set that to /bin +# for the same reason +bindir = "${base_bindir}" inherit autotools diff --git a/packages/devio/devio_1.2.bb b/packages/devio/devio_1.2.bb new file mode 100644 index 0000000000..38021fa141 --- /dev/null +++ b/packages/devio/devio_1.2.bb @@ -0,0 +1 @@ +include devio.inc diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb index dc891e7598..6186c70679 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb @@ -4,7 +4,7 @@ SECTION = "gpe" PRIORITY = "optional" MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" -DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus" +DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus libglade blueprobe bluez-utils-dbus libcontactsdb" RDEPENDS = "bluez-utils-dbus blueprobe" GPE_TARBALL_SUFFIX= "bz2" diff --git a/packages/gpe-calendar/gpe-calendar_0.69.bb b/packages/gpe-calendar/gpe-calendar_0.69.bb new file mode 100644 index 0000000000..3c8fbbc148 --- /dev/null +++ b/packages/gpe-calendar/gpe-calendar_0.69.bb @@ -0,0 +1,12 @@ +LICENSE = "GPL" +PR = "r0" +GPE_TARBALL_SUFFIX = "bz2" +MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>" + +inherit autotools gpe + +DEPENDS = "libeventdb libschedule libxsettings-client libgpepimc libgpevtype" +SECTION = "gpe" +RDEPENDS = "gpe-icons" +DESCRIPTION = "GPE calendar" + diff --git a/packages/ipkg-utils/ipkg-link_1.6cvs20050404.bb b/packages/ipkg-utils/ipkg-link_1.6+cvs20050404.bb index bcd3c7b1a0..826a9fbdb6 100644 --- a/packages/ipkg-utils/ipkg-link_1.6cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-link_1.6+cvs20050404.bb @@ -2,7 +2,8 @@ SECTION = "base" DESCRIPTION = "Itsy Package Manager utilities link script" LICENSE = "GPL" CONFLICTS = "ipkg-utils" -PR = "r2" +SRCDATE = "20050404" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils" diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb index 9c1ab32963..ef9701ecad 100644 --- a/packages/ipkg-utils/ipkg-utils-native_1.6cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb @@ -1,7 +1,7 @@ include ipkg-utils_${PV}.bb RDEPENDS = "python-native" -PR = "r5" +PR = "r6" inherit native diff --git a/packages/ipkg-utils/ipkg-utils_1.6cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb index b0acd94954..12ed042f15 100644 --- a/packages/ipkg-utils/ipkg-utils_1.6cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb @@ -4,7 +4,8 @@ PRIORITY = "optional" LICENSE = "GPL" CONFLICTS = "ipkg-link" RDEPENDS = "python" -PR = "r10" +SRCDATE = "20050404" +PR = "r11" SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils" diff --git a/packages/qpealarmclock/qpealarmclock-1.0.4/.mtn2git_empty b/packages/libxsettings-client/libxsettings-client-0.16/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/qpealarmclock/qpealarmclock-1.0.4/.mtn2git_empty +++ b/packages/libxsettings-client/libxsettings-client-0.16/.mtn2git_empty diff --git a/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch b/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch new file mode 100644 index 0000000000..fb5b1dbe65 --- /dev/null +++ b/packages/libxsettings-client/libxsettings-client-0.16/Makefile-am.patch @@ -0,0 +1,11 @@ +--- libxsettings-client-0.16/Makefile.am.orig 2006-01-17 16:01:21.000000000 +0000 ++++ libxsettings-client-0.16/Makefile.am 2006-01-17 16:01:30.000000000 +0000 +@@ -3,7 +3,7 @@ + source_h = xsettings-client.h xsettings-common.h + source_c = xsettings-client.c xsettings-common.c + +-INCLUDES = -I $(includedir) $(X_CFLAGS) ++INCLUDES = $(X_CFLAGS) + + libxsincludedir = $(includedir) + diff --git a/packages/libxsettings-client/libxsettings-client_0.16.bb b/packages/libxsettings-client/libxsettings-client_0.16.bb index 5f5d618695..0e54f6088b 100644 --- a/packages/libxsettings-client/libxsettings-client_0.16.bb +++ b/packages/libxsettings-client/libxsettings-client_0.16.bb @@ -3,10 +3,12 @@ LICENSE = "BSD-X" PRIORITY = "optional" DEPENDS = "libxsettings x11" MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" +PR="r1" inherit autotools pkgconfig gpe -SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2" +SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \ + file://Makefile-am.patch;patch=1" headers = "xsettings-client.h xsettings-common.h" diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index a0e149623e..b9d09c0565 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -167,7 +167,9 @@ CMDLINE_ROOT ?= "" # override in local.conf etc CMDLINE_DEBUG ?= "" -CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}" +CMDLINE = "${CMDLINE_ROOT}" +CMDLINE += "${CMDLINE_DEBUG}" +CMDLINE += "${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 @@ -246,31 +248,46 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}-${IXP4XX_SUFFIX}-${KERNEL_RELEAS # MACHINE DEFINITIONS: one block for each machine # The correct settings for the NSLU2 board: -nslu2_CMDLINE_ROOT = "root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M init=/linuxrc" nslu2_MACHID = "597" PACKAGES += "kernel-image-nslu2" PKG_kernel-image-nslu2 = "kernel-image-${KERNEL_VERSION}" PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${ARCH_BYTE_SEX}" -DESCRIPTION_kernel-image-nas100d = "Linux kernel for the LinkSys NSLU2" -FILES_kernel-image-nslu2 = "/boot/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE}" +DESCRIPTION_kernel-image-nslu2 = "Linux kernel for the LinkSys NSLU2" +FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE}" +pkg_postinst_kernel-image-nslu2 () { + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true +} +pkg_postrm_kernel-image-nslu2 () { + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true +} # The correct settings for Loft: -loft_CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M init=/linuxrc" loft_MACHID = "849" PACKAGES += "kernel-image-loft" PKG_kernel-image-loft = "kernel-image-${KERNEL_VERSION}" PACKAGE_ARCH_kernel-image-loft = "loft${ARCH_BYTE_SEX}" DESCRIPTION_kernel-image-loft = "Linux kernel for the Giant Shoulder Inc. Loft board" -FILES_kernel-image-loft = "/boot/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE}" +FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE}" +pkg_postinst_kernel-image-loft () { + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true +} +pkg_postrm_kernel-image-loft () { + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true +} # The correct settings for the NAS100D board: -nas100d_CMDLINE_ROOT = "root=/dev/mtdblock2 rw rootfstype=jffs2 mem=64M init=/linuxrc" nas100d_MACHID = "865" PACKAGES += "kernel-image-nas100d" PKG_kernel-image-nas100d = "kernel-image-${KERNEL_VERSION}" PACKAGE_ARCH_kernel-image-nas100d = "nas100d${ARCH_BYTE_SEX}" DESCRIPTION_kernel-image-nas100d = "Linux kernel for the IOMega NAS100D" -FILES_kernel-image-nas100d = "/boot/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE}" +FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE}" +pkg_postinst_kernel-image-nas100d () { + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE} ${KERNEL_PRIORITY} || true +} +pkg_postrm_kernel-image-nas100d () { + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${ARCH_BYTE_SEX}-${KERNEL_RELEASE} || true +} #FIXUP: the correct instructions to copy the kernel prepended with the le fixup #FIXME: do a fixup for BE too... @@ -279,19 +296,23 @@ FIXUP_arm = "wb 0xee110f10,4;wb 0xe3c00080,4;wb 0xee010f10,4;xp $,4" DEPENDS += "devio-native" +# We need the alternatives to happen in the kernel-image packages, not in +# the kernel package, because only the images know the name of the kernel. +pkg_postinst_kernel () { +} +pkg_postrm_kernel () { +} + # copy_image <dest> <cmdline> <machine-id> # copy the zImage and append the appropriate shim # dest: where to copy to # cmdline: command line to pass to image # machine-id: decimal machine id to prepend, empty for none copy_image() { - local cmdline setmach - - cmdline="" - test -n "$2" && cmdline="$2"' ${CMDLINE_KERNEL_OPTIONS} ${CMDLINE_DEBUG} ${CMDLINE_CONSOLE}' + local setmach setmach="" - test -n "$3" && setmach="wb $3 . 256/ 255& 0xe3a01c00+, 4; wb 255& 0xe3811000+, 4;" + test -n "$2" && setmach="wb $2 . 256/ 255& 0xe3a01c00+, 4; wb 255& 0xe3811000+, 4;" rm -f "$1".new devio '<<${KERNEL_OUTPUT}' >"$1".new "$setmach"'${FIXUP}' || { @@ -302,7 +323,7 @@ copy_image() { } install_image() { - copy_image '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-'"$1"'-${KERNEL_RELEASE}' "$2" "$3" + copy_image '${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-'"$1"'-${KERNEL_RELEASE}' "$2" } do_install_append() { @@ -312,15 +333,15 @@ do_install_append() { install_image '${IXP4XX_SUFFIX}' # Add the machine specific images, with appropriate suffixes - install_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_CMDLINE_ROOT}' '${nslu2_MACHID}' - install_image 'loft${ARCH_BYTE_SEX}' '${loft_CMDLINE_ROOT}' '${loft_MACHID}' - install_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_CMDLINE_ROOT}' '${nas100d_MACHID}' + install_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_MACHID}' + install_image 'loft${ARCH_BYTE_SEX}' '${loft_MACHID}' + install_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_MACHID}' } do_deploy[dirs] = "${S}" deploy_image() { - copy_image '${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-'"$1" "$2" "$3" + copy_image '${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-'"$1" "$2" } do_deploy() { @@ -328,9 +349,9 @@ do_deploy() { deploy_image '${IXP4XX_SUFFIX}' # And the machine specific images - deploy_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_CMDLINE_ROOT}' '${nslu2_MACHID}' - deploy_image 'loft${ARCH_BYTE_SEX}' '${loft_CMDLINE_ROOT}' '${loft_MACHID}' - deploy_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_CMDLINE_ROOT}' '${nas100d_MACHID}' + deploy_image 'nslu2${ARCH_BYTE_SEX}' '${nslu2_MACHID}' + deploy_image 'loft${ARCH_BYTE_SEX}' '${loft_MACHID}' + deploy_image 'nas100d${ARCH_BYTE_SEX}' '${nas100d_MACHID}' } addtask deploy before do_build after do_compile diff --git a/packages/linux/ixp4xx-kernel/2.6.15/48-setup-byteswap-cmdline.patch b/packages/linux/ixp4xx-kernel/2.6.15/48-setup-byteswap-cmdline.patch new file mode 100644 index 0000000000..34b515a5bf --- /dev/null +++ b/packages/linux/ixp4xx-kernel/2.6.15/48-setup-byteswap-cmdline.patch @@ -0,0 +1,48 @@ +When invoking an LE kernel from a BE boot loader or vice versa +the ATAG_CMDLINE command line will be byte swapped, other ATAGs +are fine because they are 32 bit values. + +This patch adds support for a command line option "swx " - which +must be at the start of the command line - and which is used to +detect a need to byte swap the rest of the command line. + +Signed-off-by: John Bowler <jbowler@acm.org> + +--- linux-2.6.15/arch/arm/kernel/setup.c 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.15/arch/arm/kernel/setup.c 1970-01-01 00:00:00.000000000 +0000 +@@ -659,7 +659,34 @@ __tagtable(ATAG_REVISION, parse_tag_revi + + static int __init parse_tag_cmdline(const struct tag *tag) + { +- strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE); ++ /* Check the first four bytes for "swx " (swap, but it's ++ * ok) or " xws" (command line is byte swapped) ++ */ ++ const char *cmdline = tag->u.cmdline.cmdline; ++ u32 size = tag->hdr.size; ++ ++ if (size > 0 && !memcmp(cmdline, " xws", 4)) { ++ cmdline += 4; ++ ++ if (--size > 0) { ++ const u32 *from = (const u32*)cmdline; ++ u32 *to = (u32*)default_command_line; ++ ++ if (size > COMMAND_LINE_SIZE/4) ++ size = COMMAND_LINE_SIZE/4; ++ ++ while (size-- > 0) ++ to[size] = swab32(from[size]); ++ ++ default_command_line[COMMAND_LINE_SIZE-1] = 0; ++ return 0; ++ } ++ } ++ ++ if (size > 0 && !memcmp(cmdline, "swx ", 4)) ++ cmdline += 4; ++ ++ strlcpy(default_command_line, cmdline, COMMAND_LINE_SIZE); + return 0; + } + diff --git a/packages/linux/ixp4xx-kernel/2.6.15/94-loft-setup.patch b/packages/linux/ixp4xx-kernel/2.6.15/94-loft-setup.patch deleted file mode 100644 index 9114f3cddd..0000000000 --- a/packages/linux/ixp4xx-kernel/2.6.15/94-loft-setup.patch +++ /dev/null @@ -1,87 +0,0 @@ -Include a fixup machine start function in the loft part of -ixdp425-setup.c to handle the command line and memory setup -parameters which are not specifiable in the boot loader. - -Signed-off-by: John Bowler <jbowler@acm.org> - - ---- linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-setup.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.15/arch/arm/mach-ixp4xx/ixdp425-setup.c 1970-01-01 00:00:00.000000000 +0000 -@@ -191,8 +191,8 @@ MACHINE_END - /* - * Loft is functionally equivalent to Avila except that it has a - * different number for the maximum PCI devices. The MACHINE -- * structure below is identical to Avila except for the and -- * the use of a loft specific init. -+ * structure below is derived from the Avila one (and may, in -+ * fact, be useful on Avila in general). - * - * The loft init registers a notifier on the on-board EEPROM to - * detect the MAC addresses. -@@ -201,6 +201,58 @@ MACHINE_END - */ - #ifdef CONFIG_MACH_LOFT - /* -+ * Loft bootstrap may pass in parameters, if these contain an -+ * ATAG_MEM and it appears valid (not the 16MByte one in the -+ * setup/kernel.c default) we use it, otherwise a 64MByte -+ * setting is forced here, this may be overridden on the -+ * command line. -+ */ -+static void __init loft_fixup(struct machine_desc *desc, -+ struct tag *tags, char **cmdline, struct meminfo *mi) -+{ -+ char saved_command_line[COMMAND_LINE_SIZE]; -+ /* Put Loft specific known-required-for-certain stuff here, leave -+ * a trailing space! -+ */ -+ static char loft_command_line[] = -+ "root=/dev/mtdblock2 rw rootfstype=jffs2 init=/linuxrc " -+ "rtc-ds1672.probe=0,0x68 rtc-ds1672.hctosys=1 "; -+ const int len = (sizeof loft_command_line)-1; -+ int memtag = 0; -+ -+ /* The Loft typically has one bank of 64MByte memory. -+ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove -+ * the mem tags from the tag list, so if there is an entry -+ * there don't remove it! -+ */ -+ if (tags->hdr.tag == ATAG_CORE) do { -+ tags = tag_next(tags); -+ printk(KERN_NOTICE "ATAG[0x%x] size %d\n", tags->hdr.tag, tags->hdr.size); -+ if (tags->hdr.tag == ATAG_MEM && tags->hdr.size == tag_size(tag_mem32) && -+ (tags->u.mem.start != 0 || tags->u.mem.size != (16*1024*1024))) { -+ memtag = 1; -+ printk(KERN_NOTICE " ATAG_MEM base %lx size %lx\n", -+ tags->u.mem.start, tags->u.mem.size); -+ } -+ } while (tags->hdr.size); -+ -+ if (!memtag) { -+ mi->nr_banks=1; -+ mi->bank[0].start = 0; -+ mi->bank[0].size = (64*1024*1024); -+ mi->bank[0].node = PHYS_TO_NID(0); -+ } -+ -+ /* A command line in the ATAG list will override this one, -+ * as is intended. -+ */ -+ memcpy(saved_command_line, *cmdline, COMMAND_LINE_SIZE); -+ memcpy(*cmdline, loft_command_line, len); -+ memcpy(*cmdline + len, saved_command_line, COMMAND_LINE_SIZE - len); -+ *cmdline[COMMAND_LINE_SIZE-1] = 0; -+} -+ -+/* - * When the EEPROM is added the MAC address are read from it. - */ - static void loft_eeprom_add(int address, int kind, struct kobject *kobj, -@@ -252,6 +304,7 @@ MACHINE_START(LOFT, "Giant Shoulder Inc - .phys_ram = PHYS_OFFSET, - .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, - .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, -+ .fixup = loft_fixup, - .map_io = ixp4xx_map_io, - .init_irq = ixp4xx_init_irq, - .timer = &ixp4xx_timer, diff --git a/packages/linux/ixp4xx-kernel/2.6.15/94-nas100d-setup.patch b/packages/linux/ixp4xx-kernel/2.6.15/94-nas100d-setup.patch index bd766a3ccc..e451619aa1 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/94-nas100d-setup.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/94-nas100d-setup.patch @@ -15,7 +15,7 @@ Signed-off-by: John Bowler <jbowler@acm.org> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/flash.h> -@@ -164,12 +166,49 @@ static void __init nas100d_init(void) +@@ -164,12 +166,53 @@ static void __init nas100d_init(void) platform_add_devices(nas100d_devices, ARRAY_SIZE(nas100d_devices)); } @@ -24,20 +24,27 @@ Signed-off-by: John Bowler <jbowler@acm.org> + * settings to be safe (the box always has 64MByte at 0). The + * passed in command line can override this default, we prepend + * to the config'ed default. ++ * ++ * NOTE: the startup sequence is: ++ * 1) Call the machine fixup ++ * 2) Parse the ATAG list, the ATAG_CMDLINE is copied in ++ * to default_command_line which is the value of *from ++ * 3) Parse the command line in *from (*not* ++ * default_command_line unless they are the same!) ++ * ++ * Setting mi->nr_banks causes (2) to 'squash' (set to ATAG_NONE) ++ * any ATAG_MEM tags, but mem= command line options cause nr_banks ++ * to be reset to 0 (on the first mem=) + */ ++static char nas100d_command_line[] __initdata = ++ "root=/dev/mtdblock2 rootfstype=jffs2 init=/linuxrc " ++ "pcf8563.hctosys=1 " ++ CONFIG_CMDLINE; ++ +static void __init nas100d_fixup(struct machine_desc *desc, + struct tag *tags, char **cmdline, struct meminfo *mi) +{ -+ char saved_command_line[COMMAND_LINE_SIZE]; -+ /* Put NAS100D specific known-required-for-certain stuff here, leave -+ * a trailing space! -+ */ -+ static char nas100d_command_line[] = -+ "root=/dev/mtdblock2 rw rootfstype=jffs2 init=/linuxrc " -+ "pcf8563.hctosys=1 "; -+ const int len = (sizeof nas100d_command_line)-1; -+ -+ /* The NAS100D has one bank of 32MByte memory. ++ /* The NAS100D has one bank of 64MByte memory. + * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove + * the mem tags from the tag list. We need do nothing here! + */ @@ -49,10 +56,7 @@ Signed-off-by: John Bowler <jbowler@acm.org> + /* A command line in the ATAG list will override this one, + * as is intended. + */ -+ memcpy(saved_command_line, *cmdline, COMMAND_LINE_SIZE); -+ memcpy(*cmdline, nas100d_command_line, len); -+ memcpy(*cmdline + len, saved_command_line, COMMAND_LINE_SIZE - len); -+ *cmdline[COMMAND_LINE_SIZE-1] = 0; ++ strlcpy(*cmdline, nas100d_command_line, COMMAND_LINE_SIZE); +} + MACHINE_START(NAS100D, "Iomega NAS 100d") diff --git a/packages/linux/ixp4xx-kernel/2.6.15/94-nslu2-setup.patch b/packages/linux/ixp4xx-kernel/2.6.15/94-nslu2-setup.patch index 0ed39d9302..55aad7c440 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/94-nslu2-setup.patch +++ b/packages/linux/ixp4xx-kernel/2.6.15/94-nslu2-setup.patch @@ -15,47 +15,48 @@ Signed-off-by: John Bowler <jbowler@acm.org> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/flash.h> -@@ -165,12 +167,52 @@ static void __init nslu2_init(void) +@@ -165,12 +167,53 @@ static void __init nslu2_init(void) platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); } +/* -+ * NSLU2 RedBoot passes garbage atag/parameter values - i.e. r2 -+ * on entry is not useable - so we get to set the right values -+ * here... ++ * NSLU2 RedBoot passes garbage atag/parameter values because it copies ++ * the kernel zImage on top of the parameter list before branching into ++ * the zImage. The machine description causes the ATAG list to be ++ * skipped (by setting boot_params to 0) and this code fixes up the ++ * memory info and command line by supplying a command line with the ++ * NSLU2 specific config prepended. ++ * ++ * NOTE: the startup sequence is: ++ * 1) Call the machine fixup ++ * 2) Parse the ATAG list, the ATAG_CMDLINE is copied in ++ * to default_command_line which is the value of *from ++ * 3) Parse the command line in *from (*not* ++ * default_command_line unless they are the same!) ++ * ++ * Setting mi->nr_banks causes (2) to 'squash' (set to ATAG_NONE) ++ * any ATAG_MEM tags, but mem= command line options cause nr_banks ++ * to be reset to 0 (on the first mem=) + */ ++static char nslu2_command_line[] __initdata = ++ "root=/dev/mtdblock4 rootfstype=jffs2 init=/linuxrc " ++ "rtc-x1205.probe=0,0x6f rtc-x1205.hctosys=1 " ++ CONFIG_CMDLINE; ++ +static void __init nslu2_fixup(struct machine_desc *desc, + struct tag *tags, char **cmdline, struct meminfo *mi) +{ -+ char saved_command_line[COMMAND_LINE_SIZE]; -+ /* Put NSLU2 specific known-required-for-certain stuff here, leave -+ * a trailing space! -+ */ -+ static char nslu2_command_line[] = -+ "root=/dev/mtdblock4 rw rootfstype=jffs2 init=/linuxrc " -+ "rtc-x1205.probe=0,0x6f rtc-x1205.hctosys=1 "; -+ const int len = (sizeof nslu2_command_line)-1; -+ + /* The NSLU2 has one bank of 32MByte memory. -+ * NOTE: this will totally destroy attempts to make fatslugs work, -+ * FATSLUG FATSLUG FATSLUG: please parameterise this! -+ * NOTE: setting nr_banks != 0 causes kernel/setup.c to remove -+ * the mem tags from the tag list. We need do nothing here! ++ * NOTE: to make a 'fatslug' work append the appropriate ++ * mem= to the CONFIG_CMDLINE - this will override the ++ * setting below. + */ + mi->nr_banks=1; + mi->bank[0].start = 0; + mi->bank[0].size = (32*1024*1024); + mi->bank[0].node = PHYS_TO_NID(0); + -+ /* The tag list is the one from kernel/setup.c, it has no -+ * command line, so we are free to make one up, do this by -+ * prepending to the default command line which has been -+ * passed in (so that can override if necessary). -+ */ -+ memcpy(saved_command_line, *cmdline, COMMAND_LINE_SIZE); -+ memcpy(*cmdline, nslu2_command_line, len); -+ memcpy(*cmdline + len, saved_command_line, COMMAND_LINE_SIZE - len); -+ *cmdline[COMMAND_LINE_SIZE-1] = 0; ++ strlcpy(*cmdline, nslu2_command_line, COMMAND_LINE_SIZE); +} + MACHINE_START(NSLU2, "Linksys NSLU2") @@ -64,7 +65,7 @@ Signed-off-by: John Bowler <jbowler@acm.org> .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, - .boot_params = 0x00000100, -+ .boot_params = 0, /* because they are garbage */ ++ .boot_params = 0, /* because they are garbage - see above */ + .fixup = nslu2_fixup, .map_io = ixp4xx_map_io, .init_irq = ixp4xx_init_irq, diff --git a/packages/linux/ixp4xx-kernel/2.6.15/defconfig b/packages/linux/ixp4xx-kernel/2.6.15/defconfig index 1643ab8b43..31961a01ff 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.15/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.15 -# Fri Jan 13 23:40:57 2006 +# Tue Jan 17 13:02:33 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -143,7 +143,7 @@ CONFIG_CPU_TLB_V4WBI=y # Processor Features # CONFIG_ARM_THUMB=y -CONFIG_CPU_BIG_ENDIAN=y +# CONFIG_CPU_BIG_ENDIAN is not set CONFIG_XSCALE_PMU=y CONFIG_DMABOUNCE=y @@ -180,7 +180,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc rtc-x1205.hctosys=1 rtc-x1205.probe=0,0x6f rtc-ds1672.probe=0,0x68 rtc-ds1672.hctosys=1 pcf8563.hctosys=1 noirqdebug console=ttyS0,115200n8" +CONFIG_CMDLINE=" noirqdebug console=ttyS0,115200n8" # CONFIG_XIP_KERNEL is not set # diff --git a/packages/linux/ixp4xx-kernel_2.6.15.bb b/packages/linux/ixp4xx-kernel_2.6.15.bb index b4cde1bf41..761b9c3203 100644 --- a/packages/linux/ixp4xx-kernel_2.6.15.bb +++ b/packages/linux/ixp4xx-kernel_2.6.15.bb @@ -8,7 +8,7 @@ PR_CONFIG = "1" # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches # applied to the kernel. -PR = "r8.${PR_CONFIG}" +PR = "r9.${PR_CONFIG}" include ixp4xx-kernel.inc @@ -21,6 +21,7 @@ IXP4XX_PATCHES += "file://11-mtdpart-redboot-config-byteswap.patch;patch=1" IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1" IXP4XX_PATCHES += "file://40-rtc-class.patch;patch=1" IXP4XX_PATCHES += "file://45-eeprom-notifier.patch;patch=1" +IXP4XX_PATCHES += "file://48-setup-byteswap-cmdline.patch;patch=1" IXP4XX_PATCHES += "file://50-nas100d-arch.patch;patch=1" IXP4XX_PATCHES += "file://55-rtc-pcf8563.patch;patch=1" IXP4XX_PATCHES += "file://60-nas100d-i2c.patch;patch=1" @@ -37,6 +38,5 @@ IXP4XX_PATCHES += "file://91-maclist.patch;patch=1" IXP4XX_PATCHES += "file://92-nas100d-maclist.patch;patch=1" IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1" IXP4XX_PATCHES += "file://93-loft-maclist.patch;patch=1" -IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1" IXP4XX_PATCHES += "file://94-nas100d-setup.patch;patch=1" IXP4XX_PATCHES += "file://94-nslu2-setup.patch;patch=1" diff --git a/packages/meta/gpe-image-blank-user.bb b/packages/meta/gpe-image-blank-user.bb index 1400bde3f1..c8e24ae035 100644 --- a/packages/meta/gpe-image-blank-user.bb +++ b/packages/meta/gpe-image-blank-user.bb @@ -1,25 +1,9 @@ -include gpe-collections.bb +include gpe-image.bb MAINTAINER = "Rob Taylor <rjt@cambridgebroadband.com" -PR = "r4" +PR = "r5" export IMAGE_BASENAME = "gpe-image-blank-user" -DEPENDS = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} ${GPE_PIM} \ - ${GPE_BASE_SETTINGS} ${GPE_BASE_APPS} \ - ${GPE_EXTRA_DEPENDS}" - -export IPKG_INSTALL = "task-bootstrap ${GPE_BASE_DEPENDS} ${GPE_BASE} \ - ${GPE_PIM} ${GPE_BASE_SETTINGS} \ - ${GPE_BASE_APPS} ${GPE_EXTRA_DEPENDS} \ - ${XSERVER} \ - ${GPE_BASE_RDEPENDS} \ - ${GPE_EXTRA_INSTALL}" - - ROOTFS_POSTPROCESS_COMMAND += "adduser -D user" - - -inherit image_ipk -LICENSE = MIT diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb index 572eef2230..a53c4d4dc0 100644 --- a/packages/meta/gpe-image.bb +++ b/packages/meta/gpe-image.bb @@ -8,44 +8,31 @@ PR = "r19" export IMAGE_BASENAME = "gpe-image" -GUI_MACHINE_CLASS ?= "none" - -GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}" -GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" - GPE_EXTRA_THEMES = "gpe-theme-industrial" -GPE_EXTRA_DEPENDS_bigscreen = "${GPE_EXTRA_THEMES}" +GPE_EXTRA_INSTALL_none = "" GPE_EXTRA_INSTALL_bigscreen = "gpe-task-games ${GPE_EXTRA_THEMES}" - -GPE_EXTRA_DEPENDS_smallscreen = "${GPE_EXTRA_THEMES}" GPE_EXTRA_INSTALL_smallscreen = "gpe-task-games ${GPE_EXTRA_THEMES}" -#ship more stuff with devices with >16MB of flash -GPE_BIGFLASH_DEPENDS := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ - gpe-theme-clearlooks \ - figment \ -",d)}' - +GUI_MACHINE_CLASS ?= "none" +GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" +#ship more stuff with devices with >16MB of flash GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\ - gpe-task-connectivity \ - ${GPE_BIGFLASH_DEPENDS} \ + gpe-task-connectivity \ + gpe-theme-clearlooks \ + figment \ ",d)}' -GPE_EXTRA_DEPENDS += ${GPE_BIGFLASH_DEPENDS} GPE_EXTRA_INSTALL += ${GPE_BIGFLASH_INSTALL} -GPE_EXTRA_DEPENDS_none = "" -GPE_EXTRA_INSTALL_none = "" - XSERVER ?= "xserver-kdrive-fbdev" -DEPENDS = "task-bootstrap \ - meta-gpe \ - ${GPE_EXTRA_DEPENDS}" +DEPENDS = "task-bootstrap task-gpe" +RDEPENDS = "${IPKG_INSTALL}" -RDEPENDS = "\ +export IPKG_INSTALL = "\ + task-bootstrap \ gpe-task-base \ gpe-task-pim \ gpe-task-settings \ @@ -53,12 +40,6 @@ RDEPENDS = "\ ${XSERVER} \ ${GPE_EXTRA_INSTALL}" -export IPKG_INSTALL = "task-bootstrap gpe-task-base \ - gpe-task-pim gpe-task-settings \ - gpe-task-apps ${GPE_EXTRA_DEPENDS} \ - ${XSERVER} \ - ${GPE_EXTRA_INSTALL}" - #ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " inherit image_ipk diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb index 1e8c219929..cd9b132b7c 100644 --- a/packages/meta/meta-gpe-extras.bb +++ b/packages/meta/meta-gpe-extras.bb @@ -1,27 +1,17 @@ -PACKAGES = gpe-task-apps-extra gpe-task-games gpe-task-web gpe-task-desktopapps DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -PR="r1" +LICENSE = MIT +PR="r2" ALLOW_EMPTY = 1 +BUILD_ALL_DEPS = "1" -RDEPENDS_gpe-task-apps-extra := "\ - gpe-filemanager \ - gpe-nmf \ - gpe-soundbite \ - mbmerlin" +DEPENDS = "task-gpe" -RDEPENDS_gpe-task-web := "\ - gpe-irc \ - minimo \ - gaim" +RDEPENDS = "\ + gpe-task-apps-extra \ + gpe-task-games \ + gpe-task-web \ + gpe-task-desktopapps" -RDEPENDS_gpe-task-desktopapps := "\ - firefox \ - thunderbird \ - galculator \ - gnumeric \ - gpdf \ - totem" -LICENSE = MIT diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index 347608aaa1..d12621ad65 100644 --- a/packages/meta/meta-gpe.bb +++ b/packages/meta/meta-gpe.bb @@ -1,98 +1,18 @@ -PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games gpe-task-connectivity DESCRIPTION = "Meta-package for GPE Palmtop Environment" MAINTAINER = "Phil Blundell <pb@handhelds.org>" -PR = "r41" +LICENSE = "MIT" +PR = "r42" ALLOW_EMPTY = "1" - -RDEPENDS_gpe-base-depends := "\ - diet-x11 \ - virtual/xserver" - -RDEPENDS_gpe-task-base := "\ - gpe-bootsplash \ - bluez-utils-dbus \ - matchbox \ - xcursor-transparent-theme \ - rxvt-unicode \ - gtk2-theme-angelistic \ - matchbox-themes-gtk \ - xst \ - xhost \ - xrdb \ - gpe-soundserver \ - ttf-bitstream-vera \ - gpe-dm \ - gpe-login \ - gpe-session-scripts \ - gpe-icons \ - gpe-confd \ - gpe-autostarter \ - libgtkstylus \ - detect-stylus \ - suspend-desktop \ - teleport \ - xauth \ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-xpm \ - gdk-pixbuf-loader-jpeg \ - pango-module-basic-x \ - pango-module-basic-fc" - -RDEPENDS_gpe-task-pim := "\ - gpe-timesheet \ - gpe-todo \ - gpe-calendar \ - gpe-sketchbook \ - gpe-contacts \ - gpe-today \ - gpesyncd" - -RDEPENDS_gpe-task-settings := "\ - matchbox-panel-manager \ - gpe-bluetooth \ - gpe-beam \ - gpe-su \ - gpe-conf \ - gpe-clock \ - gpe-mininet \ - gpe-mixer \ - gpe-package \ - gpe-shield \ - gpe-taskmanager \ - keylaunch \ - minilite \ - minimix \ - xmonobut" - -RDEPENDS_gpe-task-apps := "\ - gpe-edit \ - gpe-gallery \ - gpe-calculator \ - gpe-clock \ - gpe-plucker \ - gpe-terminal \ - gpe-watch \ - gpe-what \ - matchbox-panel-hacks \ - gpe-aerial \ - gpe-soundbite \ - rosetta" - -RDEPENDS_gpe-task-games := "\ - gpe-go \ - gpe-lights \ - gpe-othello \ - gpe-tetris \ - gsoko \ - xdemineur" - -RDEPENDS_gpe-task-connectivity := "\ - gpe-mini-browser" -# gaim -# linphone-hh - -# FIXME - Some dependencies are broken somewhere for this to be needed -DEPENDS += "matchbox-themes-extra" - -LICENSE = "MIT" +BUILD_ALL_DEPS = "1" + +DEPENDS = "task-gpe" + +RDEPENDS = "\ + gpe-base-depends \ + gpe-task-base \ + gpe-task-settings \ + gpe-task-pim \ + gpe-task-apps \ + gpe-task-games \ + gpe-task-connectivity" diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb index 01bd572730..b0f32412d8 100644 --- a/packages/meta/meta-sectest-gpe.bb +++ b/packages/meta/meta-sectest-gpe.bb @@ -1,82 +1,17 @@ -PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim sectest-task-apps gpe-task-games DESCRIPTION = "Meta-package for GPE Security Testing Image" MAINTAINER = "Bob Davies tyggerbob@rogers.com>" -PR = "r5" +LICENSE = "MIT" +PR = "r6" ALLOW_EMPTY = "1" +BUILD_ALL_DEPS = "1" -RDEPENDS_gpe-base-depends := "\ - diet-x11 \ - virtual/xserver" - -RDEPENDS_gpe-task-base := "\ - bluez-utils-dbus \ - matchbox \ - xcursor-transparent-theme \ - rxvt-unicode \ - gtk2-theme-angelistic \ - xst \ - xhost \ - xrdb \ - gpe-soundserver \ - ttf-bitstream-vera \ - gpe-dm \ - gpe-login \ - gpe-session-scripts \ - gpe-icons \ - gpe-confd \ - gpe-autostarter \ - libgtkstylus \ - detect-stylus \ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-xpm \ - gdk-pixbuf-loader-jpeg \ - pango-module-basic-x \ - pango-module-basic-fc" - -RDEPENDS_gpe-task-pim := "\ - figment" - -RDEPENDS_gpe-task-settings := "\ - matchbox-panel-manager \ - gpe-bluetooth \ - gpe-beam \ - gpe-su \ - gpe-conf \ - gpe-clock \ - gpe-mininet \ - gpe-mixer \ - gpe-package \ - gpe-shield \ - gpe-taskmanager \ - keylaunch \ - minilite \ - xmonobut" +DEPENDS = "task-gpe" -RDEPENDS_sectest-task-apps := "\ - gpe-edit \ - gpe-calculator \ - gpe-clock \ - gpe-terminal \ - gpe-watch \ - gpe-what \ - matchbox-panel-hacks \ - gpe-aerial \ - mbmerlin \ - nmap \ - ettercap \ - stunnel \ - curl \ - dsniff \ - prismstumbler \ - tcpdump \ - kismet \ - hydra \ - thcrut \ - driftnet \ - miniclipboard" - -# FIXME - we shouldn't need this. which packages don't set their dependencies correctly? -DEPENDS += "matchbox-themes-extra gtk-industrial-engine" - -LICENSE = "MIT" +RDEPENDS = "\ + gpe-task-base \ + gpe-base-depends \ + gpe-task-base \ + gpe-task-settings \ + gpe-task-pim \ + gpe-task-sectest" diff --git a/packages/meta/sectest-gpe-image.bb b/packages/meta/sectest-gpe-image.bb index 0d1dbfbcbb..39109245f1 100644 --- a/packages/meta/sectest-gpe-image.bb +++ b/packages/meta/sectest-gpe-image.bb @@ -1,45 +1,43 @@ MAINTAINER = "Bob Davies <tyggerbob@rogers.com>" +LICENSE = MIT +PR = "r5" + FEED_URIS_append_openzaurus = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" FEED_URIS_append_opensimpad = " x11##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/x11 \ gpe##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/gpe" FEED_URIS_append_familiar = " x11##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/x11" -PR = "r5" - export IMAGE_BASENAME = "sectest-gpe-image" -GUI_MACHINE_CLASS ?= "none" - -GPE_EXTRA_DEPENDS += "${GPE_EXTRA_DEPENDS_${GUI_MACHINE_CLASS}}" -GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" - -GPE_EXTRA_THEMES = "gtk-theme-industrial gtk-industrial-engine matchbox-themes-extra-industrial" - -#GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone" -#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone" -GPE_EXTRA_DEPENDS_bigscreen = "minimo" -GPE_EXTRA_INSTALL_bigscreen = "minimo gpe-task-games ${GPE_EXTRA_THEMES}" +GPE_EXTRA_THEMES = "\ + gtk-theme-industrial \ + gtk-industrial-engine \ + matchbox-themes-extra-industrial" -GPE_EXTRA_DEPENDS_smallscreen = "" +GPE_EXTRA_INSTALL_none = "" GPE_EXTRA_INSTALL_smallscreen = "${GPE_EXTRA_THEMES}" +GPE_EXTRA_INSTALL_bigscreen = "minimo gpe-task-games ${GPE_EXTRA_THEMES}" +#GPE_EXTRA_INSTALL_bigscreen = "firefox linphone" -GPE_EXTRA_DEPENDS_none = "" -GPE_EXTRA_INSTALL_none = "" +GUI_MACHINE_CLASS ?= "none" +GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}" XSERVER ?= "xserver-kdrive-fbdev" -DEPENDS = "task-bootstrap \ - meta-sectest-gpe \ - ${GPE_EXTRA_DEPENDS}" +DEPENDS = "task-bootstrap task-gpe" +RDEPENDS = "${IPKG_INSTALL}" -export IPKG_INSTALL = "task-bootstrap gpe-task-base \ - gpe-task-pim gpe-task-settings \ - sectest-task-apps ${GPE_EXTRA_DEPENDS} \ - ${XSERVER} \ - ${GPE_EXTRA_INSTALL}" +export IPKG_INSTALL = "\ + task-bootstrap \ + gpe-task-base \ + gpe-task-pim \ + gpe-task-settings \ + gpe-task-sectest \ + ${XSERVER} \ + ${GPE_EXTRA_INSTALL}" ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " inherit image_ipk -LICENSE = MIT + diff --git a/packages/meta/task-gpe.bb b/packages/meta/task-gpe.bb new file mode 100644 index 0000000000..49a456161c --- /dev/null +++ b/packages/meta/task-gpe.bb @@ -0,0 +1,139 @@ +DESCRIPTION = "Task packages for GPE Palmtop Environment" +PR = "r0" +LICENSE = MIT +ALLOW_EMPTY = "1" + +PACKAGES = "\ + gpe-base-depends \ + gpe-task-base \ + gpe-task-settings \ + gpe-task-pim \ + gpe-task-apps \ + gpe-task-games \ + gpe-task-connectivity \ + gpe-task-apps-extra \ + gpe-task-games \ + gpe-task-web \ + gpe-task-desktopapps \ + gpe-task-sectest" + +RDEPENDS_gpe-base-depends := "\ + diet-x11 \ + virtual/xserver" + +RDEPENDS_gpe-task-base := "\ + gpe-bootsplash \ + bluez-utils-dbus \ + matchbox \ + xcursor-transparent-theme \ + rxvt-unicode \ + gtk2-theme-angelistic \ + matchbox-themes-gtk \ + xst \ + xhost \ + xrdb \ + gpe-soundserver \ + ttf-bitstream-vera \ + gpe-dm \ + gpe-login \ + gpe-session-scripts \ + gpe-icons \ + gpe-confd \ + gpe-autostarter \ + libgtkstylus \ + detect-stylus \ + suspend-desktop \ + teleport \ + xauth \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-xpm \ + gdk-pixbuf-loader-jpeg \ + pango-module-basic-x \ + pango-module-basic-fc" + +RDEPENDS_gpe-task-pim := "\ + gpe-timesheet \ + gpe-todo \ + gpe-calendar \ + gpe-sketchbook \ + gpe-contacts \ + gpe-today \ + gpesyncd" + +RDEPENDS_gpe-task-settings := "\ + matchbox-panel-manager \ + gpe-bluetooth \ + gpe-beam \ + gpe-su \ + gpe-conf \ + gpe-clock \ + gpe-mininet \ + gpe-mixer \ + gpe-package \ + gpe-shield \ + gpe-taskmanager \ + keylaunch \ + minilite \ + minimix \ + xmonobut" + +RDEPENDS_gpe-task-apps := "\ + gpe-edit \ + gpe-gallery \ + gpe-calculator \ + gpe-clock \ + gpe-plucker \ + gpe-terminal \ + gpe-watch \ + gpe-what \ + matchbox-panel-hacks \ + gpe-aerial \ + gpe-soundbite \ + rosetta" + +RDEPENDS_gpe-task-games := "\ + gpe-go \ + gpe-lights \ + gpe-othello \ + gpe-tetris \ + gsoko \ + xdemineur" + +RDEPENDS_gpe-task-connectivity := "\ + gpe-mini-browser" +# gaim +# linphone-hh + +RDEPENDS_gpe-task-apps-extra := "\ + gpe-filemanager \ + gpe-nmf \ + gpe-soundbite \ + mbmerlin" + +RDEPENDS_gpe-task-web := "\ + gpe-irc \ + minimo \ + gaim" + +RDEPENDS_gpe-task-desktopapps := "\ + firefox \ + thunderbird \ + galculator \ + gnumeric \ + gpdf \ + totem" + +RDEPENDS_gpe-task-sectest := "\ + mbmerlin \ + nmap \ + ettercap \ + stunnel \ + curl \ + dsniff \ + prismstumbler \ + tcpdump \ + kismet \ + hydra \ + thcrut \ + driftnet \ + miniclipboard" diff --git a/packages/minilite/minilite_0.50.bb b/packages/minilite/minilite_0.50.bb new file mode 100644 index 0000000000..0f5b126043 --- /dev/null +++ b/packages/minilite/minilite_0.50.bb @@ -0,0 +1,10 @@ +inherit gpe +LICENSE = "GPL" +DEPENDS = "libgpewidget" +SECTION = "gpe" + +DESCRIPTION = "GPE Screen light control dockapp" + +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz" + +export CVSBUILD="no" diff --git a/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff b/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff new file mode 100644 index 0000000000..e871e8e1e4 --- /dev/null +++ b/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff @@ -0,0 +1,25 @@ +Index: terminalwidget.cpp +=================================================================== +RCS file: /cvs/opie/noncore/apps/opie-console/terminalwidget.cpp,v +retrieving revision 1.12 +diff -u -u -r1.12 terminalwidget.cpp +--- opie-console/terminalwidget.cpp 16 Oct 2004 21:06:28 -0000 1.12 ++++ opie-console/terminalwidget.cpp 17 Jan 2006 10:00:13 -0000 +@@ -1,4 +1,5 @@ + #include "terminalwidget.h" ++#include <qpe/config.h> + + /* QT */ + #include <qlabel.h> +@@ -151,8 +152,10 @@ + break; + }; + ++ Config qpecfg("qpe"); ++ qpecfg.setGroup("Appearance"); + +- m_fontSelector->setSelectedFont( prof.readEntry( "Font"), prof.readEntry( "FontStyle"), prof.readNumEntry( "FontSize" ), prof.readEntry( "FontCharset") ); ++ m_fontSelector->setSelectedFont( prof.readEntry( "Font", qpecfg.readEntry("FixedFontFamily")), prof.readEntry( "FontStyle", qpecfg.readEntry("FixedFontStyle")), prof.readNumEntry( "FontSize" , qpecfg.readNumEntry("FixedFontStyle")), prof.readEntry( "FontCharset") ); + + // switch( fontsize ) { + // case Profile::Micro: diff --git a/packages/opie-console/opie-console_1.2.1.bb b/packages/opie-console/opie-console_1.2.1.bb index b9ba9e0e43..061c489c7e 100644 --- a/packages/opie-console/opie-console_1.2.1.bb +++ b/packages/opie-console/opie-console_1.2.1.bb @@ -1,9 +1,10 @@ include ${PN}.inc -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ file://1686-bugfix.patch;patch=1 \ - file://1647-bugfix.patch;patch=1" + file://1647-bugfix.patch;patch=1 \ + file://0117_opie-console-use-default-fixed.diff;patch=1" diff --git a/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch b/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch new file mode 100644 index 0000000000..574abfaf2c --- /dev/null +++ b/packages/ppp/ppp-2.4.3/makefile-remove-hard-usr-reference.patch @@ -0,0 +1,19 @@ +--- ppp-2.4.3/pppd/Makefile.linux.orig 2006-01-17 15:09:56.000000000 +0000 ++++ ppp-2.4.3/pppd/Makefile.linux 2006-01-17 15:10:21.000000000 +0000 +@@ -117,12 +117,12 @@ + #LIBS += -lshadow $(LIBS) + endif + +-ifneq ($(wildcard /usr/include/crypt.h),) ++#ifneq ($(wildcard /usr/include/crypt.h),) + CFLAGS += -DHAVE_CRYPT_H=1 +-endif +-ifneq ($(wildcard /usr/lib/libcrypt.*),) ++#endif ++#ifneq ($(wildcard /usr/lib/libcrypt.*),) + LIBS += -lcrypt +-endif ++#endif + + ifdef NEEDDES + ifndef USE_CRYPT diff --git a/packages/ppp/ppp_2.4.3.bb b/packages/ppp/ppp_2.4.3.bb index 8701efc556..0e3b9be24a 100644 --- a/packages/ppp/ppp_2.4.3.bb +++ b/packages/ppp/ppp_2.4.3.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon" HOMEPAGE = "http://samba.org/ppp/" DEPENDS = "libpcap" LICENSE = "BSD GPLv2" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \ file://makefile.patch;patch=1 \ @@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \ file://plugins-fix-CC.patch;patch=1 \ file://pppoatm-makefile.patch;patch=1 \ file://enable-ipv6.patch;patch=1 \ + file://makefile-remove-hard-usr-reference.patch;patch=1 \ file://pon \ file://poff \ file://init \ diff --git a/packages/qpealarmclock/qpealarmclock-1.0.4/fix-compile.patch b/packages/qpealarmclock/qpealarmclock-1.0.4/fix-compile.patch deleted file mode 100644 index bd69318a5c..0000000000 --- a/packages/qpealarmclock/qpealarmclock-1.0.4/fix-compile.patch +++ /dev/null @@ -1,83 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qpealarmclock_V1.0.4/AlarmDetails.h~fix-compile -+++ qpealarmclock_V1.0.4/AlarmDetails.h -@@ -64,25 +64,8 @@ - WEEKDAYS_IGNORE = 0xFF // do not change any days - }; - -- static const Weekdays flags[] = -- { -- WEEKDAYS_MONDAY, -- WEEKDAYS_TUESDAY, -- WEEKDAYS_WEDNSDAY, -- WEEKDAYS_THURSDAY, -- WEEKDAYS_FRIDAY, -- WEEKDAYS_SATURDAY, -- WEEKDAYS_SUNDAY -- }; -- -- static const AlarmDetails::Weekdays weekdaysGroups[] = -- { -- AlarmDetails::WEEKDAYS_NONE, -- AlarmDetails::WEEKDAYS_ALL, -- AlarmDetails::WEEKDAYS_WORKDAYS, -- AlarmDetails::WEEKDAYS_WEEKEND, -- AlarmDetails::WEEKDAYS_IGNORE -- }; -+ static const Weekdays flags[]; -+ static const AlarmDetails::Weekdays weekdaysGroups[]; - - AlarmDetails(int alarmNumberInit); - ~AlarmDetails(); ---- qpealarmclock_V1.0.4/AlarmDetails.cpp~fix-compile -+++ qpealarmclock_V1.0.4/AlarmDetails.cpp -@@ -3,22 +3,39 @@ - * - * Copyright (C) 2002 Dafydd Walters <dwalters@users.sourceforge.net> - * Modified by Anton Maslovsky <my-zaurus@narod.ru> 2003/01/28 -- * -+ * - * This program may be modified or redistributed under the terms of the GNU -- * General Public License (GPL), version 2 or later. A copy of the GNU GPL -- * should have accompanied the source code of this program. If not, please -+ * General Public License (GPL), version 2 or later. A copy of the GNU GPL -+ * should have accompanied the source code of this program. If not, please - * write to the Free Software Foundation Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - * This program is distributed without any warranty. -- */ -+ */ - - #include "AlarmDetails.h" - #include <qpe/config.h> - #include <qpe/alarmserver.h> - --const AlarmDetails::Weekdays AlarmDetails::flags[]; --const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[]; -+const AlarmDetails::Weekdays AlarmDetails::flags[] = -+{ -+ WEEKDAYS_MONDAY, -+ WEEKDAYS_TUESDAY, -+ WEEKDAYS_WEDNSDAY, -+ WEEKDAYS_THURSDAY, -+ WEEKDAYS_FRIDAY, -+ WEEKDAYS_SATURDAY, -+ WEEKDAYS_SUNDAY -+}; -+ -+const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[] = -+{ -+ AlarmDetails::WEEKDAYS_NONE, -+ AlarmDetails::WEEKDAYS_ALL, -+ AlarmDetails::WEEKDAYS_WORKDAYS, -+ AlarmDetails::WEEKDAYS_WEEKEND, -+ AlarmDetails::WEEKDAYS_IGNORE -+}; - - AlarmDetails::AlarmDetails(int alarmNumberInit) : alarmNumber(alarmNumberInit) - { diff --git a/packages/qpealarmclock/qpealarmclock-1.0.4/qpealarm.patch b/packages/qpealarmclock/qpealarmclock-1.0.4/qpealarm.patch deleted file mode 100644 index 82e8c350ab..0000000000 --- a/packages/qpealarmclock/qpealarmclock-1.0.4/qpealarm.patch +++ /dev/null @@ -1,13 +0,0 @@ -Nur in qpealarmclock_V1.0.4: AlarmDetails.h~. -diff -ur qpealarmclock_V1.0.4.orig/qpealarmclock.desktop qpealarmclock_V1.0.4/qpealarmclock.desktop ---- qpealarmclock_V1.0.4.orig/qpealarmclock.desktop 2004-06-17 00:35:48.000000000 +0200 -+++ qpealarmclock_V1.0.4/qpealarmclock.desktop 2004-06-17 00:36:13.000000000 +0200 -@@ -3,7 +3,7 @@ - Comment[de]=Ein Wecker - Comment[ru]=Будильник - Exec=qpealarmclock --Icon=QpeAlarmClock -+Icon=qpealarmclock/QpeAlarmClock - Name=Alarm Clock - Name[de]=Wecker - Type=Application diff --git a/packages/qpealarmclock/qpealarmclock-1.0.9/.mtn2git_empty b/packages/qpealarmclock/qpealarmclock-1.0.9/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qpealarmclock/qpealarmclock-1.0.9/.mtn2git_empty diff --git a/packages/qpealarmclock/qpealarmclock-1.0.9/fix-compile.patch b/packages/qpealarmclock/qpealarmclock-1.0.9/fix-compile.patch new file mode 100644 index 0000000000..a39c91d796 --- /dev/null +++ b/packages/qpealarmclock/qpealarmclock-1.0.9/fix-compile.patch @@ -0,0 +1,67 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qpealarmclock/AlarmDetails.h~fix_compile ++++ qpealarmclock/AlarmDetails.h +@@ -63,26 +63,9 @@ + + WEEKDAYS_IGNORE = 0xFF // do not change any days + }; +- +- static const Weekdays flags[] = +- { +- WEEKDAYS_MONDAY, +- WEEKDAYS_TUESDAY, +- WEEKDAYS_WEDNSDAY, +- WEEKDAYS_THURSDAY, +- WEEKDAYS_FRIDAY, +- WEEKDAYS_SATURDAY, +- WEEKDAYS_SUNDAY +- }; + +- static const Weekdays weekdaysGroups[] = +- { +- WEEKDAYS_NONE, +- WEEKDAYS_ALL, +- WEEKDAYS_WORKDAYS, +- WEEKDAYS_WEEKEND, +- WEEKDAYS_IGNORE +- }; ++ static const Weekdays flags[]; ++ static const AlarmDetails::Weekdays weekdaysGroups[]; + + AlarmDetails(int alarmNumberInit); + ~AlarmDetails(); + +--- qpealarmclock/AlarmDetails.cpp~fix-compile-2 ++++ qpealarmclock/AlarmDetails.cpp +@@ -22,8 +22,25 @@ + #include <qimage.h> + #include <qpixmap.h> + +-const AlarmDetails::Weekdays AlarmDetails::flags[]; +-const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[]; ++const AlarmDetails::Weekdays AlarmDetails::flags[] = ++{ ++ WEEKDAYS_MONDAY, ++ WEEKDAYS_TUESDAY, ++ WEEKDAYS_WEDNSDAY, ++ WEEKDAYS_THURSDAY, ++ WEEKDAYS_FRIDAY, ++ WEEKDAYS_SATURDAY, ++ WEEKDAYS_SUNDAY ++}; ++ ++const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[] = ++{ ++ AlarmDetails::WEEKDAYS_NONE, ++ AlarmDetails::WEEKDAYS_ALL, ++ AlarmDetails::WEEKDAYS_WORKDAYS, ++ AlarmDetails::WEEKDAYS_WEEKEND, ++ AlarmDetails::WEEKDAYS_IGNORE ++}; + + AlarmDetails::AlarmDetails(int alarmNumberInit) : alarmNumber(alarmNumberInit) + { diff --git a/packages/qpealarmclock/qpealarmclock_1.0.4.bb b/packages/qpealarmclock/qpealarmclock_1.0.4.bb deleted file mode 100644 index 19b8532098..0000000000 --- a/packages/qpealarmclock/qpealarmclock_1.0.4.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Alarm Clock" -SECTION = "opie/applications" -PRIORITY = "optional" -MAINTAINER = "Team Opie <opie@handhelds.org>" -LICENSE = "GPL" -AUTHOR = "Dafydd Walters" -HOMEPAGE = "http://www.linux-solutions.at/projects/zaurus/applications-AlarmClock.html" - -SRC_URI = "http://handhelds.org/~zecke/oe_packages/qpealarmclock_V1.0.4.tar.gz \ - file://qpealarm.patch;patch=1 \ - file://fix-compile.patch;patch=1 " - -S = "${WORKDIR}/qpealarmclock_V${PV}" -PR = "r1" - -APPNAME = "qpealarmclock" -APPTYPE = "binary" -APPDESKTOP = "${S}" - -do_install () { - install -d ${D}${palmtopdir}/pics/${APPNAME}/ - install -m 0644 ${S}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ - -} - -inherit opie diff --git a/packages/qpealarmclock/qpealarmclock_1.0.9.bb b/packages/qpealarmclock/qpealarmclock_1.0.9.bb new file mode 100644 index 0000000000..597c43fbb0 --- /dev/null +++ b/packages/qpealarmclock/qpealarmclock_1.0.9.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Alarm Clock" +SECTION = "opie/applications" +PRIORITY = "optional" +MAINTAINER = "Patrik Gfeller (gfellerpatrik@gmx.net)" +LICENSE = "GPL" +AUTHOR = "Dafydd Walters & Anton Maslovsky" +HOMEPAGE = "http://my-zaurus.narod.ru/" + +APPNAME = "qpealarmclock" +APPTYPE = "binary" +APPDESKTOP = "${S}/dist/opt/QtPalmtop/apps/Applications" + +SRC_URI = "http://my-zaurus.narod.ru/downloads/qpealarmclock-1.0.9.tar.gz \ + file://fix-compile.patch;patch=1 " + +S = "${WORKDIR}/qpealarmclock" + +inherit palmtop + +do_install () { +# create dirs + install -d ${D}${palmtopdir}/bin + install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/pics/qpealarmclock +# move files + install -m 644 ${S}/dist/opt/QtPalmtop/apps/Applications/qpealarmclock.desktop ${D}${palmtopdir}/apps/Applications/qpealarmclock.desktop + install -m 755 ${S}/dist/opt/QtPalmtop/bin/qpealarmclock ${D}${palmtopdir}/bin/qpealarmclock + install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/frequency.png ${D}${palmtopdir}/pics/qpealarmclock/frequency.png + install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/led.png ${D}${palmtopdir}/pics/qpealarmclock/led.png + install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/QpeAlarmClock.png ${D}${palmtopdir}/pics/qpealarmclock/QpeAlarmClock.png + install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/smallalarm.png ${D}${palmtopdir}/pics/qpealarmclock/smallalarm.png + install -m 644 ${S}/dist/opt/QtPalmtop/pics/qpealarmclock/sound.png ${D}${palmtopdir}/pics/qpealarmclock/sound.png +} diff --git a/packages/qpealarmclock/qpealarmclockapplet-1.0.9/.mtn2git_empty b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/.mtn2git_empty diff --git a/packages/qpealarmclock/qpealarmclockapplet-1.0.9/fix-compile.patch b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/fix-compile.patch new file mode 100644 index 0000000000..a39c91d796 --- /dev/null +++ b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/fix-compile.patch @@ -0,0 +1,67 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- qpealarmclock/AlarmDetails.h~fix_compile ++++ qpealarmclock/AlarmDetails.h +@@ -63,26 +63,9 @@ + + WEEKDAYS_IGNORE = 0xFF // do not change any days + }; +- +- static const Weekdays flags[] = +- { +- WEEKDAYS_MONDAY, +- WEEKDAYS_TUESDAY, +- WEEKDAYS_WEDNSDAY, +- WEEKDAYS_THURSDAY, +- WEEKDAYS_FRIDAY, +- WEEKDAYS_SATURDAY, +- WEEKDAYS_SUNDAY +- }; + +- static const Weekdays weekdaysGroups[] = +- { +- WEEKDAYS_NONE, +- WEEKDAYS_ALL, +- WEEKDAYS_WORKDAYS, +- WEEKDAYS_WEEKEND, +- WEEKDAYS_IGNORE +- }; ++ static const Weekdays flags[]; ++ static const AlarmDetails::Weekdays weekdaysGroups[]; + + AlarmDetails(int alarmNumberInit); + ~AlarmDetails(); + +--- qpealarmclock/AlarmDetails.cpp~fix-compile-2 ++++ qpealarmclock/AlarmDetails.cpp +@@ -22,8 +22,25 @@ + #include <qimage.h> + #include <qpixmap.h> + +-const AlarmDetails::Weekdays AlarmDetails::flags[]; +-const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[]; ++const AlarmDetails::Weekdays AlarmDetails::flags[] = ++{ ++ WEEKDAYS_MONDAY, ++ WEEKDAYS_TUESDAY, ++ WEEKDAYS_WEDNSDAY, ++ WEEKDAYS_THURSDAY, ++ WEEKDAYS_FRIDAY, ++ WEEKDAYS_SATURDAY, ++ WEEKDAYS_SUNDAY ++}; ++ ++const AlarmDetails::Weekdays AlarmDetails::weekdaysGroups[] = ++{ ++ AlarmDetails::WEEKDAYS_NONE, ++ AlarmDetails::WEEKDAYS_ALL, ++ AlarmDetails::WEEKDAYS_WORKDAYS, ++ AlarmDetails::WEEKDAYS_WEEKEND, ++ AlarmDetails::WEEKDAYS_IGNORE ++}; + + AlarmDetails::AlarmDetails(int alarmNumberInit) : alarmNumber(alarmNumberInit) + { diff --git a/packages/qpealarmclock/qpealarmclockapplet-1.0.9/missing-files.tar.gz b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/missing-files.tar.gz Binary files differnew file mode 100644 index 0000000000..4779ce5945 --- /dev/null +++ b/packages/qpealarmclock/qpealarmclockapplet-1.0.9/missing-files.tar.gz diff --git a/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb new file mode 100644 index 0000000000..33dabde5e9 --- /dev/null +++ b/packages/qpealarmclock/qpealarmclockapplet_1.0.9.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Alarm Clock Applet" +SECTION = "opie/applets" +PRIORITY = "optional" +MAINTAINER = "Patrik Gfeller (gfellerpatrik@gmx.net)" +LICENSE = "GPL" +AUTHOR = "Anton Maslovsky" +HOMEPAGE = "http://my-zaurus.narod.ru/" +RDEPENDS = "qpealarmclock" +RCONFLICTS = "opie-clockapplet" +RREPLACES = "opie-clockapplet" + +APPNAME = "qpealarmclockapplet" +APPTYPE = "binary" + +SRC_URI = "http://my-zaurus.narod.ru/downloads/clockapplet.tar.gz \ + file://missing-files.tar.gz \ + file://fix-compile.patch;patch=1 " + +S = "${WORKDIR}/clockapplet" + +inherit palmtop + +pkg_postinst() { +#!/bin/sh +if [ -n "$D" ]; then exit 1; fi +if pidof -s qpe >/dev/null; then + /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +fi +} + +pkg_postrm() { +#!/bin/sh +/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" + if [ -n "$D" ]; then false; fi +} + +do_install () { +# create dirs + install -d ${D}${palmtopdir}/plugins/applets +# libs + oe_libinstall -so libclockapplet ${D}${palmtopdir}/plugins/applets +} diff --git a/packages/rxvt-unicode/rxvt-unicode_5.6.bb b/packages/rxvt-unicode/rxvt-unicode_5.6.bb index 92915bf872..43d9d0c14a 100644 --- a/packages/rxvt-unicode/rxvt-unicode_5.6.bb +++ b/packages/rxvt-unicode/rxvt-unicode_5.6.bb @@ -6,10 +6,14 @@ terminal emulator rxvt, modified to store text in Unicode \ output. It also supports mixing multiple fonts at the \ same time, including Xft fonts." LICENSE = "GPL" +PACKAGES =+ "${PN}-daemon ${PN}-control" +FILES_${PN}-daemon = "${bindir}/rxvtd" +FILES_${PN}-control = "${bindir}/rxvtc" + SRC_URI = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2 \ file://xwc.patch;patch=1 \ file://signedchar.patch;patch=1" -PR = "r2" +PR = "r3" inherit autotools update-alternatives |