merge of 3af6af596405ee2d8df8c79397157adaf28023b3

     and 96b18d585efe43c8bffa43523fa2b70496cc94fb

20 files changed, 223 insertions, 43 deletions

diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index b438ca61b4..7f218f2e79 100644
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -73,7 +73,7 @@ do_stage_append () {
 	fi
 }
 
-PACKAGES = "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples"
+PACKAGES += "${SRCNAME} ${SRCNAME}-themes ${SRCNAME}-dev ${SRCNAME}-examples"
 FILES_${SRCNAME} = "${libdir}/lib*.so*"
 FILES_${SRCNAME}-themes = "${datadir}/${SRCNAME}/themes ${datadir}/${SRCNAME}/data ${datadir}/${SRCNAME}/fonts ${datadir}/${SRCNAME}/pointers ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/users ${datadir}/${SRCNAME}/images ${datadir}/${SRCNAME}/styles"
 FILES_${SRCNAME}-dev += "${bindir}/${SRCNAME}-config ${libdir}/pkgconfig ${libdir}/lib*.?a ${datadir}/${SRCNAME}/include"
diff --git a/conf/distro/preferred-e-versions.inc b/conf/distro/preferred-e-versions.inc
index e4571f1ae6..f59d32ba1c 100644
--- a/conf/distro/preferred-e-versions.inc
+++ b/conf/distro/preferred-e-versions.inc
@@ -25,3 +25,7 @@ PREFERRED_VERSION_imlib2-x11 = "1.2.1.010"
 PREFERRED_VERSION_imlib2-native = "1.2.1.010"
 PREFERRED_VERSION_e-wm = "0.16.999.023"
 PREFERRED_VERSION_entrance = "0.9.0.005"
+
+PREFERRED_PROVIDER_virtual/evas = "evas-x11"
+PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
+PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
diff --git a/conf/machine/ep93xx.conf b/conf/machine/ep93xx.conf
index 3aac1aad74..f68e3dd36c 100644
--- a/conf/machine/ep93xx.conf
+++ b/conf/machine/ep93xx.conf
@@ -2,8 +2,9 @@
 #@Name: Cirrus Logic EP-93xx Development Platform
 #@DESCRIPTION: Machine configuration for Cirrus Logic EP-93xx Development Platform
 
-TARGET_ARCH = "arm"
+INHERIT += "linux_modules"
 
+TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv5te ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
diff --git a/conf/machine/include/tune-ep9312.conf b/conf/machine/include/tune-ep9312.conf
new file mode 100644
index 0000000000..f7a6fb845b
--- /dev/null
+++ b/conf/machine/include/tune-ep9312.conf
@@ -0,0 +1,6 @@
+TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312"
+# add "-mfp=maverick" for newer gcc versions > 4.0
+
+#set arch to ep9312 for all generated packages
+PACKAGE_ARCH = "ep9312"
+
diff --git a/packages/e17/e17-gpe-menu-convert/.mtn2git_empty b/packages/e17/e17-gpe-menu-convert/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/e17/e17-gpe-menu-convert/.mtn2git_empty
diff --git a/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh
new file mode 100644
index 0000000000..cf144272ec
--- /dev/null
+++ b/packages/e17/e17-gpe-menu-convert/e17-gpe-menu-convert.sh
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+setVar() {
+    if [ ! "$value" = "" ]; then
+	    name=`echo "$name" | sed 'y:-\[\]:_____:'`
+	    value=`echo "$value" | sed 's:":\\\":g'`
+	    export $name="$value"
+    fi
+}
+
+#convert true/false to 1/0
+bool() {
+    if [ ! "$1" = "" ]; then
+	if [ "$1" = "True" ]; then
+	    cmd="$cmd $2 1"
+	else
+	    cmd="$cmd $2 0"
+	fi
+    fi
+}
+
+str() {
+    if [ ! "$1" = "" ]; then
+	cmd="$cmd $2 \"$1"\"
+    fi
+}
+
+convert_desktop_to_eap() {
+    echo "Converting $1 to $2"
+    for l in `cat $1`; do
+        #on empty line clear vars
+	if [ "$l" = "" ]; then
+
+	    #grab previous var if it exists
+	    setVar
+
+	    name=""
+	    value=""
+	else
+	    #if an = is in the line it's a name/value pair
+	    if echo "$l" | grep -q "="; then
+
+	        #grab previous var if it exists
+		setVar
+
+		name=`echo "$l" | cut -d "=" -f 1`
+		value=`echo "$l" | cut -d "=" -f 2-`
+	    else
+
+	        #if previous value assume this is a continuation
+		if [ ! "$value" = "" ]; then
+		    value="$value $l"
+		fi
+	    fi
+	fi
+    done
+    setVar
+
+    cmd=""
+
+    #set up options
+    bool "$StartupNotify" -set-startup-notify
+    str "$Name" -set-name
+    str "$Comment" -set-comment
+    str "$Exec" -set-exe
+
+    if [ ! "$cmd" = "" ]; then
+        #cp ~/.e/e/applications/all/aterm.eap gpe-othello.eap
+        ##empty out eap file
+        ##enlightenment_eapp | grep -- -set- | cut -d " " -f 3 | xargs -iCMD enlightenment_eapp gpe-othello.eap CMD \"\"
+        #enlightenment_eapp gpe-othello.eap -del-all
+
+	cat <<EOF > /tmp/gpeEap.edc
+images {
+    image: "$Icon" COMP;
+}
+collections {
+    group {
+	name: "icon";
+	max: 48 48;
+	parts {
+	    part {
+		name: "image";
+		mouse_events: 0;
+		description {
+		    state: "default" 0.0;
+		    aspect: 1.0 1.0;
+		    image.normal: "$Icon";
+		}
+	    }
+	}
+    }
+}
+EOF
+
+	edje_cc --image_dir /usr/share/pixmaps /tmp/gpeEap.edc "$PATH_TO_EAP/$2"
+	rm /tmp/gpeEap.edc
+
+	cmd="enlightenment_eapp \"$PATH_TO_EAP/$2\" $cmd"
+
+        #pipe command in sh to allow it to re-interpret quotes
+	echo $cmd | /bin/sh -s
+
+	if `echo "$Categories" | grep -q "SystemSettings"`; then
+	    dir="Settings"
+	elif `echo "$Categories" | grep -q "PIM"`; then
+	    dir="PIM"
+	elif `echo "$Categories" | grep -q "Network"`; then
+	    dir="Network"
+	elif `echo "$Categories" | grep -q "Games"`; then
+	    dir="Games"
+	elif `echo "$Categories" | grep -q "Game"`; then
+	    dir="Games"
+	elif `echo "$Categories" | grep -q "AudioVideo"`; then
+	    dir="Multimedia"
+	elif `echo "$Categories" | grep -q "Panel"`; then
+	    dir="Utility/Panel"
+	elif `echo "$Categories" | grep -q "Utility"`; then
+	    dir="Utlity"
+	else
+	    dir=""
+	fi
+
+	#dir=`echo "$Categories" | sed 'y:;:/:'`
+	mkdir -p "$PATH_TO_E_GPE/$dir"
+	echo "$2" >> "$PATH_TO_E_GPE/$dir"/.order
+    fi
+}
+
+PATH_TO_DESKTOP="${IMAGE_ROOTFS}/usr/share/applications"
+PATH_TO_EAP="${IMAGE_ROOTFS}/home/root/.e/e/applications/all"
+PATH_TO_E_GPE="${IMAGE_ROOTFS}/home/root/.e/e/applications/favorite/GPE"
+
+if [ ! -d $PATH_TO_E_GPE ]; then
+    mkdir -p $PATH_TO_E_GPE
+fi
+if [ ! -d $PATH_TO_EAP ]; then
+    mkdir -p $PATH_TO_EAP
+fi
+cd "$PATH_TO_DESKTOP"
+for f in `ls *.desktop`; do
+    eap=`echo "$f" | cut -d . -f 1`
+    convert_desktop_to_eap "$PATH_TO_DESKTOP/$f" "$eap.eap"
+done
diff --git a/packages/e17/e17-gpe-menu-convert_0.2.bb b/packages/e17/e17-gpe-menu-convert_0.2.bb
new file mode 100644
index 0000000000..b83cba6209
--- /dev/null
+++ b/packages/e17/e17-gpe-menu-convert_0.2.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Shell script to convert GPE .desktop files into e17 eap files and menus"
+DEPENDS = "edje e-wm"
+RDEPENDS += "edje-utils e-wm"
+LICENSE = "MIT"
+SECTION = "e/apps"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+PR = "r0"
+
+SRC_URI = "file://e17-gpe-menu-convert.sh"
+
+do_install() {
+	install -d ${D}/usr/bin/
+	install -m 755 ${WORKDIR}/e17-gpe-menu-convert.sh ${D}/usr/bin/e17-gpe-menu-convert.sh
+}
+
+pkg_postinst() {
+	/usr/bin/e17-gpe-menu-convert.sh 2>&1 > /tmp/gpe-menu-convert.log
+}
\ No newline at end of file
diff --git a/packages/efl/edb_1.0.5.005.bb b/packages/efl/edb_1.0.5.005.bb
index 30c14d3d58..620b39d301 100644
--- a/packages/efl/edb_1.0.5.005.bb
+++ b/packages/efl/edb_1.0.5.005.bb
@@ -2,13 +2,14 @@ DESCRIPTION = "EDB is a database convenience library wrapped around the \
 Berkeley DB 2.7.7 by Sleepycat Software."
 DEPENDS = "zlib ncurses"
 LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
