diff options
| author | Philip Balister <philip@balister.org> | 2009-02-13 14:12:54 -0500 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2009-02-13 14:12:54 -0500 |
| commit | 18992093169e9ebd2a61989b853986a77199be35 (patch) | |
| tree | d08928e78b95ea9dcbd7a4f5a193b18e197e8a8d /packages/images | |
| parent | 36001a65d7eb5f4432b999d24c29501834a3b431 (diff) | |
| parent | 97b340db7c7b9ee3ed53e02eaa63c9873f4e1610 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/images')
| -rw-r--r-- | packages/images/fso-image.bb | 8 | ||||
| -rw-r--r-- | packages/images/x11-gpe-image.bb | 1 | ||||
| -rw-r--r-- | packages/images/x11-gpe-java-image.bb | 1 | ||||
| -rw-r--r-- | packages/images/x11-office-image.bb | 1 | ||||
| -rw-r--r-- | packages/images/x11-pimlico-image.bb | 1 |
5 files changed, 5 insertions, 7 deletions
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index 4ed41b5e8d..4e3bfee64e 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -3,7 +3,7 @@ #------------------------------------------------------ PV = "1.1" -PR = "r3" +PR = "r4" # no languages for now IMAGE_LINGUAS = "" @@ -80,11 +80,11 @@ ZHONE_INSTALL = "\ # additional apps APPS_INSTALL = "\ -# tichy \ + paroli \ gpe-gallery \ gpe-sketchbook \ gpe-filemanager \ - vagalume \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'vagalume', d)} \ starling \ " @@ -112,6 +112,8 @@ fso_rootfs_postprocess() { echo "alias pico=nano" >>./etc/profile echo "alias fso='cd /local/pkg/fso'" >>./etc/profile echo "alias ipkg='opkg'" >>./etc/profile + echo "alias vim=vi" >>./etc/profile + echo "alias ll='ls -al'" >>./etc/profile # nfs mkdir -p ./local/pkg echo >>./etc/fstab diff --git a/packages/images/x11-gpe-image.bb b/packages/images/x11-gpe-image.bb index 86f4cd838c..7b272f60a1 100644 --- a/packages/images/x11-gpe-image.bb +++ b/packages/images/x11-gpe-image.bb @@ -1,7 +1,6 @@ #Angstrom X11 image, with apps and kernel modules included ANGSTROM_EXTRA_INSTALL += " \ - ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ " XSERVER ?= "xserver-kdrive-fbdev" diff --git a/packages/images/x11-gpe-java-image.bb b/packages/images/x11-gpe-java-image.bb index 72b04ec2bc..fcc022c7a0 100644 --- a/packages/images/x11-gpe-java-image.bb +++ b/packages/images/x11-gpe-java-image.bb @@ -1,7 +1,6 @@ #Angstrom X11 image, with apps and kernel modules included ANGSTROM_EXTRA_INSTALL += " \ - ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ " XSERVER ?= "xserver-kdrive-fbdev" diff --git a/packages/images/x11-office-image.bb b/packages/images/x11-office-image.bb index 47a8fae71f..48799d8998 100644 --- a/packages/images/x11-office-image.bb +++ b/packages/images/x11-office-image.bb @@ -1,7 +1,6 @@ #Angstrom X11 image, with apps and kernel modules included ANGSTROM_EXTRA_INSTALL += " \ - ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ " XSERVER ?= "xserver-kdrive-fbdev" diff --git a/packages/images/x11-pimlico-image.bb b/packages/images/x11-pimlico-image.bb index 3c93bfbd1b..79dcacce6e 100644 --- a/packages/images/x11-pimlico-image.bb +++ b/packages/images/x11-pimlico-image.bb @@ -1,7 +1,6 @@ #Angstrom X11 image, with apps and kernel modules included ANGSTROM_EXTRA_INSTALL += " \ - ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ " XSERVER ?= "xserver-kdrive-fbdev" |