From 29d6678fd546377459ef75cf54abeef5b969b5cf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 Aug 2010 15:14:24 +0100 Subject: Major layout change to the packages directory Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie --- .../matchbox-sato/matchbox-session-sato/session | 22 --------- .../matchbox-sato/matchbox-session-sato_0.1.bb | 53 ---------------------- 2 files changed, 75 deletions(-) delete mode 100644 meta/packages/matchbox-sato/matchbox-session-sato/session delete mode 100644 meta/packages/matchbox-sato/matchbox-session-sato_0.1.bb (limited to 'meta/packages/matchbox-sato') diff --git a/meta/packages/matchbox-sato/matchbox-session-sato/session b/meta/packages/matchbox-sato/matchbox-session-sato/session deleted file mode 100644 index 1a7e99c0a..000000000 --- a/meta/packages/matchbox-sato/matchbox-session-sato/session +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -. /etc/formfactor/config - -if [ "$HAVE_TOUCHSCREEN" = "1" ]; then - SHOWCURSOR="no" -else - SHOWCURSOR="yes" -fi - -matchbox-desktop & - -# Lines containing feature-[foo] are removed at build time if the machine -# doesn't have the feature "foo". - -START_APPLETS=showdesktop,windowselector -END_APPLETS=clock,battery,systray,startup-notify,notify -END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone - -matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS & - -exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@ diff --git a/meta/packages/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/packages/matchbox-sato/matchbox-session-sato_0.1.bb deleted file mode 100644 index 5c01a1328..000000000 --- a/meta/packages/matchbox-sato/matchbox-session-sato_0.1.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "Custom MB session files for poky" -HOMEPAGE = "http://www.matchbox-project.org/" -BUGTRACKER = "http://bugzilla.openedhand.com/" - -LICENSE = "GPL" - -SECTION = "x11" -RDEPENDS = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato initscripts matchbox-session" -PR = "r27" - -# This package is architecture specific because the session script is modified -# based on the machine architecture. -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI = "file://session" -S = "${WORKDIR}" - -do_install() { - # This is the set of machine features that the script has markers for - FEATURES="phone" - SCRIPT="${S}/sedder" - rm -f $SCRIPT - touch $SCRIPT - for FEAT in $FEATURES; do - if echo ${MACHINE_FEATURES} | awk "/$FEAT/ {exit 1}"; then - echo "/feature-$FEAT/d" >> $SCRIPT - fi - done - - install -d ${D}/${sysconfdir}/matchbox - sed -f "$SCRIPT" ${S}/session > ${D}/${sysconfdir}/matchbox/session - chmod +x ${D}/${sysconfdir}/matchbox/session -} - -pkg_postinst_${PN} () { -#!/bin/sh -e -if [ "x$D" != "x" ]; then - exit 1 -fi - -. ${sysconfdir}/init.d/functions - -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Sato -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme Sato -gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type bool --set /desktop/poky/interface/touchscreen true - -if [ "`machine_id`" = "gta01" ] -then - gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 6" -else - gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 9" -fi -} -- cgit v1.2.3