+
+PACKAGES = "edb-utils"
+FILES_edb-utils = "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed"
+RDEPENDS_edb-utils += "ncurses"
 
 inherit efl
 
 EXTRA_OECONF += "--disable-gtk"
 
 libdirectory = "src"
-
-FILES_${PN}-dev += "${bindir}/edb_ed ${bindir}/edb_vt_ed ${bindir}/edb_gtk_ed"
-RDEPENDS_${PN}-dev += "ncurses"
\ No newline at end of file
diff --git a/packages/efl/edje_0.5.0.023.bb b/packages/efl/edje_0.5.0.023.bb
index 9315639af2..b0fbda0acb 100644
--- a/packages/efl/edje_0.5.0.023.bb
+++ b/packages/efl/edje_0.5.0.023.bb
@@ -2,18 +2,20 @@ DESCRIPTION = "Edje is a complex graphical design & layout library."
 # can also install vim data files
 DEPENDS = "virtual/evas virtual/ecore eet embryo edje-native virtual/imlib2"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r4"
+
+PACKAGES = "edje-utils"
+FILES_edje-utils = "${bindir}/edje ${bindir}/edje_* ${datadir}/edje/data/template ${datadir}/edje/include"
+RDEPENDS_edje-utils += "embryo-utils cpp"
 
 inherit efl
 
+FILES_${SRCNAME}-themes = ""
+
 SRC_URI += "cvs://anonymous@thinktux.net/root;module=e17/libs/edje/m4;date=20060101"
 
 LEAD_SONAME = "libedje.so"
 
