[oe-commits] org.oe.dev merge of 'ab1a06b7453ad48a1ad5b4f9ee053cd6a9e04d28'
osas commit
openembedded-commits at lists.openembedded.org
Wed Jan 16 20:28:09 UTC 2008
merge of 'ab1a06b7453ad48a1ad5b4f9ee053cd6a9e04d28'
and 'c794a426d2a55b0c4b5f1f6fee90c8272bd266e9'
Author: osas at nslu2-linux.org
Branch: org.openembedded.dev
Revision: c3ab98898b78f48ac52345c8f613995a696eb6a7
ViewMTN: http://monotone.openembedded.org/revision/info/c3ab98898b78f48ac52345c8f613995a696eb6a7
Files:
1
delete.txt
packages/ecj/ecj-native_3.2.2.bb
packages/ecj/ecj-native_3.3.bb
packages/ecj/files/ecj.sh
packages/jamvm/jamvm
packages/jamvm/jamvm/sh3sh4-support.patch
packages/ppp-dsl/ppp-dsl_0.1-monolithic.bb
packages/quilt/quilt_0.45.inc
packages/classpath/classpath-gtk_0.93.bb
packages/obsolete/classpath/classpath-gtk_0.93.bb
packages/classpath/classpath-gtk_cvs.bb
packages/obsolete/classpath/classpath-gtk_cvs.bb
packages/classpath/classpath-minimal-native_0.93.bb
packages/obsolete/classpath/classpath-minimal-native_0.93.bb
packages/classpath/classpath-minimal-native_0.95.bb
packages/obsolete/classpath/classpath-minimal-native_0.95.bb
packages/classpath/classpath-minimal_0.90.bb
packages/obsolete/classpath/classpath-minimal_0.90.bb
packages/classpath/classpath-minimal_0.95.bb
packages/obsolete/classpath/classpath-minimal_0.95.bb
packages/classpath/classpath.inc
packages/obsolete/classpath/classpath.inc
packages/classpath/classpath_0.14.bb
packages/obsolete/classpath/classpath_0.14.bb
packages/classpath/classpath_0.15.bb
packages/obsolete/classpath/classpath_0.15.bb
packages/classpath/classpath_0.17.bb
packages/obsolete/classpath/classpath_0.17.bb
packages/classpath/classpath_0.18.bb
packages/obsolete/classpath/classpath_0.18.bb
packages/classpath/classpath_0.19.bb
packages/obsolete/classpath/classpath_0.19.bb
packages/classpath/classpath_0.20.bb
packages/obsolete/classpath/classpath_0.20.bb
packages/classpath/classpath_cvs.bb
packages/obsolete/classpath/classpath_cvs.bb
packages/classpath/files/disable-automake-checks-v2.patch
packages/obsolete/classpath/files/disable-automake-checks-v2.patch
packages/classpath/files/disable-automake-checks.patch
packages/obsolete/classpath/files/disable-automake-checks.patch
packages/classpath/files/fix-endian-arm-floats.patch
packages/obsolete/classpath/files/fix-endian-arm-floats.patch
packages/classpath/files/gconf_version.patch
packages/obsolete/classpath/files/gconf_version.patch
packages/e17/enna_svn.bb
packages/e17/enna_cvs.bb
packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch
packages/jamvm/files/jamvm-1.3.1-size-defaults.patch
packages/jamvm/jamvm-1.3.0
packages/obsolete/jamvm/jamvm-1.3.0
packages/jamvm/jamvm_1.3.0.bb
packages/obsolete/jamvm/jamvm_1.3.0.bb
packages/jamvm/jamvm_1.3.1.bb
packages/obsolete/jamvm/jamvm_1.3.1.bb
packages/jamvm/jamvm_1.3.2.bb
packages/obsolete/jamvm/jamvm_1.3.2.bb
packages/jamvm/jamvm_1.4.1.bb
packages/obsolete/jamvm/jamvm_1.4.1.bb
packages/linux/linux-ixp4xx/defconfig-2.6.23.12
packages/linux/linux-ixp4xx/defconfig-2.6.23.14
packages/linux/linux-ixp4xx_2.6.23.12.bb
packages/linux/linux-ixp4xx_2.6.23.14.bb
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git
packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb
packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb
packages/ppp-dsl/dsl-provider
packages/ppp-dsl/files/dsl-provider
packages/ppp-dsl/ppp_on_boot.dsl
packages/ppp-dsl/files/ppp_on_boot.dsl
packages/quilt/files/install.patch
packages/quilt/quilt-0.45/install.patch
packages/quilt/quilt-0.39
packages/obsolete/quilt/quilt-0.39
packages/quilt/quilt-0.45/non-gnu.patch
packages/quilt/files/non-gnu.patch
packages/quilt/quilt-native_0.39.bb
packages/obsolete/quilt/quilt-native_0.39.bb
packages/quilt/quilt_0.39.bb
packages/obsolete/quilt/quilt_0.39.bb
packages/quilt/quilt_0.39.inc
packages/obsolete/quilt/quilt_0.39.inc
packages/base-files/base-files/openprotium
packages/e17/edje-viewer
packages/freesmartphone
packages/gpephone/libiac2
packages/gpephone/libim2
packages/gpsdrive/gpsdrive-pda
packages/obsolete/classpath
packages/obsolete/classpath/files
packages/obsolete/jamvm
packages/obsolete/jamvm/files
packages/obsolete/quilt
packages/pngcrush
packages/ppp/ppp-gprs
packages/ppp/ppp-gprs/chats
packages/ppp/ppp-gprs/peers
packages/ppp-dsl/files
packages/quilt/quilt-0.46
packages/uicmoc/files
packages/vsftpd/vsftpd-charconv-2.0.5
classes/cmake.bbclass
classes/concatenated-image.bbclass
files/device_table-minimal-add-md.txt
packages/apmd/apmd-3.2.2/90-wifi-off
packages/base-files/base-files/openprotium/fstab
packages/cacao/cacao-cldc.inc
packages/cacao/cacao_0.98+hg20071001.bb
packages/cacao/cacaoh-native.inc
packages/cacao/cacaoh-native_0.98+hg20071001.bb
packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch
packages/cacao/files/cacao-0.98+hg-attachthread.patch
packages/cacao/files/cacao-0.98+svn-classpath_var.patch
packages/cacao/files/cacao-0.98+svn-libdir.diff
packages/classpath/classpath-minimal_0.96.1.bb
packages/classpath/classpath_0.95.bb
packages/classpath/classpath_0.96.1.bb
packages/e17/edje-viewer/no-minimal-size.patch
packages/freesmartphone/gsm0710muxd_svn.bb
packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch
packages/gcc/gcc-4.2.2/gcc-4.0.2-e300c2c3.patch
packages/gpephone/almmgrd_svn.bb
packages/gpephone/calendar2_svn.bb
packages/gpephone/dialer_svn.bb
packages/gpephone/libalmmgr_svn.bb
packages/gpephone/libgemwidget_svn.bb
packages/gpephone/libiac2/disable-tests.patch
packages/gpephone/libiac2_svn.bb
packages/gpephone/libiac_svn.bb
packages/gpephone/libim2/disable-tests.patch
packages/gpephone/libim2_svn.bb
packages/gpephone/liblipsevent2_svn.bb
packages/gpephone/libmsgenabler2_svn.bb
packages/gpephone/libmsgenabler_svn.bb
packages/gpsdrive/gpsdrive-pda/makefile.patch
packages/gpsdrive/gpsdrive-pda_2.10pre2.bb
packages/initscripts/initscripts-1.0/openprotium/mountall.sh
packages/initscripts/initscripts-1.0/openprotium/umountfs
packages/initscripts/initscripts-1.0/openprotium/umountinitrd.sh
packages/jamvm/jamvm.inc
packages/jamvm/jamvm_1.5.0.bb
packages/linux/linux-2.6.23/kallsyms-missing-include.patch
packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.23.14
packages/linux/linux-openmoko-devel_2.6.23+2.6.24-rc7.bb
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/hx2750_base-r31.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/pxa27x_overlay-r8.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/squashfs3.2-2.6.20-r0.patch
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/versatile-armv6.patch
packages/linux/linux-storcenter/defconfig-2.6.15.7
packages/linux/linux-storcenter/kernel.patch-2.6.15.7
packages/linux/linux-storcenter_2.6.15.7.bb
packages/musicbrainz/libmusicbrainz_2.1.5.bb
packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch
packages/openmoko2/settingsgui_0.7+0.8-beta.bb
packages/openprotium-init/files/initscripts/zleds
packages/pngcrush/pngcrush-native_1.6.4.bb
packages/pngcrush/pngcrush_1.6.4.bb
packages/ppp/ppp-gprs/chats/chat-gprs
packages/ppp/ppp-gprs/peers/_gprs
packages/ppp/ppp-gprs/peers/_gprs-ap-internet
packages/ppp/ppp-gprs_1.0.bb
packages/python/python-edbus_cvs.bb
packages/python/python-efl-examples.bb
packages/quilt/quilt-0.46/aclocal.patch
packages/quilt/quilt-0.46/install.patch
packages/quilt/quilt-native_0.46.bb
packages/quilt/quilt_0.46.bb
packages/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch
packages/tasks/task-openprotium.bb
packages/uicmoc/files/configure-fix.patch
packages/vsftpd/vsftpd-charconv-2.0.5/vsftpd-charconv.patch
packages/vsftpd/vsftpd-charconv_2.0.5.bb
MAINTAINERS
classes/module-base.bbclass
classes/module.bbclass
conf/distro/angstrom-2008.1.conf
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
conf/distro/openprotium.conf
conf/machine/include/ixp4xx.inc
conf/machine/storcenter.conf
contrib/mtn2git/mtn2git.py
packages/apmd/apmd_3.2.2.bb
packages/avetanabt/avetanabt_20060413.bb
packages/avetanabt/avetanabt_cvs.bb
packages/cacao/cacao-cldc_0.98.bb
packages/cacao/cacao.inc
packages/cacao/cacaoh-cldc-native_0.98.bb
packages/dtnrg/dtn_2.5.0.bb
packages/e17/edje-viewer_cvs.bb
packages/efl1/ecore.inc
packages/efl1/ecore_cvs.bb
packages/efl1/edbus_cvs.bb
packages/efl1/epdf_cvs.bb
packages/efl1/evas.inc
packages/efl1/evas_cvs.bb
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc_4.2.2.bb
packages/gpephone/addressbook_svn.bb
packages/gpephone/contact_svn.bb
packages/gpephone/firewall_svn.bb
packages/gpephone/gpe-applauncher_svn.bb
packages/gpephone/libabenabler2_svn.bb
packages/gpephone/libabenabler_svn.bb
packages/gpephone/libcalenabler2_svn.bb
packages/gpephone/libmsgenabler_1.0.bb
packages/gpephone/librecord2_svn.bb
packages/gpephone/libsettings_svn.bb
packages/gpephone/machined_svn.bb
packages/gpephone/ptim-engine_svn.bb
packages/gpephone/ptim-headers_svn.bb
packages/gpephone/ptim-helper_svn.bb
packages/gpephone/ptim-manager_svn.bb
packages/gpephone/quickdial_svn.bb
packages/gpephone/useen_svn.bb
packages/images/openprotium-image.bb
packages/initscripts/initscripts-1.0/openprotium/checkroot.sh
packages/initscripts/initscripts-openprotium_1.0.bb
packages/jamvm/jamvm_1.4.5.bb
packages/kaffe/kaffe.inc
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-akita
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-c7x0
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-collie
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-poodle
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-spitz
packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/defconfig-tosa
packages/linux/linux-rp.inc
packages/linux/linux-rp_2.6.23.bb
packages/meta/openprotium-packages.bb
packages/midpath/midpath-cldc-native_0.1.bb
packages/midpath/midpath-cldc-x11_0.1.bb
packages/midpath/midpath-cldc_0.1.bb
packages/midpath/midpath.inc
packages/musicbrainz/libmusicbrainz_3.0.1.bb
packages/ncurses/ncurses.inc
packages/ncurses/ncurses_5.3.bb
packages/ncurses/ncurses_5.4.bb
packages/openprotium-init/files/boot/disk
packages/openprotium-init/files/functions
packages/openprotium-init/openprotium-init_0.10.bb
packages/ppp-dialin/ppp-dialin_0.1.bb
packages/ppp-dsl/ppp-dsl_0.1.bb
packages/python/python-2.5-manifest.inc
packages/python/python-ecore_cvs.bb
packages/python/python-edje_cvs.bb
packages/python/python-efl.inc
packages/python/python-emotion_cvs.bb
packages/python/python-epsilon_cvs.bb
packages/python/python-evas_cvs.bb
packages/python/python_2.5.1.bb
packages/quilt/quilt-native.inc
packages/quilt/quilt-native_0.45.bb
packages/quilt/quilt-package.inc
packages/quilt/quilt.inc
packages/quilt/quilt_0.45.bb
packages/rp-pppoe/rp-pppoe_3.8.bb
packages/sablevm/sablevm-classpath_1.1.9.bb
packages/sablevm/sablevm-classpath_1.11.3.bb
packages/sablevm/sablevm-classpath_1.12.bb
packages/sccd/files/scc.h
packages/sccd/sccd_1.0.bb
packages/tasks/task-openmoko-feed.bb
packages/tasks/task-python-everything.bb
packages/u-boot/u-boot-openmoko_svn.bb
packages/uicmoc/uicmoc4-native.inc
site/arm-linux
mtn:execute
true
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 -rab1a06b7453ad48a1ad5b4f9ee053cd6a9e04d28 -rc3ab98898b78f48ac52345c8f613995a696eb6a7
#
#
#
# delete "delete.txt"
#
# delete "packages/ecj/ecj-native_3.2.2.bb"
#
# delete "packages/ecj/ecj-native_3.3.bb"
#
# delete "packages/ecj/files/ecj.sh"
#
# delete "packages/jamvm/jamvm"
#
# delete "packages/jamvm/jamvm/sh3sh4-support.patch"
#
# delete "packages/ppp-dsl/ppp-dsl_0.1-monolithic.bb"
#
# delete "packages/quilt/quilt_0.45.inc"
#
# rename "packages/classpath/classpath-gtk_0.93.bb"
# to "packages/obsolete/classpath/classpath-gtk_0.93.bb"
#
# rename "packages/classpath/classpath-gtk_cvs.bb"
# to "packages/obsolete/classpath/classpath-gtk_cvs.bb"
#
# rename "packages/classpath/classpath-minimal-native_0.93.bb"
# to "packages/obsolete/classpath/classpath-minimal-native_0.93.bb"
#
# rename "packages/classpath/classpath-minimal-native_0.95.bb"
# to "packages/obsolete/classpath/classpath-minimal-native_0.95.bb"
#
# rename "packages/classpath/classpath-minimal_0.90.bb"
# to "packages/obsolete/classpath/classpath-minimal_0.90.bb"
#
# rename "packages/classpath/classpath-minimal_0.95.bb"
# to "packages/obsolete/classpath/classpath-minimal_0.95.bb"
#
# rename "packages/classpath/classpath.inc"
# to "packages/obsolete/classpath/classpath.inc"
#
# rename "packages/classpath/classpath_0.14.bb"
# to "packages/obsolete/classpath/classpath_0.14.bb"
#
# rename "packages/classpath/classpath_0.15.bb"
# to "packages/obsolete/classpath/classpath_0.15.bb"
#
# rename "packages/classpath/classpath_0.17.bb"
# to "packages/obsolete/classpath/classpath_0.17.bb"
#
# rename "packages/classpath/classpath_0.18.bb"
# to "packages/obsolete/classpath/classpath_0.18.bb"
#
# rename "packages/classpath/classpath_0.19.bb"
# to "packages/obsolete/classpath/classpath_0.19.bb"
#
# rename "packages/classpath/classpath_0.20.bb"
# to "packages/obsolete/classpath/classpath_0.20.bb"
#
# rename "packages/classpath/classpath_cvs.bb"
# to "packages/obsolete/classpath/classpath_cvs.bb"
#
# rename "packages/classpath/files/disable-automake-checks-v2.patch"
# to "packages/obsolete/classpath/files/disable-automake-checks-v2.patch"
#
# rename "packages/classpath/files/disable-automake-checks.patch"
# to "packages/obsolete/classpath/files/disable-automake-checks.patch"
#
# rename "packages/classpath/files/fix-endian-arm-floats.patch"
# to "packages/obsolete/classpath/files/fix-endian-arm-floats.patch"
#
# rename "packages/classpath/files/gconf_version.patch"
# to "packages/obsolete/classpath/files/gconf_version.patch"
#
# rename "packages/e17/enna_svn.bb"
# to "packages/e17/enna_cvs.bb"
#
# rename "packages/jamvm/jamvm/jamvm-1.3.1-size-defaults.patch"
# to "packages/jamvm/files/jamvm-1.3.1-size-defaults.patch"
#
# rename "packages/jamvm/jamvm-1.3.0"
# to "packages/obsolete/jamvm/jamvm-1.3.0"
#
# rename "packages/jamvm/jamvm_1.3.0.bb"
# to "packages/obsolete/jamvm/jamvm_1.3.0.bb"
#
# rename "packages/jamvm/jamvm_1.3.1.bb"
# to "packages/obsolete/jamvm/jamvm_1.3.1.bb"
#
# rename "packages/jamvm/jamvm_1.3.2.bb"
# to "packages/obsolete/jamvm/jamvm_1.3.2.bb"
#
# rename "packages/jamvm/jamvm_1.4.1.bb"
# to "packages/obsolete/jamvm/jamvm_1.4.1.bb"
#
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.23.12"
# to "packages/linux/linux-ixp4xx/defconfig-2.6.23.14"
#
# rename "packages/linux/linux-ixp4xx_2.6.23.12.bb"
# to "packages/linux/linux-ixp4xx_2.6.23.14.bb"
#
# rename "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git"
# to "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git"
#
# rename "packages/linux/linux-rp_2.6.23+2.6.24-rc0+git.bb"
# to "packages/linux/linux-rp_2.6.23+2.6.24-rc6+git.bb"
#
# rename "packages/ppp-dsl/dsl-provider"
# to "packages/ppp-dsl/files/dsl-provider"
#
# rename "packages/ppp-dsl/ppp_on_boot.dsl"
# to "packages/ppp-dsl/files/ppp_on_boot.dsl"
#
# rename "packages/quilt/files/install.patch"
# to "packages/quilt/quilt-0.45/install.patch"
#
# rename "packages/quilt/quilt-0.39"
# to "packages/obsolete/quilt/quilt-0.39"
#
# rename "packages/quilt/quilt-0.45/non-gnu.patch"
# to "packages/quilt/files/non-gnu.patch"
#
# rename "packages/quilt/quilt-native_0.39.bb"
# to "packages/obsolete/quilt/quilt-native_0.39.bb"
#
# rename "packages/quilt/quilt_0.39.bb"
# to "packages/obsolete/quilt/quilt_0.39.bb"
#
# rename "packages/quilt/quilt_0.39.inc"
# to "packages/obsolete/quilt/quilt_0.39.inc"
#
# add_dir "packages/base-files/base-files/openprotium"
#
# add_dir "packages/e17/edje-viewer"
#
# add_dir "packages/freesmartphone"
#
# add_dir "packages/gpephone/libiac2"
#
# add_dir "packages/gpephone/libim2"
#
# add_dir "packages/gpsdrive/gpsdrive-pda"
#
# add_dir "packages/obsolete/classpath"
#
# add_dir "packages/obsolete/classpath/files"
#
# add_dir "packages/obsolete/jamvm"
#
# add_dir "packages/obsolete/jamvm/files"
#
# add_dir "packages/obsolete/quilt"
#
# add_dir "packages/pngcrush"
#
# add_dir "packages/ppp/ppp-gprs"
#
# add_dir "packages/ppp/ppp-gprs/chats"
#
# add_dir "packages/ppp/ppp-gprs/peers"
#
# add_dir "packages/ppp-dsl/files"
#
# add_dir "packages/quilt/quilt-0.46"
#
# add_dir "packages/uicmoc/files"
#
# add_dir "packages/vsftpd/vsftpd-charconv-2.0.5"
#
# add_file "classes/cmake.bbclass"
# content [02512e3f040f3401c03f13f92d01da77069ce59e]
#
# add_file "classes/concatenated-image.bbclass"
# content [897fc5e2f0161e2487f2603b709e8d9ce91d85c7]
#
# add_file "files/device_table-minimal-add-md.txt"
# content [ae6bd8642d9e518aab41355d5c27bdec63bafc6c]
#
# add_file "packages/apmd/apmd-3.2.2/90-wifi-off"
# content [dd2b60322fc6d9136495d7c41f7c1f9e73ed8937]
#
# add_file "packages/base-files/base-files/openprotium/fstab"
# content [a3a9a408f7e276985ac09ed6e14bf3e672676856]
#
# add_file "packages/cacao/cacao-cldc.inc"
# content [d3ea647ce467d4d617b4ce6b05fb6270e58fda61]
#
# add_file "packages/cacao/cacao_0.98+hg20071001.bb"
# content [d618915c42d4979c7f29cc99c5014d3bc2d99c50]
#
# add_file "packages/cacao/cacaoh-native.inc"
# content [b5ccb2775f6560095089e77316fc173dd4abc9c5]
#
# add_file "packages/cacao/cacaoh-native_0.98+hg20071001.bb"
# content [3e9914f2a492d38de75e478cba4c16addca80a06]
#
# add_file "packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch"
# content [b4231277ce3d268059eaa141886c615a2dac0fc5]
#
# add_file "packages/cacao/files/cacao-0.98+hg-attachthread.patch"
# content [8c2c1d3d004946d41425dd8ce6e7c4602fa41437]
#
# add_file "packages/cacao/files/cacao-0.98+svn-classpath_var.patch"
# content [3ba0b66a46c0306ff811d3930f646fe0074b7477]
#
# add_file "packages/cacao/files/cacao-0.98+svn-libdir.diff"
# content [b97c32544ee97fef51a7222eb879ce6e68e3d1d4]
#
# add_file "packages/classpath/classpath-minimal_0.96.1.bb"
# content [e55ff8e0007e4814498b21013d19e63123d425ee]
#
# add_file "packages/classpath/classpath.inc"
# content [f89bbf74a4b188100d82872ac4cea3f094bafca9]
#
# add_file "packages/classpath/classpath_0.95.bb"
# content [d2f820a6ce35613717c16b3612ca071f4d918e83]
#
# add_file "packages/classpath/classpath_0.96.1.bb"
# content [d2f820a6ce35613717c16b3612ca071f4d918e83]
#
# add_file "packages/e17/edje-viewer/no-minimal-size.patch"
# content [8b482e8c0719f0c8649f3b416d404b975ac18283]
#
# add_file "packages/freesmartphone/gsm0710muxd_svn.bb"
# content [eafe51eac49ac2790c536077488698261ee29452]
#
# add_file "packages/gcc/gcc-4.2.2/fortran-libs-rpath-to-staging-hack.patch"
# content [96ee0c885c5757fde97f61188ec0c799ae5c7b18]
#
# add_file "packages/gcc/gcc-4.2.2/gcc-4.0.2-e300c2c3.patch"
# content [84568712feddebdf1d7bf5b760367393b94cf58d]
#
# add_file "packages/gpephone/almmgrd_svn.bb"
# content [25c7f68d4e9e07ed59265a1f275da3696532163b]
#
# add_file "packages/gpephone/calendar2_svn.bb"
# content [82196f61eca7b47d785a964144a279c6acdfd001]
#
# add_file "packages/gpephone/dialer_svn.bb"
# content [98dc9faf7118c94be8d57048d92db391f716a290]
#
# add_file "packages/gpephone/libalmmgr_svn.bb"
# content [f89397c2a6549797eec60645fcb0f1f141ce941c]
#
# add_file "packages/gpephone/libgemwidget_svn.bb"
# content [3e0c2912b00d90e5873a3782d885e3934046f433]
#
# add_file "packages/gpephone/libiac2/disable-tests.patch"
# content [efd8947a1d613f17903217fc9db1d3a5116bce60]
#
# add_file "packages/gpephone/libiac2_svn.bb"
# content [f7478f731cfbefa2721b6995c1c57629826efab6]
#
# add_file "packages/gpephone/libiac_svn.bb"
# content [7cc7ff46bb9359e3883a4f9c0c15fb232157d69e]
#
# add_file "packages/gpephone/libim2/disable-tests.patch"
# content [0df0f232ed225a157ef20cfc949862fe4028f296]
#
# add_file "packages/gpephone/libim2_svn.bb"
# content [19f2ddb013683120a735b58a3dd67387d006147f]
#
# add_file "packages/gpephone/liblipsevent2_svn.bb"
# content [9168c8ec313ad837ae2d7b4896b4314aa79e3673]
#
# add_file "packages/gpephone/libmsgenabler2_svn.bb"
# content [54a29d568f999ecbd83b1ce249da584fbcec85f3]
#
# add_file "packages/gpephone/libmsgenabler_svn.bb"
# content [c0e9d7dafdbb5d413c2e8addd95c5d0f4a9ed5a9]
#
# add_file "packages/gpsdrive/gpsdrive-pda/makefile.patch"
# content [c2473ec4972d5084e6249e8d896b9ecca57cbf54]
#
# add_file "packages/gpsdrive/gpsdrive-pda_2.10pre2.bb"
# content [29c061374aefcc591a87829d659fc50cdc3acefa]
#
# add_file "packages/initscripts/initscripts-1.0/openprotium/mountall.sh"
# content [d53ec5b8db4e854e32ae7bc9a2c949e2bb0d38cc]
#
# add_file "packages/initscripts/initscripts-1.0/openprotium/umountfs"
# content [749892a0259d793808e7b662b57ea68b0f8fe9c6]
#
# add_file "packages/initscripts/initscripts-1.0/openprotium/umountinitrd.sh"
# content [a3fa7aecc33c8f0216c2504ac53f053501e30697]
#
# add_file "packages/jamvm/jamvm.inc"
# content [5edcfc7c22cf4daf00c3d364962aa42af749237e]
#
# add_file "packages/jamvm/jamvm_1.5.0.bb"
# content [645cab3c8ecedf36901ba0d416cb8956c85f04b1]
#
# add_file "packages/linux/linux-2.6.23/kallsyms-missing-include.patch"
# content [4e0b600719116634929705c1b57bde66c11c7a2f]
#
# add_file "packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.23.14"
# content [fedacb0b5361d6ea9af44c234bb391c39aa55eeb]
#
# add_file "packages/linux/linux-openmoko-devel_2.6.23+2.6.24-rc7.bb"
# content [9b2a2354c222d9e3a4068950e45a4445d31981c9]
#
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/hx2750_base-r31.patch"
# content [9d52a94da2bc5efdbef91b8e0c297a7d5e5c9cf3]
#
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/pxa27x_overlay-r8.patch"
# content [50400c7a806a9483d297bfadce35b7608d9a8919]
#
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/squashfs3.2-2.6.20-r0.patch"
# content [16a42047b8f2cb7836925cbc7aca3977e1bfddad]
#
# add_file "packages/linux/linux-rp-2.6.23+2.6.24-rc6+git/versatile-armv6.patch"
# content [4741cf31febeef15c0b7646588b288c097a3d14c]
#
# add_file "packages/linux/linux-storcenter/defconfig-2.6.15.7"
# content [89163e2e88f8d563be3ba43ba5d8d97af99ac6b9]
#
# add_file "packages/linux/linux-storcenter/kernel.patch-2.6.15.7"
# content [2b5b2af2a03b3d264a60553caafa60c4e64e3ce8]
#
# add_file "packages/linux/linux-storcenter_2.6.15.7.bb"
# content [c8d13191b10ec42a45a1dac552bc747a241b24ad]
#
# add_file "packages/musicbrainz/libmusicbrainz_2.1.5.bb"
# content [9c70cdf3ad872cc2b9f5bf67233f035eabbebcd4]
#
# add_file "packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch"
# content [87b384507b8adbd40cca46154ac6911a8a79c4d6]
#
# add_file "packages/openmoko2/settingsgui_0.7+0.8-beta.bb"
# content [f6b45b1198a17a3fc45cafda47eb5c17f1299ded]
#
# add_file "packages/openprotium-init/files/initscripts/zleds"
# content [3d4888975ea9811709433fbce07f001e26d19d28]
#
# add_file "packages/pngcrush/pngcrush-native_1.6.4.bb"
# content [0c0ea8c7613f6d0177ff82807f6f30883858aebd]
#
# add_file "packages/pngcrush/pngcrush_1.6.4.bb"
# content [97eadbe6dc00b130393dc9fa876e44980ee6dad5]
#
# add_file "packages/ppp/ppp-gprs/chats/chat-gprs"
# content [3c17c4742880eb980b1f32c5bfb8ec89be225b16]
#
# add_file "packages/ppp/ppp-gprs/peers/_gprs"
# content [b8d56b83b8ed0db469e296a2adb24896adf7ebf3]
#
# add_file "packages/ppp/ppp-gprs/peers/_gprs-ap-internet"
# content [7ec04eac6aae50cf06036988b2d63e7f754abcd2]
#
# add_file "packages/ppp/ppp-gprs_1.0.bb"
# content [698b8ad36ea9b264cbdc9d217158f578b0635aaf]
#
# add_file "packages/python/python-edbus_cvs.bb"
# content [7812abc4380b4050cff4b3d2ce5a3d321fad99de]
#
# add_file "packages/python/python-efl-examples.bb"
# content [bf69dc5858a5a32c723a3146a32c4d96419db9ab]
#
# add_file "packages/quilt/quilt-0.46/aclocal.patch"
# content [ccc9f868c7adc5563ec7c822d1612d06662d62f0]
#
# add_file "packages/quilt/quilt-0.46/install.patch"
# content [b821f6cd66eca792042c080bc1e0e8410ede1e41]
#
# add_file "packages/quilt/quilt-native_0.46.bb"
# content [1b9a395ef79efd98777f42c6b6d0a14688f00c8f]
#
# add_file "packages/quilt/quilt_0.46.bb"
# content [3045f450628e75b65e19e531f085bd587c17bf41]
#
# add_file "packages/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch"
# content [4ca15864a833bc6abfdf0c03ffab5d3c5269862d]
#
# add_file "packages/tasks/task-openprotium.bb"
# content [7090386f8c1b7a38d12c4fdb13407565d809e031]
#
# add_file "packages/uicmoc/files/configure-fix.patch"
# content [84bc145dd2c490117c1f87e3171b69a2cf2dfbd3]
#
# add_file "packages/vsftpd/vsftpd-charconv-2.0.5/vsftpd-charconv.patch"
# content [cdc10852ee931d281c723603f3ca9a03d6a4aa12]
#
# add_file "packages/vsftpd/vsftpd-charconv_2.0.5.bb"
# content [b18d90a8c25102a694d9e0674e76a1fa58e240c2]
#
# patch "MAINTAINERS"
# from [8c59ce00f263c54ebc989a744a0d0538115e6075]
# to [80d282b3bf11c06303b9305e361cbce7f4166047]
#
# patch "classes/module-base.bbclass"
# from [d364b8e27548112f9d1fce0e4a6a6905d955fe4f]
# to [542662416cb5cc52f033c9b773e388e9c54ad891]
#
# patch "classes/module.bbclass"
# from [04ebb27c817750a39f3c15612ebc60e9fad68bc8]
# to [6534a9ab951349893220f85fb9b4760000b8b2de]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [e9d69ef671e762d41a8626f692a75ada0753c7d4]
# to [aa578df0dc91a178786a5d3c808aa37f370e60f9]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [0ee8e930339f1d201ab01060c7de4f6f0e484056]
# to [1dcbc89e2e936afc986ff0b9b2342ea57e980a70]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [19eeddbb17547a5f563e66f8bdc1c1baf1c8a54b]
# to [8119c811984dd538a4b239217a82174295ecb22f]
#
# patch "conf/distro/openmoko.conf"
# from [bb73329f13f5df86594c09adb3e58552511e268f]
# to [0faa207a22693f2ef2ed13e12ce53f250340b63f]
#
# patch "conf/distro/openprotium.conf"
# from [d345e4ef53818feb39363427341b7abc8cfc6c1b]
# to [675a168a57ce9b21aa838b950b5ae0da07243da2]
#
# patch "conf/machine/include/ixp4xx.inc"
# from [20b9033235fa7a2b9c96df8d4a1bb3e47d6f29e0]
# to [9c98fc2f74fc897a24220ae930e0950d7832deb0]
#
# patch "conf/machine/storcenter.conf"
# from [622076dfe27a2f9b51f85d89b558236c937d2237]
# to [d6d0332b212ef555e874615f6b130151a4913bfc]
#
# patch "contrib/mtn2git/mtn2git.py"
# from [152252b8f2f7f57c70d678432bd6cb8fa63f8946]
# to [1358f112d3cb844a52d78b014809a8a5a6609bc4]
#
# patch "packages/apmd/apmd_3.2.2.bb"
# from [468e386d67d32dcf673ffd462940acdf206daeee]
# to [7e1be5e159f4f8ae062efeda347fda7056e83fc8]
#
# patch "packages/avetanabt/avetanabt_20060413.bb"
# from [d715915e84514f9f60dd62b9fb19569c1b675e54]
# to [4fabe7f34cef66e71d1dc2a0c19e864cef8ac536]
#
# patch "packages/avetanabt/avetanabt_cvs.bb"
# from [d5f611a8d092f7c2afaf2125ff0c507d0f23d218]
# to [d245c102c30be08d98789656653a3cac3bc957cb]
#
# patch "packages/cacao/cacao-cldc_0.98.bb"
# from [d075f4c8402dcd779ca32535993ba6af6aafdafd]
# to [7a579745f970088319acb19f5f2f1ab814666abf]
#
# patch "packages/cacao/cacao.inc"
# from [d8bc9087bb9ca79854ffb1d26ff94e4bafea0159]
# to [51c2d3e8fe9d317751a001037be7b6061a61b276]
#
# patch "packages/cacao/cacaoh-cldc-native_0.98.bb"
# from [70727331bb54728e45f64ce0f2d252d870e2bf51]
# to [cc2ee6f43a136dc2ba76ed7bea4fec2f935c6fdb]
#
# patch "packages/dtnrg/dtn_2.5.0.bb"
# from [987af483064b66222040dae87a47b35f9a675f6f]
# to [f21e25b094f74aa1f1eba88ec1f6bcec6045077c]
#
# patch "packages/e17/edje-viewer_cvs.bb"
# from [a789e404a347e1eedc48636e834ce762cb837e4a]
# to [81171cf34f4ee80dedbbea9870abd1936cd37058]
#
# patch "packages/e17/enna_cvs.bb"
# from [54210860447fe567d01be8573abb04a167e9c1cc]
# to [bcbb18440565786cb1060088e96f59aa85ade0e5]
#
# pa%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rc794a426d2a55b0c4b5f1f6fee90c8272bd266e9 -rc3ab98898b78f48ac52345c8f613995a696eb6a7
#
#
#
# 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 [051f067b1365e603f425622b2d4df43fcd387fe6]
#
============================================================
--- 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 051f067b1365e603f425622b2d4df43fcd387fe6
@@ -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 \
More information about the Openembedded-commits
mailing list