summaryrefslogtreecommitdiff
path: root/recipes/tasks
diff options
context:
space:
mode:
authorSergey Lapin <slapin@ossfans.org>2010-03-22 18:13:56 +0300
committerSergey Lapin <slapin@ossfans.org>2010-03-22 18:13:56 +0300
commit3937c88166a493900a694ea8fe53b860f4099d83 (patch)
tree57597245b6efd4cf27c1f4c9ff21c0515e530c15 /recipes/tasks
parentdf2ace6d59e22b42e50bcf4e8a9c92b580602c2e (diff)
parent3510d2ed15a4b477aa7af802a839e11a87b981ed (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/tasks')
-rw-r--r--recipes/tasks/angstrom-task-gnome.bb5
-rw-r--r--recipes/tasks/task-base.bb6
-rw-r--r--recipes/tasks/task-cli-tools-python.bb4
-rw-r--r--recipes/tasks/task-cli-tools.bb6
-rw-r--r--recipes/tasks/task-efl.bb4
-rw-r--r--recipes/tasks/task-fso2-compliance.bb24
-rw-r--r--recipes/tasks/task-gpe-desktopapps.bb5
-rw-r--r--recipes/tasks/task-gpe.bb5
-rw-r--r--recipes/tasks/task-mamona-base.bb4
-rw-r--r--recipes/tasks/task-nas-server.bb10
-rw-r--r--recipes/tasks/task-openmoko-feed.bb4
-rw-r--r--recipes/tasks/task-openprotium.bb4
-rw-r--r--recipes/tasks/task-proper-tools.bb3
-rw-r--r--recipes/tasks/task-python-efl-examples.bb4
-rw-r--r--recipes/tasks/task-python-efl.bb4
-rw-r--r--recipes/tasks/task-sdk-bare.bb10
-rw-r--r--recipes/tasks/task-shr-feed.bb23
-rw-r--r--recipes/tasks/task-shr-minimal.bb46
-rw-r--r--recipes/tasks/task-shr.bb14
-rw-r--r--recipes/tasks/task-slugos.bb6
-rw-r--r--recipes/tasks/task-x11.bb2
21 files changed, 91 insertions, 102 deletions
diff --git a/recipes/tasks/angstrom-task-gnome.bb b/recipes/tasks/angstrom-task-gnome.bb
index 1c54f374d8..29b6e2c100 100644
--- a/recipes/tasks/angstrom-task-gnome.bb
+++ b/recipes/tasks/angstrom-task-gnome.bb
@@ -12,7 +12,7 @@ XSERVER ?= "xserver-xorg \
xf86-input-keyboard \
"
-PR = "r5"
+PR = "r7"
PACKAGES += "task-gnome-apps task-gnome-fonts task-gnome task-gnome-gstreamer task-gnome-perl task-gnome-pulseaudio task-gnome-themes task-gnome-totem task-gnome-xserver-base task-gnome-xserver"
@@ -30,6 +30,7 @@ RDEPENDS_task-gnome-apps = " \
gimp \
gnome-games \
gnome-mplayer \
+ gecko-mediaplayer-firefox-hack \
gnumeric \
gphoto2 \
gthumb \
@@ -66,7 +67,7 @@ RDEPENDS_task-gnome = " \
gnome-bluetooth \
gnome-desktop \
gnome-doc-utils \
- gnome-keyring gnome-keyring-pam-plugin libpam-meta \
+ gnome-keyring gnome-keyring-pam-plugin libpam-meta pam-plugin-ck-connector \
gnome-media \
gnome-menus \
gnome-mime-data \
diff --git a/recipes/tasks/task-base.bb b/recipes/tasks/task-base.bb
index d59acba026..555a463635 100644
--- a/recipes/tasks/task-base.bb
+++ b/recipes/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r87"
+PR = "r89"
inherit task
@@ -136,7 +136,9 @@ python __anonymous () {
import bb
- if not hasattr(__builtins__, 'set'):
+ try:
+ set
+ except NameError:
from sets import Set as set
distro_features = set(bb.data.getVar("DISTRO_FEATURES", d, 1).split())
diff --git a/recipes/tasks/task-cli-tools-python.bb b/recipes/tasks/task-cli-tools-python.bb
index 7c75084dd0..7945b03a1f 100644
--- a/recipes/tasks/task-cli-tools-python.bb
+++ b/recipes/tasks/task-cli-tools-python.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "A set of python-based command line tools"
SECTION = "console"
LICENSE = "MIT"
PV = "1.0"
-PR = "r8"
+PR = "r10"
inherit task
RDEPENDS_${PN} = "\
- mickeydbus \
+ mdbus \
mickeyterm \
"
diff --git a/recipes/tasks/task-cli-tools.bb b/recipes/tasks/task-cli-tools.bb
index 9c5e8615e0..dfb79e7e98 100644
--- a/recipes/tasks/task-cli-tools.bb
+++ b/recipes/tasks/task-cli-tools.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A set of command line tools useful for debugging"
SECTION = "console"
LICENSE = "MIT"
PV = "1.0"
-PR = "r9"
+PR = "r13"
inherit task
@@ -13,7 +13,10 @@ RDEPENDS_${PN} = "\
htop \
iptables \
lsof \
+ mbuffer \
+ mdbus2 \
mtd-utils \
+ mterm2 \
nano \
nfs-utils-client \
powertop \
@@ -28,6 +31,7 @@ RDEPENDS_${PN}-debug = "\
evtest \
devmem2 \
i2c-tools \
+ gdb \
ltrace \
procps \
pxaregs \
diff --git a/recipes/tasks/task-efl.bb b/recipes/tasks/task-efl.bb
index 20c8954754..00236a4050 100644
--- a/recipes/tasks/task-efl.bb
+++ b/recipes/tasks/task-efl.bb
@@ -9,13 +9,11 @@ RDEPENDS = "\
edje \
emotion \
esmart \
- epsilon \
edbus \
efreet \
ewl \
- etk \
epdf \
"
-PR = "r0"
+PR = "r1"
ALLOW_EMPTY = "1"
diff --git a/recipes/tasks/task-fso2-compliance.bb b/recipes/tasks/task-fso2-compliance.bb
index de7d6c1281..3e064785d2 100644
--- a/recipes/tasks/task-fso2-compliance.bb
+++ b/recipes/tasks/task-fso2-compliance.bb
@@ -3,15 +3,11 @@ Install this task to make your distribution FSO 2.0-compliant."
SECTION = "fso/base"
LICENSE = "MIT"
PV = "1.9.0"
-PR = "r5"
+PR = "r7"
inherit task
RDEPENDS_${PN} = "\
- dbus-hlid \
-# TODO: remove when fso2 is finished
- frameworkd \
- \
libfsobasics \
libfsotransport \
libfsoframework \
@@ -21,31 +17,27 @@ RDEPENDS_${PN} = "\
fsodeviced \
fsogsmd \
fsotdld \
- fsomusicd \
+# fsomusicd \
fsonetworkd \
fsousaged \
\
- fso-alsa-data \
fso-apm \
- fso-gpsd \
-# fso-monitord \
- connman \
+# connman \
# connman-scripts \
- connman-plugin-bluetooth \
+# connman-plugin-bluetooth \
# connman-plugin-dhclient \
# connman-plugin-dnsproxy \
# connman-plugin-ethernet \
# connman-plugin-fake \
- connman-plugin-loopback \
- connman-plugin-pppd \
+# connman-plugin-loopback \
+# connman-plugin-pppd \
# connman-plugin-resolvconf \
- connman-plugin-udhcp \
- connman-plugin-wifi \
+# connman-plugin-udhcp \
+# connman-plugin-wifi \
# connman-test-utils \
"
RRECOMMENDS_${PN} = "\
- fso-abyss \
wmiconfig \
tzdata \
tzdata-africa \
diff --git a/recipes/tasks/task-gpe-desktopapps.bb b/recipes/tasks/task-gpe-desktopapps.bb
index 25c055f446..5b6f721e0a 100644
--- a/recipes/tasks/task-gpe-desktopapps.bb
+++ b/recipes/tasks/task-gpe-desktopapps.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Additional desktop applications package for GPE Palmtop Environment"
-PR = "r6"
+PR = "r7"
LICENSE = "MIT"
inherit task
@@ -9,6 +9,5 @@ RDEPENDS_${PN} = "\
firefox \
thunderbird \
galculator \
- gnumeric \
- gpdf"
+ gnumeric"
diff --git a/recipes/tasks/task-gpe.bb b/recipes/tasks/task-gpe.bb
index 0bf1325da0..785f0184b1 100644
--- a/recipes/tasks/task-gpe.bb
+++ b/recipes/tasks/task-gpe.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Task packages for GPE Palmtop Environment"
-PR = "r7"
+PR = "r8"
LICENSE = "MIT"
inherit task
@@ -120,8 +120,7 @@ RDEPENDS_gpe-task-desktopapps = "\
firefox \
thunderbird \
galculator \
- gnumeric \
- gpdf"
+ gnumeric"
# totem"
RDEPENDS_gpe-task-sectest = "\
diff --git a/recipes/tasks/task-mamona-base.bb b/recipes/tasks/task-mamona-base.bb
index c3f867fdec..29e88ff4fa 100644
--- a/recipes/tasks/task-mamona-base.bb
+++ b/recipes/tasks/task-mamona-base.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "task mamona base"
LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
ALLOW_EMPTY = "1"
PACKAGES = "${PN}"
@@ -16,7 +16,6 @@ RDEPENDS = "\
dpkg \
e2fsprogs \
e2fsprogs-badblocks \
- e2fsprogs-blkid \
e2fsprogs-uuidgen \
file \
gawk \
@@ -44,5 +43,6 @@ RDEPENDS = "\
util-linux-losetup \
util-linux-swaponoff \
util-linux-umount \
+ util-linux-ng-blkid \
zlib \
"
diff --git a/recipes/tasks/task-nas-server.bb b/recipes/tasks/task-nas-server.bb
index 6924ff5388..f190a86587 100644
--- a/recipes/tasks/task-nas-server.bb
+++ b/recipes/tasks/task-nas-server.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Tasks for a Network Attached Storage server"
LICENSE = "MIT"
PROVIDES = "task-nas-server-everything"
-PR = "r1"
+PR = "r2"
inherit task
@@ -15,7 +15,6 @@ NAS_SERVER_PACKAGES = "\
task-nas-server-samba \
task-nas-server-dnsmasq \
task-nas-server-iptables \
- task-nas-server-openmoko \
task-nas-server-tzdata \
task-nas-server-nfs \
task-nas-server-vfat \
@@ -56,13 +55,6 @@ RRECOMMENDS_task-nas-server-iptables = "\
kernel-module-ipt-masquerade \
"
-DESCRIPTION_task-nas-server-openmoko = "NAS-Server: Openmoko Support"
-RDEPENDS_task-nas-server-openmoko = "\
- dfu-util \
-"
-RRECOMMENDS_task-nas-server-openmoko = "\
-"
-
DESCRIPTION_task-nas-server-tzdata = "NAS-Server: Timezone Support"
RDEPENDS_task-nas-server-tzdata = "\
tzdata \
diff --git a/recipes/tasks/task-openmoko-feed.bb b/recipes/tasks/task-openmoko-feed.bb
index 670af8eafe..9c7d8c5fd9 100644
--- a/recipes/tasks/task-openmoko-feed.bb
+++ b/recipes/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Openmoko: Misc. Feed Items"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r61"
+PR = "r62"
inherit task
@@ -13,7 +13,7 @@ RDEPENDS_task-openmoko-feed = "\
ppp \
bluez-hcidump \
bootchart \
- eet evas ecore embryo epsilon edje efreet emotion epdf \
+ eet evas ecore embryo edje efreet emotion epdf \
exhibit edje-viewer \
free42-vga \
gpe-filemanager gpe-gallery gpe-timesheet gpe-todo gpe-contacts \
diff --git a/recipes/tasks/task-openprotium.bb b/recipes/tasks/task-openprotium.bb
index a8e7bd7766..4a8e1e45ad 100644
--- a/recipes/tasks/task-openprotium.bb
+++ b/recipes/tasks/task-openprotium.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Basic image for openprotium"
HOMEPAGE = "http://www.openprotium.org"
ALLOW_EMPTY = "1"
-PR = "r1"
+PR = "r2"
inherit task
@@ -35,7 +35,7 @@ RDEPENDS = " kernel \
modutils-initscripts \
ipkg-collateral ipkg ipkg-link \
portmap \
- e2fsprogs-blkid \
+ util-linux-ng-blkid \
mdadm \
hdparm \
mtd-utils \
diff --git a/recipes/tasks/task-proper-tools.bb b/recipes/tasks/task-proper-tools.bb
index 056109ef86..e693c10cc6 100644
--- a/recipes/tasks/task-proper-tools.bb
+++ b/recipes/tasks/task-proper-tools.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Full versions of tools provided by busybox"
-PR = "r10"
+PR = "r11"
inherit task
@@ -10,7 +10,6 @@ RDEPENDS_${PN} = "\
debianutils \
diffutils \
e2fsprogs \
- e2fsprogs-fsck \
fbset \
findutils \
gawk \
diff --git a/recipes/tasks/task-python-efl-examples.bb b/recipes/tasks/task-python-efl-examples.bb
index 34efbeab6b..d882ceccc4 100644
--- a/recipes/tasks/task-python-efl-examples.bb
+++ b/recipes/tasks/task-python-efl-examples.bb
@@ -6,10 +6,8 @@ RDEPENDS = "\
python-ecore-examples \
python-emotion-examples \
python-edje-examples \
- python-etk-examples \
- python-epsilon-examples \
python-math python-textutils \
"
-PR = "ml4"
+PR = "ml4.1"
ALLOW_EMPTY = "1"
diff --git a/recipes/tasks/task-python-efl.bb b/recipes/tasks/task-python-efl.bb
index 70c1adfebd..79d50c7a16 100644
--- a/recipes/tasks/task-python-efl.bb
+++ b/recipes/tasks/task-python-efl.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Python Bindings to the Enlightenment Foundation Libraries"
LICENSE = "MIT"
SECTION = "devel/python"
-PR = "ml4"
+PR = "ml4.1"
ALLOW_EMPTY = "1"
@@ -11,8 +11,6 @@ RDEPENDS = "\
python-edje \
python-elementary \
python-emotion \
- python-etk \
- python-epsilon \
python-edbus \
"
diff --git a/recipes/tasks/task-sdk-bare.bb b/recipes/tasks/task-sdk-bare.bb
index f86cc9d81d..5a43fed9b0 100644
--- a/recipes/tasks/task-sdk-bare.bb
+++ b/recipes/tasks/task-sdk-bare.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Packages for a standalone SDK or external toolchain"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
-
+PR = "r1"
PACKAGES = "${PN}"
@@ -12,13 +12,7 @@ GLIBC_PKGS = "\
glibc-utils \
libsegfault \
glibc-thread-db \
- glibc-localedata-i18n \
- glibc-gconv-ibm850 \
- glibc-gconv-cp1252 \
- glibc-gconv-iso8859-1 \
- glibc-gconv-iso8859-15 \
- locale-base-en-gb \
- "
+"
LIBC_PKGS_linux = "${GLIBC_PKGS}"
LIBC_PKGS_linux-gnueabi = "${GLIBC_PKGS}"
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 3cc551b189..eba0fb6492 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "SHR Feed"
-PR = "r35"
+PR = "r49"
PV = "1.0"
LICENSE = "GPL"
@@ -7,6 +7,7 @@ inherit task
RDEPENDS_${PN} += "\
babiloo-efl \
+ bootchart-lite \
claws-mail \
claws-plugin-mailmbox \
# claws-plugin-gtkhtml2-viewer \
@@ -16,6 +17,8 @@ RDEPENDS_${PN} += "\
dosbox \
enotes \
epdfview \
+ estardict \
+ evopedia \
fbreader \
ffalarms \
gpe-calendar \
@@ -28,21 +31,22 @@ RDEPENDS_${PN} += "\
gpe-contacts \
gtkmm \
guitartune \
+ jefliks \
mc \
+ mpd \
mplayer \
navit \
- omview \
orrery \
python-elementary \
pythm \
python-wifi \
- omoney \
openmoko-agpsui \
openvpn \
pyphonelog \
# shr-config \
shr-today \
shr-theme-neo \
+ shr-theme-o2 \
shr-theme-niebiee \
shr-theme-sixteen \
# gry should be in image already
@@ -60,7 +64,6 @@ RDEPENDS_${PN} += "\
python-pygame \
mokoko \
# exhibit \
- edje-viewer \
obexpush \
obexftp \
obex-data-server \
@@ -132,7 +135,6 @@ RDEPENDS_${PN} += "\
# gpsdrive \
wxwidgets \
x11vnc \
- xf86-video-glamo \
# libswt3.4-gtk-java \
cacao \
# jamvm \
@@ -205,6 +207,8 @@ RDEPENDS_${PN} += "\
fsousaged \
fsodeviced \
fsonetworkd \
+ mdbus \
+ mickeyterm \
opimd-utils \
omgps \
shr-launcher \
@@ -222,6 +226,7 @@ RDEPENDS_${PN} += "\
illume-keyboard-german \
illume-keyboard-hebrew \
illume-keyboard-numeric-alt \
+ illume-keyboard-default-numeric \
illume-keyboard-russian \
illume-keyboard-russian-terminal \
python-xlib \
@@ -232,14 +237,13 @@ RDEPENDS_${PN} += "\
om-neon \
ipython \
# phoneme-advanced-foundation \
- eve \
+# eve was killed in svnr45979
python-pybluez \
x11perf \
pyring \
bt-configure \
bt-gps \
advancedcaching \
- glamo-dri-tests \
bonnie++ \
reiserfsprogs \
blipomoko \
@@ -274,4 +278,9 @@ RDEPENDS_${PN} += "\
ventura \
emtooth \
podboy \
+ mcnavi \
+ neolight \
"
+
+# this is only usefull on gta02 and on other devices it's trying to pull mesa-dri (not respecting DEFAULT_PROVIDER for virtual/libgl)
+RDEPENDS_${PN}_append_om-gta02 = "glamo-dri-tests"
diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb
index 8538391df3..097129292e 100644
--- a/recipes/tasks/task-shr-minimal.bb
+++ b/recipes/tasks/task-shr-minimal.bb
@@ -1,10 +1,12 @@
DESCRIPTION = "SHR Lite Image Feed"
-PR = "r20"
+PR = "r28"
PV = "2.0"
LICENSE = "GPL"
inherit task
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
def get_rdepends(bb, d):
enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1)
@@ -63,15 +65,16 @@ PACKAGES += "\
RDEPENDS_${PN}-base = "\
+ ${MACHINE_TASK_PROVIDER} \
+ task-base \
+ glibc-utils \
+ glibc-charmap-utf-8 \
netbase \
sysfsutils \
modutils-initscripts \
module-init-tools-depmod \
- rsync \
- screen \
fbset \
fbset-modes \
- openssh-sftp-server \
cron \
logrotate\
util-linux-ng-fdisk \
@@ -79,13 +82,8 @@ RDEPENDS_${PN}-base = "\
"
RDEPENDS_${PN}-cli = "\
- screen \
nano \
- iptables \
mtd-utils \
- s3c24xx-gpio \
- mickeydbus \
- mickeyterm \
"
RDEPENDS_${PN}-fso = "\
@@ -98,38 +96,38 @@ RDEPENDS_${PN}-fso = "\
#FIXME: libcanberra-alsa should be pulled in by fsodeviced but isn't
RDEPENDS_${PN}-audio = "\
+ alsa-utils-alsactl \
+ alsa-utils-alsamixer \
alsa-utils-aplay \
alsa-utils-amixer \
libcanberra-alsa \
"
-RDEPENDS_${PN}-audio_append_om-gta01 = "\
- alsa-scenarii-shr \
-"
-
-RDEPENDS_${PN}-audio_append_om-gta02 = "\
- alsa-scenarii-shr \
-"
-
RDEPENDS_${PN}-x = "\
- glibc-utils \
- glibc-charmap-utf-8 \
+ task-x11-illume \
+ task-fonts-truetype-core \
e-wm-menu-shr \
shr-wizard \
shr-theme-gry \
- etk-theme-shr \
- ${@get_rdepends(bb, d)} \
- libx11-locale \
- libmokoui2 \
xcursor-transparent-theme \
xinput-calibrator \
+# Needed for proper input support in efl based apps
+ libx11-locale \
+# All localedata based on IMAGE_LINGUAS
+ ${@get_rdepends(bb, d)} \
+# Make sure it's available for those who want's to play with illume2
+ e-wm-config-illume2-shr \
"
RDEPENDS_${PN}-apps = "\
+# because of new opimd doesn't support SIM contacts itself
+ pisi \
fso-abyss \
+ task-fso2-compliance \
phoneui-apps-messages \
phoneui-apps-contacts \
phoneui-apps-dialer \
+ phoneui-apps-quick-settings \
phonefsod \
phoneuid \
libphone-ui \
@@ -142,10 +140,8 @@ RDEPENDS_${PN}-apps = "\
RDEPENDS_${PN}-gtk = "\
- openmoko-icon-theme-standard2 \
shr-theme-gtk-e17lookalike \
vala-terminal \
- tangogps \
pyphonelog \
matchbox-keyboard-im \
"
diff --git a/recipes/tasks/task-shr.bb b/recipes/tasks/task-shr.bb
index 25e1b170c3..dfa5c7cafb 100644
--- a/recipes/tasks/task-shr.bb
+++ b/recipes/tasks/task-shr.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "SHR Fat Image Feed"
-PR = "r3"
+PR = "r7"
PV = "2.0"
LICENSE = "GPL"
@@ -9,6 +9,7 @@ PACKAGES = "\
${PN}-gtk \
${PN}-apps \
${PN}-games \
+ ${PN}-cli \
"
RDEPENDS_${PN}-gtk = "\
@@ -17,6 +18,7 @@ RDEPENDS_${PN}-gtk = "\
libpurple-protocol-msn \
libpurple-protocol-icq \
vagalume \
+ tangogps \
gpe-sketchbook \
"
@@ -24,12 +26,18 @@ RDEPENDS_${PN}-apps += "\
task-shr-minimal-apps \
opimd-utils-notes \
mokonnect \
- midori \
+ ventura \
intone \
"
+RDEPENDS_${PN}-cli += "\
+ task-cli-tools \
+ task-cli-tools-debug \
+ task-shr-minimal-cli \
+ rsync \
+ openssh-sftp-server \
+"
RDEPENDS_${PN}-games += "\
mokomaze \
numptyphysics \
"
-
diff --git a/recipes/tasks/task-slugos.bb b/recipes/tasks/task-slugos.bb
index 8ed43b1983..0ebf149480 100644
--- a/recipes/tasks/task-slugos.bb
+++ b/recipes/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r24"
+PR = "r25"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(nslu2|ixp4xx|sheevaplug)"
ALLOW_EMPTY = "1"
@@ -34,10 +34,10 @@ cpio \
# file system.
SLUGOS_STANDARD_RRECOMMENDS += "\
e2fsprogs-mke2fs \
-e2fsprogs-fsck \
+util-linux-ng-fsck \
e2fsprogs-e2fsck \
e2fsprogs-badblocks \
-e2fsprogs-blkid \
+util-linux-ng-blkid \
"
# Filesystem selection. Adding entries here adds the module to the
diff --git a/recipes/tasks/task-x11.bb b/recipes/tasks/task-x11.bb
index 1a50461352..db45ab9380 100644
--- a/recipes/tasks/task-x11.bb
+++ b/recipes/tasks/task-x11.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The X Window System -- install this task to get a client/server b
SECTION = "x11/server"
LICENSE = "MIT"
PV = "1.0"
-PR = "r2"
+PR = "r3"
# WORK IN PROGRESS