[oe-commits] org.oe.dev merge of '16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb'
Laibsch commit
openembedded-commits at lists.openembedded.org
Wed Jan 16 20:29:07 UTC 2008
merge of '16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb'
and '843d33548c0e77469b4859dd4e3b8c77590cb762'
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: c7289c9605cd6d73dd8698f9214422a66461880d
ViewMTN: http://monotone.openembedded.org/revision/info/c7289c9605cd6d73dd8698f9214422a66461880d
Files:
1
packages/gsm/files/stdint.patch
packages/gsm/libgsmd-lips_svn.bb
packages/gpephone/libmsgenabler2_svn.bb
packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb
packages/linux/linux-tornado-omap2/htctornado/defconfig
packages/linux/linux-tornado-omap2_2.6.16.16.bb
packages/meta/meta-toolchain-gpe-sbox.bb
packages/meta/meta-toolchain-gpe.bb
packages/meta/meta-toolchain-openmoko.bb
packages/meta/meta-toolchain-sbox.bb
packages/meta/meta-toolchain.bb
packages/monit
packages/monit/files
packages/monit/monit-4.10.1
packages/monit/files/init
packages/monit/monit-4.10.1/init
packages/monit/monit_4.10.1.bb
packages/meta/slugos-packages.bb
Diffs:
#
# mt diff -r16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb -rc7289c9605cd6d73dd8698f9214422a66461880d
#
#
#
# add_file "packages/gsm/files/stdint.patch"
# content [04cc8ef32d32ede1c69b0b07e61d2799a549ad51]
#
# add_file "packages/gsm/libgsmd-lips_svn.bb"
# content [9ce3eff62bdc12b8fdc3880b21d14c4ddca11602]
#
# patch "packages/gpephone/libmsgenabler2_svn.bb"
# from [54a29d568f999ecbd83b1ce249da584fbcec85f3]
# to [98732dfed57aec57dd1b60c208b0540f3fc15122]
#
# patch "packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb"
# from [076ea04844ab570db5f22cfc2d543f19f9f2af3d]
# to [8bfa3c79994262c6e40c21497b08d5d69367ac4e]
#
# patch "packages/linux/linux-tornado-omap2/htctornado/defconfig"
# from [308cbe721749ba6fcf4f8b3909cc904bf3fad4d9]
# to [9b493e680180251433c7b19b9ab3e08f41158179]
#
# patch "packages/linux/linux-tornado-omap2_2.6.16.16.bb"
# from [03dda467990161bcb196927a1060decb35dd3bd2]
# to [a735d9e07c77baf8fa31bb48cda83957ab6af590]
#
# patch "packages/meta/meta-toolchain-gpe-sbox.bb"
# from [cfdfc9f4b2bbdd1f3ad0ebd0cfa69553220548d7]
# to [8c13ffb0df097aec092934180a6187818aba7378]
#
# patch "packages/meta/meta-toolchain-gpe.bb"
# from [e4b3b787a0714a603a46e6d0423cfddb7bba3c58]
# to [96ae935de25684f8ec51be678ff8a2aedf946d99]
#
# patch "packages/meta/meta-toolchain-openmoko.bb"
# from [052ed3fc28dde371bd81be6bf9ffaa47c10deb57]
# to [2c36f31834b317cfdc81cff2dc8cd7db05229bcf]
#
# patch "packages/meta/meta-toolchain-sbox.bb"
# from [00b9d0333251622f7df96dfb38a417c61e90a281]
# to [aa24669823d24a74c6fa299901b587d1432ba62a]
#
# patch "packages/meta/meta-toolchain.bb"
# from [3fe2673a61b591aed4f247f8201896a640d5ed35]
# to [b52d096ec913c333f9bb14b192bc922b80854834]
#
============================================================
--- packages/gsm/files/stdint.patch 04cc8ef32d32ede1c69b0b07e61d2799a549ad51
+++ packages/gsm/files/stdint.patch 04cc8ef32d32ede1c69b0b07e61d2799a549ad51
@@ -0,0 +1,17 @@
+--- include/libtapi/tel_bas_types.h~ 2008-01-16 12:48:19.000000000 +0100
++++ include/libtapi/tel_bas_types.h 2008-01-16 12:48:19.000000000 +0100
+@@ -27,13 +27,7 @@
+ /******************************************************************************
+ * Type definitions
+ *****************************************************************************/
+-#ifndef _STDINT_H
+-typedef unsigned long uint32_t;
+-typedef unsigned short uint16_t;
+-typedef unsigned char uint8_t;
+-/* typedef long int32_t; */
+-typedef unsigned int size_t;
+-#endif
++#include <stdint.h>
+
+
+ typedef unsigned long tel_bool_t;
============================================================
--- packages/gsm/libgsmd-lips_svn.bb 9ce3eff62bdc12b8fdc3880b21d14c4ddca11602
+++ packages/gsm/libgsmd-lips_svn.bb 9ce3eff62bdc12b8fdc3880b21d14c4ddca11602
@@ -0,0 +1,15 @@
+BASEPN = "gsmd-lips"
+CONFLICTNAME = "gsmd-devel gsmd"
+
+require gsmd.inc
+
+RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel libtapi libgsmd-dev"
+
+PV = "0.0+svnr${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=gsm \
+ file://stdint.patch;patch=1;pnum=0 \
+ file://gsmd \
+ file://default"
+
============================================================
--- packages/gpephone/libmsgenabler2_svn.bb 54a29d568f999ecbd83b1ce249da584fbcec85f3
+++ packages/gpephone/libmsgenabler2_svn.bb 98732dfed57aec57dd1b60c208b0540f3fc15122
@@ -1,10 +1,10 @@ PV = "0.0+svnr-${SRCREV}"
LICENSE = "LiPS"
DESCRIPTION = "LiPS message backend library."
SECTION = "gpe/libs"
PRIORITY = "optional"
DEPENDS = "glib-2.0 dbus-glib librecord2 liblipsevent2 telepathy-mission-control libgsmd-lips"
PV = "0.0+svnr-${SRCREV}"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
@@ -14,7 +14,9 @@ S = ${WORKDIR}/${PN}
S = ${WORKDIR}/${PN}
-FILES_${PN} += "$(datadir)/libmsgenabler2"
+FILES_${PN} += "${datadir}/libmsgenabler2 ${libdir}/msg-providers/*.0"
+FILES_${PN}-dev += "${libdir}/msg-providers/*.so ${libdir}/msg-providers/*a"
+FILES_${PN}-dbg += "${libdir}/msg-providers/.debug"
do_stage () {
autotools_stage_all
============================================================
--- packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb 076ea04844ab570db5f22cfc2d543f19f9f2af3d
+++ packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb 8bfa3c79994262c6e40c21497b08d5d69367ac4e
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_collie = "1"
@@ -86,13 +86,17 @@ SRC_URI_append_collie = "\
# These patches are extracted from Pavel Machek's git tree
# (diff against vanilla kernel)
SRC_URI_append_collie = "\
- ${DOSRC}/collie/mtd-sharp-flash-hack-r0.patch;patch=1 \
- ${DOSRC}/collie/collie-r0.patch;patch=1 \
- ${DOSRC}/collie/locomolcd-backlight-r0.patch;patch=1 \
- ${DOSRC}/collie/ucb1x00-touch-audio-r0.patch;patch=1 \
- file://collie-mcp-r1.patch;patch=1 \
- ${DOSRC}/collie/sa1100-udc-r0.patch;patch=1 \
-# ${DOSRC}/collie/collie-pm-r1.patch;patch=1 \
+ ${TKSRC}/${PN}_${PV}/mtd-sharp-flash-hack-r3.patch;patch=1 \
+ ${TKSRC}/${PN}_${PV}/mcp-sa11x0-r0.patch;patch=1 \
+ ${TKSRC}/${PN}_${PV}/locomo-r0.patch;patch=1 \
+ ${TKSRC}/${PN}_${PV}/locomo_spi-4.patch;patch=1 \
+ ${TKSRC}/${PN}_${PV}/collie-kexec.patch;patch=1 \
+ ${TKSRC}/${PN}_${PV}/sharpsl_pm-2.patch;patch=1 \
+ ${TKSRC}/${PN}_${PV}/collie_pm-2.patch;patch=1 \
+ ${TKSRC}/${PN}_${PV}/locomokeyb_suspendkey-2.patch;patch=1 \
+ ${TKSRC}/${PN}_${PV}/ucb1x00_suspend.patch;patch=1 \
+ ${TKSRC}/${PN}_${PV}/collie-ts.patch;patch=1 \
+ ${TKSRC}/${PN}_${PV}/pcmcia_suspend.patch;patch=1 \
"
SRC_URI_append_tosa = "\
============================================================
--- packages/linux/linux-tornado-omap2/htctornado/defconfig 308cbe721749ba6fcf4f8b3909cc904bf3fad4d9
+++ packages/linux/linux-tornado-omap2/htctornado/defconfig 9b493e680180251433c7b19b9ab3e08f41158179
@@ -259,7 +259,10 @@ CONFIG_IP_FIB_HASH=y
# CONFIG_IP_MULTICAST is not set
# CONFIG_IP_ADVANCED_ROUTER is not set
CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_PNP is not set
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
# CONFIG_NET_IPIP is not set
# CONFIG_NET_IPGRE is not set
# CONFIG_ARPD is not set
============================================================
--- packages/linux/linux-tornado-omap2_2.6.16.16.bb 03dda467990161bcb196927a1060decb35dd3bd2
+++ packages/linux/linux-tornado-omap2_2.6.16.16.bb a735d9e07c77baf8fa31bb48cda83957ab6af590
@@ -1,6 +1,7 @@ LICENSE = "GPL"
DESCRIPTION = "Linux kernel for HTC Tornado/Typhoon/Hurricane phones."
SECTION = "kernel"
LICENSE = "GPL"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
http://www.muru.com/linux/omap/patches/old/patch-2.6.16-omap2.bz2;patch=1 \
============================================================
--- packages/meta/meta-toolchain-gpe-sbox.bb cfdfc9f4b2bbdd1f3ad0ebd0cfa69553220548d7
+++ packages/meta/meta-toolchain-gpe-sbox.bb 8c13ffb0df097aec092934180a6187818aba7378
@@ -9,3 +9,4 @@ require meta-toolchain.bb
require meta-toolchain.bb
+SDK_SUFFIX = "toolchain-gpe-sbox"
============================================================
--- packages/meta/meta-toolchain-gpe.bb e4b3b787a0714a603a46e6d0423cfddb7bba3c58
+++ packages/meta/meta-toolchain-gpe.bb 96ae935de25684f8ec51be678ff8a2aedf946d99
@@ -7,3 +7,4 @@ require meta-toolchain.bb
require meta-toolchain.bb
+SDK_SUFFIX = "toolchain-gpe"
============================================================
--- packages/meta/meta-toolchain-openmoko.bb 052ed3fc28dde371bd81be6bf9ffaa47c10deb57
+++ packages/meta/meta-toolchain-openmoko.bb 2c36f31834b317cfdc81cff2dc8cd7db05229bcf
@@ -1,4 +1,5 @@ require meta-toolchain.bb
TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk"
require meta-toolchain.bb
+SDK_SUFFIX = "toolchain-openmoko"
============================================================
--- packages/meta/meta-toolchain-sbox.bb 00b9d0333251622f7df96dfb38a417c61e90a281
+++ packages/meta/meta-toolchain-sbox.bb aa24669823d24a74c6fa299901b587d1432ba62a
@@ -1,6 +1,8 @@ require meta-toolchain.bb
TOOLCHAIN_TARGET_TASK = "\
task-sdk-bare \
task-sdk-sbox"
require meta-toolchain.bb
+SDK_SUFFIX = "toolchain-sbox"
+
============================================================
--- packages/meta/meta-toolchain.bb 3fe2673a61b591aed4f247f8201896a640d5ed35
+++ packages/meta/meta-toolchain.bb b52d096ec913c333f9bb14b192bc922b80854834
@@ -1,12 +1,14 @@ DEPENDS = "ipkg-native ipkg-utils-native
DESCRIPTION = "Meta package for building a installable toolchain"
LICENSE = "MIT"
DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
+PR = "r1"
inherit sdk meta
SDK_DIR = "${WORKDIR}/sdk"
SDK_OUTPUT = "${SDK_DIR}/image"
SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
+SDK_SUFFIX = "toolchain"
FEED_ARCH ?= "${TARGET_ARCH}"
@@ -120,7 +122,7 @@ do_populate_sdk() {
# package it up
mkdir -p ${SDK_DEPLOY}
cd ${SDK_OUTPUT}
- fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-toolchain.tar.bz2 .
+ fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}.tar.bz2 .
}
do_populate_sdk[nostamp] = "1"
#
# mt diff -r843d33548c0e77469b4859dd4e3b8c77590cb762 -rc7289c9605cd6d73dd8698f9214422a66461880d
#
#
#
# add_dir "packages/monit"
#
# add_dir "packages/monit/files"
#
# add_dir "packages/monit/monit-4.10.1"
#
# add_file "packages/monit/files/init"
# content [0803d04f265b5e23401f6611b137dd47114def35]
#
# add_file "packages/monit/monit-4.10.1/init"
# content [0803d04f265b5e23401f6611b137dd47114def35]
#
# add_file "packages/monit/monit_4.10.1.bb"
# content [ce8f34274bb715666a2aceab80b44e5f4b8bcbec]
#
# patch "packages/meta/slugos-packages.bb"
# from [1a2ceb929514b8bcf127cdcde0a9622c8ac4a28a]
# to [9d6f880bd2880baef83e5822947f5771707add1a]
#
============================================================
--- packages/monit/files/init 0803d04f265b5e23401f6611b137dd47114def35
+++ packages/monit/files/init 0803d04f265b5e23401f6611b137dd47114def35
@@ -0,0 +1,42 @@
+#! /bin/sh
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/monit and type
+# > update-rc.d monit defaults 99
+#
+monit=/usr/bin/monit
+pidfile=/var/run/monit.pid
+monit_args="-c /etc/monitrc"
+
+test -x "$monit" || exit 0
+
+case "$1" in
+ start)
+ echo -n "Starting Monit"
+ start-stop-daemon --start --quiet --exec $monit -- $monit_args
+ RETVAL=$?
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping Monit"
+ start-stop-daemon --stop --quiet --pidfile $pidfile
+ RETVAL=$?
+ echo "."
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ RETVAL=$?
+ ;;
+ status)
+ $monit $monit_args status
+ RETVAL=$?
+ echo "."
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|status}"
+ exit 1
+esac
+
+exit $RETVAL
+
============================================================
--- packages/monit/monit-4.10.1/init 0803d04f265b5e23401f6611b137dd47114def35
+++ packages/monit/monit-4.10.1/init 0803d04f265b5e23401f6611b137dd47114def35
@@ -0,0 +1,42 @@
+#! /bin/sh
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/monit and type
+# > update-rc.d monit defaults 99
+#
+monit=/usr/bin/monit
+pidfile=/var/run/monit.pid
+monit_args="-c /etc/monitrc"
+
+test -x "$monit" || exit 0
+
+case "$1" in
+ start)
+ echo -n "Starting Monit"
+ start-stop-daemon --start --quiet --exec $monit -- $monit_args
+ RETVAL=$?
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping Monit"
+ start-stop-daemon --stop --quiet --pidfile $pidfile
+ RETVAL=$?
+ echo "."
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ RETVAL=$?
+ ;;
+ status)
+ $monit $monit_args status
+ RETVAL=$?
+ echo "."
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|status}"
+ exit 1
+esac
+
+exit $RETVAL
+
============================================================
--- packages/monit/monit_4.10.1.bb ce8f34274bb715666a2aceab80b44e5f4b8bcbec
+++ packages/monit/monit_4.10.1.bb ce8f34274bb715666a2aceab80b44e5f4b8bcbec
@@ -0,0 +1,24 @@
+LICENSE = "GPL"
+DEPENDS = "openssl"
+
+SRC_URI = "http://www.tildeslash.com/monit/dist/monit-${PV}.tar.gz\
+ file://init"
+
+INITSCRIPT_NAME = "monit"
+INITSCRIPT_PARAMS = "defaults 99"
+
+inherit autotools update-rc.d
+
+EXTRA_OECONF = "--with-ssl-lib-dir=${STAGING_LIBDIR} --with-ssl-incl-dir=${STAGING_INCDIR}"
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d/
+ install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/monit
+ sed -i 's:# set daemon 120:set daemon 120:' ${S}/monitrc
+ sed -i 's:include /etc/monit.d/:include /${sysconfdir}/monit.d/:' ${S}/monitrc
+ install -m 600 ${S}/monitrc ${D}${sysconfdir}/monitrc
+ install -m 700 -d ${D}${sysconfdir}/monit.d/
+}
+
+CONFFILES_${PN} += "${sysconfdir}/monitrc"
+
============================================================
--- packages/meta/slugos-packages.bb 1a2ceb929514b8bcf127cdcde0a9622c8ac4a28a
+++ packages/meta/slugos-packages.bb 9d6f880bd2880baef83e5822947f5771707add1a
@@ -24,7 +24,18 @@ SLUGOS_PACKAGES = "\
apex-env \
apr \
asterisk \
- asterisk-sounds \
+ asterisk-core-sounds-en-alaw \
+ asterisk-core-sounds-en-g729 \
+ asterisk-core-sounds-en-gsm \
+ asterisk-core-sounds-en-ulaw \
+ asterisk-extra-sounds-en-alaw \
+ asterisk-extra-sounds-en-g729 \
+ asterisk-extra-sounds-en-gsm \
+ asterisk-extra-sounds-en-ulaw \
+ asterisk-moh-freeplay-alaw \
+ asterisk-moh-freeplay-g729 \
+ asterisk-moh-freeplay-gsm \
+ asterisk-moh-freeplay-ulaw \
atftp \
audiofile \
aumix \
@@ -137,6 +148,7 @@ SLUGOS_PACKAGES = "\
miau \
microcom \
minicom \
+ monit \
motion \
mpd \
mt-daapd \
@@ -148,9 +160,11 @@ SLUGOS_PACKAGES = "\
ncftp \
ncurses \
net-tools \
+ netatalk \
netcat \
netpbm \
nfs-utils \
+ ngrep \
nmap \
ntfs-3g \
ntp \
@@ -198,6 +212,7 @@ SLUGOS_PACKAGES = "\
thttpd \
tiff \
tzdata \
+ unrar \
unzip \
upslug2 \
usbutils \
More information about the Openembedded-commits
mailing list