-FILES_${PN}-dev += "${bindir}"
-
-RDEPENDS_${PN}-dev += "cpp"
-
 do_configure_prepend() {
 	install -d "${S}/m4"
 	install "${WORKDIR}/m4/"*.m4 "${S}/m4"
diff --git a/packages/efl/embryo_0.9.1.023.bb b/packages/efl/embryo_0.9.1.023.bb
index 1802da1bca..f5582ef9c2 100644
--- a/packages/efl/embryo_0.9.1.023.bb
+++ b/packages/efl/embryo_0.9.1.023.bb
@@ -4,6 +4,9 @@ CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999. \
 Embryo allows scripting capabilities in places that otherwise wouldn't support \
 basic programming structures such as in Edje EDCs."
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
+
+PACKAGES = "embryo-utils"
+FILES_embryo-utils = "${bindir}/embryo ${bindir}/embryo_* ${datadir}/embryo/include"
 
 inherit efl
diff --git a/packages/gpe-soundserver/gpe-soundserver-0.4-1/makefile-breakage.patch b/packages/gpe-soundserver/gpe-soundserver-0.4-1/makefile-breakage.patch
index 915a003bb0..59bffac6c1 100644
--- a/packages/gpe-soundserver/gpe-soundserver-0.4-1/makefile-breakage.patch
+++ b/packages/gpe-soundserver/gpe-soundserver-0.4-1/makefile-breakage.patch
@@ -14,11 +14,11 @@
  
  $(PACKAGE): $(OBJS)
 -	$(CC) -o $@ $^ $(LDFLAGS)
-+	$(CC) -o $@ $^ $(PACKAGE_LDFLAGS)
++	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
  
  wrapesd: wrapesd.o
 -	$(CC) -o $@ $^ $(LDFLAGS)
-+	$(CC) -o $@ $^ $(PACKAGE_LDFLAGS)
++	$(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS)
  
  install-program: all
  	install -d $(DESTDIR)$(PREFIX)/bin
diff --git a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb
index d883ca9959..859166b576 100644
--- a/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb
+++ b/packages/gpe-soundserver/gpe-soundserver_0.4-1.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 SECTION = "gpe"
 inherit gpe
 
-DEPENDS = "diet-x11 esound-gpe"
+DEPENDS = "x11 esound-gpe"
 RDEPENDS_${PN} = "esd"
 
 SRC_URI += "file://makefile-breakage.patch;patch=1"
diff --git a/packages/linux/ep93xx-kernel/defconfig b/packages/linux/ep93xx-kernel/defconfig
index b92ad0f3cd..9487031705 100644
--- a/packages/linux/ep93xx-kernel/defconfig
+++ b/packages/linux/ep93xx-kernel/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.15
-# Thu Feb  9 00:37:45 2006
+# Thu Feb  9 20:06:27 2006
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -162,7 +162,7 @@ CONFIG_PCMCIA_IOCTL=y
 #
 # PC-card bridges
 #
-CONFIG_PCMCIA_EP93XX=y
+# CONFIG_PCMCIA_EP93XX is not set
 
 #
 # Kernel Features
@@ -561,9 +561,9 @@ CONFIG_BLK_DEV_IDESCSI=m
 #
 CONFIG_IDE_GENERIC=y
 CONFIG_BLK_DEV_EP93XX=y
-CONFIG_BLK_DEV_IDEDMA_EP93XX=y
+# CONFIG_BLK_DEV_IDEDMA_EP93XX is not set
 CONFIG_IDE_ARM=y
-CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_BLK_DEV_IDEDMA is not set
 # CONFIG_IDEDMA_AUTO is not set
 # CONFIG_BLK_DEV_HD is not set
 
@@ -819,7 +819,7 @@ CONFIG_LEGACY_PTY_COUNT=256
 #
 # CONFIG_WATCHDOG is not set
 # CONFIG_NVRAM is not set
-CONFIG_RTC=y
+# CONFIG_RTC is not set
 CONFIG_EP93XX_RTC=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
@@ -1016,7 +1016,6 @@ CONFIG_SND_PCM=m
 CONFIG_SND_OSSEMUL=y
 CONFIG_SND_MIXER_OSS=m
 CONFIG_SND_PCM_OSS=m
-CONFIG_SND_RTCTIMER=m
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
 CONFIG_SND_GENERIC_DRIVER=y
diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc
index 2fc6f58007..8403965269 100644
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-openzaurus.inc
@@ -6,7 +6,7 @@ PROVIDES = "virtual/kernel-hostap"
 RPROVIDES = "virtual/kernel-hostap"
 
 DOSRC = "http://www.do13.de/openzaurus/patches"
-RPSRC = "http://www.rpsys.net/openzaurus/patches"
+RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
 JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files"
 BASRC = "http://www.orca.cx/zaurus/patches"
 
diff --git a/packages/linux/linux-openzaurus_2.6.15.bb b/packages/linux/linux-openzaurus_2.6.15.bb
index b42f101f50..3eae7cbc84 100644
--- a/packages/linux/linux-openzaurus_2.6.15.bb
+++ b/packages/linux/linux-openzaurus_2.6.15.bb
@@ -44,20 +44,20 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
            ${RPSRC}/input_power-r4.patch;patch=1 \
            ${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
            ${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_base-r24.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_bl-r4.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_pcmcia-r2.patch;patch=1 \
-           ${RPSRC}/ipaq/pxa_keys-r5.patch;patch=1 \
-           ${RPSRC}/ipaq/tsc2101-r12.patch;patch=1 \
-           ${RPSRC}/ipaq/hx2750_test1-r3.patch;patch=1 \
+           ${RPSRC}/hx2750_base-r24.patch;patch=1 \
+           ${RPSRC}/hx2750_bl-r4.patch;patch=1 \
+           ${RPSRC}/hx2750_pcmcia-r2.patch;patch=1 \
+           ${RPSRC}/pxa_keys-r5.patch;patch=1 \
+           ${RPSRC}/tsc2101-r12.patch;patch=1 \
+           ${RPSRC}/hx2750_test1-r3.patch;patch=1 \
            ${DOSRC}/tc6393-device-r8.patch;patch=1 \
            ${DOSRC}/tc6393_nand-r7.patch;patch=1 \
            ${DOSRC}/tosa-keyboard-r9.patch;patch=1 \
-           ${RPSRC}/temp/tosa-pxaac97-r5-rp.patch;patch=1 \
-           ${RPSRC}/temp/tosa-tc6393-r1-rp.patch;patch=1 \
-           ${RPSRC}/temp/tosa-power-r9-rp.patch;patch=1 \
+           ${RPSRC}/tosa-pxaac97-r5-rp.patch;patch=1 \
+           ${RPSRC}/tosa-tc6393-r1-rp.patch;patch=1 \
+           ${RPSRC}/tosa-power-r9-rp.patch;patch=1 \
            ${DOSRC}/tc6393fb-r9.patch;patch=1 \
-           ${RPSRC}/temp/tosa-lcd-r6-rp.patch;patch=1 \
+           ${RPSRC}/tosa-lcd-r6-rp.patch;patch=1 \
            ${DOSRC}/tosa-bl-r9.patch;patch=1 \
            ${DOSRC}/tosa-bluetooth-r2.patch;patch=1 \
            ${RPSRC}/mmc_timeout-r0.patch;patch=1 \	   
@@ -77,7 +77,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \
            ${DOSRC}/kexec-arm-r0.patch \
            file://add-oz-release-string.patch;patch=1 \
            file://pxa-serial-hack.patch;patch=1 \
-           ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \
+           ${RPSRC}/pxa-linking-bug.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
            file://connectplus-remove-ide-HACK.patch;patch=1 \
            file://defconfig-c7x0 \
diff --git a/packages/lsof/lsof_4.75.bb b/packages/lsof/lsof_4.75.bb
index 7c1bba3b6c..0562a57fb1 100644
--- a/packages/lsof/lsof_4.75.bb
+++ b/packages/lsof/lsof_4.75.bb
@@ -4,7 +4,7 @@ tool. Its name stands for LiSt Open Files, and it \
 does just that."
 LICENSE = "BSD"
 
-SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2"
+SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/lsof_${PV}.tar.bz2"
 LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar"
 S = "${WORKDIR}/lsof_${PV}_src"
 
diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb
index fffcfb1be2..caac207fb7 100644
--- a/packages/meta/e-image.bb
+++ b/packages/meta/e-image.bb
@@ -1,7 +1,6 @@
-DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools"
-PR = "r4"
-
 include e-image-core.bb
+DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools"
+PR = "r5"
 
 export IMAGE_BASENAME = "e-image"
 export IPKG_INSTALL += "task-e-x11-core \
@@ -15,7 +14,8 @@ export IPKG_INSTALL += "task-e-x11-core \
                         xhost \
                         gpe-soundserver \
                         gpe-confd \
-                        xauth"
+                        xauth \
+                        e17-gpe-menu-convert"
 
 DEPENDS += "task-e-x11-core task-gpe"
 
diff --git a/packages/xserver-common/xserver-common_1.3.bb b/packages/xserver-common/xserver-common_1.3.bb
index 343abe9258..ea3fab6654 100644
--- a/packages/xserver-common/xserver-common_1.3.bb
+++ b/packages/xserver-common/xserver-common_1.3.bb
@@ -2,8 +2,10 @@ MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
-DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
+PR = "r1"
+
+PACKAGE_ARCH = "all"
 
 # we are using a gpe-style Makefile
 inherit gpe
diff --git a/packages/xserver-common/xserver-common_1.5.bb b/packages/xserver-common/xserver-common_1.5.bb
index a825ddf6de..f6d09ac9e1 100644
--- a/packages/xserver-common/xserver-common_1.5.bb
+++ b/packages/xserver-common/xserver-common_1.5.bb
@@ -2,10 +2,10 @@ MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
-DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r0"
+PR = "r1"
 
+PACKAGE_ARCH = "all"
 
 # we are using a gpe-style Makefile
 inherit gpe
diff --git a/packages/xserver-common/xserver-common_1.7.bb b/packages/xserver-common/xserver-common_1.7.bb
index a825ddf6de..f6d09ac9e1 100644
--- a/packages/xserver-common/xserver-common_1.7.bb
+++ b/packages/xserver-common/xserver-common_1.7.bb
@@ -2,10 +2,10 @@ MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
 DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
-DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r0"
+PR = "r1"
 
+PACKAGE_ARCH = "all"
 
 # we are using a gpe-style Makefile
 inherit gpe