Re: [OE-core] kernel miscompilation with gcc 4.8 for ARMv5
On 07/10/2013 03:25 PM, Mark Hatle wrote: On 7/10/13 8:15 AM, Mike Looijmans wrote: On 07/10/2013 02:34 PM, Enrico Scholz wrote: Enrico Scholz writes: is it expected that recent gcc 4.8[1] compiles the kernel correctly? Kernels for ARMv5 platforms (PXA168 -> 3.4.52, MX28 -> 3.8.13) fail here 100% at early boot with Applying two upstream kernel commits 455bd4c430b0c0a361f38e8658a0d6cb469942b5 (ARM: 7668/1: fix memset-related crashes caused by recent GCC (4.7.2) optimizations) and 418df63adac56841ef6b0f1fcf435bc64d4ed177 (ARM: 7670/1: fix the memset fix) seem to fix the problem for me. I encountered a compilation problem for MIPS kernels (version 3.3 and below) with the new GCC compiler: arch/mips/mm/page.c:89:6: error: 'clear_page' alias in between function and variable is not supported void clear_page(void *page) __attribute__((alias("clear_page_array"))); ^ arch/mips/mm/page.c:84:12: error: 'clear_page_array' aliased declaration [-Werror] static u32 clear_page_array[0x120 / 4]; ^ arch/mips/mm/page.c:108:6: error: 'copy_page' alias in between function and variable is not supported void copy_page(void *to, void *from) __attribute__((alias("copy_page_array"))); ^ arch/mips/mm/page.c:102:12: error: 'copy_page_array' aliased declaration [-Werror] static u32 copy_page_array[0x540 / 4]; So I'll probably have to go and look for backports to apply here. Anyone happen to come across this one already? (Looking in the git history for that file suggests applying c022630633624a75b3b58f43dd3c6cc896a56cff from upstream) A 3.8 kernel is running just fine with gcc 4.8. The following commit fixed the issue in 3.4. I assume it'll work in other versions. kernel.org commit: c022630633624a75b3b58f43dd3c6cc896a56cff http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=c022630633624a75b3b58f43dd3c6cc896a56cff Indeed, patching that into the kernels fixed it. Mike. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2 1/1] image.bbclass: add a method to add/delete/modify user/group settings
On 07/11/2013 04:02 AM, Saul Wold wrote: On 07/09/2013 11:28 PM, qi.c...@windriver.com wrote: From: Chen Qi We may want to add a user or group which does not logically belong to any specific package. For example, we may want to add a user with the name 'tester' to our image. Besides, we may want to delete or modify user/group in our image. This patch adds a variable, USER_GROUP_SETTINGS, which is dedicated to these tasks. The configuration format is detailed in the local.conf. sample.extended file. This patch also adds a function, set_user_group, which happens at the end of the ROOTFS_POSTPROCESS_COMMAND. It handles the settings in the USER_GROUP_SETTINGS variable. After seeing the poky-tiny changes, which I will NAK, I am going to recommend that we need to share a common base between this and the existing useradd bbclass since you are both doing the same work. Also, I think what ever the top level looks like, it should be in a class of it's own that can be inherited, such that it won't affect other images, like a tiny or other distros that don't include login support. I understand the difference and usage of useradd is targeting packages and feeds, while this work is targeted towards customizing a final image that is not truly part of the package feed. Sau! Thanks for your suggestion. That's definitely a better approach. I'll rework on this feature. Best Regards, Chen Qi This logic here is quite similar to that of useradd.bbclass. If we need to add or modify user/group settings, base-passwd and shadow are pulled into the RDEPENDS and thus installed on target. [YOCTO #4074] Signed-off-by: Chen Qi --- meta/classes/image.bbclass | 42 ++ 1 file changed, 42 insertions(+) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 380ed8e..a76289c 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -12,6 +12,8 @@ LICENSE = "MIT" PACKAGES = "" DEPENDS += "${MLPREFIX}qemuwrapper-cross ${MLPREFIX}depmodwrapper-cross" RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}" +# Add to IMAGE_INSTALL base-passwd and shadow if USER_GROUP_SETTINGS is set +IMAGE_INSTALL_append += "${@['', 'base-passwd shadow'][bool(d.getVar('USER_GROUP_SETTINGS', True))]}" RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}" INHIBIT_DEFAULT_DEPS = "1" @@ -179,6 +181,8 @@ ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks" ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "postinst_enable_logging; ", "",d)}' # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" +# Image level user / group settings +ROOTFS_POSTPROCESS_COMMAND_append = " set_user_group;" # some default locales IMAGE_LINGUAS ?= "de-de fr-fr en-gb" @@ -528,6 +532,44 @@ postinst_enable_logging () { echo "LOGFILE=${POSTINST_LOGFILE}" >> ${IMAGE_ROOTFS}${sysconfdir}/default/postinst } +# Image level user / group settings +set_user_group () { +user_group_settings="${USER_GROUP_SETTINGS}" +export PSEUDO="${FAKEROOTENV} ${STAGING_DIR_NATIVE}${bindir}/pseudo" +setting=`echo $user_group_settings | cut -d ';' -f1` +remaining=`echo $user_group_settings | cut -d ';' -f2-` +while test "x$setting" != "x"; do +user_group=`echo $setting | cut -d ',' -f1` +action=`echo $setting | cut -d ',' -f2` +opts=`echo $setting | cut -d ',' -f3` +# determine the command according to user_group and action +if [ "$user_group" = "USER" ]; then +cmd_prefix="user" +elif [ "$user_group" = "GROUP" ]; then +cmd_prefix="group" +else +echo "Error: invalid setting of $user_group in the USER_GROUP_SETTINGS" +exit 1 +fi +if [ "$action" = "ADD" ]; then +cmd_suffix="add" +elif [ "$action" = "DEL" ]; then +cmd_suffix="del" +elif [ "$action" = "MOD" ]; then +cmd_suffix="mod" +else +echo "Error: invalid setting of $user_group in the USER_GROUP_SETTINGS" +exit 1 +fi +cmd=$cmd_prefix$cmd_suffix +echo "using commond <$cmd> for setting <$setting> ..." +eval $PSEUDO $cmd -R ${IMAGE_ROOTFS} $opts +# iterate to the next setting +setting=`echo $remaining | cut -d ';' -f1` +remaining=`echo $remaining | cut -d ';' -f2-` +done +} + # Turn any symbolic /sbin/init link into a file remove_init_link () { if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] exclude pkgs for mips64 from packagegroup-core-tools-profile
Exclude systemtap and valgrind for mips64 from packagegroup-core-tools-profile. The following changes since commit a63229917a5708de2d161aba0d67168ce0da6365: meta-yocto-bsp: update reference board SRCREVs (2013-07-10 09:45:51 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib kangkai/packagegroup-core-tools-profile http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/packagegroup-core-tools-profile Kai Kang (1): packagegroup-core-tools-profile: exclude systemtap and valgrind for mips64 meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 2 ++ 1 file changed, 2 insertions(+) -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] packagegroup-core-tools-profile: exclude systemtap and valgrind for mips64
systemap and valgrind are not buildable for mips64, so exclude them for mips64 from packagegroup-core-tools-profile. Signed-off-by: Kai Kang --- meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index bb1b78b..9eb1458 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb @@ -38,6 +38,7 @@ PROFILETOOLS = "\ SYSTEMTAP = "systemtap" SYSTEMTAP_libc-uclibc = "" SYSTEMTAP_mips = "" +SYSTEMTAP_mips64 = "" SYSTEMTAP_aarch64 = "" # lttng-ust uses sched_getcpu() which is not there on uclibc @@ -64,6 +65,7 @@ BABELTRACE_aarch64 = "" VALGRIND = "valgrind" VALGRIND_libc-uclibc = "" VALGRIND_mips = "" +VALGRIND_mips64 = "" VALGRIND_arm = "" VALGRIND_aarch64 = "" -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] boost 1.54 compile fail
maybe it is the gcc's fault (recently it is updated to 4.8.x in poky) I can found uintptr_t in cstdint, but it is wrapped by a c99 related macro. On Wednesday, July 10, 2013 04:21:02 PM Yi Qingliang wrote: > Hello! > > after update poky to latest git version, I got failure when compiling boost: > > the main error is: (indeed, and too many warning!) > > | ./boost/atomic/atomic.hpp:202:16: error: 'uintptr_t' was not declared in > > this scope > > | typedef atomic atomic_uintptr_t; > | > | ^ > | > | ./boost/atomic/atomic.hpp:202:25: error: template argument 1 is invalid > | > | typedef atomic atomic_uintptr_t; > | > | ^ > | > | ./boost/atomic/atomic.hpp:202:43: error: invalid type in declaration > | before > > ';' token > > | typedef atomic atomic_uintptr_t; > | > |^ > | > | In file included from ./boost/system/system_error.hpp:14:0, > | > | from ./boost/thread/exceptions.hpp:22, > | from ./boost/thread/pthread/thread_data.hpp:10, > | from ./boost/thread/thread_only.hpp:17, > | from libs/thread/src/pthread/thread.cpp:11: -- Nanjing Jilong Yi Qingliang niqingliang2...@gmail.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xserver-xorg: extend packageconfig and dependencies
- split glx into dri, dri2 and glx, to be able to select e.g. dri2 only - update dependencies to match configure.ac Signed-off-by: Andreas Oberritter --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 3d68413..ab8171c 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -23,7 +23,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig -PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto" +PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto" LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" @@ -122,11 +122,11 @@ EXTRA_OECONF += "--with-fop=no \ ac_cv_file__usr_share_sgml_X11_defs_ent=no \ " -PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}" +PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}" PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" -PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\ - --disable-dri --disable-dri2 --disable-glx,\ - xf86driproto dri2proto mesa" +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto mesa xf86driproto" +PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" +PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtual/libgl virtual/libx11" do_install_append () { # Its assumed base-files creates this for us -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] qt4-x11-free: fix post-processing of QtWebKit.pc
Previously it worked for qt4-embedded only. qt4-x11-free has X11 libs between -lwebcore and -ljscore. Signed-off-by: Andreas Oberritter --- meta/recipes-qt/qt4/qt4.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 81866ea..6adc404 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc @@ -345,7 +345,8 @@ do_install() { -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \ -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \ -e 's#Iin#I${in#g' \ - -e 's#-L\.\./\.\./WebCore/release\s\+-L\.\./\.\./JavaScriptCore/release\s\+-lwebcore\s\+-ljscore##g' \ + -e 's#-L\.\./\.\./WebCore/release\s\+-L\.\./\.\./JavaScriptCore/release\s\+-lwebcore##g' \ + -e 's#-ljscore##g' \ ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \ -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] cogl-1.0: add option to enable GLES1
Only PACKAGECONFIG options for GL and GLES2 were available before. Signed-off-by: Andreas Oberritter --- meta/recipes-graphics/cogl/cogl-1.0.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index c0d410e..f2c1e26 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -17,6 +17,7 @@ AUTOTOOLS_AUXDIR = "${S}/build" # Extra DEPENDS for PACKAGECONFIG EDEPENDS_GL = "virtual/libgl libdrm" +EDEPENDS_GLES1 = "virtual/libgles1" EDEPENDS_GLES2 = "virtual/libgles2" EDEPENDS_KMS = "libdrm virtual/egl" EDEPENDS_EGL = "virtual/egl" @@ -26,6 +27,7 @@ EDEPENDS_WAYLAND = "wayland" # Extra RDEPENDS for PACKAGECONFIG # This has to be explictly listed, because cogl dlopens the backends ERDEPENDS_GL= "libgl" +ERDEPENDS_GLES1 = "libgles1" ERDEPENDS_GLES2 = "libgles2" EXTRA_OECONF += "--disable-introspection \ @@ -38,6 +40,7 @@ PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" # GL flavours PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}" +PACKAGECONFIG[gles1] = "--enable-gles1,--disable-gles1,${EDEPENDS_GLES1}, ${ERDEPENDS_GLES1}" PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" # EGL backends -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] cogl-1.0: put each library into its own package
This allows to install cogl-gles2 and cogl-pango only when needed and enables Debian package renaming. This stops cogl-pango from dragging in unwanted runtime dependencies, if cogl-pango isn't used. Signed-off-by: Andreas Oberritter --- meta/recipes-graphics/cogl/cogl-1.0.inc | 27 ++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index 55eb003..8400668 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -9,7 +9,10 @@ SRC_URI += "file://cogl_fixed_mul-constraint.patch \ inherit clutter DEPENDS = "pango glib-2.0 gdk-pixbuf" -PACKAGES =+ "${PN}-examples" +PACKAGES =+ "${PN}-examples \ + libcogl libcogl-dev \ + libcogl-gles2 libcogl-gles2-dev \ + libcogl-pango libcogl-pango-dev" AUTOTOOLS_AUXDIR = "${S}/build" # Extra DEPENDS for PACKAGECONFIG @@ -54,3 +57,25 @@ PACKAGECONFIG ??= "gl \ ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" +FILES_libcogl = "${libdir}/libcogl${SOLIBS}" +FILES_libcogl-dev = "${includedir}/cogl/cogl \ + ${libdir}/libcogl${SOLIBSDEV} \ + ${libdir}/libcogl.la \ + ${libdir}/pkgconfig/cogl-1.0.pc \ + ${libdir}/pkgconfig/cogl-2.0-experimental.pc \ + ${libdir}/pkgconfig/cogl-gl-1.0.pc" +FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" +FILES_libcogl-gles2-dev = "${includedir}/cogl/cogl-gles2 \ + ${libdir}/libcogl-gles2${SOLIBSDEV} \ + ${libdir}/libcogl-gles2.la \ + ${libdir}/pkgconfig/cogl-gles2-experimental.pc" +FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}" +FILES_libcogl-pango-dev = "${includedir}/cogl/cogl-pango \ + ${libdir}/libcogl-pango${SOLIBSDEV} \ + ${libdir}/libcogl-pango.la \ + ${libdir}/pkgconfig/cogl-pango-1.0.pc" + +# For backwards compatibility after Debian-renaming +RPROVIDES_libcogl = "cogl-1.0" +RCONFLICTS_libcogl = "cogl-1.0" +RREPLACES_libcogl = "cogl-1.0" -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] cogl-1.0: make building cogl-pango optional
Add a 'cogl-pango' PACKAGECONFIG option and enable it by default. Signed-off-by: Andreas Oberritter --- meta/recipes-graphics/cogl/cogl-1.0.inc | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index 8400668..c0d410e 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -8,7 +8,7 @@ SRC_URI += "file://cogl_fixed_mul-constraint.patch \ inherit clutter -DEPENDS = "pango glib-2.0 gdk-pixbuf" +DEPENDS = "glib-2.0 gdk-pixbuf" PACKAGES =+ "${PN}-examples \ libcogl libcogl-dev \ libcogl-gles2 libcogl-gles2-dev \ @@ -34,6 +34,8 @@ EXTRA_OECONF += "--disable-introspection \ --disable-gles1\ " +PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" + # GL flavours PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}" PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" @@ -52,7 +54,7 @@ PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-e # Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by # default. -PACKAGECONFIG ??= "gl \ +PACKAGECONFIG ??= "cogl-pango gl \ ${@base_contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2 1/1] image.bbclass: add a method to add/delete/modify user/group settings
On 07/09/2013 11:28 PM, qi.c...@windriver.com wrote: From: Chen Qi We may want to add a user or group which does not logically belong to any specific package. For example, we may want to add a user with the name 'tester' to our image. Besides, we may want to delete or modify user/group in our image. This patch adds a variable, USER_GROUP_SETTINGS, which is dedicated to these tasks. The configuration format is detailed in the local.conf. sample.extended file. This patch also adds a function, set_user_group, which happens at the end of the ROOTFS_POSTPROCESS_COMMAND. It handles the settings in the USER_GROUP_SETTINGS variable. After seeing the poky-tiny changes, which I will NAK, I am going to recommend that we need to share a common base between this and the existing useradd bbclass since you are both doing the same work. Also, I think what ever the top level looks like, it should be in a class of it's own that can be inherited, such that it won't affect other images, like a tiny or other distros that don't include login support. I understand the difference and usage of useradd is targeting packages and feeds, while this work is targeted towards customizing a final image that is not truly part of the package feed. Sau! This logic here is quite similar to that of useradd.bbclass. If we need to add or modify user/group settings, base-passwd and shadow are pulled into the RDEPENDS and thus installed on target. [YOCTO #4074] Signed-off-by: Chen Qi --- meta/classes/image.bbclass | 42 ++ 1 file changed, 42 insertions(+) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 380ed8e..a76289c 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -12,6 +12,8 @@ LICENSE = "MIT" PACKAGES = "" DEPENDS += "${MLPREFIX}qemuwrapper-cross ${MLPREFIX}depmodwrapper-cross" RDEPENDS += "${IMAGE_INSTALL} ${LINGUAS_INSTALL} ${NORMAL_FEATURE_INSTALL} ${ROOTFS_BOOTSTRAP_INSTALL}" +# Add to IMAGE_INSTALL base-passwd and shadow if USER_GROUP_SETTINGS is set +IMAGE_INSTALL_append += "${@['', 'base-passwd shadow'][bool(d.getVar('USER_GROUP_SETTINGS', True))]}" RRECOMMENDS += "${NORMAL_FEATURE_INSTALL_OPTIONAL}" INHIBIT_DEFAULT_DEPS = "1" @@ -179,6 +181,8 @@ ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks" ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "postinst_enable_logging; ", "",d)}' # Set default postinst log file POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" +# Image level user / group settings +ROOTFS_POSTPROCESS_COMMAND_append = " set_user_group;" # some default locales IMAGE_LINGUAS ?= "de-de fr-fr en-gb" @@ -528,6 +532,44 @@ postinst_enable_logging () { echo "LOGFILE=${POSTINST_LOGFILE}" >> ${IMAGE_ROOTFS}${sysconfdir}/default/postinst } +# Image level user / group settings +set_user_group () { + user_group_settings="${USER_GROUP_SETTINGS}" + export PSEUDO="${FAKEROOTENV} ${STAGING_DIR_NATIVE}${bindir}/pseudo" + setting=`echo $user_group_settings | cut -d ';' -f1` + remaining=`echo $user_group_settings | cut -d ';' -f2-` + while test "x$setting" != "x"; do + user_group=`echo $setting | cut -d ',' -f1` + action=`echo $setting | cut -d ',' -f2` + opts=`echo $setting | cut -d ',' -f3` + # determine the command according to user_group and action + if [ "$user_group" = "USER" ]; then + cmd_prefix="user" + elif [ "$user_group" = "GROUP" ]; then + cmd_prefix="group" + else + echo "Error: invalid setting of $user_group in the USER_GROUP_SETTINGS" + exit 1 + fi + if [ "$action" = "ADD" ]; then + cmd_suffix="add" + elif [ "$action" = "DEL" ]; then + cmd_suffix="del" + elif [ "$action" = "MOD" ]; then + cmd_suffix="mod" + else + echo "Error: invalid setting of $user_group in the USER_GROUP_SETTINGS" + exit 1 + fi + cmd=$cmd_prefix$cmd_suffix + echo "using commond <$cmd> for setting <$setting> ..." + eval $PSEUDO $cmd -R ${IMAGE_ROOTFS} $opts + # iterate to the next setting + setting=`echo $remaining | cut -d ';' -f1` + remaining=`echo $remaining | cut -d ';' -f2-` + done +} + # Turn any symbolic /sbin/init link into a file remove_init_link () { if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] pulseaudio: Added consolekit dependency for pulseaudio-module-console-kit package
On 07/08/2013 10:16 AM, e...@felipetonello.com wrote: From: "Felipe F. Tonello" When installing pulseaudio-module-console-kit package in an image the consolekit dependecy cannot be find. This patch makes sure that the consolekit recipe will be build. Is this really a build-time dependency or a runtime dependency specific to the pulseaudio-module? Sau! Signed-off-by: Felipe F. Tonello --- meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index e4fc648..f925e7d 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \ file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95" DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool" # optional -DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" +DEPENDS += "udev alsa-lib glib-2.0 dbus gconf consolekit" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ file://gcc4-compile-fix.patch \ ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] docbook-sgml-dtd-4.1-native.bb: Add real PV inside the recipe
On 07/10/2013 08:16 AM, Martin Jansa wrote: On Wed, Jul 10, 2013 at 06:07:08PM +0300, Emilia Ciobanu wrote: Signed-off-by: Emilia Ciobanu --- .../docbook-sgml-dtd-4.1-native.bb |1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb index 88c9396..1f338fd 100644 --- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb +++ b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" DTD_VERSION = "4.1" PR = "${INC_PR}.0" +PV = "41" Why not 4.1? It seems that the older version (3.1 and 4.1) have their tarballs named with 31 and 41. Ema, can you use the regex to handle this correctly? Sau! # Note: the upstream sources are not distributed with a license file. # LICENSE-OASIS is included as a "patch" to workaround this. When -- 1.7.9.5 ___ 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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] sstate-cache and making a package "host-dependent"
On Wed, Jul 10, 2013 at 06:39:20PM +0100, Paul Eggleton wrote: > Hi Mike, > > On Wednesday 10 July 2013 15:05:23 Mike Looijmans wrote: > > I added a buildserver that also exports its "sstate-cache" directory, so > > that other build machines can grab their stuff from it. This works fine, > > but I have one problem. Some packages are meant to be dependent on the > > system that built it. I want to enforce that each build machine creates > > its own package, and does not grab it from the sstate-cache of the > > central server. > > > > For example, > > > > $ cat recipes-core/meta/distro-feed-configs.bbappend > > PRINC="1" > > DISTRO_HOST_NAME ?= "${@os.uname()[1]}" > > DISTRO_FEED_NAME ?= "feed" > > DISTRO_FEED_PREFIX = "topic" > > DISTRO_FEED_URI = > > "http://${DISTRO_HOST_NAME}/${DISTRO_FEED_NAME}/${MACHINE}"; > > > > > > The purpose being that the host name of the machien that built the image > > ends up in the opkg config files. This works just fine. > > Now that we have a central server, all images on all build hosts grab > > the package from the sstate-cache server, resulting in the feed pointing > > to the central server instead of the private one, which is not what I > > wanted to happen. > > > > After reading the documentation, I added the following line to the recipe: > > > > PACKAGE_ARCHS[vardeps] = "DISTRO_FEED_URI" > > > > This did not have the desired effect. The package is still retrieved > > from the cache, and not rebuilt locally. Even if I clean and force a > > rebuild of the distro-feed-configs package, the package that ends up in > > the image is still the one from the central server. > > > > What am I missing here? > > I think distro-feed-configs (from meta-oe, not OE-Core) is for package > installation on the target, and has nothing to do with shared state. > > I'm not sure if it's entirely appropriate, but you could take a similar > approach to the one we use for preventing native sstate packages from mixing > across different distributions (mostly to sidestep host glibc version > dependency problems) - set SSTATE_EXTRAPATH to some value for the recipes you > don't want to share and then the packages will go into a subdirectory named > with that value; you could then delete these automatically from the server. I would try to add DISTRO_HOST_NAME[vardepvalue] = "${DISTRO_HOST_NAME}" that way each builder should create own sstate archive. use bitbake-diffsigs path-to-distro-feeds.sigdata-file to check that value of os.uname is included in signature. Regards, -- 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
Re: [OE-core] sstate-cache and making a package "host-dependent"
Hi Mike, On Wednesday 10 July 2013 15:05:23 Mike Looijmans wrote: > I added a buildserver that also exports its "sstate-cache" directory, so > that other build machines can grab their stuff from it. This works fine, > but I have one problem. Some packages are meant to be dependent on the > system that built it. I want to enforce that each build machine creates > its own package, and does not grab it from the sstate-cache of the > central server. > > For example, > > $ cat recipes-core/meta/distro-feed-configs.bbappend > PRINC="1" > DISTRO_HOST_NAME ?= "${@os.uname()[1]}" > DISTRO_FEED_NAME ?= "feed" > DISTRO_FEED_PREFIX = "topic" > DISTRO_FEED_URI = > "http://${DISTRO_HOST_NAME}/${DISTRO_FEED_NAME}/${MACHINE}"; > > > The purpose being that the host name of the machien that built the image > ends up in the opkg config files. This works just fine. > Now that we have a central server, all images on all build hosts grab > the package from the sstate-cache server, resulting in the feed pointing > to the central server instead of the private one, which is not what I > wanted to happen. > > After reading the documentation, I added the following line to the recipe: > > PACKAGE_ARCHS[vardeps] = "DISTRO_FEED_URI" > > This did not have the desired effect. The package is still retrieved > from the cache, and not rebuilt locally. Even if I clean and force a > rebuild of the distro-feed-configs package, the package that ends up in > the image is still the one from the central server. > > What am I missing here? I think distro-feed-configs (from meta-oe, not OE-Core) is for package installation on the target, and has nothing to do with shared state. I'm not sure if it's entirely appropriate, but you could take a similar approach to the one we use for preventing native sstate packages from mixing across different distributions (mostly to sidestep host glibc version dependency problems) - set SSTATE_EXTRAPATH to some value for the recipes you don't want to share and then the packages will go into a subdirectory named with that value; you could then delete these automatically from the server. Cheers, Paul PS if you could please avoid replying to an existing thread for a new discussion, that would be great. -- Paul Eggleton Intel Open Source Technology Centre ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] rpcbind: Add systemd support
On 07/10/2013 03:53 AM, Shakeel, Muhammad wrote: From: Muhammad Shakeel - Adds systemd support in rpcbind - Install 'sysv' related files only if distro has this feature - Set PR to 'r0' Signed-off-by: Muhammad Shakeel --- .../rpcbind/rpcbind/rpcbind.service| 13 ++ meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb | 26 ++-- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service new file mode 100644 index 000..a028ace --- /dev/null +++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service @@ -0,0 +1,13 @@ +[Unit] +Description=RPC Bind +After=network.target +Wants=rpcbind.target +Before=rpcbind.target + +[Service] +Type=forking +ExecStart=/usr/sbin/rpcbind +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb index f4a0367..ab25edf 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb @@ -15,6 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ file://fix_host_path.patch \ file://obsolete_automake_macros.patch \ ${UCLIBCPATCHES} \ + file://rpcbind.service \ " UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \ @@ -25,9 +26,9 @@ UCLIBCPATCHES ?= "" SRC_URI[md5sum] = "1a77ddb1aaea8099ab19c351eeb26316" SRC_URI[sha256sum] = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3" -PR = "r4" +PR = "r0" Since your not changing the version, you need to keep the PR as is, there is no need to do a PR bump though. Next time this recipe is updated, the PR entry can be removed. Sau! -inherit autotools update-rc.d +inherit autotools update-rc.d systemd PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" @@ -35,12 +36,23 @@ PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" INITSCRIPT_NAME = "rpcbind" INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ." +SYSTEMD_SERVICE_${PN} = "rpcbind.service" +SYSTEMD_AUTO_ENABLE = "disable" + do_install_append () { mv ${D}${bindir} ${D}${sbindir} -install -d ${D}${sysconfdir}/init.d -sed -e 's,/etc/,${sysconfdir}/,g' \ --e 's,/sbin/,${sbindir}/,g' \ -${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind -chmod 0755 ${D}${sysconfdir}/init.d/rpcbind +if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then +install -d ${D}${sysconfdir}/init.d +sed -e 's,/etc/,${sysconfdir}/,g' \ +-e 's,/sbin/,${sbindir}/,g' \ +${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind +chmod 0755 ${D}${sysconfdir}/init.d/rpcbind +fi + +if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system +sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${systemd_unitdir}/system/rpcbind.service +fi } ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] matchbox-wm: correct the SRC_URI and add checksums
On 07/10/2013 02:56 AM, jackie.hu...@windriver.com wrote: From: Jackie Huang Signed-off-by: Jackie Huang --- .../matchbox-wm/matchbox-wm_1.2.bb |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb index 2628326..bc43167 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb @@ -2,13 +2,16 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPLv2.0+" DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat" -PR = "r5" +PR = "r6" No PR Bump needed Sau! -SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ +SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \ file://configure_fix.patch \ file://kbdconfig \ file://gconf-2.m4" +SRC_URI[md5sum] = "3e158dcf57823b55c926d95b245500fb" +SRC_URI[sha256sum] = "81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff" + S = "${WORKDIR}/matchbox-window-manager-${PV}" inherit autotools pkgconfig ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] boot-directdisk: allow specifying custom MBR disk signature
On Wed, 2013-07-10 at 13:19 +1000, Jonathan Liu wrote: Thanks for your patience with this Jonathan. > This introduces a DISK_SIGNATURE variable that allows controlling the > 32-bit MBR disk signature. By default it is set to an automatically > generated disk signature but it may by overridden in the image recipe > by setting DISK_SIGNATURE to a 8 digit hex string. > > This DISK_SIGNATURE variable can also be used in the image recipe to > specify the root by UUID using: > SYSLINUX_ROOT = "root=PARTUUID=${DISK_SIGNATURE}-02" This DISK_SIGNATURE variable needs to be documented, Scott R on Cc for that. > > Specifying the root by UUID allows the kernel to locate the root > filesystem even if the device name changes (e.g. /dev/hda2, /dev/hdb2 or > /dev/sdb2 instead of /dev/sda2) due to differences in hardware > configuration. > > Signed-off-by: Jonathan Liu In the future, please Cc the people you are collaborating with and use a tool like git send-email to automatically parse that and Cc them on the patch submission. You can also use the create-pull-request and send-pull-request scripts which automate this process (these should probably be updated to allow for just sending the email without a pull repo though): Cc: Darren Hart Then they will respond with their review: Acked-by: Darren hart > --- > meta/classes/boot-directdisk.bbclass | 20 > 1 file changed, 20 insertions(+) > > diff --git a/meta/classes/boot-directdisk.bbclass > b/meta/classes/boot-directdisk.bbclass > index 3169043..182957b 100644 > --- a/meta/classes/boot-directdisk.bbclass > +++ b/meta/classes/boot-directdisk.bbclass > @@ -34,6 +34,7 @@ BOOTDD_EXTRA_SPACE ?= "16384" > # Get the build_syslinux_cfg() function from the syslinux class > > AUTO_SYSLINUXCFG = "1" > +DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}" > SYSLINUX_ROOT ?= "root=/dev/sda2" > SYSLINUX_TIMEOUT ?= "10" > > @@ -80,6 +81,9 @@ build_boot_dd() { > parted $IMAGE set 1 boot on > parted $IMAGE print > > + echo -ne "$(echo ${DISK_SIGNATURE} | fold -w 2 | tac | paste -sd '' | > sed 's/\(..\)/\\x&/g')" | \ > + dd of=$IMAGE bs=1 seek=440 conv=notrunc > + > OFFSET=`expr $END2 / 512` > dd if=${STAGING_DATADIR}/syslinux/mbr.bin of=$IMAGE conv=notrunc > dd if=$HDDIMG of=$IMAGE conv=notrunc seek=1 bs=512 > @@ -91,8 +95,24 @@ build_boot_dd() { > } > > python do_bootdirectdisk() { > +validate_disk_signature(d) > bb.build.exec_func('build_syslinux_cfg', d) > bb.build.exec_func('build_boot_dd', d) > } > > +def generate_disk_signature(): > +import uuid > + > +return str(uuid.uuid4())[:8] > + > +def validate_disk_signature(d): > +import re > + > +disk_signature = d.getVar("DISK_SIGNATURE", True) > + > +if not re.match(r'^[0-9a-fA-F]{8}$', disk_signature): > +bb.fatal("DISK_SIGNATURE '%s' must be an 8 digit hex string" % > disk_signature) > + > +DISK_SIGNATURE_GENERATED := "${@generate_disk_signature()}" > + > addtask bootdirectdisk before do_build -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] alsa-state: Provide an empty asound.conf by default
On Tue, 2013-07-09 at 16:32 -0700, Saul Wold wrote: > On 07/09/2013 03:59 PM, Darren Hart wrote: > > On Tue, 2013-07-09 at 15:43 -0700, Saul Wold wrote: > >> On 07/09/2013 03:15 PM, Darren Hart wrote: > >>> An empty asound.conf should work for most cases. The existing asound.conf > >>> uses plug dmix which causes arecord to fail without a special -D device > >>> specification on the command line (as no capture device is defined). > >>> > >>> Clear asound.conf for the default case. Any needed changes should be > >>> made in the BSP layers. > >>> > >> Does there need to be any corresponding change for the meta-yocto-bsps? > > > > I don't believe so, but I have not built and tested every one. The old > > one setup an alias "mixer0" to hardware card 0, which isn't necessary > > for alsamixer to work and should be the default anyway. > > > > I don't know what the motivation was to use dmix for the default pcm. > > This was pulled in from open-embedded, which has a minimal commit > > message: > > > > commit bbc2776c0d955da7ec774ae934c541f33133f876 > > Author: Michael Lauer > > Date: Thu Sep 13 01:10:23 2007 + > > > Given it's 5 years old, it might be that alsa now "does the right thing" > and your change is valid. Apparently Angstrom has been doing this for a while now. Koen, do you agree this is the right thing for oe-core? I missed the PR bump... I can't remember, do we do that anymore? -- Darren > > Thanks > Sau! > > > alsa-state: ship standard asoundrc (simple dmix configuration) > > that should be a reasonable default for most devices > > > > According to the alsa wiki, the asound.conf should not be required for > > basic functionality: > > > > http://www.alsa-project.org/main/index.php/Asoundrc > > > > -- > > Darren > > > >> > >> > >> Sau! > >> > >> > >>> Signed-off-by: Darren Hart > >>> Cc: Koen Kooi > >>> --- > >>>meta/recipes-bsp/alsa-state/alsa-state/asound.conf | 13 + > >>>1 file changed, 1 insertion(+), 12 deletions(-) > >>> > >>> diff --git a/meta/recipes-bsp/alsa-state/alsa-state/asound.conf > >>> b/meta/recipes-bsp/alsa-state/alsa-state/asound.conf > >>> index 6be0242..03653cf 100644 > >>> --- a/meta/recipes-bsp/alsa-state/alsa-state/asound.conf > >>> +++ b/meta/recipes-bsp/alsa-state/alsa-state/asound.conf > >>> @@ -1,12 +1 @@ > >>> -# default dmix configuration > >>> - > >>> -pcm.!default { > >>> -type plug > >>> -slave.pcm "dmix" > >>> -} > >>> - > >>> -ctl.mixer0 { > >>> -type hw > >>> -card 0 > >>> -} > >>> - > >>> +# Global alsa-lib configuration > >>> > > -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] kernel miscompilation with gcc 4.8 for ARMv5
On Wed, Jul 10, 2013 at 11:30 AM, Enrico Scholz wrote: > Bruce Ashfield > writes: > >>> Applying two upstream kernel commits >>> 455bd4c430b0c0a361f38e8658a0d6cb469942b5 (ARM: 7668/1: fix >>> memset-related crashes caused by recent GCC (4.7.2) optimizations) and >>> 418df63adac56841ef6b0f1fcf435bc64d4ed177 (ARM: 7670/1: fix the memset >>> fix) seem to fix the problem for me. >> >> Correct. Those are the same commits you'll see on linux-yocto-3.8, >> we've been soaking them for a while. I was waiting for LTSI and -stable >> to pick up the changes before updating linux-yocto-3.4, but that hasn't >> happened yet. >> >> If you are using linux-yocto-3.4 and can confirm that it boots for you >> with those patches, > > Sorry, I am using a more or less vanilla 3.4 kernel. Patches fix > the problem there (device boots) and (after knowing about them) the > problematic code is easy to spot: No worries. I can spot the fix, since we already did this for the 3.8 kernel. I was just no where near my targets at the moment .. and if I had an independent report that things boot, I'd go ahead and push my 3.8 fixes (ported to 3.4) .. which I may do anyway, since I can drop them when they cycle through -stable and LTSI. Cheers, Bruce > > $ arm-linux-gnueabi-objdump -d mm/slub.o > > 14c4 : > ... > 14fc: e1a1mov r0, r1 > 1500: e3a0106bmov r1, #107; 0x6b > 1504: ebfebl 0 > 1508: e1a03000mov r3, r0 <<< > 150c: e5942010ldr r2, [r4, #16] > 1510: e3e0105amvn r1, #90 ; 0x5a > 1514: e0832002add r2, r3, r2 > 1518: e5421001strbr1, [r2, #-1] > > With unpatched memset, 'r0' points to end of buffer. > > > Enrico > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2] util-linux: Use PACKAGECONFIG to control pam and system config options
Saul Wold writes: > The PACKAGECONFIG will ensure consistent enabling and disabling of the pam > and systemd related > options for configure and the correct dependencies > > v2: fixed PACKAGECONFIG line continuation grammar > added _class-target for PACKAGECONFIG to work on target only > ... > +PACKAGECONFIG_class-target ??= "${@base_contains('DISTRO_FEATURES', 'pam', > 'pam', '', d)} \ > +${@base_contains('DISTRO_FEATURES', > 'systemd', 'systemd', '', d)} " This does not work here. d.getVar('PACKAGECONFIG', True) evaluates to 'None' in the anonymous python function in base.bbclass so that non-systemd options are selected in systemd distributions and packaging fails in a sanity check. Using the less weak '?=' operator makes thing work as expected. Enrico ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lib/oeqa/utils/qemurunner.py: increase boot timeout
On a loaded host (such as an AB setup where multiple builds run) the 200 seconds timeout might not be enough to reach the login prompt, so use the same value as the qemuimagetest class did. Signed-off-by: Stefan Stanacar --- meta/lib/oeqa/utils/qemurunner.py | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 3132b68..8c74e73 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -49,7 +49,6 @@ class QemuRunner: self.runqemu = subprocess.Popen(launch_cmd,shell=True,stdout=subprocess.PIPE,stderr=subprocess.STDOUT,preexec_fn=os.setpgrp) bb.note("runqemu started, pid is %s" % self.runqemu.pid) -# wait at most 30 seconds until qemu pid appears bb.note("waiting at most 60 seconds for qemu pid") endtime = time.time() + 60 while not self.is_alive() and time.time() < endtime: @@ -59,8 +58,8 @@ class QemuRunner: bb.note("qemu started - qemu procces pid is %s" % self.qemupid) console = oeQemuConsole(self.streampath, self.logfile) -bb.note("Waiting at most 200 seconds for login banner") -(match, text) = console.read_all_timeout("login:", 200) +bb.note("Waiting at most 400 seconds for login banner") +(match, text) = console.read_all_timeout("login:", 400) if match: bb.note("Reached login banner") @@ -80,7 +79,7 @@ class QemuRunner: return False else: console.close() -bb.note("Target didn't reached login boot in 120 seconds") +bb.note("Target didn't reached login boot in 400 seconds") lines = "\n".join(text.splitlines()[-5:]) bb.note("Last 5 lines of text:\n%s" % lines) bb.note("Check full boot log: %s" % self.logfile) -- 1.8.1.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] docbook-sgml-dtd-4.1-native.bb: Add real PV inside the recipe
On Wed, Jul 10, 2013 at 06:07:08PM +0300, Emilia Ciobanu wrote: > Signed-off-by: Emilia Ciobanu > --- > .../docbook-sgml-dtd-4.1-native.bb |1 + > 1 file changed, 1 insertion(+) > > diff --git > a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb > b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb > index 88c9396..1f338fd 100644 > --- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb > +++ b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb > @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = > "file://LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" > DTD_VERSION = "4.1" > > PR = "${INC_PR}.0" > +PV = "41" Why not 4.1? > > # Note: the upstream sources are not distributed with a license file. > # LICENSE-OASIS is included as a "patch" to workaround this. When > -- > 1.7.9.5 > > ___ > 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] [PATCH 2/3] docbook-sgml-dtd-4.1-native.bb: Add real PV inside the recipe
Signed-off-by: Emilia Ciobanu --- .../docbook-sgml-dtd-4.1-native.bb |1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb index 88c9396..1f338fd 100644 --- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb +++ b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" DTD_VERSION = "4.1" PR = "${INC_PR}.0" +PV = "41" # Note: the upstream sources are not distributed with a license file. # LICENSE-OASIS is included as a "patch" to workaround this. When -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Add docbook-sgml-dtd-*-native real PV
This changes are needed for a proper version reporting by the Package Reporting System. The following changes since commit a63229917a5708de2d161aba0d67168ce0da6365: meta-yocto-bsp: update reference board SRCREVs (2013-07-10 09:45:51 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib emac/docbook-sgml-dtd-native_pv http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=emac/docbook-sgml-dtd-native_pv Emilia Ciobanu (3): docbook-sgml-dtd-4.5-native.bb: Add real PV inside the recipe docbook-sgml-dtd-4.1-native.bb: Add real PV inside the recipe docbook-sgml-dtd-3.1-native.bb: Add real PV inside the recipe .../docbook-sgml-dtd-3.1-native.bb |1 + .../docbook-sgml-dtd-4.1-native.bb |1 + .../docbook-sgml-dtd-4.5-native.bb |1 + 3 files changed, 3 insertions(+) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] docbook-sgml-dtd-3.1-native.bb: Add real PV inside the recipe
Signed-off-by: Emilia Ciobanu --- .../docbook-sgml-dtd-3.1-native.bb |1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb index a7df4f9..869bffe 100644 --- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb +++ b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" DTD_VERSION = "3.1" PR = "${INC_PR}.0" +PV = "31" # Note: the upstream sources are not distributed with a license file. # LICENSE-OASIS is included as a "patch" to workaround this. When -- 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] docbook-sgml-dtd-4.5-native.bb: Add real PV inside the recipe
Signed-off-by: Emilia Ciobanu --- .../docbook-sgml-dtd-4.5-native.bb |1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb index 6c464f4..ae723c7 100644 --- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb +++ b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" DTD_VERSION = "4.5" PR = "${INC_PR}.0" +PV = "4.5" SRC_URI[md5sum] = "07c581f4bbcba6d3aac85360a19f95f7" SRC_URI[sha256sum] = "8043e514e80c6c19cb146b5d37937d1305bf3abf9b0097c36df7f70f611cdf43" -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2] test-dependencies: add simple script to detect missing or autoenabled dependencies
On Wed, Jul 10, 2013 at 03:34:58PM +0100, Burton, Ross wrote: > On 10 July 2013 13:41, Martin Jansa wrote: > > Build with last version of this script is still running (after 37 hours) > > Building recipe: gnome-desktop (485/1848) > > but I've tested it in smaller builds and I'm happy with current > > functionality, I'll send found issues in tomorrow or day after that when > > the build is complete. > > As this has been on my todo list for a while now, come to ELC-E and > I'll get you a beer. :) OK :) > Anyone volunteering to run this on oe-core master this weekend? I have it running with more layers included so it will take longer, but will report more "autodetected" deps. Well for some reason the server is very slow now, it moved only couple recipes since writting that previous e-mail :/ Building recipe: gnumeric (505/1848) -- 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
Re: [OE-core] [PATCHv2] test-dependencies: add simple script to detect missing or autoenabled dependencies
On 10 July 2013 13:41, Martin Jansa wrote: > Build with last version of this script is still running (after 37 hours) > Building recipe: gnome-desktop (485/1848) > but I've tested it in smaller builds and I'm happy with current > functionality, I'll send found issues in tomorrow or day after that when > the build is complete. As this has been on my todo list for a while now, come to ELC-E and I'll get you a beer. :) Anyone volunteering to run this on oe-core master this weekend? Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] kernel miscompilation with gcc 4.8 for ARMv5
Bruce Ashfield writes: >> Applying two upstream kernel commits >> 455bd4c430b0c0a361f38e8658a0d6cb469942b5 (ARM: 7668/1: fix >> memset-related crashes caused by recent GCC (4.7.2) optimizations) and >> 418df63adac56841ef6b0f1fcf435bc64d4ed177 (ARM: 7670/1: fix the memset >> fix) seem to fix the problem for me. > > Correct. Those are the same commits you'll see on linux-yocto-3.8, > we've been soaking them for a while. I was waiting for LTSI and -stable > to pick up the changes before updating linux-yocto-3.4, but that hasn't > happened yet. > > If you are using linux-yocto-3.4 and can confirm that it boots for you > with those patches, Sorry, I am using a more or less vanilla 3.4 kernel. Patches fix the problem there (device boots) and (after knowing about them) the problematic code is easy to spot: $ arm-linux-gnueabi-objdump -d mm/slub.o 14c4 : ... 14fc: e1a1mov r0, r1 1500: e3a0106bmov r1, #107; 0x6b 1504: ebfebl 0 1508: e1a03000mov r3, r0 <<< 150c: e5942010ldr r2, [r4, #16] 1510: e3e0105amvn r1, #90 ; 0x5a 1514: e0832002add r2, r3, r2 1518: e5421001strbr1, [r2, #-1] With unpatched memset, 'r0' points to end of buffer. Enrico ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] kernel miscompilation with gcc 4.8 for ARMv5
On Wed, Jul 10, 2013 at 9:34 AM, Enrico Scholz wrote: > Enrico Scholz > > writes: > >> is it expected that recent gcc 4.8[1] compiles the kernel correctly? >> Kernels for ARMv5 platforms (PXA168 -> 3.4.52, MX28 -> 3.8.13) fail here >> 100% at early boot with > > Applying two upstream kernel commits > 455bd4c430b0c0a361f38e8658a0d6cb469942b5 (ARM: 7668/1: fix > memset-related crashes caused by recent GCC (4.7.2) optimizations) and > 418df63adac56841ef6b0f1fcf435bc64d4ed177 (ARM: 7670/1: fix the memset > fix) seem to fix the problem for me. Correct. Those are the same commits you'll see on linux-yocto-3.8, we've been soaking them for a while. I was waiting for LTSI and -stable to pick up the changes before updating linux-yocto-3.4, but that hasn't happened yet. If you are using linux-yocto-3.4 and can confirm that it boots for you with those patches, I can stage them in my tree while I wait for them to loop around. Cheers, Bruce > > > > Enrico > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end" ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] kernel miscompilation with gcc 4.8 for ARMv5
On 7/10/13 8:15 AM, Mike Looijmans wrote: On 07/10/2013 02:34 PM, Enrico Scholz wrote: Enrico Scholz writes: is it expected that recent gcc 4.8[1] compiles the kernel correctly? Kernels for ARMv5 platforms (PXA168 -> 3.4.52, MX28 -> 3.8.13) fail here 100% at early boot with Applying two upstream kernel commits 455bd4c430b0c0a361f38e8658a0d6cb469942b5 (ARM: 7668/1: fix memset-related crashes caused by recent GCC (4.7.2) optimizations) and 418df63adac56841ef6b0f1fcf435bc64d4ed177 (ARM: 7670/1: fix the memset fix) seem to fix the problem for me. I encountered a compilation problem for MIPS kernels (version 3.3 and below) with the new GCC compiler: arch/mips/mm/page.c:89:6: error: 'clear_page' alias in between function and variable is not supported void clear_page(void *page) __attribute__((alias("clear_page_array"))); ^ arch/mips/mm/page.c:84:12: error: 'clear_page_array' aliased declaration [-Werror] static u32 clear_page_array[0x120 / 4]; ^ arch/mips/mm/page.c:108:6: error: 'copy_page' alias in between function and variable is not supported void copy_page(void *to, void *from) __attribute__((alias("copy_page_array"))); ^ arch/mips/mm/page.c:102:12: error: 'copy_page_array' aliased declaration [-Werror] static u32 copy_page_array[0x540 / 4]; So I'll probably have to go and look for backports to apply here. Anyone happen to come across this one already? (Looking in the git history for that file suggests applying c022630633624a75b3b58f43dd3c6cc896a56cff from upstream) A 3.8 kernel is running just fine with gcc 4.8. The following commit fixed the issue in 3.4. I assume it'll work in other versions. kernel.org commit: c022630633624a75b3b58f43dd3c6cc896a56cff http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=c022630633624a75b3b58f43dd3c6cc896a56cff ___ 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] kernel miscompilation with gcc 4.8 for ARMv5
On 07/10/2013 02:34 PM, Enrico Scholz wrote: Enrico Scholz writes: is it expected that recent gcc 4.8[1] compiles the kernel correctly? Kernels for ARMv5 platforms (PXA168 -> 3.4.52, MX28 -> 3.8.13) fail here 100% at early boot with Applying two upstream kernel commits 455bd4c430b0c0a361f38e8658a0d6cb469942b5 (ARM: 7668/1: fix memset-related crashes caused by recent GCC (4.7.2) optimizations) and 418df63adac56841ef6b0f1fcf435bc64d4ed177 (ARM: 7670/1: fix the memset fix) seem to fix the problem for me. I encountered a compilation problem for MIPS kernels (version 3.3 and below) with the new GCC compiler: arch/mips/mm/page.c:89:6: error: 'clear_page' alias in between function and variable is not supported void clear_page(void *page) __attribute__((alias("clear_page_array"))); ^ arch/mips/mm/page.c:84:12: error: 'clear_page_array' aliased declaration [-Werror] static u32 clear_page_array[0x120 / 4]; ^ arch/mips/mm/page.c:108:6: error: 'copy_page' alias in between function and variable is not supported void copy_page(void *to, void *from) __attribute__((alias("copy_page_array"))); ^ arch/mips/mm/page.c:102:12: error: 'copy_page_array' aliased declaration [-Werror] static u32 copy_page_array[0x540 / 4]; So I'll probably have to go and look for backports to apply here. Anyone happen to come across this one already? (Looking in the git history for that file suggests applying c022630633624a75b3b58f43dd3c6cc896a56cff from upstream) A 3.8 kernel is running just fine with gcc 4.8. ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] libogg: upgrade to 1.3.1
- obsolete_automake_macros.patch no longer needed; removed; already integrated in upstream; - switched to tar.xz archive format. Signed-off-by: Cristian Iorga --- .../libogg/libogg-1.3.0/obsolete_automake_macros.patch | 14 -- .../libogg/{libogg_1.3.0.bb => libogg_1.3.1.bb} | 10 +++--- 2 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-multimedia/libogg/libogg-1.3.0/obsolete_automake_macros.patch rename meta/recipes-multimedia/libogg/{libogg_1.3.0.bb => libogg_1.3.1.bb} (72%) diff --git a/meta/recipes-multimedia/libogg/libogg-1.3.0/obsolete_automake_macros.patch b/meta/recipes-multimedia/libogg/libogg-1.3.0/obsolete_automake_macros.patch deleted file mode 100644 index 6405b2b..000 --- a/meta/recipes-multimedia/libogg/libogg-1.3.0/obsolete_automake_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Submitted [https://trac.xiph.org/ticket/1921] - -Signed-off-by: Marko Lindqvist -diff -Nurd libogg-1.3.0/configure.in libogg-1.3.0/configure.in libogg-1.3.0/configure.in 2011-08-04 20:11:08.0 +0300 -+++ libogg-1.3.0/configure.in 2013-01-03 06:23:03.334858696 +0200 -@@ -19,7 +19,7 @@ - AM_PROG_CC_C_O - - dnl config.h --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - dnl Set some options based on environment diff --git a/meta/recipes-multimedia/libogg/libogg_1.3.0.bb b/meta/recipes-multimedia/libogg/libogg_1.3.1.bb similarity index 72% rename from meta/recipes-multimedia/libogg/libogg_1.3.0.bb rename to meta/recipes-multimedia/libogg/libogg_1.3.1.bb index c6480e9..0c12e07 100644 --- a/meta/recipes-multimedia/libogg/libogg_1.3.0.bb +++ b/meta/recipes-multimedia/libogg/libogg_1.3.1.bb @@ -9,13 +9,9 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=db1b7a668b2a6f47b2af88fb008ad555 \ file://include/ogg/ogg.h;beginline=1;endline=11;md5=eda812856f13a3b1326eb8f020cc3b0b" -PR = "r1" +SRC_URI = "http://downloads.xiph.org/releases/ogg/libogg-${PV}.tar.xz"; -SRC_URI = "http://downloads.xiph.org/releases/ogg/libogg-${PV}.tar.gz \ - file://obsolete_automake_macros.patch \ - " - -SRC_URI[md5sum] = "0a7eb40b86ac050db3a789ab65fe21c2" -SRC_URI[sha256sum] = "a8de807631014615549d2356fd36641833b8288221cea214f8a72750efe93780" +SRC_URI[md5sum] = "ca25d8da0ddfc8c6cbbf78d847a209fe" +SRC_URI[sha256sum] = "3a5bad78d81afb78908326d11761c0fb1a0662ee7150b6ad587cc586838cdcfa" inherit autotools pkgconfig -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] sstate-cache and making a package "host-dependent"
I added a buildserver that also exports its "sstate-cache" directory, so that other build machines can grab their stuff from it. This works fine, but I have one problem. Some packages are meant to be dependent on the system that built it. I want to enforce that each build machine creates its own package, and does not grab it from the sstate-cache of the central server. For example, $ cat recipes-core/meta/distro-feed-configs.bbappend PRINC="1" DISTRO_HOST_NAME ?= "${@os.uname()[1]}" DISTRO_FEED_NAME ?= "feed" DISTRO_FEED_PREFIX = "topic" DISTRO_FEED_URI = "http://${DISTRO_HOST_NAME}/${DISTRO_FEED_NAME}/${MACHINE}"; The purpose being that the host name of the machien that built the image ends up in the opkg config files. This works just fine. Now that we have a central server, all images on all build hosts grab the package from the sstate-cache server, resulting in the feed pointing to the central server instead of the private one, which is not what I wanted to happen. After reading the documentation, I added the following line to the recipe: PACKAGE_ARCHS[vardeps] = "DISTRO_FEED_URI" This did not have the desired effect. The package is still retrieved from the cache, and not rebuilt locally. Even if I clean and force a rebuild of the distro-feed-configs package, the package that ends up in the image is still the one from the central server. What am I missing here? ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2] test-dependencies: add simple script to detect missing or autoenabled dependencies
On Wed, Jul 10, 2013 at 02:38:13PM +0200, Martin Jansa wrote: > Signed-off-by: Martin Jansa > --- > scripts/test-dependencies.sh | 253 > +++ > 1 file changed, 253 insertions(+) > create mode 100755 scripts/test-dependencies.sh Build with last version of this script is still running (after 37 hours) Building recipe: gnome-desktop (485/1848) but I've tested it in smaller builds and I'm happy with current functionality, I'll send found issues in tomorrow or day after that when the build is complete. > diff --git a/scripts/test-dependencies.sh b/scripts/test-dependencies.sh > new file mode 100755 > index 000..405c14e > --- /dev/null > +++ b/scripts/test-dependencies.sh > @@ -0,0 +1,253 @@ > +#!/bin/sh > + > +# Author: Martin Jansa > +# > +# Copyright (c) 2013 Martin Jansa > + > +# Used to detect missing dependencies or automagically > +# enabled dependencies which aren't explicitly enabled > +# or disabled. > + > +# It does 3 builds of > +# 1st to populate sstate-cache directory and sysroot > +# 2nd to rebuild each recipe with every possible > +# dependency found in sysroot (which stays populated > +# from 1st build > +# 3rd to rebuild each recipe only with dependencies defined > +# in DEPENDS > +# 4th (optional) repeat build like 3rd to make sure that > +# minimal versions of dependencies defined in DEPENDS > +# is also enough > + > +# Global vars > +tmpdir= > +targets= > +recipes= > +buildhistory= > +buildtype= > +default_targets="world" > +default_buildhistory="buildhistory" > +default_buildtype="1 2 3 c" > + > +usage () { > + cat << EOF > +Welcome to utility to detect missing or autoenabled dependencies. > +WARNING: this utility will completely remove your tmpdir (make sure > + you don't have important buildhistory or persistent dir there). > +$0 > + > +Options: > + -h, --help > +Display this help and exit. > + > + --tmpdir= > +Specify tmpdir, will use the environment variable TMPDIR if it is > not specified. > +Something like /OE/oe-core/tmp-eglibc (no / at the end). > + > + --targets= > +List of targets separated by space, will use the environment > variable TARGETS if it is not specified. > +It will run "bitbake " to populate sysroots. > +Default value is "world". > + > + --recipes= > +File with list of recipes we want to rebuild with minimal and > maximal sysroot. > +Will use the environment variable RECIPES if it is not specified. > +Default value will use all packages ever recorded in buildhistory > directory. > + > + --buildhistory= > +Path to buildhistory directory, it needs to be enabled in your > config, > +because it's used to detect different dependencies and to create list > +of recipes to rebuild when it's not specified. > +Will use the environment variable BUILDHISTORY if it is not > specified. > +Default value is "buildhistory" > + > + --buildtype= > +There are 4 types of build: > + 1: build to populate sstate-cache directory and sysroot > + 2: build to rebuild each recipe with every possible dep > + 3: build to rebuild each recipe with minimal dependencies > + 4: build to rebuild each recipe again with minimal dependencies > + c: compare buildhistory directories from build 2 and 3 > +Will use the environment variable BUILDTYPE if it is not specified. > +Default value is "1 2 3 c", order is important, type 4 is optional. > +EOF > +} > + > +# Print error information and exit. > +echo_error () { > + echo "ERROR: $1" >&2 > + exit 1 > +} > + > +while [ -n "$1" ]; do > + case $1 in > +--tmpdir=*) > + tmpdir=`echo $1 | sed -e 's#^--tmpdir=##' | xargs readlink -e` > + [ -d "$tmpdir" ] || echo_error "Invalid argument to --tmpdir" > + shift > +;; > +--targets=*) > + targets=`echo $1 | sed -e 's#^--targets="*\([^"]*\)"*#\1#'` > + shift > +;; > +--recipes=*) > + recipes=`echo $1 | sed -e 's#^--recipes="*\([^"]*\)"*#\1#'` > + shift > +;; > +--buildhistory=*) > + buildhistory=`echo $1 | sed -e 's#^--buildhistory="*\([^"]*\)"*#\1#'` > + shift > +;; > +--buildtype=*) > + buildtype=`echo $1 | sed -e 's#^--buildtype="*\([^"]*\)"*#\1#'` > + shift > +;; > +--help|-h) > + usage > + exit 0 > +;; > +*) > + echo "Invalid arguments $*" > + echo_error "Try '$0 -h' for more information." > +;; > + esac > +done > + > +# tmpdir directory, use environment variable TMPDIR > +# if it was not specified, otherwise, error. > +[ -n "$tmpdir" ] || tmpdir=$TMPDIR > +[ -n "$tmpdir" ] || echo_error "No tmpdir found!" > +[ -d "$tmpdir" ] || echo_error "Invalid tmpdir \"$tmpdir\"" > +[ -n "$targets" ] || targets=$TARGETS > +[ -n "$targets" ] || targets=$default_targets > +[ -n "$recipes" ] || recipe
[OE-core] [PATCHv2] test-dependencies: add simple script to detect missing or autoenabled dependencies
Signed-off-by: Martin Jansa --- scripts/test-dependencies.sh | 253 +++ 1 file changed, 253 insertions(+) create mode 100755 scripts/test-dependencies.sh diff --git a/scripts/test-dependencies.sh b/scripts/test-dependencies.sh new file mode 100755 index 000..405c14e --- /dev/null +++ b/scripts/test-dependencies.sh @@ -0,0 +1,253 @@ +#!/bin/sh + +# Author: Martin Jansa +# +# Copyright (c) 2013 Martin Jansa + +# Used to detect missing dependencies or automagically +# enabled dependencies which aren't explicitly enabled +# or disabled. + +# It does 3 builds of +# 1st to populate sstate-cache directory and sysroot +# 2nd to rebuild each recipe with every possible +# dependency found in sysroot (which stays populated +# from 1st build +# 3rd to rebuild each recipe only with dependencies defined +# in DEPENDS +# 4th (optional) repeat build like 3rd to make sure that +# minimal versions of dependencies defined in DEPENDS +# is also enough + +# Global vars +tmpdir= +targets= +recipes= +buildhistory= +buildtype= +default_targets="world" +default_buildhistory="buildhistory" +default_buildtype="1 2 3 c" + +usage () { + cat << EOF +Welcome to utility to detect missing or autoenabled dependencies. +WARNING: this utility will completely remove your tmpdir (make sure + you don't have important buildhistory or persistent dir there). +$0 + +Options: + -h, --help +Display this help and exit. + + --tmpdir= +Specify tmpdir, will use the environment variable TMPDIR if it is not specified. +Something like /OE/oe-core/tmp-eglibc (no / at the end). + + --targets= +List of targets separated by space, will use the environment variable TARGETS if it is not specified. +It will run "bitbake " to populate sysroots. +Default value is "world". + + --recipes= +File with list of recipes we want to rebuild with minimal and maximal sysroot. +Will use the environment variable RECIPES if it is not specified. +Default value will use all packages ever recorded in buildhistory directory. + + --buildhistory= +Path to buildhistory directory, it needs to be enabled in your config, +because it's used to detect different dependencies and to create list +of recipes to rebuild when it's not specified. +Will use the environment variable BUILDHISTORY if it is not specified. +Default value is "buildhistory" + + --buildtype= +There are 4 types of build: + 1: build to populate sstate-cache directory and sysroot + 2: build to rebuild each recipe with every possible dep + 3: build to rebuild each recipe with minimal dependencies + 4: build to rebuild each recipe again with minimal dependencies + c: compare buildhistory directories from build 2 and 3 +Will use the environment variable BUILDTYPE if it is not specified. +Default value is "1 2 3 c", order is important, type 4 is optional. +EOF +} + +# Print error information and exit. +echo_error () { + echo "ERROR: $1" >&2 + exit 1 +} + +while [ -n "$1" ]; do + case $1 in +--tmpdir=*) + tmpdir=`echo $1 | sed -e 's#^--tmpdir=##' | xargs readlink -e` + [ -d "$tmpdir" ] || echo_error "Invalid argument to --tmpdir" + shift +;; +--targets=*) + targets=`echo $1 | sed -e 's#^--targets="*\([^"]*\)"*#\1#'` + shift +;; +--recipes=*) + recipes=`echo $1 | sed -e 's#^--recipes="*\([^"]*\)"*#\1#'` + shift +;; +--buildhistory=*) + buildhistory=`echo $1 | sed -e 's#^--buildhistory="*\([^"]*\)"*#\1#'` + shift +;; +--buildtype=*) + buildtype=`echo $1 | sed -e 's#^--buildtype="*\([^"]*\)"*#\1#'` + shift +;; +--help|-h) + usage + exit 0 +;; +*) + echo "Invalid arguments $*" + echo_error "Try '$0 -h' for more information." +;; + esac +done + +# tmpdir directory, use environment variable TMPDIR +# if it was not specified, otherwise, error. +[ -n "$tmpdir" ] || tmpdir=$TMPDIR +[ -n "$tmpdir" ] || echo_error "No tmpdir found!" +[ -d "$tmpdir" ] || echo_error "Invalid tmpdir \"$tmpdir\"" +[ -n "$targets" ] || targets=$TARGETS +[ -n "$targets" ] || targets=$default_targets +[ -n "$recipes" ] || recipes=$RECIPES +[ -n "$recipes" -a ! -f "$recipes" ] && echo_error "Invalid file with list of recipes to rebuild" +[ -n "$recipes" ] || echo "All packages ever recorded in buildhistory directory will be rebuilt" +[ -n "$buildhistory" ] || buildhistory=$BUILDHISTORY +[ -n "$buildhistory" ] || buildhistory=$default_buildhistory +[ -d "$buildhistory" ] || echo_error "Invalid buildhistory directory \"$buildhistory\"" +[ -n "$buildtype" ] || buildtype=$BUILDTYPE +[ -n "$buildtype" ] || buildtype=$default_buildtype +echo "$buildtype" | grep -v '^[1234c ]*$' && echo_error "Invalid buildtype \"$buildtype\", only some combin
Re: [OE-core] kernel miscompilation with gcc 4.8 for ARMv5
Enrico Scholz writes: > is it expected that recent gcc 4.8[1] compiles the kernel correctly? > Kernels for ARMv5 platforms (PXA168 -> 3.4.52, MX28 -> 3.8.13) fail here > 100% at early boot with Applying two upstream kernel commits 455bd4c430b0c0a361f38e8658a0d6cb469942b5 (ARM: 7668/1: fix memset-related crashes caused by recent GCC (4.7.2) optimizations) and 418df63adac56841ef6b0f1fcf435bc64d4ed177 (ARM: 7670/1: fix the memset fix) seem to fix the problem for me. Enrico ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] iputils: Upgrade to v20121221
Removed obsolete patches Header for arping changed. New author added. Capability support enabled by default(upstream) -> added libcap to DEPENDS Gnutls enabled by default(upstream) -> switched from openssl to gnutls Signed-off-by: Radu Moisan --- .../files/debian/add-icmp-return-codes.diff| 43 .../iputils/files/debian/fix-arping-timeouts.diff | 26 .../files/debian/fix-dead-host-ping-stats.diff | 16 .../iputils/files/debian/targets.diff | 14 +++ .../iputils/files/debian/use_gethostbyname2.diff | 36 ...x-build-command-line-argument-with-gnutls.patch | 37 + .../{iputils_s20101006.bb => iputils_s20121221.bb} | 15 +++ 7 files changed, 68 insertions(+), 119 deletions(-) delete mode 100644 meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff delete mode 100644 meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff delete mode 100644 meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff create mode 100644 meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch rename meta/recipes-extended/iputils/{iputils_s20101006.bb => iputils_s20121221.bb} (80%) diff --git a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff b/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff deleted file mode 100644 index 40070c3..000 --- a/meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff +++ /dev/null @@ -1,43 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/ping.c -=== trunk.orig/ping.c 2010-05-07 23:13:54.0 -0700 -+++ trunk/ping.c 2010-05-07 23:23:22.0 -0700 -@@ -883,9 +883,36 @@ - case ICMP_SR_FAILED: - printf("Source Route Failed\n"); - break; -+ case ICMP_NET_UNKNOWN: -+ printf("Destination Net Unknown\n"); -+ break; -+ case ICMP_HOST_UNKNOWN: -+ printf("Destination Host Unknown\n"); -+ break; -+ case ICMP_HOST_ISOLATED: -+ printf("Source Host Isolated\n"); -+ break; -+ case ICMP_NET_ANO: -+ printf("Destination Net Prohibited\n"); -+ break; -+ case ICMP_HOST_ANO: -+ printf("Destination Host Prohibited\n"); -+ break; -+ case ICMP_NET_UNR_TOS: -+ printf("Destination Net Unreachable for Type of Service\n"); -+ break; -+ case ICMP_HOST_UNR_TOS: -+ printf("Destination Host Unreachable for Type of Service\n"); -+ break; - case ICMP_PKT_FILTERED: - printf("Packet filtered\n"); - break; -+ case ICMP_PREC_VIOLATION: -+ printf("Precedence Violation\n"); -+ break; -+ case ICMP_PREC_CUTOFF: -+ printf("Precedence Cutoff\n"); -+ break; - default: - printf("Dest Unreachable, Bad Code: %d\n", code); - break; diff --git a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff b/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff deleted file mode 100644 index 3e34788..000 --- a/meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff +++ /dev/null @@ -1,26 +0,0 @@ -Upstream-Status: Pending [from other distro Debian] - -Index: trunk/arping.c -=== trunk.orig/arping.c2010-05-07 23:13:52.0 -0700 -+++ trunk/arping.c 2010-05-07 23:41:16.0 -0700 -@@ -182,12 +182,17 @@ - if (start.tv_sec==0) - start = tv; - -- if (count-- == 0 || (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500)) -+ if (timeout && MS_TDIFF(tv,start) > timeout*1000 + 500) - finish(); - -- if (last.tv_sec==0 || MS_TDIFF(tv,last) > 500) { -+ if ((!timeout) && (count == 0)) -+ finish(); -+ -+ if ( count!=0 && (last.tv_sec==0 || MS_TDIFF(tv,last) > 500 ) ) { - send_pack(s, src, dst, - (struct sockaddr_ll *)&me, (struct sockaddr_ll *)&he); -+ if (count >= 0) -+ count--; - if (count == 0 && unsolicited) - finish(); - } diff --git a/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff b/meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff deleted file mode 100644 index fda42
[OE-core] [PATCH 2/2] diffutils: Upgrade to v3.3
Signed-off-by: Radu Moisan --- .../diffutils-3.2/obsolete_automake_macros.patch | 14 - .../diffutils/diffutils-3.2/remove-gets.patch | 22 meta/recipes-extended/diffutils/diffutils.inc |4 meta/recipes-extended/diffutils/diffutils_2.8.1.bb |7 --- .../{diffutils_3.2.bb => diffutils_3.3.bb} | 12 --- 5 files changed, 8 insertions(+), 51 deletions(-) delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch rename meta/recipes-extended/diffutils/{diffutils_3.2.bb => diffutils_3.3.bb} (59%) diff --git a/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch b/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch deleted file mode 100644 index f47cc79..000 --- a/meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Backport - -Signed-off-by: Marko Lindqvist -diff -Nurd diffutils-3.2/configure.ac diffutils-3.2/configure.ac diffutils-3.2/configure.ac 2011-08-11 18:17:54.0 +0300 -+++ diffutils-3.2/configure.ac 2013-02-08 08:13:28.271427213 +0200 -@@ -33,7 +33,6 @@ - - AC_PROG_AWK - AC_PROG_CC --AM_PROG_CC_STDC - AM_MISSING_PROG([HELP2MAN], [help2man]) - AC_PROG_RANLIB - gl_EARLY diff --git a/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch b/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch deleted file mode 100644 index 58ed62d..000 --- a/meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch +++ /dev/null @@ -1,22 +0,0 @@ -check for gets before using it - -Signed-off-by: Khem Raj -Upstream-Status: Pending -Index: diffutils-3.2/lib/stdio.in.h -=== diffutils-3.2.orig/lib/stdio.in.h 2011-08-28 04:57:28.0 -0700 -+++ diffutils-3.2/lib/stdio.in.h 2012-07-03 10:45:07.518322117 -0700 -@@ -693,11 +693,13 @@ - _GL_CXXALIAS_SYS (gets, char *, (char *s)); - # undef gets - # endif -+# if defined gets - _GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -so any use of gets warrants an unconditional warning. Assume it is -always declared, since it is required by C89. */ - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+# endif - #endif - - diff --git a/meta/recipes-extended/diffutils/diffutils.inc b/meta/recipes-extended/diffutils/diffutils.inc index c90a3c9..c2ca417 100644 --- a/meta/recipes-extended/diffutils/diffutils.inc +++ b/meta/recipes-extended/diffutils/diffutils.inc @@ -4,10 +4,6 @@ sdiff, and cmp utilities. These programs are usually \ used for creating patch files." SECTION = "base" -INC_PR = "r7" - -SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz" - inherit autotools update-alternatives gettext # diffutils assumes non-glibc compilation with uclibc and diff --git a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb index da6719d..bf425bb 100644 --- a/meta/recipes-extended/diffutils/diffutils_2.8.1.bb +++ b/meta/recipes-extended/diffutils/diffutils_2.8.1.bb @@ -3,13 +3,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" require diffutils.inc -PR = "${INC_PR}.0" +PR = "r7.0" -SRC_URI += "file://diffutils_fix_for_automake-1.12.patch" +SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz \ + file://diffutils_fix_for_automake-1.12.patch" SRC_URI[md5sum] = "71f9c5ae19b60608f6c7f162da86a428" SRC_URI[sha256sum] = "c5001748b069224dd98bf1bb9ee877321c7de8b332c8aad5af3e2a7372d23f5a" do_configure_prepend () { chmod u+w ${S}/po/Makefile.in.in -} \ No newline at end of file +} diff --git a/meta/recipes-extended/diffutils/diffutils_3.2.bb b/meta/recipes-extended/diffutils/diffutils_3.3.bb similarity index 59% rename from meta/recipes-extended/diffutils/diffutils_3.2.bb rename to meta/recipes-extended/diffutils/diffutils_3.3.bb index ef400ef..7a95c1a 100644 --- a/meta/recipes-extended/diffutils/diffutils_3.2.bb +++ b/meta/recipes-extended/diffutils/diffutils_3.3.bb @@ -3,6 +3,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" require diffutils.inc +SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz" + do_configure_prepend () { # Need to remove gettext macros with weird mix of versions for i in codeset.m4 gettext_gl.m4 intlmacosx.m4 inttypes-pri.m4 lib-ld_gl.m4 lib-prefix_gl.m4 po_gl.m4 ssize_t.m4 wchar_t.m4 wint_t.m4; do @@ -10,11 +12,5 @@ do_configure_prepend () { done } -PR = "${INC_PR}.1" - -SRC_URI += "file://remove-gets.patch \ -file://obsolete_automake_macros.patch \ -" - -SRC_URI[md5sum] = "22e4deef5d8949a727b159d6bc65c1cc" -SRC_URI[sha256sum] = "2aaae
[OE-core] [PATCH 0/2] Package Upgrades
The following changes since commit 8a186a6b3853fc1a7dcf342d421c8926c38949c9: bitbake: hob: save button from settings called a nonexisting method (2013-07-03 08:13:35 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib rmoisan/branch-upgrades-last http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=rmoisan/branch-upgrades-last Radu Moisan (2): iputils: Upgrade to v20121221 diffutils: Upgrade to v3.3 .../diffutils-3.2/obsolete_automake_macros.patch | 14 --- .../diffutils/diffutils-3.2/remove-gets.patch | 22 -- meta/recipes-extended/diffutils/diffutils.inc |4 -- meta/recipes-extended/diffutils/diffutils_2.8.1.bb |7 ++-- .../{diffutils_3.2.bb => diffutils_3.3.bb} | 12 ++ .../files/debian/add-icmp-return-codes.diff| 43 .../iputils/files/debian/fix-arping-timeouts.diff | 26 .../files/debian/fix-dead-host-ping-stats.diff | 16 .../iputils/files/debian/targets.diff | 14 +++ .../iputils/files/debian/use_gethostbyname2.diff | 36 ...x-build-command-line-argument-with-gnutls.patch | 37 + .../{iputils_s20101006.bb => iputils_s20121221.bb} | 15 +++ 12 files changed, 76 insertions(+), 170 deletions(-) delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.2/obsolete_automake_macros.patch delete mode 100644 meta/recipes-extended/diffutils/diffutils-3.2/remove-gets.patch rename meta/recipes-extended/diffutils/{diffutils_3.2.bb => diffutils_3.3.bb} (59%) delete mode 100644 meta/recipes-extended/iputils/files/debian/add-icmp-return-codes.diff delete mode 100644 meta/recipes-extended/iputils/files/debian/fix-arping-timeouts.diff delete mode 100644 meta/recipes-extended/iputils/files/debian/fix-dead-host-ping-stats.diff create mode 100644 meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch rename meta/recipes-extended/iputils/{iputils_s20101006.bb => iputils_s20121221.bb} (80%) -- 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 v8] systemd: added python-systemd package generation.
Ok, agree with you to have 2 recipes. But can you show me the way how to avoid building systemd twice (in systemd and python-systemd) while including python bindings in python-systemd. Best regards, Yevhen 2013/7/9 Burton, Ross : > On 5 July 2013 00:31, Yevhen Kyriukha wrote: >> +inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d >> update-alternatives qemu \ >> +${@base_contains('DISTRO_FEATURES', 'python', 'pythonnative >> python-dir', '', d)} > > You've just invented a new DISTRO_FEATURE, right? I don't think we > should invent these without due thought. There's a good discussion to > be had around a distro feature to enable all Pythonic integration > where possible, but it hasn't been had yet. > > I see two options here: > > 1) systemd doesn't enable Python, and we add another recipe > systemd-python that only builds and ships the Python bindings. > > 2) Decide as a project that we need a new DISTRO_FEATURE "python" that > means "has full support for Python", meaning that every package that > had Python integration should enable it. > > I'm currently leaning towards (1) as it's less intrusive on the OE > environment as a whole. > > Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC][PATCH 2/4] package.bbclass: show warning when package is trying to provide already provided shlib
On Sun, Jul 07, 2013 at 01:13:05AM +0200, Martin Jansa wrote: > * move read_shlib_providers before registering package as provider > and don't change provider if it already exists, show warning instead > > [YOCTO #4628] > > Signed-off-by: Martin Jansa List of WARNINGs about multiple providers for the same shlib from world build follows: I'll take care of meta-efl recipes where modules.so is always installed in separate directory and shouldn't be included in shlibs providers at all. WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-engine-gl-x11-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-engine-software-16-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-engine-software-16-x11-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-engine-software-x11-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-engine-wayland-shm-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-cserve2-bmp-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-cserve2-eet-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-cserve2-ico-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-cserve2-jpeg-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-cserve2-pmaps-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-cserve2-png-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-cserve2-psd-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-cserve2-tga-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-cserve2-tiff-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-cserve2-wbmp-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-cserve2-xpm-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-loader-bmp-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-loader-generic-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-loader-gif-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-loader-ico-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-loader-jpeg-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-loader-pmaps-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-loader-png-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-loader-psd-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-loader-tga-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-loader-tiff-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-loader-wbmp-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-loader-xpm-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-saver-jpeg-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ignoring evas-saver-png-1.7.7 trying to register the same WARNING: evas-engine-fb-1.7.7 is already registered as shlib provider for module.so, ign
[OE-core] [PATCH] nfs-utils: Add systemd support
From: Muhammad Shakeel - Adds systemd support in nfs-utils - Install 'sysv' related files only if distro has this feature Signed-off-by: Muhammad Shakeel --- .../nfs-utils/nfs-utils/nfs-utils.service | 16 +++ .../nfs-utils/nfs-utils_1.2.8.bb | 21 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.service b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.service new file mode 100644 index 000..e480cc8 --- /dev/null +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils.service @@ -0,0 +1,16 @@ +[Unit] +Description=NFS Server +Requires=rpcbind.service +After=rpcbind.service + +[Service] +Type=oneshot +ExecStart=/usr/sbin/rpc.nfsd +ExecStart=/usr/sbin/rpc.mountd +ExecStart=/usr/sbin/rpc.statd +ExecStart=/usr/sbin/exportfs -a +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target + diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb index 40b897b..508b4b1 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb @@ -15,7 +15,8 @@ RRECOMMENDS_${PN} = "kernel-module-nfsd" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.bz2 \ file://nfs-utils-1.0.6-uclibc.patch \ file://nfs-utils-1.2.3-sm-notify-res_init.patch \ - file://nfsserver" + file://nfsserver \ + file://nfs-utils.service " SRC_URI[md5sum] = "6e7d97de51e428a0b8698c16ca23db77" SRC_URI[sha256sum] = "1cc8f02a633eddbf0a1d93421f331479c4cdab4c5ab33b8bf8c7c369f9156ac6" @@ -31,7 +32,10 @@ INITSCRIPT_NAME = "nfsserver" # in the shutdown levels, but that works fine. INITSCRIPT_PARAMS = "defaults" -inherit autotools update-rc.d +inherit autotools update-rc.d systemd + +SYSTEMD_SERVICE_${PN} = "nfs-utils.service" +SYSTEMD_AUTO_ENABLE = "disable" # --enable-uuid is need for cross-compiling EXTRA_OECONF = "--with-statduser=nobody \ @@ -62,12 +66,21 @@ do_compile_prepend() { } do_install_append () { - install -d ${D}${sysconfdir}/init.d install -d ${D}${localstatedir}/lib/nfs/statd - install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver # kernel code as of 3.8 hard-codes this path as a default install -d ${D}/var/lib/nfs/v4recovery +if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/nfsserver ${D}${sysconfdir}/init.d/nfsserver +fi + +if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then +install -d ${D}${systemd_unitdir}/system +install ${WORKDIR}/nfs-utils.service ${D}${systemd_unitdir}/system/ +sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${systemd_unitdir}/system/nfs-utils.service +fi + # the following are built by CC_FOR_BUILD rm -f ${D}${sbindir}/rpcdebug rm -f ${D}${sbindir}/rpcgen -- 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 1/1] insane.bbclass: Added QA warning for shipping /usr/share/info/dir
On Mon, Jul 01, 2013 at 03:51:26PM +0100, Burton, Ross wrote: > On 1 July 2013 11:31, Mihai Prica wrote: > > /usr/share/info/dir should be generated at install time in a postinst. > > Added QA warning to check at build time for this file. The warning > > is disabled by default. > > Patch is good but why don't we enable this by default? FWIW: this is list of QA issues found with this check in my world builds: gcc-4.8.1: The /usr/share/info/dir file is not meant to be shipped in a particular package. ed-1.7: The /usr/share/info/dir file is not meant to be shipped in a particular package. emacs-23.4: The /usr/share/info/dir file is not meant to be shipped in a particular package. quagga-0.99.21: The /usr/share/info/dir file is not meant to be shipped in a particular package. lzip-1.14: The /usr/share/info/dir file is not meant to be shipped in a particular package. -- 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] kernel miscompilation with gcc 4.8 for ARMv5
Hi, is it expected that recent gcc 4.8[1] compiles the kernel correctly? Kernels for ARMv5 platforms (PXA168 -> 3.4.52, MX28 -> 3.8.13) fail here 100% at early boot with [0.404750] Unable to handle kernel paging request at virtual address 00210020 [0.412468] pgd = c0004000 [0.415187] [00210020] *pgd= [0.418812] Internal error: Oops: 5 [#1] PREEMPT ARM [0.423781] CPU: 0Not tainted (3.8.13.ipan4 #1) [0.428781] PC is at kmem_cache_alloc+0x44/0xcc [0.433375] LR is at con_insert_unipair+0xa4/0xf0 [0.438093] pc : []lr : []psr: 2053 (this is a similar error as described in [2]). Enabling heavy memory debugging shows [0.00] Virtual kernel memory layout: [0.00] vector : 0x - 0x1000 ( 4 kB) [0.00] fixmap : 0xfff0 - 0xfffe ( 896 kB) [0.00] vmalloc : 0xc880 - 0xff00 ( 872 MB) [0.00] lowmem : 0xc000 - 0xc800 ( 128 MB) [0.00] modules : 0xbf00 - 0xc000 ( 16 MB) [0.00] .text : 0xc0008000 - 0xc0436000 (4280 kB) [0.00] .init : 0xc0436000 - 0xc046a000 ( 208 kB) [0.00] .data : 0xc046a000 - 0xc049bff8 ( 200 kB) [0.00].bss : 0xc049c01c - 0xc0511680 ( 470 kB) [0.00] = [0.00] BUG kmem_cache_node (Not tainted): Redzone overwritten [0.00] - [0.00] [0.00] INFO: 0xc78010fc-0xc78010ff. First byte 0x5a instead of 0xbb [0.00] INFO: Slab 0xc0620024 objects=18 used=18 fp=0x (null) flags=0x0080 [0.00] INFO: Object 0xc78010e0 @offset=224 fp=0xc78011c0 [0.00] [0.00] Bytes b4 c78010d0: 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a [0.00] Object c78010e0: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b [0.00] Object c78010f0: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 5a kkkZ [0.00] Redzone c78010fc: 5a 5a 5a 5a [0.00] Padding c78011a4: 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a [0.00] Padding c78011b4: 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a 5a [0.00] Backtrace: for the 3.4.52 kernel. Compiling mm/slub.o with -O1 fixes *these* problems but there happen other crashes later. A kernel compiled for an ARMv7 platform (OMAP4, kernel 3.4.43) seems to work (although there might be enabled other kernel options). Are these problems resp. fixes known? Enrico Footnotes: [1] from 4f5009dcbbeb27bdf5dcaebb3b457fecef410ebe [2] https://bugs.launchpad.net/ubuntu/+source/gcc-4.8/+bug/1178847 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] cmake: fix configure error if system Qt installation is broken
On Thu, Jul 04, 2013 at 12:26:04PM +0100, Paul Eggleton wrote: > If the host Qt installation exists but is incomplete or the installed > qmake architecture doesn't match that of the Qt libraries, cmake was > failing at do_configure. cmake 2.8.10 failed silently here so we should > make 2.8.11 do the same. FWIW: I was seeing this issue in my jenkins builds once and then before I've included this patch to test it, it was gone and I haven't seen it anymore. I believe this patch is correct, just saying that building some recipe (maybe qt4-native) before cmake-native also "hides" this issue. > Fixes [YOCTO #4565]. > > Signed-off-by: Paul Eggleton > --- > meta/recipes-devtools/cmake/cmake.inc | 1 + > .../cmake/cmake/qt4-fail-silent.patch | 55 > ++ > 2 files changed, 56 insertions(+) > create mode 100644 meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch > > diff --git a/meta/recipes-devtools/cmake/cmake.inc > b/meta/recipes-devtools/cmake/cmake.inc > index 6144d51..014ff5a 100644 > --- a/meta/recipes-devtools/cmake/cmake.inc > +++ b/meta/recipes-devtools/cmake/cmake.inc > @@ -15,6 +15,7 @@ SRC_URI = > "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz > file://support-oe-qt4-tools-names.patch \ > file://aarch64-cmake.patch \ > file://aarch64-kwsys.patch \ > + file://qt4-fail-silent.patch \ > " > > inherit autotools > diff --git a/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch > b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch > new file mode 100644 > index 000..fd39f3f > --- /dev/null > +++ b/meta/recipes-devtools/cmake/cmake/qt4-fail-silent.patch > @@ -0,0 +1,55 @@ > +Fail silently if system Qt installation is broken > + > +Fixes a regression in behaviour from 2.8.10 to 2.8.11 resulting in the > +following error if the system Qt installation is broken: > + > +CMake Error at Modules/FindQt4.cmake:1028 (set_property): > + set_property could not find TARGET Qt4::QtCore. Perhaps it has not yet > + been created. > +Call Stack (most recent call first): > + Tests/RunCMake/CMakeLists.txt:79 (find_package) > + > +Upstream-Status: Pending > + > +Signed-off-by: Paul Eggleton > + > +--- cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:20:42.092848274 > +0100 > cmake-2.8.11/Modules/FindQt4.cmake 2013-07-04 10:52:15.693380555 > +0100 > +@@ -1025,21 +1025,22 @@ > + set(_configs) > + endmacro() > + > +- > +- # Set QT_xyz_LIBRARY variable and add > +- # library include path to QT_INCLUDES > +- _QT4_ADJUST_LIB_VARS(QtCore) > +- set_property(TARGET Qt4::QtCore APPEND PROPERTY > +-INTERFACE_INCLUDE_DIRECTORIES > +- "${QT_MKSPECS_DIR}/default" > +- ${QT_INCLUDE_DIR} > +- ) > +- set_property(TARGET Qt4::QtCore PROPERTY > +-INTERFACE_QT_MAJOR_VERSION 4 > +- ) > +- set_property(TARGET Qt4::QtCore APPEND PROPERTY > +-COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION > +- ) > ++ if(QT_QTCORE_FOUND) > ++# Set QT_xyz_LIBRARY variable and add > ++# library include path to QT_INCLUDES > ++_QT4_ADJUST_LIB_VARS(QtCore) > ++set_property(TARGET Qt4::QtCore APPEND PROPERTY > ++ INTERFACE_INCLUDE_DIRECTORIES > ++"${QT_MKSPECS_DIR}/default" > ++${QT_INCLUDE_DIR} > ++) > ++set_property(TARGET Qt4::QtCore PROPERTY > ++ INTERFACE_QT_MAJOR_VERSION 4 > ++) > ++set_property(TARGET Qt4::QtCore APPEND PROPERTY > ++ COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION > ++) > ++ endif() > + > + foreach(QT_MODULE ${QT_MODULES}) > + _QT4_ADJUST_LIB_VARS(${QT_MODULE}) > -- > 1.8.1.2 > > ___ > 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] [PATCH] rpcbind: Add systemd support
From: Muhammad Shakeel - Adds systemd support in rpcbind - Install 'sysv' related files only if distro has this feature - Set PR to 'r0' Signed-off-by: Muhammad Shakeel --- .../rpcbind/rpcbind/rpcbind.service| 13 ++ meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb | 26 ++-- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service new file mode 100644 index 000..a028ace --- /dev/null +++ b/meta/recipes-extended/rpcbind/rpcbind/rpcbind.service @@ -0,0 +1,13 @@ +[Unit] +Description=RPC Bind +After=network.target +Wants=rpcbind.target +Before=rpcbind.target + +[Service] +Type=forking +ExecStart=/usr/sbin/rpcbind +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb index f4a0367..ab25edf 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb @@ -15,6 +15,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ file://fix_host_path.patch \ file://obsolete_automake_macros.patch \ ${UCLIBCPATCHES} \ + file://rpcbind.service \ " UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \ @@ -25,9 +26,9 @@ UCLIBCPATCHES ?= "" SRC_URI[md5sum] = "1a77ddb1aaea8099ab19c351eeb26316" SRC_URI[sha256sum] = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3" -PR = "r4" +PR = "r0" -inherit autotools update-rc.d +inherit autotools update-rc.d systemd PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" @@ -35,12 +36,23 @@ PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" INITSCRIPT_NAME = "rpcbind" INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ." +SYSTEMD_SERVICE_${PN} = "rpcbind.service" +SYSTEMD_AUTO_ENABLE = "disable" + do_install_append () { mv ${D}${bindir} ${D}${sbindir} -install -d ${D}${sysconfdir}/init.d -sed -e 's,/etc/,${sysconfdir}/,g' \ --e 's,/sbin/,${sbindir}/,g' \ -${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind -chmod 0755 ${D}${sysconfdir}/init.d/rpcbind +if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then +install -d ${D}${sysconfdir}/init.d +sed -e 's,/etc/,${sysconfdir}/,g' \ +-e 's,/sbin/,${sbindir}/,g' \ +${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind +chmod 0755 ${D}${sysconfdir}/init.d/rpcbind +fi + +if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then +install -d ${D}${systemd_unitdir}/system +install -m 0644 ${WORKDIR}/rpcbind.service ${D}${systemd_unitdir}/system +sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${systemd_unitdir}/system/rpcbind.service +fi } -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] matchbox-wm: correct the SRC_URI and add checksums
From: Jackie Huang Signed-off-by: Jackie Huang --- .../matchbox-wm/matchbox-wm_1.2.bb |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb index 2628326..bc43167 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb @@ -2,13 +2,16 @@ SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager" LICENSE = "GPLv2.0+" DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes xdamage libxrender startup-notification expat" -PR = "r5" +PR = "r6" -SRC_URI = "http://matchbox-project.org/sources/matchbox-window-manager/1.2/matchbox-window-manager-${PV}.tar.bz2 \ +SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \ file://configure_fix.patch \ file://kbdconfig \ file://gconf-2.m4" +SRC_URI[md5sum] = "3e158dcf57823b55c926d95b245500fb" +SRC_URI[sha256sum] = "81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff" + S = "${WORKDIR}/matchbox-window-manager-${PV}" inherit autotools pkgconfig -- 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 1/1] init-live.sh: allow users to choose the boot action
On 07/10/2013 04:32 PM, Tomas Frydrych wrote: Hi, On 10/07/13 08:12, qi.c...@windriver.com wrote: From: Chen Qi Previously, the boot action for live images was totally determined by the LABEL value in the boot parameters (/proc/cmdline). This behavior is not very convenient for users. The user may just want to drop to a shell for troubleshooting the live image, or the user may want to try to install the live image while the LABEL value is 'boot'. We should provide the users a chance to choose the boot action when the live image starts up. I am not entirely clear on why this is needed, the LABEL kernel cmdline parameter is set up by syslinux, and its value can be specified by the user from the syslinux prompt. If what you want is a more user friendly menu, then I think the correct solution would be to tweak the syslinux config, rather than to create a duplicate boot menu in the init script. Tomas I agree. Thanks for providing this info. //Chen Qi ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [CONSOLIDATED PULL 00/59] Ready for Pull
On Tue, 2013-07-09 at 08:38 -0700, Saul Wold wrote: > Paul, Ross: > > This is the updated version with some additional patches dropped > Please ACK for RP > > > Richard: > > There is an additional patch from Bruce pending on Poky for the kenrel. > > I have included Robert's DESCRIPTION changes, along with the Image Test > code. > > Thanks > Sau! > > > The following changes since commit ccbce75335971abf5098a492755e92ca60cf67bd: > > lib/oeqa/runtime: add gcc test (2013-07-09 10:49:20 +0100) > > are available in the git repository at: > > git://git.openembedded.org/openembedded-core-contrib sgw/stage > > http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage > > Andrei Dinu (1): > e2fsprogs: upgrade to 1.42.8 > > Bernhard Guillon (1): > populate_sdk_base.bbclass: allow $OECORE_NATIVE_SYSROOT in > sdk_env_script > > Bruce Ashfield (1): > linux-yocto/3.4: update to v3.4.52 > > Cristian Iorga (1): > glib-2.0: upgrade to 2.36.3 > > Felipe F. Tonello (1): > pulseaudio: Added consolekit dependency for > pulseaudio-module-console-kit package We go around in circles on this one :(. At the very least, as far as I know this is only a runtime dependency, not a build time one. > Ionut Radu (8): > libassuan: Updated from 2.1.0 to 2.1.1 > augeas: Update from 1.0.0 to 1.1.0 > libxvmc: Update from 1.0.7 to 1.0.8 > libxi: Update from 1.7.1 to 1.7.2 > libgpg-error: Updated from 1.11 to 1.12 > libxrender: Updated from 0.9.7 to 0.9.8 > libxv: Updated from 1.0.8 to 1.0.9 > ethtool: Updated from 3.9 to 3.10 > > Jackie Huang (3): > initscripts: overwrite default hostname.sh > initscripts: add dmesg file to /var/log > glib-2.0: add -march=i486 into CFLAGS automatically when needed. > > Jonathan Liu (1): > qt4: add upstream QTBUG-31579 patch to fix polyline drawing regression > > Kang Kai (2): > webkit: set COMPATIBLE_HOST for mips64 > packagegroup-core-lsb: set COMPATIBLE_HOST to mips64 > > Khem Raj (1): > eglibc: Update 2.18 recipes to fix ppc/e500 failures > > Laurentiu Palcu (6): > populate_sdk_base: fix bashism > sysvinit: allow users in shutdown group to perform halt/reboot > xuser-account: create separate recipe for xuser creation > connman: remove xuser creation, RDEPEND on xuser-account > xserver-nodm-init: remove xuser creation, RDEPEND on xuser-account > shutdown-desktop: give entire path in Exec field > > Martin Jansa (8): > (lib)telepathy*: add missing dependency on libxslt-native > gst-plugins-bad: inherit gsettings > gst-plugins-base: add missing dependency on glib-2.0-native > taglib: add missing dependency on zlib > quota: inherit pkgconfig > libpam: inherit pkgconfig > systemtap: inherit pkgconfig > eglibc-locale: add missing dependency on > virtual/${TARGET_PREFIX}binutils > > Mihaela Sendrea (1): > libxml2: Add ptest > > Nathan Rossi (2): > scripts/runqemu: Add support for 'qemuzynq' machine > scripts/runqemu: Add support for 'qemumicroblaze' machine I've taken these however I'd like to be clear that we need a way for layers to extend this script ultimately rather than adding code for every possible qemu machine. > Paul Eggleton (1): > cmake: fix configure error if system Qt installation is broken > > Radu Moisan (7): > elfutils: Upgrade to v0.155 > rxvt-unicode: Upgrade to v9.18 I've taken this but that do_configure needs to read: if [ ! -e ${S}/acinclude.m4 ]; then cp ${S}/aclocal.m4 ${S}/acinclude.m4 fi since the copy should only happen if acinclude.m4 doesn't exist. > ed: Upgrade to v1.8 > libdmx: Upgrade to v1.1.3 > apr: Upgrade to v1.4.8 > apr-util: Upgrade to v1.5.2 > usbutils: Upgrade to v007 > > Randy Witt (1): > systemd: Don't enable systemd services when native. > > Robert Yang (3): > package_rpm.bbclass: make DESCRIPTION support newline > package_ipk.bbclass: make DESCRIPTION support newline > package_deb.bbclass: make DESCRIPTION support newline > > Ross Burton (2): > gtkdoc: set the default docdir to ${S}, not ${B} > pango: drop unexplainable elfutils dependency > > Saul Wold (7): > packagegroup-core-basic: remove libpam > util-linux: Use PACKAGECONFIG to control pam and system config options > man-pages: Update to 3.52 > cmake: Update to 2.8.11.2 > tzcode-native: Update to 2013d > kconfig-frontends: Update to 3.10 > security_flags: Add addition recipes to the non pie list > > Ting Liu (1): > qemu: use PACKAGECONFIG to address libaio/attr/libcap dependencies Cheers, Richard ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] init-live.sh: allow users to choose the boot action
Hi, On 10/07/13 08:12, qi.c...@windriver.com wrote: > From: Chen Qi > > Previously, the boot action for live images was totally determined > by the LABEL value in the boot parameters (/proc/cmdline). > > This behavior is not very convenient for users. The user may just want > to drop to a shell for troubleshooting the live image, or the user may > want to try to install the live image while the LABEL value is 'boot'. > > We should provide the users a chance to choose the boot action when > the live image starts up. I am not entirely clear on why this is needed, the LABEL kernel cmdline parameter is set up by syslinux, and its value can be specified by the user from the syslinux prompt. If what you want is a more user friendly menu, then I think the correct solution would be to tweak the syslinux config, rather than to create a duplicate boot menu in the init script. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] boost 1.54 compile fail
Hello! after update poky to latest git version, I got failure when compiling boost: the main error is: (indeed, and too many warning!) | ./boost/atomic/atomic.hpp:202:16: error: 'uintptr_t' was not declared in this scope | typedef atomic atomic_uintptr_t; | ^ | ./boost/atomic/atomic.hpp:202:25: error: template argument 1 is invalid | typedef atomic atomic_uintptr_t; | ^ | ./boost/atomic/atomic.hpp:202:43: error: invalid type in declaration before ';' token | typedef atomic atomic_uintptr_t; |^ | In file included from ./boost/system/system_error.hpp:14:0, | from ./boost/thread/exceptions.hpp:22, | from ./boost/thread/pthread/thread_data.hpp:10, | from ./boost/thread/thread_only.hpp:17, | from libs/thread/src/pthread/thread.cpp:11: -- Nanjing Jilong Yi Qingliang niqingliang2...@gmail.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] nss: fix incorrect shebang line of perl script
Replace incorrect shebang line with `#!/usr/bin/perl'. Signed-off-by: Hongxu Jia --- .../files/nss-fix-incorrect-shebang-of-perl.patch | 110 + meta/recipes-support/nss/nss.inc | 1 + 2 files changed, 111 insertions(+) create mode 100644 meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch diff --git a/meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch b/meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch new file mode 100644 index 000..ae2a6e5 --- /dev/null +++ b/meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch @@ -0,0 +1,110 @@ +nss: fix incorrect shebang of perl + +Replace incorrect shebang of perl with `#!/usr/bin/perl'. + +Signed-off-by: Hongxu Jia +Upstream-Status: Pending +--- + nss/cmd/smimetools/smime | 2 +- + nss/coreconf/cpdist.pl| 2 +- + nss/coreconf/import.pl| 2 +- + nss/coreconf/jniregen.pl | 2 +- + nss/coreconf/outofdate.pl | 2 +- + nss/coreconf/release.pl | 2 +- + nss/coreconf/version.pl | 2 +- + nss/tests/clean_tbx | 2 +- + nss/tests/path_uniq | 2 +- + 9 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime +--- a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl +index 800edfb..652187f 100755 +--- a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl +@@ -1,4 +1,4 @@ +-#! /usr/local/bin/perl ++#!/usr/bin/perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl +index dd2d177..428eaa5 100755 +--- a/nss/coreconf/import.pl b/nss/coreconf/import.pl +@@ -1,4 +1,4 @@ +-#! /usr/local/bin/perl ++#!/usr/bin/perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl +index 2039180..5f4f69c 100755 +--- a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl +index 33d80bb..01fc097 100755 +--- a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/perl ++#!/usr/bin/perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl +index 7cde19d..b5df2f6 100755 +--- a/nss/coreconf/release.pl b/nss/coreconf/release.pl +@@ -1,4 +1,4 @@ +-#! /usr/local/bin/perl ++#!/usr/bin/perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl +index d2a4942..79359fe 100644 +--- a/nss/coreconf/version.pl b/nss/coreconf/version.pl +@@ -1,4 +1,4 @@ +-#!/usr/sbin/perl ++#!/usr/bin/perl + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this +diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx +index 4de9555..a7def9f 100755 +--- a/nss/tests/clean_tbx b/nss/tests/clean_tbx +@@ -1,4 +1,4 @@ +-#! /bin/perl ++#!/usr/bin/perl + + ### + # +diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq +index f29f60a..08fbffa 100755 +--- a/nss/tests/path_uniq b/nss/tests/path_uniq +@@ -1,4 +1,4 @@ +-#! /bin/perl ++#!/usr/bin/perl + + + # +-- +1.8.1.2 + diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc index 4270743..e2f3891 100644 --- a/meta/recipes-support/nss/nss.inc +++ b/meta/recipes-support/nss/nss.inc @@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466a SRC_URI = "\ file://nss-fix-support-cross-compiling.patch \ file://nss-no-rpath-for-cross-compiling.patch \ +file://nss-fix-incorrect-shebang-of-perl.patch \ " SRC_URI_append_class-target += "\ file://nss.pc.in \ -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] nss: create checksum files for the nss libraries
Add checksum files required for the NSS softoken to operate in FIPS 140 mode. The shlibsign is invoked to sign the libraries, and it is built for the target architecture and doesn't support cross-compiling so far. Invoke shlibsign at target's first boot time to generate checksum files. https://developer.mozilla.org/en-US/docs/NSS/NSS_Tech_Notes/nss_tech_note6 http://en.wikipedia.org/wiki/FIPS_140 https://bugzilla.mozilla.org/show_bug.cgi?id=681624 Signed-off-by: Hongxu Jia --- meta/recipes-support/nss/files/signlibs.sh | 20 meta/recipes-support/nss/nss.inc | 16 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-support/nss/files/signlibs.sh diff --git a/meta/recipes-support/nss/files/signlibs.sh b/meta/recipes-support/nss/files/signlibs.sh new file mode 100644 index 000..1ec79f4 --- /dev/null +++ b/meta/recipes-support/nss/files/signlibs.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +# signlibs.sh +# +# (c)2010 Wind River Systems, Inc. +# +# regenerates the .chk files for the NSS libraries that require it +# since the ones that are built have incorrect checksums that were +# calculated on the host where they really need to be done on the +# target + +CHK_FILES=`find /lib* /usr/lib* -name "*.chk"` +SIGN_BINARY=`which shlibsign` +for I in $CHK_FILES +do + DN=`dirname $I` + BN=`basename $I .chk` + FN=$DN/$BN.so + $SIGN_BINARY -i $FN +done diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc index 87cba38..4270743 100644 --- a/meta/recipes-support/nss/nss.inc +++ b/meta/recipes-support/nss/nss.inc @@ -18,6 +18,7 @@ SRC_URI = "\ " SRC_URI_append_class-target += "\ file://nss.pc.in \ +file://signlibs.sh \ " inherit siteinfo PR = "r0" @@ -136,6 +137,14 @@ do_install() { } do_install_append_class-target() { +# Create empty .chk files for the NSS libraries at build time. They could +# be regenerated at target's boot time. +for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk; do +touch ${D}/${libdir}/$file +chmod 755 ${D}/${libdir}/$file +done +install -D -m 755 ${WORKDIR}/signlibs.sh ${D}/${bindir}/signlibs.sh + install -d ${D}${libdir}/pkgconfig/ sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc @@ -151,6 +160,13 @@ do_install_append_class-target() { rm ./empty_password } +pkg_postinst_${PN} () { +if [ -n "$D" ]; then +exit 1 +fi +signlibs.sh +} + FILES_${PN} = "\ ${sysconfdir} \ ${bindir} \ -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] packagegroup-core-lsb: add nss for LSB library check
Add nss for LSB library check. ... Unable to find library libnss3.so Unable to find library libssl3.so ... [YOCTO 4096] Signed-off-by: Hongxu Jia --- meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index d71db26..4d79592 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb @@ -167,6 +167,7 @@ RDEPENDS_packagegroup-core-lsb-core = "\ zlib \ nspr \ libpng12 \ +nss \ " SUMMARY_packagegroup-core-lsb-perl = "LSB Runtime Languages (Perl)" -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2 0/5] add nss for LSB library check
Change from V1: 1) Rename the title of patch 1/5 2) Use ${libdir} rather than ${base_libdir} as the lib location which references the nss in meta-browser. //Hongxu The following changes since commit dc86293f0444384e8ae5131fdd10b6cb077164b0: bitbake: HOB:Proper handle of SIGINT (2013-07-05 15:52:48 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib hongxu/fix-nss http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-nss Hongxu Jia (5): nspr: add native version packagegroup-core-lsb: add nss for LSB library check nss: add version 3.15.1 nss: create checksum files for the nss libraries nss: fix incorrect shebang line of perl script .../packagegroups/packagegroup-core-lsb.bb | 1 + meta/recipes-support/nspr/nspr_4.10.bb | 2 + .../files/nss-fix-incorrect-shebang-of-perl.patch | 110 .../files/nss-fix-support-cross-compiling.patch| 71 .../files/nss-no-rpath-for-cross-compiling.patch | 26 +++ meta/recipes-support/nss/files/nss.pc.in | 11 ++ meta/recipes-support/nss/files/signlibs.sh | 20 +++ meta/recipes-support/nss/nss.inc | 187 + meta/recipes-support/nss/nss_3.15.1.bb | 9 + 9 files changed, 437 insertions(+) create mode 100644 meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch create mode 100644 meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch create mode 100644 meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch create mode 100644 meta/recipes-support/nss/files/nss.pc.in create mode 100644 meta/recipes-support/nss/files/signlibs.sh create mode 100644 meta/recipes-support/nss/nss.inc create mode 100644 meta/recipes-support/nss/nss_3.15.1.bb -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] nspr: add native version
It is required by nss-native. [YOCTO #4096] Signed-off-by: Hongxu Jia --- meta/recipes-support/nspr/nspr_4.10.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/nspr/nspr_4.10.bb b/meta/recipes-support/nspr/nspr_4.10.bb index 3936d67..fcecb95 100644 --- a/meta/recipes-support/nspr/nspr_4.10.bb +++ b/meta/recipes-support/nspr/nspr_4.10.bb @@ -173,3 +173,5 @@ FILES_${PN} = "${libdir}/lib*.so" FILES_${PN}-dev = "${bindir}/* ${libdir}/nspr/tests/* ${libdir}/pkgconfig \ ${includedir}/* ${datadir}/aclocal/* " FILES_${PN}-dbg += "${libdir}/nspr/tests/.debug/*" + +BBCLASSEXTEND = "native" -- 1.8.1.2 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] nss: add version 3.15.1
Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS 5, PKCS 7, PKCS 11, PKCS 12, S/MIME, X.509 v3 certificates, and other security standards. [YOCTO #4096] Signed-off-by: Hongxu Jia --- .../files/nss-fix-support-cross-compiling.patch| 71 + .../files/nss-no-rpath-for-cross-compiling.patch | 26 meta/recipes-support/nss/files/nss.pc.in | 11 ++ meta/recipes-support/nss/nss.inc | 170 + meta/recipes-support/nss/nss_3.15.1.bb | 9 ++ 5 files changed, 287 insertions(+) create mode 100644 meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch create mode 100644 meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch create mode 100644 meta/recipes-support/nss/files/nss.pc.in create mode 100644 meta/recipes-support/nss/nss.inc create mode 100644 meta/recipes-support/nss/nss_3.15.1.bb diff --git a/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch new file mode 100644 index 000..f0b3550 --- /dev/null +++ b/meta/recipes-support/nss/files/nss-fix-support-cross-compiling.patch @@ -0,0 +1,71 @@ +nss: fix support cross compiling + +Let some make variables be assigned from outside makefile. + +Signed-off-by: Hongxu Jia +Upstream-Status: Inappropriate [configuration] +--- + nss/coreconf/Linux.mk | 12 +++- + nss/coreconf/arch.mk| 2 +- + nss/lib/freebl/Makefile | 6 ++ + 3 files changed, 18 insertions(+), 2 deletions(-) + +diff --git a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk +--- a/nss/coreconf/Linux.mk b/nss/coreconf/Linux.mk +@@ -16,11 +16,21 @@ ifeq ($(USE_PTHREADS),1) + IMPL_STRATEGY = _PTH + endif + ++ifndef CC + CC= gcc ++endif ++ ++ifdef CXX ++CCC = $(CXX) ++else + CCC = g++ ++endif ++ ++ifndef RANLIB + RANLIB= ranlib ++endif + +-DEFAULT_COMPILER = gcc ++DEFAULT_COMPILER = $(CC) + + ifeq ($(OS_TARGET),Android) + ifndef ANDROID_NDK +diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +index 6557348..b722412 100644 +--- a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk +@@ -37,7 +37,7 @@ OS_TEST := $(shell uname -m) + ifeq ($(OS_TEST),i86pc) + OS_RELEASE := $(shell uname -r)_$(OS_TEST) + else +-OS_RELEASE := $(shell uname -r) ++OS_RELEASE ?= $(shell uname -r) + endif + + # +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index 0d293f1..678f506 100644 +--- a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +@@ -36,6 +36,12 @@ ifdef USE_64 + DEFINES += -DNSS_USE_64 + endif + ++ifeq ($(OS_TEST),mips) ++ifndef USE_64 ++ DEFINES += -DNS_PTR_LE_32 ++endif ++endif ++ + ifdef USE_ABI32_FPU + DEFINES += -DNSS_USE_ABI32_FPU + endif +-- +1.8.1.2 + diff --git a/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch new file mode 100644 index 000..7661dc9 --- /dev/null +++ b/meta/recipes-support/nss/files/nss-no-rpath-for-cross-compiling.patch @@ -0,0 +1,26 @@ +nss:no rpath for cross compiling + +Signed-off-by: Hongxu Jia +Upstream-Status: Inappropriate [configuration] +--- + nss/cmd/platlibs.mk | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +--- a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk +@@ -18,9 +18,9 @@ endif + + ifeq ($(OS_ARCH), Linux) + ifeq ($(USE_64), 1) +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' + else +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' + endif + endif + +-- +1.8.1.2 + diff --git a/meta/recipes-support/nss/files/nss.pc.in b/meta/recipes-support/nss/files/nss.pc.in new file mode 100644 index 000..200f635 --- /dev/null +++ b/meta/recipes-support/nss/files/nss.pc.in @@ -0,0 +1,11 @@ +prefix=OEPREFIX +exec_prefix=OEEXECPREFIX +libdir=OELIBDIR +includedir=OEINCDIR + +Name: NSS +Description: Network Security Services +Version: %NSS_VERSION% +Requires: nspr >= %NSPR_VERSION% +Libs: -lssl3 -lsmime3 -lnss3 -lsoftokn3 -lnssutil3 +Cflags: -IOEINCDIR diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc new file mode 100644 index 000..87cba38 --- /dev/null +++ b/meta/recipes-support/nss/nss.inc @@ -0,0 +1,170 @@ +SUMMARY = "Mozilla's SSL and TLS implementation" +DESCRIPTION = "Network Security Services (NSS) is a set of libraries \ +designed to support cross-platform development of \ +security-enabled client and server
[OE-core] [PATCH 0/1] init-live.sh: allow user to choose the boot action
From: Chen Qi The following changes since commit 4285e856aa073979bf046168a75188ccf5a1e7d4: lib/oeqa/runtime: add gcc test (2013-07-09 10:53:45 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib ChenQi/live-image-user-choice http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/live-image-user-choice Chen Qi (1): init-live.sh: allow users to choose the boot action meta/recipes-core/initrdscripts/files/init-live.sh | 39 1 file changed, 39 insertions(+) -- 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/1] init-live.sh: allow users to choose the boot action
From: Chen Qi Previously, the boot action for live images was totally determined by the LABEL value in the boot parameters (/proc/cmdline). This behavior is not very convenient for users. The user may just want to drop to a shell for troubleshooting the live image, or the user may want to try to install the live image while the LABEL value is 'boot'. We should provide the users a chance to choose the boot action when the live image starts up. This patch starts to implement this behavior by providing three choices at boot time, 'boot', 'install' and 'shell'. [YOCTO #4784] Signed-off-by: Chen Qi --- meta/recipes-core/initrdscripts/files/init-live.sh | 39 1 file changed, 39 insertions(+) diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh index 890c562..2300381 100644 --- a/meta/recipes-core/initrdscripts/files/init-live.sh +++ b/meta/recipes-core/initrdscripts/files/init-live.sh @@ -73,6 +73,39 @@ read_args() { done } +get_choice_from_user () { +# get the choice from user, determine the value of label +echo "" +echo "Boot options [6 seconds timeout]:" +echo "[1] boot: boot the live image" +echo "[2] install: install the live image to a local disk" +echo "[3] shell: drop to a shell" +while true; do + echo -n "Please enter your choice number [default action is $label]: " + read -t 6 choice + case "$choice" in + "") + break + ;; + "1") + label="boot" + break + ;; + "2") + label="install" + break + ;; + "3") + label="shell" + break + ;; + *) + echo "Invalid input" + ;; + esac +done +} + boot_live_root() { # Watches the udev event queue, and exits if all current events are handled udevadm settle --timeout=3 --quiet @@ -192,6 +225,9 @@ mount_and_boot() { boot_live_root } +# Get choice from user +get_choice_from_user + case $label in boot) mount_and_boot @@ -206,4 +242,7 @@ case $label in # If we're getting here, we failed... fatal "Installation image failed" ;; +shell) + exec sh + ;; esac -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core