summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/images/fso-console-image.bb11
-rw-r--r--packages/images/fso-image.bb77
-rw-r--r--packages/python/python-fugrep_0.50.bb11
-rw-r--r--packages/tasks/task-cli-tools.bb10
-rw-r--r--packages/tasks/task-python-everything.bb3
5 files changed, 46 insertions, 66 deletions
diff --git a/packages/images/fso-console-image.bb b/packages/images/fso-console-image.bb
index 2c168b7e19..04d9d23afc 100644
--- a/packages/images/fso-console-image.bb
+++ b/packages/images/fso-console-image.bb
@@ -1,13 +1,12 @@
#------------------------------------------------------
-# freesmartphone.org Console Image Recipe
+# FSO compliant Console Image Recipe
#------------------------------------------------------
require fso-image.bb
IMAGE_INSTALL = "\
- ${BASE_INSTALL} \
- ${AUDIO_INSTALL} \
- ${TOOLS_INSTALL} \
- ${PYTHON_INSTALL} \
- frameworkd \
+ task-base \
+ task-fso-compliance \
+ task-cli-tools \
+ task-cli-tools-python \
"
diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index f9d7312431..d67bd620d3 100644
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -2,70 +2,32 @@
# freesmartphone.org Image Recipe
#------------------------------------------------------
+PV = "1.0"
+PR = "r1"
+
+# no languages for now
IMAGE_LINGUAS = ""
-# getting the base system up
BASE_INSTALL = "\
- ${MACHINE_TASK_PROVIDER} \
- netbase \
- sysfsutils \
- module-init-tools-depmod \
- rsync \
- screen \
- fbset \
- fbset-modes \
+ task-base \
"
-# Some machines don't set a *runtime* provider for X, so default to Xfbdev here
-# virtual/xserver won't work, since the kdrive recipes will build multiple xserver packages
-XSERVER ?= "xserver-kdrive-fbdev"
+ILLUME_THEME = "illume-theme-fso"
-# getting an X window system up
X_INSTALL = "\
- e-wm \
- illume \
- illume-config-illume \
- illume-dicts-english-us \
- illume-keyboards-default \
- illume-keyboards-numbers \
- illume-keyboards-terminal \
- illume-theme-freesmartphone \
- ${XSERVER} \
- xserver-kdrive-common \
- xserver-nodm-init \
- xauth \
- xhost \
- xset \
- xrandr \
- \
- fontconfig-utils \
- \
- ttf-dejavu-common \
- ttf-dejavu-sans \
- ttf-dejavu-serif \
- \
+ task-x11-illume \
+ task-fonts-truetype-core \
"
X_INSTALL_append_om-gta02 = "\
- ttf-arphic-uming \
- \
+ task-fonts-truetype-chinese \
+ task-fonts-truetype-japanese \
"
-# useful command line tools
+# tools
TOOLS_INSTALL = "\
-# bash \
- dosfstools \
- htop \
- iptables \
- lsof \
- mickeydbus \
- mickeyterm \
- mtd-utils \
- nano \
- powertop \
- s3c24xx-gpio \
- sysstat \
- tcpdump \
+ task-cli-tools \
+ task-cli-tools-python \
"
# audio
@@ -82,6 +44,7 @@ AUDIO_INSTALL = "\
GTK_INSTALL = "\
openmoko-calculator2 \
+ xterm \
openmoko-terminal2 \
gpe-scap \
tangogps \
@@ -107,11 +70,9 @@ PYTHON_INSTALL = "\
python-gst \
"
-# zhone
+# fso+zhone
ZHONE_INSTALL = "\
- gsm0710muxd \
- frameworkd \
- fso-gpsd \
+ task-fso-compliance \
zhone \
"
@@ -139,7 +100,7 @@ IMAGE_INSTALL = "\
inherit image
-# perform some convenience tweaks to the rootfs
+# perform some convenience tweaks to the rootfs to improve the out-of-the-box experience :M:
fso_rootfs_postprocess() {
curdir=$PWD
cd ${IMAGE_ROOTFS}
@@ -164,6 +125,10 @@ fso_rootfs_postprocess() {
echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc
# fix strange iconv/gconf bug
ln -s libc.so.6 ./lib/libc.so
+ # set sensible DNS entries
+ echo "nameserver 208.67.222.222" > ./etc/resolv.conf
+ echo "nameserver 208.67.220.220" >> ./etc/resolv.conf
+ # back on track
cd $curdir
}
diff --git a/packages/python/python-fugrep_0.50.bb b/packages/python/python-fugrep_0.50.bb
new file mode 100644
index 0000000000..150cb84130
--- /dev/null
+++ b/packages/python/python-fugrep_0.50.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "FuGrep is a Python library for fuzzy pattern matching."
+HOMEPAGE = "http://www.j-raedler.de/pages/software/fugrep.php"
+SECTION = "devel/python"
+LICENSE = "${PN}"
+SRCNAME = "FuGrep"
+PR = "ml0"
+
+SRC_URI = "http://www.j-raedler.de/media/Software/FuGrep-${PV}.zip"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
diff --git a/packages/tasks/task-cli-tools.bb b/packages/tasks/task-cli-tools.bb
index 8bc4b83211..e69c2924a2 100644
--- a/packages/tasks/task-cli-tools.bb
+++ b/packages/tasks/task-cli-tools.bb
@@ -2,17 +2,17 @@ DESCRIPTION = "A set of command line tools"
SECTION = "console"
LICENSE = "MIT"
PV = "1.0"
-PR = "r0"
+PR = "r1"
inherit task
+PACKAGES += "${PN}-python"
+
RDEPENDS_${PN} = "\
dosfstools \
htop \
iptables \
lsof \
- mickeydbus \
- mickeyterm \
mtd-utils \
nano \
powertop \
@@ -27,3 +27,7 @@ RDEPENDS_${PN}_append_om-gta02 = "\
s3c24xx-gpio \
"
+RDEPENDS_${PN}-python = "\
+ mickeydbus \
+ mickeyterm \
+"
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index 5b0d4a1be6..02cecbf586 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
DESCRIPTION= "Everything Python"
HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
-PR = "ml35"
+PR = "ml36"
RDEPENDS = "\
python-ao \
@@ -16,6 +16,7 @@ RDEPENDS = "\
python-fnorb \
python-formencode \
python-fpconst \
+ python-fugrep \
python-fuse \
python-fusil \
python-gammu \