[OE-core] [PATCH] initscripts/sysfs.sh: Mount devtmpfs on /dev/ if needed
When booting from an initrd disk, or when the kernel config option DEVTMPFS_MOUNT isn't provided, /dev/ will not be mounted at boot. This small addition will check if /dev/ is "useful", and if not, will mount devtmpfs if the kernel provides it. With this change, it is possible to set an initscripts style image type to "cpio.gz" and boot it as initrd. Without this change, the image won't work properly because of the missing devices. Signed-off-by: Mike Looijmans--- meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh index 0cfe76e..0a52c90 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/sysfs.sh @@ -21,3 +21,7 @@ fi if [ -e /sys/kernel/debug ] && grep -q debugfs /proc/filesystems; then mount -t debugfs debugfs /sys/kernel/debug fi + +if ! [ -e /dev/zero ] && [ -e /dev ] && grep -q devtmpfs /proc/filesystems; then + mount -n -t devtmpfs devtmpfs /dev +fi -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][V2 5/5] subversion: add explicit dependency on file-replacement-native for native builds
On 20 October 2015 at 04:21, Khem Rajwrote: > It already has file in DEPENDS which means native version will get > file-native on dependencies, right ? > Yes, but file-native is in ASSUME_PROVIDED so that won't get built. If this series (when fixed, I re-broke file-nativesdk in V2) gets into jethro I plan on revisting it again in master to stamp out the root cause, but the race on file in the sysroot causes occasional build failures which are getting tiresome. This is the least-invasive way I can find to fix the races without re-engineering lots of code. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] busybox: add virtual reference instead
On Mon, 2015-10-19 at 16:02 -0500, Alejandro Joya wrote: > These recipes have a hardcoded dependency to busybox, > in order to be able to have a flexible selection, > instead of the hardcoded dependency, now it is point to virtual reference > base-utils. > > Signed-off-by: Alejandro Joya> --- > meta/conf/distro/include/default-providers.inc | 4 +++- > meta/recipes-core/images/core-image-minimal-initramfs.bb | 2 +- > meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 2 +- > meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 4 ++-- > 4 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/meta/conf/distro/include/default-providers.inc > b/meta/conf/distro/include/default-providers.inc > index 9f84d5c..82a7100 100644 > --- a/meta/conf/distro/include/default-providers.inc > +++ b/meta/conf/distro/include/default-providers.inc > @@ -13,6 +13,7 @@ PREFERRED_PROVIDER_virtual/mesa ?= "mesa" > PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-utils" > PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native" > PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" > +PREFERRED_PROVIDER_virtual/base-utils ?= "busybox" > PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" > > # > @@ -23,7 +24,8 @@ VIRTUAL-RUNTIME_apm ?= "apm" > VIRTUAL-RUNTIME_alsa-state ?= "alsa-state" > VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" > VIRTUAL-RUNTIME_wireless-tools ?= "iw wireless-tools" > - > +VIRTUAL-RUNTIME_base-utils ?= "busybox" > +VIRTUAL-RUNTIME_base-utils-hwclock ?= "busybox-hwclock" > # > # Default recipe providers > # > diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb > b/meta/recipes-core/images/core-image-minimal-initramfs.bb > index 1f0fa95..50eca53 100644 > --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb > +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb > @@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The > kernel includes \ > the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ > first 'init' program more efficiently." > > -PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install > initramfs-live-install-efi busybox udev base-passwd > ${ROOTFS_BOOTSTRAP_INSTALL}" > +PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install > initramfs-live-install-efi virtual/base-utils udev base-passwd > ${ROOTFS_BOOTSTRAP_INSTALL}" You mean ${VIRTUAL-RUNTIME_base-utils} here, right? > # Do not pollute the initrd image with rootfs features > IMAGE_FEATURES = "" > diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb > b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb > index 6c37b9a..0664a95 100644 > --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb > +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb > @@ -1,7 +1,7 @@ > SUMMARY = "Modular initramfs system" > LICENSE = "MIT" > LIC_FILES_CHKSUM = > "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" > -RDEPENDS_${PN} += "busybox" > +RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" > > PR = "r2" > > diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb > b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb > index 09f5373..b3cf236 100644 > --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb > +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb > @@ -24,7 +24,7 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit" > VIRTUAL-RUNTIME_initscripts ?= "initscripts" > VIRTUAL-RUNTIME_keymaps ?= "keymaps" > > -SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', > 'busybox-hwclock', '', d)} \ > +SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', > 'rtc','${VIRTUAL-RUNTIME_base-utils-hwclock}', '', d)} \ > modutils-initscripts \ > init-ifupdown \ > ${VIRTUAL-RUNTIME_initscripts} \ > @@ -33,7 +33,7 @@ SYSVINIT_SCRIPTS = > "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwc > RDEPENDS_${PN} = "\ > base-files \ > base-passwd \ > -busybox \ > +${VIRTUAL-RUNTIME_base-utils \ Missing } Unfortunately each issue like this I see with the patch makes me wonder about the testing its had :( Cheers, Richard > ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", > "${SYSVINIT_SCRIPTS}", "", d)} \ > ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", > "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ > netbase \ > -- > 2.1.0 > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Upgrade libidn 1.30 -> 1.32
From: Kai KangThe following changes since commit e35c404537db0b46047fcb2ee7d3645e3e0935c5: bitbake: toaster: Don't descend into directories for cached_layers (2015-10-11 08:12:58 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib kangkai/libidn http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/libidn Kai Kang (1): libidn: 1.30 -> 1.32 meta/recipes-extended/libidn/{libidn_1.30.bb => libidn_1.32.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/libidn/{libidn_1.30.bb => libidn_1.32.bb} (91%) -- 2.6.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] libidn: 1.30 -> 1.32
From: Kai KangSigned-off-by: Kai Kang --- meta/recipes-extended/libidn/{libidn_1.30.bb => libidn_1.32.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/libidn/{libidn_1.30.bb => libidn_1.32.bb} (91%) diff --git a/meta/recipes-extended/libidn/libidn_1.30.bb b/meta/recipes-extended/libidn/libidn_1.32.bb similarity index 91% rename from meta/recipes-extended/libidn/libidn_1.30.bb rename to meta/recipes-extended/libidn/libidn_1.32.bb index 7234747..d9ee346 100644 --- a/meta/recipes-extended/libidn/libidn_1.30.bb +++ b/meta/recipes-extended/libidn/libidn_1.32.bb @@ -19,8 +19,8 @@ SRC_URI = "${GNU_MIRROR}/libidn/${BPN}-${PV}.tar.gz \ file://dont-depend-on-help2man.patch \ " -SRC_URI[md5sum] = "b17edc8551cd31cc5f14c82a9dabf58e" -SRC_URI[sha256sum] = "39b9fc94d74081c185757b12e0891ce5a22db55268e7d1bb24533ff4432eb053" +SRC_URI[md5sum] = "4dd8356ba577287ea7076bfa1554b534" +SRC_URI[sha256sum] = "ba5d5afee2beff703a34ee094668da5c6ea5afa38784cebba8924105e185c4f5" # command tool is under GPLv3+, while libidn itself is under LGPLv2.1+ or LGPLv3 # so package command into a separate package -- 2.6.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/5] tune-atom.inc: include tune-bonnell.inc instead of tune-core2.inc
On Mon, 2015-10-19 at 11:59 -0700, Andre McCurdy wrote: > Use 'atom' as an alias for the first generation Intel Atom CPUs. > --- > meta/conf/machine/include/tune-atom.inc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/conf/machine/include/tune-atom.inc > b/meta/conf/machine/include/tune-atom.inc > index 5e1bb74..24cd676 100644 > --- a/meta/conf/machine/include/tune-atom.inc > +++ b/meta/conf/machine/include/tune-atom.inc > @@ -1,2 +1,2 @@ > -# Atom tunings are the same as core2 for now... > -require conf/machine/include/tune-core2.inc > +# Alias for the first generation of Intel Atom CPUs. > +require conf/machine/include/tune-bonnell.inc This is actually pretty nasty to anyone who uses package feeds or packages since all of a sudden, the system rebuilds with a completely different package architecture. Not sure we can take this change for that reason. I'd also like to understand how much of a difference these specific tunes actually give. I know the Intel people have been trying to focus on a smaller number of tunes that work well on the majority of platforms rather than micro optimising the tunes. Are there some benchmark numbers or other analysis which shows these tunes as being more effective? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] bitbake-prserv-tool: check file name
Fixed: $ bitbake-prserv-tool import /tmp/1 File "/path/to/lib/bb/parse/__init__.py", line 114, in handle(fn='/tmp/1', data=, include=True): return h['handle'](fn, data, include) >raise ParseError("not a BitBake file", fn) ParseError: ParseError in /tmp/1: not a BitBake file But 1.conf works well, its help also shows "", so check the filename and print proper error message. Signed-off-by: Robert Yang--- scripts/bitbake-prserv-tool |9 + 1 file changed, 9 insertions(+) diff --git a/scripts/bitbake-prserv-tool b/scripts/bitbake-prserv-tool index 28c2416..dcfd7f2 100755 --- a/scripts/bitbake-prserv-tool +++ b/scripts/bitbake-prserv-tool @@ -86,6 +86,15 @@ do_migrate_localcount () [ $# -eq 0 ] && help && exit 1 +case $2 in +*.conf) +;; +*) +echo ERROR: $2 must end with .conf! +exit 1 +;; +esac + case $1 in export) do_export $2 -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] prexport.bbclass: avoid export for native and crosssdk
* The prservice is only used by do_package, the native or crosssdk doesn't have do_package. * Change WARN to NOTE when no AUTOPR found, the prexport_handler() checks all the parsed recipes, but a lot of them may not be built, for example, the lower version or broken recipes. So change WARN to NOTE to not confuse user. Signed-off-by: Robert Yang--- meta/classes/prexport.bbclass |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/prexport.bbclass b/meta/classes/prexport.bbclass index 5a1cb33..809ec10 100644 --- a/meta/classes/prexport.bbclass +++ b/meta/classes/prexport.bbclass @@ -8,7 +8,8 @@ PRSERV_DUMPFILE ??= "${PRSERV_DUMPDIR}/prserv.inc" python prexport_handler () { import bb.event -if not e.data: +if not e.data or bb.data.inherits_class('native', e.data) or \ +bb.data.inherits_class('crosssdk', e.data): return if isinstance(e, bb.event.RecipeParsed): @@ -21,7 +22,7 @@ python prexport_handler () { bb.fatal("prexport_handler: export failed!") (metainfo, datainfo) = retval if not datainfo: -bb.warn("prexport_handler: No AUTOPR values found for %s" % ver) +bb.note("prexport_handler: No AUTOPR values found for %s" % ver) return oe.prservice.prserv_export_tofile(e.data, None, datainfo, False) if 'AUTOINC' in ver: -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 6/7] xserver-xorg: add Xwayland RRECOMMENDS
Xwayland has the same runtime dependencies as the standard xserver so set RRECOMMENDS the same way. Signed-off-by: Joshua Lock--- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 9881c94..30b3485 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -72,7 +72,9 @@ PACKAGES =+ "${PN}-security-policy \ SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display driver" INSANE_SKIP_xf86-video-modesetting = "xorg-driver-abi" -RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config xkbcomp" +XSERVER_RRECOMMENDS = "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config xkbcomp" +RRECOMMENDS_${PN} += "${XSERVER_RRECOMMENDS}" +RRECOMMENDS_${PN}-xwayland += "${XSERVER_RRECOMMENDS}" RDEPENDS_${PN}-xvfb += "xkeyboard-config" RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/7] systemd: add PACKAEGCONFIG to build with compatibility libraries
Systemd < 209 shipped separate pc files for various interfaces, these can still be generated for compatibility with code using the older interfaces. Add a PACKAGECONFIG option to build systemd with the compatibility pc files. Signed-off-by: Joshua LockFIX: systemd-compat --- meta/recipes-core/systemd/systemd_225.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb index c2dad58..9388046 100644 --- a/meta/recipes-core/systemd/systemd_225.bb +++ b/meta/recipes-core/systemd/systemd_225.bb @@ -89,6 +89,7 @@ PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,," PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no ,valgrind" PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode" +PACKAGECONFIG[compat] = "--enable-compat-libs,--disable-compat-libs" CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 4/7] systemd: make dbus an optional build time dependency
The dbus buildtime dependency is only required in order to build dbus related tests in modern systemd, make this a PACKAGECONFIG option. Signed-off-by: Joshua Lock--- meta/recipes-core/systemd/systemd_225.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb index 9388046..ac3e9b8 100644 --- a/meta/recipes-core/systemd/systemd_225.bb +++ b/meta/recipes-core/systemd/systemd_225.bb @@ -18,7 +18,7 @@ PROVIDES = "udev" PE = "1" -DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup qemu-native util-linux" +DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline libcap libcgroup qemu-native util-linux" SECTION = "base/shell" @@ -90,6 +90,7 @@ PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no ,valgrind" PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode" PACKAGECONFIG[compat] = "--enable-compat-libs,--disable-compat-libs" +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 5/7] weston: add a PACKAGECONFIG option for xwayland support
Signed-off-by: Joshua Lock--- meta/recipes-graphics/wayland/weston_1.8.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/wayland/weston_1.8.0.bb b/meta/recipes-graphics/wayland/weston_1.8.0.bb index 4f1269f..db68ccc 100644 --- a/meta/recipes-graphics/wayland/weston_1.8.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb @@ -23,7 +23,6 @@ DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" DEPENDS += "wayland libinput virtual/egl pango" EXTRA_OECONF = "--enable-setuid-install \ ---disable-xwayland \ --enable-simple-clients \ --enable-clients \ --enable-demo-clients-install \ @@ -71,6 +70,8 @@ PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" # Weston with systemd-login support PACKAGECONFIG[systemd] = ",,systemd dbus" +# Weston with Xwayland support +PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,libxcb libxcursor cairo" do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/7] weston: backport support for single libsystemd.pc
systemd > 209 ships only a single libsystemd pkg-config file by default, backport a patch from upstream Weston git to check this pkg-config file in addition to the old libsystemd-login. Signed-off-by: Joshua Lock--- .../wayland/weston/libsystemd.patch| 53 ++ meta/recipes-graphics/wayland/weston_1.8.0.bb | 1 + 2 files changed, 54 insertions(+) create mode 100644 meta/recipes-graphics/wayland/weston/libsystemd.patch diff --git a/meta/recipes-graphics/wayland/weston/libsystemd.patch b/meta/recipes-graphics/wayland/weston/libsystemd.patch new file mode 100644 index 000..2d28d56 --- /dev/null +++ b/meta/recipes-graphics/wayland/weston/libsystemd.patch @@ -0,0 +1,53 @@ +From 5eb025a867b42f8bc7bc73279eac8de58e51a13e Mon Sep 17 00:00:00 2001 +From: Frederico Cadete +Date: Mon, 28 Sep 2015 00:30:09 +0200 +Subject: configure.ac: add support for new versions of systemd + +Starting from systemd version 209, a single libsystemd.pc is provided. +For previous versions, fall back on libsystemd-login.pc. + +Signed-off-by: Frederico Cadete +Reviewed-by: Bryce Harrington +Reviewed-by: Derek Foreman + +Upstream-Status: Backport +Backported from Weston git: +http://cgit.freedesktop.org/wayland/weston/commit/?id=5eb025 + +Signed-off-by: Joshua Lock + +diff --git a/configure.ac b/configure.ac +index 045291c..a9cd429 100644 +--- a/configure.ac b/configure.ac +@@ -380,14 +380,23 @@ AC_ARG_ENABLE(resize-optimization, + AS_IF([test "x$enable_resize_optimization" = "xyes"], + [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) + +-PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198], +- [have_systemd_login=yes], [have_systemd_login=no]) ++PKG_CHECK_MODULES(SYSTEMD_LOGIN, ++ [libsystemd >= 209], ++ [have_systemd_login_209=yes;have_systemd_login=yes], ++ [have_systemd_login_209=no;have_systemd_login=no]) ++ ++# Older versions of systemd package systemd-login separately. Fall back on that ++AS_IF([test x$have_systemd_login != xyes],[ ++ PKG_CHECK_MODULES(SYSTEMD_LOGIN, ++[libsystemd-login >= 198], ++[have_systemd_login=yes], ++[have_systemd_login=no]) ++ ]) ++ + AS_IF([test "x$have_systemd_login" = "xyes"], + [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) + AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes") + +-PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209], +- [have_systemd_login_209=yes], [have_systemd_login_209=no]) + AS_IF([test "x$have_systemd_login_209" = "xyes"], + [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])]) + +-- +cgit v0.10.2 + diff --git a/meta/recipes-graphics/wayland/weston_1.8.0.bb b/meta/recipes-graphics/wayland/weston_1.8.0.bb index 342c604..a2b1c8c 100644 --- a/meta/recipes-graphics/wayland/weston_1.8.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb @@ -12,6 +12,7 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://make-libwebp-explicitly-configurable.patch \ file://0001-make-error-portable.patch \ file://parallelmake.patch \ + file://libsystemd.patch \ " SRC_URI[md5sum] = "24cb8a7ed0535b4fc3642643988dab36" SRC_URI[sha256sum] = "8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/6] systemd: build with compatibility libraries
On 20/10/15 04:23, Khem Raj wrote: On Oct 16, 2015, at 8:51 AM, Joshua Lockwrote: There are recipes in the Core metadata that have optional systemd support but expect the old, separate, libsystemd-foo pkg-config files (not the newer unified libsystemd). Add a PACKAGECONFIG option to build systemd with the compatibility pc files and default to enabling this option so that we can make use of them in the weston recipe. Signed-off-by: Joshua Lock --- meta/recipes-core/systemd/systemd_225.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb index c2dad58..594c5aa 100644 --- a/meta/recipes-core/systemd/systemd_225.bb +++ b/meta/recipes-core/systemd/systemd_225.bb @@ -58,7 +58,7 @@ LDFLAGS_append_libc-uclibc = " -lrt" GTKDOC_DOCDIR = "${S}/docs/" -PACKAGECONFIG ??= "xz ldconfig \ +PACKAGECONFIG ??= "xz ldconfig compat \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ @@ -89,6 +89,7 @@ PACKAGECONFIG[ldconfig] = "--enable-ldconfig,--disable-ldconfig,," PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" PACKAGECONFIG[valgrind] = "ac_cv_header_valgrind_memcheck_h=yes ac_cv_header_valgrind_valgrind_h=yes ,ac_cv_header_valgrind_memcheck_h=no ac_cv_header_valgrind_valgrind_h=no ,valgrind" PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode" +PACKAGECONFIG[compat] = "--enable-compat-libs,--disable-compat-libs” I would rather expect this to not be there in first place, if its needed for some, then lets not enable it by default what would it take to fix weston ? Very little effort, it seems - the backport for Weston is trivial. I'll prepare a v2 series where this PACKAGECONFIG is added but not enabled by default and add an extra change to backport the weston configure.ac update for the new libsystemd pkg-config. Regards, Joshua -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] meta: fixes for prserver
The following changes since commit 13282223b07787a92c251f89251e8a49a0e4e3eb: oeqa/runtime: Fix setUp and tearDown methods (2015-10-19 17:55:40 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/prserv http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/prserv Robert Yang (3): prserv.bbclass: remove it since it is null prexport.bbclass: avoid export for native and crosssdk bitbake-prserv-tool: check file name meta/classes/package.bbclass |1 - meta/classes/prexport.bbclass |5 +++-- meta/classes/prserv.bbclass |2 -- scripts/bitbake-prserv-tool |9 + 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 meta/classes/prserv.bbclass -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] prserv.bbclass: remove it since it is null
Signed-off-by: Robert Yang--- meta/classes/package.bbclass |1 - meta/classes/prserv.bbclass |2 -- 2 files changed, 3 deletions(-) delete mode 100644 meta/classes/prserv.bbclass diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 09230b5..a86b680 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -39,7 +39,6 @@ #packaging steps inherit packagedata -inherit prserv inherit chrpath # Need the package_qa_handle_error() in insane.bbclass diff --git a/meta/classes/prserv.bbclass b/meta/classes/prserv.bbclass deleted file mode 100644 index 139597f..000 --- a/meta/classes/prserv.bbclass +++ /dev/null @@ -1,2 +0,0 @@ - - -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] How to handle mesa customization in BSP layers
hi there, in the meta-qcom BSP layer, I need to customize mesa to enable Gallium/freedreno driver which is not enabled in OE-core by default. I have been using a bbappend , see [1] so far. However it was reported by Koen that his is causing issues, at least in Angstrom, though it's not specific to this distro.. See github comments on [2]. The issue is that mesa is arch specific, not machine specific. So if you start mixing machines from the same arch, we are getting unexpected/wrong rebuilds. How am I supposed to handle that properly in a BSP layer? I don't think that enabling the freedreno driver should be a distro config, am i right? thanks nico [1] https://github.com/ndechesne/meta-qcom/blob/master/recipes-graphics/mesa/mesa_10.%25.bbappend [2] https://github.com/ndechesne/meta-qcom/commit/dc00771aaba1051a3c679dd8f782089b499cbdbb -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 0/7] Various metadata tweaks v2
The following series are some tidy ups and changes made whilst porting a distro with systemd and a Weston + Xwayland userland to Jethro. Please consider them for inclusion. Changes since v1: * Backport weston patch to use libsystemd.pc * Don't enable systemd compat PACKAGECONFIG by default Regards, Joshua lib/oe/image.py: Fix dependency handling for compressed types (2015-10-14 18:08:22 +0300) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib joshuagl/cleanup http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=joshuagl/cleanup Joshua Lock (7): systemd: add PACKAEGCONFIG to build with compatibility libraries weston: backport support for single libsystemd.pc weston: add PACKAGECONFIG to build with systemd-login support systemd: make dbus an optional build time dependency weston: add a PACKAGECONFIG option for xwayland support xserver-xorg: add Xwayland RRECOMMENDS xserver-xorg: drop empty ${PN}-security-policy package meta/recipes-core/systemd/systemd_225.bb | 4 +- .../wayland/weston/libsystemd.patch| 53 ++ meta/recipes-graphics/wayland/weston_1.8.0.bb | 7 ++- .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 8 ++-- 4 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-graphics/wayland/weston/libsystemd.patch -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 7/7] xserver-xorg: drop empty ${PN}-security-policy package
The SecurityPolicy hasn't been included since 2007[1] and the last remnants were removed from the code base in 2010[2]. 1. http://cgit.freedesktop.org/xorg/xserver/commit/?id=9d03ca 2. http://cgit.freedesktop.org/xorg/xserver/commit/?id=19d03d Signed-off-by: Joshua Lock--- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 30b3485..91df2b7 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -44,8 +44,7 @@ DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" # libextmod.so # libdbe.so -PACKAGES =+ "${PN}-security-policy \ - ${PN}-sdl \ +PACKAGES =+ "${PN}-sdl \ ${PN}-fbdev \ ${PN}-xvfb \ ${PN}-utils \ @@ -72,7 +71,7 @@ PACKAGES =+ "${PN}-security-policy \ SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display driver" INSANE_SKIP_xf86-video-modesetting = "xorg-driver-abi" -XSERVER_RRECOMMENDS = "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config xkbcomp" +XSERVER_RRECOMMENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp" RRECOMMENDS_${PN} += "${XSERVER_RRECOMMENDS}" RRECOMMENDS_${PN}-xwayland += "${XSERVER_RRECOMMENDS}" RDEPENDS_${PN}-xvfb += "xkeyboard-config" @@ -85,7 +84,6 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ ${libdir}/xorg/modules/*/.debug \ ${libdir}/xorg/modules/*/*/.debug \ " -FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy" FILES_${PN}-sdl = "${bindir}/Xsdl" FILES_${PN}-fbdev = "${bindir}/Xfbdev" FILES_${PN}-xvfb = "${bindir}/Xvfb" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] How to handle mesa customization in BSP layers
> Op 20 okt. 2015, om 11:32 heeft Nicolas Dechesne >het volgende geschreven: > > hi there, > > in the meta-qcom BSP layer, I need to customize mesa to enable > Gallium/freedreno driver which is not enabled in OE-core by default. I > have been using a bbappend , see [1] so far. > > However it was reported by Koen that his is causing issues, at least > in Angstrom, though it's not specific to this distro.. See github > comments on [2]. > > The issue is that mesa is arch specific, not machine specific. So if > you start mixing machines from the same arch, we are getting > unexpected/wrong rebuilds. > > How am I supposed to handle that properly in a BSP layer? I don't > think that enabling the freedreno driver should be a distro config, am > i right? I agree that making it a DISTRO thing is not the right answer, but it is exactly what I ended up doing: https://github.com/Angstrom-distribution/meta-angstrom/commit/549d58dd00cd0683d92b942e9574ef0d1e347e51 In this specific case I think we should enable freedreno for armv7/armv8 in OE-core, but the problem remains for other recipes like this. regards, Koen -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] U-boot file is being removed when image-recipe is rebuild which uses wic.bz2
Hello Ed Bartosh, Just to be clear the u-boot-mx6-solox.imx gets deleted when wic create command is executed. Kindly let us know what to do. We are stuck with our release. Noor From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Ahsan, Noor Sent: Monday, October 19, 2015 8:42 PM To: ed.bart...@linux.intel.com Cc: Krishnakar, Srikanth; Larson, Chris; openembedded-core@lists.openembedded.org Subject: [OE-core] U-boot file is being removed when image-recipe is rebuild which uses wic.bz2 Hello, We are using wi.bz2 as our image fstypes. The image gets created smoothly for the first time. Our wks file uses -sourceparam argument and mention the u-boot file part u-boot --source rawcopy --sourceparams="file=u-boot-mx6-solox.imx" --ondisk mmcblk --no-table --align 1 The issue comes when something is added to image recipe and it get rebuild. At that time somehow u-boot-mx6-solox.imx gets deleted from deploy folder and we get this error Error: exec_cmd: du -Lbks /home/noor/SB/release_2015.12/build_soloX/tmp/deploy/images/mx6-solox/u-boot-mx6-solox.imx returned '1' instead of 0 Checking basic build environment... Done. I was able to reproduce the error by cleaning image recipe and rebuilding it. I got the same error. So something is being done in wic setup which removes the u-boot file. I need some help on this to resolve the issue of removal of u-boot. Noor -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oeqa/selftest/bbtests: clean up local DL_DIR/SSTATE_DIR safely
Now that the selftests clean selftest.inc in the tearDown using bitbake in a function passed to addCleanup (which happens after teardown) will use the default configuration and not the customised one. As the intention was to clean away the temporary DL_DIR and SSTATE_DIR, simple use track_for_cleanup to delete the entire directory instead. Signed-off-by: Ross Burton--- meta/lib/oeqa/selftest/bbtests.py | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/bbtests.py b/meta/lib/oeqa/selftest/bbtests.py index 3d25aed..94ca79c 100644 --- a/meta/lib/oeqa/selftest/bbtests.py +++ b/meta/lib/oeqa/selftest/bbtests.py @@ -126,6 +126,8 @@ class BitbakeTests(oeSelfTest): self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" SSTATE_DIR = \"${TOPDIR}/download-selftest\" """) +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') @@ -141,12 +143,13 @@ doesn't exist, yet fetcher didn't report any error. bitbake output: %s" % result self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" SSTATE_DIR = \"${TOPDIR}/download-selftest\" """) +self.track_for_cleanup(os.path.join(self.builddir, "download-selftest")) + data = 'SRC_URI_append = ";downloadfilename=test-aspell.tar.gz"' self.write_recipeinc('aspell', data) bitbake('-ccleanall aspell') result = bitbake('-c fetch aspell', ignore_status=True) self.delete_recipeinc('aspell') -self.addCleanup(bitbake, '-ccleanall aspell') self.assertEqual(result.status, 0, msg = "Couldn't fetch aspell. %s" % result.output) self.assertTrue(os.path.isfile(os.path.join(get_bb_var("DL_DIR"), 'test-aspell.tar.gz')), msg = "File rename failed. No corresponding test-aspell.tar.gz file found under %s" % str(get_bb_var("DL_DIR"))) self.assertTrue(os.path.isfile(os.path.join(get_bb_var("DL_DIR"), 'test-aspell.tar.gz.done')), "File rename failed. No corresponding test-aspell.tar.gz.done file found under %s" % str(get_bb_var("DL_DIR"))) @@ -203,6 +206,7 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\" self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" SSTATE_DIR = \"${TOPDIR}/download-selftest\" """) +self.track_for_cleanup(os.path.join(self.builddir, "download-selftest")) self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" ) runCmd('bitbake -c cleanall man xcursor-transparent-theme') result = runCmd('bitbake man xcursor-transparent-theme -k', ignore_status=True) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] i2c-tools: fix inverted RDEPENDS
The runtime dependency between i2c-tools and i2c-tools-misc was backwards when the packages were split. With this change, including i2c-tools in an image no longer drags in perl. Signed-off-by: Matt Madison--- meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb b/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb index 92f4d69..042695b 100644 --- a/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb +++ b/meta/recipes-devtools/i2c-tools/i2c-tools_3.1.2.bb @@ -30,5 +30,4 @@ FILES_${PN}-misc = "${sbindir}/i2c-stub-from-dump \ ${bindir}/decode-dimms \ ${bindir}/decode-vaio \ " -RDEPENDS_${PN} += "${PN}-misc" -RDEPENDS_${PN}-misc += "perl" +RDEPENDS_${PN}-misc = "${PN} perl" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] binutils: Fix octeon3 disassembly patch
The structure has apparently changed, and there was a missing setting. This corrects a segfault when disassembling code. Signed-off-by: Mark Hatle--- meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch b/meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch index 6108c0d..4e8c69f 100644 --- a/meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch +++ b/meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch @@ -229,7 +229,7 @@ Index: git/opcodes/mips-dis.c + { "octeon3", 1, bfd_mach_mips_octeon3, CPU_OCTEON3, +ISA_MIPS64R2 | INSN_OCTEON3, ASE_VIRT | ASE_VIRT64, +mips_cp0_names_numeric, -+NULL, 0, mips_hwr_names_numeric }, ++NULL, 0, mips_cp1_names_mips3264, mips_hwr_names_numeric }, + { "xlr", 1, bfd_mach_mips_xlr, CPU_XLR, ISA_MIPS64 | INSN_XLR, 0, -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [jethro/master] Fix octeon3 binutils behavior
Fix the octeon3 binutils patch. Without this we can segfaults. Applicable to jethro and master. Mark Hatle (1): binutils: Fix octeon3 disassembly patch meta/recipes-devtools/binutils/binutils/binutils-octeon3.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] [jethro/master] Be more permissive on executable names
On mingw32 the executables are suffixed with .exe. Add a wild car in to ensure these will be packaged if generated. Mark Hatle (1): gcc-target.inc: Add support for executable thats may have a suffix meta/recipes-devtools/gcc/gcc-target.inc | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc-target.inc: Add support for executable thats may have a suffix
In the past GCC has used a wildcard to permit generating executables that may have a suffix, such as .exe. This wild card was lost in one of the updates. Adding the wild card back in fixes a number of issues when generating a mingw gcc. Signed-off-by: Mark Hatle--- meta/recipes-devtools/gcc/gcc-target.inc | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index 6e160c0..d62c15a 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -31,7 +31,7 @@ PACKAGES = "\ FILES_${PN} = "\ ${bindir}/${TARGET_PREFIX}gcc* \ -${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \ +${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ @@ -83,20 +83,20 @@ FILES_gfortran-symlinks = "\ ${bindir}/f95" FILES_cpp = "\ -${bindir}/${TARGET_PREFIX}cpp \ +${bindir}/${TARGET_PREFIX}cpp* \ ${base_libdir}/cpp \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1" FILES_cpp-symlinks = "${bindir}/cpp" -FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov \ -${bindir}/${TARGET_PREFIX}gcov-tool \ +FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov* \ +${bindir}/${TARGET_PREFIX}gcov-tool* \ " FILES_gcov-symlinks = "${bindir}/gcov \ ${bindir}/gcov-tool \ " FILES_g++ = "\ -${bindir}/${TARGET_PREFIX}g++ \ +${bindir}/${TARGET_PREFIX}g++* \ ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ " FILES_g++-symlinks = "\ @@ -141,7 +141,7 @@ do_install () { cd ${D}${bindir} # We care about g++ not c++ - rm -f *c++ + rm -f *c++* # We don't care about the gcc- ones for this rm -f *gcc-?.?* -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Avoid unnecessary useradd warnings
This avoids unnecessary warnings when using GROUPMEMS_PARAM, or when using userdel or groupdel in EXTRA_USERS_PARAMS. A similar change was introduced for GROUPADD_PARAM and USERADD_PARAM in c0da4270c76375a7a8cbcc09319fe4570ebbc5bd. //Peter The following changes since commit 8578bc17b54da97d42b257b3c8f398ac52b91a9f: libc-package: Fix localedef multilib dependency issues (2015-10-20 10:12:01 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib pkj/avoid_useradd_warnings http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=pkj/avoid_useradd_warnings Peter Kjellerstedt (1): useradd_base.bbclass: Do not warn without a reason meta/classes/useradd_base.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] useradd_base.bbclass: Do not warn without a reason
In c0da4270c76375a7a8cbcc09319fe4570ebbc5bd two bbwarn were changed to bbnote for the case where an added user or group already exists. The same should have been done for groupmems, groupdel and userdel as well since the warnings that are currently generated are superflouous. The two remaining similar bbwarn for groupmod and usermod are left as is since there they actually make sense. Signed-off-by: Peter Kjellerstedt--- meta/classes/useradd_base.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/useradd_base.bbclass b/meta/classes/useradd_base.bbclass index 802f3a1..ab3cd35 100644 --- a/meta/classes/useradd_base.bbclass +++ b/meta/classes/useradd_base.bbclass @@ -104,7 +104,7 @@ perform_groupmems () { sleep $count done else - bbwarn "${PN}: group $groupname already contains $username, not re-adding it" + bbnote "${PN}: group $groupname already contains $username, not re-adding it" fi if test "x$gshadow" = "xno"; then rm -f $rootdir${sysconfdir}/gshadow @@ -136,7 +136,7 @@ perform_groupdel () { sleep $count done else - bbwarn "${PN}: group $groupname doesn't exist, not removing it" + bbnote "${PN}: group $groupname doesn't exist, not removing it" fi } @@ -164,7 +164,7 @@ perform_userdel () { sleep $count done else - bbwarn "${PN}: user $username doesn't exist, not removing it" + bbnote "${PN}: user $username doesn't exist, not removing it" fi } -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/5] tune-atom.inc: include tune-bonnell.inc instead of tune-core2.inc
On Tue, Oct 20, 2015 at 2:16 AM, Richard Purdiewrote: > On Mon, 2015-10-19 at 11:59 -0700, Andre McCurdy wrote: >> Use 'atom' as an alias for the first generation Intel Atom CPUs. >> --- >> meta/conf/machine/include/tune-atom.inc | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/meta/conf/machine/include/tune-atom.inc >> b/meta/conf/machine/include/tune-atom.inc >> index 5e1bb74..24cd676 100644 >> --- a/meta/conf/machine/include/tune-atom.inc >> +++ b/meta/conf/machine/include/tune-atom.inc >> @@ -1,2 +1,2 @@ >> -# Atom tunings are the same as core2 for now... >> -require conf/machine/include/tune-core2.inc >> +# Alias for the first generation of Intel Atom CPUs. >> +require conf/machine/include/tune-bonnell.inc > > This is actually pretty nasty to anyone who uses package feeds or > packages since all of a sudden, the system rebuilds with a completely > different package architecture. Not sure we can take this change for > that reason. OK. I was thinking the comment in tune-atom.inc "Atom tunings are the same as core2 FOR NOW..." gave people fair warning that tune-atom.inc might not remain an alias for tune-core2.inc forever, but no problem to drop this patch. Another approach might be to drop tune-atom.inc altogether. Atom is now ambiguous in terms of defining a CPU architecture and it hasn't been a documented gcc x86 tuning option since gcc 4.8 https://gcc.gnu.org/onlinedocs/gcc-4.8.5/gcc/i386-and-x86-64-Options.html#i386-and-x86-64-Options https://gcc.gnu.org/onlinedocs/gcc-4.9.3/gcc/i386-and-x86-64-Options.html#i386-and-x86-64-Options https://gcc.gnu.org/onlinedocs/gcc-5.2.0/gcc/x86-Options.html#x86-Options > I'd also like to understand how much of a difference these specific > tunes actually give. I know the Intel people have been trying to focus > on a smaller number of tunes that work well on the majority of platforms > rather than micro optimising the tunes. > > Are there some benchmark numbers or other analysis which shows these > tunes as being more effective? Not that I'm aware of. My own tests suggest that the benefits of bonnell -vs- core2 tuning on a first generation Atom are pretty unspectacular (maybe ~0 to 5 % performance increase and ~5% increase in code size). I don't have a Silvermont board. This patch set was more about enabling further experiments though, so if solid benchmark improvements are a prerequisite then this patch set isn't ready to merge. > > Cheers, > > Richard > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] qemu: disable Valgrind
Qemu has an automatic dependency on valgrind which cannot be disabled, which causes non-deterministic builds and build failures. As Valgrind wasn't enabled previously make this deterministic by forcibly disabling it. Signed-off-by: Ross Burton--- meta/recipes-devtools/qemu/qemu/no-valgrind.patch | 19 +++ meta/recipes-devtools/qemu/qemu_2.4.0.bb | 1 + 2 files changed, 20 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/no-valgrind.patch diff --git a/meta/recipes-devtools/qemu/qemu/no-valgrind.patch b/meta/recipes-devtools/qemu/qemu/no-valgrind.patch new file mode 100644 index 000..91f7280 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/no-valgrind.patch @@ -0,0 +1,19 @@ +There isn't an option to enable or disable valgrind support, so disable it to avoid non-deterministic builds. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton + +diff --git a/configure b/configure +index b3c4f51..4d3929e 100755 +--- a/configure b/configure +@@ -4193,9 +4192,0 @@ valgrind_h=no +-cat > $TMPC << EOF +-#include +-int main(void) { +- return 0; +-} +-EOF +-if compile_prog "" "" ; then +-valgrind_h=yes +-fi diff --git a/meta/recipes-devtools/qemu/qemu_2.4.0.bb b/meta/recipes-devtools/qemu/qemu_2.4.0.bb index 59b1788..1505b80 100644 --- a/meta/recipes-devtools/qemu/qemu_2.4.0.bb +++ b/meta/recipes-devtools/qemu/qemu_2.4.0.bb @@ -9,6 +9,7 @@ SRC_URI += "file://configure-fix-Darwin-target-detection.patch \ file://smc91c111_fix1.patch \ file://smc91c111_fix2.patch \ file://smc91c111_fix3.patch \ +file://no-valgrind.patch \ " SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2; SRC_URI[md5sum] = "186ee8194140a484a455f8e3c74589f4" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V3 3/5] file: don't replace host file when built natively
To avoid races over the file binaries being replaced mid-build we made file-native an assume-provided binary and check for it at startup, but target file still needs a native file binary of the same version to compile the magic data. The least invasive way of doing this is to build a native file don't put it on PATH, and tell the target build where to find the native binary. We do however want the native libmagic to be installed normally (as for example rpm and subversion need it) so we can't use NATIVE_PACKAGE_PATH_SUFFIX as that change libdir. [ YOCTO #8144 ] Signed-off-by: Ross Burton--- meta/recipes-devtools/file/file/host-file.patch | 32 + meta/recipes-devtools/file/file_5.24.bb | 10 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/file/file/host-file.patch diff --git a/meta/recipes-devtools/file/file/host-file.patch b/meta/recipes-devtools/file/file/host-file.patch new file mode 100644 index 000..a7efbdc --- /dev/null +++ b/meta/recipes-devtools/file/file/host-file.patch @@ -0,0 +1,32 @@ +Upstream-Status: Submitted (http://bugs.gw.com/view.php?id=485) +Signed-off-by: Ross Burton + +From 3cde199d03b39632361c275cd30fa0612a03138b Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Mon, 19 Oct 2015 10:30:57 +0100 +Subject: [PATCH 2/2] When using the host file, respect FILE_COMPILE + +If we're cross-compiling and not using the file binary that was just built, +execute the binary that we've been told to use (via FILE_COMPILE) when checking +the version instead of assuming that "file" is correct as the actual compile +uses FILE_COMPILE so different binaries may be used. +--- + magic/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/magic/Makefile.am b/magic/Makefile.am +index 89ac844..67067fe 100644 +--- a/magic/Makefile.am b/magic/Makefile.am +@@ -293,7 +293,7 @@ ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) + @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \ + echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \ + else \ +- v=$$(file --version | sed -e s/file-// -e q); \ ++ v=$$(${FILE_COMPILE} --version | sed -e s/file-// -e q); \ + if [ "$$v" != "${PACKAGE_VERSION}" ]; then \ + echo "Cannot use the installed version of file ($$v) to"; \ + echo "cross-compile file ${PACKAGE_VERSION}"; \ +-- +2.1.4 + diff --git a/meta/recipes-devtools/file/file_5.24.bb b/meta/recipes-devtools/file/file_5.24.bb index 08b95d7..d04f121 100644 --- a/meta/recipes-devtools/file/file_5.24.bb +++ b/meta/recipes-devtools/file/file_5.24.bb @@ -8,12 +8,13 @@ SECTION = "console/utils" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03188" -DEPENDS = "zlib file-native" +DEPENDS = "zlib file-replacement-native" DEPENDS_class-native = "zlib-native" SRC_URI = "git://github.com/file/file.git \ file://debian-742262.patch \ file://0001-Add-P-prompt-into-Usage-info.patch \ +file://host-file.patch \ " SRCREV = "3c0874be4d3232d672b20f513451a39cfd7c585a" @@ -21,6 +22,9 @@ S = "${WORKDIR}/git" inherit autotools +EXTRA_OEMAKE_append_class-target = "-e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" +EXTRA_OEMAKE_append_class-nativesdk = "-e FILE_COMPILE=${STAGING_BINDIR_NATIVE}/file-native/file" + FILES_${PN} += "${datadir}/misc/*.mgc" do_install_append_class-native() { @@ -34,3 +38,7 @@ do_install_append_class-nativesdk() { } BBCLASSEXTEND = "native nativesdk" +PROVIDES_append_class-native = " file-replacement-native" +# Don't use NATIVE_PACKAGE_PATH_SUFFIX as that hides libmagic from anyone who +# depends on file-replacement-native. +bindir_append_class-native = "/file-native" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V3 5/5] subversion: add explicit dependency on file-replacement-native for native builds
Signed-off-by: Ross Burton--- meta/recipes-devtools/subversion/subversion_1.8.13.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/subversion/subversion_1.8.13.bb b/meta/recipes-devtools/subversion/subversion_1.8.13.bb index f843b95..9c9bdb1 100644 --- a/meta/recipes-devtools/subversion/subversion_1.8.13.bb +++ b/meta/recipes-devtools/subversion/subversion_1.8.13.bb @@ -1,6 +1,7 @@ SUMMARY = "Subversion (svn) version control system client" SECTION = "console/network" DEPENDS = "apr-util serf sqlite3 file" +DEPENDS_append_class-native = " file-replacement-native" RDEPENDS_${PN} = "serf" LICENSE = "Apache-2" HOMEPAGE = "http://subversion.tigris.org; -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V3 1/5] bitbake: add file-native to ASSUME_PROVIDED
Various key parts of the core classes (for example, do_package and do_populate_sysroot) currently require file. As it's not possible to build a file-native without invoking do_populate_sysroot mark file-native as ASSUME_PROVIDED and expect to use the host's binary. Signed-off-by: Ross Burton--- meta/conf/bitbake.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 9ddd1c0..06971da 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -166,6 +166,7 @@ DATETIME = "${DATE}${TIME}" ASSUME_PROVIDED = "\ bzip2-native \ chrpath-native \ +file-native \ git-native \ grep-native \ diffstat-native \ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] intercepts/update_icon_cache: use STAGING_DIR_NATIVE from environment
Instead of expecting that the calling postinst has exported STAGING_LIBDIR_NATIVE (which will get set to the sysroot at package build time and may not be correct if sstate is used), use the new STAGING_DIR_NATIVE that is exported by rootfs.py. [ YOCTO #8547 ] Signed-off-by: Ross Burton--- scripts/postinst-intercepts/update_icon_cache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/postinst-intercepts/update_icon_cache b/scripts/postinst-intercepts/update_icon_cache index c02273d..df9bdec 100644 --- a/scripts/postinst-intercepts/update_icon_cache +++ b/scripts/postinst-intercepts/update_icon_cache @@ -3,7 +3,7 @@ set -e # update native pixbuf loaders -${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache +$STAGING_DIR_NATIVE/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache for icondir in $D/usr/share/icons/*/ ; do if [ -d $icondir ] ; then -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] lib/oe/rootfs: tell intercepts where the native sysroot is
Some intercepts may want to access files in the native sysroot that are not on $PATH (such as something in $libexecdir) but any use of STAGING_DIR_NATIVE in the postinst that calls the intercept will be "baked" into the package, so if sstate is reused it will use paths that may not exist. Solve this by exporting the location of the native sysroot in the environment so the postinst and intercept can use an environment variable instead of a bitbake variable. Signed-off-by: Ross Burton--- meta/lib/oe/rootfs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 4e81263..ff29083 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -278,6 +278,7 @@ class Rootfs(object): bb.note("Running intercept scripts:") os.environ['D'] = self.image_rootfs +os.environ['STAGING_DIR_NATIVE'] = self.d.getVar('STAGING_DIR_NATIVE', True) for script in os.listdir(intercepts_dir): script_full = os.path.join(intercepts_dir, script) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] classes/gtk-icon-cache: don't pass STAGING_LIBDIR_NATIVE to intercepts
The intercept doesn't need STAGING_LIBDIR_NATIVE anymore, so don't pass it. Signed-off-by: Ross Burton--- meta/classes/gtk-icon-cache.bbclass | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index 6195fa4..425397a 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass @@ -6,8 +6,7 @@ gtk_icon_cache_postinst() { if [ "x$D" != "x" ]; then $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \ mlprefix=${MLPREFIX} \ - libdir=${libdir} \ - STAGING_LIBDIR_NATIVE=${STAGING_LIBDIR_NATIVE} + libdir=${libdir} else # Update the pixbuf loaders in case they haven't been registered yet @@ -25,8 +24,7 @@ gtk_icon_cache_postrm() { if [ "x$D" != "x" ]; then $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \ mlprefix=${MLPREFIX} \ - libdir=${libdir} \ - STAGING_LIBDIR_NATIVE=${STAGING_LIBDIR_NATIVE} + libdir=${libdir} else for icondir in /usr/share/icons/* ; do if [ -d $icondir ] ; then -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V3 2/5] sanity: check that the host has file installed
Now that file-native is ASSUME_PROVIDED, check that it's actually present. Signed-off-by: Ross Burton--- meta/classes/sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index d0b5cd0..ae86d26 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -3,7 +3,7 @@ # SANITY_REQUIRED_UTILITIES ?= "patch diffstat makeinfo git bzip2 tar \ -gzip gawk chrpath wget cpio perl" +gzip gawk chrpath wget cpio perl file" def bblayers_conf_file(d): return os.path.join(d.getVar('TOPDIR', True), 'conf/bblayers.conf') -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][V3 4/5] rpm: add explicit dependency on file-replacement-native for native builds
Signed-off-by: Ross Burton--- meta/recipes-devtools/rpm/rpm_4.11.2.bb | 1 + meta/recipes-devtools/rpm/rpm_5.4+cvs.bb | 1 + meta/recipes-devtools/rpm/rpm_5.4.14.bb | 1 + 3 files changed, 3 insertions(+) diff --git a/meta/recipes-devtools/rpm/rpm_4.11.2.bb b/meta/recipes-devtools/rpm/rpm_4.11.2.bb index bc36f99..f4a2110 100644 --- a/meta/recipes-devtools/rpm/rpm_4.11.2.bb +++ b/meta/recipes-devtools/rpm/rpm_4.11.2.bb @@ -23,6 +23,7 @@ LICENSE = "GPL-2.0+" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" DEPENDS = "db libxml2 xz findutils file popt nss bzip2 elfutils attr zlib acl gzip python" +DEPENDS_append_class-native = " file-replacement-native" SRC_URI += "http://rpm.org/releases/rpm-4.11.x/${BP}.tar.bz2 \ file://use-pkgconfig-for-python.patch \ diff --git a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb index 8903f3b..951b251 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4+cvs.bb @@ -43,6 +43,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "libpcre attr acl popt ossp-uuid file byacc-native" +DEPENDS_append_class-native = " file-replacement-native" S = "${WORKDIR}/rpm" diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index b450c6f..73b3734 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -41,6 +41,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "libpcre attr acl popt ossp-uuid file byacc-native" +DEPENDS_append_class-native = " file-replacement-native" # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed # in order to extract the distribution SRPM into a format we can extract... -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH v2] busybox: add virtual reference instead
These recipes have a hardcoded dependency to busybox, in order to be able to have a flexible selection, instead of the hardcoded dependency, now it is point to virtual reference base-utils. Signed-off-by: Alejandro Joya--- meta/conf/distro/include/default-providers.inc | 3 +++ meta/recipes-core/images/core-image-minimal-initramfs.bb | 2 +- meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 2 +- meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 9f84d5c..bb382bd 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -13,6 +13,7 @@ PREFERRED_PROVIDER_virtual/mesa ?= "mesa" PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-utils" PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-utils-native" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" +PREFERRED_PROVIDER_virtual/base-utils ?= "busybox" PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" # @@ -23,6 +24,8 @@ VIRTUAL-RUNTIME_apm ?= "apm" VIRTUAL-RUNTIME_alsa-state ?= "alsa-state" VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" VIRTUAL-RUNTIME_wireless-tools ?= "iw wireless-tools" +VIRTUAL-RUNTIME_base-utils ?= "busybox" +VIRTUAL-RUNTIME_base-utils-hwclock ?= "busybox-hwclock" # # Default recipe providers diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb index 1f0fa95..a26286e 100644 --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Small image capable of booting a device. The kernel includes \ the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \ first 'init' program more efficiently." -PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi busybox udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" +PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-install-efi ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" # Do not pollute the initrd image with rootfs features IMAGE_FEATURES = "" diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 6c37b9a..0664a95 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Modular initramfs system" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -RDEPENDS_${PN} += "busybox" +RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" PR = "r2" diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index 09f5373..7e40445 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb @@ -24,7 +24,7 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit" VIRTUAL-RUNTIME_initscripts ?= "initscripts" VIRTUAL-RUNTIME_keymaps ?= "keymaps" -SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \ +SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc','${VIRTUAL-RUNTIME_base-utils-hwclock}', '', d)} \ modutils-initscripts \ init-ifupdown \ ${VIRTUAL-RUNTIME_initscripts} \ @@ -33,7 +33,7 @@ SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwc RDEPENDS_${PN} = "\ base-files \ base-passwd \ -busybox \ +${VIRTUAL-RUNTIME_base-utils} \ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ netbase \ -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] base.bbclass: considering multilib when setting LICENSE_EXCLUSION
Ping 于 2015年10月16日 13:58, Liu Jian 写道: Hi All, Will you going to merge this patch? I have ever discuss with Robert Yang and he agreed to integrated it. Thanks! Jian 于 2015年10月08日 14:47, Jian Liu 写道: The PACKAGES is not mapped with MLPREFIX when setting LICENSE_EXCLUSION in base.bbclass. For example, For libgcc-dev, LICENSE_EXCLUSION-libgcc-dev=1 but for lib32-libgcc-dev, LICENSE_EXCLUSION-libgcc-dev=1 Obviously it is wrong for lib32-libgcc-dev. Add MLPREFIX before the package name during setting LICENSE_EXCLUSION Signed-off-by: Jian Liu--- meta/classes/base.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index f078001..89c8f04 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -512,7 +512,8 @@ python () { if unskipped_pkgs: for pkg in skipped_pkgs: bb.debug(1, "SKIPPING the package " + pkg + " at do_rootfs because it's " + recipe_license) -d.setVar('LICENSE_EXCLUSION-' + pkg, 1) +mlprefix = d.getVar('MLPREFIX', True) +d.setVar('LICENSE_EXCLUSION-' + mlprefix + pkg, 1) for pkg in unskipped_pkgs: bb.debug(1, "INCLUDING the package " + pkg) elif all_skipped or incompatible_license(d, bad_licenses): -- Jian Liu Email: jian@windriver.com Office Phone: 86-10-84778539 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] cairo: backport fix for compatibility with OpenGL ES 2.0
To maintain compatibility with OpenGL ES 2.0, the matrix in _cairo_gl_shader_bind_matrix() should be manually transposed, and GL_FALSE passed as the transpose argument to the glUniformMatrix3fv() call as it is the only valid value for that parameter in OpenGL ES 2.0. http://lists.cairographics.org/archives/cairo/2015-May/026253.html http://cgit.freedesktop.org/cairo/commit/?id=f52f0e2feb1ad0a4de23c475a8c020d41a1764a8 Signed-off-by: Andre McCurdy--- ...anspose-the-matrix-in-_cairo_gl_shader_bi.patch | 49 ++ meta/recipes-graphics/cairo/cairo_1.14.2.bb| 1 + 2 files changed, 50 insertions(+) create mode 100644 meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch diff --git a/meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch b/meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch new file mode 100644 index 000..955b7d4 --- /dev/null +++ b/meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch @@ -0,0 +1,49 @@ +Upstream-Status: Backport + + http://lists.cairographics.org/archives/cairo/2015-May/026253.html + http://cgit.freedesktop.org/cairo/commit/?id=f52f0e2feb1ad0a4de23c475a8c020d41a1764a8 + +Signed-off-by: Andre McCurdy + + +From f52f0e2feb1ad0a4de23c475a8c020d41a1764a8 Mon Sep 17 00:00:00 2001 +From: Zan Dobersek +Date: Fri, 8 May 2015 01:50:25 -0700 +Subject: [PATCH] Manually transpose the matrix in _cairo_gl_shader_bind_matrix() + +To maintain compatibility with OpenGL ES 2.0, the matrix in +_cairo_gl_shader_bind_matrix() should be manually transposed, +and GL_FALSE passed as the transpose argument to the +glUniformMatrix3fv() call as it is the only valid value for +that parameter in OpenGL ES 2.0. + +Reviewed-by: Bryce Harrington +Acked-by: "Henry (Yu) Song" +--- + src/cairo-gl-shaders.c | 8 + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/cairo-gl-shaders.c b/src/cairo-gl-shaders.c +index 2710606..fe975d2 100644 +--- a/src/cairo-gl-shaders.c b/src/cairo-gl-shaders.c +@@ -973,12 +973,12 @@ _cairo_gl_shader_bind_matrix (cairo_gl_context_t *ctx, + { + cairo_gl_dispatch_t *dispatch = >dispatch; + float gl_m[9] = { +- m->xx, m->xy, m->x0, +- m->yx, m->yy, m->y0, +- 0, 0, 1 ++ m->xx, m->yx, 0, ++ m->xy, m->yy, 0, ++ m->x0, m->y0, 1 + }; + assert (location != -1); +-dispatch->UniformMatrix3fv (location, 1, GL_TRUE, gl_m); ++dispatch->UniformMatrix3fv (location, 1, GL_FALSE, gl_m); + } + + void +-- +1.9.1 + diff --git a/meta/recipes-graphics/cairo/cairo_1.14.2.bb b/meta/recipes-graphics/cairo/cairo_1.14.2.bb index 3817dbf..75cde0a 100644 --- a/meta/recipes-graphics/cairo/cairo_1.14.2.bb +++ b/meta/recipes-graphics/cairo/cairo_1.14.2.bb @@ -3,6 +3,7 @@ require cairo.inc LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz; +SRC_URI += "file://Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch" SRC_URI[md5sum] = "e1cdfaf1c6c995c4d4c54e07215b0118" SRC_URI[sha256sum] = "c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [jethro/master][PATCH] busybox: Fix mdev block device automounting
The directory ${MDEV_AUTOMOUNT_ROOT}/ which is '/run/media' may not exist yet when the device is found, so lets use -p switch to mkdir cmd so it create preceding parent dirs if needed. Remove some bash specific constructs Signed-off-by: Khem Raj--- meta/recipes-core/busybox/files/mdev-mount.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/busybox/files/mdev-mount.sh b/meta/recipes-core/busybox/files/mdev-mount.sh index d5d66d6..b4385a1 100644 --- a/meta/recipes-core/busybox/files/mdev-mount.sh +++ b/meta/recipes-core/busybox/files/mdev-mount.sh @@ -15,7 +15,7 @@ case "$ACTION" in exit 0 fi DEVBASE=`expr substr $MDEV 1 3` - if [ "${DEVBASE}" == "mmc" ] ; then + if [ "${DEVBASE}" = "mmc" ] ; then DEVBASE=`expr substr $MDEV 1 7` fi # check for "please don't mount it" file @@ -24,7 +24,7 @@ case "$ACTION" in exit 0 fi # check for full-disk partition - if [ "${DEVBASE}" == "${MDEV}" ] ; then + if [ "${DEVBASE}" = "${MDEV}" ] ; then if [ -d /sys/block/${DEVBASE}/${DEVBASE}*1 ] ; then # Partition detected, just quit exit 0 @@ -33,7 +33,7 @@ case "$ACTION" in # No size at all exit 0 fi - if [ `cat /sys/block/${DEVBASE}/size` == 0 ] ; then + if [ "`cat /sys/block/${DEVBASE}/size`" = "0" ] ; then # empty device, bail out exit 0 fi @@ -42,7 +42,7 @@ case "$ACTION" in if ! mount /dev/$MDEV > /dev/null 2>&1 then MOUNTPOINT="${MDEV_AUTOMOUNT_ROOT}/$MDEV" - mkdir "$MOUNTPOINT" + mkdir -p "$MOUNTPOINT" mount -t auto /dev/$MDEV "$MOUNTPOINT" fi ;; -- 2.6.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image-mklibs.bbclass: update i586 TARGET_ARCH test to also handle i686
On Tue, Oct 20, 2015 at 10:36 PM, Khem Rajwrote: > On Tue, Oct 20, 2015 at 9:33 PM, Andre McCurdy wrote: >> Signed-off-by: Andre McCurdy >> --- >> meta/classes/image-mklibs.bbclass | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta/classes/image-mklibs.bbclass >> b/meta/classes/image-mklibs.bbclass >> index c455a8e..d5f668c 100644 >> --- a/meta/classes/image-mklibs.bbclass >> +++ b/meta/classes/image-mklibs.bbclass >> @@ -25,7 +25,7 @@ mklibs_optimize_image_doit() { >> x86_64) >> dynamic_loader="${base_libdir}/ld-linux-x86-64.so.2" >> ;; >> - i586 ) >> + i586 | i686 ) > > i*86 once for all OK. Looks like the armhf ld path needs fixing too... >> dynamic_loader="${base_libdir}/ld-linux.so.2" >> ;; >> arm ) >> -- >> 1.9.1 >> >> -- >> ___ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] image-mklibs.bbclass: update i586 TARGET_ARCH test to also handle i686
Signed-off-by: Andre McCurdy--- meta/classes/image-mklibs.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass index c455a8e..d5f668c 100644 --- a/meta/classes/image-mklibs.bbclass +++ b/meta/classes/image-mklibs.bbclass @@ -25,7 +25,7 @@ mklibs_optimize_image_doit() { x86_64) dynamic_loader="${base_libdir}/ld-linux-x86-64.so.2" ;; - i586 ) + i586 | i686 ) dynamic_loader="${base_libdir}/ld-linux.so.2" ;; arm ) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [jethro/master][PATCH 2/2] busybox: Schedule mdev after mountall
mdev does automounting of block media, which expects /run/ to be mounted, so let mounting happen before running mdev service and mountall is done with at 03 so trigger mdev at 04 This helps in mounting the devices which are plugged on boot Signed-off-by: Khem Raj--- meta/recipes-core/busybox/busybox.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 4d4709a..cfdea30 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -33,9 +33,9 @@ INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev ${PN}-hw INITSCRIPT_NAME_${PN}-httpd = "busybox-httpd" INITSCRIPT_NAME_${PN}-hwclock = "hwclock.sh" INITSCRIPT_NAME_${PN}-mdev = "mdev" -INITSCRIPT_PARAMS_${PN}-mdev = "start 03 S ." +INITSCRIPT_PARAMS_${PN}-mdev = "start 04 S ." INITSCRIPT_NAME_${PN}-syslog = "syslog" -INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" +INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" SYSTEMD_PACKAGES = "${PN}-syslog" SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service" -- 2.6.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image-mklibs.bbclass: update i586 TARGET_ARCH test to also handle i686
On Tue, Oct 20, 2015 at 9:33 PM, Andre McCurdywrote: > Signed-off-by: Andre McCurdy > --- > meta/classes/image-mklibs.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes/image-mklibs.bbclass > b/meta/classes/image-mklibs.bbclass > index c455a8e..d5f668c 100644 > --- a/meta/classes/image-mklibs.bbclass > +++ b/meta/classes/image-mklibs.bbclass > @@ -25,7 +25,7 @@ mklibs_optimize_image_doit() { > x86_64) > dynamic_loader="${base_libdir}/ld-linux-x86-64.so.2" > ;; > - i586 ) > + i586 | i686 ) i*86 once for all > dynamic_loader="${base_libdir}/ld-linux.so.2" > ;; > arm ) > -- > 1.9.1 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] oeqa/selftest: Added/Updated docstring for each TC with TestopiaID
Also the TCs from meta-yocto-bsp/lib/oeqa/selftest/gummiboot were updated. Signed-off-by: Daniel Istrate--- meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py | 2 + meta/lib/oeqa/selftest/archiver.py| 1 + meta/lib/oeqa/selftest/bblayers.py| 18 meta/lib/oeqa/selftest/bbtests.py | 66 +++ meta/lib/oeqa/selftest/buildoptions.py| 26 ++ meta/lib/oeqa/selftest/devtool.py | 67 ++- meta/lib/oeqa/selftest/imagefeatures.py | 5 ++ meta/lib/oeqa/selftest/layerappend.py | 3 + meta/lib/oeqa/selftest/lic-checksum.py| 3 + meta/lib/oeqa/selftest/oescripts.py | 6 ++ meta/lib/oeqa/selftest/pkgdata.py | 24 ++ meta/lib/oeqa/selftest/prservice.py | 24 ++ meta/lib/oeqa/selftest/recipetool.py | 96 + meta/lib/oeqa/selftest/sstatetests.py | 46 +++ meta/lib/oeqa/selftest/wic.py | 115 -- 15 files changed, 477 insertions(+), 25 deletions(-) diff --git a/meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py b/meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py index 00aa36f..c3d48b5 100644 --- a/meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py +++ b/meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py @@ -37,6 +37,7 @@ class Gummiboot(oeSelfTest): Product: oe-core Author: Ionut Chisanovici AutomatedBy: Daniel Istrate +TestopiaID: https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=1101 """ # We'd use DEPLOY_DIR_IMAGE here, except that we need its value for @@ -63,6 +64,7 @@ class Gummiboot(oeSelfTest): Product: oe-core Author: Ionut Chisanovici AutomatedBy: Daniel Istrate +TestopiaID: https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=1103 """ self._common_setup() diff --git a/meta/lib/oeqa/selftest/archiver.py b/meta/lib/oeqa/selftest/archiver.py index f2030c4..10f9ec7 100644 --- a/meta/lib/oeqa/selftest/archiver.py +++ b/meta/lib/oeqa/selftest/archiver.py @@ -17,6 +17,7 @@ class Archiver(oeSelfTest): Product: oe-core Author: Daniel Istrate AutomatedBy: Daniel Istrate +TestopiaID: https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=1345 """ include_recipe = 'busybox' diff --git a/meta/lib/oeqa/selftest/bblayers.py b/meta/lib/oeqa/selftest/bblayers.py index 20c17e4..af6e434 100644 --- a/meta/lib/oeqa/selftest/bblayers.py +++ b/meta/lib/oeqa/selftest/bblayers.py @@ -13,26 +13,41 @@ class BitbakeLayers(oeSelfTest): @testcase(756) def test_bitbakelayers_showcrossdepends(self): +""" +TestopiaID: https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=756 +""" result = runCmd('bitbake-layers show-cross-depends') self.assertTrue('aspell' in result.output, msg = "No dependencies were shown. bitbake-layers show-cross-depends output: %s" % result.output) @testcase(83) def test_bitbakelayers_showlayers(self): +""" +TestopiaID: https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=83 +""" result = runCmd('bitbake-layers show-layers') self.assertTrue('meta-selftest' in result.output, msg = "No layers were shown. bitbake-layers show-layers output: %s" % result.output) @testcase(93) def test_bitbakelayers_showappends(self): +""" +TestopiaID: https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=93 +""" result = runCmd('bitbake-layers show-appends') self.assertTrue('xcursor-transparent-theme_0.1.1.bbappend' in result.output, msg="xcursor-transparent-theme_0.1.1.bbappend file was not recognised. bitbake-layers show-appends output: %s" % result.output) @testcase(90) def test_bitbakelayers_showoverlayed(self): +""" +TestopiaID: https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=90 +""" result = runCmd('bitbake-layers show-overlayed') self.assertTrue('aspell' in result.output, msg="aspell overlayed recipe was not recognised bitbake-layers show-overlayed %s" % result.output) @testcase(95) def test_bitbakelayers_flatten(self): +""" +TestopiaID: https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=95 +""" testoutdir = os.path.join(self.builddir, 'test_bitbakelayers_flatten') self.assertFalse(os.path.isdir(testoutdir), msg = "test_bitbakelayers_flatten should not exist at this point in time") self.track_for_cleanup(testoutdir) @@
[OE-core] [PATCH 1/2] oeqa/selftest: Added testcase decorators.
Added testcase decorators for testopia integration. Signed-off-by: Daniel Istrate--- meta/lib/oeqa/selftest/devtool.py | 8 ++-- meta/lib/oeqa/selftest/recipetool.py | 11 +++ meta/lib/oeqa/selftest/sstatetests.py | 14 -- meta/lib/oeqa/selftest/wic.py | 2 +- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index baa56d6..18e2a9d 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -378,6 +378,7 @@ class DevtoolTests(DevtoolBase): self.assertNotEqual(result.status, 0, 'devtool modify on %s should have failed. devtool output: %s' % (testrecipe, result.output)) self.assertIn('ERROR: ', result.output, 'devtool modify on %s should have given an ERROR' % testrecipe) +@testcase(1365) def test_devtool_modify_native(self): # Check preconditions self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') @@ -723,7 +724,7 @@ class DevtoolTests(DevtoolBase): self.assertEqual(expectedlines, f.readlines()) # Deleting isn't expected to work under these circumstances -@testcase(1173) +@testcase(1370) def test_devtool_update_recipe_local_files(self): """Check that local source files are copied over instead of patched""" testrecipe = 'makedevs' @@ -753,7 +754,7 @@ class DevtoolTests(DevtoolBase): ('??', '.*/makedevs/0001-Add-new-file.patch$')] self._check_repo_status(os.path.dirname(recipefile), expected_status) -@testcase(1174) +@testcase(1371) def test_devtool_update_recipe_local_files_2(self): """Check local source files support when oe-local-files is in Git""" testrecipe = 'lzo' @@ -832,6 +833,7 @@ class DevtoolTests(DevtoolBase): matches2 = glob.glob(stampprefix2 + '*') self.assertFalse(matches2, 'Stamp files exist for recipe %s that should have been cleaned' % testrecipe2) +@testcase(1272) def test_devtool_deploy_target(self): # NOTE: Whilst this test would seemingly be better placed as a runtime test, # unfortunately the runtime tests run under bitbake and you can't run @@ -916,6 +918,7 @@ class DevtoolTests(DevtoolBase): result = runCmd('ssh %s root@%s %s' % (sshargs, qemu.ip, testcommand), ignore_status=True) self.assertNotEqual(result, 0, 'undeploy-target did not remove command as it should have') +@testcase(1366) def test_devtool_build_image(self): """Test devtool build-image plugin""" # Check preconditions @@ -949,6 +952,7 @@ class DevtoolTests(DevtoolBase): if reqpkgs: self.fail('The following packages were not present in the image as expected: %s' % ', '.join(reqpkgs)) +@testcase(1367) def test_devtool_upgrade(self): # Check preconditions self.assertTrue(not os.path.exists(self.workspacedir), 'This test cannot be run with a workspace directory under the build directory') diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py index c34ad68..b1f1d2a 100644 --- a/meta/lib/oeqa/selftest/recipetool.py +++ b/meta/lib/oeqa/selftest/recipetool.py @@ -492,9 +492,12 @@ class RecipetoolAppendsrcBase(RecipetoolBase): class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase): + +@testcase(1273) def test_recipetool_appendsrcfile_basic(self): self._test_appendsrcfile('base-files', 'a-file') +@testcase(1274) def test_recipetool_appendsrcfile_basic_wildcard(self): testrecipe = 'base-files' self._test_appendsrcfile(testrecipe, 'a-file', options='-w') @@ -502,12 +505,15 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase): bbappendfile = self._check_bbappend(testrecipe, recipefile, self.templayerdir) self.assertEqual(os.path.basename(bbappendfile), '%s_%%.bbappend' % testrecipe) +@testcase(1281) def test_recipetool_appendsrcfile_subdir_basic(self): self._test_appendsrcfile('base-files', 'a-file', 'tmp') +@testcase(1282) def test_recipetool_appendsrcfile_subdir_basic_dirdest(self): self._test_appendsrcfile('base-files', destdir='tmp') +@testcase(1280) def test_recipetool_appendsrcfile_srcdir_basic(self): testrecipe = 'bash' srcdir = get_bb_var('S', testrecipe) @@ -515,12 +521,14 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase): subdir = os.path.relpath(srcdir, workdir) self._test_appendsrcfile(testrecipe, 'a-file', srcdir=subdir) +@testcase(1275) def test_recipetool_appendsrcfile_existing_in_src_uri(self): testrecipe = 'base-files' filepath = self._get_first_file_uri(testrecipe)