[OE-core] ✗ patchtest: failure for openssl: disable default cryptodev

[Patchwork]

== Series Details ==

Series: openssl: disable default cryptodev
Revision: 1
URL   : https://patchwork.openembedded.org/series/7965/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 51b3ee2986)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v2] openssl: disable default cryptodev

[Huang Qiyu]

Because according to the other Distros,cryptodev is not enabled.
If users want enable cryptodev, just have to add "cryptodev-linux" into 
PACKAGECONFIG.

Signed-off-by: Huang Qiyu 
---
 meta/recipes-connectivity/openssl/openssl_1.0.2l.bb | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb 
b/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb
index c00dd81..7c8f18b 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb
@@ -2,10 +2,8 @@ require openssl.inc
 
 # For target side versions of openssl enable support for OCF Linux driver
 # if they are available.
-PACKAGECONFIG[cryptodev-linux] = ",,cryptodev-linux"
-DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'cryptodev-linux', 
'cryptodev-linux', '', d)}"
-
-CFLAG += "${@bb.utils.contains('PACKAGECONFIG', 'cryptodev-linux', 
'-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS', '', d)}"
+PACKAGECONFIG[cryptodev-linux] = "-DHAVE_CRYPTODEV 
-DUSE_CRYPTODEV_DIGESTS,,cryptodev-linux"
+CFLAG += "${PACKAGECONFIG_CONFARGS}"
 
 CFLAG_append_class-native = " -fPIC"
 
-- 
2.7.4



-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] automake: Add missing libtool tag for cppasm language

[Khem Raj]

This is highlighted when CC is passing flags like -fPIE
which are stripped by libtool when building shared libs
and replaced with -fPIC, this actually results in CC
not matching the CC computed from cmdline created for
compiling and as a result libtool heuristic to compute
tags auotmatically fails.

Signed-off-by: Khem Raj 
---
 ...utomake-Add-default-libtool_tag-to-cppasm.patch | 27 ++
 meta/recipes-devtools/automake/automake_1.15.1.bb  |  1 +
 2 files changed, 28 insertions(+)
 create mode 100644 
meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch

diff --git 
a/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
 
b/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
new file mode 100644
index 00..1221f13067
--- /dev/null
+++ 
b/meta/recipes-devtools/automake/automake/0001-automake-Add-default-libtool_tag-to-cppasm.patch
@@ -0,0 +1,27 @@
+From 25a8ac30486798d23f516722d73eb622e6264f28 Mon Sep 17 00:00:00 2001
+From: Khem Raj 
+Date: Wed, 26 Jul 2017 11:19:56 -0700
+Subject: [PATCH] automake: Add default libtool_tag to cppasm.
+
+* bin/automake.in (register_language): Define default libtool tag to be CC
+since CPPASCOMPILE is using CC to call assembler
+
+Signed-off-by: Khem Raj 
+---
+Upstream-Status: Submitted
+
+ bin/automake.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: automake-1.15.1/bin/automake.in
+===
+--- automake-1.15.1.orig/bin/automake.in
 automake-1.15.1/bin/automake.in
+@@ -831,6 +831,7 @@ register_language ('name' => 'cppasm',
+  'compiler' => 'CPPASCOMPILE',
+  'compile_flag' => '-c',
+  'output_flag' => '-o',
++ 'libtool_tag' => 'CC',
+  'extensions' => ['.S', '.sx']);
+ 
+ # Fortran 77
diff --git a/meta/recipes-devtools/automake/automake_1.15.1.bb 
b/meta/recipes-devtools/automake/automake_1.15.1.bb
index 481234185e..4f9b616b66 100644
--- a/meta/recipes-devtools/automake/automake_1.15.1.bb
+++ b/meta/recipes-devtools/automake/automake_1.15.1.bb
@@ -24,6 +24,7 @@ SRC_URI += "file://python-libdir.patch \
 file://performance.patch \
 file://new_rt_path_for_test-driver.patch \
 
file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \
+file://0001-automake-Add-default-libtool_tag-to-cppasm.patch \
 "
 
 SRC_URI[md5sum] = "95df3f2d6eb8f81e70b8cb63a93c8853"
-- 
2.13.3

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 5/5] imagefeatures: Add a test for various hypervisor formats

[Tom Rini]

We add a new test that will create core-image-minimal for wic.vmdk,
wic.vdi and wic.qcow2.  We then confirm via qemu-img that the resulting
file is of the expected type.

Cc: Ed Bartosh 
Signed-off-by: Tom Rini 
---
Changes in v2: New patch
---
 meta/lib/oeqa/selftest/cases/imagefeatures.py | 35 +++
 1 file changed, 35 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py 
b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index 2c59ef6490b3..bb2e0dba4c23 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -3,6 +3,7 @@ from oeqa.utils.commands import runCmd, bitbake, get_bb_var, 
runqemu
 from oeqa.core.decorator.oeid import OETestID
 from oeqa.utils.sshcontrol import SSHControl
 import os
+import json
 
 class ImageFeatures(OESelftestTestCase):
 
@@ -130,6 +131,40 @@ class ImageFeatures(OESelftestTestCase):
 # check if the resulting gzip is valid
 self.assertTrue(runCmd('gzip -t %s' % gzip_path))
 
+def test_hypervisor_fmts(self):
+"""
+Summary: Check various hypervisor formats
+Expected:1. core-image-minimal can be built with vmdk, vdi and
+qcow2 support.
+ 2. qemu-img says each image has the expected format
+Product: oe-core
+Author:  Tom Rini 
+"""
+
+img_types = [ 'vmdk', 'vdi', 'qcow2' ]
+features = ""
+for itype in img_types:
+features += 'IMAGE_FSTYPES += "wic.%s"\n' % itype
+self.write_config(features)
+
+image_name = 'core-image-minimal'
+bitbake(image_name)
+
+deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE')
+link_name = get_bb_var('IMAGE_LINK_NAME', image_name)
+for itype in img_types:
+image_path = os.path.join(deploy_dir_image, "%s.wic.%s" %
+  (link_name, itype))
+
+# check if result image file is in deploy directory
+self.assertTrue(os.path.exists(image_path))
+
+# check if result image is vmdk
+sysroot = get_bb_var('STAGING_DIR_NATIVE', 'core-image-minimal')
+result = runCmd('qemu-img info --output json %s' % image_path,
+native_sysroot=sysroot)
+self.assertTrue(json.loads(result.output).get('format') == itype)
+
 def test_long_chain_conversion(self):
 """
 Summary: Check for chaining many CONVERSION_CMDs together
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 3/5] imagefeatures: Extend test_bmap to validate gzip

[Tom Rini]

We extend the existing test_bmap test to also produce an ext4.bmap.gz
file and then have gzip confirm that it contains valid gzip data.  This
tests that we are able to chain at least 2 CONVERSION_CMDs together.

Cc: Ed Bartosh 
Signed-off-by: Tom Rini 
---
Changes in v2: New patch
---
 meta/lib/oeqa/selftest/cases/imagefeatures.py | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py 
b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index 91d8e9b5017c..dac74ba72b37 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -106,7 +106,7 @@ class ImageFeatures(OESelftestTestCase):
 Author:  Ed Bartosh 
 """
 
-features = 'IMAGE_FSTYPES += " ext4 ext4.bmap"'
+features = 'IMAGE_FSTYPES += " ext4 ext4.bmap ext4.bmap.gz"'
 self.write_config(features)
 
 image_name = 'core-image-minimal'
@@ -116,15 +116,21 @@ class ImageFeatures(OESelftestTestCase):
 link_name = get_bb_var('IMAGE_LINK_NAME', image_name)
 image_path = os.path.join(deploy_dir_image, "%s.ext4" % link_name)
 bmap_path = "%s.bmap" % image_path
+gzip_path = "%s.gz" % bmap_path
 
-# check if result image and bmap file are in deploy directory
+# check if result image, bmap and bmap.gz files are in deploy directory
 self.assertTrue(os.path.exists(image_path))
 self.assertTrue(os.path.exists(bmap_path))
+self.assertTrue(os.path.exists(gzip_path))
 
 # check if result image is sparse
 image_stat = os.stat(image_path)
 self.assertTrue(image_stat.st_size > image_stat.st_blocks * 512)
 
+# check if the resulting gzip is valid
+self.assertTrue(runCmd('gzip -t %s' % gzip_path))
+
+
 def test_image_fstypes(self):
 """
 Summary: Check if image of supported image fstypes can be built
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 4/5] imagefeatures: Add a test for many CONVERSION_CMDs being chained

[Tom Rini]

Add a new test to create a long (and not otherwise useful) image,
ext4.bmap.gz.bz2.lzo.xz.u-boot and also the sha256sum of it.  Check that
the resulting sha256sum is valid.

Cc: Ed Bartosh 
Signed-off-by: Tom Rini 
---
Changes in v2: New patch
---
 meta/lib/oeqa/selftest/cases/imagefeatures.py | 30 +++
 1 file changed, 30 insertions(+)

diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py 
b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index dac74ba72b37..2c59ef6490b3 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -130,6 +130,36 @@ class ImageFeatures(OESelftestTestCase):
 # check if the resulting gzip is valid
 self.assertTrue(runCmd('gzip -t %s' % gzip_path))
 
+def test_long_chain_conversion(self):
+"""
+Summary: Check for chaining many CONVERSION_CMDs together
+Expected:1. core-image-minimal can be built with
+ext4.bmap.gz.bz2.lzo.xz.u-boot and also create a
+sha256sum
+ 2. The above image has a valid sha256sum
+Product: oe-core
+Author:  Tom Rini 
+"""
+
+conv = "ext4.bmap.gz.bz2.lzo.xz.u-boot"
+features = 'IMAGE_FSTYPES += "%s %s.sha256sum"' % (conv, conv)
+self.write_config(features)
+
+image_name = 'core-image-minimal'
+bitbake(image_name)
+
+deploy_dir_image = get_bb_var('DEPLOY_DIR_IMAGE')
+link_name = get_bb_var('IMAGE_LINK_NAME', image_name)
+image_path = os.path.join(deploy_dir_image, "%s.%s" %
+  (link_name, conv))
+
+# check if resulting image is in the deploy directory
+self.assertTrue(os.path.exists(image_path))
+self.assertTrue(os.path.exists(image_path + ".sha256sum"))
+
+# check if the resulting sha256sum agrees
+self.assertTrue(runCmd('cd %s;sha256sum -c %s.%s.sha256sum' %
+   (deploy_dir_image, link_name, conv)))
 
 def test_image_fstypes(self):
 """
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCHv2 1/5] image: Convert vmdk/vdi/qcow2 to strict CONVERSION_CMD types

[Tom Rini]

The vmdk/vdi/qcow2 IMAGE_FSTYPEs predate wic.  As such, they provide
some similar underlying functionality in order to produce a "disk" image
that in turn can be converted into different formats that various
hypervisor types work with.  They do not however provide the ability for
other disk image types to be converted into these same output types.
Furthermore, they are less flexible than what wic does provide.  This
drops the old style vmdk/vdi/qcow2 types and re-introduces them under
the CONVERSION_CMD framework.  The equivalent of vmdk is now wic.vmdk
and so forth for the other types.

Signed-off-by: Tom Rini 
---
Changes in v2:
- Update runqemu help (code matches .wic.vmdk as vmdk, does right thing,
  tested).
- Supply an update to yocto-docs separately, to be merged once these
  changes are live.
---
 meta/classes/image-vm.bbclass  | 171 -
 meta/classes/image.bbclass |   3 -
 meta/classes/image_types.bbclass   |  12 +-
 .../images/build-appliance-image_15.0.0.bb |   6 +-
 scripts/runqemu|   4 +-
 5 files changed, 12 insertions(+), 184 deletions(-)
 delete mode 100644 meta/classes/image-vm.bbclass

diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass
deleted file mode 100644
index b52df9fbf5a1..
--- a/meta/classes/image-vm.bbclass
+++ /dev/null
@@ -1,171 +0,0 @@
-# image-vm.bbclass
-# (loosly based off image-live.bbclass Copyright (C) 2004, Advanced Micro 
Devices, Inc.)
-#
-# Create an image which can be placed directly onto a harddisk using dd and 
then
-# booted.
-#
-# This uses syslinux. extlinux would have been nice but required the ext2/3
-# partition to be mounted. grub requires to run itself as part of the install
-# process.
-#
-# The end result is a 512 boot sector populated with an MBR and partition table
-# followed by an msdos fat16 partition containing syslinux and a linux kernel
-# completed by the ext2/3 rootfs.
-#
-# We have to push the msdos parition table size > 16MB so fat 16 is used as 
parted
-# won't touch fat12 partitions.
-
-inherit live-vm-common
-
-do_bootdirectdisk[depends] += "dosfstools-native:do_populate_sysroot \
-   virtual/kernel:do_deploy \
-   syslinux:do_populate_sysroot \
-   syslinux-native:do_populate_sysroot \
-   parted-native:do_populate_sysroot \
-   mtools-native:do_populate_sysroot \
-   ${PN}:do_image_${VM_ROOTFS_TYPE} \
-   "
-
-IMAGE_TYPEDEP_vmdk = "${VM_ROOTFS_TYPE}"
-IMAGE_TYPEDEP_vdi = "${VM_ROOTFS_TYPE}"
-IMAGE_TYPEDEP_qcow2 = "${VM_ROOTFS_TYPE}"
-IMAGE_TYPEDEP_hdddirect = "${VM_ROOTFS_TYPE}"
-IMAGE_TYPES_MASKED += "vmdk vdi qcow2 hdddirect"
-
-VM_ROOTFS_TYPE ?= "ext4"
-ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${VM_ROOTFS_TYPE}"
-
-# Used by bootloader
-LABELS_VM ?= "boot"
-ROOT_VM ?= "root=/dev/sda2"
-# Using an initramfs is optional. Enable it by setting INITRD_IMAGE_VM.
-INITRD_IMAGE_VM ?= ""
-INITRD_VM ?= "${@'${IMGDEPLOYDIR}/${INITRD_IMAGE_VM}-${MACHINE}.cpio.gz' if 
'${INITRD_IMAGE_VM}' else ''}"
-do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE_VM}:do_image_complete' if 
'${INITRD_IMAGE_VM}' else ''}"
-
-BOOTDD_VOLUME_ID   ?= "boot"
-BOOTDD_EXTRA_SPACE ?= "16384"
-
-DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}"
-DISK_SIGNATURE[vardepsexclude] = "DISK_SIGNATURE_GENERATED"
-
-build_boot_dd() {
-   HDDDIR="${S}/hdd/boot"
-   HDDIMG="${S}/hdd.image"
-   IMAGE=${IMGDEPLOYDIR}/${IMAGE_NAME}.hdddirect
-
-   populate_kernel $HDDDIR
-
-   if [ "${PCBIOS}" = "1" ]; then
-   syslinux_hddimg_populate $HDDDIR
-   fi
-   if [ "${EFI}" = "1" ]; then
-   efi_hddimg_populate $HDDDIR
-   fi
-
-   BLOCKS=`du -bks $HDDDIR | cut -f 1`
-   BLOCKS=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}`
-
-   # Remove it since mkdosfs would fail when it exists
-   rm -f $HDDIMG
-   mkdosfs -n ${BOOTDD_VOLUME_ID} ${MKDOSFS_EXTRAOPTS} -C $HDDIMG $BLOCKS
-   mcopy -i $HDDIMG -s $HDDDIR/* ::/
-
-   if [ "${PCBIOS}" = "1" ]; then
-   syslinux_hdddirect_install $HDDIMG
-   fi  
-   chmod 644 $HDDIMG
-
-   ROOTFSBLOCKS=`du -Lbks ${ROOTFS} | cut -f 1`
-   TOTALSIZE=`expr $BLOCKS + $ROOTFSBLOCKS`
-   END1=`expr $BLOCKS \* 1024`
-   END2=`expr $END1 + 512`
-   END3=`expr \( $ROOTFSBLOCKS \* 1024 \) + $END1`
-
-   echo $ROOTFSBLOCKS $TOTALSIZE $END1 $END2 $END3
-   rm -rf $IMAGE
-   dd if=/dev/zero of=$IMAGE bs=1024 seek=$TOTALSIZE count=1
-
-   parted $IMAGE mklabel msdos
-   parted $IMAGE mkpart primary fat16 0 ${END1}B
-   parted $IMAGE unit B mkpart primary ext2 ${END2}B ${END3}B
-   parted $IMAGE set 1 boot on 
-
-   parted $IMAGE print
-
-   awk "BEGIN 

[OE-core] [PATCHv2 2/5] wic: Switch to using --use-uuid by default

[Tom Rini]

The most portable way to specifiy a root device in a disk image that we
create is to use PARTUUID rather than /dev/sda2.  As background, both
GPT and MBR tables provide valid UUID values for each partition and the
Linux Kernel contains the logic to parse this value.  With this change
we can now boot the default disk images when used as any valid block
device that the included kernel uses.  This for example means that
VirtualBox can be used to run vmdk without changes as it uses IDE for
the virtual disk controller.

Cc: Matt Porter 
Signed-off-by: Tom Rini 
---
Changes in v2: None
---
 scripts/lib/wic/canned-wks/common.wks.inc   | 2 +-
 scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg | 8 
 scripts/lib/wic/canned-wks/qemux86-directdisk.wks   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/lib/wic/canned-wks/common.wks.inc 
b/scripts/lib/wic/canned-wks/common.wks.inc
index 5cf2fd1f3e06..89880b417b6e 100644
--- a/scripts/lib/wic/canned-wks/common.wks.inc
+++ b/scripts/lib/wic/canned-wks/common.wks.inc
@@ -1,3 +1,3 @@
 # This file is included into 3 canned wks files from this directory
 part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 
1024
-part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024
+part / --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024
diff --git a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg 
b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
index d5a07d20484d..c58e74a853cb 100644
--- a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
+++ b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
@@ -12,16 +12,16 @@ DEFAULT Graphics console boot
 
 LABEL Graphics console boot
 KERNEL /vmlinuz
-APPEND label=boot root=/dev/sda2 rootwait
+APPEND label=boot rootwait
 
 LABEL Serial console boot
 KERNEL /vmlinuz
-APPEND label=boot root=/dev/sda2 rootwait console=ttyS0,115200
+APPEND label=boot rootwait console=ttyS0,115200
 
 LABEL Graphics console install
 KERNEL /vmlinuz
-APPEND label=install root=/dev/sda2 rootwait
+APPEND label=install rootwait
 
 LABEL Serial console install
 KERNEL /vmlinuz
-APPEND label=install root=/dev/sda2 rootwait console=ttyS0,115200
+APPEND label=install rootwait console=ttyS0,115200
diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks 
b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
index db30bbced034..1f8466af29bf 100644
--- a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
+++ b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
@@ -4,5 +4,5 @@
 
 include common.wks.inc
 
-bootloader  --timeout=0  --append="vga=0 uvesafb.mode_option=640x480-32 
root=/dev/sda2 rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 
oprofile.timer=1 rootfstype=ext4 "
+bootloader  --timeout=0  --append="vga=0 uvesafb.mode_option=640x480-32 rw 
mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 
rootfstype=ext4 "
 
-- 
1.9.1

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe-core][RESEND][PATCH 1/1] go: centralize definition of COMPATIBLE_HOST

[Khem Raj]

On Wed, Jul 26, 2017 at 3:14 PM, Joe Slater  wrote:
> Put it in goarch.bbclass which all go related recipes inherit.
>

looks ok

> Signed-off-by: Joe Slater 
> ---
>  meta/classes/go.bbclass   | 5 -
>  meta/classes/goarch.bbclass   | 6 ++
>  meta/recipes-devtools/go/go-cross.inc | 4 
>  meta/recipes-devtools/go/go.inc   | 6 --
>  4 files changed, 6 insertions(+), 15 deletions(-)
>
> diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass
> index 85f71a2..cedda68 100644
> --- a/meta/classes/go.bbclass
> +++ b/meta/classes/go.bbclass
> @@ -1,10 +1,5 @@
>  inherit goarch
>
> -# x32 ABI is not supported on go compiler so far
> -COMPATIBLE_HOST_linux-gnux32 = "null"
> -# ppc32 is not supported in go compilers
> -COMPATIBLE_HOST_powerpc = "null"
> -
>  GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go"
>  GOROOT = "${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
>  GOBIN_FINAL_class-native = "${GOROOT_FINAL}/bin"
> diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass
> index 4a5b2ec..57537fb 100644
> --- a/meta/classes/goarch.bbclass
> +++ b/meta/classes/goarch.bbclass
> @@ -11,6 +11,12 @@ TARGET_GOARM = "${@go_map_arm(d.getVar('TARGET_ARCH', 
> True), d.getVar('TUNE_FEAT
>  TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}"
>  GO_BUILD_BINDIR = 
> "${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == 
> d.getVar('HOST_GOTUPLE',True)]}"
>
> +# define here because everybody inherits this class
> +#
> +COMPATIBLE_HOST_linux-gnux32 = "null"
> +COMPATIBLE_HOST_powerpc = "null"
> +COMPATIBLE_HOST_powerpc64 = "null"
> +
>  def go_map_arch(a, d):
>  import re
>  if re.match('i.86', a):
> diff --git a/meta/recipes-devtools/go/go-cross.inc 
> b/meta/recipes-devtools/go/go-cross.inc
> index 71e4611..1c2d9e3 100644
> --- a/meta/recipes-devtools/go/go-cross.inc
> +++ b/meta/recipes-devtools/go/go-cross.inc
> @@ -13,7 +13,3 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/go-cross:"
>  GOROOT_FINAL = "${libdir}/go"
>  export GOROOT_FINAL
>
> -# x32 ABI is not supported on go compiler so far
> -COMPATIBLE_HOST_linux-gnux32 = "null"
> -# ppc32 is not supported in go compilers
> -COMPATIBLE_HOST_powerpc = "null"
> diff --git a/meta/recipes-devtools/go/go.inc b/meta/recipes-devtools/go/go.inc
> index 91d040d..52abbeb 100644
> --- a/meta/recipes-devtools/go/go.inc
> +++ b/meta/recipes-devtools/go/go.inc
> @@ -12,12 +12,6 @@ DEPENDS += "${@ 'libgcc' if not oe.utils.inherits(d, 
> 'cross') else ''}"
>  INHIBIT_PACKAGE_STRIP = "1"
>  INHIBIT_SYSROOT_STRIP = "1"
>
> -# x32 ABI is not supported on go compiler so far
> -COMPATIBLE_HOST_linux-gnux32 = "null"
> -# ppc is not supported in go compilers
> -COMPATIBLE_HOST_powerpc = "null"
> -COMPATIBLE_HOST_powerpc64 = "null"
> -
>  export GOHOSTOS = "${BUILD_GOOS}"
>  export GOHOSTARCH = "${BUILD_GOARCH}"
>  export GOOS = "${TARGET_GOOS}"
> --
> 2.7.4
>
> --
> ___
> 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] [oe-core][RESEND][PATCH 1/1] go: centralize definition of COMPATIBLE_HOST

[Joe Slater]

Put it in goarch.bbclass which all go related recipes inherit.

Signed-off-by: Joe Slater 
---
 meta/classes/go.bbclass   | 5 -
 meta/classes/goarch.bbclass   | 6 ++
 meta/recipes-devtools/go/go-cross.inc | 4 
 meta/recipes-devtools/go/go.inc   | 6 --
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass
index 85f71a2..cedda68 100644
--- a/meta/classes/go.bbclass
+++ b/meta/classes/go.bbclass
@@ -1,10 +1,5 @@
 inherit goarch
 
-# x32 ABI is not supported on go compiler so far
-COMPATIBLE_HOST_linux-gnux32 = "null"
-# ppc32 is not supported in go compilers
-COMPATIBLE_HOST_powerpc = "null"
-
 GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go"
 GOROOT = "${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go"
 GOBIN_FINAL_class-native = "${GOROOT_FINAL}/bin"
diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass
index 4a5b2ec..57537fb 100644
--- a/meta/classes/goarch.bbclass
+++ b/meta/classes/goarch.bbclass
@@ -11,6 +11,12 @@ TARGET_GOARM = "${@go_map_arm(d.getVar('TARGET_ARCH', True), 
d.getVar('TUNE_FEAT
 TARGET_GOTUPLE = "${TARGET_GOOS}_${TARGET_GOARCH}"
 GO_BUILD_BINDIR = 
"${@['bin/${HOST_GOTUPLE}','bin'][d.getVar('BUILD_GOTUPLE',True) == 
d.getVar('HOST_GOTUPLE',True)]}"
 
+# define here because everybody inherits this class
+#
+COMPATIBLE_HOST_linux-gnux32 = "null"
+COMPATIBLE_HOST_powerpc = "null"
+COMPATIBLE_HOST_powerpc64 = "null"
+
 def go_map_arch(a, d):
 import re
 if re.match('i.86', a):
diff --git a/meta/recipes-devtools/go/go-cross.inc 
b/meta/recipes-devtools/go/go-cross.inc
index 71e4611..1c2d9e3 100644
--- a/meta/recipes-devtools/go/go-cross.inc
+++ b/meta/recipes-devtools/go/go-cross.inc
@@ -13,7 +13,3 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/go-cross:"
 GOROOT_FINAL = "${libdir}/go"
 export GOROOT_FINAL
 
-# x32 ABI is not supported on go compiler so far
-COMPATIBLE_HOST_linux-gnux32 = "null"
-# ppc32 is not supported in go compilers
-COMPATIBLE_HOST_powerpc = "null"
diff --git a/meta/recipes-devtools/go/go.inc b/meta/recipes-devtools/go/go.inc
index 91d040d..52abbeb 100644
--- a/meta/recipes-devtools/go/go.inc
+++ b/meta/recipes-devtools/go/go.inc
@@ -12,12 +12,6 @@ DEPENDS += "${@ 'libgcc' if not oe.utils.inherits(d, 
'cross') else ''}"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
 
-# x32 ABI is not supported on go compiler so far
-COMPATIBLE_HOST_linux-gnux32 = "null"
-# ppc is not supported in go compilers
-COMPATIBLE_HOST_powerpc = "null"
-COMPATIBLE_HOST_powerpc64 = "null"
-
 export GOHOSTOS = "${BUILD_GOOS}"
 export GOHOSTARCH = "${BUILD_GOARCH}"
 export GOOS = "${TARGET_GOOS}"
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [meta-oe][krogoth][morty][PATCH] systemd: Disable DefaultDependencies for sysv scripts on rcS runlevel

[Nikolai Merinov]

Hi Armin,

No. Pyro dropped support for rcS runlevel in commit e6c1765a05 during upgrade 
to systemd 232. According to commit message support was droped because of 
dependency loops that can be solved with my patch.

Regards,
Nikolay

26 июля 2017 г. 23:45:00 GMT+05:00, akuster808  пишет:
>
>Nikolay,
>
>On 07/26/2017 01:05 AM, Nikolay Merinov wrote:
>> systemd-sysv-generator translate sysv services on rcS runlevel to
>> services that starts before sysinit.target. This behavour conflict
>> with default dependency on same tartget.
>>
>> String that define "DefaultDependency=no" was lost from patch for
>> sysv generator during porting patches to systemd 229 in commit
>> 64ab17b707dc431aaed880d6d8615971243f46f8.
>
>is Master or Pyro affected?
>
>- armin
>>
>> Current commit returns changes required for services that work on
>> rcS runlevel.
>>
>> Signed-off-by: Nikolay Merinov 
>> ---
>>   ...nerator-add-support-for-executing-scripts-und.patch | 18
>++
>>   1 file changed, 14 insertions(+), 4 deletions(-)
>>
>> diff --git
>a/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
>b/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
>> index ac67f65685..5736f57814 100644
>> ---
>a/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
>> +++
>b/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
>> @@ -57,7 +57,17 @@ index b5925a4..ea06d6a 100644
>>} SysvStub;
>>
>>static void free_sysvstub(SysvStub *s) {
>> -@@ -711,17 +717,31 @@ static int fix_order(SysvStub *s, Hashmap
>*all_services) {
>> +@@ -194,6 +198,9 @@ static int generate_unit_file(SysvStub *s) {
>> + if (s->description)
>> + fprintf(f, "Description=%s\n", s->description);
>> +
>> ++if (!s->default_dependencies)
>> ++fprintf(f, "DefaultDependencies=no\n");
>> ++
>> + STRV_FOREACH(p, s->before)
>> + fprintf(f, "Before=%s\n", *p);
>> + STRV_FOREACH(p, s->after)
>> +@@ -711,17 +720,31 @@ static int fix_order(SysvStub *s, Hashmap
>*all_services) {
>>if (s->has_lsb && other->has_lsb)
>>continue;
>>
>> @@ -95,7 +105,7 @@ index b5925a4..ea06d6a 100644
>>
>>/* FIXME: Maybe we should compare the name here
>lexicographically? */
>>}
>> -@@ -788,6 +808,8 @@ static int enumerate_sysv(const LookupPaths *lp,
>Hashmap *all_services) {
>> +@@ -788,6 +811,8 @@ static int enumerate_sysv(const LookupPaths *lp,
>Hashmap *all_services) {
>>return log_oom();
>>
>>service->sysv_start_priority = -1;
>> @@ -104,7 +114,7 @@ index b5925a4..ea06d6a 100644
>>service->name = name;
>>service->path = fpath;
>>name = fpath = NULL;
>> -@@ -871,9 +893,11 @@ static int set_dependencies_from_rcnd(const
>LookupPaths *lp, Hashmap *all_servic
>> +@@ -871,9 +896,11 @@ static int set_dependencies_from_rcnd(const
>LookupPaths *lp, Hashmap *all_servic
>>
>>if (de->d_name[0] == 'S')  {
>>
>> @@ -118,7 +128,7 @@ index b5925a4..ea06d6a 100644
>>r =
>set_ensure_allocated(_services[i], NULL);
>>if (r < 0) {
>>log_oom();
>> -@@ -887,7 +911,8 @@ static int set_dependencies_from_rcnd(const
>LookupPaths *lp, Hashmap *all_servic
>> +@@ -887,7 +914,8 @@ static int set_dependencies_from_rcnd(const
>LookupPaths *lp, Hashmap *all_servic
>>}
>>
>>} else if (de->d_name[0] == 'K' &&
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [meta-oe][krogoth][morty][PATCH] systemd: Disable DefaultDependencies for sysv scripts on rcS runlevel

[akuster808]

Nikolay,

On 07/26/2017 01:05 AM, Nikolay Merinov wrote:

systemd-sysv-generator translate sysv services on rcS runlevel to
services that starts before sysinit.target. This behavour conflict
with default dependency on same tartget.

String that define "DefaultDependency=no" was lost from patch for
sysv generator during porting patches to systemd 229 in commit
64ab17b707dc431aaed880d6d8615971243f46f8.


is Master or Pyro affected?

- armin


Current commit returns changes required for services that work on
rcS runlevel.

Signed-off-by: Nikolay Merinov 
---
  ...nerator-add-support-for-executing-scripts-und.patch | 18 ++
  1 file changed, 14 insertions(+), 4 deletions(-)

diff --git 
a/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
 
b/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
index ac67f65685..5736f57814 100644
--- 
a/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
+++ 
b/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
@@ -57,7 +57,17 @@ index b5925a4..ea06d6a 100644
   } SysvStub;
   
   static void free_sysvstub(SysvStub *s) {

-@@ -711,17 +717,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) 
{
+@@ -194,6 +198,9 @@ static int generate_unit_file(SysvStub *s) {
+ if (s->description)
+ fprintf(f, "Description=%s\n", s->description);
+
++if (!s->default_dependencies)
++fprintf(f, "DefaultDependencies=no\n");
++
+ STRV_FOREACH(p, s->before)
+ fprintf(f, "Before=%s\n", *p);
+ STRV_FOREACH(p, s->after)
+@@ -711,17 +720,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) 
{
   if (s->has_lsb && other->has_lsb)
   continue;
   
@@ -95,7 +105,7 @@ index b5925a4..ea06d6a 100644
   
   /* FIXME: Maybe we should compare the name here lexicographically? */

   }
-@@ -788,6 +808,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap 
*all_services) {
+@@ -788,6 +811,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap 
*all_services) {
   return log_oom();
   
   service->sysv_start_priority = -1;

@@ -104,7 +114,7 @@ index b5925a4..ea06d6a 100644
   service->name = name;
   service->path = fpath;
   name = fpath = NULL;
-@@ -871,9 +893,11 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
+@@ -871,9 +896,11 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
   
   if (de->d_name[0] == 'S')  {
   
@@ -118,7 +128,7 @@ index b5925a4..ea06d6a 100644

   r = 
set_ensure_allocated(_services[i], NULL);
   if (r < 0) {
   log_oom();
-@@ -887,7 +911,8 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
+@@ -887,7 +914,8 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
   }
   
   } else if (de->d_name[0] == 'K' &&


--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v2] oe-selftest: wic: change mkfs.btrfs options

[Ed Bartosh]

test_mkfs_extraopts test case fails on ab with error caused
by using -K --mixed options:
 output: extent-tree.c:2696: btrfs_reserve_extent: BUG_ON `ret` triggered, 
value -28

For this test case it's not important to use particular options,
so changing options to anything less influential is OK.

Changed extra options for mkfs.btrfs to '--quiet' to fix the failure.

Signed-off-by: Ed Bartosh 
---
 meta/lib/oeqa/selftest/cases/wic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/wic.py 
b/meta/lib/oeqa/selftest/cases/wic.py
index ceb92ae..aaefd4f 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -926,7 +926,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 
--exclude-path bin/ --r
 with NamedTemporaryFile("w", suffix=".wks") as wks:
 wks.writelines(
 ['part ext2   --fstype ext2 --source rootfs 
--mkfs-extraopts "-D -F -i 8192"\n',
- 'part btrfs  --fstype btrfs--source rootfs --size 40M 
--mkfs-extraopts "--mixed -K"\n',
+ "part btrfs  --fstype btrfs--source rootfs --size 40M 
--mkfs-extraopts='--quiet'\n",
  'part squash --fstype squashfs --source rootfs 
--mkfs-extraopts "-no-sparse -b 4096"\n',
  'part emptyvfat   --fstype vfat   --size 1M --mkfs-extraopts 
"-S 1024 -s 64"\n',
  'part emptymsdos  --fstype msdos  --size 1M --mkfs-extraopts 
"-S 1024 -s 64"\n',
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] image_types_wic: add dependency to e2fsprogs-native

[Ed Bartosh]

Added e2fsprogs-native to the list of default dependencies for
wic (WKS_FILE_DEPENDS_DEFAULT) as all fs-related utilities
have to be in this list.

Thanks to Patrick Ohly for noticing this.

[YOCTO #11817]

Signed-off-by: Ed Bartosh 
---
 meta/classes/image_types_wic.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image_types_wic.bbclass 
b/meta/classes/image_types_wic.bbclass
index 57ba646..b825b47 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -41,7 +41,7 @@ WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % 
os.path.exists('${WKS_FULL_PATH}
 do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}"
 do_image_wic[depends] += "${@' '.join('%s-native:do_populate_sysroot' % r for 
r in ('parted', 'gptfdisk', 'dosfstools', 'mtools'))}"
 
-WKS_FILE_DEPENDS_DEFAULT = "syslinux-native bmap-tools-native cdrtools-native 
btrfs-tools-native squashfs-tools-native"
+WKS_FILE_DEPENDS_DEFAULT = "syslinux-native bmap-tools-native cdrtools-native 
btrfs-tools-native squashfs-tools-native e2fsprogs-native"
 WKS_FILE_DEPENDS_BOOTLOADERS = ""
 WKS_FILE_DEPENDS_BOOTLOADERS_x86 = "syslinux grub-efi systemd-boot"
 WKS_FILE_DEPENDS_BOOTLOADERS_x86-64 = "syslinux grub-efi systemd-boot"
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH v2] opkg: 0.3.4 -> 0.3.5

[Alejandro del Castillo]

master already have opkg 0.3.5:

http://git.openembedded.org/openembedded-core/commit/meta/recipes-devtools/opkg?id=89b8cbfd65ae6c682908da8028d86692926e4d45

On 07/26/2017 04:26 AM, Huang Qiyu wrote:
> 1) Update opkg from 0.3.4 to 0.3.5.
> 2) Delete status-conffile.patch, since it is integrated upstream
> 
> Signed-off-by: Huang Qiyu 
> ---
>  .../opkg/opkg/status-conffile.patch| 69 
> --
>  .../opkg/{opkg_0.3.4.bb => opkg_0.3.5.bb}  |  5 +-
>  2 files changed, 2 insertions(+), 72 deletions(-)
>  delete mode 100644 meta/recipes-devtools/opkg/opkg/status-conffile.patch
>  rename meta/recipes-devtools/opkg/{opkg_0.3.4.bb => opkg_0.3.5.bb} (93%)
> 
> diff --git a/meta/recipes-devtools/opkg/opkg/status-conffile.patch 
> b/meta/recipes-devtools/opkg/opkg/status-conffile.patch
> deleted file mode 100644
> index 6fc405b..000
> --- a/meta/recipes-devtools/opkg/opkg/status-conffile.patch
> +++ /dev/null
> @@ -1,69 +0,0 @@
> -Upstream-Status: Submitted
> -Signed-off-by: Ross Burton 
> -
> -From 086d5083dfe0102368cb7c8ce89b0c06b64ca773 Mon Sep 17 00:00:00 2001
> -From: Ross Burton 
> -Date: Tue, 10 Jan 2017 15:24:59 +
> -Subject: [PATCH 1/2] opkg_cmd: only look at conffile status if we're going to
> - output it
> -
> -The loop to compare the recorded conffile hash with their hash on disk is
> -outputted at level INFO but the loop was executed at level NOTICE and higher.
> -
> -This means that if a conffile had been deleted the status operation would
> -produce error messages for output it isn't displaying.
> -
> -Signed-off-by: Ross Burton 
> 
> - libopkg/opkg_cmd.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
> -index ba57c6a..37416fd 100644
>  a/libopkg/opkg_cmd.c
> -+++ b/libopkg/opkg_cmd.c
> -@@ -638,7 +638,7 @@ static int opkg_info_status_cmd(int argc, char **argv, 
> int installed_only)
> - 
> - pkg_formatted_info(stdout, pkg);
> - 
> --if (opkg_config->verbosity >= NOTICE) {
> -+if (opkg_config->verbosity >= INFO) {
> - conffile_list_elt_t *iter;
> - for (iter = nv_pair_list_first(>conffiles); iter;
> -  iter = nv_pair_list_next(>conffiles, iter)) {
> --- 
> -2.8.1
> -
> -From 225e30e0f9fa7cfeaa3f89e2713e5147ab371def Mon Sep 17 00:00:00 2001
> -From: Ross Burton 
> -Date: Tue, 10 Jan 2017 15:28:47 +
> -Subject: [PATCH 2/2] conffile: gracefully handle deleted conffiles in
> - conffile_has_been_modified
> -
> -Handle conffiles that don't exist gracefully so that instead of showing an 
> error
> -message from file_md5sum_alloc() a notice that the file has been deleted is
> -shown instead.
> -
> -Signed-off-by: Ross Burton 
> 
> - libopkg/conffile.c | 5 +
> - 1 file changed, 5 insertions(+)
> -
> -diff --git a/libopkg/conffile.c b/libopkg/conffile.c
> -index b2f2469..7b4b87b 100644
>  a/libopkg/conffile.c
> -+++ b/libopkg/conffile.c
> -@@ -51,6 +51,11 @@ int conffile_has_been_modified(conffile_t * conffile)
> - }
> - 
> - root_filename = root_filename_alloc(filename);
> -+if (!file_exists(root_filename)) {
> -+opkg_msg(INFO, "Conffile %s deleted\n", conffile->name);
> -+free(root_filename);
> -+return 1;
> -+}
> - 
> - md5sum = file_md5sum_alloc(root_filename);
> - 
> --- 
> -2.8.1
> diff --git a/meta/recipes-devtools/opkg/opkg_0.3.4.bb 
> b/meta/recipes-devtools/opkg/opkg_0.3.5.bb
> similarity index 93%
> rename from meta/recipes-devtools/opkg/opkg_0.3.4.bb
> rename to meta/recipes-devtools/opkg/opkg_0.3.5.bb
> index a21fde1..3e511b6 100644
> --- a/meta/recipes-devtools/opkg/opkg_0.3.4.bb
> +++ b/meta/recipes-devtools/opkg/opkg_0.3.5.bb
> @@ -15,11 +15,10 @@ SRC_URI = 
> "https://urldefense.proofpoint.com/v2/url?u=http-3A__downloads.yoctoproject.org_releases_-24=DwICAg=I_0YwoKy7z5LMTVdyO6YCiE2uzI1jjZZuIPelcSjixA=wNcrL2akRn6jfxhHaKavUrJB_C9JAMXtynjLd8ZzgXQ=BifePy5QrwZOSind-8ndN3lCCnR8yRdx4Vlx8YK5WmY=J_wAe7LX3BF1PYcPxUBNWuq4VmGmewb44c3BOV2NY4s=
>  {BPN}/${BPN}-${PV}.tar.gz
> file://opkg-configure.service \
> file://opkg.conf \
> 
> file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
> -   file://status-conffile.patch \
>  "
>  
> -SRC_URI[md5sum] = "6c52a065499056a196e0b45a27e392de"
> -SRC_URI[sha256sum] = 
> "750b900b53b62a9b280b601a196f02da81091eda2f3478c509512aa5a1ec93be"
> +SRC_URI[md5sum] = "d202d09ea0932943071b842626cab13c"
> +SRC_URI[sha256sum] = 
> "734bc21dea11262113fa86b928d09812618b3966f352350cf916a6ae0d343f32"
>  
>  inherit autotools pkgconfig systemd
>  
> 

-- 
Cheers,

Alejandro
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org

Re: [OE-core] [PATCH] wic: Switch to using --use-uuid by default

[Ed Bartosh]

On Wed, Jul 26, 2017 at 10:29:09AM +0300, Ed Bartosh wrote:
> On Tue, Jul 25, 2017 at 03:58:22PM -0400, Tom Rini wrote:
> > The most portable way to specifiy a root device in a disk image that we
> > create is to use PARTUUID rather than /dev/sda2.  As background, both
> > GPT and MBR tables provide valid UUID values for each partition and the
> > Linux Kernel contains the logic to parse this value.  With this change
> > we can now boot the default disk images when used as any valid block
> > device that the included kernel uses.  This for example means that
> > VirtualBox can be used to run vmdk without changes as it uses IDE for
> > the virtual disk controller.
> >
> I suspect oe-selftest needs to be adjusted for this change.
> 
> Please run "oe-selftest -r wic" to ensure all tests pass.
>
I've just run all wic tests in the branch with your changes - everything
works, no breakages.

Acked-by: Ed Bartosh 

> > Cc: Ed Bartosh 
> > Cc: Matt Porter 
> > Signed-off-by: Tom Rini 
> > ---
> >  scripts/lib/wic/canned-wks/common.wks.inc   | 2 +-
> >  scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg | 8 
> >  scripts/lib/wic/canned-wks/qemux86-directdisk.wks   | 2 +-
> >  3 files changed, 6 insertions(+), 6 deletions(-)
> > 
> > diff --git a/scripts/lib/wic/canned-wks/common.wks.inc 
> > b/scripts/lib/wic/canned-wks/common.wks.inc
> > index 5cf2fd1..89880b4 100644
> > --- a/scripts/lib/wic/canned-wks/common.wks.inc
> > +++ b/scripts/lib/wic/canned-wks/common.wks.inc
> > @@ -1,3 +1,3 @@
> >  # This file is included into 3 canned wks files from this directory
> >  part /boot --source bootimg-pcbios --ondisk sda --label boot --active 
> > --align 1024
> > -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 
> > 1024
> > +part / --source rootfs --use-uuid --fstype=ext4 --label platform --align 
> > 1024
> > diff --git a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg 
> > b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
> > index d5a07d2..c58e74a 100644
> > --- a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
> > +++ b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
> > @@ -12,16 +12,16 @@ DEFAULT Graphics console boot
> >  
> >  LABEL Graphics console boot
> >  KERNEL /vmlinuz
> > -APPEND label=boot root=/dev/sda2 rootwait
> > +APPEND label=boot rootwait
> >  
> >  LABEL Serial console boot
> >  KERNEL /vmlinuz
> > -APPEND label=boot root=/dev/sda2 rootwait console=ttyS0,115200
> > +APPEND label=boot rootwait console=ttyS0,115200
> >  
> >  LABEL Graphics console install
> >  KERNEL /vmlinuz
> > -APPEND label=install root=/dev/sda2 rootwait
> > +APPEND label=install rootwait
> >  
> >  LABEL Serial console install
> >  KERNEL /vmlinuz
> > -APPEND label=install root=/dev/sda2 rootwait console=ttyS0,115200
> > +APPEND label=install rootwait console=ttyS0,115200
> > diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks 
> > b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
> > index db30bbc..1f8466a 100644
> > --- a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
> > +++ b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
> > @@ -4,5 +4,5 @@
> >  
> >  include common.wks.inc
> >  
> > -bootloader  --timeout=0  --append="vga=0 uvesafb.mode_option=640x480-32 
> > root=/dev/sda2 rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 
> > oprofile.timer=1 rootfstype=ext4 "
> > +bootloader  --timeout=0  --append="vga=0 uvesafb.mode_option=640x480-32 rw 
> > mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 
> > rootfstype=ext4 "
> >  
> > -- 
> > 2.1.4
> > 
> 
> -- 
> --
> Regards,
> Ed
> -- 
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
--
Regards,
Ed
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/2] oeqa/{core, selftest}: Add support to validate if a specified test case isn't found

[Aníbal Limón]

If some test module/case is specified to run and isn't found the OEQA
framework didn't notice it, so complete the implementation using
modules_required and validate for the test case prescense.

Raise an exception when the test module/case required isn't found.

[YOCTO #11645]

Signed-off-by: Aníbal Limón 
---
 meta/lib/oeqa/core/context.py |  9 +++--
 meta/lib/oeqa/core/exception.py   |  3 +++
 meta/lib/oeqa/core/loader.py  | 26 ++
 meta/lib/oeqa/selftest/context.py |  8 ++--
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/core/context.py b/meta/lib/oeqa/core/context.py
index 2d543ffa31a..422e2899921 100644
--- a/meta/lib/oeqa/core/context.py
+++ b/meta/lib/oeqa/core/context.py
@@ -10,7 +10,7 @@ import collections
 
 from oeqa.core.loader import OETestLoader
 from oeqa.core.runner import OETestRunner
-from oeqa.core.exception import OEQAMissingManifest
+from oeqa.core.exception import OEQAMissingManifest, OEQATestNotFound
 
 class OETestContext(object):
 loaderClass = OETestLoader
@@ -139,6 +139,7 @@ class OETestContextExecutor(object):
 
 if args.run_tests:
 self.tc_kwargs['load']['modules'] = args.run_tests
+self.tc_kwargs['load']['modules_required'] = args.run_tests
 else:
 self.tc_kwargs['load']['modules'] = []
 
@@ -151,7 +152,11 @@ class OETestContextExecutor(object):
 self._process_args(logger, args)
 
 self.tc = self._context_class(**self.tc_kwargs['init'])
-self.tc.loadTests(self.module_paths, **self.tc_kwargs['load'])
+try:
+self.tc.loadTests(self.module_paths, **self.tc_kwargs['load'])
+except OEQATestNotFound as ex:
+logger.error(ex)
+sys.exit(1)
 
 if args.list_tests:
 rc = self.tc.listTests(args.list_tests, **self.tc_kwargs['run'])
diff --git a/meta/lib/oeqa/core/exception.py b/meta/lib/oeqa/core/exception.py
index a07961adc31..732f2efdeb6 100644
--- a/meta/lib/oeqa/core/exception.py
+++ b/meta/lib/oeqa/core/exception.py
@@ -18,3 +18,6 @@ class OEQAMissingManifest(OEQAException):
 
 class OEQAPreRun(OEQAException):
 pass
+
+class OEQATestNotFound(OEQAException):
+pass
diff --git a/meta/lib/oeqa/core/loader.py b/meta/lib/oeqa/core/loader.py
index e4c218b57f0..332086a13d7 100644
--- a/meta/lib/oeqa/core/loader.py
+++ b/meta/lib/oeqa/core/loader.py
@@ -9,6 +9,7 @@ import inspect
 from oeqa.core.utils.path import findFile
 from oeqa.core.utils.test import getSuiteModules, getCaseID
 
+from oeqa.core.exception import OEQATestNotFound
 from oeqa.core.case import OETestCase
 from oeqa.core.decorator import decoratorClasses, OETestDecorator, \
 OETestFilter, OETestDiscover
@@ -277,6 +278,28 @@ class OETestLoader(unittest.TestLoader):
 
 return self.suiteClass(suite)
 
+def _required_modules_validation(self):
+"""
+Search in Test context registry if a required
+test is found, raise an exception when not found.
+"""
+
+for module in self.modules_required:
+found = False
+
+# The module name is splitted to only compare the
+# first part of a test case id.
+comp_len = len(module.split('.'))
+for case in self.tc._registry['cases']:
+case_comp = '.'.join(case.split('.')[0:comp_len])
+if module == case_comp:
+found = True
+break
+
+if not found:
+raise OEQATestNotFound("Not found %s in loaded test cases" % \
+module)
+
 def discover(self):
 big_suite = self.suiteClass()
 for path in self.module_paths:
@@ -291,6 +314,9 @@ class OETestLoader(unittest.TestLoader):
 for clss in discover_classes:
 cases = clss.discover(self.tc._registry)
 
+if self.modules_required:
+self._required_modules_validation()
+
 return self.suiteClass(cases) if cases else big_suite
 
 def _filterModule(self, module):
diff --git a/meta/lib/oeqa/selftest/context.py 
b/meta/lib/oeqa/selftest/context.py
index 4575a0537fb..990c761f298 100644
--- a/meta/lib/oeqa/selftest/context.py
+++ b/meta/lib/oeqa/selftest/context.py
@@ -13,7 +13,7 @@ from random import choice
 import oeqa
 
 from oeqa.core.context import OETestContext, OETestContextExecutor
-from oeqa.core.exception import OEQAPreRun
+from oeqa.core.exception import OEQAPreRun, OEQATestNotFound
 
 from oeqa.utils.commands import runCmd, get_bb_vars, get_test_layer
 
@@ -196,7 +196,11 @@ class OESelftestTestContextExecutor(OETestContextExecutor):
 self.tc_kwargs['init']['td']['BBPATH'].split(':'))
 
 self.tc = self._context_class(**self.tc_kwargs['init'])
-self.tc.loadTests(self.module_paths, **self.tc_kwargs['load'])
+try:
+self.tc.loadTests(self.module_paths, 

[OE-core] [PATCH 2/2] oeqa/core/runner: OEStreamLogger don't buffer test execution writes

[Aníbal Limón]

Since OEQA framework uses Python logging functionality to report test
results there is a class that wraps PyUnit writes into logging commands
(OEStreamLogger), so don't buffer the actual test execution to have
insight of what is currently executing.

This fix will change a little the test output format adding an '\n'
previous the test result, for example:

From:

test_nonmatching_checksum (lic_checksum.LicenseTests) ... ok

To:

test_nonmatching_checksum (lic_checksum.LicenseTests)
 ... ok

This is because the new line added by the PyUnit StreamLogger because
currently we don't have a manner to identify when a test execution
starts at report level (write msg).

[YOCTO #11827]

Signed-off-by: Aníbal Limón 
---
 meta/lib/oeqa/core/runner.py | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/lib/oeqa/core/runner.py b/meta/lib/oeqa/core/runner.py
index 8a55c24c788..f6539e60b6b 100644
--- a/meta/lib/oeqa/core/runner.py
+++ b/meta/lib/oeqa/core/runner.py
@@ -25,10 +25,14 @@ class OEStreamLogger(object):
 
 def write(self, msg):
 if len(msg) > 1 and msg[0] != '\n':
-self.buffer += msg
-else:
-self.logger.log(logging.INFO, self.buffer.rstrip("\n"))
-self.buffer = ""
+if '...' in msg:
+self.buffer += msg
+elif self.buffer:
+self.buffer += msg
+self.logger.log(logging.INFO, self.buffer)
+self.buffer = ""
+else:
+self.logger.log(logging.INFO, msg)
 
 def flush(self):
 for handler in self.logger.handlers:
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] android-tools related warnings in (updated) eSDK

[Andrea Galbusera]

When upgrading an eSDK (via devtool sdk-update) from a project that
includes meta-oe in the stack, some files listed in android-tools' SRC_URI,
most notably patches and systemd service file got removed from the eSDK
copy of metadata during the update, leading bitbake to start warning about
not being able to verify the checksum for those files (those files are
indeed missing as shown below).

Here is the log from bitbake:

WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools-native
SRC_URI entry remove-selinux-android.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools-native
SRC_URI entry use-capability.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools-native
SRC_URI entry use-local-socket.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools-native
SRC_URI entry preserve-ownership.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools-native
SRC_URI entry mkbootimg-Add-dt-parameter-to-specify-DT-image.patch: file
could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools-native
SRC_URI entry remove-bionic-android.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools-native
SRC_URI entry define-shell-command.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools-native
SRC_URI entry implicit-declaration-function-strlcat-strlcopy.patch: file
could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools-native
SRC_URI entry fix-big-endian-build.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools-native
SRC_URI entry android-tools-adbd.service: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools
SRC_URI entry remove-selinux-android.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools
SRC_URI entry use-capability.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools
SRC_URI entry use-local-socket.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools
SRC_URI entry preserve-ownership.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools
SRC_URI entry mkbootimg-Add-dt-parameter-to-specify-DT-image.patch: file
could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools
SRC_URI entry remove-bionic-android.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools
SRC_URI entry define-shell-command.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools
SRC_URI entry implicit-declaration-function-strlcat-strlcopy.patch: file
could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools
SRC_URI entry fix-big-endian-build.patch: file could not be found
WARNING:
/home/vagrant/poky_sdk/layers/meta-oe/recipes-devtools/android-tools/
android-tools_5.1.1.r37.bb: Unable to get checksum for android-tools
SRC_URI entry android-tools-adbd.service: file could not be found

...and the metadata files:

$ find poky_sdk/layers/meta-oe/recipes-devtools/android-tools/android-tools

[OE-core] [PATCH] harfbuzz: upgrade to 1.4.7

[Maxin B. John]

1.4.6 -> 1.4.7

Signed-off-by: Maxin B. John 
---
 .../harfbuzz/{harfbuzz_1.4.6.bb => harfbuzz_1.4.7.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/harfbuzz/{harfbuzz_1.4.6.bb => harfbuzz_1.4.7.bb} 
(88%)

diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.4.6.bb 
b/meta/recipes-graphics/harfbuzz/harfbuzz_1.4.7.bb
similarity index 88%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_1.4.6.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_1.4.7.bb
index 0d73465..be1dd64 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.4.6.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.4.7.bb
@@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 cairo fontconfig freetype"
 
 SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2;
 
-SRC_URI[md5sum] = "e246c08a3bac98e31e731b2a1bf97edf"
-SRC_URI[sha256sum] = 
"21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293"
+SRC_URI[md5sum] = "37096205bc43e2977de0f1cf2706940a"
+SRC_URI[sha256sum] = 
"b85f6627425d54f32118308e053b939c63a388de9bf455b3830f68cad406bc6d"
 
 inherit autotools pkgconfig lib_package gtk-doc
 
-- 
2.4.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/2] image.bbclass: Correct chaining compression support

[Tom Rini]

On Wed, Jul 26, 2017 at 10:16:39AM +0300, Ed Bartosh wrote:
> On Fri, Jul 21, 2017 at 06:06:33PM -0400, Tom Rini wrote:
> > When chaining of compression/conversion types was added, we had a new
> > way to handle doing things like "ext4.bz2.sha256sum" or
> > "ext2.gz.u-boot".  However, because the U-Boot image class isn't
> > included normally, it wasn't properly converted at the time.  After the
> > support was added the "clean" argument that the .u-boot code uses no
> > longer functions.  The fix for this inadvertently broke chaining
> > compression/conversion.  First, correct the u-boot conversion code.
> > 
> > Fixes: 46bc438374de ("image.bbclass: do exact match for rootfs type")
> > Cc: Zhenhua Luo 
> > Cc: Richard Purdie 
> > Cc: Patrick Ohly 
> > Signed-off-by: Tom Rini 
> 
> Acked-by: Ed Bartosh 
> 
> Any chance to have this functionality covered by oe-selftest?
> That would help to ensure it will not be broken again.

Give me a pointer to adding stuff to oe-selftest and I'll take a look.
Thanks!

-- 
Tom


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 3/3] libcap: fix build with gperf 3.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin 
---
 .../files/0001-Fix-build-with-gperf-3.1.patch  | 30 ++
 meta/recipes-support/libcap/libcap_2.25.bb |  3 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 
meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch

diff --git 
a/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch 
b/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch
new file mode 100644
index 000..ae03cf74223
--- /dev/null
+++ b/meta/recipes-support/libcap/files/0001-Fix-build-with-gperf-3.1.patch
@@ -0,0 +1,30 @@
+From 2b350b270bd6a5cf0c89414cd16e51d8dec5c874 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin 
+Date: Wed, 26 Jul 2017 13:37:49 +0300
+Subject: [PATCH] Fix build with gperf 3.1
+
+The generated gperf file refers to size_t which needs to be
+provided by stddef.h include.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin 
+---
+ libcap/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcap/Makefile b/libcap/Makefile
+index d189777..32c5a69 100644
+--- a/libcap/Makefile
 b/libcap/Makefile
+@@ -22,7 +22,7 @@ all: $(MINLIBNAME) $(STALIBNAME) libcap.pc
+ 
+ ifeq ($(BUILD_GPERF),yes)
+ USE_GPERF_OUTPUT = $(GPERF_OUTPUT)
+-INCLUDE_GPERF_OUTPUT = -include $(GPERF_OUTPUT)
++INCLUDE_GPERF_OUTPUT = -include stddef.h -include $(GPERF_OUTPUT)
+ endif
+ 
+ libcap.pc: libcap.pc.in
+-- 
+2.13.2
+
diff --git a/meta/recipes-support/libcap/libcap_2.25.bb 
b/meta/recipes-support/libcap/libcap_2.25.bb
index 5c2765f343a..d619a2eb4cc 100644
--- a/meta/recipes-support/libcap/libcap_2.25.bb
+++ b/meta/recipes-support/libcap/libcap_2.25.bb
@@ -9,7 +9,8 @@ DEPENDS = "hostperl-runtime-native gperf-native"
 
 SRC_URI = 
"${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz
 \

file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \
-"
+   file://0001-Fix-build-with-gperf-3.1.patch \
+   "
 SRC_URI[md5sum] = "b839e5d46c2ad33fc8aa2ceb5f77"
 SRC_URI[sha256sum] = 
"693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162"
 
-- 
2.13.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/3] eudev: update to 3.2.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-core/udev/{eudev_3.2.1.bb => eudev_3.2.2.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-core/udev/{eudev_3.2.1.bb => eudev_3.2.2.bb} (96%)

diff --git a/meta/recipes-core/udev/eudev_3.2.1.bb 
b/meta/recipes-core/udev/eudev_3.2.2.bb
similarity index 96%
rename from meta/recipes-core/udev/eudev_3.2.1.bb
rename to meta/recipes-core/udev/eudev_3.2.2.bb
index bdfb5441ade..78fef2c1441 100644
--- a/meta/recipes-core/udev/eudev_3.2.1.bb
+++ b/meta/recipes-core/udev/eudev_3.2.2.bb
@@ -23,8 +23,8 @@ SRC_URI = 
"https://github.com/gentoo/${BPN}/archive/v${PV}.tar.gz;downloadfilena
 "
 UPSTREAM_CHECK_URI = "https://github.com/gentoo/eudev/releases;
 
-SRC_URI[md5sum] = "a2aae16bc432eac0e71c1267c384e295"
-SRC_URI[sha256sum] = 
"88f530c1540750e6daa91b5eaeebf88e761e6f0c86515c1c28eedfd871f027c6"
+SRC_URI[md5sum] = "1a0faad3a88ade3475e8c0ddef78e30b"
+SRC_URI[sha256sum] = 
"80628191448886846ab9cc0e2af6782358a0afb81d5b4f8cd9d982d2626cca31"
 
 inherit autotools update-rc.d qemu pkgconfig
 
-- 
2.13.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 1/3] gperf: upgrade to 3.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin 
---
 meta/recipes-extended/gperf/gperf_3.0.4.bb | 5 -
 meta/recipes-extended/gperf/gperf_3.1.bb   | 5 +
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 meta/recipes-extended/gperf/gperf_3.0.4.bb
 create mode 100644 meta/recipes-extended/gperf/gperf_3.1.bb

diff --git a/meta/recipes-extended/gperf/gperf_3.0.4.bb 
b/meta/recipes-extended/gperf/gperf_3.0.4.bb
deleted file mode 100644
index 64003fc0bb7..000
--- a/meta/recipes-extended/gperf/gperf_3.0.4.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require gperf.inc
-
-
-SRC_URI[md5sum] = "c1f1db32fb6598d6a93e6e88796a8632"
-SRC_URI[sha256sum] = 
"767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e"
diff --git a/meta/recipes-extended/gperf/gperf_3.1.bb 
b/meta/recipes-extended/gperf/gperf_3.1.bb
new file mode 100644
index 000..942820b91d5
--- /dev/null
+++ b/meta/recipes-extended/gperf/gperf_3.1.bb
@@ -0,0 +1,5 @@
+require gperf.inc
+
+
+SRC_URI[md5sum] = "9e251c0a618ad0824b51117d5d9db87e"
+SRC_URI[sha256sum] = 
"588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2"
-- 
2.13.2

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for gnome-themes-standard: Fix packages so dev-pkgs image generation works

[Patchwork]

== Series Details ==

Series: gnome-themes-standard: Fix packages so dev-pkgs image generation works
Revision: 1
URL   : https://patchwork.openembedded.org/series/7948/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 51b3ee2986)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for opkg: 0.3.4 -> 0.3.5 (rev2)

[Patchwork]

== Series Details ==

Series: opkg: 0.3.4 -> 0.3.5 (rev2)
Revision: 2
URL   : https://patchwork.openembedded.org/series/7945/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 51b3ee2986)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] oe-selftest: wic: change mkfs.btrfs options

[Ed Bartosh]

test_mkfs_extraopts test case fails on ab with error caused
by using -K --mixed options:
 output: extent-tree.c:2696: btrfs_reserve_extent: BUG_ON `ret` triggered, 
value -28

For this test case it's not important to use particular options,
so changing options to anything less influential is OK.

Changed extra options for mkfs.btrfs to '--quiet' to fix the failure.

Signed-off-by: Ed Bartosh 
---
 meta/lib/oeqa/selftest/cases/wic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/wic.py 
b/meta/lib/oeqa/selftest/cases/wic.py
index ceb92ae..daa4067 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -926,7 +926,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 
--exclude-path bin/ --r
 with NamedTemporaryFile("w", suffix=".wks") as wks:
 wks.writelines(
 ['part ext2   --fstype ext2 --source rootfs 
--mkfs-extraopts "-D -F -i 8192"\n',
- 'part btrfs  --fstype btrfs--source rootfs --size 40M 
--mkfs-extraopts "--mixed -K"\n',
+ 'part btrfs  --fstype btrfs--source rootfs --size 40M 
--mkfs-extraopts "--quiet"\n',
  'part squash --fstype squashfs --source rootfs 
--mkfs-extraopts "-no-sparse -b 4096"\n',
  'part emptyvfat   --fstype vfat   --size 1M --mkfs-extraopts 
"-S 1024 -s 64"\n',
  'part emptymsdos  --fstype msdos  --size 1M --mkfs-extraopts 
"-S 1024 -s 64"\n',
-- 
2.1.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v2] opkg: 0.3.4 -> 0.3.5

[Huang Qiyu]

1) Update opkg from 0.3.4 to 0.3.5.
2) Delete status-conffile.patch, since it is integrated upstream

Signed-off-by: Huang Qiyu 
---
 .../opkg/opkg/status-conffile.patch| 69 --
 .../opkg/{opkg_0.3.4.bb => opkg_0.3.5.bb}  |  5 +-
 2 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg/opkg/status-conffile.patch
 rename meta/recipes-devtools/opkg/{opkg_0.3.4.bb => opkg_0.3.5.bb} (93%)

diff --git a/meta/recipes-devtools/opkg/opkg/status-conffile.patch 
b/meta/recipes-devtools/opkg/opkg/status-conffile.patch
deleted file mode 100644
index 6fc405b..000
--- a/meta/recipes-devtools/opkg/opkg/status-conffile.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton 
-
-From 086d5083dfe0102368cb7c8ce89b0c06b64ca773 Mon Sep 17 00:00:00 2001
-From: Ross Burton 
-Date: Tue, 10 Jan 2017 15:24:59 +
-Subject: [PATCH 1/2] opkg_cmd: only look at conffile status if we're going to
- output it
-
-The loop to compare the recorded conffile hash with their hash on disk is
-outputted at level INFO but the loop was executed at level NOTICE and higher.
-
-This means that if a conffile had been deleted the status operation would
-produce error messages for output it isn't displaying.
-
-Signed-off-by: Ross Burton 

- libopkg/opkg_cmd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
-index ba57c6a..37416fd 100644
 a/libopkg/opkg_cmd.c
-+++ b/libopkg/opkg_cmd.c
-@@ -638,7 +638,7 @@ static int opkg_info_status_cmd(int argc, char **argv, int 
installed_only)
- 
- pkg_formatted_info(stdout, pkg);
- 
--if (opkg_config->verbosity >= NOTICE) {
-+if (opkg_config->verbosity >= INFO) {
- conffile_list_elt_t *iter;
- for (iter = nv_pair_list_first(>conffiles); iter;
-  iter = nv_pair_list_next(>conffiles, iter)) {
--- 
-2.8.1
-
-From 225e30e0f9fa7cfeaa3f89e2713e5147ab371def Mon Sep 17 00:00:00 2001
-From: Ross Burton 
-Date: Tue, 10 Jan 2017 15:28:47 +
-Subject: [PATCH 2/2] conffile: gracefully handle deleted conffiles in
- conffile_has_been_modified
-
-Handle conffiles that don't exist gracefully so that instead of showing an 
error
-message from file_md5sum_alloc() a notice that the file has been deleted is
-shown instead.
-
-Signed-off-by: Ross Burton 

- libopkg/conffile.c | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/libopkg/conffile.c b/libopkg/conffile.c
-index b2f2469..7b4b87b 100644
 a/libopkg/conffile.c
-+++ b/libopkg/conffile.c
-@@ -51,6 +51,11 @@ int conffile_has_been_modified(conffile_t * conffile)
- }
- 
- root_filename = root_filename_alloc(filename);
-+if (!file_exists(root_filename)) {
-+opkg_msg(INFO, "Conffile %s deleted\n", conffile->name);
-+free(root_filename);
-+return 1;
-+}
- 
- md5sum = file_md5sum_alloc(root_filename);
- 
--- 
-2.8.1
diff --git a/meta/recipes-devtools/opkg/opkg_0.3.4.bb 
b/meta/recipes-devtools/opkg/opkg_0.3.5.bb
similarity index 93%
rename from meta/recipes-devtools/opkg/opkg_0.3.4.bb
rename to meta/recipes-devtools/opkg/opkg_0.3.5.bb
index a21fde1..3e511b6 100644
--- a/meta/recipes-devtools/opkg/opkg_0.3.4.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.3.5.bb
@@ -15,11 +15,10 @@ SRC_URI = 
"http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
file://opkg-configure.service \
file://opkg.conf \

file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
-   file://status-conffile.patch \
 "
 
-SRC_URI[md5sum] = "6c52a065499056a196e0b45a27e392de"
-SRC_URI[sha256sum] = 
"750b900b53b62a9b280b601a196f02da81091eda2f3478c509512aa5a1ec93be"
+SRC_URI[md5sum] = "d202d09ea0932943071b842626cab13c"
+SRC_URI[sha256sum] = 
"734bc21dea11262113fa86b928d09812618b3966f352350cf916a6ae0d343f32"
 
 inherit autotools pkgconfig systemd
 
-- 
2.7.4



-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] gnome-themes-standard: Fix packages so dev-pkgs image generation works

[Richard Purdie]

A change from Ross removed the dual -dev/-dbg packages but this broke
deb/ipk rootfs constuction due to a dependency on a package which doesn't
exist (for dev-pkgs images). Remove the dependency on that package to
allow images to build.

Signed-off-by: Richard Purdie 
---
 meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb 
b/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb
index e49ad5e..3b41328 100644
--- a/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb
+++ b/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb
@@ -38,3 +38,6 @@ FILES_gnome-theme-adwaita = "${prefix}/share/themes/Adwaita \
 
 FILES_gnome-theme-adwaita-dark = "${prefix}/share/themes/Adwaita-dark"
 RDEPENDS_gnome-theme-adwaita-dark = "gnome-theme-adwaita"
+
+# gnome-themes-standard is empty and doesn't exist
+RDEPENDS_${PN}-dev = ""
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] ✗ patchtest: failure for opkg: 0.3.4 -> 0.3.5

[Patchwork]

== Series Details ==

Series: opkg: 0.3.4 -> 0.3.5
Revision: 1
URL   : https://patchwork.openembedded.org/series/7945/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue Series does not apply on top of target branch 
[test_series_merge_on_head] 
  Suggested fixRebase your series on top of targeted branch
  Targeted branch  master (currently at 98a2afeb3a)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] oeqa/buildperf: Add 'bitbake -m' on sync function to ensure bitbake is unloaded

[Joshua Lock]

On 25/07/2017 20:42, jose.perez.carra...@linux.intel.com wrote:

From: Jose Perez Carranza 

Add 'bitbake -m' to the sync method and ensure all process related to
bitbake are correctly unloaded before doing the different measurements.
Also add a call to sync funtion on Test4 before final measurment of
eSDK deploy dir disk usage.

Signed-off-by: Jose Perez Carranza 
---
  meta/lib/oeqa/buildperf/base.py   | 1 +
  meta/lib/oeqa/buildperf/test_basic.py | 2 ++
  2 files changed, 3 insertions(+)

diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py
index 6e62b279c1..7b2b4aa2a4 100644
--- a/meta/lib/oeqa/buildperf/base.py
+++ b/meta/lib/oeqa/buildperf/base.py
@@ -485,6 +485,7 @@ class BuildPerfTestCase(unittest.TestCase):
  @staticmethod
  def sync():
  """Sync and drop kernel caches"""
+runCmd2('bitbake -m', ignore_status=True)


Looks like the indentation is out here?


  log.debug("Syncing and dropping kernel caches""")
  KernelDropCaches.drop()
  os.sync()
diff --git a/meta/lib/oeqa/buildperf/test_basic.py 
b/meta/lib/oeqa/buildperf/test_basic.py
index a9e4a5b731..0033ee4815 100644
--- a/meta/lib/oeqa/buildperf/test_basic.py
+++ b/meta/lib/oeqa/buildperf/test_basic.py
@@ -121,5 +121,7 @@ class Test4(BuildPerfTestCase):
  self.sync()
  self.measure_cmd_resources([installer, '-y', '-d', deploy_dir],
 'deploy', 'eSDK deploy')
+#make sure bitbake is unloaded
+#self.sync()


Is this sync() call supposed to be commented out?

Thanks,

Joshua


  self.measure_disk_usage(deploy_dir, 'deploy_dir', 'deploy dir',
  apparent_size=True)


--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [meta-oe][krogoth][morty][PATCH] systemd: Disable DefaultDependencies for sysv scripts on rcS runlevel

[Nikolay Merinov]

Incorrect tags, please ignore this mail

On 7/26/17 1:05 PM, Nikolay Merinov wrote:

systemd-sysv-generator translate sysv services on rcS runlevel to
services that starts before sysinit.target. This behavour conflict
with default dependency on same tartget.

String that define "DefaultDependency=no" was lost from patch for
sysv generator during porting patches to systemd 229 in commit
64ab17b707dc431aaed880d6d8615971243f46f8.

Current commit returns changes required for services that work on
rcS runlevel.

Signed-off-by: Nikolay Merinov 
---
  ...nerator-add-support-for-executing-scripts-und.patch | 18 ++
  1 file changed, 14 insertions(+), 4 deletions(-)

diff --git 
a/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
 
b/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
index ac67f65685..5736f57814 100644
--- 
a/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
+++ 
b/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
@@ -57,7 +57,17 @@ index b5925a4..ea06d6a 100644
   } SysvStub;
   
   static void free_sysvstub(SysvStub *s) {

-@@ -711,17 +717,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) 
{
+@@ -194,6 +198,9 @@ static int generate_unit_file(SysvStub *s) {
+ if (s->description)
+ fprintf(f, "Description=%s\n", s->description);
+
++if (!s->default_dependencies)
++fprintf(f, "DefaultDependencies=no\n");
++
+ STRV_FOREACH(p, s->before)
+ fprintf(f, "Before=%s\n", *p);
+ STRV_FOREACH(p, s->after)
+@@ -711,17 +720,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) 
{
   if (s->has_lsb && other->has_lsb)
   continue;
   
@@ -95,7 +105,7 @@ index b5925a4..ea06d6a 100644
   
   /* FIXME: Maybe we should compare the name here lexicographically? */

   }
-@@ -788,6 +808,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap 
*all_services) {
+@@ -788,6 +811,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap 
*all_services) {
   return log_oom();
   
   service->sysv_start_priority = -1;

@@ -104,7 +114,7 @@ index b5925a4..ea06d6a 100644
   service->name = name;
   service->path = fpath;
   name = fpath = NULL;
-@@ -871,9 +893,11 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
+@@ -871,9 +896,11 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
   
   if (de->d_name[0] == 'S')  {
   
@@ -118,7 +128,7 @@ index b5925a4..ea06d6a 100644

   r = 
set_ensure_allocated(_services[i], NULL);
   if (r < 0) {
   log_oom();
-@@ -887,7 +911,8 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
+@@ -887,7 +914,8 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
   }
   
   } else if (de->d_name[0] == 'K' &&


--

Nikolay Merinov
Team Leader
n.meri...@inango-systems.com
T +7 343 298 0147 C +7 912 229 2564
inango.com Inango on LinkedIn 

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [meta-oe][krogoth][morty][PATCH] systemd: Disable DefaultDependencies for sysv scripts on rcS runlevel

[Nikolay Merinov]

systemd-sysv-generator translate sysv services on rcS runlevel to
services that starts before sysinit.target. This behavour conflict
with default dependency on same tartget.

String that define "DefaultDependency=no" was lost from patch for
sysv generator during porting patches to systemd 229 in commit
64ab17b707dc431aaed880d6d8615971243f46f8.

Current commit returns changes required for services that work on
rcS runlevel.

Signed-off-by: Nikolay Merinov 
---
 ...nerator-add-support-for-executing-scripts-und.patch | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git 
a/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
 
b/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
index ac67f65685..5736f57814 100644
--- 
a/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
+++ 
b/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
@@ -57,7 +57,17 @@ index b5925a4..ea06d6a 100644
  } SysvStub;
  
  static void free_sysvstub(SysvStub *s) {
-@@ -711,17 +717,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) 
{
+@@ -194,6 +198,9 @@ static int generate_unit_file(SysvStub *s) {
+ if (s->description)
+ fprintf(f, "Description=%s\n", s->description);
+ 
++if (!s->default_dependencies)
++fprintf(f, "DefaultDependencies=no\n");
++
+ STRV_FOREACH(p, s->before)
+ fprintf(f, "Before=%s\n", *p);
+ STRV_FOREACH(p, s->after)
+@@ -711,17 +720,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) 
{
  if (s->has_lsb && other->has_lsb)
  continue;
  
@@ -95,7 +105,7 @@ index b5925a4..ea06d6a 100644
  
  /* FIXME: Maybe we should compare the name here 
lexicographically? */
  }
-@@ -788,6 +808,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap 
*all_services) {
+@@ -788,6 +811,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap 
*all_services) {
  return log_oom();
  
  service->sysv_start_priority = -1;
@@ -104,7 +114,7 @@ index b5925a4..ea06d6a 100644
  service->name = name;
  service->path = fpath;
  name = fpath = NULL;
-@@ -871,9 +893,11 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
+@@ -871,9 +896,11 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
  
  if (de->d_name[0] == 'S')  {
  
@@ -118,7 +128,7 @@ index b5925a4..ea06d6a 100644
  r = 
set_ensure_allocated(_services[i], NULL);
  if (r < 0) {
  log_oom();
-@@ -887,7 +911,8 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
+@@ -887,7 +914,8 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
  }
  
  } else if (de->d_name[0] == 'K' &&
-- 
2.13.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [krogoth][morty][PATCH] systemd: Disable DefaultDependencies for sysv scripts on rcS runlevel

[Nikolay Merinov]

systemd-sysv-generator translate sysv services on rcS runlevel to
services that starts before sysinit.target. This behavour conflict
with default dependency on same tartget.

String that define "DefaultDependency=no" was lost from patch for
sysv generator during porting patches to systemd 229 in commit
64ab17b707dc431aaed880d6d8615971243f46f8.

Current commit returns changes required for services that work on
rcS runlevel.

Signed-off-by: Nikolay Merinov 
---
 ...nerator-add-support-for-executing-scripts-und.patch | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git 
a/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
 
b/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
index ac67f65685..5736f57814 100644
--- 
a/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
+++ 
b/meta/recipes-core/systemd/systemd/0013-sysv-generator-add-support-for-executing-scripts-und.patch
@@ -57,7 +57,17 @@ index b5925a4..ea06d6a 100644
  } SysvStub;
  
  static void free_sysvstub(SysvStub *s) {
-@@ -711,17 +717,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) 
{
+@@ -194,6 +198,9 @@ static int generate_unit_file(SysvStub *s) {
+ if (s->description)
+ fprintf(f, "Description=%s\n", s->description);
+ 
++if (!s->default_dependencies)
++fprintf(f, "DefaultDependencies=no\n");
++
+ STRV_FOREACH(p, s->before)
+ fprintf(f, "Before=%s\n", *p);
+ STRV_FOREACH(p, s->after)
+@@ -711,17 +720,31 @@ static int fix_order(SysvStub *s, Hashmap *all_services) 
{
  if (s->has_lsb && other->has_lsb)
  continue;
  
@@ -95,7 +105,7 @@ index b5925a4..ea06d6a 100644
  
  /* FIXME: Maybe we should compare the name here 
lexicographically? */
  }
-@@ -788,6 +808,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap 
*all_services) {
+@@ -788,6 +811,8 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap 
*all_services) {
  return log_oom();
  
  service->sysv_start_priority = -1;
@@ -104,7 +114,7 @@ index b5925a4..ea06d6a 100644
  service->name = name;
  service->path = fpath;
  name = fpath = NULL;
-@@ -871,9 +893,11 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
+@@ -871,9 +896,11 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
  
  if (de->d_name[0] == 'S')  {
  
@@ -118,7 +128,7 @@ index b5925a4..ea06d6a 100644
  r = 
set_ensure_allocated(_services[i], NULL);
  if (r < 0) {
  log_oom();
-@@ -887,7 +911,8 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
+@@ -887,7 +914,8 @@ static int set_dependencies_from_rcnd(const LookupPaths 
*lp, Hashmap *all_servic
  }
  
  } else if (de->d_name[0] == 'K' &&
-- 
2.13.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] opkg: 0.3.4 -> 0.3.5

[Huang Qiyu]

1) Update opkg from 0.3.4 to 0.3.5.
2) Delete status-conffile.patch, since it is integrated upstream

Signed-off-by: Huang Qiyu 
---
 .../opkg/opkg/status-conffile.patch| 69 --
 .../opkg/{opkg_0.3.4.bb => opkg_0.3.5.bb}  |  5 +-
 2 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 meta/recipes-devtools/opkg/opkg/status-conffile.patch
 rename meta/recipes-devtools/opkg/{opkg_0.3.4.bb => opkg_0.3.5.bb} (93%)

diff --git a/meta/recipes-devtools/opkg/opkg/status-conffile.patch 
b/meta/recipes-devtools/opkg/opkg/status-conffile.patch
deleted file mode 100644
index 6fc405b..000
--- a/meta/recipes-devtools/opkg/opkg/status-conffile.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton 
-
-From 086d5083dfe0102368cb7c8ce89b0c06b64ca773 Mon Sep 17 00:00:00 2001
-From: Ross Burton 
-Date: Tue, 10 Jan 2017 15:24:59 +
-Subject: [PATCH 1/2] opkg_cmd: only look at conffile status if we're going to
- output it
-
-The loop to compare the recorded conffile hash with their hash on disk is
-outputted at level INFO but the loop was executed at level NOTICE and higher.
-
-This means that if a conffile had been deleted the status operation would
-produce error messages for output it isn't displaying.
-
-Signed-off-by: Ross Burton 

- libopkg/opkg_cmd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libopkg/opkg_cmd.c b/libopkg/opkg_cmd.c
-index ba57c6a..37416fd 100644
 a/libopkg/opkg_cmd.c
-+++ b/libopkg/opkg_cmd.c
-@@ -638,7 +638,7 @@ static int opkg_info_status_cmd(int argc, char **argv, int 
installed_only)
- 
- pkg_formatted_info(stdout, pkg);
- 
--if (opkg_config->verbosity >= NOTICE) {
-+if (opkg_config->verbosity >= INFO) {
- conffile_list_elt_t *iter;
- for (iter = nv_pair_list_first(>conffiles); iter;
-  iter = nv_pair_list_next(>conffiles, iter)) {
--- 
-2.8.1
-
-From 225e30e0f9fa7cfeaa3f89e2713e5147ab371def Mon Sep 17 00:00:00 2001
-From: Ross Burton 
-Date: Tue, 10 Jan 2017 15:28:47 +
-Subject: [PATCH 2/2] conffile: gracefully handle deleted conffiles in
- conffile_has_been_modified
-
-Handle conffiles that don't exist gracefully so that instead of showing an 
error
-message from file_md5sum_alloc() a notice that the file has been deleted is
-shown instead.
-
-Signed-off-by: Ross Burton 

- libopkg/conffile.c | 5 +
- 1 file changed, 5 insertions(+)
-
-diff --git a/libopkg/conffile.c b/libopkg/conffile.c
-index b2f2469..7b4b87b 100644
 a/libopkg/conffile.c
-+++ b/libopkg/conffile.c
-@@ -51,6 +51,11 @@ int conffile_has_been_modified(conffile_t * conffile)
- }
- 
- root_filename = root_filename_alloc(filename);
-+if (!file_exists(root_filename)) {
-+opkg_msg(INFO, "Conffile %s deleted\n", conffile->name);
-+free(root_filename);
-+return 1;
-+}
- 
- md5sum = file_md5sum_alloc(root_filename);
- 
--- 
-2.8.1
diff --git a/meta/recipes-devtools/opkg/opkg_0.3.4.bb 
b/meta/recipes-devtools/opkg/opkg_0.3.5.bb
similarity index 93%
rename from meta/recipes-devtools/opkg/opkg_0.3.4.bb
rename to meta/recipes-devtools/opkg/opkg_0.3.5.bb
index a21fde1..3e511b6 100644
--- a/meta/recipes-devtools/opkg/opkg_0.3.4.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.3.5.bb
@@ -15,11 +15,10 @@ SRC_URI = 
"http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz
file://opkg-configure.service \
file://opkg.conf \

file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
-   file://status-conffile.patch \
 "
 
-SRC_URI[md5sum] = "6c52a065499056a196e0b45a27e392de"
-SRC_URI[sha256sum] = 
"750b900b53b62a9b280b601a196f02da81091eda2f3478c509512aa5a1ec93be"
+SRC_URI[md5sum] = "d202d09ea0932943071b842626cab13c"
+SRC_URI[sha256sum] = 
"734bc21dea11262113fa86b928d09812618b3966f352350cf916a6ae0d343f32"
 
 inherit autotools pkgconfig systemd
 
-- 
2.7.4



-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] wic: Switch to using --use-uuid by default

[Ed Bartosh]

On Tue, Jul 25, 2017 at 03:58:22PM -0400, Tom Rini wrote:
> The most portable way to specifiy a root device in a disk image that we
> create is to use PARTUUID rather than /dev/sda2.  As background, both
> GPT and MBR tables provide valid UUID values for each partition and the
> Linux Kernel contains the logic to parse this value.  With this change
> we can now boot the default disk images when used as any valid block
> device that the included kernel uses.  This for example means that
> VirtualBox can be used to run vmdk without changes as it uses IDE for
> the virtual disk controller.
>
I suspect oe-selftest needs to be adjusted for this change.

Please run "oe-selftest -r wic" to ensure all tests pass.

> Cc: Ed Bartosh 
> Cc: Matt Porter 
> Signed-off-by: Tom Rini 
> ---
>  scripts/lib/wic/canned-wks/common.wks.inc   | 2 +-
>  scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg | 8 
>  scripts/lib/wic/canned-wks/qemux86-directdisk.wks   | 2 +-
>  3 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/scripts/lib/wic/canned-wks/common.wks.inc 
> b/scripts/lib/wic/canned-wks/common.wks.inc
> index 5cf2fd1..89880b4 100644
> --- a/scripts/lib/wic/canned-wks/common.wks.inc
> +++ b/scripts/lib/wic/canned-wks/common.wks.inc
> @@ -1,3 +1,3 @@
>  # This file is included into 3 canned wks files from this directory
>  part /boot --source bootimg-pcbios --ondisk sda --label boot --active 
> --align 1024
> -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 
> 1024
> +part / --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024
> diff --git a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg 
> b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
> index d5a07d2..c58e74a 100644
> --- a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
> +++ b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg
> @@ -12,16 +12,16 @@ DEFAULT Graphics console boot
>  
>  LABEL Graphics console boot
>  KERNEL /vmlinuz
> -APPEND label=boot root=/dev/sda2 rootwait
> +APPEND label=boot rootwait
>  
>  LABEL Serial console boot
>  KERNEL /vmlinuz
> -APPEND label=boot root=/dev/sda2 rootwait console=ttyS0,115200
> +APPEND label=boot rootwait console=ttyS0,115200
>  
>  LABEL Graphics console install
>  KERNEL /vmlinuz
> -APPEND label=install root=/dev/sda2 rootwait
> +APPEND label=install rootwait
>  
>  LABEL Serial console install
>  KERNEL /vmlinuz
> -APPEND label=install root=/dev/sda2 rootwait console=ttyS0,115200
> +APPEND label=install rootwait console=ttyS0,115200
> diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks 
> b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
> index db30bbc..1f8466a 100644
> --- a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
> +++ b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks
> @@ -4,5 +4,5 @@
>  
>  include common.wks.inc
>  
> -bootloader  --timeout=0  --append="vga=0 uvesafb.mode_option=640x480-32 
> root=/dev/sda2 rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 
> oprofile.timer=1 rootfstype=ext4 "
> +bootloader  --timeout=0  --append="vga=0 uvesafb.mode_option=640x480-32 rw 
> mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 
> rootfstype=ext4 "
>  
> -- 
> 2.1.4
> 

-- 
--
Regards,
Ed
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] image: Convert vmdk/vdi/qcow2 to strict CONVERSION_CMD types

[Ed Bartosh]

On Tue, Jul 25, 2017 at 03:58:16PM -0400, Tom Rini wrote:
> The vmdk/vdi/qcow2 IMAGE_FSTYPEs predate wic.  As such, they provide
> some similar underlying functionality in order to produce a "disk" image
> that in turn can be converted into different formats that various
> hypervisor types work with.  They do not however provide the ability for
> other disk image types to be converted into these same output types.
> Furthermore, they are less flexible than what wic does provide.  This
> drops the old style vmdk/vdi/qcow2 types and re-introduces them under
> the CONVERSION_CMD framework.  The equivalent of vmdk is now wic.vmdk
> and so forth for the other types.
> 
> Signed-off-by: Tom Rini 
> ---
> This depends on my previous series to correct chaining compression
> support.  I had attempted to keep the vmdk/vdi/qcow2 IMAGE_FSTYPES for
> compatibility sake using IMAGE_TYPEDEP_vmdk = "wic" and introducing an
> oe_qemuimg function to run to do the conversion.  This was working, but
> I could not get it to have the symlinks created automatically.  At this
> timeI think it makes most sense to not hide that the underlying disk
> content has changed at least slightly from the old vmdk type to the new
> type and that we can simply handle this change in documentation.  As
> such, if there's agreement about dropping the types I'll include some
> documentation changes in the next version.
> 

Great work! Thank you!

Acked-by: Ed Bartosh 

How about adding couple of test cases to oe-selftest to test these
conversion types? You can see some examples in wic testing suite
in meta/lib/oeqa/selftest/cases/wic.py

>  meta/classes/image-vm.bbclass  | 171 
> -
>  meta/classes/image.bbclass |   3 -
>  meta/classes/image_types.bbclass   |  12 +-
>  .../images/build-appliance-image_15.0.0.bb |   6 +-
>  4 files changed, 10 insertions(+), 182 deletions(-)
>  delete mode 100644 meta/classes/image-vm.bbclass
> 
> diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass
> deleted file mode 100644
> index b52df9f..000
> --- a/meta/classes/image-vm.bbclass
> +++ /dev/null
> @@ -1,171 +0,0 @@
> -# image-vm.bbclass
> -# (loosly based off image-live.bbclass Copyright (C) 2004, Advanced Micro 
> Devices, Inc.)
> -#
> -# Create an image which can be placed directly onto a harddisk using dd and 
> then
> -# booted.
> -#
> -# This uses syslinux. extlinux would have been nice but required the ext2/3
> -# partition to be mounted. grub requires to run itself as part of the install
> -# process.
> -#
> -# The end result is a 512 boot sector populated with an MBR and partition 
> table
> -# followed by an msdos fat16 partition containing syslinux and a linux kernel
> -# completed by the ext2/3 rootfs.
> -#
> -# We have to push the msdos parition table size > 16MB so fat 16 is used as 
> parted
> -# won't touch fat12 partitions.
> -
> -inherit live-vm-common
> -
> -do_bootdirectdisk[depends] += "dosfstools-native:do_populate_sysroot \
> -   virtual/kernel:do_deploy \
> -   syslinux:do_populate_sysroot \
> -   syslinux-native:do_populate_sysroot \
> -   parted-native:do_populate_sysroot \
> -   mtools-native:do_populate_sysroot \
> -   ${PN}:do_image_${VM_ROOTFS_TYPE} \
> -   "
> -
> -IMAGE_TYPEDEP_vmdk = "${VM_ROOTFS_TYPE}"
> -IMAGE_TYPEDEP_vdi = "${VM_ROOTFS_TYPE}"
> -IMAGE_TYPEDEP_qcow2 = "${VM_ROOTFS_TYPE}"
> -IMAGE_TYPEDEP_hdddirect = "${VM_ROOTFS_TYPE}"
> -IMAGE_TYPES_MASKED += "vmdk vdi qcow2 hdddirect"
> -
> -VM_ROOTFS_TYPE ?= "ext4"
> -ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${VM_ROOTFS_TYPE}"
> -
> -# Used by bootloader
> -LABELS_VM ?= "boot"
> -ROOT_VM ?= "root=/dev/sda2"
> -# Using an initramfs is optional. Enable it by setting INITRD_IMAGE_VM.
> -INITRD_IMAGE_VM ?= ""
> -INITRD_VM ?= "${@'${IMGDEPLOYDIR}/${INITRD_IMAGE_VM}-${MACHINE}.cpio.gz' if 
> '${INITRD_IMAGE_VM}' else ''}"
> -do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE_VM}:do_image_complete' if 
> '${INITRD_IMAGE_VM}' else ''}"
> -
> -BOOTDD_VOLUME_ID   ?= "boot"
> -BOOTDD_EXTRA_SPACE ?= "16384"
> -
> -DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}"
> -DISK_SIGNATURE[vardepsexclude] = "DISK_SIGNATURE_GENERATED"
> -
> -build_boot_dd() {
> - HDDDIR="${S}/hdd/boot"
> - HDDIMG="${S}/hdd.image"
> - IMAGE=${IMGDEPLOYDIR}/${IMAGE_NAME}.hdddirect
> -
> - populate_kernel $HDDDIR
> -
> - if [ "${PCBIOS}" = "1" ]; then
> - syslinux_hddimg_populate $HDDDIR
> - fi
> - if [ "${EFI}" = "1" ]; then
> - efi_hddimg_populate $HDDDIR
> - fi
> -
> - BLOCKS=`du -bks $HDDDIR | cut -f 1`
> - BLOCKS=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}`
> -
> - # Remove it since mkdosfs would 

