[oe-commits] org.oe.dev merge of '19b628fe5b8cb6344e5f3362266f45985cfee2a6'

[pfalcon commit]

merge of '19b628fe5b8cb6344e5f3362266f45985cfee2a6'
     and '75f2dc6b3a783a084bf013ce7dc072992561a9bd'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 01798a2a11c1f1c74e406486dc3e8b456e3a7e3c
ViewMTN: http://monotone.openembedded.org/revision/info/01798a2a11c1f1c74e406486dc3e8b456e3a7e3c
Files:
1
packages/initscripts/initscripts-1.0/banner
packages/initscripts/initscripts_1.0.bb
packages/xorg-lib/libx11_1.1.1.bb
Diffs:

#
# mt diff -r19b628fe5b8cb6344e5f3362266f45985cfee2a6 -r01798a2a11c1f1c74e406486dc3e8b456e3a7e3c
#
# 
# 
# patch "packages/initscripts/initscripts-1.0/banner"
#  from [15cd4658a14195d30ae64858bb15f0aaa26ef3f0]
#    to [b5b1b9b5740378e6e408d32438eca5a98d6f8f0e]
# 
# patch "packages/initscripts/initscripts_1.0.bb"
#  from [5b015b91512e978190564024638f1a0bbb5cf876]
#    to [f77c65c300bf290e8cd8506433653eba162768e6]
# 
============================================================
--- packages/initscripts/initscripts-1.0/banner	15cd4658a14195d30ae64858bb15f0aaa26ef3f0
+++ packages/initscripts/initscripts-1.0/banner	b5b1b9b5740378e6e408d32438eca5a98d6f8f0e
@@ -8,6 +8,8 @@ elif ( > /dev/vc/0 ) 2>/dev/null; then
     vtmaster=/dev/tty0
 elif ( > /dev/vc/0 ) 2>/dev/null; then
     vtmaster=/dev/vc/0
+elif ( > /dev/console ) 2>/dev/null; then
+    vtmaster=/dev/console
 else
     vtmaster=/dev/null
 fi
============================================================
--- packages/initscripts/initscripts_1.0.bb	5b015b91512e978190564024638f1a0bbb5cf876
+++ packages/initscripts/initscripts_1.0.bb	f77c65c300bf290e8cd8506433653eba162768e6
@@ -1,10 +1,10 @@ LICENSE = "GPL"
 DESCRIPTION = "SysV init scripts"
 SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r104"
+PR = "r105"
 
 SRC_URI = "file://functions \
            file://halt \


#
# mt diff -r75f2dc6b3a783a084bf013ce7dc072992561a9bd -r01798a2a11c1f1c74e406486dc3e8b456e3a7e3c
#
# 
# 
# patch "packages/xorg-lib/libx11_1.1.1.bb"
#  from [2a23c0349e30662b6bb5e1e9ecb7863558ebd333]
#    to [ab8677d262614ad6c91d439e7356c1b49e8dc5a3]
# 
============================================================
--- packages/xorg-lib/libx11_1.1.1.bb	2a23c0349e30662b6bb5e1e9ecb7863558ebd333
+++ packages/xorg-lib/libx11_1.1.1.bb	ab8677d262614ad6c91d439e7356c1b49e8dc5a3
@@ -1,23 +1,18 @@ PE = "1"
 require xorg-lib-common.inc
 PE = "1"
-PR = "r4"
+PR = "r5"
 
 DESCRIPTION = "Base X libs."
-
 DEPENDS += " bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-	libxcb libxdmcp xf86bigfontproto kbproto inputproto"
+	libxdmcp xf86bigfontproto kbproto inputproto"
 PROVIDES = "virtual/libx11"
 
 XORG_PN = "libX11"
 
-PACKAGES =+ "libx11-xcb"
+EXTRA_OECONF += "--without-xcb"
 
 SRC_URI += " file://ruutf8.patch;patch=1"
 
-FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
-FILES_${PN}-xcb = "${libdir}/libX11-xcb.so.*"
-
 do_compile() {
         (
          unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
@@ -27,3 +22,5 @@ do_compile() {
         oe_runmake
 }
 
+FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
+FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"