[OE-core] [meta-qt5][PATCH v2 2/2] packagegroup-qt5-toolchain-target: include all modules for development
This adds the necessary target packages for development with all of the
Qt 5 modules.
Signed-off-by: Jonathan Liu
---
.../packagegroup-qt5-toolchain-target.bb | 60 +-
1 file changed, 46 insertions(+), 14 deletions(-)
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index 997df18..13cac33 100644
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -11,30 +11,62 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
USE_RUBY = " \
qtwebkit-mkspecs \
qtwebkit-dev \
+qtwebkit-qmlplugins \
+"
+
+# Requires X11 to work
+USE_X11 = " \
+qtx11extras-dev \
+qtx11extras-mkspecs \
"
RDEPENDS_${PN} += " \
packagegroup-core-standalone-sdk-target \
libsqlite3-dev \
-qtbase-mkspecs \
-qtscript-mkspecs \
-qtxmlpatterns-mkspecs \
-qtdeclarative-mkspecs \
-qtsensors-mkspecs \
+qt3d-dev \
qt3d-mkspecs \
-qtlocation-mkspecs \
-qtsvg-mkspecs \
+qt3d-qmlplugins \
qtbase-dev \
+qtbase-fonts \
+qtbase-mkspecs \
+qtbase-plugins \
+qtbase-staticdev \
+qtconnectivity-dev \
+qtconnectivity-mkspecs \
+qtconnectivity-qmlplugins \
qtdeclarative-dev \
-qtscript-dev \
-qt3d-dev \
+qtdeclarative-mkspecs \
+qtdeclarative-plugins \
+qtdeclarative-qmlplugins \
+qtdeclarative-staticdev \
+qtgraphicaleffects-qmlplugins \
+qtimageformats-dev \
+qtimageformats-plugins \
qtlocation-dev \
+qtlocation-mkspecs \
+qtlocation-plugins \
+qtlocation-qmlplugins \
+qtquick1-dev \
+qtquick1-mkspecs \
+qtquick1-plugins \
+qtquick1-qmlplugins \
+qtquickcontrols-qmlplugins \
+qtscript-dev \
+qtscript-mkspecs \
qtsensors-dev \
+qtsensors-mkspecs \
+qtsensors-plugins \
+qtsensors-qmlplugins \
+qtserialport-dev \
+qtserialport-mkspecs \
qtsvg-dev \
-qtxmlpatterns-dev \
-qtdeclarative-dev \
-qtdeclarative-plugins \
-qtdeclarative-qmlplugins \
-qtgraphicaleffects-dev \
+qtsvg-mkspecs \
+qtsvg-plugins \
+qtsystems-dev \
+qtsystems-mkspecs \
+qtsystems-qmlplugins \
${@base_contains('BBFILE_COLLECTIONS', 'ruby-layer', '${USE_RUBY}', '',
d)} \
+${@base_contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \
+qtxmlpatterns-dev \
+qtxmlpatterns-mkspecs \
"
--
1.9.0
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-qt5][PATCH v2 1/2] qtimageformats: allow empty qtimageformats package
On 2/03/2014 1:58 PM, Jonathan Liu wrote:
This fixes installing qtimageformats-dev with opkg as it depends on the
qtimageformats package which wasn't created.
The qtimageformats package was not created as it is empty and BitBake
avoids producing empty packages by default. The installed files consist
of source files split into qtimageformats-dbg, CMake files split into
qtimageformats-dev, plugins split into qtimageformats-plugins and
debug build of plugins split into qtimageformats-plugins-dbg.
Signed-off-by: Jonathan Liu
---
recipes-qt/qt5/qtimageformats.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-qt/qt5/qtimageformats.inc
b/recipes-qt/qt5/qtimageformats.inc
index 1b4bb4f..f90e58a 100644
--- a/recipes-qt/qt5/qtimageformats.inc
+++ b/recipes-qt/qt5/qtimageformats.inc
@@ -1,3 +1,4 @@
require qt5.inc
DEPENDS += "qtbase tiff"
+ALLOW_EMPTY_${PN} = "1"
Whoops, wrong mailing list.
Regards,
Jonathan
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-qt5][PATCH v2 1/2] qtimageformats: allow empty qtimageformats package
This fixes installing qtimageformats-dev with opkg as it depends on the
qtimageformats package which wasn't created.
The qtimageformats package was not created as it is empty and BitBake
avoids producing empty packages by default. The installed files consist
of source files split into qtimageformats-dbg, CMake files split into
qtimageformats-dev, plugins split into qtimageformats-plugins and
debug build of plugins split into qtimageformats-plugins-dbg.
Signed-off-by: Jonathan Liu
---
recipes-qt/qt5/qtimageformats.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-qt/qt5/qtimageformats.inc
b/recipes-qt/qt5/qtimageformats.inc
index 1b4bb4f..f90e58a 100644
--- a/recipes-qt/qt5/qtimageformats.inc
+++ b/recipes-qt/qt5/qtimageformats.inc
@@ -1,3 +1,4 @@
require qt5.inc
DEPENDS += "qtbase tiff"
+ALLOW_EMPTY_${PN} = "1"
--
1.9.0
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH] Attempt to unify predefined package feed handling
On Saturday 01 March 2014 18:21:59 Paul Barker wrote: > On 1 March 2014 18:10, Otavio Salvador wrote: > > Hello David, > > > > On Thu, Feb 27, 2014 at 4:59 PM, David Nyström > > > > wrote: > >> On 2014-02-27 16:18, Laurentiu Palcu wrote: > >>> On Thu, Feb 27, 2014 at 03:35:50PM +0100, David Nyström wrote: > On 2014-02-27 15:24, Laurentiu Palcu wrote: > > Hi David, > > > > My comments/questions below. > > Thank you for your detailed comments on the RFC. > I will return with V2, where your comments are addressed when the > general approach is Acked. > > What do you think about the general approach ? > >>> > >>> I think the approach is ok. I don't know a simpler way than this to add > >>> package feeds into the image. > >> > >> OK, there seems to be no screaming objections from other parties either. > >> > >> I'll resend v2 > > > > I understand why you are adding this here but I think it'd be good to the > > settings to be put in a package so in a product we may add extra > > repositories updating the package. > > > > I am trying to think now how this could be done (or optionally done). > > > > What you think? > > +1 > > I'd rather have '/etc/opkg/base-feeds.conf' (for example) generated > and placed into a package which is then installed on the rootfs. That > would make it easy to distribute an update to that in the future. I'm > not sure how difficult/easy that would be. The only problem with this is you then can't have your feeds different per image. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] sstate-cache-management: improve shown numbers of removed files
* deleted files were counting .siginfo and .done files, but total_files were
counting only .tgz archives
so it could show confusing output like:
Figuring out the sstate:xxx_packagedata.tgz ... (21098 from 15162 files for
packagedata suffix will be removed)
* split the counts and show both
* fix .sigdata sometimes used instead of .siginfo
* this will also show new "suffixes" which have only .siginfo files but
no .tgz, e.g.:
Figuring out the sstate:xxx_rm_work.tgz ... (0 from 0 .tgz files for
rm_work suffix will be removed or 0 from 107630 when counting also
.siginfo and .done files)
because now we're storing siginfo files from all intermediate tasks,
but they are not being removed by this script
Signed-off-by: Martin Jansa
---
scripts/sstate-cache-management.sh | 48 +-
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/scripts/sstate-cache-management.sh
b/scripts/sstate-cache-management.sh
index 34483d0..a4f6611 100755
--- a/scripts/sstate-cache-management.sh
+++ b/scripts/sstate-cache-management.sh
@@ -172,7 +172,7 @@ remove_duplicated () {
local ava_archs
local arch
local file_names
- local sstate_list
+ local sstate_files_list
local fn_tmp
local list_suffix=`mktemp` || exit 1
@@ -195,14 +195,14 @@ remove_duplicated () {
| sed -e 's/-/_/g' -e 's/ /\n/g' | sort -u) $extra_archs"
echo "Done"
- # Total number of files including sstate-, sigdata and .done files
+ # Total number of files including sstate-, .siginfo and .done files
total_files=`find $cache_dir -name 'sstate*' | wc -l`
# Save all the sstate files in a file
- sstate_list=`mktemp` || exit 1
- find $cache_dir -name 'sstate:*:*:*:*:*:*:*.tgz' >$sstate_list
+ sstate_files_list=`mktemp` || exit 1
+ find $cache_dir -name 'sstate:*:*:*:*:*:*:*.tgz*' >$sstate_files_list
echo -n "Figuring out the suffixes in the sstate cache dir ... "
- sstate_suffixes="`sed
's%.*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^_]*_\([^:]*\)\.tgz$%\1%g'
$sstate_list | sort -u`"
+ sstate_suffixes="`sed
's%.*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^_]*_\([^:]*\)\.tgz.*%\1%g'
$sstate_files_list | sort -u`"
echo "Done"
echo "The following suffixes have been found in the cache dir:"
echo $sstate_suffixes
@@ -211,10 +211,10 @@ remove_duplicated () {
# Using this SSTATE_PKGSPEC definition it's 6th colon separated field
# SSTATE_PKGSPEC=
"sstate:${PN}:${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}:${PV}:${PR}:${SSTATE_PKGARCH}:${SSTATE_VERSION}:"
for arch in $all_archs; do
- grep -q ".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:$arch:[^:]*:[^:]*\.tgz$"
$sstate_list
+ grep -q ".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:$arch:[^:]*:[^:]*\.tgz$"
$sstate_files_list
[ $? -eq 0 ] && ava_archs="$ava_archs $arch"
# ${builder_arch}_$arch used by toolchain sstate
- grep -q
".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:${builder_arch}_$arch:[^:]*:[^:]*\.tgz$"
$sstate_list
+ grep -q
".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:${builder_arch}_$arch:[^:]*:[^:]*\.tgz$"
$sstate_files_list
[ $? -eq 0 ] && ava_archs="$ava_archs ${builder_arch}_$arch"
done
echo "Done"
@@ -226,11 +226,13 @@ remove_duplicated () {
local remove_listdir=`mktemp -d` || exit 1
for suffix in $sstate_suffixes; do
- # Total number of files including sigdata and .done files
- total_files_suffix=`grep
".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:_]*_$suffix.*" $sstate_list |
wc -l 2>/dev/null`
+ # Total number of files including .siginfo and .done files
+ total_files_suffix=`grep
".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:_]*_$suffix.*"
$sstate_files_list | wc -l 2>/dev/null`
+ total_tgz_suffix=`grep
".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:_]*_$suffix.*.tgz$"
$sstate_files_list | wc -l 2>/dev/null`
# Save the file list to a file, some suffix's file may not exist
- grep ".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:_]*_$suffix.tgz"
$sstate_list >$list_suffix 2>/dev/null
- local deleted=0
+ grep ".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:_]*_$suffix.tgz$"
$sstate_files_list >$list_suffix 2>/dev/null
+ local deleted_tgz=0
+ local deleted_files=0
echo -n "Figuring out the sstate:xxx_$suffix.tgz ... "
# Uniq BPNs
file_names=`for arch in $ava_archs ""; do
@@ -272,21 +274,23 @@ remove_duplicated () {
fi
done
done
- [ ! -s "$rm_list" ] || deleted=`cat $rm_list | wc -l`
+ [ -s "$rm_list" ] && deleted_tgz=`cat $rm_list | grep ".tgz$" | wc -l`
+ [ -s "$rm_list" ] && deleted_files=`cat $rm_list | wc -l`
[ -s "$rm_list" -a $debug -gt 0 ] && cat $rm_list
- echo "($deleted from $total_files_suffix files for $suffix suffix will
be removed)"
- let total_deleted=$total_deleted+$deleted
+ echo "($deleted_tgz from $total_tgz_suffix .tgz files for $suffix suffix
will be removed or $delete
[OE-core] [PATCH] pango: Fix postinst by adding missing qemu-native dependency
* postinst_prologue calls qemu_run_binary but there is no
dependency on qemu-native which causes postinst to sometimes
fail which is fatal for building read-only rootfs
Signed-off-by: Martin Jansa
---
meta/recipes-graphics/pango/pango.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-graphics/pango/pango.inc
b/meta/recipes-graphics/pango/pango.inc
index 17006d3..4a20d20 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -10,7 +10,7 @@ SECTION = "libs"
LICENSE = "LGPLv2.0+"
X11DEPENDS = "virtual/libx11 libxft"
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz
qemu-native"
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}"
--
1.9.0
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] sstate-cache-management.sh: Don't use echo -n
* when debug is enabled it causes more confusion than what it's gaining
without debug enabled
Signed-off-by: Martin Jansa
---
scripts/sstate-cache-management.sh | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/scripts/sstate-cache-management.sh
b/scripts/sstate-cache-management.sh
index e55eb23..d741ec9 100755
--- a/scripts/sstate-cache-management.sh
+++ b/scripts/sstate-cache-management.sh
@@ -101,13 +101,13 @@ do_nothing () {
# Read the input "y"
read_confirm () {
- echo -n "$total_deleted from $total_files files will be removed! "
+ echo "$total_deleted from $total_files files will be removed! "
if [ "$confirm" != "y" ]; then
- echo -n "Do you want to continue (y/n)? "
+ echo "Do you want to continue (y/n)? "
while read confirm; do
[ "$confirm" = "Y" -o "$confirm" = "y" -o "$confirm" = "n" \
-o "$confirm" = "N" ] && break
- echo -n "Invalid input \"$confirm\", please input 'y' or 'n': "
+ echo "Invalid input \"$confirm\", please input 'y' or 'n': "
done
else
echo
@@ -178,7 +178,7 @@ remove_duplicated () {
if [ -z "$extra_archs" ] ; then
# Find out the archs in all the layers
-echo -n "Figuring out the archs in the layers ... "
+echo "Figuring out the archs in the layers ... "
oe_core_dir=$(dirname $(dirname $(readlink -e $0)))
topdir=$(dirname $oe_core_dir)
tunedirs="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path
'*/meta*/conf/machine/include' 2>/dev/null`"
@@ -201,13 +201,13 @@ remove_duplicated () {
sstate_files_list=`mktemp` || exit 1
find $cache_dir -name 'sstate:*:*:*:*:*:*:*.tgz*' >$sstate_files_list
- echo -n "Figuring out the suffixes in the sstate cache dir ... "
+ echo "Figuring out the suffixes in the sstate cache dir ... "
sstate_suffixes="`sed
's%.*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^_]*_\([^:]*\)\.tgz.*%\1%g'
$sstate_files_list | sort -u`"
echo "Done"
echo "The following suffixes have been found in the cache dir:"
echo $sstate_suffixes
- echo -n "Figuring out the archs in the sstate cache dir ... "
+ echo "Figuring out the archs in the sstate cache dir ... "
# Using this SSTATE_PKGSPEC definition it's 6th colon separated field
# SSTATE_PKGSPEC=
"sstate:${PN}:${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}:${PV}:${PR}:${SSTATE_PKGARCH}:${SSTATE_VERSION}:"
for arch in $all_archs; do
@@ -296,7 +296,7 @@ remove_duplicated () {
read_confirm
if [ "$confirm" = "y" -o "$confirm" = "Y" ]; then
for list in `ls $remove_listdir/`; do
- echo -n "Removing $list.tgz (`cat $remove_listdir/$list | wc -w`
files) ... "
+ echo "Removing $list.tgz (`cat $remove_listdir/$list | wc -w`
files) ... "
# Remove them one by one to avoid the argument list too long
error
for i in `cat $remove_listdir/$list`; do
rm -f $verbose $i
@@ -328,7 +328,7 @@ rm_by_stamps (){
package_write_rpm package_write_deb package packagedata deploy"
# Figure out all the md5sums in the stamps dir.
- echo -n "Figuring out all the md5sums in stamps dir ... "
+ echo "Figuring out all the md5sums in stamps dir ... "
for i in $suffixes; do
# There is no "\.siginfo" but "_setcene" when it is mirrored
# from the SSTATE_MIRRORS, use them to figure out the sum.
@@ -345,7 +345,7 @@ rm_by_stamps (){
# Save all the state file list to a file
find $cache_dir -name 'sstate*.tgz' | sort -u -o $cache_list
- echo -n "Figuring out the files which will be removed ... "
+ echo "Figuring out the files which will be removed ... "
for i in $all_sums; do
grep ".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:${i}_.*" $cache_list
>>$keep_list
done
--
1.9.0
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] sstate-cache-management.sh: Allow to remove old .siginfo and .done files for all tasks
* this allows to remove them even for tasks without sstate archives (e.g.
rm_work, multilib_install, ..)
whole list of tasks found in one of my sstate-cache directories:
sstate:xxx_boostconfig.tgz ... 6
sstate:xxx_bundle_initramfs.tgz ... 31
sstate:xxx_compile.tgz ... 47894
sstate:xxx_compile_kernelmodules.tgz ... 31
sstate:xxx_compile_ptest_base.tgz ... 68
sstate:xxx_configure.tgz ... 48247
sstate:xxx_configure_ptest_base.tgz ... 68
sstate:xxx_deploy.tgz ... 8
sstate:xxx_evacuate_scripts.tgz ... 58
sstate:xxx_fetch.tgz ... 7045
sstate:xxx_generate.tgz ... 812
sstate:xxx_generate_qt_config_file.tgz ... 576
sstate:xxx_generate_toolchain_file.tgz ... 219
sstate:xxx_install.tgz ... 48273
sstate:xxx_install_locale.tgz ... 58
sstate:xxx_install_ptest_base.tgz ... 68
sstate:xxx_kernel_checkout.tgz ... 14
sstate:xxx_kernel_configcheck.tgz ... 34
sstate:xxx_kernel_configme.tgz ... 17
sstate:xxx_kernel_link_vmlinux.tgz ... 30
sstate:xxx_make_scripts.tgz ... 42
sstate:xxx_multilib_install.tgz ... 29
sstate:xxx_package.tgz ... 13848
sstate:xxx_package_write_ipk.tgz ... 4615
sstate:xxx_packagedata.tgz ... 4613
sstate:xxx_pam_sanity.tgz ... 3
sstate:xxx_patch.tgz ... 7883
sstate:xxx_populate_adt.tgz ... 28
sstate:xxx_populate_ide_support.tgz ... 33
sstate:xxx_populate_lic.tgz ... 1718
sstate:xxx_populate_sysroot.tgz ... 5094
sstate:xxx_prepare_qmake_symlink.tgz ... 6
sstate:xxx_prepsources.tgz ... 168
sstate:xxx_rm_work.tgz ... 107630
sstate:xxx_rm_work_all.tgz ... 52563
sstate:xxx_rootfs.tgz ... 13
sstate:xxx_sanitize_sources.tgz ... 8
sstate:xxx_sizecheck.tgz ... 31
sstate:xxx_strip.tgz ... 31
sstate:xxx_uboot_mkimage.tgz ... 31
sstate:xxx_unpack.tgz ... 7857
sstate:xxx_unpack_extra.tgz ... 6
sstate:xxx_validate_branches.tgz ... 14
* with this patches most of these files are removed as well
Figuring out the sstate:xxx_compile ... (0 from 0 .tgz files for
compile suffix will be removed or 42310 from 47795 when counting also
.siginfo and .done files)
Signed-off-by: Martin Jansa
---
scripts/sstate-cache-management.sh | 91 +++---
1 file changed, 46 insertions(+), 45 deletions(-)
diff --git a/scripts/sstate-cache-management.sh
b/scripts/sstate-cache-management.sh
index a4f6611..e55eb23 100755
--- a/scripts/sstate-cache-management.sh
+++ b/scripts/sstate-cache-management.sh
@@ -224,59 +224,60 @@ remove_duplicated () {
# Save the file list which needs to be removed
local remove_listdir=`mktemp -d` || exit 1
-
for suffix in $sstate_suffixes; do
# Total number of files including .siginfo and .done files
- total_files_suffix=`grep
".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:_]*_$suffix.*"
$sstate_files_list | wc -l 2>/dev/null`
- total_tgz_suffix=`grep
".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:_]*_$suffix.*.tgz$"
$sstate_files_list | wc -l 2>/dev/null`
+ total_files_suffix=`grep
".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:_]*_$suffix\.tgz.*"
$sstate_files_list | wc -l 2>/dev/null`
+ total_tgz_suffix=`grep
".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:_]*_$suffix\.tgz$"
$sstate_files_list | wc -l 2>/dev/null`
# Save the file list to a file, some suffix's file may not exist
- grep ".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:_]*_$suffix.tgz$"
$sstate_files_list >$list_suffix 2>/dev/null
+ grep
".*/sstate:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:_]*_$suffix\.tgz.*"
$sstate_files_list >$list_suffix 2>/dev/null
local deleted_tgz=0
local deleted_files=0
- echo -n "Figuring out the sstate:xxx_$suffix.tgz ... "
- # Uniq BPNs
- file_names=`for arch in $ava_archs ""; do
- sed -ne
"s%.*/sstate:\([^:]*\):[^:]*:[^:]*:[^:]*:$arch:[^:]*:[^:]*\.tgz$%\1%p"
$list_suffix
- done | sort -u`
-
- fn_tmp=`mktemp` || exit 1
- rm_list="$remove_listdir/sstate:xxx_$suffix"
- for fn in $file_names; do
- [ -z "$verbose" ] || echo "Analyzing sstate:$fn-xxx_$suffix.tgz"
- for arch in $ava_archs ""; do
- grep -h
".*/sstate:$fn:[^:]*:[^:]*:[^:]*:$arch:[^:]*:[^:]*\.tgz$" $list_suffix >$fn_tmp
- if [ -s $fn_tmp ] ; then
- [ $debug -gt 1 ] && echo "Available files for $fn-$arch-
with suffix $suffix:" && cat $fn_tmp
- # Use the modification time
- to_del=$(ls -t $(cat $fn_tmp) | sed -n '1!p')
- [ $debug -gt 2 ] && echo "Considering to delete: $to_del"
- # The sstate file which is downloaded from the SSTATE_MIRROR
is
- # put in SSTATE_DIR, and there is a symlink in
SSTATE_DIR/??/ to
- # it, so filter it out from the remove list if it should not
be
- # removed.
- to_keep=$(ls -t $(cat $fn_tmp) | sed -n '1p')
- [ $debug -gt 2 ] && echo "Considering to keep: $to_keep"
-
[OE-core] [PATCH] testimage: add task level lock
For machines other than qemu it will not be okay to run
multiple testimage tasks in parallel.
Signed-off-by: Stefan Stanacar
---
meta/classes/testimage-auto.bbclass | 1 +
meta/classes/testimage.bbclass | 4
2 files changed, 5 insertions(+)
diff --git a/meta/classes/testimage-auto.bbclass
b/meta/classes/testimage-auto.bbclass
index a5b8f7f..860599d 100644
--- a/meta/classes/testimage-auto.bbclass
+++ b/meta/classes/testimage-auto.bbclass
@@ -20,3 +20,4 @@ python do_testimage_auto() {
}
addtask testimage_auto before do_build after do_rootfs
do_testimage_auto[depends] += "${TESTIMAGEDEPENDS}"
+do_testimage_auto[lockfiles] += "${TESTIMAGELOCK}"
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 48e1032..691c7f6 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -42,12 +42,16 @@ TEST_SERVER_IP ?= ""
TESTIMAGEDEPENDS = ""
TESTIMAGEDEPENDS_qemuall = "qemu-native:do_populate_sysroot
qemu-helper-native:do_populate_sysroot"
+TESTIMAGELOCK = "${TMPDIR}/testimage.lock"
+TESTIMAGELOCK_qemuall = ""
+
python do_testimage() {
testimage_main(d)
}
addtask testimage
do_testimage[nostamp] = "1"
do_testimage[depends] += "${TESTIMAGEDEPENDS}"
+do_testimage[lockfiles] += "${TESTIMAGELOCK}"
def get_tests_list(d):
--
1.8.5.3
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH] Attempt to unify predefined package feed handling
On 1 March 2014 18:10, Otavio Salvador wrote: > Hello David, > > On Thu, Feb 27, 2014 at 4:59 PM, David Nyström > wrote: >> >> >> On 2014-02-27 16:18, Laurentiu Palcu wrote: >>> >>> On Thu, Feb 27, 2014 at 03:35:50PM +0100, David Nyström wrote: On 2014-02-27 15:24, Laurentiu Palcu wrote: > > Hi David, > > My comments/questions below. Thank you for your detailed comments on the RFC. I will return with V2, where your comments are addressed when the general approach is Acked. What do you think about the general approach ? >>> >>> I think the approach is ok. I don't know a simpler way than this to add >>> package feeds into the image. >> >> >> OK, there seems to be no screaming objections from other parties either. >> >> I'll resend v2 > > > I understand why you are adding this here but I think it'd be good to the > settings to be put in a package so in a product we may add extra > repositories updating the package. > > I am trying to think now how this could be done (or optionally done). > > What you think? +1 I'd rather have '/etc/opkg/base-feeds.conf' (for example) generated and placed into a package which is then installed on the rootfs. That would make it easy to distribute an update to that in the future. I'm not sure how difficult/easy that would be. > > Other point, PACKAGE_FEED_URIS could be change to PACKAGE_FEED_URI as it > matches SRC_URI for example. > +1 Thanks, -- Paul Barker Email: p...@paulbarker.me.uk http://www.paulbarker.me.uk ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH] Attempt to unify predefined package feed handling
Hello David, On Thu, Feb 27, 2014 at 4:59 PM, David Nyström wrote: > > On 2014-02-27 16:18, Laurentiu Palcu wrote: > >> On Thu, Feb 27, 2014 at 03:35:50PM +0100, David Nyström wrote: >> >>> On 2014-02-27 15:24, Laurentiu Palcu wrote: >>> Hi David, My comments/questions below. >>> Thank you for your detailed comments on the RFC. >>> I will return with V2, where your comments are addressed when the >>> general approach is Acked. >>> >>> What do you think about the general approach ? >>> >> I think the approach is ok. I don't know a simpler way than this to add >> package feeds into the image. >> > > OK, there seems to be no screaming objections from other parties either. > > I'll resend v2 > I understand why you are adding this here but I think it'd be good to the settings to be put in a package so in a product we may add extra repositories updating the package. I am trying to think now how this could be done (or optionally done). What you think? Other point, PACKAGE_FEED_URIS could be change to PACKAGE_FEED_URI as it matches SRC_URI for example. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] sanity.bbclass: support wildcards in SANITY_TESTED_DISTROS
On 14-02-28 16:28 +0100, Chris Larson wrote: > Out of curiosity, why not just use fnmatch for this > implementation? No reason. That would probably be far superior. I'll send a revised patch some time early next week! Thanks! -- olofjn ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] rootfs fails to build in current master
On 1 March 2014 17:46, Mike Looijmans wrote:
> I get this mysterious error at rootfs after updating to current master:
>
> Exception: AttributeError: 'module' object has no attribute
> 'shell_trap_code'
>
>
> I haven't been following OE for a while, so I have no clue as to what caused
> this.
>
> Stack trace:
>
> File: '/media/work/master-next/openembedded-core/meta/lib/oe/image.py',
> lineno: 248, function: _write_script
> 0244:self.d.setVarFlag('img_creation_func', 'func', 1)
> 0245:self.d.setVarFlag('img_creation_func', 'fakeroot', 1)
> 0246:
> 0247:with open(script_name, "w+") as script:
> *** 0248:script.write("%s" % bb.build.shell_trap_code())
> 0249:script.write("export ROOTFS_SIZE=%d\n" %
> self._get_rootfs_size())
> 0250:bb.data.emit_func('img_creation_func', script, self.d)
> 0251:script.write("img_creation_func\n")
> 0252:
>
As a quick stab-in-the-dark guess: Are you using the current master of
Bitbake to build this? Each branch of OpenEmbedded has a corresponding
branch of Bitbake, OE master requires Bitbake master.
--
Paul Barker
Email: p...@paulbarker.me.uk
http://www.paulbarker.me.uk
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] rootfs fails to build in current master
I get this mysterious error at rootfs after updating to current master:
Exception: AttributeError: 'module' object has no attribute
'shell_trap_code'
I haven't been following OE for a while, so I have no clue as to what
caused this.
Stack trace:
File: '/media/work/master-next/openembedded-core/meta/lib/oe/image.py',
lineno: 248, function: _write_script
0244:self.d.setVarFlag('img_creation_func', 'func', 1)
0245:self.d.setVarFlag('img_creation_func', 'fakeroot', 1)
0246:
0247:with open(script_name, "w+") as script:
*** 0248:script.write("%s" % bb.build.shell_trap_code())
0249:script.write("export ROOTFS_SIZE=%d\n" %
self._get_rootfs_size())
0250:bb.data.emit_func('img_creation_func', script,
self.d)
0251:script.write("img_creation_func\n")
0252:
--
Mike Looijmans
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oeqa/runtime/dmesg: Ignore DMA timeout errors
We see these from qemu images on servers under load. They're not interesting
and clutter the build output so lets ignore them.
Signed-off-by: Richard Purdie
---
diff --git a/meta/lib/oeqa/runtime/dmesg.py b/meta/lib/oeqa/runtime/dmesg.py
index a53d1f0..64247ea 100644
--- a/meta/lib/oeqa/runtime/dmesg.py
+++ b/meta/lib/oeqa/runtime/dmesg.py
@@ -7,5 +7,5 @@ class DmesgTest(oeRuntimeTest):
@skipUnlessPassed('test_ssh')
def test_dmesg(self):
-(status, output) = self.target.run('dmesg | grep -v mmci-pl18x | grep
-v "error changing net interface name" | grep -i error')
+(status, output) = self.target.run('dmesg | grep -v mmci-pl18x | grep
-v "error changing net interface name" | grep -iv "dma timeout" | grep -i
error')
self.assertEqual(status, 1, msg = "Error messages in dmesg log: %s" %
output)
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ltp: Work around parallel make race
As per the comments, the makefiles use make -C extensively and
this causes particular problems around the kernel syscall header. We
therefore ensure its up to date in advance.
Signed-off-by: Richard Purdie
---
diff --git a/meta/recipes-extended/ltp/ltp_20140115.bb
b/meta/recipes-extended/ltp/ltp_20140115.bb
index 361eccb..b04debf 100644
--- a/meta/recipes-extended/ltp/ltp_20140115.bb
+++ b/meta/recipes-extended/ltp/ltp_20140115.bb
@@ -43,6 +43,14 @@ do_configure_prepend() {
(cd utils/ffsb-6.0-rc2; autoreconf -fvi; ./configure ${CONFIGUREOPTS})
}
+# The makefiles make excessive use of make -C and several include testcases.mk
+# which triggers a build of the syscall header. To reproduce, build ltp,
+# then delete the header, then "make -j XX" and watch regen.sh run multiple
+# times. Its easier to generate this once here instead.
+do_compile_prepend () {
+ ( cd ${S} make -C testcases/kernel include/linux_syscall_numbers.h )
+}
+
do_install(){
install -d ${D}/opt/ltp/
oe_runmake DESTDIR=${D} SKIP_IDCHECK=1 install
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] relocate_sdk.py: Possible bug, /lib64/ld-linux-x86-64.so.2 not relocated
Hi, Using top of dylan branch, I generated a SDK using bitbake meta-toolchain. I'm running Arch Linux, but I also see similar issues on Ubuntu 12.04.4 LTS: Some binaries segfault when running them. I discovered, that the dynamic linker of the host is used: $ ldd /usr/local/oecore-x86_64/sysroots/x86_64-angstromsdk-linux/usr/bin/armv7ahf-vfp-neon-angstrom-linux-gnueabi/arm-angstrom-linux-gnueabi-gcc linux-vdso.so.1 (0x7fffc8f11000) libc.so.6 => /usr/local/oecore-x86_64/sysroots/x86_64-angstromsdk-linux/usr/bin/armv7ahf-vfp-neon-angstrom-linux-gnueabi/../../../lib/libc.so.6 (0x7f4d85eb1000) /lib64/ld-linux-x86-64.so.2 (0x7f4d8625f000) When forcing the dynamic linker of the SDK, the binary works: $ /usr/local/oecore-x86_64/sysroots/x86_64-angstromsdk-linux/lib/ld-linux-x86-64.so.2 /usr/local/oecore-x86_64/sysroots/x86_64-angstromsdk-linux/usr/bin/armv7ahf-vfp-neon-angstrom-linux-gnueabi/arm-angstrom-linux-gnueabi-gcc arm-angstrom-linux-gnueabi-gcc: fatal error: no input files compilation terminated. Digging around I found this commit by Jason: 3752a9c6d772b39bbe04d62ef4d3527b4c7198c1 relocate_sdk.py: Fix corruption of sdk binaries It changes the behavior and don't relocates stuff which start with /lib64. When I install the SDK with -S (copy the relocate scripts), and remove the condition around line 95, the binaries work as expected. Also LDD shows that ld-linux-x86-64.so.2 of the SDK will be used. Btw, I think this bug is related to that: https://github.com/Angstrom-distribution/setup-scripts/issues/25 Since I don't understand the original intention of that commit, I'm not sure how to fix this properly... -- Stefan ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] image.bbclass: add BAD_RECOMMENDATIONS/NO_RECOMMENDATIONS rootfs vardeps
Changes to BAD_RECOMMENDATIONS or NO_RECOMMENDATIONS require the rootfs
for the image to be rebuilt.
[YOCTO #5898]
Signed-off-by: Jonathan Liu
---
meta/classes/image.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 28b68f9..64f4359 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -70,6 +70,7 @@ LDCONFIGDEPEND_libc-uclibc = ""
do_rootfs[depends] += "makedevs-native:do_populate_sysroot
virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND}"
do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot
update-rc.d-native:do_populate_sysroot"
do_rootfs[recrdeptask] += "do_packagedata"
+do_rootfs[vardeps] += "BAD_RECOMMENDATIONS NO_RECOMMENDATIONS"
do_build[depends] += "virtual/kernel:do_deploy"
--
1.9.0
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
