[OE-core] [PATCH] util-linux: move getopt u-a link to base_bindir
* busybox installs getopt u-a in base_bindir when GETOPT is enabled, move util-linux link to the same location to fix calling u-a in read-only images * remove unused variable usrbinprogs_a Signed-off-by: Martin Jansa --- meta/recipes-core/util-linux/util-linux.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 3d8a4d0..dd607ef 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -83,7 +83,7 @@ FILES_util-linux-reset = "${base_bindir}/reset" FILES_util-linux-partx = "${sbindir}/partx" FILES_util-linux-hwclock = "${base_sbindir}/hwclock.${BPN}" FILES_util-linux-findfs = "${sbindir}/findfs" -FILES_util-linux-getopt = "${bindir}/getopt.${BPN}" +FILES_util-linux-getopt = "${base_bindir}/getopt.${BPN}" FILES_util-linux-libblkid = "${base_libdir}/libblkid.so.*" FILES_util-linux-libmount = "${base_libdir}/libmount.so.*" @@ -139,8 +139,7 @@ do_install () { sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk fsck blkid blockdev fstrim sulogin switch_root" -usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt readprofile" -binprogs_a="dmesg kill more umount mount login reset su" +binprogs_a="dmesg getopt kill more umount mount login reset su" if [ "${base_sbindir}" != "${sbindir}" ]; then mkdir -p ${D}${base_sbindir} @@ -234,6 +233,7 @@ ALTERNATIVE_LINK_NAME[reset] = "${bindir}/reset" ALTERNATIVE_TARGET[reset] = "${base_bindir}/reset" ALTERNATIVE_util-linux-getopt = "getopt" +ALTERNATIVE_LINK_NAME[getopt] = "${base_bindir}/getopt" BBCLASSEXTEND = "native nativesdk" -- 2.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv6 1/1] recipes: add x11 to required DISTRO_FEATURES
On Fri, Feb 27, 2015 at 10:23:22AM +0100, Martin Jansa wrote: > On Mon, Feb 09, 2015 at 01:25:15PM +0100, Martin Jansa wrote: > > * it's not complete, but recipes depending on virtual/libx11 are easiest > > to spot, I've long list of PNBLACKLIST for all recipes which cannot > > be built in distro without x11 in DISTRO_FEATURES > > PING > > This was first sent 8 months ago, it's trivial change, please merge it > in 1.8. Ping! This is very disappointing and probably one of my last patches to oe-core. > > Signed-off-by: Martin Jansa > > --- > > meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 4 > > +++- > > meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb | 4 > > > > meta/recipes-graphics/fstests/fstests_git.bb | 4 > > +++- > > meta/recipes-graphics/glew/glew_1.12.0.bb | 4 > > +++- > > meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb | 4 > > +++- > > meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb | 4 > > +++- > > meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb | 4 > > +++- > > meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb | 4 > > +++- > > meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb | 4 > > +++- > > meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb | 4 > > +++- > > meta/recipes-graphics/pong-clock/pong-clock_1.0.bb| 4 > > > > .../startup-notification/startup-notification_0.12.bb | 4 > > +++- > > meta/recipes-graphics/x11-common/x11-common_0.1.bb| 4 > > > > meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb | 4 > > +++- > > meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb | 4 > > +++- > > meta/recipes-graphics/xrestop/xrestop_0.4.bb | 4 > > +++- > > meta/recipes-graphics/xtscal/xtscal_0.6.3.bb | 4 > > +++- > > meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 4 > > +++- > > meta/recipes-support/atk/at-spi2-core_2.14.1.bb | 4 > > +++- > > meta/recipes-support/consolekit/consolekit_0.4.6.bb | 4 > > +++- > > 20 files changed, 63 insertions(+), 17 deletions(-) > > > > diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb > > b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb > > index c471020..47589b6 100644 > > --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb > > +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb > > @@ -7,7 +7,9 @@ DESCRIPTION = "Packages required to run the build system" > > PR = "r13" > > LICENSE = "MIT" > > > > -inherit packagegroup > > +inherit packagegroup distro_features_check > > +# rdepends on libx11-dev > > +REQUIRED_DISTRO_FEATURES = "x11" > > > > PACKAGES = "\ > > packagegroup-self-hosted \ > > diff --git a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb > > b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb > > index 18fc893..3427fdf 100644 > > --- a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb > > +++ b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb > > @@ -5,4 +5,8 @@ include eglinfo.inc > > > > DEPENDS += "virtual/libx11" > > > > +inherit distro_features_check > > +# depends on virtual/libx11 > > +REQUIRED_DISTRO_FEATURES = "x11" > > + > > SUMMARY += "(X11 version)" > > diff --git a/meta/recipes-graphics/fstests/fstests_git.bb > > b/meta/recipes-graphics/fstests/fstests_git.bb > > index 57ff9f6..95c33f4 100644 > > --- a/meta/recipes-graphics/fstests/fstests_git.bb > > +++ b/meta/recipes-graphics/fstests/fstests_git.bb > > @@ -13,4 +13,6 @@ LIC_FILES_CHKSUM = > > "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac > > > > S = "${WORKDIR}/git/tests" > > > > -inherit autotools pkgconfig > > +inherit autotools pkgconfig distro_features_check > > +# depends on virtual/libx11 > > +REQUIRED_DISTRO_FEATURES = "x11" > > diff --git a/meta/recipes-graphics/glew/glew_1.12.0.bb > > b/meta/recipes-graphics/glew/glew_1.12.0.bb > > index 9343604..eb28c4d 100644 > > --- a/meta/recipes-graphics/glew/glew_1.12.0.bb > > +++ b/meta/recipes-graphics/glew/glew_1.12.0.bb > > @@ -18,4 +18,6 @@ SRC_URI = > > "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ > > SRC_URI[md5sum] = "01246c7ecd135d99be031aa63f86dca1" > > SRC_URI[sha256sum] = > > "af58103f4824b443e7fa4ed3af593b8edac6f3a7be3b30911edbc7344f48e4bf" > > > > -inherit autotools lib_package pkgconfig > > +inherit autotools lib_package pkgconfig distro_features_check > > +# depends on virtual/libx11 > > +REQUIRED_DISTRO_FEATURES = "x11" > > diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb > > b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb > > index 4acac39..f2eb675 100644 > > --- a/meta/recipes-graphi
[OE-core] [meta-oe][PATCH v2] glibc: 'yes' within the path sets wrong variables
The pre-processed output of conftest.c contains an include dir and if the path of it contains a 'yes' it will cause some variables to be wrongly set to yes because of the way it greps for it. The fix is to use a more elaborated string instead of just 'yes'. This has to be done at the configure and the configure.ac files, normally it would only require the configure.ac changes but they also need modification given the configure files also pop-out of the source tarball. [YOCTO #6614] Upstream Status: Submitted Signed-off-by: Benjamin Esquivel --- meta/recipes-core/glibc/glibc/fix-yesdir.patch | 230 + meta/recipes-core/glibc/glibc_2.21.bb | 1 + 2 files changed, 231 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/fix-yesdir.patch diff --git a/meta/recipes-core/glibc/glibc/fix-yesdir.patch b/meta/recipes-core/glibc/glibc/fix-yesdir.patch new file mode 100644 index 000..4d014c0 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/fix-yesdir.patch @@ -0,0 +1,230 @@ +Index: git/sysdeps/arm/configure +=== +--- git.orig/sysdeps/arm/configure git/sysdeps/arm/configure +@@ -150,12 +150,12 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __ARM_PCS_VFP +-yes ++use_arm_pcs_vfp +#endif + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : ++ $EGREP "use_arm_pcs_vfp" >/dev/null 2>&1; then : + libc_cv_arm_pcs_vfp=yes + else + libc_cv_arm_pcs_vfp=no +Index: git/sysdeps/arm/configure.ac +=== +--- git.orig/sysdeps/arm/configure.ac git/sysdeps/arm/configure.ac +@@ -16,8 +16,8 @@ dnl it. Until we do, don't define it. + # the dynamic linker via %ifdef. + AC_CACHE_CHECK([whether the compiler is using the ARM hard-float ABI], + [libc_cv_arm_pcs_vfp], +- [AC_EGREP_CPP(yes,[#ifdef __ARM_PCS_VFP +-yes ++ [AC_EGREP_CPP(use_arm_pcs_vfp,[#ifdef __ARM_PCS_VFP ++use_arm_pcs_vfp +#endif + ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)]) + if test $libc_cv_arm_pcs_vfp = yes; then +Index: git/sysdeps/aarch64/configure +=== +--- git.orig/sysdeps/aarch64/configure git/sysdeps/aarch64/configure +@@ -148,12 +148,12 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __AARCH64EB__ +- yes ++ is_aarch64_be + #endif + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : ++ $EGREP "is_aarch64_be" >/dev/null 2>&1; then : + libc_cv_aarch64_be=yes + else + libc_cv_aarch64_be=no +Index: git/sysdeps/aarch64/configure.ac +=== +--- git.orig/sysdeps/aarch64/configure.ac git/sysdeps/aarch64/configure.ac +@@ -10,8 +10,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the + # the dynamic linker via %ifdef. + AC_CACHE_CHECK([for big endian], + [libc_cv_aarch64_be], +- [AC_EGREP_CPP(yes,[#ifdef __AARCH64EB__ +- yes ++ [AC_EGREP_CPP(is_aarch64_be,[#ifdef __AARCH64EB__ ++ is_aarch64_be + #endif + ], libc_cv_aarch64_be=yes, libc_cv_aarch64_be=no)]) + if test $libc_cv_aarch64_be = yes; then +Index: git/sysdeps/mips/configure +=== +--- git.orig/sysdeps/mips/configure git/sysdeps/mips/configure +@@ -143,11 +143,11 @@ else + /* end confdefs.h. */ + dnl + #ifdef __mips_nan2008 +-yes ++use_mips_nan2008 + #endif + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- $EGREP "yes" >/dev/null 2>&1; then : ++ $EGREP "use_mips_nan2008" >/dev/null 2>&1; then : + libc_cv_mips_nan2008=yes + else + libc_cv_mips_nan2008=no +Index: git/sysdeps/mips/configure.ac +=== +--- git.orig/sysdeps/mips/configure.ac git/sysdeps/mips/configure.ac +@@ -6,9 +6,9 @@ dnl position independent way. + dnl AC_DEFINE(PI_STATIC_AND_HIDDEN) + + AC_CACHE_CHECK([whether the compiler is using the 2008 NaN encoding], +- libc_cv_mips_nan2008, [AC_EGREP_CPP(yes, [dnl ++ libc_cv_mips_nan2008, [AC_EGREP_CPP(use_mips_nan2008, [dnl + #ifdef __mips_nan2008 +-yes ++use_mips_nan2008 + #endif], libc_cv_mips_nan2008=yes, libc_cv_mips_nan2008=no)]) + if test x$libc_cv_mips_nan2008 = xyes; then + AC_DEFINE(HAVE_MIPS_NAN2008) +Index: git/sysdeps/nios2/configure +=== +--- git.orig/sysdeps/nios2/configure git/sysdeps/nios2/configure +@@ -142,12 +142,12 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + #ifdef __nios2_big_
[OE-core] [PATCH] gstreamer1.0-plugins-bad: disable Yadif on X32
Yadif generates bad assembler when the x32 tune is enabled: gst/yadif/yadif_template.c:244: Error: `(%edx,%r11)' is not a valid base/index expression This should be fixed upstream but until then we can disable the Yadif plugin if x32 is enabled. [ YOCTO #7385 ] Signed-off-by: Ross Burton --- meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc |1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc index 69a15a2..e2752af 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc @@ -127,6 +127,7 @@ EXTRA_OECONF += " \ --disable-xvid \ --disable-zbar \ ${GSTREAMER_1_0_ORC} \ +${@bb.utils.contains("TUNE_FEATURES", "mx32", "--disable-yadif", "", d)} \ " ARM_INSTRUCTION_SET = "arm" -- 1.7.10.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/4] kernel-yocto: consolidated pull request
Richard, Here's my next round of incremental fixes and updates. All are relatively minor, so there's no sense sitting on them while I work on some other changes. These two are tweaks to the Kconfig audit warnings that went into M3, and will remove a config warning and the other will not uncessarily warn people who've done nothing wrong :) linux-yocto: fix qemux86-64 config warning kernel-yocto: inhibit BSP description warnings for custom linux-yocto kernels I also have some OcteonIII support additions to linux-yocto-3.14, and finally a minor patch performance improvement. We aren't done on this front, but again, no sense sitting on changes. Cheers, Bruce The following changes since commit bf1a68e97f2069a4f4c351d4bafd416358eb: taglib: Fix cmake floating dependency on boost (2015-03-02 18:06:53 +) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (4): linux-yocto: fix qemux86-64 config warning kernel-yocto: inhibit BSP description warnings for custom linux-yocto kernels linux-yocto/3.14: OcteonIII support kern-tools: improve patch application performance meta/classes/kernel-yocto.bbclass | 13 +++-- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb| 5 +++-- meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 3 ++- meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb | 3 ++- meta/recipes-kernel/linux/linux-yocto.inc | 1 + meta/recipes-kernel/linux/linux-yocto_3.14.bb | 17 + meta/recipes-kernel/linux/linux-yocto_3.19.bb | 3 ++- 8 files changed, 27 insertions(+), 20 deletions(-) -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] kernel-yocto: inhibit BSP description warnings for custom linux-yocto kernels
We don't require that a yocto custom kernel + defconfig have a full BSP description (but of course it would be better if they did). Since this isn't a requirement, we shouldn't alarm users by generating a BSP description warning. To implement this, we add a bsp audit level flag (like the one that exists for kconfig audits), and only set it to activate in the versioned linux-yocto recipes. [YOCTO: #7370] Signed-off-by: Bruce Ashfield --- meta/classes/kernel-yocto.bbclass | 13 +++-- meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | 1 + meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 1 + meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb | 1 + meta/recipes-kernel/linux/linux-yocto.inc | 1 + meta/recipes-kernel/linux/linux-yocto_3.14.bb | 1 + meta/recipes-kernel/linux/linux-yocto_3.19.bb | 1 + 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index c8d1e95df348..8db489964ed2 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -265,6 +265,7 @@ python do_kernel_configcheck() { ret, result = oe.utils.getstatusoutput("%s%s" % (pathprefix, cmd)) config_check_visibility = int(d.getVar( "KCONF_AUDIT_LEVEL", True ) or 0) +bsp_check_visibility = int(d.getVar( "KCONF_BSP_AUDIT_LEVEL", True ) or 0) # if config check visibility is non-zero, report dropped configuration values mismatch_file = "${S}/" + kmeta + "/" + "mismatch.cfg" @@ -283,13 +284,13 @@ python do_kernel_configcheck() { bb.warn( "[kernel config]: BSP specified non-hw configuration:\n\n%s" % results) bsp_desc = "${S}/" + kmeta + "/" + "top_tgt" -if os.path.exists(bsp_desc): +if os.path.exists(bsp_desc) and bsp_check_visibility > 1: with open (bsp_desc, "r") as myfile: -bsp_tgt = myfile.read() -m = re.match("^(.*)scratch.obj(.*)$", bsp_tgt) -if not m is None: -bb.warn( "[kernel]: An auto generated BSP description was used, this normally indicates a misconfiguration.\n" + - "Check that your machine (%s) has an associated kernel description." % "${MACHINE}" ) +bsp_tgt = myfile.read() +m = re.match("^(.*)scratch.obj(.*)$", bsp_tgt) +if not m is None: +bb.warn( "[kernel]: An auto generated BSP description was used, this normally indicates a misconfiguration.\n" + + "Check that your machine (%s) has an associated kernel description." % "${MACHINE}" ) } # Ensure that the branches (BSP and meta) are on the locations specified by diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb index 8e2189654bc5..bd61c4a927c8 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb @@ -14,6 +14,7 @@ LINUX_VERSION ?= "3.14.29" PV = "${LINUX_VERSION}+git${SRCPV}" KMETA = "meta" +KCONF_BSP_AUDIT_LEVEL = "2" LINUX_KERNEL_TYPE = "preempt-rt" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb index db9ad738c3ab..d110297246c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb @@ -7,6 +7,7 @@ require recipes-kernel/linux/linux-yocto.inc LINUX_VERSION ?= "3.14.29" KMETA = "meta" +KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "f65678ef48c5d41af914d2769e4dd01411c1df96" SRCREV_meta ?= "6eddbf47875ef48ddc5864957a7b63363100782b" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb index 1997e30a2589..d10449aab365 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb @@ -7,6 +7,7 @@ require recipes-kernel/linux/linux-yocto.inc LINUX_VERSION ?= "3.19" KMETA = "meta" +KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "43b9eced9ba8a57add36af07736344dcc383f711" SRCREV_meta ?= "f7a81274b461d0c748964d75c24bea8574d350fb" diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc index 79b3f256f4bc..c62f8ca97de4 100644 --- a/meta/recipes-kernel/linux/linux-yocto.inc +++ b/meta/recipes-kernel/linux/linux-yocto.inc @@ -28,6 +28,7 @@ SRCREV_FORMAT ?= "meta_machine" # 1: report options that are specified, but not in the final config # 2: report options that are not hardware related, but set by a BSP KCONF_AUDIT_LEVEL ?= "1" +KCONF_BSP_AUDIT_LEVEL ?= "0" LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb index ac0143089795..9cdd3eea0d5c 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb +++ b/meta
[OE-core] [PATCH 1/4] linux-yocto: fix qemux86-64 config warning
During the 3.19 update a 32 bit option in the 64 bit config was missed, which results in the option being dropped (and reported as a warning): Value requested for CONFIG_PCI_GOANY not in final ".config" Requested value: "CONFIG_PCI_GOANY=y" Actual value set: "" So we split the 32bit only drivers out of the common driver include and the problem goes away. [YOCTO: 7354] Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.19.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb index dba163e006d3..1997e30a2589 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb @@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.19" KMETA = "meta" SRCREV_machine ?= "43b9eced9ba8a57add36af07736344dcc383f711" -SRCREV_meta ?= "8897ef68b30e7426bc1d39895e71fb155d694974" +SRCREV_meta ?= "f7a81274b461d0c748964d75c24bea8574d350fb" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb index 044ee7f524ca..f856d19f938f 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb @@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "43b9eced9ba8a57add36af07736344dcc383f711" SRCREV_machine_qemux86-64 ?= "43b9eced9ba8a57add36af07736344dcc383f711" SRCREV_machine_qemumips64 ?= "b7ab9d4bac55415f125c81f529dbbefb07de98ad" SRCREV_machine ?= "43b9eced9ba8a57add36af07736344dcc383f711" -SRCREV_meta ?= "8897ef68b30e7426bc1d39895e71fb155d694974" +SRCREV_meta ?= "f7a81274b461d0c748964d75c24bea8574d350fb" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] kern-tools: improve patch application performance
Update the SRCREV for the following incremental improvement in patch processing time: kgit-meta: skip patches on non-leaf nodes In a similar way as commit 0768d697 [kgit-meta: dont run kgit-s2q for non-leaf nodes], we can save even more processing time by not even analysing and linking patches if we aren't on the leaf node of the tree. This early exit can save nearly 95% of the time required to "patch" a tree when no changes are actually applied. Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/kern-tools/kern-tools-native_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 80d26f98749d..131c5e9d0e2b 100644 --- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70c DEPENDS = "git-native" -SRCREV = "cab17f884998b43692244a863dea6f505c7f67af" +SRCREV = "0c51a3d02fa54726141f32824b11d0676960e0a5" PR = "r12" PV = "0.2+git${SRCPV}" -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] linux-yocto/3.14: OcteonIII support
With these SRCREV updates, we add the following support to the kernel: The following has been verified with the branch sources: On 68xx: * SGMII, XAUI Packet IO interfaces. * PCIe devices * EHCI/OHCI USB driver On 78XX: * Ran LTP testsuite * SGMII, XAUI Packet IO interfaces * MMC driver (which covers GPIO interrupts in the driver) * PCIe devices * XHCI USB driver Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.14.bb | 16 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb index bd61c4a927c8..4080aca495db 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb @@ -3,8 +3,8 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "fbe20225d041672b110e93c3ad171737b69e2126" -SRCREV_machine_qemuppc ?= "11f38e2b2a63c5b1138617c197b3f5b96cd74a65" +SRCREV_machine ?= "eb2c9c93de9b806f2a52c26bba229089a7a71385" +SRCREV_machine_qemuppc ?= "bd470d1c8337323b0f7d1529df70a1c68108df0b" SRCREV_meta ?= "6eddbf47875ef48ddc5864957a7b63363100782b" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb index d110297246c1..f6b95a218ad7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb @@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.14.29" KMETA = "meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "f65678ef48c5d41af914d2769e4dd01411c1df96" +SRCREV_machine ?= "3bab81113682d3a5ffc8ea60cf770beed4831492" SRCREV_meta ?= "6eddbf47875ef48ddc5864957a7b63363100782b" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb index 9cdd3eea0d5c..0d0d8b2ee22a 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb @@ -11,14 +11,14 @@ KBRANCH_qemux86 ?= "standard/common-pc/base" KBRANCH_qemux86-64 ?= "standard/common-pc-64/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "1a9f9edade8d8c0120d2f47dfd15edd41c7a3439" -SRCREV_machine_qemuarm64 ?= "f65678ef48c5d41af914d2769e4dd01411c1df96" -SRCREV_machine_qemumips ?= "68e9a20079f3cc333c3b7d945bb65fa74772aa37" -SRCREV_machine_qemuppc ?= "a992646d267f012f87967f1c8b88608c950c7e58" -SRCREV_machine_qemux86 ?= "2f37d969c5d3b28d936ac3533862e2ab034d4f37" -SRCREV_machine_qemux86-64 ?= "f65678ef48c5d41af914d2769e4dd01411c1df96" -SRCREV_machine_qemumips64 ?= "e93012684a290e9b60d61f58c2dbd36ab3f2e549" -SRCREV_machine ?= "f65678ef48c5d41af914d2769e4dd01411c1df96" +SRCREV_machine_qemuarm ?= "38d0249598bef8263f1f1e280badf6b92a0bc668" +SRCREV_machine_qemuarm64 ?= "3bab81113682d3a5ffc8ea60cf770beed4831492" +SRCREV_machine_qemumips ?= "d2138247c6f1ba8f082f7c2b0d4a6a4efb0cf908" +SRCREV_machine_qemuppc ?= "2ec2927314d58a012403cbaccdf0a8a1f5c5d666" +SRCREV_machine_qemux86 ?= "9ed9a63eeafbcbee0e378e304a1029bb14d45697" +SRCREV_machine_qemux86-64 ?= "3bab81113682d3a5ffc8ea60cf770beed4831492" +SRCREV_machine_qemumips64 ?= "afdaa94d540bf671f4d4d198ec6b891df22fb323" +SRCREV_machine ?= "3bab81113682d3a5ffc8ea60cf770beed4831492" SRCREV_meta ?= "6eddbf47875ef48ddc5864957a7b63363100782b" SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" -- 2.1.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] systemd: split modules into packages
Hello Randy, On Sex, 2015-02-06 at 10:45 -0800, Randy Witt wrote: > On 02/04/2015 09:04 AM, Bruno Bottazzini wrote: > > It wil be able to choose what systemd module to be installed. > > The final result may get smaller, if the user wanted to. > > By default it will install the whole systemd which may be big. > > --- > > meta/recipes-core/systemd/systemd_218.bb | 1059 > > ++ > > 1 file changed, 914 insertions(+), 145 deletions(-) > > This patch will push a lot of maintenance work onto the Yocto systemd > maintainer > every time there is an upgrade. It's also easy to miss dependencies because > of > the inter-dependencies that can exist between services. This is not a problem, we can give this maintenance. > > For items such as systemd-cgls and the tools, a change like this would be > maintainable since those items are self-contained. But yanking out the > services > into separate packages means the maintainer will have to inspect them on each > upgrade to make sure they still work. > > Would it be sufficient to use PACKAGECONFIG for each of the items that can be > disabled via configure? That way the granularity configuration is done by the > systemd maintainers rather than the Yocto maintainer. With PACKAGECONFIG, we may not get everything "for free" as some data files will be installed regardless as well as some components from systemd cannot be disabled by their build system but we can run without them, for instance we can run without journald. The problem is understanding that although systemd is a single repository it contains multiple services and daemons in it that can run even without the core PID1, udev or the many helpers used to configure the system such as resolved, timedated, localed... All of these components are runtime independent, we can install or remove them and they should not create problems. Even Ubuntu is shipping with some of these daemons even if systemd is not used (yet). If they were different GIT repos then it would be clear that they are separate daemons, but as they are all in a single repository people can make a confusion about it. I see that in the master branch it has already the version 219. I will make a split packages for the newest version that was just released. Best Regards, Bruno Bottazzini > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: verify if file test-udev and systemd-journal-flush exists
If we compile using EXTRA_OECONF with '--disable-tests' option, the files test-udev and systemd-journal-flush will not be created and the systemd install phase will fail. --- meta/recipes-core/systemd/systemd_219.bb | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index f245239..b30f14d 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -165,7 +165,9 @@ do_install() { sed -i -e 's/.*ForwardToSyslog.*/ForwardToSyslog=yes/' ${D}${sysconfdir}/systemd/journald.conf # its needed in 216 upstream has fixed it with 919699ec301ea507edce4a619141ed22e789ac0d # don't order journal flushing afte remote-fs.target - sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service + if [ -s ${D}${systemd_unitdir}/system/systemd-journal-flush.service ]; then +sed -i -e 's/ remote-fs.target$//' ${D}${systemd_unitdir}/system/systemd-journal-flush.service + fi # this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it # for existence else it fails if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then @@ -176,7 +178,9 @@ do_install() { do_install_ptest () { install -d ${D}${PTEST_PATH}/test cp -rf ${S}/test/* ${D}${PTEST_PATH}/test - install -m 0755 ${B}/test-udev ${D}${PTEST_PATH}/ + if [ -s ${B}/test-udev ]; then + install -m 0755 ${B}/test-udev ${D}${PTEST_PATH}/ + fi install -d ${D}${PTEST_PATH}/build-aux cp ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ cp -rf ${B}/rules ${D}${PTEST_PATH}/ -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] lib/oeqa/selftest/lic-checksum: Verify failure when checksum changes.
The test added verifies that when a file with an absolute path in LIC_FILES_CHKSUM changes without a corresponding change to the md5sum, it triggers the license qa test again with a failure. [Yocto #6450] Signed-off-by: Randy Witt --- meta-selftest/recipes-test/emptytest/emptytest.bb | 5 meta/lib/oeqa/selftest/lic-checksum.py| 28 +++ 2 files changed, 33 insertions(+) create mode 100644 meta-selftest/recipes-test/emptytest/emptytest.bb create mode 100644 meta/lib/oeqa/selftest/lic-checksum.py diff --git a/meta-selftest/recipes-test/emptytest/emptytest.bb b/meta-selftest/recipes-test/emptytest/emptytest.bb new file mode 100644 index 000..e87f4d7 --- /dev/null +++ b/meta-selftest/recipes-test/emptytest/emptytest.bb @@ -0,0 +1,5 @@ +include test_recipe.inc + +# Set LICENSE to something so that bitbake -p that is ran at the beginning +# is successful since test_recipe.inc has not yet been modified. +LICENSE = "" diff --git a/meta/lib/oeqa/selftest/lic-checksum.py b/meta/lib/oeqa/selftest/lic-checksum.py new file mode 100644 index 000..0c1afa6 --- /dev/null +++ b/meta/lib/oeqa/selftest/lic-checksum.py @@ -0,0 +1,28 @@ +import os +import tempfile + +from oeqa.selftest.base import oeSelfTest +from oeqa.utils.commands import bitbake +from oeqa.utils import CommandError + +class LicenseTests(oeSelfTest): + +# Verify that changing a license file that has an absolute path causes +# the license qa to fail due to a mismatched md5sum. +def test_foo(self): +bitbake_cmd = '-c configure emptytest' +error_msg = 'ERROR: emptytest: The new md5 checksum is 8d777f385d3dfec8815d20f7496026dc' + +lic_file, lic_path = tempfile.mkstemp() +os.close(lic_file) +self.track_for_cleanup(lic_path) + +self.write_recipeinc('emptytest', 'LIC_FILES_CHKSUM = "file://%s;md5=d41d8cd98f00b204e9800998ecf8427e"' % lic_path) +result = bitbake(bitbake_cmd) + +with open(lic_path, "w") as f: +f.write("data") + +result = bitbake(bitbake_cmd, ignore_status=True) +if error_msg not in result.output: +raise AssertionError(result.output) -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Add fix and test for [Yocto #6450]
The following changes since commit bf1a68e97f2069a4f4c351d4bafd416358eb: taglib: Fix cmake floating dependency on boost (2015-03-02 18:06:53 +) are available in the git repository at: git://git.yoctoproject.org/poky-contrib rewitt/license_fix for you to fetch changes up to a35e9afe37fe87921f0e9e915208364a271d89c3: lib/oeqa/selftest/lic-checksum: Verify failure when checksum changes. (2015-03-02 10:28:23 -0800) Randy Witt (2): base.bbclass: Add LIC_FILES_CHKSUM files to checksum files. lib/oeqa/selftest/lic-checksum: Verify failure when checksum changes. meta-selftest/recipes-test/emptytest/emptytest.bb | 5 meta/classes/base.bbclass | 17 ++ meta/lib/oeqa/selftest/lic-checksum.py| 28 +++ 3 files changed, 50 insertions(+) create mode 100644 meta-selftest/recipes-test/emptytest/emptytest.bb create mode 100644 meta/lib/oeqa/selftest/lic-checksum.py -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] base.bbclass: Add LIC_FILES_CHKSUM files to checksum files.
Previously, files with absolute paths in LIC_FILES_CHKSUM such as "file://${COMMON_LICENSE_DIR}/foo" would not result in a qa failure when the license file changed. To fix this problem, add any files with absolute paths from LIC_FILES_CHKSUM to the file-checksums varflag, so that changes in the license file are detected and cause the qa task for licenses to run. [Yocto #6450] Signed-off-by: Randy Witt --- meta/classes/base.bbclass | 17 + 1 file changed, 17 insertions(+) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 789af3b..2c2d019 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -94,9 +94,26 @@ def extra_path_elements(d): PATH_prepend = "${@extra_path_elements(d)}" +def get_lic_checksum_file_list(d): +filelist = [] +lic_files = d.getVar("LIC_FILES_CHKSUM", True) or '' + +urls = lic_files.split() +for url in urls: +# We only care about items that are absolute paths since +# any others should be covered by SRC_URI. +try: +path = bb.fetch.decodeurl(url)[2] +if path[0] == '/': +filelist.append(path + ":" + str(os.path.exists(path))) +except bb.fetch.MalformedUrl: +raise bb.build.FuncFailed(d.getVar('PN', True) + ": LIC_FILES_CHKSUM contains an invalid URL: " + url) +return " ".join(filelist) + addtask fetch do_fetch[dirs] = "${DL_DIR}" do_fetch[file-checksums] = "${@bb.fetch.get_checksum_file_list(d)}" +do_fetch[file-checksums] += " ${@get_lic_checksum_file_list(d)}" do_fetch[vardeps] += "SRCREV" python base_do_fetch() { -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] Add init script (sysv) support for busybox's ntpd
On Mon, Mar 2, 2015 at 10:12 AM, Laszlo Papp wrote: > Signed-off-by: Laszlo Papp > --- > meta/recipes-core/busybox/busybox.inc | 12 +++-- > meta/recipes-core/busybox/busybox_1.23.1.bb | 2 + > meta/recipes-core/busybox/files/busybox-ntpd | 54 > +++ > meta/recipes-core/busybox/files/busybox-ntpd.conf | 2 + > 4 files changed, 67 insertions(+), 3 deletions(-) > create mode 100644 meta/recipes-core/busybox/files/busybox-ntpd > create mode 100644 meta/recipes-core/busybox/files/busybox-ntpd.conf > > diff --git a/meta/recipes-core/busybox/busybox.inc > b/meta/recipes-core/busybox/busybox.inc > index 0769d92..b33d624 100644 > --- a/meta/recipes-core/busybox/busybox.inc > +++ b/meta/recipes-core/busybox/busybox.inc > @@ -19,7 +19,7 @@ export EXTRA_CFLAGS = "${CFLAGS}" > export EXTRA_LDFLAGS = "${LDFLAGS}" > export EXTRA_OEMAKE += "'LD=${CCLD}'" > > -PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev > ${PN}-hwclock" > +PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev > ${PN}-hwclock ${PN}-ntpd" > > FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" > FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* > ${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* > ${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog" > @@ -27,15 +27,17 @@ FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev > ${sysconfdir}/mdev.conf ${sysconfd > FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" > FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" > FILES_${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh" > +FILES_${PN}-ntpd = "${sysconfdir}/init.d/busybox-ntpd > ${sysconfdir}/busybox-ntpd.conf" > > -INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev > ${PN}-hwclock" > +INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev > ${PN}-hwclock ${PN}-ntpd" > > 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_NAME_${PN}-syslog = "syslog" > -INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" > +INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" > +INITSCRIPT_NAME_${PN}-ntpd = "busybox-ntpd" > > SYSTEMD_PACKAGES = "${PN}-syslog" > SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service" > @@ -273,6 +275,10 @@ do_install () { > install -m 0755 ${WORKDIR}/mdev-mount.sh > ${D}${sysconfdir}/mdev > fi > fi > +if grep "CONFIG_NTPD=y" ${B}/.config; then > +install -m 0755 ${WORKDIR}/busybox-ntpd ${D}${sysconfdir}/init.d/ > +install -m 0644 ${WORKDIR}/busybox-ntpd.conf ${D}${sysconfdir}/ > +fi > > if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; > then > if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then > diff --git a/meta/recipes-core/busybox/busybox_1.23.1.bb > b/meta/recipes-core/busybox/busybox_1.23.1.bb > index 1742390..8e57381 100644 > --- a/meta/recipes-core/busybox/busybox_1.23.1.bb > +++ b/meta/recipes-core/busybox/busybox_1.23.1.bb > @@ -31,6 +31,8 @@ SRC_URI = > "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ > file://recognize_connmand.patch \ > file://busybox-cross-menuconfig.patch \ > > file://CVE-2014-9645_busybox_reject_module_names_with_slashes.patch \ > + file://busybox-ntpd \ > + file://busybox-ntpd.conf \ > " > > SRC_URI[tarball.md5sum] = "5c94d6301a964cd91619bd4d74605245" > diff --git a/meta/recipes-core/busybox/files/busybox-ntpd > b/meta/recipes-core/busybox/files/busybox-ntpd > new file mode 100644 > index 000..b318cda > --- /dev/null > +++ b/meta/recipes-core/busybox/files/busybox-ntpd > @@ -0,0 +1,54 @@ > +#!/bin/sh > + > +### BEGIN INIT INFO > +# Provides: > +# Required-Start:$local_fs $remote_fs $network $syslog > +# Required-Stop: $local_fs $remote_fs $network $syslog > +# Default-Start: 2 3 4 5 > +# Default-Stop: 0 1 6 > +# Short-Description: Small busybox ntp server > +# Description: busybox-ntpd is a small and fast busybox ntp applet > +### END INIT INFO > + > +DAEMON=/sbin/ntpd > +NAME=ntpd > +DESC="Busybox NTP Daemon" > +source /etc/busybox-ntpd.conf > +ARGS="-p $PEER" > + > +test -f $DAEMON || exit 0 > + > +set -e > + > +case "$1" in > +start) > +if [ -z "$PEER" ]; then > +echo "PEER needs to be specified" > +else > +start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS > +echo "done." > +fi > +;; > +stop) > +echo -n "stopping $DESC: $NAME... " > +start-stop-daemon -K -n $NAME > +echo "done." > +;; > +restart) > +echo "restarting $DESC: $NAME... " > +$0 stop > +$0 start > +echo "done." > +;; > +
Re: [OE-core] NFS server
On 28/02/15 14:39, Michael Gloff wrote: I'm not sure how to proceed, but this pretty much breaks nfs server capabilities. Hi Michael, could you please file a bug on https://bugzilla.yoctoproject.org/ -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Building with OpenMP support in OE fails on #include
On 02-03-15 16:45, Paul Eggleton wrote: Hi Mike, On Monday 02 March 2015 15:54:04 Mike Looijmans wrote: Here's the problem, running in a devshell: # echo '#include ' > /tmp/compileme.c # $CC -c -fopenmp /tmp/compileme.c /tmp/compileme.c:1:17: fatal error: omp.h: No such file or directory #include ^ compilation terminated. The #pragma's and linking of OpenMP work just fine, it's just the inclusion of omp.h that appears to fail. What I was actually trying to do is to activate OpenMP in OpenCV to get decent performance on a multicore ARM system. But this is holding me back now. Looking in the sysroots reveals that the include file is actually there: $ find tmp-glibc/sysroots/topic-miami-florida-med-xc7z030 -name omp.h tmp-glibc/sysroots/topic-miami-florida-med-xc7z030/usr/lib/gcc/arm-oe-linux- gnueabi/4.9.1/include/omp.h Funnily enough this is an issue I fixed a few weeks ago - here's the bug which contains a link to the fix: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7141 Ah okay, I'll upgrade to current master and retest. If it works, I'll post the patch to make opencv build with openmp. -- Mike Looijmans -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] NFS server
On 28/02/15 14:39, Michael Gloff wrote: All, I have run into the issue of nfs server seg faulting when trying to start. After some searching I found that it is related to GCC 4.9.x and nfs-utils-1.3.X http://lists.linuxfromscratch.org/pipermail/blfs-dev/2014-July/027853.html There is a patch that I have tested locally that works. Hmm, that seems weird, I seem to remember this specific patch being already fixed upstream, I will check this later today. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] systemd: avoid parsing error when 'networkd' is enabled in PACKAGECONFIG
On 2 March 2015 at 01:37, Chen Qi wrote: > If 'networkd' is enabled in PACKAGECONFIG, the do_install variable cannot > be correctly expanded. Error message is like below. > > Failure expanding variable do_install: ShellSyntaxError: LexToken(Fi,'fi',0,0) > followed by: > LexToken(NEWLINE,'\n',0,0) > > This patch fixes the above problem. > > Signed-off-by: Chen Qi > --- > meta/recipes-core/systemd/systemd_219.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-core/systemd/systemd_219.bb > b/meta/recipes-core/systemd/systemd_219.bb > index f245239..d785255 100644 > --- a/meta/recipes-core/systemd/systemd_219.bb > +++ b/meta/recipes-core/systemd/systemd_219.bb > @@ -169,7 +169,7 @@ do_install() { > # this file is needed to exist if networkd is disabled but timesyncd > is still in use since timesyncd checks it > # for existence else it fails > if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then > - ${@bb.utils.contains('PACKAGECONFIG', 'networkd', '', 'sed -i > -e "\$ad /run/systemd/netif/links 0755 root root -" > ${D}${libdir}/tmpfiles.d/systemd.conf', d)} > + ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed > -i -e "\$ad /run/systemd/netif/links 0755 root root -" > ${D}${libdir}/tmpfiles.d/systemd.conf', d)} I did exactly this locally. Works fine. > fi > } > > -- > 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
Re: [OE-core] [PATCH] glibc: 'yes' within the path sets wrong variables
On Thu, 2015-02-26 at 08:17 -0800, Khem Raj wrote: > On Thu, Feb 26, 2015 at 4:22 AM, Burton, Ross wrote: > > > > On 25 February 2015 at 18:14, Benjamin Esquivel > > wrote: > >> > >> Saul, is there a specific part of the glibc's run.do_configure that > >> should re-conf? > > > > > > The glibc recipe explicitly avoids autoreconfig: > > > > "# override this function to avoid the autoconf/automake/aclocal/autoheader > > calls for now" > > it is intentional since glibc would use older versions of autotools. > 2.21 should be using 2.69, so in theory we > can reconf, but this needs to be tested thoroughly. Indeed it starts bleeding all over with failures if a reconf is attempted. I'll stick to the bug fix for now. > > > > > Khem is the person to ask if this is something that can be removed but for > > now, patching the configure is all we can do (and sending the patch upstream > > so we don't need to patch configure in the future). > > > > Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] glibc: 'yes' within the path sets wrong variables
On Thu, 2015-02-26 at 08:18 -0800, Khem Raj wrote: > On Mon, Feb 23, 2015 at 1:54 AM, Benjamin Esquivel > wrote: > > The pre-processed output of conftest.c contains an include dir > > and if the path of it contains a 'yes' it will cause some variables > > to be wrongly set to yes because of the way it greps for it. > > The fix is to use a more elaborated string instead of just 'yes'. > > This has to be done at the configure and the configure.ac files, > > normally it would only require the configure.ac changes but they > > also need modification given the configure files also pop-out of > > the source tarball. > > > > [YOCTO #6614] > > looks good. Mark it upstreamable, and send it to glibc ml as well. > will do > > > > Signed-off-by: Benjamin Esquivel > > --- > > meta/recipes-core/glibc/glibc/fix-yesdir.patch | 230 > > + > > meta/recipes-core/glibc/glibc_2.21.bb | 1 + > > 2 files changed, 231 insertions(+) > > create mode 100644 meta/recipes-core/glibc/glibc/fix-yesdir.patch > > > > diff --git a/meta/recipes-core/glibc/glibc/fix-yesdir.patch > > b/meta/recipes-core/glibc/glibc/fix-yesdir.patch > > new file mode 100644 > > index 000..4d014c0 > > --- /dev/null > > +++ b/meta/recipes-core/glibc/glibc/fix-yesdir.patch > > @@ -0,0 +1,230 @@ > > +Index: git/sysdeps/arm/configure > > +=== > > +--- git.orig/sysdeps/arm/configure > > git/sysdeps/arm/configure > > +@@ -150,12 +150,12 @@ else > > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext > > + /* end confdefs.h. */ > > + #ifdef __ARM_PCS_VFP > > +-yes > > ++use_arm_pcs_vfp > > +#endif > > + > > + _ACEOF > > + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | > > +- $EGREP "yes" >/dev/null 2>&1; then : > > ++ $EGREP "use_arm_pcs_vfp" >/dev/null 2>&1; then : > > + libc_cv_arm_pcs_vfp=yes > > + else > > + libc_cv_arm_pcs_vfp=no > > +Index: git/sysdeps/arm/configure.ac > > +=== > > +--- git.orig/sysdeps/arm/configure.ac > > git/sysdeps/arm/configure.ac > > +@@ -16,8 +16,8 @@ dnl it. Until we do, don't define it. > > + # the dynamic linker via %ifdef. > > + AC_CACHE_CHECK([whether the compiler is using the ARM hard-float ABI], > > + [libc_cv_arm_pcs_vfp], > > +- [AC_EGREP_CPP(yes,[#ifdef __ARM_PCS_VFP > > +-yes > > ++ [AC_EGREP_CPP(use_arm_pcs_vfp,[#ifdef __ARM_PCS_VFP > > ++use_arm_pcs_vfp > > +#endif > > + ], libc_cv_arm_pcs_vfp=yes, libc_cv_arm_pcs_vfp=no)]) > > + if test $libc_cv_arm_pcs_vfp = yes; then > > +Index: git/sysdeps/aarch64/configure > > +=== > > +--- git.orig/sysdeps/aarch64/configure > > git/sysdeps/aarch64/configure > > +@@ -148,12 +148,12 @@ else > > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext > > + /* end confdefs.h. */ > > + #ifdef __AARCH64EB__ > > +- yes > > ++ is_aarch64_be > > + #endif > > + > > + _ACEOF > > + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | > > +- $EGREP "yes" >/dev/null 2>&1; then : > > ++ $EGREP "is_aarch64_be" >/dev/null 2>&1; then : > > + libc_cv_aarch64_be=yes > > + else > > + libc_cv_aarch64_be=no > > +Index: git/sysdeps/aarch64/configure.ac > > +=== > > +--- git.orig/sysdeps/aarch64/configure.ac > > git/sysdeps/aarch64/configure.ac > > +@@ -10,8 +10,8 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the > > + # the dynamic linker via %ifdef. > > + AC_CACHE_CHECK([for big endian], > > + [libc_cv_aarch64_be], > > +- [AC_EGREP_CPP(yes,[#ifdef __AARCH64EB__ > > +- yes > > ++ [AC_EGREP_CPP(is_aarch64_be,[#ifdef __AARCH64EB__ > > ++ is_aarch64_be > > + #endif > > + ], libc_cv_aarch64_be=yes, libc_cv_aarch64_be=no)]) > > + if test $libc_cv_aarch64_be = yes; then > > +Index: git/sysdeps/mips/configure > > +=== > > +--- git.orig/sysdeps/mips/configure > > git/sysdeps/mips/configure > > +@@ -143,11 +143,11 @@ else > > + /* end confdefs.h. */ > > + dnl > > + #ifdef __mips_nan2008 > > +-yes > > ++use_mips_nan2008 > > + #endif > > + _ACEOF > > + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | > > +- $EGREP "yes" >/dev/null 2>&1; then : > > ++ $EGREP "use_mips_nan2008" >/dev/null 2>&1; then : > > + libc_cv_mips_nan2008=yes > > + else > > + libc_cv_mips_nan2008=no > > +Index: git/sysdeps/mips/configure.ac > > +=== > > +--- git.orig/sysdeps/mips/configure.ac > > git/sysdeps/mips/configure.ac > > +@@ -6,9 +6,9 @@ dnl position independent way. > > + dnl AC_DEFINE(PI_STATIC_AND_HIDDEN) > > + > > + AC_CACHE_CHECK([whether the
Re: [OE-core] Building with OpenMP support in OE fails on #include
Hi Mike, On Monday 02 March 2015 15:54:04 Mike Looijmans wrote: > Here's the problem, running in a devshell: > > # echo '#include ' > /tmp/compileme.c > # $CC -c -fopenmp /tmp/compileme.c > /tmp/compileme.c:1:17: fatal error: omp.h: No such file or directory > #include > ^ > compilation terminated. > > > The #pragma's and linking of OpenMP work just fine, it's just the inclusion > of omp.h that appears to fail. > > What I was actually trying to do is to activate OpenMP in OpenCV to get > decent performance on a multicore ARM system. But this is holding me back > now. > > Looking in the sysroots reveals that the include file is actually there: > > $ find tmp-glibc/sysroots/topic-miami-florida-med-xc7z030 -name omp.h > tmp-glibc/sysroots/topic-miami-florida-med-xc7z030/usr/lib/gcc/arm-oe-linux- > gnueabi/4.9.1/include/omp.h Funnily enough this is an issue I fixed a few weeks ago - here's the bug which contains a link to the fix: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7141 Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Building with OpenMP support in OE fails on #include
Here's the problem, running in a devshell: # echo '#include ' > /tmp/compileme.c # $CC -c -fopenmp /tmp/compileme.c /tmp/compileme.c:1:17: fatal error: omp.h: No such file or directory #include ^ compilation terminated. The #pragma's and linking of OpenMP work just fine, it's just the inclusion of omp.h that appears to fail. What I was actually trying to do is to activate OpenMP in OpenCV to get decent performance on a multicore ARM system. But this is holding me back now. Looking in the sysroots reveals that the include file is actually there: $ find tmp-glibc/sysroots/topic-miami-florida-med-xc7z030 -name omp.h tmp-glibc/sysroots/topic-miami-florida-med-xc7z030/usr/lib/gcc/arm-oe-linux-gnueabi/4.9.1/include/omp.h Maybe something missing in the OE compiler options for the compiler? Met vriendelijke groet / kind regards, Mike Looijmans System Expert TOPIC Embedded Systems Eindhovenseweg 32-C, NL-5683 KH Best Postbus 440, NL-5680 AK Best Telefoon: (+31) (0) 499 33 69 79 Telefax: (+31) (0) 499 33 69 70 E-mail: mike.looijm...@topic.nl Website: www.topic.nl Please consider the environment before printing this e-mail Topic zoekt gedreven (embedded) software specialisten! http://topic.nl/vacatures/topic-zoekt-software-engineers/ -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Bitbake class - how to escape special characters?
On Mon, 2015-03-02 at 11:49 +, Peter Gejgus wrote: > Hello, > > This is the excerpt of my bitbake class: > > data_migration_common() { > if [ x"$D" = "x" ]; then > if [[ ! ${CURRENT_DATA_VERSION} =~ ^[0-9]?[0-9].[0-9]?[0-9]$ > ]]; then > error-exit "Version information was provided in invalid > format!" > fi > ... > fi > } > > python populate_packages_append() { > data_migration_pkgs = d.getVar('DATA_MIGRATION_PACKAGES', True).split() > > for pkg in data_migration_pkgs: > bb.note("adding data migration postinst scripts to %s" % pkg) > postinst = d.getVar('pkg_postinst_%s' % pkg, True) or > d.getVar('pkg_postinst', True) > if not postinst: > postinst = '#!/bin/sh\n' > postinst += d.getVar('data_migration_common', True) > d.setVar('pkg_postinst_%s' % pkg, postinst) > } > > This class generates post-install scriptlet for the packages > inheriting from this bitbake class. > > But bitbake is unable to parse the code in the data_migration_common > function and claiming: > ERROR: ExpansionError during parsing .../xyz_0.1.0.bb: Failure > expanding variable data_migration_common: ShellSyntaxError: Invalid > token "%s" > > This problem is because the regular expression in the function > data_migration_common contains character '$'. Bitbake succeeds when I > remove character '$' from this regular expression. Is there some way > to escape this '$' character? Because I need '$' in my regex. The problem is in the shell parser that bitbake uses (lib/bb/pysh) doesn't like that syntax. The expression you have above is bash specific and we tend to support /bin/dash as /bin/sh so the function you have there isn't portable. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] security_flags: remove PIE flags from flex and gstreamer1.0-plugins-bad
These recipes both fail to build with "relocation R_X86_64_PC32 against undefined hidden symbol `__init_array_start' can not be used when making a shared object" when using PIE. Signed-off-by: Ross Burton --- meta/conf/distro/include/security_flags.inc |2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index 16a5748..f3f0082 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc @@ -29,6 +29,7 @@ SECURITY_CFLAGS_pn-glibc-initial = "" SECURITY_CFLAGS_pn-enchant = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-expect = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-flac = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-flex = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gcc-runtime = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gcc-sanitizers = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gdb = "${SECURITY_NO_PIE_CFLAGS}" @@ -43,6 +44,7 @@ SECURITY_CFLAGS_pn-grub-efi-i586-native = "" SECURITY_CFLAGS_pn-grub-efi-x86-64-native = "" SECURITY_CFLAGS_pn-gst-plugins-bad = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gst-plugins-gl = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-gstreamer1.0-plugins-bad = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-gstreamer1.0-plugins-good = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-harfbuzz = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-kexec-tools = "${SECURITY_NO_PIE_CFLAGS}" -- 1.7.10.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Bitbake class - how to escape special characters?
Hello, This is the excerpt of my bitbake class: data_migration_common() { if [ x"$D" = "x" ]; then if [[ ! ${CURRENT_DATA_VERSION} =~ ^[0-9]?[0-9].[0-9]?[0-9]$ ]]; then error-exit "Version information was provided in invalid format!" fi ... fi } python populate_packages_append() { data_migration_pkgs = d.getVar('DATA_MIGRATION_PACKAGES', True).split() for pkg in data_migration_pkgs: bb.note("adding data migration postinst scripts to %s" % pkg) postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) if not postinst: postinst = '#!/bin/sh\n' postinst += d.getVar('data_migration_common', True) d.setVar('pkg_postinst_%s' % pkg, postinst) } This class generates post-install scriptlet for the packages inheriting from this bitbake class. But bitbake is unable to parse the code in the data_migration_common function and claiming: ERROR: ExpansionError during parsing .../xyz_0.1.0.bb: Failure expanding variable data_migration_common: ShellSyntaxError: Invalid token "%s" This problem is because the regular expression in the function data_migration_common contains character '$'. Bitbake succeeds when I remove character '$' from this regular expression. Is there some way to escape this '$' character? Because I need '$' in my regex. Best Regards, Peter -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gst-player: port to GTK+ 2
Whilst Sato still uses GTK+ 2 we don't want the overhead of building both GTK+ 2 and GKT+ 3. Luckily gtk-play is a simple application and it's just a small patch away from building with GTK+ 2. When Sato is ported to GTK+ 3 (the mythical Shuku proposal) this patch can be removed. Signed-off-by: Ross Burton --- .../gstreamer/gst-player/gtk2.patch| 71 .../recipes-multimedia/gstreamer/gst-player_git.bb |3 +- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch diff --git a/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch b/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch new file mode 100644 index 000..2cd18bb --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-player/gtk2.patch @@ -0,0 +1,71 @@ +As the rest of Sato is GTK+ 2, patch gtk-play to use GTK+ 2. When the rest of +Sato has been ported to GTK+ 3 this patch can be dropped. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton + + +diff --git a/configure.ac b/configure.ac +index b8af13b..90ab74c 100644 +--- a/configure.ac b/configure.ac +@@ -60,7 +60,7 @@ AC_SUBST(GLIB_PREFIX) + GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-1.0`" + AC_SUBST(GST_PREFIX) + +-PKG_CHECK_MODULES(GTK, [gtk+-3.0], [have_gtk="yes"], [have_gtk="no"]) ++PKG_CHECK_MODULES(GTK, [gtk+-2.0], [have_gtk="yes"], [have_gtk="no"]) + AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" != "xno") + + GOBJECT_INTROSPECTION_CHECK([1.31.1]) +diff --git a/gtk/gtk-play.c b/gtk/gtk-play.c +index f015077..954d6fb 100644 +--- a/gtk/gtk-play.c b/gtk/gtk-play.c +@@ -34,6 +34,46 @@ typedef struct + gulong seekbar_value_changed_signal_id; + } GtkPlay; + ++/* Compat stubs */ ++GtkWidget * ++gtk_box_new (GtkOrientation orientation, ++ gint spacing) ++{ ++ switch (orientation) { ++ case GTK_ORIENTATION_HORIZONTAL: ++return gtk_hbox_new (FALSE, spacing); ++ case GTK_ORIENTATION_VERTICAL: ++return gtk_vbox_new (FALSE, spacing); ++ } ++} ++ ++GtkWidget* ++gtk_button_new_from_icon_name (const gchar *icon_name, ++ GtkIconSize size) ++{ ++ GtkWidget *button; ++ GtkWidget *image; ++ ++ image = gtk_image_new_from_icon_name (icon_name, size); ++ button = g_object_new (GTK_TYPE_BUTTON, ++ "image", image, ++ NULL); ++ return button; ++} ++ ++GtkWidget * ++gtk_scale_new_with_range (GtkOrientation orientation, ++ gdouble min, ++ gdouble max, ++ gdouble step) ++{ ++ switch (orientation) { ++ case GTK_ORIENTATION_HORIZONTAL: ++return gtk_hscale_new_with_range (min, max, step); ++ case GTK_ORIENTATION_VERTICAL: ++return gtk_vscale_new_with_range (min, max, step); ++ } ++} + + static void + set_title (GtkPlay * play, const gchar * title) diff --git a/meta/recipes-multimedia/gstreamer/gst-player_git.bb b/meta/recipes-multimedia/gstreamer/gst-player_git.bb index cd96d77..988c407 100644 --- a/meta/recipes-multimedia/gstreamer/gst-player_git.bb +++ b/meta/recipes-multimedia/gstreamer/gst-player_git.bb @@ -3,10 +3,11 @@ SUMMARY="GStreamer playback helper library and examples" LICENSE = "LGPL-2.0+" LIC_FILES_CHKSUM = "file://lib/gst/player/gstplayer.c;beginline=1;endline=19;md5=03aeca9d8295f811817909075a15ff65" -DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gtk+3" +DEPENDS = "glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base gtk+" SRC_URI = "git://github.com/sdroege/gst-player.git \ file://filechooser.patch \ + file://gtk2.patch \ file://gst-player.desktop" SRCREV = "5386c5b984d40ef5434673ed62204e69aaf52645" -- 1.7.10.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH] gcc-source: fix bug to avoid building error.
gcc-source don't do do_package_write_rpm, so we should set PACKAGES = "" to avoid the building error if we want generate srpm, otherwise, we get the error as below. ERROR: Task do_deploy_archives in meta/recipes-devtools/gcc/gcc-source_4.9.bb \ depends upon non-existent task do_package_write_rpm in \ meta/recipes-devtools/gcc/gcc-source_4.9.bb Signed-off-by: Bian Naimeng --- meta/recipes-devtools/gcc/gcc-source.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc index 968830a..10e9285 100644 --- a/meta/recipes-devtools/gcc/gcc-source.inc +++ b/meta/recipes-devtools/gcc/gcc-source.inc @@ -19,6 +19,7 @@ STAMPCLEAN = "${STAMPS_DIR}/work-shared/gcc-[0-9]*-*" INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "" +PACKAGES = "" python do_preconfigure () { import subprocess -- 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 0/1] Python: Upgrade from 2.7.3 to 2.7.9
On 2 March 2015 at 10:29, Peter Urbanec wrote: > I'm completely in favour of this change from the security point of view. > However, it is likely to trip up a few people, so the change in behaviour > should be prominently highlighted in the release notes. I also think that > it may be a good idea to keep 2.7.3 around so that it is possible to move > to new oe-core and keep the old python around. Yes, this is an important change and I'll ensure it's in the release notes. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH] fltk: Replace use of freetype-config with pkg-config Drop blacklist entry
Hi, On 02.03.2015 11:27, Martin Jansa wrote: > Wrong ML, please resend to oe-devel. oh indeed - sorry... Greetings Florian -- The dream of yesterday Florian Boor is the hope of todayTel: +49 271-771091-15 and the reality of tomorrow.Fax: +49 271-771091-19 [Robert Hutchings Goddard, 1904]florian.b...@kernelconcepts.de http://www.kernelconcepts.de/en -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libtool: put libltdl.la in the right package.
The libltdl libraries are put in libltdl-* packages, but libltdl.la is packaged in libtool-dev. This change puts libltdl.la in libltdl-dev package instead of libtool-dev. Signed-off-by: Li Zhou --- meta/recipes-devtools/libtool/libtool-2.4.6.inc |1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.4.6.inc index ff5abcb..2125de3 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc +++ b/meta/recipes-devtools/libtool/libtool-2.4.6.inc @@ -45,6 +45,7 @@ FILES_${PN}-dev = "${includedir} ${FILES_SOLIBSDEV} ${libdir}/*.la \ #FILES_${PN}-dev := "${@oe_filter_out('${datadir}/aclocal', '${FILES_libtool-dev}', d)}" FILES_libltdl = "${libdir}/libltdl${SOLIBS}" FILES_libltdl-dev = "${libdir}/libltdl${SOLIBSDEV} ${includedir}" +FILES_libltdl-dev =+ "${libdir}/libltdl.la" FILES_libltdl-staticdev = "${libdir}/libltdl.a" FILES_libltdl-dbg = "${libdir}/.debug/" -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 0/1] Python: Upgrade from 2.7.3 to 2.7.9
On 28/02/15 03:07, Burton, Ross wrote: IIRC the general argument is if that if you're assuming a self-signed certification is valid, you've lost so much security. We're in the middle of a development cycle so this will only impact people using or moving to 1.8. I'm completely in favour of this change from the security point of view. However, it is likely to trip up a few people, so the change in behaviour should be prominently highlighted in the release notes. I also think that it may be a good idea to keep 2.7.3 around so that it is possible to move to new oe-core and keep the old python around. I would not be surprised if there were other differences between 2.7.3 and 2.7.9 that complicate life. My main rationale for keeping both 2.7.3 and 2.7.9 would be that 2.7.9 can not be made backwards compatible when it comes to the SSL certificates. The only fix is at the source code level for every application that uses SSL based protocols or alternatively convincing the server operators to use certificates issued by well known CAs. For my use case scenario, that's not workable because the user of the device can download packages from third party feeds, including closed source plugins. Yes, 2.7.9 is doing the right thing, but in this case doing the right thing breaks too much stuff. I've just verified that python-imaging works for me (and works on the autobuilders), so if you can replicate the failure on demand that filing a bug would be useful. Good to know that is is something that is specific to my setup. I'll look into it again when I have a little bit of time on my hands. Right now I've put python 2.7.3 in my local overlay and am using it to get work done. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH] fltk: Replace use of freetype-config with pkg-config Drop blacklist entry
On Mon, Mar 02, 2015 at 11:15:13AM +0100, Florian Boor wrote: > From: Florian Boor > > Tested building for MIPS 32bit QEMU Wrong ML, please resend to oe-devel. > > Signed-off-by: Florian Boor > --- > .../fltk/fltk-1.1.10/fltk-no-freetype-config.patch | 18 > ++ > meta-oe/recipes-support/fltk/fltk_1.1.10.bb |7 +++ > 2 files changed, 21 insertions(+), 4 deletions(-) > create mode 100644 > meta-oe/recipes-support/fltk/fltk-1.1.10/fltk-no-freetype-config.patch > > diff --git > a/meta-oe/recipes-support/fltk/fltk-1.1.10/fltk-no-freetype-config.patch > b/meta-oe/recipes-support/fltk/fltk-1.1.10/fltk-no-freetype-config.patch > new file mode 100644 > index 000..5dbb054 > --- /dev/null > +++ b/meta-oe/recipes-support/fltk/fltk-1.1.10/fltk-no-freetype-config.patch > @@ -0,0 +1,18 @@ > +--- a/configure.in.orig 2015-03-01 16:00:35.956432907 +0100 > b/configure.in 2015-03-01 16:04:23.269580093 +0100 > +@@ -865,11 +865,11 @@ > + AC_ARG_ENABLE(xft, [ --enable-xftturn on Xft support > [default=no]]) > + > + if test x$enable_xft = xyes; then > +-AC_PATH_PROG(FTCONFIG,freetype-config) > ++AC_PATH_PROG(PKGCONFIG,pkg-config) > + > +-if test "x$FTCONFIG" != x; then > +-CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS" > +-CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS" > ++if test "x$PKGCONFIG" != x; then > ++CPPFLAGS="`$PKGCONFIG --cflags xft` $CPPFLAGS" > ++CXXFLAGS="`$PKGCONFIG --cflags xft` $CXXFLAGS" > + > + AC_CHECK_HEADER(X11/Xft/Xft.h, > + AC_CHECK_LIB(Xft, XftDrawCreate, > diff --git a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb > b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb > index 4fd3645..3229ed0 100644 > --- a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb > +++ b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb > @@ -6,19 +6,18 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=1c0b73db66884b6a925e727400315130" > > DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" > > -PR = "r1" > - > -PNBLACKLIST[fltk] ?= "broken: still uses /usr/bin/freetype-config" > +PR = "r2" > > SRC_URI = > "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 > \ > file://disable_test.patch \ > file://dso-fix.patch \ > file://libpng15.patch \ > + file://fltk-no-freetype-config.patch \ > " > > S = "${WORKDIR}/fltk-${PV}" > > -inherit lib_package autotools-brokensep binconfig > +inherit lib_package autotools-brokensep binconfig pkgconfig > > TARGET_CC_ARCH += "${LDFLAGS} -DXFT_MAJOR=2" > > -- > 1.7.10.4 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [meta-oe][PATCH] fltk: Replace use of freetype-config with pkg-config Drop blacklist entry
From: Florian Boor Tested building for MIPS 32bit QEMU Signed-off-by: Florian Boor --- .../fltk/fltk-1.1.10/fltk-no-freetype-config.patch | 18 ++ meta-oe/recipes-support/fltk/fltk_1.1.10.bb |7 +++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 meta-oe/recipes-support/fltk/fltk-1.1.10/fltk-no-freetype-config.patch diff --git a/meta-oe/recipes-support/fltk/fltk-1.1.10/fltk-no-freetype-config.patch b/meta-oe/recipes-support/fltk/fltk-1.1.10/fltk-no-freetype-config.patch new file mode 100644 index 000..5dbb054 --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk-1.1.10/fltk-no-freetype-config.patch @@ -0,0 +1,18 @@ +--- a/configure.in.orig2015-03-01 16:00:35.956432907 +0100 b/configure.in 2015-03-01 16:04:23.269580093 +0100 +@@ -865,11 +865,11 @@ + AC_ARG_ENABLE(xft, [ --enable-xftturn on Xft support [default=no]]) + + if test x$enable_xft = xyes; then +-AC_PATH_PROG(FTCONFIG,freetype-config) ++AC_PATH_PROG(PKGCONFIG,pkg-config) + +- if test "x$FTCONFIG" != x; then +- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS" +- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS" ++ if test "x$PKGCONFIG" != x; then ++ CPPFLAGS="`$PKGCONFIG --cflags xft` $CPPFLAGS" ++ CXXFLAGS="`$PKGCONFIG --cflags xft` $CXXFLAGS" + + AC_CHECK_HEADER(X11/Xft/Xft.h, + AC_CHECK_LIB(Xft, XftDrawCreate, diff --git a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb index 4fd3645..3229ed0 100644 --- a/meta-oe/recipes-support/fltk/fltk_1.1.10.bb +++ b/meta-oe/recipes-support/fltk/fltk_1.1.10.bb @@ -6,19 +6,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1c0b73db66884b6a925e727400315130" DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" -PR = "r1" - -PNBLACKLIST[fltk] ?= "broken: still uses /usr/bin/freetype-config" +PR = "r2" SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 \ file://disable_test.patch \ file://dso-fix.patch \ file://libpng15.patch \ + file://fltk-no-freetype-config.patch \ " S = "${WORKDIR}/fltk-${PV}" -inherit lib_package autotools-brokensep binconfig +inherit lib_package autotools-brokensep binconfig pkgconfig TARGET_CC_ARCH += "${LDFLAGS} -DXFT_MAJOR=2" -- 1.7.10.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Add init script (sysv) support for busybox's ntpd
Signed-off-by: Laszlo Papp --- meta/recipes-core/busybox/busybox.inc | 12 +++-- meta/recipes-core/busybox/busybox_1.23.1.bb | 2 + meta/recipes-core/busybox/files/busybox-ntpd | 54 +++ meta/recipes-core/busybox/files/busybox-ntpd.conf | 2 + 4 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-core/busybox/files/busybox-ntpd create mode 100644 meta/recipes-core/busybox/files/busybox-ntpd.conf diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 0769d92..b33d624 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -19,7 +19,7 @@ export EXTRA_CFLAGS = "${CFLAGS}" export EXTRA_LDFLAGS = "${LDFLAGS}" export EXTRA_OEMAKE += "'LD=${CCLD}'" -PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock" +PACKAGES =+ "${PN}-httpd ${PN}-udhcpd ${PN}-udhcpc ${PN}-syslog ${PN}-mdev ${PN}-hwclock ${PN}-ntpd" FILES_${PN}-httpd = "${sysconfdir}/init.d/busybox-httpd /srv/www" FILES_${PN}-syslog = "${sysconfdir}/init.d/syslog* ${sysconfdir}/syslog-startup.conf* ${sysconfdir}/syslog.conf* ${systemd_unitdir}/system/syslog.service ${sysconfdir}/default/busybox-syslog" @@ -27,15 +27,17 @@ FILES_${PN}-mdev = "${sysconfdir}/init.d/mdev ${sysconfdir}/mdev.conf ${sysconfd FILES_${PN}-udhcpd = "${sysconfdir}/init.d/busybox-udhcpd" FILES_${PN}-udhcpc = "${sysconfdir}/udhcpc.d ${datadir}/udhcpc" FILES_${PN}-hwclock = "${sysconfdir}/init.d/hwclock.sh" +FILES_${PN}-ntpd = "${sysconfdir}/init.d/busybox-ntpd ${sysconfdir}/busybox-ntpd.conf" -INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev ${PN}-hwclock" +INITSCRIPT_PACKAGES = "${PN}-httpd ${PN}-syslog ${PN}-udhcpd ${PN}-mdev ${PN}-hwclock ${PN}-ntpd" 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_NAME_${PN}-syslog = "syslog" -INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" +INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" +INITSCRIPT_NAME_${PN}-ntpd = "busybox-ntpd" SYSTEMD_PACKAGES = "${PN}-syslog" SYSTEMD_SERVICE_${PN}-syslog = "busybox-syslog.service" @@ -273,6 +275,10 @@ do_install () { install -m 0755 ${WORKDIR}/mdev-mount.sh ${D}${sysconfdir}/mdev fi fi +if grep "CONFIG_NTPD=y" ${B}/.config; then +install -m 0755 ${WORKDIR}/busybox-ntpd ${D}${sysconfdir}/init.d/ +install -m 0644 ${WORKDIR}/busybox-ntpd.conf ${D}${sysconfdir}/ +fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then diff --git a/meta/recipes-core/busybox/busybox_1.23.1.bb b/meta/recipes-core/busybox/busybox_1.23.1.bb index 1742390..8e57381 100644 --- a/meta/recipes-core/busybox/busybox_1.23.1.bb +++ b/meta/recipes-core/busybox/busybox_1.23.1.bb @@ -31,6 +31,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://recognize_connmand.patch \ file://busybox-cross-menuconfig.patch \ file://CVE-2014-9645_busybox_reject_module_names_with_slashes.patch \ + file://busybox-ntpd \ + file://busybox-ntpd.conf \ " SRC_URI[tarball.md5sum] = "5c94d6301a964cd91619bd4d74605245" diff --git a/meta/recipes-core/busybox/files/busybox-ntpd b/meta/recipes-core/busybox/files/busybox-ntpd new file mode 100644 index 000..b318cda --- /dev/null +++ b/meta/recipes-core/busybox/files/busybox-ntpd @@ -0,0 +1,54 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: +# Required-Start:$local_fs $remote_fs $network $syslog +# Required-Stop: $local_fs $remote_fs $network $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Small busybox ntp server +# Description: busybox-ntpd is a small and fast busybox ntp applet +### END INIT INFO + +DAEMON=/sbin/ntpd +NAME=ntpd +DESC="Busybox NTP Daemon" +source /etc/busybox-ntpd.conf +ARGS="-p $PEER" + +test -f $DAEMON || exit 0 + +set -e + +case "$1" in +start) +if [ -z "$PEER" ]; then +echo "PEER needs to be specified" +else +start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS +echo "done." +fi +;; +stop) +echo -n "stopping $DESC: $NAME... " +start-stop-daemon -K -n $NAME +echo "done." +;; +restart) +echo "restarting $DESC: $NAME... " +$0 stop +$0 start +echo "done." +;; +reload) +echo -n "reloading $DESC: $NAME... " +killall -HUP $(basename ${DAEMON}) +echo "done." +;; +*) +echo "Usage: $0 {start|stop|restart|reload}" +exit 1 +;; +esac + +exit 0 diff --git a/meta/recipes-core/busybox/files/busybox-ntpd.conf
Re: [OE-core] [PATCH] Add init script (sysv) support for busybox's ntpd
On Sun, Mar 1, 2015 at 9:34 PM, Alexandre Belloni wrote: > On 01/03/2015 at 13:48:11 +, Laszlo Papp wrote : >> I finally decided to get this patch another go, even though still no >> busybox daemon has LSB headers, but I would need to ask for some prime >> example of LSB headers that I can start off with. Could anyone please >> provide me a good example for that from the Yocto project? Thanks. >> > > What about: > > ### BEGIN INIT INFO > # Provides: ntpd > # Required-Start:$network > # Required-Stop: $network > # Default-Start: 2 3 4 5 > # Default-Stop: 0 1 6 > # Short-Description: NTP daemon > # Description: Network Time Protocol (NTP) is a networking > #protocol for clock synchronization > ### END INIT INFO > > See > http://www.linuxbase.org/betaspecs/lsb/LSB-Core-generic/LSB-Core-generic/initscrcomconv.html I forgot to mention that Martin Jansa gave me a good example yesterday. But thanks anyway. It is helpful. > > > -- > Alexandre Belloni, Free Electrons > Embedded Linux, Kernel and Android engineering > http://free-electrons.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] uniformity in defining basic SDK images?
reading YP kernel dev manual and section 2.5.1 contains the following passage: "Briefly, the kernel-dev package is installed by default on all *.sdk images... Because all SDK image recipes include dev-pkgs, the kernel-dev packages will be installed as part of the SDK image." first, if that's true, then it's redundant to incorporate both the image feature of dev-pkgs *and* the image install of kernel-dev, as is done in images like core-image-rt-sdk.bb: IMAGE_FEATURES += "dev-pkgs tools-sdk tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks" IMAGE_INSTALL += "rt-tests hwlatdetect kernel-dev" additionally, the core-image-sato-sdk.bb recipe file is alone in including: IMAGE_INSTALL += "kernel-devsrc" is there a reason that that core-image sdk recipe alone includes kernel-devsrc while the others do not? rday -- Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core