[oe-commits] org.oe.dev merge of '7bd228fcb04f96a616bd3711f0d5df582a2a71ec'
mwester commit
oe at amethyst.openembedded.net
Mon Sep 1 18:25:38 UTC 2008
merge of '7bd228fcb04f96a616bd3711f0d5df582a2a71ec'
and '87d13abecb09be358ba331b4193cf76bdd2bda3d'
Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: f4dabead7ddd765bb651fb44cd9e5d48fb582330
ViewMTN: http://monotone.openembedded.org/revision/info/f4dabead7ddd765bb651fb44cd9e5d48fb582330
Files:
1
packages/openmoko-projects/illume
packages/openmoko-projects/illume/configure-keyboard.patch
packages/openmoko-projects/illume/module.illume.src
packages/e17/e-utils_svn.bb
packages/e17/e-wm_svn.bb
packages/e17/edje-editor_svn.bb
packages/e17/edje-viewer_svn.bb
packages/e17/enna_svn.bb
packages/e17/examine_svn.bb
packages/e17/exhibit_svn.bb
packages/e17/expedite_svn.bb
packages/e17/exquisite_svn.bb
packages/e17/illume_svn.bb
packages/e17/rage_svn.bb
packages/efl1/ecore-native_svn.bb
packages/efl1/ecore_svn.bb
packages/efl1/edb_svn.bb
packages/efl1/edbus_svn.bb
packages/efl1/edje-native_svn.bb
packages/efl1/edje_svn.bb
packages/efl1/eet-native_svn.bb
packages/efl1/eet_svn.bb
packages/efl1/eflpp_svn.bb
packages/efl1/efreet_svn.bb
packages/efl1/embryo-native_svn.bb
packages/efl1/embryo_svn.bb
packages/efl1/emotion_svn.bb
packages/efl1/engrave_svn.bb
packages/efl1/enhance_svn.bb
packages/efl1/epdf_svn.bb
packages/efl1/epeg_svn.bb
packages/efl1/epsilon_svn.bb
packages/efl1/esmart_svn.bb
packages/efl1/etk-native_svn.bb
packages/efl1/etk_svn.bb
packages/efl1/evas-native_svn.bb
packages/efl1/evas_svn.bb
packages/efl1/evolve-native_svn.bb
packages/efl1/evolve_svn.bb
packages/efl1/ewl_svn.bb
packages/efl1/exml_svn.bb
packages/efl1/imlib2_svn.bb
packages/python/python-ecore_svn.bb
packages/python/python-edbus_svn.bb
packages/python/python-edje_svn.bb
packages/python/python-emotion_svn.bb
packages/python/python-epsilon_svn.bb
packages/python/python-evas_svn.bb
conf/distro/include/sane-srcrevs.inc
packages/freesmartphone/frameworkd/a780/frameworkd.conf
packages/freesmartphone/frameworkd/frameworkd.conf
packages/freesmartphone/frameworkd/magician/frameworkd.conf
packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
packages/freesmartphone/frameworkd_git.bb
packages/slugos-init/files/boot/disk
packages/slugos-init/files/functions
packages/slugos-init/files/turnup
packages/slugos-init/slugos-init_5.0.bb
Diffs:
#
# mt diff -r7bd228fcb04f96a616bd3711f0d5df582a2a71ec -rf4dabead7ddd765bb651fb44cd9e5d48fb582330
#
#
#
# delete "packages/openmoko-projects/illume"
#
# delete "packages/openmoko-projects/illume/configure-keyboard.patch"
#
# delete "packages/openmoko-projects/illume/module.illume.src"
#
# add_file "packages/e17/e-utils_svn.bb"
# content [75bb8b8292b466047f4fe8d3cd3e6e05e13d87ec]
#
# add_file "packages/e17/e-wm_svn.bb"
# content [31e37ed1d926bba319e08d51364517f6a2733054]
#
# add_file "packages/e17/edje-editor_svn.bb"
# content [2c16f500f2a181e8d6b78d8facd23f2514e1fc00]
#
# add_file "packages/e17/edje-viewer_svn.bb"
# content [0f651e6b286ae4a1d809e07dc51dbc8f02d1529c]
#
# add_file "packages/e17/enna_svn.bb"
# content [62f671a8da1b257cbfacf565b6b0921ab90ed30e]
#
# add_file "packages/e17/examine_svn.bb"
# content [635b1c0e10faae4d6ee560c3375940713261372b]
#
# add_file "packages/e17/exhibit_svn.bb"
# content [f6314a94e9aaf13d2384c2222d4bd25fffaeba8d]
#
# add_file "packages/e17/expedite_svn.bb"
# content [6bb2b7725ee48d6f17b24187e4cafbe1c5e166fc]
#
# add_file "packages/e17/exquisite_svn.bb"
# content [f2263b9c94d9dfc781c625380c9cc77f89d7cad7]
#
# add_file "packages/e17/illume_svn.bb"
# content [b9fb37a0cc3bbbc4f4cf89e38883b1f2f6a2f613]
#
# add_file "packages/e17/rage_svn.bb"
# content [d6c7cc60962dfa00b345d943c8063f34d67b42a0]
#
# add_file "packages/efl1/ecore-native_svn.bb"
# content [c3fec1d570712238b606aaca4e7c278f8635dc8e]
#
# add_file "packages/efl1/ecore_svn.bb"
# content [85cf65cd0e01e037c6a68fbd2a8c46368af7c9f8]
#
# add_file "packages/efl1/edb_svn.bb"
# content [6d402b52ab6dfe98d7347a1ef5691c6971f39055]
#
# add_file "packages/efl1/edbus_svn.bb"
# content [ed2d4a1fee76e684a76c9c1a04c9cc4848ea163f]
#
# add_file "packages/efl1/edje-native_svn.bb"
# content [c2e2f58460706fd0502acfc7cabeae9bf5fff99d]
#
# add_file "packages/efl1/edje_svn.bb"
# content [3491c2b1c6daaf47cf80f1468b021020ff7068fe]
#
# add_file "packages/efl1/eet-native_svn.bb"
# content [4d410e73419250312a111ce3d28fc29f41745845]
#
# add_file "packages/efl1/eet_svn.bb"
# content [c681e46e8bfa49e5cae66a826265da08cbe4fbaf]
#
# add_file "packages/efl1/eflpp_svn.bb"
# content [100cb58b00e35ab32615122756760bcd34f168a7]
#
# add_file "packages/efl1/efreet_svn.bb"
# content [37574395f38cf68161dfc4bcca46fa6cb4e16677]
#
# add_file "packages/efl1/embryo-native_svn.bb"
# content [f2f729cd85d73754a2338098b1ac297cd419b558]
#
# add_file "packages/efl1/embryo_svn.bb"
# content [55558851131adb8b77d75e82297681fbd6888c05]
#
# add_file "packages/efl1/emotion_svn.bb"
# content [a9d58b5061ace5e52e0bead4340a991ddc805ded]
#
# add_file "packages/efl1/engrave_svn.bb"
# content [18985a30eba85eddff94bfdc0dd21b140448e29c]
#
# add_file "packages/efl1/enhance_svn.bb"
# content [48633d65401934f067f9db3cbda3dfdd0ba741d8]
#
# add_file "packages/efl1/epdf_svn.bb"
# content [c23004a5a6d3c4ea29c29f0a95f26fcf8df5db2d]
#
# add_file "packages/efl1/epeg_svn.bb"
# content [e79d107a8a575bcaaedcc44ad889c38746276e89]
#
# add_file "packages/efl1/epsilon_svn.bb"
# content [3f5dfffeda61d5a8d54190d0e624dc5a2fde3762]
#
# add_file "packages/efl1/esmart_svn.bb"
# content [f16739357dab9560042865d44cb5381b1d4e00e9]
#
# add_file "packages/efl1/etk-native_svn.bb"
# content [4d6674c3d1b99c1ffec25db70dfb9bb8ba2f5c23]
#
# add_file "packages/efl1/etk_svn.bb"
# content [113ff0aee78dd2aa1e03367692d33855623ad8e3]
#
# add_file "packages/efl1/evas-native_svn.bb"
# content [6187f8e7ba476dd0db7fa8a5c523f6a000d9e5fa]
#
# add_file "packages/efl1/evas_svn.bb"
# content [82f126668ed700106fce2efb55f6d16c371b4bd1]
#
# add_file "packages/efl1/evolve-native_svn.bb"
# content [658ea6525468025cadcb521bcf72358c1b2662e0]
#
# add_file "packages/efl1/evolve_svn.bb"
# content [c7c9901f6837ff01f3297a7959745da5c6ade187]
#
# add_file "packages/efl1/ewl_svn.bb"
# content [9f03b17f23c652174c4a69067038824fddeec992]
#
# add_file "packages/efl1/exml_svn.bb"
# content [5f77d81aa113f50346011b1519b282f4637fc588]
#
# add_file "packages/efl1/imlib2_svn.bb"
# content [291aed0bcb27b9855f5ca417db8784cd8cbd872c]
#
# add_file "packages/python/python-ecore_svn.bb"
# content [ba3b56939d13c2e8516162c71658bbc6128ffa42]
#
# add_file "packages/python/python-edbus_svn.bb"
# content [a59f5e269950d79dd64e0f9707521c7a4aa31b3b]
#
# add_file "packages/python/python-edje_svn.bb"
# content [6c02a312d756152cf52504755d39a806b4cbcc52]
#
# add_file "packages/python/python-emotion_svn.bb"
# content [b6b6fae4ceb0f75ca9a0618a285c727daeb10530]
#
# add_file "packages/python/python-epsilon_svn.bb"
# content [6333ae50ca89b2d367444c5850e185338a723e2f]
#
# add_file "packages/python/python-evas_svn.bb"
# content [2e59d1d5ff054289b5f5591f679ca79a167d932f]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [c8c33b6eb98daedf3de99ee5ba7bee2199f7704c]
# to [4f99de2a0c9d2189fd884f2aa9e6803cea686dc0]
#
# patch "packages/freesmartphone/frameworkd/a780/frameworkd.conf"
# from [42f71b59097f81bae168195d85209063cb92c1f4]
# to [2c8e9ed6b3301fc069f677a28c6bb7dfec1e35ee]
#
# patch "packages/freesmartphone/frameworkd/frameworkd.conf"
# from [31582e7207f59cfd9b6570cbe36f2df59f587eab]
# to [7f5e3940479f66844a28668a1161f2b664e1079e]
#
# patch "packages/freesmartphone/frameworkd/magician/frameworkd.conf"
# from [956fbca634e435124be4f323573306632e11f8eb]
# to [6c951b8c68fd4a7515677bb251edcee52648e04c]
#
# patch "packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf"
# from [aaa2ede39c269671da1b463d943cda006ff393cf]
# to [b0ba7ea2cfe4dcba9828b27cf52bd1bc7274dee6]
#
# patch "packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf"
# from [519709aafcf5d15f5d178fc7e95869b9214bed78]
# to [a0b3e8d263d2f7a745291efc50eab5ddafea8d8c]
#
# patch "packages/freesmartphone/frameworkd_git.bb"
# from [500c5a7db116c70138d4188704cb83417b655625]
# to [fb0260924225b0c8aa28c4ec9290819c11e7f543]
#
============================================================
--- packages/e17/e-utils_svn.bb 75bb8b8292b466047f4fe8d3cd3e6e05e13d87ec
+++ packages/e17/e-utils_svn.bb 75bb8b8292b466047f4fe8d3cd3e6e05e13d87ec
@@ -0,0 +1,12 @@
+DESCRIPTION = "Enlightenment Window Manager Utilities"
+DEPENDS = "eet evas ecore edje esmart ewl engrave"
+LICENSE = "MIT BSD"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit e
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD;module=e_utils;proto=http"
+S = "${WORKDIR}/e_utils"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
============================================================
--- packages/e17/e-wm_svn.bb 31e37ed1d926bba319e08d51364517f6a2733054
+++ packages/e17/e-wm_svn.bb 31e37ed1d926bba319e08d51364517f6a2733054
@@ -0,0 +1,70 @@
+DESCRIPTION = "The Enlightenment Window Mananger Version 17"
+DEPENDS = "eet evas ecore edje efreet edbus"
+LICENSE = "MIT BSD"
+PV = "0.16.999.043+svnr${SRCREV}"
+PR = "r11"
+
+inherit e update-alternatives
+
+SRC_URI = "\
+ svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \
+ file://disable-e-cursor.patch;patch=1 \
+ file://enlightenment_start.oe \
+ file://applications.menu \
+"
+S = "${WORKDIR}/e"
+
+EXTRA_OECONF = "\
+ --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+ --x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR} \
+ --enable-simple-x11 \
+"
+
+do_configure_prepend() {
+ autopoint
+}
+
+do_stage() {
+ autotools_stage_all
+ for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done
+ for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done
+ for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done
+ for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done
+}
+
+do_install_append() {
+ # customising - should rather make this simple upstream
+ rm -rf ${D}${datadir}/enlightenment/data/backgrounds/*
+ rm -rf ${D}${datadir}/enlightenment/data/fonts/*
+ rm -rf ${D}${datadir}/enlightenment/data/other/*
+ install -m 755 ${WORKDIR}/enlightenment_start.oe ${D}/${bindir}
+ install -d ${D}/${sysconfdir}/xdg/menus
+ install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/
+}
+
+RDEPENDS += "shared-mime-info mime-support"
+
+FILES_${PN} = "\
+ ${bindir}/* \
+ ${libdir}/enlightenment/modules/*/*.* \
+ ${libdir}/enlightenment/modules/*/*/* \
+ ${libdir}/enlightenment/preload/*.so \
+ ${datadir} \
+ ${sysconfdir} \
+"
+FILES_${PN}-dbg += "\
+ ${libdir}/enlightenment/modules/*/*/.debug/ \
+ ${libdir}/enlightenment/preload/.debug/ \
+"
+
+FILES_${PN}-dev += "\
+ ${libdir}/enlightenment/preload/*.?a \
+"
+
+CONFFILES_${PN} = "/etc/xdg/menus/applications.menu"
+
+ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "16"
============================================================
--- packages/e17/edje-editor_svn.bb 2c16f500f2a181e8d6b78d8facd23f2514e1fc00
+++ packages/e17/edje-editor_svn.bb 2c16f500f2a181e8d6b78d8facd23f2514e1fc00
@@ -0,0 +1,12 @@
+DESCRIPTION = "Edje-Editor is just that."
+LICENSE = "MIT BSD"
+DEPENDS = "etk"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit e
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=edje_editor;proto=http"
+S = "${WORKDIR}/edje_editor"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
============================================================
--- packages/e17/edje-viewer_svn.bb 0f651e6b286ae4a1d809e07dc51dbc8f02d1529c
+++ packages/e17/edje-viewer_svn.bb 0f651e6b286ae4a1d809e07dc51dbc8f02d1529c
@@ -0,0 +1,13 @@
+DESCRIPTION = "Edje_Viewer is just that."
+DEPENDS = "etk"
+LICENSE = "MIT BSD"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit e
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=edje_viewer;proto=http \
+ file://no-minimal-size.patch;patch=1"
+S = "${WORKDIR}/edje_viewer"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
============================================================
--- packages/e17/enna_svn.bb 62f671a8da1b257cbfacf565b6b0921ab90ed30e
+++ packages/e17/enna_svn.bb 62f671a8da1b257cbfacf565b6b0921ab90ed30e
@@ -0,0 +1,16 @@
+DESCRIPTION = "Enna is a media center application based on EFL"
+LICENSE = "GPL"
+DEPENDS = "curl dbus eet evas edje ecore edbus emotion"
+DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglib"
+SECTION = "x11/multimedia"
+PV = "0.2.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit e
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/MISC;module=enna;proto=http"
+S = "${WORKDIR}/enna"
+
+do_configure_prepend() {
+ autopoint
+}
============================================================
--- packages/e17/examine_svn.bb 635b1c0e10faae4d6ee560c3375940713261372b
+++ packages/e17/examine_svn.bb 635b1c0e10faae4d6ee560c3375940713261372b
@@ -0,0 +1,13 @@
+DESCRIPTION = "Examine, the program configurator"
+LICENSE = "MIT BSD"
+DEPENDS = "ewl"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r1"
+
+SRCNAME = "examine"
+
+inherit e
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}"
============================================================
--- packages/e17/exhibit_svn.bb f6314a94e9aaf13d2384c2222d4bd25fffaeba8d
+++ packages/e17/exhibit_svn.bb f6314a94e9aaf13d2384c2222d4bd25fffaeba8d
@@ -0,0 +1,9 @@
+DESCRIPTION = "Exhibit is the ETK picture viewer"
+LICENSE = "MIT BSD"
+DEPENDS = "evas ecore epsilon edje eet etk efreet"
+PV = "0.1.1+svnr${SRCREV}"
+PR = "r1"
+
+SRCNAME = "exhibit"
+
+inherit e
============================================================
--- packages/e17/expedite_svn.bb 6bb2b7725ee48d6f17b24187e4cafbe1c5e166fc
+++ packages/e17/expedite_svn.bb 6bb2b7725ee48d6f17b24187e4cafbe1c5e166fc
@@ -0,0 +1,31 @@
+DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
+DEPENDS = "eet evas"
+RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png"
+LICENSE = "MIT BSD"
+PV = "0.6.0+svnr${SRCREV}"
+PR = "r1"
+
+inherit autotools
+
+EXTRA_OECONF = "\
+ --x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR} \
+ --enable-simple-x11 \
+\
+ --disable-opengl-glew \
+ --disable-opengl-x11 \
+ --enable-software-x11 \
+ --enable-xrender-x11 \
+ --enable-software-16-x11 \
+ --enable-fb \
+ --disable-software-ddraw \
+ --disable-software-16-ddraw \
+ --disable-direct3d \
+ --disable-software-sdl \
+"
+
+do_configure_append() {
+ find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+}
+
+FILES_${PN} += "${datadir}"
============================================================
--- packages/e17/exquisite_svn.bb f2263b9c94d9dfc781c625380c9cc77f89d7cad7
+++ packages/e17/exquisite_svn.bb f2263b9c94d9dfc781c625380c9cc77f89d7cad7
@@ -0,0 +1,11 @@
+DESCRIPTION = "A psplash replacement for display"
+LICENSE = "MIT BSD"
+DEPENDS = "eet evas ecore embryo edje"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r1"
+
+SRCNAME = "exquisite"
+
+inherit e
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
============================================================
--- packages/e17/illume_svn.bb b9fb37a0cc3bbbc4f4cf89e38883b1f2f6a2f613
+++ packages/e17/illume_svn.bb b9fb37a0cc3bbbc4f4cf89e38883b1f2f6a2f613
@@ -0,0 +1,54 @@
+DESCRIPTION = "Illume - A mobile UI module for the Enlightenment Window Manager"
+AUTHOR = "Rasterman"
+LICENSE = "MIT/BSD"
+DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native eet-native"
+PV = "0.0+svnr${SRCREV}"
+PR = "r13"
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=illume;proto=http"
+S = "${WORKDIR}/${PN}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "\
+ --x-includes=${STAGING_INCDIR}/X11 \
+ --x-libraries=${STAGING_LIBDIR} \
+ --enable-simple-x11 \
+ --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
+ --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \
+"
+
+RRECOMMENDS_${PN} = "\
+ wamerican \
+ ${PN}-config \
+ ${PN}-theme \
+ ${PN}-dicts-english-us \
+ ${PN}-keyboards-default \
+ ${PN}-keyboards-numbers \
+ ${PN}-keyboards-terminal \
+"
+
+PACKAGES =+ "\
+ ${PN}-config \
+ ${PN}-dicts-english-us \
+ ${PN}-keyboards-default \
+ ${PN}-keyboards-numbers \
+ ${PN}-keyboards-terminal \
+"
+PACKAGE_ARCH_${PN}-config = "all"
+PACKAGE_ARCH_${PN}-dicts-english-us = "all"
+PACKAGE_ARCH_${PN}-keyboards-default = "all"
+PACKAGE_ARCH_${PN}-keyboards-numbers = "all"
+
+FILES_${PN}-config = "${datadir}/enlightenment/data/config/*/* ${datadir}/illume"
+FILES_${PN}-dicts-english-us = "${libdir}/enlightenment/modules/illume/dicts/English_*.dic"
+FILES_${PN}-keyboards-default = "${libdir}/enlightenment/modules/illume/keyboards/Default.kbd"
+FILES_${PN}-keyboards-numbers = "${libdir}/enlightenment/modules/illume/keyboards/Numbers.kbd"
+FILES_${PN}-keyboards-terminal = "${libdir}/enlightenment/modules/illume/keyboards/Terminal.kbd"
+
+FILES_${PN} = "\
+ ${libdir}/enlightenment/modules/*/*.edj \
+ ${libdir}/enlightenment/modules/*/*.desktop \
+ ${libdir}/enlightenment/modules/*/*/* \
+"
+FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/"
============================================================
--- packages/e17/rage_svn.bb d6c7cc60962dfa00b345d943c8063f34d67b42a0
+++ packages/e17/rage_svn.bb d6c7cc60962dfa00b345d943c8063f34d67b42a0
@@ -0,0 +1,12 @@
+DESCRIPTION = "Rage is a media center application based on EFL"
+AUTHOR = "Carsten 'The Rasterman' Heitzler"
+HOMEPAGE = "http://www.rasterman.com"
+LICENSE = "MIT BSD"
+DEPENDS = "evas ecore edje"
+SECTION = "x11/multimedia"
+PV = "0.3.0.042+svnr${SRCREV}"
+
+inherit autotools
+
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=rage;proto=http"
+S = "${WORKDIR}/rage"
============================================================
--- packages/efl1/ecore-native_svn.bb c3fec1d570712238b606aaca4e7c278f8635dc8e
+++ packages/efl1/ecore-native_svn.bb c3fec1d570712238b606aaca4e7c278f8635dc8e
@@ -0,0 +1,32 @@
+require ecore.inc
+inherit native
+DEPENDS = "eet-native evas-native"
+PR = "r1"
+
+EXTRA_OECONF = "\
+ --enable-ecore-txt \
+ --disable-ecore-config \
+ --disable-ecore-x-xcb \
+ --disable-ecore-x \
+ --enable-ecore-job \
+ --disable-ecore-directfb \
+ %s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r87d13abecb09be358ba331b4193cf76bdd2bda3d -rf4dabead7ddd765bb651fb44cd9e5d48fb582330
#
#
#
# patch "packages/slugos-init/files/boot/disk"
# from [0853a98ec96963dcaf9f81f162c4bf2900366c46]
# to [2812a8e183761c88f764ab143d6e65cf1bfc8290]
#
# patch "packages/slugos-init/files/functions"
# from [68db6b5c8036845c4660e107be5b5c6a9a1c0cad]
# to [3a8a43e4f47ba0bc13a780d41ba39abc0a55d2e5]
#
# patch "packages/slugos-init/files/turnup"
# from [8eb7efd8fbaf4a131d1e25e012806db17e21eb37]
# to [d94a8247eae67fe247bce151f90da0b92e8c9617]
#
# patch "packages/slugos-init/slugos-init_5.0.bb"
# from [77db73d4a4c178a7a01dd6a1bfafc30334a7c0dd]
# to [5c3b2fe18a30d3510095f7868b4e32f248080492]
#
============================================================
--- packages/slugos-init/files/boot/disk 0853a98ec96963dcaf9f81f162c4bf2900366c46
+++ packages/slugos-init/files/boot/disk 2812a8e183761c88f764ab143d6e65cf1bfc8290
@@ -38,12 +38,13 @@ then
# is attempted.
if test -n "$UUID" &&
mount "$@" UUID="$UUID" /mnt ||
- mount "$@" -U "$UUID" /mnt ||
mount "$@" "$device" /mnt
then
- # checkmount checks for sh, chroot, init
- # and /mnt (i.e. /mnt/mnt in this case)
- if checkmount /mnt
+ # checkmount checks for sh, chroot, init, /dev
+ # and /mnt (i.e. /mnt/mnt in this case).
+ # minimaldevnodes checks (and creates if required)
+ # a few mandatory /dev nodes we may need.
+ if checkmount /mnt && minimaldevnodes /mnt
then
# pivot to /initrd if available, else /mnt
cd /
============================================================
--- packages/slugos-init/files/functions 68db6b5c8036845c4660e107be5b5c6a9a1c0cad
+++ packages/slugos-init/files/functions 3a8a43e4f47ba0bc13a780d41ba39abc0a55d2e5
@@ -173,6 +173,7 @@ checkmount(){
# basic test for init (the kernel will try to load this)
# but require a shell in bin/sh too
test \( -d "$1/mnt" \) -a \
+ \( -d "$1/dev" \) -a \
\( -x "$1/bin/sh" -o -h "$1/bin/sh" \) -a \
\( -x "$1/usr/sbin/chroot" -o -h "$1/usr/sbin/chroot" -o \
-x "$1/sbin/chroot" -o -h "$1/sbin/chroot" \) -a \
@@ -181,6 +182,18 @@ checkmount(){
-x "$1/bin/init" -o -h "$1/bin/init" \)
}
#
+# minimaldevnodes "mountpoint"
+# tests an already mounted mountpoint to see if a very minimal
+# set of devices exists or can be created in dev, and returns
+# failure if not. This is required for booting to an nfsroot
+# with an empty dev directory, as commonly occurs when the rootfs
+# is created from a tar.gz image. This is also required for mdev.
+minimaldevnodes(){
+ [ -c "$1/dev/console" ] || mknod -m 600 "$1/dev/console" c 5 1 || return 1
+ [ -c "$1/dev/null" ] || mknod -m 666 "$1/dev/null" c 1 3 || return 1
+ return 0
+}
+#
# swivel "new root" "old root"
# NOTE: the arguments must be paths relative to /, bad things
# will happen if the arguments themselves start with /
============================================================
--- packages/slugos-init/files/turnup 8eb7efd8fbaf4a131d1e25e012806db17e21eb37
+++ packages/slugos-init/files/turnup d94a8247eae67fe247bce151f90da0b92e8c9617
@@ -578,7 +578,7 @@ disk() {
fso="$(fsoptions "$@")"
if if test -n "$uuid"
then
- mount "$@" UUID="$uuid" "$new" || mount "$@" -U "$uuid" "$new"
+ mount "$@" UUID="$uuid" "$new"
else
mount "$@" "$device" "$new"
fi
@@ -591,7 +591,7 @@ disk() {
if test -n "$fst" &&
if test -n "$uuid"
then
- mount -t "$fst" -o "$fso" UUID="$uuid" "$new" || mount -t "$fst" -o "$fso" -U "$uuid" "$new"
+ mount -t "$fst" -o "$fso" UUID="$uuid" "$new"
else
mount -t "$fst" -o "$fso" "$device" "$new"
fi
@@ -633,7 +633,7 @@ disk() {
then
echo " options used: -t $fst -o $fso [error in this script]" >&2
test -n "$uuid" &&
- echo " uuid: $uuid (passed with UUID= or -U)" >&2
+ echo " uuid: $uuid (passed with UUID=<uuid>)" >&2
fi
fi
============================================================
--- packages/slugos-init/slugos-init_5.0.bb 77db73d4a4c178a7a01dd6a1bfafc30334a7c0dd
+++ packages/slugos-init/slugos-init_5.0.bb 5c3b2fe18a30d3510095f7868b4e32f248080492
@@ -4,7 +4,7 @@ RDEPENDS = "busybox devio"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r0"
+PR = "r1"
SRC_URI = "file://boot/flash \
file://boot/disk \
More information about the Openembedded-commits
mailing list