[oe-commits] org.oe.dev merge of '4f0260db452e1d17accce2d4d5bdb2c928659a73'
pfalcon commit
openembedded-commits at lists.openembedded.org
Sun Feb 3 00:05:48 UTC 2008
merge of '4f0260db452e1d17accce2d4d5bdb2c928659a73'
and '9ffd2a28e373f472fe60ae833c1effe73b2bed70'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: eea0b13e3079e07cf547a5690026863e07e011bf
ViewMTN: http://monotone.openembedded.org/revision/info/eea0b13e3079e07cf547a5690026863e07e011bf
Files:
1
packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb
packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb
packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
packages/inetutils/inetutils_1.5.bb
packages/python/python-edbus_cvs.bb
packages/xorg-app/bdftopcf-native_1.0.0.bb
packages/xorg-font/font-util-native_1.0.1.bb
conf/machine/h5000.conf
packages/tasks/task-base.bb
Diffs:
#
# mt diff -r4f0260db452e1d17accce2d4d5bdb2c928659a73 -reea0b13e3079e07cf547a5690026863e07e011bf
#
#
#
# rename "packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb"
# to "packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb"
#
# rename "packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb"
# to "packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb"
#
# rename "packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb"
# to "packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb"
#
# rename "packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb"
# to "packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb"
#
# rename "packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb"
# to "packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb"
#
# rename "packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb"
# to "packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb"
#
# rename "packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb"
# to "packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb"
#
# rename "packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb"
# to "packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb"
#
# add_file "packages/inetutils/inetutils_1.5.bb"
# content [dfddc68af03f52a9106590446cca1d62313b47dc]
#
# patch "packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb"
# from [2cf4bac2b83ff6352cb4315ebe9bcea76fa47ce7]
# to [bc806f771dfb211bb02961e2f052b4c8a4cbcbbc]
#
# patch "packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb"
# from [84fc3a38f5414cbd71aabdebd2df8cb422c94290]
# to [4c11d3df09f6a7340c8d0de10119b55c14bfc64f]
#
# patch "packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb"
# from [49e28cdbdf947670361e9bf063c2e5cb74702417]
# to [6ec7811fb60d0489394ab075d552e12a70685633]
#
# patch "packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb"
# from [43abb0834bd9e900f53ffd78c329cdc8ba920e57]
# to [f4c0ee79455559e83ac70389ffae91dabb34538a]
#
# patch "packages/python/python-edbus_cvs.bb"
# from [8d1d00ca5115e7226c39fbda403b7c1f6246e0a2]
# to [b9e9b38cb16c01ec8101aa260e4284de97c19c1e]
#
# patch "packages/xorg-app/bdftopcf-native_1.0.0.bb"
# from [60d6c9131e6edb0c83a67fd03de07e9b8331719c]
# to [7f4e40b838d6811415a1d0a5752d2cc807af3d67]
#
# patch "packages/xorg-font/font-util-native_1.0.1.bb"
# from [e15331aa720a2c0392a072ac4bedee6d2406739c]
# to [38bd9ec3ecff18a104db97c5ea359a0ec7b06c93]
#
============================================================
--- packages/inetutils/inetutils_1.5.bb dfddc68af03f52a9106590446cca1d62313b47dc
+++ packages/inetutils/inetutils_1.5.bb dfddc68af03f52a9106590446cca1d62313b47dc
@@ -0,0 +1,17 @@
+SECTION = "libs"
+DEPENDS = "ncurses"
+LICENSE = "GPL"
+DESCRIPTION = "The GNU inetutils are a collection of common \
+networking utilities and servers including ftp, ftpd, rcp, \
+rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \
+talkd, telnet, telnetd, tftp, tftpd, and uucpd."
+
+SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR}"
+
+do_configure_prepend () {
+ rm -f ${S}/glob/configure*
+}
============================================================
--- packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb 2cf4bac2b83ff6352cb4315ebe9bcea76fa47ce7
+++ packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb bc806f771dfb211bb02961e2f052b4c8a4cbcbbc
@@ -10,8 +10,6 @@ do_install() {
do_install() {
install -d ${D}${localstatedir}/lib/asterisk/sounds
# HACK: moving the files in chunkes (too many of them)
- rm ${WORKDIR}/conf-thereare.alaw
- rm ${WORKDIR}/invalid.alaw
mv ${WORKDIR}/[a-d]*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/[e-l]*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
- #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
- #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
- mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
============================================================
--- packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb 84fc3a38f5414cbd71aabdebd2df8cb422c94290
+++ packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb 4c11d3df09f6a7340c8d0de10119b55c14bfc64f
@@ -10,8 +10,6 @@ do_install() {
do_install() {
install -d ${D}${localstatedir}/lib/asterisk/sounds
# HACK: moving the files in chunks (too many files)
- rm ${WORKDIR}/conf-thereare.g729
- rm ${WORKDIR}/invalid.g729
mv ${WORKDIR}/[a-d]*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/[e-l]*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
- #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
- #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
- mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
============================================================
--- packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb 49e28cdbdf947670361e9bf063c2e5cb74702417
+++ packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb 6ec7811fb60d0489394ab075d552e12a70685633
@@ -10,8 +10,6 @@ do_install() {
do_install() {
install -d ${D}${localstatedir}/lib/asterisk/sounds
# HACK: moving the files in chunks (too many files)
- rm ${WORKDIR}/conf-thereare.gsm
- rm ${WORKDIR}/invalid.gsm
mv ${WORKDIR}/[a-d]*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/[e-l]*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
- #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
- #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
- mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
============================================================
--- packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb 43abb0834bd9e900f53ffd78c329cdc8ba920e57
+++ packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb f4c0ee79455559e83ac70389ffae91dabb34538a
@@ -10,8 +10,6 @@ do_install() {
do_install() {
install -d ${D}${localstatedir}/lib/asterisk/sounds
# HACK: moving the files in chunkes (too many of them)
- rm ${WORKDIR}/conf-thereare.ulaw
- rm ${WORKDIR}/invalid.ulaw
mv ${WORKDIR}/[a-d]*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/[e-l]*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
- #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
- #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
- mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
============================================================
--- packages/python/python-edbus_cvs.bb 8d1d00ca5115e7226c39fbda403b7c1f6246e0a2
+++ packages/python/python-edbus_cvs.bb b9e9b38cb16c01ec8101aa260e4284de97c19c1e
@@ -1,7 +1,7 @@ require python-efl.inc
require python-efl.inc
-DEPENDS += "edbus dbus"
+DEPENDS += "edbus python-dbus"
-PR = "r2"
+PR = "r3"
SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
S = "${WORKDIR}/python-e_dbus"
============================================================
--- packages/xorg-app/bdftopcf-native_1.0.0.bb 60d6c9131e6edb0c83a67fd03de07e9b8331719c
+++ packages/xorg-app/bdftopcf-native_1.0.0.bb 7f4e40b838d6811415a1d0a5752d2cc807af3d67
@@ -1,13 +1,8 @@
-DESCRIPTION = "Native bdftopdf utility"
-SECTION = "x11/fonts"
-LICENSE = "MIT-X"
+inherit native
+require xorg-app-common.inc
PE = "1"
-S="${WORKDIR}/bdftopcf-${PV}"
+XORG_PN = "bdftopcf"
DEPENDS = "libxfont-native"
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/bdftopcf-X11R7.0-1.0.0.tar.gz"
-
-inherit native autotools pkgconfig
-
============================================================
--- packages/xorg-font/font-util-native_1.0.1.bb e15331aa720a2c0392a072ac4bedee6d2406739c
+++ packages/xorg-font/font-util-native_1.0.1.bb 38bd9ec3ecff18a104db97c5ea359a0ec7b06c93
@@ -1,13 +1,8 @@
-DESCRIPTION = "X font utils."
-SECTION = "x11/fonts"
-LICENSE = "MIT-X"
+inherit native
+require xorg-font-common.inc
-S="${WORKDIR}/font-util-${PV}"
+XORG_PN = "font-util"
DEPENDS = "bdftopcf-native"
PE = "1"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/font/font-util-${PV}.tar.gz"
-
-inherit native autotools pkgconfig
#
# mt diff -r9ffd2a28e373f472fe60ae833c1effe73b2bed70 -reea0b13e3079e07cf547a5690026863e07e011bf
#
#
#
# patch "conf/machine/h5000.conf"
# from [b6fb552c41aeff2850cd35e5d3dfb99733e1e56d]
# to [e03a562f647e39de325cf64e33abb934e96da504]
#
# patch "packages/tasks/task-base.bb"
# from [c13ff0dc014dd2c93926e1f1aef880d9dda3571c]
# to [1a4f000020453dc9598a87cbb8a1df9e88bc5c96]
#
============================================================
--- conf/machine/h5000.conf b6fb552c41aeff2850cd35e5d3dfb99733e1e56d
+++ conf/machine/h5000.conf e03a562f647e39de325cf64e33abb934e96da504
@@ -27,7 +27,8 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-mod
MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
kernel-module-h5400-battery \
- kernel-module-snd-soc-h5000"
+ kernel-module-snd-soc-h5000 \
+ kernel-module-i2c-pxa"
#
# Modules autoload and other boot properties
============================================================
--- packages/tasks/task-base.bb c13ff0dc014dd2c93926e1f1aef880d9dda3571c
+++ packages/tasks/task-base.bb 1a4f000020453dc9598a87cbb8a1df9e88bc5c96
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r58"
+PR = "r59"
inherit task
More information about the Openembedded-commits
mailing list