Re: [OE-core] [PATCH] init-install-efi.sh: Check if an installation device is present
This patch does not solve the related bug (#7971) so I will send a V2 soon. On 07/31/2015 04:14 AM, leonardo.sandoval.gonza...@linux.intel.com wrote: From: Leonardo Sandoval leonardo.sandoval.gonza...@linux.intel.com In case there is no installation device present, give a better message to the user and abort installation. [YOCTO #7971] Signed-off-by: Leonardo Sandoval leonardo.sandoval.gonza...@linux.intel.com --- meta/recipes-core/initrdscripts/files/init-install-efi.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index f339b30..a3ed74b 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -55,6 +55,11 @@ for device in `ls /sys/block/`; do esac done +if [ -z ${hdnamelist} ]; then +echo You need another device (besides the live device /dev/${live_dev_name}) to install the image. Installation aborted. +exit 1 +fi + TARGET_DEVICE_NAME= for hdname in $hdnamelist; do # Display found hard drives and their basic info -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/7] distcc: update SRC_URI to not use Google Code
Google Code is shutting down soon and distcc has moved to github. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-devtools/distcc/distcc_3.1.bb | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.1.bb index e4b9313..8ea3cac 100644 --- a/meta/recipes-devtools/distcc/distcc_3.1.bb +++ b/meta/recipes-devtools/distcc/distcc_3.1.bb @@ -17,16 +17,14 @@ PACKAGECONFIG[popt] = --without-included-popt,--with-included-popt,popt RRECOMMENDS_${PN} = avahi-daemon -SRC_URI = http://distcc.googlecode.com/files/${BPN}-${PV}.tar.bz2 \ +SRC_URI = git://github.com/distcc/distcc.git \ file://separatebuilddir.patch \ file://0001-zeroconf-Include-fcntl.h.patch \ file://default \ file://distccmon-gnome.desktop \ file://distcc \ file://distcc.service - -SRC_URI[md5sum] = a1a9d3853df7133669fffec2a9aab9f3 -SRC_URI[sha256sum] = f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89 +SRCREV = 9a172d3d20042754a30c0cd9a5d63fd1a8120c31 inherit autotools pkgconfig update-rc.d useradd systemd -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/7] gptfdisk: update to 1.0.0
Also, use tarballs instead of git for fetching source code. git repository does not have version tags, so upstream version check cannot be performed. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- .../recipes-devtools/fdisk/{gptfdisk_git.bb = gptfdisk_1.0.0.bb} | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) rename meta/recipes-devtools/fdisk/{gptfdisk_git.bb = gptfdisk_1.0.0.bb} (75%) diff --git a/meta/recipes-devtools/fdisk/gptfdisk_git.bb b/meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb similarity index 75% rename from meta/recipes-devtools/fdisk/gptfdisk_git.bb rename to meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb index 477c1d9..f4b0e32 100644 --- a/meta/recipes-devtools/fdisk/gptfdisk_git.bb +++ b/meta/recipes-devtools/fdisk/gptfdisk_1.0.0.bb @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 DEPENDS = util-linux popt ncurses -PV = 0.8.10+git${SRCPV} -SRCREV = a920398fa393f9d6301b32b191bc01e086ab8bc8 -SRC_URI = git://git.code.sf.net/p/gptfdisk/code - -S = ${WORKDIR}/git +SRC_URI = ${SOURCEFORGE_MIRROR}/${BPN}/${PV}/${BP}.tar.gz +SRC_URI[md5sum] = 2061f917af084215898d4fea04d8388f +SRC_URI[sha256sum] = 5b66956743a799fc0471cdb032665c1391e82f9c5b3f1d7d726d29fe2ba01d6c do_install() { install -d ${D}${sbindir} -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/7] stress: update checksums to match upstream tarball
COPYING checksum has changed because the previous upstream tarball (taken from Fedora) had GPLv3 in it, but author's tarball has GPLv2. Otherwise the tarballs are identical Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-extended/stress/stress_1.0.4.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/stress/stress_1.0.4.bb b/meta/recipes-extended/stress/stress_1.0.4.bb index df96fc0..00d9940 100644 --- a/meta/recipes-extended/stress/stress_1.0.4.bb +++ b/meta/recipes-extended/stress/stress_1.0.4.bb @@ -2,13 +2,13 @@ DESCRIPTION = Deliberately simple workload generator for POSIX systems. It \ imposes a configurable amount of CPU, memory, I/O, and disk stress on the system. HOMEPAGE = http://people.seas.harvard.edu/~apw/stress/; LICENSE = GPLv2 -LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 +LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 SRC_URI = http://people.seas.harvard.edu/~apw/stress/stress-${PV}.tar.gz \ file://texinfo.patch \ -SRC_URI[md5sum] = a607afa695a511765b40993a64c6e2f4 -SRC_URI[sha256sum] = 369c997f65e8426ae8b318d4fdc8e6f07a311cfa77cc4b25dace465c582163c0 +SRC_URI[md5sum] = 890a4236dd1656792f3ef9a190cf99ef +SRC_URI[sha256sum] = 057e4fc2a7706411e1014bf172e4f94b63a12f18412378fca8684ca92408825b inherit autotools -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] oprofile: reorder SRC_URI lines to fix upstream version check
The source tarball should be listed first. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-kernel/oprofile/oprofile.inc | 3 ++- meta/recipes-kernel/oprofile/oprofile_1.0.0.bb | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc index 49e6b16..6b393bc 100644 --- a/meta/recipes-kernel/oprofile/oprofile.inc +++ b/meta/recipes-kernel/oprofile/oprofile.inc @@ -18,7 +18,8 @@ FILES_${PN} = ${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN} FILES_${PN}-dev += ${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la FILES_${PN}-staticdev += ${libdir}/${BPN}/lib*.a -SRC_URI = file://filemode-fix.patch \ +SRC_URI = ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ + file://filemode-fix.patch \ file://acinclude.m4 \ file://automake-foreign.patch \ file://oprofile-cross-compile-tests.patch \ diff --git a/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb index f4a34b3..b44b5c5 100644 --- a/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb +++ b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb @@ -3,8 +3,6 @@ require oprofile.inc DEPENDS += virtual/kernel DEPENDS_append_powerpc64 = libpfm4 -SRC_URI += ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz - SRC_URI[md5sum] = ba0b340e5c421a93959776c836ed35b3 SRC_URI[sha256sum] = 847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7e3c45a -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] xf86-video-omapfb: switch SRC_URI to debian git repo
The previous upstream is no longer available. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb index 4ad2538..e649270 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb @@ -13,7 +13,7 @@ SRCREV = 28c006c94e57ea71df11ec4fff79d7ffcfc4860f PR = ${INC_PR}.7 PV = 0.1.1+gitr${SRCPV} -SRC_URI = git://git.pingu.fi/xf86-video-omapfb;protocol=http \ +SRC_URI = git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \ file://0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch \ file://0002-Revert-Set-virtual-size-when-configuring-framebuffer.patch \ file://0003-force-plain-mode.patch \ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/7] fotowall: update SRC_URI to use github instead of qt-apps.org
GitHub is where upstream development is happening, so we are more likely to find out about new releases from there Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-qt/qt-apps/fotowall_0.9.bb | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb index 48dcc02..e92e862 100644 --- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb +++ b/meta/recipes-qt/qt-apps/fotowall_0.9.bb @@ -10,13 +10,11 @@ SECTION = x11/apps PR = r4 -SRC_URI = http://qt-apps.org/CONTENT/content-files/71316-Fotowall-0.9.tar.bz2 \ +SRCREV = 06d5a4142c599604d9a9fd64727b6945eb8cd3da +SRC_URI = git://github.com/enricoros/fotowall.git \ file://ExportWizard-depends-on-ui_wizard.patch \ -SRC_URI[md5sum] = 142ef697332e0777c6d22c5bc96cc438 -SRC_URI[sha256sum] = e4d0c005d2cb1d7c09438bfc3098eadebc08946e4fbc0655b7fc8b046de3810d - S = ${WORKDIR}/Fotowall-${PV} inherit qt4x11 -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/7] More recipe reporting fixes
This patchset contains more recipe reporting fixes, some of which are based on the review comments to the previous patchset (which got partially merged into master). Please see specific commits for details. The following changes since commit a8b723498c9a7106210db140452886894494b4d6: bitbake: cooker: Resolve file monitoring race issues when using memres bitbake (2015-08-03 07:36:25 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib akanavin/recipe-reporting-fixes http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=akanavin/recipe-reporting-fixes Alexander Kanavin (7): fotowall: update SRC_URI to use github instead of qt-apps.org distcc: update SRC_URI to not use Google Code gptfdisk: update to 1.0.0 oprofile: reorder SRC_URI lines to fix upstream version check xf86-video-omapfb: switch SRC_URI to debian git repo stress: update checksums to match upstream tarball recipeutils.py: allow all characters in regexes used to parse version strings meta/lib/oe/recipeutils.py| 4 ++-- meta/recipes-devtools/distcc/distcc_3.1.bb| 6 ++ .../recipes-devtools/fdisk/{gptfdisk_git.bb = gptfdisk_1.0.0.bb} | 8 +++- meta/recipes-extended/stress/stress_1.0.4.bb | 6 +++--- meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb| 2 +- meta/recipes-kernel/oprofile/oprofile.inc | 3 ++- meta/recipes-kernel/oprofile/oprofile_1.0.0.bb| 2 -- meta/recipes-qt/qt-apps/fotowall_0.9.bb | 6 ++ 8 files changed, 15 insertions(+), 22 deletions(-) rename meta/recipes-devtools/fdisk/{gptfdisk_git.bb = gptfdisk_1.0.0.bb} (75%) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/7] recipeutils.py: allow all characters in regexes used to parse version strings
Previously only numeric characters were matches and anything else was discarded, so 4.0-rc3, 2005e, 1.0.2a and similar versions got truncated. Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/lib/oe/recipeutils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 9d45b42..cd74213 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -638,7 +638,7 @@ def get_recipe_pv_without_srcpv(pv, uri_type): sfx = '' if uri_type == 'git': -git_regex = re.compile((?Ppfx(v|))(?Pver((\d+[\.\-_]*)+))(?Psfx(\+|)(git|)(r|)(AUTOINC|)(\+|))(?Prev.*)) +git_regex = re.compile((?Ppfxv?)(?Pver[^\+]*)((?Psfx\+(git)?r?(AUTOINC\+))(?Prev.*))?) m = git_regex.match(pv) if m: @@ -646,7 +646,7 @@ def get_recipe_pv_without_srcpv(pv, uri_type): pfx = m.group('pfx') sfx = m.group('sfx') else: -regex = re.compile((?Ppfx(v|r|))(?Pver((\d+[\.\-_]*)+))) +regex = re.compile((?Ppfx(v|r)?)(?Pver.*)) m = regex.match(pv) if m: pv = m.group('ver') -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] bjam-native: build and install bjam.debug
From: Wenzong Fan wenzong@windriver.com bjam is stripped by default, this causes QA warning while stripping it from do_populate_sysroot(): WARNING: File '.../tmp/sysroots/x86_64-linux/usr/bin/bjam' \ from bjam-native was already stripped, \ this will prevent future debugging! The JAM scripts allow to build unstripped version with '--debug'. Just build and install the bjam.debug to stop bjam from being stripped in compile step. Signed-off-by: Wenzong Fan wenzong@windriver.com --- meta/recipes-support/boost/bjam-native_1.58.0.bb | 5 ++- .../boost/files/bjam-native-build-bjam.debug.patch | 50 ++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch diff --git a/meta/recipes-support/boost/bjam-native_1.58.0.bb b/meta/recipes-support/boost/bjam-native_1.58.0.bb index d85d1a9..32646d7 100644 --- a/meta/recipes-support/boost/bjam-native_1.58.0.bb +++ b/meta/recipes-support/boost/bjam-native_1.58.0.bb @@ -5,11 +5,14 @@ SECTION = devel inherit native +SRC_URI += file://bjam-native-build-bjam.debug.patch + do_compile() { ./bootstrap.sh --with-toolset=gcc } do_install() { install -d ${D}${bindir}/ -install -c -m 755 bjam ${D}${bindir}/ +# install unstripped version for bjam +install -c -m 755 bjam.debug ${D}${bindir}/bjam } diff --git a/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch b/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch new file mode 100644 index 000..9f8b7ea --- /dev/null +++ b/meta/recipes-support/boost/files/bjam-native-build-bjam.debug.patch @@ -0,0 +1,50 @@ +From 619ada314ab26c0c9cbfe5702cd9c0caa8f6415a Mon Sep 17 00:00:00 2001 +From: Wenzong Fan wenzong@windriver.com +Date: Mon, 3 Aug 2015 17:12:33 +0800 +Subject: [PATCH] bjam-native: build bjam.debug + +bjam is stripped by default, this causes QA warning while stripping it +from do_populate_sysroot(): + + WARNING: File '.../tmp/sysroots/x86_64-linux/usr/bin/bjam' \ +from bjam-native was already stripped, \ +this will prevent future debugging! + +The JAM scripts allow to build unstripped version with '--debug'. Just +build and install the bjam.debug to stop bjam from being stripped in +compile step. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Wenzong Fan wenzong@windriver.com +--- + bootstrap.sh| 1 + + tools/build/src/engine/build.sh | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/bootstrap.sh b/bootstrap.sh +index 98cf88b..54690aa 100755 +--- a/bootstrap.sh b/bootstrap.sh +@@ -228,6 +228,7 @@ if test x$BJAM = x; then + echo tools/build/src/engine/$arch/b2 + cp $BJAM . + cp $my_dir/tools/build/src/engine/$arch/bjam . ++ cp $my_dir/tools/build/src/engine/${arch}.debug/bjam bjam.debug + + fi + +diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh +index 6dbc706..c69fdc7 100755 +--- a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh +@@ -312,5 +312,5 @@ if test -x ./bootstrap/jam0 ; then + if test ${BJAM_UPDATE} != update ; then + echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET --toolset-root=$BOOST_JAM_TOOLSET_ROOT $@ clean + fi +-echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET --toolset-root=$BOOST_JAM_TOOLSET_ROOT $@ ++echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET --toolset-root=$BOOST_JAM_TOOLSET_ROOT $@ --debug + fi +-- +1.9.1 + -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] weston: Fix parallel make race
The current approach used by the Makefile ends up installing weston.desktop twice and can give build failures when using parallel make flags. Change to just have one DATA reference. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../wayland/weston/parallelmake.patch | 22 ++ meta/recipes-graphics/wayland/weston_1.8.0.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta/recipes-graphics/wayland/weston/parallelmake.patch diff --git a/meta/recipes-graphics/wayland/weston/parallelmake.patch b/meta/recipes-graphics/wayland/weston/parallelmake.patch new file mode 100644 index 000..34d7512 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/parallelmake.patch @@ -0,0 +1,22 @@ +The current approach used by the Makefile ends up installing +weston.desktop twice and can give build failures when using +parallel make flags. Change to just have one DATA reference. + +RP +2015/8/3 +Upstream-Status: Pending + +Index: weston-1.8.0/Makefile.am +=== +--- weston-1.8.0.orig/Makefile.am weston-1.8.0/Makefile.am +@@ -179,8 +179,7 @@ pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = src/weston.pc + + wayland_sessiondir = $(datadir)/wayland-sessions +-wayland_session_DATA = src/weston.desktop +-dist_wayland_session_DATA = $(wayland_session_DATA) ++dist_wayland_session_DATA = src/weston.desktop + + westonincludedir = $(includedir)/weston + westoninclude_HEADERS = \ diff --git a/meta/recipes-graphics/wayland/weston_1.8.0.bb b/meta/recipes-graphics/wayland/weston_1.8.0.bb index ac6bd97..342c604 100644 --- a/meta/recipes-graphics/wayland/weston_1.8.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb @@ -11,6 +11,7 @@ SRC_URI = http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://make-lcms-explicitly-configurable.patch \ file://make-libwebp-explicitly-configurable.patch \ file://0001-make-error-portable.patch \ + file://parallelmake.patch \ SRC_URI[md5sum] = 24cb8a7ed0535b4fc3642643988dab36 SRC_URI[sha256sum] = 8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] init-install-efi.sh: Avoid /mnt/mtab creation if already present
From: Leonardo Sandoval leonardo.sandoval.gonza...@linux.intel.com The base-files recipe installs /mnt/mtab (it is a softlink of /proc/mounts), so if an image includes the latter, there is no new to created it again inside the install-efi.sh script, otherwise an error may occur as indicated on the bug's site. [YOCTO #7971] Signed-off-by: Leonardo Sandoval leonardo.sandoval.gonza...@linux.intel.com --- meta/recipes-core/initrdscripts/files/init-install-efi.sh | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index f339b30..665d04a 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -109,7 +109,11 @@ rm -f /etc/udev/scripts/mount* umount ${device}* 2 /dev/null || /bin/true mkdir -p /tmp -cat /proc/mounts /etc/mtab + +# Create /etc/mtab if not present +if [ ! -e /etc/mtab ]; then +cat /proc/mounts /etc/mtab +fi disk_size=$(parted ${device} unit mb print | grep Disk | cut -d -f 3 | sed -e s/MB//) -- 1.8.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] V2: Fix rt-tests redo install error and add qemu ptest
V2: * add upstream status for add-ptest-in-makefile.patch of qemu. The following changes since commit a8bc06c3a001d89586f534c6411c3eeb2b106906: bitbake: bb.parse: properly error out on filesystem errors (2015-08-01 11:31:16 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib kangkai/qemu-ptest http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/qemu-ptest Kai Kang (2): rt-tests: fix redo install error qemu: add ptest sub-package meta/recipes-devtools/qemu/qemu.inc| 16 +++- .../qemu/qemu/add-ptest-in-makefile.patch | 29 + meta/recipes-devtools/qemu/qemu/run-ptest | 8 .../rt-tests/files/fix-re-install-failure.patch| 48 ++ meta/recipes-rt/rt-tests/rt-tests.inc | 1 + 5 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch create mode 100644 meta/recipes-devtools/qemu/qemu/run-ptest create mode 100644 meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] build-appliance-image: support for VirtualBox guest addtions
On Mon, Aug 3, 2015 at 1:35 PM, Juro Bystricky juro.bystri...@intel.com wrote: It is possible to run Build Appliance VM using VirtualBox. User experience can be improved by installing VirtulaBox guest Typo: VirtulaBox -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] rt-tests: fix redo install error
Currently gzip on host is used. If host gzip is provided by pigz, it fails to redo install that pigz can't handle the option after file name. When run command for target install in Makefile: gzip src/backfire/backfire.4 -c OUTPUT_FILE File src/backfire/backfire.4 is zipped into backfire.4.gz but the OUTPUT_FILE is empty. When rerun do_install, it shows warning: | gzip: src/backfire/backfire.4 does not exist -- skipping and empty manual gzip files are created: $ file image/usr/share/man/man4/backfire.4.gz image/usr/share/man/man4/backfire.4.gz: empty Fix it by putting option '-c' before the file name. Signed-off-by: Kai Kang kai.k...@windriver.com --- .../rt-tests/files/fix-re-install-failure.patch| 48 ++ meta/recipes-rt/rt-tests/rt-tests.inc | 1 + 2 files changed, 49 insertions(+) create mode 100644 meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch diff --git a/meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch b/meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch new file mode 100644 index 000..e38ec92 --- /dev/null +++ b/meta/recipes-rt/rt-tests/files/fix-re-install-failure.patch @@ -0,0 +1,48 @@ +Currently gzip on host is used. If host gzip is provided by pigz, it fails to +redo install that pigz can't handle the option after file name. When run: + +gzip src/backfire/backfire.4 -c OUTPUT_FILE + +File src/backfire/backfire.4 is zipped into backfire.4.gz but the OUTPUT_FILE +is empty. When rerun do_install, it shows warning: + +| gzip: src/backfire/backfire.4 does not exist -- skipping + +and empty manual gzip files are created: + +$ file image/usr/share/man/man4/backfire.4.gz +image/usr/share/man/man4/backfire.4.gz: empty + +Fix it by putting option '-c' before the file name. + +Upstream-Status: Pending + +Signed-off-by: Kai Kang kai.k...@windriver.com +--- +--- git/Makefile.orig 2014-11-14 15:47:26.406638419 +0800 git/Makefile 2014-11-14 15:46:53.890637533 +0800 +@@ -127,15 +127,15 @@ + cp $(TARGETS) $(DESTDIR)$(bindir) + install -D -m 644 src/backfire/backfire.c $(DESTDIR)$(srcdir)/backfire/backfire.c + install -m 644 src/backfire/Makefile $(DESTDIR)$(srcdir)/backfire/Makefile +- gzip src/backfire/backfire.4 -c $(DESTDIR)$(mandir)/man4/backfire.4.gz +- gzip src/cyclictest/cyclictest.8 -c $(DESTDIR)$(mandir)/man8/cyclictest.8.gz +- gzip src/pi_tests/pi_stress.8 -c $(DESTDIR)$(mandir)/man8/pi_stress.8.gz +- gzip src/ptsematest/ptsematest.8 -c $(DESTDIR)$(mandir)/man8/ptsematest.8.gz +- gzip src/sigwaittest/sigwaittest.8 -c $(DESTDIR)$(mandir)/man8/sigwaittest.8.gz +- gzip src/svsematest/svsematest.8 -c $(DESTDIR)$(mandir)/man8/svsematest.8.gz +- gzip src/pmqtest/pmqtest.8 -c $(DESTDIR)$(mandir)/man8/pmqtest.8.gz +- gzip src/backfire/sendme.8 -c $(DESTDIR)$(mandir)/man8/sendme.8.gz +- gzip src/hackbench/hackbench.8 -c $(DESTDIR)$(mandir)/man8/hackbench.8.gz ++ gzip -c src/backfire/backfire.4 $(DESTDIR)$(mandir)/man4/backfire.4.gz ++ gzip -c src/cyclictest/cyclictest.8 $(DESTDIR)$(mandir)/man8/cyclictest.8.gz ++ gzip -c src/pi_tests/pi_stress.8 $(DESTDIR)$(mandir)/man8/pi_stress.8.gz ++ gzip -c src/ptsematest/ptsematest.8 $(DESTDIR)$(mandir)/man8/ptsematest.8.gz ++ gzip -c src/sigwaittest/sigwaittest.8 $(DESTDIR)$(mandir)/man8/sigwaittest.8.gz ++ gzip -c src/svsematest/svsematest.8 $(DESTDIR)$(mandir)/man8/svsematest.8.gz ++ gzip -c src/pmqtest/pmqtest.8 $(DESTDIR)$(mandir)/man8/pmqtest.8.gz ++ gzip -c src/backfire/sendme.8 $(DESTDIR)$(mandir)/man8/sendme.8.gz ++ gzip -c src/hackbench/hackbench.8 $(DESTDIR)$(mandir)/man8/hackbench.8.gz + + .PHONY: install_hwlatdetect + install_hwlatdetect: hwlatdetect diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index e63182a..9a076ad 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -8,6 +8,7 @@ SRC_URI = git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git file://added-missing-dependencies.patch \ file://hackbench-fix-error-check.patch \ file://Makefile-fix-gzip-command.patch \ + file://fix-re-install-failure.patch \ S = ${WORKDIR}/git -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] qemu: add ptest sub-package
Add sub-package ptest which runs all unit tests cases for qemu. Signed-off-by: Kai Kang kai.k...@windriver.com --- meta/recipes-devtools/qemu/qemu.inc| 16 +++- .../qemu/qemu/add-ptest-in-makefile.patch | 29 ++ meta/recipes-devtools/qemu/qemu/run-ptest | 8 ++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch create mode 100644 meta/recipes-devtools/qemu/qemu/run-ptest diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 6a744c3..c3f73d1 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -3,9 +3,10 @@ HOMEPAGE = http://qemu.org; LICENSE = GPLv2 LGPLv2.1 DEPENDS = glib-2.0 zlib pixman RDEPENDS_${PN}_class-target += bash python +RDEPENDS_${PN}-ptest = bash make require qemu-targets.inc -inherit autotools +inherit autotools ptest BBCLASSEXTEND = native nativesdk PR = r1 @@ -18,6 +19,8 @@ SRC_URI = \ file://disable-grabs.patch \ file://exclude-some-arm-EABI-obsolete-syscalls.patch \ file://wacom.patch \ +file://add-ptest-in-makefile.patch \ +file://run-ptest \ SRC_URI_append_class-native = \ @@ -54,6 +57,17 @@ do_configure() { test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh } +do_compile_ptest() { + make buildtest-TESTS +} + +do_install_ptest() { + cp -rL ${B}/tests ${D}${PTEST_PATH} + find ${D}${PTEST_PATH}/tests -type f -name *.[Sshcod] | xargs -i rm -rf {} + + cp ${S}/tests/Makefile ${D}${PTEST_PATH}/tests +} + do_install () { export STRIP=true autotools_do_install diff --git a/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch b/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch new file mode 100644 index 000..a99f720 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch @@ -0,0 +1,29 @@ +Upstream-Status: Pending + +Add subpackage -ptest which runs all unit test cases for qemu. + +Signed-off-by: Kai Kang kai.k...@windriver.com +--- + tests/Makefile | 10 ++ + 1 file changed, 10 insertions(+) + +diff --git a/tests/Makefile b/tests/Makefile +index 88f7105..3f40b4b 100644 +--- a/tests/Makefile b/tests/Makefile +@@ -405,3 +405,12 @@ all: $(QEMU_IOTESTS_HELPERS-y) + + -include $(wildcard tests/*.d) + -include $(wildcard tests/libqos/*.d) ++ ++buildtest-TESTS: $(check-unit-y) ++ ++runtest-TESTS: ++ for f in $(check-unit-y); do \ ++ nf=$$(echo $$f | sed 's/tests\//\.\//g'); \ ++ $$nf; \ ++ done ++ +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/qemu/qemu/run-ptest b/meta/recipes-devtools/qemu/qemu/run-ptest new file mode 100644 index 000..f4b8e97 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/run-ptest @@ -0,0 +1,8 @@ +#!/bin/sh +# +#This script is used to run qemu test suites +ptestdir=$(pwd) +cd tests + +export SRC_PATH=$ptestdir +make -k runtest-TESTS | sed '/: OK/ s/^/PASS: /g' -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xf86-video-intel: fix yocto/oe-core wreckage from libdrm upgrade
In commit a117fd5ecdd9973c7e4d772d1785f1f4e9b162c2, from OE-Core rev: 88d60e70da0890184922056cef1f20171f716ace libdrm: Upgrade to 2.4.62 we managed to break X like this: [3602662.736] (--) intel(0): Integrated Graphics Chipset: Intel(R) HD Graphics 4600 [3602662.736] (--) intel(0): CPU: x86-64, sse2, sse3, ssse3, sse4.1, sse4.2, avx, avx2 [3602662.736] (II) intel(0): Creating default Display subsection in Screen section Default Screen Section for depth/fbbpp 24/32 [3602662.736] (==) intel(0): Depth 24, (--) framebuffer bpp 32 [3602662.736] (==) intel(0): RGB weight 888 [3602662.736] (==) intel(0): Default visual is TrueColor [3602662.736] (EE) [3602662.736] (EE) Backtrace: [3602662.736] (EE) 0: /usr/bin/X (xorg_backtrace+0x49) [0x56ae09] [3602662.736] (EE) 1: /usr/bin/X (0x40+0x16ecd9) [0x56ecd9] [3602662.736] (EE) 2: /lib64/libpthread.so.0 (0x333060+0x105e0) [0x33306105e0] [3602662.736] (EE) [3602662.736] (EE) Segmentation fault at address 0x0 [3602662.736] (EE) Fatal server error: [3602662.736] (EE) Caught signal 11 (Segmentation fault). Server aborting A mix of a ~1 month old (working) image and the failing image led me to determine /usr/lib64/xorg/modules/drivers/intel_drv.so was bad. However nothing changed the parent package xf86-video-intel in yocto for months. So brute force bisecting yocto leads to the above commit. Inserting libdrm as git and then bisecting the 2.4.59 -- 2.4.62 uprev content leads to libdrm commit 8576527cfacaf42af8316e1030c192193e94225a (intel: Merge latest i915_drm.h) -- specifically, the part of that commit that adds __u64 flags to drm_i915_gem_mmap lands in our sysroot and is used by the compile of xf86-video-intel. With the specific trigger finally pinpointed, the final leap was to correlate that trigger to the upstream xf86-video-intel commit that accounts for the fallout of this libdrm header change, that we did not yet have here. Fun times. Hopefully this complete description here will ensure nobody else has to retrace these steps again. Cc: Damien Lespiau damien.lesp...@intel.com Cc: Neil Roberts n...@linux.intel.com Cc: Chris Wilson ch...@chris-wilson.co.uk Cc: Steffen Pankratz steffen.pankr...@elektrobit.com Cc: Ross Burton ross.bur...@intel.com Cc: Richard Purdie richard.pur...@linuxfoundation.org Signed-off-by: Paul Gortmaker paul.gortma...@windriver.com diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch new file mode 100644 index ..589d52e0f091 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch @@ -0,0 +1,70 @@ +From 7fe2b2948652443ff43d907855bd7a051d54d309 Mon Sep 17 00:00:00 2001 +From: Chris Wilson ch...@chris-wilson.co.uk +Date: Thu, 19 Mar 2015 23:14:17 + +Subject: [PATCH] sna: Protect against ABI breakage in recent versions of + libdrm + +commit 7fe2b2948652443ff43d907855bd7a051d54d309 upstream. + +Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk +Upstream-Status: Backport +Signed-off-by: Paul Gortmaker paul.gortma...@windriver.com + +diff --git a/src/sna/kgem.c b/src/sna/kgem.c +index 11f0828f2bbc..6f16cbac87f2 100644 +--- a/src/sna/kgem.c b/src/sna/kgem.c +@@ -182,6 +182,15 @@ struct local_i915_gem_caching { + #define LOCAL_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_SET_CACHING, struct local_i915_gem_caching) + #define LOCAL_IOCTL_I915_GEM_GET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_GET_CACHING, struct local_i915_gem_caching) + ++struct local_i915_gem_mmap { ++ uint32_t handle; ++ uint32_t pad; ++ uint64_t offset; ++ uint64_t size; ++ uint64_t addr_ptr; ++}; ++#define LOCAL_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct local_i915_gem_mmap) ++ + struct local_i915_gem_mmap2 { + uint32_t handle; + uint32_t pad; +@@ -514,15 +523,15 @@ retry_wc: + + static void *__kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo) + { +- struct drm_i915_gem_mmap mmap_arg; ++ struct local_i915_gem_mmap arg; + int err; + + retry: +- VG_CLEAR(mmap_arg); +- mmap_arg.handle = bo-handle; +- mmap_arg.offset = 0; +- mmap_arg.size = bytes(bo); +- if ((err = do_ioctl(kgem-fd, DRM_IOCTL_I915_GEM_MMAP, mmap_arg))) { ++ VG_CLEAR(arg); ++ arg.handle = bo-handle; ++ arg.offset = 0; ++ arg.size = bytes(bo); ++ if ((err = do_ioctl(kgem-fd, LOCAL_IOCTL_I915_GEM_MMAP, arg))) { + assert(err != EINVAL); + + if (__kgem_throttle_retire(kgem, 0)) +@@ -536,10 +545,10 @@ retry: + return NULL; + } + +- VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo))); ++ VG(VALGRIND_MAKE_MEM_DEFINED(arg.addr_ptr, bytes(bo))); + + DBG((%s: caching CPU vma
Re: [OE-core] [PATCH 1/2] kernel-headers: linux kernel headers
On Mon, Aug 3, 2015 at 1:35 PM, Juro Bystricky juro.bystri...@intel.com wrote: A set of files is needed to allow building new Linux kernel modules against an already installed Linux kernel. The files include various header files, script files, Makefiles, source code files for several utility programs and Linux kerenl .config file. Typo: kerenl -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Fwd: Help: Can not install OpenEmbedded
Giang V. Nguyen EDA BK Laboratory - Room 611 - Ta Quang Buu Library School of Electronics and Telecommunications Hanoi University of Science and Technology Email: nguyengiangb...@gmail.com Phone: 0973528618 -- Forwarded message -- From: Giang Nguyễn nguyengiangb...@gmail.com Date: Sun, Aug 2, 2015 at 1:12 AM Subject: Help: Can not install OpenEmbedded To: openembedded-core@lists.openembedded.org Hi, sir I am installing Openembedded but i got an error. When i tried to extract oecore-x86_64-armv7a-vfp-neon-toolchain-oe-core.0.sh file, it is always produce the same warning like the picture below. Please show me what must i do or give me some advices. I'm expecting to hear back from you. Hope you have a nice day, sir. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Fwd: Help: Can not install OpenEmbedded
Hi Giang, On 03.08.2015 10:42, Giang Nguyễn wrote: I am installing Openembedded but i got an error. When i tried to extract oecore-x86_64-armv7a-vfp-neon-toolchain-oe-core.0.sh http://oecore-x86_64-armv7a-vfp-neon-toolchain-oe-core.0.sh/ file, it is always produce the same warning like the picture below. Please show me what must i do or give me some advices. I'm expecting to hear back from you. Hope you have a nice day, sir. the error message is pretty clear: It looks like your downloaded file is corrupt. Try to download again... Greetings Florian -- The dream of yesterday Florian Boor is the hope of todayTel: +49 271-771091-15 and the reality of tomorrow.Fax: +49 271-771091-19 [Robert Hutchings Goddard, 1904]florian.b...@kernelconcepts.de http://www.kernelconcepts.de/en -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] mesa: upgrade 10.5.8 - 10.6.3
On 31 July 2015 at 11:08, Nicolas Dechesne nicolas.deche...@linaro.org wrote: Tested with X11 : * xf86-video-freedreno (and w/ XA) on IFC6410 and DragonBoard 410c * softpipe on DragonBoard 410c * using meta-qualcomm BSP Hi Nicolas, I believe OpenVG support has been removed in 10.6: Could you remove the unnecessary references from the recipe (PACKAGECONFIG, PACKAGES and FILES). Thanks, Jussi Signed-off-by: Nicolas Dechesne nicolas.deche...@linaro.org --- meta/recipes-graphics/mesa/{mesa-gl_10.5.8.bb = mesa-gl_10.6.3.bb} | 0 meta/recipes-graphics/mesa/{mesa_10.5.8.bb = mesa_10.6.3.bb} | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/mesa/{mesa-gl_10.5.8.bb = mesa-gl_10.6.3.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_10.5.8.bb = mesa_10.6.3.bb} (78%) diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.5.8.bb b/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_10.5.8.bb rename to meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb diff --git a/meta/recipes-graphics/mesa/mesa_10.5.8.bb b/meta/recipes-graphics/mesa/mesa_10.6.3.bb similarity index 78% rename from meta/recipes-graphics/mesa/mesa_10.5.8.bb rename to meta/recipes-graphics/mesa/mesa_10.6.3.bb index 072cde9..8c55064 100644 --- a/meta/recipes-graphics/mesa/mesa_10.5.8.bb +++ b/meta/recipes-graphics/mesa/mesa_10.6.3.bb @@ -2,8 +2,8 @@ require ${BPN}.inc SRC_URI = ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz; -SRC_URI[md5sum] = 5332a3576c5e3a0c3947ee6668dd4157 -SRC_URI[sha256sum] = 2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663da2b54 +SRC_URI[md5sum] = 553e525d2f20ed48fca8f1ec3176fd83 +SRC_URI[sha256sum] = 58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -- 2.3.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssl: fix ptest issues
From: Wenzong Fan wenzong@windriver.com * follow symbolic links while copying sources from test/* * install required target files to remove Make errors: make[2]: *** No rule to make target 'xxx', needed by 'yyy'. * fix hardcode pathes: /usr/lib - ${libdir}, /usr/bin - ${bindir} Signed-off-by: Wenzong Fan wenzong@windriver.com --- meta/recipes-connectivity/openssl/openssl.inc | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 53dcfd9..8d62915 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -191,12 +191,18 @@ do_install () { } do_install_ptest () { - cp -r Makefile test ${D}${PTEST_PATH} + cp -r -L Makefile.org Makefile test ${D}${PTEST_PATH} + cp Configure config e_os.h ${D}${PTEST_PATH} + cp -r -L include ${D}${PTEST_PATH} + ln -sf ${base_libdir}/libcrypto.a ${D}${PTEST_PATH} + ln -sf ${libdir}/libssl.a ${D}${PTEST_PATH} + mkdir -p ${D}${PTEST_PATH}/crypto + cp crypto/constant_time_locl.h ${D}${PTEST_PATH}/crypto cp -r certs ${D}${PTEST_PATH} mkdir -p ${D}${PTEST_PATH}/apps - ln -sf /usr/lib/ssl/misc/CA.sh ${D}${PTEST_PATH}/apps - ln -sf /usr/lib/ssl/openssl.cnf ${D}${PTEST_PATH}/apps - ln -sf /usr/bin/openssl ${D}${PTEST_PATH}/apps + ln -sf ${libdir}/ssl/misc/CA.sh ${D}${PTEST_PATH}/apps + ln -sf ${libdir}/ssl/openssl.cnf ${D}${PTEST_PATH}/apps + ln -sf ${bindir}/openssl ${D}${PTEST_PATH}/apps cp apps/server2.pem ${D}${PTEST_PATH}/apps mkdir -p ${D}${PTEST_PATH}/util install util/opensslwrap.sh${D}${PTEST_PATH}/util -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] bmap-tools: v3.2 (initial commit)
Bmap-tools - tools to generate block map (AKA bmap) and flash images using bmap. Bmaptool is a generic tool for creating the block map (bmap) for a file and copying files using the block map. The idea is that large file containing unused blocks, like raw system image files, can be copied or flashed a lot faster with bmaptool than with traditional tools like dd or cp. This package provides Python API, which can be used to generate bmaps for Yocto images produced by bitbake and wic. Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com --- meta/recipes-extended/bmap-tools/bmap-tools_3.2.bb | 15 +++ 1 file changed, 15 insertions(+) create mode 100644 meta/recipes-extended/bmap-tools/bmap-tools_3.2.bb diff --git a/meta/recipes-extended/bmap-tools/bmap-tools_3.2.bb b/meta/recipes-extended/bmap-tools/bmap-tools_3.2.bb new file mode 100644 index 000..79a2aa9 --- /dev/null +++ b/meta/recipes-extended/bmap-tools/bmap-tools_3.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = Tools to generate block map (AKA bmap) and flash images using bmap. +HOMEPAGE = http://source.tizen.org/documentation/reference/bmaptool/bmap-tools-project; +SECTION = console/tools +LICENSE = GPLv2.0 +LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 + +SRC_URI = ftp://ftp.infradead.org/pub/${BPN}/${BPN}-${PV}.tgz; +SRC_URI[md5sum] = 92cdad1cb4dfa0cca7176c8e22752616 +SRC_URI[sha256sum] = cc6c7f7dc0a37e2a32deb127308e24e6c4b80bfb54f3803c308efab02bf2d434 + +RDEPENDS_${PN} = bzip2 gzip lzop pigz python tar xz + +inherit setuptools + +BBCLASSEXTEND = native -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] HELP - Can not build the shell file when install openembedded
Hi, sir I am installing Openembedded but i got an error. When i tried to extract oecore-x86_64-armv7a-vfp-neon-toolchain-oe-core.0.sh file, it is always produce the same warning like the picture below. I was following the install guide: https://gnuradio.org/redmine/projects/gnuradio/wiki/OpenEmbedded. Please show me what must i do or give me some advices. I'm expecting to hear back from you. Hope you have a nice day, sir. Giang V. Nguyen EDA BK Laboratory - Room 611 - Ta Quang Buu Library School of Electronics and Telecommunications Hanoi University of Science and Technology Email: nguyengiangb...@gmail.com Phone: 0973528618 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 6/7] stress: update checksums to match upstream tarball
On 08/03/2015 07:58 PM, Martin Jansa wrote: Did you forget to update this? Commit message says something about Fedora tarball... Nope - this commit is an update to an earlier commit which got merged into master before I could fix it. I'll add a reference. http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=5f9d379fac16cfe6ca155077e6279242e72a92a9 Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 6/7] stress: update checksums to match upstream tarball
On Mon, Aug 03, 2015 at 07:29:53PM +0300, Alexander Kanavin wrote: COPYING checksum has changed because the previous upstream tarball (taken from Fedora) had GPLv3 in it, but author's tarball has GPLv2. Otherwise the tarballs are identical Signed-off-by: Alexander Kanavin alexander.kana...@linux.intel.com --- meta/recipes-extended/stress/stress_1.0.4.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/stress/stress_1.0.4.bb b/meta/recipes-extended/stress/stress_1.0.4.bb index df96fc0..00d9940 100644 --- a/meta/recipes-extended/stress/stress_1.0.4.bb +++ b/meta/recipes-extended/stress/stress_1.0.4.bb @@ -2,13 +2,13 @@ DESCRIPTION = Deliberately simple workload generator for POSIX systems. It \ imposes a configurable amount of CPU, memory, I/O, and disk stress on the system. HOMEPAGE = http://people.seas.harvard.edu/~apw/stress/; LICENSE = GPLv2 -LIC_FILES_CHKSUM = file://COPYING;md5=d32239bcb673463ab874e80d47fae504 +LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 SRC_URI = http://people.seas.harvard.edu/~apw/stress/stress-${PV}.tar.gz \ Did you forget to update this? Commit message says something about Fedora tarball... Please also use ${BPN}/${BP} instead of stress/stress-${PV} file://texinfo.patch \ -SRC_URI[md5sum] = a607afa695a511765b40993a64c6e2f4 -SRC_URI[sha256sum] = 369c997f65e8426ae8b318d4fdc8e6f07a311cfa77cc4b25dace465c582163c0 +SRC_URI[md5sum] = 890a4236dd1656792f3ef9a190cf99ef +SRC_URI[sha256sum] = 057e4fc2a7706411e1014bf172e4f94b63a12f18412378fca8684ca92408825b inherit autotools -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] wic: improved usage text
Made command line specification less confusing. Reformatted usage output. [YOCTO #7938] Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com --- scripts/lib/image/help.py | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/lib/image/help.py b/scripts/lib/image/help.py index 0666d80..a14ef20 100644 --- a/scripts/lib/image/help.py +++ b/scripts/lib/image/help.py @@ -101,19 +101,17 @@ wic_usage = Create a customized OpenEmbedded image - usage: wic [--version] [--help] COMMAND [ARGS] + usage: wic [--version] | [--help] | [COMMAND [ARGS]] Current 'wic' commands are: +help Show help for command or one of the topics (see below) createCreate a new OpenEmbedded image list List available values for options and image properties Help topics: -overview wic overview - General overview of wic -pluginswic plugins - Overview and API -kickstart wic kickstart - wic kickstart reference - - See 'wic help COMMAND or HELP TOPIC' for more information on a specific - command or help topic. +overview wic overview - General overview of wic +plugins wic plugins - Overview and API +kickstart wic kickstart - wic kickstart reference wic_help_usage = -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] wic: Report recipe name for native commands
exec_native_cmd was modified to report recipe to build native programs. Pairs executable-recipe are hardcoded as it's not possible to obtain this information automatically. [YOCTO #7631] Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com --- scripts/lib/wic/utils/oe/misc.py | 29 ++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py index 4978745..af831d3 100644 --- a/scripts/lib/wic/utils/oe/misc.py +++ b/scripts/lib/wic/utils/oe/misc.py @@ -30,6 +30,21 @@ from collections import defaultdict from wic import msger from wic.utils import runner +# executable - recipe pairs for exec_native_cmd +NATIVE_RECIPES = {mcopy: mtools, + mkdosfs: dosfstools, + mkfs.btrfs: btrfs-tools, + mkfs.ext2: e2fsprogs, + mkfs.ext3: e2fsprogs, + mkfs.ext4: e2fsprogs, + mkfs.vfat: dosfstools, + mksquashfs: squashfs-tools, + mkswqp: util-linux, + parted: parted, + sgdisk: gptfdisk, + syslinux: syslinux + } + def __exec_cmd(cmd_and_args, as_shell=False, catch=3): Execute command, catching stderr, stdout @@ -85,9 +100,17 @@ def exec_native_cmd(cmd_and_args, native_sysroot, catch=3): rc, out = __exec_cmd(native_cmd_and_args, True, catch) if rc == 127: # shell command-not-found -msger.error(A native program %s required to build the image -was not found (see details above). Please make sure -it's installed and try again. % args[0]) +prog = args[0] +msg = A native program %s required to build the image \ + was not found (see details above).\n\n % prog +recipe = NATIVE_RECIPES.get(prog) +if recipe: +msg += Please bake it with 'bitbake %s-native' \ + and try again.\n % recipe +else: +msg += Wic failed to find a recipe to build native %s. Please \ + file a bug against wic.\n % prog +msger.error(msg) if out: msger.debug('%s output: %s' % (args[0], out)) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] wic: Improve 'wic help overview' content
Included full console output and example of the .wks file into the 'wic help overview' content. Used qemux86-64 machine instead of crownbay to make example working without cloning additional layers. [YOCTO #7940] Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com --- scripts/lib/image/help.py | 33 - 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/scripts/lib/image/help.py b/scripts/lib/image/help.py index a14ef20..5fa5836 100644 --- a/scripts/lib/image/help.py +++ b/scripts/lib/image/help.py @@ -616,18 +616,33 @@ DESCRIPTION and also uses the -o option to have wic create the output somewhere other than the default /var/tmp/wic: - $ wic create ~/test.wks -o /home/trz/testwic --rootfs-dir - /home/trz/yocto/build/tmp/work/crownbay/core-image-minimal/1.0-r0/rootfs - --bootimg-dir /home/trz/yocto/build/tmp/sysroots/crownbay/usr/share - --kernel-dir /home/trz/yocto/build/tmp/sysroots/crownbay/usr/src/kernel - --native-sysroot /home/trz/yocto/build/tmp/sysroots/x86_64-linux + $ wic create ./test.wks -o ./out --rootfs-dir + tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/rootfs + --bootimg-dir tmp/sysroots/qemux86-64/usr/share + --kernel-dir tmp/deploy/images/qemux86-64 + --native-sysroot tmp/sysroots/x86_64-linux - Creating image(s)... + Creating image(s)... - Info: The new image(s) can be found here: -/home/trz/testwic/build/test-201309260032-sda.direct + Info: The new image(s) can be found here: + out/build/test-201507211313-sda.direct + + The following build artifacts were used to create the image(s): + ROOTFS_DIR: tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/rootfs + BOOTIMG_DIR: tmp/sysroots/qemux86-64/usr/share + KERNEL_DIR: tmp/deploy/images/qemux86-64 + NATIVE_SYSROOT: tmp/sysroots/x86_64-linux + + The image(s) were created using OE kickstart file: + ./test.wks + + Here is a content of test.wks: + + part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 + part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024 + + bootloader --timeout=0 --append=rootwait rootfstype=ext3 video=vesafb vga=0x318 console=tty0 - ... Finally, here's an example of the actual partition language commands used to generate the mkefidisk image i.e. these are the -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] wic: code cleanup: pylint misc.py
Fixed pylint warnings. Increased pylint score from 8.02 to 9.40. Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com --- scripts/lib/wic/utils/oe/misc.py | 40 +--- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py index 0fa8a53..d399f2a 100644 --- a/scripts/lib/wic/utils/oe/misc.py +++ b/scripts/lib/wic/utils/oe/misc.py @@ -24,6 +24,7 @@ # AUTHORS # Tom Zanussi tom.zanussi (at] linux.intel.com # +Miscellaneous functions. from collections import defaultdict @@ -56,14 +57,14 @@ def __exec_cmd(cmd_and_args, as_shell=False, catch=3): msger.debug(args) if as_shell: -rc, out = runner.runtool(cmd_and_args, catch) +ret, out = runner.runtool(cmd_and_args, catch) else: -rc, out = runner.runtool(args, catch) +ret, out = runner.runtool(args, catch) out = out.strip() msger.debug(__exec_cmd: output for %s (rc = %d): %s % \ -(cmd_and_args, rc, out)) +(cmd_and_args, ret, out)) -return (rc, out) +return (ret, out) def exec_cmd(cmd_and_args, as_shell=False, catch=3): @@ -72,10 +73,11 @@ def exec_cmd(cmd_and_args, as_shell=False, catch=3): Exits if rc non-zero -rc, out = __exec_cmd(cmd_and_args, as_shell, catch) +ret, out = __exec_cmd(cmd_and_args, as_shell, catch) -if rc != 0: -msger.error(exec_cmd: %s returned '%s' instead of 0 % (cmd_and_args, rc)) +if ret != 0: +msger.error(exec_cmd: %s returned '%s' instead of 0 % \ +(cmd_and_args, ret)) return out @@ -97,9 +99,9 @@ def exec_native_cmd(cmd_and_args, native_sysroot, catch=3): args = cmd_and_args.split() msger.debug(args) -rc, out = __exec_cmd(native_cmd_and_args, True, catch) +ret, out = __exec_cmd(native_cmd_and_args, True, catch) -if rc == 127: # shell command-not-found +if ret == 127: # shell command-not-found prog = args[0] msg = A native program %s required to build the image \ was not found (see details above).\n\n % prog @@ -114,11 +116,11 @@ def exec_native_cmd(cmd_and_args, native_sysroot, catch=3): if out: msger.debug('%s output: %s' % (args[0], out)) -if rc != 0: +if ret != 0: msger.error(exec_cmd: '%s' returned '%s' instead of 0 % \ -(cmd_and_args, rc)) +(cmd_and_args, ret)) -return (rc, out) +return ret, out BOOTDD_EXTRA_SPACE = 16384 @@ -137,10 +139,10 @@ def get_bitbake_var(var, image=None): log_level = msger.get_loglevel() msger.set_loglevel('normal') -rc, lines = __exec_cmd(cmd) +ret, lines = __exec_cmd(cmd) msger.set_loglevel(log_level) -if rc: +if ret: print Couldn't get '%s' output. % cmd print Bitbake failed with error:\n%s\n % lines return @@ -176,14 +178,14 @@ def parse_sourceparams(sourceparams): params = sourceparams.split(',') if params: -for p in params: -if not p: +for par in params: +if not par: continue -if not '=' in p: -key = p +if not '=' in par: +key = par val = None else: -key, val = p.split('=') +key, val = par.split('=') params_dict[key] = val return params_dict -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] wic: finalize 0.2.0
Hi, This patchset includes small bugfixes, code cleanup and usability fixes for wic release 0.2.0. Please review. The following changes since commit a8b723498c9a7106210db140452886894494b4d6: bitbake: cooker: Resolve file monitoring race issues when using memres bitbake (2015-08-03 07:36:25 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ed/wic/0.2.0 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wic/0.2.0 Ed Bartosh (6): wic: improved usage text wic: Improve 'wic help overview' content wic: Report recipe name for native commands wic: code cleanup: remove unused code wic: code cleanup: pylint misc.py wic: release 0.2.0 scripts/lib/image/help.py| 45 ++ scripts/lib/wic/utils/oe/misc.py | 82 +++- scripts/wic | 2 +- 3 files changed, 78 insertions(+), 51 deletions(-) -- Regards, Ed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] wic: code cleanup: remove unused code
Removed unused global variable wks_vars and 2 unused functions get_wks_var and add_wks_var. Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com --- scripts/lib/wic/utils/oe/misc.py | 11 --- 1 file changed, 11 deletions(-) diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py index af831d3..0fa8a53 100644 --- a/scripts/lib/wic/utils/oe/misc.py +++ b/scripts/lib/wic/utils/oe/misc.py @@ -120,17 +120,6 @@ def exec_native_cmd(cmd_and_args, native_sysroot, catch=3): return (rc, out) -# kickstart doesn't support variable substution in commands, so this -# is our current simplistic scheme for supporting that - -wks_vars = dict() - -def get_wks_var(key): -return wks_vars[key] - -def add_wks_var(key, val): -wks_vars[key] = val - BOOTDD_EXTRA_SPACE = 16384 _BITBAKE_VARS = defaultdict(dict) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] wic: release 0.2.0
Major changes in 0.2.0: - implemented UUID support - fixed support of GPT partition tables - implemented running bitbake from wic - implemented image compressing - started testing with oe-selftest. implemented 17 test cases - used native tools (parted, mkfs, mtools, etc) - usability and documentation fixes - code clenup Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com --- scripts/wic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/wic b/scripts/wic index 9435ce0..c1d3003 100755 --- a/scripts/wic +++ b/scripts/wic @@ -29,7 +29,7 @@ # Tom Zanussi tom.zanussi (at] linux.intel.com # -__version__ = 0.1.0 +__version__ = 0.2.0 # Python Standard Library modules import os -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] license.bbclass: Add support for deployed packages not in rootfs
Hi, Comments below, On 03/08/15 06:59, mariano.lo...@linux.intel.com wrote: From: Mariano Lopez mariano.lo...@linux.intel.com This adds a new manifest file for the packages that were deployed but not included into rootfs. The new manifest file is in the same directory as the rootfs manifest but the name is image_license.manifest. It also creates the directory structure for the packages and add the license file in such directories. The bootloader is an example of such packages. [YOCTO #6772] Signed-off-by: Mariano Lopez mariano.lo...@linux.intel.com --- meta/classes/license.bbclass | 107 +-- 1 file changed, 94 insertions(+), 13 deletions(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 224d541..42d2748 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -26,18 +26,14 @@ python write_package_manifest() { } python license_create_manifest() { -import re import oe.packagedata from oe.rootfs import image_list_installed_packages -bad_licenses = (d.getVar(INCOMPATIBLE_LICENSE, True) or ).split() -bad_licenses = map(lambda l: canonical_license(d, l), bad_licenses) -bad_licenses = expand_wildcard_licenses(d, bad_licenses) - build_images_from_feeds = d.getVar('BUILD_IMAGES_FROM_FEEDS', True) if build_images_from_feeds == 1: return 0 +# Files that are installed in the rootfs pkg_dic = {} for pkg in image_list_installed_packages(d).split(\n): pkg_info = os.path.join(d.getVar('PKGDATA_DIR', True), @@ -49,8 +45,90 @@ python license_create_manifest() { pkg_lic_name = LICENSE_ + pkg_name pkg_dic[pkg_name][LICENSE] = pkg_dic[pkg_name][pkg_lic_name] -license_manifest = os.path.join(d.getVar('LICENSE_DIRECTORY', True), Will be better to move this code into another function like image_list_installed_package to re-utilize if needed in other parts of the code base. - +# Files that are part of the image but no installed in rootfs +imgpkg_dic = {} +taskdepdata = d.getVar(BB_TASKDEPDATA, True) +all_depends = imagetypes_getdepends(d) +all_depends += %s % d.getVar(EXTRA_IMAGEDEPENDS, True) +for depend in all_depends.split(): +# Get package name without task +depend = depend.split(:)[0] +if not depend.endswith(native): +pkgs_file = os.path.join( +d.getVar('PKGDATA_DIR', True), depend) +# Search for the file on the installed packages with the +# same name as depend if not found fallback to search +# the provider for that depend. +if not os.path.isfile(pkgs_file): +pkgs_file = +for taskdep in taskdepdata.itervalues(): +# The fifth field of BB_TASKDEPDATA is PROVIDES +if depend in taskdep[4]: +pkgs_file = os.path.join( +d.getVar('PKGDATA_DIR', True), +taskdep[0]) +if os.path.isfile(pkgs_file): +break +else: +pkgs_file = +if pkgs_file: +pkgs_dep = oe.packagedata.read_pkgdatafile(pkgs_file) +# There is no need to duplicate license info for +# derivated packages or packages in the other +# license manifest +for pkg in pkgs_dep['PACKAGES'].split(): +if (pkg.endswith(-dbg) or +pkg.endswith(-dev) or +pkg.endswith(-doc) or +pkg.endswith(-locale) or +pkg.endswith(-localedata) or +pkg.endswith(-staticdev) or +pkg in pkg_dic.keys()): +continue +pkg_data_file = os.path.join( +d.getVar('PKGDATA_DIR', True), +runtime, pkg) +pkg_data = oe.packagedata.read_pkgdatafile( +pkg_data_file) +pkg_pe = pkg_data.get(PE,0) +if pkg_pe is 0: +pkg_pf = %s-%s % (pkg_data[PV], pkg_data[PR]) +else: +pkg_pf = %s_%s-%s % (pkg_pe, +pkg_data[PV], pkg_data[PR]) +# There is no need to add the license for +# packages that were not deployed +pkg_deploy = os.path.join( +d.getVar(TMPDIR, True), work, +d.getVar(MULTIMACH_TARGET_SYS, True), +
[OE-core] [PATCH 1/1] license.bbclass: Add support for deployed packages not in rootfs
From: Mariano Lopez mariano.lo...@linux.intel.com This adds a new manifest file for the packages that were deployed but not included into rootfs. The new manifest file is in the same directory as the rootfs manifest but the name is image_license.manifest. It also creates the directory structure for the packages and add the license file in such directories. The bootloader is an example of such packages. [YOCTO #6772] Signed-off-by: Mariano Lopez mariano.lo...@linux.intel.com --- meta/classes/license.bbclass | 107 +-- 1 file changed, 94 insertions(+), 13 deletions(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 224d541..42d2748 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -26,18 +26,14 @@ python write_package_manifest() { } python license_create_manifest() { -import re import oe.packagedata from oe.rootfs import image_list_installed_packages -bad_licenses = (d.getVar(INCOMPATIBLE_LICENSE, True) or ).split() -bad_licenses = map(lambda l: canonical_license(d, l), bad_licenses) -bad_licenses = expand_wildcard_licenses(d, bad_licenses) - build_images_from_feeds = d.getVar('BUILD_IMAGES_FROM_FEEDS', True) if build_images_from_feeds == 1: return 0 +# Files that are installed in the rootfs pkg_dic = {} for pkg in image_list_installed_packages(d).split(\n): pkg_info = os.path.join(d.getVar('PKGDATA_DIR', True), @@ -49,8 +45,90 @@ python license_create_manifest() { pkg_lic_name = LICENSE_ + pkg_name pkg_dic[pkg_name][LICENSE] = pkg_dic[pkg_name][pkg_lic_name] -license_manifest = os.path.join(d.getVar('LICENSE_DIRECTORY', True), +# Files that are part of the image but no installed in rootfs +imgpkg_dic = {} +taskdepdata = d.getVar(BB_TASKDEPDATA, True) +all_depends = imagetypes_getdepends(d) +all_depends += %s % d.getVar(EXTRA_IMAGEDEPENDS, True) +for depend in all_depends.split(): +# Get package name without task +depend = depend.split(:)[0] +if not depend.endswith(native): +pkgs_file = os.path.join( +d.getVar('PKGDATA_DIR', True), depend) +# Search for the file on the installed packages with the +# same name as depend if not found fallback to search +# the provider for that depend. +if not os.path.isfile(pkgs_file): +pkgs_file = +for taskdep in taskdepdata.itervalues(): +# The fifth field of BB_TASKDEPDATA is PROVIDES +if depend in taskdep[4]: +pkgs_file = os.path.join( +d.getVar('PKGDATA_DIR', True), +taskdep[0]) +if os.path.isfile(pkgs_file): +break +else: +pkgs_file = +if pkgs_file: +pkgs_dep = oe.packagedata.read_pkgdatafile(pkgs_file) +# There is no need to duplicate license info for +# derivated packages or packages in the other +# license manifest +for pkg in pkgs_dep['PACKAGES'].split(): +if (pkg.endswith(-dbg) or +pkg.endswith(-dev) or +pkg.endswith(-doc) or +pkg.endswith(-locale) or +pkg.endswith(-localedata) or +pkg.endswith(-staticdev) or +pkg in pkg_dic.keys()): +continue +pkg_data_file = os.path.join( +d.getVar('PKGDATA_DIR', True), +runtime, pkg) +pkg_data = oe.packagedata.read_pkgdatafile( +pkg_data_file) +pkg_pe = pkg_data.get(PE,0) +if pkg_pe is 0: +pkg_pf = %s-%s % (pkg_data[PV], pkg_data[PR]) +else: +pkg_pf = %s_%s-%s % (pkg_pe, +pkg_data[PV], pkg_data[PR]) +# There is no need to add the license for +# packages that were not deployed +pkg_deploy = os.path.join( +d.getVar(TMPDIR, True), work, +d.getVar(MULTIMACH_TARGET_SYS, True), +pkg_data[PN], pkg_pf, temp, run.do_deploy) +if os.path.isfile(pkg_deploy): +imgpkg_dic[pkg] = pkg_data +if not LICENSE in imgpkg_dic[pkg].keys(): +pkg_lic_name = LICENSE_%s % pkg +imgpkg_dic[pkg][LICENSE] = \ +
[OE-core] [PATCH 0/1] Creates manifest/license files for deployed packages not in rootfs
From: Mariano Lopez mariano.lo...@linux.intel.com The current license manifest creation behavior is to include only packages that were installed. This beahvior excludes packages that were deployed but not installed in the rootfs. An example would be the bootloader. This patch adds support for packages deployed but not installed in the rootfs. Please note this patch DEPENDS on: http://lists.openembedded.org/pipermail/bitbake-devel/2015-August/006130.html Mariano Lopez (1): license.bbclass: Add support for deployed packages not in rootfs meta/classes/license.bbclass | 107 +-- 1 file changed, 94 insertions(+), 13 deletions(-) -- 1.8.4.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Support for VirtualBox guest additions
In order to support VirtualBox guest additions, kernel headers need to be present in the VM. I am aware we already have two packages/recipes that are somewhat similar (kernel-devsrc.bb, linux-libc-headers), but none of them is suitable for this purpose. Besides the kernel headers, some additional files (scripts, Makefiles, .config, etc) are also required. The new recipe kernel-headers.bb can in principle be used by other images as well. It is not limited to the Build Appliance and hence is not a part of the Build Appliance recipe. Juro Bystricky (2): kernel-headers: linux kernel headers build-appliance-image: support for VirtualBox guest addtions .../README_vbox_guest_additions.txt| 78 ++ .../images/build-appliance-image_12.0.1.bb | 4 +- meta/recipes-kernel/linux/kernel-headers.bb| 66 ++ 3 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/images/build-appliance-image/README_vbox_guest_additions.txt create mode 100644 meta/recipes-kernel/linux/kernel-headers.bb -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] kernel-headers: linux kernel headers
Header files and scripts for building modules for Linux kernel. A set of files is needed to allow building new Linux kernel modules against an already installed Linux kernel. The files include various header files, script files, Makefiles, source code files for several utility programs and Linux kerenl .config file. The files may be needed by programs such as: dkms, nvidia-304xx-dkms, virtualbox, acpi_call, audit, bbswitch, ipsec-tools, nvidia-304xx, nvidia-340xx, openssh, r8168, rt3562sta, sysprof, tp_smapi, vhba-module, kmod, ... Signed-off-by: Juro Bystricky juro.bystri...@intel.com --- meta/recipes-kernel/linux/kernel-headers.bb | 66 + 1 file changed, 66 insertions(+) create mode 100644 meta/recipes-kernel/linux/kernel-headers.bb diff --git a/meta/recipes-kernel/linux/kernel-headers.bb b/meta/recipes-kernel/linux/kernel-headers.bb new file mode 100644 index 000..4be5153 --- /dev/null +++ b/meta/recipes-kernel/linux/kernel-headers.bb @@ -0,0 +1,66 @@ +SUMMARY = Linux kernel headers +DESCRIPTION = Files needed to allow building Linux kernel modules against the installed Linux kernel. + +SECTION = kernel + +LICENSE = GPLv2 +LIC_FILES_CHKSUM = file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 + +inherit module-base linux-kernel-base + +INHIBIT_PACKAGE_DEBUG_SPLIT = 1 +INHIBIT_PACKAGE_STRIP = 1 + +# Install the files once the kernel is done with them. +do_install[depends] += virtual/kernel:do_compile +do_install[depends] += virtual/kernel:do_populate_sysroot + +# Only install is needed +do_fetch[noexec] = 1 +do_unpack[noexec] = 1 +do_patch[noexec] = 1 +do_configure[noexec] = 1 +do_compile[noexec] = 1 +do_populate_sysroot[noexec] = 1 + +S = ${STAGING_KERNEL_DIR} + +do_install() { +kerneldir=${D}/lib/modules/${KERNEL_VERSION}/build +install -d $kerneldir + +cp -a ${STAGING_KERNEL_BUILDDIR}/.config $kerneldir +cp -aR ${STAGING_KERNEL_BUILDDIR}/include $kerneldir +cp -aR ${STAGING_KERNEL_BUILDDIR}/arch $kerneldir + +cd ${S} + +rsync -avm \ +--include=*/ \ +--include=Makefile* \ +--include=Kconfig* \ +--include=Kbuild* \ +--include=Module.symvers \ +--include=.config \ +--include=*.h \ +--exclude=* \ +. $kerneldir + +rsync -avm \ +--exclude=*.o \ +--exclude=.debug \ +./scripts $kerneldir + +# As of Linux kernel version 3.0.1, the clean target removes +# arch/powerpc/lib/crtsavres.o which is present in +# KBUILD_LDFLAGS_MODULE, making it required to build external modules. +if [ ${ARCH} = powerpc ]; then +mkdir -p $kerneldir/arch/powerpc/lib/ +cp ${B}/arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o +fi +} + +PACKAGES = ${PN} +FILES_${PN} = /lib/modules/${KERNEL_VERSION}/build/ +RDEPENDS_${PN} = python bash gawk perl + -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] build-appliance-image: support for VirtualBox guest addtions
It is possible to run Build Appliance VM using VirtualBox. User experience can be improved by installing VirtulaBox guest additions. This patch installs kernel headers into the Build Appliance VM, in order to make possible to rebuild the guest additons against the running kernel. The instructions on installing the guest additions are described in the attached file README_vbox_guest_additions.txt. [YOCTO #8074] Signed-off-by: Juro Bystricky juro.bystri...@intel.com --- .../README_vbox_guest_additions.txt| 78 ++ .../images/build-appliance-image_12.0.1.bb | 4 +- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/images/build-appliance-image/README_vbox_guest_additions.txt diff --git a/meta/recipes-core/images/build-appliance-image/README_vbox_guest_additions.txt b/meta/recipes-core/images/build-appliance-image/README_vbox_guest_additions.txt new file mode 100644 index 000..7121804 --- /dev/null +++ b/meta/recipes-core/images/build-appliance-image/README_vbox_guest_additions.txt @@ -0,0 +1,78 @@ + +Installing VirtualBox Guest Additions +== + +In order to use VirtualBox guest additions, they have to be build +first. They may have to be rebuilt again each time the VM kernel changes, +or each time there is a new version of VirtualBox. +The following describes steps needed to perform on the Host and the +Guest VM (Build Appliance). + +Host: + +1. If you don't already have them, download the guest additions matching + your VirtualBox version. + + http://download.virtualbox.org/virtualbox/ + +2. Make sure VM has a CDROM drive, usually an IDE. Place the additions + file into the CDROM (VirtualBox Manager: VM Settings - Storage) + +Guest VM: + +1. Boot VM + + Find your CDROM device (most likely /dev/hda for IDE) and mount it: + + # cat /proc/sys/dev/cdrom/info | grep name + # mount -t iso9660 /dev/name /media/cdrom + + i.e.: + + # mount -t iso9660 /dev/hda /media/cdrom + +2. Build the additions. + This is a two step process. Step 1 needs to be done only once. + Step 2 must be done each time a new version of guest additions is being + installed. + + Step 1: Build some necessary utilities, needed for step2. + + # cd /lib/modules/xx.xx.x-yocto-standard/build + # make scripts + +Step 2: Build the guest additions: + + # /media/cdrom/VBoxLinuxAdditions.run --nox11 + +This will display some warning messages about unknown system, it is safe to ignore them. +Note: You can check the build log log if there are any errors: + + # cat /var/volatile/log/vboxadd-install.log + + +3. Check if VirtualBox additions are running: + + # /etc/init.d/vboxadd status + +If the additions are not running, try to manually start them: + + # /etc/init.d/vboxadd start + +4. Check if the guest additions actually work, in particular folder sharing: + + Host: Devices-Shared Folder Settings... +Choose any host folder and name it to your liking (my_shared_folder) + + Guest VM: + Create mount point for the shared folder, i.e.: + +# mkdir ~/shared_folder + + Mount the shared folder: (Watch out for spelling: it's vboxsf NOT vboxfs) + +# mount -t vboxsf my_shared_folder ~/shared_folder + + Verify mount, should see the contents of my_shared_folder: + +# ls shared_folder diff --git a/meta/recipes-core/images/build-appliance-image_12.0.1.bb b/meta/recipes-core/images/build-appliance-image_12.0.1.bb index 8e71b36..a96e8a0 100644 --- a/meta/recipes-core/images/build-appliance-image_12.0.1.bb +++ b/meta/recipes-core/images/build-appliance-image_12.0.1.bb @@ -6,7 +6,7 @@ LICENSE = MIT LIC_FILES_CHKSUM = file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 -IMAGE_INSTALL = packagegroup-core-boot packagegroup-core-ssh-openssh packagegroup-self-hosted +IMAGE_INSTALL = packagegroup-core-boot packagegroup-core-ssh-openssh packagegroup-self-hosted kernel-headers IMAGE_FEATURES += x11-base package-management splash @@ -25,6 +25,7 @@ SRCREV ?= d01cd53429b1c20f01dac97f1b9b659cb9dc9812 SRC_URI = git://git.yoctoproject.org/poky \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ + file://README_vbox_guest_additions.txt \ IMAGE_CMD_ext3_append () { @@ -80,6 +81,7 @@ create_bundle_files () { cd ${WORKDIR} mkdir -p Yocto_Build_Appliance cp *.vmx* Yocto_Build_Appliance + cp README* Yocto_Build_Appliance ln -sf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk Yocto_Build_Appliance/Yocto_Build_Appliance.vmdk zip -r
Re: [OE-core] [PATCH 1/1] license.bbclass: Add support for deployed packages not in rootfs
On 08/03/2015 03:20 PM, Aníbal Limón wrote: Hi, Comments below, On 03/08/15 06:59, mariano.lo...@linux.intel.com wrote: From: Mariano Lopez mariano.lo...@linux.intel.com This adds a new manifest file for the packages that were deployed but not included into rootfs. The new manifest file is in the same directory as the rootfs manifest but the name is image_license.manifest. It also creates the directory structure for the packages and add the license file in such directories. The bootloader is an example of such packages. [YOCTO #6772] Signed-off-by: Mariano Lopez mariano.lo...@linux.intel.com --- meta/classes/license.bbclass | 107 +-- 1 file changed, 94 insertions(+), 13 deletions(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 224d541..42d2748 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -26,18 +26,14 @@ python write_package_manifest() { } python license_create_manifest() { -import re import oe.packagedata from oe.rootfs import image_list_installed_packages -bad_licenses = (d.getVar(INCOMPATIBLE_LICENSE, True) or ).split() -bad_licenses = map(lambda l: canonical_license(d, l), bad_licenses) -bad_licenses = expand_wildcard_licenses(d, bad_licenses) - build_images_from_feeds = d.getVar('BUILD_IMAGES_FROM_FEEDS', True) if build_images_from_feeds == 1: return 0 +# Files that are installed in the rootfs pkg_dic = {} for pkg in image_list_installed_packages(d).split(\n): pkg_info = os.path.join(d.getVar('PKGDATA_DIR', True), @@ -49,8 +45,90 @@ python license_create_manifest() { pkg_lic_name = LICENSE_ + pkg_name pkg_dic[pkg_name][LICENSE] = pkg_dic[pkg_name][pkg_lic_name] -license_manifest = os.path.join(d.getVar('LICENSE_DIRECTORY', True), Will be better to move this code into another function like image_list_installed_package to re-utilize if needed in other parts of the code base. It's a good idea, let me work in that and I will send another patch implementing this. - +# Files that are part of the image but no installed in rootfs +imgpkg_dic = {} +taskdepdata = d.getVar(BB_TASKDEPDATA, True) +all_depends = imagetypes_getdepends(d) +all_depends += %s % d.getVar(EXTRA_IMAGEDEPENDS, True) +for depend in all_depends.split(): +# Get package name without task +depend = depend.split(:)[0] +if not depend.endswith(native): +pkgs_file = os.path.join( +d.getVar('PKGDATA_DIR', True), depend) +# Search for the file on the installed packages with the +# same name as depend if not found fallback to search +# the provider for that depend. +if not os.path.isfile(pkgs_file): +pkgs_file = +for taskdep in taskdepdata.itervalues(): +# The fifth field of BB_TASKDEPDATA is PROVIDES +if depend in taskdep[4]: +pkgs_file = os.path.join( +d.getVar('PKGDATA_DIR', True), +taskdep[0]) +if os.path.isfile(pkgs_file): +break +else: +pkgs_file = +if pkgs_file: +pkgs_dep = oe.packagedata.read_pkgdatafile(pkgs_file) +# There is no need to duplicate license info for +# derivated packages or packages in the other +# license manifest +for pkg in pkgs_dep['PACKAGES'].split(): +if (pkg.endswith(-dbg) or +pkg.endswith(-dev) or +pkg.endswith(-doc) or +pkg.endswith(-locale) or +pkg.endswith(-localedata) or +pkg.endswith(-staticdev) or +pkg in pkg_dic.keys()): +continue +pkg_data_file = os.path.join( +d.getVar('PKGDATA_DIR', True), +runtime, pkg) +pkg_data = oe.packagedata.read_pkgdatafile( +pkg_data_file) +pkg_pe = pkg_data.get(PE,0) +if pkg_pe is 0: +pkg_pf = %s-%s % (pkg_data[PV], pkg_data[PR]) +else: +pkg_pf = %s_%s-%s % (pkg_pe, +pkg_data[PV], pkg_data[PR]) +# There is no need to add the license for +# packages that were not deployed +pkg_deploy = os.path.join( +