On Mon, Jun 15, 2015 at 04:10:55PM +0800, [email protected] wrote: > From: Roy Li <[email protected]> > > remove the squid-change-ksh-referen*.patch which is not needed, > since 3.5.5 did not use ksh by default. > update the checksum of COPYING,since the date in it has been changed.
fails to build in world: | g++ -O2 -pipe -g -feliminate-unused-debug-types -fvisibility-inlines-hidden -std=c++11 -o cf_gen /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/squid/3.5.5-r0/squid-3.5.5/src/cf_gen.cc -I/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/squid/3.5.5-r0/squid-3.5.5/src -I../include/ -I../src | cc1plus: error: unrecognized command line option '-std=c++11' | make[1]: *** [cf_gen] Error 1 | make[1]: *** Waiting for unfinished jobs.... | make[1]: Leaving directory `/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/squid/3.5.5-r0/build/src' | make: *** [all-recursive] Error 1 | ERROR: oe_runmake failed | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_compile (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/squid/3.5.5-r0/temp/log.do_compile.18374) NOTE: recipe squid-3.5.5-r0: task do_compile: Failed ERROR: Task 27024 (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-networking/recipes-daemons/squid/squid_3.5.5.bb, do_compile) failed with exit code '1' > > Signed-off-by: Roy Li <[email protected]> > --- > ...ge-ksh-reference-in-krb-ldap-helper-to-sh.patch | 39 > ---------------------- > .../squid/{squid_3.4.7.bb => squid_3.5.5.bb} | 8 ++--- > 2 files changed, 4 insertions(+), 43 deletions(-) > delete mode 100644 > meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch > rename meta-networking/recipes-daemons/squid/{squid_3.4.7.bb => > squid_3.5.5.bb} (88%) > > diff --git > a/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch > > b/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch > deleted file mode 100644 > index 8e03860..0000000 > --- > a/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch > +++ /dev/null > @@ -1,39 +0,0 @@ > -squid: change ksh reference in krb ldap helper to sh > - > -Very simple cert_tool script with no ksh specifics. > -Change it to use sh so a package dependency doesn't > -get created to ksh. > - > -Upstream-Status: Pending > - > -Signed-off-by: Jim Somerville <[email protected]> > -Signed-off-by: Chong Lu <[email protected]> > ---- > - helpers/external_acl/kerberos_ldap_group/cert_tool | 6 +++--- > - 1 file changed, 3 insertions(+), 3 deletions(-) > - > -diff --git a/helpers/external_acl/kerberos_ldap_group/cert_tool > b/helpers/external_acl/kerberos_ldap_group/cert_tool > -index 9f14959..8c4ea11 100644 > ---- a/helpers/external_acl/kerberos_ldap_group/cert_tool > -+++ b/helpers/external_acl/kerberos_ldap_group/cert_tool > -@@ -1,4 +1,4 @@ > --#!/bin/ksh > -+#!/bin/sh > - # > - # > ----------------------------------------------------------------------------- > - # > -@@ -64,9 +64,9 @@ QUIT > - # Create database for Sun ldap and pem file for Openldap > - # > - rm ${server}_[0-9]*.pem 2>/dev/null > --let i=0 > -+i=0 > - ls ${server}_[0-9]*.cert | while read file; do > -- let i=i+1 > -+ i=`expr $i + 1` > - cat $file >> ${server}_$i.pem > - CA=`openssl x509 -noout -text -in ${server}_$i.pem | grep -i "CA:.*true"` > - if [ -n "$CA" ]; then > --- > -1.9.1 > - > diff --git a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb > b/meta-networking/recipes-daemons/squid/squid_3.5.5.bb > similarity index 88% > rename from meta-networking/recipes-daemons/squid/squid_3.4.7.bb > rename to meta-networking/recipes-daemons/squid/squid_3.5.5.bb > index 7b00dfc..1f445e5 100644 > --- a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb > +++ b/meta-networking/recipes-daemons/squid/squid_3.5.5.bb > @@ -16,17 +16,16 @@ SRC_URI = > "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P > file://Set-up-for-cross-compilation.patch \ > file://Skip-AC_RUN_IFELSE-tests.patch \ > file://Fix-flawed-dynamic-ldb-link-test-in-configure.patch \ > - file://squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch \ > file://squid-use-serial-tests-config-needed-by-ptest.patch \ > file://run-ptest \ > file://volatiles.03_squid \ > " > > LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \ > - file://COPYRIGHT;md5=2900f50789c498be8e9f1eb23b55cbe9 \ > + > file://errors/COPYRIGHT;md5=0fed8f1462f6fdbc62bb431bcb618f46 \ > " > -SRC_URI[md5sum] = "9951034b10f7ee0f45a95cfae61c57c2" > -SRC_URI[sha256sum] = > "7b423f3d3495a317503ca559ea535f80445fd7c4e3c3e268cb7a8c97c61af2b6" > +SRC_URI[md5sum] = "6aac5c2e9cbbeabcbf2e9e49a178a931" > +SRC_URI[sha256sum] = > "741c24a307c50f0d845d53cabb66b36d91ce9a73c8a165eae5def5e4d11e6a0d" > > DEPENDS = "libtool krb5 openldap db cyrus-sasl" > > @@ -38,6 +37,7 @@ USERADD_PARAM_${PN} = "--system --no-create-home --home-dir > /var/run/squid --she > PACKAGECONFIG ??= "" > PACKAGECONFIG[libnetfilter-conntrack] = > "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, > libnetfilter-conntrack" > EXTRA_OECONF += "--with-default-user=squid" > +CACHED_CONFIGUREVARS += "squid_cv_gnu_atomics=no" > > TESTDIR = "test-suite" > do_compile_ptest() { > -- > 1.9.1 > > -- > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: [email protected] -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
