[oe-commits] org.oe.dev merge of '4392736ce508627f703cfd1f8849601caf77f045'
thebohemian commit
oe at amethyst.openembedded.net
Fri May 23 14:55:51 UTC 2008
merge of '4392736ce508627f703cfd1f8849601caf77f045'
and 'fb05f74b0b5c179d6ed3f8897306c5563c223a50'
Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: be23a3d9c964660487451387d6318c3915ad5b51
ViewMTN: http://monotone.openembedded.org/revision/info/be23a3d9c964660487451387d6318c3915ad5b51
Files:
1
conf/distro/chinook-compat.conf
packages/efl1/epsilon
packages/efl1/epsilon/fix_alignment_error.patch
packages/php/php-5.2.5/autotools.patch
packages/php/files
packages/nonworking/php/files
packages/php/php-native_4.4.4.bb
packages/nonworking/php/php-native_4.4.4.bb
packages/php/php_4.4.4.bb
packages/nonworking/php/php_4.4.4.bb
contrib/marketing
packages/freesmartphone/python-ousaged
packages/freesmartphone/zhone
packages/gcc/gcc-csl-arm-2007q3
packages/keyring/keyring-0.6.8
packages/nonworking/php
packages/wwwoffle
packages/wwwoffle/files
conf/machine/include/tune-mips2.inc
contrib/marketing/oe-flyer.pdf
contrib/marketing/oe-poster.pdf
packages/dropbear/dropbear-0.49/scp-argument-fix.patch
packages/freesmartphone/python-ophoned/ophoned
packages/freesmartphone/python-ousaged/ousaged
packages/freesmartphone/python-ousaged_git.bb
packages/freesmartphone/zhone/80zhone
packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb
packages/gcc/gcc-cross_csl-arm-2007q3.bb
packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch
packages/gcc/gcc-csl-arm-2007q3.inc
packages/gcc/gcc_csl-arm-2007q3.bb
packages/gettext/gettext-0.14.1/linklib_from_0.17.patch
packages/images/fso-image.bb
packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch
packages/libopie/libopie2/remove_h2200_rotate_fix.patch
packages/qte/qte-2.3.10/disable-dup-rotation.patch
packages/wwwoffle/files/wwwoffle.if-down
packages/wwwoffle/files/wwwoffle.if-up
packages/wwwoffle/files/wwwoffle.init
packages/wwwoffle/wwwoffle_2.9c.bb
classes/image.bbclass
classes/oestats-client.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-glibc.inc
conf/distro/include/fso-autorev.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/include/gumstix.inc
conf/machine/include/tune-cortexa8.inc
conf/machine/rb500.conf
conf/machine/wl500g.conf
conf/machine/wrt54.conf
contrib/distro-packages/debian/openembedded-essential-1.4/debian/control
contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules
packages/dropbear/dropbear-early_1.0.bb
packages/dropbear/dropbear_0.49.bb
packages/dropbear/dropbear_0.50.bb
packages/efl1/edbus_cvs.bb
packages/efl1/epsilon_cvs.bb
packages/freesmartphone/python-ophoned_git.bb
packages/freesmartphone/zhone_git.bb
packages/gallery/gallery_1.5.5.bb
packages/gettext/gettext-native_0.14.1.bb
packages/gettext/gettext_0.14.1.bb
packages/gpe-helpviewer/gpe-helpviewer_1.0.bb
packages/keyring/keyring_0.6.8.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/linux/linux-rp-2.6.24/defconfig-akita
packages/linux/linux-rp-2.6.24/defconfig-bootcdx86
packages/linux/linux-rp-2.6.24/defconfig-c7x0
packages/linux/linux-rp-2.6.24/defconfig-hx2000
packages/linux/linux-rp-2.6.24/defconfig-poodle
packages/linux/linux-rp-2.6.24/defconfig-qemuarm
packages/linux/linux-rp-2.6.24/defconfig-qemux86
packages/linux/linux-rp-2.6.24/defconfig-spitz
packages/linux/linux-rp-2.6.24/defconfig-tosa
packages/linux/linux-rp-2.6.24/defconfig-zylonite
packages/php/php-native_5.2.5.bb
packages/php/php.inc
packages/php/php_5.1.4.bb
packages/php/php_5.2.5.bb
packages/python/python-setuptools-native_0.6c6.bb
packages/python/python-setuptools_0.6c6.bb
packages/tasks/task-opie-16mb.bb
packages/tasks/task-opie-all.bb
packages/tasks/task-opie.bb
packages/uclibc/uclibc_0.9.29.bb
mtn:manual_merge
true
Diffs:
#
# mt diff -r4392736ce508627f703cfd1f8849601caf77f045 -rbe23a3d9c964660487451387d6318c3915ad5b51
#
#
#
# patch "conf/distro/chinook-compat.conf"
# from [c5844f900694f22660695c8b7f810b0ff9eb235c]
# to [6f4774c59d5c8589f1b8d21db8f3fed3f209e847]
#
============================================================
--- conf/distro/chinook-compat.conf c5844f900694f22660695c8b7f810b0ff9eb235c
+++ conf/distro/chinook-compat.conf 6f4774c59d5c8589f1b8d21db8f3fed3f209e847
@@ -163,8 +163,10 @@ PREFERRED_VERSION_osso-gnome-vfs2 = "2.1
PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
# Java stuff
+PREFERRED_PROVIDER_midpath = "midpath-maemo"
+PREFERRED_PROVIDER_midpath-backend-gtk = "midpath-backend-gtk-hildon"
-PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
PREFERRED_PROVIDER_classpath = "classpath"
PREFERRED_VERSION_classpath = "0.97.1"
@@ -197,6 +199,8 @@ PKG_libsdl-directfb = "libsdl1.2"
PKG_libsdl-image = "libsdl-image1.2"
PKG_libsdl-directfb = "libsdl1.2"
+PKG_libsdl-ttf = "libsdl-ttf2.0-0"
+PKG_libsdl-gfx = "libsdl-gfx1.2-4"
PKG_bluez-libs = "libbluetooth2"
#
# mt diff -rfb05f74b0b5c179d6ed3f8897306c5563c223a50 -rbe23a3d9c964660487451387d6318c3915ad5b51
#
#
#
# delete "packages/efl1/epsilon"
#
# delete "packages/efl1/epsilon/fix_alignment_error.patch"
#
# delete "packages/php/php-5.2.5/autotools.patch"
#
# rename "packages/php/files"
# to "packages/nonworking/php/files"
#
# rename "packages/php/php-native_4.4.4.bb"
# to "packages/nonworking/php/php-native_4.4.4.bb"
#
# rename "packages/php/php_4.4.4.bb"
# to "packages/nonworking/php/php_4.4.4.bb"
#
# add_dir "contrib/marketing"
#
# add_dir "packages/freesmartphone/python-ousaged"
#
# add_dir "packages/freesmartphone/zhone"
#
# add_dir "packages/gcc/gcc-csl-arm-2007q3"
#
# add_dir "packages/keyring/keyring-0.6.8"
#
# add_dir "packages/nonworking/php"
#
# add_dir "packages/wwwoffle"
#
# add_dir "packages/wwwoffle/files"
#
# add_file "conf/machine/include/tune-mips2.inc"
# content [057bacb0584328df3d50b30000597eb1d919767b]
#
# add_file "contrib/marketing/oe-flyer.pdf"
# content [b963e650a847d1f3d4d567e056167985a51efc0d]
#
# add_file "contrib/marketing/oe-poster.pdf"
# content [68a7e59df4fe6e80f6ee801fac05b9add2157de5]
#
# add_file "packages/dropbear/dropbear-0.49/scp-argument-fix.patch"
# content [43e25cab4f86cb784071ef1a175b77eb2d69b7fc]
#
# add_file "packages/freesmartphone/python-ophoned/ophoned"
# content [04ac655816cc1bcffc208b9a49671a917fa078eb]
#
# add_file "packages/freesmartphone/python-ousaged/ousaged"
# content [c51f4851c9816bae9c38bbb52a7ae117ae697d0f]
#
# add_file "packages/freesmartphone/python-ousaged_git.bb"
# content [7e85950cc2cc762a57a6e4933d57332db89c97f4]
#
# add_file "packages/freesmartphone/zhone/80zhone"
# content [9ff83a5124c6c03330a51793cd6cf90e486b185e]
#
# add_file "packages/gcc/gcc-cross-initial_csl-arm-2007q3.bb"
# content [4acf01cc481b727325c6077882c195b4f1572001]
#
# add_file "packages/gcc/gcc-cross_csl-arm-2007q3.bb"
# content [f7fca6eee83b5ebe3eca940d8e1b1046d6de5ff0]
#
# add_file "packages/gcc/gcc-csl-arm-2007q3/gcc-new-makeinfo.patch"
# content [ae26bd559a50cddae7e3e2732e8821389464d64b]
#
# add_file "packages/gcc/gcc-csl-arm-2007q3.inc"
# content [01e125daae24e6a2f2f71eb12b6d2232b0ada01a]
#
# add_file "packages/gcc/gcc_csl-arm-2007q3.bb"
# content [d2ba66d1d65f6be2dc6ddf47d238afe57eb05f4f]
#
# add_file "packages/gettext/gettext-0.14.1/linklib_from_0.17.patch"
# content [2c7c2af754692bd64cb23395724103e9ef59d60e]
#
# add_file "packages/images/fso-image.bb"
# content [e842729f8da66c4407499fe16327a5107ca1895d]
#
# add_file "packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch"
# content [20aad83748060bdeaff7f817d93e61f7f3d10d42]
#
# add_file "packages/libopie/libopie2/remove_h2200_rotate_fix.patch"
# content [971d8c3bbb6ab648db8f29cf5425c85557416af6]
#
# add_file "packages/qte/qte-2.3.10/disable-dup-rotation.patch"
# content [f90a467431d9bde1ffae27ccf563cfdeed54691e]
#
# add_file "packages/wwwoffle/files/wwwoffle.if-down"
# content [e4aa7cb1319be94b2bda9198bd0a2d8c7fbdf8b9]
#
# add_file "packages/wwwoffle/files/wwwoffle.if-up"
# content [df3f0c05b29192684fce6d5734a28ca7c6681c66]
#
# add_file "packages/wwwoffle/files/wwwoffle.init"
# content [3648bf9fdc09412336b5bf1671b1d16da01d54e9]
#
# add_file "packages/wwwoffle/wwwoffle_2.9c.bb"
# content [d9fd9a242f353e3916f1d36829b96f70732c14df]
#
# patch "classes/image.bbclass"
# from [e1da20bc3a6143fb41abbfe3d0a7070416bdde17]
# to [4ce2b3c777b457b63352a87b70b325fc84e10644]
#
# patch "classes/oestats-client.bbclass"
# from [a710c44a7f932fd458136ca8079856a4b2962a61]
# to [2b82de605ebfcc914f36652cbb9c49dce3cd2442]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [dface09802ce45bdb21c822c2e46b480f3369810]
# to [4b22a5418909757b3c14e67557228138743a303e]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [c49fa1468b1a41c309505f099d320a78a592a8b8]
# to [64060b7ace4591e34cd8206bb5cd3ba77c6554d4]
#
# patch "conf/distro/include/fso-autorev.inc"
# from [f9276705864b02b4689fddd0fdbfb8f5ce705e91]
# to [1bd8343974f0b1a558fc8a74c6c3960c49fafd3e]
#
# patch "conf/distro/include/moko-autorev.inc"
# from [cf51729787fd2fd25f76ebaf652e629b2c27a8b4]
# to [89ce7f49f72eea705ed63b4f98b6ffa6d6a02bed]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [e993ffd4e275abdc019bd768b83fe75481e9f12a]
# to [a840f12073131fc6d5922a4f7d4eaf3c0fbe93ba]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [2cff5a66720adf7279a2d1efa08468aa48d8a0d0]
# to [8ab516eb346939396ae72444623b5b352271c190]
#
# patch "conf/machine/include/gumstix.inc"
# from [7578e77d24254c6b31c18d29909b2cdae25e53b8]
# to [296433a9b80e1ec2fd23dc9e4c458d24e763e9a4]
#
# patch "conf/machine/include/tune-cortexa8.inc"
# from [8ce9346cd012a0659a0967b2e43edcfc2dfaf921]
# to [ffd911180ea7eb03d473826a023a54d88a219438]
#
# patch "conf/machine/rb500.conf"
# from [c5e4304761ab59c29e7a9549abec25df0455a552]
# to [ec3468237873c1f6f3831eb19db443d2aba4a9e0]
#
# patch "conf/machine/wl500g.conf"
# from [d7067382eb29e1f5c251a2c48f5e4f7d36f6f0f9]
# to [b7ee5dd752935d7f8924e84976cadbce6359227d]
#
# patch "conf/machine/wrt54.conf"
# from [5d9e6710b8fae51d475e91a5c2047e7be52b7649]
# to [2fe22c13b02b4959e3cab0cc7ff5c98fb68bf489]
#
# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/control"
# from [b527265a4a8d5e1b7c8b8ecf77d86a5bd0892b57]
# to [0c3280f88a76ccf4454f600420c2394625422b57]
#
# patch "contrib/distro-packages/debian/openembedded-essential-1.4/debian/rules"
# from [fca0385b822b8dc03a597d316d04549edc9dd1be]
# to [f2b5b27d488e832661562e98cc7249a22c9e29bb]
#
# patch "packages/dropbear/dropbear-early_1.0.bb"
# from [5b7702b9d74427e400988330fbd7c6fcff176371]
# to [f1e7db2a9ec4fc0155567720a008f3158be5d187]
#
# patch "packages/dropbear/dropbear_0.49.bb"
# from [ca38761fd3af49819c41b42791592ee01c0d97cc]
# to [78fcce6b1a8d01f370d8c3b57fe9feea4faa3d77]
#
# patch "packages/dropbear/dropbear_0.50.bb"
# from [1f1e5b54696006b7f8484bd48dff9fa684992830]
# to [61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [ecd6cb444aeac48cd019c31f15055fb2cca6157a]
# to [7f6f010883128a2dc595086674f08caa1bf29d74]
#
# patch "packages/efl1/epsilon_cvs.bb"
# from [06a4ccc0ac1208566731c847fc2ac20246de3ec5]
# to [83ada598b7cf56e16b6d9c1101d88249c5112649]
#
# patch "packages/freesmartphone/python-ophoned_git.bb"
# from [c3a23270719f3ed39a3432f18c7e5dd0ad4b8847]
# to [e858c518c17070ad938fb291af8a6bd7474d439c]
#
# patch "packages/freesmartphone/zhone_git.bb"
# from [be991be982f74c721ed53468671e7ecce2218df4]
# to [1d68c71ea6216ba266c1d3f52a8a13c33d86b97d]
#
# patch "packages/gallery/gallery_1.5.5.bb"
# from [733e15213ab5e6ec1bd791438af67af63d5ec35c]
# to [511bfe0c06f90814e496d4f7e1d3b7218cd60e28]
#
# patch "packages/gettext/gettext-native_0.14.1.bb"
# from [5573b70e6cbee4dc9639ecbef5e47e8c411d325c]
# to [2e903067b552793b23bc96c5ec738ada09f03316]
#
# patch "packages/gettext/gettext_0.14.1.bb"
# from [de52cbbadfde1d2a8520b9e08d233b8c44267b54]
# to [3a0fa051089a75ecb61149ba3b56405116c60bb2]
#
# patch "packages/gpe-helpviewer/gpe-helpviewer_1.0.bb"
# from [0b59db3ecd7e959fdd8a7c3e7f0b122f4b6f6c8b]
# to [92868c7c6de1862496bb9aa0d29afa555520bad4]
#
# patch "packages/keyring/keyring_0.6.8.bb"
# from [2cfb564b37ee4f9a7f8fc38d6a1ef53cf057ac03]
# to [e0d93d0a4a92bc44db6eeeafa9ecbcf49ef6babe]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [a85580d79b52077d3a62b921dea5d7de0827ff0d]
# to [964a8dabe7c00485c6abaca8fd364eb631810716]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [a05dfd66bdd95a25bffd9f9ea592f03165e7321e]
# to [91d936879c9fac0d051b7c80b290a712b953d3e0]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-akita"
# from [d714658790b6d290f5220e92a762c59d1755f521]
# to [33d8cc0f8a30277b834a2c1da09fb6ece1d098a5]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-bootcdx86"
# from [ff935bd0c61befdc4d68c43b5c60ef4cb05c4753]
# to [f9ecd99888aa68cb846f0d56cee5bca5371c9d4b]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-c7x0"
# from [df65683d9a629e20e3adaf2ca96f9b5e7b77710b]
# to [b45f438b494270a020d8feec2d5110707bde21f1]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-hx2000"
# from [673369cff9f4de86044b4e3e7d0a32f40f7ddb1f]
# to [957a7113b116599f4ae7309f217801c829f7211b]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-poodle"
# from [19043385a06385c41f9d8be31ee1b42171e5d4e5]
# to [c66e00f8061a663ee80edff2c737bc0266f3df43]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-qemuarm"
# from [5cc1a20209d9bfde5ad851a89437c08c721815c5]
# to [e74d23a59f5aad6fe732ed3b3e3b1a0b16d03ebc]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-qemux86"
# from [680641c4ecbfa3499fbdd079095535f629587647]
# to [3c92e257aaa1496dfd2123064691c6dd459e62b9]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-spitz"
# from [1c089b38d34a93c68659ef90bec902bbbcf436ae]
# to [58c5d3463be6ec2d735fef9b44f8c1be7c658075]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-tosa"
# from [9309f0f56b45754f03ad35209dcb54e4cfb7df83]
# to [8f0bf8a513bad928394f2e4ff80b6284302f6685]
#
# patch "packages/linux/linux-rp-2.6.24/defconfig-zylonite"
# from [01f7a0f6b6bb0cbdd5daa28ff680349a8d8cddbb]
# to [d6bbc8912bcc1fc8d6774c5c7211f49f73ebf102]
#
# patch "packages/php/php-native_5.2.5.bb"
# from [afcfc4ccde9ff42bdd27725eddbfa53791632cd8]
# to [4dd1052db32deca1bb0d52de8f524177f396ae22]
#
# patch "packages/php/php.inc"
# from [05d469fc771d0798c8e8fc750ab8e1c1dde63c41]
# to [f360b47349e23f032edf1830103283c4ec1fdc0b]
#
# patch "packages/php/php_5.1.4.bb"
# from [e3f518eac4c616faa17ae879f81b81abae3ad3e2]
# to [6dada38712cbc4601f615e341b87181924fa2e27]
#
# patch "packages/php/php_5.2.5.bb"
# from [3c1f63cc7326dce0a534438bf37d88728f3048ec]
# to [7b323ec36d0b7855942e82ce9ecbd07e2600a9df]
#
# patch "packages/python/python-setuptools-native_0.6c6.bb"
# from [37e35eebe4105610cad978ad7a92f12a2b9095d1]
# to [98f58e21bf03997cb61c8459da61b888c73364f9]
#
# patch "packages/python/python-setuptools_0.6c6.bb"
# from [074cb8e81cb89426c6d897caeb5fd18c68571c9a]
# to [84dd67b8d39b269a732a02fdc2b2b08af8516af9]
#
# patch "packages/tasks/task-opie-16mb.bb"
# from [17a97e85093fb7c7aaba5ea5de08086d633dc185]
# to [cf1f25614ad8da263d528b3f34d314213dd05281]
#
# patch "packages/tasks/task-opie-all.bb"
# from [247d329aa6a21cecb1f4f74f1a838072b8aa22d8]
# to [e996923d71e129ec881e2b565c3689d4ce4c94c5]
#
# patch "packages/tasks/task-opie.bb"
# from [78fbe261fe8ace945600c95b91627808e02cef52]
# to [ae01f0abcd042b147b21cd29141a481fd081fdb4]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [2768d9ecc595b84f45ce4e80e84cf53949a8b652]
# to [3283df3bb2a36857cc4cb9bd5bd8e5e3c3ea5b35]
#
# set "contrib/marketing/oe-flyer.pdf"
# attr "mtn:manual_merge"
# value "true"
#
# set "contrib/marketing/oe-poster.pdf"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
--- conf/machine/include/tune-mips2.inc 057bacb0584328df3d50b30000597eb1d919767b
+++ conf/machine/include/tune-mips2.inc 057bacb0584328df3d50b30000597eb1d919767b
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-mips2"
============================================================
# contrib/marketing/oe-flyer.pdf is binary
============================================================
# contrib/marketing/oe-poster.pdf is binary
============================================================
--- packages/dropbear/dropbear-0.49/scp-argument-fix.patch 43e25cab4f86cb784071ef1a175b77eb2d69b7fc
+++ packages/dropbear/dropbear-0.49/scp-argument-fix.patch 43e25cab4f86cb784071ef1a175b77eb2d69b7fc
@@ -0,0 +1,21 @@
+source: https://dev.openwrt.org/browser/trunk/openwrt/package/dropbear/patches/scp-argument-fix.patch?rev=453
+comment: remove unsupported default arguments in scp. Fixes OE bug 3227.
+
+diff -ur dropbear-0.49-orig/scp.c dropbear-0.49/scp.c
+--- dropbear-0.49-orig/scp.c 2007-02-22 16:51:35.000000000 +0100
++++ dropbear-0.49/scp.c 2007-10-19 14:19:08.000000000 +0200
+@@ -308,10 +308,10 @@
+ memset(&args, '\0', sizeof(args));
+ args.list = NULL;
+ addargs(&args, "%s", ssh_program);
+- addargs(&args, "-x");
+- addargs(&args, "-oForwardAgent no");
+- addargs(&args, "-oPermitLocalCommand no");
+- addargs(&args, "-oClearAllForwardings yes");
++// addargs(&args, "-x");
++// addargs(&args, "-oForwardAgent no");
++// addargs(&args, "-oPermitLocalCommand no");
++// addargs(&args, "-oClearAllForwardings yes");
+
+ fflag = tflag = 0;
+ while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
============================================================
--- packages/freesmartphone/python-ophoned/ophoned 04ac655816cc1bcffc208b9a49671a917fa078eb
+++ packages/freesmartphone/python-ophoned/ophoned 04ac655816cc1bcffc208b9a49671a917fa078eb
@@ -0,0 +1,40 @@
+#! /bin/sh
+#
+# ophoned This shell script starts and stops the open phone daemon.
+#
+# chkconfig: 345 90 20
+# description: py-ophoned is the open phone daemon
+# processname: python
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+NAME=ophoned
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+case "$1" in
+ start)
+ echo -n "Starting open phone daemon: "
+ start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/ophoned
+ if [ $? = 0 ]; then
+ echo "(ok)"
+ else
+ echo "(failed)"
+ fi
+ ;;
+ stop)
+ echo -n "Stopping open phone daemon: "
+ start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
+ rm -f /var/run/${NAME}.pid
+ echo "(done)"
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "Usage: /etc/init.d/ophoned {start|stop|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/freesmartphone/python-ousaged/ousaged c51f4851c9816bae9c38bbb52a7ae117ae697d0f
+++ packages/freesmartphone/python-ousaged/ousaged c51f4851c9816bae9c38bbb52a7ae117ae697d0f
@@ -0,0 +1,40 @@
+#! /bin/sh
+#
+# odeviced This shell script starts and stops the open device daemon.
+#
+# chkconfig: 345 90 20
+# description: py-ousaged is the open usage daemon
+# processname: python
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+NAME=odeviced
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+case "$1" in
+ start)
+ echo -n "Starting open usage daemon: "
+ start-stop-daemon --start --pidfile /var/run/${NAME}.pid --make-pidfile --background -x /usr/bin/ousaged
+ if [ $? = 0 ]; then
+ echo "(ok)"
+ else
+ echo "(failed)"
+ fi
+ ;;
+ stop)
+ echo -n "Stopping open usage daemon: "
+ start-stop-daemon --stop --pidfile /var/run/${NAME}.pid --oknodo
+ rm -f /var/run/${NAME}.pid
+ echo "(done)"
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "Usage: /etc/init.d/ousaged {start|stop|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/freesmartphone/python-ousaged_git.bb 7e85950cc2cc762a57a6e4933d57332db89c97f4
+++ packages/freesmartphone/python-ousaged_git.bb 7e85950cc2cc762a57a6e4933d57332db89c97f4
@@ -0,0 +1,36 @@
+DESCRIPTION = "The Open Usage Daemon Prototype in Python"
+HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenUsageDaemon"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
+SECTION = "console/network"
+DEPENDS = "python-cython-native python-pyrex-native"
+LICENSE = "GPLv2"
+PV = "0.7.9+gitr${SRCREV}"
+PR = "r0"
+
+inherit distutils update-rc.d
+
+INITSCRIPT_NAME = "ousaged"
+INITSCRIPT_PARAMS = "defaults 20"
+
+SRC_URI = "\
+ ${FREESMARTPHONE_GIT}/usaged.git;protocol=git;branch=master \
+ file://ousaged \
+"
+S = "${WORKDIR}/git"
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/init.d/
+ install -m 0755 ${WORKDIR}/ousaged ${D}${sysconfdir}/init.d/
+ install -d ${D}${sysconfdir}/dbus-1/system.d/
+ mv -f ${D}${datadir}/etc/dbus-1/system.d/ousaged.conf ${D}${sysconfdir}/dbus-1/system.d/
+}
+
+RDEPENDS_${PN} += "\
+ python-dbus \
+ python-pygobject \
+ python-pyrtc \
+ python-syslog \
+ python-odeviced%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list