diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-23 20:30:30 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-23 20:32:47 +0200 |
| commit | c0916bda7cc1d7015e87a31645bc85d87b228584 (patch) | |
| tree | 06db55174814a884b3bde99c018ff26d2923dc59 | |
| parent | 4522417763213a44d4c72da97a0c8380ee68799f (diff) | |
Revert "e-wm: introduce E17_DEFAULT_CONFIG to remove e-wm-config-default from RRECOMMENDS if needed"
* This reverts commit 22e3772f799948bf4a7806e74d83948ee2b2e1f4.
* e-wm-config-default is still needed to show 1st time wizard (selecting
which config to use)
* sorry I should have tried after removing ~/.e (I thought I did)
| -rw-r--r-- | conf/distro/shr.conf | 1 | ||||
| -rw-r--r-- | recipes/e17/e-wm_svn.bb | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index 460e433c69..1191d8c88c 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -99,7 +99,6 @@ IPKG_VARIANT = "opkg" #Illume settings ILLUME_CONFIG = "e-wm-config-illume2-shr" -E17_DEFAULT_CONFIG = "e-wm-config-illume2-shr" ILLUME_THEME = "e-wm-theme-illume-gry" # From minimal.conf diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index 99b10d23f7..4871e3bba4 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -3,11 +3,9 @@ DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" SRCNAME = "e" PV = "0.16.999.060+svnr${SRCPV}" -PR = "r15" +PR = "r16" SRCREV = "${EFL_SRCREV}" -E17_DEFAULT_CONFIG ?= "${PN}-config-default" - inherit e update-alternatives SRC_URI += "\ @@ -85,7 +83,7 @@ PACKAGES =+ "\ " RRECOMMENDS_${PN} = "\ - ${E17_DEFAULT_CONFIG} \ + ${PN}-config-default \ ${PN}-images \ ${PN}-icons \ ${PN}-other \ |