Re: [OE-core] [dunfell][PATCH 1/2] u-boot: support merging .cfg files for UBOOT_CONFIG
Hello Richard, Can you merge this on Dunfell, Noor -Original Message- From: openembedded-core@lists.openembedded.org [mailto:openembedded-core@lists.openembedded.org] On Behalf Of Hussain, Ahsan Sent: Monday, June 29, 2020 2:16 PM To: openembedded-core@lists.openembedded.org Subject: [OE-core] [dunfell][PATCH 1/2] u-boot: support merging .cfg files for UBOOT_CONFIG From: Ming Liu U-boot recipe supports .cfg files in SRC_URI, but they would be merged to .config during do_configure only when UBOOT_MACHINE is set, we should also support merging .cfg files for UBOOT_CONFIG. Signed-off-by: Max Krummenacher Signed-off-by: Ming Liu Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot.inc | 21 + 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 80f828df52..8cfd25020c 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -77,7 +77,23 @@ def find_cfgs(d): return sources_list do_configure () { -if [ -z "${UBOOT_CONFIG}" ]; then +if [ -n "${UBOOT_CONFIG}" ]; then +unset i j +for config in ${UBOOT_MACHINE}; do +i=$(expr $i + 1); +for type in ${UBOOT_CONFIG}; do +j=$(expr $j + 1); +if [ $j -eq $i ]; then +oe_runmake -C ${S} O=${B}/${config} ${config} +merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} +oe_runmake -C ${S} O=${B}/${config} oldconfig +fi +done +unset j +done +unset i +DEVTOOL_DISABLE_MENUCONFIG=true +else if [ -n "${UBOOT_MACHINE}" ]; then oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} else @@ -85,8 +101,6 @@ do_configure () { fi merge_config.sh -m .config ${@" ".join(find_cfgs(d))} cml1_do_configure -else -DEVTOOL_DISABLE_MENUCONFIG=true fi } @@ -114,7 +128,6 @@ do_compile () { j=$(expr $j + 1); if [ $j -eq $i ] then -oe_runmake -C ${S} O=${B}/${config} ${config} oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET} for binary in ${UBOOT_BINARIES}; do k=$(expr $k + 1); -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#140292): https://lists.openembedded.org/g/openembedded-core/message/140292 Mute This Topic: https://lists.openembedded.org/mt/75187816/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [dunfell][PATCH 2/2] u-boot: avoid blind merging all *.cfg
Hello Richard, Can you merge this on Dunfell. Noor -Original Message- From: openembedded-core@lists.openembedded.org [mailto:openembedded-core@lists.openembedded.org] On Behalf Of Hussain, Ahsan Sent: Monday, June 29, 2020 2:16 PM To: openembedded-core@lists.openembedded.org Subject: [OE-core] [dunfell][PATCH 2/2] u-boot: avoid blind merging all *.cfg From: Jens Rehsack This fixes u-boot-qoriq breakage of: commit 4fde8c8f479f5acd24fb6e0d0b9b4dc94d6f560b Author: Ming Liu Date: Wed Jun 3 13:56:01 2020 +0200 u-boot: support merging .cfg files for UBOOT_CONFIG U-boot recipe supports .cfg files in SRC_URI, but they would be merged to .config during do_configure only when UBOOT_MACHINE is set, we should also support merging .cfg files for UBOOT_CONFIG. The intension of 4fde8c8 looks more than append delta-config snippets to u-boot config and should probably be rewritten to express that much better than implicitely assume all "*.cfg" are for merging into .config. Signed-off-by: Jens Rehsack Signed-off-by: Richard Purdie --- meta/recipes-bsp/u-boot/u-boot.inc | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 8cfd25020c..7d241916eb 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -85,8 +85,10 @@ do_configure () { j=$(expr $j + 1); if [ $j -eq $i ]; then oe_runmake -C ${S} O=${B}/${config} ${config} -merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} -oe_runmake -C ${S} O=${B}/${config} oldconfig +if [ test -n "${@' '.join(find_cfgs(d))}" ]; then +merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} +oe_runmake -C ${S} O=${B}/${config} oldconfig +fi fi done unset j @@ -119,7 +121,7 @@ do_compile () { echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion fi -if [ -n "${UBOOT_CONFIG}" ] +if [ -n "${UBOOT_CONFIG}" -o -n "${UBOOT_DELTA_CONFIG}" ] then unset i j k for config in ${UBOOT_MACHINE}; do -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#140291): https://lists.openembedded.org/g/openembedded-core/message/140291 Mute This Topic: https://lists.openembedded.org/mt/75187818/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [PATCH V2] u-boot: support merging .cfg files for UBOOT_CONFIG
Can this be ported/merged to dunfell also? Noor -Original Message- From: openembedded-core@lists.openembedded.org [mailto:openembedded-core@lists.openembedded.org] On Behalf Of Ming Liu Sent: Wednesday, June 3, 2020 4:56 PM To: openembedded-core@lists.openembedded.org Cc: stefan.ag...@toradex.com; max.krummenac...@toradex.com; Ming Liu Subject: [OE-core] [PATCH V2] u-boot: support merging .cfg files for UBOOT_CONFIG From: Ming Liu U-boot recipe supports .cfg files in SRC_URI, but they would be merged to .config during do_configure only when UBOOT_MACHINE is set, we should also support merging .cfg files for UBOOT_CONFIG. Signed-off-by: Max Krummenacher Signed-off-by: Ming Liu --- meta/recipes-bsp/u-boot/u-boot.inc | 21 + 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 80f828df52..8cfd25020c 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -77,7 +77,23 @@ def find_cfgs(d): return sources_list do_configure () { -if [ -z "${UBOOT_CONFIG}" ]; then +if [ -n "${UBOOT_CONFIG}" ]; then +unset i j +for config in ${UBOOT_MACHINE}; do +i=$(expr $i + 1); +for type in ${UBOOT_CONFIG}; do +j=$(expr $j + 1); +if [ $j -eq $i ]; then +oe_runmake -C ${S} O=${B}/${config} ${config} +merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} +oe_runmake -C ${S} O=${B}/${config} oldconfig +fi +done +unset j +done +unset i +DEVTOOL_DISABLE_MENUCONFIG=true +else if [ -n "${UBOOT_MACHINE}" ]; then oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} else @@ -85,8 +101,6 @@ do_configure () { fi merge_config.sh -m .config ${@" ".join(find_cfgs(d))} cml1_do_configure -else -DEVTOOL_DISABLE_MENUCONFIG=true fi } @@ -114,7 +128,6 @@ do_compile () { j=$(expr $j + 1); if [ $j -eq $i ] then -oe_runmake -C ${S} O=${B}/${config} ${config} oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET} for binary in ${UBOOT_BINARIES}; do k=$(expr $k + 1); -- 2.26.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#139684): https://lists.openembedded.org/g/openembedded-core/message/139684 Mute This Topic: https://lists.openembedded.org/mt/74647690/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [PATCH V2] cups.inc: Fix ldflags warning.
From: Noor Ahsan <noor_ah...@mentor.com> * While building following warning comes up QA Issue: No GNU_HASH in the elf binary: '...libcups.so.2' [ldflags] Fix this warning by settin DSOFLAGS. Signed-off-by: Noor Ahsan <noor_ah...@mentor.com> --- meta/recipes-extended/cups/cups.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 4b2d214..da70b87 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -44,6 +44,7 @@ EXTRA_OECONF = " \ --without-perl \ --without-python \ --without-java \ + DSOFLAGS='${LDFLAGS}' \ " EXTRA_AUTORECONF += "--exclude=autoheader" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cups.inc: Fix ldflags warning.
From: Noor Ahsan <noor_ah...@mentor.com> * While building following warning comes up QA Issue: No GNU_HASH in the elf binary: '...libcups.so.2' [ldflags] Fix this warning by settin DSOFLAGS. Signed-off-by: Noor Ahsan <noor_ah...@mentor.com> --- meta/recipes-extended/cups/cups.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index 4b2d214..c7f3afe 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -44,6 +44,7 @@ EXTRA_OECONF = " \ --without-perl \ --without-python \ --without-java \ + "DSOFLAGS='${LDFLAGS}'" " EXTRA_AUTORECONF += "--exclude=autoheader" -- 2.8.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] rawcopy.py: Copy source file in image creation build folder
From: Noor <noor_ah...@mentor.com> * In wks file when a file name is given using --sourceparams then wic directly use that file instead of copying them to build folder. "assemble" function in partitionedfs.py calls os.rename which renames the file given in --sourceparams. When image recipe is rebuilt then wic complains about missing file which was renamed in previous build. Signed-off-by: Noor Ahsan <noor_ah...@mentor.com> --- scripts/lib/wic/plugins/source/rawcopy.py |4 1 file changed, 4 insertions(+) diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index f0691ba..8481168 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py @@ -74,6 +74,10 @@ class RawCopyPlugin(SourcePlugin): dd_cmd = "dd if=%s of=%s ibs=%s skip=1 conv=notrunc" % \ (src, dst, source_params['skip']) exec_cmd(dd_cmd) +else: + dst = os.path.join(cr_workdir, source_params['file']) + cp_cmd = "cp %s %s" % (src, dst) + exec_cmd(cp_cmd) # get the size in the right units for kickstart (kB) du_cmd = "du -Lbks %s" % dst -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC] rawcopy.py: Copy source file in image creation build folder
From: Noor <noor_ah...@mentor.com> * When a file is given using --sourceparams then wic directly use that file instead of copying them to build folder. At time of assmebling it os.rename is called which rename all the files to name. In that process the original file get renamed. When image recipe is rebuilt then wic complains about missing file which renamed in previous build. Signed-off-by: Noor Ahsan <noor_ah...@mentor.com> --- scripts/lib/wic/plugins/source/rawcopy.py |4 1 file changed, 4 insertions(+) diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py index f0691ba..f17da27 100644 --- a/scripts/lib/wic/plugins/source/rawcopy.py +++ b/scripts/lib/wic/plugins/source/rawcopy.py @@ -74,6 +74,10 @@ class RawCopyPlugin(SourcePlugin): dd_cmd = "dd if=%s of=%s ibs=%s skip=1 conv=notrunc" % \ (src, dst, source_params['skip']) exec_cmd(dd_cmd) +else: +dst = os.path.join(cr_workdir, source_params['file']) +dd_cmd = "cp src dst" +exec_cmd(dd_cmd) # get the size in the right units for kickstart (kB) du_cmd = "du -Lbks %s" % dst -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bind: Update libxml2 check to make it deterministic.
From: Noor noor_ah...@mentor.com * Firstly configure scritp was testing files from bin folder. In our case we don't copy bin folder to sysroot for target recipes. So added extra check to validate .pc file from lib folder via a patch to configure.in file. * Secondly linxml2 dependency was missing. So added PACKAGECONFIG for libxml2. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- ...d-crosscripts-search-path-for-xml2-config.patch | 35 meta/recipes-connectivity/bind/bind_9.9.5.bb |9 +++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch b/meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch new file mode 100644 index 000..4f1a3f8 --- /dev/null +++ b/meta/recipes-connectivity/bind/bind/bind-add-crosscripts-search-path-for-xml2-config.patch @@ -0,0 +1,35 @@ +From 8fa549fe5390875d56f75e20d364394cd5ccf388 Mon Sep 17 00:00:00 2001 +From: Joe MacDonald joe_macdon...@mentor.com +Date: Mon, 3 Nov 2014 21:52:02 -0500 +Subject: [PATCH] bind: add crosscripts search path for xml2-config + +The configure script was testing xml2-config from bin but in openembedded +bin folder is not copied to sysroot so the test was failing. Added another +condition to test libxml-2.0.pc which is present in lib folder. Used pkg-config +to get libs and cflags information. + +Upstream-Status: Inappropriate [ openembedded specific ] + +Signed-off-by: Joe MacDonald joe_macdon...@mentor.com +Signed-off-by: Noor Ahsan noor_ah...@mentor.com +--- + configure.in | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.in b/configure.in +index 3d04f4c..6032f67 100644 +--- a/configure.in b/configure.in +@@ -1433,6 +1433,9 @@ case $use_libxml2 in + if test -f $use_libxml2/bin/xml2-config ; then + libxml2_libs=`$use_libxml2/bin/xml2-config --libs` + libxml2_cflags=`$use_libxml2/bin/xml2-config --cflags` ++ elif test -f $use_libxml2/lib/pkgconfig/libxml-2.0.pc ; then ++ libxml2_libs=`pkg-config libxml-2.0 --libs` ++ libxml2_cflags=`pkg-config libxml-2.0 --cflags` + fi + ;; + esac +-- +1.9.1 + diff --git a/meta/recipes-connectivity/bind/bind_9.9.5.bb b/meta/recipes-connectivity/bind/bind_9.9.5.bb index 8e04f8a..eacb23f 100644 --- a/meta/recipes-connectivity/bind/bind_9.9.5.bb +++ b/meta/recipes-connectivity/bind/bind_9.9.5.bb @@ -18,6 +18,7 @@ SRC_URI = ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \ file://bind9 \ file://init.d-add-support-for-read-only-rootfs.patch \ file://bind9_9_5-CVE-2014-8500.patch \ + file://bind-add-crosscripts-search-path-for-xml2-config.patch \ SRC_URI[md5sum] = e676c65cad5234617ee22f48e328c24e @@ -29,10 +30,14 @@ EXTRA_OECONF = ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \ --disable-devpoll --disable-epoll --with-gost=no \ --with-gssapi=no --with-ecdsa=yes \ --sysconfdir=${sysconfdir}/bind \ - --with-openssl=${STAGING_LIBDIR}/.. --with-libxml2=${STAGING_LIBDIR}/.. \ + --with-openssl=${STAGING_LIBDIR}/.. \ --enable-exportlib --with-export-includedir=${includedir} --with-export-libdir=${libdir} \ -inherit autotools-brokensep update-rc.d systemd useradd +inherit autotools-brokensep update-rc.d systemd useradd pkgconfig + +PACKAGECONFIG ?= libxml2 + +PACKAGECONFIG[libxml2] = --with-libxml2=${STAGING_LIBDIR}/..,--with-libxml2=no,libxml2 USERADD_PACKAGES = ${PN} USERADD_PARAM_${PN} = --system --home /var/cache/bind --no-create-home \ -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] latencytop: Creats x11 PACKAGECONFIG.
From: Noor noor_ah...@mentor.com * Creates x11 packageconfig and update DEPENDS and EXTRA_OEMAKE_X for better handling. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta/recipes-kernel/latencytop/latencytop_0.5.bb |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/latencytop/latencytop_0.5.bb b/meta/recipes-kernel/latencytop/latencytop_0.5.bb index 516e2c5..3fbbd53 100644 --- a/meta/recipes-kernel/latencytop/latencytop_0.5.bb +++ b/meta/recipes-kernel/latencytop/latencytop_0.5.bb @@ -4,7 +4,7 @@ HOMEPAGE = http://www.latencytop.org/; LICENSE = GPLv2 LIC_FILES_CHKSUM = file://latencytop.c;endline=23;md5=ee9ea9b1415356e5734adad4a87dc7fa -DEPENDS = virtual/libintl ncurses glib-2.0 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)} +DEPENDS = virtual/libintl ncurses glib-2.0 PR = r3 @@ -15,7 +15,11 @@ SRC_URI = http://www.latencytop.org/download/latencytop-${PV}.tar.gz \ SRC_URI[md5sum] = 73bb3371c6ee0b0e68e25289027e865c SRC_URI[sha256sum] = 9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef -EXTRA_OEMAKE_X = ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'HAS_GTK_GUI=1', '', d)} +PACKAGECONFIG ?= ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} + +PACKAGECONFIG[x11] = ,,gtk+ + +EXTRA_OEMAKE_X = ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'HAS_GTK_GUI=1', '', d)} CFLAGS += ${LDFLAGS} -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sysprof: Creats x11 PACKAGECONFIG.
From: Noor noor_ah...@mentor.com * gtk+ and libglade is required to have graphical version of sysprof. Created x11 packageconfig and added these two packages in that config and removed from DEPENDS. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta/recipes-kernel/sysprof/sysprof_git.bb |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb index ef1e270..d3fb97a 100644 --- a/meta/recipes-kernel/sysprof/sysprof_git.bb +++ b/meta/recipes-kernel/sysprof/sysprof_git.bb @@ -2,8 +2,6 @@ SUMMARY = System-wide Performance Profiler for Linux LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f -DEPENDS = gtk+ libglade - SRCREV = cd44ee6644c3641507fb53b8a2a69137f2971219 PV = 1.2.0+git${SRCPV} @@ -18,3 +16,8 @@ SRC_URI_append_mips64 = file://rmb-mips.patch S = ${WORKDIR}/git inherit autotools pkgconfig + +PACKAGECONFIG ?= ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} + +PACKAGECONFIG[x11] = ,,gtk+ libglade + -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] latencytop: Creates x11 PACKAGECONFIG.
From: Noor noor_ah...@mentor.com * Creates x11 packageconfig and update DEPENDS and EXTRA_OEMAKE_X for better handling. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta/recipes-kernel/latencytop/latencytop_0.5.bb |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/latencytop/latencytop_0.5.bb b/meta/recipes-kernel/latencytop/latencytop_0.5.bb index 516e2c5..e910a96 100644 --- a/meta/recipes-kernel/latencytop/latencytop_0.5.bb +++ b/meta/recipes-kernel/latencytop/latencytop_0.5.bb @@ -4,7 +4,7 @@ HOMEPAGE = http://www.latencytop.org/; LICENSE = GPLv2 LIC_FILES_CHKSUM = file://latencytop.c;endline=23;md5=ee9ea9b1415356e5734adad4a87dc7fa -DEPENDS = virtual/libintl ncurses glib-2.0 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)} +DEPENDS = virtual/libintl ncurses glib-2.0 PR = r3 @@ -15,7 +15,11 @@ SRC_URI = http://www.latencytop.org/download/latencytop-${PV}.tar.gz \ SRC_URI[md5sum] = 73bb3371c6ee0b0e68e25289027e865c SRC_URI[sha256sum] = 9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef -EXTRA_OEMAKE_X = ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'HAS_GTK_GUI=1', '', d)} +PACKAGECONFIG ??= ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} + +PACKAGECONFIG[x11] = ,,gtk+ + +EXTRA_OEMAKE_X = ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'HAS_GTK_GUI=1', '', d)} CFLAGS += ${LDFLAGS} -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] babeltrace: Add missing bison/flex depensencies.
From: Noor noor_ah...@mentor.com * babeltrace do_configure failed due to missing flex/bison dependencies. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta/recipes-kernel/lttng/babeltrace_1.2.1.bb |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb b/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb index a8ea4cb..dd9961c 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.2.1.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = file://LICENSE;md5=76ba15dd76a248e1dd526bca0e2125fa inherit autotools pkgconfig -DEPENDS = glib-2.0 util-linux popt +DEPENDS = glib-2.0 util-linux popt bison-native flex-native SRCREV = 66c2a20b4391fb5c7f870aeb0dde854f0ae1fc79 PV = 1.2.1+git${SRCPV} -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] libcgroup: Add bison-native and flex-native in depends
From: Noor noor_ah...@mentor.com * libcgroup requires native packages for bison and flex to configure itself successfully. Added those in its DEPENDS. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta/recipes-core/libcgroup/libcgroup_0.41.bb |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/meta/recipes-core/libcgroup/libcgroup_0.41.bb index 5db1079..76b0b58 100644 --- a/meta/recipes-core/libcgroup/libcgroup_0.41.bb +++ b/meta/recipes-core/libcgroup/libcgroup_0.41.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 inherit autotools pkgconfig -DEPENDS = ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} +DEPENDS = bison-native flex-native ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} SRC_URI = ${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2 -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libcgroup: Add bison-native and flex-native in depends
From: Noor noor_ah...@mentor.com * libcgroup require native packages for bison and flex. Added those in its DEPENDS. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta/recipes-core/libcgroup/libcgroup_0.38.bb |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/libcgroup/libcgroup_0.38.bb b/meta/recipes-core/libcgroup/libcgroup_0.38.bb index 8bd0ead..711229f 100644 --- a/meta/recipes-core/libcgroup/libcgroup_0.38.bb +++ b/meta/recipes-core/libcgroup/libcgroup_0.38.bb @@ -10,7 +10,7 @@ PR = r1 inherit autotools pkgconfig -DEPENDS = ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} +DEPENDS = bison-native flex-native ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} SRC_URI = ${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v.038/${BPN}-${PV}.tar.bz2 -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [Patch V3] lighttpd: Add systemd support.
From: Noor noor_ah...@mentor.com * Enable lighttpd with systemd support. * Replace the hardcoded paths with sbindir, sysconfdir and base_bindir Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- .../lighttpd/files/lighttpd.service| 12 ++ meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb | 24 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service b/meta/recipes-extended/lighttpd/files/lighttpd.service new file mode 100644 index 000..a5333b6 --- /dev/null +++ b/meta/recipes-extended/lighttpd/files/lighttpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Lightning Fast Webserver With Light System Requirements +After=network.target + +[Service] +ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf +ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target + diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb index df6ce97..ed8fce2 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb @@ -22,6 +22,7 @@ SRC_URI = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ +file://lighttpd.service \ SRC_URI[md5sum] = 8e2d4ae8e918d4de1aeb9842584d170b @@ -39,19 +40,34 @@ EXTRA_OECONF = \ --disable-static \ -inherit autotools pkgconfig update-rc.d gettext +inherit autotools pkgconfig update-rc.d gettext systemd INITSCRIPT_NAME = lighttpd INITSCRIPT_PARAMS = defaults 70 +SYSTEMD_SERVICE_${PN} = lighttpd.service +SYSTEMD_AUTO_ENABLE = disable + + do_install_append() { -install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var -install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d + +install -d ${D}${sysconfdir} ${D}/www/logs ${D}/www/pages/dav ${D}/www/var install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html +if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then +install -d ${D}${sysconfdir}/init.d +install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d +if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system +sed -i 's!/usr/sbin!${sbindir}!g' ${D}${systemd_unitdir}/system/lighttpd.service +sed -i 's!/etc!${sysconfdir}!g' ${D}${systemd_unitdir}/system/lighttpd.service +sed -i 's!/bin!${base_bindir}!g' ${D}${systemd_unitdir}/system/lighttpd.service +fi + } -FILES_${PN} += ${sysconfdir} /www +FILES_${PN} += ${sysconfdir} /www ${systemd_unitdir} CONFFILES_${PN} = ${sysconfdir}/lighttpd.conf -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [Patch V4] lighttpd: Add systemd support.
From: Noor noor_ah...@mentor.com * Enable lighttpd with systemd support. * Replace the hardcoded paths with sbindir, sysconfdir and base_bindir Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- .../lighttpd/files/lighttpd.service| 12 ++ meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb | 25 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service b/meta/recipes-extended/lighttpd/files/lighttpd.service new file mode 100644 index 000..a5333b6 --- /dev/null +++ b/meta/recipes-extended/lighttpd/files/lighttpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Lightning Fast Webserver With Light System Requirements +After=network.target + +[Service] +ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf +ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target + diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb index df6ce97..4e36772 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb @@ -22,6 +22,7 @@ SRC_URI = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ +file://lighttpd.service \ SRC_URI[md5sum] = 8e2d4ae8e918d4de1aeb9842584d170b @@ -39,19 +40,35 @@ EXTRA_OECONF = \ --disable-static \ -inherit autotools pkgconfig update-rc.d gettext +inherit autotools pkgconfig update-rc.d gettext systemd INITSCRIPT_NAME = lighttpd INITSCRIPT_PARAMS = defaults 70 +SYSTEMD_SERVICE_${PN} = lighttpd.service +SYSTEMD_AUTO_ENABLE = disable + + do_install_append() { -install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var -install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d + +install -d ${D}${sysconfdir} ${D}/www/logs ${D}/www/pages/dav ${D}/www/var install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html +if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then +install -d ${D}${sysconfdir}/init.d +install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d +fi +if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system +sed -i 's!/usr/sbin!${sbindir}!g' ${D}${systemd_unitdir}/system/lighttpd.service +sed -i 's!/etc!${sysconfdir}!g' ${D}${systemd_unitdir}/system/lighttpd.service +sed -i 's!/bin!${base_bindir}!g' ${D}${systemd_unitdir}/system/lighttpd.service +fi + } -FILES_${PN} += ${sysconfdir} /www +FILES_${PN} += ${sysconfdir} /www ${systemd_unitdir} CONFFILES_${PN} = ${sysconfdir}/lighttpd.conf -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lighttpd: Add systemd support.
From: Noor noor_ah...@mentor.com * Enable lighttpd with systemd support. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- .../lighttpd/files/lighttpd.service| 12 +++ meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb | 21 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service b/meta/recipes-extended/lighttpd/files/lighttpd.service new file mode 100644 index 000..a5333b6 --- /dev/null +++ b/meta/recipes-extended/lighttpd/files/lighttpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Lightning Fast Webserver With Light System Requirements +After=network.target + +[Service] +ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf +ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target + diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb index df6ce97..93f7a39 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb @@ -22,6 +22,7 @@ SRC_URI = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ +file://lighttpd.service \ SRC_URI[md5sum] = 8e2d4ae8e918d4de1aeb9842584d170b @@ -39,19 +40,31 @@ EXTRA_OECONF = \ --disable-static \ -inherit autotools pkgconfig update-rc.d gettext +inherit autotools pkgconfig update-rc.d gettext systemd INITSCRIPT_NAME = lighttpd INITSCRIPT_PARAMS = defaults 70 +SYSTEMD_SERVICE_${PN} = lighttpd.service +SYSTEMD_AUTO_ENABLE = disable + + do_install_append() { -install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var -install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d + +install -d ${D}${sysconfdir} ${D}/www/logs ${D}/www/pages/dav ${D}/www/var install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html +if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then +install -d ${D}${sysconfdir}/init.d +install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d +else + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system +fi + } -FILES_${PN} += ${sysconfdir} /www +FILES_${PN} += ${sysconfdir} /www ${systemd_unitdir} CONFFILES_${PN} = ${sysconfdir}/lighttpd.conf -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] lighttpd: Add systemd support.
From: Noor noor_ah...@mentor.com * Enable lighttpd with systemd support. * Replace the hardcoded paths with sbindir, sysconfdir and base_bindir Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- .../lighttpd/files/lighttpd.service| 12 ++ meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb | 24 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/lighttpd/files/lighttpd.service b/meta/recipes-extended/lighttpd/files/lighttpd.service new file mode 100644 index 000..a5333b6 --- /dev/null +++ b/meta/recipes-extended/lighttpd/files/lighttpd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Lightning Fast Webserver With Light System Requirements +After=network.target + +[Service] +ExecStartPre=/usr/sbin/lighttpd -t -f /etc/lighttpd.conf +ExecStart=/usr/sbin/lighttpd -D -f /etc/lighttpd.conf +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target + diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb index df6ce97..3c03938 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.32.bb @@ -22,6 +22,7 @@ SRC_URI = http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ +file://lighttpd.service \ SRC_URI[md5sum] = 8e2d4ae8e918d4de1aeb9842584d170b @@ -39,19 +40,34 @@ EXTRA_OECONF = \ --disable-static \ -inherit autotools pkgconfig update-rc.d gettext +inherit autotools pkgconfig update-rc.d gettext systemd INITSCRIPT_NAME = lighttpd INITSCRIPT_PARAMS = defaults 70 +SYSTEMD_SERVICE_${PN} = lighttpd.service +SYSTEMD_AUTO_ENABLE = disable + + do_install_append() { -install -d ${D}${sysconfdir}/init.d ${D}/www/logs ${D}/www/pages/dav ${D}/www/var -install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d + +install -d ${D}${sysconfdir} ${D}/www/logs ${D}/www/pages/dav ${D}/www/var install -m 0755 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html +if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then +install -d ${D}${sysconfdir}/init.d +install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d +else +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system +sed -i 's!/usr/sbin!${sbindir}!g' ${D}${systemd_unitdir}/system/lighttpd.service +sed -i 's!/etc!${sysconfdir}!g' ${D}${systemd_unitdir}/system/lighttpd.service +sed -i 's!/bin!${base_bindir}!g' ${D}${systemd_unitdir}/system/lighttpd.service +fi + } -FILES_${PN} += ${sysconfdir} /www +FILES_${PN} += ${sysconfdir} /www ${systemd_unitdir} CONFFILES_${PN} = ${sysconfdir}/lighttpd.conf -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cairo: Adds libxext in X11DEPENDS.
From: Noor Ahsan noor_ah...@mentor.com * cairo was giving redefinition error of struct _XLinearGradient, struct _XCircle and struct _XRadialGradient. * cario now depends on libxext. Adding that dependency resolved above errors. * Verified it on P2020RDB. * Bump PR. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta/recipes-graphics/cairo/cairo.inc |2 +- meta/recipes-graphics/cairo/cairo_1.12.8.bb |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 3059fae..217e297 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -10,7 +10,7 @@ HOMEPAGE = http://cairographics.org; BUGTRACKER = http://bugs.freedesktop.org; SECTION = libs LICENSE = MPL-1 LGPLv2.1 -X11DEPENDS = virtual/libx11 libsm libxrender +X11DEPENDS = virtual/libx11 libsm libxrender libxext DEPENDS = libpng fontconfig pixman glib-2.0 PACKAGECONFIG ??= ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'gtk-directfb', 'gtk-directfb', '', d)} diff --git a/meta/recipes-graphics/cairo/cairo_1.12.8.bb b/meta/recipes-graphics/cairo/cairo_1.12.8.bb index 058854c..567a17f 100644 --- a/meta/recipes-graphics/cairo/cairo_1.12.8.bb +++ b/meta/recipes-graphics/cairo/cairo_1.12.8.bb @@ -2,7 +2,7 @@ require cairo.inc LIC_FILES_CHKSUM = file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77 -PR = r0 +PR = r1 SRC_URI = http://cairographics.org/releases/cairo-${PV}.tar.xz; -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] freetype: Update EXTRA_OECONF to use host gcc.
From: Noor Ahsan noor_ah...@mentor.com * It uses host gcc in its configure script. When IA32 toolchain is installed it starts using its binaries instead of native gcc. Modified EXTRA_OECONF so that host gcc is used. Signed-off-by: Noor Ahsa noor_ah...@mentor.com --- meta/recipes-graphics/freetype/freetype_2.4.10.bb |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/freetype/freetype_2.4.10.bb b/meta/recipes-graphics/freetype/freetype_2.4.10.bb index 9365475..35d6d22 100644 --- a/meta/recipes-graphics/freetype/freetype_2.4.10.bb +++ b/meta/recipes-graphics/freetype/freetype_2.4.10.bb @@ -28,7 +28,7 @@ inherit autotools pkgconfig binconfig LIBTOOL = ${S}/builds/unix/${HOST_SYS}-libtool EXTRA_OEMAKE = 'LIBTOOL=${LIBTOOL}' EXTRA_OEMAKE_class-native = -EXTRA_OECONF = --without-zlib --without-bzip2 +EXTRA_OECONF = --without-zlib --without-bzip2 CC_BUILD='${BUILD_CC}' do_configure() { cd builds/unix -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sysprof: Fixes undefined reference to `rmb'
From: Noor Ahsan noor_ah...@mentor.com * Recipe already contains a patch for mips arch but not for mips64. For mips64 arch 'mips' was not available in OVERRIDES, rather mips64 was there. So added the same patch for mips64 arch using mips64. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta/recipes-kernel/sysprof/sysprof_git.bb |1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-kernel/sysprof/sysprof_git.bb b/meta/recipes-kernel/sysprof/sysprof_git.bb index bd34f00..64414c0 100644 --- a/meta/recipes-kernel/sysprof/sysprof_git.bb +++ b/meta/recipes-kernel/sysprof/sysprof_git.bb @@ -15,6 +15,7 @@ SRC_URI = git://git.gnome.org/sysprof;protocol=git \ SRC_URI_append_arm = file://rmb-arm.patch SRC_URI_append_mips = file://rmb-mips.patch +SRC_URI_append_mips64 = file://rmb-mips.patch S = ${WORKDIR}/git -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] utility-taska.bbclass: Add distclean task for removing sources
From: Noor Ahsan noor_ah...@mentor.com * Bring distclean task from openembedded classic. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta/classes/utility-tasks.bbclass | 30 ++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass index cbb000a..8379de6 100644 --- a/meta/classes/utility-tasks.bbclass +++ b/meta/classes/utility-tasks.bbclass @@ -28,6 +28,36 @@ python do_clean() { bb.build.exec_func(f, d) } +addtask distclean +do_distclean[nostamp] = 1 +python do_distclean() { + clear downloaded sources, build and temp directories + + bb.build.exec_func('do_clean', d) + + src_uri = bb.data.getVar('SRC_URI', d, 1) + if not src_uri: + return + + for uri in src_uri.split(): + if bb.decodeurl(uri)[0] == file: + continue + + try: + local = bb.data.expand(bb.fetch.localpath(uri, d), d) + except bb.MalformedUrl, e: + bb.debug(1, 'Unable to generate local path for malformed uri: %s' % e) + else: + bb.note(removing %s % base_path_out(local, d)) + try: + if os.path.exists(local + .done): + os.remove(local + .done) + if os.path.exists(local): + os.remove(local) + except OSError, e: + bb.note(Error in removal: %s % e) +} + addtask checkuri do_checkuri[nostamp] = 1 python do_checkuri() { -- 1.7.9 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] utility-taska.bbclass: Add distclean task for removing sources
From: Noor Ahsan noor_ah...@mentor.com * Bring distclean task from openembedded classic. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta/classes/utility-tasks.bbclass | 30 ++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass index cbb000a..8379de6 100644 --- a/meta/classes/utility-tasks.bbclass +++ b/meta/classes/utility-tasks.bbclass @@ -28,6 +28,36 @@ python do_clean() { bb.build.exec_func(f, d) } +addtask distclean +do_distclean[nostamp] = 1 +python do_distclean() { + clear downloaded sources, build and temp directories + + bb.build.exec_func('do_clean', d) + + src_uri = bb.data.getVar('SRC_URI', d, 1) + if not src_uri: + return + + for uri in src_uri.split(): + if bb.decodeurl(uri)[0] == file: + continue + + try: + local = bb.data.expand(bb.fetch.localpath(uri, d), d) + except bb.MalformedUrl, e: + bb.debug(1, 'Unable to generate local path for malformed uri: %s' % e) + else: + bb.note(removing %s % base_path_out(local, d)) + try: + if os.path.exists(local + .done): + os.remove(local + .done) + if os.path.exists(local): + os.remove(local) + except OSError, e: + bb.note(Error in removal: %s % e) +} + addtask checkuri do_checkuri[nostamp] = 1 python do_checkuri() { -- 1.7.9 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] utility-tasks.bbclass: Add distclean task for removing sources
From: Noor Ahsan noor_ah...@mentor.com * Bring distclean task from openembedded classic. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta/classes/utility-tasks.bbclass | 30 ++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass index cbb000a..8379de6 100644 --- a/meta/classes/utility-tasks.bbclass +++ b/meta/classes/utility-tasks.bbclass @@ -28,6 +28,36 @@ python do_clean() { bb.build.exec_func(f, d) } +addtask distclean +do_distclean[nostamp] = 1 +python do_distclean() { + clear downloaded sources, build and temp directories + + bb.build.exec_func('do_clean', d) + + src_uri = bb.data.getVar('SRC_URI', d, 1) + if not src_uri: + return + + for uri in src_uri.split(): + if bb.decodeurl(uri)[0] == file: + continue + + try: + local = bb.data.expand(bb.fetch.localpath(uri, d), d) + except bb.MalformedUrl, e: + bb.debug(1, 'Unable to generate local path for malformed uri: %s' % e) + else: + bb.note(removing %s % base_path_out(local, d)) + try: + if os.path.exists(local + .done): + os.remove(local + .done) + if os.path.exists(local): + os.remove(local) + except OSError, e: + bb.note(Error in removal: %s % e) +} + addtask checkuri do_checkuri[nostamp] = 1 python do_checkuri() { -- 1.7.9 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] insane.bbclass: Add missing variable bpn
From: Noor Ahsan noor_ah...@mentor.com * bpn variable was used but it was not defined. Add bpn to resolve that issue. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta/classes/insane.bbclass |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 6298136..1cfb898 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -328,6 +328,7 @@ def package_qa_check_arch(path,name,d, elf, messages): target_os = d.getVar('TARGET_OS', True) target_arch = d.getVar('TARGET_ARCH', True) provides = d.getVar('PROVIDES', d, True) +bpn = d.getVar('BPN', True) # FIXME: Cross package confuse this check, so just skip them for s in ['cross', 'nativesdk', 'cross-canadian']: -- 1.7.9 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libc-packgae.bbclass: Add i686 support in locale_arch_options
From: Noor Ahsan noor_ah...@mentor.com * While building for i686 architectre an error was coming that locale_arch_options does not have support for i686. Add missing support. * Verified on intel architecture. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta/classes/libc-package.bbclass |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 4acf91a..957243d 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass @@ -271,6 +271,7 @@ python package_do_split_gconvs () { mips: --uint32-align=4 --big-endian , \ mipsel: --uint32-align=4 --little-endian , \ i586: --uint32-align=4 --little-endian , \ + i686: --uint32-align=4 --little-endian , \ x86_64: --uint32-align=4 --little-endian } if target_arch in locale_arch_options: -- 1.7.9 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH 0/4] pull request #1 for bechmark recipes
From: Noor Ahsan noor_ah...@mentor.com *** BLURB HERE *** The following changes since commit 22ec18224f7a7c64850c76b14017dff2ff4345f2: pespin (1): elfe: Add LIC_FILES_CHKSUM to recipe are available in the git repository at: git://github.com/Noor-Ahsan/meta-oe master https://github.com/Noor-Ahsan/meta-oe/tree/master Noor Ahsan (4): dbench: Add version 4.0 (initial recipe) lmbench: Add version 3.0-a9 (initial recipe) iperf: Add version 2.0.4 (initial recipe) tiobench: Add version 0.3.3 (initial recipe) meta-oe/recipes-benchmark/dbench/dbench_4.0.bb | 26 +++ .../recipes-benchmark/dbench/files/destdir.patch | 28 +++ .../recipes-benchmark/dbench/files/makefile.patch | 18 ++ .../iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff | 164 ++ .../001-cast-to-max_size_t-instead-of-int.patch| 14 ++ .../003-fix-hyphen-used-as-minus-sign.patch| 178 .../iperf/iperf-2.0.4/004-svn-r43-ro.patch | 117 + .../iperf-2.0.4/005-iperf-die-on-bind-fail.patch | 15 ++ .../006-iperf-die-on-connect-fail.patch| 15 ++ .../iperf-2.0.4/007-iperf-reporter-deadlock.patch | 68 .../iperf/iperf-2.0.4/008-numofreport.patch| 15 ++ .../iperf/iperf-2.0.4/009-delayloop.patch | 22 +++ meta-oe/recipes-benchmark/iperf/iperf_2.0.4.bb | 47 + .../lmbench/lmbench-3.0-a9/obey-ranlib.patch | 30 .../lmbench-3.0-a9/update-results-script.patch | 160 ++ .../recipes-benchmark/lmbench/lmbench/lmbench-run | 23 +++ .../lmbench/lmbench/rename-line-binary.patch | 19 ++ .../recipes-benchmark/lmbench/lmbench_3.0-a9.bb| 56 ++ .../tiobench-0.3.3/tiobench-makefile.patch | 49 ++ .../recipes-benchmark/tiobench/tiobench_0.3.3.bb | 25 +++ 20 files changed, 1089 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-benchmark/dbench/dbench_4.0.bb create mode 100644 meta-oe/recipes-benchmark/dbench/files/destdir.patch create mode 100644 meta-oe/recipes-benchmark/dbench/files/makefile.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/001-cast-to-max_size_t-instead-of-int.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/003-fix-hyphen-used-as-minus-sign.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/004-svn-r43-ro.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/005-iperf-die-on-bind-fail.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/006-iperf-die-on-connect-fail.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/007-iperf-reporter-deadlock.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/008-numofreport.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/009-delayloop.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf_2.0.4.bb create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench/rename-line-binary.patch create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb create mode 100644 meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch create mode 100644 meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH 1/4] dbench: Add version 4.0 (initial recipe)
From: Noor Ahsan noor_ah...@mentor.com * Imported from oe.dev commit id d6f49fe115206047b41b0195724ba872897ef531 Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- meta-oe/recipes-benchmark/dbench/dbench_4.0.bb | 26 ++ .../recipes-benchmark/dbench/files/destdir.patch | 28 .../recipes-benchmark/dbench/files/makefile.patch | 18 3 files changed, 72 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-benchmark/dbench/dbench_4.0.bb create mode 100644 meta-oe/recipes-benchmark/dbench/files/destdir.patch create mode 100644 meta-oe/recipes-benchmark/dbench/files/makefile.patch diff --git a/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb b/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb new file mode 100644 index 000..60163d1 --- /dev/null +++ b/meta-oe/recipes-benchmark/dbench/dbench_4.0.bb @@ -0,0 +1,26 @@ +DESCRIPTION = The dbench (disk) and tbench (TCP) benchmarks +DESCRIPTION_dbench = Filesystem load benchmark +DESCRIPTION_tbench = TCP load benchmark +HOMEPAGE = http://samba.org/ftp/tridge/dbench/; +LICENSE = GPL +LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 + +DEPENDS = popt +PR = r0 + +SRC_URI = \ + http://samba.org/ftp/tridge/dbench/dbench-${PV}.tar.gz \ + file://destdir.patch \ + file://makefile.patch + +inherit autotools + +PACKAGES =+ tbench tbench-dbg + +TARGET_CC_ARCH += ${LDFLAGS} + +FILES_tbench = ${bindir}/tbench* ${prefix}/share/client.txt +FILES_tbench-dbg += ${bindir}/.debug/tbench* + +SRC_URI[md5sum] = 1fe56ff71b9a416f8889d7150ac54da4 +SRC_URI[sha256sum] = 6001893f34e68a3cfeb5d424e1f2bfef005df96a22d86f35dc770c5bccf3aa8a diff --git a/meta-oe/recipes-benchmark/dbench/files/destdir.patch b/meta-oe/recipes-benchmark/dbench/files/destdir.patch new file mode 100644 index 000..ca9a8ee --- /dev/null +++ b/meta-oe/recipes-benchmark/dbench/files/destdir.patch @@ -0,0 +1,28 @@ +Append $(DESTDIR) to all $(bindir), $(datadir) and $(mandir). Got +this patch from OE commit id 709c4d66e0b107ca606941b988bad717c0b45d9b + +Upstream-Status: Inappropriate [not author] + +Index: dbench-3.04/Makefile.in +=== +--- dbench-3.04.orig/Makefile.in 2006-09-17 20:21:07.0 +0200 dbench-3.04/Makefile.in2006-09-17 20:21:36.0 +0200 +@@ -32,12 +32,12 @@ + + # Careful here: don't install client.txt over itself. + install: all +- ${INSTALLCMD} -d $(bindir) $(datadir) $(mandir) +- ${INSTALLCMD} dbench tbench tbench_srv $(bindir) +- ${INSTALLCMD} client.txt $(datadir) +- ${INSTALLCMD} -m644 dbench.1 $(mandir) +- ln -sf dbench.1 $(mandir)/tbench.1 +- ln -sf dbench.1 $(mandir)/tbench_srv.1 ++ ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mandir) ++ ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir) ++ ${INSTALLCMD} client.txt $(DESTDIR)$(datadir) ++ ${INSTALLCMD} -m644 dbench.1 $(DESTDIR)$(mandir) ++ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1 ++ ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1 + + clean: + rm -f *.o *~ dbench tbench tbench_srv diff --git a/meta-oe/recipes-benchmark/dbench/files/makefile.patch b/meta-oe/recipes-benchmark/dbench/files/makefile.patch new file mode 100644 index 000..09d619a --- /dev/null +++ b/meta-oe/recipes-benchmark/dbench/files/makefile.patch @@ -0,0 +1,18 @@ +Add space between install -m option and its argument. Got this patch from +OE 709c4d66e0b107ca606941b988bad717c0b45d9b + +Upstream-Status: Inappropriate [not author] + +Index: dbench-4.0/Makefile.in +=== +--- dbench-4.0.orig/Makefile.in dbench-4.0/Makefile.in +@@ -35,7 +35,7 @@ install: all + ${INSTALLCMD} -d $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(mandir) + ${INSTALLCMD} dbench tbench tbench_srv $(DESTDIR)$(bindir) + ${INSTALLCMD} client.txt $(DESTDIR)$(datadir) +- ${INSTALLCMD} -m644 dbench.1 $(DESTDIR)$(mandir) ++ ${INSTALLCMD} -m 644 dbench.1 $(DESTDIR)$(mandir) + ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench.1 + ln -sf dbench.1 $(DESTDIR)$(mandir)/tbench_srv.1 + -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH 2/4] lmbench: Add version 3.0-a9 (initial recipe)
From: Noor Ahsan noor_ah...@mentor.com * Imported from oe.dev commit id bac6441118e0b78d55c98afdc108f03b6c655909. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- .../lmbench/lmbench-3.0-a9/obey-ranlib.patch | 30 .../lmbench-3.0-a9/update-results-script.patch | 160 .../recipes-benchmark/lmbench/lmbench/lmbench-run | 23 +++ .../lmbench/lmbench/rename-line-binary.patch | 19 +++ .../recipes-benchmark/lmbench/lmbench_3.0-a9.bb| 56 +++ 5 files changed, 288 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench/rename-line-binary.patch create mode 100644 meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch new file mode 100644 index 000..41a3b32 --- /dev/null +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/obey-ranlib.patch @@ -0,0 +1,30 @@ +In some cases the host may have too old of a ranlib to work. Since it's +not exactly a great idea to not be using the cross ranlib anyhow, fix the +Makefile so we can override ranlib and then override it + +Upstream-Status: Inappropriate [build system specific change] +--- + src/Makefile |3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: lmbench-3.0-a9/src/Makefile +=== +--- lmbench-3.0-a9.orig/src/Makefile lmbench-3.0-a9/src/Makefile +@@ -38,6 +38,7 @@ CC=`../scripts/compiler` + MAKE=`../scripts/make` + AR=ar + ARCREATE=cr ++RANLIB=ranlib + + # base of installation location + BASE=/usr/local +@@ -217,7 +218,7 @@ $O/lmbench : ../scripts/lmbench version. + $O/lmbench.a: $(LIBOBJS) + /bin/rm -f $O/lmbench.a + $(AR) $(ARCREATE) $O/lmbench.a $(LIBOBJS) +- -ranlib $O/lmbench.a ++ -$(RANLIB) $O/lmbench.a + + $O/lib_timing.o : lib_timing.c $(INCS) + $(COMPILE) -c lib_timing.c -o $O/lib_timing.o diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch new file mode 100644 index 000..894f146 --- /dev/null +++ b/meta-oe/recipes-benchmark/lmbench/lmbench-3.0-a9/update-results-script.patch @@ -0,0 +1,160 @@ +Now that we have our binaries in /usr/bin rather than the normal +lmbench hierarchy we need to update the scripts as well to behave well here. + +Upstream-Status: Inappropriate [This is related to the OE-specific behavior +of installing into /usr/bin, etc, rather than dumping everything into +/usr/share/lmbench or similar] + +Index: lmbench-3.0-a9/scripts/results +=== +--- lmbench-3.0-a9.orig/scripts/results lmbench-3.0-a9/scripts/results +@@ -8,11 +8,11 @@ RESULTS=results/$OS + BASE=../$RESULTS/`uname -n` + EXT=0 + +-if [ ! -f ../bin/$OS/$CONFIG ] ++if [ ! -f $CONFIG ] + then echo No config file? + exit 1 + fi +-. ../bin/$OS/$CONFIG ++. $CONFIG + + if [ ! -d ../$RESULTS ] + then mkdir -p ../$RESULTS +@@ -23,11 +23,9 @@ do EXT=`expr $EXT + 1` + RESULTS=$BASE.$EXT + done + +-cd ../bin/$OS +-PATH=.:${PATH}; export PATH + export SYNC_MAX + export OUTPUT +-lmbench $CONFIG 2../${RESULTS} ++lmbench $CONFIG 2${RESULTS} + + if [ X$MAIL = Xyes ] + then echo Mailing results +Index: lmbench-3.0-a9/scripts/config-run +=== +--- lmbench-3.0-a9.orig/scripts/config-run lmbench-3.0-a9/scripts/config-run +@@ -132,20 +132,20 @@ export LMBENCH_SCHED + + echo $L; echo ; + echo Hang on, we are calculating your timing granularity. +-../bin/$OS/msleep 250 +-ENOUGH=`../bin/$OS/enough` ++msleep 250 ++ENOUGH=`enough` + export ENOUGH + echo OK, it looks like you can time stuff down to $ENOUGH usec resolution. + echo + echo Hang on, we are calculating your timing overhead. +-../bin/$OS/msleep 250 +-TIMING_O=`../bin/$OS/timing_o` ++msleep 250 ++TIMING_O=`timing_o` + export TIMING_O + echo OK, it looks like your gettimeofday() costs $TIMING_O usecs. + echo + echo Hang on, we are calculating your loop overhead. +-../bin/$OS/msleep 250 +-LOOP_O=`../bin/$OS/loop_o` ++msleep 250 ++LOOP_O=`loop_o` + export LOOP_O + echo OK, it looks like your benchmark loop costs $LOOP_O usecs. + echo +@@ -177,7 +177,7 @@ then + fi + if [ X$MB = X ] + then $ECHON Probing system for available memory: $ECHOC +- MB=`../bin/$OS/memsize 4096` ++ MB=`memsize 4096` + fi + TOTAL_MEM=$MB + MB=`echo \( $MB \* 7 \) / 10 | bc 2/dev/null
[OE-core] [meta-oe][PATCH 3/4] iperf: Add version 2.0.4 (initial recipe)
From: Noor Ahsan noor_ah...@mentor.com * Imported from oe.dev commit id 0ff10ecb88de73074ae4857046643cef15dc4e97 and c10c33f86903c93611023197a7f812459c2dfe2d. * Combined .inc and bb file from oe.dev and made a single bb file. * Removed EXTRA_OECONF_append_epia = --disable-threads while importing as this should go in epia layer. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- .../iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff | 164 ++ .../001-cast-to-max_size_t-instead-of-int.patch| 14 ++ .../003-fix-hyphen-used-as-minus-sign.patch| 178 .../iperf/iperf-2.0.4/004-svn-r43-ro.patch | 117 + .../iperf-2.0.4/005-iperf-die-on-bind-fail.patch | 15 ++ .../006-iperf-die-on-connect-fail.patch| 15 ++ .../iperf-2.0.4/007-iperf-reporter-deadlock.patch | 68 .../iperf/iperf-2.0.4/008-numofreport.patch| 15 ++ .../iperf/iperf-2.0.4/009-delayloop.patch | 22 +++ meta-oe/recipes-benchmark/iperf/iperf_2.0.4.bb | 47 + 10 files changed, 655 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/001-cast-to-max_size_t-instead-of-int.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/003-fix-hyphen-used-as-minus-sign.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/004-svn-r43-ro.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/005-iperf-die-on-bind-fail.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/006-iperf-die-on-connect-fail.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/007-iperf-reporter-deadlock.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/008-numofreport.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.4/009-delayloop.patch create mode 100644 meta-oe/recipes-benchmark/iperf/iperf_2.0.4.bb diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff b/meta-oe/recipes-benchmark/iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff new file mode 100644 index 000..7e89953 --- /dev/null +++ b/meta-oe/recipes-benchmark/iperf/iperf-2.0.4/000-Iperf_Fix-CPU-Usage.diff @@ -0,0 +1,164 @@ +[Thread]: Replace thread_rest() with condition variables + +This applies the patch by Ingo Molnar from + + http://marc.info/?l=linux-kernelm=119088670113210w=2 + +by reverting previous changes that coincided with changes made by this +patch. Other than that, the patch is the original from the above URL. + +Gerrit +--- + compat/Thread.c |6 -- + src/Reporter.c | 37 + + src/main.cpp|2 ++ + 3 files changed, 11 insertions(+), 34 deletions(-) + +rover: changed two remaining thread_rest. + +--- a/compat/Thread.c b/compat/Thread.c +@@ -405,12 +405,6 @@ int thread_numuserthreads( void ) { + void thread_rest ( void ) { + #if defined( HAVE_THREAD ) + #if defined( HAVE_POSIX_THREAD ) +-#if defined( _POSIX_PRIORITY_SCHEDULING ) +-sched_yield(); +-#else +-usleep( 0 ); +-#endif +- + #else // Win32 + SwitchToThread( ); + #endif +--- a/src/Reporter.c b/src/Reporter.c +@@ -110,9 +110,8 @@ + + char buffer[64]; // Buffer for printing + ReportHeader *ReportRoot = NULL; +-int threadWait = 0; +-int threadSleeping = 0; + extern Condition ReportCond; ++extern Condition ReportDoneCond; + int reporter_process_report ( ReportHeader *report ); + void process_report ( ReportHeader *report ); + int reporter_handle_packet( ReportHeader *report ); +@@ -340,7 +339,7 @@ + // item + while ( index == 0 ) { + Condition_Signal( ReportCond ); +-thread_rest(); ++Condition_Wait( ReportDoneCond ); + index = agent-reporterindex; + } + agent-agentindex = 0; +@@ -348,11 +347,9 @@ + // Need to make sure that reporter is not about to be lapped + while ( index - 1 == agent-agentindex ) { + Condition_Signal( ReportCond ); +-thread_rest(); ++Condition_Wait( ReportDoneCond ); + index = agent-reporterindex; + } +- if (threadSleeping) +- Condition_Signal( ReportCond ); + + // Put the information there + memcpy( agent-data + agent-agentindex, packet, sizeof(ReportStruct) ); +@@ -382,9 +379,6 @@ + packet-packetLen = 0; + ReportPacket( agent, packet ); + packet-packetID = agent-report.cntDatagrams; +- if (threadSleeping) +- Condition_Signal( ReportCond ); +- + } + } + +@@ -396,11 +390,8 @@ + void EndReport( ReportHeader *agent ) { + if ( agent != NULL ) { + int index = agent-reporterindex; +- if (threadSleeping) +- Condition_Signal( ReportCond ); +- + while ( index != -1
[OE-core] [meta-oe][PATCH 4/4] tiobench: Add version 0.3.3 (initial recipe)
From: Noor Ahsan noor_ah...@mentor.com * Imported from oe.dev commit id 821f47e170dddabaef3925fd62c5423210dcb363. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- .../tiobench-0.3.3/tiobench-makefile.patch | 49 .../recipes-benchmark/tiobench/tiobench_0.3.3.bb | 25 ++ 2 files changed, 74 insertions(+), 0 deletions(-) create mode 100644 meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch create mode 100644 meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb diff --git a/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch b/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch new file mode 100644 index 000..f820c7e --- /dev/null +++ b/meta-oe/recipes-benchmark/tiobench/tiobench-0.3.3/tiobench-makefile.patch @@ -0,0 +1,49 @@ +Adapt tiobench to OE +Author: Ludovic Desroches ludovic.desroc...@atmel.com + +Upstream-Status: Inappropriate [not author] + +Index: Makefile +=== +--- a/Makefile 2011-05-26 07:48:46.341400974 +0200 b/Makefile 2011-05-30 06:32:38.091401358 +0200 +@@ -1,8 +1,9 @@ + # Makefile for tiotest + +-CC=gcc ++CC?=gcc + #CFLAGS=-O3 -fomit-frame-pointer -Wall + CFLAGS=-O2 -Wall ++LDFLAGS?= + + #DEFINES=-DUSE_MMAP + #-DUSE_MADVISE +@@ -14,16 +15,16 @@ + + #DEFINES= + +-LINK=gcc ++LINK?=$(CC) + EXE=tiotest + PROJECT=tiobench + # do it once instead of each time referenced + VERSION=$(shell egrep tiotest v[0-9]+.[0-9]+ tiotest.c | cut -d -f 7 | sed s/v//g) + DISTNAME=$(PROJECT)-$(VERSION) + INSTALL=install +-PREFIX=/usr/local ++PREFIX?=/usr/local + BINDIR=$(PREFIX)/bin +-DOCDIR=/usr/local/doc/$(DISTNAME) ++DOCDIR=$(PREFIX)/share/doc/$(DISTNAME) + + all: $(EXE) + +@@ -34,7 +35,7 @@ + $(CC) -c $(CFLAGS) $(DEFINES) tiotest.c -o tiotest.o + + $(EXE): tiotest.o crc32.o +- $(LINK) -o $(EXE) tiotest.o crc32.o -lpthread ++ $(LINK) -o $(EXE) tiotest.o crc32.o -lpthread $(LDFLAGS) + @echo + @echo ./tiobench.pl --help for usage options + @echo diff --git a/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb b/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb new file mode 100644 index 000..636e2d1 --- /dev/null +++ b/meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb @@ -0,0 +1,25 @@ +DESCRIPTION = Threaded I/O tester +HOMEPAGE = http://sourceforge.net/projects/tiobench/; +LICENSE = GPLv2 +LIC_FILES_CHKSUM = file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b +RDEPENDS = \ +perl \ +perl-module-exporter-heavy \ +perl-module-getopt-long \ +perl-module-overload \ +perl-module-strict \ + +PR = r0 + +SRC_URI = \ +http://sourceforge.net/projects/tiobench/files/tiobench/${PV}/${P}.tar.gz \ +file://tiobench-makefile.patch \ + +SRC_URI[md5sum] = bf485bf820e693c79e6bd2a38702a128 +SRC_URI[sha256sum] = 8ad011059a35ac70cdb5e3d3999ceee44a8e8e9078926844b0685b7ea9db2bcc + +EXTRA_OEMAKE = PREFIX=${D}/usr + +do_install() { +oe_runmake install +} -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mtd-utils: Added recipe of newer version 1.4.4.
From: Noor Ahsan noor_ah...@mentor.com * Added recipe of version 1.4.4 and removed 1.4.1 recipe and its patch files. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- .../add-exclusion-to-mkfs-jffs2-git-2.patch| 103 .../add-exclusion-to-mkfs-jffs2-git-2.patch| 103 meta/recipes-devtools/mtd/mtd-utils_1.4.1.bb | 31 -- meta/recipes-devtools/mtd/mtd-utils_1.4.4.bb | 32 ++ 4 files changed, 135 insertions(+), 134 deletions(-) diff --git a/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch b/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch deleted file mode 100644 index 57d6a30..000 --- a/meta/recipes-devtools/mtd/mtd-utils-1.4.1/add-exclusion-to-mkfs-jffs2-git-2.patch +++ /dev/null @@ -1,103 +0,0 @@ -Upstream-Status: Pending - /tmp/mkfs.jffs2.c 2009-01-11 15:28:41.0 +0100 -+++ git/mkfs.jffs2.c 2009-01-11 15:59:29.0 +0100 -@@ -100,6 +100,11 @@ - struct rb_node hardlink_rb; - }; - -+struct ignorepath_entry { -+ struct ignorepath_entry* next; /* Points to the next ignorepath element */ -+ char name[PATH_MAX];/* Name of the entry */ -+}; -+static struct ignorepath_entry* ignorepath = 0; - struct rb_root hardlinks; - static int out_fd = -1; - static int in_fd = -1; -@@ -408,7 +413,7 @@ - char *hpath, *tpath; - struct dirent *dp, **namelist; - struct filesystem_entry *entry; -- -+ struct ignorepath_entry* element = ignorepath; - - if (lstat(hostpath, sb)) { - perror_msg_and_die(%s, hostpath); -@@ -417,6 +422,15 @@ - entry = add_host_filesystem_entry(targetpath, hostpath, - sb.st_uid, sb.st_gid, sb.st_mode, 0, parent); - -+ while ( element ) { -+ if ( strcmp( element-name, targetpath ) == 0 ) { -+ printf( Note: ignoring directories below '%s'\n, targetpath ); -+ return entry; -+ break; -+ } -+ element = element-next; -+ } -+ - n = scandir(hostpath, namelist, 0, alphasort); - if (n 0) { - perror_msg_and_die(opening directory %s, hostpath); -@@ -1453,6 +1467,7 @@ - {root, 1, NULL, 'r'}, - {pagesize, 1, NULL, 's'}, - {eraseblock, 1, NULL, 'e'}, -+ {ignore, 1, NULL, 'I'}, - {output, 1, NULL, 'o'}, - {help, 0, NULL, 'h'}, - {verbose, 0, NULL, 'v'}, -@@ -1500,6 +1515,7 @@ - -L, --list-compressors Show the list of the avaiable compressors\n - -t, --test-compression Call decompress and compare with the original (for test)\n - -n, --no-cleanmarkers Don't add a cleanmarker to every eraseblock\n -+ -I, --ignore=PATH Ignore sub directory and file tree below PATH when recursing over the file system\n - -o, --output=FILE Output to FILE (default: stdout)\n - -l, --little-endian Create a little-endian filesystem\n - -b, --big-endianCreate a big-endian filesystem\n -@@ -1666,6 +1682,7 @@ - char *compr_name = NULL; - int compr_prior = -1; - int warn_page_size = 0; -+ struct ignorepath_entry* element = ignorepath; - - page_size = sysconf(_SC_PAGESIZE); - if (page_size 0) /* System doesn't know so ... */ -@@ -1676,7 +1693,7 @@ - jffs2_compressors_init(); - - while ((opt = getopt_long(argc, argv, -- D:d:r:s:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:, long_options, c)) = 0) -+ D:d:r:s:I:o:qUPfh?vVe:lbp::nc:m:x:X:Lty:i:, long_options, c)) = 0) - { - switch (opt) { - case 'D': -@@ -1700,6 +1717,28 @@ - warn_page_size = 0; /* set by user, so don't need to warn */ - break; - -+ case 'I': -+ printf( Note: Adding '%s' to ignore Path\n, optarg ); -+ element = ignorepath; -+ if ( !ignorepath ) { -+ ignorepath = xmalloc( sizeof( struct ignorepath_entry ) ); -+ ignorepath-next = 0; -+ strcpy( ignorepath-name[0], optarg ); -+ } else { -+ while ( element-next ) element = element-next; -+ element-next = xmalloc( sizeof( struct ignorepath_entry ) ); -+ element-next-next = 0; -+ strcpy( element-next-name[0], optarg ); -+ } -+ printf( - Dumping ignore path list \n ); -+ element = ignorepath; -+ while
[OE-core] [PATCH V2] bluez4: Added new recipe 4.96 and removed 4.82 version
From: Noor Ahsan noor_ah...@mentor.com * Added new recipe 4.96 and removed 4.82 version and its files. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- .../bluez/bluez4-4.82/bluetooth.conf | 16 .../fix-dfutool-usb-declaration-mismatch.patch | 20 - .../bluez/bluez4-4.82/hid2hci_usb_init.patch | 35 - .../bluez/bluez4-4.82/sbc-thumb.patch | 14 .../bluez/bluez4-4.96/bluetooth.conf | 16 meta/recipes-connectivity/bluez/bluez4_4.82.bb | 75 meta/recipes-connectivity/bluez/bluez4_4.96.bb | 73 +++ 7 files changed, 89 insertions(+), 160 deletions(-) diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf deleted file mode 100644 index ca5e9e4..000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/bluetooth.conf +++ /dev/null @@ -1,16 +0,0 @@ -!-- This configuration file specifies the required security policies - for Bluetooth core daemon to work. -- - -!DOCTYPE busconfig PUBLIC -//freedesktop//DTD D-BUS Bus Configuration 1.0//EN - http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd; -busconfig - - !-- ../system.conf have denied everything, so we just punch some holes -- - - policy context=default -allow own=org.bluez/ -allow send_destination=org.bluez/ -allow send_interface=org.bluez.Agent/ - /policy - -/busconfig diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch deleted file mode 100644 index 27dead0..000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/fix-dfutool-usb-declaration-mismatch.patch +++ /dev/null @@ -1,20 +0,0 @@ -# bluez4: add compile patch fixing some usb declaration mismatch -# Author: Michael 'Mickey' Lauer mic...@vanille-media.de -# Date: Thu Jan 29 16:52:21 2009 + -# -# Acquired from OpenEmbedded -Upstream-Status: Pending - -Index: bluez-4.27/tools/dfutool.c -=== bluez-4.27.orig/tools/dfutool.c -+++ bluez-4.27/tools/dfutool.c -@@ -59,7 +59,7 @@ - #endif - - #ifdef NEED_USB_GET_BUSSES --static inline struct usb_bus *usb_get_busses(void) -+inline struct usb_bus *usb_get_busses(void) - { - return usb_busses; - } diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch deleted file mode 100644 index e8a58e5..000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/hid2hci_usb_init.patch +++ /dev/null @@ -1,35 +0,0 @@ -# Signed-off-by: Khem Raj raj.k...@gmail.com -# -# Use the new usb1 API for usb_init() and check for fails from -# usb_init (). Currently we see a crash on a system which does -# not have USB because usb_init() fails and it cleans up all initialized -# data (e.g. ctx) which is used in subsequent calls to libusb -# We return immediately if usb_init() fails for some reason. - -Upstream-Status: Inappropriate [not used] - -Index: bluez-4.24/tools/hid2hci.c -=== bluez-4.24.orig/tools/hid2hci.c2008-10-25 23:40:34.0 -0700 -+++ bluez-4.24/tools/hid2hci.c 2008-12-29 22:06:04.0 -0800 -@@ -337,7 +337,7 @@ - int main(int argc, char *argv[]) - { - struct device_info dev[16]; -- int i, opt, num, quiet = 0, mode = HCI; -+ int i, ret, opt, num, quiet = 0, mode = HCI; - - while ((opt = getopt_long(argc, argv, +01qh, main_options, NULL)) != -1) { - switch (opt) { -@@ -361,8 +361,9 @@ - argc -= optind; - argv += optind; - optind = 0; -- -- usb_init(); -+ ret = libusb_init(); -+ if (ret 0) -+ return ret; - - num = find_devices(mode, dev, sizeof(dev) / sizeof(dev[0])); - if (num = 0) { diff --git a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch b/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch deleted file mode 100644 index 881cb9c..000 --- a/meta/recipes-connectivity/bluez/bluez4-4.82/sbc-thumb.patch +++ /dev/null @@ -1,14 +0,0 @@ -# Acquired from OpenEmbedded -Upstream-Status: Inappropriate [embedded specific] - bluez/sbc/sbc_math.h~ 2008-03-05 20:18:03.0 + -+++ bluez/sbc/sbc_math.h 2008-10-27 13:39:27.0 + -@@ -59,7 +59,7 @@ - - #define SBC_FIXED_0(val) { val = 0; } - #define MUL(a, b)((a) * (b)) --#ifdef __arm__ -+#if defined(__arm__) !defined(__thumb__) - #define MULA(a, b, res) ({\ - int tmp = res; \ - __asm__(\ diff --git a/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf new file mode
[OE-core] [PATCH] bluez4: Added new recipe version 4.96
From: Noor Ahsan noor_ah...@mentor.com * Added new recipe version 4.96. Signed-off-by: Noor Ahsan noor_ah...@mentor.com --- .../bluez/bluez4-4.96/bluetooth.conf | 16 meta/recipes-connectivity/bluez/bluez4_4.96.bb | 73 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf new file mode 100644 index 000..ca5e9e4 --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4-4.96/bluetooth.conf @@ -0,0 +1,16 @@ +!-- This configuration file specifies the required security policies + for Bluetooth core daemon to work. -- + +!DOCTYPE busconfig PUBLIC -//freedesktop//DTD D-BUS Bus Configuration 1.0//EN + http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd; +busconfig + + !-- ../system.conf have denied everything, so we just punch some holes -- + + policy context=default +allow own=org.bluez/ +allow send_destination=org.bluez/ +allow send_interface=org.bluez.Agent/ + /policy + +/busconfig diff --git a/meta/recipes-connectivity/bluez/bluez4_4.96.bb b/meta/recipes-connectivity/bluez/bluez4_4.96.bb new file mode 100644 index 000..ebd2849 --- /dev/null +++ b/meta/recipes-connectivity/bluez/bluez4_4.96.bb @@ -0,0 +1,73 @@ +SUMMARY = Linux Bluetooth Stack Userland V4 +DESCRIPTION = Linux Bluetooth stack V4 userland components. These include a system configurations, daemons, tools and system libraries. +HOMEPAGE = http://www.bluez.org; +SECTION = libs +LICENSE = GPLv2+ LGPLv2.1+ +LIC_FILES_CHKSUM = file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ +file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ + file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e \ + file://sbc/sbc.c;beginline=1;endline=25;md5=1a40781ed30d50d8639323a184aeb191 +DEPENDS = gst-plugins-base alsa-lib libusb dbus-glib libnl +RDEPENDS_${PN}-dev = bluez-hcidump + +# For angstrom we want this to replace at least bluez-libs +PROVIDES_append_angstrom = bluez-utils bluez-libs + +ASNEEDED = + +PR = r0 + +SRC_URI = \ + ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ + file://bluetooth.conf \ + + +SRC_URI[md5sum] = 296111afac49e3f9035085ac14daf518 +SRC_URI[sha256sum] = c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99 +S = ${WORKDIR}/bluez-${PV} + +inherit autotools + +EXTRA_OECONF = \ + --enable-gstreamer \ + --enable-alsa \ + --enable-usb \ + --enable-netlink \ + --enable-tools \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-dfutool \ + --enable-hidd \ + --enable-pandd \ + --enable-dund \ + --disable-cups \ + --enable-test \ + --enable-manpages \ + --enable-configfiles \ + --enable-initscripts \ + --disable-pcmciarules \ + + +do_install_append() { + install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/ + # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT + install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ +} + +PACKAGES =+ gst-plugin-bluez libasound-module-bluez + +FILES_gst-plugin-bluez = ${libdir}/gstreamer-0.10/lib*.so +FILES_libasound-module-bluez = ${libdir}/alsa-lib/lib*.so +FILES_${PN} += ${libdir}/bluetooth/plugins/*.so +FILES_${PN}-dev += \ + ${libdir}/bluetooth/plugins/*.la \ + ${libdir}/alsa-lib/*.la \ + ${libdir}/gstreamer-0.10/*.la \ + + +FILES_${PN}-dbg += \ + ${libdir}/bluetooth/plugins/.debug \ + ${libdir}/*/.debug \ + -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel.bbcalss: Added do_savedefconfig task.
* Added do_savedefconfig task to kernel.bbclass. Signed-off-by: Noor, Ahsan noor_ah...@mentor.com --- meta/classes/kernel.bbclass |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 25d2629..f2f05b1 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -197,6 +197,12 @@ kernel_do_configure() { do_configure[depends] += ${INITRAMFS_TASK} +do_savedefconfig() { + oe_runmake savedefconfig +} +do_savedefconfig[nostamp] = 1 +addtask savedefconfig after do_configure + pkg_postinst_kernel () { cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bison: Add dependency on flex-native
* This is 0479b70418ef553859029911c57c63a7aaebe299 from OE. flex-native is needed to build bison. The dependency was being satisfied indirectly but we need to add it explicitly. Signed-off-by: Noor, Ahsan noor_ah...@mentor.com --- meta/recipes-devtools/bison/bison_2.3.bb |4 ++-- meta/recipes-devtools/bison/bison_2.5.bb |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/bison/bison_2.3.bb b/meta/recipes-devtools/bison/bison_2.3.bb index 22f884b..388476b 100644 --- a/meta/recipes-devtools/bison/bison_2.3.bb +++ b/meta/recipes-devtools/bison/bison_2.3.bb @@ -7,9 +7,9 @@ HOMEPAGE = http://www.gnu.org/software/bison/; LICENSE = GPLv2 LIC_FILES_CHKSUM = file://COPYING;md5=eb723b61539feef013de476e68b5c50a SECTION = devel -DEPENDS = bison-native +DEPENDS = bison-native flex-native -PR = r0 +PR = r1 BASE_SRC_URI = ${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ file://bison-2.3_m4.patch diff --git a/meta/recipes-devtools/bison/bison_2.5.bb b/meta/recipes-devtools/bison/bison_2.5.bb index 63f4e76..eb5d87c 100644 --- a/meta/recipes-devtools/bison/bison_2.5.bb +++ b/meta/recipes-devtools/bison/bison_2.5.bb @@ -7,9 +7,9 @@ HOMEPAGE = http://www.gnu.org/software/bison/; LICENSE = GPLv3 LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 SECTION = devel -DEPENDS = bison-native +DEPENDS = bison-native flex-native -PR = r0 +PR = r1 BASE_SRC_URI = ${GNU_MIRROR}/bison/bison-${PV}.tar.gz \ file://m4.patch \ -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel,cml1.bbclass: Move menuconfig to cml1
* The menuconfig target exists in places other than the kernel that use kernel style config. Signed-off-by: Noor, Ahsan noor_ah...@mentor.com --- meta/classes/cml1.bbclass | 12 meta/classes/kernel.bbclass | 15 --- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass index 79218b4..a747af5 100644 --- a/meta/classes/cml1.bbclass +++ b/meta/classes/cml1.bbclass @@ -6,3 +6,15 @@ cml1_do_configure() { EXPORT_FUNCTIONS do_configure addtask configure after do_unpack do_patch before do_compile + +do_menuconfig() { + export TERMWINDOWTITLE=${PN} Configuration + export SHELLCMDS=make menuconfig + ${TERMCMDRUN} + if [ $? -ne 0 ]; then + oefatal '${TERMCMD}' not found. Check TERMCMD variable. + fi +} +do_menuconfig[nostamp] = 1 +addtask menuconfig after do_configure + diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 9c492a3..25d2629 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -197,21 +197,6 @@ kernel_do_configure() { do_configure[depends] += ${INITRAMFS_TASK} -do_menuconfig() { -export DISPLAY='${DISPLAY}' -export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}' -export XAUTHORITY='${XAUTHORITY}' - export TERMWINDOWTITLE=${PN} Kernel Configuration - export SHELLCMDS=make menuconfig - ${TERMCMDRUN} - if [ $? -ne 0 ]; then - echo Fatal: '${TERMCMD}' not found. Check TERMCMD variable. - exit 1 - fi -} -do_menuconfig[nostamp] = 1 -addtask menuconfig after do_configure - pkg_postinst_kernel () { cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } -- 1.7.0.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core