From 389043beaee17cd6bc90e5c8e7140fdab51c9ae8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 6 Apr 2009 08:56:14 +0200 Subject: kernel,module-base class, bitbake.conf: introduce MACHINE_KERNEL_PR * bandaid till we have a better way to track ABI changes --- classes/kernel.bbclass | 4 ++++ classes/module-base.bbclass | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 17e8941745..954c407d51 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -64,6 +64,10 @@ export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "tt KERNEL_VERSION = "${@get_kernelversion('${S}')}" KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}" +# A machine.conf or local.conf can increase MACHINE_KERNEL_PR to force +# rebuilds for kernel and external modules +PR = "${MACHINE_KERNEL_PR}" + KERNEL_LOCALVERSION ?= "" # kernels are generally machine specific diff --git a/classes/module-base.bbclass b/classes/module-base.bbclass index c98baceeab..bc53e1bad5 100644 --- a/classes/module-base.bbclass +++ b/classes/module-base.bbclass @@ -5,6 +5,10 @@ inherit kernel-arch export OS = "${TARGET_OS}" export CROSS_COMPILE = "${TARGET_PREFIX}" +# A machine.conf or local.conf can increase MACHINE_KERNEL_PR to force +# rebuilds for kernel and external modules +PR = "${MACHINE_KERNEL_PR}" + export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}" export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}" KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}" -- cgit v1.2.3 From 69c119a2b998be63816a1d483bdb656fd33f11d2 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 7 Apr 2009 16:20:08 -0700 Subject: canadian-sdk: Add SDK_REALPATH_MINGW variable, so that we can prepend a drive letter for sysroot. --- classes/canadian-sdk.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/canadian-sdk.bbclass b/classes/canadian-sdk.bbclass index d73b62f485..6b4fdf878a 100644 --- a/classes/canadian-sdk.bbclass +++ b/classes/canadian-sdk.bbclass @@ -24,9 +24,12 @@ LDFLAGS = "${SDK_LDFLAGS}" # and otherwise just DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils " -SDK_PATH_sdk-mingw32 = "/OpenEmbedded/${SDK_NAME}" + +# On mingw systems we want to have the real sysroot default to c:/... and +# assume that the default install will be on the C drive. This can be changed +# by setting SDK_REALPATH_MINGW. SDK_REALPATH = "${SDK_PATH}" -SDK_REALPATH_sdk-mingw32 = "C:/OpenEmbedded/${SDK_NAME}" +SDK_REALPATH_MINGW ?= "C:" # Path prefixes prefix = "${SDK_PATH}" -- cgit v1.2.3 From 846330c96c871b0b4116581fa195a6ad1932a439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Wed, 8 Apr 2009 09:23:01 +0000 Subject: insane.bbclass: make "LDFLAGS ignored" QA errors fatal --- classes/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 3e519c3253..9fc5f0718d 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -184,7 +184,7 @@ def package_qa_make_fatal_error(error_class, name, path,d): TODO: Load a whitelist of known errors """ - return not error_class in [0, 5, 7, 9] + return not error_class in [0, 5, 7] def package_qa_write_error(error_class, name, path, d): """ -- cgit v1.2.3 From b579bdce5da97216a6020c2c1fe18839d5dd5603 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 14 Apr 2009 10:25:38 +0200 Subject: gtk-icon-cache bbclass: build caches for all icondirs in ${datadir}/icons --- classes/gtk-icon-cache.bbclass | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass index b256365175..ea1fdff3dd 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -11,11 +11,19 @@ fi # Update the pixbuf loaders in case they haven't been registered yet gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders -gtk-update-icon-cache -q /usr/share/icons/hicolor +for icondir in /usr/share/icons/* ; do + if [ -d $icondir ] ; then + gtk-update-icon-cache -qt $icondir + fi +done } gtk_icon_cache_postrm() { -gtk-update-icon-cache -q /usr/share/icons/hicolor +for icondir in /usr/share/icons/* ; do + if [ -d $icondir ] ; then + gtk-update-icon-cache -qt $icondir + fi +done } python populate_packages_append () { @@ -24,7 +32,7 @@ python populate_packages_append () { workdir = bb.data.getVar('WORKDIR', d, 1) for pkg in packages: - icon_dir = '%s/install/%s/%s/icons/hicolor' % (workdir, pkg, bb.data.getVar('datadir', d, 1)) + icon_dir = '%s/install/%s/%s/icons' % (workdir, pkg, bb.data.getVar('datadir', d, 1)) if not os.path.exists(icon_dir): continue -- cgit v1.2.3 From 42e6449391d52d0d92617c809f32757e451a1b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Thu, 16 Apr 2009 10:34:23 +0000 Subject: siteinfo.bbclass: add entry for arm-darwin9 --- classes/siteinfo.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 55ab371af3..82a1616d05 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -26,6 +26,7 @@ def get_siteinfo_list(d): "armeb-linux-uclibc": "endian-big bit-32 common-linux common-uclibc arm-common",\ "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-linux common-uclibc arm-common armeb-linux-uclibc",\ "arm-darwin": "endian-little bit-32 common-darwin",\ + "arm-darwin9": "endian-little bit-32 common-darwin",\ "arm-linux": "endian-little bit-32 common-linux common-glibc arm-common",\ "arm-linux-gnueabi": "endian-little bit-32 common-linux common-glibc arm-common arm-linux",\ "arm-linux-uclibc": "endian-little bit-32 common-linux common-uclibc arm-common",\ -- cgit v1.2.3 From 8fa95dc3f6c3a06cb0ada1fc0e8269c4b1309f90 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 16 Apr 2009 13:02:51 +0200 Subject: java.bbclass: Use force (-f) for ln (suggested by Marcin). --- classes/java.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/java.bbclass b/classes/java.bbclass index 38256d7798..cacd2ce525 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass @@ -72,7 +72,7 @@ oe_jarinstall() { oewarn "file was in the way. removing:" $dir/$1 rm $dir/$1 fi - ln -s $destname $dir/$1 + ln -sf $destname $dir/$1 shift done } -- cgit v1.2.3 From e0b9b374794838e0710d3ebbaaa5ceda49801981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Fri, 17 Apr 2009 16:18:53 +0200 Subject: insane.bbclass: add an entry for darwin9/arm --- classes/insane.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 9fc5f0718d..584a5f1c1e 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -31,6 +31,9 @@ PACKAGEFUNCS += " do_package_qa " # TARGET_OS TARGET_ARCH MACHINE, OSABI, ABIVERSION, Little Endian, 32bit? def package_qa_get_machine_dict(): return { + "darwin9" : { + "arm" : (40, 0, 0, True, True), + }, "linux" : { "arm" : (40, 97, 0, True, True), "armeb": (40, 97, 0, False, True), -- cgit v1.2.3 From a4f79016c537fc93e5a487d51a22fb4d01e9afe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Fri, 17 Apr 2009 19:57:32 +0200 Subject: lib_package.bbclass: fix package population on darwin * make use of SOLIBS and SOLIBSDEV to populate FILE_* instead of hardcoded .so.* and .so --- classes/lib_package.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/lib_package.bbclass b/classes/lib_package.bbclass index 9a48408527..03ba9d094f 100644 --- a/classes/lib_package.bbclass +++ b/classes/lib_package.bbclass @@ -1,9 +1,9 @@ PACKAGES += "${PN}-bin" -FILES_${PN} = "${libexecdir} ${libdir}/lib*.so.* \ +FILES_${PN} = "${libexecdir} ${libdir}/lib*${SOLIBS} \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ + ${base_libdir}/*${SOLIBS} ${datadir}/${PN} ${libdir}/${PN}" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.a ${libdir}/pkgconfig /lib/*.a /lib/*.o \ ${datadir}/aclocal ${bindir}/*-config" FILES_${PN}-bin = "${bindir}/* ${sbindir}/* /bin/* /sbin/*" -- cgit v1.2.3