diff options
15 files changed, 131 insertions, 11 deletions
diff --git a/packages/gtk-webcore/midori_0.0.4.bb b/packages/gtk-webcore/midori_0.0.4.bb index 47c7fe123b..4f39f7bab3 100644 --- a/packages/gtk-webcore/midori_0.0.4.bb +++ b/packages/gtk-webcore/midori_0.0.4.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Midori is a lightweight web browser." LICENSE = "GPLv2" -DEPENDS = "webkit libsexy" +DEPENDS = "webkit-gtk libsexy" inherit autotools pkgconfig diff --git a/packages/webkit/webkit/.mtn2git_empty b/packages/linux-libc-headers/linux-libc-headers-2.6.22/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/webkit/webkit/.mtn2git_empty +++ b/packages/linux-libc-headers/linux-libc-headers-2.6.22/.mtn2git_empty diff --git a/packages/linux-libc-headers/linux-libc-headers-2.6.22/procinfo.h b/packages/linux-libc-headers/linux-libc-headers-2.6.22/procinfo.h new file mode 100644 index 0000000000..8cdf828af8 --- /dev/null +++ b/packages/linux-libc-headers/linux-libc-headers-2.6.22/procinfo.h @@ -0,0 +1,24 @@ +/* + * linux/include/asm-arm/procinfo.h + * + * Copyright (C) 1996-1999 Russell King + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __ASM_PROCINFO_H +#define __ASM_PROCINFO_H + +#define HWCAP_SWP 1 +#define HWCAP_HALF 2 +#define HWCAP_THUMB 4 +#define HWCAP_26BIT 8 /* Play it safe */ +#define HWCAP_FAST_MULT 16 +#define HWCAP_FPA 32 +#define HWCAP_VFP 64 +#define HWCAP_EDSP 128 +#define HWCAP_JAVA 256 +#define HWCAP_IWMMXT 512 +#define HWCAP_CRUNCH 1024 +#endif diff --git a/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb new file mode 100644 index 0000000000..97e5a223a2 --- /dev/null +++ b/packages/linux-libc-headers/linux-libc-headers_2.6.22.bb @@ -0,0 +1,73 @@ +require linux-libc-headers.inc + +INHIBIT_DEFAULT_DEPS = "1" +DEPENDS = "unifdef-native" +PR = "r0" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + file://procinfo.h" + +S = "${WORKDIR}/linux-${PV}" + +set_arch() { + case ${TARGET_ARCH} in + alpha*) ARCH=alpha ;; + arm*) ARCH=arm ;; + cris*) ARCH=cris ;; + hppa*) ARCH=parisc ;; + i*86*) ARCH=i386 ;; + ia64*) ARCH=ia64 ;; + mips*) ARCH=mips ;; + m68k*) ARCH=m68k ;; + powerpc*) ARCH=powerpc ;; + s390*) ARCH=s390 ;; + sh*) ARCH=sh ;; + sparc64*) ARCH=sparc64 ;; + sparc*) ARCH=sparc ;; + x86_64*) ARCH=x86_64 ;; + avr32*) ARCH=avr32 ;; + bfin*) ARCH=blackfin ;; + esac +} + +do_configure() { + set_arch + oe_runmake allnoconfig ARCH=$ARCH +} + +do_compile () { +} + +do_install() { + set_arch + oe_runmake headers_install INSTALL_HDR_PATH=${D}/usr ARCH=$ARCH +} + +do_install_append_arm() { + cp ${WORKDIR}/procinfo.h ${D}${includedir}/asm/ +} + +STAGE_TEMP="${WORKDIR}/temp-staging" + +do_stage () { + set_arch + echo $ARCH + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}/usr ARCH=$ARCH + if [ "$ARCH" = "arm" ]; then + cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/ + fi + install -d ${STAGING_INCDIR} + rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm ${STAGING_INCDIR}/asm-generic + cp -pfLR ${STAGE_TEMP}${includedir}/linux ${STAGING_INCDIR}/ + cp -pfLR ${STAGE_TEMP}${includedir}/asm ${STAGING_INCDIR}/ + cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${STAGING_INCDIR}/ + rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/linux + rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm + rm -rf ${CROSS_DIR}/${TARGET_SYS}/include/asm-generic + install -d ${CROSS_DIR}/${TARGET_SYS}/include + cp -pfLR ${STAGE_TEMP}${includedir}/linux ${CROSS_DIR}/${TARGET_SYS}/include/ + cp -pfLR ${STAGE_TEMP}${includedir}/asm ${CROSS_DIR}/${TARGET_SYS}/include/ + cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${CROSS_DIR}/${TARGET_SYS}/include/ +} diff --git a/packages/openmoko2/openmoko-feedreader2_svn.bb b/packages/openmoko2/openmoko-feedreader2_svn.bb index 04b08539f2..3655f8977b 100644 --- a/packages/openmoko2/openmoko-feedreader2_svn.bb +++ b/packages/openmoko2/openmoko-feedreader2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The OpenMoko Feed Reader" SECTION = "openmoko/apps" -DEPENDS += "libmrss check webkit" +DEPENDS += "libmrss check webkit-gtk" PV = "0.0.1+svn${SVNREV}" PR = "r0" diff --git a/packages/openssh/openssh_4.6p1.bb b/packages/openssh/openssh_4.6p1.bb index e5dfaff77d..27bea2ce9a 100644 --- a/packages/openssh/openssh_4.6p1.bb +++ b/packages/openssh/openssh_4.6p1.bb @@ -16,7 +16,7 @@ It is intended as a replacement for rlogin, rsh and rcp, and can be \ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" -PR = "r1" +PR = "r2" SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://sshd_config \ @@ -55,6 +55,7 @@ do_install_append() { install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd mv ${D}${bindir}/scp ${D}${bindir}/scp.openssh mv ${D}${bindir}/ssh ${D}${bindir}/ssh.openssh + rmdir ${D}/var/run/sshd ${D}/var/run ${D}/var } PACKAGES =+ " openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc" @@ -62,7 +63,7 @@ FILES_openssh-dbg +=${bindir}/.debug ${libdir}exec/.debug" FILES_openssh-scp = "${bindir}/scp.${PN}" FILES_openssh-ssh = "${bindir}/ssh.${PN} ${bindir}/slogin /${sysconfdir}/ssh/ssh_config" FILES_openssh-sshd = "${sbindir}/sshd /${sysconfdir}/init.d/sshd ${bindir}/ssh-keygen" -FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config /var/run/sshd" +FILES_openssh-sshd += " /${sysconfdir}/ssh/moduli /${sysconfdir}/ssh/sshd_config" FILES_openssh-sftp = "${bindir}/sftp ${libdir}exec/sftp-server" FILES_openssh-misc = "${bindir}/ssh* ${libdir}exec/ssh*" diff --git a/packages/slugos-init/files/initscripts/zleds b/packages/slugos-init/files/initscripts/zleds index f5bd703b65..4c8277a53d 100644 --- a/packages/slugos-init/files/initscripts/zleds +++ b/packages/slugos-init/files/initscripts/zleds @@ -21,8 +21,25 @@ state(){ esac } +# trumpet "beeps" an announcement on systems with such support. +l=120 # Long beep time +s=40 # Try to keep a 3:1 ratio +trumpet(){ + case "$1" in + k) leds beep -l $l; leds beep -l $s; leds beep -l $l;; + n) leds beep -l $l; leds beep -l $s;; + *) leds beep;; + esac +} + case "$1" in -start) leds "$(state "$runlevel")";; -stop) leds boot "$(state "$runlevel")";; -*) echo "led change: $1: command ignored" >&2;; +start) leds "$(state "$runlevel")" + if [ "$(state "$runlevel")" == "user" ]; then + trumpet "k" + fi + ;; +stop) leds boot "$(state "$runlevel")" + ;; +*) echo "led change: $1: command ignored" >&2 + ;; esac diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 9748f13ec9..301a6829a5 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r87" +PR = "r88" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index 86fab657bd..8607c571b2 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -6,7 +6,7 @@ # UCLIBC_BASE can be set in a distro file, but whether this works depends # on whether the base patches apply to the selected (SRCDATE) svn release. # -UCLIBC_BASE ?= "0.9.28" +UCLIBC_BASE ?= "0.9.29" PV = "${UCLIBC_BASE}+svn${SRCDATE}" PR = "r5" @@ -25,8 +25,13 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNA #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking .... KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}" -SRC_URI += "svn://uclibc.org/trunk;module=uClibc" +SRC_URI += "svn://uclibc.org/trunk;module=uClibc \ + file://uClibc.machine \ + file://uClibc.distro \ + file://error_print_progname.patch;patch=1 \ + file://select.diff;patch=1 \ + " -SRC_URI += " file://error_print_progname.patch;patch=1" S = "${WORKDIR}/uClibc" + diff --git a/packages/webkit/files/.mtn2git_empty b/packages/webkit/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/webkit/files/.mtn2git_empty diff --git a/packages/webkit/webkit/Makefile b/packages/webkit/files/Makefile index 89344f7a58..89344f7a58 100644 --- a/packages/webkit/webkit/Makefile +++ b/packages/webkit/files/Makefile diff --git a/packages/webkit/webkit/Makefile.shared b/packages/webkit/files/Makefile.shared index a036aacc50..a036aacc50 100644 --- a/packages/webkit/webkit/Makefile.shared +++ b/packages/webkit/files/Makefile.shared diff --git a/packages/webkit/webkit/WebKit.pri b/packages/webkit/files/WebKit.pri index 0375102a0c..0375102a0c 100644 --- a/packages/webkit/webkit/WebKit.pri +++ b/packages/webkit/files/WebKit.pri diff --git a/packages/webkit/webkit/WebKit.pro b/packages/webkit/files/WebKit.pro index 335d11e6e7..335d11e6e7 100644 --- a/packages/webkit/webkit/WebKit.pro +++ b/packages/webkit/files/WebKit.pro diff --git a/packages/webkit/webkit_svn.bb b/packages/webkit/webkit-gtk_svn.bb index 8a6480d54f..8a6480d54f 100644 --- a/packages/webkit/webkit_svn.bb +++ b/packages/webkit/webkit-gtk_svn.bb |