summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/e.bbclass28
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--conf/machine/include/ixp4xx.inc2
-rw-r--r--packages/busybox/busybox-1.9.1/defconfig2
-rw-r--r--packages/busybox/files/50telnet16
-rw-r--r--packages/busybox/files/login.failsafe19
-rw-r--r--packages/e17/e-wm_cvs.bb6
-rw-r--r--packages/images/slugos-image.bb2
-rw-r--r--packages/linux/linux-ixp4xx/defconfig-2.6.24.3 (renamed from packages/linux/linux-ixp4xx/defconfig-2.6.24)0
-rw-r--r--packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.3 (renamed from packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24)0
-rw-r--r--packages/linux/linux-ixp4xx_2.6.24.3.bb (renamed from packages/linux/linux-ixp4xx_2.6.24.bb)10
-rw-r--r--packages/openmoko-projects/diversity-daemon_svn.bb5
12 files changed, 55 insertions, 37 deletions
diff --git a/classes/e.bbclass b/classes/e.bbclass
index 84d85f5542..3fb2355bc9 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -1,6 +1,7 @@
HOMEPAGE = "http://www.enlightenment.org"
SECTION = "e/apps"
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/${PN}-${PV}.tar.gz"
+SRC_URI = "${E_CVS};module=e17/apps/${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
inherit autotools pkgconfig binconfig
@@ -9,27 +10,10 @@ do_prepsources () {
}
addtask prepsources after do_fetch before do_unpack
-export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
-export EDB_CONFIG = "${STAGING_BINDIR_CROSS}/edb-config"
-export EET_CONFIG = "${STAGING_BINDIR_CROSS}/eet-config"
-export EVAS_CONFIG = "${STAGING_BINDIR_CROSS}/evas-config"
-export ECORE_CONFIG = "${STAGING_BINDIR_CROSS}/ecore-config"
-export EMBRYO_CONFIG = "${STAGING_BINDIR_CROSS}/embryo-config"
-export ENGRAVE_CONFIG = "${STAGING_BINDIR_CROSS}/engrave-config"
-export ENLIGHTENMENT_CONFIG = "${STAGING_BINDIR_CROSS}/enlightenment-config"
-export EPSILON_CONFIG = "${STAGING_BINDIR_CROSS}/epsilon-config"
-export EPEG_CONFIG = "${STAGING_BINDIR_CROSS}/epeg-config"
-export ESMART_CONFIG = "${STAGING_BINDIR_CROSS}/esmart-config"
-export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
-export IMLIB2_CONFIG = "${STAGING_BINDIR_CROSS}/imlib2-config"
+export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
+export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-config"
-#do_compile_prepend() {
-# find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-# find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
-#}
-
-PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev"
-FILES_${PN} += "${libdir}/lib*.so.*"
+PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-lib"
+FILES_${PN}-lib = "${libdir}/lib*.so.*"
FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
FILES_${PN}-dev += "${includedir} ${libdir}/lib*.so"
-
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index cb960d5168..6f9568c9c0 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -56,7 +56,7 @@ SRCREV_pn-libxosd ?= "627"
SRCREV_pn-lightmediascanner ?= "68"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "1039"
+SRCREV_pn-linux-ixp4xx ?= "1056"
SRCREV_pn-linux-openmoko ?= "4194"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index da1e8b7557..4696d7906d 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -7,7 +7,7 @@ MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex"
# Select an appropriate default kernel
PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
-PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24+svnr${SRCREV}"
+PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24.3+svnr${SRCREV}"
# Add packages required for basic networking support
MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
diff --git a/packages/busybox/busybox-1.9.1/defconfig b/packages/busybox/busybox-1.9.1/defconfig
index 770ef6eb12..33d30911da 100644
--- a/packages/busybox/busybox-1.9.1/defconfig
+++ b/packages/busybox/busybox-1.9.1/defconfig
@@ -633,7 +633,7 @@ CONFIG_ROUTE=y
CONFIG_TELNET=y
# CONFIG_FEATURE_TELNET_TTYPE is not set
CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-# CONFIG_TELNETD is not set
+CONFIG_TELNETD=y
# CONFIG_FEATURE_TELNETD_STANDALONE is not set
CONFIG_TFTP=y
CONFIG_FEATURE_TFTP_GET=y
diff --git a/packages/busybox/files/50telnet b/packages/busybox/files/50telnet
new file mode 100644
index 0000000000..3fb4a90494
--- /dev/null
+++ b/packages/busybox/files/50telnet
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2008 Koen Kooi
+
+# This starts telnetd if the password for 'root' is empty. This is needed for devices without a screen or serial console (wifi router, NAS, etc).
+
+start() {
+ if awk -F: '/^root:/ && ($2 != "") && ($2 !~ /\!/) {exit 1}' /etc/passwd 2>/dev/null
+ then
+ telnetd -l /bin/login.failsafe
+ fi
+}
+
+stop() {
+ killall telnetd
+}
diff --git a/packages/busybox/files/login.failsafe b/packages/busybox/files/login.failsafe
new file mode 100644
index 0000000000..e7c12a27fb
--- /dev/null
+++ b/packages/busybox/files/login.failsafe
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2008 Koen Kooi
+
+grep '^root:[^!]' /etc/passwd >&- 2>&-
+[ "$?" = "0" ] &&
+{
+ echo "Login failed."
+ exit 0
+} || {
+cat << EOF
+ === IMPORTANT ============================
+ Use 'passwd' to set your login password
+ this will disable telnet and enable SSH
+ ------------------------------------------
+EOF
+}
+
+exec /bin/sh --login
diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb
index 364e5539e1..9cd4ab7ffc 100644
--- a/packages/e17/e-wm_cvs.bb
+++ b/packages/e17/e-wm_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17"
DEPENDS = "eet evas ecore edje efreet"
LICENSE = "MIT BSD"
PV = "0.16.999.042+cvs${SRCDATE}"
-PR = "r1"
+PR = "r0"
inherit e update-alternatives
@@ -53,6 +53,10 @@ FILES_${PN}-dbg += "\
${libdir}/enlightenment/preload/.debug/ \
"
+FILES_${PN}-dev += "\
+ ${libdir}/enlightenment/preload/*.?a \
+"
+
ALTERNATIVE_PATH = "${bindir}/enlightenment_start"
ALTERNATIVE_NAME = "x-window-manager"
ALTERNATIVE_LINK = "${bindir}/x-window-manager"
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index fb1b372735..56abc3d39f 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -9,7 +9,7 @@ HOMEPAGE = "http://www.nslu2-linux.org"
DEPENDS = "task-slugos"
IMAGE_INSTALL = "task-slugos"
-COMPATIBLE_MACHINE = "nslu2"
+COMPATIBLE_MACHINE = "nslu2|ixp4xx"
IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}"
IMAGE_FSTYPES = "jffs2 tar.gz"
diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/defconfig-2.6.24.3
index 790120452a..790120452a 100644
--- a/packages/linux/linux-ixp4xx/defconfig-2.6.24
+++ b/packages/linux/linux-ixp4xx/defconfig-2.6.24.3
diff --git a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.3
index 0e14d09d11..0e14d09d11 100644
--- a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24
+++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.3
diff --git a/packages/linux/linux-ixp4xx_2.6.24.bb b/packages/linux/linux-ixp4xx_2.6.24.3.bb
index 9a5967afa2..06ff3f13d7 100644
--- a/packages/linux/linux-ixp4xx_2.6.24.bb
+++ b/packages/linux/linux-ixp4xx_2.6.24.3.bb
@@ -1,21 +1,17 @@
-# Keep this until the dsmg600 via-velocity BE patch is forward-ported
-DEFAULT_PREFERENCE = "-1"
-
require linux.inc
require linux-ixp4xx.inc
VANILLA_VERSION = "2.6.24"
-KERNEL_RELEASE = "2.6.24"
+KERNEL_RELEASE = "2.6.24.3"
# If you use a rc, you will need to use this:
#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r1"
-
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
+ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${VANILLA_VERSION};proto=http \
file://defconfig-${KERNEL_RELEASE}"
diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb
index dd582490fb..8ffcdc5038 100644
--- a/packages/openmoko-projects/diversity-daemon_svn.bb
+++ b/packages/openmoko-projects/diversity-daemon_svn.bb
@@ -1,6 +1,6 @@
-DESCRIPTION = "Diveristy Daemon"
+DESCRIPTION = "Diversity Daemon"
HOMEPAGE = "http://diversity.projects.openmoko.org/"
-SECTION = "net/misc"
+SECTION = "network/misc"
LICENSE = "GPL"
DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl"
RDEPENDS_${PN} = "eds-dbus openmoko-dialer2"
@@ -8,7 +8,6 @@ PV = "0.0+svnr${SRCREV}"
PR = "r2"
SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
-
S = "${WORKDIR}/diversity-daemon"
inherit autotools pkgconfig
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-08 16:45:34 +0000