[oe-commits] org.oe.dev merge of '4f38c623129076351ddc15086ffe865d87b655b4'
oe commit
oe at amethyst.openembedded.net
Mon Mar 24 18:35:57 UTC 2008
merge of '4f38c623129076351ddc15086ffe865d87b655b4'
and 'f7f15489efbfb6b3c25a219c0a8803930179c346'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 22070216e65cf80581c36bade36576e881fc55b9
ViewMTN: http://monotone.openembedded.org/revision/info/22070216e65cf80581c36bade36576e881fc55b9
Files:
1
packages/update-alternatives/update-alternatives-dpkg-1.13.22
packages/update-alternatives/update-alternatives-dpkg-1.13.22/paths.patch
packages/update-alternatives/update-alternatives-dpkg.inc
packages/linux/linux-ixp4xx/defconfig-2.6.24
packages/linux/linux-ixp4xx/defconfig-2.6.24.3
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.3
packages/linux/linux-ixp4xx_2.6.24.bb
packages/linux/linux-ixp4xx_2.6.24.3.bb
packages/busybox/files/50telnet
packages/busybox/files/login.failsafe
classes/e.bbclass
conf/distro/include/sane-srcrevs.inc
conf/machine/include/ixp4xx.inc
packages/busybox/busybox-1.9.1/defconfig
packages/e17/e-wm_cvs.bb
packages/images/slugos-image.bb
packages/openmoko-projects/diversity-daemon_svn.bb
Diffs:
#
# mt diff -r4f38c623129076351ddc15086ffe865d87b655b4 -r22070216e65cf80581c36bade36576e881fc55b9
#
#
#
# add_dir "packages/update-alternatives/update-alternatives-dpkg-1.13.22"
#
# add_file "packages/update-alternatives/update-alternatives-dpkg-1.13.22/paths.patch"
# content [2bb6ec2888beec1f67a4d263182f51544c9546dc]
#
# patch "packages/update-alternatives/update-alternatives-dpkg.inc"
# from [fd5891d1c2427cb7812d3e42cec9fda9928223b7]
# to [55dbce12aebf658e14d8e13197f8a7ee8740ac1f]
#
============================================================
--- packages/update-alternatives/update-alternatives-dpkg-1.13.22/paths.patch 2bb6ec2888beec1f67a4d263182f51544c9546dc
+++ packages/update-alternatives/update-alternatives-dpkg-1.13.22/paths.patch 2bb6ec2888beec1f67a4d263182f51544c9546dc
@@ -0,0 +1,26 @@
+diff -ruN dpkg-1.13.22.orig/scripts/update-alternatives.pl dpkg-1.13.22/scripts/update-alternatives.pl
+--- dpkg-1.13.22.orig/scripts/update-alternatives.pl 2006-06-21 01:46:12.000000000 -0300
++++ dpkg-1.13.22/scripts/update-alternatives.pl 2007-08-02 19:36:47.000000000 -0300
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl --
+
+ $admindir= "/var/lib/dpkg"; # This line modified by Makefile
+-$dpkglibdir= "../utils"; # This line modified by Makefile
++$dpkglibdir= "/usr/lib/dpkg"; # This line modified by Makefile
+ $version= '0.93.80'; # This line modified by Makefile
+ push (@INC, $dpkglibdir);
+ require 'dpkg-gettext.pl';
+@@ -129,6 +129,12 @@
+ &checkmanymodes;
+ @ARGV >= 4 || &badusage(_g("--install needs <link> <name> <path> <priority>"));
+ ($alink,$name,$apath,$apriority, at ARGV) = @ARGV;
++ if (! -e $apath) {
++ $apath = substr($alink,0,rindex($alink,"/")+1).$apath;
++ }
++ if (! -e $apath) {
++ &quit(sprintf(_g("Error: file not found: %s"), $apath));
++ }
+ $apriority =~ m/^[-+]?\d+/ || &badusage(_g("priority must be an integer"));
+ $mode= 'install';
+ } elsif (m/^--(remove|set)$/) {
+
============================================================
--- packages/update-alternatives/update-alternatives-dpkg.inc fd5891d1c2427cb7812d3e42cec9fda9928223b7
+++ packages/update-alternatives/update-alternatives-dpkg.inc 55dbce12aebf658e14d8e13197f8a7ee8740ac1f
@@ -1,19 +1,14 @@ SECTION = "base"
LICENSE = "GPL"
SECTION = "base"
-SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
+SRC_URI += "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.gz"
S = "${WORKDIR}/dpkg-${PV}"
PACKAGE_ARCH = "all"
-do_patch () {
- cat ${S}/scripts/update-alternatives.pl | \
- sed -n -e '
- /^\$admindir=.*staging/{
- x
- s/^.*$/$D=$ENV{"D"} || ""\;/;
- p;
- x;
- s,^\$admindir=.*staging.*$,$admindir="$D${localstatedir}/dpkg"\;,;
- };
- s,^\$altdir=.*$,$altdir="$D${sysconfdir}/alternatives"\;,;
- p;' > ${S}/scripts/update-alternatives
+SRC_URI += "file://paths.patch;patch=1"
+
+do_patch_append () {
+ import shutil
+ update_alternatives_src = bb.data.getVar('S', d, 1)
+ shutil.move("%s/scripts/update-alternatives.pl" % (update_alternatives_src,),
+ "%s/scripts/update-alternatives" % (update_alternatives_src,))
}
#
# mt diff -rf7f15489efbfb6b3c25a219c0a8803930179c346 -r22070216e65cf80581c36bade36576e881fc55b9
#
#
#
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.24"
# to "packages/linux/linux-ixp4xx/defconfig-2.6.24.3"
#
# rename "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24"
# to "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.3"
#
# rename "packages/linux/linux-ixp4xx_2.6.24.bb"
# to "packages/linux/linux-ixp4xx_2.6.24.3.bb"
#
# add_file "packages/busybox/files/50telnet"
# content [1da1219aa725bae7dfd982000c97e159804237f9]
#
# add_file "packages/busybox/files/login.failsafe"
# content [d3eaa22066e6d13ead9d5ee78fd47ad0d251a261]
#
# patch "classes/e.bbclass"
# from [312ae44c83581d25ea920d0970eb19ad5677206f]
# to [2c087f480efe7a90c7cc009a93e634e6e25f16ca]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [0269a178e7edbe8ac9c17cef3cc5878aa563ee30]
# to [44e4906ecf7591680ec759d0c7ea0fbc8cbab14a]
#
# patch "conf/machine/include/ixp4xx.inc"
# from [aa79f84872ffba6825c781a48f53c408a318a978]
# to [af1b2871a2c2334a9ab155190f79070786c9c41f]
#
# patch "packages/busybox/busybox-1.9.1/defconfig"
# from [183a1034704ae8119a3b8348768ba35a162e96b8]
# to [f0e872e8e6f3bc9941075571caf38d1a62657458]
#
# patch "packages/e17/e-wm_cvs.bb"
# from [30e8a7e80783fa3d3c697eaa85a84f9109988105]
# to [5002700472e10c4056f6f0f86e315d894a880f22]
#
# patch "packages/images/slugos-image.bb"
# from [d1b20833658ac4a2ccc5e3cb746817cbf12bf138]
# to [83b5d4afb1824bc34cbfc0ebb671afbbee6d911d]
#
# patch "packages/linux/linux-ixp4xx_2.6.24.3.bb"
# from [6df87e421ee2408a059092ec0b63b1393e0c03ce]
# to [067925905346daa80ca610740fd9398e7c32ca12]
#
# patch "packages/openmoko-projects/diversity-daemon_svn.bb"
# from [6838bb9ca4040ee4c51c28db47ac68a9a434f15c]
# to [2f221ccc7f8ad502be7a83b018be160aa88a2b77]
#
============================================================
--- packages/busybox/files/50telnet 1da1219aa725bae7dfd982000c97e159804237f9
+++ packages/busybox/files/50telnet 1da1219aa725bae7dfd982000c97e159804237f9
@@ -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
+}
============================================================
--- packages/busybox/files/login.failsafe d3eaa22066e6d13ead9d5ee78fd47ad0d251a261
+++ packages/busybox/files/login.failsafe d3eaa22066e6d13ead9d5ee78fd47ad0d251a261
@@ -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
============================================================
--- classes/e.bbclass 312ae44c83581d25ea920d0970eb19ad5677206f
+++ classes/e.bbclass 2c087f480efe7a90c7cc009a93e634e6e25f16ca
@@ -1,6 +1,7 @@ SECTION = "e/apps"
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 @@ addtask prepsources after do_fetch befor
}
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"
-
============================================================
--- conf/distro/include/sane-srcrevs.inc 0269a178e7edbe8ac9c17cef3cc5878aa563ee30
+++ conf/distro/include/sane-srcrevs.inc 44e4906ecf7591680ec759d0c7ea0fbc8cbab14a
@@ -56,7 +56,7 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
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"
============================================================
--- conf/machine/include/ixp4xx.inc aa79f84872ffba6825c781a48f53c408a318a978
+++ conf/machine/include/ixp4xx.inc af1b2871a2c2334a9ab155190f79070786c9c41f
@@ -7,7 +7,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "li
# 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"
============================================================
--- packages/busybox/busybox-1.9.1/defconfig 183a1034704ae8119a3b8348768ba35a162e96b8
+++ packages/busybox/busybox-1.9.1/defconfig f0e872e8e6f3bc9941075571caf38d1a62657458
@@ -633,7 +633,7 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=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
============================================================
--- packages/e17/e-wm_cvs.bb 30e8a7e80783fa3d3c697eaa85a84f9109988105
+++ packages/e17/e-wm_cvs.bb 5002700472e10c4056f6f0f86e315d894a880f22
@@ -2,7 +2,7 @@ PV = "0.16.999.042+cvs${SRCDATE}"
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"
============================================================
--- packages/images/slugos-image.bb d1b20833658ac4a2ccc5e3cb746817cbf12bf138
+++ packages/images/slugos-image.bb 83b5d4afb1824bc34cbfc0ebb671afbbee6d911d
@@ -9,7 +9,7 @@ IMAGE_INSTALL = "task-slugos"
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"
============================================================
--- packages/linux/linux-ixp4xx_2.6.24.bb 6df87e421ee2408a059092ec0b63b1393e0c03ce
+++ packages/linux/linux-ixp4xx_2.6.24.3.bb 067925905346daa80ca610740fd9398e7c32ca12
@@ -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"
+PR = "r0"
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
-
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}"
============================================================
--- packages/openmoko-projects/diversity-daemon_svn.bb 6838bb9ca4040ee4c51c28db47ac68a9a434f15c
+++ packages/openmoko-projects/diversity-daemon_svn.bb 2f221ccc7f8ad502be7a83b018be160aa88a2b77
@@ -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 @@ SRC_URI = "svn://svn.projects.openmoko.o
PR = "r2"
SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
-
S = "${WORKDIR}/diversity-daemon"
inherit autotools pkgconfig
More information about the Openembedded-commits
mailing list