diff options
| -rw-r--r-- | classes/gconf.bbclass | 2 | ||||
| -rw-r--r-- | classes/insane.bbclass | 15 | ||||
| -rw-r--r-- | conf/distro/openomap.conf | 52 | ||||
| -rw-r--r-- | packages/chrpath/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/chrpath/chrpath-native_0.13.bb | 10 | ||||
| -rw-r--r-- | packages/matchbox-wm/matchbox-wm_1.2.bb | 2 | ||||
| -rw-r--r-- | packages/uclibc/uclibc.inc | 2 |
7 files changed, 22 insertions, 61 deletions
diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass index 686f8e6596..99f33e433a 100644 --- a/classes/gconf.bbclass +++ b/classes/gconf.bbclass @@ -1,4 +1,4 @@ -DEPENDS += "gconf" +DEPENDS += "gconf gconf-native" gconf_postinst() { if [ "$1" = configure ]; then diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 8ef4858aa4..c424a573d3 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -21,7 +21,7 @@ # We play a special package function inherit package -PACKAGE_DEPENDS += "pax-utils-native" +PACKAGE_DEPENDS += "pax-utils-native chrpath-native" PACKAGEFUNCS += " do_package_qa " @@ -203,6 +203,7 @@ def package_qa_check_rpath(file,name,d): import bb, os scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'scanelf') bad_dir = bb.data.getVar('TMPDIR', d, True) + "/work" + bad_dir_test = bb.data.getVar('TMPDIR', d, True) if not os.path.exists(scanelf): bb.fatal("Can not check RPATH scanelf not found") if not bad_dir in bb.data.getVar('WORKDIR', d, True): @@ -210,11 +211,11 @@ def package_qa_check_rpath(file,name,d): output = os.popen("%s -Byr %s" % (scanelf,file)) txt = output.readline().split() - if bad_dir in txt: - package_qa_write_error( 1, name, file, d) - bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, txt, file)) - return False - + for line in txt: + if bad_dir_test in line: + package_qa_write_error( 1, name, file, d) + bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, line, file)) + return False return True def package_qa_check_devdbg(path, name,d): @@ -405,7 +406,7 @@ python do_package_qa () { rdepends_sane = False if not walk_sane or not rdepends_sane: - bb.fatal("QA ran found fatal errors. Please consider fixing them") + bb.fatal("QA run found fatal errors. Please consider fixing them.") bb.note("DONE with PACKAGE QA") } diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf deleted file mode 100644 index 5819b5ad59..0000000000 --- a/conf/distro/openomap.conf +++ /dev/null @@ -1,52 +0,0 @@ -#@TYPE: Distribution -#@NAME: OpenOMAP -#@DESCRIPTION: OE Distribution for TI OMAP Development Boards - -INHERIT += " package_ipk debian" -TARGET_OS ?= "linux-gnueabi" -TARGET_FPU ?= "soft" - -# 2.4 vs 2.6 is a distro decision. -MODUTILS = "26" - -PREFERRED_PROVIDER_hotplug = "udev" - -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" - -PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" - -#EABI stuff -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate" -PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" - -# use latest booting kernel but allow to override it in local.conf -#PREFERRED_VERSION_linux-omap1_omap5912osk ?= "2.6.19-omap1" - - -#use EABI toolchain -PREFERRED_VERSION_gcc ?= "4.1.1" -PREFERRED_VERSION_gcc-cross ?= "4.1.1" -PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -PREFERRED_VERSION_binutils ?= "2.17.50.0.5" -PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5" -PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" -PREFERRED_VERSION_glibc ?= "2.5" -PREFERRED_VERSION_glibc-intermediate ?= "2.5" - -#PREFERRED_VERSION_gcc ?= "4.1.1" -#PREFERRED_VERSION_gcc-cross ?= "4.1.1" -#PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1" -#PREFERRED_VERSION_binutils ?= "2.17" -#PREFERRED_VERSION_binutils-cross ?= "2.17" -#PREFERRED_VERSION_linux-libc-headers ?= "2.6.15.99" -#PREFERRED_VERSION_glibc ?= "2.4" -#PREFERRED_VERSION_glibc-intermediate ?= "2.4" - -# We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs pcmcia usbhost alsa" - -PCMCIA_MANAGER = "pcmciautils" - diff --git a/packages/chrpath/.mtn2git_empty b/packages/chrpath/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/chrpath/.mtn2git_empty diff --git a/packages/chrpath/chrpath-native_0.13.bb b/packages/chrpath/chrpath-native_0.13.bb new file mode 100644 index 0000000000..c9cc9112a3 --- /dev/null +++ b/packages/chrpath/chrpath-native_0.13.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "chrpath allows you to change the rpath (where the application looks for libraries) in an application. It does not (yet) allow you to add an rpath if there isn't one already." +LICENSE = "GPL" + +SRC_URI = "http://ftp.debian.org/debian/pool/main/c/chrpath/chrpath_0.13.orig.tar.gz" + +inherit autotools native + +S = "${WORKDIR}/chrpath-${PV}" + + diff --git a/packages/matchbox-wm/matchbox-wm_1.2.bb b/packages/matchbox-wm/matchbox-wm_1.2.bb index a7e9d4df62..ad7c31d3ed 100644 --- a/packages/matchbox-wm/matchbox-wm_1.2.bb +++ b/packages/matchbox-wm/matchbox-wm_1.2.bb @@ -1,6 +1,6 @@ require matchbox-wm.inc -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf matchbox-common" +DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxdamage libxrender startup-notification expat gconf gconf-native matchbox-common" RDEPENDS = "matchbox-common" PR="r0" diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index d81cfc636a..15004c4b9a 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -72,8 +72,10 @@ EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}" EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}" KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}/include" +KERNEL_HEADERS = "${CROSS_DIR}/${TARGET_SYS}/include" configmangle = 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE="${KERNEL_SOURCE}",g; \ + s,^KERNEL_HEADERS=.*,KERNEL_HEADERS="${KERNEL_HEADERS}",g; \ s,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX="/",g; \ s,^DEVEL_PREFIX=.*,DEVEL_PREFIX="/${prefix}",g; \ s,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH="/lib",; \ |