conf/machine: Don't poke around providers which aren't machine specific/safe

Machines shouldn't be poking around PREFERRED_PROVIDERS which aren't machine specific or at least machine safe. Kernels are machine specific and the xserver is selectable. libx11 and mesa are now really a distro choice and machine configurations shouldn't be poking around them as it just leads to corruption, conflicts and confusion. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2026-01-30 05:18:43 +01:00 · 2011-12-07 00:30:15 +00:00 · 2011-12-07 00:30:04 +00:00 · 2011-12-06 16:37:19 +00:00 · 2011-12-06 16:37:19 +00:00 · 2011-12-06 16:37:19 +00:00
13 changed files with 10 additions and 25 deletions
--- a/meta-yocto/conf/machine/atom-pc.conf
+++ b/meta-yocto/conf/machine/atom-pc.conf
@@ -12,11 +12,7 @@ KERNEL_IMAGETYPE = "bzImage"

 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "3.0%"
-#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
           xserver-xorg-extension-dri2 \
           xserver-xorg-extension-glx \
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -32,7 +32,6 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
 SERIAL_CONSOLE = "115200 ttyO2"

 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"

 KERNEL_IMAGETYPE = "uImage"

--- a/meta-yocto/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto/conf/machine/mpc8315e-rdb.conf
@@ -14,7 +14,6 @@ MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial"
 PREFERRED_VERSION_linux-yocto ?= "3.0%"
 PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"

-#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"

--- a/meta-yocto/conf/machine/routerstationpro.conf
+++ b/meta-yocto/conf/machine/routerstationpro.conf
@@ -11,7 +11,6 @@ KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_ALT_IMAGETYPE = "vmlinux.bin"

 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 XSERVER = "xserver-kdrive-fbdev"

