[OE-core] [PATCH 2/2] build-appliance-image: update version to 19.0.0
Updating recipe to reflect latest poky version and SRCREV points
to latest master HEAD revision.
Signed-off-by: Chang Rebecca Swee Fun
---
...{build-appliance-image_15.0.0.bb => build-appliance-image_19.0.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-core/images/{build-appliance-image_15.0.0.bb =>
build-appliance-image_19.0.0.bb} (99%)
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
b/meta/recipes-core/images/build-appliance-image_19.0.0.bb
similarity index 99%
rename from meta/recipes-core/images/build-appliance-image_15.0.0.bb
rename to meta/recipes-core/images/build-appliance-image_19.0.0.bb
index dc16c0b..f3a2eac 100644
--- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb
+++ b/meta/recipes-core/images/build-appliance-image_19.0.0.bb
@@ -22,7 +22,7 @@ IMAGE_FSTYPES = "wic.vmdk"
inherit core-image module-base setuptools3
-SRCREV ?= "433ef0f8e9e63e4459934a06a42b56989c885e44"
+SRCREV ?= "44ea6ded0e8e73f5258ce55bd1b851e24243b76a"
SRC_URI = "git://git.yoctoproject.org/poky;branch=master \
file://Yocto_Build_Appliance.vmx \
file://Yocto_Build_Appliance.vmxf \
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] maintainers.inc: change ownership
Taking ownership on recipes related to boot and base setup. Signed-off-by: Chang Rebecca Swee Fun --- meta/conf/distro/include/maintainers.inc | 25 + 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 2500d19..33a9d55 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -59,8 +59,8 @@ RECIPE_MAINTAINER_pn-automake = "Robert Yang " RECIPE_MAINTAINER_pn-avahi = "Yi Zhao " RECIPE_MAINTAINER_pn-avahi-ui = "Yi Zhao " RECIPE_MAINTAINER_pn-babeltrace = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-base-files = "Ross Burton " -RECIPE_MAINTAINER_pn-base-passwd = "Ross Burton " +RECIPE_MAINTAINER_pn-base-files = "Chang Rebecca Swee Fun " +RECIPE_MAINTAINER_pn-base-passwd = "Chang Rebecca Swee Fun " RECIPE_MAINTAINER_pn-bash = "Hongxu Jia " RECIPE_MAINTAINER_pn-bash-completion = "Alexander Kanavin " RECIPE_MAINTAINER_pn-bc = "Jose Lamego " @@ -272,12 +272,13 @@ RECIPE_MAINTAINER_pn-ifupdown = "Maxin B. John " RECIPE_MAINTAINER_pn-init-ifupdown = "Maxin B. John " RECIPE_MAINTAINER_pn-initramfs-boot = "Otavio Salvador " RECIPE_MAINTAINER_pn-initramfs-framework = "Otavio Salvador " -RECIPE_MAINTAINER_pn-initramfs-live-boot = "Ross Burton " -RECIPE_MAINTAINER_pn-initramfs-live-install = "Ross Burton " -RECIPE_MAINTAINER_pn-initramfs-live-install-efi = "Ross Burton " -RECIPE_MAINTAINER_pn-initramfs-live-install-efi-testfs = "Ross Burton " -RECIPE_MAINTAINER_pn-initramfs-live-install-testfs = "Ross Burton " -RECIPE_MAINTAINER_pn-initscripts = "Ross Burton " +RECIPE_MAINTAINER_pn-initramfs-live-boot = "Chang Rebecca Swee Fun " +RECIPE_MAINTAINER_pn-initramfs-live-boot-tiny = "Chang Rebecca Swee Fun " +RECIPE_MAINTAINER_pn-initramfs-live-install = "Chang Rebecca Swee Fun " +RECIPE_MAINTAINER_pn-initramfs-live-install-efi = "Chang Rebecca Swee Fun " +RECIPE_MAINTAINER_pn-initramfs-live-install-efi-testfs = "Chang Rebecca Swee Fun " +RECIPE_MAINTAINER_pn-initramfs-live-install-testfs = "Chang Rebecca Swee Fun " +RECIPE_MAINTAINER_pn-initscripts = "Chang Rebecca Swee Fun " RECIPE_MAINTAINER_pn-inputproto = "Armin Kuster " RECIPE_MAINTAINER_pn-intltool = "Alexander Kanavin " RECIPE_MAINTAINER_pn-iproute2 = "Changhyeok Bae " @@ -463,7 +464,7 @@ RECIPE_MAINTAINER_pn-llvm = "Khem Raj " RECIPE_MAINTAINER_pn-logrotate = "Yi Zhao " RECIPE_MAINTAINER_pn-lrzsz = "Maxin B. John " RECIPE_MAINTAINER_pn-lsb = "Hongxu Jia " -RECIPE_MAINTAINER_pn-lsbinitscripts = "Ross Burton " +RECIPE_MAINTAINER_pn-lsbinitscripts = "Chang Rebecca Swee Fun " RECIPE_MAINTAINER_pn-lsbtest = "Yi Zhao " RECIPE_MAINTAINER_pn-lsof = "Maxin B. John " RECIPE_MAINTAINER_pn-ltp = "Yi Zhao " @@ -687,8 +688,8 @@ RECIPE_MAINTAINER_pn-systemd-serialgetty = "Chen Qi " RECIPE_MAINTAINER_pn-systemd-systemctl-native = "Chen Qi " RECIPE_MAINTAINER_pn-systemtap = "Alexander Kanavin " RECIPE_MAINTAINER_pn-systemtap-uprobes = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-sysvinit = "Ross Burton " -RECIPE_MAINTAINER_pn-sysvinit-inittab = "Ross Burton " +RECIPE_MAINTAINER_pn-sysvinit = "Chang Rebecca Swee Fun " +RECIPE_MAINTAINER_pn-sysvinit-inittab = "Chang Rebecca Swee Fun " RECIPE_MAINTAINER_pn-taglib = "Maxin B. John " RECIPE_MAINTAINER_pn-tar = "Chen Qi " RECIPE_MAINTAINER_pn-tcf-agent = "Randy Witt " @@ -716,7 +717,7 @@ RECIPE_MAINTAINER_pn-unfs3 = "Randy Witt " RECIPE_MAINTAINER_pn-unifdef = "Ross Burton " RECIPE_MAINTAINER_pn-uninative-tarball = "Richard Purdie " RECIPE_MAINTAINER_pn-unzip = "Denys Dmytriyenko " -RECIPE_MAINTAINER_pn-update-rc.d = "Ross Burton " +RECIPE_MAINTAINER_pn-update-rc.d = "Chang Rebecca Swee Fun " RECIPE_MAINTAINER_pn-usbinit = "Alexander Kanavin " RECIPE_MAINTAINER_pn-usbutils = "Alexander Kanavin " RECIPE_MAINTAINER_pn-util-linux = "Chen Qi " -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] build-appliance-image: update version to 19.0.0
On 02/12/2018 10:27 AM, Chang Rebecca Swee Fun wrote: Updating recipe to reflect latest poky version and SRCREV points to latest master HEAD revision. The latest poky version is 18.0.1, and I think SRCREV should point to that as well, not to the tip of master? 19.0.0 isn't yet released. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] site/common-linux: coreutils: get the uptime program to work
coreutils configure script needs to know whether /proc/uptime is
available, but this is not possible in a cross-compilation
context. This leads to an uptime program that fails to work on the
target, as it has been compiled without /proc/uptime reading support.
This commit fixes that by telling coreutils at configure time that
/proc/uptime will be available on the target (which seems to be a
reasonable assumption on Linux systems).
This commit is made with great inspiration from Thomas Petazzoni's
patch to buildroot to fix the same issue.
Signed-off-by: Sean Nyekjaer
---
meta/site/common-linux | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/site/common-linux b/meta/site/common-linux
index 2958716..71ec961 100644
--- a/meta/site/common-linux
+++ b/meta/site/common-linux
@@ -48,6 +48,7 @@ hw_cv_func_vsnprintf_c99=${hw_cv_func_vsnprintf_c99=yes}
# coreutils
gl_cv_func_fstatat_zero_flag=${gl_cv_func_fstatat_zero_flag=yes}
+gl_cv_have_proc_uptime=${gl_cv_have_proc_uptime=yes}
# mysql
ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes}
--
2.7.4
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [pyro][PATCH] bitbake.conf: add ssh to HOSTTOOLS_NONFATAL
From: Chen Qi
We changed to make tools required by testimage to be included conditionally.
This resulted in users who use ssh for git fetching having failures.
Add ssh to HOSTTOOLS_NONFATAL to make things work for the above situation.
[YOCTO #12227]
Signed-off-by: Chen Qi
Signed-off-by: Ross Burton
---
meta/conf/bitbake.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index f3994fc642..e2383d2709 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -472,7 +472,7 @@ HOSTTOOLS += " \
HOSTTOOLS += "${@['', 'ip ping ps scp ssh
stty'][bb.data.inherits_class('testimage', d)]}"
# Link to these if present
-HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat sudo"
+HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc sftp socat ssh
sudo"
# Temporary add few more detected in bitbake world
HOSTTOOLS_NONFATAL += "join nl size yes zcat"
--
2.15.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally (rev3)
== Series Details == Series: bitbake.conf: add tools required by testimage to HOSTTOOLS conditionally (rev3) Revision: 3 URL : https://patchwork.openembedded.org/series/9179/ 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 pyro (currently at 2c61e60cc5) 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] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines 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 01/10] cryptodev: switch SRC_URI to git
One of the tarball mirrors is down; the other is blocked by Intel's corporate
proxy
for being deemed 'suspicious' (the same problem might pop up in other
companies as well). Let's just take the source from github.
Signed-off-by: Alexander Kanavin
---
meta/recipes-kernel/cryptodev/cryptodev.inc | 8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc
b/meta/recipes-kernel/cryptodev/cryptodev.inc
index 50366e72024..ab15bc1d971 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev.inc
+++ b/meta/recipes-kernel/cryptodev/cryptodev.inc
@@ -3,11 +3,9 @@ HOMEPAGE = "http://cryptodev-linux.org/";
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI = "http://nwl.cc/pub/cryptodev-linux/cryptodev-linux-${PV}.tar.gz";
+SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux"
+SRCREV = "87d959d9a279c055b361de8e730fab6a7144edd7"
-SRC_URI[md5sum] = "cb4e0ed9e5937716c7c8a7be84895b6d"
-SRC_URI[sha256sum] =
"9f4c0b49b30e267d776f79455d09c70cc9c12c86eee400a0d0a0cd1d8e467950"
-
-S = "${WORKDIR}/cryptodev-linux-${PV}"
+S = "${WORKDIR}/git"
CLEANBROKEN = "1"
--
2.15.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/10] devtool: fix upstream version check for devtool-test-local recipe
Signed-off-by: Alexander Kanavin
---
meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb
b/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb
index 6bfc557060a..b377cb76051 100644
--- a/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb
+++ b/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb
@@ -9,6 +9,7 @@ SRC_URI =
"http://downloads.yoctoproject.org/mirror/sources/syslinux-${PV}.tar.x
SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13"
SRC_URI[sha256sum] =
"26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e"
+UPSTREAM_VERSION_UNKNOWN = "1"
S = "${WORKDIR}/syslinux-${PV}"
--
2.15.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/10] image-live.bbclass: drop support for compressed ISO images
While modern Linux kernels still support it, the userspace tools
haven't been updated in over a decade. Also, squashfs provides
both better performance, and better compression ratio:
https://elinux.org/Squash_Fs_Comparisons
Signed-off-by: Alexander Kanavin
---
meta/classes/image-live.bbclass | 17 ++---
meta/conf/distro/include/maintainers.inc | 1 -
.../zisofs-tools/zisofs-tools-native_1.0.8.bb| 20
3 files changed, 2 insertions(+), 36 deletions(-)
delete mode 100644
meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 1623c15988b..966277c6785 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -19,7 +19,6 @@
# External variables (also used by syslinux.bbclass)
# ${INITRD} - indicates a list of filesystem images to concatenate and use as
an initrd (optional)
-# ${COMPRESSISO} - Transparent compress ISO, reduce size ~40% if set to 1
# ${NOISO} - skip building the ISO image if set to 1
# ${NOHDD} - skip building the HDD image if set to 1
# ${HDDIMG_ID} - FAT image volume-id
@@ -33,7 +32,6 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot
\
virtual/kernel:do_deploy \
${MLPREFIX}syslinux:do_populate_sysroot \
syslinux-native:do_populate_sysroot \
-${@oe.utils.ifelse(d.getVar('COMPRESSISO',
False),'zisofs-tools-native:do_populate_sysroot','')} \
${PN}:do_image_${@d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')} \
"
@@ -65,7 +63,6 @@ HDDDIR = "${S}/hddimg"
ISODIR = "${S}/iso"
EFIIMGDIR = "${S}/efi_img"
COMPACT_ISODIR = "${S}/iso.z"
-COMPRESSISO ?= "0"
ISOLINUXDIR ?= "/isolinux"
ISO_BOOTIMG = "isolinux/isolinux.bin"
@@ -115,18 +112,8 @@ build_iso() {
install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin
${ISODIR}${ISOLINUXDIR}
fi
- if [ "${COMPRESSISO}" = "1" ] ; then
- # create compact directory, compress iso
- mkdir -p ${COMPACT_ISODIR}
- mkzftree -z 9 -p 4 -F ${ISODIR}/rootfs.img
${COMPACT_ISODIR}/rootfs.img
-
- # move compact iso to iso, then remove compact directory
- mv ${COMPACT_ISODIR}/rootfs.img ${ISODIR}/rootfs.img
- rm -Rf ${COMPACT_ISODIR}
- mkisofs_compress_opts="-R -z -D -l"
- else
- mkisofs_compress_opts="-r"
- fi
+ # We used to have support for zisofs; this is a relic of that
+ mkisofs_compress_opts="-r"
# Check the size of ${ISODIR}/rootfs.img, use mkisofs -iso-level 3
# when it exceeds 3.8GB, the specification is 4G - 1 bytes, we need
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 16a15a3865e..24bf6b96a7e 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -803,5 +803,4 @@ RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster
"
RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko "
RECIPE_MAINTAINER_pn-yasm = "Yi Zhao "
RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko "
-RECIPE_MAINTAINER_pn-zisofs-tools-native = "Alexander Kanavin
"
RECIPE_MAINTAINER_pn-zlib = "Denys Dmytriyenko "
diff --git a/meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb
b/meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb
deleted file mode 100644
index 021c05839c0..000
--- a/meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-# zisofs-tools-native OE build file
-# Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-SUMMARY = "Utilities for creating compressed CD-ROM filesystems"
-HOMEPAGE = "http://freecode.com/projects/zisofs-tools";
-SECTION = "console/utils"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-DEPENDS = "zlib-native"
-
-SRC_URI =
"http://pkgs.fedoraproject.org/repo/pkgs/zisofs-tools/zisofs-tools-${PV}.tar.bz2/2d0ed8c9a1f60b45f949b136f9be1f6c/zisofs-tools-${PV}.tar.bz2";
-
-SRC_URI[md5sum] = "2d0ed8c9a1f60b45f949b136f9be1f6c"
-SRC_URI[sha256sum] =
"ae4e53e4914934d41660248fb59d3c8761f1f1fd180d5ec993c17ddb3afd04f3"
-
-inherit native
-
-do_install() {
- oe_runmake install INSTALLROOT=${D} bindir=${bindir}
-}
--
2.15.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/10] man-db: replace the outdated man implementation
Until now oe-core has been using a well obsolete implementation of man. Man-db on the other hand is used by all modern Linux distros, is actively maintained, has a standard build system, and does not require 30 patches to build. Signed-off-by: Alexander Kanavin --- meta/recipes-extended/man-db/man-db_2.8.1.bb | 41 ++ meta/recipes-extended/man/man/configure_sed.patch | 32 - .../man/man/man-1.5g-nonrootbuild.patch| 16 --- .../man/man/man-1.5h1-gencat.patch | 14 -- meta/recipes-extended/man/man/man-1.5h1-make.patch | 17 --- .../man/man/man-1.5i2-initial.patch| 19 --- .../man/man/man-1.5i2-newline.patch| 15 -- .../man/man/man-1.5i2-overflow.patch | 16 --- meta/recipes-extended/man/man/man-1.5j-i18n.patch | 16 --- .../man/man/man-1.5j-nocache.patch | 16 --- meta/recipes-extended/man/man/man-1.5j-utf8.patch | 61 .../man/man/man-1.5k-confpath.patch| 15 -- .../man/man/man-1.5k-nonascii.patch| 18 --- meta/recipes-extended/man/man/man-1.5k-sofix.patch | 24 .../man/man/man-1.5m2-bug11621.patch | 15 -- .../man/man/man-1.5m2-buildroot.patch | 52 --- .../man/man/man-1.5m2-no-color-for-printing.patch | 15 -- .../man/man/man-1.5m2-sigpipe.patch| 30 .../man/man/man-1.6e-i18n_whatis.patch | 145 --- .../man/man/man-1.6e-mandirs.patch | 31 .../man/man/man-1.6e-new_sections.patch| 15 -- .../recipes-extended/man/man/man-1.6e-ro_usr.patch | 33 - .../man/man/man-1.6e-security.patch| 62 .../man/man-1.6e-use_i18n_vars_in_a_std_way.patch | 160 - .../man/man/man-1.6e-whatis2.patch | 59 .../man/man/man-1.6g-compile-warnings.patch| 105 -- .../man/man/man-1.6g-configure.patch | 68 - .../man/man/man-1.6g-parallel.patch| 30 .../man/man/man-1.6g-whatis3.patch | 20 --- meta/recipes-extended/man/man/man.1.gz | Bin 12323 -> 0 bytes meta/recipes-extended/man/man/man.7.gz | Bin 6192 -> 0 bytes meta/recipes-extended/man/man/man.conf | 141 -- meta/recipes-extended/man/man/manpath.5.gz | Bin 2133 -> 0 bytes meta/recipes-extended/man/man_1.6g.bb | 86 --- 34 files changed, 41 insertions(+), 1346 deletions(-) create mode 100644 meta/recipes-extended/man-db/man-db_2.8.1.bb delete mode 100644 meta/recipes-extended/man/man/configure_sed.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5h1-gencat.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5h1-make.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-initial.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-newline.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-overflow.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5j-i18n.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5j-nocache.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5j-utf8.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5k-confpath.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5k-nonascii.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5k-sofix.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-bug11621.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-buildroot.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch delete mode 100644 meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch delete mode 100644 meta/recipes-extended/man/man/man-1.6e-mandirs.patch delete mode 100644 meta/recipes-extended/man/man/man-1.6e-new_sections.patch delete mode 100644 meta/recipes-extended/man/man/man-1.6e-ro_usr.patch delete mode 100644 meta/recipes-extended/man/man/man-1.6e-security.patch delete mode 100644 meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch delete mode 100644 meta/recipes-extended/man/man/man-1.6e-whatis2.patch delete mode 100644 meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch delete mode 100644 meta/recipes-extended/man/man/man-1.6g-configure.patch delete mode 100644 meta/recipes-extended/man/man/man-1.6g-parallel.patch delete mode 100644 meta/recipes-extended/man/man/man-1.6g-whatis3.patch delete mode 100644 meta/recipes-extended/man/man/man.1.gz delete mode 100644 meta/recipes-extended/man/man/man.7.gz delete mode 100644 meta/recipes-extended/man/man/man.conf delete mode 100644 meta/recipes-extended/man/man/manpath.5.gz delete mode 100644 m
[OE-core] [PATCH 03/10] lsbinitscripts: update to 9.79
Switch to github as pkgs.fedoraproject.org is down.
Signed-off-by: Alexander Kanavin
---
.../lsb/lsbinitscripts/functions.patch | 21 +++--
...sbinitscripts_9.72.bb => lsbinitscripts_9.79.bb} | 8 +---
2 files changed, 16 insertions(+), 13 deletions(-)
rename meta/recipes-extended/lsb/{lsbinitscripts_9.72.bb =>
lsbinitscripts_9.79.bb} (73%)
diff --git a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
index 9c58d90c382..e912daa701a 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
+++ b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
@@ -1,7 +1,7 @@
-From 57468c5f4e364bdad556604dca09046e1afca929 Mon Sep 17 00:00:00 2001
+From e46b056282c8420f096d5c34d78c00f816788784 Mon Sep 17 00:00:00 2001
From: Fan Xin
Date: Mon, 5 Jun 2017 16:26:47 +0900
-Subject: [PATCH] Upstream-Status: Inappropriate [configuration]
+Subject: [PATCH 1/2] Upstream-Status: Inappropriate [configuration]
Signed-off-by: Xiaofeng Yan
Signed-off-by: Saul Wold
@@ -10,23 +10,24 @@ Rebase on 9.72
Signed-off-by: Fan Xin
Upstream-Status: Pending
+
---
- initscripts-9.72/rc.d/init.d/functions | 2 +-
+ rc.d/init.d/functions | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/initscripts-9.72/rc.d/init.d/functions
b/initscripts-9.72/rc.d/init.d/functions
-index 0f627f1..a6aa092 100644
a/initscripts-9.72/rc.d/init.d/functions
-+++ b/initscripts-9.72/rc.d/init.d/functions
+diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
+index 2e3da964..1a204dec 100644
+--- a/rc.d/init.d/functions
b/rc.d/init.d/functions
@@ -59,7 +59,7 @@ systemctl_redirect () {
[ -z "${COLUMNS:-}" ] && COLUMNS=80
if [ -z "${CONSOLETYPE:-}" ]; then
--if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then
-+if [ -c "/dev/stderr" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then
+-if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then
++if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ] && [ -e /sbin/consoletype
]; then
CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
else
CONSOLETYPE="serial"
--
-1.9.1
+2.15.1
diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb
b/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb
similarity index 73%
rename from meta/recipes-extended/lsb/lsbinitscripts_9.72.bb
rename to meta/recipes-extended/lsb/lsbinitscripts_9.79.bb
index 2d74a6f9d3b..46edeed8a48 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb
@@ -10,11 +10,13 @@ RCONFLICTS_${PN} = "initscripts-functions"
LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
-S="${WORKDIR}/initscripts-${PV}"
-SRC_URI =
"http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.gz/sha512/b6ed38f9576e9227c2ecf047e2d60e1e872f40d51d13861b0c91dddb282f10f7e6b79706a4d1435d7a57a14a0b73a1b71541cfe44c00e8e03ef96b08de19ec32/initscripts-${PV}.tar.gz
\
- file://functions.patch;striplevel=2 \
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/fedora-sysv/initscripts \
+ file://functions.patch \
file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \
"
+SRCREV = "a51c1b4f7dcf55b568b2ee4c2b18078849943469"
+UPSTREAM_CHECK_GITTAGREGEX = "^(?P\d+(\.\d+)+)"
SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a"
SRC_URI[sha256sum] =
"1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db"
--
2.15.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/10] libpipeline: add a recipe
This is a hard dependency of man-db, which will be added in the following
commit.
Signed-off-by: Alexander Kanavin
---
meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb | 14 ++
1 file changed, 14 insertions(+)
create mode 100644 meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb
diff --git a/meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb
b/meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb
new file mode 100644
index 000..14cc9e519a8
--- /dev/null
+++ b/meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb
@@ -0,0 +1,14 @@
+SUMMARY = "pipeline manipulation library"
+DESCRIPTION = "This is a C library for setting up and running pipelines of
processes, \
+without needing to involve shell command-line parsing which is often \
+error-prone and insecure."
+HOMEPAGE = "http://libpipeline.nongnu.org/";
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI = "${SAVANNAH_GNU_MIRROR}/libpipeline/libpipeline-${PV}.tar.gz"
+SRC_URI[md5sum] = "b7437a5020190cfa84f09c412db38902"
+SRC_URI[sha256sum] =
"0d72e12e4f2afff67fd7b9df0a24d7ba42b5a7c9211ac5b3d5cd8b286f2b"
+
+inherit pkgconfig autotools
+
--
2.15.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/10] oe-selftest: add a test for recipes without maintainers
'bitbake -c checkpkg world' is moved to class initializer to avoid
it being run twice in a row.
The no-maintainers test checks only oe-core recipes, as other layers
may be be configured, and assigning maintainership to specific people via
maintainers.inc is known to be used only in oe-core.
Signed-off-by: Alexander Kanavin
---
meta/lib/oeqa/selftest/cases/distrodata.py | 67 +++---
1 file changed, 62 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py
b/meta/lib/oeqa/selftest/cases/distrodata.py
index 12540adc7d8..7b2800464cb 100644
--- a/meta/lib/oeqa/selftest/cases/distrodata.py
+++ b/meta/lib/oeqa/selftest/cases/distrodata.py
@@ -9,6 +9,11 @@ class Distrodata(OESelftestTestCase):
@classmethod
def setUpClass(cls):
super(Distrodata, cls).setUpClass()
+feature = 'INHERIT += "distrodata"\n'
+feature += 'LICENSE_FLAGS_WHITELIST += " commercial"\n'
+
+cls.write_config(cls, feature)
+bitbake('-c checkpkg world')
@OETestID(1902)
def test_checkpkg(self):
@@ -18,11 +23,6 @@ class Distrodata(OESelftestTestCase):
Product: oe-core
Author: Alexander Kanavin
"""
-feature = 'INHERIT += "distrodata"\n'
-feature += 'LICENSE_FLAGS_WHITELIST += " commercial"\n'
-
-self.write_config(feature)
-bitbake('-c checkpkg world')
checkpkg_result = open(os.path.join(get_bb_var("LOG_DIR"),
"checkpkg.csv")).readlines()[1:]
regressed_failures = [pkg_data[0] for pkg_data in
[pkg_line.split('\t') for pkg_line in checkpkg_result] if pkg_data[11] ==
'UNKNOWN_BROKEN']
regressed_successes = [pkg_data[0] for pkg_data in
[pkg_line.split('\t') for pkg_line in checkpkg_result] if pkg_data[11] ==
'KNOWN_BROKEN']
@@ -40,3 +40,60 @@ The following packages have been checked successfully for
upstream versions,
but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please
remove that line from the recipes.
""" + "\n".join(regressed_successes)
self.assertTrue(len(regressed_failures) == 0 and
len(regressed_successes) == 0, msg)
+
+def test_maintainers(self):
+"""
+Summary: Test that oe-core recipes have a maintainer
+Expected:All oe-core recipes (except a few special static/testing
ones) should have a maintainer listed in maintainers.inc file.
+Product: oe-core
+Author: Alexander Kanavin
+"""
+def is_exception(pkg):
+exceptions = ["packagegroup-", "initramfs-",
"systemd-machine-units", "target-sdk-provides-dummy"]
+for i in exceptions:
+ if i in pkg:
+ return True
+return False
+
+def is_in_oe_core(recipe, recipes):
+self.assertTrue(recipe in recipes.keys(), "Recipe %s was not in
'bitbake-layers show-recipes' output" %(recipe))
+self.assertTrue(len(recipes[recipe]) > 0, "'bitbake-layers
show-recipes' could not determine what layer(s) a recipe %s is in" %(recipe))
+try:
+recipes[recipe].index('meta')
+return True
+except ValueError:
+return False
+
+def get_recipe_layers():
+import re
+
+recipes = {}
+recipe_regex = re.compile('^(?P.*):$')
+layer_regex = re.compile('^ (?P\S*) +')
+output = runCmd('bitbake-layers show-recipes').output
+for line in output.split('\n'):
+recipe_name_obj = recipe_regex.search(line)
+if recipe_name_obj:
+recipe_name = recipe_name_obj.group('name')
+recipes[recipe_name] = []
+recipe_layer_obj = layer_regex.search(line)
+if recipe_layer_obj:
+layer_name = recipe_layer_obj.group('name')
+recipes[recipe_name].append(layer_name)
+return recipes
+
+checkpkg_result = open(os.path.join(get_bb_var("LOG_DIR"),
"checkpkg.csv")).readlines()[1:]
+recipes_layers = get_recipe_layers()
+no_maintainer_list = [pkg_data[0] for pkg_data in
[pkg_line.split('\t') for pkg_line in checkpkg_result] \
+if pkg_data[14] == '' and is_in_oe_core(pkg_data[0],
recipes_layers) and not is_exception(pkg_data[0])]
+msg = """
+The following packages do not have a maintainer assigned to them. Please add
an entry to meta/conf/distro/include/maintainers.inc file.
+""" + "\n".join(no_maintainer_list)
+self.assertTrue(len(no_maintainer_list) == 0, msg)
+
+with_maintainer_list = [pkg_data[0] for pkg_data in
[pkg_line.split('\t') for pkg_line in checkpkg_result] \
+if pkg_data[14] != '' and is_in_oe_core(pkg_data[0],
recipes_layers) and not is_exception(pkg_data[0])]
+msg = """
+The list of oe-core packages with maintainers is empty. This may indic
[OE-core] [PATCH 08/10] oe-selftest: fix tests to reflect man->man-db transition
Rather than apply a patch twice, an incorrect patch is applied
(as the new man-db recipe does not have any patches yet).
Signed-off-by: Alexander Kanavin
---
.../man-db/files/0001-Test-patch-here.patch| 22
.../man_1.6g.bbappend => man-db/man-db_%.bbappend} | 0
.../recipes-test/man/man/man-1.5h1-make.patch | 16
meta/lib/oeqa/selftest/cases/bbtests.py| 29 +++---
4 files changed, 36 insertions(+), 31 deletions(-)
create mode 100644
meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch
rename meta-selftest/recipes-test/{man/man_1.6g.bbappend =>
man-db/man-db_%.bbappend} (100%)
delete mode 100644 meta-selftest/recipes-test/man/man/man-1.5h1-make.patch
diff --git a/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch
b/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch
new file mode 100644
index 000..b1d5eab2b8c
--- /dev/null
+++ b/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch
@@ -0,0 +1,22 @@
+From efc8831f33106e6b48de8e612c2d816fe7d1ae68 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin
+Date: Fri, 9 Feb 2018 17:37:48 +0200
+Subject: [PATCH] Test patch here!
+
+This is an invalid patch used by oe-selftest
+---
+ README | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/README b/README
+index 48fff57..26d1234 100644
+--- a/README
b/README
+@@ -1,3 +1,4 @@
++This is a test patch for purposes of oe-selftest
+ THIS LINE MAKES THIS PATCH INVALID README for the man-db manual pager suite
+
+
+--
+2.15.1
+
diff --git a/meta-selftest/recipes-test/man/man_1.6g.bbappend
b/meta-selftest/recipes-test/man-db/man-db_%.bbappend
similarity index 100%
rename from meta-selftest/recipes-test/man/man_1.6g.bbappend
rename to meta-selftest/recipes-test/man-db/man-db_%.bbappend
diff --git a/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch
b/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch
deleted file mode 100644
index a0d59b78cef..000
--- a/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Test patch here!
-This is invalid patch used by tests in scripts/lib/selftests.
-
man-1.5g/man/Makefile.in.mike Fri Apr 9 13:35:54 1999
-+++ man-1.5g/man/Makefile.in Fri Apr 9 13:36:45 1999
-@@ -1,8 +1,8 @@
- #MAKE THIS PATCH INVALID
- MAN1 = man whatis apropos
--MAN5 = man.conf
-+MAN5 = man.config
- MAN8 = makewhatis
--ALL = man.1 whatis.1 apropos.1 man.conf.5
-+ALL = man.1 whatis.1 apropos.1 man.config.5
- MAYBE8 = makewhatis
-
- .SUFFIXES: .man .1 .5 .8
diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py
b/meta/lib/oeqa/selftest/cases/bbtests.py
index 4c82049032b..350614967c9 100644
--- a/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -64,15 +64,14 @@ class BitbakeTests(OESelftestTestCase):
@OETestID(108)
def test_invalid_patch(self):
-# This patch already exists in SRC_URI so adding it again will cause
the
-# patch to fail.
-self.write_recipeinc('man', 'SRC_URI += "file://man-1.5h1-make.patch"')
+# This patch should fail to apply.
+self.write_recipeinc('man-db', 'FILESEXTRAPATHS_prepend :=
"${THISDIR}/files:"\nSRC_URI += "file://0001-Test-patch-here.patch"')
self.write_config("INHERIT_remove = \"report-error\"")
-result = bitbake('man -c patch', ignore_status=True)
-self.delete_recipeinc('man')
-bitbake('-cclean man')
+result = bitbake('man-db -c patch', ignore_status=True)
+self.delete_recipeinc('man-db')
+bitbake('-cclean man-db')
line = self.getline(result, "Function failed: patch_do_patch")
-self.assertTrue(line and line.startswith("ERROR:"), msg = "Repeated
patch application didn't fail. bitbake output: %s" % result.output)
+self.assertTrue(line and line.startswith("ERROR:"), msg = "Incorrectly
formed patch application didn't fail. bitbake output: %s" % result.output)
@OETestID(1354)
def test_force_task_1(self):
@@ -132,17 +131,17 @@ class BitbakeTests(OESelftestTestCase):
@OETestID(168)
def test_invalid_recipe_src_uri(self):
data = 'SRC_URI = "file://invalid"'
-self.write_recipeinc('man', data)
+self.write_recipeinc('man-db', data)
self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\"
SSTATE_DIR = \"${TOPDIR}/download-selftest\"
INHERIT_remove = \"report-error\"
""")
self.track_for_cleanup(os.path.join(self.builddir,
"download-selftest"))
-bitbake('-ccleanall man')
-result = bitbake('-c fetch man', ignore_status=True)
-bitbake('-ccleanall man')
-self.delete_recipeinc('man')
+bitbake('-ccleanall man-db')
+result = bitbake('-c fetch man-db', ignore_status=True)
+bitbake('-ccleanall man-db')
+self.delete_recipeinc('man-db')
self.a
[OE-core] [PATCH 04/10] pax: remove the recipe
The situation with pax (vs. tar and cpio) is perfectly described here:
https://xkcd.com/927/
The only reason pax is still around, kind of, is because both POSIX and LSB
mandate it. Outside of those documents, it's not used by anyone.
Meanwhile, the upstream URI we've been taking it from went down, and rather
than seek an alternative source, I just went ahead and removed the recipe.
Signed-off-by: Alexander Kanavin
---
README.LSB |1 +
meta/conf/distro/include/maintainers.inc |1 -
.../packagegroup-core-full-cmdline.bb |1 -
.../packagegroups/packagegroup-core-lsb.bb |1 -
.../pax/0001-Add-a-comment-for-fallthrough.patch | 38 -
.../pax/pax/0001-Fix-build-with-musl.patch | 1287
...s-sysmacros.h-for-major-minor-definitions.patch | 65 -
.../pax/0001-use-strtoll-instead-of-strtoq.patch | 33 -
.../pax/pax/fix_for_compile_with_gcc-4.6.0.patch | 25 -
.../pax/pax/pax-3.4_fix_for_x32.patch | 185 ---
meta/recipes-extended/pax/pax_3.4.bb | 31 -
11 files changed, 1 insertion(+), 1667 deletions(-)
delete mode 100644
meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch
delete mode 100644 meta/recipes-extended/pax/pax/0001-Fix-build-with-musl.patch
delete mode 100644
meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
delete mode 100644
meta/recipes-extended/pax/pax/0001-use-strtoll-instead-of-strtoq.patch
delete mode 100644
meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch
delete mode 100644 meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch
delete mode 100644 meta/recipes-extended/pax/pax_3.4.bb
diff --git a/README.LSB b/README.LSB
index c9dca3fc75e..f68d07c9e03 100644
--- a/README.LSB
+++ b/README.LSB
@@ -23,3 +23,4 @@ therefore provides compatibility with the following caveats:
* libpng 1.2 isn't provided; oe-core includes the latest release of libpng
instead.
+* pax (POSIX standard archive) tool is not provided.
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 9b25a112b75..16a15a3865e 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -562,7 +562,6 @@ RECIPE_MAINTAINER_pn-pango = "Maxin B. John
"
RECIPE_MAINTAINER_pn-parted = "Hongxu Jia "
RECIPE_MAINTAINER_pn-patch = "Hongxu Jia "
RECIPE_MAINTAINER_pn-patchelf = "Richard Purdie
"
-RECIPE_MAINTAINER_pn-pax = "Hongxu Jia "
RECIPE_MAINTAINER_pn-pax-utils = "Hongxu Jia "
RECIPE_MAINTAINER_pn-pbzip2 = "Denys Dmytriyenko "
RECIPE_MAINTAINER_pn-pciutils = "Chen Qi "
diff --git
a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
index fdede5954c3..318959e6649 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
@@ -89,7 +89,6 @@ RDEPENDS_packagegroup-core-full-cmdline-utils = "\
mktemp \
ncurses \
net-tools \
-pax \
popt \
procps \
psmisc \
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 8ba02e62834..8959e3c8f46 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -158,7 +158,6 @@ RDEPENDS_packagegroup-core-lsb-core = "\
mktemp \
msmtp \
patch \
-pax \
procps \
psmisc \
sed \
diff --git
a/meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch
b/meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch
deleted file mode 100644
index b76f85aa458..000
--- a/meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e67bb3debe582f0e0b714bd012bb1082fc41 Mon Sep 17 00:00:00 2001
-From: Khem Raj
-Date: Wed, 19 Apr 2017 11:32:00 -0700
-Subject: [PATCH] Add a comment for fallthrough
-
-Fixes warnings with gcc7 e.g.
-
-../../../../../../../workspace/sources/pax/src/options.c: In function
'tar_options':
-../../../../../../../workspace/sources/pax/src/options.c:725:7: error: this
statement may fall through [-Werror=implicit-fallthrough=]
-if (opt_add ("write_opt=nodir") < 0)
- ^
-../../../../../../../workspace/sources/pax/src/options.c:730:2: note: here
- case 'O':
- ^~~~
-cc1: all warnings being treated as errors
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj
- src/options.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/options.c b/src/options.c
-index c663b4e..b80819a 100644
a/src/options.c
-+++ b/src/options.c
-@@ -724,6 +724,7 @@ tar_options (int argc, char **argv)
- case 'o':
- if (opt_add ("write_opt=nod
[OE-core] [PATCH 09/10] maintainers.inc: add missing entries
Signed-off-by: Alexander Kanavin --- meta/conf/distro/include/maintainers.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 24bf6b96a7e..add094e2e37 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -212,6 +212,7 @@ RECIPE_MAINTAINER_pn-glibc-initial = "Khem Raj " RECIPE_MAINTAINER_pn-glibc-locale = "Khem Raj " RECIPE_MAINTAINER_pn-glibc-mtrace = "Khem Raj " RECIPE_MAINTAINER_pn-glibc-scripts = "Khem Raj " +RECIPE_MAINTAINER_pn-glide = "Otavio Salvador " RECIPE_MAINTAINER_pn-glproto = "Armin Kuster " RECIPE_MAINTAINER_pn-gmp = "Khem Raj " RECIPE_MAINTAINER_pn-gnome-common = "Maxin B. John " @@ -375,6 +376,7 @@ RECIPE_MAINTAINER_pn-libpciaccess = "Alexander Kanavin http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] libevdev: upgrade to version 1.5.8
Bug fix release. Supports new keycodes in linux 4.15 headers
Signed-off-by: Maxin B. John
---
.../recipes-support/libevdev/{libevdev_1.5.7.bb => libevdev_1.5.8.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/libevdev/{libevdev_1.5.7.bb => libevdev_1.5.8.bb}
(74%)
diff --git a/meta/recipes-support/libevdev/libevdev_1.5.7.bb
b/meta/recipes-support/libevdev/libevdev_1.5.8.bb
similarity index 74%
rename from meta/recipes-support/libevdev/libevdev_1.5.7.bb
rename to meta/recipes-support/libevdev/libevdev_1.5.8.bb
index f740da2..c138014 100644
--- a/meta/recipes-support/libevdev/libevdev_1.5.7.bb
+++ b/meta/recipes-support/libevdev/libevdev_1.5.8.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \
SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz";
-SRC_URI[md5sum] = "4f1cfaee8d75ea3fbbfeb99a98730952"
-SRC_URI[sha256sum] =
"a1e59e37a2f0d397ffd7e83b73af0e638db83b8dd08902ef0f651a21cc1dd422"
+SRC_URI[md5sum] = "c25a8c3939e4ad59a5e9e5e1e354832d"
+SRC_URI[sha256sum] =
"6083d81e46609da8ba80cb826c02d9080764a6dec33c8267ccb7e158833d4c6d"
inherit autotools pkgconfig
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] harfbuzz: upgrade to version 1.7.5
1.7.4 -> 1.7.5
Signed-off-by: Maxin B. John
---
.../harfbuzz/{harfbuzz_1.7.4.bb => harfbuzz_1.7.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/harfbuzz/{harfbuzz_1.7.4.bb => harfbuzz_1.7.5.bb}
(88%)
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.4.bb
b/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
similarity index 88%
rename from meta/recipes-graphics/harfbuzz/harfbuzz_1.7.4.bb
rename to meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb
index ce1ead4..0a9b029 100644
--- a/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.4.bb
+++ b/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.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] = "c7476d8b989869d8b95b37fa53add6bf"
-SRC_URI[sha256sum] =
"b5d6ac8415f97f3540d73f3f91c41c5c10f8a4d76350f11a7184062aae88ac0b"
+SRC_URI[md5sum] = "1466ab51fc5aaa6af4065936939cec62"
+SRC_URI[sha256sum] =
"84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563"
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
[OE-core] [PATCH 4/4] libinput: fix upstream version check
Skip RC releases for libinput which follow the pattern: x.x.9xx
Signed-off-by: Maxin B. John
---
meta/recipes-graphics/wayland/libinput_1.9.4.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-graphics/wayland/libinput_1.9.4.bb
b/meta/recipes-graphics/wayland/libinput_1.9.4.bb
index 2843314..c250383 100644
--- a/meta/recipes-graphics/wayland/libinput_1.9.4.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.9.4.bb
@@ -12,6 +12,7 @@ SRC_URI =
"http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
SRC_URI[md5sum] = "8b43d07d1698fb207a0492fc67554d4f"
SRC_URI[sha256sum] =
"0bcdbd4c4e3c2a2db322fbdf2ef3284f2e6d6fb7be3af80e6d8de7783f675190"
+UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.[^9]\d*).tar.xz"
inherit meson pkgconfig lib_package
PACKAGECONFIG ??= ""
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] fontconfig: fix upstream version check
In the case of fontconfig, version x.x.9x are release candidates
for next version.
Signed-off-by: Maxin B. John
---
meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
index fa5f0ee..756e324 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
@@ -28,6 +28,7 @@ SRC_URI =
"http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb"
SRC_URI[sha256sum] =
"064b9ebf060c9e77011733ac9dc0e2ce92870b574cca2405e11f5353a683c334"
+UPSTREAM_CHECK_REGEX = "fontconfig-(?P\d+\.\d+\.[^9]\d*).tar.gz"
do_configure_prepend() {
# work around https://bugs.freedesktop.org/show_bug.cgi?id=101280
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] fontconfig: fix upstream version check
On 02/12/2018 04:16 PM, Maxin B. John wrote: In the case of fontconfig, version x.x.9x are release candidates for next version. +UPSTREAM_CHECK_REGEX = "fontconfig-(?P\d+\.\d+\.[^9]\d*).tar.gz" This will incorrectly exclude x.x.9 which is not a release candidate. You need to exclude "9 followed by one or more digits", not just 9 alone. Also, "." in .tar.gz means "any character", if you want to match literal "." it should be "\." This is a good place to practice: http://regex101.com Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/4] libinput: fix upstream version check
On 02/12/2018 04:16 PM, Maxin B. John wrote: Skip RC releases for libinput which follow the pattern: x.x.9xx +UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.[^9]\d*).tar.xz" Same issue as previous patch. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] fontconfig: fix upstream version check
Hi Alex, On Mon, Feb 12, 2018 at 04:19:53PM +0200, Alexander Kanavin wrote: > On 02/12/2018 04:16 PM, Maxin B. John wrote: > >In the case of fontconfig, version x.x.9x are release candidates > >for next version. > >+UPSTREAM_CHECK_REGEX = "fontconfig-(?P\d+\.\d+\.[^9]\d*).tar.gz" > > This will incorrectly exclude x.x.9 which is not a release candidate. You > need to exclude "9 followed by one or more digits", not just 9 alone. You are right. Thanks for looking into this. However, in practice, I haven't found a single non-RC release which follow the pattern x.x.9 for these packages (fontconfig, libinput). That doesn't mean, it is improbable. > Also, "." in .tar.gz means "any character", if you want to match literal "." > it should be "\." Ok. > This is a good place to practice: > http://regex101.com Thanks. I will update and send a v2. > Alex Best Regards, Maxin -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] fontconfig: fix upstream version check
On 02/12/2018 04:35 PM, Maxin B. John wrote: This is a good place to practice: http://regex101.com Thanks. I will update and send a v2. To save you a bit of time, I think the right construct should be either (9|[0-8]\d+) or (?!9\d+)\d+ Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Yocto Project Status WW07’18
Current Dev Position: YP 2.5 M3 development Next Deadline: YP 2.5 M3 cut off is 2/19/18 SWAT team rotation: Paul -> Tracy on Feb. 9, 2018. SWAT team rotation: Tracy -> Stephano on Feb. 16, 2018. https://wiki.yoctoproject.org/wiki/Yocto_Build_Failure_Swat_Team Key Status/Updates: · YP 2.5 M2 is currently undergoing QA and nearly complete. See: https://wiki.yoctoproject.org/wiki/2.5_QA_Status · YP 2.2.3 is also mostly through QA. See https://wiki.yoctoproject.org/wiki/2.2_QA_Status. T · Holidays mean that QA is slowed, we will QA 2.4.2 as soon as they return. · autobuilder.yoctoproject.org continues to be unavailable as we continue to develop the new autobuilder codebase to replace the current heavily customized buildbot one. · Some positive performance news is that by removing the “fetchall” and “checkuriall” tasks, we were able to take “bitbake core-image-sato -g” from 20s to around 8s. The speedup comes from the runqueue calculation so most builds will benefit from this speedup. The tasks are replaced by a dedicated bitbake option, --runall=. · Kernel updates have been blocked as some image sizes have overflowed the maximum allowed image sizes. We’re working on figuring out how to resolve that, likely by stripping ltp and/or optimising the kernel-devsrc recipe if possible. · The glibc change is blocked on various build failures the code seems to trigger as well as issues with gplv2 vs gplv3 patches for meta-gplv2. Planned upcoming dot releases: YP 2.4.2 (Rocko) will be built shortly, once there is QA bandwidth available. YP 2.3.4 (Pyro) will be built when we figure out gcc backports. YP 2.2.3 (Morty) rc2 is in QA. YP 2.2.4 (Morty) will be built when we figure out gcc backports. Key YP 2.5 Dates are: YP 2.5 M2 cut off is past, it is in QA. YP 2.5 M2 release of 1/26/18 YP 2.5 M3 cut off of 2/19/18 YP 2.5 M3 release of 3/2/18 YP 2.5 M4 cut off of 4/2/18 YP 2.5 M4 release of 4/27/18 Tracking Metrics: WDD 2610 (last week 2638) (https://wiki.yoctoproject.org/charts/combo.html) Key Status Links for YP: https://wiki.yoctoproject.org/wiki/Yocto_Project_v2.5_Status https://wiki.yoctoproject.org/wiki/Yocto_2.5_Schedule https://wiki.yoctoproject.org/wiki/Yocto_2.5_Features The Status reports are now stored on the wiki at: https://wiki.yoctoproject.org/wiki/Weekly_Status [If anyone has suggestions for other information you’d like to see on this weekly status update, let us know!] Thanks, Stephen K. Jolley Yocto Project Release Engineer INTEL, MS JF1-255, 2111 N.E. 25th Avenue, Hillsboro, OR 97124 • Work Telephone: (503) 712-0534 •Cell:(208) 244-4460 • Email: stephen.k.jol...@intel.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel: add objtool to shared workdir
With CONFIG_UNWINDER_ORC (the default in 4.14), objtool is required for
out-of-tree modules to be able to generate object files.
For instance, meta-skeleton/hello-mod fails with:
| make[3]: *** No rule to make target 'tools/objtool/objtool', needed by ...
Signed-off-by: Justin Bronder
---
meta/classes/kernel.bbclass | 7 +++
1 file changed, 7 insertions(+)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 943938df0e..5cdff581ef 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -479,6 +479,13 @@ do_shared_workdir () {
mkdir -p $kerneldir/arch/${ARCH}/include/generated/
cp -fR arch/${ARCH}/include/generated/*
$kerneldir/arch/${ARCH}/include/generated/
fi
+
+ # With CONFIG_UNWINDER_ORC (the default in 4.14), objtool is required
for
+ # out-of-tree modules to be able to generate object files.
+ if [ -x tools/objtool/objtool ]; then
+ mkdir -p ${kerneldir}/tools/objtool
+ cp tools/objtool/objtool ${kerneldir}/tools/objtool/
+ fi
}
# We don't need to stage anything, not the modules/firmware since those would
clash with linux-firmware
--
2.13.6
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 00/17] Fix support for Icecream
Fix up support for using Icecream to do distributed builds, which
appears to have been broken for some time.
In addition, Icecream support can now be enabled in the SDK. When
enabled, the SDK install process will check if the host supports icecc
and if so will construct a proper environment tarball and use it when
compiling.
Most of the changes should be straightforward. icecc-create-env has
been almost completely re-written but the changes were broken up into
hopefully logical chunks.
V2:
* Default ICECC_CARET_WORKAROUND = "0" which greatly speeds up build
times in recipes with a lot of warnings. (Thanks to Tomas Novotny
)
* Fix elfutils build when ICECC_CARET_WORKAROUND = "0"
* Minor fixes to commit messages and patchtest failures
The following changes since commit 44ea6ded0e8e73f5258ce55bd1b851e24243b76a:
bitbake: bitbake-user-manual: Commented out Placeholder Paragraph (2018-02-06
18:10:35 +)
are available in the Git repository at:
git://push.yoctoproject.org/poky-contrib jpew/icecream
Joshua Watt (17):
icecc.bbclass: Move to shared work directory
icecc.bbclass: Fix STAGING_BINDIR_TOOLCHAIN usage
icecc.bbclass: Skip canadian-cross compiles
icecc-create-env: Reformat
icecc-create-env: Add /bin/true to environment
icecc-create-env: Use program interpreter for deps
icecc-create-env: Symlink alternate names
icecc-create-env: Archive directory
icecc-create-env: Fix executable rpaths
icecc-create-env: Add support for nativesdk
icecc-create-env: Allow multiple tool aliases
toolchain-shar-extract: Add post-relocate scripts
icecc-toolchain: Add SDK icecream setup
icecc.bbclass: Add Icecream support to SDK
icecc.bbclass: Disable caret workaround by default
icecc-toolchain: Disable caret workaround
elfutils: Use fallthrough attribute
meta/classes/icecc.bbclass | 57 +-
meta/classes/toolchain-scripts.bbclass | 15 +
meta/files/toolchain-shar-extract.sh | 8 +
meta/recipes-core/meta/meta-environment.bb | 2 +
meta/recipes-devtools/elfutils/elfutils_0.170.bb | 4 +-
.../files/0001-Use-fallthrough-attribute.patch | 791 +
.../elfutils/files/debian/fallthrough.patch| 36 -
.../icecc-create-env/icecc-create-env | 328 ++---
...e-env-native_0.1.bb => icecc-create-env_0.1.bb} | 4 +-
.../icecc-toolchain/icecc-toolchain/icecc-env.sh | 49 ++
.../icecc-toolchain/icecc-toolchain/icecc-setup.sh | 43 ++
.../nativesdk-icecc-toolchain_0.1.bb | 38 +
12 files changed, 1214 insertions(+), 161 deletions(-)
create mode 100644
meta/recipes-devtools/elfutils/files/0001-Use-fallthrough-attribute.patch
delete mode 100644
meta/recipes-devtools/elfutils/files/debian/fallthrough.patch
rename meta/recipes-devtools/icecc-create-env/{icecc-create-env-native_0.1.bb
=> icecc-create-env_0.1.bb} (98%)
create mode 100644
meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
create mode 100644
meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh
create mode 100644
meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 02/17] icecc.bbclass: Fix STAGING_BINDIR_TOOLCHAIN usage
STAGING_BINDIR_TOOLCHAIN is actually a path list, not a single path. Fix
icecc.bbclass to try all the paths in the variable instead of treating
it as a single path.
Signed-off-by: Joshua Watt
---
meta/classes/icecc.bbclass | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index e8725b582b3..35a1aaef86f 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -210,15 +210,14 @@ def icecc_get_tool(bb, d, tool):
else:
ice_dir = d.expand('${STAGING_BINDIR_TOOLCHAIN}')
target_sys = d.expand('${TARGET_SYS}')
-tool_bin = os.path.join(ice_dir, "%s-%s" % (target_sys, tool))
-if os.path.isfile(tool_bin):
-return tool_bin
-else:
-external_tool_bin = icecc_get_external_tool(bb, d, tool)
-if os.path.isfile(external_tool_bin):
-return external_tool_bin
-else:
-return ""
+for p in ice_dir.split(':'):
+tool_bin = os.path.join(p, "%s-%s" % (target_sys, tool))
+if os.path.isfile(tool_bin):
+return tool_bin
+external_tool_bin = icecc_get_external_tool(bb, d, tool)
+if os.path.isfile(external_tool_bin):
+return external_tool_bin
+return ""
def icecc_get_and_check_tool(bb, d, tool):
# Check that g++ or gcc is not a symbolic link to icecc binary in
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 03/17] icecc.bbclass: Skip canadian-cross compiles
icecc.bbclass will no longer attempt to distribute cross-canadian
compiles. While it is technically possible to generate a toolchain that runs
on the build system and generates executables for the host system, this
is not the normal way that icecc operates. There are so few of these
recipes that it is probably not worth maintaining a distinct code path
for them.
Signed-off-by: Joshua Watt
---
meta/classes/icecc.bbclass | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 35a1aaef86f..9d5eaed57ce 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -101,6 +101,9 @@ def use_icecc(bb,d):
if icecc_is_allarch(bb, d):
return "no"
+if icecc_is_cross_canadian(bb, d):
+return "no"
+
pn = d.getVar('PN')
system_class_blacklist = []
@@ -151,6 +154,9 @@ def icecc_is_native(bb, d):
bb.data.inherits_class("cross", d) or \
bb.data.inherits_class("native", d);
+def icecc_is_cross_canadian(bb, d):
+return bb.data.inherits_class("cross-canadian", d)
+
def icecc_dir(bb, d):
return d.expand('${TMPDIR}/work-shared/ice')
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 01/17] icecc.bbclass: Move to shared work directory
Generate the icecc toolchains in a shared work directory. This class was
already setup to correctly synchronize creating the toolchains in a
shared location before the RSS changes, so return to that behavior
instead of generated the toolchains in each recipe's sysroot.
Additionally, it makes no sense for each recipe to generate a toolchain,
only to find it was already generated and uploaded to the compile server
by another recipe.
Signed-off-by: Joshua Watt
---
meta/classes/icecc.bbclass | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 1cc1c4ddb0f..e8725b582b3 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -151,6 +151,9 @@ def icecc_is_native(bb, d):
bb.data.inherits_class("cross", d) or \
bb.data.inherits_class("native", d);
+def icecc_dir(bb, d):
+return d.expand('${TMPDIR}/work-shared/ice')
+
# Don't pollute allarch signatures with TARGET_FPU
icecc_version[vardepsexclude] += "TARGET_FPU"
def icecc_version(bb, d):
@@ -175,8 +178,8 @@ def icecc_version(bb, d):
archive_name += "-kernel"
import socket
-ice_dir = d.expand('${STAGING_DIR_NATIVE}${prefix_native}')
-tar_file = os.path.join(ice_dir, 'ice', archive_name + "-@VERSION@-" +
socket.gethostname() + '.tar.gz')
+ice_dir = icecc_dir(bb, d)
+tar_file = os.path.join(ice_dir, archive_name + "-@VERSION@-" +
socket.gethostname() + '.tar.gz')
return tar_file
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 04/17] icecc-create-env: Reformat
The environment script used an annoying mix of tabs and spaces and no
mapping of tabs to spaces would produce pleasant indentation. Reformat
to eliminate tab characters and settle on 4 spaces for indentation
(which matches the upstream icecream script from which this is derived)
Signed-off-by: Joshua Watt
---
.../icecc-create-env/icecc-create-env | 208 ++---
1 file changed, 104 insertions(+), 104 deletions(-)
diff --git
a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
index 7e4dbc414e7..723f1f9bd90 100755
--- a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
+++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
@@ -8,63 +8,63 @@ target_files=
is_contained ()
{
- case " $target_files " in
-*" $1 "* ) return 0 ;;
-*"=$1 "* ) return 0;;
-* ) return 1 ;;
- esac
+case " $target_files " in
+*" $1 "* ) return 0 ;;
+*"=$1 "* ) return 0;;
+* ) return 1 ;;
+esac
}
add_file ()
{
- local name="$1"
- local path="$1";
- if test -n "$2"; then
-name="$2"
- fi
- test -z "$name" && return
- # ls -H isn't really the same as readlink, but
- # readlink is not portable enough.
- path=`ls -H $path`
- toadd="$name=$path"
- is_contained "$toadd" && return
- if test -z "$silent"; then
- echo "adding file $toadd"
- fi
- target_files="$target_files $toadd"
- if test -x "$path"; then
-# Only call ldd when it makes sense
-if file -L "$path" | grep 'ELF' > /dev/null 2>&1; then
- if ! file -L "$path" | grep 'static' > /dev/null 2>&1; then
- # ldd now outputs ld as /lib/ld-linux.so.xx on current nptl based
glibc
- # this regexp parse the outputs like:
- # ldd /usr/bin/gcc
- # linux-gate.so.1 => (0xe000)
- # libc.so.6 => /lib/tls/libc.so.6 (0xb7e81000)
- # /lib/ld-linux.so.2 (0xb7fe8000)
- # covering both situations ( with => and without )
- for lib in `ldd "$path" | sed -n 's,^[^/]*\(/[^ ]*\).*,\1,p'`; do
- test -f "$lib" || continue
- # Check wether the same library also exists in the parent directory,
- # and prefer that on the assumption that it is a more generic one.
- local baselib=`echo "$lib" | sed 's,\(/[^/]*\)/.*\(/[^/]*\)$,\1\2,'`
- test -f "$baselib" && lib=$baselib
- add_file "$lib"
-done
- fi
+local name="$1"
+local path="$1";
+if test -n "$2"; then
+name="$2"
+fi
+test -z "$name" && return
+# ls -H isn't really the same as readlink, but
+# readlink is not portable enough.
+path=`ls -H $path`
+toadd="$name=$path"
+is_contained "$toadd" && return
+if test -z "$silent"; then
+echo "adding file $toadd"
+fi
+target_files="$target_files $toadd"
+if test -x "$path"; then
+# Only call ldd when it makes sense
+if file -L "$path" | grep 'ELF' > /dev/null 2>&1; then
+if ! file -L "$path" | grep 'static' > /dev/null 2>&1; then
+# ldd now outputs ld as /lib/ld-linux.so.xx on current nptl
based glibc
+# this regexp parse the outputs like:
+# ldd /usr/bin/gcc
+# linux-gate.so.1 => (0xe000)
+# libc.so.6 => /lib/tls/libc.so.6 (0xb7e81000)
+# /lib/ld-linux.so.2 (0xb7fe8000)
+# covering both situations ( with => and without )
+for lib in `ldd "$path" | sed -n 's,^[^/]*\(/[^ ]*\).*,\1,p'`;
do
+test -f "$lib" || continue
+# Check wether the same library also exists in the parent
directory,
+# and prefer that on the assumption that it is a more
generic one.
+local baselib=`echo "$lib" | sed
's,\(/[^/]*\)/.*\(/[^/]*\)$,\1\2,'`
+test -f "$baselib" && lib=$baselib
+add_file "$lib"
+done
+fi
+fi
fi
- fi
}
# backward compat
if test "$1" = "--respect-path"; then
- shift
+shift
fi
#add a --silent switch to avoid "broken pipe" errors when calling this scipt
from within OE
if test "$1" = "--silent"; then
- silent=1
- shift
+silent=1
+shift
fi
@@ -77,18 +77,18 @@ shift
archive_name=$1
if test -z "$added_gcc" || test -z "$added_gxx" ; then
- echo "usage: $0 "
- exit 1
+echo "usage: $0 "
+exit 1
fi
if ! test -x "$added_gcc" ; then
- echo "'$added_gcc' is no executable."
- exit 1
+echo "'$added_gcc' is no executable."
+exit 1
fi
if ! test -x "$added_gxx" ; then
- echo "'$added_gcc' is no executable."
- exit 1
+echo "'$added_gcc' is no executable."
+exit 1
fi
@@ -97,51 +97,51 @@ add_file $
[OE-core] [PATCH v2 05/17] icecc-create-env: Add /bin/true to environment
icecream daemons execute /bin/true from the environment as a check to
determine if the environment is valid at all, so it needs to be
included.
Signed-off-by: Joshua Watt
---
.../icecc-create-env/icecc-create-env/icecc-create-env | 10 ++
1 file changed, 10 insertions(+)
diff --git
a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
index 723f1f9bd90..c838256f748 100755
--- a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
+++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
@@ -122,6 +122,16 @@ then
add_file $pluginfile /usr${pluginfile#*usr}
fi
+# for testing the environment is usable at all
+if test -x /bin/true; then
+add_file /bin/true
+elif test -x /usr/bin/true; then
+add_file /usr/bin/true /bin/true
+else
+echo "'true' not found"
+exit 1
+fi
+
tempdir=`mktemp -d /tmp/iceccenvXX`
new_target_files=
for i in $target_files; do
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 10/17] icecc-create-env: Add support for nativesdk
icecc-create-env can now be built as a nativesdk recipe, allowing the
script to be included as part of an SDK
Signed-off-by: Joshua Watt
---
.../{icecc-create-env-native_0.1.bb => icecc-create-env_0.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/icecc-create-env/{icecc-create-env-native_0.1.bb
=> icecc-create-env_0.1.bb} (98%)
diff --git
a/meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb
b/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb
similarity index 98%
rename from
meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb
rename to meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb
index f8f4aef3923..053945ebbc6 100644
--- a/meta/recipes-devtools/icecc-create-env/icecc-create-env-native_0.1.bb
+++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env_0.1.bb
@@ -12,8 +12,6 @@ PR = "r2"
DEPENDS = ""
INHIBIT_DEFAULT_DEPS = "1"
-inherit native
-
# This is needed, because otherwise there is dependency loop from quilt-native
# Dependency loop #1 found:
# Task 10907 (meta/recipes-devtools/quilt/quilt-native_0.60.bb, do_install)
(dependent Tasks ['quilt-native, do_compile'])
@@ -34,3 +32,5 @@ do_install() {
install -d ${D}/${bindir}
install -m 0755 ${WORKDIR}/icecc-create-env ${D}/${bindir}
}
+
+BBCLASSEXTEND = "native nativesdk"
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 07/17] icecc-create-env: Symlink alternate names
Instead of renaming files to a new path in the toolchain archive, keep
the files with their original paths and create a relative symbolic link
from the new path to the original file.
Signed-off-by: Joshua Watt
---
.../icecc-create-env/icecc-create-env | 64 +++---
1 file changed, 57 insertions(+), 7 deletions(-)
diff --git
a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
index 7636d090a48..0791bd54b27 100755
--- a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
+++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
@@ -21,10 +21,28 @@ is_contained ()
esac
}
+normalize_path ()
+{
+# Normalizes the path to a file or directory, removing all "." and ".."
+# entries. Use pwd -L to explicitly prevent symlink expansion
+local path=$1
+if test -f "$path"; then
+pushd $(dirname $path) > /dev/null 2>&1
+dir_path=$(pwd -L)
+path=$dir_path/$(basename $path)
+popd > /dev/null 2>&1
+elif test -d "$path"; then
+pushd $path > /dev/null 2>&1
+path=$(pwd -L)
+popd > /dev/null 2>&1
+fi
+echo $path
+}
+
add_file ()
{
-local name="$1"
-local path="$1";
+local path=`normalize_path $1`
+local name="$path"
if test -n "$2"; then
name="$2"
fi
@@ -129,7 +147,7 @@ if test -n "$specfile" && test -e "$specfile"; then
fi
ltofile=`$added_gcc -print-prog-name=lto1`
-pluginfile="${ltofile%lto1}liblto_plugin.so"
+pluginfile=`normalize_path "${ltofile%lto1}liblto_plugin.so"`
if test -r "$pluginfile"
then
add_file $pluginfile ${pluginfile#*usr}
@@ -146,6 +164,19 @@ else
exit 1
fi
+link_rel ()
+{
+local target="$1"
+local name="$2"
+local base="$3"
+
+local prefix=`dirname $name`
+
+prefix=`echo $prefix | sed 's,[^/]\+,..,g' | sed 's,^/*,,g'`
+
+ln -s $prefix/$target $base/$name
+}
+
tempdir=`mktemp -d /tmp/iceccenvXX`
new_target_files=
for i in $target_files; do
@@ -159,11 +190,30 @@ for i in $target_files; do
target=$i
;;
esac
-mkdir -p $tempdir/`dirname $target`
-cp -p $path $tempdir/$target
-if test -f $tempdir/$target -a -x $tempdir/$target; then
-strip -s $tempdir/$target 2>/dev/null
+if test "$target" == "$path"; then
+mkdir -p $tempdir/`dirname $target`
+cp -pH $target $tempdir/$target
+
+if test -f $tempdir/$target -a -x $tempdir/$target; then
+strip -s $tempdir/$target 2>/dev/null
+fi
+else
+mkdir -p $tempdir/`dirname $path`
+cp -pH $path $tempdir/$path
+
+mkdir -p $tempdir/`dirname $target`
+# Relative links are used because the files are checked for being
+# executable outside the chroot
+link_rel $path $target $tempdir
+
+if test -f $tempdir/$path -a -x $tempdir/$path; then
+strip -s $tempdir/$path 2>/dev/null
+fi
+
+path=`echo $path | cut -b2-`
+new_target_files="$new_target_files $path"
fi
+
target=`echo $target | cut -b2-`
new_target_files="$new_target_files $target"
done
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 11/17] icecc-create-env: Allow multiple tool aliases
When files are added to the environment, multiple aliases can be given
for the file (by calling add_path multiple times with a second
argument). All of these names will end up with a symlink to the original
file.
Signed-off-by: Joshua Watt
---
.../icecc-create-env/icecc-create-env | 110 ++---
1 file changed, 54 insertions(+), 56 deletions(-)
diff --git
a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
index 90d249df9f3..537e38a9ba0 100755
--- a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
+++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
@@ -4,7 +4,8 @@
# Copyright (C) 2004 by the Icecream Authors
# GPL
-target_files=
+target_paths=
+target_aliases=
is_dynamic_elf ()
{
@@ -32,15 +33,33 @@ fix_rpath ()
fi
}
-is_contained ()
+add_path ()
{
-case " $target_files " in
-*" $1 "* ) return 0 ;;
-*"=$1 "* ) return 0;;
-* ) return 1 ;;
+case " $target_paths " in
+*" $1 "*)
+return 1
+;;
+*)
+target_paths="$target_paths $1"
+return 0
+;;
esac
}
+add_alias ()
+{
+if test "$1" != "$2"; then
+local alias="$1=$2"
+case " $target_aliases " in
+*" $alias "*)
+;;
+*)
+target_aliases="$target_aliases $alias"
+;;
+esac
+fi
+}
+
normalize_path ()
{
# Normalizes the path to a file or directory, removing all "." and ".."
@@ -61,20 +80,17 @@ normalize_path ()
add_file ()
{
-local path=`normalize_path $1`
-local name="$path"
-if test -n "$2"; then
-name="$2"
-fi
-test -z "$name" && return
+local p=`normalize_path $1`
# readlink is required for Yocto, so we can use it
-path=`readlink -f "$path"`
-toadd="$name=$path"
-is_contained "$toadd" && return
-if test -z "$silent"; then
-echo "adding file $toadd"
+local path=`readlink -f "$p"`
+
+add_alias "$path" "$p"
+if test -n "$2"; then
+add_alias "$path" "$2"
fi
-target_files="$target_files $toadd"
+
+add_path "$path" || return
+
if test -x "$path"; then
# Only call ldd when it makes sense
if is_dynamic_elf "$path"; then
@@ -208,52 +224,34 @@ link_rel ()
}
tempdir=`mktemp -d /tmp/iceccenvXX`
-new_target_files=
-for i in $target_files; do
-case $i in
-*=/*)
-target=`echo $i | cut -d= -f1`
-path=`echo $i | cut -d= -f2`
-;;
-*)
-path=$i
-target=$i
-;;
-esac
-if test "$target" == "$path"; then
-mkdir -p $tempdir/`dirname $target`
-cp -pH $target $tempdir/$target
-
-if test -f $tempdir/$target -a -x $tempdir/$target; then
-strip -s $tempdir/$target 2>/dev/null
-fi
-
-fix_rpath $tempdir/$target `dirname $target`
-else
-mkdir -p $tempdir/`dirname $path`
-cp -pH $path $tempdir/$path
+target_files=
+for path in $target_paths; do
+mkdir -p $tempdir/`dirname $path`
+cp -pH $path $tempdir/$path
-mkdir -p $tempdir/`dirname $target`
-# Relative links are used because the files are checked for being
-# executable outside the chroot
-link_rel $path $target $tempdir
+if test -f $tempdir/$path -a -x $tempdir/$path; then
+strip -s $tempdir/$path 2>/dev/null
+fi
-if test -f $tempdir/$path -a -x $tempdir/$path; then
-strip -s $tempdir/$path 2>/dev/null
-fi
+fix_rpath $tempdir/$path `dirname $path`
+target_files="$target_files $path"
+done
-fix_rpath $tempdir/$path `dirname $path`
+for i in $target_aliases; do
+target=`echo $i | cut -d= -f1`
+link_name=`echo $i | cut -d= -f2`
-path=`echo $path | cut -b2-`
-new_target_files="$new_target_files $path"
-fi
+mkdir -p $tempdir/`dirname $link_name`
+# Relative links are used because the files are checked for being
+# executable outside the chroot
+link_rel $target $link_name $tempdir
-target=`echo $target | cut -b2-`
-new_target_files="$new_target_files $target"
+link_name=`echo $link_name | cut -b2-`
+target_files="$target_files $link_name"
done
#sort the files
-target_files=`for i in $new_target_files; do echo $i; done | sort`
+target_files=`for i in $target_files; do echo $i; done | sort`
#test if an archive name was supplied
#if not use the md5 of all files as the archive name
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 06/17] icecc-create-env: Use program interpreter for deps
ldd cannot always be used to determine a program's dependencies
correctly, particularly when the program specifies an alternate program
interpreter (dynamic loader). This commonly happens when using a
uninative tarball. Instead, determine the program's requested
interpreter, and ask it to list the dependencies.
Signed-off-by: Joshua Watt
---
.../icecc-create-env/icecc-create-env| 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git
a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
index c838256f748..7636d090a48 100755
--- a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
+++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
@@ -6,6 +6,12 @@
target_files=
+is_dynamic_elf ()
+{
+# Is the file an dynamically linked ELF executable?
+(file -L "$1" | grep 'ELF' > /dev/null 2>&1) && (! file -L "$1" | grep
'static' > /dev/null 2>&1)
+}
+
is_contained ()
{
case " $target_files " in
@@ -34,8 +40,16 @@ add_file ()
target_files="$target_files $toadd"
if test -x "$path"; then
# Only call ldd when it makes sense
-if file -L "$path" | grep 'ELF' > /dev/null 2>&1; then
-if ! file -L "$path" | grep 'static' > /dev/null 2>&1; then
+if is_dynamic_elf "$path"; then
+# Request the program interpeter (dynamic loader)
+interp=`readelf -w -l "$path" | grep "Requesting program
interpreter:" | sed "s/\s*\[Requesting program interpreter:\s*\(.*\)\]/\1/g"`
+
+if test -n "$interp" && test -x "$interp"; then
+# Use the dynamic loaders --list argument to list the
+# depenencies. The program may have a a different program
+# interpeter (typical when using uninative tarballs), which is
+# why we can't just call ldd.
+#
# ldd now outputs ld as /lib/ld-linux.so.xx on current nptl
based glibc
# this regexp parse the outputs like:
# ldd /usr/bin/gcc
@@ -43,7 +57,7 @@ add_file ()
# libc.so.6 => /lib/tls/libc.so.6 (0xb7e81000)
# /lib/ld-linux.so.2 (0xb7fe8000)
# covering both situations ( with => and without )
-for lib in `ldd "$path" | sed -n 's,^[^/]*\(/[^ ]*\).*,\1,p'`;
do
+for lib in `$interp --list "$path" | sed -n 's,^[^/]*\(/[^
]*\).*,\1,p'`; do
test -f "$lib" || continue
# Check wether the same library also exists in the parent
directory,
# and prefer that on the assumption that it is a more
generic one.
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 12/17] toolchain-shar-extract: Add post-relocate scripts
Recipes can now install post-relocation scripts which will be run when
the SDK is installed.
Signed-off-by: Joshua Watt
---
meta/classes/toolchain-scripts.bbclass | 15 +++
meta/files/toolchain-shar-extract.sh | 8
meta/recipes-core/meta/meta-environment.bb | 2 ++
3 files changed, 25 insertions(+)
diff --git a/meta/classes/toolchain-scripts.bbclass
b/meta/classes/toolchain-scripts.bbclass
index 9bcfe708c7c..eeb320d15a8 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -116,6 +116,21 @@ fi
EOF
}
+toolchain_create_post_relocate_script() {
+ script=$1
+ rm -f $script
+ touch $script
+
+cat >> $script
[OE-core] [PATCH v2 09/17] icecc-create-env: Fix executable rpaths
Executables in the toolchain archive occasionally contain runtime
library search paths (RPATH) that use the $ORIGIN placeholder. However,
in order for that placeholder to work, /proc must be mounted. When
iceccd executes the toolchain in the chroot environment, it doesn't
mount /proc, so it is unable to resolve $ORIGIN resulting in a failure
to find dynamic libraries.
The fix is to replace $ORIGIN in executable RPATH entries with the known
chroot executable path. In order for this to work, the actual real path
to the executable must be resolved to remove any symlinks, otherwise the
calculate $ORIGIN replacement will be wrong. This is done by using
"readlink -f", which is an acceptable dependency because Yocto already
requires it.
Signed-off-by: Joshua Watt
---
.../icecc-create-env/icecc-create-env | 40 --
1 file changed, 37 insertions(+), 3 deletions(-)
diff --git
a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
index 426b093d91c..90d249df9f3 100755
--- a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
+++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
@@ -12,6 +12,26 @@ is_dynamic_elf ()
(file -L "$1" | grep 'ELF' > /dev/null 2>&1) && (! file -L "$1" | grep
'static' > /dev/null 2>&1)
}
+fix_rpath ()
+{
+# Patches the RPATH for a file. When the program is executed in the chroot
+# be iceccd, /proc is not mounted. As such, $ORIGIN can't be resolved. To
+# work around this, replace all instances of $ORIGIN in RPATH with the
+# known chroot path to the executables directory
+local path="$1"
+local origin="$2"
+if ! is_dynamic_elf "$path"; then
+return
+fi
+local new_rpath="`readelf -w -d "$path" | grep RPATH | \
+sed 's/.*\[\(.*\)\]/\1/g' | \
+sed "s,\\\$ORIGIN,/$origin,g"`"
+
+if test -n "$new_rpath"; then
+$PATCHELF --set-rpath "$new_rpath" "$path"
+fi
+}
+
is_contained ()
{
case " $target_files " in
@@ -47,9 +67,8 @@ add_file ()
name="$2"
fi
test -z "$name" && return
-# ls -H isn't really the same as readlink, but
-# readlink is not portable enough.
-path=`ls -H $path`
+# readlink is required for Yocto, so we can use it
+path=`readlink -f "$path"`
toadd="$name=$path"
is_contained "$toadd" && return
if test -z "$silent"; then
@@ -108,6 +127,17 @@ added_as=$1
shift
archive_name=$1
+if test -z "$PATCHELF"; then
+PATCHELF=`which patchelf 2> /dev/null`
+fi
+if test -z "$PATCHELF"; then
+PATCHELF=`which patchelf-uninative 2> /dev/null`
+fi
+if test -z "$PATCHELF"; then
+echo "patchelf is required"
+exit 1
+fi
+
if test -z "$added_gcc" || test -z "$added_gxx" ; then
echo "usage: $0 "
exit 1
@@ -197,6 +227,8 @@ for i in $target_files; do
if test -f $tempdir/$target -a -x $tempdir/$target; then
strip -s $tempdir/$target 2>/dev/null
fi
+
+fix_rpath $tempdir/$target `dirname $target`
else
mkdir -p $tempdir/`dirname $path`
cp -pH $path $tempdir/$path
@@ -210,6 +242,8 @@ for i in $target_files; do
strip -s $tempdir/$path 2>/dev/null
fi
+fix_rpath $tempdir/$path `dirname $path`
+
path=`echo $path | cut -b2-`
new_target_files="$new_target_files $path"
fi
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 08/17] icecc-create-env: Archive directory
Taring up the toolchain is now done by adding the entire working
directory, instead of listing all the files individually. This is done
because the list of files may contain ".." entries, which tar does not
like and strips out, resulting in bad archives. This should result in an
identical archive to what was previously generated.
In addition, symbolic links are no longer dereferenced when creating the
archive, as they are purposely included to provide alternate names for
files
Signed-off-by: Joshua Watt
---
.../icecc-create-env/icecc-create-env/icecc-create-env | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
index 0791bd54b27..426b093d91c 100755
--- a/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
+++ b/meta/recipes-devtools/icecc-create-env/icecc-create-env/icecc-create-env
@@ -256,7 +256,11 @@ if test -z "$silent"; then
fi
cd $tempdir
-tar -czhf "$mydir/$archive_name" $target_files || {
+# Add everything in the temp directory. Tar doesn't like to be given files with
+# ".." in them, which frequently happens in $target_files, and will strip off
+# the path prefix past the offending "..". This makes the archive generate
+# incorrectly
+tar -czf "$mydir/$archive_name" . || {
if test -z "$silent"; then
echo "Couldn't create archive"
fi
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 13/17] icecc-toolchain: Add SDK icecream setup
Icecream can now be optionally included in the generated SDK by
including nativesdk-icecc-toolchain to TOOLCHAIN_HOST_TASK. When the SDK
is installed a post-relocation script will check if icecc exists and if
so will generate the toolchain environment.
Signed-off-by: Joshua Watt
---
.../icecc-toolchain/icecc-toolchain/icecc-env.sh | 37 +++
.../icecc-toolchain/icecc-toolchain/icecc-setup.sh | 43 ++
.../nativesdk-icecc-toolchain_0.1.bb | 38 +++
3 files changed, 118 insertions(+)
create mode 100644
meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
create mode 100644
meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh
create mode 100644
meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb
diff --git a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
new file mode 100644
index 000..9c9bb4dc4ea
--- /dev/null
+++ b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
@@ -0,0 +1,37 @@
+#! /bin/sh
+# Copyright (c) 2018 Joshua Watt, Garmin International,Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+if [ -z "$ICECC_PATH" ]; then
+ICECC_PATH=$(which icecc 2> /dev/null)
+fi
+
+if [ -n "$ICECC_PATH" ]; then
+export ICECC_PATH
+export
ICECC_VERSION="$OECORE_NATIVE_SYSROOT/usr/share/icecream/@TOOLCHAIN_ENV@"
+export ICECC="$(which ${CROSS_COMPILE}gcc)"
+export ICECXX="$(which ${CROSS_COMPILE}g++)"
+export ICEAS="$(which ${CROSS_COMPILE}as)"
+export PATH="$OECORE_NATIVE_SYSROOT/usr/share/icecream/bin:$PATH"
+else
+echo "Icecc not found. Disabling distributed compiling"
+fi
+
diff --git
a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh
b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh
new file mode 100644
index 000..04808265781
--- /dev/null
+++ b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-setup.sh
@@ -0,0 +1,43 @@
+#! /bin/sh
+# Copyright (c) 2018 Joshua Watt, Garmin International,Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+# Setup environment
+for env_setup_script in `ls $1/environment-setup-*`; do
+ . $env_setup_script
+done
+
+# ICECC_PATH will have been found icecc-env.sh
+if [ -z "$ICECC_PATH" ]; then
+exit 0
+fi
+
+echo "Setting up IceCream distributed compiling..."
+
+# Create the environment
+mkdir -p "`dirname $ICECC_VERSION`"
+icecc-create-env $ICECC $ICECXX $ICEAS $ICECC_VERSION || exit $?
+
+# Create symbolic links
+d="$OECORE_NATIVE_SYSROOT/usr/share/icecream/bin"
+mkdir -p "$d"
+ln -s "$ICECC_PATH" "$d/${CROSS_COMPILE}gcc"
+ln -s "$ICECC_PATH" "$d/${CROSS_COMPILE}g++"
diff --git
a/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.1.bb
b/meta/recipes-devtools/icecc-toolchain/nativesdk-icecc-toolchain_0.
[OE-core] [PATCH v2 14/17] icecc.bbclass: Add Icecream support to SDK
If icecc is inherited, generated SDKs will automatically have optional
support for compiling using the Icecream distributed compiler
Signed-off-by: Joshua Watt
---
meta/classes/icecc.bbclass | 7 +++
1 file changed, 7 insertions(+)
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 9d5eaed57ce..8492ece60c3 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -346,3 +346,10 @@ do_compile_kernelmodules_prepend() {
do_install_prepend() {
set_icecc_env
}
+
+# IceCream is not (currently) supported in the extensible SDK
+ICECC_SDK_HOST_TASK = "nativesdk-icecc-toolchain"
+ICECC_SDK_HOST_TASK_task-populate-sdk-ext = ""
+
+# Add the toolchain scripts to the SDK
+TOOLCHAIN_HOST_TASK_append = " ${ICECC_SDK_HOST_TASK}"
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 16/17] icecc-toolchain: Disable caret workaround
Icecream has a behavior that causes it to recompile files locally if gcc
generates any warnings or errors. The reason for this is that GCC tries
to re-read the input file in order to display the offending line with a
caret below it, which doesn't work in the remote chroot.
Default to disabling this this workaround and add
-fno-diagnostics-show-caret to the GCC flags so that errors and warnings
generated by GCC do not show erroneous results. Users can override this
default in the SDK by defining ICECC_CARET_WORKAROUND="1" either before
or after sourcing the SDK environment.
Signed-off-by: Joshua Watt
---
.../icecc-toolchain/icecc-toolchain/icecc-env.sh | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
index 9c9bb4dc4ea..94760076bfa 100644
--- a/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
+++ b/meta/recipes-devtools/icecc-toolchain/icecc-toolchain/icecc-env.sh
@@ -25,7 +25,19 @@ if [ -z "$ICECC_PATH" ]; then
fi
if [ -n "$ICECC_PATH" ]; then
-export ICECC_PATH
+# Default to disabling the caret workaround. If set to "1", icecc will
+# locally recompile any files that have warnings, which can adversely
+# affect performance.
+#
+# See: https://github.com/icecc/icecream/issues/190
+if [ -z "$ICECC_CARET_WORKAROUND" ]; then
+ICECC_CARET_WORKAROUND="0"
+fi
+if [ "$ICECC_CARET_WORKAROUND" != "1" ]; then
+CFLAGS="$CFLAGS -fno-diagnostics-show-caret"
+CXXFLAGS="$CXXFLAGS -fno-diagnostics-show-caret"
+fi
+export ICECC_PATH ICECC_CARET_WORKAROUND
export
ICECC_VERSION="$OECORE_NATIVE_SYSROOT/usr/share/icecream/@TOOLCHAIN_ENV@"
export ICECC="$(which ${CROSS_COMPILE}gcc)"
export ICECXX="$(which ${CROSS_COMPILE}g++)"
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 15/17] icecc.bbclass: Disable caret workaround by default
Icecream has a behavior that causes it to recompile files locally if gcc
generates any warnings or errors. The reason for this is that GCC tries
to re-read the input file in order to display the offending line with a
caret below it, which doesn't work in the remote chroot.
Default to disabling this this workaround and add
-fno-diagnostics-show-caret to the GCC flags so that errors and warnings
generated by GCC do not show erroneous results.
Signed-off-by: Joshua Watt
---
meta/classes/icecc.bbclass | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 8492ece60c3..e8f7eab1bc1 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -28,10 +28,23 @@
#Error checking is kept to minimum so double check any parameters you pass to
the class
###
-BB_HASHBASE_WHITELIST += "ICECC_PARALLEL_MAKE ICECC_DISABLED
ICECC_USER_PACKAGE_BL ICECC_USER_CLASS_BL ICECC_USER_PACKAGE_WL ICECC_PATH
ICECC_ENV_EXEC"
+BB_HASHBASE_WHITELIST += "ICECC_PARALLEL_MAKE ICECC_DISABLED
ICECC_USER_PACKAGE_BL \
+ICECC_USER_CLASS_BL ICECC_USER_PACKAGE_WL ICECC_PATH ICECC_ENV_EXEC \
+ICECC_CARET_WORKAROUND ICECC_CFLAGS"
ICECC_ENV_EXEC ?= "${STAGING_BINDIR_NATIVE}/icecc-create-env"
+# Default to disabling the caret workaround, If set to "1" in local.conf, icecc
+# will locally recompile any files that have warnings, which can adversely
+# affect performance.
+#
+# See: https://github.com/icecc/icecream/issues/190
+export ICECC_CARET_WORKAROUND ??= "0"
+
+ICECC_CFLAGS = ""
+CFLAGS += "${ICECC_CFLAGS}"
+CXXFLAGS += "${ICECC_CFLAGS}"
+
def icecc_dep_prepend(d):
# INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not
# we need that built is the responsibility of the patch function / class,
not
@@ -170,6 +183,11 @@ def icecc_version(bb, d):
if not d.getVar('PARALLEL_MAKE', False) == "" and parallel:
d.setVar("PARALLEL_MAKE", parallel)
+# Disable showing the caret in the GCC compiler output if the workaround is
+# disabled
+if d.getVar('ICECC_CARET_WORKAROUND', True) == '0':
+d.setVar('ICECC_CFLAGS', '-fno-diagnostics-show-caret')
+
if icecc_is_native(bb, d):
archive_name = "local-host-env"
elif d.expand('${HOST_PREFIX}') == "":
--
2.14.3
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 17/17] elfutils: Use fallthrough attribute
Patches elfutils to use the fallthrough attribute instead of comments to satisfy the -Wimplicit-fallthrough warning. Using comments is insufficient when compiling remotely with Icecream because the file gets pre-processed locally, removing the comments Signed-off-by: Joshua Watt --- meta/recipes-devtools/elfutils/elfutils_0.170.bb | 4 +- .../files/0001-Use-fallthrough-attribute.patch | 791 + .../elfutils/files/debian/fallthrough.patch| 36 - 3 files changed, 793 insertions(+), 38 deletions(-) create mode 100644 meta/recipes-devtools/elfutils/files/0001-Use-fallthrough-attribute.patch delete mode 100644 meta/recipes-devtools/elfutils/files/debian/fallthrough.patch diff --git a/meta/recipes-devtools/elfutils/elfutils_0.170.bb b/meta/recipes-devtools/elfutils/elfutils_0.170.bb index 3b81e287b01..9242aea26b5 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.170.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.170.bb @@ -32,8 +32,8 @@ SRC_URI += "\ file://debian/0002-Add-support-for-mips64-abis-in-mips_retval.c.patch \ file://debian/0003-Add-mips-n64-relocation-format-hack.patch \ " -# Fix the patches from Debian with GCC7 -SRC_URI += "file://debian/fallthrough.patch" +# Fix fallthrough with GCC7 +SRC_URI += "file://0001-Use-fallthrough-attribute.patch" # The buildsystem wants to generate 2 .h files from source using a binary it just built, # which can not pass the cross compiling, so let's work around it by adding 2 .h files diff --git a/meta/recipes-devtools/elfutils/files/0001-Use-fallthrough-attribute.patch b/meta/recipes-devtools/elfutils/files/0001-Use-fallthrough-attribute.patch new file mode 100644 index 000..5e2155b3c66 --- /dev/null +++ b/meta/recipes-devtools/elfutils/files/0001-Use-fallthrough-attribute.patch @@ -0,0 +1,791 @@ +From 5cb883f67d00a63531ef195c242763d36b1905ca Mon Sep 17 00:00:00 2001 +From: Joshua Watt +Date: Fri, 9 Feb 2018 12:46:38 -0600 +Subject: [PATCH] Use fallthrough attribute + +Use __attribute__ ((fallthrough)) to indicate switch case fall through +instead of a comment. This ensure that the fallthrough warning is not +triggered even if the file is pre-processed (hence stripping the +comments) before it is compiled. + +The actual fallback implementation is hidden behind a FALLBACK macro in +case the compiler doesn't support it. + +Finally, the -Wimplict-fallthrough warning was upgraded to only allow +the attribute to satisfy it; a comment alone is no longer sufficient. + +Signed-off-by: Joshua Watt + +Upstream-Status: Submitted [1] + +[1] https://sourceware.org/ml/elfutils-devel/2018-q1/msg00027.html +--- + backends/aarch64_retval.c| 2 +- + backends/alpha_retval.c | 4 ++-- + backends/arm_regs.c | 2 +- + backends/arm_retval.c| 2 +- + backends/i386_regs.c | 2 +- + backends/i386_retval.c | 4 ++-- + backends/ia64_retval.c | 2 +- + backends/linux-core-note.c | 2 +- + backends/m68k_retval.c | 4 ++-- + backends/mips_retval.c | 4 ++-- + backends/parisc_retval.c | 5 +++-- + backends/ppc64_retval.c | 6 +++--- + backends/ppc_regs.c | 2 +- + backends/ppc_retval.c| 4 ++-- + backends/s390_retval.c | 4 ++-- + backends/sh_retval.c | 2 +- + backends/sparc_retval.c | 2 +- + backends/tilegx_retval.c | 4 ++-- + backends/x86_64_regs.c | 2 +- + backends/x86_64_retval.c | 2 +- + config/eu.am | 4 +++- + configure.ac | 6 ++ + lib/eu-config.h | 7 +++ + libcpu/i386_disasm.c | 2 +- + libcpu/i386_parse.c | 4 ++-- + libdw/cfi.c | 4 ++-- + libdw/dwarf_frame_register.c | 2 +- + libdwfl/dwfl_report_elf.c| 2 +- + libdwfl/frame_unwind.c | 2 +- + libebl/eblobjnote.c | 2 +- + libelf/elf32_updatenull.c| 2 +- + libelf/elf_begin.c | 4 ++-- + libelf/elf_cntl.c| 2 +- + src/addr2line.c | 2 +- + src/elfcompress.c| 2 +- + src/elflint.c| 8 + src/objdump.c| 2 +- + src/readelf.c| 8 + src/strings.c| 2 +- + tests/backtrace.c| 2 +- + tests/elfstrmerge.c | 3 ++- + 41 files changed, 75 insertions(+), 58 deletions(-) + +diff --git a/backends/aarch64_retval.c b/backends/aarch64_retval.c +index 68de307..1308340 100644 +--- a/backends/aarch64_retval.c b/backends/aarch64_retval.c +@@ -292,7 +292,7 @@ aarch64_return_value_location (Dwarf_Die *functypedie, const Dwarf_Op **locp) + assert (count > 0); + if (count <= 4) + return pass_hfa (locp, base_size, count); +-/* Fall through. */ ++FALLTHROUGH; + + case 1: + /* Not a HFA. */ +diff --git a/backends/alpha_retval.c b/backends/alpha_retval.c +index 53dbfa4..d9bae3b 100644 +--- a/backends/alpha_retval.c b/backends/alpha_retval.c +@@ -85,7 +85,7 @@ alpha_retur
[OE-core] [PATCH v2 1/2] fontconfig: fix upstream version check
In the case of fontconfig, version x.x.9x are release candidates
for next version.
Signed-off-by: Maxin B. John
---
meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
index fa5f0ee..1b4f87b 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
@@ -28,6 +28,7 @@ SRC_URI =
"http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb"
SRC_URI[sha256sum] =
"064b9ebf060c9e77011733ac9dc0e2ce92870b574cca2405e11f5353a683c334"
+UPSTREAM_CHECK_REGEX = "fontconfig-(?P\d+\.\d+\.(?!9\d+)\d+)\.tar\.gz"
do_configure_prepend() {
# work around https://bugs.freedesktop.org/show_bug.cgi?id=101280
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/2] fontconfig: fix upstream version check
On 02/12/2018 07:03 PM, Maxin B. John wrote: In the case of fontconfig, version x.x.9x are release candidates for next version. +UPSTREAM_CHECK_REGEX = "fontconfig-(?P\d+\.\d+\.(?!9\d+)\d+)\.tar\.gz" Drop the \.gz part. Upstreams can and do switch to anything else at any point - bz2, xz, lz, whateverz. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/4] fontconfig: fix upstream version check
Hi Alex, On Mon, Feb 12, 2018 at 04:43:54PM +0200, Alexander Kanavin wrote: > On 02/12/2018 04:35 PM, Maxin B. John wrote: > >>This is a good place to practice: > >>http://regex101.com > > > >Thanks. I will update and send a v2. > > To save you a bit of time, I think the right construct should be either > > (9|[0-8]\d+) > > or > > (?!9\d+)\d+ This looks much better. Thanks! > > Alex Thanks and Regards, Maxin -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/2] libinput: fix upstream version check
Skip RC releases for libinput which follow the pattern: x.x.9xx
Signed-off-by: Maxin B. John
---
meta/recipes-graphics/wayland/libinput_1.9.4.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-graphics/wayland/libinput_1.9.4.bb
b/meta/recipes-graphics/wayland/libinput_1.9.4.bb
index 2843314..3879356 100644
--- a/meta/recipes-graphics/wayland/libinput_1.9.4.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.9.4.bb
@@ -12,6 +12,7 @@ SRC_URI =
"http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
SRC_URI[md5sum] = "8b43d07d1698fb207a0492fc67554d4f"
SRC_URI[sha256sum] =
"0bcdbd4c4e3c2a2db322fbdf2ef3284f2e6d6fb7be3af80e6d8de7783f675190"
+UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)\.tar\.xz"
inherit meson pkgconfig lib_package
PACKAGECONFIG ??= ""
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 2/2] libinput: fix upstream version check
On 02/12/2018 07:03 PM, Maxin B. John wrote: Skip RC releases for libinput which follow the pattern: x.x.9xx +UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)\.tar\.xz" Same here: dom't hardcode the compression format. Otherwise, seems fine. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/2] libinput: fix upstream version check
Skip RC releases for libinput which follow the pattern: x.x.9xx
Signed-off-by: Maxin B. John
---
meta/recipes-graphics/wayland/libinput_1.9.4.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-graphics/wayland/libinput_1.9.4.bb
b/meta/recipes-graphics/wayland/libinput_1.9.4.bb
index 2843314..67a49df 100644
--- a/meta/recipes-graphics/wayland/libinput_1.9.4.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.9.4.bb
@@ -12,6 +12,7 @@ SRC_URI =
"http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
SRC_URI[md5sum] = "8b43d07d1698fb207a0492fc67554d4f"
SRC_URI[sha256sum] =
"0bcdbd4c4e3c2a2db322fbdf2ef3284f2e6d6fb7be3af80e6d8de7783f675190"
+UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)"
inherit meson pkgconfig lib_package
PACKAGECONFIG ??= ""
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/2] fontconfig: fix upstream version check
In the case of fontconfig, version x.x.9x are release candidates
for next version.
Signed-off-by: Maxin B. John
---
meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
index fa5f0ee..d4cbce8 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb
@@ -28,6 +28,7 @@ SRC_URI =
"http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb"
SRC_URI[sha256sum] =
"064b9ebf060c9e77011733ac9dc0e2ce92870b574cca2405e11f5353a683c334"
+UPSTREAM_CHECK_REGEX = "fontconfig-(?P\d+\.\d+\.(?!9\d+)\d+)"
do_configure_prepend() {
# work around https://bugs.freedesktop.org/show_bug.cgi?id=101280
--
2.4.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 2/2] libinput: fix upstream version check
Hi, On Mon, Feb 12, 2018 at 07:05:27PM +0200, Alexander Kanavin wrote: > On 02/12/2018 07:03 PM, Maxin B. John wrote: > >Skip RC releases for libinput which follow the pattern: x.x.9xx > >+UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)\.tar\.xz" > > Same here: dom't hardcode the compression format. Otherwise, seems fine. Updated and sent v3. Thanks. > Alex Best Regards, Maxin -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] utils.py: add parallel make helpers
The code to extract the integer number of parallel build threads and
construct a new argument from them has started to be copied in multiple
locations, so create two new helper utilities to aid recipes.
The first helper (parallel_make()) extracts the integer number of
parallel build threads from PARALLEL_MAKE. The second
(parallel_make_argument()) does the same and then puts the result back
into a format string, optionally clamping it to some maximum value.
Additionally, rework the oe-core recipes that were manually doing this
to use the new helper utilities.
Signed-off-by: Joshua Watt
---
meta/classes/go.bbclass | 19 +---
meta/classes/waf.bbclass | 24 +---
meta/lib/oe/utils.py | 43
meta/recipes-core/ovmf/ovmf_git.bb | 2 +-
meta/recipes-support/boost/boost.inc | 24 +---
5 files changed, 47 insertions(+), 65 deletions(-)
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass
index 09b01a84c37..7ecd8c92541 100644
--- a/meta/classes/go.bbclass
+++ b/meta/classes/go.bbclass
@@ -1,23 +1,6 @@
inherit goarch ptest
-def get_go_parallel_make(d):
-pm = (d.getVar('PARALLEL_MAKE') or '').split()
-# look for '-j' and throw other options (e.g. '-l') away
-# because they might have a different meaning in golang
-while pm:
-opt = pm.pop(0)
-if opt == '-j':
-v = pm.pop(0)
-elif opt.startswith('-j'):
-v = opt[2:].strip()
-else:
-continue
-
-return '-p %d' % int(v)
-
-return ""
-
-GO_PARALLEL_BUILD ?= "${@get_go_parallel_make(d)}"
+GO_PARALLEL_BUILD ?= "${@oe.utils.parallel_make_argument(d, '-p %d')}"
GOROOT_class-native = "${STAGING_LIBDIR_NATIVE}/go"
GOROOT_class-nativesdk = "${STAGING_DIR_TARGET}${libdir}/go"
diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass
index bdbdc56767c..f9a851d0759 100644
--- a/meta/classes/waf.bbclass
+++ b/meta/classes/waf.bbclass
@@ -3,28 +3,6 @@ DISABLE_STATIC = ""
EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
-def get_waf_parallel_make(d):
-pm = d.getVar('PARALLEL_MAKE')
-if pm:
-# look for '-j' and throw other options (e.g. '-l') away
-# because they might have different meaning in bjam
-pm = pm.split()
-while pm:
-v = None
-opt = pm.pop(0)
-if opt == '-j':
-v = pm.pop(0)
-elif opt.startswith('-j'):
-v = opt[2:].strip()
-else:
-v = None
-
-if v:
-v = min(64, int(v))
-return '-j' + str(v)
-
-return ""
-
python waf_preconfigure() {
import subprocess
from distutils.version import StrictVersion
@@ -47,7 +25,7 @@ waf_do_configure() {
do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+"
waf_do_compile() {
- ${S}/waf build ${@get_waf_parallel_make(d)}
+ ${S}/waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}
}
waf_do_install() {
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 7a79d752b69..ec91927233a 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -156,6 +156,49 @@ def any_distro_features(d, features, truevalue="1",
falsevalue=""):
"""
return bb.utils.contains_any("DISTRO_FEATURES", features, truevalue,
falsevalue, d)
+def parallel_make(d):
+"""
+Return the integer value for the number of parallel threads to use when
+building, scraped out of PARALLEL_MAKE. If no parallelization option is
+found, returns None
+
+e.g. if PARALLEL_MAKE = "-j 10", this will return 10 as an integer.
+"""
+pm = (d.getVar('PARALLEL_MAKE') or '').split()
+# look for '-j' and throw other options (e.g. '-l') away
+while pm:
+opt = pm.pop(0)
+if opt == '-j':
+v = pm.pop(0)
+elif opt.startswith('-j'):
+v = opt[2:].strip()
+else:
+continue
+
+return int(v)
+
+return None
+
+def parallel_make_argument(d, fmt, limit=None):
+"""
+Helper utility to construct a parallel make argument from the number of
+parallel threads specified in PARALLEL_MAKE.
+
+Returns the input format string `fmt` where a single '%d' will be expanded
+with the number of parallel threads to use. If `limit` is specified, the
+number of parallel threads will be no larger than it. If no parallelization
+option is found in PARALLEL_MAKE, returns an empty string
+
+e.g. if PARALLEL_MAKE = "-j 10", parallel_make_argument(d, "-n %d") will
return
+"-n 10"
+"""
+v = parallel_make(d)
+if v:
+if limit:
+v = max(limit, v)
+return fmt % v
+return ''
+
def packages_filter_out_system(d):
"""
Return a list of packages from PACKAGES with the "system" packages such as
diff --git a/meta/recipes-core/ovmf/ovmf_git.bb
b/m
Re: [OE-core] [PATCH] site/common-linux: coreutils: get the uptime program to work
On Mon, Feb 12, 2018 at 1:41 AM, Sean Nyekjaer wrote:
> coreutils configure script needs to know whether /proc/uptime is
> available, but this is not possible in a cross-compilation
> context. This leads to an uptime program that fails to work on the
> target, as it has been compiled without /proc/uptime reading support.
>
> This commit fixes that by telling coreutils at configure time that
> /proc/uptime will be available on the target (which seems to be a
> reasonable assumption on Linux systems).
>
> This commit is made with great inspiration from Thomas Petazzoni's
> patch to buildroot to fix the same issue.
>
is there a knob in kernel to disable /proc/uptime ?
if so then this patch as such will probably will cause failures for such
configs. But if there is no such knob then perhaps its ok.
> Signed-off-by: Sean Nyekjaer
> ---
> meta/site/common-linux | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/meta/site/common-linux b/meta/site/common-linux
> index 2958716..71ec961 100644
> --- a/meta/site/common-linux
> +++ b/meta/site/common-linux
> @@ -48,6 +48,7 @@ hw_cv_func_vsnprintf_c99=${hw_cv_func_vsnprintf_c99=yes}
>
> # coreutils
> gl_cv_func_fstatat_zero_flag=${gl_cv_func_fstatat_zero_flag=yes}
> +gl_cv_have_proc_uptime=${gl_cv_have_proc_uptime=yes}
>
> # mysql
> ac_cv_sys_restartable_syscalls=${ac_cv_sys_restartable_syscalls=yes}
> --
> 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
Re: [OE-core] [PATCH] site/common-linux: coreutils: get the uptime program to work
On Mon, Feb 12, 2018 at 12:10 PM, Khem Raj wrote: > On Mon, Feb 12, 2018 at 1:41 AM, Sean Nyekjaer > wrote: >> coreutils configure script needs to know whether /proc/uptime is >> available, but this is not possible in a cross-compilation >> context. This leads to an uptime program that fails to work on the >> target, as it has been compiled without /proc/uptime reading support. >> >> This commit fixes that by telling coreutils at configure time that >> /proc/uptime will be available on the target (which seems to be a >> reasonable assumption on Linux systems). >> >> This commit is made with great inspiration from Thomas Petazzoni's >> patch to buildroot to fix the same issue. >> > > is there a knob in kernel to disable /proc/uptime ? No, it's unconditional: https://github.com/torvalds/linux/blob/master/fs/proc/Makefile#L23 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Regarding Patch ID: 132816
Hello, I'm new to this forum and didn't know to where to report an issue. I'm contacting you regarding the patch ID 132816 ( cmake: improve CMAKE_SYSTEM_PROCESSOR assignment in nativesdk). If SDKTARGETSYSROOT is "/sysroots/cortexa9hf-neon-poky-linux-gnueabi" this patch sets the CMAKE_SYSTEM_PROCESSOR as "cortexa9hf-neon-poky" instead of "cortexa9hf-neon". This patch works if SDKTARGETSYSROOT is "/sysroots/core2-32-poky-linux". Thanks, Chaitanya -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Backport OpenSSL 1.0.2n
I'm working with the pyro release, and noticed that it's still using openssl 1.0.2k. The latest version in the 1.0.2 series is 1.0.2n, which is already available on master. Is there a reason that the newer version hasn't made it back to pyro (or rocko, which is on 1.0.2m)? I know new package versions are not normally backported, but looking at the change log, I only see one change mentioned that is not a CVE fix (the 1.0.2l release): https://urldefense.proofpoint.com/v2/url?u=https-3A__git.openssl.org_-3Fp-3Dopenssl.git-3Ba-3Dblob-3Bf-3DCHANGES-3Bh-3Df2fc31a25c54b12fc7db40c03d39f9a68b9ec0e5-3Bhb-3De5bba24cd8bb3e5127a578b85c6edf013a38ea6d&d=DwIBAg&c=zVFQZQ67ypsA9mYKSCqWmQHiVkCCaN-Gb60_N6TVnLk&r=ak_pMnzuMKndrbvJGok-seoFenjTGhP3oPNUzKUOwzHhGpNMwSJsaHunyXDlBGjO&m=3JjPoO2FeIBSz3wggiqKGtYceKB5t__oSe8p6yDsQfM&s=oeCHfmZkkXVFW1aoMZsolXeFvKI9RTUtbdGBj61kheQ&e= I can send patches to bring 1.0.2n to rocko and pyro if they will be accepted. Thanks, Robert -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] ltp: fix fanotify06 test
This patch fixes the fanotify06 test.
http://lists.linux.it/pipermail/ltp/2018-January/006915.html
Signed-off-by: Anders Roxell
---
...anotify-the-mount-fs_type-should-be-given.patch | 38 ++
meta/recipes-extended/ltp/ltp_20180118.bb | 1 +
2 files changed, 39 insertions(+)
create mode 100644
meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch
diff --git
a/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch
b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch
new file mode 100644
index 00..6b4dc30712
--- /dev/null
+++
b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch
@@ -0,0 +1,38 @@
+From c1b440c04d86adf77308fcd173d41dbfc6e66299 Mon Sep 17 00:00:00 2001
+From: Li Wang
+Date: Tue, 23 Jan 2018 16:23:14 +0800
+Subject: [PATCH 40/40] fanotify: the mount fs_type should be given
+
+This commmit 28507e514c(safe_mount: Do not try mount() syscall for FUSE fs)
+involves FUSE fs check in safe_mount(), so we should give the "fs_type" when
+calling that in case the system kill our program.
+
+ cmdline="fanotify06"
+ contacts=""
+ analysis=exit
+ <<>>
+ tst_test.c:980: INFO: Timeout per run is 0h 10m 00s
+ tst_test.c:1025: BROK: Test killed by SIGSEGV!
+
+Signed-off-by: Li Wang
+Upstream-Status: Submitted
+---
+ testcases/kernel/syscalls/fanotify/fanotify06.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c
b/testcases/kernel/syscalls/fanotify/fanotify06.c
+index e63e457a1..8cbe1adc6 100644
+--- a/testcases/kernel/syscalls/fanotify/fanotify06.c
b/testcases/kernel/syscalls/fanotify/fanotify06.c
+@@ -221,7 +221,7 @@ void test01(void)
+ static void setup(void)
+ {
+ SAFE_MKDIR(MOUNT_NAME, 0755);
+- SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL);
++ SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, "none", MS_BIND, NULL);
+ mount_created = 1;
+ SAFE_CHDIR(MOUNT_NAME);
+
+--
+2.11.0
+
diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb
b/meta/recipes-extended/ltp/ltp_20180118.bb
index a0dd9aa19b..4c6be16e30 100644
--- a/meta/recipes-extended/ltp/ltp_20180118.bb
+++ b/meta/recipes-extended/ltp/ltp_20180118.bb
@@ -44,6 +44,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0035-fix-test_proc_kill-hang.patch \
file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \
+ file://0040-fanotify-the-mount-fs_type-should-be-given.patch \
"
S = "${WORKDIR}/git"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for ltp: fix fanotify06 test
== Series Details == Series: ltp: fix fanotify06 test Revision: 1 URL : https://patchwork.openembedded.org/series/10951/ 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 Upstream-Status is Submitted, but it is not mentioned where [test_upstream_status_presence_format] Suggested fixInclude where 0040-fanotify-the-mount-fs_type-should-be-given.patch was submitted Current Upstream-Status: Submitted Standard format Upstream-Status: Submitted [where] 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] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines 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] rxvt-unicode: add missing pkgconfig
The configure script uses pkg-config in RXVT_CHECK_MODULES and falls
back to disabling features that were enabled in EXTRA_OECONF if
pkg-config isn't found.
Signed-off-by: Justin Bronder
---
meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
index 4d5daa661c..b568f04580 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc
@@ -12,7 +12,7 @@ SRC_URI =
"http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${PV}.tar.bz2
file://rxvt.desktop \
file://rxvt.png"
-inherit autotools update-alternatives
+inherit autotools pkgconfig update-alternatives
PROVIDES = "virtual/x-terminal-emulator"
ALTERNATIVE_${PN} = "x-terminal-emulator"
--
2.13.6
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] ltp: fix fanotify06 test
This patch fixes the fanotify06 test.
http://lists.linux.it/pipermail/ltp/2018-January/006915.html
Signed-off-by: Anders Roxell
---
...anotify-the-mount-fs_type-should-be-given.patch | 38 ++
meta/recipes-extended/ltp/ltp_20180118.bb | 1 +
2 files changed, 39 insertions(+)
create mode 100644
meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch
diff --git
a/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch
b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch
new file mode 100644
index 00..e57b6cd91e
--- /dev/null
+++
b/meta/recipes-extended/ltp/ltp/0040-fanotify-the-mount-fs_type-should-be-given.patch
@@ -0,0 +1,38 @@
+From c1b440c04d86adf77308fcd173d41dbfc6e66299 Mon Sep 17 00:00:00 2001
+From: Li Wang
+Date: Tue, 23 Jan 2018 16:23:14 +0800
+Subject: [PATCH 40/40] fanotify: the mount fs_type should be given
+
+This commmit 28507e514c(safe_mount: Do not try mount() syscall for FUSE fs)
+involves FUSE fs check in safe_mount(), so we should give the "fs_type" when
+calling that in case the system kill our program.
+
+ cmdline="fanotify06"
+ contacts=""
+ analysis=exit
+ <<>>
+ tst_test.c:980: INFO: Timeout per run is 0h 10m 00s
+ tst_test.c:1025: BROK: Test killed by SIGSEGV!
+
+Signed-off-by: Li Wang
+Upstream-Status: Submitted
[http://lists.linux.it/pipermail/ltp/2018-January/006915.html]
+---
+ testcases/kernel/syscalls/fanotify/fanotify06.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c
b/testcases/kernel/syscalls/fanotify/fanotify06.c
+index e63e457a1..8cbe1adc6 100644
+--- a/testcases/kernel/syscalls/fanotify/fanotify06.c
b/testcases/kernel/syscalls/fanotify/fanotify06.c
+@@ -221,7 +221,7 @@ void test01(void)
+ static void setup(void)
+ {
+ SAFE_MKDIR(MOUNT_NAME, 0755);
+- SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, NULL, MS_BIND, NULL);
++ SAFE_MOUNT(MOUNT_NAME, MOUNT_NAME, "none", MS_BIND, NULL);
+ mount_created = 1;
+ SAFE_CHDIR(MOUNT_NAME);
+
+--
+2.11.0
+
diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb
b/meta/recipes-extended/ltp/ltp_20180118.bb
index 369b98df9b..88f3bb4879 100644
--- a/meta/recipes-extended/ltp/ltp_20180118.bb
+++ b/meta/recipes-extended/ltp/ltp_20180118.bb
@@ -43,6 +43,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0035-fix-test_proc_kill-hang.patch \
file://0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
file://0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch \
+ file://0040-fanotify-the-mount-fs_type-should-be-given.patch \
"
S = "${WORKDIR}/git"
--
2.11.0
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] build-appliance-image: update version to 19.0.0
> -Original Message- > From: Alexander Kanavin [mailto:alexander.kana...@linux.intel.com] > Sent: Monday, February 12, 2018 4:43 PM > To: Chang, Rebecca Swee Fun ; > openembedded-core@lists.openembedded.org > Subject: Re: [OE-core] [PATCH 2/2] build-appliance-image: update version to > 19.0.0 > > On 02/12/2018 10:27 AM, Chang Rebecca Swee Fun wrote: > > Updating recipe to reflect latest poky version and SRCREV points to > > latest master HEAD revision. > > The latest poky version is 18.0.1, and I think SRCREV should point to that as > well, > not to the tip of master? 19.0.0 isn't yet released. Build-appliance-image normally points to the tip of master, should I change this in stable branch instead while in master pointing to HEAD? Rebecca -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v7] do_image: Implement IMAGE_ROOTFS_EXCLUDE_PATH feature.
On 01/25/2018 02:33 AM, Kristian Amlie wrote:
This is a direct followup from the earlier 6602392db3d39 commit in
wic. It works more or less the same way: The variable specifies a list
of directories relative to the root of the rootfs, and these
directories will be excluded from the resulting rootfs image. If an
entry ends with a slash, only the contents are omitted, not the
directory itself.
Since the intended use of the variable is to exclude certain
directories from the rootfs, and then include said directories in
other partitions, it is not natural for this variable to be respected
for image creators that create multi partition images. These can turn
the feature off locally by defining:
do_image_myfs[respect_exclude_path] = "0"
Specifically, "wic" and "multiubi" come with the feature disabled.
Signed-off-by: Kristian Amlie
---
meta/classes/image.bbclass | 84 +++-
meta/classes/image_types.bbclass | 1 +
meta/classes/image_types_wic.bbclass | 1 +
3 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 4531aa2..849a19c 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -117,7 +117,8 @@ def rootfs_variables(d):
'IMAGE_ROOTFS_MAXSIZE','IMAGE_NAME','IMAGE_LINK_NAME','IMAGE_MANIFEST','DEPLOY_DIR_IMAGE','IMAGE_FSTYPES','IMAGE_INSTALL_COMPLEMENTARY','IMAGE_LINGUAS',
'MULTILIBRE_ALLOW_REP','MULTILIB_TEMP_ROOTFS','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS',
'PACKAGE_ARCHS','PACKAGE_CLASSES','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','OVERRIDES','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI','INTERCEPT_DIR','USE_DEVFS',
- 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED',
'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY',
'REPRODUCIBLE_TIMESTAMP_ROOTFS']
+ 'CONVERSIONTYPES', 'IMAGE_GEN_DEBUGFS', 'ROOTFS_RO_UNNEEDED',
'IMGDEPLOYDIR', 'PACKAGE_EXCLUDE_COMPLEMENTARY',
'REPRODUCIBLE_TIMESTAMP_ROOTFS',
+ 'IMAGE_ROOTFS_EXCLUDE_PATH']
variables.extend(rootfs_command_variables(d))
variables.extend(variable_depends(d))
return " ".join(variables)
@@ -508,8 +509,9 @@ python () {
d.setVarFlag(task, 'func', '1')
d.setVarFlag(task, 'fakeroot', '1')
-d.appendVarFlag(task, 'prefuncs', ' ' + debug + ' set_image_size')
+d.appendVarFlag(task, 'prefuncs', ' ' + debug + ' set_image_size
prepare_excluded_directories')
d.prependVarFlag(task, 'postfuncs', ' create_symlinks')
+d.appendVarFlag(task, 'postfuncs', ' cleanup_excluded_directories')
d.appendVarFlag(task, 'subimages', ' ' + ' '.join(subimages))
d.appendVarFlag(task, 'vardeps', ' ' + ' '.join(vardeps))
d.appendVarFlag(task, 'vardepsexclude', 'DATETIME DATE ' + '
'.join(vardepsexclude))
@@ -518,6 +520,84 @@ python () {
bb.build.addtask(task, 'do_image_complete', after, d)
}
+python prepare_excluded_directories() {
+exclude_var = d.getVar('IMAGE_ROOTFS_EXCLUDE_PATH')
+if not exclude_var:
+return
+
+taskname = d.getVar("BB_CURRENTTASK")
+
+if d.getVarFlag('do_%s' % taskname, 'respect_exclude_path') == '0':
+bb.debug(1, "'IMAGE_ROOTFS_EXCLUDE_PATH' is set but 'respect_exclude_path'
variable flag is 0 for this image type, so ignoring it")
+return
+
+import shutil
+from oe.path import copyhardlinktree
+
+exclude_list = exclude_var.split()
+
+rootfs_orig = d.getVar('IMAGE_ROOTFS')
+# We need a new rootfs directory we can delete files from. Copy to
+# workdir.
+new_rootfs = os.path.realpath(os.path.join(d.getVar("WORKDIR"),
"rootfs.%s" % taskname))
+
+if os.path.lexists(new_rootfs):
+shutil.rmtree(os.path.join(new_rootfs))
+
+copyhardlinktree(rootfs_orig, new_rootfs)
+
+for orig_path in exclude_list:
+path = orig_path
+if os.path.isabs(path):
+bb.fatal("IMAGE_ROOTFS_EXCLUDE_PATH: Must be relative: %s" %
orig_path)
+
+full_path = os.path.realpath(os.path.join(new_rootfs, path))
+
+# Disallow climbing outside of parent directory using '..',
+# because doing so could be quite disastrous (we will delete the
+# directory).
+if not full_path.startswith(new_rootfs):
+bb.fatal("'%s' points to a path outside the rootfs" % orig_path)
+
+if path.endswith(os.sep):
We need to check if full_path exists here, else it may try modifying
things that don't exist. E.g., if I have IMAGE_ROOTFS_EXCLUDE_PATH =
"boot" in local.conf and do 'bitbake core-image-minimal-initramfs' I get
the following:
ERROR: core-image-minimal-initramfs-1.0-r0 do_image_cpio: Error
executing a python function in exec_python_func() autogenerated:
The stack trace of pytho
Re: [OE-core] [PATCH] oeqa/sdkext: wic: add new test cases for eSDK
Hi all,
Ed has acked/reviewed on the patchset.
Link to patchset: https://patchwork.openembedded.org/patch/147467/
Regards,
Rebecca
-Original Message-
From: Bartosh, Eduard
Sent: Monday, February 12, 2018 5:09 PM
To: Chang, Rebecca Swee Fun
Subject: Re: [OE-core] [PATCH] oeqa/sdkext: wic: add new test cases for eSDK
Hi Rebecca,
The patchset looks good to me.
Regards,
Ed
On 08/02/18 10:18, "Chang, Rebecca Swee Fun"
wrote:
Hi Ed,
Thanks, here is the link: https://patchwork.openembedded.org/patch/147467/
Regards,
Rebecca
> -Original Message-
> From: Bartosh, Eduard
> Sent: Thursday, February 8, 2018 6:05 PM
> To: Chang, Rebecca Swee Fun ;
> ed.bart...@linux.intel.com
> Subject: Re: [OE-core] [PATCH] oeqa/sdkext: wic: add new test cases for
eSDK
>
> Hi Rebecca,
>
> Can you point me out on the patchset? It looks like I missed it somehow.
>
> Sure, please take the maintenance, no concerns here.
>
> Regards,
> Ed
>
> On 08/02/18 07:09, "Chang, Rebecca Swee Fun"
> wrote:
>
> Hi Ed,
>
> I have pushed some basic test for wic in eSDK. I still have plan to
extend the
> test coverage.
> Could you help to provide you feedback for the basic tests?
>
> I also plan to take up the recipe maintenance for wic-tools and
bmap-tools.
> Do you have any concern?
>
> Thank you.
>
> Regards,
> Rebecca
> -Original Message-
> From: openembedded-core-boun...@lists.openembedded.org
> [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of
> Chang Rebecca Swee Fun
> Sent: Monday, January 22, 2018 12:26 PM
> To: OpenEmbedded Core Mailing List c...@lists.openembedded.org>
> Subject: [OE-core] [PATCH] oeqa/sdkext: wic: add new test cases for eSDK
>
> wic is now available in the eSDK. Adding test cases to test wic utility
> within eSDK.
>
> Signed-off-by: Chang Rebecca Swee Fun
> ---
> meta/lib/oeqa/sdkext/cases/wic.py | 171
> ++
> 1 file changed, 171 insertions(+)
> create mode 100644 meta/lib/oeqa/sdkext/cases/wic.py
>
> diff --git a/meta/lib/oeqa/sdkext/cases/wic.py
> b/meta/lib/oeqa/sdkext/cases/wic.py
> new file mode 100644
> index 000..221a290
> --- /dev/null
> +++ b/meta/lib/oeqa/sdkext/cases/wic.py
> @@ -0,0 +1,171 @@
> +import os
> +import sys
> +import shutil
> +import unittest
> +
> +from glob import glob
> +
> +from oeqa.sdkext.case import OESDKExtTestCase from
> +oeqa.core.decorator.depends import OETestDepends from
> +oeqa.core.decorator.oeid import OETestID from oeqa.utils.commands
> +import runCmd
> +
> +
> +class WicTest(OESDKExtTestCase):
> +"""Wic test within eSDK."""
> +
> +testdir = "/var/tmp/wic.test.sdkext/"
> +outfile = "/var/tmp/wic.test.sdkext/output.txt"
> +
> +@OETestID(1963)
> +def test_wic_location(self):
> +"""Check whether wic is run within eSDK sysroot"""
> +output = self._run("which wic")
> +self.assertEqual(output.startswith(self.tc.sdk_dir), True, \
> +msg="Seems that wic isn't the eSDK one : %s" % output)
> +
> +def _exec_wic_cmd(self, cmd):
> +"""Wrapper to execute wic command and check status"""
> +status = runCmd("cd %s; . %s; %s" % (self.tc.sdk_dir,
> self.tc.sdk_env,
> cmd)).status
> +self.assertEqual(0, status)
> +
> +def _exec_devtool_build(self):
> +"""Wrapper to build image as pre-requisite for wic"""
> +cmd = "devtool build-image"
> +runCmd("cd %s; . %s; %s" % (self.tc.sdk_dir, self.tc.sdk_env,
> + cmd))
> +
> +def _get_img_type(self):
> +"""Wrapper to get SDK target for image creation"""
> +# Get sdk_targets from devtool.conf
> +conf_file = self.tc.sdk_dir + "conf/devtool.conf"
> +with open (conf_file, 'r') as in_file:
> + for line in in_file:
> +if 'sdk_targets' in line:
> +image = line.split()
> +for img_name in image:
> +if img_name.startswith('core-image'):
> +break
> +return img_name
> +
> +def _get_line_count(self):
> +count = 0
> +with open (self.outfile, 'r') as output:
> +count = sum(1 for line in output if line.rstrip('\n'))
> +return count
> +
> +@OETestID(1964)
> +@OETestDepends(['test_wic_location'])
> +def test_wic_version(self):
> +cmd = "wic --version"
> +self._exec_wic_cmd(cmd)
> +
> +@OETestID(1965)
> +@OETestDepends(['test_wic_location'])
> +def test_wic_help(self):
> +cmd = "wic --help"
> +self._exec_wic_cmd(cmd)
> +cmd = "wic -h"
> +self._exec_wic_cmd(cmd)
> +
> +@OETestID(1966)
> +@OETestDepends(['test_wic_location'])
> +def test_wic_create_help(self):
> +cmd = "wic create
[OE-core] [PATCH] sudo: 1.8.21P1 -> 1.8.22
1.Upgrade sudo from 1.8.21P1 to 1.8.22.
2.Update the checksum of LIC_FILES_CHKSUM.
The following content is appended to doc/LICENSE, plugins/sudoers/redblack.c.
Todd C. Miller -> Todd C. Miller
Signed-off-by: Huang Qiyu
---
meta/recipes-extended/sudo/sudo.inc | 4 ++--
meta/recipes-extended/sudo/{sudo_1.8.21p2.bb => sudo_1.8.22.bb} | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-extended/sudo/{sudo_1.8.21p2.bb => sudo_1.8.22.bb} (90%)
diff --git a/meta/recipes-extended/sudo/sudo.inc
b/meta/recipes-extended/sudo/sudo.inc
index 80ec0ae..362bd3a 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -4,8 +4,8 @@ HOMEPAGE = "http://www.sudo.ws";
BUGTRACKER = "http://www.sudo.ws/bugs/";
SECTION = "admin"
LICENSE = "ISC & BSD & Zlib"
-LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=652fb4334c13b511597d7940ef8b3323 \
-
file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=cfe41112f96c19a074934d128f45c693
\
+LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=7765a3d787cb4fed3ccc3c9cee030af9 \
+
file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=805782a8466975716f8376b2be9aedde
\
file://lib/util/reallocarray.c;beginline=3;endline=16;md5=85b0905b795d4d58bf2e00635649eec6
\
file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd
\
file://lib/util/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681
\
diff --git a/meta/recipes-extended/sudo/sudo_1.8.21p2.bb
b/meta/recipes-extended/sudo/sudo_1.8.22.bb
similarity index 90%
rename from meta/recipes-extended/sudo/sudo_1.8.21p2.bb
rename to meta/recipes-extended/sudo/sudo_1.8.22.bb
index acd0025..9150178 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.21p2.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.22.bb
@@ -7,8 +7,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
PAM_SRC_URI = "file://sudo.pam"
-SRC_URI[md5sum] = "cd3993d910c713ae72e94beebd230b22"
-SRC_URI[sha256sum] =
"74c5746cd33a814e2431c39faf0d76f7f8a697379bd073862e3b156cf0d76368"
+SRC_URI[md5sum] = "24abdea48db4c5abcd410167c801cc8c"
+SRC_URI[sha256sum] =
"7256cb27c20883b14360eddbd17f98922073d104b214cf65aeacf1d9c9b9fd02"
DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam',
'pam-plugin-limits pam-plugin-keyinit', '', d)}"
--
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 sudo: 1.8.21P1 -> 1.8.22
== Series Details == Series: sudo: 1.8.21P1 -> 1.8.22 Revision: 1 URL : https://patchwork.openembedded.org/series/10956/ 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 LIC_FILES_CHKSUM changed on target sudo but there is no "License-Update" tag in commit message [test_lic_files_chksum_modified_not_mentioned] Suggested fixInclude "License-Update: " into the commit message with a brief description Current checksum file://doc/LICENSE;md5=652fb4334c13b511597d7940ef8b3323 file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=cfe41112f96c19a074934d128f45c693 file://lib/util/reallocarray.c;beginline=3;endline=16;md5=85b0905b795d4d58bf2e00635649eec6 file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd file://lib/util/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 file://lib/util/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 file://lib/util/snprintf.c;beginline=6;endline=34;md5=c82c1b3a5c32e08545c9ec5d71e41e50 file://include/sudo_queue.h;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 file://lib/util/inet_pton.c;beginline=3;endline=17;md5=3970ab0518ab79cbd0bafb697f10b33a New checksum file://doc/LICENSE;md5=7765a3d787cb4fed3ccc3c9cee030af9 file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=805782a8466975716f8376b2be9aedde file://lib/util/reallocarray.c;beginline=3;endline=16;md5=85b0905b795d4d58bf2e00635649eec6 file://lib/util/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd file://lib/util/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 file://lib/util/glob.c;beginline=6;endline=31;md5=5872733146b9eb0deb79e1f664815b85 file://lib/util/snprintf.c;beginline=6;endline=34;md5=c82c1b3a5c32e08545c9ec5d71e41e50 file://include/sudo_queue.h;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 file://lib/util/inet_pton.c;beginline=3;endline=17;md5=3970ab0518ab79cbd0bafb697f10b33a 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] -> ...). --- Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines 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] Regarding Patch ID: 132816
On 02/12/2018 11:06 PM, Chaitanya Cherukuri wrote: I'm new to this forum and didn't know to where to report an issue. I'm contacting you regarding the patch ID 132816 ( cmake: improve CMAKE_SYSTEM_PROCESSOR assignment in nativesdk). If SDKTARGETSYSROOT is "/sysroots/cortexa9hf-neon-poky-linux-gnueabi" this patch sets the CMAKE_SYSTEM_PROCESSOR as "cortexa9hf-neon-poky" instead of "cortexa9hf-neon". This patch works if SDKTARGETSYSROOT is "/sysroots/core2-32-poky-linux". I guess this one is for Otavio Salvador, the cmake recipe maintainer? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Backport OpenSSL 1.0.2n
On 02/12/2018 11:08 PM, robert_jos...@selinc.com wrote: I'm working with the pyro release, and noticed that it's still using openssl 1.0.2k. The latest version in the 1.0.2 series is 1.0.2n, which is already available on master. Is there a reason that the newer version hasn't made it back to pyro (or rocko, which is on 1.0.2m)? I know new package versions are not normally backported, but looking at the change log, I only see one change mentioned that is not a CVE fix (the 1.0.2l release): > I can send patches to bring 1.0.2n to rocko and pyro if they will be accepted. Yes please. The reason is that users of stable releases should take care of them too; the core team does not have the resources to do it for the users. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] build-appliance-image: update version to 19.0.0
On 02/13/2018 02:42 AM, Chang, Rebecca Swee Fun wrote: Updating recipe to reflect latest poky version and SRCREV points to latest master HEAD revision. The latest poky version is 18.0.1, and I think SRCREV should point to that as well, not to the tip of master? 19.0.0 isn't yet released. Build-appliance-image normally points to the tip of master, should I change this in stable branch instead while in master pointing to HEAD? Actually, that's right. You should update the master to latest master revision, but don't set the version to something that does not yet exist. 15.0.0 (or 18.0.0) is fine, nobody would mind. This recipe is special, as it has a circular reference to the repository it's in, and so setting the version consistently is tricky. As for what do do in the stable branch, I don't know. We don't have a clear policy for how updates to this recipe should be done. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCHv2] build-appliance-image: update SRCREV to master HEAD revision
Signed-off-by: Chang Rebecca Swee Fun --- meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index dc16c0b..f3a2eac 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb @@ -22,7 +22,7 @@ IMAGE_FSTYPES = "wic.vmdk" inherit core-image module-base setuptools3 -SRCREV ?= "433ef0f8e9e63e4459934a06a42b56989c885e44" +SRCREV ?= "44ea6ded0e8e73f5258ce55bd1b851e24243b76a" SRC_URI = "git://git.yoctoproject.org/poky;branch=master \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
