[oe-commits] Graeme Gregory : xterm_207.bb : fix problem on "SELinux" F11 based builds

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 509fe8bba28753b7dff021b7216cb65cb9e3d180
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=509fe8bba28753b7dff021b7216cb65cb9e3d180

Author: Graeme Gregory <dp at xora.org.uk>
Date:   Fri Nov 13 09:28:04 2009 +0000

xterm_207.bb : fix problem on "SELinux" F11 based builds
xterm_251.bb : fix problem on "SELinux" F11 based builds

This was not really F11 or SELinux problem, installer was checking for
the existance of /usr/bin/X11/xterm and trying to read the permissions
for that and replicate them into the OE build. A simple --disable-setuid
prevents this script being called and the bogus check on host tools
from occuring.

---

 recipes/xorg-app/xterm_207.bb |   10 +++++-----
 recipes/xorg-app/xterm_243.bb |   28 ----------------------------
 recipes/xorg-app/xterm_251.bb |   10 +++++-----
 3 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/recipes/xorg-app/xterm_207.bb b/recipes/xorg-app/xterm_207.bb
index f8ed913..0f31f41 100644
--- a/recipes/xorg-app/xterm_207.bb
+++ b/recipes/xorg-app/xterm_207.bb
@@ -10,12 +10,12 @@ inherit autotools pkgconfig
 
 FILES_${PN} += " /usr/lib/X11"
 
-#EXTRA_OERECONF = " -I${S}/xterm.m4"
-EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config --disable-imake"
+EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \
+                 --x-libraries=${STAGING_LIBDIR} \
+                 FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \
+                 --disable-imake \
+                 --disable-setuid"
 
-#do_configure_prepend () {
-#	mv ${S}/aclocal.m4 ${S}/xterm.m4
-#}
 do_configure() {
 
 	sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure
diff --git a/recipes/xorg-app/xterm_243.bb b/recipes/xorg-app/xterm_243.bb
deleted file mode 100644
index 5764da3..0000000
--- a/recipes/xorg-app/xterm_243.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "xterm is the standard terminal emulator for the X Window System."
-SECTION = "x11/applications"
-LICENSE = "MIT-X"
-
-DEPENDS = "libxaw xproto virtual/libx11 xextproto xext xau libxpm ncurses"
-
-SRC_URI = "ftp://invisible-island.net/xterm/${PN}-${PV}.tgz"
-
-inherit autotools pkgconfig
-
-FILES_${PN} += " /usr/lib/X11"
-
-#EXTRA_OERECONF = " -I${S}/xterm.m4"
-EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config --disable-imake"
-
-#do_configure_prepend () {
-#	mv ${S}/aclocal.m4 ${S}/xterm.m4
-#}
-do_configure() {
-
-	sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure
-
-	oe_runconf
-}
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/recipes/xorg-app/xterm_251.bb b/recipes/xorg-app/xterm_251.bb
index 5764da3..004679e 100644
--- a/recipes/xorg-app/xterm_251.bb
+++ b/recipes/xorg-app/xterm_251.bb
@@ -10,12 +10,12 @@ inherit autotools pkgconfig
 
 FILES_${PN} += " /usr/lib/X11"
 
-#EXTRA_OERECONF = " -I${S}/xterm.m4"
-EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR} FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config --disable-imake"
+EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \
+                 --x-libraries=${STAGING_LIBDIR} \
+                 FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \
+                 --disable-imake \
+                 --disable-setuid"
 
-#do_configure_prepend () {
-#	mv ${S}/aclocal.m4 ${S}/xterm.m4
-#}
 do_configure() {
 
 	sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure