[oe-commits] org.oe.dev merge of '55b6b2c132d8b0a81bcec0deed383a3da45e39e8'
jeremy_laine commit
oe at amethyst.openembedded.net
Tue Mar 25 07:37:07 UTC 2008
merge of '55b6b2c132d8b0a81bcec0deed383a3da45e39e8'
and '67254ac9ecc3abdbf0b718b05d6eaa8d6b4b6e92'
Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: ec37570cb305b4562beefda95e60ef1dc8807583
ViewMTN: http://monotone.openembedded.org/revision/info/ec37570cb305b4562beefda95e60ef1dc8807583
Files:
1
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
packages/mamona
packages/mamona/bash-noemu-3.2
packages/mamona/binutils-noemu-2.17.50.0.5
packages/mamona/gcc-noemu-4.1.1
packages/mamona/mamona-sound-n800
packages/mamona/usbnet
packages/mamona/usbnet/default
packages/mamona/bash-noemu_3.2.bb
packages/mamona/binutils-noemu_2.17.50.0.5.bb
packages/mamona/gcc-noemu_4.1.1.bb
packages/mamona/gcc-package-noemu.inc
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
Diffs:
#
# mt diff -r55b6b2c132d8b0a81bcec0deed383a3da45e39e8 -rec37570cb305b4562beefda95e60ef1dc8807583
#
#
#
# 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
#
# mt diff -r67254ac9ecc3abdbf0b718b05d6eaa8d6b4b6e92 -rec37570cb305b4562beefda95e60ef1dc8807583
#
#
#
# add_dir "packages/mamona"
#
# add_dir "packages/mamona/bash-noemu-3.2"
#
# add_dir "packages/mamona/binutils-noemu-2.17.50.0.5"
#
# add_dir "packages/mamona/gcc-noemu-4.1.1"
#
# add_dir "packages/mamona/mamona-sound-n800"
#
# add_dir "packages/mamona/usbnet"
#
# add_dir "packages/mamona/usbnet/default"
#
# add_file "packages/mamona/bash-noemu_3.2.bb"
# content [1540a1b530abf247e26dc00b255bf6b8637cad93]
#
# add_file "packages/mamona/binutils-noemu_2.17.50.0.5.bb"
# content [0a1681bf30546f26f0bbc29b2d3c58c5bb8aa697]
#
# add_file "packages/mamona/gcc-noemu_4.1.1.bb"
# content [bc2fbdaf9606df8094de2db14dff3804289b8f07]
#
# add_file "packages/mamona/gcc-package-noemu.inc"
# content [a2000c1ed55ac1ed191d55172369e36677df3394]
#
# 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/bash-noemu_3.2.bb 1540a1b530abf247e26dc00b255bf6b8637cad93
+++ packages/mamona/bash-noemu_3.2.bb 1540a1b530abf247e26dc00b255bf6b8637cad93
@@ -0,0 +1,29 @@
+require ../bash/bash.inc
+PR = "r1"
+
+SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
+ file://001-005.patch;patch=1"
+
+S = "${WORKDIR}/bash-${PV}"
+
+EXTRA_OECONF += "--enable-static-link --without-bash-malloc"
+
+#HOST_SYS = "${BUILD_SYS}"
+#CONFIG_SITE = ""
+
+do_configure () {
+ export CPP="gcc -E"
+ export CC=gcc
+ export AS=as
+ export LD=ld
+ export CXX=g++
+ export AR=ar
+ export OBJCOPY=objcopy
+ export OBJDUMP=objdump
+ export RANLIB=ranlib
+ export NM=nm
+ export STRIP=strip
+ export CFLAGS="-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+ export CXXFLAGS="-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -fpermissive -fvisibility-inlines-hidden"
+ oe_runconf
+}
============================================================
--- packages/mamona/binutils-noemu_2.17.50.0.5.bb 0a1681bf30546f26f0bbc29b2d3c58c5bb8aa697
+++ packages/mamona/binutils-noemu_2.17.50.0.5.bb 0a1681bf30546f26f0bbc29b2d3c58c5bb8aa697
@@ -0,0 +1,32 @@
+require ../binutils/binutils.inc
+
+PR = "r1"
+
+SRC_URI = \
+ "${KERNELORG_MIRROR}/pub/linux/devel/binutils/binutils-${PV}.tar.bz2 \
+ file://binutils-2.16.91.0.6-objcopy-rename-errorcode.patch;patch=1 \
+ file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
+ file://binutils-configure-texinfo-version.patch;patch=1 \
+ file://110-arm-eabi-conf.patch;patch=1 \
+ file://binutils-uclibc-300-001_ld_makefile_patch.patch;patch=1 \
+ file://binutils-uclibc-300-006_better_file_error.patch;patch=1 \
+ file://binutils-uclibc-300-012_check_ldrunpath_length.patch;patch=1 \
+ "
+
+EXTRA_OECONF = "--with-sysroot=${CROSS_DIR}/${TARGET_SYS} \
+ --program-prefix=${TARGET_PREFIX} --disable-shared"
+
+HOST_SYS = "${BUILD_SYS}"
+
+do_configure () {
+ CC=gcc AS=as LD=ld CXX=g++ AR=ar OBJCOPY=objcopy OBJDUMP=objdump RANLIB=ranlib NM=nm STRIP=strip oe_runconf
+}
+
+do_compile() {
+ make configure-host
+ make LDFLAGS=\"-all-static\"
+}
+
+do_stage() {
+ :
+}
============================================================
--- packages/mamona/gcc-noemu_4.1.1.bb bc2fbdaf9606df8094de2db14dff3804289b8f07
+++ packages/mamona/gcc-noemu_4.1.1.bb bc2fbdaf9606df8094de2db14dff3804289b8f07
@@ -0,0 +1,82 @@
+PR = "r14"
+DESCRIPTION = "The GNU cc and gcc C compilers."
+HOMEPAGE = "http://www.gnu.org/software/gcc/"
+SECTION = "devel"
+LICENSE = "GPL"
+
+inherit autotools gettext
+
+require gcc-package-noemu.inc
+
+SRC_URI = "http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2 \
+ file://100-uclibc-conf.patch;patch=1 \
+ file://110-arm-eabi.patch;patch=1 \
+ file://200-uclibc-locale.patch;patch=1 \
+ file://300-libstdc++-pic.patch;patch=1 \
+ file://301-missing-execinfo_h.patch;patch=1 \
+ file://302-c99-snprintf.patch;patch=1 \
+ file://303-c99-complex-ugly-hack.patch;patch=1 \
+ file://304-index_macro.patch;patch=1 \
+ file://602-sdk-libstdc++-includes.patch;patch=1 \
+ file://740-sh-pr24836.patch;patch=1 \
+ file://800-arm-bigendian.patch;patch=1 \
+ file://801-arm-bigendian-eabi.patch;patch=1 \
+ file://arm-nolibfloat.patch;patch=1 \
+ file://arm-softfloat.patch;patch=1 \
+ file://gcc41-configure.in.patch;patch=1 \
+ file://arm-thumb.patch;patch=1 \
+ file://arm-thumb-cache.patch;patch=1 \
+ file://ldflags.patch;patch=1 \
+ file://cse.patch;patch=1 \
+ file://zecke-xgcc-cpp.patch;patch=1 \
+ file://unbreak-armv4t.patch;patch=1 \
+ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
+ file://gcc-4.1.1-pr13685-1.patch;patch=1 \
+ file://gcc-ignore-cache.patch;patch=1 \
+ "
+
+SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
+
+#This is a dirty hack to get gcc 4.1.1 to compile for glibc AND uclibc on ppc
+#the patch that is need it to get gcc support soft-floats with glibc, makes gcc fail with uclibc
+SRC_URI_append_linux = " file://ppc-gcc-41-20060515.patch;patch=1 \
+ file://ppc-sfp-long-double-gcc411-7.patch;patch=1 "
+
+
+#Set the fortran bits
+# 'fortran' or '', not 'f77' like gcc3 had
+FORTRAN = ""
+HAS_GFORTRAN = "no"
+HAS_G2C = "no"
+
+#Set the java bits
+JAVA_arm = ""
+JAVA = ""
+
+LANGUAGES = "c,c++${FORTRAN}${JAVA}"
+require ../gcc/gcc3-build.inc
+
+EXTRA_OECONF += "--disable-libspp --with-slibdir=\"/lib\""
+
+EXTRA_OEMAKE += "LDFLAGS=\"-static\" build_tooldir=\"${STAGING_DIR}/${TARGET_SYS}\""
+
+HOST_SYS = ${BUILD_SYS}
+
+CONFIG_SITE=""
+
+do_configure () {
+ export CPP="gcc -E"
+ export CC=gcc
+ export AS=as
+ export LD=ld
+ export CXX=g++
+ export AR=ar
+ export OBJCOPY=objcopy
+ export OBJDUMP=objdump
+ export RANLIB=ranlib
+ export NM=nm
+ export STRIP=strip
+ export CFLAGS="-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+ export CXXFLAGS="-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os -fpermissive -fvisibility-inlines-hidden"
+ oe_runconf
+}
============================================================
--- packages/mamona/gcc-package-noemu.inc a2000c1ed55ac1ed191d55172369e36677df3394
+++ packages/mamona/gcc-package-noemu.inc a2000c1ed55ac1ed191d55172369e36677df3394
@@ -0,0 +1,126 @@
+gcclibdir ?= "${libdir}/gcc"
+BINV ?= "${PV}"
+
+PACKAGES = "libgcc ${PN} ${PN}-symlinks \
+ g++-noemu g++-noemu-symlinks \
+ cpp-noemu cpp-noemu-symlinks \
+ g77-noemu g77-noemu-symlinks \
+ gcov-noemu gcov-noemu-symlinks \
+ libmudflap-noemu libmudflap-noemu-dev \
+ libstdc++-noemu libg2c-noemu \
+ libstdc++-noemu-dev libg2c-noemu-dev \
+ ${PN}-doc"
+
+FILES_${PN} = "${bindir}/${TARGET_PREFIX}gcc \
+ ${bindir}/${TARGET_PREFIX}gccbug \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1 \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/include"
+FILES_${PN}-symlinks = "${bindir}/cc \
+ ${bindir}/gcc \
+ ${bindir}/gccbug"
+
+FILES_g77-noemu = "${bindir}/${TARGET_PREFIX}g77 \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/f771"
+FILES_g77-noemu-symlinks = "${bindir}/g77 \
+ ${bindir}/f77"
+
+FILES_cpp-noemu = "${bindir}/${TARGET_PREFIX}cpp \
+ ${base_libdir}/cpp"
+FILES_cpp-noemu-symlinks = "${bindir}/cpp"
+
+FILES_gcov-noemu = "${bindir}/${TARGET_PREFIX}gcov"
+FILES_gcov-noemu-symlinks = "${bindir}/gcov"
+
+FILES_libgcc-noemu = "${base_libdir}/libgcc*.so.*"
+FILES_libgcc-noemu-dev = "${base_libdir}/libgcc*.so"
+
+# Called from within gcc-cross, so libdir is set wrong
+FILES_libg2c-noemu = "${target_libdir}/libg2c.so.*"
+FILES_libg2c-noemu-dev = "${libdir}/libg2c.so \
+ ${libdir}/libg2c.a \
+ ${libdir}/libfrtbegin.a"
+
+FILES_g++-noemu = "${bindir}/${TARGET_PREFIX}g++ \
+ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus"
+FILES_g++-noemu-symlinks = "${bindir}/c++ \
+ ${bindir}/g++"
+
+FILES_libstdc++-noemu = "${libdir}/libstdc++.so.*"
+FILES_libstdc++-noemu-dev = "${includedir}/c++/${BINV} \
+ ${libdir}/libstdc++.so \
+ ${libdir}/libstdc++.la \
+ ${libdir}/libstdc++.a \
+ ${libdir}/libsupc++.la \
+ ${libdir}/libsupc++.a"
+
+FILES_libmudflap-noemu = "${libdir}/libmudflap*.so.*"
+FILES_libmudflap-noemu-dev = "${libdir}/libmudflap*.so \
+ ${libdir}/libmudflap*.a \
+ ${libdir}/libmudflap*.a"
+
+
+FILES_${PN}-doc = "${infodir} \
+ ${mandir} \
+ ${gcclibdir}/${TARGET_SYS}/${BINV}/include/README"
+
+python do_package() {
+ if bb.data.getVar('DEBIAN_NAMES', d, 1):
+ bb.data.setVar('PKG_libgcc', 'libgcc1', d)
+ bb.build.exec_func('package_do_package', d)
+}
+
+
+do_install () {
+ autotools_do_install
+
+ # Cleanup some of the ${libdir}{,exec}/gcc stuff ...
+ rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+ rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
+
+ # Hack around specs file assumptions
+ test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs
+
+ # Using --with-slibdir instead of this hack below..
+ ## Move libgcc_s into /lib
+ #mkdir -p ${D}${base_libdir}
+ #mv ${D}${libdir}/libgcc_s.so.* ${D}${base_libdir}
+ #rm -f ${D}${libdir}/libgcc_s.so
+ #ln -sf `echo ${libdir}/gcc/${TARGET_SYS}/${BINV} \
+ # | tr -s / \
+ # | sed -e 's,^/,,' -e 's,[^/]*,..,g'`/lib/libgcc_s.so.1 \
+ # ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/libgcc_s.so
+
+ # We don't need libtool libraries
+ rm -f ${D}${libdir}/libg2c.la &>/dev/null || true
+
+ # Cleanup manpages..
+ rm -rf ${D}${mandir}/man7
+
+ # We use libiberty from binutils
+ rm -f ${D}${libdir}/libiberty.a
+
+ cd ${D}${bindir}
+
+ # We care about g++ not c++
+ rm -f *c++
+
+ # We don't care about the gcc-<version> ones for this
+ rm -f *gcc-?.?*
+
+ # These sometimes show up, they are strange, we remove them
+ rm -f ${TARGET_ARCH}-*${TARGET_ARCH}-*
+
+ # Symlinks so we can use these trivially on the target
+ ln -sf ${TARGET_SYS}-g77 g77
+ ln -sf ${TARGET_SYS}-g++ g++
+ ln -sf ${TARGET_SYS}-gcc gcc
+ ln -sf g77 f77
+ ln -sf g++ c++
+ ln -sf gcc cc
+ ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${base_libdir}/cpp
+ ln -sf ${bindir}/${TARGET_SYS}-cpp ${D}${bindir}/cpp
+}
============================================================
--- 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 al%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list