diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-11 17:39:50 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-11 17:39:50 +0000 |
| commit | 7f50547bf299c6225f7fd40ed1cba12a358292c3 (patch) | |
| tree | f30bc66d576b7ed69742185a27f56725ad1dde30 /packages/meta | |
| parent | 47e5b54056f7be35302769d443285c99f728d744 (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/05/11 19:23:46+02:00 utwente.nl!koen
matchbox-session:
remove gpe-appmgr for the time being
2005/05/11 19:22:21+02:00 utwente.nl!koen
meta-sectest-gpe.bb, meta-gpe.bb, gpe-image.bb:
remove gpe-appmgr for the time being
2005/05/11 19:10:15+02:00 utwente.nl!koen
gpe-conf_0.1.23.bb: < florian_kc> koen: i must have been drunk... please fix this.
BKrev: 42824366SwYYjGDmKQ-B9cfACDk_IQ
Diffstat (limited to 'packages/meta')
| -rw-r--r-- | packages/meta/gpe-image.bb | 8 | ||||
| -rw-r--r-- | packages/meta/meta-gpe.bb | 2 | ||||
| -rw-r--r-- | packages/meta/meta-sectest-gpe.bb | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/packages/meta/gpe-image.bb b/packages/meta/gpe-image.bb index 640da98937..59f4ad9a24 100644 --- a/packages/meta/gpe-image.bb +++ b/packages/meta/gpe-image.bb @@ -18,14 +18,14 @@ GPE_EXTRA_THEMES = "gtk-theme-industrial matchbox-themes-extra-industrial" #GPE_EXTRA_DEPENDS_bigscreen = "firefox linphone" #GPE_EXTRA_INSTALL_bigscreen = "firefox linphone" GPE_EXTRA_DEPENDS_bigscreen = "minimo figment" -GPE_EXTRA_INSTALL_bigscreen = "minimo figment gpe-task-games ${GPE_EXTRA_THEMES} gpe-appmgr" +GPE_EXTRA_INSTALL_bigscreen = "minimo figment gpe-task-games ${GPE_EXTRA_THEMES}" GPE_EXTRA_DEPENDS_smallscreen = "minimo figment linphone-hh" GPE_EXTRA_INSTALL_smallscreen = "minimo figment linphone-hh gpe-task-games ${GPE_EXTRA_THEMES}" #h3900 has 32mb of *useable* flash -GPE_EXTRA_DEPENDS_append_h3900 = " vlc-gpe " -GPE_EXTRA_INSTALL_append_h3900 = " vlc-gpe " +#GPE_EXTRA_DEPENDS_append_h3900 = " vlc-gpe " +#GPE_EXTRA_INSTALL_append_h3900 = " vlc-gpe " GPE_EXTRA_DEPENDS_none = "" GPE_EXTRA_INSTALL_none = "" @@ -42,7 +42,7 @@ export IPKG_INSTALL = "task-bootstrap gpe-task-base \ ${XSERVER} \ ${GPE_EXTRA_INSTALL}" -ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " +#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; " inherit image_ipk LICENSE = MIT diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index e3abaedb3b..4c8e6decba 100644 --- a/packages/meta/meta-gpe.bb +++ b/packages/meta/meta-gpe.bb @@ -101,6 +101,6 @@ gpe-task-games = "\ RDEPENDS_gpe-task-games := "${gpe-task-games}" DEPENDS += " ${gpe-task-games}" -DEPENDS += "gpe-appmgr matchbox-themes-extra" +DEPENDS += "matchbox-themes-extra" LICENSE = MIT diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb index ba09c0249e..dd393fc50b 100644 --- a/packages/meta/meta-sectest-gpe.bb +++ b/packages/meta/meta-sectest-gpe.bb @@ -31,7 +31,6 @@ gpe-task-base = "\ gpe-autostarter \ gpe-bootsplash \ libgtkstylus \ - gpe-appmgr \ detect-stylus" RDEPENDS_gpe-task-base := "gdk-pixbuf-loader-png \ @@ -83,7 +82,8 @@ sectest-task-apps = "\ dsniff \ prismstumbler \ tcpdump \ - miniclipboard" + kismet \ + miniclipboard" RDEPENDS_sectest-task-apps := "${sectest-task-apps}" DEPENDS += " ${sectest-task-apps}" |