diff options
18 files changed, 82 insertions, 14 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index aba754b368..b83060a200 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -69,6 +69,7 @@ ${PKGDIR}/packages/ixp425-eth/*.bb \ ${PKGDIR}/packages/ixp4xx/*.bb \ ${PKGDIR}/packages/jpeg/*.bb \ ${PKGDIR}/packages/joe/*.bb \ +${PKGDIR}/packages/lcdproc/*.bb \ ${PKGDIR}/packages/less/*.bb \ ${PKGDIR}/packages/libaal/*.bb \ ${PKGDIR}/packages/libao/*.bb \ @@ -149,6 +150,7 @@ ${PKGDIR}/packages/puppy/*.bb \ ${PKGDIR}/packages/pwc/*.bb \ ${PKGDIR}/packages/python/*.bb \ ${PKGDIR}/packages/quilt/*.bb \ +${PKGDIR}/packages/qc-usb-messenger/*.bb \ ${PKGDIR}/packages/readline/*.bb \ ${PKGDIR}/packages/reiser4progs/*.bb \ ${PKGDIR}/packages/reiserfsprogs/*.bb \ @@ -159,6 +161,7 @@ ${PKGDIR}/packages/screen/*.bb \ ${PKGDIR}/packages/sed/*.bb \ ${PKGDIR}/packages/setpwc/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ +${PKGDIR}/packages/spca5xx/*.bb \ ${PKGDIR}/packages/ssmtp/*.bb \ ${PKGDIR}/packages/strace/*.bb \ ${PKGDIR}/packages/streamripper/*.bb \ diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb index 882b7f2c71..3ab58c590f 100644 --- a/packages/apache/apache_2.0.54.bb +++ b/packages/apache/apache_2.0.54.bb @@ -2,7 +2,7 @@ MAINTAINER="David Karlstrom <daka@nslu2-linux.org>" SECTION = "net" DEPENDS = "openssl expat pcre" -PR = "r2" +PR = "r4" # ------------------------------------------ # NOTE: This package is currently only meant @@ -16,7 +16,7 @@ S = "${WORKDIR}/httpd-${PV}" inherit autotools update-rc.d -INITSCRIPT_NAME = "httpd" +INITSCRIPT_NAME = "apache" INITSCRIPT_PARAMS = "defaults 91 20" CONFFILES_${PN} = "${sysconfdir}/apache/httpd.conf \ @@ -74,8 +74,8 @@ do_install_append () { -e 's,/usr/bin/,${bindir}/,g' \ -e 's,/usr/lib,${libdir}/,g' \ -e 's,/etc/,${sysconfdir}/,g' \ - -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/httpd - chmod 755 ${D}/${sysconfdir}/init.d/httpd + -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/apache + chmod 755 ${D}/${sysconfdir}/init.d/apache install -m 0644 ${FILESDIR}/httpd.conf ${D}/${sysconfdir}/apache/httpd.conf diff --git a/packages/apache/files/init b/packages/apache/files/init index 46dae0395f..6c8ff0a6ec 100755 --- a/packages/apache/files/init +++ b/packages/apache/files/init @@ -64,7 +64,7 @@ case "$1" in ;; esac -if [ $? == 0 ]; then +if [ $? = 0 ]; then echo . exit 0 else diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb index ea93bfc3e2..e0fa41311c 100644 --- a/packages/e17/e-wm_20050810.bb +++ b/packages/e17/e-wm_20050810.bb @@ -30,4 +30,4 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" do_install_append() { install -d ${D}/${sysconfdir}/X11/Xsession.d install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d -}
\ No newline at end of file +} diff --git a/packages/e17/entrance_20050810.bb b/packages/e17/entrance_20050810.bb index d032eeacf3..e43fe9aff8 100644 --- a/packages/e17/entrance_20050810.bb +++ b/packages/e17/entrance_20050810.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Entrace is the Enlightenment login manager" SECTION = "e/apps" LICENSE = "MIT" # can also use pam and crypt -DEPENDS = "edb evas-x11 ecore-x11 edje esmart" +DEPENDS = "edb evas-x11 ecore-x11 edje esmart bash keylaunch detect-stylus x11-common" RDEPENDS += "bash keylaunch detect-stylus x11-common" HOMEPAGE = "http://www.enlightenment.org" MAINTAINER = "Justin Patrin <papercrane@reversefold.com>" diff --git a/packages/gammu/gammu_1.01.0.bb b/packages/gammu/gammu_1.02.0.bb index 967a551eb2..967a551eb2 100644 --- a/packages/gammu/gammu_1.01.0.bb +++ b/packages/gammu/gammu_1.02.0.bb diff --git a/packages/kdepimpi/kdepimpi_2.1.18.bb b/packages/kdepimpi/kdepimpi_2.2.2.bb index f3dde1a2fd..f3dde1a2fd 100644 --- a/packages/kdepimpi/kdepimpi_2.1.18.bb +++ b/packages/kdepimpi/kdepimpi_2.2.2.bb diff --git a/packages/kdepimpi/pwmpi_2.1.18.bb b/packages/kdepimpi/pwmpi_2.2.2.bb index 904f640955..904f640955 100644 --- a/packages/kdepimpi/pwmpi_2.1.18.bb +++ b/packages/kdepimpi/pwmpi_2.2.2.bb diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index cb40aad03a..62d6350e16 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r8" +PR = "r9" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -79,15 +79,18 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-lcd-r3.patch;patch=1 \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ - ${RPSRC}/pxa27x_extraregs-r1.patch;patch=1 \ - ${RPSRC}/spitzbase-r3.patch;patch=1 \ - ${RPSRC}/spitzkbd-r0.patch;patch=1 \ + ${RPSRC}/pxa27x_extraregs-r2.patch;patch=1 \ + ${RPSRC}/spitzbase-r4.patch;patch=1 \ + ${RPSRC}/spitzkbd-r1.patch;patch=1 \ ${RPSRC}/spitzssp-r4.patch;patch=1 \ ${RPSRC}/spitzbl-r1.patch;patch=1 \ ${RPSRC}/spitzts-r1.patch;patch=1 \ ${RPSRC}/spitzcf-r1.patch;patch=1 \ + ${RPSRC}/spitz_power-r1.patch;patch=1 \ + ${RPSRC}/scoop_susres-r0.patch;patch=1 \ + ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \ ${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \ - ${RPSRC}/pxa_cf_initorder_hack-r0.patch;patch=1 \ + ${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \ ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 56124ab2e2..15de0f1fcb 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -7,9 +7,12 @@ ALLOW_EMPTY = 1 PACKAGES = "${PN}" OPENSLUG_PACKAGES = "\ + alsa-lib \ + alsa-utils \ atftp \ autoconf \ automake \ + aumix \ bash \ bind \ binutils \ @@ -48,6 +51,7 @@ OPENSLUG_PACKAGES = "\ irssi \ joe \ jpeg \ + lcdproc \ less \ libpam \ libpng \ @@ -93,6 +97,7 @@ OPENSLUG_PACKAGES = "\ pwc \ python \ quilt \ + qc-usb-messenger \ reiserfsprogs reiser4progs \ rsync \ samba \ diff --git a/packages/nonworking/meta/.mtn2git_empty b/packages/nonworking/meta/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/nonworking/meta/.mtn2git_empty diff --git a/packages/meta/e-image.bb b/packages/nonworking/meta/e-image.bb index d58215d3a7..d58215d3a7 100644 --- a/packages/meta/e-image.bb +++ b/packages/nonworking/meta/e-image.bb diff --git a/packages/qc-usb-messenger/.mtn2git_empty b/packages/qc-usb-messenger/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qc-usb-messenger/.mtn2git_empty diff --git a/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty b/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qc-usb-messenger/qc-usb-messenger-0.8/.mtn2git_empty diff --git a/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix b/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix new file mode 100644 index 0000000000..ff3572db8d --- /dev/null +++ b/packages/qc-usb-messenger/qc-usb-messenger-0.8/qc-messenger-0.8-fix @@ -0,0 +1,25 @@ +diff -Naur qc-usb-messenger-0.8/qc-memory.c qc-usb-messenger-0.8-fixed/qc-memory.c +--- qc-usb-messenger-0.8/qc-memory.c 2003-12-15 10:31:46.000000000 +0100 ++++ qc-usb-messenger-0.8-fixed/qc-memory.c 2005-02-22 17:53:50.000000000 +0100 +@@ -63,9 +63,9 @@ + #endif + + #if !HAVE_VMA +-static inline int qc_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return remap_page_range(from, addr, size, prot); } +-#undef remap_page_range +-#define remap_page_range(vma, start, addr, size, prot) qc_remap_page_range((start),(addr),(size),(prot)) ++static inline int qc_io_remap_page_range(unsigned long from, unsigned long addr, unsigned long size, pgprot_t prot) { return io_remap_page_range(from, addr, size, prot); } ++#undef io_remap_page_range ++#define io_remap_page_range(vma, start, addr, size, prot) qc_io_remap_page_range((start),(addr),(size),(prot)) + #endif + + #if LINUX_VERSION_CODE>=KERNEL_VERSION(2,5,3) || defined(pte_offset_map) +@@ -230,7 +230,7 @@ + pos = (unsigned long)src; + while ((long)size > 0) { + physaddr = kvirt_to_pa(pos); +- if (remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) ++ if (io_remap_page_range(vma, start, physaddr, PAGE_SIZE, PAGE_SHARED)) + return -EAGAIN; + start += PAGE_SIZE; + pos += PAGE_SIZE; diff --git a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb b/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb new file mode 100644 index 0000000000..e7041c6990 --- /dev/null +++ b/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Driver for QuickCam Messenger and Communicate usb cameras" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://home.mag.cx/messenger/source/${PN}-${PV}.tar.gz \ + file://qc-messenger-0.8-fix;patch=1" + +S = "${WORKDIR}/${PN}-${PV}" + +inherit module + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP + oe_runmake 'KSRC=${STAGING_KERNEL_DIR}' \ + 'KDIR=${STAGING_KERNEL_DIR}' \ + 'CC="${KERNEL_CC}"' \ + 'LD="${KERNEL_LD}"' \ + 'LINUX_DIR=${STAGING_KERNEL_DIR}' \ + all +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/misc +} + diff --git a/packages/ssmtp/ssmtp_2.61.bb b/packages/ssmtp/ssmtp_2.61.bb index 425f7a607b..72cf7e63e4 100644 --- a/packages/ssmtp/ssmtp_2.61.bb +++ b/packages/ssmtp/ssmtp_2.61.bb @@ -3,6 +3,7 @@ MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>" DEPENDS = "openssl" DESCRIPTION = "Extremely simple MTA to get mail off the system to a mail hub." LICENCE = "GPL" +LICENCE = "GPL" PR = "r5" SRC_URI = "${DEBIAN_MIRROR}/main/s/ssmtp/ssmtp_${PV}.orig.tar.gz \ diff --git a/packages/ttf-fonts/ttf-dejavu_1.11.bb b/packages/ttf-fonts/ttf-dejavu_1.13-20050820.bb index 64d0ac3e60..394b79005c 100644 --- a/packages/ttf-fonts/ttf-dejavu_1.11.bb +++ b/packages/ttf-fonts/ttf-dejavu_1.13-20050820.bb @@ -2,11 +2,13 @@ DESCRIPTION = "DejaVu font - TTF Edition" LICENSE = "Bitstream Vera" HOMEPAGE = "http://dejavu.sourceforge.net/wiki/index.php/Main_Page" -SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.gz" +#SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-ttf-${PV}.tar.gz" +SRC_URI = "http://dejavu.sourceforge.net/snapshots/dejavu-ttf-20050820.tar.gz" include ttf.inc -S = "${WORKDIR}/dejavu-ttf-${PV}" +#S = "${WORKDIR}/dejavu-ttf-${PV}" +S = "${WORKDIR}/dejavu-ttf-20050820" PACKAGES = "ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-sans-condensed \ ttf-dejavu-serif ttf-dejavu-serif-condensed" |