--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -321,7 +321,7 @@ buildhistory_get_image_installed() {
 buildhistory_get_imageinfo() {
 	# List the files in the image, but exclude date/time etc.
 	# This awk script is somewhat messy, but handles where the size is not printed for device files under pseudo
-	find ${IMAGE_ROOTFS} -ls | awk '{ if ( $7 ~ /[0-9]/ ) printf "%s %10-s %10-s %10s %s %s %s\n", $3, $5, $6, $7, $11, $12, $13 ; else printf "%s %10-s %10-s %10s %s %s %s\n", $3, $5, $6, 0, $10, $11, $12 }' > ${BUILDHISTORY_DIR_IMAGE}/files-in-image.txt
+	( cd ${IMAGE_ROOTFS} && find . -ls | awk '{ if ( $7 ~ /[0-9]/ ) printf "%s %10-s %10-s %10s %s %s %s\n", $3, $5, $6, $7, $11, $12, $13 ; else printf "%s %10-s %10-s %10s %s %s %s\n", $3, $5, $6, 0, $10, $11, $12 }' > ${BUILDHISTORY_DIR_IMAGE}/files-in-image.txt )

 	# Add some configuration information
 	echo "${MACHINE}: ${IMAGE_BASENAME} configured for ${DISTRO} ${DISTRO_VERSION}" > ${BUILDHISTORY_DIR_IMAGE}/build-id
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -562,7 +562,7 @@ python do_checkpkg() {
 		if 'protocol' in parm:
 			gitproto = parm['protocol']
 		else:
-			gitproto = "rsync"
+			gitproto = "git"
 		gitcmd = "git ls-remote %s://%s%s%s *tag* 2>&1" % (gitproto, gituser, host, path)
 		gitcmd2 = "git ls-remote %s://%s%s%s HEAD 2>&1" % (gitproto, gituser, host, path)
 		tmp = os.popen(gitcmd).read()
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5734,7 +5734,7 @@ RECIPE_NO_UPDATE_REASON_pn-groff = "1.18.1.4 is latest GPLv2 Version no 1.21"
 RECIPE_STATUS_pn-eglibc = "red"
 RECIPE_LATEST_VERSION_pn-eglibc = "2.13-r15508"
 RECIPE_LAST_UPDATE_pn-eglibc = "Nov 16, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn = "Nov 16, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-eglibc = "Nov 16, 2011"

 RECIPE_STATUS_pn-lighttpd = "red"
 RECIPE_LAST_UPDATE_pn-lighttpd = "Jul 28, 2011"
@@ -5999,7 +5999,7 @@ RECIPE_STATUS_pn-ghostscript = "red"
 RECIPE_LATEST_VERSION_pn-ghostscript = "9.04"
 RECIPE_MAINTAINER_pn-ghostscript = "Kai Kang <kai.kang@windriver.com>"
 RECIPE_LAST_UPDATE_pn-ghostscript = "Oct 19, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn = "Oct 19, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-ghostscript = "Oct 19, 2011"

 RECIPE_STATUS_pn-createrepo = "green"
 RECIPE_LATEST_VERSION_pn-createrepo = "0.9.9"
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -12,6 +12,5 @@ RDEPENDS_kernel-base = ""

 # Use a common kernel recipe for all QEMU machines
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"

 EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
--- a/meta/conf/machine/qemuppc.conf
+++ b/meta/conf/machine/qemuppc.conf
@@ -2,8 +2,6 @@
 #@NAME: qemu PPC Emulator setup
 #@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation

-PREFERRED_PROVIDER_virtual/libgl  = "mesa-xlib"
-
 require conf/machine/include/qemu.inc
 require conf/machine/include/tune-ppc603e.inc

--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -2,10 +2,7 @@
 #@NAME: common_pc
 #@DESCRIPTION: Machine configuration for running a common x86

-PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"

 require conf/machine/include/tune-x86_64.inc
 require conf/machine/include/qemu.inc
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -2,10 +2,7 @@
 #@NAME: common_pc
 #@DESCRIPTION: Machine configuration for running a common x86

-PREFERRED_PROVIDER_virtual/libgl  = "mesa-dri"
-PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"

 require conf/machine/include/tune-i586.inc
 require conf/machine/include/qemu.inc
--- a/meta/recipes-extended/wget/wget.inc
+++ b/meta/recipes-extended/wget/wget.inc
@@ -3,7 +3,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"

-INC_PR = "r10"
+INC_PR = "r11"

 inherit autotools gettext update-alternatives

@@ -15,6 +15,6 @@ do_install_append () {
 }

 ALTERNATIVE_NAME = "wget"
-ALTERNATIVE_LINK = "${base_bindir}/wget"
-ALTERNATIVE_PATH = "${base_bindir}/wget.${PN}"
+ALTERNATIVE_LINK = "${bindir}/wget"
+ALTERNATIVE_PATH = "${bindir}/wget.${PN}"
 ALTERNATIVE_PRIORITY = "100"
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.14.bb
@@ -15,7 +15,7 @@ PROVIDES = "virtual/libsdl"
 DEPENDS = "${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} virtual/libx11 libxext libxrandr libxrender tslib"
 DEPENDS_virtclass-nativesdk = "libx11-nativesdk libxrandr-nativesdk libxrender-nativesdk libxext-nativesdk"

-PR = "r1"
+PR = "r2"

 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
           file://configure_tweak.patch \
@@ -38,7 +38,8 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads
                ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
                --disable-video-svga \
                --disable-video-picogui --disable-video-qtopia --enable-dlopen \
-                --disable-rpath"
+                --disable-rpath \
+                --disable-pulseaudio"

 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
 PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib,"
Author	SHA1	Message	Date
Richard Purdie	b9d3a5224c	conf/machine: Don't poke around providers which aren't machine specific/safe Machines shouldn't be poking around PREFERRED_PROVIDERS which aren't machine specific or at least machine safe. Kernels are machine specific and the xserver is selectable. libx11 and mesa are now really a distro choice and machine configurations shouldn't be poking around them as it just leads to corruption, conflicts and confusion. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2011-12-07 00:30:15 +00:00
Richard Purdie	dc51e4a982	conf/machine: Don't poke around providers which aren't machine specific/safe Machines shouldn't be poking around PREFERRED_PROVIDERS which aren't machine specific or at least machine safe. Kernels are machine specific and the xserver is selectable. libx11 and mesa are now really a distro choice and machine configurations shouldn't be poking around them as it just leads to corruption, conflicts and confusion. (From OE-Core rev: 97a57aca12437c24b628071bb189c9f3b94e27ca) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2011-12-07 00:30:04 +00:00
Saul Wold	d22daf5c06	wget: Fix wget alternative path to be /usr/bin not /bin (From OE-Core rev: 4339459bd38c75250610c4cdb767504e808c5bf0) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2011-12-06 16:37:19 +00:00
Saul Wold	bc557dece3	distro_tracking: fix manual entries (From OE-Core rev: a1784e814a412f209fe36626affdb82e2dfbeffe) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2011-12-06 16:37:19 +00:00
Koen Kooi	4290ee8526	buildhistory bbclass: avoid absolute paths for files-in-image.txt to avoid diff churn when relocating TMPDIR (From OE-Core rev: fb642d21111691b9302e16e984aff9d8fb18c431) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2011-12-06 16:37:19 +00:00
Mei Lei	965777b2fb	distrodata.bbclass:Fix some recipes upstream version check issue. Some recipes,like rt-tests,clutter-box2d,iproute2,didn't declare upstream protocal, but in distrodata.bbclass, we use rsync as the default protocal, this will lead an error when checking upstream version. Change default protocal from rsync to git in distrodata.bbclass. (From OE-Core rev: 7f38cbef365c05d75563760f15b10284147c2de3) Signed-off-by: Mei Lei <lei.mei@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2011-12-06 16:37:19 +00:00
Richard Purdie	8d182bb423	libsdl: Disable pulseaudio explicitly Its not listed in DEPENDS so should never have been built. We could configure this as a configuration option and I'll take a patch for that but I like deterministic builds so force it off for now. (From OE-Core rev: 0a7a8597be05c8def8af58eecab49d963dc9d757) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>	2011-12-06 16:37:19 +00:00