[OE-core] [PATCH] image.bbclass: don't emit redundant IMAGE_CMD_xxx functions

[Andre McCurdy]

IMAGE_CMD_xxx commands are always inlined within do_image_xxx.

When IMAGE_CMD_xxx is defined as a function (e.g. IMAGE_CMD_btrfs,
IMAGE_CMD_cpio, etc), a redundant copy of the function will be emitted
by default. Remove IMAGE_CMD_xxx 'func' flags to prevent that.

Signed-off-by: Andre McCurdy 
---

This has been tested and seems to work as expected, however I'm not
100% sure I fully understand the implications of localdata -vs- d
or realt -vs- t in this code, so please review before merging.

 meta/classes/image.bbclass | 4 
 1 file changed, 4 insertions(+)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index f471f1a..ca6dda4 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -388,6 +388,10 @@ python () {
 bb.fatal("No IMAGE_CMD defined for IMAGE_FSTYPES entry '%s' - 
possibly invalid type name or missing support class" % t)
 cmds.append(localdata.expand("\tcd ${DEPLOY_DIR_IMAGE}"))
 
+# Since a copy of IMAGE_CMD_xxx will be inlined within do_image_xxx,
+# prevent a redundant copy of IMAGE_CMD_xxx being emitted as a 
function.
+d.delVarFlag('IMAGE_CMD_' + realt, 'func')
+
 rm_tmp_images = set()
 def gen_conversion_cmds(bt):
 for ctype in ctypes:
-- 
1.9.1

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

[OE-core] [PATCH] linux-firmware: break out bnx2 mips firmware and WHENCE license

[Christopher Clark]

commit a19cfee10c1f1762da601125c17035cf7701ce91
Author: Christopher Clark 
Date:   Thu Apr 14 17:00:20 2016 -0700

linux-firmware: break out bnx2 mips firmware and WHENCE license

Break out the bnx2 mips firmware into an independent subpackage.

Since the bnx2 firmware license is contained in the common WHENCE file
also package that separately so that other firmware that is licensed
within that file may depend upon a standalone package containing it.

Signed-off-by: Christopher Clark 

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index a4e64d5..95a57d7 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -55,6 +55,7 @@ LICENSE = "\
 & Firmware-xc4000 \
 & Firmware-xc5000 \
 & Firmware-xc5000c \
+& WHENCE \
 "

 LIC_FILES_CHKSUM = "\
@@ -111,6 +112,7 @@ LIC_FILES_CHKSUM = "\
 file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \
 file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \
 file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \
+file://WHENCE;md5=2ec7cdcaf7b1f57b77665b4d77b76e50 \
 "

 # These are not common licenses, set NO_GENERIC_LICENSE for them
@@ -168,6 +170,7 @@ NO_GENERIC_LICENSE[Firmware-wl1251] = "LICENCE.wl1251"
 NO_GENERIC_LICENSE[Firmware-xc4000] = "LICENCE.xc4000"
 NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000"
 NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c"
+NO_GENERIC_LICENSE[WHENCE] = "WHENCE"

 SRCREV = "5f8ca0c1db6106a2d6d7e85eee778917ff03c3de"
 PE = "1"
@@ -227,6 +230,8 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
  ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \
  ${PN}-i915-license ${PN}-i915 \
  ${PN}-adsp-sst-license ${PN}-adsp-sst \
+ ${PN}-bnx2-mips \
+ ${PN}-whence-license \
  ${PN}-license \
  "

@@ -425,6 +430,19 @@ RDEPENDS_${PN}-bcm43340 += "${PN}-broadcom-license"
 RDEPENDS_${PN}-bcm4339 += "${PN}-broadcom-license"
 RDEPENDS_${PN}-bcm4354 += "${PN}-broadcom-license"

+# For Broadcom bnx2-mips
+#
+# which is a separate case to the other Broadcom firmwares since its
+# license is contained in the shared WHENCE file.
+
+LICENSE_${PN}-bnx2-mips = "WHENCE"
+LICENSE_${PN}-whence-license = "WHENCE"
+
+FILES_${PN}-bnx2-mips = "/lib/firmware/bnx2/bnx2-mips-09-6.2.1b.fw"
+FILES_${PN}-whence-license = "/lib/firmware/WHENCE"
+
+RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license"
+
 # For iwlwifi
 LICENSE_${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware"
 LICENSE_${PN}-iwlwifi-3160-7= "Firmware-iwlwifi_firmware"
@@ -543,11 +561,13 @@ LICENSE_${PN} = "\
 & Firmware-xc4000 \
 & Firmware-xc5000 \
 & Firmware-xc5000c \
+& WHENCE \
 "

 FILES_${PN}-license += "/lib/firmware/LICEN*"
 FILES_${PN} += "/lib/firmware/*"
 RDEPENDS_${PN} += "${PN}-license"
+RDEPENDS_${PN} += "${PN}-whence-license"

 # Make linux-firmware depend on all of the split-out packages.
 python populate_packages_prepend () {
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] devtool: sdk-update: reset git metadata on update

[Paul Eggleton]

Hi Stephano,

A few review comments below.

On Thu, 14 Apr 2016 11:15:41 Stephano Cetola wrote:
> Forgot to add in the .gitignore. It's in there now.

For future patches if you could mark them as "[PATCH v2]", "[PATCH v3]" etc 
that would be great. Additionally the commit message should be standalone - 
imagine you were reading it via "git log" in a year's time, things like the 
above don't really belong. If you do need to comment on the changes between 
versions then use a cover letter or alternatively edit the patch before 
sending and put the comments after the --- line.
 
> Replace git pull with fetch and reset. 

You ought to say why we're doing this here (i.e. to avoid the merge logic in 
the event that the layers repo in the published SDK we're updating to isn't 
fast-forward merge from the local repo).

> Also add gitignore and committer
> info during publish to avoid errors on update.
>
> [ YOCTO #9368 ]
> 
> Signed-off-by: Stephano Cetola 
> ---
>  scripts/lib/devtool/sdk.py | 11 +--
>  scripts/oe-publish-sdk |  4 ++--
>  2 files changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py
> index b1905f9..d666341 100644
> --- a/scripts/lib/devtool/sdk.py
> +++ b/scripts/lib/devtool/sdk.py
> @@ -17,6 +17,7 @@
> 
>  import os
>  import subprocess
> +from subprocess import check_output

We're already importing the entire subprocess module on the line above so you 
don't need this, just change the code to call subprocess.check_output() 
instead of just check_output().

>  import logging
>  import glob
>  import shutil
> @@ -186,9 +187,15 @@ def sdk_update(args, config, basepath, workspace):
>  return 0
>  # Update metadata
>  logger.debug("Updating metadata via git ...")
> -# Try using 'git pull', if failed, use 'git clone'
> +#Check for the status before doing a fetch and reset
>  if os.path.exists(os.path.join(basepath, 'layers/.git')):
> -ret = subprocess.call("git pull %s/layers/.git" %
> updateserver, shell=True, cwd=layers_dir) +out =
> check_output("git status --porcelain", shell=True, cwd=layers_dir) +   
> if not out:
> +  ret = subprocess.call("git fetch --all; git reset
> --hard", shell=True, cwd=layers_dir) +else:
> +  logger.error("Failed to update metadata as there have
> been changes made to it. Aborting."); + 
> logger.error("Changed files:\n%s" % out);
> +  return -1

Please use four spaces for indentation in python code like this.

Thanks,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] build-appliance-image: Load TUN at startup

[Juro Bystricky]

This patch addresses the issue of not being able to execute "runqemu"
in the Build Appliance.
The root cause of the problem was that TAP/TUN was not available,
although required by "runqemu". In addition, the recommended remedy

  $ sudo modprobe tun

would fail for two reasons: modprobe not in PATH (user builder),
and "iptables" located in /usr/sbin but expected in /sbin.

[YOCTO #9437]

Signed-off-by: Juro Bystricky 
---
 meta/recipes-core/images/build-appliance-image_14.0.0.bb | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/images/build-appliance-image_14.0.0.bb 
b/meta/recipes-core/images/build-appliance-image_14.0.0.bb
index eeb301d..07bd145 100644
--- a/meta/recipes-core/images/build-appliance-image_14.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_14.0.0.bb
@@ -21,7 +21,7 @@ IMAGE_FSTYPES = "vmdk"
 
 inherit core-image module-base
 
-SRCREV ?= "00c4c9bf0007b964dfa4559fe8fc8687f14cdec3"
+SRCREV ?= "5c8124df2efed4b8691239cd357cf69211b0c844"
 SRC_URI = "git://git.yoctoproject.org/poky \
file://Yocto_Build_Appliance.vmx \
file://Yocto_Build_Appliance.vmxf \
@@ -80,9 +80,13 @@ fakeroot do_populate_poky_src () {
# Assume we will need CDROM to install guest additions
mkdir -p ${IMAGE_ROOTFS}/media/cdrom
 
-   # Allow builder to use sudo to setup tap/tun
+   # Allow builder to use sudo
echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers
 
+   # Load tap/tun at startup
+   ln -sr ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables
+   echo "tun" >> ${IMAGE_ROOTFS}/etc/modules
+
# Use Clearlooks GTK+ theme
mkdir -p ${IMAGE_ROOTFS}/etc/gtk-2.0
echo 'gtk-theme-name = "Clearlooks"' > ${IMAGE_ROOTFS}/etc/gtk-2.0/gtkrc
-- 
1.9.1

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

[OE-core] [PATCH] default-providers.inc: set openssl PREFERRED_PROVIDER to openssl

[Andre McCurdy]

Although the oe-core openssl recipe is currently the only provider of
openssl, make the preference for using it explicit in anticipation of
a libressl recipe being added to meta-oe.

Signed-off-by: Andre McCurdy 
---
 meta/conf/distro/include/default-providers.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/conf/distro/include/default-providers.inc 
b/meta/conf/distro/include/default-providers.inc
index 5801b67..d5e8e42 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -53,3 +53,6 @@ PREFERRED_PROVIDER_bluez-hcidump ?= 
"${@bb.utils.contains('DISTRO_FEATURES','blu
 # Alternative is ltp-ddt in meta-oe: 
meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
 PREFERRED_PROVIDER_ltp ?= "ltp"
 PREFERRED_PROVIDER_getopt ?= "util-linux-getopt"
+PREFERRED_PROVIDER_openssl ?= "openssl"
+PREFERRED_PROVIDER_openssl-native ?= "openssl-native"
+PREFERRED_PROVIDER_nativesdk-openssl ?= "nativesdk-openssl"
-- 
1.9.1

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

Re: [OE-core] [PATCH] image_types: use compress framework to produce checksums for images

[Denys Dmytriyenko]

On Thu, Apr 14, 2016 at 05:31:56PM -0300, Otavio Salvador wrote:
> On Thu, Apr 14, 2016 at 5:12 PM, Denys Dmytriyenko  wrote:
> > On Thu, Apr 14, 2016 at 04:59:53PM -0300, Otavio Salvador wrote:
> >> On Thu, Apr 14, 2016 at 4:53 PM, Burton, Ross  
> >> wrote:
> >> >
> >> > On 10 April 2016 at 19:49, Denys Dmytriyenko  wrote:
> >> >>
> >> >> BTW, at least for md5sum (not sure about sha*), isn't the de-facto
> >> >> standard
> >> >> extension .md5 and not .md5sum? Can we change it?
> >> >
> >> >
> >> > Picking a random upstream (https://download.gnome.org/sources/glib/2.10/)
> >> > shows that GNOME used .md5sum until they migrated over to sha256sum, so 
> >> > I'm
> >> > not sure there's a de-facto standard as two equally reasonable options.
> >>
> >> Debian does as well, IIRC.
> >
> > Debian uses .dsc files for that...
> 
> For .iso files, for example, no.
> 
> See:
> 
> http://cdimage.debian.org/debian-cd/current/i386/iso-cd/

Nope, don't see it - all I see are .iso and .sign extensions...

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

Re: [OE-core] [PATCH] image_types: use compress framework to produce checksums for images

[Denys Dmytriyenko]

On Thu, Apr 14, 2016 at 08:53:29PM +0100, Burton, Ross wrote:
> On 10 April 2016 at 19:49, Denys Dmytriyenko  wrote:
> 
> > BTW, at least for md5sum (not sure about sha*), isn't the de-facto standard
> > extension .md5 and not .md5sum? Can we change it?
> 
> Picking a random upstream (https://download.gnome.org/sources/glib/2.10/)
> shows that GNOME used .md5sum until they migrated over to sha256sum, so I'm
> not sure there's a de-facto standard as two equally reasonable options.

Hmm, ok. I guess with the migration to sha256sum, it's becoming to provide 
multiple checksum files and I see more uses of .md5sum extension now. Never 
mind, I'll update my infrastructure from the old .md5 days... :)

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

[OE-core] [PATCH] zero out the rootfs_extra_space in initramfs images

[Stephano Cetola]

Setting IMAGE_ROOTFS_EXTRA_SPACE impacts the initramfs images, results
in an error about INITRAMFS_MAXSIZE.

Signed-off-by: Stephano Cetola 
---
 meta/recipes-core/images/core-image-minimal-initramfs.bb| 1 +
 meta/recipes-extended/images/core-image-testmaster-initramfs.bb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb 
b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index a26286e..8d7c0d2 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -17,5 +17,6 @@ IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
 inherit core-image
 
 IMAGE_ROOTFS_SIZE = "8192"
+IMAGE_ROOTFS_EXTRA_SPACE = "0"
 
 BAD_RECOMMENDATIONS += "busybox-syslog"
diff --git a/meta/recipes-extended/images/core-image-testmaster-initramfs.bb 
b/meta/recipes-extended/images/core-image-testmaster-initramfs.bb
index 563260d..ad1407c 100644
--- a/meta/recipes-extended/images/core-image-testmaster-initramfs.bb
+++ b/meta/recipes-extended/images/core-image-testmaster-initramfs.bb
@@ -16,4 +16,5 @@ IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
 inherit core-image
 
 IMAGE_ROOTFS_SIZE = "8192"
+IMAGE_ROOTFS_EXTRA_SPACE = "0"
 BAD_RECOMMENDATIONS += "busybox-syslog"
-- 
2.8.0

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

Re: [OE-core] [PATCH] image_types: use compress framework to produce checksums for images

[Otavio Salvador]

On Thu, Apr 14, 2016 at 5:12 PM, Denys Dmytriyenko  wrote:
> On Thu, Apr 14, 2016 at 04:59:53PM -0300, Otavio Salvador wrote:
>> On Thu, Apr 14, 2016 at 4:53 PM, Burton, Ross  wrote:
>> >
>> > On 10 April 2016 at 19:49, Denys Dmytriyenko  wrote:
>> >>
>> >> BTW, at least for md5sum (not sure about sha*), isn't the de-facto
>> >> standard
>> >> extension .md5 and not .md5sum? Can we change it?
>> >
>> >
>> > Picking a random upstream (https://download.gnome.org/sources/glib/2.10/)
>> > shows that GNOME used .md5sum until they migrated over to sha256sum, so I'm
>> > not sure there's a de-facto standard as two equally reasonable options.
>>
>> Debian does as well, IIRC.
>
> Debian uses .dsc files for that...

For .iso files, for example, no.

See:

http://cdimage.debian.org/debian-cd/current/i386/iso-cd/

-- 
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] image_types: use compress framework to produce checksums for images

[Denys Dmytriyenko]

On Thu, Apr 14, 2016 at 04:59:53PM -0300, Otavio Salvador wrote:
> On Thu, Apr 14, 2016 at 4:53 PM, Burton, Ross  wrote:
> >
> > On 10 April 2016 at 19:49, Denys Dmytriyenko  wrote:
> >>
> >> BTW, at least for md5sum (not sure about sha*), isn't the de-facto
> >> standard
> >> extension .md5 and not .md5sum? Can we change it?
> >
> >
> > Picking a random upstream (https://download.gnome.org/sources/glib/2.10/)
> > shows that GNOME used .md5sum until they migrated over to sha256sum, so I'm
> > not sure there's a de-facto standard as two equally reasonable options.
> 
> Debian does as well, IIRC.

Debian uses .dsc files for that...

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

Re: [OE-core] [PATCH] image_types: use compress framework to produce checksums for images

[Otavio Salvador]

On Thu, Apr 14, 2016 at 4:53 PM, Burton, Ross  wrote:
>
> On 10 April 2016 at 19:49, Denys Dmytriyenko  wrote:
>>
>> BTW, at least for md5sum (not sure about sha*), isn't the de-facto
>> standard
>> extension .md5 and not .md5sum? Can we change it?
>
>
> Picking a random upstream (https://download.gnome.org/sources/glib/2.10/)
> shows that GNOME used .md5sum until they migrated over to sha256sum, so I'm
> not sure there's a de-facto standard as two equally reasonable options.

Debian does as well, IIRC.

-- 
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] image_types: use compress framework to produce checksums for images

[Burton, Ross]

On 10 April 2016 at 19:49, Denys Dmytriyenko  wrote:

> BTW, at least for md5sum (not sure about sha*), isn't the de-facto standard
> extension .md5 and not .md5sum? Can we change it?
>

Picking a random upstream (https://download.gnome.org/sources/glib/2.10/)
shows that GNOME used .md5sum until they migrated over to sha256sum, so I'm
not sure there's a de-facto standard as two equally reasonable options.

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

Re: [OE-core] [PATCH] image_types: use compress framework to produce checksums for images

[Denys Dmytriyenko]

On Sun, Apr 10, 2016 at 02:49:53PM -0400, Denys Dmytriyenko wrote:
> On Thu, Mar 24, 2016 at 02:14:36PM -0700, Andre McCurdy wrote:
> > On Thu, Mar 24, 2016 at 1:45 PM, Alexander Kanevskiy  wrote:
> > > On Thu, Mar 24, 2016 at 10:32 PM, Andre McCurdy  
> > > wrote:
> > >>
> > >> On Thu, Mar 24, 2016 at 1:16 PM, Alexander D. Kanevskiy 
> > >> wrote:
> > >> > Existing compress framework for producing various compressed versions
> > >> > of images is powerfull enough to be extended for other uses, e.g. to
> > >> > convert types of images.
> > >> >
> > >> > It is possible to use it also to produce image checksums at the time
> > >> > of image generation. This commit adds support for all supported
> > >> > at the moment coreutils hashing algorithms: md5, sha1, sha224,
> > >> > sha256, sha384 and sha512
> > >> >
> > >> > Usage:
> > >> > IMAGE_FSTYPES_append = " hddimg.sha256sum"
> > >>
> > >> I guess a common requirement is for hashes of the compressed images,
> > >> not only the uncompressed image.
> > >
> > > you can easily chain them.
> > > " hddimg.sha256sum hddimg.xz hddimg.xz.sha256sum"
> > 
> > OK. Great. Didn't realise that was going to work!
> 
> Well, unless something has been changed/fixed recently (and I believe it was 
> Richard's do_rootfs fixes), it didn't use to work as easy as you'd expect and 
> it would break in do_rootfs, when trying to nest image types directly, hence 
> the implementations like these:
> 
> http://cgit.openembedded.org/openembedded-core/tree/meta/classes/image_types_uboot.bbclass
> http://arago-project.org/git/?p=meta-arago.git;a=blob;f=meta-arago-distro/classes/image_types_md5.bbclass;hb=HEAD
> 
> BTW, at least for md5sum (not sure about sha*), isn't the de-facto standard 
> extension .md5 and not .md5sum? Can we change it?

Ping? Any comments on the last part about the standard .md5 file extension?

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

[OE-core] [PATCH] devtool: sdk-update: reset git metadata on update

[Stephano Cetola]

Forgot to add in the .gitignore. It's in there now.

Replace git pull with fetch and reset. Also add gitignore and committer
info during publish to avoid errors on update.

[ YOCTO #9368 ]

Signed-off-by: Stephano Cetola 
---
 scripts/lib/devtool/sdk.py | 11 +--
 scripts/oe-publish-sdk |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py
index b1905f9..d666341 100644
--- a/scripts/lib/devtool/sdk.py
+++ b/scripts/lib/devtool/sdk.py
@@ -17,6 +17,7 @@
 
 import os
 import subprocess
+from subprocess import check_output
 import logging
 import glob
 import shutil
@@ -186,9 +187,15 @@ def sdk_update(args, config, basepath, workspace):
 return 0
 # Update metadata
 logger.debug("Updating metadata via git ...")
-# Try using 'git pull', if failed, use 'git clone'
+#Check for the status before doing a fetch and reset
 if os.path.exists(os.path.join(basepath, 'layers/.git')):
-ret = subprocess.call("git pull %s/layers/.git" % 
updateserver, shell=True, cwd=layers_dir)
+out = check_output("git status --porcelain", shell=True, 
cwd=layers_dir)
+if not out:
+  ret = subprocess.call("git fetch --all; git reset --hard", 
shell=True, cwd=layers_dir)
+else:
+  logger.error("Failed to update metadata as there have been 
changes made to it. Aborting.");
+  logger.error("Changed files:\n%s" % out);
+  return -1
 else:
 ret = -1
 if ret != 0:
diff --git a/scripts/oe-publish-sdk b/scripts/oe-publish-sdk
index e6cb7af..55872f2 100755
--- a/scripts/oe-publish-sdk
+++ b/scripts/oe-publish-sdk
@@ -114,9 +114,9 @@ def publish(args):
 
 # Setting up the git repo
 if not is_remote:
-cmd = 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; 
then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; fi; 
git add -A .; git commit -q -m "init repo" || true; git update-server-info' % 
(destination, destination)
+cmd = 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; 
then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; echo 
"*.pyc\n*.pyo" > .gitignore; fi; git add -A .; git config user.email 
"o...@oe.oe" && git config user.name "OE" && git commit -q -m "init repo" || 
true; git update-server-info' % (destination, destination)
 else:
-cmd = "ssh %s 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e 
.git ]; then git init .; mv .git/hooks/post-update.sample 
.git/hooks/post-update; fi; git add -A .; git commit -q -m \"init repo\" || 
true; git update-server-info'" % (host, destdir, destdir)
+cmd = "ssh %s 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e 
.git ]; then git init .; mv .git/hooks/post-update.sample 
.git/hooks/post-update; echo '*.pyc\n*.pyo' > .gitignore; fi; git add -A .; git 
config user.email 'o...@oe.oe' && git config user.name 'OE' && git commit -q -m 
\"init repo\" || true; git update-server-info'" % (host, destdir, destdir)
 ret = subprocess.call(cmd, shell=True)
 if ret == 0:
 logger.info('SDK published successfully')
-- 
2.8.0

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

[OE-core] [PATCH] devtool: sdk-update: reset git metadata on update

[Stephano Cetola]

Replace git pull with fetch and reset. Also add gitignore and committer
info during publish to avoid errors on update.

[ YOCTO #9368 ]

Signed-off-by: Stephano Cetola 
---
 scripts/lib/devtool/sdk.py | 11 +--
 scripts/oe-publish-sdk |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py
index b1905f9..d666341 100644
--- a/scripts/lib/devtool/sdk.py
+++ b/scripts/lib/devtool/sdk.py
@@ -17,6 +17,7 @@
 
 import os
 import subprocess
+from subprocess import check_output
 import logging
 import glob
 import shutil
@@ -186,9 +187,15 @@ def sdk_update(args, config, basepath, workspace):
 return 0
 # Update metadata
 logger.debug("Updating metadata via git ...")
-# Try using 'git pull', if failed, use 'git clone'
+#Check for the status before doing a fetch and reset
 if os.path.exists(os.path.join(basepath, 'layers/.git')):
-ret = subprocess.call("git pull %s/layers/.git" % 
updateserver, shell=True, cwd=layers_dir)
+out = check_output("git status --porcelain", shell=True, 
cwd=layers_dir)
+if not out:
+  ret = subprocess.call("git fetch --all; git reset --hard", 
shell=True, cwd=layers_dir)
+else:
+  logger.error("Failed to update metadata as there have been 
changes made to it. Aborting.");
+  logger.error("Changed files:\n%s" % out);
+  return -1
 else:
 ret = -1
 if ret != 0:
diff --git a/scripts/oe-publish-sdk b/scripts/oe-publish-sdk
index e6cb7af..33bca8d 100755
--- a/scripts/oe-publish-sdk
+++ b/scripts/oe-publish-sdk
@@ -114,9 +114,9 @@ def publish(args):
 
 # Setting up the git repo
 if not is_remote:
-cmd = 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; 
then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; fi; 
git add -A .; git commit -q -m "init repo" || true; git update-server-info' % 
(destination, destination)
+cmd = 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e .git ]; 
then git init .; mv .git/hooks/post-update.sample .git/hooks/post-update; fi; 
git add -A .; git config user.email "o...@oe.oe" && git config user.name "OE" 
&& git commit -q -m "init repo" || true; git update-server-info' % 
(destination, destination)
 else:
-cmd = "ssh %s 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e 
.git ]; then git init .; mv .git/hooks/post-update.sample 
.git/hooks/post-update; fi; git add -A .; git commit -q -m \"init repo\" || 
true; git update-server-info'" % (host, destdir, destdir)
+cmd = "ssh %s 'set -e; mkdir -p %s/layers; cd %s/layers; if [ ! -e 
.git ]; then git init .; mv .git/hooks/post-update.sample 
.git/hooks/post-update; fi; git add -A .; git config user.email 'o...@oe.oe' && 
git config user.name 'OE' && git commit -q -m \"init repo\" || true; git 
update-server-info'" % (host, destdir, destdir)
 ret = subprocess.call(cmd, shell=True)
 if ret == 0:
 logger.info('SDK published successfully')
-- 
2.8.0

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

Re: [OE-core] [PATCH 1/1] fs-perms.txt: fix ROOT_HOME's permission

[Burton, Ross]

On 14 April 2016 at 17:23, Dan McGregor  wrote:

> I believe you merged the wrong version of this patch.
>

I've updated mut with a revert/add of the revised patch.

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

Re: [OE-core] [PATCH 1/1] fs-perms.txt: fix ROOT_HOME's permission

[Dan McGregor]

Richard,

I believe you merged the wrong version of this patch.

Dan

On 7 April 2016 at 18:47, Robert Yang  wrote:
>
>
> On 04/07/2016 11:55 PM, Dan McGregor wrote:
>>
>> On 7 April 2016 at 07:46, Robert Yang  wrote:
>>>
>>>
>>>
>>> On 04/07/2016 09:30 PM, Dan McGregor wrote:


 On 7 April 2016 at 01:50, Robert Yang  wrote:
>
>
> It should be 0700 rather than 0755.
>
> Reported-by: Charles Chan 
> Signed-off-by: Robert Yang 
> ---
>meta/files/fs-perms.txt | 1 +
>1 file changed, 1 insertion(+)
>
> diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt
> index 109cbe5..1d74da7 100644
> --- a/meta/files/fs-perms.txt
> +++ b/meta/files/fs-perms.txt
> @@ -51,6 +51,7 @@ ${localstatedir}/lock link/run/lock
>${localstatedir}/tmp   linkvolatile/tmp
>
>/home  0755rootrootfalse - - -
> +${ROOT_HOME}   0700rootrootfalse - - -



 I'd like to see this in the section labelled "Special permissions from
 base-files" around line 58. I think that makes it more clear that this
 is a special permission setting.
>>>
>>>
>>>
>>> Thanks, updated in the repo:
>>>
>>>git://git.openembedded.org/openembedded-core-contrib rbt/home
>>>
>>>
>>> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/home
>>>
>>>
>>> commit ccc59f44f5fc6c6ccef6b0fed58b0d582c9ee32b
>>> Author: Robert Yang 
>>> Date:   Tue Apr 5 22:34:25 2016 -0700
>>>
>>>  fs-perms.txt: fix ROOT_HOME's permission
>>>
>>>  It should be 0700 rather than 0755.
>>>
>>>  Reported-by: Charles Chan 
>>>  Signed-off-by: Robert Yang 
>>>
>>> diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt
>>> index 109cbe5..6c1083c 100644
>>> --- a/meta/files/fs-perms.txt
>>> +++ b/meta/files/fs-perms.txt
>>> @@ -59,6 +59,7 @@ ${localstatedir}/local0755root
>>> root
>>> false - - -
>>>   # Set 1777
>>>   /tmp   01777   rootrootfalse - - -
>>>   ${localstatedir}/volatile/tmp  01777   rootrootfalse - - -
>>> +${ROOT_HOME}   0700rootrootfalse - - -
>>>
>>
>> Thanks, this is the right track, but this implies that ${ROOT_HOME}
>> should be mode 1777, how about:
>>
>> +
>> +# Set 700
>> +${ROOT_HOME}   0700rootrootfalse - - -
>
>
> Thanks, updated in the repo:
>
>   git://git.openembedded.org/openembedded-core-contrib rbt/home
>
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/home
>
>
> commit 5d0c64fd55edc957d8fb6340c9842bf8498a485d
> Author: Robert Yang 
> Date:   Tue Apr 5 22:34:25 2016 -0700
>
> fs-perms.txt: fix ROOT_HOME's permission
>
> It should be 0700 rather than 0755.
>
> Reported-by: Charles Chan 
> Signed-off-by: Robert Yang 
>
> diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt
> index 109cbe5..3d00e86 100644
> --- a/meta/files/fs-perms.txt
> +++ b/meta/files/fs-perms.txt
> @@ -60,6 +60,9 @@ ${localstatedir}/local0755rootroot
> false - - -
>  /tmp   01777   rootrootfalse - - -
>  ${localstatedir}/volatile/tmp  01777   rootrootfalse - - -
>
> +# Set 0700
> +${ROOT_HOME}   0700rootrootfalse - - -
> +
>
>  # Set 755-lsb
>  /srv   0755rootrootfalse - - -
>
>
> // Robert
>
>>
>>>   # Set 755-lsb
>>>   /srv   0755rootrootfalse - - -
>>>
>>>
>>> // Robert
>>>
>>>


>/srv   0755rootrootfalse - - -
>${prefix}/src  0755rootrootfalse - - -
>${localstatedir}/local 0755rootrootfalse - - -
> --
> 2.8.0
>
> --
> ___
> 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

Re: [OE-core] [PATCH] dhcp: Enable update-rc.d service

[Otavio Salvador]

On Thu, Apr 14, 2016 at 9:51 AM, Fabio Berton
 wrote:
> do_install_append function installs init scripts but to enable this
> service we need to inherit update-rc.d class and set INITSCRIPT name
> and params.
>
> Signed-off-by: Fabio Berton 

Acked-by: Otavio Salvador 

-- 
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] buildstats: Fix trackbacks for early task failures

[Richard Purdie]

If a failure occurs early in the task, its possible we can have a
TaskFailed before the TaskStarted event can be triggered. This in
turn causes another traceback as the directory buildstats writes 
files into doesn't exist.

Ensure the directory exists so we can see the original error.

Signed-off-by: Richard Purdie 

diff --git a/meta/classes/buildstats.bbclass b/meta/classes/buildstats.bbclass
index d381c93..ab72af5 100644
--- a/meta/classes/buildstats.bbclass
+++ b/meta/classes/buildstats.bbclass
@@ -195,6 +195,8 @@ python run_buildstats () {
 f.write("Uncompressed Rootfs size: %s" % rootfs_size)
 
 elif isinstance(e, bb.build.TaskFailed):
+# Can have a failure before TaskStarted so need to mkdir here too
+bb.utils.mkdirhier(taskdir)
 write_task_data("failed", os.path.join(taskdir, e.task), e, d)
 

 # Lets make things easier and tell people where the build failed in
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] oeqa/selftest/sstatetests: fix no-op sstate test

[Ross Burton]

The test to verify that certain classes when inherited were no-ops only passed
if the build already inherited buildhistory.

To ensure that the test works as expected, use INHERITS_remove to ensure that
the classes are not inherited in the base run.

Signed-off-by: Ross Burton 
---
 meta/lib/oeqa/selftest/sstatetests.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/lib/oeqa/selftest/sstatetests.py 
b/meta/lib/oeqa/selftest/sstatetests.py
index d41b1d3..acaf405 100644
--- a/meta/lib/oeqa/selftest/sstatetests.py
+++ b/meta/lib/oeqa/selftest/sstatetests.py
@@ -411,6 +411,7 @@ PARALLEL_MAKE = "-j 1"
 DL_DIR = "${TOPDIR}/download1"
 TIME = "11"
 DATE = "2016"
+INHERIT_remove = "buildstats-summary buildhistory"
 """)
 self.track_for_cleanup(topdir + "/tmp-sstatesamehash")
 bitbake("world meta-toolchain -S none")
-- 
2.8.0.rc3

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

[OE-core] [PATCH] default-providers: Update to use PREFERRED_RPROVIDER

[Richard Purdie]

Get rid of the very confusing PREFERRED_PROVIDER_bluez4 using the 
new/better PREFERRED_RPROVIDER syntax.

[YOCTO #5044]

Signed-off-by: Richard Purdie 

diff --git a/meta/conf/distro/include/default-providers.inc 
b/meta/conf/distro/include/default-providers.inc
index 5801b67..b2548e1 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -46,10 +46,8 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
 PREFERRED_PROVIDER_console-tools ?= "kbd"
 PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
 PREFERRED_PROVIDER_udev ?= 
"${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','eudev',d)}"
-# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO 
#5044 for details
-# on this rather strange entry.
-PREFERRED_PROVIDER_bluez4 ?= 
"${@bb.utils.contains('DISTRO_FEATURES','bluetooth 
bluez5','bluez5','bluez4',d)}"
-PREFERRED_PROVIDER_bluez-hcidump ?= 
"${@bb.utils.contains('DISTRO_FEATURES','bluetooth 
bluez5','bluez5','bluez-hcidump',d)}"
+PREFERRED_RPROVIDER_libasound-module-bluez ?= 
"${@bb.utils.contains('DISTRO_FEATURES','bluetooth 
bluez5','bluez5','bluez4',d)}"
+PREFERRED_RPROVIDER_bluez-hcidump ?= 
"${@bb.utils.contains('DISTRO_FEATURES','bluetooth 
bluez5','bluez5','bluez-hcidump',d)}"
 # Alternative is ltp-ddt in meta-oe: 
meta-oe/recipes-devtools/ltp-ddt/ltp-ddt_0.0.4.bb
 PREFERRED_PROVIDER_ltp ?= "ltp"
 PREFERRED_PROVIDER_getopt ?= "util-linux-getopt"


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

[OE-core] [PATCH 1/2] buildhistory: don't alter SDK creation stamps

[Ross Burton]

This class adds functions to the SDK creation hooks, so ensure that they're
ignored in task stamps.

Signed-off-by: Ross Burton 
---
 meta/classes/buildhistory.bbclass | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/classes/buildhistory.bbclass 
b/meta/classes/buildhistory.bbclass
index 0fa9b16..581d532 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -582,12 +582,16 @@ ROOTFS_POSTUNINSTALL_COMMAND += " 
buildhistory_list_installed_image ;\
 IMAGE_POSTPROCESS_COMMAND += " buildhistory_get_imageinfo ; "
 
 # We want these to be the last run so that we get called after complementary 
package installation
-POPULATE_SDK_POST_TARGET_COMMAND_append = " 
buildhistory_list_installed_sdk_target ;\
-
buildhistory_get_sdk_installed_target ; "
-POPULATE_SDK_POST_HOST_COMMAND_append = " buildhistory_list_installed_sdk_host 
;\
-  buildhistory_get_sdk_installed_host 
; "
+POPULATE_SDK_POST_TARGET_COMMAND_append = " 
buildhistory_list_installed_sdk_target;"
+POPULATE_SDK_POST_TARGET_COMMAND_append = " 
buildhistory_get_sdk_installed_target;"
+POPULATE_SDK_POST_TARGET_COMMAND[vardepvalueexclude] .= "| 
buildhistory_list_installed_sdk_target;| buildhistory_get_sdk_installed_target;"
+
+POPULATE_SDK_POST_HOST_COMMAND_append = " 
buildhistory_list_installed_sdk_host;"
+POPULATE_SDK_POST_HOST_COMMAND_append = " buildhistory_get_sdk_installed_host;"
+POPULATE_SDK_POST_HOST_COMMAND[vardepvalueexclude] .= "| 
buildhistory_list_installed_sdk_host;| buildhistory_get_sdk_installed_host;"
 
 SDK_POSTPROCESS_COMMAND_append = " buildhistory_get_sdkinfo ; 
buildhistory_get_extra_sdkinfo; "
+SDK_POSTPROCESS_COMMAND[vardepvalueexclude] .= "| buildhistory_get_sdkinfo ; 
buildhistory_get_extra_sdkinfo; "
 
 def buildhistory_get_build_id(d):
 if d.getVar('BB_WORKERCONTEXT', True) != '1':
-- 
2.8.0.rc3

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

Re: [OE-core] [master/krogoth][oe-core PATCH] meta/classes/qemu.bbclass: set -cpu of ppce5500/ppce6500 to e500mc

[Otavio Salvador]

On Thu, Apr 14, 2016 at 6:26 AM, Zhenhua Luo  wrote:
> The e5500 and e6500 cpu types are not supported by native qemu, set the value
> of -cpu to e500mc. Without this change, build will fail for packages which use
> qemuwrapper in compile phase due to the following error.
> | Unable to find CPU definition
>
> e.g. gobject-introspection
>
> Signed-off-by: Zhenhua Luo 

Acked-by: Otavio Salvador 

-- 
Otavio Salvador O.S. Systems
http://www.ossystems.com.brhttp://code.ossystems.com.br
Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCHv2 1/1] Revert "useradd.bbclass: remove user/group created by the package in clean* task"

[Richard Purdie]

On Thu, 2016-04-14 at 11:46 +, Peter Kjellerstedt wrote:
> Ok, this looks like a good start for me to continue working on.
> 
> What is the easiest way to execute the useradd selftest?

oe-selftest --run-tests useradd.Useradd.test_useradd

Cheers,

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

Re: [OE-core] [PATCHv2 1/1] Revert "useradd.bbclass: remove user/group created by the package in clean* task"

[Peter Kjellerstedt]

> -Original Message-
> From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org]
> Sent: den 14 april 2016 12:41
> To: Peter Kjellerstedt; Otavio Salvador
> Cc: OE Core (openembedded-core@lists.openembedded.org)
> Subject: Re: [OE-core] [PATCHv2 1/1] Revert "useradd.bbclass: remove
> user/group created by the package in clean* task"
> 
> On Wed, 2016-04-13 at 17:29 +0100, Richard Purdie wrote:
> > There is a comparatively neat way we could use pkgdata to track the
> > provider of a given user, specifically:
> >
> > http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/wip=5cd646ea185eaafaa341f26310f2eddc75766175
> >
> > The above is a quick patch I've just put together which illustrates
> > what could be done so that the user gets better warnings about
> > conflicting users. It needs cleaning up but thought it worth sharing
> > now as if might give some ideas.
> >
> > This is in keeping with how bitbake detects multiple providers of the
> > same thing.
> 
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/wip=a362e6da0eec1f7a7d4db19d47f16b1c729562ba
> 
> is an improved version.
> 
> > > Here I must show my lack of knowledge. How and where should I go
> > > about
> > > adding a regression test that verifies the support for that
> > > multiple
> > > recipes can add the same user/group? Since this does not test a
> > > specific recipe, but rather a part of the build framework, I do not
> > > know if, e.g., ptest is applicable (of which I have no experience
> > > either).
> >
> > oe-selftest would be the place to add something like this, see the
> >  /meta/lib/oeqa/selftest directory. We could add some test useradd
> > recipes to meta-selftest.
> 
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/wip=23134a7d837bc7985ba8e7069d405913c2055a04
> 
> is a really simplistic new selftest for useradd. It does however test
> the bug the original patch fixes. There are clearly a much wider range
> of things it could test, I just wanted to show this isn't hard.
> 
> Cheers,
> 
> Richard

Ok, this looks like a good start for me to continue working on.

What is the easiest way to execute the useradd selftest?

//Peter

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

[OE-core] [PATCH 0/1] Disable syslog for all shadow commands supported by useradd_base.bbclass

[Peter Kjellerstedt]

With the introduction of using userdel and groupdel when cleaning up a
recipe, I started getting messages in my system logs about the removal
of users and groups I know only exist in my recipes. It turned out
that the use of syslog had been disabled for useradd and groupadd when
building shadow-native, but never for the other commands supported by
useradd_base.bbclass. This commit rectifies this.

//Peter

The following changes since commit aab3c8d56dd6344b1e6cf38e610970bc68b2f624:

  linux-yocto: make aufs4 optional (2016-04-14 10:58:34 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib pkj/shadow_disable_syslog
  
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=pkj/shadow_disable_syslog

Peter Kjellerstedt (1):
  shadow: Disable syslog for more commands

 .../0001-Disable-use-of-syslog-for-sysroot.patch   | 124 +
 .../shadow/files/disable-syslog.patch  |  34 --
 meta/recipes-extended/shadow/shadow.inc|   4 +-
 3 files changed, 126 insertions(+), 36 deletions(-)
 create mode 100644 
meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
 delete mode 100644 meta/recipes-extended/shadow/files/disable-syslog.patch

-- 
2.1.0

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

[OE-core] [PATCH 1/1] shadow: Disable syslog for more commands

[Peter Kjellerstedt]

When building shadow-native, syslog was disabled for useradd and
groupadd. This disables it also for groupdel, groupmems, groupmod,
userdel and usermod (i.e., the use of syslog is now disabled for all
commands supported by useradd_base.bbclass).

Signed-off-by: Peter Kjellerstedt 
---
 .../0001-Disable-use-of-syslog-for-sysroot.patch   | 124 +
 .../shadow/files/disable-syslog.patch  |  34 --
 meta/recipes-extended/shadow/shadow.inc|   4 +-
 3 files changed, 126 insertions(+), 36 deletions(-)
 create mode 100644 
meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
 delete mode 100644 meta/recipes-extended/shadow/files/disable-syslog.patch

diff --git 
a/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
 
b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
new file mode 100644
index 000..a6f604b
--- /dev/null
+++ 
b/meta/recipes-extended/shadow/files/0001-Disable-use-of-syslog-for-sysroot.patch
@@ -0,0 +1,124 @@
+From 8cf3454d567f77233023be49a39a33e9f0836f89 Mon Sep 17 00:00:00 2001
+From: Scott Garman 
+Date: Thu, 14 Apr 2016 12:28:57 +0200
+Subject: [PATCH] Disable use of syslog for sysroot
+
+Disable use of syslog to prevent sysroot user and group additions from
+writing entries to the host's syslog. This patch should only be used
+with the shadow-native recipe.
+
+Upstream-Status: Inappropriate [disable feature]
+
+Signed-off-by: Scott Garman 
+Signed-off-by: Peter Kjellerstedt 
+---
+ src/groupadd.c  | 3 +++
+ src/groupdel.c  | 3 +++
+ src/groupmems.c | 3 +++
+ src/groupmod.c  | 3 +++
+ src/useradd.c   | 3 +++
+ src/userdel.c   | 3 +++
+ src/usermod.c   | 3 +++
+ 7 files changed, 21 insertions(+)
+
+diff --git a/src/groupadd.c b/src/groupadd.c
+index 39b4ec0..f716f57 100644
+--- a/src/groupadd.c
 b/src/groupadd.c
+@@ -34,6 +34,9 @@
+ 
+ #ident "$Id$"
+ 
++/* Disable use of syslog since we're running this command against a sysroot */
++#undef USE_SYSLOG
++
+ #include 
+ #include 
+ #include 
+diff --git a/src/groupdel.c b/src/groupdel.c
+index da99347..46a679c 100644
+--- a/src/groupdel.c
 b/src/groupdel.c
+@@ -34,6 +34,9 @@
+ 
+ #ident "$Id$"
+ 
++/* Disable use of syslog since we're running this command against a sysroot */
++#undef USE_SYSLOG
++
+ #include 
+ #include 
+ #include 
+diff --git a/src/groupmems.c b/src/groupmems.c
+index e4f107f..95cb073 100644
+--- a/src/groupmems.c
 b/src/groupmems.c
+@@ -32,6 +32,9 @@
+ 
+ #include 
+ 
++/* Disable use of syslog since we're running this command against a sysroot */
++#undef USE_SYSLOG
++
+ #include 
+ #include 
+ #include 
+diff --git a/src/groupmod.c b/src/groupmod.c
+index d9d3807..6229737 100644
+--- a/src/groupmod.c
 b/src/groupmod.c
+@@ -34,6 +34,9 @@
+ 
+ #ident "$Id$"
+ 
++/* Disable use of syslog since we're running this command against a sysroot */
++#undef USE_SYSLOG
++
+ #include 
+ #include 
+ #include 
+diff --git a/src/useradd.c b/src/useradd.c
+index e1ebf50..25679d8 100644
+--- a/src/useradd.c
 b/src/useradd.c
+@@ -34,6 +34,9 @@
+ 
+ #ident "$Id$"
+ 
++/* Disable use of syslog since we're running this command against a sysroot */
++#undef USE_SYSLOG
++
+ #include 
+ #include 
+ #include 
+diff --git a/src/userdel.c b/src/userdel.c
+index 19b12bc..a083929 100644
+--- a/src/userdel.c
 b/src/userdel.c
+@@ -34,6 +34,9 @@
+ 
+ #ident "$Id$"
+ 
++/* Disable use of syslog since we're running this command against a sysroot */
++#undef USE_SYSLOG
++
+ #include 
+ #include 
+ #include 
+diff --git a/src/usermod.c b/src/usermod.c
+index 685b50a..28e5cfc 100644
+--- a/src/usermod.c
 b/src/usermod.c
+@@ -34,6 +34,9 @@
+ 
+ #ident "$Id$"
+ 
++/* Disable use of syslog since we're running this command against a sysroot */
++#undef USE_SYSLOG
++
+ #include 
+ #include 
+ #include 
+-- 
+2.1.0
+
diff --git a/meta/recipes-extended/shadow/files/disable-syslog.patch 
b/meta/recipes-extended/shadow/files/disable-syslog.patch
deleted file mode 100644
index 1943fd6..000
--- a/meta/recipes-extended/shadow/files/disable-syslog.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Disable use of syslog to prevent sysroot user and group additions from
-writing entries to the host's syslog. This patch should only be used
-with the shadow-native recipe.
-
-Upstream-Status: Inappropriate [disable feature]
-
-Signed-off-by: Scott Garman 
-
-diff -urN shadow-4.1.4.3.orig//src/groupadd.c shadow-4.1.4.3/src/groupadd.c
 shadow-4.1.4.3.orig//src/groupadd.c2011-02-13 09:58:16.0 
-0800
-+++ shadow-4.1.4.3/src/groupadd.c  2012-04-05 10:05:59.440001758 -0700
-@@ -34,6 +34,9 @@
- 
- #ident "$Id: groupadd.c 3015 2009-06-05 22:16:56Z nekral-guest $"
- 
-+/* Disable use of syslog since we're running this command against a sysroot */
-+#undef USE_SYSLOG
-+
- #include 
- 

[OE-core] [master/krogoth][oe-core PATCH] meta/classes/qemu.bbclass: set -cpu of ppce5500/ppce6500 to e500mc

[Zhenhua Luo]

The e5500 and e6500 cpu types are not supported by native qemu, set the value
of -cpu to e500mc. Without this change, build will fail for packages which use
qemuwrapper in compile phase due to the following error.
| Unable to find CPU definition

e.g. gobject-introspection

Signed-off-by: Zhenhua Luo 
---
 meta/classes/qemu.bbclass | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index f3d3be8..75739db 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -52,8 +52,8 @@ QEMU_OPTIONS[vardeps] += "QEMU_EXTRAOPTIONS_${PACKAGE_ARCH}"
 
 QEMU_EXTRAOPTIONS_ppce500v2 = " -cpu e500v2"
 QEMU_EXTRAOPTIONS_ppce500mc = " -cpu e500mc"
-QEMU_EXTRAOPTIONS_ppce5500 = " -cpu e5500"
-QEMU_EXTRAOPTIONS_ppc64e5500 = " -cpu e5500"
-QEMU_EXTRAOPTIONS_ppce6500 = " -cpu e6500"
-QEMU_EXTRAOPTIONS_ppc64e6500 = " -cpu e6500"
+QEMU_EXTRAOPTIONS_ppce5500 = " -cpu e500mc"
+QEMU_EXTRAOPTIONS_ppc64e5500 = " -cpu e500mc"
+QEMU_EXTRAOPTIONS_ppce6500 = " -cpu e500mc"
+QEMU_EXTRAOPTIONS_ppc64e6500 = " -cpu e500mc"
 QEMU_EXTRAOPTIONS_ppc7400 = " -cpu 7400"
-- 
2.4.11

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

Re: [OE-core] [PATCHv2 1/1] Revert "useradd.bbclass: remove user/group created by the package in clean* task"

[Richard Purdie]

On Wed, 2016-04-13 at 17:29 +0100, Richard Purdie wrote:
> There is a comparatively neat way we could use pkgdata to track the
> provider of a given user, specifically:
> 
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/w
> ip
> =5cd646ea185eaafaa341f26310f2eddc75766175
> 
> The above is a quick patch I've just put together which illustrates
> what could be done so that the user gets better warnings about
> conflicting users. It needs cleaning up but thought it worth sharing
> now as if might give some ideas.
> 
> This is in keeping with how bitbake detects multiple providers of the
> same thing.

http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/wip
=a362e6da0eec1f7a7d4db19d47f16b1c729562ba

is an improved version.

> > Here I must show my lack of knowledge. How and where should I go
> > about 
> > adding a regression test that verifies the support for that
> > multiple 
> > recipes can add the same user/group? Since this does not test a 
> > specific recipe, but rather a part of the build framework, I do not
> > know if, e.g., ptest is applicable (of which I have no experience 
> > either).
> 
> oe-selftest would be the place to add something like this, see the
>  /meta/lib/oeqa/selftest directory. We could add some test useradd
> recipes to meta-selftest.

http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/wip
=23134a7d837bc7985ba8e7069d405913c2055a04

is a really simplistic new selftest for useradd. It does however test
the bug the original patch fixes. There are clearly a much wider range
of things it could test, I just wanted to show this isn't hard.

Cheers,

Richard



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

[OE-core] [PATCH 1/2] devtool: update-recipe: handle where SRC_URI is appended to with +=

[Paul Eggleton]

If a recipe sets SRC_URI and then appends more items to it with +=
(such as the current rpm recipe in OE-Core), the code in
patch_recipe_file() was failing with a traceback. Work around the
problem for now by dropping the existing lines if we understand the
operation, else just set the value outright at the end. This leaves
something to be desired as it either doesn't respect the existing
structure or leaves a mess but it's better than the current
breakage.

We'll need to come up with a better solution later. Part of the problem
is the existing code structure doesn't allow for patch_recipe_file() to
know what's being added or removed - it only knows the final value that
the caller wants set.

Fixes [YOCTO #9458].

Signed-off-by: Paul Eggleton 
---
 meta/lib/oe/recipeutils.py | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 5e0fda5..6c7adb5 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -235,9 +235,10 @@ def patch_recipe_file(fn, values, patch=False, relpath=''):
 outputvalue(k, newlines, rewindcomments=True)
 del remainingnames[k]
 # Now change this variable, if it needs to be changed
-if varname in existingnames:
-outputvalue(varname, newlines)
-del remainingnames[varname]
+if varname in existingnames and op in ['+=', '=', '=+']:
+if varname in remainingnames:
+outputvalue(varname, newlines)
+del remainingnames[varname]
 return None, None, 0, True
 else:
 if varname in values:
-- 
2.5.5

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

[OE-core] [PATCH 2/2] devtool: upgrade: handle recipes where source is not first entry in SRC_URI

[Paul Eggleton]

It is unusual but not impossible to find recipes whose first entry is
not the main source URL but instead some patch or other local file, for
example python-cryptography in meta-python (which sets SRC_URI before
inheriting pypi). There's nothing inherently wrong with this, and we
shouldn't assume that the first entry is the main source URL, so just
take the first non-local entry instead.

Signed-off-by: Paul Eggleton 
---
 scripts/lib/devtool/upgrade.py | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 680cbf1..a085f78 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -145,7 +145,15 @@ def _get_uri(rd):
 srcuris = rd.getVar('SRC_URI', True).split()
 if not len(srcuris):
 raise DevtoolError('SRC_URI not found on recipe')
-srcuri = srcuris[0] # it is assumed, URI is at first position
+# Get first non-local entry in SRC_URI - usually by convention it's
+# the first entry, but not always!
+srcuri = None
+for entry in srcuris:
+if not entry.startswith('file://'):
+srcuri = entry
+break
+if not srcuri:
+raise DevtoolError('Unable to find non-local entry in SRC_URI')
 srcrev = '${AUTOREV}'
 if '://' in srcuri:
 # Fetch a URL
-- 
2.5.5

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

[OE-core] [PATCH 0/2] A couple of fixes for devtool

[Paul Eggleton]

The following changes since commit 0e306a53c460302ec20192fc35930983781b7a2e:

  archiver: Improve debug output (2016-04-13 20:58:35 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/devtool16-oe
  
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/devtool16-oe

Paul Eggleton (2):
  devtool: update-recipe: handle where SRC_URI is appended to with +=
  devtool: upgrade: handle recipes where source is not first entry in
SRC_URI

 meta/lib/oe/recipeutils.py |  7 ---
 scripts/lib/devtool/upgrade.py | 10 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

-- 
2.5.5

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

Re: [OE-core] Warnings from autotools_copy_aclocals()

[Richard Purdie]

On Wed, 2016-04-13 at 16:58 -0700, Andre McCurdy wrote:
> Does anyone else see these type of warnings from
> autotools_copy_aclocals()? I don't remember exactly when they started
> (a few months ago at least, maybe more).
> 
>   WARNING: gmp-4.2.1-r0 do_configure:
> /.../build-dcx960-debug/tmp/sstate-control/manifest-dcx960-debug
> -glibc-initial.populate_sysroot
> not found
>   WARNING: gmp-4.2.1-r0 do_configure:
> /.../build-dcx960-debug/tmp/sstate-control/manifest-dcx960-debug
> -libgcc-initial.populate_sysroot
> not found

Yes, I also do have a rough idea of the cause.

They happen in builds from sstate where the system has decided that for
whatever reason, a given dependency isn't needed. The aclocal
dependency traversal code looks down the full dependency list and warns
when these things aren't present.

Examples of sstate's decisions would be skipping libgcc-initial when
libgcc is available, same for glibc-initial and glibc.

Somehow we need to reconcile the two views. sstate is clearly correct
or there would be failures. The question is how to make the aclocal
code have the same understanding (which will then limit the number of
aclocal macros copied in).

Cheers,

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