diff options
| -rw-r--r-- | conf/machine/epia.conf | 2 | ||||
| -rw-r--r-- | packages/cppunit/cppunit_1.10.2.bb | 2 | ||||
| -rw-r--r-- | packages/images/xfce-image.bb | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 86e9429506..1497e303c4 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -1,3 +1,5 @@ +require conf/machine/x86.conf + TARGET_ARCH = "i586" PACKAGE_EXTRA_ARCHS = "i386 i486" diff --git a/packages/cppunit/cppunit_1.10.2.bb b/packages/cppunit/cppunit_1.10.2.bb index 9949f020e2..e4c146eede 100644 --- a/packages/cppunit/cppunit_1.10.2.bb +++ b/packages/cppunit/cppunit_1.10.2.bb @@ -9,7 +9,7 @@ SECTION = "devel" SRC_URI = "${SOURCEFORGE_MIRROR}/cppunit/cppunit-${PV}.tar.gz" -inherit autotools +inherit autotools binconfig CXXFLAGS_powerpc += "-lstdc++" diff --git a/packages/images/xfce-image.bb b/packages/images/xfce-image.bb index 42b0907b2b..d5d48233a7 100644 --- a/packages/images/xfce-image.bb +++ b/packages/images/xfce-image.bb @@ -2,8 +2,10 @@ export IMAGE_BASENAME = "xfce-image" IMAGE_LINGUAS = "" +XSERVER ?= "xserver-kdrive-fbdev" + X_DEPENDS = "virtual/xserver" -X_RDEPENDS = "xserver-kdrive-fbdev" +X_RDEPENDS = "${XSERVER}" XFCE_DEPENDS = "${MACHINE_TASK_PROVIDER} task-xfce-base" XFCE_RDEPENDS = "${XFCE_DEPENDS}" |