diff options
Diffstat (limited to 'packages')
29 files changed, 253 insertions, 67 deletions
diff --git a/packages/boa/boa_0.94.13.bb b/packages/boa/boa_0.94.13.bb index e88ded7df5..215533e26d 100644 --- a/packages/boa/boa_0.94.13.bb +++ b/packages/boa/boa_0.94.13.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Lightweight and High Performance WebServer" SECTION = "console/network" RPROVIDES = "httpd" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "GPL" -PR = "r1" +PR = "r2" DEPENDS = "mime-support" RDEPENDS = "mime-support" diff --git a/packages/fltk/fltk_1.2+cvs20040806.bb b/packages/fltk/fltk_1.2+cvs20040806.bb index b72e357d06..439c2e7398 100644 --- a/packages/fltk/fltk_1.2+cvs20040806.bb +++ b/packages/fltk/fltk_1.2+cvs20040806.bb @@ -3,9 +3,9 @@ LICENSE ="LGPL" HOMEPAGE = "http://www.fltk.org" SECTION = "libs" PRIORITY = "optional" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" DEPENDS = "jpeg libpng zlib" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/fltk;module=fltk;method=pserver;tag=v1_2;date=${@bb.data.getVar('PV', d, 1)[7:]} \ file://makefiles.patch;patch=1 \ diff --git a/packages/jikes/jikes_1.21.bb b/packages/jikes/jikes_1.21.bb index 05827e6967..050152a3ef 100644 --- a/packages/jikes/jikes_1.21.bb +++ b/packages/jikes/jikes_1.21.bb @@ -1,9 +1,10 @@ DESCRIPTION = "Java compiler adhering to language and VM specifications" HOMEPAGE = "http://jikes.sourceforge.net/" PRIORITY = "optional" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "devel" LICENSE = "IBM" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/jikes/jikes-${PV}.tar.bz2" diff --git a/packages/libffi/libffi_2.0+gcc3.4.1.bb b/packages/libffi/libffi_2.0+gcc3.4.1.bb index 7ec822c52c..843e888391 100644 --- a/packages/libffi/libffi_2.0+gcc3.4.1.bb +++ b/packages/libffi/libffi_2.0+gcc3.4.1.bb @@ -2,7 +2,8 @@ SECTION = "libs" DESCRIPTION = "Foreign Function Interface library" LICENSE = "libffi" PRIORITY = "optional" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +PR = "r1" inherit autotools gettext diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb index e9bd8b26b0..9089678fdc 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.bb @@ -1,8 +1,8 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices." -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "GPL" -PR = "r2" +PR = "r3" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb index d95bcb2459..b4850a24de 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.bb @@ -1,8 +1,8 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices." -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "GPL" -PR = "r2" +PR = "r3" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" diff --git a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb index 1fa6a96919..df160cd1ed 100644 --- a/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb +++ b/packages/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.bb @@ -1,8 +1,8 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices." -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" LICENSE = "GPL" -PR = "r5" +PR = "r6" KERNEL_CCSUFFIX = "-3.3.4" COMPATIBLE_HOST = "arm.*-linux" diff --git a/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c b/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c new file mode 100644 index 0000000000..47be53bf81 --- /dev/null +++ b/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c @@ -0,0 +1,156 @@ +/* + * arch/arm/mach-ixp4xx/nslu2-setup.c + * + * NSLU2 board-setup + * + * based ixdp425-setup.c: + * Copyright (C) 2003-2004 MontaVista Software, Inc. + * + * Author: Mark Rakes <mrakes at mac.com> + * Maintainers: http://www.nslu2-linux.org/ + * + * Fixed missing init_time in MACHINE_START kas11 10/22/04 + * Changed to conform to new style __init ixdp425 kas11 10/22/04 + */ + +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/device.h> +#include <linux/serial.h> +#include <linux/tty.h> +#include <linux/serial_8250.h> + +#include <asm/types.h> +#include <asm/setup.h> +#include <asm/memory.h> +#include <asm/hardware.h> +#include <asm/mach-types.h> +#include <asm/irq.h> +#include <asm/mach/arch.h> +#include <asm/mach/flash.h> + +void __init nslu2_map_io(void) +{ + ixp4xx_map_io(); +} + +static struct flash_platform_data nslu2_flash_data = { + .map_name = "cfi_probe", + .width = 2, +}; + +static struct resource nslu2_flash_resource = { + .start = NSLU2_FLASH_BASE, + .end = NSLU2_FLASH_BASE + NSLU2_FLASH_SIZE, + .flags = IORESOURCE_MEM, +}; + +static struct platform_device nslu2_flash = { + .name = "IXP4XX-Flash", + .id = 0, + .dev = { + .platform_data = &nslu2_flash_data, + }, + .num_resources = 1, + .resource = &nslu2_flash_resource, +}; + +static struct ixp4xx_i2c_pins nslu2_i2c_gpio_pins = { + .sda_pin = NSLU2_SDA_PIN, + .scl_pin = NSLU2_SCL_PIN, +}; + +static struct platform_device nslu2_i2c_controller = { + .name = "IXP4XX-I2C", + .id = 0, + .dev = { + .platform_data = &nslu2_i2c_gpio_pins, + }, + .num_resources = 0 +}; + +static struct resource nslu2_uart_resources[] = { + { + .start = IXP4XX_UART1_BASE_PHYS, + .end = IXP4XX_UART1_BASE_PHYS + 0x0fff, + .flags = IORESOURCE_MEM + }, + { + }, +#if 0 + , { + .start = IXP4XX_UART2_BASE_PHYS, + .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, + .flags = IORESOURCE_MEM + } +#endif +}; + +static struct plat_serial8250_port nslu2_uart_data[] = { + { + .mapbase = IXP4XX_UART1_BASE_PHYS, + .membase = (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET, + .irq = IRQ_IXP4XX_UART1, + .flags = UPF_BOOT_AUTOCONF, + .iotype = UPIO_MEM, + .regshift = 2, + .uartclk = IXP4XX_UART_XTAL, + }, + { + }, + +#if 0 + , { + .mapbase = IXP4XX_UART2_BASE_PHYS, + .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, + .irq = IRQ_IXP4XX_UART1, + .flags = UPF_BOOT_AUTOCONF, + .iotype = UPIO_MEM, + .regshift = 2, + .uartclk = IXP4XX_UART_XTAL, + } +#endif +}; + +static struct platform_device nslu2_uart = { + .name = "serial8250", + .id = 0, + .dev.platform_data = nslu2_uart_data, + .num_resources = 2, + .resource = nslu2_uart_resources +}; + +static struct platform_device *nslu2_devices[] __initdata = { + &nslu2_i2c_controller, + &nslu2_flash, + &nslu2_uart +}; + +static void n2_power_off(void) +{ + /* This causes the box to drop the power and go dead. */ +#define GPIO_PO_BM 0x0100 //b0000 0001 0000 0000 + *IXP4XX_GPIO_GPOER &= ~GPIO_PO_BM; // enable the pwr cntl gpio + *IXP4XX_GPIO_GPOUTR |= GPIO_PO_BM; // do the deed +} + +static void __init nslu2_init(void) +{ + ixp4xx_sys_init(); + + pm_power_off = n2_power_off; + platform_add_devices(nslu2_devices, ARRAY_SIZE(nslu2_devices)); +} + +MACHINE_START(NSLU2, "Linksys NSLU2") + MAINTAINER("www.nslu2-linux.org") + BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, + IXP4XX_PERIPHERAL_BASE_VIRT) + MAPIO(nslu2_map_io) + INITIRQ(ixp4xx_init_irq) //FIXME: all irq are off here + .timer = &ixp4xx_timer, + // INITTIME(ixp4xx_init_time) //this was missing in 2.6.7 code ...soft reboot needed? + BOOT_PARAMS(0x0100) + INIT_MACHINE(nslu2_init) +MACHINE_END + diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index ca24279832..1ba5305902 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = r0 +PR = r1 include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 7e2c044b19..3fb0587727 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -26,7 +26,7 @@ OPENSLUG_DEVELOPMENT = "\ lsof \ m4 \ make \ - monotone \ + monotone-4 monotone-5 \ ncurses \ openssh \ patch \ @@ -62,7 +62,6 @@ OPENSLUG_PACKAGES = "\ libxml2 \ miau \ microcom \ - mpd \ mt-daapd \ mutt \ mysql \ @@ -92,10 +91,13 @@ OPENSLUG_PACKAGES = "\ " # These packages only build on TARGET_OS=linux, not -# TARGET_OS=linux-uclibc +# TARGET_OS=linux-uclibc (Note that for several this +# is because of use of single precision FP interfaces +# such as sinf.) OPENSLUG_PACKAGES_append_linux = "\ bind \ mgetty \ + mpd \ nfs-utils \ libpam \ php \ diff --git a/packages/meta/unslung-packages.bb b/packages/meta/unslung-packages.bb index 53355d79e0..21a55ae957 100644 --- a/packages/meta/unslung-packages.bb +++ b/packages/meta/unslung-packages.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Packages that are compatible with the Unslung firmware" LICENSE = MIT -PR = "r2" +PR = "r3" ALLOW_EMPTY = 1 PACKAGES = "${PN}" @@ -12,4 +12,5 @@ BROKEN_PACKAGES = "\ " DEPENDS = 'unslung-image \ - ${UNSLUNG_PACKAGES}' + ${UNSLUNG_PACKAGES} \ + package-index' diff --git a/packages/meta/xbase-clients.bb b/packages/meta/xbase-clients.bb index 69d1c8b121..dc53858b47 100644 --- a/packages/meta/xbase-clients.bb +++ b/packages/meta/xbase-clients.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Basic X clients (meta package)" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +PR = "r1" ALLOW_EMPTY = 1 PACKAGES = "${PN}" diff --git a/packages/mime-support/mime-support_3.28.bb b/packages/mime-support/mime-support_3.28.bb index 8f5beb7c09..ee8f93fef8 100644 --- a/packages/mime-support/mime-support_3.28.bb +++ b/packages/mime-support/mime-support_3.28.bb @@ -1,12 +1,12 @@ SECTION = "base" DESCRIPTION = "MIME files 'mime.types' & 'mailcap', and support programs" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" DEPENDS = "file" RRECOMMENDS = "file" LICENSE = "PD" PACKAGE_ARCH = "all" -PR = "r1" +PR = "r2" SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz" S = "${WORKDIR}/${PN}" diff --git a/packages/monotone/monotone_0.19.bb b/packages/monotone/monotone-4_0.19.bb index 276bed4b6f..b90f0eacb9 100644 --- a/packages/monotone/monotone_0.19.bb +++ b/packages/monotone/monotone-4_0.19.bb @@ -6,7 +6,7 @@ SECTION = "devel" PRIORITY = "optional" LICENSE = "MIT" SUBV = "1" -PR = "r2" +PR = "r0" SRC_URI = "http://www.venge.net/monotone/downloads/monotone_${PV}-${SUBV}.tar.gz \ file://txt2c-cross.patch;patch=1 \ @@ -16,12 +16,14 @@ DEPENDS += "boost" #TARGET_CFLAGS += "-fno-strict-aliasing" PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" -tsd = "/home/monotone" +tsd = "/home/monotone/${PN}" FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests" RDEPENDS_${PN}-testsuite += "bash sed grep cvs" # The testsuite also requires the following - not yet available... #RDEPENDS_${PN}-testsuite += "patch perl" +S = "${WORKDIR}/monotone-${PV}" + # no cross compile support - it tries to run the test program even with # --enable_ipv6=yes EXTRA_OECONF = "--disable-ipv6 \ @@ -31,11 +33,20 @@ EXTRA_OECONF = "--disable-ipv6 \ --with-gnu-ld \ " -inherit autotools +inherit autotools update-alternatives + +ALTERNATIVE_NAME = "monotone" +ALTERNATIVE_LINK = "${bindir}/monotone" +ALTERNATIVE_PATH = "${bindir}/${PN}" +ALTERNATIVE_PRIORITY = "40" + -# This makes the testsuite as a package +# This makes the testsuite as a package and renames the monotone executable +# to include the netsync suffix. do_install_append() { install -d ${D}${tsd} install -c -m 755 testsuite ${D}${tsd}/testsuite cp -a tests ${D}${tsd}/tests + # + mv ${D}${bindir}/monotone ${D}${bindir}/${PN} } diff --git a/packages/monotone/monotone_0.20.bb b/packages/monotone/monotone-5_0.20.bb index 05c59ba5ca..ec98ec26d2 100644 --- a/packages/monotone/monotone_0.20.bb +++ b/packages/monotone/monotone-5_0.20.bb @@ -5,17 +5,7 @@ MAINTAINER = "John Bowler <jbowler@acm.org>" SECTION = "devel" PRIORITY = "optional" LICENSE = "MIT" -PR = "r1" - -#WARNING: monotone-0.20 uses a new netsync protocol, at present the -# OpenEmbedded monotone archives use monotone-0.19 as the server, -# therefore OE builds of 0.20 are disabled here. The protocol version -# is checked, 0.19 has version 4, 0.20 has version 5, it is not -# possible to pull using 0.20 from a 0.19 server. -# The 0.20 and 0.19 databases (the files) are compatible, so it is -# possible to use 0.20 then swap back to 0.19 for netsync with the -# older server. -DEFAULT_PREFERENCE = "-1" +PR = "r0" SRC_URI = "http://venge.net/monotone/downloads/monotone-${PV}.tar.gz \ file://txt2c-cross.patch;patch=1 \ @@ -25,12 +15,14 @@ DEPENDS += "boost" #TARGET_CFLAGS += "-fno-strict-aliasing" PACKAGES = "${PN} ${PN}-doc ${PN}-testsuite" -tsd = "/home/monotone" +tsd = "/home/monotone/${PN}" FILES_${PN}-testsuite = "${tsd}/testsuite ${tsd}/tests" RDEPENDS_${PN}-testsuite += "bash sed grep cvs" # The testsuite also requires the following - not yet available... #RDEPENDS_${PN}-testsuite += "patch perl" +S = "${WORKDIR}/monotone-${PV}" + # no cross compile support - it tries to run the test program even with # --enable_ipv6=yes EXTRA_OECONF = "--disable-ipv6 \ @@ -40,11 +32,20 @@ EXTRA_OECONF = "--disable-ipv6 \ --with-gnu-ld \ " -inherit autotools +inherit autotools update-alternatives + +ALTERNATIVE_NAME = "monotone" +ALTERNATIVE_LINK = "${bindir}/monotone" +ALTERNATIVE_PATH = "${bindir}/${PN}" +ALTERNATIVE_PRIORITY = "50" + -# This makes the testsuite as a package +# This makes the testsuite as a package and renames the monotone executable +# to include the netsync suffix. do_install_append() { install -d ${D}${tsd} install -c -m 755 testsuite ${D}${tsd}/testsuite cp -a tests ${D}${tsd}/tests + # + mv ${D}${bindir}/monotone ${D}${bindir}/${PN} } diff --git a/packages/mpd/.mtn2git_empty b/packages/mpd/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/mpd/.mtn2git_empty +++ /dev/null diff --git a/packages/mpfr/mpfr_2.1.1.bb b/packages/mpfr/mpfr_2.1.1.bb index 586527f779..dec3302200 100644 --- a/packages/mpfr/mpfr_2.1.1.bb +++ b/packages/mpfr/mpfr_2.1.1.bb @@ -1,9 +1,12 @@ -SECTION = "libs" DESCRIPTION = "A C library for multiple-precision floating-point \ computations with exact rounding" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" -DEPENDS = "gmp" LICENSE = "LGPL" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "libs" +PR = "r1" + +DEPENDS = "gmp" + SRC_URI = "http://www.mpfr.org/mpfr-current/mpfr-${PV}.tar.bz2" inherit autotools diff --git a/packages/mpfr/mpfr_cvs.bb b/packages/mpfr/mpfr_cvs.bb index af2829abb2..22f8703027 100644 --- a/packages/mpfr/mpfr_cvs.bb +++ b/packages/mpfr/mpfr_cvs.bb @@ -1,10 +1,13 @@ -SECTION = "libs" DESCRIPTION = "A C library for multiple-precision floating-point \ computations with exact rounding" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +LICENSE = "LGPL" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "libs" +PR = "r1" + DEPENDS = "gmp" + PV = "0.0cvs${CVSDATE}" -LICENSE = "LGPL" SRC_URI = "cvs://cvs:@cvs-sop.inria.fr/CVS/spaces;module=mpfr;method=pserver" S = "${WORKDIR}/mpfr" diff --git a/packages/mpd/mpd_0.11.2.bb b/packages/musicpd/mpd_0.11.2.bb index 41d08c8c5d..51067a5c7a 100644 --- a/packages/mpd/mpd_0.11.2.bb +++ b/packages/musicpd/mpd_0.11.2.bb @@ -1,8 +1,8 @@ -SECTION = "console/multimedia" DESCRIPTION = "Music Player Daemon (mpd)" HOMEPAGE = "http://www.musicpd.org" LICENSE = "GPLv2" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" +SECTION = "console/multimedia" DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile" PR = "r1" diff --git a/packages/ppp-dialin/ppp-dialin_0.1.bb b/packages/ppp-dialin/ppp-dialin_0.1.bb index 65af10dd31..815ed14d3b 100644 --- a/packages/ppp-dialin/ppp-dialin_0.1.bb +++ b/packages/ppp-dialin/ppp-dialin_0.1.bb @@ -1,9 +1,9 @@ SECTION = "console/network" DESCRIPTION = "Enables PPP dial-in through a serial connection" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" DEPENDS = "ppp" RDEPENDS = "ppp" -PR = "r3" +PR = "r4" LICENSE = "MIT" SRC_URI = "file://host-peer \ diff --git a/packages/sablevm/sablevm-classpath_1.1.9.bb b/packages/sablevm/sablevm-classpath_1.1.9.bb index 2ac5148754..3ca91fa8d5 100644 --- a/packages/sablevm/sablevm-classpath_1.1.9.bb +++ b/packages/sablevm/sablevm-classpath_1.1.9.bb @@ -1,9 +1,11 @@ -SECTION = "console/utils" DESCRIPTION = "GNU Classpath modified to work with SableVM" HOMEPAGE = "http://sablevm.org" LICENSE = "Classpath" PRIORITY = "optional" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "libs" +PR = "r1" + DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native fastjar-native" RDEPENDS_${PN} = "${PN}-native" diff --git a/packages/sablevm/sablevm_1.1.9.bb b/packages/sablevm/sablevm_1.1.9.bb index b93e12db53..ee4d86d8cf 100644 --- a/packages/sablevm/sablevm_1.1.9.bb +++ b/packages/sablevm/sablevm_1.1.9.bb @@ -1,9 +1,11 @@ -SECTION = "console/utils" DESCRIPTION = "A highly-portable Java virtual machine implementing the Java virtual machine specification, second edition." HOMEPAGE = "http://sablevm.org" LICENSE = "LGPL" PRIORITY = "optional" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" +SECTION = "interpreters" +PR = "r1" + DEPENDS = "libffi libtool popt \ sablevm-classpath" # unzip" diff --git a/packages/thttpd/files/init b/packages/thttpd/files/init index fdcd0f4530..df6d64842c 100644 --- a/packages/thttpd/files/init +++ b/packages/thttpd/files/init @@ -13,7 +13,7 @@ test -x "$thttpd" || exit 0 case "$1" in start) echo -n "Starting thttpd" - start-stop-daemon --start --quiet --exec $thttpd + start-stop-daemon --start --quiet --exec $thttpd -- -d @@SRVDIR echo "." ;; stop) @@ -22,11 +22,11 @@ case "$1" in echo "." ;; reload|force-reload) - start-stop-daemon --stop --quiet --signal 1 --exec $thttpd + start-stop-daemon --stop --quiet --signal 1 --exec $thttpd ;; restart) echo -n "Stopping thttpd" - start-stop-daemon --stop --quiet --exec $thttpd + start-stop-daemon --stop --quiet --exec $thttpd -- -d @@SRVDIR echo "." echo -n "Waiting for thttpd to die off" for i in 1 2 3 ; @@ -36,7 +36,7 @@ case "$1" in done echo "" echo -n "Starting thttpd" - start-stop-daemon --start --quiet --exec $thttpd + start-stop-daemon --start --quiet --exec $thttpd -- -d @@SRVDIR echo "." ;; *) diff --git a/packages/thttpd/thttpd_2.25b.bb b/packages/thttpd/thttpd_2.25b.bb index e7b786c1b0..9a3ac3af11 100644 --- a/packages/thttpd/thttpd_2.25b.bb +++ b/packages/thttpd/thttpd_2.25b.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A simple, small, portable, fast, and secure HTTP server." LICENSE = "BSD" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" HOMEPAGE = "http://www.acme.com/software/thttpd/" -PR="r1" +PR="r2" SRC_URI = "http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz \ file://install.patch;patch=1 \ @@ -24,5 +24,6 @@ do_configure () { do_install_append () { install -d "${D}${sysconfdir}/init.d" - install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/thttpd + cat ${WORKDIR}/init | sed -e 's,@@SRVDIR,${servicedir}/www,g' > ${WORKDIR}/thttpd + install -c -m 755 ${WORKDIR}/thttpd ${D}${sysconfdir}/init.d/thttpd } diff --git a/packages/xauth/xauth_cvs.bb b/packages/xauth/xauth_cvs.bb index 0e3e9c1497..ff615a500d 100644 --- a/packages/xauth/xauth_cvs.bb +++ b/packages/xauth/xauth_cvs.bb @@ -2,9 +2,9 @@ PV = "0.0cvs${CVSDATE}" LICENSE = "MIT" DEPENDS = "x11 xau xmu xext" DESCRIPTION = "X authority file utility" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xauth \ file://autofoo.patch;patch=1" diff --git a/packages/xhost/xhost_20040413.bb b/packages/xhost/xhost_20040413.bb index 07e796cb0f..7245e7164e 100644 --- a/packages/xhost/xhost_20040413.bb +++ b/packages/xhost/xhost_20040413.bb @@ -3,9 +3,9 @@ LICENSE = "MIT" PV = "0.0cvs${FIXEDCVSDATE}" DEPENDS = "x11 xext xmu" DESCRIPTION = "server access control program for X" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xhost;date=${FIXEDCVSDATE} \ file://autofoo.patch;patch=1" diff --git a/packages/xmodmap/xmodmap_cvs.bb b/packages/xmodmap/xmodmap_cvs.bb index 2d771f0498..890e70d956 100644 --- a/packages/xmodmap/xmodmap_cvs.bb +++ b/packages/xmodmap/xmodmap_cvs.bb @@ -1,8 +1,9 @@ PV = "0.0cvs${CVSDATE}" LICENSE = "MIT" DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" +PR = "r1" DEPENDS = "x11" diff --git a/packages/xprop/xprop_cvs.bb b/packages/xprop/xprop_cvs.bb index df715ee2ec..04be770116 100644 --- a/packages/xprop/xprop_cvs.bb +++ b/packages/xprop/xprop_cvs.bb @@ -2,9 +2,9 @@ PV = "0.0cvs${CVSDATE}" LICENSE = "MIT" DEPENDS = "x11 xmu xext" DESCRIPTION = "property displayer for X" -MAINTER = "Rene Wagner <reenoo@gmx.de>" +MAINTER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xprop;tag=XORG-MAIN \ file://autofoo.patch;patch=1" diff --git a/packages/xrdb/xrdb_cvs.bb b/packages/xrdb/xrdb_cvs.bb index 6d477de8ef..d5c954b0f3 100644 --- a/packages/xrdb/xrdb_cvs.bb +++ b/packages/xrdb/xrdb_cvs.bb @@ -1,10 +1,10 @@ PV = "0.0cvs${CVSDATE}" DEPENDS = "x11 xmu xext" DESCRIPTION = "X server resource database utility" -MAINTAINER = "Rene Wagner <reenoo@gmx.de>" +MAINTAINER = "Rene Wagner <rw@handhelds.org>" SECTION = "x11/base" LICENSE = "xrdb" -PR = "r1" +PR = "r2" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xorg;module=xc/programs/xrdb \ file://autofoo.patch;patch=1" |