[oe-commits] org.oe.dev merge of '67254ac9ecc3abdbf0b718b05d6eaa8d6b4b6e92'
ifaistos commit
oe at amethyst.openembedded.net
Sat Mar 29 12:07:43 UTC 2008
merge of '67254ac9ecc3abdbf0b718b05d6eaa8d6b4b6e92'
and '6e883229c491cafc759e732de8b7df6be2b32ca2'
Author: ifaistos at openembedded.org
Branch: org.openembedded.dev
Revision: 1d205cceb88799688dad02620d65bb08678fccd9
ViewMTN: http://monotone.openembedded.org/revision/info/1d205cceb88799688dad02620d65bb08678fccd9
Files:
1
packages/mamona
packages/mamona/mamona-sound-n800
packages/mamona/usbnet
packages/mamona/usbnet/default
packages/mamona/mamona-sound-n800/asound.conf
packages/mamona/mamona-sound-n800/asound.state
packages/mamona/mamona-sound-n800/dsp-n800.rules
packages/mamona/mamona-sound-n800_0.1.0.bb
packages/mamona/usbnet/default/usbnet
packages/mamona/usbnet/interfaces.usbnet
packages/mamona/usbnet/usbnet
packages/mamona/usbnet_0.1.0.bb
packages/meta/mamona-buildall.inc
packages/meta/meta-mamona-light.bb
packages/meta/meta-mamona.bb
packages/tasks/task-mamona-base.bb
packages/tasks/task-mamona-devel.bb
packages/tasks/task-mamona-e.bb
packages/tasks/task-mamona-extras.bb
packages/tasks/task-mamona-noemu.bb
packages/tasks/task-mamona-nokia-it.bb
packages/tasks/task-mamona.bb
conf/distro/mamona.conf
packages/linux/linux-ixp4xx/defconfig-2.6.24
packages/linux/linux-ixp4xx/defconfig-2.6.24.4
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
packages/linux/linux-ixp4xx_2.6.24.bb
packages/linux/linux-ixp4xx_2.6.24.4.bb
packages/gtkhtml/gtkhtml-3.8
packages/busybox/files/50telnet
packages/busybox/files/login.failsafe
packages/db/db4-native.inc
packages/db/db4.inc
packages/gtkhtml/gtkhtml-3.8/60_glib-2.15-g-gnuc-function.patch
packages/gtkhtml/gtkhtml-3.8_3.12.3.bb
classes/e.bbclass
classes/rootfs_ipk.bbclass
conf/distro/include/sane-srcrevs.inc
conf/machine/include/ixp4xx.inc
packages/busybox/busybox-1.9.1/defconfig
packages/db/db-native_4.2.52.bb
packages/db/db-native_4.3.29.bb
packages/db/db3_3.2.9.bb
packages/db/db_4.2.52.bb
packages/db/db_4.3.29.bb
packages/e17/e-wm_cvs.bb
packages/images/slugos-image.bb
packages/openmoko-projects/diversity-daemon_svn.bb
Diffs:
#
# mt diff -r67254ac9ecc3abdbf0b718b05d6eaa8d6b4b6e92 -r1d205cceb88799688dad02620d65bb08678fccd9
#
#
#
# add_dir "packages/mamona"
#
# add_dir "packages/mamona/mamona-sound-n800"
#
# add_dir "packages/mamona/usbnet"
#
# add_dir "packages/mamona/usbnet/default"
#
# add_file "packages/mamona/mamona-sound-n800/asound.conf"
# content [4c3a80721a75c72a021764b5b66270324c7e84ff]
#
# add_file "packages/mamona/mamona-sound-n800/asound.state"
# content [b52d1e3b20ac77cb38dc4c188831aad27ddc6349]
#
# add_file "packages/mamona/mamona-sound-n800/dsp-n800.rules"
# content [088e823b2de1c88cff0c7087a50244e848c1c5a5]
#
# add_file "packages/mamona/mamona-sound-n800_0.1.0.bb"
# content [8faec36ac452ef13d528516a9db23e4bb19ef065]
#
# add_file "packages/mamona/usbnet/default/usbnet"
# content [5f7c339c659b0d8ae3c277a611e2e4de096e0120]
#
# add_file "packages/mamona/usbnet/interfaces.usbnet"
# content [fe9f507497151144a5ce6b8834e2ba97fb7f2507]
#
# add_file "packages/mamona/usbnet/usbnet"
# content [200ff86730b6ddfb250ea53ef4930fb365ab3e0b]
#
# add_file "packages/mamona/usbnet_0.1.0.bb"
# content [97487a11406e428683a93bb3f9411a1e312d0cb7]
#
# add_file "packages/meta/mamona-buildall.inc"
# content [7e5b9bda5103cad6de4ea67781fbe03361c42954]
#
# add_file "packages/meta/meta-mamona-light.bb"
# content [43175c63b0f7da84377250d7e45ad5b213d2a3af]
#
# add_file "packages/meta/meta-mamona.bb"
# content [7456a2dcf69a6bd128334d18b83303c358e5840f]
#
# add_file "packages/tasks/task-mamona-base.bb"
# content [653d03806dd7d8e89480b24bad16a0136906b198]
#
# add_file "packages/tasks/task-mamona-devel.bb"
# content [7051d9c0015aeffbac96fc5ff75b2dbc78db4b56]
#
# add_file "packages/tasks/task-mamona-e.bb"
# content [ef2f20e68a1ff39f3dc2cbedfd8bb250c79c6849]
#
# add_file "packages/tasks/task-mamona-extras.bb"
# content [e7a1914a1ba4b2d123097f9be99973cbc2c0e2f5]
#
# add_file "packages/tasks/task-mamona-noemu.bb"
# content [bb6b3825c1d03e458b8cd256e101fcd88288315d]
#
# add_file "packages/tasks/task-mamona-nokia-it.bb"
# content [e290043abe03a97148f32e902bf62a433c56c47e]
#
# add_file "packages/tasks/task-mamona.bb"
# content [5f631c210a500880b15cffcfcb1f3c420a601891]
#
# patch "conf/distro/mamona.conf"
# from [5d40e92d458ce0b59a7069cdbdf8eaab449ed77f]
# to [9cbafb2b9adc44908a472e8fbc349a0b5c6177de]
#
============================================================
--- packages/mamona/mamona-sound-n800/asound.conf 4c3a80721a75c72a021764b5b66270324c7e84ff
+++ packages/mamona/mamona-sound-n800/asound.conf 4c3a80721a75c72a021764b5b66270324c7e84ff
@@ -0,0 +1,22 @@
+# PCM
+pcm.!default {
+ type alsa_dsp
+ playback_device_file ["/dev/dsptask/pcm3"]
+ recording_device_file ["/dev/dsptask/pcm_rec1"]
+}
+
+# Mixer
+ctl.!master {
+ type hw
+ card 0
+}
+
+ctl.!default {
+ type dsp_ctl
+ playback_devices ["/dev/dsptask/pcm3"]
+ recording_devices ["/dev/dsptask/pcm_rec1"]
+}
+
+# OSS emulation
+pcm.dsp0 pcm.default
+ctl.mixer0 mixer.default
============================================================
--- packages/mamona/mamona-sound-n800/asound.state b52d1e3b20ac77cb38dc4c188831aad27ddc6349
+++ packages/mamona/mamona-sound-n800/asound.state b52d1e3b20ac77cb38dc4c188831aad27ddc6349
@@ -0,0 +1,105 @@
+state.EAC {
+ control.1 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture Switch'
+ value.0 false
+ value.1 false
+ }
+ control.2 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '6 - 127'
+ iface MIXER
+ name 'Capture Volume'
+ value.0 87
+ value.1 87
+ }
+ control.3 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'PCM Playback Switch'
+ value.0 true
+ value.1 true
+ }
+ control.4 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'PCM Playback Volume'
+ value.0 103
+ value.1 103
+ }
+ control.5 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Line Playback Switch'
+ value.0 false
+ value.1 false
+ }
+ control.6 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '31 - 127'
+ iface MIXER
+ name 'Line Playback Volume'
+ value.0 103
+ value.1 103
+ }
+ control.7 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '1 - 3'
+ iface MIXER
+ name 'Mic Boost'
+ value 0
+ }
+ control.8 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 2
+ comment.item.0 Mic
+ comment.item.1 Line
+ comment.item.2 'Line swapped'
+ comment.item.3 'Line mono'
+ iface MIXER
+ name 'Capture Source'
+ value.0 Mic
+ value.1 Mic
+ }
+ control.9 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Headset Amplifier'
+ value false
+ }
+ control.10 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Speaker Amplifier'
+ value true
+ }
+ control.11 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Headset Mic Select'
+ value false
+ }
+}
============================================================
--- packages/mamona/mamona-sound-n800/dsp-n800.rules 088e823b2de1c88cff0c7087a50244e848c1c5a5
+++ packages/mamona/mamona-sound-n800/dsp-n800.rules 088e823b2de1c88cff0c7087a50244e848c1c5a5
@@ -0,0 +1,6 @@
+# dsp dev
+KERNEL=="dspctl", NAME="dspctl/ctl"
+KERNEL=="dspmem", NAME="dspctl/mem", MODE="0640", GROUP="kmem"
+KERNEL=="dsptwch", NAME="dspctl/twch", MODE="0640"
+KERNEL=="dsperr", NAME="dspctl/err", MODE="0440"
+KERNEL=="dsptask[0-9]*", MODE="0666"
============================================================
--- packages/mamona/mamona-sound-n800_0.1.0.bb 8faec36ac452ef13d528516a9db23e4bb19ef065
+++ packages/mamona/mamona-sound-n800_0.1.0.bb 8faec36ac452ef13d528516a9db23e4bb19ef065
@@ -0,0 +1,36 @@
+DESCRIPTION = "Mamona's sound configuration for Nokia N800"
+HOMEPAGE = "http://dev.openbossa.org/trac/mamona/"
+#SECTION = "console/utils"
+LICENSE = "GPL"
+RDEPENDS = "dspgw-utils udev alsa-lib alsa-utils-alsactl alsa-state"
+PR = "r1"
+
+PACKAGES = "${PN}"
+
+SRC_URI = "file://dsp-n800.rules \
+ file://asound.conf \
+ file://asound.state \
+ "
+
+# Skipping...
+do_configure () {
+}
+
+# Skipping...
+do_stage () {
+}
+
+# Skipping...
+do_compile () {
+}
+
+do_install () {
+ install -d ${D}${sysconfdir}/udev/rules.d
+ install -m 0755 ${WORKDIR}/dsp-n800.rules ${D}${sysconfdir}/udev/rules.d/
+
+ install -d ${D}${sysconfdir}
+ install -m 0644 ${WORKDIR}/asound.conf ${D}${sysconfdir}/
+
+ install -d ${D}${sysconfdir}
+ install -m 0644 ${WORKDIR}/asound.state ${D}${sysconfdir}/
+}
============================================================
--- packages/mamona/usbnet/default/usbnet 5f7c339c659b0d8ae3c277a611e2e4de096e0120
+++ packages/mamona/usbnet/default/usbnet 5f7c339c659b0d8ae3c277a611e2e4de096e0120
@@ -0,0 +1,4 @@
+# Defaults for usbnet initscript
+# sourced by /etc/init.d/usbnet
+
+INTERFACE_CONF=/etc/network/interfaces.usbnet
============================================================
--- packages/mamona/usbnet/interfaces.usbnet fe9f507497151144a5ce6b8834e2ba97fb7f2507
+++ packages/mamona/usbnet/interfaces.usbnet fe9f507497151144a5ce6b8834e2ba97fb7f2507
@@ -0,0 +1,5 @@
+iface usb0 inet static
+ address 10.0.1.10
+ netmask 255.255.255.0
+ broadcast 10.0.1.255
+ up route add default gw 10.0.1.11
============================================================
--- packages/mamona/usbnet/usbnet 200ff86730b6ddfb250ea53ef4930fb365ab3e0b
+++ packages/mamona/usbnet/usbnet 200ff86730b6ddfb250ea53ef4930fb365ab3e0b
@@ -0,0 +1,113 @@
+#!/bin/sh
+# USB Networking script
+# Copyright (C) 2007 INdT.
+# @author Abner Jose de Faria Silva <abner.silva at indt.org.br>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+DESC="USB Networking"
+
+INITFSPATH=/mnt/initfs
+MODULENAME="g_ether"
+MODULEPATH=$INITFSPATH/lib/modules/$(uname -r)/$MODULENAME.ko
+CONFIGPATH=/etc/default/usbnet
+
+MOUNTPOINT=/media/mmc
+
+LSMOD=/bin/lsmod
+RMMOD=/sbin/rmmod
+INSMOD=/sbin/insmod
+IFUP=/sbin/ifup
+IFDOWN=/sbin/ifdown
+
+test -e "$MODULEPATH" || exit 0
+test -x "$IFUP" || exit 0
+test -x "$IFDOWN" || exit 0
+test -x "$LSMOD" || exit 0
+test -x "$RMMOD" || exit 0
+test -x "$INSMOD" || exit 0
+
+test -r "$CONFIGPATH" && . $CONFIGPATH
+
+
+print_error()
+{
+ echo "failed."
+ echo "$1"
+}
+
+start_usbnet()
+{
+ if $LSMOD | grep -q "$MODULENAME"; then
+ echo "$DESC is already configured."
+ return
+ fi
+
+ echo -n "Starting $DESC: "
+
+ for f in 1 2; do
+ umount "$MOUNTPOINT$f" > /dev/null 2>&1
+ done
+
+ if ! $INSMOD "$MODULEPATH" > /dev/null 2>&1; then
+ print_error "Error loading $MODULEPATH."
+ return
+ fi
+
+ if ! $IFUP -i "$INTERFACE_CONF" usb0 > /dev/null 2>&1; then
+ print_error "Error configuring usb0."
+ return;
+ fi
+
+ echo "done."
+}
+
+stop_usbnet()
+{
+ echo -n "Stopping $DESC: "
+
+ if ! $IFDOWN -i "$INTERFACE_CONF" usb0 > /dev/null 2>&1; then
+ print_error "Error deconfiguring usb0."
+ return;
+ fi
+
+ if ! $RMMOD "$MODULENAME" > /dev/null 2>&1; then
+ print_error "Error unloading $MODULENAME"
+ return
+ fi
+
+ echo "done."
+}
+
+case "$1" in
+ start)
+ start_usbnet
+ ;;
+ stop)
+ stop_usbnet
+ ;;
+ restart|force-reload)
+ stop_usbnet
+ start_usbnet
+ ;;
+ *)
+ echo "Usage: $(basename $0) {start|stop|restart|force-reload}" >&2
+ exit 1
+ ;;
+esac
+
+echo ""
+
+exit 0
============================================================
--- packages/mamona/usbnet_0.1.0.bb 97487a11406e428683a93bb3f9411a1e312d0cb7
+++ packages/mamona/usbnet_0.1.0.bb 97487a11406e428683a93bb3f9411a1e312d0cb7
@@ -0,0 +1,38 @@
+DESCRIPTION = "USB Networking"
+HOMEPAGE = "http://dev.openbossa.org/trac/mamona/"
+SECTION = "utils"
+LICENSE = "GPL"
+RDEPENDS = "module-init-tools busybox"
+PR = "r1"
+
+PACKAGES = "${PN}"
+
+SRC_URI = "file://usbnet \
+ file://default/usbnet \
+ file://interfaces.usbnet"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "usbnet"
+INITSCRIPT_PARAMS = "defaults"
+
+# Skipping...
+do_configure () {
+}
+
+# Skipping...
+do_stage () {
+}
+
+# Skipping...
+do_compile () {
+}
+
+do_install () {
+ install -d ${D}${sysconfdir}/init.d
+ install -d ${D}${sysconfdir}/default
+ install -d ${D}${sysconfdir}/network
+ install -m 0755 ${WORKDIR}/usbnet ${D}${sysconfdir}/init.d
+ install -m 0644 ${WORKDIR}/default/usbnet ${D}${sysconfdir}/default
+ install -m 0644 ${WORKDIR}/interfaces.usbnet ${D}${sysconfdir}/network
+}
============================================================
--- packages/meta/mamona-buildall.inc 7e5b9bda5103cad6de4ea67781fbe03361c42954
+++ packages/meta/mamona-buildall.inc 7e5b9bda5103cad6de4ea67781fbe03361c42954
@@ -0,0 +1,4 @@
+# Forcing build all rdepends
+do_mamona[nostamp] = "1"
+do_mamona[recrdeptask] = "do_package_write"
+addtask mamona before do_build after do_install
============================================================
--- packages/meta/meta-mamona-light.bb 43175c63b0f7da84377250d7e45ad5b213d2a3af
+++ packages/meta/meta-mamona-light.bb 43175c63b0f7da84377250d7e45ad5b213d2a3af
@@ -0,0 +1,13 @@
+DESCRIPTION = "Meta package for Mamona"
+LICENSE = "MIT"
+PR = "r1"
+
+inherit meta
+EXCLUDE_FROM_WORLD = "1"
+
+RDEPENDS = " \
+task-mamona \
+"
+
+include mamona-buildall.inc
+
============================================================
--- packages/meta/meta-mamona.bb 7456a2dcf69a6bd128334d18b83303c358e5840f
+++ packages/meta/meta-mamona.bb 7456a2dcf69a6bd128334d18b83303c358e5840f
@@ -0,0 +1,17 @@
+DESCRIPTION = "Meta package for Mamona"
+LICENSE = "MIT"
+PR = "r1"
+
+inherit meta
+EXCLUDE_FROM_WORLD = "1"
+
+RDEPENDS = " \
+task-mamona-base \
+task-mamona-devel \
+task-mamona-extras \
+task-mamona-nokia-it \
+task-mamona-noemu \
+task-mamona-e \
+"
+
+include mamona-buildall.inc
============================================================
--- packages/tasks/task-mamona-base.bb 653d03806dd7d8e89480b24bad16a0136906b198
+++ packages/tasks/task-mamona-base.bb 653d03806dd7d8e89480b24bad16a0136906b198
@@ -0,0 +1,56 @@
+DESCRIPTION = "task mamona base"
+LICENSE = "MIT"
+PR = "r1"
+ALLOW_EMPTY = "1"
+
+PACKAGES = "${PN}"
+
+RDEPENDS = "\
+ apt \
+ base-files \
+ base-passwd \
+ bash \
+ binutils \
+ busybox \
+ bzip2 \
+ coreutils \
+ dpkg \
+ e2fsprogs \
+ e2fsprogs-badblocks \
+ e2fsprogs-blkid \
+ e2fsprogs-uuidgen \
+ file \
+ gawk \
+ gawk-common \
+ libgcc \
+ libstdc++ \
+ zlib \
+ ncurses \
+ netbase \
+ perl \
+ perl-module-base \
+ perl-module-carp \
+ perl-module-exporter \
+ perl-module-strict \
+ perl-module-vars \
+ perl-module-warnings \
+ perl-module-warnings-register \
+ procps \
+ sed \
+ sysvinit \
+ sysvinit-inittab \
+ tar \
+ udev \
+ update-alternatives-dpkg \
+ update-rc.d \
+ util-linux \
+ util-linux-losetup \
+ util-linux-swaponoff \
+ util-linux-umount \
+ pkgconfig \
+ initscripts \
+ makedevs \
+ patch \
+ tinylogin \
+ sudo \
+"
============================================================
--- packages/tasks/task-mamona-devel.bb 7051d9c0015aeffbac96fc5ff75b2dbc78db4b56
+++ packages/tasks/task-mamona-devel.bb 7051d9c0015aeffbac96fc5ff75b2dbc78db4b56
@@ -0,0 +1,26 @@
+DESCRIPTION = "Necessary packages for development"
+LICENSE = "MIT"
+PR = "r1"
+ALLOW_EMPTY = "1"
+
+PACKAGES = "${PN}"
+
+RDEPENDS = "\
+ automake \
+ bison \
+ fakeroot \
+ flex \
+ gcc \
+ gcc-symlinks \
+ g++ \
+ g++-symlinks \
+ gdb \
+ gettext \
+ groff \
+ libc6-dev \
+ libstdc++-dev \
+ make \
+ cvs \
+ subversion \
+ pkgconfig \
+"
============================================================
--- packages/tasks/task-mamona-e.bb ef2f20e68a1ff39f3dc2cbedfd8bb250c79c6849
+++ packages/tasks/task-mamona-e.bb ef2f20e68a1ff39f3dc2cbedfd8bb250c79c6849
@@ -0,0 +1,37 @@
+DESCRIPTION = "Necessary packages for Enlightenment on Mamona"
+LICENSE = "MIT"
+PR = "r2"
+ALLOW_EMPTY = "1"
+
+PACKAGES = "${PN}"
+
+RDEPENDS = "\
+eet \
+embryo \
+imlib2 \
+edb \
+evas \
+libevas-engine-software-x11 \
+libevas-engine-software-16 \
+libevas-engine-software-16-x11 \
+libevas-saver-eet \
+libevas-saver-edb \
+libevas-saver-jpeg \
+libevas-saver-tiff \
+libevas-loader-eet \
+libevas-loader-edb \
+libevas-loader-jpeg \
+libevas-loader-tiff \
+ecore \
+efreet \
+edje \
+etk \
+ewl \
+epeg \
+esmart \
+epsilon \
+emotion \
+enhance \
+edbus \
+e-wm \
+"
============================================================
--- packages/tasks/task-mamona-extras.bb e7a1914a1ba4b2d123097f9be99973cbc2c0e2f5
+++ packages/tasks/task-mamona-extras.bb e7a1914a1ba4b2d123097f9be99973cbc2c0e2f5
@@ -0,0 +1,174 @@
+DESCRIPTION = "Task mamona extras: Dummy package to build extra packages to mamona repository"
+LICENSE = "MIT"
+PR = "r1"
+ALLOW_EMPTY = "1"
+
+PACKAGES = "${PN}"
+
+RDEPENDS = "\
+ tinylogin \
+ bluez-utils \
+ bluez-utils-compat \
+ bluez-utils-alsa \
+ bluez-libs \
+ coreutils \
+ cpio \
+ dbus \
+ diffstat \
+ dnsmasq \
+ dosfstools \
+ e2fsprogs \
+ expat \
+ findutils \
+ fontconfig \
+ gconf \
+ gnome-common \
+ gtk+-doc \
+ glib-2.0 \
+ ifupdown \
+ initscripts \
+ intltool \
+ iptables \
+ libelf \
+ libfontenc \
+ libmatchbox \
+ liboil \
+ libpng \
+ libtool \
+ libusb \
+ libxau \
+ libxcursor \
+ libxdmcp \
+ libxext \
+ libxfixes \
+ libxfont \
+ libxi \
+ libxkbfile \
+ libxml2 \
+ libxpm \
+ libxrandr \
+ libxren%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r6e883229c491cafc759e732de8b7df6be2b32ca2 -r1d205cceb88799688dad02620d65bb08678fccd9
#
#
#
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.24"
# to "packages/linux/linux-ixp4xx/defconfig-2.6.24.4"
#
# rename "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24"
# to "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4"
#
# rename "packages/linux/linux-ixp4xx_2.6.24.bb"
# to "packages/linux/linux-ixp4xx_2.6.24.4.bb"
#
# add_dir "packages/gtkhtml/gtkhtml-3.8"
#
# add_file "packages/busybox/files/50telnet"
# content [1da1219aa725bae7dfd982000c97e159804237f9]
#
# add_file "packages/busybox/files/login.failsafe"
# content [d3eaa22066e6d13ead9d5ee78fd47ad0d251a261]
#
# add_file "packages/db/db4-native.inc"
# content [d9b9ccd6925ca57231ad3f1e281972378ca83be6]
#
# add_file "packages/db/db4.inc"
# content [e7bdabc82bbe6d1c172d1ee155e0024792de676a]
#
# add_file "packages/gtkhtml/gtkhtml-3.8/60_glib-2.15-g-gnuc-function.patch"
# content [b1b1fae7207eeac786b8ee9ea7f0b098b2de0009]
#
# add_file "packages/gtkhtml/gtkhtml-3.8_3.12.3.bb"
# content [8472e2a38e79fa83c7aac126c8fbd65d7797528e]
#
# patch "classes/e.bbclass"
# from [312ae44c83581d25ea920d0970eb19ad5677206f]
# to [2c087f480efe7a90c7cc009a93e634e6e25f16ca]
#
# patch "classes/rootfs_ipk.bbclass"
# from [c319cef6215ceb9e757092d0eb6ea8303cbaacad]
# to [fec211c8f0426463d8bddc084d993099b5bbb2ab]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [0269a178e7edbe8ac9c17cef3cc5878aa563ee30]
# to [44e4906ecf7591680ec759d0c7ea0fbc8cbab14a]
#
# patch "conf/machine/include/ixp4xx.inc"
# from [aa79f84872ffba6825c781a48f53c408a318a978]
# to [858cbefa25de1ab4bbfcb2a59425e5b0487f6de4]
#
# patch "packages/busybox/busybox-1.9.1/defconfig"
# from [183a1034704ae8119a3b8348768ba35a162e96b8]
# to [f0e872e8e6f3bc9941075571caf38d1a62657458]
#
# patch "packages/db/db-native_4.2.52.bb"
# from [5c0fba9adce096fef14fb5d04f1d361ca27d602e]
# to [f5954aaccdc1a79e66f41abe40553c04eb9790d8]
#
# patch "packages/db/db-native_4.3.29.bb"
# from [5b85626af5db30b2e76c61a4f42f2b8894647dcc]
# to [f5954aaccdc1a79e66f41abe40553c04eb9790d8]
#
# patch "packages/db/db3_3.2.9.bb"
# from [160e0e47ee411a288806fb7a98681e9824e90f19]
# to [edda3a971c8f4ec1512f8625e93548438152e661]
#
# patch "packages/db/db_4.2.52.bb"
# from [1a8760b7fc8cc0392968b1042a6f1f4ad8942c90]
# to [10f8a7c33de2cb7e627c1fc0081456e03ce9b6a6]
#
# patch "packages/db/db_4.3.29.bb"
# from [66709e9d9588794467ceb39b685bde44ab5bf724]
# to [41ed5118580382354ff82f6b91aef47cf361cd98]
#
# 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.4.bb"
# from [6df87e421ee2408a059092ec0b63b1393e0c03ce]
# to [493df9f1f9f80a8b08911a0846783e5101b6b828]
#
# 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
============================================================
--- packages/db/db4-native.inc d9b9ccd6925ca57231ad3f1e281972378ca83be6
+++ packages/db/db4-native.inc d9b9ccd6925ca57231ad3f1e281972378ca83be6
@@ -0,0 +1,28 @@
+# This wrapper builds a native version of the Oracal
+# Berkeley DB for those packages which need it (e.g.
+# perl).
+
+VIRTUAL_NAME = "virtual/db-native"
+CONFLICTS = "db3-native"
+#PR tracks the non-native package
+
+inherit native
+
+do_package() {
+:
+}
+
+PACKAGES = ""
+
+do_stage() {
+ # The .h files get installed read-only, the autostage
+ # function just uses cp -pPR, so do this by hand
+ rm -rf ${STAGE_TEMP}
+ mkdir -p ${STAGE_TEMP}
+ oe_runmake DESTDIR="${STAGE_TEMP}" install_include
+ cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
+ rm -rf ${STAGE_TEMP}
+ oe_libinstall -so -C .libs libdb-${PVM} ${STAGING_LIBDIR}
+ ln -sf libdb-${PVM}.so ${STAGING_LIBDIR}/libdb.so
+ ln -sf libdb-${PVM}.a ${STAGING_LIBDIR}/libdb.a
+}
============================================================
--- packages/db/db4.inc e7bdabc82bbe6d1c172d1ee155e0024792de676a
+++ packages/db/db4.inc e7bdabc82bbe6d1c172d1ee155e0024792de676a
@@ -0,0 +1,96 @@
+# Version 4 of the Berkeley DB from Oracle
+#
+# At present this package only installs the DB code
+# itself (shared libraries, .a in the dev package),
+# documentation and headers.
+#
+# The headers have the same names as those as v3
+# of the DB, only one version can be used *for dev*
+# at once - DB3 and DB4 can both be installed on the
+# same system at the same time if really necessary.
+
+
+DESCRIPTION = "Berkeley DB v4."
+HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
+SECTION = "libs"
+LICENSE = "BSD"
+VIRTUAL_NAME ?= "virtual/db"
+CONFLICTS = "db3"
+
+SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
+
+inherit autotools
+
+# Put virtual/db in any appropriate provider of a
+# relational database, use it as a dependency in
+# place of a specific db and use:
+#
+# PREFERRED_PROVIDER_virtual/db
+#
+# to select the correct db in the build (distro) .conf
+PROVIDES += "${VIRTUAL_NAME}"
+
+# bitbake isn't quite clever enough to deal with db,
+# the distribution sits in the expected directory, but all
+# the builds must occur from a sub-directory. The following
+# persuades bitbake to go to the right place
+S = "${WORKDIR}/db-${PV}/dist"
+B = "${WORKDIR}/db-${PV}/build_unix"
+
+# The executables go in a separate package - typically there
+# is no need to install these unless doing real database
+# management on the system.
+PACKAGES += " ${PN}-bin"
+
+# Package contents
+FILES_${PN} = "${libdir}/libdb-4*so*"
+FILES_${PN}-bin = "${bindir}/*"
+# The dev package has the .so link (as in db3) and the .a's -
+# it is therefore incompatible (cannot be installed at the
+# same time) as the db3 package
+FILES_${PN}-dev = "${includedir} ${libdir}/*"
+
+EXTRA_OECONF = "${DB4_CONFIG}"
+
+# Override the MUTEX setting here, the POSIX library is
+# the default - "POSIX/pthreads/library".
+# Don't ignore the nice SWP instruction on the ARM:
+# These enable the ARM assembler mutex code, this won't
+# work with thumb compilation...
+ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
+MUTEX = ""
+MUTEX_arm = "${ARM_MUTEX}"
+MUTEX_armeb = "${ARM_MUTEX}"
+EXTRA_OECONF += "${MUTEX}"
+
+# Cancel the site stuff - it's set for db3 and destroys the
+# configure.
+CONFIG_SITE = ""
+do_configure() {
+ ( cd ${WORKDIR}/db-${PV}/dist ; gnu-configize )
+ oe_runconf
+}
+
+
+do_install_append() {
+ # The docs end up in /usr/docs - not right.
+ if test -d "${D}/${prefix}/docs"
+ then
+ mkdir -p "${D}/${datadir}"
+ test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
+ mv "${D}/${prefix}/docs" "${D}/${docdir}"
+ fi
+}
+
+do_stage() {
+ # The .h files get installed read-only, the autostage
+ # function just uses cp -pPR, so do this by hand
+ rm -rf ${STAGE_TEMP}
+ mkdir -p ${STAGE_TEMP}
+ oe_runmake DESTDIR="${STAGE_TEMP}" install_include
+ cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
+ rm -rf ${STAGE_TEMP}
+ oe_libinstall -so -C .libs libdb-${PVM} ${STAGING_LIBDIR}
+ ln -sf libdb-${PVM}.so ${STAGING_LIBDIR}/libdb.so
+ ln -sf libdb-${PVM}.a ${STAGING_LIBDIR}/libdb.a
+}
============================================================
--- packages/gtkhtml/gtkhtml-3.8/60_glib-2.15-g-gnuc-function.patch b1b1fae7207eeac786b8ee9ea7f0b098b2de0009
+++ packages/gtkhtml/gtkhtml-3.8/60_glib-2.15-g-gnuc-function.patch b1b1fae7207eeac786b8ee9ea7f0b098b2de0009
@@ -0,0 +1,39 @@
+diff -Nur gtkhtml3.8-3.12.3/src/htmlengine-edit-clueflowstyle.c gtkhtml3.8-3.12.3.new/src/htmlengine-edit-clueflowstyle.c
+--- gtkhtml3.8-3.12.3/src/htmlengine-edit-clueflowstyle.c 2007-01-29 10:50:59.000000000 +0100
++++ gtkhtml3.8-3.12.3.new/src/htmlengine-edit-clueflowstyle.c 2008-02-15 10:07:22.000000000 +0100
+@@ -175,7 +175,7 @@
+ while (p != NULL) {
+ if (HTML_OBJECT_TYPE (obj->parent) != HTML_TYPE_CLUEFLOW) {
+ g_warning ("(%s:%s) Eeeek! Unknown parent type `%s'.",
+- __FILE__, G_GNUC_FUNCTION,
++ __FILE__, G_STRFUNC,
+ html_type_name (HTML_OBJECT_TYPE (obj->parent)));
+ break;
+ }
+@@ -209,7 +209,7 @@
+ /* This should not happen. */
+ g_warning ("(%s:%s) There were not enough paragraphs for "
+ "setting the paragraph style.",
+- __FILE__, G_GNUC_FUNCTION);
++ __FILE__, G_STRFUNC);
+ break;
+ }
+ } while (obj != NULL && HTML_CLUEFLOW (obj->parent) == clueflow);
+@@ -217,7 +217,7 @@
+
+ if (prop_list == NULL) {
+ /* This should not happen. */
+- g_warning ("%s:%s Eeek! Nothing done?", __FILE__, G_GNUC_FUNCTION);
++ g_warning ("%s:%s Eeek! Nothing done?", __FILE__, G_STRFUNC);
+ return;
+ }
+
+@@ -280,7 +280,7 @@
+ while (p != NULL) {
+ if (HTML_OBJECT_TYPE (p->parent) != HTML_TYPE_CLUEFLOW) {
+ g_warning ("(%s:%s) Eeeek! Unknown parent type `%s'.",
+- __FILE__, G_GNUC_FUNCTION,
++ __FILE__, G_STRFUNC,
+ html_type_name (HTML_OBJECT_TYPE (p->parent)));
+ break;
+ }
============================================================
--- packages/gtkhtml/gtkhtml-3.8_3.12.3.bb 8472e2a38e79fa83c7aac126c8fbd65d7797528e
+++ packages/gtkhtml/gtkhtml-3.8_3.12.3.bb 8472e2a38e79fa83c7aac126c8fbd65d7797528e
@@ -0,0 +1,29 @@
+DESCRIPTION = "HTML rendering/editing library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+
+SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.12/gtkhtml-${PV}.tar.bz2 \
+ file://60_glib-2.15-g-gnuc-function.patch;patch=1"
+
+S = "${WORKDIR}/gtkhtml-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+ORBIT_IDL = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+
+do_configure_append() {
+ find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+ find ${S} -name Makefile | xargs sed -i s:'-I${prefix}/include':'-I.':g
+ find ${S} -name Makefile | xargs sed -i 's|ORBIT_IDL =.*|ORBIT_IDL = ${ORBIT_IDL}|'
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/gtkhtml-3.8"
+
============================================================
--- 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"
-
============================================================
--- classes/rootfs_ipk.bbclass c319cef6215ceb9e757092d0eb6ea8303cbaacad
+++ classes/rootfs_ipk.bbclass fec211c8f0426463d8bddc084d993099b5bbb2ab
@@ -60,6 +60,10 @@ fakeroot rootfs_ipk_do_rootfs () {
rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/*
+ # Keep these lines until package manager selection is implemented
+ ln -s opkg ${IMAGE_ROOTFS}${sysconfdir}/ipkg
+ ln -s opkg ${IMAGE_ROOTFS}${libdir}/ipkg
+
${ROOTFS_POSTPROCESS_COMMAND}
log_check rootfs
============================================================
--- 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 858cbefa25de1ab4bbfcb2a59425e5b0487f6de4
@@ -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.4+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/db/db-native_4.2.52.bb 5c0fba9adce096fef14fb5d04f1d361ca27d602e
+++ packages/db/db-native_4.2.52.bb f5954aaccdc1a79e66f41abe40553c04eb9790d8
@@ -1,27 +1,2 @@
-# This wrapper builds a native version of the SleepyCat
-# Berkeley DB for those packages which need it (e.g.
-# perl).
-SECTION = "libs%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list