Re: [OE-core] [PATCH 1/2] image.bbclass: Correct chaining compression support

[Ed Bartosh]

On Fri, Jul 21, 2017 at 06:06:33PM -0400, Tom Rini wrote:
> When chaining of compression/conversion types was added, we had a new
> way to handle doing things like "ext4.bz2.sha256sum" or
> "ext2.gz.u-boot".  However, because the U-Boot image class isn't
> included normally, it wasn't properly converted at the time.  After the
> support was added the "clean" argument that the .u-boot code uses no
> longer functions.  The fix for this inadvertently broke chaining
> compression/conversion.  First, correct the u-boot conversion code.
> 
> Fixes: 46bc438374de ("image.bbclass: do exact match for rootfs type")
> Cc: Zhenhua Luo 
> Cc: Richard Purdie 
> Cc: Patrick Ohly 
> Signed-off-by: Tom Rini 

Acked-by: Ed Bartosh 

Any chance to have this functionality covered by oe-selftest?
That would help to ensure it will not be broken again.

> ---
> This change is fairly important and, imho, innocuous and should be
> populated to pyro/etc, once merged to master.  The next part of the
> series is clean-up and while with my U-Boot hat on, I would say should
> be pushed more widely, I am biased.
> ---
>  meta/classes/image.bbclass |  2 +-
>  meta/classes/image_types_uboot.bbclass | 13 +
>  2 files changed, 6 insertions(+), 9 deletions(-)
> 
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index de535ce6fcff..bd6a5b7b810a 100644
> --- a/meta/classes/image.bbclass
> +++ b/meta/classes/image.bbclass
> @@ -453,7 +453,7 @@ python () {
>  rm_tmp_images = set()
>  def gen_conversion_cmds(bt):
>  for ctype in ctypes:
> -if bt[bt.find('.') + 1:] == ctype:
> +if bt.endswith("." + ctype):
>  type = bt[0:-len(ctype) - 1]
>  if type.startswith("debugfs_"):
>  type = type[8:]
> diff --git a/meta/classes/image_types_uboot.bbclass 
> b/meta/classes/image_types_uboot.bbclass
> index 5dfa39287dab..8db436efb14b 100644
> --- a/meta/classes/image_types_uboot.bbclass
> +++ b/meta/classes/image_types_uboot.bbclass
> @@ -3,9 +3,6 @@ inherit image_types kernel-arch
>  oe_mkimage () {
>  mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C $2 -n ${IMAGE_NAME} \
>  -d ${IMGDEPLOYDIR}/$1 ${IMGDEPLOYDIR}/$1.u-boot
> -if [ x$3 = x"clean" ]; then
> -rm $1
> -fi
>  }
>  
>  CONVERSIONTYPES += "gz.u-boot bz2.u-boot lz4.u-boot lzma.u-boot lzo.u-boot 
> u-boot"
> @@ -14,19 +11,19 @@ CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native"
>  CONVERSION_CMD_u-boot  = "oe_mkimage ${IMAGE_NAME}.rootfs.${type} none"
>  
>  CONVERSION_DEPENDS_gz.u-boot = "u-boot-mkimage-native"
> -CONVERSION_CMD_gz.u-boot  = "${CONVERSION_CMD_gz}; oe_mkimage 
> ${IMAGE_NAME}.rootfs.${type}.gz gzip clean"
> +CONVERSION_CMD_gz.u-boot  = "${CONVERSION_CMD_gz}; oe_mkimage 
> ${IMAGE_NAME}.rootfs.${type}.gz gzip"
>  
>  CONVERSION_DEPENDS_bz2.u-boot = "u-boot-mkimage-native"
> -CONVERSION_CMD_bz2.u-boot  = "${CONVERSION_CMD_bz2}; oe_mkimage 
> ${IMAGE_NAME}.rootfs.${type}.bz2 bzip2 clean"
> +CONVERSION_CMD_bz2.u-boot  = "${CONVERSION_CMD_bz2}; oe_mkimage 
> ${IMAGE_NAME}.rootfs.${type}.bz2 bzip2"
>  
>  CONVERSION_DEPENDS_lz4.u-boot = "u-boot-mkimage-native"
> -CONVERSION_CMD_lz4.u-boot  = "${CONVERSION_CMD_lz4_legacy}; oe_mkimage 
> ${IMAGE_NAME}.rootfs.${type}.lz4 lz4 clean"
> +CONVERSION_CMD_lz4.u-boot  = "${CONVERSION_CMD_lz4_legacy}; oe_mkimage 
> ${IMAGE_NAME}.rootfs.${type}.lz4 lz4"
>  
>  CONVERSION_DEPENDS_lzma.u-boot = "u-boot-mkimage-native"
> -CONVERSION_CMD_lzma.u-boot  = "${CONVERSION_CMD_lzma}; oe_mkimage 
> ${IMAGE_NAME}.rootfs.${type}.lzma lzma clean"
> +CONVERSION_CMD_lzma.u-boot  = "${CONVERSION_CMD_lzma}; oe_mkimage 
> ${IMAGE_NAME}.rootfs.${type}.lzma lzma"
>  
>  CONVERSION_DEPENDS_lzo.u-boot = "u-boot-mkimage-native"
> -CONVERSION_CMD_lzo.u-boot  = "${CONVERSION_CMD_lzo}; oe_mkimage 
> ${IMAGE_NAME}.rootfs.${type}.lzo lzo clean"
> +CONVERSION_CMD_lzo.u-boot  = "${CONVERSION_CMD_lzo}; oe_mkimage 
> ${IMAGE_NAME}.rootfs.${type}.lzo lzo"
>  
>  IMAGE_TYPES += "ext2.u-boot ext2.gz.u-boot ext2.bz2.u-boot ext2.lzma.u-boot 
> ext3.gz.u-boot ext4.gz.u-boot cpio.gz.u-boot"
>  
> -- 
> 1.9.1
> 
> -- 
> ___
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

--
Regards,
Ed
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] kernel-devsrc: Remove .kernel-meta from package

[swee . aun . khor]

From: sweeaun 

[YOCTO #11730]

Include .kernel-meta directory in the prune list of the find to
prevent .kernel-meta directory included into installable package.

Signed-off-by: sweeaun 
---
 meta/recipes-kernel/linux/kernel-devsrc.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb 
b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 7004261..c1b5b77 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -46,7 +46,7 @@ do_install() {
 cd ${B}
 find . -type d -name '.git*' -prune -o -path '.debug' -prune -o -type 
f -print0 | cpio --null -pdlu $kerneldir
 cd ${S}
-find . -type d -name '.git*' -prune -o -type f -print0 | cpio --null 
-pdlu $kerneldir
+   find . -type d -name '.git*' -prune -o -type d -name '.kernel-meta' 
-prune -o -type f -print0 | cpio --null -pdlu $kerneldir
 
 # Explicitly set KBUILD_OUTPUT to ensure that the image directory is 
cleaned and not
 # The main build artifacts. We clean the directory to avoid QA errors 
on mismatched
-- 
2.7.4

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core