diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2008-11-17 21:20:43 +0000 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2008-11-17 21:20:43 +0000 |
| commit | 6362c83899bb5f169d75678fabdead7083cbccd5 (patch) | |
| tree | 393d18cf7f83476245bcfcc45ec0765ae2737698 | |
| parent | f50b30cb87c7900452773acaf8ef1c854336d8c5 (diff) | |
| parent | 496ef6848836894e9fa2189b2e1c7cc70a1d0bff (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 1 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index cc5be470d2..fc53859bb3 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -105,6 +105,7 @@ ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2" #Everybody else can just use this: ANGSTROM_GCC_VERSION ?= "4.2.4" +PREFERRED_VERSION_binutils ?= "2.18.50.0.7" PREFERRED_VERSION_binutils-cross ?= "2.18.50.0.7" PREFERRED_VERSION_binutils-cross-sdk ?= "2.18.50.0.7" diff --git a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb index 77c36086df..614848f3e3 100644 --- a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb +++ b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb @@ -11,7 +11,7 @@ PROVIDES = "virtual/xserver" PE = "1" PV = "1.3.0.0+gitr${SRCREV}" -PR = "r2" +PR = "r3" COMPATIBLE_HOST = "arm.*-linux" COMPATIBLE_MACHINE = 'om-gta02' @@ -38,6 +38,10 @@ do_configure_prepend() { sed -i -e 's/tslib-0.0/tslib-1.0/' ${S}/configure.ac } +PACKAGES =+ "xserver-security-policy" +FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy" +RRECOMMENDS_${PN} += "xserver-security-policy" + FILES_${PN} = "${bindir}/Xglamo" FILES_${PN}-dbg = "${bindir}/.debug/Xglamo" |