diff options
-rw-r--r-- | meta-networking/recipes-support/dnsmasq/dnsmasq.inc | 4 | ||||
-rw-r--r-- | meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch | 19 | ||||
-rw-r--r-- | meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb | 8 | ||||
-rw-r--r-- | meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb | 8 | ||||
-rw-r--r-- | meta-networking/recipes-support/wireshark/wireshark_2.2.12.bb (renamed from meta-networking/recipes-support/wireshark/wireshark_2.2.9.bb) | 6 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/sip/sip_4.19.2.bb (renamed from meta-oe/recipes-devtools/sip/sip_4.19.bb) | 4 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_3.2.bb | 2 |
7 files changed, 26 insertions, 25 deletions
diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index ef79c5f822..4f4bbf144a 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq.inc @@ -6,8 +6,8 @@ LICENSE = "GPLv2 | GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://COPYING-v3;md5=d32239bcb673463ab874e80d47fae504" -#at least versions 2.15 and prior are moved to the archive folder on the server -SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 15]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \ +#at least versions 2.69 and prior are moved to the archive folder on the server +SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 69]}dnsmasq-${PV}.tar.gz;name=dnsmasq-${PV} \ file://init \ file://dnsmasq.conf \ file://dnsmasq-resolvconf.service \ diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch index 918c0b6d56..0991dd8b95 100644 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq/lua.patch @@ -1,29 +1,30 @@ -From 1e5be0a0bcf85913d63408030dec038d360a5fa6 Mon Sep 17 00:00:00 2001 +From be1b3d2d0f1608cba5efee73d6aac5ad0709041b Mon Sep 17 00:00:00 2001 From: Joe MacDonald <joe_macdonald@mentor.com> Date: Tue, 9 Sep 2014 10:24:58 -0400 Subject: [PATCH] Upstream-status: Inappropriate [OE specific] Signed-off-by: Christopher Larson <chris_larson@mentor.com> +Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> --- - Makefile | 4 ++-- + Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index fc38393..a79f8bf 100644 +index 73ea23e..ed3eeb9 100644 --- a/Makefile +++ b/Makefile -@@ -57,8 +57,8 @@ idn_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) - - idn_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_IDN $(PKG_CONFIG) --libs libidn` +@@ -59,8 +59,8 @@ idn2_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFI + idn2_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LIBIDN2 $(PKG_CONFIG) --libs libidn2` ct_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --cflags libnetfilter_conntrack` ct_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_CONNTRACK $(PKG_CONFIG) --libs libnetfilter_conntrack` --lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.1` --lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.1` +-lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua5.2` +-lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua5.2` +lua_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --cflags lua` +lua_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_LUASCRIPT $(PKG_CONFIG) --libs lua` nettle_cflags = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --cflags nettle hogweed` nettle_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --libs nettle hogweed` - gmp_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC $(PKG_CONFIG) --copy -lgmp` + gmp_libs = `echo $(COPTS) | $(top)/bld/pkg-wrapper HAVE_DNSSEC NO_GMP --copy -lgmp` -- -1.7.9.5 +2.9.5 diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb deleted file mode 100644 index 41573d9dd6..0000000000 --- a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb +++ /dev/null @@ -1,8 +0,0 @@ -require dnsmasq.inc - -SRC_URI += "\ - file://lua.patch \ -" - -SRC_URI[dnsmasq-2.76.md5sum] = "6610f8233ca89b15a1bb47c788ffb84f" -SRC_URI[dnsmasq-2.76.sha256sum] = "777c4762d2fee3738a0380401f2d087b47faa41db2317c60660d69ad10a76c32" diff --git a/meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb new file mode 100644 index 0000000000..4d1dc6e69e --- /dev/null +++ b/meta-networking/recipes-support/dnsmasq/dnsmasq_2.78.bb @@ -0,0 +1,8 @@ +require dnsmasq.inc + +SRC_URI += "\ + file://lua.patch \ +" + +SRC_URI[dnsmasq-2.78.md5sum] = "3bb97f264c73853f802bf70610150788" +SRC_URI[dnsmasq-2.78.sha256sum] = "c92e5d78aa6353354d02aabf74590d08980bb1385d8a00b80ef9bc80430aa1dc" diff --git a/meta-networking/recipes-support/wireshark/wireshark_2.2.9.bb b/meta-networking/recipes-support/wireshark/wireshark_2.2.12.bb index 82c25ffa6e..6c0b644c62 100644 --- a/meta-networking/recipes-support/wireshark/wireshark_2.2.9.bb +++ b/meta-networking/recipes-support/wireshark/wireshark_2.2.12.bb @@ -10,8 +10,8 @@ SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2" PE = "1" -SRC_URI[md5sum] = "7d5e65efd0714bd6248aa5b36c28320d" -SRC_URI[sha256sum] = "c8b32c0e7d44a277e737c53d9d142ad3fe4265338f25a7fd8c891f58a7633fc2" +SRC_URI[md5sum] = "ebf3d4230d7a13408758cdf037c42d66" +SRC_URI[sha256sum] = "3274458d1bb1658a5001465ecb07c7cbfc709571ef36bd062897570d4bab3ebc" inherit autotools pkgconfig perlnative @@ -39,7 +39,7 @@ PACKAGECONFIG[geoip] = "--with-geoip=yes, --with-geoip=no, geoip" PACKAGECONFIG[plugins] = "--with-plugins=yes, --with-plugins=no" PACKAGECONFIG[sbc] = "--with-sbc=yes, --with-sbc=no, sbc" -PACKAGECONFIG[libssh] = "--with-ssh=yes, --with-ssh=no, libssh2" +PACKAGECONFIG[libssh] = "--with-libssh=${STAGING_LIBDIR}, --with-libssh=no, libssh2" # these next two options require addional layers diff --git a/meta-oe/recipes-devtools/sip/sip_4.19.bb b/meta-oe/recipes-devtools/sip/sip_4.19.2.bb index 82feebbed8..1d837c59f8 100644 --- a/meta-oe/recipes-devtools/sip/sip_4.19.bb +++ b/meta-oe/recipes-devtools/sip/sip_4.19.2.bb @@ -9,8 +9,8 @@ inherit python-dir DEPENDS = "python" SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz" -SRC_URI[md5sum] = "be51a05065c9323b98a2ec2966c64e6a" -SRC_URI[sha256sum] = "014bf55f653e0d8bcc582705ef4fbd61e0859a36e959ab46d8fa060cdf0b5e27" +SRC_URI[md5sum] = "4f48e212890ebe584e8d804cfbcfc61e" +SRC_URI[sha256sum] = "432b4aad25254e6997913e33b1ca3cf5fd21d5729a50a3ce2edccbea82c80533" BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-support/opencv/opencv_3.2.bb b/meta-oe/recipes-support/opencv/opencv_3.2.bb index 535c761fa5..fc62e99755 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.2.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.2.bb @@ -126,7 +126,7 @@ python populate_packages_prepend () { metapkg = pn d.setVar('ALLOW_EMPTY_' + metapkg, "1") - blacklist = [ metapkg ] + blacklist = [ metapkg, "libopencv-ts" ] metapkg_rdepends = [ ] for pkg in packages[1:]: if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale') and not pkg.endswith('-staticdev'): |