[OE-core] [PATCH] task-core-basic: Drop hal dependency, its deprecated
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
diff --git a/meta/recipes-extended/tasks/task-core-basic.bb
b/meta/recipes-extended/tasks/task-core-basic.bb
index e2a37d1..8bab0db 100644
--- a/meta/recipes-extended/tasks/task-core-basic.bb
+++ b/meta/recipes-extended/tasks/task-core-basic.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = Create Basic Image Tasks
-PR = r3
+PR = r4
LICENSE = MIT
LIC_FILES_CHKSUM =
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
@@ -140,7 +140,6 @@ RDEPENDS_task-core-sys-services = \
python-dbus \
elfutils \
gzip \
-hal \
less \
libcap \
libevent \
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] connman: Drop hal dependency and udev configure option, neither is used
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc index a72c34a..ae1b725 100644 --- a/meta/recipes-connectivity/connman/connman.inc +++ b/meta/recipes-connectivity/connman/connman.inc @@ -13,7 +13,7 @@ LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/main.c;beginline=1;endline=20;md5=4b55b550fa6b33cc2055ef30dd262b3e -DEPENDS = libgdbus dbus glib-2.0 hal iptables +DEPENDS = libgdbus dbus glib-2.0 iptables INITSCRIPT_NAME = connman INITSCRIPT_PARAMS = start 05 5 2 3 . stop 22 0 1 6 . diff --git a/meta/recipes-connectivity/connman/connman_0.75.bb b/meta/recipes-connectivity/connman/connman_0.75.bb index 5a7b284..4c25fcc 100644 --- a/meta/recipes-connectivity/connman/connman_0.75.bb +++ b/meta/recipes-connectivity/connman/connman_0.75.bb @@ -13,7 +13,6 @@ EXTRA_OECONF += \ --enable-dnsproxy \ --disable-dhclient \ --enable-test \ - --disable-udev \ --disable-polkit \ --enable-client \ --enable-ofono \ ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libc-package.bbclass: Use a makefile for locale gernation to increase parallelization
We can generate the locales in parallel. The easiest way to do this is
generate a Makefile and then run this with our usual parallel make
options.
[YOCTO #1554]
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
diff --git a/meta/classes/libc-package.bbclass
b/meta/classes/libc-package.bbclass
index 71a577b..6ef2f97 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -252,6 +252,8 @@ python package_do_split_gconvs () {
rprovides.append(legitimize_package_name('%s-binary-localedata-%s' % (bpn,
libc_name)))
bb.data.setVar('RPROVIDES_%s' % pkgname, .join(rprovides), d)
+ commands = {}
+
def output_locale_binary(name, pkgname, locale, encoding):
treedir = base_path_join(bb.data.getVar(WORKDIR, d, 1),
locale-tree)
ldlibdir = base_path_join(treedir,
bb.data.getVar(base_libdir, d, 1))
@@ -298,17 +300,9 @@ python package_do_split_gconvs () {
-E LD_LIBRARY_PATH=%s %s %s/bin/localedef %s %
\
(path, i18npath, qemu, treedir, ldlibdir,
qemu_options, treedir, localedef_opts)
+ commands[%s/%s % (outputpath, name)] = cmd
+
bb.note(generating locale %s (%s) % (locale, encoding))
- import subprocess
- process = subprocess.Popen(cmd, shell=True,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- if process.wait() != 0:
- bb.note(cmd:)
- bb.note(cmd)
- bb.note(stdout:)
- bb.note(process.stdout.read())
- bb.note(stderr:)
- bb.note(process.stderr.read())
- raise bb.build.FuncFailed(localedef returned an error)
def output_locale(name, locale, encoding):
pkgname = bb.data.getVar('MLPREFIX', d) + 'locale-base-' +
legitimize_package_name(name)
@@ -353,6 +347,17 @@ python package_do_split_gconvs () {
bb.note( + .join(non_utf8))
if use_bin == compile:
+ makefile = base_path_join(bb.data.getVar(WORKDIR, d, 1),
locale-tree, Makefile)
+ m = open(makefile, w)
+ m.write(all: %s\n\n % .join(commands.keys()))
+ for cmd in commands:
+ m.write(cmd + :\n)
+ m.write(+ commands[cmd] + \n\n)
+ m.close()
+ d.setVar(B, os.path.dirname(makefile))
+ d.setVar(EXTRA_OEMAKE, ${PARALLEL_MAKE})
+ bb.note(Executing binary locale generation makefile)
+ bb.build.exec_func(oe_runmake, d)
bb.note(collecting binary locales from locale tree)
bb.build.exec_func(do_collect_bins_from_locale_tree, d)
do_split_packages(d, binary_locales_dir, file_regex='(.*)', \
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] qt-demo-init/linux-firmware/adt-installer: Convert to Use allarch class file
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb
b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index 74e1b9f..53911b8 100644
--- a/meta/recipes-devtools/installer/adt-installer_1.0.bb
+++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb
@@ -29,7 +29,6 @@ LICENSE = MIT
ALLOW_EMPTY = 1
PACKAGES =
-PACKAGE_ARCH = all
PR = r4
@@ -38,7 +37,7 @@ ADT_DIR = ${WORKDIR}/adt-installer/
YOCTOADT_VERSION = ${SDK_VERSION}
S = ${WORKDIR}/trunk
-inherit deploy
+inherit deploy allarch
SRCREV = 596
PV = 0.1.8+svnr${SRCPV}
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 660877e..86d60b4 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -30,6 +30,8 @@ SRC_URI =
git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.gi
S = ${WORKDIR}/git
+inherit allarch
+
do_compile() {
:
}
@@ -78,4 +80,3 @@ FILES_${PN}-rtl8192su = \
RPROVIDES_${PN}-rtl8192su = ${PN}-rtl8192su
-PACKAGE_ARCH = all
diff --git a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
index 0f089ad..6cd3e17 100644
--- a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
+++ b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
@@ -6,14 +6,12 @@ PR = r3
LIC_FILES_CHKSUM =
file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420
-PACKAGE_ARCH = all
-
do_install() {
install -d ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/qtdemo-init ${D}${sysconfdir}/init.d/qtdemo
}
-inherit update-rc.d
+inherit update-rc.d allarch
INITSCRIPT_NAME = qtdemo
INITSCRIPT_PARAMS = start 99 5 2 . stop 19 0 1 6 .
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gnutls: Disable p11-kit dependency explicitly to resolve build failures
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
diff --git a/meta/recipes-support/gnutls/gnutls.inc
b/meta/recipes-support/gnutls/gnutls.inc
index 9257880..3569648 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -25,6 +25,7 @@ EXTRA_OECONF=--with-included-opencdk --with-included-libcfg
--disable-rpath \
--with-libdl-prefix=${STAGING_DIR_HOST}${prefix} \
--with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
--with-lzo --disable-guile \
+ --without-p11-kit \
do_configure_prepend() {
for dir in . lib libextra; do
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc/binutils: Disable NLS/gettext dependencies
We force the C locale when running builds for determinstic error messages. We
therefore have no need to NLS support in binutils cross or gcc cross.
We also don't need the standard base/autotools dependencies for our
toolchain components since we don't autoreconf these.
This patch turns off nls and cleans up some of the dependencies resulting
in a slightly less convoluted set of build dependencies.
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
Note: This isn't the full potential gain of the NLS changes, the bigger
speedup comes from breaking the binutils dependency on flex/bison which
depend on gettext-native. This patch sets the scene though and is a
first step.
diff --git a/meta/recipes-devtools/binutils/binutils-cross.inc
b/meta/recipes-devtools/binutils/binutils-cross.inc
index 5a41970..982224f 100644
--- a/meta/recipes-devtools/binutils/binutils-cross.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross.inc
@@ -1,10 +1,14 @@
inherit cross
PROVIDES = virtual/${TARGET_PREFIX}binutils
+INHIBIT_DEFAULT_DEPS = 1
+INHIBIT_AUTOTOOLS_DEPS = 1
+
EXTRA_OECONF = --with-sysroot=${STAGING_DIR_TARGET} \
--program-prefix=${TARGET_PREFIX} \
--disable-install-libbfd \
--disable-werror \
+--disable-nls \
--enable-poison-system-directories \
${@base_contains('DISTRO_FEATURES', 'ld-is-gold',
'--enable-gold=default', '', d)}
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc
b/meta/recipes-devtools/gcc/gcc-4.6.inc
index a352e36..8ca3174 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -23,7 +23,7 @@ BRANCH = gcc-4_6-branch
FILESPATH = ${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}
DEPENDS =+ mpfr gmp libmpc
-NATIVEDEPS = mpfr-native gmp-native gettext-native libmpc-native
+NATIVEDEPS = mpfr-native gmp-native libmpc-native
LICENSE=GPL-3.0-with-GCC-exception GPLv3
@@ -108,3 +108,4 @@ EXTRA_OECONF_INTERMEDIATE = --disable-libmudflap \
EXTRA_OECONF_append_linux-uclibc = --disable-decimal-float
EXTRA_OECONF_append_linux-uclibceabi = --disable-decimal-float
EXTRA_OECONF_append_linux-uclibcspe = --disable-decimal-float
+
diff --git a/meta/recipes-devtools/gcc/gcc-configure-cross.inc
b/meta/recipes-devtools/gcc/gcc-configure-cross.inc
index 36edb81..d2d9081 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-cross.inc
@@ -4,8 +4,11 @@ USE_NLS = '${@base_conditional( TARGET_OS, linux-uclibc,
no, , d )}'
EXTRA_OECONF += --enable-poison-system-directories \
--with-headers=${STAGING_DIR_TARGET}${SYSTEMHEADERS} \
+ --disable-nls \
+INHIBIT_DEFAULT_DEPS = 1
+
EXTRA_OECONF_PATHS =
--with-local-prefix=${STAGING_DIR_TARGET}${target_exec_prefix} \
--with-gxx-include-dir=${target_includedir}/c++ \
--with-sysroot=${STAGING_DIR_TARGET} \
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 4e2e343..d58bf70 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -1,7 +1,10 @@
-DEPENDS = virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}
+DEPENDS = virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}
PROVIDES = virtual/${TARGET_PREFIX}gcc-initial
PACKAGES =
+INHIBIT_AUTOTOOLS_DEPS = 1
+INHIBIT_DEFAULT_DEPS = 1
+
CROSS_TARGET_SYS_DIR_append = .${PN}
# This is intended to be a -very- basic config
@@ -11,6 +14,7 @@ EXTRA_OECONF =
--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
--without-headers \
--disable-shared \
--disable-threads \
+ --disable-nls \
--disable-multilib \
--disable-__cxa_atexit \
--enable-languages=c \
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index 7b1bb38..f368ae9 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -1,8 +1,11 @@
DEPENDS = virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}
-DEPENDS += virtual/${TARGET_PREFIX}libc-initial gettext-native
+DEPENDS += virtual/${TARGET_PREFIX}libc-initial
PROVIDES = virtual/${TARGET_PREFIX}gcc-intermediate
PACKAGES =
+INHIBIT_DEFAULT_DEPS = 1
+INHIBIT_AUTOTOOLS_DEPS = 1
+
CROSS_TARGET_SYS_DIR_append = .${PN}
# This is intended to be a -very- basic config
@@ -13,6 +16,7 @@ CROSS_TARGET_SYS_DIR_append = .${PN}
# preferred linker.
EXTRA_OECONF = --with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
--enable-shared \
+ --disable-nls \
--disable-multilib \
--disable-threads \
--enable-languages=c \
[OE-core] Convoluted dependencies
I've been trying to figure out why our builds take as long as they do. It appears our dependency chains are getting more and more convoluted and this certainly isn't helping things. Specific pain points look like: bison-native - gettext-native flex-native - gettext-native (which limits binutils-cross) gettext-native - libxml2-native - python-native (hence gettext takes a *long* time to be built) What uses the python xml bindings? pseudo-native - sqlite3-native (dragging out the time our effectively single threaded init takes) I'm mentioning this in case anyone has good ideas for fixing some of these... Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] hicolor-icon-theme: Convert to allarch
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
diff --git a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
index c9d65a2..759c9d8 100644
--- a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
+++ b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
@@ -6,7 +6,9 @@ LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426
SECTION = unknown
-inherit gnome
+inherit gnome allarch
+
+DEPENDS =
PR = r0
@@ -16,8 +18,6 @@ SRC_URI =
http://icon-theme.freedesktop.org/releases/${BPN}-${PV}.tar.gz \
SRC_URI[md5sum] = 55cafbcef8bcf7107f6d502149eb4d87
SRC_URI[sha256sum] =
9edca690617eaa19054951ca53501c802180262be8880ed84754ac46c93bec73
-PACKAGE_ARCH = all
-
FILES_${PN} += ${datadir}/icons
do_install_append () {
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] font-alias: Convert to use allarch including a patch to disable compiler checks
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org
---
diff --git a/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch
b/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch
new file mode 100644
index 000..48e183c
--- a/dev/null
+++ b/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch
@@ -0,0 +1,30 @@
+XORG_DEFAULT_OPTIONS pulls in the following dependency chains:
+
+XORG_CWARNFLAGS - AC_PROG_CC_C99
+XORG_STRICT_OPTION - AC_PROG_CC_C99, XORG_CWARNFLAGS
+XORG_MANPAGE_SECTIONS - AC_CANONICAL_HOST - Checks host
+
+each of which triggers the use of the host compiler. As an all
+architecture package, it shouldn't need a compiler (and doesn't).
+
+RP 17/5/2011
+
+diff -uNr font-alias-1.0.3.orig//configure.ac font-alias-1.0.3/configure.ac
+--- font-alias-1.0.3.orig//configure.ac2011-05-18 21:29:18.378258643
+0200
font-alias-1.0.3/configure.ac 2011-05-18 21:32:06.865258593 +0200
+@@ -28,12 +28,12 @@
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE
+
+-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+ m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running
autoconf/autogen])])
+ XORG_MACROS_VERSION(1.3)
+-XORG_DEFAULT_OPTIONS
+-
++XORG_RELEASE_VERSION
++XORG_CHANGELOG
++XORG_INSTALL
+ AC_PROG_INSTALL
+
+ XORG_FONTROOTDIR
diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
index 1b63961..7005291 100644
--- a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
+++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
@@ -9,14 +9,16 @@ LIC_FILES_CHKSUM =
file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \
file://misc/fonts.alias;md5=a8ec05d528431d4c9703b55a7efd67a8 \
file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb
-DEPENDS = virtual/xserver font-util
+SRC_URI += file://nocompiler.patch
+
+DEPENDS = util-macros-native
RDEPENDS_${PN} = encodings font-util
RDEPENDS_${PN}_virtclass-native = font-util-native
-PE = 1
-PR = ${INC_PR}.1
+inherit allarch
-PACKAGE_ARCH = all
+PE = 1
+PR = ${INC_PR}.2
SRC_URI[md5sum] = 6d25f64796fef34b53b439c2e9efa562
SRC_URI[sha256sum] =
8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] WARNING: Deprecated components removal in 5 days
On Wed, 2011-10-05 at 17:56 +0100, Richard Purdie wrote: I do plan to remove hal too as soon as the last dependency is removed (my build without hal isn't booting X correctly atm). I've resolved those issues so I'm planning to also remove hal and hal-info since neither component is used in OE-Core any longer. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] acl/attr: don't make symlink if base_libdir = libdir
On Thu, 2011-10-06 at 11:25 -0700, Saul Wold wrote: Signed-off-by: Saul Wold s...@linux.intel.com --- meta/recipes-support/attr/ea-acl.inc |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 00/21] Add SRC_URI Checksums and some Updates
On Thu, 2011-10-06 at 09:14 -0700, Saul Wold wrote: Richard, Found some recipes missing Checksums and do a couple of package updates. Thanks Sau! The following changes since commit cc626b9e1671670a931ea3e528ea4b0f7b2e923b: webkit-gtk: Enable dependency tracking since the webkit makefiles have bugs (2011-10-05 14:36:18 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgw/updates http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates Saul Wold (21): grub: Add SRC_URI Checksum dosfstools: Add SRC_URI Checksum libx11-trim: Add SRC_URI Checksum guilt-native: Add SRC_URI Checksums libx11-diet: Add SRC_URI Checksum eds-tools: Convert from BZR to GIT Repo clutter-gst-1.6: Add SRC_URI Checksum xserver-kdrive: Add SRC_URI Checksum mutter: Add SRC_URI Checksum icon-naming-utils: Add SRC_URI Checksum libxml-perl: Add SRC_URI Checksum liburi-perl: Add SRC_URI Checksum gconf-dbus: Add SRC_URI Checksum gail: Add SRC_URI Checksum boost-jam-native: Add SRC_URI Checksum puzzles: Update to latest version gnutls: Update to 2.12.11 tzdata: Update to 2011k lsof: Update to 4.84 apt: Update to 0.8.15.8 distro_tracking: Updates Merged to master apart from the apt change. Thanks, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] util-linux: split fsck* into its own subpackage
On Thu, 2011-10-06 at 16:59 +0200, Koen Kooi wrote: This will allow systemd to run /sbin/fsck without dragging in all of util-linux Signed-off-by: Koen Kooi k...@dominion.thruhere.net --- meta/recipes-core/util-linux/util-linux.inc | 16 +--- meta/recipes-core/util-linux/util-linux_2.19.1.bb |2 +- 2 files changed, 14 insertions(+), 4 deletions(-) Merged to master, thanks. Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gnutls: disable p11-kit
| checking for P11_KIT... configure: error: Package requirements (p11-kit-1 =
0.2) were not met:
|
| No package 'p11-kit-1' found
|
| Consider adjusting the PKG_CONFIG_PATH environment variable if you
| installed software in a non-standard prefix.
|
| Alternatively, you may set the environment variables P11_KIT_CFLAGS
| and P11_KIT_LIBS to avoid the need to call pkg-config.
| See the pkg-config man page for more details.
|
| + bbfatal 'oe_runconf failed'
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/recipes-support/gnutls/gnutls.inc |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/gnutls/gnutls.inc
b/meta/recipes-support/gnutls/gnutls.inc
index 9257880..67e44ba 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -3,7 +3,7 @@ HOMEPAGE = http://www.gnu.org/software/gnutls/;
BUGTRACKER = https://savannah.gnu.org/support/?group=gnutls;
DEPENDS = zlib lzo libtasn1 libgcrypt (= 1.4.2) libcap
-INC_PR = r2
+INC_PR = r3
LICENSE = GPLv3+ LGPLv2.1+
LICENSE_${PN} = LGPLv2.1+
@@ -25,6 +25,7 @@ EXTRA_OECONF=--with-included-opencdk --with-included-libcfg
--disable-rpath \
--with-libdl-prefix=${STAGING_DIR_HOST}${prefix} \
--with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
--with-lzo --disable-guile \
+ --without-p11-kit \
do_configure_prepend() {
for dir in . lib libextra; do
--
1.6.6.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] gnutls: disable p11-kit
On Fri, 2011-10-07 at 16:37 +0200, Koen Kooi wrote: | checking for P11_KIT... configure: error: Package requirements (p11-kit-1 = 0.2) were not met: | | No package 'p11-kit-1' found | | Consider adjusting the PKG_CONFIG_PATH environment variable if you | installed software in a non-standard prefix. | | Alternatively, you may set the environment variables P11_KIT_CFLAGS | and P11_KIT_LIBS to avoid the need to call pkg-config. | See the pkg-config man page for more details. | | + bbfatal 'oe_runconf failed' Signed-off-by: Koen Kooi k...@dominion.thruhere.net --- meta/recipes-support/gnutls/gnutls.inc |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) I had a similar patch pending too. I've just expedited the fix to master... Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-core][WIP][PATCH 8/9] glib: upgrade to 2.30.0
On Fri, 2011-09-30 at 17:43 +0200, Martin Jansa wrote: Signed-off-by: Martin Jansa martin.ja...@gmail.com --- ...003-gatomic-proper-pointer-get-cast.patch.patch | 28 -- .../0005-glib-mkenums-interpreter.patch.patch | 25 - .../60_wait-longer-for-threads-to-die.patch| 24 +- meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch |2 - .../glib-2.0/remove.test.for.qsort_r.patch | 53 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb | 23 - meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 41 +++ 7 files changed, 106 insertions(+), 90 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb +DEPENDS += libffi python-argparse-native +DEPENDS_virtclass-native += libffi-native python-argparse-native Just to be clear on the status of this, the above dependencies present a problem for OE-Core :( Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] pkg-config bug crashes 'bitbake glib-2.0-native' in FC15.x86_64
On Thu, 2011-10-06 at 02:38 -0600, dashesy wrote: On Wed, Oct 5, 2011 at 4:05 AM, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Wed, 2011-10-05 at 11:01 +0100, Richard Purdie wrote: On Wed, 2011-10-05 at 03:21 -0600, dashesy wrote: Hi, I am using these in my local.conf with master branch of oe-core: DISTRO=angstrom-2010.x MACHINE=beagleboard The build for 'bitbake glib-2.0-native' (or actually 'bitbake meta-toolchain') will finally reach a run.do_configure for 'package glib-2.0-native-1_2.28.8-r5: task do_configure: Started' which runs the oe-core/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/pkg-config for auto build This leads to the following chain pkg-config(cross)-gnome-config-pkg-config-glib-config-pkg-config-... dashesy 21266 21265 21266 01 01:56 pts/000:00:00 /bin/sh -e /home/dashesy/buildroot/oe-core/build/tmp-eglibc/work/x86_64-linux/glib-2.0-native-1_2.28.8-r5/temp/run.do_configure.21265 root 21870 935 21870 01 01:56 ?00:00:00 sleep 60 dashesy 22246 21266 22246 01 01:56 pts/000:00:00 /bin/sh /home/dashesy/buildroot/oe-core/build/tmp-eglibc/work/x86_64-linux/glib-2.0-native-1_2.28.8-r5/glib-2.28.8/configure [...] --disable-silent-rules --disable-dependency-tracking --disable-dtrace --disable-systemtap --enable-nls --enable-dtrace=no dashesy 22671 22246 22671 01 01:56 pts/000:00:00 /home/dashesy/buildroot/oe-core/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/pkg-config --exists --print-errors zlib dashesy 22672 22671 22672 01 01:56 pts/000:00:00 sh -c gnome-config --libs zlib /dev/null 21 Something odd is happening here. We have a patch in OE-Core against pkg-config which should disable leagacy pkg-config functionality. I took a look and it somehow looks like the patch got broken. Could you try again with http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/wip8id=de51d6ffae1d6a4f594687d5bdef25e731f44dfa applied please? I think this should fix this problem. Sorry, this should be: http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/wip8id=8d04d67271e5698ede8c08d3b6e3d4d7e38ffb0c The patch worked, no more recursive calls and bitbake succeeds too, thanks! Thanks for testing. The fix has been merged into master. Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/6] Fix perl for powerpc64 build
On Wed, 2011-10-05 at 19:04 +, McClintock Matthew-B29882 wrote:
On Wed, Oct 5, 2011 at 6:46 AM, Richard Purdie
richard.pur...@linuxfoundation.org wrote:
--- a/meta/recipes-devtools/perl/perl_5.12.3.bb
+++ b/meta/recipes-devtools/perl/perl_5.12.3.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
# We need gnugrep (for -I)
DEPENDS = virtual/db grep-native
DEPENDS += gdbm zlib
-PR = r5
+PR = r6
# 5.10.1 has Module::Build built-in
PROVIDES += libmodule-build-perl
@@ -95,6 +95,8 @@ export LDDLFLAGS = ${LDFLAGS} -shared
# We're almost Debian, aren't we?
CFLAGS += -DDEBIAN
+export ARCH_powerpc64 = powerpc64
+
I'm finding it really hard to believe this makes any difference. I just
tried a powerpc64 build here and perl built fine. I can't find any
evidence for any part of the perl build using an ARCH variable
(TARGET_ARCH is used but that isn't ARCH).
Can you give some further information about how/where this is used?
I'm trying to reproduce this again on 'edison' as well and it does not
appear to be occurring anymore! The problem before had to do with a
configuration script error:
config.sh-powerpc64-linux
This script was getting invoked as 'config.sh-powerpc-linux' on the
64bit build, then the file did not exist and the configure step failed
out. Not sure if this was somehow fixed in a different manner.
Please drop this patch for now. I'll bring it up again if I see issues.
Do you still need this bit:
case ${TARGET_ARCH} in
- x86_64 | powerpc | s390)
+ x86_64 | powerpc | powerpc64 | s390)
sed -i -e s,\(need_va_copy=\)'undef',\1'define',g \
config.sh-${TARGET_ARCH}-${TARGET_OS}
;;
?
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/6] Fix perl for powerpc64 build
On Fri, Oct 7, 2011 at 10:52 AM, Richard Purdie
richard.pur...@linuxfoundation.org wrote:
Do you still need this bit:
case ${TARGET_ARCH} in
- x86_64 | powerpc | s390)
+ x86_64 | powerpc | powerpc64 | s390)
sed -i -e s,\(need_va_copy=\)'undef',\1'define',g \
config.sh-${TARGET_ARCH}-${TARGET_OS}
;;
Missing this does not seem to affect things negatively so far, I've
been build testing mostly though - will revisit this later if
something comes up.
-M
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Convoluted dependencies
On 10/07/2011 07:09 AM, Richard Purdie wrote: I've been trying to figure out why our builds take as long as they do. It appears our dependency chains are getting more and more convoluted and this certainly isn't helping things. Specific pain points look like: bison-native - gettext-native flex-native - gettext-native (which limits binutils-cross) gettext-native - libxml2-native - python-native (hence gettext takes a *long* time to be built) What uses the python xml bindings? I thought that by having the --with-included-libxml, we got rid of the libxml2-native dependency, we should investigate that further. Digging shows that it is needed for python to create the xml2po tool for doc translation. Sau! pseudo-native - sqlite3-native (dragging out the time our effectively single threaded init takes) I'm mentioning this in case anyone has good ideas for fixing some of these... Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Convoluted dependencies
On Fri, Oct 7, 2011 at 11:09, Richard Purdie richard.pur...@linuxfoundation.org wrote: ... gettext-native - libxml2-native - python-native (hence gettext takes a *long* time to be built) What uses the python xml bindings? ... Maybe a gettext-python-native or similar might be created if something required the xml bindings for something. -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 00/31] Xorg related changes
this patchset brings meta-oe and oe-core xorg stuff together and most of
xorg recipes will be removed from meta-oe (sending another pull request now).
This step is needed to be able to separate common x11 to meta-x11 or whatever
later.
The following changes since commit 808b3123e359f1aebabb8af44694275e4075e031:
gnutls: Disable p11-kit dependency explicitly to resolve build failures
(2011-10-07 15:40:42 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/x11-v2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v2
Martin Jansa (31):
xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
xserver-xorg: remove old git recipe
glx-use-tls.inc: add include file to enable glx-tls only when
TARGET_OS isn't uclibc
xserver-xorg-common: fix LIC_FILES_CHKSUM
xserver-xorg-common: move SRC_URI closer together
xserver-xorg-common: Split out some bigger modules and extensions
from the main package
xserver-xorg-common: improve packaging
xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from
xserver-xorg.inc and xserver-xorg-lite.inc to
xserver-xorg-common.inc
xserver-xorg-common: lower xserver-xf86-config and xkeyboard-config
dependency to RRECOMMENDS and add few more recipes to RRECOMMENDS
xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to
shared .inc
xserver-xorg: remove FILES_${PN} += ${bindir}/Xorg , now we have
whole ${bindir} in FILES_ defined in shared .inc
xserver-xorg: replace hardcoded --enable-glx-tls with
glx-use-tls.inc, which doesn't enable it for uClibc
xserver-xorg: move shared EXTRA_OECONF entries to shared .inc
xserver-xorg: add new version 1.11.1
xserver-xorg: remove old 1.10.1 version
xserver-xorg: remove COMPATIBLE_HOST
xserver-xorg: drop unused files
xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use
same directory from xserver-xf86-lite recipe
xserver-kdrive: drop unused files (same files are in
xserver-kdrive-1.7.99.2 directory
xorg-driver-common.inc: use virtual/xserver instead of older
virtual/xserver-xf86
xorg-driver-common.inc: bump INC_PR to rebuild drivers agains new
xserver-xorg ABI
libx11: package xcb, merge few changes from meta-oe
libx11: add new version 1.4.4
libx11: remove older 1.3.4
libx11: drop old 1.2.2 git version
libx11-trim: move files for libx11-trim from libx11-1.3.4 to
libx11-trim-1.3.4
libx11-diet: move old patches used only by libx11-diet-1.3 to
separate directory
mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move
uclibc.patch
mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2
was removed
mesa: add new version 7.11
mesa: drop older 7.10.2 and 7.7+git recipes
meta/conf/distro/include/default-providers.inc |4 +-
.../conf/distro/include/distro_tracking_fields.inc | 20 +-
meta/conf/machine/qemux86-64.conf |6 +-
meta/conf/machine/qemux86.conf |6 +-
meta/conf/multilib.conf|2 +-
meta/recipes-graphics/mesa/glx-use-tls.inc |7 +
meta/recipes-graphics/mesa/mesa-7.11.inc | 15 +
meta/recipes-graphics/mesa/mesa-common.inc | 36 ++-
.../mesa/mesa-dri-glsl-native_7.11.bb | 28 +
.../mesa/mesa-dri-glsl-native_7.8.2.bb | 27 -
meta/recipes-graphics/mesa/mesa-dri.inc| 22 +
meta/recipes-graphics/mesa/mesa-dri/cross2.patch | 46 --
meta/recipes-graphics/mesa/mesa-dri/crossfix.patch | 18 -
meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h | 162 --
meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 40 --
meta/recipes-graphics/mesa/mesa-dri_7.11.bb|4 +
meta/recipes-graphics/mesa/mesa-dri_git.bb | 57 --
meta/recipes-graphics/mesa/mesa-xlib.inc |1 +
meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 22 -
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb |4 +
.../mesa/{mesa-dri = mesa}/uclibc.patch |0
.../xorg-driver/xorg-driver-common.inc |4 +-
.../xorg-lib/libx11-1.4.4/keysymdef_include.patch | 23 +
.../libx11-1.4.4/x11_disable_makekeys.patch| 29 +
.../{libx11 = libx11-diet-1.3}/X18NCMSstubs.diff |0
.../fix-disable-xlocale.diff |0
.../fix-utf8-wrong-define.patch|0
.../include_fix.patch |0
.../{libx11-git = libx11-diet-1.3}/nodolt.patch |0
.../x11_disable_makekeys.patch |0
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb |3 +-
meta/recipes-graphics/xorg-lib/libx11-diet_git.bb | 17 -
.../xorg-lib/libx11-git/X18NCMSstubs.diff | 570
.../xorg-lib/libx11-git/x11_disable_makekeys.patch | 30 -
.../include_fix.patch |0
[OE-core] [oe-core][PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
* xserver-xorg is closer to upstream naming and
that's how it's named in OE-classic and meta-oe? It would make meta-oe
transition easier and better to do it now then convert meta-oe to
xserver-xf86 and then rename it back later.
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/conf/distro/include/default-providers.inc |4 ++--
.../conf/distro/include/distro_tracking_fields.inc | 20 ++--
meta/conf/machine/qemux86-64.conf |6 +++---
meta/conf/machine/qemux86.conf |6 +++---
meta/conf/multilib.conf|2 +-
...ver-xf86-common.inc = xserver-xorg-common.inc} |1 +
...xserver-xf86-lite.inc = xserver-xorg-lite.inc} |4 +---
.../crosscompile.patch |0
.../fix_open_max_preprocessor_error.patch |0
.../macro_tweak.patch |2 +-
...-lite_1.10.1.bb = xserver-xorg-lite_1.10.1.bb} |2 +-
...{xserver-xf86-dri-lite.inc = xserver-xorg.inc} |2 +-
.../cache-xkbcomp-output-for-fast-start-up.patch |0
.../crosscompile.patch |0
.../fix_macros1.patch |0
.../fix_open_max_preprocessor_error.patch |0
.../macro_tweak.patch |2 +-
...6-dri-lite_1.10.1.bb = xserver-xorg_1.10.1.bb} |2 +-
...er-xf86-dri-lite_git.bb = xserver-xorg_git.bb} |2 +-
19 files changed, 27 insertions(+), 28 deletions(-)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-common.inc =
xserver-xorg-common.inc} (96%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite.inc =
xserver-xorg-lite.inc} (95%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =
xserver-xorg-lite}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =
xserver-xorg-lite}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =
xserver-xorg-lite}/macro_tweak.patch (93%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite_1.10.1.bb =
xserver-xorg-lite_1.10.1.bb} (89%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite.inc =
xserver-xorg.inc} (97%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =
xserver-xorg}/cache-xkbcomp-output-for-fast-start-up.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite =
xserver-xorg}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =
xserver-xorg}/fix_macros1.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =
xserver-xorg}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite =
xserver-xorg}/macro_tweak.patch (93%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.10.1.bb =
xserver-xorg_1.10.1.bb} (93%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_git.bb =
xserver-xorg_git.bb} (94%)
diff --git a/meta/conf/distro/include/default-providers.inc
b/meta/conf/distro/include/default-providers.inc
index d51ac64..a5cdb5b 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -3,8 +3,8 @@
#
PREFERRED_PROVIDER_virtual/db ?= db
PREFERRED_PROVIDER_virtual/db-native ?= db-native
-PREFERRED_PROVIDER_virtual/xserver ?= xserver-xf86
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= xserver-xf86-dri-lite
+PREFERRED_PROVIDER_virtual/xserver ?= xserver-xorg
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= xserver-xorg
PREFERRED_PROVIDER_virtual/libgl ?= mesa-xlib
PREFERRED_PROVIDER_virtual/update-alternatives ?= update-alternatives-cworth
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= opkg-native
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc
b/meta/conf/distro/include/distro_tracking_fields.inc
index 7b6c4a9..8af80c7 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -3683,14 +3683,14 @@ RECIPE_INTEL_SECTION_pn-mesa-xlib=graphic core
RECIPE_LAST_UPDATE_pn-mesa-xlib = Nov 27, 2010
RECIPE_MAINTAINER_pn-mesa-xlib=Yu Ke ke...@intel.com
-RECIPE_STATUS_pn-xserver-xf86-dri-lite=green # no update needed
-RECIPE_LATEST_VERSION_pn-xserver-xf86-dri-lite=1.8.99.904
-RECIPE_NO_OF_PATCHES_pn-xserver-xf86-dri-lite=2
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-dri-lite=2 monthes
-RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-dri-lite=2010/07/01
-RECIPE_INTEL_SECTION_pn-xserver-xf86-dri-lite=graphic core
-RECIPE_LAST_UPDATE_pn-xserver-xf86-dri-lite = Jan 18, 2011
-RECIPE_MAINTAINER_pn-xserver-xf86-dri-lite=Yu Ke ke...@intel.com
+RECIPE_STATUS_pn-xserver-xorg=green # no update needed
+RECIPE_LATEST_VERSION_pn-xserver-xorg=1.8.99.904
+RECIPE_NO_OF_PATCHES_pn-xserver-xorg=2
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xorg=2
[OE-core] [oe-core][PATCHv3 03/31] glx-use-tls.inc: add include file to enable glx-tls only when TARGET_OS isn't uclibc
* will be used in mesa-common.inc and xserver-xorg.inc
* based on mesa-tls.inc (glx-use-tls.bbclass) from
http://git.openembedded.org/cgit.cgi/openembedded/commit/packages/mesa/mesa-tls.inc?id=b527d8f723c98c77f2f5c5358062e5348493d767
---
meta/recipes-graphics/mesa/glx-use-tls.inc |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/glx-use-tls.inc
diff --git a/meta/recipes-graphics/mesa/glx-use-tls.inc
b/meta/recipes-graphics/mesa/glx-use-tls.inc
new file mode 100644
index 000..7530872
--- /dev/null
+++ b/meta/recipes-graphics/mesa/glx-use-tls.inc
@@ -0,0 +1,7 @@
+def get_tls_setting(bb, d):
+# until we have no prober TLS support in uclibc disable it
+if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') = 0 :
+return
+return --enable-glx-tls
+
+EXTRA_OECONF += ${@get_tls_setting(bb, d)}
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 02/31] xserver-xorg: remove old git recipe
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/xserver-xorg_git.bb | 25
1 files changed, 0 insertions(+), 25 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
deleted file mode 100644
index beef06a..000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require xserver-xorg.inc
-
-LIC_FILES_CHKSUM = file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00
-
-SRCREV = 6689e8add183835274a70ee013e5d3bc8023681f
-PE = 1
-PR = r3
-PV = 1.10+git${SRCPV}
-
-PROTO_DEPS += xf86driproto dri2proto
-
-DEPENDS += font-util
-
-RDEPENDS_${PN} += xkeyboard-config
-
-SRC_URI =
git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=master \
- file://crosscompile.patch; \
- file://fix_macros1.patch;
-
-# Misc build failure for master HEAD
-SRC_URI += file://fix_open_max_preprocessor_error.patch;
-
-EXTRA_OECONF += --enable-dri --enable-dri2 --enable-dga
-
-S = ${WORKDIR}/git
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 04/31] xserver-xorg-common: fix LIC_FILES_CHKSUM
* old value was actually from xserver-kdrive, use the same as xserver-xorg-1.10.1 and newer has ./xserver-kdrive.inc:LIC_FILES_CHKSUM = file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353 ./xserver-xorg-lite_1.10.1.bb:LIC_FILES_CHKSUM = file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00 Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../xorg-xserver/xserver-xorg-common.inc |3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc index 78c5f2e..3a69d7d 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc @@ -2,8 +2,7 @@ DESCRIPTION = The X.Org X server HOMEPAGE = http://www.x.org; SECTION = x11/base LICENSE = MIT-X - -LIC_FILES_CHKSUM = file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353 +LIC_FILES_CHKSUM = file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00 # xf86-*-* packages depend on an X server built with the xfree86 DDX # so we have a virtual to represent that: -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 05/31] xserver-xorg-common: move SRC_URI closer together
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/xserver-xorg-common.inc |3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 3a69d7d..67edbcf 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -14,6 +14,7 @@ PROVIDES += virtual/xserver
XORG_PN = xorg-server
SRC_URI = ${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2
+SRC_URI += file://macro_tweak.patch
S = ${WORKDIR}/${XORG_PN}-${PV}
@@ -32,8 +33,6 @@ FILES_${PN}-dbg += ${libdir}/xorg/modules/.debug \
${libdir}/xorg/modules/*/*/.debug \
-SRC_URI += file://macro_tweak.patch
-
EXTRA_OECONF = --with-fop=no
PACKAGECONFIG ??= udev
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 07/31] xserver-xorg-common: improve packaging
* add ${bindir} and protocol.txt to ${PN}
* SecurityPolicy is now in ${PN}-security-policy
* package .la files to ${PN}-dev
* README.compiled is lately in ${localstatedir}/lib/xkb so add it too to
${PN}-doc
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/xserver-xorg-common.inc | 11 +--
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index c0fcf8b..0a5d8b6 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -58,14 +58,13 @@ PACKAGES =+ ${PN}-security-policy \
RDEPENDS_${PN} += xserver-xf86-config xkeyboard-config
-FILES_${PN} = ${libdir}/X11/Options ${libdir}/X11/Cards
${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy
${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so
${libdir}/xorg/modules/*/*/*.so /etc/X11
-FILES_${PN}-doc += ${libdir}/X11/doc
${datadir}/X11/xkb/compiled/README.compiled
-
+FILES_${PN} = ${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards
${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so
${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt
${datadir}/X11/xorg.conf.d
+FILES_${PN}-dev += ${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la
+FILES_${PN}-doc += ${libdir}/X11/doc
${datadir}/X11/xkb/compiled/README.compiled
${localstatedir}/lib/xkb/README.compiled
FILES_${PN}-dbg += ${libdir}/xorg/modules/.debug \
${libdir}/xorg/modules/*/.debug \
- ${libdir}/xorg/modules/*/*/.debug \
-
-
+${libdir}/xorg/modules/*/*/.debug \
+
FILES_${PN}-security-policy += ${libdir}/xserver/SecurityPolicy
FILES_${PN}-sdl = ${bindir}/Xsdl
FILES_${PN}-fbdev = ${bindir}/Xfbdev
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 06/31] xserver-xorg-common: Split out some bigger modules and extensions from the main package
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/xserver-xorg-common.inc | 60 +++-
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 67edbcf..c0fcf8b 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -20,11 +20,44 @@ S = ${WORKDIR}/${XORG_PN}-${PV}
inherit autotools pkgconfig
-PACKAGES =+ ${PN}-utils
+# Split out some modules and extensions from the main package
+# These aren't needed for basic operations and only take up space:
+# 32.0k libdri.so
+# 336.0k libglx.so
+# 1360k libint10.so
+# 180.0k libwfb.so
+# 320.0k libxaa.so
+# 124.0k libxf1bpp.so
+# 84.0k libxf4bpp.so
+# librecord.so
+# libextmod.so
+# libdbe.so
+
+PACKAGES =+ ${PN}-security-policy \
+ ${PN}-sdl \
+ ${PN}-fbdev \
+ ${PN}-xprint \
+ ${PN}-xvfb \
+ ${PN}-utils \
+ ${PN}-xephyr \
+ ${PN}-multimedia-modules \
+ ${PN}-extension-dri \
+ ${PN}-extension-dri2 \
+ ${PN}-extension-glx \
+ ${PN}-extension-record \
+ ${PN}-extension-extmod \
+ ${PN}-extension-dbe \
+ ${PN}-module-libint10 \
+ ${PN}-module-libafb \
+ ${PN}-module-libwfb \
+ ${PN}-module-libmfb \
+ ${PN}-module-libcfb \
+ ${PN}-module-xaa \
+ ${PN}-module-libxf1bpp \
+ ${PN}-module-libxf4bpp
RDEPENDS_${PN} += xserver-xf86-config xkeyboard-config
-FILES_${PN}-utils = ${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport
${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf
${bindir}/getconfig ${bindir}/getconfig.pl
FILES_${PN} = ${libdir}/X11/Options ${libdir}/X11/Cards
${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy
${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so
${libdir}/xorg/modules/*/*/*.so /etc/X11
FILES_${PN}-doc += ${libdir}/X11/doc
${datadir}/X11/xkb/compiled/README.compiled
@@ -33,6 +66,29 @@ FILES_${PN}-dbg += ${libdir}/xorg/modules/.debug \
${libdir}/xorg/modules/*/*/.debug \
+FILES_${PN}-security-policy += ${libdir}/xserver/SecurityPolicy
+FILES_${PN}-sdl = ${bindir}/Xsdl
+FILES_${PN}-fbdev = ${bindir}/Xfbdev
+FILES_${PN}-xprint = ${libdir}/X11/xserver/*/print
+FILES_${PN}-xvfb = ${bindir}/Xvfb
+FILES_${PN}-utils = ${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport
${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf
${bindir}/getconfig ${bindir}/getconfig.pl
+FILES_${PN}-xephyr = ${bindir}/Xephyr
+FILES_${PN}-multimedia-modules = ${libdir}/xorg/modules/multimedia/*drv*
+FILES_${PN}-extension-dri = ${libdir}/xorg/modules/extensions/libdri.so
+FILES_${PN}-extension-dri2 = ${libdir}/xorg/modules/extensions/libdri2.so
+FILES_${PN}-extension-glx = ${libdir}/xorg/modules/extensions/libglx.so
+FILES_${PN}-extension-record = ${libdir}/xorg/modules/extensions/librecord.so
+FILES_${PN}-extension-extmod = ${libdir}/xorg/modules/extensions/libextmod.so
+FILES_${PN}-extension-dbe = ${libdir}/xorg/modules/extensions/libdbe.so
+FILES_${PN}-module-libint10 = ${libdir}/xorg/modules/libint10.so
+FILES_${PN}-module-libafb = ${libdir}/xorg/modules/libafb.so
+FILES_${PN}-module-libwfb = ${libdir}/xorg/modules/libwfb.so
+FILES_${PN}-module-libmfb = ${libdir}/xorg/modules/libmfb.so
+FILES_${PN}-module-libcfb = ${libdir}/xorg/modules/libcfb.so
+FILES_${PN}-module-xaa = ${libdir}/xorg/modules/libxaa.so
+FILES_${PN}-module-libxf1bpp = ${libdir}/xorg/modules/libxf1bpp.so
+FILES_${PN}-module-libxf4bpp = ${libdir}/xorg/modules/libxf4bpp.so
+
EXTRA_OECONF = --with-fop=no
PACKAGECONFIG ??= udev
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 08/31] xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from xserver-xorg.inc and xserver-xorg-lite.inc to xserver-xorg-common.inc
* xserver-xorg.inc is appending extra xf86driproto dri2proto to PROTO_DEPS and
virtual/libgl to LIB_DEPS
* both lite and dri variants now depend on font-util (from DEPENDS in
xserver-xorg-common.inc)
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/xserver-xorg-common.inc |4
.../xorg-xserver/xserver-xorg-lite.inc |6 --
.../recipes-graphics/xorg-xserver/xserver-xorg.inc |7 ++-
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 0a5d8b6..d901e2c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -20,6 +20,10 @@ S = ${WORKDIR}/${XORG_PN}-${PV}
inherit autotools pkgconfig
+PROTO_DEPS = randrproto renderproto fixesproto damageproto xextproto xproto
xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto
compositeproto recordproto resourceproto videoproto scrnsaverproto evieext
trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto
glproto
+LIB_DEPS = pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile
libpciaccess openssl
+DEPENDS = ${PROTO_DEPS} ${LIB_DEPS} font-util
+
# Split out some modules and extensions from the main package
# These aren't needed for basic operations and only take up space:
# 32.0k libdri.so
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index f1cef1b..a942a11 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,11 +1,5 @@
require xserver-xorg-common.inc
-PROTO_DEPS = randrproto renderproto fixesproto damageproto xextproto xproto
xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto
compositeproto recordproto resourceproto videoproto scrnsaverproto evieext
trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto
glproto
-
-LIB_DEPS = pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile
libpciaccess openssl
-
-DEPENDS = ${PROTO_DEPS} ${LIB_DEPS}
-
RDEPENDS_${PN} += xorg-minimal-fonts
FILES_${PN} += ${bindir}/Xorg
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 9bc0ee4..71754f7 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -1,10 +1,7 @@
require xserver-xorg-common.inc
-PROTO_DEPS = randrproto renderproto fixesproto damageproto xextproto xproto
xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto
compositeproto recordproto resourceproto videoproto scrnsaverproto evieext
trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto
glproto
-
-LIB_DEPS = pixman virtual/libgl libxfont xtrans libxau libxext libxdmcp
libdrm libxkbfile libpciaccess openssl
-
-DEPENDS = ${PROTO_DEPS} ${LIB_DEPS}
+PROTO_DEPS += xf86driproto dri2proto
+LIB_DEPS += virtual/libgl
RDEPENDS_${PN} += xorg-minimal-fonts
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 09/31] xserver-xorg-common: lower xserver-xf86-config and xkeyboard-config dependency to RRECOMMENDS and add few more recipes to RRECOMMENDS
* when someone is using hal or udev explicitly, then he doesn't need
xserver-xf86-config
* add xkeyboard-config to RDEPENDS_${PN}-xvfb
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/xserver-xorg-common.inc |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index d901e2c..099d240 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -60,7 +60,8 @@ PACKAGES =+ ${PN}-security-policy \
${PN}-module-libxf1bpp \
${PN}-module-libxf4bpp
-RDEPENDS_${PN} += xserver-xf86-config xkeyboard-config
+RRECOMMENDS_${PN} += ${PN}-security-policy xkeyboard-config rgb
xserver-xf86-config
+RDEPENDS_${PN}-xvfb += xkeyboard-config
FILES_${PN} = ${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards
${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so
${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt
${datadir}/X11/xorg.conf.d
FILES_${PN}-dev += ${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 11/31] xserver-xorg: remove FILES_${PN} += ${bindir}/Xorg , now we have whole ${bindir} in FILES_ defined in shared .inc
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/xserver-xorg-lite.inc |2 --
.../recipes-graphics/xorg-xserver/xserver-xorg.inc |2 --
2 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index 2483553..b82d153 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,7 +1,5 @@
require xserver-xorg-common.inc
-FILES_${PN} += ${bindir}/Xorg
-
EXTRA_OECONF += --disable-static \
--disable-acfb \
--disable-ccfb \
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 6a4f978..dfad8f3 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -3,8 +3,6 @@ require xserver-xorg-common.inc
PROTO_DEPS += xf86driproto dri2proto
LIB_DEPS += virtual/libgl
-FILES_${PN} += ${bindir}/Xorg
-
EXTRA_OECONF += --disable-static \
--disable-acfb \
--disable-ccfb \
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 10/31] xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to shared .inc
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/xserver-xorg-common.inc |1 +
.../xorg-xserver/xserver-xorg-lite.inc |2 --
.../recipes-graphics/xorg-xserver/xserver-xorg.inc |2 --
3 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 099d240..77c3761 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -60,6 +60,7 @@ PACKAGES =+ ${PN}-security-policy \
${PN}-module-libxf1bpp \
${PN}-module-libxf4bpp
+RDEPENDS_${PN} += xorg-minimal-fonts
RRECOMMENDS_${PN} += ${PN}-security-policy xkeyboard-config rgb
xserver-xf86-config
RDEPENDS_${PN}-xvfb += xkeyboard-config
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index a942a11..2483553 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,7 +1,5 @@
require xserver-xorg-common.inc
-RDEPENDS_${PN} += xorg-minimal-fonts
-
FILES_${PN} += ${bindir}/Xorg
EXTRA_OECONF += --disable-static \
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 71754f7..6a4f978 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -3,8 +3,6 @@ require xserver-xorg-common.inc
PROTO_DEPS += xf86driproto dri2proto
LIB_DEPS += virtual/libgl
-RDEPENDS_${PN} += xorg-minimal-fonts
-
FILES_${PN} += ${bindir}/Xorg
EXTRA_OECONF += --disable-static \
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 13/31] xserver-xorg: move shared EXTRA_OECONF entries to shared .inc
* after this xserver-xorg-lite.inc is disabling only dri/glx
and xserver-xorg.inc is forcing dri/dri2 enabled
the rest is defined in xserver-xorg-common.inc
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/xserver-xorg-common.inc | 21 ++-
.../xorg-xserver/xserver-xorg-lite.inc | 20 +
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 22 +++
3 files changed, 26 insertions(+), 37 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 77c3761..0cc3dc0 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -94,7 +94,26 @@ FILES_${PN}-module-xaa = ${libdir}/xorg/modules/libxaa.so
FILES_${PN}-module-libxf1bpp = ${libdir}/xorg/modules/libxf1bpp.so
FILES_${PN}-module-libxf4bpp = ${libdir}/xorg/modules/libxf4bpp.so
-EXTRA_OECONF = --with-fop=no
+EXTRA_OECONF += --with-fop=no \
+ --disable-static \
+ --disable-acfb \
+ --disable-ccfb \
+ --disable-mcfb \
+ --disable-dga \
+ --disable-xinerama \
+ --disable-xf86misc \
+ --disable-xorgcfg \
+ --disable-record \
+ --disable-dmx \
+ --disable-xnest \
+ --disable-xvfb \
+ --enable-composite \
+ --sysconfdir=/etc/X11 \
+ --localstatedir=/var \
+ --with-fontdir=${datadir}/fonts/X11 \
+ --with-xkb-output=/var/lib/xkb \
+ ac_cv_file__usr_share_sgml_X11_defs_ent=no \
+
PACKAGECONFIG ??= udev
PACKAGECONFIG[hal] = --enable-config-hal,--disable-config-hal,,hal
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index b82d153..be84e9e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,22 +1,6 @@
require xserver-xorg-common.inc
-EXTRA_OECONF += --disable-static \
- --disable-acfb \
- --disable-ccfb \
- --disable-mcfb \
- --disable-dga \
- --disable-xinerama \
- --disable-xf86misc \
- --disable-xorgcfg \
- --disable-record \
- --disable-dmx \
- --disable-xnest \
- --disable-xvfb \
- --enable-composite \
+EXTRA_OECONF += \
--disable-dri \
--disable-glx \
- --sysconfdir=/etc/X11 \
- --localstatedir=/var \
- --with-fontdir=${datadir}/fonts/X11 \
- --with-xkb-output=/var/lib/xkb \
- ac_cv_file__usr_share_sgml_X11_defs_ent=no
+
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 726fbaa..f734873 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -5,26 +5,12 @@ LIB_DEPS += virtual/libgl
require ../mesa/glx-use-tls.inc
-EXTRA_OECONF += --disable-static \
- --disable-acfb \
- --disable-ccfb \
- --disable-mcfb \
- --disable-dga \
- --disable-xinerama \
- --disable-xf86misc \
- --disable-xorgcfg \
- --disable-record \
- --disable-dmx \
- --disable-xnest \
- --disable-xvfb \
- --enable-composite \
- --sysconfdir=/etc/X11 \
- --localstatedir=/var \
+EXTRA_OECONF += \
+ --enable-dri \
+ --enable-dri2 \
--with-pic \
--with-int10=x86emu \
- --with-fontdir=${datadir}/fonts/X11 \
- --with-xkb-output=/var/lib/xkb \
- ac_cv_file__usr_share_sgml_X11_defs_ent=no
+
# Due to mesa-dri
COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 14/31] xserver-xorg: add new version 1.11.1
* move shared definitions to .inc file
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-xserver/xserver-xorg-1.11.1.inc |7 +++
.../xorg-xserver/xserver-xorg-lite_1.11.1.bb |2 ++
.../xorg-xserver/xserver-xorg_1.11.1.bb|4
3 files changed, 13 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
create mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
new file mode 100644
index 000..690de3f
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
@@ -0,0 +1,7 @@
+SRC_URI += file://crosscompile.patch
+
+# Misc build failure for master HEAD
+SRC_URI += file://fix_open_max_preprocessor_error.patch
+
+SRC_URI[md5sum] = 4cdf54dc569b6a5548257c93a45dcd3d
+SRC_URI[sha256sum] =
c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
new file mode 100644
index 000..799b11a
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
@@ -0,0 +1,2 @@
+require xserver-xorg-lite.inc
+require xserver-xorg-${PV}.inc
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
new file mode 100644
index 000..8e97888
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
@@ -0,0 +1,4 @@
+require xserver-xorg.inc
+require xserver-xorg-${PV}.inc
+
+PE = 1
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 15/31] xserver-xorg: remove old 1.10.1 version
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../xorg-xserver/xserver-xorg-lite_1.10.1.bb | 12 .../xorg-xserver/xserver-xorg_1.10.1.bb| 20 2 files changed, 0 insertions(+), 32 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb deleted file mode 100644 index 63b2c38..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb +++ /dev/null @@ -1,12 +0,0 @@ -require xserver-xorg-lite.inc - -LIC_FILES_CHKSUM = file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00 - -PR = r3 - -DEPENDS += font-util - -SRC_URI += file://crosscompile.patch - -# Misc build failure for master HEAD -SRC_URI += file://fix_open_max_preprocessor_error.patch; diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb deleted file mode 100644 index 0194798..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -require xserver-xorg.inc - -LIC_FILES_CHKSUM = file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00 - -PROTO_DEPS += xf86driproto dri2proto - -DEPENDS += font-util - -PE = 1 -PR = r3 - -SRC_URI += file://crosscompile.patch - -# Misc build failure for master HEAD -SRC_URI += file://fix_open_max_preprocessor_error.patch - -SRC_URI[md5sum] = 75f117c74f2ecaf9dd167f6a66ac98de -SRC_URI[sha256sum] = 143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d - -EXTRA_OECONF += --enable-dri --enable-dri2 -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 16/31] xserver-xorg: remove COMPATIBLE_HOST
* ie om-gta02 has mesa-dri module too so this should be limited in mesa-dri only Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../recipes-graphics/xorg-xserver/xserver-xorg.inc |3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index f734873..01cdd68 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -11,6 +11,3 @@ EXTRA_OECONF += \ --with-pic \ --with-int10=x86emu \ - -# Due to mesa-dri -COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 18/31] xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use same directory from xserver-xf86-lite recipe
* FILESEXTRAPATHS needs to be in xserver-xf86-lite_1.11.1
because in .inc we don't have ${PV} expanded yet
* crosscompile.patch macro_tweak.patch were identical
* fix_open_max_preprocessor_error.patch has only different header
# $ diff xserver-xorg/fix_open_max_preprocessor_error.patch
xserver-xorg-dri/fix_open_max_preprocessor_error.patch
1c1
Upstream-Status: Pending
---
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../crosscompile.patch |0
.../fix_open_max_preprocessor_error.patch |0
.../macro_tweak.patch |7 +
.../xserver-xorg-lite/macro_tweak.patch| 30
.../xorg-xserver/xserver-xorg-lite_1.11.1.bb |2 +
.../xorg-xserver/xserver-xorg/crosscompile.patch | 22 --
.../fix_open_max_preprocessor_error.patch | 15 --
7 files changed, 3 insertions(+), 73 deletions(-)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-lite =
xserver-xorg-1.11.1}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg-lite =
xserver-xorg-1.11.1}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xorg =
xserver-xorg-1.11.1}/macro_tweak.patch (75%)
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
delete mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
diff --git
a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch
similarity index 100%
rename from
meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
rename to
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/crosscompile.patch
diff --git
a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preprocessor_error.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/fix_open_max_preprocessor_error.patch
similarity index 100%
rename from
meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preprocessor_error.patch
rename to
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch
similarity index 75%
rename from meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
rename to
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch
index 2b32d4e..ec0eea6 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1/macro_tweak.patch
@@ -1,10 +1,5 @@
This is the revised version of files/macro_tweak.patch for
-xorg-server 1.8.99.904.
-
-the files/macro_tweak.patch can not removed now since it is used by
-xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
-are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
-can be safely replace by this patch.
+xorg-server 1.8.99.904 and newer.
Upstream-Status: Pending
diff --git
a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
deleted file mode 100644
index 2b32d4e..000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-This is the revised version of files/macro_tweak.patch for
-xorg-server 1.8.99.904.
-
-the files/macro_tweak.patch can not removed now since it is used by
-xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
-are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
-can be safely replace by this patch.
-
-Upstream-Status: Pending
-
-Signed-off-by: Yu Ke ke...@intel.com
-
-diff --git a/xorg-server.m4 b/xorg-server.m4
-index bdecf62..040fdb8 100644
a/xorg-server.m4
-+++ b/xorg-server.m4
-@@ -28,10 +28,12 @@ dnl
- # Checks for the $1 define in xorg-server.h (from the sdk). If it
- # is defined, then add $1 to $REQUIRED_MODULES.
-
-+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR)
-+
- AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
- AC_REQUIRE([PKG_PROG_PKG_CONFIG])
- SAVE_CFLAGS=$CFLAGS
-- CFLAGS=$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`
-+ CFLAGS=$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir
xorg-server`
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include xorg-server.h
- #if !defined $1
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
index 799b11a..ec29b21 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
+++
[OE-core] [oe-core][PATCHv3 19/31] xserver-kdrive: drop unused files (same files are in xserver-kdrive-1.7.99.2 directory
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../xorg-xserver/xserver-kdrive/disable-apm.patch | 24 -- .../xserver-kdrive/disable-xf86-dga-xorgcfg.patch | 43 -- .../xorg-xserver/xserver-kdrive/extra-kmodes.patch | 87 .../xserver-kdrive/fbdev_xrandr_ioctl.patch| 63 -- .../xserver-kdrive/no-serial-probing.patch | 17 5 files changed, 0 insertions(+), 234 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch deleted file mode 100644 index c22b1c0..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Yu Ke ke...@intel.com - xserver/hw/kdrive/linux/linux.c.orig 2005-04-23 15:56:13.988849232 + -+++ xserver/hw/kdrive/linux/linux.c2005-04-23 15:57:05.001094192 + -@@ -342,7 +342,7 @@ - /* - * Open the APM driver - */ --LinuxApmFd = open (/dev/apm_bios, 2); -+/*LinuxApmFd = open (/dev/apm_bios, 2); - if (LinuxApmFd 0 errno == ENOENT) - LinuxApmFd = open (/dev/misc/apm_bios, 2); - if (LinuxApmFd = 0) -@@ -352,7 +352,7 @@ - RegisterBlockAndWakeupHandlers (LinuxApmBlock, LinuxApmWakeup, 0); - AddEnabledDevice (LinuxApmFd); - } -- -+*/ - /* - * now get the VT - */ diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch deleted file mode 100644 index 631c111..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch +++ /dev/null @@ -1,43 +0,0 @@ -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Yu Ke ke...@intel.com - -Index: xorg-server-1.3.0.0/configure.ac -=== xorg-server-1.3.0.0.orig/configure.ac 2007-04-20 03:23:40.0 +0200 -+++ xorg-server-1.3.0.0/configure.ac 2007-05-09 16:51:34.0 +0200 -@@ -520,7 +520,11 @@ - XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la' - - dnl Core modules for most extensions, et al. -+if test $KDRIVE = yes; then -+REQUIRED_MODULES=[randrproto = 1.2] renderproto [fixesproto = 4.0] [damageproto = 1.1] xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto = 1.1] bigreqsproto resourceproto fontsproto inputproto [kbproto = 1.0.3] -+else - REQUIRED_MODULES=[randrproto = 1.2] renderproto [fixesproto = 4.0] [damageproto = 1.1] xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto = 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto [kbproto = 1.0.3] -+fi - REQUIRED_LIBS=xfont xau fontenc - - AM_CONDITIONAL(XV, [test x$XV = xyes]) -@@ -1603,7 +1607,9 @@ - AC_SUBST(XKB_COMPILED_DIR) - - dnl and the rest of these are generic, so they're in config.h -+if test ! x$KDRIVE = xyes; then - AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) -+fi - AC_DEFINE(XResExtension, 1, [Build XRes extension]) - - AC_TRY_COMPILE([ -@@ -1616,10 +1622,12 @@ - - AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) - -+if test ! x$KDRIVE = xyes ; then - dnl xorgconfig CLI configuration utility - PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11]) - AC_SUBST(XORGCONFIG_DEP_CFLAGS) - AC_SUBST(XORGCONFIG_DEP_LIBS) -+fi - - dnl xorgcfg GUI configuration utility - AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg], diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch b/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch deleted file mode 100644 index 896c033..000 --- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch +++ /dev/null @@ -1,87 +0,0 @@ -Add some extra video modes and change the default to VGA. - -Upstream-Status: Pending - -Signed-off-by: Yu Ke ke...@intel.com - - hw/kdrive/src/kmode.c | 41 +++-- - 1 file changed, 39 insertions(+), 2 deletions(-) - -Index: xorg-server-1.3.0.0/hw/kdrive/src/kmode.c -=== xorg-server-1.3.0.0.orig/hw/kdrive/src/kmode.c 2008-01-11 14:20:47.0 + -+++ xorg-server-1.3.0.0/hw/kdrive/src/kmode.c 2008-01-11 14:21:18.0 +
[OE-core] [PATCH] python-argparse: import from meta-oe, needed for newer glib
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../python/python-argparse_1.2.1.bb| 15 +++
1 files changed, 15 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-devtools/python/python-argparse_1.2.1.bb
diff --git a/meta/recipes-devtools/python/python-argparse_1.2.1.bb
b/meta/recipes-devtools/python/python-argparse_1.2.1.bb
new file mode 100644
index 000..a74c533
--- /dev/null
+++ b/meta/recipes-devtools/python/python-argparse_1.2.1.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = Python command-line parsing library
+SECTION = devel/python
+LICENSE = PSF
+LIC_FILES_CHKSUM = file://LICENSE.txt;md5=09d08bb5b7047e2688ea3faad6408aa8
+SRCNAME = argparse
+
+SRC_URI = http://argparse.googlecode.com/files/${SRCNAME}-${PV}.tar.gz;
+SRC_URI[md5sum] = 2fbef8cb61e506c706957ab6e135840c
+SRC_URI[sha256sum] =
ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
+
+S = ${WORKDIR}/${SRCNAME}-${PV}
+
+inherit setuptools
+
+BBCLASSEXTEND = native
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 21/31] xorg-driver-common.inc: bump INC_PR to rebuild drivers agains new xserver-xorg ABI
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../xorg-driver/xorg-driver-common.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index da3a90b..097060e 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc @@ -5,7 +5,7 @@ SECTION = x11/drivers LICENSE = MIT-X PE = 1 -INC_PR = r15 +INC_PR = r17 DEPENDS = virtual/xserver xproto randrproto util-macros -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 22/31] libx11: package xcb, merge few changes from meta-oe
* move --with-keysymdef/--with-keysymdefdir setting to recipes (newer
versions are using keysymdefdir instead keysymdef
* fix MIN_REHASH in makekeys by sed call
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb |2 +-
meta/recipes-graphics/xorg-lib/libx11-diet_git.bb |2 +-
.../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb |2 +-
meta/recipes-graphics/xorg-lib/libx11-trim_git.bb |2 +-
meta/recipes-graphics/xorg-lib/libx11.inc | 25 ---
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb |2 +-
meta/recipes-graphics/xorg-lib/libx11_git.bb |2 +
7 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
index e7ad2d8..d97a5b8 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
@@ -22,5 +22,5 @@ DEPENDS += bigreqsproto xproto xextproto xtrans libxau
xcmiscproto \
FILESDIR = ${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11
-EXTRA_OECONF += --without-xcb --disable-udc --disable-xcms --disable-xlocale
+EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h
--without-xcb --disable-udc --disable-xcms --disable-xlocale
CFLAGS += -D_GNU_SOURCE
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
index dea7faf..4cda779 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
@@ -13,5 +13,5 @@ DEPENDS += bigreqsproto xproto xextproto xtrans libxau
xcmiscproto \
SRCREV = d23aad31338e7d869d878d5aa1b6b91d20287005
-EXTRA_OECONF += --without-xcb --disable-udc --disable-xcms --disable-xlocale
+EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h
--without-xcb --disable-udc --disable-xcms --disable-xlocale
CFLAGS += -D_GNU_SOURCE
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
index 5a63c53..3c33de9 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
@@ -17,4 +17,4 @@ SRC_URI += file://../libx11-${PV}/x11_disable_makekeys.patch
\
SRC_URI[md5sum] = f65c9c7ecbfb64c19dbd7927160d63fd
SRC_URI[sha256sum] =
88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844
-EXTRA_OECONF += --disable-xcms --with-xcb
+EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h
--disable-xcms --with-xcb
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
index 730efe1..d1bf67b 100644
--- a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
@@ -8,6 +8,6 @@ SRCREV = d23aad31338e7d869d878d5aa1b6b91d20287005
DEPENDS += libxcb xproto xextproto xtrans libxau kbproto inputproto
xf86bigfontproto xproto-native
-EXTRA_OECONF += --disable-xcms --with-xcb
+EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h
--disable-xcms --with-xcb
CFLAGS += -D_GNU_SOURCE
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc
b/meta/recipes-graphics/xorg-lib/libx11.inc
index 455753f..748a48c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -11,32 +11,39 @@ inherit siteinfo
PROVIDES = virtual/libx11
XORG_PN = libX11
-LEAD_SONAME = libX11.so
+LICENSE = MIT MIT-style BSD
+LIC_FILES_CHKSUM = file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7
-EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h
--disable-specs
+EXTRA_OECONF += --with-groff=no --with-ps2pdf=no --with-fop=no
--disable-specs
+
+PACKAGES =+ ${PN}-xcb
FILES_${PN} += ${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB
${libdir}/X11/Xcms.txt
+FILES_${PN}-xcb += ${libdir}/libX11-xcb.so.*
FILES_${PN}-locale += ${datadir}/X11/locale ${libdir}/X11/locale
-do_compile() {
+do_compile_prepend() {
cd ${S}/src/util
mv makekeys.c.orig makekeys.c || true
touch makekeys-makekeys.o
(
unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+ # MIN_REHASH 10 is only in 1.0.1
+ sed -i -e 's:MIN_REHASH 10:MIN_REHASH 16:g' makekeys.c
+ sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c
+ touch makekeys-makekeys.o;
if [ ${SITEINFO_BITS} == 64 ]; then
-${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}
makekeys.c -o makekeys
-else
-${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}
-DUSE32 makekeys.c -o makekeys
-fi
+ ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}
makekeys.c -o makekeys
+ else
+ ${BUILD_CC}
[OE-core] [oe-core][PATCHv3 23/31] libx11: add new version 1.4.4
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../xorg-lib/libx11-1.4.4/keysymdef_include.patch | 23 +++
.../libx11-1.4.4/x11_disable_makekeys.patch| 29
meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb | 18
3 files changed, 70 insertions(+), 0 deletions(-)
create mode 100644
meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
create mode 100644
meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
diff --git
a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
new file mode 100644
index 000..d1bdab9
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
@@ -0,0 +1,23 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Martin Jansa martin.ja...@gmail.com
+
+diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
+--- libX11-1.3.6.orig//configure.ac2010-09-20 08:04:16.0 +0200
libX11-1.3.6/configure.ac 2010-09-28 16:29:26.0 +0200
+@@ -355,7 +355,14 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysym definitions])
+-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
++AC_ARG_WITH(keysymdefdir,
++AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of
keysymdef.h]),
++KEYSYMDEFDIR=$withval, KEYSYMDEFDIR=)
++
++if test x$KEYSYMDEFDIR = x; then
++ KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
++fi
++
+ FILES=keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h
+ for i in $FILES; do
+ if test -f $KEYSYMDEFDIR/$i; then
diff --git
a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
new file mode 100644
index 000..9763313
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
@@ -0,0 +1,29 @@
+Index: libX11-1.3.4/src/util/Makefile.am
+===
+--- libX11-1.3.4.orig/src/util/Makefile.am
libX11-1.3.4/src/util/Makefile.am
+@@ -1,24 +1 @@
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS = \
+- $(X11_CFLAGS) \
+- $(CWARNFLAGS)
+-
+-CC = @CC_FOR_BUILD@
+-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+-CFLAGS = @CFLAGS_FOR_BUILD@
+-LDFLAGS = @LDFLAGS_FOR_BUILD@
+-
+ EXTRA_DIST = mkks.sh
+-
+-if LINT
+-# Check source code with tools like lint sparse
+-
+-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+-
+-lint:
+- $(LINT) $(ALL_LINT_FLAGS) makekeys.c
+-
+-endif LINT
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
new file mode 100644
index 000..823b3dc
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
@@ -0,0 +1,18 @@
+require libx11.inc
+inherit gettext
+
+BBCLASSEXTEND = native nativesdk
+
+EXTRA_OECONF += --with-keysymdefdir=${STAGING_INCDIR}/X11
+
+DEPENDS += util-macros xtrans libxdmcp libxau \
+bigreqsproto xproto xextproto xcmiscproto \
+xf86bigfontproto kbproto inputproto libxcb \
+xproto-native
+
+SRC_URI += file://keysymdef_include.patch \
+ file://x11_disable_makekeys.patch \
+
+
+SRC_URI[md5sum] = ed7c382cbf8c13425b6a66bcac0ca5d9
+SRC_URI[sha256sum] =
7fe62180f08ef5f0a0062fb444591e349cae2ab5af6ad834599f5c654e6c840d
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 24/31] libx11: remove older 1.3.4
* libx11-1.3.4 directory is kept for libx11-trim_1.3.4.bb
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 35
1 files changed, 0 insertions(+), 35 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
deleted file mode 100644
index ffec7d1..000
--- a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-require libx11.inc
-inherit gettext
-
-LICENSE = MIT MIT-style BSD
-LIC_FILES_CHKSUM = file://COPYING;md5=bf75bfe4d05068311b5e6862d4b5f2c5
-
-PE = 1
-PR = r4
-
-SRC_URI += file://x11_disable_makekeys.patch \
-file://nodolt.patch \
-file://include_fix.patch \
- file://makekeys_crosscompile.patch
-
-SRC_URI[md5sum] = f65c9c7ecbfb64c19dbd7927160d63fd
-SRC_URI[sha256sum] =
88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844
-
-DEPENDS += bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-libxdmcp xf86bigfontproto kbproto inputproto xproto-native libxcb
-
-DEPENDS_virtclass-native += bigreqsproto-native xextproto-native \
-xtrans-native libxau-native xcmiscproto-native \
-libxdmcp-native xf86bigfontproto-native kbproto-native \
-inputproto-native xproto-native
-
-DEPENDS_virtclass-nativesdk += bigreqsproto xproto xextproto \
-xtrans libxau xcmiscproto libxdmcp xf86bigfontproto kbproto \
-inputproto xproto-native
-
-XCB = --with-xcb
-XCB_virtclass-native = --without-xcb
-XCB_virtclass-nativesdk = --without-xcb
-EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h ${XCB}
-
-BBCLASSEXTEND = native nativesdk
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 25/31] libx11: drop old 1.2.2 git version
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-graphics/xorg-lib/libx11-diet_git.bb | 17 -
.../xorg-lib/libx11-git/X18NCMSstubs.diff | 570
.../xorg-lib/libx11-git/fix-disable-xlocale.diff | 16 -
.../libx11-git/fix-utf8-wrong-define.patch | 17 -
.../xorg-lib/libx11-git/include_fix.patch | 25 -
.../xorg-lib/libx11-git/nodolt.patch | 14 -
.../xorg-lib/libx11-git/x11_disable_makekeys.patch | 30 -
meta/recipes-graphics/xorg-lib/libx11-trim_git.bb | 13 -
meta/recipes-graphics/xorg-lib/libx11_git.bb | 16 -
meta/recipes-graphics/xorg-lib/libx11_git.inc | 11 -
10 files changed, 0 insertions(+), 729 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
delete mode 100644
meta/recipes-graphics/xorg-lib/libx11-git/fix-disable-xlocale.diff
delete mode 100644
meta/recipes-graphics/xorg-lib/libx11-git/fix-utf8-wrong-define.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/nodolt.patch
delete mode 100644
meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_git.inc
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
deleted file mode 100644
index 4cda779..000
--- a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-require libx11.inc
-require libx11_git.inc
-
-DESCRIPTION += Support for XCB, UDC, XCMS and XLOCALE is disabled in \
-this version.
-
-SRC_URI += file://X18NCMSstubs.diff \
-file://fix-disable-xlocale.diff \
-file://fix-utf8-wrong-define.patch
-
-DEPENDS += bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
-libxdmcp xf86bigfontproto kbproto inputproto xproto-native
-
-SRCREV = d23aad31338e7d869d878d5aa1b6b91d20287005
-
-EXTRA_OECONF += --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h
--without-xcb --disable-udc --disable-xcms --disable-xlocale
-CFLAGS += -D_GNU_SOURCE
diff --git a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
b/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
deleted file mode 100644
index b49fc22..000
--- a/meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
+++ /dev/null
@@ -1,570 +0,0 @@
-Upstream-Status: Pending
-
- configure.ac |9 -
- src/Makefile.am|5
- src/X18NCMSstubs.c | 428
+
- src/imConv.c |4
- src/locking.c |4
- 5 files changed, 448 insertions(+), 2 deletions(-)
-
git.orig/configure.ac
-+++ git/configure.ac
-@@ -263,11 +263,18 @@ if test -f $KEYSYMDEF; then
- else
- AC_MSG_ERROR([Cannot find keysymdef.h])
- fi
- AC_SUBST(KEYSYMDEF)
-
--AM_CONDITIONAL(UDC, test xfalse = xtrue)
-+AC_ARG_ENABLE(udc,
-+ AC_HELP_STRING([--disable-udc],
-+[Disable Xlib support for UDC *EXPERIMENTAL*]),
-+ [UDC=$enableval],[UDC=yes])
-+AM_CONDITIONAL(UDC, [test x$UDC = xyes ])
-+if test x$UDC = xyes; then
-+ AC_DEFINE(UDC,1,[Include support for UDC])
-+fi
-
- AC_ARG_ENABLE(xcms,
- AC_HELP_STRING([--disable-xcms],
- [Disable Xlib support for CMS *EXPERIMENTAL*]),
- [XCMS=$enableval],[XCMS=yes])
git.orig/src/Makefile.am
-+++ git/src/Makefile.am
-@@ -329,18 +329,21 @@ endif
-
- if THRSTUBS
- libX11_la_SOURCES+=UIThrStubs.c
- endif
-
-+libX11_la_SOURCES+=X18NCMSstubs.c
-+
- x11datadir = @X11_DATADIR@
- x11data_DATA = XKeysymDB XErrorDB
-
- EXTRA_DIST = \
- $(x11data_DATA) \
- os2Stubs.c \
- udcInf.c \
-- UIThrStubs.c
-+ UIThrStubs.c \
-+ X18NCMSstubs.c
-
- if XCB
- libX11_la_SOURCES += \
- xcb_lock.c \
- xcb_disp.c \
/dev/null
-+++ git/src/X18NCMSstubs.c
-@@ -0,0 +1,428 @@
-+/*
-+ * X18NCMSstubs.c
-+ * - Provides stubs and dummy funcs needed when Xcms and XLocale stuff removed
-+ *
-+ * Copyright � 2003 Matthew Allum
-+ *
-+ * Permission to use, copy, modify, distribute, and sell this software and its
-+ * documentation for any purpose is hereby granted without fee, provided that
-+ * the above copyright notice appear in all copies and that both that
-+ * copyright notice and this permission notice appear in supporting
-+ * documentation, and that the name of Matthew Allum not be used in
-+ * advertising or publicity pertaining to distribution of the software without
-+ * specific, written prior permission. Keith Packard and Compaq makes no
-+ * representations about the suitability of this software for any
[OE-core] [oe-core][PATCHv3 26/31] libx11-trim: move files for libx11-trim from libx11-1.3.4 to libx11-trim-1.3.4
* because there isn't libx11-1.3.4 recipe anymore
* remove older versions from libx11-trim directory
* notice that DESCRIPTION says xcb is disabled and EXTRA_OECONF has
--with-xcb
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
.../{libx11 = libx11-diet-1.3}/X18NCMSstubs.diff |0
.../fix-disable-xlocale.diff |0
.../fix-utf8-wrong-define.patch|0
.../include_fix.patch |0
.../makekeys_crosscompile.patch|0
.../nodolt.patch |0
.../x11_disable_makekeys.patch |0
.../xorg-lib/libx11-trim/include_fix.patch | 25
.../xorg-lib/libx11-trim/nodolt.patch | 14 -
.../libx11-trim/x11_disable_makekeys.patch | 31
.../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb |8 ++--
11 files changed, 4 insertions(+), 74 deletions(-)
rename meta/recipes-graphics/xorg-lib/{libx11 =
libx11-diet-1.3}/X18NCMSstubs.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11 =
libx11-diet-1.3}/fix-disable-xlocale.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11 =
libx11-diet-1.3}/fix-utf8-wrong-define.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 =
libx11-trim-1.3.4}/include_fix.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 =
libx11-trim-1.3.4}/makekeys_crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 =
libx11-trim-1.3.4}/nodolt.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 =
libx11-trim-1.3.4}/x11_disable_makekeys.patch (100%)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
delete mode 100644
meta/recipes-graphics/xorg-lib/libx11-trim/x11_disable_makekeys.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/X18NCMSstubs.diff
rename to meta/recipes-graphics/xorg-lib/libx11-diet-1.3/X18NCMSstubs.diff
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
rename to
meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-disable-xlocale.diff
diff --git a/meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
b/meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
rename to
meta/recipes-graphics/xorg-lib/libx11-diet-1.3/fix-utf8-wrong-define.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.3.4/include_fix.patch
rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/include_fix.patch
diff --git
a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
similarity index 100%
rename from
meta/recipes-graphics/xorg-lib/libx11-1.3.4/makekeys_crosscompile.patch
rename to
meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/makekeys_crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-lib/libx11-1.3.4/nodolt.patch
rename to meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/nodolt.patch
diff --git
a/meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
b/meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
similarity index 100%
rename from
meta/recipes-graphics/xorg-lib/libx11-1.3.4/x11_disable_makekeys.patch
rename to
meta/recipes-graphics/xorg-lib/libx11-trim-1.3.4/x11_disable_makekeys.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
b/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
deleted file mode 100644
index b3bcbab..000
--- a/meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
- configure.ac |6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
libX11-1.1.5.orig/configure.ac
-+++ libX11-1.1.5/configure.ac
-@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS)
- AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])],
)
-
- #
- # Find keysymdef.h
- #
--AC_MSG_CHECKING([keysymdef.h])
--dir=`pkg-config --variable=includedir xproto`
Re: [OE-core] [oe-core][WIP][PATCH 8/9] glib: upgrade to 2.30.0
On Fri, Oct 07, 2011 at 04:05:34PM +0100, Richard Purdie wrote: On Fri, 2011-09-30 at 17:43 +0200, Martin Jansa wrote: Signed-off-by: Martin Jansa martin.ja...@gmail.com --- ...003-gatomic-proper-pointer-get-cast.patch.patch | 28 -- .../0005-glib-mkenums-interpreter.patch.patch | 25 - .../60_wait-longer-for-threads-to-die.patch| 24 +- meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch |2 - .../glib-2.0/remove.test.for.qsort_r.patch | 53 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb | 23 - meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 41 +++ 7 files changed, 106 insertions(+), 90 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb +DEPENDS += libffi python-argparse-native +DEPENDS_virtclass-native += libffi-native python-argparse-native Just to be clear on the status of this, the above dependencies present a problem for OE-Core :( python-argparse: import from meta-oe, needed for newer glib was added on top of jansa/glib branch to resolve this.. Regards, -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 28/31] mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move uclibc.patch
* uclibc patch does apply to all mesa versions and adding mesa-dri to
FILESPATH in all recipes is worse then adding mesa
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-graphics/mesa/mesa-common.inc | 36 +---
meta/recipes-graphics/mesa/mesa-dri.inc| 22
meta/recipes-graphics/mesa/mesa-xlib.inc |1 +
.../mesa/{mesa-dri = mesa}/uclibc.patch |0
4 files changed, 54 insertions(+), 5 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa-dri.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-xlib.inc
rename meta/recipes-graphics/mesa/{mesa-dri = mesa}/uclibc.patch (100%)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc
b/meta/recipes-graphics/mesa/mesa-common.inc
index d8e800e..85db07a 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -10,25 +10,51 @@ HOMEPAGE = http://mesa3d.org;
BUGTRACKER = https://bugs.freedesktop.org;
SECTION = x11
LICENSE = MIT
+LIC_FILES_CHKSUM =
file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d
-SRC_URI =
ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;name=mesalib \
-
ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaDemos-${PV}.tar.bz2;name=mesademos
+INC_PR = r12
+PE = 2
+PROTO_DEPS = xf86driproto glproto
+LIB_DEPS = virtual/libx11 libxext libxxf86vm libxdamage libxfixes
+
+DEPENDS = makedepend-native ${PROTO_DEPS} ${LIB_DEPS}
+
+SRC_URI = ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;
S = ${WORKDIR}/Mesa-${PV}
PROVIDES = virtual/libgl
+# for mesa-dri and mesa-xlib
+FILESEXTRAPATHS_append := ${THISDIR}/mesa:${THISDIR}/mesa-${PV}:
+
inherit autotools pkgconfig
EXTRA_OECONF = --enable-glu \
--disable-glw \
--disable-glut \
---enable-glx-tls
+
+
+require glx-use-tls.inc
# Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = 1
-PACKAGES =+ libglu libglu-dev
-
+PACKAGES =+ libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa
libosmesa-dev libgl libgl-dev
+FILES_libegl = ${libdir}/libEGL.so.* ${libdir}/egl/*.so
+FILES_libgl = ${libdir}/libGL.so.*
FILES_libglu = ${libdir}/libGLU.so.*
+FILES_libosmesa = ${libdir}/libOSMesa.so.*
+
+FILES_libegl-dev = ${libdir}/libEGL.* ${includedir}/EGL
+FILES_libgl-dev = ${libdir}/libGL.* ${includedir}/GL
FILES_libglu-dev = ${libdir}/libGLU.* ${includedir}/GL/glu*.h
+FILES_libosmesa-dev = ${libdir}/libOSMesa.* ${includedir}/osmesa.h
+
+FILES_${PN}-dbg += ${libdir}/dri/.debug/*
+FILES_libegl-dbg += ${libdir}/egl/.debug/*
+
+do_install_append () {
+install -d ${D}/${includedir}/GL
+cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
+}
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc
b/meta/recipes-graphics/mesa/mesa-dri.inc
new file mode 100644
index 000..ce98228
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -0,0 +1,22 @@
+DEPENDS += dri2proto expat libdrm
+
+# most of our targets do not have DRI so will use mesa-xlib
+DEFAULT_PREFERENCE = -1
+
+MACHINE_DRI_MODULES ?=
+PACKAGE_ARCH =
${@['${MACHINE_ARCH}','${TUNE_PKGARCH}'][bb.data.getVar('MACHINE_DRI_MODULES',d,1)
== '']}
+
+EXTRA_OECONF += --with-driver=dri --disable-egl --disable-gallium
-with-dri-drivers=swrast,${MACHINE_DRI_MODULES}
+
+python populate_packages_prepend() {
+ import os.path
+
+ dri_drivers_root = os.path.join(bb.data.getVar('libdir', d, 1), dri)
+
+ do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$',
'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
+}
+
+PACKAGES_DYNAMIC = mesa-dri-driver-*
+
+FILES_${PN}-dbg += ${libdir}/dri/.debug/*
+
diff --git a/meta/recipes-graphics/mesa/mesa-xlib.inc
b/meta/recipes-graphics/mesa/mesa-xlib.inc
new file mode 100644
index 000..44e5dc6
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-xlib.inc
@@ -0,0 +1 @@
+EXTRA_OECONF += --with-driver=xlib
diff --git a/meta/recipes-graphics/mesa/mesa-dri/uclibc.patch
b/meta/recipes-graphics/mesa/mesa/uclibc.patch
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-dri/uclibc.patch
rename to meta/recipes-graphics/mesa/mesa/uclibc.patch
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 30/31] mesa: add new version 7.11
Signed-off-by: Martin Jansa martin.ja...@gmail.com
---
meta/recipes-graphics/mesa/mesa-7.11.inc | 15 ++
.../mesa/mesa-dri-glsl-native_7.11.bb | 28
meta/recipes-graphics/mesa/mesa-dri_7.11.bb|4 +++
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb |4 +++
4 files changed, 51 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa-7.11.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.11.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
diff --git a/meta/recipes-graphics/mesa/mesa-7.11.inc
b/meta/recipes-graphics/mesa/mesa-7.11.inc
new file mode 100644
index 000..98b888f
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-7.11.inc
@@ -0,0 +1,15 @@
+SRC_URI = ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+ file://uclibc.patch \
+
+
+DEPENDS += mesa-dri-glsl-native
+
+SRC_URI[md5sum] = ff03aca82d0560009a076a87c888cf13
+SRC_URI[sha256sum] =
f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf
+
+do_configure_prepend() {
+ #check for python not python2, because python-native does not stage python2
binary/link
+ sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2
python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac
+ # We need builtin_compiler built for buildhost arch instead of target (is
provided by mesa-dri-glsl-native)
+ sed -i
s#\./builtin_compiler#${STAGING_BINDIR_NATIVE}/glsl/builtin_compiler#g
${S}/src/glsl/Makefile
+}
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
new file mode 100644
index 000..f1987fd
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = gl shader language specific build from mesa-dri
+HOMEPAGE = http://mesa3d.org;
+BUGTRACKER = https://bugs.freedesktop.org;
+SECTION = x11
+LICENSE = GPLv3+
+LIC_FILES_CHKSUM =
file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9
+
+DEPENDS = makedepend-native
+
+SRC_URI = ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2;
+
+SRC_URI[md5sum] = ff03aca82d0560009a076a87c888cf13
+SRC_URI[sha256sum] =
f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf
+
+S = ${WORKDIR}/Mesa-${PV}/src/glsl/
+
+inherit native
+
+# use default config for native build
+do_configure_prepend() {
+ ln -s ${S}/../../configs/default ${S}/../../configs/current
+}
+
+do_install() {
+ install -d ${D}/${bindir}/glsl
+ install -m 755 ${S}/builtin_compiler
${D}/${bindir}/glsl/builtin_compiler
+ install -m 755 ${S}/glsl_compiler ${D}/${bindir}/glsl/glsl_compiler
+}
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
new file mode 100644
index 000..26b56e4
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -0,0 +1,4 @@
+require mesa-common.inc
+require mesa-${PV}.inc
+require mesa-dri.inc
+PR = ${INC_PR}.0
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
new file mode 100644
index 000..93bb8cd
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
@@ -0,0 +1,4 @@
+require mesa-common.inc
+require mesa-${PV}.inc
+require mesa-xlib.inc
+PR = ${INC_PR}.0
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCHv3 12/31] xserver-xorg: replace hardcoded --enable-glx-tls with glx-use-tls.inc, which doesn't enable it for uClibc
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- .../recipes-graphics/xorg-xserver/xserver-xorg.inc |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index dfad8f3..726fbaa 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -3,6 +3,8 @@ require xserver-xorg-common.inc PROTO_DEPS += xf86driproto dri2proto LIB_DEPS += virtual/libgl +require ../mesa/glx-use-tls.inc + EXTRA_OECONF += --disable-static \ --disable-acfb \ --disable-ccfb \ @@ -16,7 +18,6 @@ EXTRA_OECONF += --disable-static \ --disable-xnest \ --disable-xvfb \ --enable-composite \ - --enable-glx-tls \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ --with-pic \ -- 1.7.7 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] farsight2, ldconfig-native, gnutls: There is no GPLv2.1, correct the fields
The licenses were either LGPLv2.1 or GPLv2
make the changes appropriately
Signed-off-by: Khem Raj raj.k...@gmail.com
---
.../farsight/farsight2_0.0.9.bb|4 ++--
meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb |4 ++--
meta/recipes-support/gnutls/gnutls.inc |4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb
b/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb
index a7bdc97..ee0ce8a 100644
--- a/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb
+++ b/meta-demoapps/recipes-connectivity/farsight/farsight2_0.0.9.bb
@@ -1,12 +1,12 @@
DESCRIPTION = FarSight is an audio/video conferencing framework specifically
designed for Instant Messengers.
HOMEPAGE = http://farsight.sf.net;
SRC_URI =
http://farsight.freedesktop.org/releases/farsight2/${BPN}-${PV}.tar.gz;
-LICENSE = GPLv2.1
+LICENSE = LGPLv2.1
DEPENDS = libnice glib-2.0 libxml2 zlib dbus gstreamer gst-plugins-base
inherit autotools
-PR = r1
+PR = r2
EXTRA_OECONF = \
--disable-debug \
diff --git a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
index 00edb6e..2a93913 100644
--- a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
+++ b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
@@ -1,6 +1,6 @@
DESCRIPTION = A standalone native ldconfig build
-LICENSE = GPLv2.1
+LICENSE = GPLv2+
LIC_FILES_CHKSUM =
file://${S}/ldconfig.c;endline=17;md5=1d15f20937c055cb5de2329a4c054399
@@ -12,7 +12,7 @@ SRC_URI = file://ldconfig-native-2.12.1.tar.bz2 \
file://flag_fix.patch \
file://endianess-header.patch
-PR = r1
+PR = r2
inherit native
diff --git a/meta/recipes-support/gnutls/gnutls.inc
b/meta/recipes-support/gnutls/gnutls.inc
index 9257880..d73c799 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -3,11 +3,11 @@ HOMEPAGE = http://www.gnu.org/software/gnutls/;
BUGTRACKER = https://savannah.gnu.org/support/?group=gnutls;
DEPENDS = zlib lzo libtasn1 libgcrypt (= 1.4.2) libcap
-INC_PR = r2
+INC_PR = r3
LICENSE = GPLv3+ LGPLv2.1+
LICENSE_${PN} = LGPLv2.1+
-LICENSE_${PN}-xx = GPLv2.1+
+LICENSE_${PN}-xx = LGPLv2.1+
LICENSE_${PN}-bin = GPLv3+
LICENSE_${PN}-extra = GPLv3+
LICENSE_${PN}-openssl = GPLv3+
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] MINUTES: OE-TSC meeting 6-Oct-2011
MINUTES: OE-TSC meeting 6-Oct-2011 Attending: Mark, Richard, Khem, Koen, Tom Notes: Jefro Agenda Results 1. pick a moderator RP 2. new items: maintainer files bitbake doesn't have one acknowledged need for READMEs in bitbake, main directory, oe-core layers possibly add knowledge to pull request scripts PACKAGECONFIG concept generally positive, continue discussing on list ELCE RP: reminder about GA proxy voting GA plans - Jefro finding a room, Philip B. gathering RSVPs need a new place for bitbake tarball downloads Khem can ask Tom K. to revive downloads.oe.org 3. status on old items: oe-core release need BSP tarballs (TI), official is preferred (having a maintainer is a good start) oe-core needs promotion, needs plans in place for release OE infrastructure moving around, admin issues need a lead release bitbake as well elections Denys sent mail, khem standing down up infrastructure new server opal, 64 bit VM transitioning all services from melo to opal wiki runs on it, moving git over some difficulty using nginx, Tartarus knows someone good with it yocto also uses nginx, RP and Tom will both pass on questions note: berlios closing at end of year, yocto 1.2 feature list shaping up rc4 release build successful, waiting now on QA TI had strategic meeting for 1.2/1.3 wish list, going through yocto channels WR focusing on workflow improvements Raw Transcript: (1:02:44 PM) fray: ok.. I;m here now (1:03:31 PM) RP__: quorum :) (1:03:51 PM) khem: ok it was not pear but peaches took a bit longer :) (1:03:53 PM) RP__: Anything for the agenda? (1:04:05 PM) khem: Infra update (1:04:14 PM) fray: maintainer files or something similar for newbies to know where to send patches (1:04:19 PM) khem: move of git to new server is under work (1:04:21 PM) RP__: Yocto Feature List for 1.2 is shaping up: https://wiki.yoctoproject.org/wiki/Yocto_1.2_Features (1:04:47 PM) RP__: Yocto -rc4 release build was successful, waiting on QA now but its looking pretty much done (1:05:07 PM) RP__: fray: no brainer, I agree we need it, just need the patches (1:05:23 PM) RP__: khem: this is a file at the top level of the tree saying where patches should go etc. (1:05:29 PM) Tartarus [tr...@pixelshelf.com] entered the room. (1:05:29 PM) mode (+v Tartarus) by ChanServ (1:05:35 PM) Tartarus: Sorry I'm late (1:05:38 PM) Tartarus: just got internet back up (1:05:49 PM) Jefro: welcome back :) (1:05:55 PM) fray: RP__ yup.. I think that'll take all of 2 minutes to discuss.. I just want it in the minutes (1:05:57 PM) khem: RP__: README at top says about this (1:05:59 PM) ***RP__ has pasted the last few lines (1:06:05 PM) Tartarus: no new items from me (1:06:09 PM) RP__: khem: bitbake doesn't have one for example (1:06:49 PM) khem: ok (1:06:52 PM) khem: that should be added (1:06:54 PM) RP__: Tartarus: we have four of us (koen isn't here) (1:07:01 PM) RP__: + Jefro :) (1:07:16 PM) RP__: ok, any other agenda items? (1:07:23 PM) khem: and may be we can think of adding knowledge to pull request scripts (1:07:25 PM) RP__: We could quickly touch on PACKAGECONFIG I guess (1:07:38 PM) khem: that may be a bit stretch (1:07:40 PM) Jefro: 1. pick a chair (RP__ already fulfilling that function) (1:08:33 PM) RP__: ELCE and TSC election? (1:08:34 PM) khem: RP__: is PACKAGECONFIG same as gentoo's USE flags (1:08:47 PM) RP__: khem: yes and no ;-) (1:09:10 PM) khem: similar I would say (1:09:19 PM) RP__: ok, we have an agenda then (1:09:33 PM) RP__: do we need to talk about readme files in repos further? (1:09:41 PM) RP__: We did already as a TSC advise README files (1:09:56 PM) RP__: Stating how patches should be submitted seems like a good thing to have there (1:10:03 PM) fray: just wanted to mention the problem (1:10:17 PM) khem: I think README are good since github displays them on front page if repo is hosted on github (1:10:18 PM) fray: I had a user download oe-core and they fixed a problem. but they had to ask me where to send the fix.. (1:10:30 PM) khem: and kind of cool when one browses it (1:10:44 PM) fray: a simple maintainers page or similar (readme is fine) that says here is the mailing list to use to send patches or here is the maintainer, etc.. is what is needed.. (1:10:59 PM) fray: they were able ot find (immediately) the commit guidelines and policies on the oe page, but not where to send their patches (1:11:09 PM) khem: fray: README are pretty common and easy for users to find (1:11:12 PM) fray: so we should solve that... (1:11:20 PM) RP__: fray: no argument here (1:11:26 PM) fray: yup, no worries.. and this includes adding one to bitbake -- assuming the maintainers there will accept it (1:11:43 PM) khem: I think most of meta-* layers have it (1:11:48 PM) RP__: fray: I suspect they will (1:11:50 PM) fray: (I started to put together one, but wasn't sure what to put into it.. so I stopped) (1:11:53 PM) fray: RP ;)
[OE-core] [PATCH 0/3] A few miscellaneous fixes
The following changes since commit cc626b9e1671670a931ea3e528ea4b0f7b2e923b: webkit-gtk: Enable dependency tracking since the webkit makefiles have bugs (2011-10-05 14:36:18 +0100) are available in the git repository at: http://github.com/kergoth/oe-core misc-fixes Christopher Larson (3): autotools: fix multi-word arguments for EXTRA_OECONF autoconf: no need to hardcode the full path to m4 oe.patch: drop bb.msg.domain reference meta/classes/autotools.bbclass | 14 ++ meta/lib/oe/patch.py|4 ++-- meta/recipes-devtools/autoconf/autoconf_2.68.bb |4 +++- 3 files changed, 11 insertions(+), 11 deletions(-) -- 1.7.4.1 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] oe.patch: drop bb.msg.domain reference
Signed-off-by: Christopher Larson kerg...@gmail.com
---
meta/lib/oe/patch.py |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 1406e19..9b0ff37 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -376,8 +376,8 @@ class UserResolver(Resolver):
os.environ['SHELLCMDS'] = bash --rcfile + rcfile
rc = os.system(bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0:
-bb.msg.fatal(bb.msg.domain.Build, (Cannot proceed with manual
patch resolution - '%s' not found. \
-+ Check TERMCMDRUN variable.) %
bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
+bb.fatal((Cannot proceed with manual patch resolution - '%s'
not found.
+ + Check TERMCMDRUN variable.) %
bb.data.getVar('TERMCMDRUN', self.patchset.d, 1))
# Construct a new PatchSet after the user's changes, compare the
# sets, checking patches for modifications, and doing a remote
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] autoconf: no need to hardcode the full path to m4
This way autom4te uses m4 as it finds it in the PATH, rather than
hardcoding any particular path.
Signed-off-by: Christopher Larson kerg...@gmail.com
---
meta/recipes-devtools/autoconf/autoconf_2.68.bb |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/autoconf/autoconf_2.68.bb
b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
index c6209a3..21b5fb3 100644
--- a/meta/recipes-devtools/autoconf/autoconf_2.68.bb
+++ b/meta/recipes-devtools/autoconf/autoconf_2.68.bb
@@ -1,6 +1,6 @@
require autoconf.inc
-PR = r2
+PR = r3
PARALLEL_MAKE =
@@ -27,4 +27,6 @@ RDEPENDS_${PN}_virtclass-native = m4-native
gnu-config-native
SRC_URI_append_virtclass-native = file://fix_path_xtra.patch
+EXTRA_OECONF += ac_cv_path_M4=m4
+
BBCLASSEXTEND = native
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] autotools: fix multi-word arguments for EXTRA_OECONF
This is needed to better support things like the following (with a
multi-word BUILD_CC):
EXTRA_OECONF += 'ac_cv_prog_CC_FOR_BUILD=${BUILD_CC}'
Signed-off-by: Christopher Larson kerg...@gmail.com
---
meta/classes/autotools.bbclass | 14 ++
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index a4ce851..135be33 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -70,14 +70,12 @@ CONFIGUREOPT_DEPTRACK = --disable-dependency-tracking
oe_runconf () {
- if [ -x ${S}/configure ] ; then
- cfgcmd=${S}/configure \
- ${CONFIGUREOPTS} ${EXTRA_OECONF} $@
- bbnote Running $cfgcmd...
- $cfgcmd || bbfatal oe_runconf failed
- else
- bbfatal no configure script found
- fi
+ if [ -x ${S}/configure ] ; then
+ bbnote Running ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
$@
+ ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} $@ || bbfatal
oe_runconf failed
+ else
+ bbfatal no configure script found
+ fi
}
autotools_do_configure() {
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Use for filedeps/rpmdeps data?
Hey everyone, I noticed today that one of our recipes takes a very long time to get through the do_package task. The recipe has a couple of binaries and a whole lot of assets (thousands of audio files). It takes over 20 minutes for the do_package task to complete on my local desktop. I finally tracked it down to the package_do_filedeps function which appears to be running an rpmdeps process for each file in each package. As far as I can tell, it just then dumps that data to text files in pkgdata and only seems concerned with the binaries. Can anyone shed some light on what this info is used for? Should it only be concerned with executables and libraries (there is currently no filter on it)? Do I even need that data if we are using ipkg instead of rpm? Thanks, Dan Lazzari Jr. Firmware Engineer dlazz...@leapfrog.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] Use for filedeps/rpmdeps data?
On Fri, 2011-10-07 at 21:21 +, Daniel Lazzari wrote:
Hey everyone,
I noticed today that one of our recipes takes a very long time to get
through the do_package task. The recipe has a couple of binaries and a
whole lot of assets (thousands of audio files). It takes over 20
minutes for the do_package task to complete on my local desktop. I
finally tracked it down to the package_do_filedeps function which
appears to be running an rpmdeps process for each file in each
package. As far as I can tell, it just then dumps that data to text
files in pkgdata and only seems concerned with the binaries. Can
anyone shed some light on what this info is used for? Should it only
be concerned with executables and libraries (there is currently no
filter on it)? Do I even need that data if we are using ipkg instead
of rpm?
This is why there is a line in package.bbclass which says:
if pkg.endswith('-dbg') or pkg.endswith('-doc') or
pkg.find('-locale-') != -1 or pkg.find('-localedata-') != -1 or
pkg.find('-gconv-') != -1 or pkg.find('-charmap-') != -1 or
pkg.startswith('kernel-module-'):
continue
since those are packages we know we're not going to get useful
information from. It finds perl and python module dependencies so its
not just executable binaries/libraries unfortunately :/.
It would probably be useful to have a way of flagging other packages as
uninteresting though. The idea is the information is used by all the
package backends. At present it is used more by some than by others and
the ipk backend is limited in its use iirc. That will be changing over
time though.
Cheers,
Richard
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] autotools: fix multi-word arguments for EXTRA_OECONF
Op 7 okt 2011, om 23:02 heeft Christopher Larson het volgende
geschreven:
This is needed to better support things like the following (with a
multi-word BUILD_CC):
EXTRA_OECONF += 'ac_cv_prog_CC_FOR_BUILD=${BUILD_CC}'
Signed-off-by: Christopher Larson kerg...@gmail.com
---
meta/classes/autotools.bbclass | 14 ++
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/meta/classes/autotools.bbclass b/meta/classes/
autotools.bbclass
index a4ce851..135be33 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -70,14 +70,12 @@ CONFIGUREOPT_DEPTRACK = --disable-dependency-
tracking
oe_runconf () {
- if [ -x ${S}/configure ] ; then
- cfgcmd=${S}/configure \
- ${CONFIGUREOPTS} ${EXTRA_OECONF} $@
- bbnote Running $cfgcmd...
- $cfgcmd || bbfatal oe_runconf failed
- else
- bbfatal no configure script found
- fi
+ if [ -x ${S}/configure ] ; then
+ bbnote Running ${S}/configure ${CONFIGUREOPTS} $
{EXTRA_OECONF} $@
+ ${S}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF} $@ ||
bbfatal oe_runconf failed
+ else
+ bbfatal no configure script found
+ f
Was the tab-spaces conversion intentional?
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] Bitbake dependency failure with git fetcher
Hi, Everytime openssl and a git recipe get changed at the same time, I end up with: | /angstrom/build/tmp-angstrom_2010_x-eglibc/sysroots/x86_64-linux/usr/bin/git.real: error while loading shared libraries: libcrypto.so.1.0.0: cannot open shared object file: No such file or directory Why is bitbake not resolving the git-native - openssl-native dep before invoking the git fetcher? regards, Koen ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] git: update to 1.7.7
Signed-off-by: Koen Kooi k...@dominion.thruhere.net
---
meta/recipes-devtools/git/git_1.7.5.1.bb | 10 --
meta/recipes-devtools/git/git_1.7.7.bb | 10 ++
2 files changed, 10 insertions(+), 10 deletions(-)
delete mode 100644 meta/recipes-devtools/git/git_1.7.5.1.bb
create mode 100644 meta/recipes-devtools/git/git_1.7.7.bb
diff --git a/meta/recipes-devtools/git/git_1.7.5.1.bb
b/meta/recipes-devtools/git/git_1.7.5.1.bb
deleted file mode 100644
index b5eb015..000
--- a/meta/recipes-devtools/git/git_1.7.5.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require git.inc
-
-PR = r3
-
-EXTRA_OECONF += ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
-
ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
-
-
-SRC_URI[md5sum] = a49291116e3b0564e069ae989e4db6fb
-SRC_URI[sha256sum] =
a1d4a1c59300e68fbc493a2cbe9257048d4d6f4363924bf34f38c413a825f80c
diff --git a/meta/recipes-devtools/git/git_1.7.7.bb
b/meta/recipes-devtools/git/git_1.7.7.bb
new file mode 100644
index 000..486e2e5
--- /dev/null
+++ b/meta/recipes-devtools/git/git_1.7.7.bb
@@ -0,0 +1,10 @@
+require git.inc
+
+SRC_URI = http://git-core.googlecode.com/files/git-${PV}.tar.gz;
+SRC_URI[md5sum] = 5d645884e688921e773186783b65ce33
+SRC_URI[sha256sum] =
5a977bc01e4989b9928345e99aab15ce896cf5897c6e32eb449538574df377f6
+
+EXTRA_OECONF += ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
+
ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
+
+
--
1.6.6.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 0/2] Fix useradd class to accept useradd long options
On 10/06/2011 05:13 PM, Julian Pidancet wrote: This first patch fixes the --root option for programs in shadow-native and allow one to specify useradd long options when using the useradd class in a recipe. The second patch demonstrates usage of the useradd class and ability to specify long options in the USERADD_PARAM variable by converting the OpenSSH recipe to useradd. v2: Fixed a typo in add_root_cmd_options.patch, --root is equivalent to -Q instead of -R. v3: Comment modifications and add Signed-off-by line in the modified patch directly. Thank you Julian for these fixes. Signed-off-by: Scott Garman scott.a.gar...@intel.com -- Scott Garman Embedded Linux Engineer - Yocto Project Intel Open Source Technology Center ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
