Re: [oe] [PATCH] imagemagick: upgrade from 6.9.2 to 7.0.2
On 2016-08-15 06:28 AM, Martin Jansa wrote: On Mon, Aug 08, 2016 at 05:41:34PM -0400, Randy MacLeod wrote: The copyright end year update made the LICENSE file checksum change. That line is in the middle of the file so the license checksum has been updated rather than specifying two ranges of lines. You forgot to update FILES variable, I did that in master-next, but next time please test your changes for QA issues before sending them. Will do. I'll likely add ptest support as well at some point... ../Randy WARNING: imagemagick-7.0.2-r0 do_package: QA Issue: imagemagick: Files/directories were installed but not shipped in any package: /usr/lib/ImageMagick-7.0.2 /usr/lib/ImageMagick-7.0.2/config-Q16HDRI /usr/lib/ImageMagick-7.0.2/config-Q16HDRI/configure.xml /usr/share/ImageMagick-7 /usr/share/ImageMagick-7/english.xml /usr/share/ImageMagick-7/francais.xml /usr/share/ImageMagick-7/locale.xml Signed-off-by: Randy MacLeod--- .../imagemagick/{imagemagick_6.9.2.bb => imagemagick_7.0.2.bb}| 8 1 file changed, 4 insertions(+), 4 deletions(-) rename meta-oe/recipes-support/imagemagick/{imagemagick_6.9.2.bb => imagemagick_7.0.2.bb} (94%) diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb similarity index 94% rename from meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb rename to meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb index a9f0134..a5a239c 100644 --- a/meta-oe/recipes-support/imagemagick/imagemagick_6.9.2.bb +++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.2.bb @@ -1,18 +1,18 @@ SUMMARY = "ImageMagick is an image convertion tools" SECTION = "console/utils" LICENSE = "ImageMagick" -LIC_FILES_CHKSUM = "file://LICENSE;md5=0887b670be7ef0c3cb37092b64d57514" +LIC_FILES_CHKSUM = "file://LICENSE;md5=22d47a47bf252ca3ed7f71273b53612e" # FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results. DEPENDS = "lcms bzip2 jpeg libpng librsvg tiff zlib virtual/fftw freetype" # Important note: tarballs for all patchsets within a version are deleted when # a new pachset is created. To avoid multiple patches for each patchset, try to # update to the last pachset of a version -PATCHSET = "0" +PATCHSET = "7" SRC_URI = "http://www.imagemagick.org/download/releases/ImageMagick-${PV}-${PATCHSET}.tar.xz \ " -SRC_URI[md5sum] = "99471c8c3f38c9264faf5c4ca7a31287" -SRC_URI[sha256sum] = "07a2de28f7f9ab888ef47c02eb7e10cc3e0dd0e9797c5d71d6e71d19f842399e" +SRC_URI[md5sum] = "bd66b19bd6fc3d320bd8d51869c874f9" +SRC_URI[sha256sum] = "1168f44cfcd1243acda6bb9663f5d9b3a4bca2acd372e979b97b58ecf5c713e2" S = "${WORKDIR}/ImageMagick-${PV}-${PATCHSET}" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- # Randy MacLeod. SMTS, Linux, Wind River Direct: 613.963.1350 | 350 Terry Fox Drive, Suite 200, Ottawa, ON, Canada, K2K 2W5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH 2/2] Reimplement helper method for parallelizing JDK builds
Simplifies duplicated implementation across multiple recipes that all inherited from java.bbclass. Previously implementation was not flexible in supporting other make job-limiting flags (like -l for load) that are typically passed in through PARALLEL_MAKE. (OpenJDK doesn't know about these other flags that might have gotten tagged on after the value for -j.) Signed-off-by: Kyle Russell--- classes/java.bbclass | 17 recipes-core/icedtea/icedtea7-native.inc | 23 +- recipes-core/openjdk/openjdk-7-common.inc | 32 +-- recipes-core/openjdk/openjdk-8-common.inc | 21 recipes-core/openjdk/openjdk-8-cross.inc | 6 +++--- recipes-core/openjdk/openjdk-8-native.inc | 2 +- 6 files changed, 23 insertions(+), 78 deletions(-) diff --git a/classes/java.bbclass b/classes/java.bbclass index fc97295..aa012ab 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass @@ -21,6 +21,23 @@ STAGING_DATADIR_JAVA_NATIVE ?= "${STAGING_DATADIR_NATIVE}/java" STAGING_LIBDIR_JNI_NATIVE ?= "${STAGING_LIBDIR_NATIVE}/jni" STAGING_LIBDIR_JVM_NATIVE ?= "${STAGING_LIBDIR_NATIVE}/jvm" +# Icedtea's makefile is not compatible to parallelization so we cannot allow +# passing a valid ${PARALLEL_MAKE} to it. OTOH OpenJDK's makefiles are +# parallelizable and we need ${PARALLEL_MAKE} to derive the proper value. +# The base for this quirk is that GNU Make only considers the last "-j" option. +EXTRA_OEMAKE_remove_task-compile = "${PARALLEL_MAKE}" +EXTRA_OEMAKE_remove_task-install = "${PARALLEL_MAKEINST}" + +# OpenJDK supports parallel compilation but uses a plain number for this. +# In OE we have PARALLEL_MAKE which is the actual option passed to make, +# e.g. "-j 4". +def java_get_parallel_make(d): +pm = d.getVar('PARALLEL_MAKE', True); +if not pm or '-j' not in pm: +return 1 + +return pm.partition('-j')[2].strip().split(' ')[0] + oe_jarinstall() { # Purpose: Install a jar file and create all the given symlinks to it. # Example: diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc index 3344acb..d4c5c29 100644 --- a/recipes-core/icedtea/icedtea7-native.inc +++ b/recipes-core/icedtea/icedtea7-native.inc @@ -54,27 +54,8 @@ export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" # which is already stripped. INSANE_SKIP_${PN} = "already-stripped" -# OpenJDK supports parallel compilation but uses a plain number for this. -# In OE we have PARALLEL_MAKE which is the actual option passed to make, -# e.g. "-j 4". -ICEDTEA_PARALLEL_MAKE := "${PARALLEL_MAKE}" -PARALLEL_MAKE = "" -def get_jdk7_native_jobs(d): -import bb - -pm = bb.data.getVar('ICEDTEA_PARALLEL_MAKE', d, 1); -if not pm: -return "1" - -pm = pm.split("j"); -if (len(pm) == 2): -return pm[1].strip() - -# Whatever found in PARALLEL_MAKE was not suitable. -return "1" - EXTRA_OECONF = "\ - --with-parallel-jobs=${@get_jdk7_native_jobs(d)} \ + --with-parallel-jobs=${@java_get_parallel_make(d)} \ \ --disable-tests \ --disable-hotspot-tests \ @@ -273,5 +254,3 @@ do_install() { # Fix missing write permissions on the files. chmod ug+w -R ${JDK_INSTALL_DIR} } - -get_jdk7_native_jobs[vardepsexclude] += "ICEDTEA_PARALLEL_MAKE" diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc index 759b426..ba738cf 100644 --- a/recipes-core/openjdk/openjdk-7-common.inc +++ b/recipes-core/openjdk/openjdk-7-common.inc @@ -59,30 +59,6 @@ export CACAO_CONFIGURE_ARGS = " \ JAVA_HOME[unexport] = "1" -# OpenJDK supports parallel compilation but uses a plain number for this. -# In OE we have PARALLEL_MAKE which is the actual option passed to make, -# e.g. "-j 4". - -OPENJDK_PARALLEL_MAKE := "${PARALLEL_MAKE}" -PARALLEL_MAKE = "" - -def get_jdk7_jobs(d): -import bb - -pm = bb.data.getVar('OPENJDK_PARALLEL_MAKE', d, 1); -if not pm: -return "1" - -pm = pm.split("j"); -if (len(pm) == 2): -return pm[1].strip() - -# Whatever found in PARALLEL_MAKE was not suitable. -return "1" - -get_jdk7_jobs[vardepsexclude] += "OPENJDK_PARALLEL_MAKE" -JDK_JOBS = "${@get_jdk7_jobs(d)}" - EXTRA_OECONF = " \ --disable-tests \ --disable-hotspot-tests \ @@ -106,7 +82,7 @@ EXTRA_OECONF = " \ --with-jdk-src-zip=${WORKDIR}/${JDK_FILE} \ --with-langtools-src-zip=${WORKDIR}/${LANGTOOLS_FILE} \ \ ---with-parallel-jobs=${JDK_JOBS} \ +--with-parallel-jobs=${@java_get_parallel_make(d)} \ \ --with-pkgversion=${PV} \ --with-cc-for-build=${BUILD_CC} \ @@ -121,8 +97,6 @@ EXTRA_OECONF += " \ " do_configure_prepend() { -echo "Configure with parallel-jobs: ${JDK_JOBS}" - # Automatically copy everything that starts with "icedtea" (or "cacao") and ends with # ".patch" into the patches directory.
[oe] [meta-java][PATCH 1/2] rhino-native should depend on classpath-native
rhino's do_compile task passes ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip to javac. This glibj.zip archive comes from the classpath-native package. Signed-off-by: Kyle Russell--- recipes-core/rhino/rhino_1.7r4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-core/rhino/rhino_1.7r4.bb b/recipes-core/rhino/rhino_1.7r4.bb index 7898d23..30d5a62 100644 --- a/recipes-core/rhino/rhino_1.7r4.bb +++ b/recipes-core/rhino/rhino_1.7r4.bb @@ -2,6 +2,8 @@ DESCRIPTION = "Lexical analyzer generator for Java" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=8e2372bdbf22c99279ae4599a13cc458" +DEPENDS_class-native += "classpath-native" + BBCLASSEXTEND = "native" inherit java-library -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-webserver][PATCHv3 2/2] nginx.inc: use 4 spaces for indentation
From: Martin Jansa* like any other sane recipes do Signed-off-by: Martin Jansa Signed-off-by: Gyorgy Szombathelyi --- meta-webserver/recipes-httpd/nginx/nginx.inc | 194 ++- 1 file changed, 98 insertions(+), 96 deletions(-) diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc index 7698c90..f3660af 100644 --- a/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -12,12 +12,12 @@ SECTION = "net" DEPENDS = "libpcre gzip openssl" SRC_URI = " \ - http://nginx.org/download/nginx-${PV}.tar.gz \ - file://nginx-cross.patch \ - file://nginx.conf \ - file://nginx.init \ - file://nginx-volatile.conf \ - file://nginx.service \ +http://nginx.org/download/nginx-${PV}.tar.gz \ +file://nginx-cross.patch \ +file://nginx.conf \ +file://nginx.init \ +file://nginx-volatile.conf \ +file://nginx.service \ " inherit update-rc.d useradd @@ -34,104 +34,106 @@ DISABLE_STATIC = "" PACKAGECONFIG[http2] = "--with-http_v2_module,," do_configure () { - if [ "${SITEINFO_BITS}" = "64" ]; then - PTRSIZE=8 - else - PTRSIZE=4 - fi - - echo $CFLAGS - echo $LDFLAGS - - # Add the LDFLAGS to the main nginx link to avoid issues with missing GNU_HASH - echo "MAIN_LINK=\"\${MAIN_LINK} ${LDFLAGS}\"" >> auto/cc/conf - - ./configure \ - --crossbuild=Linux:${TUNE_ARCH} \ - --with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ - --with-int=4 \ - --with-long=${PTRSIZE} \ - --with-long-long=8 \ - --with-ptr-size=${PTRSIZE} \ - --with-sig-atomic-t=${PTRSIZE} \ - --with-size-t=${PTRSIZE} \ - --with-off-t=${PTRSIZE} \ - --with-time-t=${PTRSIZE} \ - --with-sys-nerr=132 \ - --conf-path=${sysconfdir}/nginx/nginx.conf \ - --http-log-path=${localstatedir}/log/nginx/access.log \ - --error-log-path=${localstatedir}/log/nginx/error.log \ - --pid-path=/run/nginx/nginx.pid \ - --prefix=${prefix} \ - --with-http_ssl_module \ - --with-http_gzip_static_module \ - ${EXTRA_OECONF} +if [ "${SITEINFO_BITS}" = "64" ]; then +PTRSIZE=8 +else +PTRSIZE=4 +fi + +echo $CFLAGS +echo $LDFLAGS + +# Add the LDFLAGS to the main nginx link to avoid issues with missing GNU_HASH +echo "MAIN_LINK=\"\${MAIN_LINK} ${LDFLAGS}\"" >> auto/cc/conf + +./configure \ +--crossbuild=Linux:${TUNE_ARCH} \ +--with-endian=${@base_conditional('SITEINFO_ENDIANNESS', 'le', 'little', 'big', d)} \ +--with-int=4 \ +--with-long=${PTRSIZE} \ +--with-long-long=8 \ +--with-ptr-size=${PTRSIZE} \ +--with-sig-atomic-t=${PTRSIZE} \ +--with-size-t=${PTRSIZE} \ +--with-off-t=${PTRSIZE} \ +--with-time-t=${PTRSIZE} \ +--with-sys-nerr=132 \ +--conf-path=${sysconfdir}/nginx/nginx.conf \ +--http-log-path=${localstatedir}/log/nginx/access.log \ +--error-log-path=${localstatedir}/log/nginx/error.log \ +--pid-path=/run/nginx/nginx.pid \ +--prefix=${prefix} \ +--with-http_ssl_module \ +--with-http_gzip_static_module \ +${EXTRA_OECONF} } do_install () { - oe_runmake 'DESTDIR=${D}' install - rm -fr ${D}${localstatedir}/run ${D}/run - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d /run/${BPN} - - - -" \ -> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf -echo "d /${localstatedir}/log/${BPN} 0755 root root -" \ - >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf - fi - install -d ${D}${sysconfdir}/${BPN} - ln -snf ${localstatedir}/run/${BPN} ${D}${sysconfdir}/${BPN}/run - install -d ${D}${NGINX_WWWDIR} - mv ${D}/usr/html ${D}${NGINX_WWWDIR}/ - chown ${NGINX_USER}:www-data -R ${D}${NGINX_WWWDIR} - - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/nginx.init ${D}${sysconfdir}/init.d/nginx - sed -i 's,/usr/sbin/,${sbindir}/,g' ${D}${sysconfdir}/init.d/nginx - sed -i 's,/etc/,${sysconfdir}/,g' ${D}${sysconfdir}/init.d/nginx - - install -d ${D}${sysconfdir}/nginx - install -m 0644 ${WORKDIR}/nginx.conf ${D}${sysconfdir}/nginx/nginx.conf - sed -i 's,/var/,${localstatedir}/,g' ${D}${sysconfdir}/nginx/nginx.conf - sed -i 's/^user.*/user ${NGINX_USER};/g' ${D}${sysconfdir}/nginx/nginx.conf - install -d ${D}${sysconfdir}/nginx/sites-enabled - - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/nginx-volatile.conf ${D}${sysconfdir}/default/volatiles/99_nginx - sed -i 's,/var/,${localstatedir}/,g'
Re: [oe] [meta-java][PATCH] openjdk-8-cross.inc: Fix QA error caused by missing hash
> On Aug 19, 2016, at 6:24 AM, Erkka Kääriäwrote: > > Some openjdk makefiles (e.g. vm.make) only use CFLAGS as their linker > flags. This means that the oe-specific linker flags are lost. This in > particular causes issues with the recent oe-core commit a98a81808, which > intentionally poisons the linker hash style, so that any recipes that do > not use the oe LDFLAGS fail to build. > > Signed-off-by: Erkka Kääriä > --- > recipes-core/openjdk/openjdk-8-cross.inc | 10 ++ > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/recipes-core/openjdk/openjdk-8-cross.inc > b/recipes-core/openjdk/openjdk-8-cross.inc > index 11e94ce..6097afc 100644 > --- a/recipes-core/openjdk/openjdk-8-cross.inc > +++ b/recipes-core/openjdk/openjdk-8-cross.inc > @@ -39,21 +39,23 @@ SRC_URI_append = "\ > file://jvm.cfg \ > " > > +# Some makefiles pick the linker flags from the CFLAGS variable, so add > +# the LDFLAGS to CFLAGS > +CFLAGS_append = " \ > + ${LDFLAGS} \ > +” This could break non, gcc compilers, where they will warn about linker options being unused during compile step etc. and if we use -Werror this may fail to build too. The change belongs to openjdk build system, if its not that invasive and complex, I would suggest to patch openjdk and upstream the change, since that will be upstream worthy > + > EXTRA_OECONF_append = "\ > --with-jobs=${@get_jdk8_native_jobs(d)} \ > -\ > --with-sys-root=${STAGING_DIR} \ > --with-tools-dir=${STAGING_DIR_NATIVE} \ > --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native \ > > --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/jre/lib/security/cacerts > \ > -\ > --disable-precompiled-headers \ > --disable-zip-debug-info \ > -\ > --with-extra-cflags='${CFLAGS}' \ > --with-extra-cxxflags='${CXXFLAGS}' \ > --with-extra-ldflags='${LDFLAGS}' \ > -\ > ${@jdk_configure_options(d)} \ > " > > -- > 2.7.4 > > - > Intel Finland Oy > Registered Address: PL 281, 00181 Helsinki > Business Identity Code: 0357606 - 4 > Domiciled in Helsinki > > This e-mail and any attachments may contain confidential material for > the sole use of the intended recipient(s). Any review or distribution > by others is strictly prohibited. If you are not the intended > recipient, please contact the sender and delete all copies. > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel signature.asc Description: Message signed with OpenPGP using GPGMail -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 1/3] ifenslave: fix QA warning for GNU_HASH
> On Aug 19, 2016, at 3:09 AM, André Draszikwrote: > > On Fr, 2016-08-19 at 18:04 +0800, Yi Zhao wrote: >> Set LDFLAGS explicitly for do_compile >> >> Signed-off-by: Yi Zhao >> --- >> meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb >> b/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb >> index acc0864..385bc80 100644 >> --- a/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb >> +++ b/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb >> @@ -10,7 +10,7 @@ SRC_URI[md5sum] = "56126cd1013cefe0ce6f81613e677bdd" >> SRC_URI[sha256sum] = >> "7917bf34de80a2492eb225adf9168c83a4854ac8a008ed0fd5b3fd147ccd3041" >> >> do_compile() { >> -${CC} ifenslave.c -o ifenslave >> +${CC} ${LDFLAGS} ifenslave.c -o ifenslave > > While you're fixing the gcc invocation here, wouldn't it make sense to add > CFLAGS as well? (Maybe in a separate patch). > yeah or into two distinct steps of compile and link. > > Cheers, > Andre' > > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel signature.asc Description: Message signed with OpenPGP using GPGMail -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH] openjdk-8-cross.inc: Fix QA error caused by missing hash
On Fri, Aug 19, 2016 at 10:24 AM, Erkka Kääriäwrote: > Some openjdk makefiles (e.g. vm.make) only use CFLAGS as their linker > flags. This means that the oe-specific linker flags are lost. This in > particular causes issues with the recent oe-core commit a98a81808, which > intentionally poisons the linker hash style, so that any recipes that do > not use the oe LDFLAGS fail to build. > > Signed-off-by: Erkka Kääriä > --- > recipes-core/openjdk/openjdk-8-cross.inc | 10 ++ > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/recipes-core/openjdk/openjdk-8-cross.inc > b/recipes-core/openjdk/openjdk-8-cross.inc > index 11e94ce..6097afc 100644 > --- a/recipes-core/openjdk/openjdk-8-cross.inc > +++ b/recipes-core/openjdk/openjdk-8-cross.inc > @@ -39,21 +39,23 @@ SRC_URI_append = "\ > file://jvm.cfg \ > " > > +# Some makefiles pick the linker flags from the CFLAGS variable, so add > +# the LDFLAGS to CFLAGS > +CFLAGS_append = " \ > + ${LDFLAGS} \ > +" > + Fine. > EXTRA_OECONF_append = "\ > --with-jobs=${@get_jdk8_native_jobs(d)} \ > -\ > --with-sys-root=${STAGING_DIR} \ > --with-tools-dir=${STAGING_DIR_NATIVE} \ > --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native \ > > --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/jre/lib/security/cacerts > \ > -\ > --disable-precompiled-headers \ > --disable-zip-debug-info \ > -\ > --with-extra-cflags='${CFLAGS}' \ > --with-extra-cxxflags='${CXXFLAGS}' \ > --with-extra-ldflags='${LDFLAGS}' \ > -\ > ${@jdk_configure_options(d)} \ > " Not related, please drop this change. > -- > 2.7.4 > > - > Intel Finland Oy > Registered Address: PL 281, 00181 Helsinki > Business Identity Code: 0357606 - 4 > Domiciled in Helsinki > > This e-mail and any attachments may contain confidential material for > the sole use of the intended recipient(s). Any review or distribution > by others is strictly prohibited. If you are not the intended > recipient, please contact the sender and delete all copies. > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH] openjdk-8-cross.inc: Fix QA error caused by missing hash
Some openjdk makefiles (e.g. vm.make) only use CFLAGS as their linker flags. This means that the oe-specific linker flags are lost. This in particular causes issues with the recent oe-core commit a98a81808, which intentionally poisons the linker hash style, so that any recipes that do not use the oe LDFLAGS fail to build. Signed-off-by: Erkka Kääriä--- recipes-core/openjdk/openjdk-8-cross.inc | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 11e94ce..6097afc 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc @@ -39,21 +39,23 @@ SRC_URI_append = "\ file://jvm.cfg \ " +# Some makefiles pick the linker flags from the CFLAGS variable, so add +# the LDFLAGS to CFLAGS +CFLAGS_append = " \ + ${LDFLAGS} \ +" + EXTRA_OECONF_append = "\ --with-jobs=${@get_jdk8_native_jobs(d)} \ -\ --with-sys-root=${STAGING_DIR} \ --with-tools-dir=${STAGING_DIR_NATIVE} \ --with-boot-jdk=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native \ --with-cacerts-file=${STAGING_LIBDIR_NATIVE}/jvm/openjdk-8-native/jre/lib/security/cacerts \ -\ --disable-precompiled-headers \ --disable-zip-debug-info \ -\ --with-extra-cflags='${CFLAGS}' \ --with-extra-cxxflags='${CXXFLAGS}' \ --with-extra-ldflags='${LDFLAGS}' \ -\ ${@jdk_configure_options(d)} \ " -- 2.7.4 - Intel Finland Oy Registered Address: PL 281, 00181 Helsinki Business Identity Code: 0357606 - 4 Domiciled in Helsinki This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] nodejs, arm: map TUNE_FEATURES to --with-arm-fpu parameters
The same code is used in the nodejs recipe from meta-nodejs Signed-off-by: Pascal Bach--- meta-oe/recipes-devtools/nodejs/nodejs_4.4.7.bb | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_4.4.7.bb b/meta-oe/recipes-devtools/nodejs/nodejs_4.4.7.bb index 95a2048..88b0e87 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_4.4.7.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_4.4.7.bb @@ -30,7 +30,11 @@ def map_nodejs_arch(a, d): elif re.match('powerpc$', a): return 'ppc' return a -ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)}" +ARCHFLAGS_arm = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', '--with-arm-float-abi=hard', '--with-arm-float-abi=softfp', d)} \ + ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-arm-fpu=neon', \ +bb.utils.contains('TUNE_FEATURES', 'vfpv3d16', '--with-arm-fpu=vfpv3-d16', \ +bb.utils.contains('TUNE_FEATURES', 'vfpv3', '--with-arm-fpu=vfpv3', \ +'--with-arm-fpu=vfp', d), d), d)}" GYP_DEFINES_append_mipsel = " mips_arch_variant='r1' " ARCHFLAGS ?= "" -- 2.1.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] nodejs: use shared zlib instead of bundled one
Signed-off-by: Pascal Bach--- meta-oe/recipes-devtools/nodejs/nodejs_4.4.7.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_4.4.7.bb b/meta-oe/recipes-devtools/nodejs/nodejs_4.4.7.bb index 671d604..95a2048 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_4.4.7.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_4.4.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://nodejs.org; LICENSE = "MIT & BSD & Artistic-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=8e3c01094f0fcb889b13f0354e52f914" -DEPENDS = "openssl" +DEPENDS = "openssl zlib" COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" @@ -39,7 +39,7 @@ do_configure () { export LD="${CXX}" GYP_DEFINES="${GYP_DEFINES}" export GYP_DEFINES # $TARGET_ARCH settings don't match --dest-cpu settings - ./configure --prefix=${prefix} --without-snapshot --shared-openssl \ + ./configure --prefix=${prefix} --without-snapshot --shared-openssl --shared-zlib \ --dest-cpu="${@map_nodejs_arch(d.getVar('TARGET_ARCH', True), d)}" \ --dest-os=linux \ ${ARCHFLAGS} -- 2.1.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] poco: update to 1.7.4
Signed-off-by: Pascal Bach--- meta-oe/recipes-support/poco/{poco_1.7.3.bb => poco_1.7.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-oe/recipes-support/poco/{poco_1.7.3.bb => poco_1.7.4.bb} (98%) diff --git a/meta-oe/recipes-support/poco/poco_1.7.3.bb b/meta-oe/recipes-support/poco/poco_1.7.4.bb similarity index 98% rename from meta-oe/recipes-support/poco/poco_1.7.3.bb rename to meta-oe/recipes-support/poco/poco_1.7.4.bb index 32f56d4..e7a279f 100644 --- a/meta-oe/recipes-support/poco/poco_1.7.3.bb +++ b/meta-oe/recipes-support/poco/poco_1.7.4.bb @@ -12,7 +12,7 @@ inherit cmake ptest BBCLASSEXTEND = "native" -SRCREV = "abc4742ebe6718530a2503fcc3f2554a6296ef5a" +SRCREV = "da66f2863aa02c11967862f2d9f0251574a5e9c2" SRC_URI = " \ git://github.com/pocoproject/poco.git \ file://run-ptest \ -- 2.1.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH v2] testfloat: Fix No GNU_HASH in the elf binary warnings
These warnings are observed when testfloat is cross-compiled with certain external toolchains. Signed-off-by: Fahad Usman--- .../testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch b/meta-oe/recipes-extended/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch index cc124b3..71ca343 100644 --- a/meta-oe/recipes-extended/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch +++ b/meta-oe/recipes-extended/testfloat/files/0002-Makefile-for-cross-compile-TestFloat.patch @@ -79,7 +79,7 @@ index 000..a89326a + ${CC} -c -Werror-implicit-function-declaration $(TESTFLOAT_OPTS) \ +$(C_INCLUDES) -O3 -o $@ +MAKELIB = ${AR} crs $@ -+LINK = ${CC} -o $@ ++LINK = ${CC} -o $@ ${LDFLAGS} +OTHER_LIBS = -lm + +OBJ = .o -- 2.8.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] [RFT] gcc 6.2 RC1 update
On Tue, 2016-08-16 at 11:55 -0700, Khem Raj wrote: > Hi All > > I have put together recipe upgrade for upcoming gcc 6.2 release now > that it entered RC phase. With gcc 6.2 the recipes are using tarballs > instead of git fetcher as promised :) > Please help testing it out in your setups and report any issues you > see. > > The commit you need to cherry-pick for OE-core is this one > > https://github.com/kraj/openembedded-core/commit/0319b603761a16e65d70 > 4336112c3709a8bf771c > > Thank you for your help I put this through the autobuilder and it passed so I've merged it. I did this quickly as we're putting a "pre M3" build through a QA cycle and I wanted to get some of the more invasive changes into that build so we don't have a stampeding herd of patches breaking everything coming up to the final feature freeze for 2.2. In other news, we are now also testing musl world builds on the autobuilder as part of regular testing. Cheers, Richard -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH 1/3] ifenslave: fix QA warning for GNU_HASH
On Fr, 2016-08-19 at 18:04 +0800, Yi Zhao wrote: > Set LDFLAGS explicitly for do_compile > > Signed-off-by: Yi Zhao> --- > meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb > b/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb > index acc0864..385bc80 100644 > --- a/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb > +++ b/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb > @@ -10,7 +10,7 @@ SRC_URI[md5sum] = "56126cd1013cefe0ce6f81613e677bdd" > SRC_URI[sha256sum] = > "7917bf34de80a2492eb225adf9168c83a4854ac8a008ed0fd5b3fd147ccd3041" > > do_compile() { > -${CC} ifenslave.c -o ifenslave > +${CC} ${LDFLAGS} ifenslave.c -o ifenslave While you're fixing the gcc invocation here, wouldn't it make sense to add CFLAGS as well? (Maybe in a separate patch). Cheers, Andre' -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 3/3] iscsitarget: fix QA warning for GNU_HASH
Split kernel module and user space build. Ensure the LDFLAGS is passed when build user space code. Signed-off-by: Yi Zhao--- .../recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb index 4c5eed6..c60277d 100644 --- a/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb +++ b/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb @@ -26,7 +26,8 @@ do_configure[noexec] = "1" do_make_scripts[depends] += "virtual/kernel:do_shared_workdir" do_compile() { -oe_runmake KSRC=${STAGING_KERNEL_DIR} LDFLAGS='' V=1 +oe_runmake KSRC=${STAGING_KERNEL_DIR} LDFLAGS='' V=1 kernel +oe_runmake KSRC=${STAGING_KERNEL_DIR} usr } do_install() { -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 1/3] ifenslave: fix QA warning for GNU_HASH
Set LDFLAGS explicitly for do_compile Signed-off-by: Yi Zhao--- meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb b/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb index acc0864..385bc80 100644 --- a/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb +++ b/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb @@ -10,7 +10,7 @@ SRC_URI[md5sum] = "56126cd1013cefe0ce6f81613e677bdd" SRC_URI[sha256sum] = "7917bf34de80a2492eb225adf9168c83a4854ac8a008ed0fd5b3fd147ccd3041" do_compile() { -${CC} ifenslave.c -o ifenslave +${CC} ${LDFLAGS} ifenslave.c -o ifenslave } do_install() { install -d "${D}${sbindir}" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 0/3] NO_GNU_HASH warning fixes
The following changes since commit 02a390b79bdc089eb583e443ee04f60bffd409eb: tnftp: tnftp20130505 -> tnftp20151004 (2016-08-16 21:26:15 -0400) are available in the git repository at: git://git.openembedded.org/meta-openembedded-contrib yzhao/networking-hashfix http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=yzhao/networking-hashfix Yi Zhao (3): ifenslave: fix QA warning for GNU_HASH ipvsadm: fix QA warning for GNU_HASH iscsitarget: fix QA warning for GNU_HASH .../iscsitarget/iscsitarget_1.4.20.3+svn502.bb| 3 ++- .../recipes-support/ifenslave/ifenslave_1.1.0.bb | 2 +- .../ipvsadm/ipvsadm/makefile-add-ldflags.patch| 19 +++ .../recipes-support/ipvsadm/ipvsadm_1.26.bb | 1 + 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 2/3] ipvsadm: fix QA warning for GNU_HASH
Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this variable. Signed-off-by: Yi Zhao--- .../ipvsadm/ipvsadm/makefile-add-ldflags.patch| 19 +++ .../recipes-support/ipvsadm/ipvsadm_1.26.bb | 1 + 2 files changed, 20 insertions(+) create mode 100644 meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch b/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch new file mode 100644 index 000..1bf1eed --- /dev/null +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch @@ -0,0 +1,19 @@ +Add LDFLAGS variable to Makefile, make sure the extra linker flags can be passed. + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao + +diff --git a/Makefile b/Makefile +index 461c021..8bc9cde 100644 +--- a/Makefile b/Makefile +@@ -86,7 +86,7 @@ libs: + make -C libipvs + + ipvsadm: $(OBJS) libs +- $(CC) $(CFLAGS) -o $@ $(OBJS) $(STATIC_LIBS) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(STATIC_LIBS) $(LIBS) + + install:all + if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi diff --git a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb index 7302e9d..8d1b3f0 100644 --- a/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb +++ b/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb @@ -19,6 +19,7 @@ SRC_URI = "http://www.linuxvirtualserver.org/software/kernel-2.6/${BP}.tar.gz \ file://0001-Modify-the-Makefile-for-cross-compile.patch \ file://0002-Replace-nl_handle-to-nl_sock.patch \ file://0003-ipvsadm-remove-dependency-on-bash.patch \ +file://makefile-add-ldflags.patch \ " SRC_URI[md5sum] = "eac3ba3f62cd4dea2da353aeddd353a8" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libqb: 0.17.1 -> 0.17.2
Upgrade libqb from 0.17.1 to 0.17.2. Signed-off-by: Wang Xin--- meta-oe/recipes-extended/libqb/{libqb_0.17.1.bb => libqb_0.17.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-oe/recipes-extended/libqb/{libqb_0.17.1.bb => libqb_0.17.2.bb} (80%) diff --git a/meta-oe/recipes-extended/libqb/libqb_0.17.1.bb b/meta-oe/recipes-extended/libqb/libqb_0.17.2.bb similarity index 80% rename from meta-oe/recipes-extended/libqb/libqb_0.17.1.bb rename to meta-oe/recipes-extended/libqb/libqb_0.17.2.bb index 77307fe..40d06f3 100644 --- a/meta-oe/recipes-extended/libqb/libqb_0.17.1.bb +++ b/meta-oe/recipes-extended/libqb/libqb_0.17.2.bb @@ -11,8 +11,8 @@ inherit autotools pkgconfig SRC_URI = "https://fedorahosted.org/releases/q/u/quarterback/${BP}.tar.xz \ " -SRC_URI[md5sum] = "5770b343baa4528f6fec90120ec55048" -SRC_URI[sha256sum] = "7a2115f83bfe20eaa5f2e4ed235e8f2994235d3b87e3e5ca41ba47b320f12e29" +SRC_URI[md5sum] = "de1e5d38fa449b4d127940c10d117260" +SRC_URI[sha256sum] = "9a419c649ed51f275dc780da8a15babb8a5d33633567bd9e0cb6193b6e21f4fe" LICENSE = "LGPL-2.1" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-filesystems][PATCH] yaffs2-utils: fix QA warning for GNU_HASH
Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this variable. Signed-off-by: Yi Zhao--- .../yaffs2/yaffs2-utils/makefile-add-ldflags.patch | 21 + .../recipes-filesystems/yaffs2/yaffs2-utils_git.bb | 5 - 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch new file mode 100644 index 000..bb21899 --- /dev/null +++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch @@ -0,0 +1,21 @@ +Upstream-Status: Pending + +Signed-off-by: Yi Zhao + +diff --git a/utils/Makefile b/utils/Makefile +index 710ebbf..6259893 100644 +--- a/utils/Makefile b/utils/Makefile +@@ -57,10 +57,10 @@ $(COMMONOBJS) $(MKYAFFSIMAGEOBJS) $(MKYAFFS2IMAGEOBJS) : %.o: %.c + $(CC) -c $(CFLAGS) $< -o $@ + + mkyaffsimage: $(MKYAFFSIMAGEOBJS) $(COMMONOBJS) +- $(CC) -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ + + mkyaffs2image: $(MKYAFFS2IMAGEOBJS) $(COMMONOBJS) +- $(CC) -o $@ $^ ++ $(CC) $(LDFLAGS) -o $@ $^ + + + clean: diff --git a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb index 253ea62..e8d1873 100644 --- a/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb +++ b/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb @@ -12,7 +12,10 @@ PV = "0.0+git${SRCPV}" DEPENDS = "mtd-utils" # Source is the HEAD of master branch at the time of writing this recipe -SRC_URI = "git://www.aleph1.co.uk/yaffs2;protocol=git;branch=master" +SRC_URI = "git://www.aleph1.co.uk/yaffs2;protocol=git;branch=master \ + file://makefile-add-ldflags.patch \ + " + SRCREV = "bc76682d93955cfb33051beb503ad9f8a5450578" S = "${WORKDIR}/git" -- 2.7.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel