diff --git a/import-layers/meta-openembedded/contrib/oe-stylize.py b/import-layers/meta-openembedded/contrib/oe-stylize.py index db8a3632d93e430f3f3b7f790fde0e760283ace9..ba4b87a74cb4238ca96252067e36efcae0e47add 100755 --- a/import-layers/meta-openembedded/contrib/oe-stylize.py +++ b/import-layers/meta-openembedded/contrib/oe-stylize.py @@ -102,6 +102,7 @@ OE_vars = [ 'AR', 'ARCH', 'ARM_INSTRUCTION_SET', + 'MIPS_INSTRUCTION_SET', 'ARM_MUTEX', 'ART_CONFIG', 'B', diff --git a/import-layers/meta-openembedded/contrib/tesseract-langs.sh b/import-layers/meta-openembedded/contrib/tesseract-langs.sh deleted file mode 100755 index 50873c139bbc93b22ff4813a65801184291bf20f..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/contrib/tesseract-langs.sh +++ /dev/null @@ -1,92 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2014, O.S. Systems Software Ltda. All Rights Reserved -# Released under the MIT license (see meta-openembedded layer's COPYING.MIT) - -PV='3.02' - -# Sometimes the software package has a minor version, but language -# packages have not. Example: -# software package: tesseract-ocr-3.02.02.tar.gz -# language package: tesseract-ocr-3.02.por.tar.gz -MINOR_PV=02 - -recipes_dir=$1 - -usage() { - echo "Usage: `basename $0` [ ]" -} - -if [ -z "$recipes_dir" ]; then - usage - exit 1 -fi -mkdir -p "$recipes_dir" - -file_list_uri='https://code.google.com/p/tesseract-ocr/downloads/list' -file_list=`mktemp` - -remove_dl_dir= -if [ -z "$2" ]; then - remove_dl_dir=1 - dl_dir=`mktemp -d` -else - dl_dir="$2" -fi - -mkdir -p $dl_dir - -tesseract_langs() { - wget -q -O "$file_list" "$file_list_uri" - - grep -E 'a href="detail\?name=tesseract-ocr-'${PV}'\.[^\.]+.tar.gz&can=2&q=">' "$file_list" | \ - sed -r -e 's/.*tesseract-ocr-'${PV}'\.*([^\.]+)\.tar\.gz.*/\1/' | \ - grep -Ev '('${MINOR_PV}'|'${MINOR_PV}'-doc-html)' | \ - sort -u -} - -download_lang_files() { - local langs="$1" - local uri - for lang in $langs; do - if [ ! -e "$dl_dir/tesseract-ocr-${PV}.${lang}.tar.gz" ]; then - uri="https://tesseract-ocr.googlecode.com/files/tesseract-ocr-${PV}.${lang}.tar.gz" - echo "Downloading $uri" - wget -q -P "$dl_dir" "$uri" - fi - done -} - -create_recipe() { - local lang=$1 - local tarball - - tarball="$dl_dir/tesseract-ocr-${PV}.${lang}.tar.gz" - - md5sum=`md5sum $tarball | awk '{print $1}'` - sha256sum=`sha256sum $tarball | awk '{print $1}'` - - cat > $recipes_dir/tesseract-lang-`echo ${lang} | sed s/_/-/g`_${PV}.bb < diff --git a/import-layers/meta-openembedded/meta-efl/recipes-devtools/python/python-edbus.inc b/import-layers/meta-openembedded/meta-efl/recipes-devtools/python/python-edbus.inc index 3e72261e224d04bddc643935aef26324a0a999d6..cc60083874a8ef91455e97bc7ed2f76ceb550eb6 100644 --- a/import-layers/meta-openembedded/meta-efl/recipes-devtools/python/python-edbus.inc +++ b/import-layers/meta-openembedded/meta-efl/recipes-devtools/python/python-edbus.inc @@ -8,10 +8,6 @@ AUTHOR = "Gustavo Sverzut Barbieri " DEPENDS = "python-cython-native python-pyrex-native python-numeric eina edbus python-dbus" RDEPENDS_${PN} += "python-lang python-dbus" -# necessary to let the call for python-config succeed -export BUILD_SYS -export HOST_SYS - inherit e-base autotools pkgconfig distutils-base SRCNAME = "python-e_dbus" diff --git a/import-layers/meta-openembedded/meta-efl/recipes-devtools/python/python-efl.inc b/import-layers/meta-openembedded/meta-efl/recipes-devtools/python/python-efl.inc index 92a26eddbad9fa354eb238c48a7b0e8c524b0eb3..6837dab9fec0db860e3ffd5894a35bb0a169c3e4 100644 --- a/import-layers/meta-openembedded/meta-efl/recipes-devtools/python/python-efl.inc +++ b/import-layers/meta-openembedded/meta-efl/recipes-devtools/python/python-efl.inc @@ -13,10 +13,6 @@ RDEPENDS_${PN} += "python-lang" PROVIDES = "python-ecore python-eldbus python-edje python-elementary python-emotion python-evas" -# necessary to let the call for python-config succeed -export BUILD_SYS -export HOST_SYS - inherit e-base distutils pkgconfig SRCVER = "${PV}" diff --git a/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/e-module.inc b/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/e-module.inc index 092357572547ef06765c225982cf0693063da5b3..770f794aafff5fe8a36831756ecdc03492364e7d 100644 --- a/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/e-module.inc +++ b/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/e-module.inc @@ -5,7 +5,7 @@ DEPENDS = "e-wm" SRCREV = "${EFL_SRCREV}" INC_PR = "r0" -SRCNAME = "E-MODULES-EXTRA/${PN}" +SRCNAME = "E-MODULES-EXTRA/${BPN}" inherit e gettext SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep" diff --git a/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb b/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb index ae1b8a6c698ac01f0ef1d2fae651856db19c433f..704e43dd6f714e85e684020ce069c796de87177c 100644 --- a/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb +++ b/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb @@ -18,7 +18,7 @@ SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};protocol=http" S = "${WORKDIR}/${SRCNAME}/e" do_compile() { - # unfortunately hardcoded edje_cc in Makefile + # unfortunately hardcoded edje_cc in Makefile sed -i "s#\tedje_cc#\t${STAGING_BINDIR_NATIVE}/edje_cc#g" Makefile make } diff --git a/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/exalt-client_svn.bb b/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/exalt-client_svn.bb index f70860154fa458f558928e63cbdbdd22e4baeaa9..afed0e831096dc02a00af6eef74e862776e4ac29 100644 --- a/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/exalt-client_svn.bb +++ b/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/exalt-client_svn.bb @@ -21,5 +21,5 @@ FILES_${PN} += "${libdir}/enlightenment/modules/*/*.desktop \ FILES_${PN}-staticdev += "${libdir}/enlightenment/modules/*/*/*.a" FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.la" FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug" - + SRC_URI += "file://configure.patch" \ No newline at end of file diff --git a/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/news_svn.bb b/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/news_svn.bb index f08cab60a99125c8f1f18c7823bde0f949931544..3b652a69443d84ebe1d25ef58ed480b06febb00c 100644 --- a/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/news_svn.bb +++ b/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/news_svn.bb @@ -7,7 +7,7 @@ PR = "${INC_PR}.0" require e-module.inc do_configure_prepend() { - sed -i -e /po/d configure.ac + sed -i -e /po/d configure.ac sed -i -e s:\ po::g Makefile.am } diff --git a/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/rain_svn.bb b/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/rain_svn.bb index cf67a4cd5d805e66732bb0d030567f3a95a2266c..7e8544219a35f5d4da955cbc9670e2473ab77b6f 100644 --- a/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/rain_svn.bb +++ b/import-layers/meta-openembedded/meta-efl/recipes-efl/e17/rain_svn.bb @@ -9,7 +9,7 @@ PR = "${INC_PR}.0" require e-module.inc do_configure_prepend() { - sed -i -e /po/d ${S}/configure.ac + sed -i -e /po/d ${S}/configure.ac sed -i -e s:\ po::g ${S}/Makefile.am } diff --git a/import-layers/meta-openembedded/meta-efl/recipes-efl/efl/efl.inc b/import-layers/meta-openembedded/meta-efl/recipes-efl/efl/efl.inc index 31aff8731cb34b6e48517a511313eb5d12708992..5436b40dd0b8c70a23035997a08ed5b1b1e6c3f3 100644 --- a/import-layers/meta-openembedded/meta-efl/recipes-efl/efl/efl.inc +++ b/import-layers/meta-openembedded/meta-efl/recipes-efl/efl/efl.inc @@ -105,7 +105,7 @@ python populate_packages_prepend () { output_pattern = 'evas-' + plugin_type[:-1] + "-%s", description = 'Evas module %s', allow_dirs=True, recursive=False, extra_depends="" ) - + plugin_type = "cserve2" bb.note( "splitting packages for evas %s..." % plugin_type ) basedir = d.expand( '${libdir}/evas/%s/loaders' % plugin_type) diff --git a/import-layers/meta-openembedded/meta-efl/recipes-efl/efl/elementary.inc b/import-layers/meta-openembedded/meta-efl/recipes-efl/efl/elementary.inc index f0a92dfe9a0e2ddea96bb3dee0c93a385398f7c8..cec67aa72c07152d3f0a1f932a8a5fa9dca147e1 100644 --- a/import-layers/meta-openembedded/meta-efl/recipes-efl/efl/elementary.inc +++ b/import-layers/meta-openembedded/meta-efl/recipes-efl/efl/elementary.inc @@ -1,7 +1,7 @@ DESCRIPTION = "EFL based widget set for mobile devices" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a173054a93896e933df53e3382d472c2" -DEPENDS = "eet-native edje-native elementary-native efreet evas ecore edje eet eldbus ethumb poppler eio" +DEPENDS = "eet-native edje-native elementary-native efreet evas ecore edje eet eldbus ethumb eio" DEPENDS_class-native = "efl-native" inherit efl gettext diff --git a/import-layers/meta-openembedded/meta-efl/recipes-efl/efl/evas-generic-loaders.inc b/import-layers/meta-openembedded/meta-efl/recipes-efl/efl/evas-generic-loaders.inc index 5cd9ec18826bfdf9b31f6ec427678e6cb3fe2388..d277c1167954a91cdbd6f8814b8c1d94296107bf 100644 --- a/import-layers/meta-openembedded/meta-efl/recipes-efl/efl/evas-generic-loaders.inc +++ b/import-layers/meta-openembedded/meta-efl/recipes-efl/efl/evas-generic-loaders.inc @@ -1,20 +1,22 @@ DESCRIPTION = "Evas generic loaders" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=a87563ed30add2b0e3460272d3138a00" -DEPENDS = "eina poppler librsvg cairo" +DEPENDS = "eina librsvg cairo" inherit efl SRCNAME = "evas_generic_loaders" EXTRA_OECONF = " \ - --enable-poppler \ --enable-svg \ --disable-gstreamer \ --disable-libraw \ --disable-spectre \ " +PACKAGECONFIG ??= "" +PACKAGECONFIG[poppler] = "--enable-poppler,--disable-poppler,poppler" + PACKAGESPLITFUNCS_prepend = "split_evas_loader_packages " python split_evas_loader_packages () { diff --git a/import-layers/meta-openembedded/meta-filesystems/README b/import-layers/meta-openembedded/meta-filesystems/README index 026c132385cf0d8b09cd142fca43d4973f2e9347..0a8f6cfbdc327e056ea1e7369826f2de80ce4401 100644 --- a/import-layers/meta-openembedded/meta-filesystems/README +++ b/import-layers/meta-openembedded/meta-filesystems/README @@ -10,22 +10,22 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/bitbake - branch: 1.28 + branch: morty URI: git://git.openembedded.org/openembedded-core layers: meta - branch: krogoth + branch: morty URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: krogoth + branch: morty Patches ======= Please submit any patches against the filesystems layer to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) -with '[meta-filesystems][krogoth]' in the subject. +with '[meta-filesystems]' in the subject. Maintainers List: physfs Andreas Müller @@ -66,9 +66,9 @@ When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix=meta-filesystems][krogoth][PATCH + --subject-prefix=meta-filesystems][morty][PATCH -krogoth Branch Maintainer: +morty branch maintainer(s): Armin Kuster Table of Contents diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch new file mode 100644 index 0000000000000000000000000000000000000000..c434a03f0f3ba028d96353f34cf739cd717615f1 --- /dev/null +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/files/0001-Makefile-fix-path-for-sshfs.1.patch @@ -0,0 +1,32 @@ +From e3cd445a4ee44a16faa646d7b642d02eea62b1f8 Mon Sep 17 00:00:00 2001 +From: Zoltan Kuscsik +Date: Fri, 1 Jul 2016 09:30:31 +0200 +Subject: [PATCH] Makefile: fix path for sshfs.1 + +Fix source path when build directory differs +from the source dir. + +Upstream-Status: Accepted + +https://github.com/libfuse/sshfs/pull/24 + +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index f003bae..3d8f9cb 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -24,7 +24,7 @@ sshfs.1: sshfs.1.in + $(AM_V_GEN)sed \ + -e 's,__IDMAP_DEFAULT__,$(IDMAP_DEFAULT),g' \ + -e 's,__UNMOUNT_COMMAND__,$(UNMOUNT_COMMAND),g' \ +- sshfs.1.tmp || exit 1; \ ++ <$(srcdir)/sshfs.1.in >sshfs.1.tmp || exit 1; \ + mv sshfs.1.tmp sshfs.1 + + if SSH_NODELAY_SO +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.5.bb b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb similarity index 65% rename from import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.5.bb rename to import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb index c54cfcbd2be9dc5240283c50e57d5caeb963e476..64ccdace181f1bef8834220de84973e56cc55c78 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.5.bb +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/sshfs-fuse/sshfs-fuse_2.8.bb @@ -6,12 +6,11 @@ LICENSE = "GPLv2" DEPENDS = "glib-2.0 fuse" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/${BP}.tar.gz" -S = "${WORKDIR}/${BP}" +SRC_URI = "git://github.com/libfuse/sshfs;tag=b2fa7593586b141298e6159f40f521d2b0f4f894 \ + file://0001-Makefile-fix-path-for-sshfs.1.patch" + +S = "${WORKDIR}/git" inherit autotools pkgconfig FILES_${PN} += "${libdir}/sshnodelay.so" - -SRC_URI[md5sum] = "17494910db8383a366b1301e5f5148a9" -SRC_URI[sha256sum] = "e9171452e5d0150b9c6a2158fd2e2dcefb5d5d03ba4d208949e00a3a46c6e63e" diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_0.26.bb b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_0.26.bb index 7df9c39a4fb19196b5785fcc3c3c76053f56f95c..d98d35ab1795c8d025dcf6900f76e409450c72ec 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_0.26.bb +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/unionfs-fuse/unionfs-fuse_0.26.bb @@ -11,7 +11,7 @@ SRC_URI[md5sum] = "689c636484756f6f7a728ef354cbeac2" SRC_URI[sha256sum] = "8d5c9dcb51ecb9a9b03890e16d17e37d602b0c1f23ed6a9ddec2b0f719c9f662" do_install() { - oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix} + oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix} } RDEPENDS_${PN} += "bash" diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils/makefile-add-ldflags.patch new file mode 100644 index 0000000000000000000000000000000000000000..bb21899eb339a52d6355d0c2c465dd9dd1e1f05c --- /dev/null +++ b/import-layers/meta-openembedded/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/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb b/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb index 253ea627b0d0d146b0a4dc162dee6490ae43077f..e8d187389af161ade272522b528ac98f73208f2e 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-filesystems/yaffs2/yaffs2-utils_git.bb +++ b/import-layers/meta-openembedded/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" diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb b/import-layers/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb index 5618f28a68b6b4a5fc9dd8bbd33594c99ca74a0e..dc2c1064970c7c7ee34301e0dc5eace6c06746a8 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb @@ -6,6 +6,8 @@ DEPENDS = "readline zlib" inherit cmake +PE = "1" + SRC_URI = "http://icculus.org/${BPN}/downloads/${BP}.tar.bz2" SRC_URI[md5sum] = "c2c727a8a8deb623b521b52d0080f613" SRC_URI[sha256sum] = "ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69" diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/dmapi/dmapi_2.2.12.bb b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/dmapi/dmapi_2.2.12.bb index 4ff95f97717cea9b64fd5fc4f20e7395530bf229..0242a702315386f957730c78c106f85ad52274f5 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/dmapi/dmapi_2.2.12.bb +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/dmapi/dmapi_2.2.12.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=1678edfe8de9be9564d23761ae2fa794" DEPENDS = "xfsprogs" SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/dmapi-${PV}.tar.gz \ - file://remove-install-as-user.patch \ + file://remove-install-as-user.patch \ file://dmapi_aarch64_configure_support.patch \ " SRC_URI[md5sum] = "cd825d4e141c16011367e0a0dd98c9c5" @@ -29,3 +29,5 @@ do_install () { install -d ${D}${libdir} oe_runmake install install-dev PKG_DEVLIB_DIR=${libdir} } + +PNBLACKLIST[dmapi] ?= "Depends on broken xfsprogs" diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.4.bb b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.4.bb index e053a6ef2992ad54d9498d2082aae70a9389ea30..fe5aef1583c4c93443e2f04d41fc1010108e26ae 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.4.bb +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.4.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=15c832894d10ddd00dfcf57bee490ecc" DEPENDS = "xfsprogs attr" SRC_URI = "ftp://oss.sgi.com/projects/xfs/cmd_tars/${BPN}-${PV}.tar.gz \ - file://remove-install-as-user.patch \ - " + file://remove-install-as-user.patch \ +" SRC_URI[md5sum] = "a8b1761be5feb363131e7b506639ad4c" SRC_URI[sha256sum] = "570eafd0721515bdd79cb0e295b701d49cdf81e71a0a0ff0df6d4c5cc1960943" @@ -31,6 +31,8 @@ do_configure () { do_install () { export DIST_ROOT=${D} - oe_runmake install + oe_runmake install oe_runmake install-dev } + +PNBLACKLIST[xfsdump] ?= "Depends on broken xfsprogs" diff --git a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.2.3.bb b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.2.3.bb index f38239c373ee2d9966a4ab41306a65e71070e69c..460a89869116042eac1c6e7d2c1b39339449ea39 100644 --- a/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.2.3.bb +++ b/import-layers/meta-openembedded/meta-filesystems/recipes-utils/xfsprogs/xfsprogs_3.2.3.bb @@ -50,3 +50,6 @@ do_install () { # needed for xfsdump oe_runmake install-dev } + +# http://errors.yoctoproject.org/Errors/Details/83236/ +PNBLACKLIST[xfsprogs] ?= "BROKEN: Needs upgrade to 4.5.0 version to be compatible with Kernel uapi changes from 4.5" diff --git a/import-layers/meta-openembedded/meta-gnome/README b/import-layers/meta-openembedded/meta-gnome/README index 2a889e47ce128c5702cd1122c9615ff1a1f99ba7..143173727d2ca275feb27cf455e9c650cd560011 100644 --- a/import-layers/meta-openembedded/meta-gnome/README +++ b/import-layers/meta-openembedded/meta-gnome/README @@ -1,17 +1,18 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: krogoth +branch: morty revision: HEAD URI: git://github.com/openembedded/meta-oe.git -branch: krogoth +branch: morty revision: HEAD -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome][krogoth]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][krogoth][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gnome][morty][PATCH' -krogoth Branch Maintainer: +morty branch maintainer(s): Armin Kuster + diff --git a/import-layers/meta-openembedded/meta-gnome/conf/layer.conf b/import-layers/meta-openembedded/meta-gnome/conf/layer.conf index 58e12a9cdaeff2d3f3093c2540d0825f977a06c9..fce5627bd951917db96fe5dad74fdfbf662ca11e 100644 --- a/import-layers/meta-openembedded/meta-gnome/conf/layer.conf +++ b/import-layers/meta-openembedded/meta-gnome/conf/layer.conf @@ -13,3 +13,5 @@ BBFILE_PRIORITY_gnome-layer = "7" LAYERVERSION_gnome-layer = "1" LAYERDEPENDS_gnome-layer = "core openembedded-layer" + +AVAHI_GTK_pn-avahi-ui = "gtk gtk3" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.10.bb b/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.10.bb index d3e08cadbb9ee5d971b52b6b56fdcf9cd0bda3eb..9803a832361cebdb35c05ab48ad3a4773146c90e 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.10.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.0.10.bb @@ -2,7 +2,10 @@ SUMMARY = "GTK+ applet for NetworkManager" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib gconf libgnome-keyring iso-codes nss" +DEPENDS = "gtk+3 libnotify libsecret networkmanager dbus-glib \ + gconf libgnome-keyring iso-codes nss \ + intltool-native \ +" inherit gnomebase gsettings gtk-icon-cache gobject-introspection diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb index 2f38977fdc7c4883fed07db033da0ae14bab0308..73a15db00a63e8ac8b86828c6fce4be23e231844 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-extended/gparted/gparted_0.24.0.bb @@ -13,7 +13,7 @@ SRC_URI = " \ SRC_URI[md5sum] = "b8480274c68876acff5965d4346710e7" SRC_URI[sha256sum] = "02398ab33894a59b0bd8707e598c46d8bb56f1413cd54de48eed61e2920ecd60" -DEPENDS = "glib-2.0 gtkmm parted gnome-doc-utils-native" +DEPENDS = "glib-2.0 gtkmm parted gnome-doc-utils intltool-native" do_install_append() { # Add a script which checks if polkit is installed. diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gtk-theme-torturer/gtk-theme-torturer_git.bb b/import-layers/meta-openembedded/meta-gnome/recipes-extended/gtk-theme-torturer/gtk-theme-torturer_git.bb index 2621d15407a9ce1e7ab07e76d58af47c8d90047c..8a21112dd7b9ae89748b2f471152edd851bfc284 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-extended/gtk-theme-torturer/gtk-theme-torturer_git.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-extended/gtk-theme-torturer/gtk-theme-torturer_git.bb @@ -17,8 +17,8 @@ inherit distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" do_install() { - install -d ${D}${bindir} - install -m 0755 torturer ${D}${bindir} + install -d ${D}${bindir} + install -m 0755 torturer ${D}${bindir} } # http://errors.yoctoproject.org/Errors/Details/35132/ diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0002-Bug-13754-Fix-build-on-gcc-6-default-to-C-11.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0002-Bug-13754-Fix-build-on-gcc-6-default-to-C-11.patch new file mode 100644 index 0000000000000000000000000000000000000000..595ee8e5a2d59a2982653933b0ecdbf355c9cb5d --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword/0002-Bug-13754-Fix-build-on-gcc-6-default-to-C-11.patch @@ -0,0 +1,74 @@ +From a83e6f50dbd5efa16fb39efe32b9de370f103130 Mon Sep 17 00:00:00 2001 +From: Hubert Figuiere +Date: Sat, 23 Jan 2016 20:46:02 +0000 +Subject: [PATCH] Bug 13754 - Fix build on gcc-6 (default to C++11). + +This is debian bug https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=811381 + +git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35182 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 + +Upstream-Status: Backport +--- + plugins/collab/backends/service/xp/RealmProtocol.cpp | 4 ++-- + plugins/collab/backends/service/xp/soa_soup.cpp | 2 +- + plugins/latex/xp/ie_exp_LaTeX.cpp | 2 +- + plugins/xslfo/xp/ie_exp_XSL-FO.cpp | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/plugins/collab/backends/service/xp/RealmProtocol.cpp b/plugins/collab/backends/service/xp/RealmProtocol.cpp +index fb426eb..347a49c 100644 +--- a/plugins/collab/backends/service/xp/RealmProtocol.cpp ++++ b/plugins/collab/backends/service/xp/RealmProtocol.cpp +@@ -6,8 +6,8 @@ namespace protocolv1 { + + #define MAX_PACKET_DATA_SIZE 64*1024*1024 + +-#define RPV1_PACKET_NONEXISTENT -2 +-#define RPV1_PACKET_VARIABLE -1 ++#define RPV1_PACKET_NONEXISTENT uint32_t(-2) ++#define RPV1_PACKET_VARIABLE uint32_t(-1) + + static uint32_t body_size[6] = { + RPV1_PACKET_NONEXISTENT, /* 0: reserved */ +diff --git a/plugins/collab/backends/service/xp/soa_soup.cpp b/plugins/collab/backends/service/xp/soa_soup.cpp +index 4b81735..f4f5134 100644 +--- a/plugins/collab/backends/service/xp/soa_soup.cpp ++++ b/plugins/collab/backends/service/xp/soa_soup.cpp +@@ -163,7 +163,7 @@ namespace soup_soa { + + static bool _invoke(const std::string& /*url*/, const soa::method_invocation& /*mi*/, SoaSoupSession& sess, std::string& result) { + if (!sess.m_session || !sess.m_msg ) +- return soa::GenericPtr(); ++ return false; + + guint status = soup_session_send_message (sess.m_session, sess.m_msg); + if (!(SOUP_STATUS_IS_SUCCESSFUL (status) || +diff --git a/plugins/latex/xp/ie_exp_LaTeX.cpp b/plugins/latex/xp/ie_exp_LaTeX.cpp +index 7aaf3a9..8bcc250 100644 +--- a/plugins/latex/xp/ie_exp_LaTeX.cpp ++++ b/plugins/latex/xp/ie_exp_LaTeX.cpp +@@ -1330,7 +1330,7 @@ void s_LaTeX_Listener::_outputData(const UT_UCSChar * data, UT_uint32 length) + m_pie->write(sBuf.c_str(),sBuf.size()); + } + +-#define SUB(a,who) case a: subst = "\\(\\"who"\\)"; return true; ++#define SUB(a,who) case a: subst = "\\(\\" who"\\)"; return true; + #define SUBd(a,who) case a: subst = who; return true; + static bool _convertLettersToSymbols(char c, const char *& subst) + { +diff --git a/plugins/xslfo/xp/ie_exp_XSL-FO.cpp b/plugins/xslfo/xp/ie_exp_XSL-FO.cpp +index cc5e4e6..957226e 100644 +--- a/plugins/xslfo/xp/ie_exp_XSL-FO.cpp ++++ b/plugins/xslfo/xp/ie_exp_XSL-FO.cpp +@@ -1451,7 +1451,7 @@ void s_XSL_FO_Listener::_openSection(PT_AttrPropIndex api) + { \ + UT_UTF8String esc = szValue; \ + esc.escapeXML(); \ +- buf += " "x"=\""; \ ++ buf += " " x"=\""; \ + buf += esc.utf8_str(); \ + buf += "\""; \ + } +-- +2.5.5 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb index 962a56cb9e81473ddb748eb70f3c5a045bd4cdf8..5052b36fc339247239521b19029e90ce5bab3374 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb @@ -13,6 +13,7 @@ RCONFLICTS_${PN} = "${PN}-embedded" SRC_URI = " \ http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \ file://0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch \ + file://0002-Bug-13754-Fix-build-on-gcc-6-default-to-C-11.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a" @@ -75,7 +76,7 @@ FILES_${PN} += " \ ${datadir}/${PN}-${SHRT_VER}/templates/Press-Release.awt \ ${datadir}/${PN}-${SHRT_VER}/certs \ ${datadir}/${PN}-${SHRT_VER}/ui \ - ${datadir}/${PN}-${SHRT_VER}/xsl* \ + ${datadir}/${PN}-${SHRT_VER}/xsl* \ ${datadir}/${PN}-${SHRT_VER}/mime-info \ ${datadir}/${PN}-${SHRT_VER}/Pr*.xml \ " @@ -113,7 +114,7 @@ python populate_packages_prepend () { packages = d.getVar('PACKAGES', 1).split() for pkg in packages[1:]: if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"): - print "Modifying ", pkg + print("Modifying %s" % pkg) metapkg_rdepends.append(pkg) d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends)) d.setVar('DESCRIPTION_' + metapkg, 'abiword-plugin meta package') diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo.inc b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo.inc index e0f6168694726879f379d5434563194b941871fd..60a85974ed69faa7f19844638a0e54f3d026f724 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo.inc +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo.inc @@ -3,7 +3,7 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34" SECTION = "x11/gnome/libs" -DEPENDS = "glib-2.0 orbit2 intltool-native libxml2 dbus dbus-glib" +DEPENDS = "glib-2.0 orbit2-native orbit2 intltool-native libxml2 dbus dbus-glib" inherit gnomebase gtk-doc lib_package diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch new file mode 100644 index 0000000000000000000000000000000000000000..20db671e0552955344f3b7cb34190c838f343cb0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo/fix-nonliteral-in-string.patch @@ -0,0 +1,26 @@ +This checks whether the format string is a literal on the calling function. As bonobo_debug_print() +takes already a va_list, we specify the format on the functions that call it +The second number, which is 0 here, should then be the argument index of the variadic argument + +Fixed warning with clang + +| ../../libbonobo-2.32.1/bonobo/bonobo-debug.c:58:32: error: format string is not a string literal [-Werror,-Wformat-nonliteral] +| vfprintf (_bonobo_debug_file, fmt, args); +| ^~~ +| 1 error generated. + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +Index: libbonobo-2.32.1/bonobo/bonobo-debug.c +=================================================================== +--- libbonobo-2.32.1.orig/bonobo/bonobo-debug.c ++++ libbonobo-2.32.1/bonobo/bonobo-debug.c +@@ -47,6 +47,7 @@ bonobo_debug_init(void) + _bonobo_debug_file = stderr; + } + ++__attribute__((__format__ (printf, 2, 0))) + void + bonobo_debug_print (const char *name, char *fmt, ...) + { diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb index fd4d812105feb4346560f02ee5cc77145fa1d72a..8e00eb4d2dc59548e3a40c382649dccbe3e223ca 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/bonobo/libbonobo_2.32.1.bb @@ -2,6 +2,7 @@ require libbonobo.inc SRC_URI += "file://0001-Remove-use-of-G_DISABLE_DEPRECATED.patch \ file://do-not-use-srcdir-variable.patch \ + file://fix-nonliteral-in-string.patch \ " SRC_URI[archive.md5sum] = "27fa902d4fdf6762ee010e7053aaf77b" SRC_URI[archive.sha256sum] = "9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb index 2b6f15e82ff745b418736361df3acb2e2659486a..f38be880f8ba0809ba167c0acafeb11962e37633 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb @@ -9,21 +9,23 @@ SRC_URI[archive.md5sum] = "69a12ed68893f2e1e81ac4e531bc1515" SRC_URI[archive.sha256sum] = "109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955" GNOME_COMPRESS_TYPE = "xz" -DEPENDS = "glib-2.0 gtk+3 libxml2" +DEPENDS = "glib-2.0 gtk+3 libxml2 intltool-native" -inherit vala gtk-doc +inherit vala gtk-doc distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" EXTRA_OECONF += "--disable-man" PACKAGES =+ "dconf-editor" FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${libdir}/gio/modules/*.so \ + ${datadir}/dbus-1 \ + ${libdir}/gio/modules/*.so \ " FILES_dconf-editor = " \ - ${bindir}/dconf-editor \ - ${datadir}/icons \ - ${datadir}/bash-completion \ + ${bindir}/dconf-editor \ + ${datadir}/icons \ + ${datadir}/bash-completion \ " FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb index a5664b0856cd275cb25045d7de245ce9c86cdf50..c31de0ca134a76d01b149afabcaa293078eaf489 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb @@ -48,7 +48,7 @@ do_compile_prepend() { EXTRA_OECONF = "--without-openldap \ --with-libdb=${STAGING_DIR_HOST}${prefix} \ - --disable-nntp --disable-goa --disable-weather" + --disable-nntp --disable-goa --disable-weather --disable-gtk-doc" PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \ libedata-book libedata-book-dev libedata-cal libedata-cal-dev \ diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-fix-gcc6-errors.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-fix-gcc6-errors.patch new file mode 100644 index 0000000000000000000000000000000000000000..b8e30f7d929b7e97ffa347beef285879ecf6fc92 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-fix-gcc6-errors.patch @@ -0,0 +1,39 @@ +--- evince-3.18.2/backend/comics/comics-document.c.orig 2016-06-22 20:08:01.789805750 +0000 ++++ evince-3.18.2/backend/comics/comics-document.c 2016-06-22 20:07:00.817804688 +0000 +@@ -241,6 +241,8 @@ + /* This function shows how to use the choosen command for decompressing a + * comic book file. It modifies fields of the ComicsDocument struct with + * this information */ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + static gboolean + comics_generate_command_lines (ComicsDocument *comics_document, + GError **error) +@@ -296,6 +298,7 @@ + } + + } ++#pragma GCC diagnostic pop + + /* This function chooses an external command for decompressing a comic + * book based on its mime tipe. */ +--- evince-3.18.2/libdocument/ev-document-misc.c.orig 2016-06-22 20:01:49.205799262 +0000 ++++ evince-3.18.2/libdocument/ev-document-misc.c 2016-06-22 20:02:27.233799924 +0000 +@@ -519,7 +519,8 @@ + + return (dp / di); + } +- ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-y2k" + /* Returns a locale specific date and time representation */ + gchar * + ev_document_misc_format_date (GTime utime) +@@ -542,6 +543,7 @@ + + return g_locale_to_utf8 (s, -1, NULL, NULL, NULL); + } ++#pragma GCC diagnostic pop + + void + ev_document_misc_get_pointer_position (GtkWidget *widget, diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb index fe63093adf9486a19eab25a739d1a1e2cca33c1f..e42e9045d1e5dbae396d352e8f6156cacacaf3d5 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.18.2.bb @@ -2,15 +2,19 @@ SUMMARY = "Evince is a document viewer for document formats like pdf, ps, djvu" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b" SECTION = "x11/office" -DEPENDS = "gtk+3 libsecret gnome-desktop3 poppler gstreamer1.0-plugins-base orc adwaita-icon-theme" +DEPENDS = "gtk+3 libsecret gnome-desktop3 poppler gstreamer1.0-plugins-base orc adwaita-icon-theme intltool-native" PR = "r5" -inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection +inherit gnome pkgconfig gtk-icon-cache gsettings gobject-introspection distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[archive.md5sum] = "c39af6b8b1c44d4393ef8ac9dab99c0b" SRC_URI[archive.sha256sum] = "42ad6c7354d881a9ecab136ea84ff867acb942605bcfac48b6c12e1c2d8ecb17" -SRC_URI += "file://0001-help-remove-YELP-macro.patch" +SRC_URI += "file://0001-help-remove-YELP-macro.patch \ + file://0002-fix-gcc6-errors.patch \ +" EXTRA_OECONF = " --enable-thumbnailer \ " diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb index 259c609fd340507ae83f6f32051cd3f489052f4f..9266f97a2001801250cbf6b01fb1a94e4c4d5240 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb @@ -34,6 +34,7 @@ EXTRA_OECONF = " \ do_configure_prepend() { sed -i -e "s:\bdocs::g" ${S}/Makefile.am + rm -f ${S}/m4/gnome-doc-utils.m4 } do_install_prepend() { @@ -103,3 +104,5 @@ pkg_postrm_${PN} () { delgroup gdm || true sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true } + +PNBLACKLIST[gdm] ?= "Depends on broken gnome-panel" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch new file mode 100644 index 0000000000000000000000000000000000000000..4ad57effe94b307d274df8e27a59b9c4dab0852b --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch @@ -0,0 +1,29 @@ +From 1d2e6165e3154e27ecde329a40c05f0880afb9e0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 17 May 2016 14:14:03 +0300 +Subject: [PATCH] Remove help directory from build + +It hardcodes the use of xml2po utility, which is provided by obsolete gnome-doc-utils + +Signed-off-by: Alexander Kanavin +--- + Makefile.am | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index e57b203..a88152d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + + SUBDIRS = gedit pixmaps po data plugin-loaders plugins docs tests win32 osx + +-if !OS_OSX +-SUBDIRS += help +-endif + + distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper + +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch new file mode 100644 index 0000000000000000000000000000000000000000..a5d23101238540c2d2086d461ada524efa780215 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/files/0002-suppress-string-format-literal-warning-to-fix-build-.patch @@ -0,0 +1,38 @@ +From 4ebdf8023f763f75a7e1b548894de2e8b784f4a8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 29 Jul 2016 23:19:40 +0200 +Subject: [PATCH] suppress string format literal warning to fix build with gcc6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + plugins/time/gedit-time-plugin.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/plugins/time/gedit-time-plugin.c b/plugins/time/gedit-time-plugin.c +index d2ffdb9..441d9f9 100644 +--- a/plugins/time/gedit-time-plugin.c ++++ b/plugins/time/gedit-time-plugin.c +@@ -473,12 +473,15 @@ get_time (const gchar* format) + clock = time (NULL); + now = localtime (&clock); + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + do + { + out_length += 255; + out = g_realloc (out, out_length); + } + while (strftime (out, out_length, locale_format, now) == 0); ++#pragma GCC diagnostic pop + + g_free (locale_format); + +-- +2.5.5 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb index 1c7b7e3ed86309e4b4e120b59d2c44b18d9b7cdd..a6c68d383a67494309aae3f6e01df5f67a64456d 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb @@ -3,12 +3,16 @@ SECTION = "x11/gnome" LICENSE = "GPLv2+" PR = "r2" -DEPENDS = "gvfs enchant gconf gnome-doc-utils gnome-doc-utils-native glib-2.0 gtk+ gtksourceview2 iso-codes" +DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ gtksourceview2 iso-codes intltool-native" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit gnome gettext pythonnative -SRC_URI+= "file://0001-workaround-void-pointer-arithmetic.patch" +SRC_URI+= " \ + file://0001-workaround-void-pointer-arithmetic.patch \ + file://0001-Remove-help-directory-from-build.patch \ + file://0002-suppress-string-format-literal-warning-to-fix-build-.patch \ +" SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b" SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c" GNOME_COMPRESS_TYPE="bz2" @@ -16,13 +20,5 @@ GNOME_COMPRESS_TYPE="bz2" EXTRA_OECONF = "--disable-scrollkeeper \ --enable-gvfs-metadata" -do_configure_prepend() { - cd ${S} - gnome-doc-common --copy || true - gnome-doc-prepare --force --copy || true - cd ${B} -} - FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2" FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug" - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb index 7b064c332c9fd706c1e5bee4dd385e9fbdd6fd86..fe3e572f3509948b6c8c0516425a4f0835d9c7cd 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.18.2.bb @@ -6,8 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ SECTION = "x11/gnome" -DEPENDS = "udev gtk+3 libnotify libcanberra" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}" +DEPENDS = "udev gtk+3 libnotify libcanberra intltool-native \ + ${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)} \ +" inherit gnomebase gtk-icon-cache gobject-introspection diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb index 86b913bb18882550001b97155cf1ffdc39b5bd03..391d0dd9714dae7b1dc9c0f0265d861eaae286a7 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb @@ -16,6 +16,7 @@ LDFLAGS += "-lgthread-2.0 -lxml2" do_configure_prepend() { sed -i s:help::g ${S}/Makefile.am + rm -f ${S}/m4/gnome-doc-utils.m4 } do_install_append() { rm -rf ${D}${datadir}/mime @@ -30,3 +31,5 @@ FILES_${PN} += "${datadir}/icon* \ FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug" FILES_${PN}-dev += "${libdir}/window-manager-settings/*.la" FILES_${PN}-staticdev += "${libdir}/window-manager-settings/*.a" + +PNBLACKLIST[gnome-control-center] ?= "Depends on broken gnome-menus" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb index 703c397b25df0d68db579401a0ce22369c76ebdb..c1a47e09bd50efd09e41f8da0900429c9a2a529e 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb @@ -12,12 +12,13 @@ SRC_URI[archive.md5sum] = "5c80d628a240eb9d9ff78913b31f2f67" SRC_URI[archive.sha256sum] = "55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d" GNOME_COMPRESS_TYPE="bz2" -DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification" +DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification intltool-native" EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs --disable-gnome-about" do_configure_prepend () { sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in + rm -f ${S}/m4/gnome-doc-utils.m4 } PACKAGES =+ "libgnome-desktop" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb index 2f427e7ef19a565d8474acd7b3ddf5d233eb8405..eac9dbd26904387f2c5e2505a046a03ed26a7c06 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb @@ -7,7 +7,10 @@ DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui virtual/libx11 liba PR = "r4" -inherit gnomebase gtk-icon-cache +inherit gnomebase gtk-icon-cache distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d" SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98" GNOME_COMPRESS_TYPE="bz2" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb index f8f5dddfbc60582f2bc6ad937ab0cc97e08af801..100d32ef230f377b852e4af2bfe50a69d93096a4 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_2.32.1.bb @@ -36,6 +36,8 @@ FILES_${PN}-dev += "${libdir}/${BPN}/devel/*.la \ ${base_libdir}/security/*.la \ " +INSANE_SKIP_${PN}-dev += "dev-elf" + FILES_${PN}-dbg += "${libdir}/${BPN}/standalone/.debug/ \ ${libdir}/${BPN}/devel/.debug/ \ ${base_libdir}/security/.debug/" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb index 1b84a54c8b8469e4396d4bd94f75e8721de420ea..418951890326b7802197c763f1ad006bc4ecfda8 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" PR = "r1" -DEPENDS = "python libxml2 gconf popt gtk+" +DEPENDS = "python libxml2 gconf popt gtk+ intltool-native" inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection @@ -13,10 +13,18 @@ SRC_URI[archive.md5sum] = "caa6772e63ed5870cf43dc3d354e0624" SRC_URI[archive.sha256sum] = "6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa" GNOME_COMPRESS_TYPE="bz2" -PACKAGES += "${PN}-python" +do_configure_append () { + + # this expands to native-pthon which we don't want. + sed -i 's:\@PYTHON\@:/usr/bin/env python:' ${S}/simple-editor/gmenu-simple-editor.in + +} +PACKAGES += "${PN}-python ${PN}-python-staticdev" FILES_${PN} += "${datadir}/desktop-directories/" -FILES_${PN}-python = "${libdir}/python*" +FILES_${PN}-python-staticdev = "${PYTHON_SITEPACKAGES_DIR}/gmenu.a ${PYTHON_SITEPACKAGES_DIR}/gmenu.la" +FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/gmenu.so ${PYTHON_SITEPACKAGES_DIR}/GMenuSimpleEditor " FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \ ${PYTHON_SITEPACKAGES_DIR}/.debug" - +# http://errors.yoctoproject.org/Errors/Details/81001/ +PNBLACKLIST[gnome-menus] ?= "BROKEN: fails to build because of python" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch new file mode 100644 index 0000000000000000000000000000000000000000..fdcccb9d7324a2bc6c6e4d8a3c7cd5fffda868c2 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch @@ -0,0 +1,730 @@ +From 7345730ac882ee5a493254e5cf9162c96c648ef2 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 17 May 2016 14:40:33 +0300 +Subject: [PATCH] Add gnome-doc-utils.make + +Since the sources are taken from git, the file is absent +(and is installed by tools from gnome-doc-utils which +are no longer provided). + +Signed-off-by: Alexander Kanavin +--- + gnome-doc-utils.make | 706 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 706 insertions(+) + create mode 100644 gnome-doc-utils.make + +diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make +new file mode 100644 +index 0000000..b2e0fa1 +--- /dev/null ++++ b/gnome-doc-utils.make +@@ -0,0 +1,706 @@ ++# gnome-doc-utils.make - make magic for building documentation ++# Copyright (C) 2004-2005 Shaun McCance ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software Foundation, ++# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++################################################################################ ++## @@ Generating Header Files ++ ++## @ DOC_H_FILE ++## The name of the header file to generate ++DOC_H_FILE ?= ++ ++## @ DOC_H_DOCS ++## The input DocBook files for generating the header file ++DOC_H_DOCS ?= ++ ++$(DOC_H_FILE): $(DOC_H_DOCS); ++ @rm -f $@.tmp; touch $@.tmp; ++ echo 'const gchar* documentation_credits[] = {' >> $@.tmp ++ list='$(DOC_H_DOCS)'; for doc in $$list; do \ ++ xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ ++ if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ ++ xsltproc -nonet --path "$$xmlpath" $(_credits) $$doc; \ ++ done | sort | uniq \ ++ | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \ ++ | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp ++ echo ' NULL' >> $@.tmp ++ echo '};' >> $@.tmp ++ echo >> $@.tmp ++ list='$(DOC_H_DOCS)'; for doc in $$list; do \ ++ xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ ++ if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ ++ docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ ++ | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ ++ echo $$xmlpath; \ ++ ids=`xsltproc -nonet --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ ++ for id in $$ids; do \ ++ echo '#define HELP_'`echo $$docid`'_'`echo $$id \ ++ | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \ ++ done; \ ++ echo >> $@.tmp; \ ++ done; ++ cp $@.tmp $@ && rm -f $@.tmp ++ ++dist-check-gdu: ++if !HAVE_GNOME_DOC_UTILS ++ @echo "*** GNOME Doc Utils must be installed in order to make dist" ++ @false ++endif ++ ++.PHONY: dist-doc-header ++dist-doc-header: $(DOC_H_FILE) ++ @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \ ++ $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)"; ++ ++doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header) ++ ++.PHONY: clean-doc-header ++_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) ++clean-local: $(_clean_doc_header) ++distclean-local: $(_clean_doc_header) ++mostlyclean-local: $(_clean_doc_header) ++maintainer-clean-local: $(_clean_doc_header) ++clean-doc-header: ++ rm -f $(DOC_H_FILE) ++ ++all: $(DOC_H_FILE) ++ ++ ++################################################################################ ++## @@ Generating Documentation Files ++ ++## @ DOC_MODULE ++## The name of the document being built ++DOC_MODULE ?= ++ ++## @ DOC_ID ++## The unique identifier for a Mallard document ++DOC_ID ?= ++ ++## @ DOC_PAGES ++## Page files in a Mallard document ++DOC_PAGES ?= ++ ++## @ DOC_ENTITIES ++## Files included with a SYSTEM entity ++DOC_ENTITIES ?= ++ ++## @ DOC_INCLUDES ++## Files included with XInclude ++DOC_INCLUDES ?= ++ ++## @ DOC_FIGURES ++## Figures and other external data ++DOC_FIGURES ?= ++ ++## @ DOC_FORMATS ++## The default formats to be built and installed ++DOC_FORMATS ?= docbook ++_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) ++ ++## @ DOC_LINGUAS ++## The languages this document is translated into ++DOC_LINGUAS ?= ++_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ ++ $(filter $(LINGUAS),$(DOC_LINGUAS)), \ ++ $(DOC_LINGUAS)) ++ ++_DOC_ABS_SRCDIR = @abs_srcdir@ ++ ++ ++################################################################################ ++## Variables for Bootstrapping ++ ++_xml2po ?= `which xml2po` ++_xml2po_mode = $(if $(DOC_ID),mallard,docbook) ++ ++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` ++_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` ++_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl ++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl ++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl ++ ++if ENABLE_SK ++_ENABLE_SK = true ++_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` ++_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` ++_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml ++endif ++ ++ ++################################################################################ ++## Support for automake silent-rules ++GDU_V_XML2PO=$(GDU__v_XML2PO_$(V)) ++GDU__v_XML2PO_=$(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) ++GDU__v_XML2PO_0=@echo " XML2PO" $@; ++ ++GDU_V_MSGFMT=$(GDU__v_MSGFMT_$(V)) ++GDU__v_MSGFMT_=$(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) ++GDU__v_MSGFMT_0=@echo " MSGFMT" $@; ++ ++GDU_V_DB2OMF=$(GDU__v_DB2OMF_$(V)) ++GDU__v_DB2OMF_=$(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) ++GDU__v_DB2OMF_0=@echo " DB2OMF" $@; ++ ++GDU_V_DB2HTM=$(GDU__v_DB2HTM_$(V)) ++GDU__v_DB2HTM_=$(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) ++GDU__v_DB2HTM_0=@echo " DB2HTM" $@; ++ ++################################################################################ ++## @@ Rules for OMF Files ++ ++db2omf_args = \ ++ --stringparam db2omf.basename $(DOC_MODULE) \ ++ --stringparam db2omf.format $(3) \ ++ --stringparam db2omf.dtd \ ++ $(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 \ ++ | sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/') \ ++ --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \ ++ --stringparam db2omf.omf_dir "$(OMF_DIR)" \ ++ --stringparam db2omf.help_dir "$(HELP_DIR)" \ ++ --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \ ++ $(if $(_ENABLE_SK), \ ++ --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \ ++ $(_db2omf) $(2) ++ ++## @ _DOC_OMF_IN ++## The OMF input file ++_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in)) ++ ++## @ _DOC_OMF_DB ++## The OMF files for DocBook output ++_DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ ++ $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf)) ++ ++$(_DOC_OMF_DB) : $(_DOC_OMF_IN) ++$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml ++ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ ++ echo "The file '$(_skcontentslist)' does not exist." >&2; \ ++ echo "Please check your ScrollKeeper installation." >&2; \ ++ exit 1; } ++ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } ++ ++## @ _DOC_OMF_HTML ++## The OMF files for HTML output ++_DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \ ++ $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf)) ++ ++$(_DOC_OMF_HTML) : $(_DOC_OMF_IN) ++$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml ++if ENABLE_SK ++ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ ++ echo "The file '$(_skcontentslist)' does not exist" >&2; \ ++ echo "Please check your ScrollKeeper installation." >&2; \ ++ exit 1; } ++endif ++ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } ++ ++## @ _DOC_OMF_ALL ++## All OMF output files to be built ++# FIXME ++_DOC_OMF_ALL = \ ++ $(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB)) \ ++ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML)) ++ ++.PHONY: omf ++omf: $(_DOC_OMF_ALL) ++ ++ ++################################################################################ ++## @@ C Locale Documents ++ ++## @ _DOC_C_MODULE ++## The top-level documentation file in the C locale ++_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml) ++ ++## @ _DOC_C_PAGES ++## Page files in a Mallard document in the C locale ++_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page)) ++ ++## @ _DOC_C_ENTITIES ++## Files included with a SYSTEM entity in the C locale ++_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent)) ++ ++## @ _DOC_C_XINCLUDES ++## Files included with XInclude in the C locale ++_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc)) ++ ++## @ _DOC_C_DOCS ++## All documentation files in the C locale ++_DOC_C_DOCS = \ ++ $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \ ++ $(_DOC_C_PAGES) $(_DOC_C_MODULE) ++ ++## @ _DOC_C_DOCS_NOENT ++## All documentation files in the C locale, ++## except files included with a SYSTEM entity ++_DOC_C_DOCS_NOENT = \ ++ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \ ++ $(_DOC_C_PAGES) ++ ++## @ _DOC_C_FIGURES ++## All figures and other external data in the C locale ++_DOC_C_FIGURES = $(if $(DOC_FIGURES), \ ++ $(foreach fig,$(DOC_FIGURES),C/$(fig)), \ ++ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png))) ++ ++## @ _DOC_C_HTML ++## All HTML documentation in the C locale ++# FIXME: probably have to shell escape to determine the file names ++_DOC_C_HTML = $(foreach f, \ ++ $(shell xsltproc -nonet --xinclude \ ++ --stringparam db.chunk.basename "$(DOC_MODULE)" \ ++ $(_chunks) "C/$(DOC_MODULE).xml"), \ ++ C/$(f).xhtml) ++ ++############################################################################### ++## @@ Other Locale Documentation ++ ++## @ _DOC_POFILES ++## The .po files used for translating the document ++_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) ++ ++.PHONY: po ++po: $(_DOC_POFILES) ++ ++## @ _DOC_MOFILES ++## The .mo files used for translating the document ++_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) ++ ++.PHONY: mo ++mo: $(_DOC_MOFILES) ++ ++## @ _DOC_LC_MODULES ++## The top-level documentation files in all other locales ++_DOC_LC_MODULES = $(if $(DOC_MODULE), \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) ++ ++## @ _DOC_LC_PAGES ++## Page files in a Mallard document in all other locales ++_DOC_LC_PAGES = \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \ ++ $(lc)/$(notdir $(page)) )) ++ ++## @ _DOC_LC_XINCLUDES ++## Files included with XInclude in all other locales ++_DOC_LC_INCLUDES = \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \ ++ $(lc)/$(notdir $(inc)) )) ++ ++## @ _DOC_LC_HTML ++## All HTML documentation in all other locales ++# FIXME: probably have to shell escape to determine the file names ++_DOC_LC_HTML = \ ++ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \ ++ $(lc)/$(notdir $(doc)) )) ++ ++## @ _DOC_LC_DOCS ++## All documentation files in all other locales ++_DOC_LC_DOCS = \ ++ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \ ++ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML)) ++ ++## @ _DOC_LC_FIGURES ++## All figures and other external data in all other locales ++_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \ ++ $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) ) ++ ++_DOC_SRC_FIGURES = \ ++ $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ ++ $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) ++ ++$(_DOC_POFILES): ++ @if ! test -d $(dir $@); then \ ++ echo "mkdir $(dir $@)"; \ ++ mkdir "$(dir $@)"; \ ++ fi ++ @if test ! -f $@ -a -f $(srcdir)/$@; then \ ++ echo "cp $(srcdir)/$@ $@"; \ ++ cp "$(srcdir)/$@" "$@"; \ ++ fi; ++ @docs=; \ ++ list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \ ++ docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \ ++ done; \ ++ if ! test -f $@; then \ ++ echo "(cd $(dir $@) && \ ++ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ ++ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \ ++ (cd $(dir $@) && \ ++ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ ++ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \ ++ else \ ++ echo "(cd $(dir $@) && \ ++ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \ ++ (cd $(dir $@) && \ ++ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ ++ fi ++ ++$(_DOC_MOFILES): %.mo: %.po ++ $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi ++ $(GDU_V_MSGFMT)msgfmt -o $@ $< ++ ++# FIXME: fix the dependancy ++# FIXME: hook xml2po up ++$(_DOC_LC_DOCS) : $(_DOC_MOFILES) ++$(_DOC_LC_DOCS) : $(_DOC_C_DOCS) ++ $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi ++ $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ ++ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ ++ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ ++ (cd $(dir $@) && \ ++ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \ ++ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ ++ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) ++ ++## @ _DOC_POT ++## A pot file ++_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot)) ++.PHONY: pot ++pot: $(_DOC_POT) ++$(_DOC_POT): $(_DOC_C_DOCS_NOENT) ++ $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ ++ ++ ++################################################################################ ++## @@ All Documentation ++ ++## @ _DOC_HTML_ALL ++## All HTML documentation, only if it's built ++_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ ++ $(_DOC_C_HTML) $(_DOC_LC_HTML)) ++ ++_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) ++ ++$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) ++ $(GDU_V_DB2HTM)xsltproc -nonet -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ++ ++ ++################################################################################ ++## All ++ ++all: \ ++ $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \ ++ $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \ ++ $(_DOC_HTML_ALL) $(_DOC_POFILES) ++ ++ ++################################################################################ ++## Clean ++ ++.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir ++ ++clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML) ++clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) ++clean-doc-lc: ++ rm -f $(_DOC_LC_DOCS) ++ rm -f $(_DOC_MOFILES) ++ @list='$(_DOC_POFILES)'; for po in $$list; do \ ++ if ! test "$$po" -ef "$(srcdir)/$$po"; then \ ++ echo "rm -f $$po"; \ ++ rm -f "$$po"; \ ++ fi; \ ++ done ++# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ if test -f "$$lc/.xml2po.mo"; then \ ++ echo "rm -f $$lc/.xml2po.mo"; \ ++ rm -f "$$lc/.xml2po.mo"; \ ++ fi; \ ++ done ++clean-doc-dir: clean-doc-lc ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ for dir in `find $$lc -depth -type d`; do \ ++ if ! test $$dir -ef $(srcdir)/$$dir; then \ ++ echo "rmdir $$dir"; \ ++ rmdir "$$dir"; \ ++ fi; \ ++ done; \ ++ done ++ ++_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf) ++_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk) ++_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc) ++_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir) ++ ++clean-local: \ ++ $(_clean_omf) $(_clean_dsk) \ ++ $(_clean_lc) $(_clean_dir) ++distclean-local: \ ++ $(_clean_omf) $(_clean_dsk) \ ++ $(_clean_lc) $(_clean_dir) ++mostlyclean-local: \ ++ $(_clean_omf) $(_clean_dsk) \ ++ $(_clean_lc) $(_clean_dir) ++maintainer-clean-local: \ ++ $(_clean_omf) $(_clean_dsk) \ ++ $(_clean_lc) $(_clean_dir) ++ ++ ++ ++################################################################################ ++## Dist ++ ++.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk ++doc-dist-hook: \ ++ $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \ ++ $(if $(_DOC_C_FIGURES),dist-doc-figs) \ ++ $(if $(_DOC_OMF_IN),dist-doc-omf) ++# $(if $(_DOC_DSK_IN),dist-doc-dsk) ++ ++dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES) ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ ++ $(mkinstalldirs) "$(distdir)/$$lc"; \ ++ done ++ @list='$(_DOC_C_DOCS)'; \ ++ for doc in $$list; do \ ++ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ if ! test -d "$(distdir)/$$docdir"; then \ ++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ ++ $(mkinstalldirs) "$(distdir)/$$docdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ ++ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ ++ done ++ @list='$(_DOC_LC_DOCS)'; \ ++ for doc in $$list; do \ ++ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ if ! test -d "$(distdir)/$$docdir"; then \ ++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ ++ $(mkinstalldirs) "$(distdir)/$$docdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ ++ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ ++ done ++ @list='$(_DOC_POFILES)'; \ ++ for doc in $$list; do \ ++ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ if ! test -d "$(distdir)/$$docdir"; then \ ++ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ ++ $(mkinstalldirs) "$(distdir)/$$docdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ ++ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ ++ done ++ ++dist-doc-figs: $(_DOC_SRC_FIGURES) ++ @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \ ++ for fig in $$list; do \ ++ if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ ++ if test -f "$$d$$fig"; then \ ++ figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ if ! test -d "$(distdir)/$$figdir"; then \ ++ echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ ++ $(mkinstalldirs) "$(distdir)/$$figdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \ ++ $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \ ++ fi; \ ++ done; ++ ++dist-doc-omf: ++ @if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \ ++ $(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))" ++ ++dist-doc-dsk: ++ @if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \ ++ echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \ ++ $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))" ++ ++ ++ ++################################################################################ ++## Check ++ ++.PHONY: check-doc-docs check-doc-omf ++check: \ ++ $(if $(DOC_MODULE),check-doc-docs) \ ++ $(if $(DOC_ID),check-doc-pages) \ ++ $(if $(_DOC_OMF_IN),check-doc-omf) ++ ++check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ if test -f "$$lc"; \ ++ then d=; \ ++ xmlpath="$$lc"; \ ++ else \ ++ d="$(srcdir)/"; \ ++ xmlpath="$$lc:$(srcdir)/$$lc"; \ ++ fi; \ ++ echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \ ++ xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \ ++ done ++ ++check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES) ++ for lc in C $(_DOC_REAL_LINGUAS); do \ ++ if test -f "$$lc"; \ ++ then d=; \ ++ xmlpath="$$lc"; \ ++ else \ ++ d="$(srcdir)/"; \ ++ xmlpath="$$lc:$(srcdir)/$$lc"; \ ++ fi; \ ++ for page in $(DOC_PAGES); do \ ++ echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ ++ xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ ++ done; \ ++ done ++ ++check-doc-omf: $(_DOC_OMF_ALL) ++ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ ++ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ ++ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \ ++ done ++ ++ ++ ++################################################################################ ++## Install ++ ++.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk ++ ++_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE)) ++ ++install-data-local: \ ++ $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \ ++ $(if $(_DOC_HTML_ALL),install-doc-html) \ ++ $(if $(_DOC_C_FIGURES),install-doc-figs) \ ++ $(if $(_DOC_OMF_IN),install-doc-omf) ++# $(if $(_DOC_DSK_IN),install-doc-dsk) ++ ++install-doc-docs: ++ @for lc in C $(_DOC_REAL_LINGUAS); do \ ++ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ ++ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ ++ done ++ @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ ++ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ ++ if ! test -d "$$docdir"; then \ ++ echo "$(mkinstalldirs) $$docdir"; \ ++ $(mkinstalldirs) "$$docdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ ++ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ ++ done ++ @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ ++ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ ++ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ ++ if ! test -d "$$docdir"; then \ ++ echo "$(mkinstalldirs) $$docdir"; \ ++ $(mkinstalldirs) "$$docdir"; \ ++ fi; \ ++ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ ++ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ ++ done ++ ++install-doc-figs: ++ @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \ ++ for lc in C $(_DOC_REAL_LINGUAS); do \ ++ figsymlink=false; \ ++ if test -f "$$lc/$$fig"; then \ ++ figfile="$$lc/$$fig"; \ ++ elif test -f "$(srcdir)/$$lc/$$fig"; then \ ++ figfile="$(srcdir)/$$lc/$$fig"; \ ++ else \ ++ figsymlink=true; \ ++ fi; \ ++ figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ ++ figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \ ++ if ! test -d "$$figdir"; then \ ++ echo "$(mkinstalldirs) $$figdir"; \ ++ $(mkinstalldirs) "$$figdir"; \ ++ fi; \ ++ figbase=`echo $$fig | sed -e 's/^.*\///'`; \ ++ if $$figsymlink; then \ ++ echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \ ++ ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \ ++ else \ ++ echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ ++ $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ ++ fi; \ ++ done; \ ++ done ++ ++install-doc-html: ++ echo install-html ++ ++install-doc-omf: ++ $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir) ++ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ ++ echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ ++ $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \ ++ done ++ @if test "x$(_ENABLE_SK)" = "xtrue"; then \ ++ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ ++ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ ++ fi; ++ ++install-doc-dsk: ++ echo install-dsk ++ ++ ++ ++################################################################################ ++## Uninstall ++ ++.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk ++uninstall-local: \ ++ $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \ ++ $(if $(_DOC_HTML_ALL),uninstall-doc-html) \ ++ $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \ ++ $(if $(_DOC_OMF_IN),uninstall-doc-omf) ++# $(if $(_DOC_DSK_IN),uninstall-doc-dsk) ++ ++uninstall-doc-docs: ++ @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ ++ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ ++ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ ++ done ++ @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ ++ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ ++ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ ++ done ++ ++uninstall-doc-figs: ++ @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \ ++ echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ ++ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ ++ done; ++ ++uninstall-doc-omf: ++ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ ++ if test "x$(_ENABLE_SK)" = "xtrue"; then \ ++ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ ++ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ ++ fi; \ ++ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ ++ rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ ++ done +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb index fbcf76f6f84bdf6a7ebd0a73b89fb7e9110bc8f2..138d985fea98ef58de81c9f673536e612fe61899 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SECTION = "x11/gnome" -DEPENDS = "gnome-doc-utils-native gtk+3 dconf gconf glib-2.0 gnome-desktop3 gtk+ pango libwnck3 gnome-menus cairo libgweather3 dbus-glib librsvg libcanberra" +DEPENDS = "gnome-doc-utils-native gtk+3 dconf gconf glib-2.0 gnome-desktop3 gtk+ pango libwnck3 gnome-menus cairo libgweather3 dbus-glib librsvg libcanberra" inherit gtk-doc gnome gettext pkgconfig @@ -48,4 +48,4 @@ FILES_${PN} =+ "${datadir}/gnome* \ ${libdir}/bonobo \ " - +PNBLACKLIST[gnome-panel3] ?= "Depends on broken gnome-menus" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb index 9be2ec10af0debcadf46dd12dc8225abb028d3fc..2e36063f229d2fb173ce7cac566288b3fc845ea5 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb @@ -9,9 +9,10 @@ SECTION = "x11/gnome" PR = "r7" -DEPENDS = "gnome-doc-utils-native gconf glib-2.0 gnome-desktop gtk+ \ - pango libwnck gnome-menus cairo libgweather dbus dbus-glib \ - librsvg libcanberra" +DEPENDS = "gnome-doc-utils gconf glib-2.0 gnome-desktop gtk+ \ + pango libwnck gnome-menus cairo libgweather dbus dbus-glib \ + librsvg libcanberra \ +" RDEPENDS_${PN} = "python" inherit gtk-doc gnome autotools-brokensep gettext pkgconfig gconf gobject-introspection @@ -19,7 +20,8 @@ inherit gtk-doc gnome autotools-brokensep gettext pkgconfig gconf gobject-intros SRCREV = "8292bd2b8a36df7eed3c760899400790cde68590" SRC_URI = "git://git.gnome.org/gnome-panel;branch=gnome-2-32 \ file://0001-Fix-build-with-gcc-5.patch \ - " + file://0001-Add-gnome-doc-utils.make.patch \ +" S = "${WORKDIR}/git" @@ -29,7 +31,6 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[networkmanager] = "--enable-network-manager,--disable-network-manager,networkmanager" do_configure_prepend() { - gnome-doc-prepare --automake sed -i -e s:help:: ${S}/Makefile.am sed -i -e s:^#!@PYTHON@:#!/usr/bin/python: ${S}/gnome-panel/gnome-panel-add.in } @@ -43,3 +44,5 @@ FILES_${PN} =+ "${datadir}/gnome* \ ${datadir}/PolicyKit \ ${libdir}/bonobo \ " + +PNBLACKLIST[gnome-panel] ?= "Depends on broken libgweather" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb index c6fb75b8f16a816e053a2d06c2c98fcc6fe88db9..94e0a63295671256fd34cc0a591f96f6545902ec 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb @@ -21,9 +21,12 @@ do_configure_append() { for i in $(find ${S} -name "Makefile") ; do sed -i -e s:"GCONFTOOL = .*/usr/bin/gconftool-2":"GCONFTOOL = /usr/bin/gconftool-2":g $i sed -i -e s:"GCONF_SANITY_CHECK = set":"GCONF_SANITY_CHECK = /usr/libexec/gconf-sanity-check-2":g $i - done + done } RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-ck-connector', '', d)}" FILES_${PN} += "${datadir}/xsessions ${datadir}/icons ${datadir}/gnome ${libdir}/gnome-session/helpers" FILES_${PN}-dbg += "${libexecdir}/gnome-session/helpers/.debug" + +# http://errors.yoctoproject.org/Errors/Details/68621/ +PNBLACKLIST[gnome-session] ?= "BROKEN: fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb index f9b02b1db05b3aa45ad4d1f311e1cad604a0eaad..1c784743fbcfe024e1b03cc7cd11c8f43c7fc5ee 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb @@ -53,8 +53,6 @@ FILES_${PN}-doc += "${datadir}/gtk-doc" PACKAGES_DYNAMIC += "^gnome-vfs-plugin-.*" python populate_packages_prepend () { - print d.getVar('FILES_gnome-vfs', 1) - plugindir = d.expand('${libdir}/gnome-vfs-2.0/modules/') do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') } diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb index 0ac2b20e4e5fe9f4d867b2ac602330f93dd061eb..18e74dae63e1e7bb61110732f5d0cd45dc06ba76 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb @@ -1,7 +1,7 @@ SUMMARY = "GNOME Terminal" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=5b51eba4ba4cafe64073227530c061ed" -DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte gnome-doc-utils intltool-native" +DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte9 gnome-doc-utils intltool-native" PR = "r1" inherit gnome @@ -17,3 +17,6 @@ SRC_URI[archive.sha256sum] = "2c7af2250698b9f9f53c6eaa93211c1118cf2c7e29cbbacfd1 GNOME_COMPRESS_TYPE="bz2" RRECOMMENDS_${PN} += "gnome-common-schemas" + +# http://errors.yoctoproject.org/Errors/Details/68636/ +PNBLACKLIST[gnome-terminal] ?= "BROKEN: fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb index 6bb6816cb73d4076844624557ec3608592e83e55..2caa820812395d6bc6493af87d9aee35c152af46 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb @@ -21,3 +21,5 @@ SRC_URI += "\ SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b" SRC_URI[archive.sha256sum] = "e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29" GNOME_COMPRESS_TYPE="bz2" + +PNBLACKLIST[libgnomecups] ?= "Depends on broken libgnomeui" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb index 9d41914b26648148c3f0f7c500d248ef0fdcc648..ff14616d2a576a059816f5ec80f687e26d345e58 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb @@ -24,3 +24,5 @@ FILES_${PN}-staticdev += "\ ${libdir}/${PN}/${PV}/modules/*.a \ ${libdir}/${PN}/${PV}/modules/*/*.a \ " + +PNBLACKLIST[libgnomeprint] ?= "Depends on broken libgnomecups" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb index 3d3118a92794e91b3f676c85e7081d03005c6e02..5d1d251b1fec230c49f6085b393490b1cff65d96 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb @@ -45,3 +45,5 @@ python populate_packages_prepend () { recursive=True, prepend=True) } + +PNBLACKLIST[gnumeric] ?= "Depends on broken libgnomeprint" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch new file mode 100644 index 0000000000000000000000000000000000000000..d116968a6d356889c7d0fef9c5cdc3fe11a0bba7 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch @@ -0,0 +1,25 @@ +From 48cb878cb724e7a509260f014db6365510b8b541 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 17 May 2016 14:05:29 +0300 +Subject: [PATCH] Drop help directory from build + +It hardcodes the use of xml2po tool form gnome-doc-utils + +Signed-off-by: Alexander Kanavin +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index d056875..3fc4a41 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = m4 copy-n-paste data po gthumb extensions tests help ++SUBDIRS = m4 copy-n-paste data po gthumb extensions tests + + ACLOCAL_AMFLAGS = -I m4 + AMCFLAGS = -fPIC -DPIC +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb index 0bf1321de8dfff33db2849a8b222b6a61c63dda6..5eee7f0654a6f97d762354837db5e8fedd76fd48 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb @@ -2,7 +2,7 @@ SUMMARY = "gThumb is an image viewer and browser for the GNOME Desktop" SECTION = "x11/gnome" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base" +DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base intltool-native" PR = "r4" @@ -14,7 +14,12 @@ SRC_URI[archive.md5sum] = "97fc13221b0c5d80c27a2e25a3a3ac6f" SRC_URI[archive.sha256sum] = "cf809695230ab8892a078be454a42ade865754c72ec1da7c3d74d4310de54f1d" GNOME_COMPRESS_TYPE="bz2" -SRC_URI += "file://parallel.patch" +SRC_URI += "file://parallel.patch \ + file://0001-Drop-help-directory-from-build.patch" + +do_configure_prepend () { + rm -f ${S}/m4/gnome-doc-utils.m4 +} do_install_append () { rm -f ${D}${libdir}/${BPN}/extensions/*.a diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/glib-2.32.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/glib-2.32.patch new file mode 100644 index 0000000000000000000000000000000000000000..f0b878d37689d74b57a8875448721e24139f5d98 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/glib-2.32.patch @@ -0,0 +1,23 @@ +From 8d49a386f467cbf8e0842d2218126f643e50f834 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Sun, 27 Nov 2011 14:24:57 +0000 +Subject: Fix build with glib 2.31: Only glib.h can be #include'd. Fixes bug #664914 + +Upstream-Status: Backport + +--- +diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c +index 1f7a41f..56a9286 100644 +--- a/engines/clearlooks/src/animation.c ++++ b/engines/clearlooks/src/animation.c +@@ -28,7 +28,7 @@ + #include "animation.h" + + #ifdef HAVE_WORKING_ANIMATION +-#include ++#include + + struct _AnimationInfo { + GTimer *timer; +-- +cgit v0.9.0.2 diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/substitute-tests.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/substitute-tests.patch new file mode 100644 index 0000000000000000000000000000000000000000..5c557ba6898ed8ca99f89b4b0033c0b65381a5b6 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/files/substitute-tests.patch @@ -0,0 +1,37 @@ +Upstream-Status: Pending + +Signed-off-by: Marko Lindqvist +diff -Nurd gtk-engines-2.20.2/configure.ac gtk-engines-2.20.2/configure.ac +--- gtk-engines-2.20.2/configure.ac 2010-10-01 15:42:37.000000000 +0300 ++++ gtk-engines-2.20.2/configure.ac 2013-08-20 02:50:27.930510565 +0300 +@@ -166,6 +166,9 @@ + + AC_SUBST(DEVELOPMENT_CFLAGS) + ++AC_SUBST([exported_symbols_tests], [[$(EXPORTED_SYMBOLS_TESTS)]]) ++AC_SUBST([torture_test_tests], [[$(TORTURE_TEST_TESTS)]]) ++ + AM_CONFIG_HEADER([engines/support/config.h]) + + AC_CONFIG_FILES([ +diff -Nurd gtk-engines-2.20.2/test/Makefile.am gtk-engines-2.20.2/test/Makefile.am +--- gtk-engines-2.20.2/test/Makefile.am 2010-09-19 18:18:21.000000000 +0300 ++++ gtk-engines-2.20.2/test/Makefile.am 2013-08-20 02:50:36.842510865 +0300 +@@ -66,7 +66,7 @@ + # Prefix with exported_ + EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES)) + +-TESTS += $(EXPORTED_SYMBOLS_TESTS) ++TESTS += @exported_symbols_tests@ + + + ############################################################# +@@ -88,7 +88,7 @@ + TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES)) + + # Add TORTURE_TEST_ENGINES to list of tests +-TESTS += $(TORTURE_TEST_TESTS) ++TESTS += @torture_test_tests@ + + # Possible other tests: + # - An extensive theme switch tests that loads/unloads the engine diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb new file mode 100644 index 0000000000000000000000000000000000000000..c0ac911a64706395e20cd3ddc09eec4825b6151e --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb @@ -0,0 +1,55 @@ +SUMMARY = "GTK+ theme engines" +HOMEPAGE = "http://www.gnome.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +SECTION = "x11/base" +DEPENDS = "intltool-native gtk+ gettext-native" + +PR = "r3" + +PACKAGES += "${PN}-schemas" +PACKAGES_DYNAMIC += "^gtk-engine-.* ^gtk-theme-.*" + +RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95" +RDEPENDS_gtk-theme-metal = "gtk-engine-metal" +RDEPENDS_gtk-theme-mist = "gtk-engine-mist" +RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine" +RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue" +RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice" +RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial" +RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks" + +FILES_${PN} = "" +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/engines/*.la" +FILES_${PN}-schemas = "${datadir}/gtk-engines/*.xml" + +CFLAGS_prepend = "-DHAVE_ANIMATION " + +RDEPENDS_${PN}-dev = "" + +inherit gnomebase +GNOME_COMPRESS_TYPE="bz2" + +inherit distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" + +# This picks stable releases in the 2.x series (but not 2.90 onwards, +# which were GNOME 3 betas). +UPSTREAM_CHECK_REGEX = "(?P2\.([0-8]*[02468])+(\.\d+)+)" + +python populate_packages_prepend() { + engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines") + themes_root = os.path.join(d.getVar('datadir', True), "themes") + + do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='') + do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='') + # TODO: mark theme packages as arch all +} + +SRC_URI += "file://glib-2.32.patch \ + file://substitute-tests.patch" +SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f" +SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch new file mode 100644 index 0000000000000000000000000000000000000000..f9ae077631c2ca4b3ee15f32a1bf40aa864d8602 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch @@ -0,0 +1,33 @@ +Fix build error with gcc6: +../../gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c: In function 'strdup_strftime': +../../gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c:1951:3: error: format not a string literal, format string not checked [-Werror=format-nonliteral] + tmplen = strftime (tmpbuf, tmpbufsize, locale_format, tm); + ^~~~~~ + +Patch Reference: +https://git.gnome.org/browse/glib/commit/?id=0817af40e8c74c721c30f6ef482b1f53d12044c7 +https://git.gnome.org/browse/glib/commit/?id=8cdbc7fb2c8c876902e457abe46ee18a0b134486 + +Upstream-Status: Pending +Signed-off-by: Yi Zhao + +diff -Nurp gtksourceview-2.10.5.orig/gtksourceview/gtksourceprintcompositor.c gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c +--- gtksourceview-2.10.5.orig/gtksourceview/gtksourceprintcompositor.c 2016-07-01 13:11:43.631173762 +0800 ++++ gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c 2016-07-04 13:54:18.223726343 +0800 +@@ -1913,6 +1913,8 @@ setup_pango_layouts (GtkSourcePrintCompo + * GLIB - Library of useful routines for C programming + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald */ + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + static gchar * + strdup_strftime (const gchar *format, const struct tm *tm) + { +@@ -1982,6 +1984,7 @@ strdup_strftime (const gchar *format, co + + return convbuf; + } ++#pragma GCC diagnostic pop + + static gchar * + evaluate_format_string (GtkSourcePrintCompositor *compositor, diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb index c745e345a83ce6f518c0970af6eabe6a9e34e09d..df37b04a56a42897a0d0c59b91da772098f0039e 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2_2.10.5.bb @@ -4,17 +4,20 @@ HOMEPAGE = "http://projects.gnome.org/gtksourceview/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "gtk+ libxml2" +DEPENDS = "gtk+ libxml2 intltool-native" PNAME = "gtksourceview" S = "${WORKDIR}/${PNAME}-${PV}" -inherit gnomebase lib_package gettext +inherit gnomebase lib_package gettext distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" # overrule SRC_URI from gnome.conf SRC_URI = "${GNOME_MIRROR}/${PNAME}/${@gnome_verdir("${PV}")}/${PNAME}-${PV}.tar.bz2;name=archive \ file://gtk-doc.make \ + file://suppress-string-format-literal-warning.patch \ " SRC_URI[archive.md5sum] = "1219ad1694df136f126507466aeb41aa" SRC_URI[archive.sha256sum] = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e" @@ -26,3 +29,4 @@ do_configure_prepend() { } FILES_${PN} += " ${datadir}/gtksourceview-2.0" + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/files/0001-Add-support-for-libsystemd.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/files/0001-Add-support-for-libsystemd.patch deleted file mode 100644 index 7ec95055821b0dbac8b6d6e970c71047dcc0a378..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/files/0001-Add-support-for-libsystemd.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 39be8b277c666db21965d54d5b72418ce57a450b Mon Sep 17 00:00:00 2001 -From: Michael Biebl -Date: Tue, 19 May 2015 23:38:11 +0200 -Subject: [PATCH] Add support for libsystemd - -In systemd v209 the various libsystemd-* libraries were merged into a -single libsystemd library. So first check for this library and fall back -to libsystemd-login if not found. - -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=749603 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779766 - -Upstream-Status: Applied ---- - configure.ac | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ee3475d..bd5c043 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -264,18 +264,20 @@ dnl ********************************** - dnl *** Check for libsystemd-login *** - dnl ********************************** - --AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without liblibsystemd-login])) -+AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without libsystemd-login])) - msg_libsystemd_login=no - LIBSYSTEMD_LOGIN_LIBS= - LIBSYSTEMD_LOGIN_CFLAGS= - LIBSYSTEMD_LOGIN_REQUIRED=44 - - if test "x$enable_libsystemd_login" != "xno"; then -- PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes) -+ PKG_CHECK_EXISTS([libsystemd], [msg_libsystemd_login=yes], -+ [PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes)]) - - if test "x$msg_libsystemd_login" = "xyes"; then -- PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED]) -- AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if liblibsystemd_login is available]) -+ PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd],, -+ [PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED])]) -+ AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if libsystemd_login is available]) - fi - fi - --- -2.5.0 - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.24.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.28.3.bb similarity index 75% rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.24.2.bb rename to import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.28.3.bb index aa6207019f0b2e963957f747d97f4536ba78357b..746d73c7144efcd5646196cb1660cffc72ecd998 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.24.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.28.3.bb @@ -2,15 +2,14 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" -inherit gnome +inherit gnome bash-completion DEPENDS += "libsecret glib-2.0 gconf intltool-native libgudev udisks2" -SRC_URI[archive.md5sum] = "83ed317eb2a5264715d4273e90a5cfd8" -SRC_URI[archive.sha256sum] = "0949eaedd1df7175f8d7ee2700df8210d1f854b8ee37d963bc32ee7091eeb228" -SRC_URI += " \ - file://0001-Add-support-for-libsystemd.patch \ -" +SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" + +SRC_URI[archive.md5sum] = "d2399a1a217dd5030e8830c7e7c813c2" +SRC_URI[archive.sha256sum] = "458c4cb68570f6ef4a9e152995c62d0057c3e0a07ed64d84c7200cdd22f0bd17" EXTRA_OECONF = " \ --disable-gdu \ @@ -28,6 +27,7 @@ FILES_${PN} += " \ ${datadir}/dbus-1/services \ ${libdir}/gio/modules/*.so \ ${libdir}/tmpfiles.d \ + ${systemd_user_unitdir} \ " RDEPENDS_${PN} = "udisks2" @@ -40,20 +40,18 @@ FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${datadir}/gvfs/mounts/trash.moun RRECOMMENDS_gvfsd-ftp += "openssh-sftp openssh-ssh" -PACKAGES += "${PN}-bash-completion" -FILES_${PN}-bash-completion = "${datadir}/bash-completion" -RDEPENDS_${PN}-bash-completion = "bash-completion" - -PACKAGECONFIG ?= "libgphoto2" +PACKAGECONFIG ?= "libgphoto2 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PACKAGECONFIG[afc] = "--enable-afc, --disable-afc, libimobiledevice libplist" PACKAGECONFIG[archive] = "--enable-archive, --disable-archive, libarchive" PACKAGECONFIG[avahi] = "--enable-avahi, --disable-avahi, avahi" +PACKAGECONFIG[gcr] = "--enable-gcr, --disable-gcr, gcr" PACKAGECONFIG[gtk] = "--enable-gtk, --disable-gtk, gtk+3" PACKAGECONFIG[http] = "--enable-http, --disable-http, libsoup-2.4" PACKAGECONFIG[libmtp] = "--enable-libmtp, --disable-libmtp, libmtp" PACKAGECONFIG[libgphoto2] = "--enable-gphoto2, --disable-gphoto2, libgphoto2" PACKAGECONFIG[samba] = "--enable-samba, --disable-samba, samba" +PACKAGECONFIG[systemd] = "--with-systemduserunitdir=${systemd_user_unitdir},--without-systemduserunitdir,systemd" # needs meta-filesystems PACKAGECONFIG[fuse] = "--enable-fuse, --disable-fuse, fuse" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb index aeec2d31bab2fbbab8f1dec33213628aab6a5fac..71fe545fc2c17e283f6516796e6709e7a4c1854e 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb @@ -20,4 +20,5 @@ FILES_${PN} += "${datadir}/gnome* \ PACKAGES =+ "${PN}-locationdata" FILES_${PN}-locationdata = "${datadir}/libgweather/Locations*" - +# http://errors.yoctoproject.org/Errors/Details/68608/ +PNBLACKLIST[libgweather] ?= "BROKEN: fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl_2.3.21.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl_2.3.21.bb index 4966ea4c7a9613b150f525c70233f11b0e3085b7..7b295063bc137c861c1975cd185c18651ca3bbfa 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl_2.3.21.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libart-lgpl/libart-lgpl_2.3.21.bb @@ -24,5 +24,5 @@ FILES_${PN}-dev += "${bindir}/libart2-config" S = "${WORKDIR}/libart_lgpl-${PV}" do_configure_prepend() { - cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h + cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h } diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb index 2a6f04b4d831837ccd621486197fcfbb145bf4bc..6ec6d46188638f5b5bc14ea1cb7c92c59eb61e9a 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.16.1.bb @@ -21,7 +21,7 @@ do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" } -EXTRA_OECONF += "--disable-goa --disable-tests" +EXTRA_OECONF += "--disable-goa --disable-tests --disable-gtk-doc" SRC_URI[archive.md5sum] = "eb552a8a8482e4231a3d1baf7262e64d" SRC_URI[archive.sha256sum] = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb index 27b8b9ae51d2c8ddc2b8477bf0a028046336f8f8..40caa7b11459b65737c552635ca2fe9add7bd698 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb @@ -12,7 +12,7 @@ SRC_URI[archive.sha256sum] = "b2c63916866485793b87398266dd7778548c1734923c272a94 SRC_URI += "file://0001-libgnome-Makefile.am-allow-deprecated-symbols.patch" GNOME_COMPRESS_TYPE="bz2" -DEPENDS += "libcanberra gconf-native gnome-vfs libbonobo esound" +DEPENDS += "libcanberra gconf-native gnome-vfs libbonobo esound intltool-native" EXTRA_OECONF += "--disable-gtk-doc" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb index 969df3b95779a98471093a10e676a060441f3bd4..f3576579040594b9c8453b8265b2905f179c182d 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" SECTION = "x11/gnome/libs" -DEPENDS = "gconf gtk+ glib-2.0 libxklavier" +DEPENDS = "gconf gtk+ glib-2.0 libxklavier intltool-native" inherit gnome diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch new file mode 100644 index 0000000000000000000000000000000000000000..abc9bdfbab7a8345a081f049a051f763dba41ac7 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui/0001-suppress-string-format-literal-warning-to-fix-build-.patch @@ -0,0 +1,78 @@ +From 6697fcf9d7f53126b442bf19890640b5f88c8aa4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 29 Jul 2016 21:24:20 +0200 +Subject: [PATCH] suppress string format literal warning to fix build with gcc6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +works around: +| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c: In function 'day_selected': +| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c:156:9: error: format not a string literal, format string not checked [-Werror=format-nonliteral] +| strftime_date_format, &mtm) == 0) +| ^~~~~~~~~~~~~~~~~~~~ +| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c: In function 'gnome_date_edit_set_time': +| ../../libgnomeui-2.24.5/libgnomeui/gnome-dateedit.c:704:2: error: format not a string literal, format string not checked [-Werror=format-nonliteral] +| if (strftime (buffer, sizeof (buffer), strftime_date_format, mytm) == 0) +| ^~ + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + libgnomeui/gnome-dateedit.c | 6 ++++++ + libgnomeui/gnome-gconf-ui.c | 3 +++ + 2 files changed, 9 insertions(+) + +diff --git a/libgnomeui/gnome-dateedit.c b/libgnomeui/gnome-dateedit.c +index 69ab699..41541c3 100644 +--- a/libgnomeui/gnome-dateedit.c ++++ b/libgnomeui/gnome-dateedit.c +@@ -152,9 +152,12 @@ day_selected (GtkCalendar *calendar, GnomeDateEdit *gde) + else + mtm.tm_year = year; + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + if (strftime (buffer, sizeof (buffer), + strftime_date_format, &mtm) == 0) + strcpy (buffer, "???"); ++#pragma GCC diagnostic pop + buffer[sizeof(buffer)-1] = '\0'; + + /* FIXME: what about set time */ +@@ -701,8 +704,11 @@ gnome_date_edit_set_time (GnomeDateEdit *gde, time_t the_time) + mytm = localtime (&the_time); + + /* Set the date */ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + if (strftime (buffer, sizeof (buffer), strftime_date_format, mytm) == 0) + strcpy (buffer, "???"); ++#pragma GCC diagnostic pop + buffer[sizeof(buffer)-1] = '\0'; + + str_utf8 = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL); +diff --git a/libgnomeui/gnome-gconf-ui.c b/libgnomeui/gnome-gconf-ui.c +index 43c0f44..a84b2c0 100644 +--- a/libgnomeui/gnome-gconf-ui.c ++++ b/libgnomeui/gnome-gconf-ui.c +@@ -180,12 +180,15 @@ error_idle_func (gpointer data) + "configuration settings may not work properly."); + } + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + dialog = gtk_message_dialog_new (NULL /* parent */, + 0 /* flags */, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + fmt, + gnome_program_get_human_readable_name(gnome_program_get())); ++#pragma GCC diagnostic pop + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + g_signal_connect (dialog, "response", + G_CALLBACK (gtk_widget_destroy), +-- +2.5.5 + diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb deleted file mode 100644 index 6fb2786b18f17fac35c925ed117f034d02470aca..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.3.bb +++ /dev/null @@ -1,7 +0,0 @@ -require libgnomeui.inc - -PR = "r1" - -SRC_URI[archive.md5sum] = "ceab6f4370581d1a03c09f15cc103099" -SRC_URI[archive.sha256sum] = "04c81f3bb5a337cdf3ed1230916f82d29857ee95eb884f58dd2f5c6860efe803" -GNOME_COMPRESS_TYPE="bz2" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb similarity index 67% rename from import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc rename to import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb index 26997b851d4a0032d44951eb66d5691942a1fd2c..94b00c133066df96db4fedbeb06ae4ea009a8735 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomeui_2.24.5.bb @@ -5,20 +5,25 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" SECTION = "x11/gnome/libs" DEPENDS = "libgnome libgnomecanvas libbonoboui libgnome-keyring intltool-native" -inherit gnome +inherit gnome FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \ ${libdir}/libglade/*/lib*.so \ ${datadir}/pixmaps/gnome-about-logo.png" FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la" FILES_${PN}-staticdev += "${libdir}/libglade/*/*.a" -FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/" -SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch" +SRC_URI += " \ + file://0001-suppress-string-format-literal-warning-to-fix-build-.patch \ + file://gnome-stock-pixbufs.h \ + file://no-pixbuf-csource.patch \ +" +SRC_URI[archive.md5sum] = "d4bb506b1916015323928faab5aa708b" +SRC_URI[archive.sha256sum] = "ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f" +GNOME_COMPRESS_TYPE="bz2" EXTRA_OECONF = "--disable-gtk-doc" do_configure_prepend() { install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h } - diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb index be79ec14ab0347c51b0cf733033c0af386277ccc..602d5134c86af7102fff8313b4013230b06bf30d 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.29.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dc7371b50816c96e145fa0f8ade8e24d \ SECTION = "libs" -DEPENDS= "libxml2 bzip2 glib-2.0 zlib" +DEPENDS= "libxml2 bzip2 glib-2.0 zlib intltool-native" inherit autotools pkgconfig gnome gconf gobject-introspection @@ -24,6 +24,6 @@ EXTRA_OECONF = "\ --with-bz2 \ " -RDEPENDS_${PN} = "gconf" +RDEPENDS_${PN} = "gconf" FILES_${PN} += "${datadir}/thumbnailers" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb index d273e6c1e69f8e9a4e12c82c04057646d3905c2b..83e84687ac521ef277b8865106a44e6bc7994255 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck_2.31.0.bb @@ -8,7 +8,9 @@ DEPENDS = "intltool-native gtk+ gdk-pixbuf-native libxres" PACKAGECONFIG ??= "startup-notification" PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" -inherit gnomebase gobject-introspection +inherit gnomebase gobject-introspection distro_features_check +REQUIRED_DISTRO_FEATURES = "x11" + GNOME_COMPRESS_TYPE = "xz" SRC_URI[archive.md5sum] = "f03e1139296e2a3a92e3b65a3080cd32" SRC_URI[archive.sha256sum] = "83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb index 384841a8d3591f4f4d4155c059876e6cb705e2f0..23e6603f7bd6b125fad4a1a5391d7c98004caba5 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.3.bb @@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" DEPENDS = "xkbcomp gtk+ iso-codes libxi libxml2" GNOME_COMPRESS_TYPE = "xz" +inherit gnomebase gettext gobject-introspection distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" inherit gnomebase gettext gobject-introspection SRC_URI[archive.md5sum] = "290ea2a8abc40f78a3a16bdae6f02808" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb index 992596eaf31d44f7c6db712b2c3b702a466cc15a..47b09804550797c955a15ae2aacd585d9d168e89 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb @@ -11,3 +11,6 @@ SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08" SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e" PR = "r3" + +# tasks-0.19/libkoto/koto-utils.c:81:3: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] +PNBLACKLIST[tasks] ?= "Fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_git.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_git.bb index 6a06da336391a14672b4a8eb550e2132f15a5fd4..32d2ac62ea559835cfaba708cd6ed74465015096 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_git.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/pimlico/tasks_git.bb @@ -7,3 +7,6 @@ PV = "0.13+git${SRCPV}" PR = "r3" S = "${WORKDIR}/git" + +# ../../git/libkoto/koto-utils.c:81:3: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] +PNBLACKLIST[tasks] ?= "Fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb index 1693f37cb40026e727c37fab55953957d1cd02b3..745b55805f93781a2c8b3b3171af0738d88d4742 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb @@ -34,7 +34,7 @@ do_configure() { do_install_append () { install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/ } INITSCRIPT_NAME = "system-tools-backends" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb index 3aa743e0c30ecaf442c40e7fbf509615aa2664c2..8c39ad7759c0357c3dc1646e142b60abe6a1bb19 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb @@ -27,7 +27,7 @@ FILES_${PN} += "${datadir}/themes ${datadir}/icons" SRC_URI += "file://iconpath-option.patch \ file://drop-localedir-override.patch \ -" +" SRC_URI[archive.md5sum] = "41db9e3cb25d35af2675c599e67944d1" SRC_URI[archive.sha256sum] = "8601ee24c2e096593221cbd6ebdb6686042225a03c02a01c0d67c163f9febd1a" GNOME_COMPRESS_TYPE="bz2" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch b/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch new file mode 100644 index 0000000000000000000000000000000000000000..0bb5dee80fecb2b6036596be1cf27b4af85d8591 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/files/fix-no-atspi-compile.patch @@ -0,0 +1,30 @@ +diff --git a/src/florence.c b/src/florence.c +index b27c31b..feadefe 100644 +--- a/src/florence.c ++++ b/src/florence.c +@@ -44,12 +44,6 @@ + /* exit signal */ + static int flo_exit=FALSE; + +-#ifdef ENABLE_AT_SPI2 +-void flo_check_show (struct florence *florence, AtspiAccessible *obj); +-#else +-void flo_check_show (struct florence *florence, Accessible *obj); +-#endif +- + /* Called on destroy event (systray quit or close window) */ + void flo_destroy (void) + { +@@ -61,6 +55,12 @@ void flo_destroy (void) + } + + #ifdef AT_SPI ++#ifdef ENABLE_AT_SPI2 ++void flo_check_show (struct florence *florence, AtspiAccessible *obj); ++#else ++void flo_check_show (struct florence *florence, Accessible *obj); ++#endif ++ + /* Called to destroy the icon */ + void flo_icon_destroy (GtkWidget *widget, gpointer user_data) + { diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/florence_0.5.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/florence_0.5.4.bb similarity index 62% rename from import-layers/meta-openembedded/meta-gnome/recipes-support/florence/florence_0.5.1.bb rename to import-layers/meta-openembedded/meta-gnome/recipes-support/florence/florence_0.5.4.bb index 71014f0879ea99b29a1a2d39cb7a002676091ec3..dfdb6bdb8c4d37a6ab194f5d8fa83af5aaa9cc07 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/florence_0.5.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-support/florence/florence_0.5.4.bb @@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" PR = "r1" -DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native gnome-doc-utils libnotify" +DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native gnome-doc-utils libnotify gstreamer" -SRC_URI = "${SOURCEFORGE_MIRROR}/florence/florence/${PV}/florence-${PV}.tar.bz2 \ - file://0001-Fix-glib-includes.patch" -SRC_URI[md5sum] = "56d12e5b47c100d9df172aa5ddc0f609" -SRC_URI[sha256sum] = "7b06ed84ef2b7b22d8d2cf0c7d013a05409bd82028240ac8719a68b192d5bc62" +SRC_URI = "${SOURCEFORGE_MIRROR}/florence/florence/${PV}-gtk2/florence-${PV}.tar.bz2 \ + file://fix-no-atspi-compile.patch" +SRC_URI[md5sum] = "8d5c2367a28485bfcf577650b0badab7" +SRC_URI[sha256sum] = "26d33aa20d5fbf34ceeded4c41cb922d2988b6082e33d9acc46dd7bfe56d31a1" inherit gettext autotools gconf pkgconfig -EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet" +EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb b/import-layers/meta-openembedded/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb index 919aa7bca0362525f6915837cbe3377b404905c0..ab20460f187bd459cfd9554e35df0b5318a38ebf 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb @@ -47,3 +47,5 @@ python populate_packages_prepend () { do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) } +# | ../../goffice-0.10.1/goffice/math/go-complex.c:75:3: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] +PNBLACKLIST[goffice] ?= "BROKEN: fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch b/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch new file mode 100644 index 0000000000000000000000000000000000000000..fab3371f0f51d1eb165ae27837af82b8d09e91a0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch @@ -0,0 +1,126 @@ + src/tracker-extract/tracker-extract-gif.c | 36 +++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) +--- a/src/tracker-extract/tracker-extract-gif.c ++++ a/src/tracker-extract/tracker-extract-gif.c +@@ -75,6 +75,39 @@ + return (GIF_OK); + } + ++#if GIFLIB_MAJOR >= 5 ++static inline void ++gif_error (const gchar *action, int err) ++{ ++ const char *str = GifErrorString (err); ++ if (str != NULL) { ++ g_message ("%s, error: '%s'", action, str); ++ } else { ++ g_message ("%s, undefined error %d", action, err); ++ } ++} ++#else /* GIFLIB_MAJOR >= 5 */ ++static inline void print_gif_error() ++{ ++#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4) ++ const char *str = GifErrorString (); ++ if (str != NULL) { ++ g_message ("GIF, error: '%s'", str); ++ } else { ++ g_message ("GIF, undefined error"); ++ } ++#else ++ PrintGifError(); ++#endif ++} ++#endif /* GIFLIB_MAJOR >= 5 */ ++ ++/* giflib 5.1 changed the API of DGifCloseFile to take two arguments */ ++#if !defined(GIFLIB_MAJOR) || \ ++ !(GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)) ++#define DGifCloseFile(a, b) DGifCloseFile(a) ++#endif ++ + static void + read_metadata (TrackerSparqlBuilder *preupdate, + TrackerSparqlBuilder *metadata, +@@ -100,14 +133,22 @@ + ExtBlock extBlock; + + if (DGifGetRecordType(gifFile, &RecordType) == GIF_ERROR) { +- PrintGifError(); ++#if GIFLIB_MAJOR < 5 ++ print_gif_error (); ++#else /* GIFLIB_MAJOR < 5 */ ++ gif_error ("Could not read next GIF record type", gifFile->Error); ++#endif /* GIFLIB_MAJOR < 5 */ + return; + } + + switch (RecordType) { + case IMAGE_DESC_RECORD_TYPE: + if (DGifGetImageDesc(gifFile) == GIF_ERROR) { +- PrintGifError(); ++#if GIFLIB_MAJOR < 5 ++ print_gif_error(); ++#else /* GIFLIB_MAJOR < 5 */ ++ gif_error ("Could not get GIF record information", gifFile->Error); ++#endif /* GIFLIB_MAJOR < 5 */ + return; + } + +@@ -117,7 +158,11 @@ + framedata = g_malloc (framewidth*frameheight); + + if (DGifGetLine(gifFile, framedata, framewidth*frameheight)==GIF_ERROR) { +- PrintGifError(); ++#if GIFLIB_MAJOR < 5 ++ print_gif_error(); ++#else /* GIFLIB_MAJOR < 5 */ ++ gif_error ("Could not load a block of GIF pixes", gifFile->Error); ++#endif /* GIFLIB_MAJOR < 5 */ + return; + } + +@@ -593,6 +638,9 @@ + gchar *filename, *uri; + GFile *file; + int fd; ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + + preupdate = tracker_extract_info_get_preupdate_builder (info); + metadata = tracker_extract_info_get_metadata_builder (info); +@@ -617,8 +665,14 @@ + return FALSE; + } + ++#if GIFLIB_MAJOR < 5 + if ((gifFile = DGifOpenFileHandle (fd)) == NULL) { +- PrintGifError (); ++ print_gif_error (); ++#else /* GIFLIB_MAJOR < 5 */ ++ if ((gifFile = DGifOpenFileHandle (fd, &err)) == NULL) { ++ gif_error ("Could not open GIF file with handle", err); ++#endif /* GIFLIB_MAJOR < 5 */ ++ g_free (filename); + close (fd); + return FALSE; + } +@@ -637,10 +691,15 @@ + g_string_free (where, TRUE); + + g_free (uri); +- ++#if GIFLIB_MAJOR < 5 + if (DGifCloseFile (gifFile) != GIF_OK) { +- PrintGifError (); ++ print_gif_error (); ++ } ++#else /* GIFLIB_MAJOR < 5 */ ++ if (DGifCloseFile (gifFile, NULL) != GIF_OK) { ++ gif_error ("Could not close GIF file", gifFile->Error); + } ++#endif /* GIFLIB_MAJOR < 5 */ + + return TRUE; + } diff --git a/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb b/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb index c52d95e976b4ab5cfa0a51f1a10f04debac2cd56..7025280b8a338a053bf0a4730c8a07fbfe3eac1e 100644 --- a/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb +++ b/import-layers/meta-openembedded/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb @@ -1,9 +1,11 @@ DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly." LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=ee31012bf90e7b8c108c69f197f3e3a4" -DEPENDS = "file gstreamer dbus libexif gettext sqlite3 icu gst-plugins-base libgnome-keyring poppler tiff enca libgsf libunistring giflib taglib bzip2 upower gtk+3 libgee networkmanager" +DEPENDS = "file gstreamer dbus libexif gettext sqlite3 icu gst-plugins-base libgnome-keyring poppler tiff enca libgsf libunistring giflib taglib bzip2 upower gtk+3 libgee networkmanager intltool-native" RDEPENDS_${PN} += " gvfs gsettings-desktop-schemas" + +RDEPENDS_${PN}-nautilus-extension += "nautilus" HOMEPAGE = "http://projects.gnome.org/tracker/" PR = "r7" @@ -13,7 +15,8 @@ inherit autotools pkgconfig gnomebase gettext gsettings systemd gobject-introspe VER_DIR = "${@gnome_verdir("${PV}")}" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \ file://enable-sqlite-crosscompile.patch \ - file://fix-removable-media-detection.patch \ + file://fix-removable-media-detection.patch \ + file://giflib5-support.patch \ file://90tracker \ file://tracker-store.service \ file://tracker-miner-fs.service \ @@ -80,3 +83,6 @@ FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so" SRC_URI[md5sum] = "f3a871beeebf86fd752863ebd22af9ac" SRC_URI[sha256sum] = "9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1" + +# http://errors.yoctoproject.org/Errors/Details/81007/ +PNBLACKLIST[tracker] ?= "BROKEN: fails to build with new binutils-2.27" diff --git a/import-layers/meta-openembedded/meta-gpe/README b/import-layers/meta-openembedded/meta-gpe/README index 70055af5072490833ba428a69730e011dd890477..af7d98f01573a4dde8c373dfc7f8329dba6260da 100644 --- a/import-layers/meta-openembedded/meta-gpe/README +++ b/import-layers/meta-openembedded/meta-gpe/README @@ -1,17 +1,18 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: krogoth +branch: morty revision: HEAD URI: git://github.com/openembedded/meta-oe.git -branch: krogoth +branch: morty revision: HEAD -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gpe][krogoth]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gpe]' in the subject' When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gpe][krogoth][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-gpe][PATCH' -krogoth Branch Maintainer: +morty branch maintainer(s): Armin Kuster + diff --git a/import-layers/meta-openembedded/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb b/import-layers/meta-openembedded/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb index df774eed068f362ad942839a2c87d5551a8f928f..87a3ed0dec277fb32438eea47b6c525633133db1 100644 --- a/import-layers/meta-openembedded/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb +++ b/import-layers/meta-openembedded/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb @@ -4,7 +4,7 @@ SECTION = "gpe/libs" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499" -DEPENDS = "gtk+ cairo libxinerama libxcomposite libxrender" +DEPENDS = "gtk+ cairo libxinerama libxcomposite libxrender" PR = "r5" inherit gpe pkgconfig autotools gtk-doc @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "f96d30c09b0395ea4e146730fd52d9ea303b619bb139051d9f12d3f868 GPE_TARBALL_SUFFIX = "bz2" -EXTRA_OECONF = "--enable-cairo" +EXTRA_OECONF = "--enable-cairo --disable-gtk-doc" LDFLAGS += " -L${STAGING_LIBDIR}" PACKAGES =+ "${PN}-bin" diff --git a/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-cflags-fribidi.patch b/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-cflags-fribidi.patch new file mode 100644 index 0000000000000000000000000000000000000000..e72fa8cf2f578d59e2f301aa53eb327a6dd0a50d --- /dev/null +++ b/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-cflags-fribidi.patch @@ -0,0 +1,11 @@ +--- fbreader-0.12.10/makefiles/config.mk.orig 2016-05-03 11:11:07.259734561 -0400 ++++ fbreader-0.12.10/makefiles/config.mk 2016-05-03 11:11:37.447735786 -0400 +@@ -38,7 +38,7 @@ + LDFLAGS += -pg + endif + +-ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include ++ZINCLUDE = $(shell pkg-config --cflags fribidi) -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include + + ZLSHARED ?= yes + diff --git a/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch b/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch new file mode 100644 index 0000000000000000000000000000000000000000..97ab4d315dd02eec03548f3e7848b4a06ab67133 --- /dev/null +++ b/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader-0.12.10/fix-return-code-gcc6.patch @@ -0,0 +1,11 @@ +--- fbreader-0.12.10/fbreader/src/database/booksdb/BooksDB.cpp.orig 2016-06-08 14:54:04.206196501 -0400 ++++ fbreader-0.12.10/fbreader/src/database/booksdb/BooksDB.cpp 2016-06-08 14:54:17.686196322 -0400 +@@ -145,7 +145,7 @@ + + myFindFileId->setFileName(fileName); + if (!myFindFileId->run()) { +- return false; ++ return 0; + } + ((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId(); + shared_ptr reader = myLoadBook->executeReader(); diff --git a/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb b/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb index e9ead0f248eb5601e417dd1061d1c4c330b07f64..f8ecc934d01eaaf8891ce0db7d3faa5d6cc11da9 100644 --- a/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb +++ b/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader_0.12.10.bb @@ -9,7 +9,9 @@ PR = "r1" SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz \ file://Makefile.patch \ -file://gcc45.patch" +file://gcc45.patch \ +file://fix-cflags-fribidi.patch \ +file://fix-return-code-gcc6.patch" # Set the defaults READER_RESOLUTION ?= "1024x600" diff --git a/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader_git.bb b/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader_git.bb index 763889a5611b28dd9866553afedd561e0afcfce0..1ed65849a4258ee18865451f7bc0ebfbce8fd32f 100644 --- a/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader_git.bb +++ b/import-layers/meta-openembedded/meta-gpe/recipes-support/fbreader/fbreader_git.bb @@ -40,3 +40,6 @@ do_configure() { do_install() { oe_runmake install DESTDIR=${D} RESOLUTION=${READER_RESOLUTION} } + +# http://errors.yoctoproject.org/Errors/Details/68618/ +PNBLACKLIST[fbreader] ?= "BROKEN: fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-initramfs/README b/import-layers/meta-openembedded/meta-initramfs/README index ea03a1d06ecd177b87b01edc52f9e90cbcf42640..906a85983a7768ddc7943ce76c2fbf6e64640670 100644 --- a/import-layers/meta-openembedded/meta-initramfs/README +++ b/import-layers/meta-openembedded/meta-initramfs/README @@ -12,7 +12,7 @@ Dependencies This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: krogoth +branch: morty revision: HEAD @@ -20,12 +20,12 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org -with '[meta-initramfs][krogoth]' in the subject. +with '[meta-initramfs]' in the subject. When sending single patches, please using something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-initramfs][krogoth][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-initramfs][morty][PATCH' -krogoth Branch Maintainer: +morty branch maintainer(s): Armin Kuster diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb b/import-layers/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb index df97511892a6ef46e9c99ae834abf4827d65eb49..da3023fe17268cb5fac84e1a030fe42c3cd4e564 100644 --- a/import-layers/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb +++ b/import-layers/meta-openembedded/meta-initramfs/recipes-bsp/images/initramfs-kexecboot-klibc-image.bb @@ -5,3 +5,9 @@ SUMMARY = "Initramfs image for kexecboot kernel (klibc-static binaries)" # We really need just kexecboot, kexec and ubiattach # statically compiled against klibc IMAGE_INSTALL = "kexecboot-klibc kexec-klibc ubiattach-klibc" + +python () { + if d.getVar('TARGET_ARCH', True) == "nios2": + raise bb.parse.SkipPackage("'nios2' not supported arch") +} + diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb b/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb index c978263a1b08479b4e6135f6861059f284372edf..c806370b7e07d89f5b128cd415694b781e8e9fe3 100644 --- a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb +++ b/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_git.bb @@ -57,5 +57,5 @@ RDEPENDS_${PN} = "findutils cpio util-linux-blkid util-linux-getopt util-linux b RRECOMMENDS_${PN} = " \ kernel-modules \ busybox \ - coreutils \ + coreutils \ " diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch b/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch new file mode 100644 index 0000000000000000000000000000000000000000..d936249be81021757c3a68d65ed896b49bf6e1f8 --- /dev/null +++ b/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/grubby-rename-grub2-editenv-to-grub-editenv.patch @@ -0,0 +1,69 @@ +From 0841706a5b5280e501c8e392c70c466c5fbcf0aa Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Tue, 4 Aug 2015 23:54:41 -0700 +Subject: [PATCH] rename grub2-editenv to grub-editenv + +We don't use the name grub2-editenv for grub2. + +Upstream-Status: Inappropriate + +Signed-off-by: Jackie Huang +--- + grubby.c | 4 ++-- + test.sh | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/grubby.c b/grubby.c +index d4ebb86..47a1a15 100644 +--- a/grubby.c ++++ b/grubby.c +@@ -290,7 +290,7 @@ static char *grub2GetEnv(struct configFileInfo *info, char *name) + char *s = NULL; + char *ret = NULL; + char *envFile = info->envFile ? info->envFile : "/boot/grub2/grubenv"; +- int rc = asprintf(&s, "grub2-editenv %s list | grep '^%s='", envFile, name); ++ int rc = asprintf(&s, "grub-editenv %s list | grep '^%s='", envFile, name); + + if (rc < 0) + return NULL; +@@ -361,7 +361,7 @@ static int grub2SetEnv(struct configFileInfo *info, char *name, char *value) + if (!value) + return -1; + +- rc = asprintf(&s, "grub2-editenv %s set '%s=%s'", envFile, name, value); ++ rc = asprintf(&s, "grub-editenv %s set '%s=%s'", envFile, name, value); + free(value); + if (rc <0) + return -1; +diff --git a/test.sh b/test.sh +index 6379698..f738388 100755 +--- a/test.sh ++++ b/test.sh +@@ -574,7 +574,7 @@ if [ "$testgrub2" == "y" ]; then + --title='title' --initrd=/boot/new-initrd --boot-filesystem=/boot/ \ + --copy-default + commandTest "saved_default output" \ +- "grub2-editenv test/grub2-support_files/env_temp list" \ ++ "grub-editenv test/grub2-support_files/env_temp list" \ + "saved_entry=Linux, with Fedora 2.6.38.8-32.fc15.x86_64" + + testing="GRUB2 add kernel with default=saved_entry and a terrible title" +@@ -587,13 +587,13 @@ if [ "$testgrub2" == "y" ]; then + testing="GRUB2 set default with default=saved_entry and a terrible name" + grub2Test grub2.9 add/g2-1.9 --env grubenv.1 --set-default-index=0 + commandTest "saved_default output" \ +- "grub2-editenv test/grub2-support_files/env_temp list" \ ++ "grub-editenv test/grub2-support_files/env_temp list" \ + 'saved_entry=Fedora (3.10.3-300.fc19.x86_64) 19 (Schrödinger’s Cat)' + + testing="GRUB2 set default with default=saved_entry" + grub2Test grub2.8 add/g2-1.8 --env grubenv.1 --set-default-index=0 + commandTest "saved_default output" \ +- "grub2-editenv test/grub2-support_files/env_temp list" \ ++ "grub-editenv test/grub2-support_files/env_temp list" \ + "saved_entry=title" + + testing="GRUB2 --default-index with default=saved_entry" +-- +2.3.5 + diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/run-ptest b/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/run-ptest new file mode 100644 index 0000000000000000000000000000000000000000..b06ac59460fbc4348522f442951851b7526f09c0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +./test.sh -v diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb b/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb new file mode 100644 index 0000000000000000000000000000000000000000..0e93790855a88094da6a54cedacb881882a01417 --- /dev/null +++ b/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/grubby/grubby_8.40.bb @@ -0,0 +1,37 @@ +SUMMARY = "A command line tool for updating and displaying info about boot loaders" +DESCRIPTION = "grubby is a command line tool for updating and displaying information \ +about the configuration files for the grub, lilo, elilo (ia64), yaboot (powerpc) and \ +zipl (s390) boot loaders. It is primarily designed to be used from scripts which install \ +new kernels and need to find information about the current boot environment. \ +" +LICENSE = "GPLv2+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" + +DEPENDS = "popt util-linux" + +SRC_URI = "https://github.com/rhinstaller/${BPN}/archive/${PV}-1.tar.gz;downloadfilename=${BPN}-${PV}-1.tar.gz \ + file://grubby-rename-grub2-editenv-to-grub-editenv.patch \ + file://run-ptest \ +" + +SRC_URI[md5sum] = "1005907b275d6d93368d045274537d86" +SRC_URI[sha256sum] = "85f1c678484f74c8978e8643451594967defce463a86c35cb1ee56d12767a9df" + +S = "${WORKDIR}/${BPN}-${PV}-1" + +RDEPENDS_${PN} += "dracut" + +inherit autotools-brokensep ptest + +EXTRA_OEMAKE = "-e 'CC=${CC}' 'LDFLAGS=${LDFLAGS}'" + +do_install_ptest() { + install -d ${D}${PTEST_PATH} + cp -r ${S}/test ${S}/test.sh ${D}${PTEST_PATH} + sed -i 's|./grubby|grubby|' ${D}${PTEST_PATH}/test.sh +} + +RDEPENDS_${PN}-ptest = "util-linux-getopt bash" + +COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' diff --git a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc b/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc index 65ee8681ea71fcffc0d79e5fee527e6d8e61c79a..f00e31a69a37257ad8c540af758e8446da86b5d6 100644 --- a/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/import-layers/meta-openembedded/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -27,6 +27,7 @@ EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ 'KLIBCLIBGCC=${STAGING_DIR_TARGET}${libdir}/${TARGET_SYS}/*/libgcc.a' \ 'prefix=${exec_prefix}' \ 'INSTALLROOT=${D}' \ + 'INSTALLDIR=${libdir}/klibc' \ 'SHLIBDIR=${libdir}' \ " diff --git a/import-layers/meta-openembedded/meta-multimedia/README b/import-layers/meta-openembedded/meta-multimedia/README index 936461876bf3d71b1b8010438d931413e52a3d78..c540bed6f9bdd155626b8f2509f62da6f0ee76c1 100644 --- a/import-layers/meta-openembedded/meta-multimedia/README +++ b/import-layers/meta-openembedded/meta-multimedia/README @@ -1,20 +1,20 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: krogoth +branch: morty revision: HEAD URI: git://github.com/openembedded/meta-oe.git layers: meta-oe, meta-ruby -branch: krogoth +branch: morty revision: HEAD -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia][krogoth]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia]' in the subject' When sending single patches, please use something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-multimedia][krogoth][PATCH +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-multimedia][morty][PATCH You are encouraged to fork the mirror on github https://github.com/openembedded/meta-oe/ to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like gitorious, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch ' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -krogoth Branch Maintainer: +morty branch maintainer(s): Armin Kuster diff --git a/import-layers/meta-openembedded/meta-multimedia/classes/juce.bbclass b/import-layers/meta-openembedded/meta-multimedia/classes/juce.bbclass new file mode 100644 index 0000000000000000000000000000000000000000..715282fd15c1b18f23a97dbe86079d1366dc62c3 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/classes/juce.bbclass @@ -0,0 +1,48 @@ +inherit pkgconfig + +JUCE_MODULES ??= " \ + juce_core \ + juce_events \ + ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'juce_audio_devices', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'juce_graphics juce_gui_basics', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'juce_opengl', '', d)} \ +" +JUCE_X11_DEPS = "libx11 libxext libxinerama libxrandr libxcursor" + +PACKAGECONFIG_prepend= "${JUCE_MODULES} " +PACKAGECONFIG[juce_core] = ",,curl," +PACKAGECONFIG[juce_events] = ",,libx11," +PACKAGECONFIG[juce_audio_devices] = ",,alsa-lib," +PACKAGECONFIG[juce_graphics] = ",,${JUCE_X11_DEPS} freetype," +PACKAGECONFIG[juce_gui_basics] = ",,${JUCE_X11_DEPS}," +PACKAGECONFIG[juce_opengl] = ",,virtual/libgl," + +DEPENDS_prepend = "projucer-native " + +export OE_JUCE_PROJUCER = "${STAGING_BINDIR_NATIVE}/Projucer" + +juce_do_configure() { + if [ -z "${JUCE_JUCERS}" ]; then + JUCERS=`find . -type f -iname "*.jucer"` && IFS=$'\n' + else + JUCERS="${JUCE_JUCERS}" + fi + + if [ -z "$JUCERS" ]; then + die "JUCE_JUCERS not set and no profiles found in $PWD" + fi + + # XXX: Hack for Projucer, since it requires a X Display even when running in + # console mode. This will be fixed in future. Most cases DISPLAY=:0 will just work, + # the only case why we have JUCE_DISPLAY variable, is in case of a build system, + # such as jenkins, that can have multiple virtual X server running for each build. + test -z "${JUCE_DISPLAY}" && export DISPLAY=:0 || export DISPLAY=${JUCE_DISPLAY} + + for i in $JUCERS; do + ${OE_JUCE_PROJUCER} --resave $i + done +} + +EXPORT_FUNCTIONS do_configure + +addtask configure after do_unpack do_patch before do_compile diff --git a/import-layers/meta-openembedded/meta-multimedia/conf/layer.conf b/import-layers/meta-openembedded/meta-multimedia/conf/layer.conf index 64a0a443c2bc406a9f10abe2f41663f55922f954..d68b13f7fe9eadcd582fc8eec884260055ec2e38 100644 --- a/import-layers/meta-openembedded/meta-multimedia/conf/layer.conf +++ b/import-layers/meta-openembedded/meta-multimedia/conf/layer.conf @@ -23,3 +23,9 @@ BBFILE_PATTERN_multimedia-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_multimedia-layer = "6" +# This should only be incremented on significant changes that will +# cause compatibility issues with other layers +LAYERVERSION_multimedia-layer = "1" + +LAYERDEPENDS_multimedia-layer = "core" + diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.10.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.10.bb index 821b5a3c6956874c38f9f09d19967e5e6a2fcdba..eda70e82bfc8747046642860a9417a97a6889fe7 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.10.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.10.bb @@ -2,7 +2,7 @@ SUMMARY = "Tools for GUPnP" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://src/network-light/main.c;beginline=1;endline=21;md5=2c39b3a000495dabd4932f231c7efed8" -DEPENDS = "gupnp gupnp-av gtk+3" +DEPENDS = "gupnp gupnp-av gtk+3 intltool-native" RRECOMMENDS_${PN} = "adwaita-icon-theme" SRC_URI = "http://download.gnome.org/sources/${BPN}/0.8/${BPN}-${PV}.tar.xz" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb index 5cb7d4330eea94b3b0411890ef6875c719cb3cce..79ff6e2b00f19f0d5b7c9035cccb59b76ee55913 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb @@ -9,7 +9,7 @@ LICENSE = "LGPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://src/rygel/rygel-main.vala;endline=27;md5=99324118da4c012d25edae2f779ae9b3" -DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 gstreamer1.0-plugins-base ossp-uuid libgee libsoup-2.4 libmediaart-2.0 libunistring sqlite3" +DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 gstreamer1.0-plugins-base ossp-uuid libgee libsoup-2.4 libmediaart-2.0 libunistring sqlite3 intltool-native" RDEPENDS_${PN} = "gstreamer1.0-plugins-base-playback shared-mime-info" RRECOMMENDS_${PN} = "rygel-plugin-media-export" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb index 1c0d6867dc300b38045f89fade942ea66cd3d2e6..0b4b72ddac3ead7dc93239156d63a5ef0a6fca39 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-dvb/dvb-apps/dvb-apps_1.1.1.bb @@ -4,20 +4,38 @@ SUMMARY = "Linux DVB API applications and utilities" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "hg://linuxtv.org/hg;module=dvb-apps;protocol=http" -SRCREV = "3fc7dfa68484" +DEPENDS = "v4l-utils-native" + +SRC_URI = " \ + hg://linuxtv.org/hg;module=dvb-apps;protocol=http;name=apps \ + git://linuxtv.org/git/dtv-scan-tables.git;protocol=http;destsuffix=dvb-apps/initial-scan-tables;name=scantables \ + " +SRCREV_apps = "3d43b280298c" +SRCREV_scantables = "ceb11833b35f05813b1f0397a60e0f3b99430aab" +SRCREV_FORMAT = "apps_scantables" S = "${WORKDIR}/${BPN}" +TARGET_CC_ARCH += "${LDFLAGS}" +EXTRA_OEMAKE = "VERSION_FILE='${STAGING_INCDIR}/linux/dvb/version.h'" + do_configure() { - sed -i -e s:/usr/include:${STAGING_INCDIR}:g util/av7110_loadkeys/generate-keynames.sh + sed -i -e s:/usr/include:${STAGING_INCDIR}:g util/av7110_loadkeys/generate-keynames.sh +} + +do_compile_append() { +# dvb-apps only support DVBAPI v3, so generate them from the DVBAPI v5 downloaded files + make -C initial-scan-tables clean + make -C initial-scan-tables dvbv3 } do_install() { make DESTDIR=${D} install +# dvb-apps only support DVBAPI v3, so only install the generated DVBAPI v3 files + make -C initial-scan-tables DATADIR=${D}/${datadir} DVBV3DIR=dvb install_v3 + install -d ${D}/${bindir} install -d ${D}/${docdir}/dvb-apps - install -d ${D}/${docdir}/dvb-apps/scan install -d ${D}/${docdir}/dvb-apps/szap chmod a+rx ${D}/${libdir}/*.so* @@ -63,6 +81,9 @@ PACKAGES =+ "dvb-evtest dvb-evtest-dbg \ dvb-femon dvb-femon-dbg \ dvb-zap-data" +# Expose the packages from the above spitting +PACKAGES =+ "libdvbapi libdvbcfg libdvben50221 \ + libesg libucsi libdvbsec" FILES_${PN} = "${bindir} ${datadir}/dvb" FILES_${PN}-doc = "" @@ -86,7 +107,7 @@ FILES_dvbnet-dbg = "${bindir}/.debug/dvbnet" FILES_dvb-scan = "${bindir}/*scan " FILES_dvb-scan-dbg = "${bindir}/.debug/*scan" -FILES_dvb-scan-data = "${docdir}/dvb-apps/scan" +FILES_dvb-scan-data = "${datadir}/dvb" FILES_dvb-azap = "${bindir}/azap" FILES_dvb-azap-dbg = "${bindir}/.debug/azap" @@ -104,3 +125,10 @@ FILES_dvb-femon = "${bindir}/femon" FILES_dvb-femon-dbg = "${bindir}/.debug/femon" FILES_dvb-zap-data = "${docdir}/dvb-apps/szap" + +RDEPENDS_dvbdate =+ "libdvbapi libucsi" +RDEPENDS_dvbtraffic =+ "libdvbapi" +RDEPENDS_dvb-scan =+ "libdvbapi libdvbcfg libdvbsec" +RDEPENDS_dvb-apps =+ "libdvbapi libdvbcfg libdvbsec libdvben50221 libucsi" +RDEPENDS_dvb-femon =+ "libdvbapi" +RDEPENDS_dvbnet =+ "libdvbapi" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0002-fix-issues-with-gcc6.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0002-fix-issues-with-gcc6.patch new file mode 100644 index 0000000000000000000000000000000000000000..55b92499b255158a2f0ee84e3ad49990ab1aa469 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend/0002-fix-issues-with-gcc6.patch @@ -0,0 +1,46 @@ +--- git/src/htsmsg.c.orig 2016-06-17 11:47:53.026921237 -0400 ++++ git/src/htsmsg.c 2016-06-17 11:49:03.086922457 -0400 +@@ -574,13 +574,13 @@ + case HMF_MAP: + printf("MAP) = {\n"); + htsmsg_print0(&f->hmf_msg, indent + 1); +- for(i = 0; i < indent; i++) printf("\t"); printf("}\n"); ++ for(i = 0; i < indent; i++) {printf("\t");} printf("}\n"); + break; + + case HMF_LIST: + printf("LIST) = {\n"); + htsmsg_print0(&f->hmf_msg, indent + 1); +- for(i = 0; i < indent; i++) printf("\t"); printf("}\n"); ++ for(i = 0; i < indent; i++) {printf("\t");} printf("}\n"); + break; + + case HMF_STR: +--- git/src/dvb/dvb_tables.c.orig 2016-06-17 11:51:09.142924652 -0400 ++++ git/src/dvb/dvb_tables.c 2016-06-17 11:54:33.962928219 -0400 +@@ -935,10 +935,10 @@ + onid = (ptr[24] << 8) | ptr[25]; + + /* Search all muxes on adapter */ +- LIST_FOREACH(tdmi, &tda->tda_muxes, tdmi_adapter_link) +- if(tdmi->tdmi_transport_stream_id == tsid && tdmi->tdmi_network_id == onid); +- break; +- ++ LIST_FOREACH(tdmi, &tda->tda_muxes, tdmi_adapter_link) { ++ if(tdmi->tdmi_transport_stream_id == tsid && tdmi->tdmi_network_id == onid) ++ break; ++ } + if(tdmi == NULL) + continue; + +--- git/src/epggrab/module/eit.c.orig 2016-06-17 11:49:57.726923409 -0400 ++++ git/src/epggrab/module/eit.c 2016-06-17 11:50:14.526923701 -0400 +@@ -214,7 +214,7 @@ + if (m && m->enabled) cptr = _eit_freesat_conv; + else + m = epggrab_module_find_by_id("uk_freeview"); +- if (m && m->enabled) cptr = _eit_freesat_conv; ++ if (m && m->enabled) cptr = _eit_freesat_conv; + + /* Convert */ + return dvb_get_string_with_len(dst, dstlen, src, srclen, charset, cptr); diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb index 65d43c620d7cdd9db10155029b635b2ec592742b..bd5062c942b1dab91b09fe29fc391e5a129e3488 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9eef91148a9b14ec7f9df333daebc746" SRC_URI = "git://github.com/tvheadend/tvheadend.git \ file://0001-Move-tvheadend-specific-LD-CFLAGS-into-a-helper-vari.patch \ + file://0002-fix-issues-with-gcc6.patch \ " SRCREV = "a420c83a0e0d2c31c2c15d0fec6fedc3f5a36dfe" PV = "3.3" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb index f14d4e1cf907c8f906ed3d9ddc4cc24297e24c7c..0d8dd5cb35924c90ef356ade274d989321073da2 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-mediacentre/xbmc/xbmc_git.bb @@ -52,8 +52,6 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" EXTRA_OECONF_append_armv7a = "--cpu=cortex-a8" # for python modules -export HOST_SYS -export BUILD_SYS export STAGING_LIBDIR export STAGING_INCDIR export PYTHON_DIR diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch new file mode 100644 index 0000000000000000000000000000000000000000..a01c7544b635b04ac6d0d1546fcf25c037f991ca --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/ldflags.patch @@ -0,0 +1,57 @@ +Use LD and obey LDFLAGS + +Signed-off-by: Christopher Larson +Upstream-Status: Pending + +diff --git a/make/linux/Makefile b/make/linux/Makefile +index 391b6e3..a2ac13e 100644 +--- a/make/linux/Makefile ++++ b/make/linux/Makefile +@@ -64,6 +64,7 @@ objects_so:=$(patsubst %$(EXTENSION),%.lo,$(sources)) + WARNINGFLAGS=-Wall -Wextra -Wno-unknown-pragmas -ansi -fno-gnu-keywords -Wshadow + COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) + DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE) ++LINKFLAGS=$(LDFLAGS) + + ifeq (Darwin,$(shell uname -s)) + all: staticlib +@@ -91,7 +92,7 @@ $(LIBRARY): $(objects) + $(RANLIB) $@ + + $(LIBRARY_SO): $(objects_so) +- $(CXX) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) ++ $(LD) $(LINKFLAGS) -shared -Wl,-soname,$(LIBRARY_SO_VER) -o $(LIBRARY_SO_VER) $(objects_so) + rm -f $(LIBRARY_SO) + ln -s $(LIBRARY_SO_VER) $(LIBRARY_SO) + +diff --git a/make/mingw32/Makefile b/make/mingw32/Makefile +index e5986ef..6ca16aa 100644 +--- a/make/mingw32/Makefile ++++ b/make/mingw32/Makefile +@@ -18,6 +18,7 @@ DEBUGFLAGS=-g -DDEBUG + endif + CROSS = + CXX = $(CROSS)g++ ++LD = $(CXX) + CC = $(CROSS)gcc + WINDRES = $(CROSS)windres + RANLIB = $(CROSS)ranlib +@@ -33,6 +34,7 @@ LIBS = libebml.a + endif + INCS = -I"$(shell pwd)/../.." + COMPILEFLAGS = $(DEBUGFLAGS) $(INCS) $(DLLFLAGS) $(CXXFLAGS) ++LINKFLAGS = $(LDFLAGS) + + .PHONY: all all-before all-after clean clean-custom + +@@ -54,7 +56,7 @@ libebml.a: $(OBJ) + $(RANLIB) $@ + + libebml.dll: $(OBJ) +- $(CXX) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ) ++ $(LD) $(LINKFLAGS) -shared -Wl,--export-all -Wl,--out-implib=$@.a -o $@ $(OBJ) + + depend: + @echo Calculating dependecies: +-- +2.8.0 diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch new file mode 100644 index 0000000000000000000000000000000000000000..57eb3450d67a62a691fb6ec9ecb82463a4edbbac --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml/override-uname.patch @@ -0,0 +1,42 @@ +Allow override of the 'uname -s' for cross-compilation + +Signed-off-by: Christopher Larson +Upstream-Status: Pending + +diff --git a/make/linux/Makefile b/make/linux/Makefile +index a2ac13e..4188bee 100644 +--- a/make/linux/Makefile ++++ b/make/linux/Makefile +@@ -9,9 +9,11 @@ + # 'make DEBUG=yes'. + # + ++TARGET_OS ?= $(shell uname -s) ++ + # Paths + # BeOS wants the libs and headers in /boot/home/config +-ifeq (BeOS,$(shell uname -s)) ++ifeq (BeOS,$(TARGET_OS)) + prefix=/boot/home/config + else + prefix=/usr/local +@@ -66,7 +68,7 @@ COMPILEFLAGS=$(WARNINGFLAGS) $(CXXFLAGS) $(CPPFLAGS) $(DEBUGFLAGS) $(INCLUDE) + DEPENDFLAGS = $(CXXFLAGS) $(INCLUDE) + LINKFLAGS=$(LDFLAGS) + +-ifeq (Darwin,$(shell uname -s)) ++ifeq (Darwin,$(TARGET_OS)) + all: staticlib + else + all: staticlib sharedlib +@@ -116,7 +118,7 @@ depend: + $(CXX) $(DEPENDFLAGS) -MM -MT $$o $$i >> .depend ; \ + done + +-ifeq (Darwin,$(shell uname -s)) ++ifeq (Darwin,$(TARGET_OS)) + install: install_staticlib install_headers + else + install: install_staticlib install_sharedlib install_headers +-- +2.8.0 diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb index 71e2bfc5676d178bd196425f219e57d5beece52f..bbbe563889d2f7c15e95a383eba134001e9aff94 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-mkv/libebml/libebml_1.3.0.bb @@ -2,15 +2,49 @@ SUMMARY = "libebml is a C++ libary to parse EBML files" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=f14599a2f089f6ff8c97e2baa4e3d575" -SRC_URI = "http://dl.matroska.org/downloads/libebml/libebml-${PV}.tar.bz2" +SRC_URI = "\ + http://dl.matroska.org/downloads/libebml/libebml-${PV}.tar.bz2 \ + file://ldflags.patch \ + file://override-uname.patch \ +" SRC_URI[md5sum] = "efec729bf5a51e649e1d9d1f61c0ae7a" SRC_URI[sha256sum] = "83b074d6b62715aa0080406ea84d33df2e44b5d874096640233a4db49b8096de" -EXTRA_OEMAKE = "-e MAKEFLAGS=" +do_unpack[postfuncs] += "dos2unix" -do_compile() { - cd ${S}/make/linux - oe_runmake CROSS="${TARGET_PREFIX}" +dos2unix () { + cr="$(printf '\r')" + for f in ${S}/make/*/Makefile; do + tr -d "$cr" <"$f" >"$f.new" && \ + mv "$f.new" "$f" + done +} + +LIBEBML_OS = "Unknown" +LIBEBML_OS_linux = "Linux" +LIBEBML_OS_darwin = "Darwin" +LIBEBML_OS_mingw32 = "Windows" + +EXTRA_OEMAKE = "\ + 'TARGET_OS=${LIBEBML_OS}' \ + \ + 'CXX=${CXX}' \ + 'LD=${CXX}' \ + 'AR=${AR}' \ + 'RANLIB=${RANLIB}' \ + \ + 'DEBUGFLAGS=' \ + 'CPPFLAGS=${CPPFLAGS}' \ + 'CXXFLAGS=${CXXFLAGS}' \ + 'LDFLAGS=${LDFLAGS}' \ + \ + 'prefix=${prefix}' \ + 'libdir=${libdir}' \ + 'includedir=${includedir}/ebml' \ +" + +do_compile () { + oe_runmake -C make/linux } do_install() { diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0001-Fix-asneeded.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0001-Fix-asneeded.patch new file mode 100644 index 0000000000000000000000000000000000000000..64130d900cdcf75342668376365691e7e996660b --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0001-Fix-asneeded.patch @@ -0,0 +1,37 @@ +From c17129561e784bb9efebee2380349f121db0a9db Mon Sep 17 00:00:00 2001 +From: Fabio Berton +Date: Wed, 5 Oct 2016 10:56:33 -0300 +Subject: [PATCH 1/3] Fix asneeded +Organization: O.S. Systems Software LTDA. + +Patch from: +https://git.backbone.ws/portage/overlay/commit/7a069112054fbb5dc94a857e9c020a38cb1c6fde + +Upstream-Status: Pending + +Signed-off-by: Fabio Berton +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 3b2aa7d..0489fc1 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,11 +29,11 @@ dep: + + $(SND_PCM_BIN): $(SND_PCM_OBJECTS) + @echo LD $@ +- $(Q)$(LD) $(LDFLAGS) $(SND_PCM_LIBS) $(SND_PCM_OBJECTS) -o $(SND_PCM_BIN) ++ $(Q)$(LD) $(LDFLAGS) $(SND_PCM_OBJECTS) -o $(SND_PCM_BIN) $(SND_PCM_LIBS) + + $(SND_CTL_BIN): $(SND_CTL_OBJECTS) + @echo LD $@ +- $(Q)$(LD) $(LDFLAGS) $(SND_CTL_LIBS) $(SND_CTL_OBJECTS) -o $(SND_CTL_BIN) ++ $(Q)$(LD) $(LDFLAGS) $(SND_CTL_OBJECTS) -o $(SND_CTL_BIN) $(SND_CTL_LIBS) + + %.o: %.c + @echo GCC $< +-- +2.1.4 + diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0002-Fix-Eq-CAPS-plugin-name.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0002-Fix-Eq-CAPS-plugin-name.patch new file mode 100644 index 0000000000000000000000000000000000000000..efce38070beec655cb1ea4ac3299ed9d0c36a616 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0002-Fix-Eq-CAPS-plugin-name.patch @@ -0,0 +1,83 @@ +From d5c6c92045f9b6ad32365f39b8cc77f2fcd7d0f5 Mon Sep 17 00:00:00 2001 +From: Fabio Berton +Date: Wed, 5 Oct 2016 10:57:29 -0300 +Subject: [PATCH 2/3] Fix Eq CAPS plugin name +Organization: O.S. Systems Software LTDA. + +Patch from: +https://git.backbone.ws/portage/overlay/commit/7a069112054fbb5dc94a857e9c020a38cb1c6fde + +Upstream-Status: Pending + +Signed-off-by: Fabio Berton +--- + README | 8 ++++---- + ctl_equal.c | 2 +- + pcm_equal.c | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/README b/README +index b77fd2d..2df3dc5 100644 +--- a/README ++++ b/README +@@ -1,11 +1,11 @@ + Alsaequal is a real-time adjustable equalizer plugin for ALSA. It can + be adjusted using any ALSA compatible mixer, e.g. alsamixergui. + +-Alsaequal uses the Eq CAPS LADSPA Plugin for audio processing, actually ++Alsaequal uses the Eq10 CAPS LADSPA Plugin for audio processing, actually + alsaequal is a generic LADSPA plugin interface with real-time access to + the LADSPA controls (the LADSPA plugin included with alsa doesn't allow + for real-time controls) but it was developed for and only tested with +-Eq CAPS LADSPA plugin. You are welcome to try it with other plugins, it ++Eq10 CAPS LADSPA plugin. You are welcome to try it with other plugins, it + may work. Let me know how it goes, you can reach me at + . + +@@ -66,7 +66,7 @@ ctl. { + library -- location of the LADSPA library, the default is + "/usr/lib/ladspa/caps.so" + module -- module name within the LADSPA library, the deafault +- is "Eq" ++ is "Eq10" + channels -- number of channels, the default is 2 + } + +@@ -81,7 +81,7 @@ pcm. { + library -- location of the LADSPA library, the default is + "/usr/lib/ladspa/caps.so" + module -- module name within the LADSPA library, the deafault +- is "Eq" ++ is "Eq10" + channels -- number of channels, the default is 2 + } + +diff --git a/ctl_equal.c b/ctl_equal.c +index 40747d4..afba793 100644 +--- a/ctl_equal.c ++++ b/ctl_equal.c +@@ -167,7 +167,7 @@ SND_CTL_PLUGIN_DEFINE_FUNC(equal) + snd_ctl_equal_t *equal; + const char *controls = ".alsaequal.bin"; + const char *library = "/usr/lib/ladspa/caps.so"; +- const char *module = "Eq"; ++ const char *module = "Eq10"; + long channels = 2; + const char *sufix = " Playback Volume"; + int err, i, index; +diff --git a/pcm_equal.c b/pcm_equal.c +index 2bc87fb..b0b4265 100644 +--- a/pcm_equal.c ++++ b/pcm_equal.c +@@ -151,7 +151,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(equal) + snd_config_t *sconf = NULL; + const char *controls = ".alsaequal.bin"; + const char *library = "/usr/lib/ladspa/caps.so"; +- const char *module = "Eq"; ++ const char *module = "Eq10"; + long channels = 2; + int err; + +-- +2.1.4 + diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0003-Fix-mixer.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0003-Fix-mixer.patch new file mode 100644 index 0000000000000000000000000000000000000000..1c2503ed96554f1091d725c0c1047f773e9a0cd8 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal/0003-Fix-mixer.patch @@ -0,0 +1,92 @@ +From 665f68a863b4ac2e21b0a994dce7e2720c03aa9d Mon Sep 17 00:00:00 2001 +From: Fabio Berton +Date: Wed, 5 Oct 2016 11:02:18 -0300 +Subject: [PATCH 3/3] Fix mixer +Organization: O.S. Systems Software LTDA. + +Patch from: +https://git.backbone.ws/portage/overlay/commit/7a069112054fbb5dc94a857e9c020a38cb1c6fde + +Upstream-Status: Pending + +Signed-off-by: Fabio Berton +--- + ctl_equal.c | 9 ++++++--- + ladspa_utils.c | 6 ++++-- + pcm_equal.c | 6 ++++-- + 3 files changed, 14 insertions(+), 7 deletions(-) + +diff --git a/ctl_equal.c b/ctl_equal.c +index afba793..dd90e88 100644 +--- a/ctl_equal.c ++++ b/ctl_equal.c +@@ -263,7 +263,8 @@ SND_CTL_PLUGIN_DEFINE_FUNC(equal) + for(i = 0; i < equal->num_input_controls; i++) { + if(equal->control_data->control[i].type == LADSPA_CNTRL_INPUT) { + index = equal->control_data->control[i].index; +- if(equal->klass->PortDescriptors[index] != ++ if((equal->klass->PortDescriptors[index] & ++ (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL)) != + (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL)) { + SNDERR("Problem with control file %s, %d.", controls, index); + return -1; +@@ -284,12 +285,14 @@ SND_CTL_PLUGIN_DEFINE_FUNC(equal) + } + + /* Make sure that the control file makes sense */ +- if(equal->klass->PortDescriptors[equal->control_data->input_index] != ++ if((equal->klass->PortDescriptors[equal->control_data->input_index] & ++ (LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO))!= + (LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO)) { + SNDERR("Problem with control file %s.", controls); + return -1; + } +- if(equal->klass->PortDescriptors[equal->control_data->output_index] != ++ if((equal->klass->PortDescriptors[equal->control_data->output_index] & ++ (LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO))!= + (LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO)) { + SNDERR("Problem with control file %s.", controls); + return -1; +diff --git a/ladspa_utils.c b/ladspa_utils.c +index 7b596da..0c00800 100644 +--- a/ladspa_utils.c ++++ b/ladspa_utils.c +@@ -354,10 +354,12 @@ LADSPA_Control * LADSPAcontrolMMAP(const LADSPA_Descriptor *psDescriptor, + default_controls->control[index].type = LADSPA_CNTRL_OUTPUT; + } + index++; +- } else if(psDescriptor->PortDescriptors[i] == ++ } else if((psDescriptor->PortDescriptors[i] & ++ (LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO)) == + (LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO)) { + default_controls->input_index = i; +- } else if(psDescriptor->PortDescriptors[i] == ++ } else if((psDescriptor->PortDescriptors[i] & ++ (LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO)) == + (LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO)) { + default_controls->output_index = i; + } +diff --git a/pcm_equal.c b/pcm_equal.c +index b0b4265..8d98371 100644 +--- a/pcm_equal.c ++++ b/pcm_equal.c +@@ -231,12 +231,14 @@ SND_PCM_PLUGIN_DEFINE_FUNC(equal) + } + + /* Make sure that the control file makes sense */ +- if(equal->klass->PortDescriptors[equal->control_data->input_index] != ++ if((equal->klass->PortDescriptors[equal->control_data->input_index] & ++ (LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO)) != + (LADSPA_PORT_INPUT | LADSPA_PORT_AUDIO)) { + SNDERR("Problem with control file %s.", controls); + return -1; + } +- if(equal->klass->PortDescriptors[equal->control_data->output_index] != ++ if((equal->klass->PortDescriptors[equal->control_data->output_index] & ++ (LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO)) != + (LADSPA_PORT_OUTPUT | LADSPA_PORT_AUDIO)) { + SNDERR("Problem with control file %s.", controls); + return -1; +-- +2.1.4 + diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb new file mode 100644 index 0000000000000000000000000000000000000000..637d029baf2793b3f1ec166d93f0b7cc08e7a42a --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/alsa-equal/alsa-equal_0.6.bb @@ -0,0 +1,44 @@ +DESCRIPTION = "A real-time adjustable equalizer plugin for ALSA" +HOMEPAGE = "http://www.thedigitalmachine.net/alsaequal.html" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" + +DEPENDS = "alsa-lib" + +SRC_URI = " \ + http://www.thedigitalmachine.net/tools/alsaequal-${PV}.tar.bz2 \ + file://0001-Fix-asneeded.patch \ + file://0002-Fix-Eq-CAPS-plugin-name.patch \ + file://0003-Fix-mixer.patch \ +" + +SRC_URI[md5sum] = "d2edc7710c72cbf3ab297c414e35ebda" +SRC_URI[sha256sum] = "916e7d152added24617efc350142438a46099efe062bd8781d36dbf10b4e6ff0" + +S = "${WORKDIR}/alsaequal" + +EXTRA_OEMAKE = " \ + Q='' \ + CC='${CC}' \ + LD='${CC}' \ + LDFLAGS='${LDFLAGS} -shared -lasound' \ + CFLAGS='${CFLAGS} -I. -funroll-loops -ffast-math -fPIC -DPIC' \ + SND_PCM_LIBS='-lasound' \ + SND_CTL_LIBS='-lasound' \ +" + +do_compile() { + oe_runmake all +} + +do_install() { + install -Dm 0644 libasound_module_ctl_equal.so ${D}${libdir}/alsa-lib/libasound_module_ctl_equal.so + install -Dm 0644 libasound_module_pcm_equal.so ${D}${libdir}/alsa-lib/libasound_module_pcm_equal.so +} + +RDEPENDS_${PN} += " \ + alsa-utils \ + caps \ +" + +FILES_${PN} = "${libdir}/alsa-lib/" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch new file mode 100644 index 0000000000000000000000000000000000000000..1a050af917c58bcf17658eac03a0fb3a211e7060 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps/Avoid-ambiguity-in-div-invocation.patch @@ -0,0 +1,32 @@ +From 1ea09653692efdd6443fb6770e8523bf6c9e49b9 Mon Sep 17 00:00:00 2001 +From: Fabio Berton +Date: Thu, 6 Oct 2016 11:54:07 -0300 +Subject: Avoid ambiguity in div invocation +Organization: O.S. Systems Software LTDA. + +Patch from: +https://anonscm.debian.org/cgit/pkg-multimedia/caps.git/commit/?id=9a99c225fb813ae69f146e3d90f7b47bdbd97708 + +Upstream-Status: Pending + +Signed-off-by: Fabio Berton +--- + AutoFilter.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/AutoFilter.cc b/AutoFilter.cc +index fc087d0..bd6b12f 100644 +--- a/AutoFilter.cc ++++ b/AutoFilter.cc +@@ -69,7 +69,7 @@ AutoFilter::activate() + void + AutoFilter::cycle (uint frames) + { +- div_t qr = div (frames, blocksize); ++ div_t qr = div ((int)frames, (int)blocksize); + int blocks = qr.quot; + if (qr.rem) ++blocks; + double over_blocks = 1./blocks; +-- +2.1.4 + diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb new file mode 100644 index 0000000000000000000000000000000000000000..3e409e6eb37f809357b321bd27b8bf61757233ad --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/caps/caps_0.9.24.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "The CAPS Audio Plugin Suite - LADSPA plugin suite" +HOMEPAGE = "http://quitte.de/dsp/caps.html" +LICENSE = "GPL-3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = " \ + http://quitte.de/dsp/${PN}_${PV}.tar.bz2 \ + file://Avoid-ambiguity-in-div-invocation.patch \ +" + +SRC_URI[md5sum] = "c1d634038dcb54702306c0e30cb1c626" +SRC_URI[sha256sum] = "f746feba57af316b159f0169de5d78b4fd1064c2c0c8017cb5856b2f22e83f20" + +S = "${WORKDIR}/${PN}-${PV}" + +EXTRA_OEMAKE = " \ + CC='${CXX}' \ + CFLAGS='${CFLAGS} -ffast-math -funroll-loops -fPIC -DPIC' \ +" +do_compile() { + oe_runmake all +} + +do_install() { + install -Dm 0644 caps.so ${D}${libdir}/ladspa/caps.so +} + +FILES_${PN} = "${libdir}/ladspa/" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb index 86ba527845ecf5b0bd45964b3cade9fc1772b5bd..ba368a27f59f183d045720dd7d02ada10c992581 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/cdparanoia_10.2.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING-LGPL;md5=d370feaa1c9edcdbd29ca27ea3d2304d" SRC_URI = "http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-${PV}.src.tgz \ file://0001-Use-DESTDIR-in-install-Makefile-rule.patch \ file://0002-interface-remove-C-reserved-keyword.patch \ + file://0003-Fix-missing-shared-object-LDFLAGS.patch \ " SRC_URI[md5sum] = "b304bbe8ab63373924a744eac9ebc652" SRC_URI[sha256sum] = "005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0003-Fix-missing-shared-object-LDFLAGS.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0003-Fix-missing-shared-object-LDFLAGS.patch new file mode 100644 index 0000000000000000000000000000000000000000..5298a3dcf2d04a7bbc2b3ce99d20bd1f2c41dcdd --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/cdparanoia/files/0003-Fix-missing-shared-object-LDFLAGS.patch @@ -0,0 +1,42 @@ +From c0b77aeb2127da821ae1c03c2f98aaf4db65277d Mon Sep 17 00:00:00 2001 +From: Carlos Rafael Giani +Date: Sat, 10 Sep 2016 21:15:18 +0200 +Subject: [PATCH] Fix missing shared object LDFLAGS + +Upstream-Status: Inappropriate (the upstream project is dead) + +Signed-off-by: Carlos Rafael Giani +--- + interface/Makefile.in | 2 +- + paranoia/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/interface/Makefile.in b/interface/Makefile.in +index 40c6098..020bf2a 100644 +--- a/interface/Makefile.in ++++ b/interface/Makefile.in +@@ -46,7 +46,7 @@ libcdda_interface.a: $(OFILES) + $(RANLIB) libcdda_interface.a + + libcdda_interface.so: $(OFILES) +- $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS) ++ $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(LDFLAGS) $(OFILES) $(LIBS) + [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0 + [ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so + +diff --git a/paranoia/Makefile.in b/paranoia/Makefile.in +index 89d0328..ffb4e70 100644 +--- a/paranoia/Makefile.in ++++ b/paranoia/Makefile.in +@@ -44,7 +44,7 @@ libcdda_paranoia.a: $(OFILES) + $(RANLIB) libcdda_paranoia.a + + libcdda_paranoia.so: $(OFILES) +- $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface ++ $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(LDFLAGS) $(OFILES) -L ../interface -lcdda_interface + [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0 + [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so + +-- +2.7.4 + diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb index d96c1a40155704b7903f5c39a159a2f43c38c694..2f048af0edb7fa23f0bc146bdfe1da86dd5075d2 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ inherit autotools-brokensep SRC_URI = "${SOURCEFORGE_MIRROR}/faac/${BP}.tar.gz \ - file://build-fix.patch" + file://build-fix.patch \ + file://address-gcc-6-narrowing-errors.patch \ +" SRC_URI[md5sum] = "80763728d392c7d789cde25614c878f6" SRC_URI[sha256sum] = "c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df" @@ -18,4 +20,3 @@ FILES_${PN} = " ${bindir}/faac " FILES_lib${PN} = " ${libdir}/libfaac.so.*" FILES_lib${PN}-dev = "${includedir}/faac.h ${includedir}/faaccfg.h ${libdir}/libfaac.so ${libdir}/libfaac.la" FILES_lib${PN}-staticdev = "${libdir}/libfaac.a" - diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/faac/files/address-gcc-6-narrowing-errors.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/faac/files/address-gcc-6-narrowing-errors.patch new file mode 100644 index 0000000000000000000000000000000000000000..92fdd9bab1a01710ae94d21299d4769a76faad27 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/faac/files/address-gcc-6-narrowing-errors.patch @@ -0,0 +1,47 @@ +--- faac-1.28/common/mp4v2/atom_standard.cpp.orig 2016-06-16 07:59:21.657040761 -0400 ++++ faac-1.28/common/mp4v2/atom_standard.cpp 2016-06-16 08:01:50.613036724 -0400 +@@ -22,15 +22,15 @@ + #include "mp4common.h" + #include "atoms.h" + +-static const char name[5]={0251,'n', 'a', 'm', '\0'}; +-static const char art[5]={0251,'A', 'R', 'T', '\0'}; +-static const char wrt[5]={0251,'w', 'r', 't', '\0'}; +-static const char alb[5]={0251,'a', 'l', 'b', '\0'}; +-static const char day[5]={0251,'d', 'a', 'y', '\0'}; +-static const char too[5]={0251,'t', 'o', 'o', '\0'}; +-static const char cmt[5]={0251,'c', 'm', 't', '\0'}; +-static const char gen[5]={0251,'g', 'e', 'n', '\0'}; +-static const char grp[5]={0251,'g', 'r', 'p', '\0'}; ++static const char name[5]={(char)0251,'n', 'a', 'm', '\0'}; ++static const char art[5]={(char)0251,'A', 'R', 'T', '\0'}; ++static const char wrt[5]={(char)0251,'w', 'r', 't', '\0'}; ++static const char alb[5]={(char)0251,'a', 'l', 'b', '\0'}; ++static const char day[5]={(char)0251,'d', 'a', 'y', '\0'}; ++static const char too[5]={(char)0251,'t', 'o', 'o', '\0'}; ++static const char cmt[5]={(char)0251,'c', 'm', 't', '\0'}; ++static const char gen[5]={(char)0251,'g', 'e', 'n', '\0'}; ++static const char grp[5]={(char)0251,'g', 'r', 'p', '\0'}; + + MP4StandardAtom::MP4StandardAtom (const char *type) : MP4Atom(type) + { +--- faac-1.28/common/mp4v2/mp4atom.cpp.orig 2016-06-16 08:03:07.777034633 -0400 ++++ faac-1.28/common/mp4v2/mp4atom.cpp 2016-06-16 08:03:54.629033363 -0400 +@@ -264,11 +264,11 @@ + } + break; + case 0251: +- static const char name[5]={0251,'n', 'a', 'm', '\0'}; +- static const char cmt[5]={0251,'c', 'm', 't', '\0'}; +- static const char cpy[5]={0251,'c', 'p', 'y', '\0'}; +- static const char des[5]={0251,'d', 'e', 's','\0'}; +- static const char prd[5]={0251, 'p', 'r', 'd', '\0'}; ++ static const char name[5]={(char)0251,'n', 'a', 'm', '\0'}; ++ static const char cmt[5]={(char)0251,'c', 'm', 't', '\0'}; ++ static const char cpy[5]={(char)0251,'c', 'p', 'y', '\0'}; ++ static const char des[5]={(char)0251,'d', 'e', 's','\0'}; ++ static const char prd[5]={(char)0251, 'p', 'r', 'd', '\0'}; + if (ATOMID(type) == ATOMID(name) || + ATOMID(type) == ATOMID(cmt) || + ATOMID(type) == ATOMID(cpy) || + diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb index 8aad0b78f8f52d6c0d2f774020ab3b9676b19fb1..f8e77e199fa37b80de68a9a913fc0043991d63d8 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-bad_0.10.23.bb @@ -52,8 +52,8 @@ FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/libresindvd.la" FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-${LIBV}/presets/GstVoAmrwbEnc.prs" do_configure_prepend() { - # This m4 file contains nastiness which conflicts with libtool 2.2.2 - rm ${S}/m4/lib-link.m4 || true + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm ${S}/m4/lib-link.m4 || true } SRC_URI[md5sum] = "fcb09798114461955260e4d940db5987" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch new file mode 100644 index 0000000000000000000000000000000000000000..29fbec5f80724d51ef4359ff2b71033b921d3c14 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base-0.10.36/0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch @@ -0,0 +1,32 @@ +From 5478eafecf618cd8e742cc1b96d688a2c7ce5a79 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 2 Oct 2016 21:49:33 +0200 +Subject: [PATCH] gst-glib2.m4: don't do crazy things to GLIB_CFLAGS +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +we are definitely not one of those poor souls mentioned + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + common/m4/gst-glib2.m4 | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/common/m4/gst-glib2.m4 b/common/m4/gst-glib2.m4 +index b01f02f..4569ae5 100644 +--- a/common/m4/gst-glib2.m4 ++++ b/common/m4/gst-glib2.m4 +@@ -69,7 +69,6 @@ AC_DEFUN([AG_GST_GLIB_CHECK], + fi + + dnl for the poor souls who for example have glib in /usr/local +- AS_SCRUB_INCLUDE(GLIB_CFLAGS) + + AC_SUBST(GLIB_EXTRA_CFLAGS) + ]) +-- +2.5.5 + diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb index c86834f3baa4380ccf2b458f669ab84954fc6c1c..eefd993e1655ecca87037e21afcc41a977b82753 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-base_0.10.36.bb @@ -11,6 +11,7 @@ DEPENDS += "alsa-lib libogg libvorbis libtheora util-linux tremor glib-2.0-nativ SRC_URI += "file://gst-plugins-base-tremor.patch \ file://configure.ac-fix-subparse-plugin.patch \ file://audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch \ + file://0001-aclocal.m4-don-t-do-crazy-things-to-GLIB_CFLAGS.patch \ " SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a" @@ -31,8 +32,8 @@ PACKAGECONFIG[x11] = "--enable-x --enable-xvideo,--disable-x --disable-xvideo,vi PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia" do_configure_prepend() { - # This m4 file contains nastiness which conflicts with libtool 2.2.2 - rm -f ${S}/m4/lib-link.m4 + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm -f ${S}/m4/lib-link.m4 } FILES_${PN} += "${datadir}/${BPN}" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb index d92289502e818885f117a79a77cc474356c52d4d..7e4a5256785f1ca4f0106383489ece3a560f57a0 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-good_0.10.31.bb @@ -37,8 +37,8 @@ EXTRA_OECONF += "--disable-aalib --disable-esd --disable-shout2 --disable-libcac --disable-examples --disable-taglib" do_configure_prepend() { - # This m4 file contains nastiness which conflicts with libtool 2.2.2 - rm ${S}/m4/lib-link.m4 || true + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm ${S}/m4/lib-link.m4 || true } SRC_URI[md5sum] = "24f98a294a2b521e1b29412bdadae2e6" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb index a8cb8527521f8f6a30ed40f1dc413e17d5427fe1..199b47d76242e1cbe00d5888f4c74abf212e7657 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-ugly_0.10.19.bb @@ -23,8 +23,8 @@ PACKAGECONFIG[amrnb] = "--enable-amrnb,--disable-amrnb,opencore-amr" PACKAGECONFIG[amrwb] = "--enable-amrwb,--disable-amrwb,opencore-amr" do_configure_prepend() { - # This m4 file contains nastiness which conflicts with libtool 2.2.2 - rm ${S}/m4/lib-link.m4 || true + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm ${S}/m4/lib-link.m4 || true } SRC_URI[md5sum] = "1d81c593e22a6cdf0f2b4f57eae93df2" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc index 68a70b13681f0d5b4d605c1c6d6b8c53d7a6fac3..6e163a8c4932735c21aa6711a21bca2d95404f68 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins.inc @@ -23,7 +23,7 @@ PACKAGES_DYNAMIC += "^${PN}-.*" # ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed # http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html oe_runconf_prepend() { - if [ -e ${S}/po/Makefile.in.in ]; then - sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in - fi + if [ -e ${S}/po/Makefile.in.in ]; then + sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in + fi } diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb index f61a41092a3f535efd4e55e829ea3adf874d3aff..e3bd5e5d1f9088fcceaadacad6cb94502e51b3f1 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gstreamer_0.10.36.bb @@ -41,7 +41,7 @@ oe_runconf_prepend() { } #do_compile_prepend () { -# mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/ +# mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/ #} RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb new file mode 100644 index 0000000000000000000000000000000000000000..7836bae691a3983b018600e1e053f26268d4a33a --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/nativesdk-projucer_git.bb @@ -0,0 +1,3 @@ +inherit nativesdk +include projucer.inc +BBCLASSEXTEND = "nativesdk" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb new file mode 100644 index 0000000000000000000000000000000000000000..fb54fb9e98889ddd791bf77fa754d304bc1a2013 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer-native_git.bb @@ -0,0 +1,3 @@ +inherit native +include projucer.inc +BBCLASSEXTEND = "native" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc new file mode 100644 index 0000000000000000000000000000000000000000..6f696e26f928aea5de66db73cd89e032e68cda83 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/juce/projucer.inc @@ -0,0 +1,37 @@ +SUMMARY = "JUCE's Projucer" +DESCRIPTION = "Projucer is used to build and generate support files and build infrastructure for all \ +JUCE supported platforms, including Linux and Embedded Linux." +SECTION = "utils" +HOMEPAGE = "http://juce.com/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://README.txt;md5=9ab765ccda8890efc753f287911a1958" + +inherit pkgconfig + +DEPENDS = "libx11 libxext libxinerama libxrandr libxcursor freetype alsa-lib curl" + +SRCREV = "a8a7fa28e2e9cb19db6a27fcccb567a8ccfe6109" +BRANCH = "develop" +SRC_URI = "git://github.com/julianstorer/JUCE.git;protocol=https;branch=${BRANCH}" + +S = "${WORKDIR}/git" +PV = "4.2.3+git${SRCPV}" + +JUCE_PROJUCER_BUILD_PATH = "${B}/extras/Projucer/Builds" +JUCE_PROJUCER_MAKEFILE_PATH = "${JUCE_PROJUCER_BUILD_PATH}/LinuxMakefile" +JUCE_PROJUCER = "${JUCE_PROJUCER_MAKEFILE_PATH}/build/Projucer" + +do_configure() { + cd ${JUCE_PROJUCER_MAKEFILE_PATH} + CONFIG=Release oe_runmake clean +} + +do_compile() { + cd ${JUCE_PROJUCER_MAKEFILE_PATH} + CONFIG=Release oe_runmake +} + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${JUCE_PROJUCER} ${D}${bindir} +} diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb index 0ea5cb90aee980c8ab7cad16f04ef20b1504f1b9..c298b440d30075b4aa2e6781a8def8d91fb25e56 100755 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c848e78d9a4a5cc69906178e4d6fbd64" # libsdl to provide sdl.m4 with AM_PATH_SDL DEPENDS += "libusb1 libraw1394 libsdl" -PV = "2.2.1+gitr${SRCPV}" +PV = "2.2.4+gitr${SRCPV}" -SRCREV = "b90342933b4b48634b98b73805f47bd25ed5857e" +SRCREV = "9ac63fe7a7561bea83bfd4a5db47d4d74fde43a6" SRC_URI = "git://git.code.sf.net/p/libdc1394/code;branch=master;protocol=git \ file://install_examples.patch \ diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb deleted file mode 100644 index e6a912b359126dab493b8081c85e5902286ed7da..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/mpg123/mpg123_1.22.4.bb +++ /dev/null @@ -1,65 +0,0 @@ -SUMMARY = "Audio decoder for MPEG-1 Layer 1/2/3" -DESCRIPTION = "The core of mpg123 is an MPEG-1 Layer 1/2/3 decoding library, which can be used by other programs. \ -mpg123 also comes with a command-line tool which can playback using ALSA, PulseAudio, OSS, and several other APIs, \ -and also can write the decoded audio to WAV." -HOMEPAGE = "http://mpg123.de/" -BUGTRACKER = "http://sourceforge.net/p/mpg123/bugs/" -SECTION = "multimedia" - -LICENSE = "LGPLv2.1" -LICENSE_FLAGS = "commercial" -LIC_FILES_CHKSUM = "file://COPYING;md5=1e86753638d3cf2512528b99079bc4f3" - -DEPENDS = "audiofile" - -SRC_URI = "${SOURCEFORGE_MIRROR}/mpg123/mpg123/${PV}/${BP}.tar.bz2" - -SRC_URI[md5sum] = "2dfafae3bbc532b4c8b04a77c6a6de89" -SRC_URI[sha256sum] = "5069e02e50138600f10cc5f7674e44e9bf6f1930af81d0e1d2f869b3c0ee40d2" - -inherit autotools pkgconfig - -# The options should be mutually exclusive for configuration script. -# If both alsa and pulseaudio are specified (as in the default distro features) -# pulseaudio takes precedence. -PACKAGECONFIG_ALSA = "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '${PACKAGECONFIG_ALSA}', d)}" - -PACKAGECONFIG[alsa] = "--with-default-audio=alsa,,alsa-lib" -PACKAGECONFIG[esd] = ",,esound" -PACKAGECONFIG[jack] = ",,jack" -PACKAGECONFIG[openal] = ",,openal-soft" -PACKAGECONFIG[portaudio] = ",,portaudio-v19" -PACKAGECONFIG[pulseaudio] = "--with-default-audio=pulse,,pulseaudio" -PACKAGECONFIG[sdl] = ",,libsdl" - -# Following are possible sound output modules: -# alsa arts coreaudio dummy esd jack nas openal os2 oss portaudio pulse sdl sndio sun tinyalsa win32 win32_wasapi -AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', 'alsa', '', d)}" -AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'esd', 'esd', '', d)}" -AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'jack', 'jack', '', d)}" -AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'openal', 'openal', '', d)}" -AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'portaudio', 'portaudio', '', d)}" -AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'pulse', '', d)}" -AUDIOMODS += "${@bb.utils.contains('PACKAGECONFIG', 'sdl', 'sdl', '', d)}" - -EXTRA_OECONF = " \ - --enable-shared \ - --with-audio='${AUDIOMODS}' \ - --with-module-suffix=.so \ - ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--with-cpu=neon', '', d)} \ - ${@bb.utils.contains('TUNE_FEATURES', 'altivec', '--with-cpu=altivec', '', d)} \ -" - -# The x86 assembler optimisations contains text relocations and there are no -# upstream plans to fix them: http://sourceforge.net/p/mpg123/bugs/168/ -INSANE_SKIP_${PN}_append_x86 = " textrel" - -# Fails to build with thumb-1 (qemuarm) -#| {standard input}: Assembler messages: -#| {standard input}:47: Error: selected processor does not support Thumb mode `smull r5,r6,r7,r4' -#| {standard input}:48: Error: shifts in CMP/MOV instructions are only supported in unified syntax -- `mov r5,r5,lsr#24' -#... -#| make[3]: *** [equalizer.lo] Error 1 -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb similarity index 89% rename from import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb rename to import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb index 7b124ca156ffd8bd12c83c9fa6428afd1b3cabb1..0fed867696457aa8d4e9459f488f57cba8b756f9 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.10.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.15.bb @@ -9,8 +9,8 @@ SRC_URI = " \ http://www.musicpd.org/download/${BPN}/0.19/${BP}.tar.xz \ file://mpd.conf.in \ " -SRC_URI[md5sum] = "da4bc3e47afd0faf9e7a67168e012102" -SRC_URI[sha256sum] = "c386eb3d22f98dc993b5ae3c272f969aa7763713483c6800040ebf1791b15851" +SRC_URI[md5sum] = "bb855b1689c9e863c2dd214ab1cb9344" +SRC_URI[sha256sum] = "0cb9a223894b038ce966ce6d651d9b3ea3bdc7d7b9bec8d1e9e7e091cbc29b8b" inherit autotools useradd systemd @@ -22,6 +22,10 @@ PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag" PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame" PACKAGECONFIG[smb] = "--enable-smbclient,--disable-smbclient,samba" +do_configure_prepend() { + sed -i -e 's|libsystemd-daemon|libsystemd|' ${S}/configure.ac +} + do_install_append() { install -d ${D}/${localstatedir}/lib/mpd/music chmod 775 ${D}/${localstatedir}/lib/mpd/music @@ -49,7 +53,7 @@ do_install_append() { RPROVIDES_${PN} += "${PN}-systemd" RREPLACES_${PN} += "${PN}-systemd" RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "mpd.service mpd.socket" +SYSTEMD_SERVICE_${PN} = "mpd.socket" USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = " \ diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb index a1e650243f2c930559ca474116d4fd4220038027..c5513b02520bfb25f49adcf5d7aebf588faf0330 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/rtmpdump/rtmpdump_2.4.bb @@ -17,6 +17,6 @@ S = "${WORKDIR}/git" inherit autotools-brokensep EXTRA_OEMAKE = " \ - CC='${CC}' LD='${LD} ${STAGING_LIBDIR}' \ + CC='${CC}' LD='${LD} ${STAGING_LIBDIR}' XCFLAGS='${CFLAGS}' XLDFLAGS='${LDFLAGS}' \ SYS=posix INC=-I=/usr/include DESTDIR=${D} \ prefix=${prefix} libdir=${libdir} incdir=${includedir}/librtmp bindir=${bindir} mandir=${mandir}" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb index e91ba45c647649b537b2d7b9fefb2df807dc9862..a80fc10ace4bb4e95c175c054634b336c2040ca9 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-1080p.bb @@ -10,8 +10,8 @@ SRC_URI[sha256sum] = "69fe2cfe7154a6e752688e3a0d7d6b07b1605bbaf75b56f6470dc7b4c2 inherit allarch do_install() { - install -d ${D}${datadir}/movies - install -m 0644 ${WORKDIR}/big_buck_bunny_1080p_surround.avi ${D}${datadir}/movies/ + install -d ${D}${datadir}/movies + install -m 0644 ${WORKDIR}/big_buck_bunny_1080p_surround.avi ${D}${datadir}/movies/ } FILES_${PN} += "${datadir}/movies" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb index e7029d9b0cbedbf6907e57122579a943c66eb9b7..59ac4788cb616f0c49e1bd704702e62144cbb66f 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-480p.bb @@ -10,8 +10,8 @@ SRC_URI[sha256sum] = "40d1cf5bc8e1b0e55dac7bb2e3fbc2aea05b6679444864781299b24db0 inherit allarch do_install() { - install -d ${D}${datadir}/movies - install -m 0644 ${WORKDIR}/big_buck_bunny_480p_surround-fix.avi ${D}${datadir}/movies/ + install -d ${D}${datadir}/movies + install -m 0644 ${WORKDIR}/big_buck_bunny_480p_surround-fix.avi ${D}${datadir}/movies/ } FILES_${PN} += "${datadir}/movies" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb index 55fceabc81f8b73a8d3612facd883f57bed9dedd..21b8f8f0f8a9d621b7c56c99d49c510c63174b12 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/bigbuckbunny-720p.bb @@ -10,8 +10,8 @@ SRC_URI[sha256sum] = "b957d6e6212638441b52d3b620af157cc8d40c2a0342669294854a06ed inherit allarch do_install() { - install -d ${D}${datadir}/movies - install -m 0644 ${WORKDIR}/big_buck_bunny_720p_surround.avi ${D}${datadir}/movies/ + install -d ${D}${datadir}/movies + install -m 0644 ${WORKDIR}/big_buck_bunny_720p_surround.avi ${D}${datadir}/movies/ } FILES_${PN} += "${datadir}/movies" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb index bb7ee7cf70a13b830d9111fa509115109da3db29..0582a48562fb95cef4e432b6f4c3ea85c06219bc 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/sample-content/tearsofsteel-1080p.bb @@ -9,8 +9,8 @@ SRC_URI[sha256sum] = "bd2b5bc6c16d4085034f47ef7e4b3938afe86b4eec4ac3cf2685367d3b inherit allarch do_install() { - install -d ${D}${datadir}/movies - install -m 0644 ${WORKDIR}/ToS-4k-1920.mov ${D}${datadir}/movies/ + install -d ${D}${datadir}/movies + install -m 0644 ${WORKDIR}/ToS-4k-1920.mov ${D}${datadir}/movies/ } FILES_${PN} += "${datadir}/movies" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc index 8142e16510bd2af4fbac1e93e878c8235d4a4303..0972b6162d1dcf00e94ece04ac9ee0efed87342e 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -21,7 +21,7 @@ ARM_INSTRUCTION_SET = "arm" EXTRA_OECONF = "\ --enable-run-as-root \ - --enable-xvideo \ + --enable-xvideo \ --disable-screen --disable-caca \ --enable-httpd --enable-vlm \ --enable-freetype \ diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb index eb45974b1d74c12443ec4445abf6c1392c987347..ae95d4f6975a71ee710552f2f2ffb2596c2fcea3 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-support/libmediaart/libmediaart_0.7.0.bb @@ -2,3 +2,5 @@ require libmediaart.inc SRC_URI[archive.md5sum] = "1a44933d4cd0064e3c76d8d0ddacddc9" SRC_URI[archive.sha256sum] = "3a9dffcad862aed7c0921579b93080d694b8a66f3676bfee8037867f653a1cd3" + +EXTRA_OECONF_append = " --disable-gtk-doc" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb index 8ee6634b5e581d4cc9c030e26985e43321fac9d3..3249828434230b5de76c93c02fc1d3570105b216 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-support/libsrtp/libsrtp_1.5.2.bb @@ -14,5 +14,5 @@ inherit autotools do_install[postfuncs] += " rm_unused_bindir " rm_unused_bindir() { - rmdir ${D}/${bindir} + rmdir ${D}/${bindir} } diff --git a/import-layers/meta-openembedded/meta-networking/MAINTAINERS b/import-layers/meta-openembedded/meta-networking/MAINTAINERS index f3896725ca733ae975cd71f5ce0a22137256a7a4..53593ae0350affa0b098d19416497f02872097a2 100644 --- a/import-layers/meta-openembedded/meta-networking/MAINTAINERS +++ b/import-layers/meta-openembedded/meta-networking/MAINTAINERS @@ -2,19 +2,19 @@ This file contains a list of maintainers for the meta-networking layer. Please submit any patches against meta-networking to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) with -'[meta-networking][krogoth]' in the subject. +'[meta-networking]' in the subject. When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix=meta-networking][krogoth][PATCH - -krogoth Branch Maintainer: -Armin Kuster + --subject-prefix=meta-networking][morty][PATCH You may also contact the maintainers directly. +morty branch maintainer(s): +Armin Kuster + Descriptions of section entries: M: Mail patches to: FullName diff --git a/import-layers/meta-openembedded/meta-networking/README b/import-layers/meta-openembedded/meta-networking/README index e1ba27d83bd7c404795c29e9c5513cf3849a2dda..329db4fd8ebad718a6bb1a7443d8b32a623d00e4 100644 --- a/import-layers/meta-openembedded/meta-networking/README +++ b/import-layers/meta-openembedded/meta-networking/README @@ -18,19 +18,19 @@ Dependencies This layer depends on: URI: git://github.com/openembedded/openembedded-core.git -branch: master +branch: morty revision: HEAD For some recipes, the meta-oe layer is required: URI: git://github.com/openembedded/meta-openembedded.git subdirectory: meta-oe -branch: master +branch: morty revision: HEAD URI: git://github.com/openembedded/meta-openembedded.git subdirectory: meta-python -branch: master +branch: morty revision: HEAD Maintenance diff --git a/import-layers/meta-openembedded/meta-networking/classes/waf-samba.bbclass b/import-layers/meta-openembedded/meta-networking/classes/waf-samba.bbclass index 45fbcc342b2b8de3c74783c0b63461c49c3a24b3..af4c7d0bee4e45625502df2d2b98672f53ec7760 100644 --- a/import-layers/meta-openembedded/meta-networking/classes/waf-samba.bbclass +++ b/import-layers/meta-openembedded/meta-networking/classes/waf-samba.bbclass @@ -18,6 +18,7 @@ CONFIGUREOPTS = " --prefix=${prefix} \ --oldincludedir=${oldincludedir} \ --infodir=${infodir} \ --mandir=${mandir} \ + ${PACKAGECONFIG_CONFARGS} \ " # Three methods for waf cross compile: @@ -65,8 +66,6 @@ do_configure() { -L ${STAGING_DIR_HOST} \ -E LD_LIBRARY_PATH=${libdir_qemu}:${base_libdir_qemu}" - export BUILD_SYS=${BUILD_SYS} - export HOST_SYS=${HOST_SYS} export BUILD_ARCH=${BUILD_ARCH} export HOST_ARCH=${HOST_ARCH} export STAGING_LIBDIR=${STAGING_LIBDIR} diff --git a/import-layers/meta-openembedded/meta-networking/conf/distro/include/meta_networking_security_flags.inc b/import-layers/meta-openembedded/meta-networking/conf/distro/include/meta_networking_security_flags.inc new file mode 100644 index 0000000000000000000000000000000000000000..19e13ea872eaa980cd4c5d66267a231541b9ea15 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/conf/distro/include/meta_networking_security_flags.inc @@ -0,0 +1,10 @@ +# configure righteously complains: +# | configure:3479: using CFLAGS: -O2 -pipe -g -feliminate-unused-debug-types -fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 +# | configure:3485: CFLAGS error: CFLAGS may only be used to specify C compiler flags, not macro definitions. Use CPPFLAGS for: -D_FORTIFY_SOURCE=2 +# | configure:3516: error: Can not continue. Fix errors mentioned immediately above this line. + +# Make sure it's at least empty in builds which don't include +# conf/distro/include/security_flags.inc +lcl_maybe_fortify ?= "" +TARGET_CFLAGS_remove_pn-c-ares = "${lcl_maybe_fortify}" +TARGET_CPPFLAGS_append_pn-c-ares = "${lcl_maybe_fortify}" diff --git a/import-layers/meta-openembedded/meta-networking/conf/layer.conf b/import-layers/meta-openembedded/meta-networking/conf/layer.conf index 5fd636a87e903bb3d07ed0cab7f101fb9d5808a7..c09ba4a478887bae7a0df66a2593d27d759791bc 100644 --- a/import-layers/meta-openembedded/meta-networking/conf/layer.conf +++ b/import-layers/meta-openembedded/meta-networking/conf/layer.conf @@ -21,3 +21,6 @@ LICENSE_PATH += "${LAYERDIR}/licenses" # used by waf-samba.bbclass WAF_CROSS_ANSWERS_PATH = "${LAYERDIR}/files/waf-cross-answers" + +# Override security flags +require conf/distro/include/meta_networking_security_flags.inc diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch new file mode 100644 index 0000000000000000000000000000000000000000..16800d5066661362e1b757c92eed652ec004ad29 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch @@ -0,0 +1,29 @@ +From 1e1a78b7b4fa1662b4447aa19c15b1e839b7e9db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= +Date: Wed, 24 Aug 2016 10:58:45 +0200 +Subject: [PATCH] Makefile: respect LDFLAGS for libreg +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Stefan Müller-Klieser +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 2879896..1650db8 100644 +--- a/Makefile ++++ b/Makefile +@@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) + + $(LIBREG): regdb.h reglib.h reglib.c + $(NQ) ' CC ' $@ +- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREGLDLIBS) ++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LDFLAGS) $(LIBREGLDLIBS) + + install-libreg-headers: + $(NQ) ' INSTALL libreg-headers' +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch new file mode 100644 index 0000000000000000000000000000000000000000..747804d345c3d5ff14d31a1d2061fa5fa5dfe148 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch @@ -0,0 +1,11 @@ +--- crda-3.18/utils/key2pub.py.orig 2016-06-18 09:54:23.671326113 -0400 ++++ crda-3.18/utils/key2pub.py 2016-06-18 09:54:34.387326300 -0400 +@@ -115,7 +115,7 @@ + .n = _n, .len_n = sizeof(_n), \ + } + +-static const struct key_params keys[] = { ++static const struct key_params keys[] __attribute__((unused))= { + ''') + for n in xrange(n + 1): + output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb index 931a05352874e2e81af7e88fbec7d3e82205666a..00c358dab09266f287c336865666ec2082b6f8bd 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -1,22 +1,19 @@ SUMMARY = "Wireless Central Regulatory Domain Agent" HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" SECTION = "net" -LICENSE = "copyleft-next-0.3.0 & ISC" -LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe \ - file://${WORKDIR}/wireless-regdb-2014.11.18/LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" +LICENSE = "copyleft-next-0.3.0" +LIC_FILES_CHKSUM = "file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe" DEPENDS = "python-m2crypto-native python-native libgcrypt libnl" -SRC_URI = "https://www.kernel.org/pub/software/network/crda/${BP}.tar.xz;name=crda \ - https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2014.11.18.tar.xz;name=bin \ +SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz \ file://do-not-run-ldconfig-if-destdir-is-set.patch \ file://fix-linking-of-libraries-used-by-reglib.patch \ + file://fix-gcc-6-unused-variables.patch \ + file://0001-Makefile-respect-LDFLAGS-for-libreg.patch \ " -SRC_URI[crda.md5sum] = "0431fef3067bf503dfb464069f06163a" -SRC_URI[crda.sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" - -SRC_URI[bin.md5sum] = "d750c402c5510add7380edcb1d9b75b2" -SRC_URI[bin.sha256sum] = "eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd" +SRC_URI[md5sum] = "0431fef3067bf503dfb464069f06163a" +SRC_URI[sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" inherit python-dir pythonnative # Recursive make problem @@ -28,14 +25,6 @@ do_compile() { do_install() { oe_runmake SBINDIR=${sbindir}/ install - - install -d ${D}${libdir}/crda/ - - install -m 0644 ${WORKDIR}/wireless-regdb-2014.11.18/regulatory.bin ${D}${libdir}/crda/regulatory.bin } - -RDEPENDS_${PN} = "udev" -FILES_${PN} += "${libdir}crda/regulatory.bin \ - ${base_libdir}/udev/rules.d/85-regulatory.rules \ -" +RDEPENDS_${PN} = "udev wireless-regdb" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb index 48039f07ad2403fc6cc741ebcddfacd8ba83628f..3ed3aab98599844bb039ab9b7e6d9188d067b667 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.6.bb @@ -18,7 +18,10 @@ SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ # never look to /usr/local lib while cross compiling EXTRA_OECONF = "--disable-nfq-module --disable-ipq-module --includedir=${includedir} \ - --with-libpcap-includes=${STAGING_INCDIR} --with-dnet-includes=${STAGING_LIBDIR}" + --with-libpcap-includes=${STAGING_INCDIR} --with-dnet-includes=${STAGING_LIBDIR}" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," SRC_URI[md5sum] = "2cd6da422a72c129c685fc4bb848c24c" SRC_URI[sha256sum] = "b40e1d1273e08aaeaa86e69d4f28d535b7e53bdb3898adf539266b63137be7cb" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.10.1.bb b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb similarity index 84% rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.10.1.bb rename to import-layers/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb index cd804286602fe41e19c8d61081b8f485af328931..197dfb1a4ec965c4807376df76ab1749ac35e0a3 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.10.1.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/dhcpcd_6.11.3.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://dhcpcd.c;endline=26;md5=77c40d671aff804ca91ea99556da8 SRC_URI = "http://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "a7b83c57f47b62f48373905d3b4f7978" -SRC_URI[sha256sum] = "284abf8c3be0580bbac5eaca95359346ab0d78d4072317b6ce87cc68f2e8ae7b" +SRC_URI[md5sum] = "d4f2f3ed4964197dee7767219c33a9df" +SRC_URI[sha256sum] = "5abd12c4df2947d608f60a35227f9bf8ae8ab9de06ce975cdab1144d8f229b06" inherit autotools-brokensep diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch index bd3ae476bd402f678b138a90ed8375da01816185..24c134fcac8d4d2083b34a4ff3c4d63c372da249 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch @@ -2,9 +2,15 @@ Upstream: http://www.mail-archive.com/bug-inetutils@gnu.org/msg02103.html Upstream-Status: Pending -diff -ur inetutils-1.8.orig/ping/ping_common.h inetutils-1.8/ping/ping_common.h ---- inetutils-1.8.orig/ping/ping_common.h 2010-05-15 20:55:47.000000000 +0930 -+++ inetutils-1.8/ping/ping_common.h 2010-12-01 12:19:08.000000000 +1030 +Signed-off-by: Jackie Huang +--- + ping/ping_common.h | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/ping/ping_common.h b/ping/ping_common.h +index 1dfd1b5..3bfbd12 100644 +--- a/ping/ping_common.h ++++ b/ping/ping_common.h @@ -17,10 +17,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see `http://www.gnu.org/licenses/'. */ @@ -20,18 +26,32 @@ diff -ur inetutils-1.8.orig/ping/ping_common.h inetutils-1.8/ping/ping_common.h #include #include #include -@@ -66,13 +70,19 @@ +@@ -62,7 +66,12 @@ struct ping_stat + want to follow the traditional behaviour of ping. */ + #define DEFAULT_PING_COUNT 0 + ++#ifdef HAVE_IPV6 + #define PING_HEADER_LEN (USE_IPV6 ? sizeof (struct icmp6_hdr) : ICMP_MINLEN) ++#else ++#define PING_HEADER_LEN (ICMP_MINLEN) ++#endif ++ + #define PING_TIMING(s) ((s) >= sizeof (struct timeval)) + #define PING_DATALEN (64 - PING_HEADER_LEN) /* default data length */ + +@@ -74,13 +83,20 @@ struct ping_stat (t).tv_usec = ((i)%PING_PRECISION)*(1000000/PING_PRECISION) ;\ } while (0) +#ifdef HAVE_IPV6 - /* Not sure about this step*/ - #define _PING_BUFLEN(p, USE_IPV6) ((USE_IPV6)? ((p)->ping_datalen + sizeof (struct icmp6_hdr)) : \ - ((p)->ping_datalen + sizeof (icmphdr_t))) + /* FIXME: Adjust IPv6 case for options and their consumption. */ + #define _PING_BUFLEN(p, u) ((u)? ((p)->ping_datalen + sizeof (struct icmp6_hdr)) : \ + (MAXIPLEN + (p)->ping_datalen + ICMP_TSLEN)) + +#else -+#define _PING_BUFLEN(p, USE_IPV6) ((p)->ping_datalen + sizeof (icmphdr_t)) ++#define _PING_BUFLEN(p, u) (MAXIPLEN + (p)->ping_datalen + ICMP_TSLEN) +#endif - ++ +#ifdef HAVE_IPV6 typedef int (*ping_efp6) (int code, void *closure, struct sockaddr_in6 * dest, struct sockaddr_in6 * from, struct icmp6_hdr * icmp, @@ -40,7 +60,7 @@ diff -ur inetutils-1.8.orig/ping/ping_common.h inetutils-1.8/ping/ping_common.h typedef int (*ping_efp) (int code, void *closure, -@@ -81,13 +91,17 @@ +@@ -89,13 +105,17 @@ typedef int (*ping_efp) (int code, struct ip * ip, icmphdr_t * icmp, int datalen); union event { @@ -58,3 +78,6 @@ diff -ur inetutils-1.8.orig/ping/ping_common.h inetutils-1.8/ping/ping_common.h }; typedef struct ping_data PING; +-- +2.8.3 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb index 68487eab7d58a3bf89e29986e0d2f881ef1f652b..8db6b7417808daaedb9dde529bb4c7bd32133b65 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.4.bb @@ -28,18 +28,19 @@ SRC_URI[sha256sum] = "be8f75eff936b8e41b112462db51adf689715658a1b09e0d6b05d11ec9 inherit autotools gettext update-alternatives texinfo -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}" -noipv6="${@base_contains('DISTRO_FEATURES', 'ipv6', '', '--disable-ipv6 gl_cv_socket_ipv6=no', d)}" +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '', 'file://fix-disable-ipv6.patch', d)}" PACKAGECONFIG ??= "ftp uucpd \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6 ping6', '', d)} \ " PACKAGECONFIG[ftp] = "--enable-ftp,--disable-ftp,readline" PACKAGECONFIG[uucpd] = "--enable-uucpd,--disable-uucpd,readline" PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6 gl_cv_socket_ipv6=no," +PACKAGECONFIG[ping6] = "--enable-ping6,--disable-ping6," EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR} \ - ${noipv6} \ inetutils_cv_path_login=${base_bindir}/login \ --with-libreadline-prefix=${STAGING_LIBDIR} \ --enable-rpath=no \ @@ -56,8 +57,7 @@ do_install_append () { install -m 0755 -d ${D}${base_sbindir} install -m 0755 -d ${D}${sbindir} install -m 0755 -d ${D}${sysconfdir}/xinetd.d - mv ${D}${bindir}/ping ${D}${base_bindir}/ - mv ${D}${bindir}/ping6 ${D}${base_bindir}/ + mv ${D}${bindir}/ping* ${D}${base_bindir}/ mv ${D}${bindir}/ifconfig ${D}${base_sbindir}/ mv ${D}${libexecdir}/syslogd ${D}${base_sbindir}/ mv ${D}${bindir}/hostname ${D}${base_bindir}/ @@ -135,7 +135,7 @@ ALTERNATIVE_LINK_NAME[ifconfig] = "${base_sbindir}/ifconfig" ALTERNATIVE_${PN}-ping = "ping" ALTERNATIVE_LINK_NAME[ping] = "${base_bindir}/ping" -ALTERNATIVE_${PN}-ping6 = "ping6" +ALTERNATIVE_${PN}-ping6 = "${@bb.utils.contains('PACKAGECONFIG', 'ping6', 'ping6', '', d)}" ALTERNATIVE_LINK_NAME[ping6] = "${base_bindir}/ping6" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch new file mode 100644 index 0000000000000000000000000000000000000000..952232b7a7d3129a2230876c46448588ca1fd74a --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch @@ -0,0 +1,44 @@ +--- lftp-4.6.3a/src/NetAccess.cc.orig 2016-06-18 10:25:51.063358981 -0400 ++++ lftp-4.6.3a/src/NetAccess.cc 2016-06-18 10:26:04.143359209 -0400 +@@ -21,7 +21,7 @@ + + #include + #include +-#include ++#include + #include + + #include "NetAccess.h" +--- lftp-4.6.3a/src/Speedometer.cc.orig 2016-06-18 10:24:58.895358073 -0400 ++++ lftp-4.6.3a/src/Speedometer.cc 2016-06-18 10:25:10.879358281 -0400 +@@ -18,7 +18,7 @@ + */ + + #include +-#include ++#include + #include + #include "Speedometer.h" + #include "misc.h" +--- lftp-4.6.3a/src/FileCopy.cc.orig 2016-06-18 10:24:15.939357325 -0400 ++++ lftp-4.6.3a/src/FileCopy.cc 2016-06-18 10:24:24.583357475 -0400 +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "FileCopy.h" + #include "url.h" +--- lftp-4.6.3a/src/ResMgr.cc.orig 2016-06-18 10:23:31.387356549 -0400 ++++ lftp-4.6.3a/src/ResMgr.cc 2016-06-18 10:23:41.771356729 -0400 +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.6.3a.bb b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb similarity index 55% rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.6.3a.bb rename to import-layers/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb index e6796a6998438d418a4a1771582a66e916a5337d..b0cd399fed189d83fe6960dedec494c300d54acd 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.6.3a.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/lftp/lftp_4.7.3.bb @@ -5,22 +5,24 @@ HOMEPAGE = "http://lftp.yar.ru/" SECTION = "console/network" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "readline" SRC_URI = "http://fossies.org/linux/misc/lftp-${PV}.tar.gz \ + file://fix-gcc-6-conflicts-signbit.patch \ " -SRC_URI[md5sum] = "2777dd514d21fe1da764bedd1d0ab36c" -SRC_URI[sha256sum] = "a8b53e5ca2c1acbecd181c87f21a8673ca9038dc9f2be6ab8c23790bd91fd446" +SRC_URI[md5sum] = "8eb1fe5f113126b60f172643c7f6c2e6" +SRC_URI[sha256sum] = "ce6519831603c19c2cf2e3c10b41d6ddc87a16049b99383e7b9b77fbc7707214" inherit autotools gettext pkgconfig EXTRA_OECONF += "--with-modules" -PACKAGECONFIG ??= "libidn openssl zlib gnutls" +PACKAGECONFIG ??= "libidn openssl zlib gnutls readline expat" PACKAGECONFIG[libidn] = "--with-libidn, --without-libidn, libidn" PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" -PACKAGECONFIG[zlib] = "--with-zlib, --without-zlib, zlib" +PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_INCDIR}/.., --without-zlib, zlib" PACKAGECONFIG[gnutls] = "--with-gnutls, --without-gnutls, gnutls" +PACKAGECONFIG[readline] = "--with-readline=${STAGING_INCDIR}/.. --with-readline-inc=${STAGING_INCDIR} --with-readline-lib=-lreadline, --with-readline=no, readline" +PACKAGECONFIG[expat] = "--with-expat=${STAGING_INCDIR}/.. --with-expat-inc=${STAGING_INCDIR} --with-expat-lib=-lexpat, , expat" FILES_${PN}-dbg += "${libdir}/lftp/${PV}/.debug" RDEPENDS_${PN} = "perl bash readline" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_1.3.10.bb b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_1.3.17.bb similarity index 91% rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_1.3.10.bb rename to import-layers/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_1.3.17.bb index d5c7afe04f756aeddec147b253abf025f53c34a3..fcfec6907dbb69bb9ebe3baffb7b5b40800c1964 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_1.3.10.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_1.3.17.bb @@ -25,8 +25,8 @@ SECTION = "libdevel" SRC_URI = "https://tls.mbed.org/download/mbedtls-${PV}-gpl.tgz" -SRC_URI[md5sum] = "19ebbc96feceb430ad958dfe89cb633f" -SRC_URI[sha256sum] = "746fd88e0c6623691fc56c4eed52e40a57b2da0ac80f6dd8995094aa6adb407e" +SRC_URI[md5sum] = "a6ed92fc377ef60f7c24d42b900e0dad" +SRC_URI[sha256sum] = "f5beb43e850283915e3e0f8d37495eade3bfb5beedfb61e7b8da70d4c68edb82" DEPENDS = "openssl" RDEPENDS_${PN} += "libcrypto" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb index 6d3c252175c3f3dec7c1981485dc6e7597886c74..60e7e6e496e8b915bdd21fb29d6642873072ba8d 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/openconnect/openconnect_git.bb @@ -2,8 +2,17 @@ SUMMARY = "Open client for Cisco AnyConnect VPN" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING.LGPL;md5=243b725d71bb5df4a1e5920b344b86ad" -DEPENDS = "vpnc libxml2 gnutls lz4 krb5 libproxy pcsc-lite" -RDEPENDS_${PN} = "vpnc" +DEPENDS = "vpnc libxml2 krb5" + +PACKAGECONFIG ??= "gnutls lz4 libproxy" + +# config defaults +PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls," +PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4," +PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy," + +# not config defaults +PACKAGECONFIG[pcsc-lite] = "--with-libpcsclite,--without-libpcsclite,pcsc-lite," PV = "7.06" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.2/00-fix-typos-in-man-pages.patch b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/00-fix-typos-in-man-pages.patch similarity index 100% rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.2/00-fix-typos-in-man-pages.patch rename to import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/00-fix-typos-in-man-pages.patch diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.2/0006-avoid-using-colon-in-the-checking-msg.patch b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/0006-avoid-using-colon-in-the-checking-msg.patch similarity index 100% rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.2/0006-avoid-using-colon-in-the-checking-msg.patch rename to import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/0006-avoid-using-colon-in-the-checking-msg.patch diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/10-use-only-libsystemd.patch b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/10-use-only-libsystemd.patch new file mode 100644 index 0000000000000000000000000000000000000000..0ddc9410cd43e4587b1764eac662c388bc7dbaf0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/10-use-only-libsystemd.patch @@ -0,0 +1,30 @@ +diff -ur samba-4.4.2/lib/util/debug.c samba-4.4.2/lib/util/debug.c +--- samba-4.4.2/lib/util/debug.c 2016-05-08 18:33:24.000000000 +0200 ++++ samba-4.4.2/lib/util/debug.c 2016-05-08 18:27:09.341481492 +0200 +@@ -102,7 +102,7 @@ + .fd = 2 /* stderr by default */ + }; + +-#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD_JOURNAL) ++#if defined(WITH_SYSLOG) || defined(HAVE_LIBSYSTEMD) + static int debug_level_to_priority(int level) + { + /* +@@ -179,7 +179,7 @@ + } + #endif /* WITH_SYSLOG */ + +-#ifdef HAVE_LIBSYSTEMD_JOURNAL ++#ifdef HAVE_LIBSYSTEMD + #include + static void debug_systemd_log(int msg_level, + const char *msg, const char *msg_no_nl) +@@ -251,7 +251,7 @@ + }, + #endif + +-#ifdef HAVE_LIBSYSTEMD_JOURNAL ++#ifdef HAVE_LIBSYSTEMD + { + .name = "systemd", + .log = debug_systemd_log, diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.2/16-do-not-check-xsltproc-manpages.patch b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/16-do-not-check-xsltproc-manpages.patch similarity index 100% rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.2/16-do-not-check-xsltproc-manpages.patch rename to import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/16-do-not-check-xsltproc-manpages.patch diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.2/20-do-not-import-target-module-while-cross-compile.patch b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/20-do-not-import-target-module-while-cross-compile.patch similarity index 100% rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.2/20-do-not-import-target-module-while-cross-compile.patch rename to import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/20-do-not-import-target-module-while-cross-compile.patch diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.2/21-add-config-option-without-valgrind.patch b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/21-add-config-option-without-valgrind.patch similarity index 100% rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.2/21-add-config-option-without-valgrind.patch rename to import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/21-add-config-option-without-valgrind.patch diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.2/volatiles.03_samba b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/volatiles.03_samba similarity index 100% rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.2/volatiles.03_samba rename to import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba-4.4.5/volatiles.03_samba diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb similarity index 93% rename from import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb rename to import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb index 6a2220ac178f92d37a490ad7300e16a4362047fd..e9694d4e9ca2660f983079b32bc38fab6ead5c8d 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.4.2.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.4.5.bb @@ -13,6 +13,7 @@ ${SAMBA_MIRROR} http://www.mirrorservice.org/sites/ftp.samba.org \n \ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://00-fix-typos-in-man-pages.patch \ + file://10-use-only-libsystemd.patch \ file://16-do-not-check-xsltproc-manpages.patch \ file://20-do-not-import-target-module-while-cross-compile.patch \ file://21-add-config-option-without-valgrind.patch \ @@ -20,22 +21,24 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://volatiles.03_samba \ " -SRC_URI[md5sum] = "03a65a3adf08ceb1636ad59d234d7f9d" -SRC_URI[sha256sum] = "eaecd41a85ebb9507b8db9856ada2a949376e9d53cf75664b5493658f6e5926a" +SRC_URI[md5sum] = "6950c5e9f7bdeb8a610c2ca957a15be4" +SRC_URI[sha256sum] = "b876ef2e63f66265490e80a122e66ef2d7616112b839df68f56ac2e1ce17a7bd" -inherit systemd waf-samba cpan-base perlnative +inherit systemd waf-samba cpan-base perlnative update-rc.d # remove default added RDEPENDS on perl RDEPENDS_${PN}_remove = "perl" -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb krb5 libbsd libaio" +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb krb5 libbsd libaio libpam" SYSVINITTYPE_linuxstdbase = "lsb" SYSVINITTYPE = "sysv" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ +INITSCRIPT_NAME = "samba.sh" +INITSCRIPT_PARAMS = "start 20 3 5 . stop 20 0 1 6 ." + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${SYSVINITTYPE}', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'zeroconf', '', d)} \ acl cups ldap \ " @@ -44,7 +47,6 @@ RDEPENDS_${PN}-ctdb-tests += "bash" PACKAGECONFIG[acl] = "--with-acl-support,--without-acl-support,acl" PACKAGECONFIG[fam] = "--with-fam,--without-fam,gamin" -PACKAGECONFIG[pam] = "--with-pam --with-pammodulesdir=${base_libdir}/security,--without-pam,libpam" PACKAGECONFIG[lsb] = ",,lsb" PACKAGECONFIG[sysv] = ",,sysvinit" PACKAGECONFIG[cups] = "--enable-cups,--disable-cups,cups" @@ -81,10 +83,11 @@ EXTRA_OECONF += "--enable-fhs \ --with-cluster-support \ --with-profiling-data \ --with-libiconv=${STAGING_DIR_HOST}${prefix} \ + --with-pam --with-pammodulesdir=${base_libdir}/security \ " DISABLE_STATIC = "" -LDFLAGS += "-Wl,-z,relro,-z,now" +LDFLAGS += "-Wl,-z,relro,-z,now ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" do_install_append() { if ${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'true', 'false', d)}; then @@ -101,8 +104,6 @@ do_install_append() { elif ${@bb.utils.contains('PACKAGECONFIG', 'lsb', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d install -m 0755 packaging/LSB/samba.sh ${D}${sysconfdir}/init.d - update-rc.d -r ${D} samba.sh start 20 3 5 . - update-rc.d -r ${D} samba.sh start 20 0 1 6 . elif ${@bb.utils.contains('PACKAGECONFIG', 'sysv', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/init.d install -m 0755 packaging/sysv/samba.init ${D}${sysconfdir}/init.d/samba.sh @@ -111,8 +112,6 @@ do_install_append() { -e 's,/opt/samba/log,${localstatedir}/log/samba,g' \ -e 's,/etc/init.d/samba.server,${sysconfdir}/init.d/samba.sh,g' \ -i ${D}${sysconfdir}/init.d/samba.sh - update-rc.d -r ${D} samba.sh start 20 3 5 . - update-rc.d -r ${D} samba.sh start 20 0 1 6 . fi install -d ${D}${sysconfdir}/samba @@ -123,10 +122,10 @@ do_install_append() { install -d ${D}${sysconfdir}/sysconfig/ install -m644 packaging/systemd/samba.sysconfig ${D}${sysconfdir}/sysconfig/samba - rm -rf ${D}/run ${D}${localstatedir}/run + rm -rf ${D}/run ${D}${localstatedir}/run ${D}${localstatedir}/log } -PACKAGES += "${PN}-python ${PN}-python-dbg ${PN}-pidl libwinbind libwinbind-dbg libwinbind-krb5-locator" +PACKAGES =+ "${PN}-python ${PN}-python-dbg ${PN}-pidl libwinbind libwinbind-dbg libwinbind-krb5-locator" PACKAGES =+ "libwbclient libnss-winbind winbind winbind-dbg libnetapi libsmbsharemodes \ libsmbclient libsmbclient-dev lib${PN}-base ${PN}-base ${PN}-ctdb-tests" @@ -136,7 +135,6 @@ FILES_${PN}-base = "${sbindir}/nmbd \ ${sbindir}/smbd \ ${sysconfdir}/init.d \ ${localstatedir}/lib/samba \ - ${localstatedir}/log/samba \ ${localstatedir}/nmbd \ ${localstatedir}/spool/samba \ " diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb index 7d946af25bb5f2072e25a2b94b3acd1363d42971..c62a8d360eb1290aa858556262c3afa27ba650fb 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/snort/snort_2.9.7.5.bb @@ -4,7 +4,7 @@ SECTION = "net" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=78fa8ef966b48fbf9095e13cc92377c5" -DEPENDS = "libpcap libpcre daq libdnet util-linux" +DEPENDS = "xz libpcap libpcre daq libdnet util-linux" SRC_URI = " ${GENTOO_MIRROR}/${BP}.tar.gz;name=tarball \ file://snort.init \ @@ -42,8 +42,9 @@ EXTRA_OECONF = " \ # if you want to disable it, you need to patch configure.in first # AC_CHECK_HEADERS([openssl/sha.h],, SHA_H="no") # is called even with --without-openssl-includes -PACKAGECONFIG ?= "openssl" +PACKAGECONFIG ?= "openssl lzma" PACKAGECONFIG[openssl] = "--with-openssl-includes=${STAGING_INCDIR} --with-openssl-libraries=${STAGING_LIBDIR}, --without-openssl-includes --without-openssl-libraries, openssl," +PACKAGECONFIG[lzma] = "--with-lzma-includes=${STAGING_INCDIR} --with-lzma-libraries=${STAGING_LIBDIR}, --without-lzma-includes --without-lzma-libraries, xz," do_install_append() { install -d ${D}${sysconfdir}/snort/rules @@ -56,6 +57,8 @@ do_install_append() { install -m 755 ${WORKDIR}/snort.init ${D}${sysconfdir}/init.d/snort mkdir -p ${D}${localstatedir}/log/snort install -d ${D}/var/log/snort + + sed -i 's/-fdebug-prefix-map[^ ]*//g; s#${STAGING_DIR_TARGET}##g' ${D}${libdir}/pkgconfig/*.pc } FILES_${PN} += " \ @@ -84,6 +87,3 @@ FILES_${PN}-dev += " \ ${libdir}/snort_dynamicrules/*.so \ ${prefix}/src/snort_dynamicsrc \ " - -# http://errors.yoctoproject.org/Errors/Details/35137/ -PNBLACKLIST[snort] ?= "BROKEN: QA Issue: snort_preproc.pc, snort_output.pc, snort.pc" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb index ccb44947600c3ad05de6eaf1e0db81a92dfc1103..1aff0458d37c1deee26df5d9c437c54a18bba71c 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/vpnc/vpnc_0.5.3.bb @@ -18,7 +18,7 @@ do_configure_append () { } do_install () { - sed -i s:m600:m\ 600:g Makefile + sed -i s:m600:m\ 600:g Makefile oe_runmake 'DESTDIR=${D}' 'PREFIX=/usr' install rm -f ${D}${sysconfdir}/vpnc/vpnc.conf #This file is useless install ${WORKDIR}/default.conf ${D}${sysconfdir}/vpnc/default.conf diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb new file mode 100644 index 0000000000000000000000000000000000000000..a9119eabc534ae0d7fcfea8267372b8ce938bd5d --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/wireless-regdb/wireless-regdb_2016.06.10.bb @@ -0,0 +1,18 @@ +SUMMARY = "Wireless Central Regulatory Domain Database" +HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA" +SECTION = "net" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" + +SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" +SRC_URI[md5sum] = "d282cce92b6e692e8673e2bd97adf33b" +SRC_URI[sha256sum] = "cfedf1c3521b3c8f32602f25ed796e96e687c3441a00e7c050fedf7fd4f1b8b7" + +inherit bin_package + +do_install() { + install -d -m0755 ${D}${libdir}/crda + install -m 0644 regulatory.bin ${D}${libdir}/crda/regulatory.bin +} + +RSUGGESTS_${PN} = "crda" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb index d086cefc581f500d4e03d105dfd93b374af9f08f..0040f677bf327335c03974bd0893c8d9533b2be3 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_3.9.0.bb @@ -19,3 +19,5 @@ SRC_URI[sha256sum] = "98f50244f7b43f8683bd0cf5c599849d330e75e6cf077e96f14e83bda8 inherit autotools +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch new file mode 100644 index 0000000000000000000000000000000000000000..cfa8a7325f81c27ff5bdb0cddef12abb18d79b94 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0001-argz.h-fix-musl-compile-add-missing-defines.patch @@ -0,0 +1,45 @@ +From 543e67919f5cacf309ac88ab091331e41af4224b Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 16 Apr 2015 22:41:57 +0200 +Subject: [PATCH] argz.h: fix musl compile (add missing defines) + +Upstream-Status: Pending + +Add __THROW, __BEGIN_DECLS, __END_DECLS and __attribute_pure__ defines. + +Signed-off-by: Peter Seiderer +Signed-off-by: Ming Liu +--- + argz.h | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/argz.h b/argz.h +index 582be55..bdf9f62 100644 +--- a/argz.h ++++ b/argz.h +@@ -48,6 +48,22 @@ + # define __const const + #endif + ++#ifndef __THROW ++# define __THROW ++#endif ++ ++#ifndef __BEGIN_DECLS ++# define __BEGIN_DECLS ++#endif ++ ++#ifndef __END_DECLS ++# define __END_DECLS ++#endif ++ ++#ifndef __attribute_pure__ ++# define __attribute_pure__ ++#endif ++ + #ifndef __error_t_defined + typedef int error_t; + #endif +-- +2.1.4 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch new file mode 100644 index 0000000000000000000000000000000000000000..093054ce80506c26b86c2164b479114ceb37c33f --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp/0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch @@ -0,0 +1,43 @@ +From 77e399899d9d7297d23c321811b628febdf0fd92 Mon Sep 17 00:00:00 2001 +From: Peter Seiderer +Date: Thu, 16 Apr 2015 22:43:49 +0200 +Subject: [PATCH] tftp.h/tftpd.h: fix musl compile (missing include) + +Upstream-Status: Pending + +Add sys/types.h include for u_char typedef. + +Signed-off-by: Peter Seiderer +Signed-off-by: Ming Liu +--- + tftp.h | 1 + + tftpd.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/tftp.h b/tftp.h +index 12bd6aa..32a3f63 100644 +--- a/tftp.h ++++ b/tftp.h +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include "tftp_def.h" + #include "config.h" + +diff --git a/tftpd.h b/tftpd.h +index 945065e..60d3a49 100644 +--- a/tftpd.h ++++ b/tftpd.h +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include "tftp_io.h" + + /* +-- +2.1.4 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_git.bb index 0ece58f7d363ac7374e592703732696a714635e2..a9949d59ae68243a48e3ad697a9a03f6704b0488 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/atftp/atftp_git.bb @@ -12,12 +12,16 @@ SRC_URI = "git://git.code.sf.net/p/atftp/code \ file://atftpd-0.7_circumvent_tftp_size_restrictions.patch \ file://atftpd-0.7_unprotected_assignments_crash.patch \ file://atftpd.init \ - file://atftpd.service \ + file://atftpd.service \ file://atftp-0.7-sorcerers_apprentice.patch \ " +SRC_URI_append_libc-musl = " file://0001-argz.h-fix-musl-compile-add-missing-defines.patch \ + file://0002-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch \ + " + S = "${WORKDIR}/git" -inherit autotools update-rc.d useradd systemd +inherit autotools update-rc.d systemd PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[pcre] = "--enable-libpcre,--disable-libpcre,libpcre" @@ -28,9 +32,6 @@ INITSCRIPT_PACKAGES = "${PN}d" INITSCRIPT_NAME_${PN}d = "atftpd" INITSCRIPT_PARAMS_${PN}d = "defaults 80" -USERADD_PACKAGES = "${PN}d" -USERADD_PARAM_${PN}d = "--system --no-create-home --shell /bin/false \ - --user-group nobody" EXTRA_OEMAKE = "CFLAGS='${CFLAGS} -std=gnu89'" @@ -41,7 +42,7 @@ do_install_append() { install -d ${D}/srv/tftp rm ${D}${sbindir}/in.tftpd - + install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/atftpd.service ${D}${systemd_unitdir}/system } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb index 0f4c2478eff9aa95c737a432fcf409d295862fe1..4a888c84fd3761f17134128fba279c48e95ce314 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.1.bb @@ -36,7 +36,7 @@ CFLAGS += "${LDFLAGS}" PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" EXTRA_OEMAKE = "DONTSTRIP=1" EXTRA_OECONF += "--disable-mount-locking \ @@ -57,10 +57,10 @@ do_configure_prepend () { do_install_append () { if [ -d ${D}/run ]; then - rmdir ${D}/run + rmdir ${D}/run fi if [ -d ${D}${localstatedir}/run ]; then - rmdir ${D}${localstatedir}/run + rmdir ${D}${localstatedir}/run fi } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb index 5da3d965b07609bf4420d4d623f28d65007be447..69df274fe0287bfc740d4a755d0a8043fc6752ec 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/cyrus-sasl/cyrus-sasl_2.1.26.bb @@ -5,14 +5,14 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=3f55e0974e3d6db00ca6f57f2d206396" SRC_URI = "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${PV}.tar.gz \ - file://avoid-to-call-AC_TRY_RUN.patch \ - file://Fix-hardcoded-libdir.patch \ - file://debian_patches_0009_sasldb_al.diff \ - file://debian_patches_0014_avoid_pic_overwrite.diff \ - file://sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch \ - file://saslauthd.service \ - file://saslauthd.conf \ - " + file://avoid-to-call-AC_TRY_RUN.patch \ + file://Fix-hardcoded-libdir.patch \ + file://debian_patches_0009_sasldb_al.diff \ + file://debian_patches_0014_avoid_pic_overwrite.diff \ + file://sasl.h-include-stddef.h-for-size_t-on-NetBSD.patch \ + file://saslauthd.service \ + file://saslauthd.conf \ +" inherit autotools-brokensep pkgconfig useradd systemd @@ -24,8 +24,9 @@ EXTRA_OECONF += "--with-dblib=berkeley \ andrew_cv_runpath_switch=none" PACKAGECONFIG ??= "ntlm \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ " PACKAGECONFIG[gssapi] = "--enable-gssapi=yes,--enable-gssapi=no,krb5," PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," @@ -33,6 +34,7 @@ PACKAGECONFIG[opie] = "--with-opie,--without-opie,opie," PACKAGECONFIG[des] = "--with-des,--without-des,," PACKAGECONFIG[ldap] = "--with-ldap=${STAGING_LIBDIR} --enable-ldapdb,--without-ldap --disable-ldapdb,openldap," PACKAGECONFIG[ntlm] = "--with-ntlm,--without-ntlm,," +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," CFLAGS += "-fPIC" @@ -54,7 +56,7 @@ do_compile_prepend () { } do_install_append() { - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/saslauthd.service ${D}${systemd_unitdir}/system diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb index 8769e529485dff92e463f1c12585906b54476264..b5851a9599fbc8eeece02caaf6788c0c63b16cf3 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/dnrd/dnrd_2.20.3.bb @@ -22,7 +22,7 @@ SYSTEMD_SERVICE_${PN} = "dnrd.service" SYSTEMD_AUTO_ENABLE = "disable" inherit autotools -inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} +inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} do_install() { oe_runmake install DESTDIR=${D} INSTALL="install -p" @@ -34,7 +34,7 @@ do_install() { install -p -m 0644 ${WORKDIR}/dnrd.conf.sample ${D}${sysconfdir}/dnrd/dnrd.conf install -p -m 0755 ${WORKDIR}/dnrd.init ${D}${sysconfdir}/init.d/dnrd - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d -m 0755 ${D}${systemd_unitdir}/system install -m 644 ${WORKDIR}/dnrd.service ${D}${systemd_unitdir}/system fi diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator.service b/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator.service index b1397513bb883c505de655b73a488b4daf446d8e..3790daebdc13e91fba228f31e4d5def83f4ceac2 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator.service +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator.service @@ -5,6 +5,7 @@ After=syslog.target [Service] EnvironmentFile=/etc/default/iscsi-initiator ExecStartPre=/sbin/modprobe iscsi_tcp +ExecStartPre=/usr/lib/iscsi/set_initiatorname ExecStart=/usr/sbin/iscsid -f $OPTS_ISCSID [Install] diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/set_initiatorname b/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/set_initiatorname new file mode 100644 index 0000000000000000000000000000000000000000..a196c6b79d3cc5f1749abae768797d65b26c2128 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/iscsi-initiator-utils/files/set_initiatorname @@ -0,0 +1,12 @@ +#!/bin/sh +if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then + INITIATORNAME=$(iscsi-iname) + cat >/etc/iscsi/initiatorname.iscsi < \ - ${sysconfdir}/iscsi/initiatorname.iscsi - fi - - if [ -e /etc/init.d/populate-volatile.sh ]; then - /etc/init.d/populate-volatile.sh update - elif command -v systemd-tmpfiles >/dev/null; then - systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/iscsi.conf + if [ "x$D" = "x" ]; then + if [ -e /etc/init.d/populate-volatile.sh ]; then + /etc/init.d/populate-volatile.sh update + elif command -v systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/iscsi.conf + fi fi } SYSTEMD_SERVICE = " iscsi-initiator.service iscsi-initiator-targets.service " INITSCRIPT_NAME = "iscsid" INITSCRIPT_PARAMS = "start 30 1 2 3 4 5 . stop 70 0 1 2 3 4 5 6 ." + +FILES_${PN} += "${nonarch_libdir}/iscsi" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_4.7.0.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb similarity index 82% rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_4.7.0.bb rename to import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb index 42e883a310ec4cd487a6f5e6e3373470b7a8c5ae..da9c105207227cb31b3718c39ab7db24f0854569 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_4.7.0.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/opensaf/opensaf_5.0.0.bb @@ -10,22 +10,21 @@ an informal group of supporters of the OpenSAF initiative. The OpenSAF \ Foundation was founded on January 22nd 2008 with Emerson Network Power, \ Ericsson, Nokia Siemens Networks, HP and Sun Microsystems as founding members." HOMEPAGE = "http://www.opensaf.org" +SECTION = "admin" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" -inherit autotools useradd systemd pkgconfig +DEPENDS = "libxml2 python" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://install-samples-from-srcdir.patch \ file://0001-plmcd-error-fix.patch \ " -SRC_URI[md5sum] = "82dd2777a672140e22b8205f10aa55d3" -SRC_URI[sha256sum] = "da9e138650b835728ad51d99268d3a31419b254c4cb4e87c6ec90bc45266d7d2" - -SECTION = "admin" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a916467b91076e631dd8edb7424769c7" +SRC_URI[md5sum] = "94cd1a4c0406e6a45bb04c003f8690e7" +SRC_URI[sha256sum] = "4b4188a0f3d0ed1ed0e3d77de27c45e2c96b437401de08e7df2ed9ecd54bb999" -DEPENDS = "libxml2 python" +inherit autotools useradd systemd pkgconfig USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "-f -r opensaf" @@ -37,22 +36,14 @@ SYSTEMD_AUTO_ENABLE = "disable" PACKAGECONFIG[systemd] = "--enable-systemd-daemon" PACKAGECONFIG[openhpi] = "--with-hpi-interface=B03 --enable-ais-plm,,openhpi" -do_configure_prepend () { - ( cd ${S}; autoreconf -f -i -s ) -} - EXTRA_OECONF += " --libdir=${libdir}/opensaf " EXTRA_OEMAKE += " -Wl,-rpath,${libdir}/opensaf " PKGLIBDIR="${libdir}/opensaf/opensaf" -FILES_${PN} += "${localstatedir}/run" - -FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" - -RDEPENDS_${PN} += "bash python" - -INSANE_SKIP_${PN} = "dev-so" +do_configure_prepend () { + ( cd ${S}; autoreconf -f -i -s ) +} do_install_append() { rm -fr "${D}${localstatedir}/lock" @@ -62,5 +53,21 @@ do_install_append() { install -m 0644 ${B}/osaf/services/infrastructure/nid/config/opensafd.service \ ${D}${systemd_unitdir}/system install -m 0644 ${B}/contrib/plmc/config/*.service ${D}/${systemd_unitdir}/system +} +FILES_${PN} += "${localstatedir}/run ${systemd_unitdir}/system/*.service" +FILES_${PN}-staticdev += "${PKGLIBDIR}/*.a" + +INSANE_SKIP_${PN} = "dev-so" + +RDEPENDS_${PN} += "bash python" + +do_sysvinit_install() { + if [ ! -d "${D}${sysconfdir}/init.d" ]; then + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${B}/osaf/services/infrastructure/nid/scripts/opensafd ${D}${sysconfdir}/init.d/ + fi } + +addtask sysvinit_install after do_install before do_package + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc b/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc index 17dbf76ceb8e10181581d27ac47efb9ab9961f50..c00c77fc7ec231d56e171d856a5035685432af00 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix.inc @@ -7,8 +7,8 @@ has a definite Sendmail-ish flavor, but the inside is completely different." HOMEPAGE= "http://www.postfix.org" SECTION = "mail" DEPENDS = "virtual/db libpcre openssl postfix-native \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'sasl', 'cyrus-sasl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'openldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', 'cyrus-sasl', '', d)} \ " DEPENDS_class-native = "virtual/db-native openssl-native libpcre-native" @@ -52,9 +52,9 @@ export SYSLIBS = "${LDFLAGS}" # ldap support export CCARGS-ldap = "\ - ${@base_contains('DISTRO_FEATURES', 'ldap', '-DHAS_LDAP', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', '-DHAS_LDAP', '', d)}" export AUXLIBS-ldap = "\ - ${@base_contains('DISTRO_FEATURES', 'ldap', '-lldap -llber', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', '-lldap -llber', '', d)}" # no native openldap export CCARGS-ldap_class-native = "" @@ -63,9 +63,9 @@ export AUXLIBS-ldap_class-native = "" # SASL support -DUSE_LDAP_SASL -DUSE_SASL_AUTH # current openldap didn't enable SASL export CCARGS-sasl = "\ - ${@base_contains('DISTRO_FEATURES', 'sasl', '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I=/usr/include/sasl', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I=/usr/include/sasl', '', d)}" export AUXLIBS-sasl = "\ - ${@base_contains('DISTRO_FEATURES', 'sasl', '-lsasl2', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'sasl', '-lsasl2', '', d)}" export CCARGS-sasl_class-native = "" export AUXLIBS-sasl_class-native = "" @@ -224,6 +224,11 @@ ALTERNATIVE_TARGET[sendmail] = "${sbindir}/sendmail.postfix" ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" ALTERNATIVE_PRIORITY = "120" +ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" +ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1" +ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1" +ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1" + pkg_postinst_${PN} () { if [ "x$D" = "x" ]; then touch /etc/aliases diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.0.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.0.3.bb deleted file mode 100644 index 7104a9d1c393a508c76d951d8e020a3aad3fc4ca..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.0.3.bb +++ /dev/null @@ -1,4 +0,0 @@ -require postfix.inc - -SRC_URI[md5sum] = "61caffae689c11d09b4c972a394ae3b1" -SRC_URI[sha256sum] = "401e46ec3450569dcce60d1d8ca22a19ab1f7f817b0cc730cdf4875ba608ac02" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.1.1.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.1.1.bb new file mode 100644 index 0000000000000000000000000000000000000000..dbbe24ca3a8c8064db8c5257df65b77bb1ca46d7 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/postfix/postfix_3.1.1.bb @@ -0,0 +1,4 @@ +require postfix.inc + +SRC_URI[md5sum] = "40d72ea143af7ab0038c2cee1f483707" +SRC_URI[sha256sum] = "3deda4c34631970490b1b5fbb559905f93531bf1c7eb00e38b0d0deb1dba9982" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/CVE-2016-3125.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/CVE-2016-3125.patch deleted file mode 100644 index 69c9be031a82036d5fb12a6f50c799b09e667c2d..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/CVE-2016-3125.patch +++ /dev/null @@ -1,247 +0,0 @@ -From 7a8f683cedf9b0d1024a80362693c9f8b93a0f2b Mon Sep 17 00:00:00 2001 -From: TJ Saunders -Date: Thu, 10 Mar 2016 15:07:58 -0800 -Subject: [PATCH] Backport of fix for Bug#4230 to 1.3.5 branch. - -Upstream-Status: Backport -CVE: CVE-2016-3125 - -Author: TJ Saunders -Signed-off-by: Catalin Enache ---- - contrib/mod_tls.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 147 insertions(+), 20 deletions(-) - -diff --git a/contrib/mod_tls.c b/contrib/mod_tls.c -index df92658..5883cc7 100644 ---- a/contrib/mod_tls.c -+++ b/contrib/mod_tls.c -@@ -411,6 +411,13 @@ static int tls_required_on_ctrl = 0; - static int tls_required_on_data = 0; - static unsigned char *tls_authenticated = NULL; - -+/* Define the minimum DH group length we allow (unless the AllowWeakDH -+ * TLSOption is used). Ideally this would be 2048, per https://weakdh.org, -+ * but for compatibility with older Java versions, which only support up to -+ * 1024, we'll use 1024. For now. -+ */ -+#define TLS_DH_MIN_LEN 1024 -+ - /* mod_tls session flags */ - #define TLS_SESS_ON_CTRL 0x0001 - #define TLS_SESS_ON_DATA 0x0002 -@@ -438,6 +445,7 @@ static unsigned char *tls_authenticated = NULL; - #define TLS_OPT_USE_IMPLICIT_SSL 0x0200 - #define TLS_OPT_ALLOW_CLIENT_RENEGOTIATIONS 0x0400 - #define TLS_OPT_VERIFY_CERT_CN 0x0800 -+#define TLS_OPT_ALLOW_WEAK_DH 0x1000 - - /* mod_tls SSCN modes */ - #define TLS_SSCN_MODE_SERVER 0 -@@ -2417,24 +2425,139 @@ static int tls_ctrl_renegotiate_cb(CALLBACK_FRAME) { - - static DH *tls_dh_cb(SSL *ssl, int is_export, int keylength) { - DH *dh = NULL; -+ EVP_PKEY *pkey; -+ int pkeylen = 0, use_pkeylen = FALSE; -+ -+ /* OpenSSL will only ever call us (currently) with a keylen of 512 or 1024; -+ * see the SSL_EXPORT_PKEYLENGTH macro in ssl_locl.h. Sigh. -+ * -+ * Thus we adjust the DH parameter length according to the size of the -+ * RSA/DSA private key used for the current connection. -+ * -+ * NOTE: This MAY cause interoperability issues with some clients, notably -+ * Java 7 (and earlier) clients, since Java 7 and earlier supports -+ * Diffie-Hellman only up to 1024 bits. More sighs. To deal with these -+ * clients, then, you need to configure a certificate/key of 1024 bits. -+ */ -+ pkey = SSL_get_privatekey(ssl); -+ if (pkey != NULL) { -+ if (EVP_PKEY_type(pkey->type) == EVP_PKEY_RSA || -+ EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA) { -+ pkeylen = EVP_PKEY_bits(pkey); -+ -+ if (pkeylen < TLS_DH_MIN_LEN) { -+ if (!(tls_opts & TLS_OPT_ALLOW_WEAK_DH)) { -+ pr_trace_msg(trace_channel, 11, -+ "certificate private key length %d less than %d bits, using %d " -+ "(see AllowWeakDH TLSOption)", pkeylen, TLS_DH_MIN_LEN, -+ TLS_DH_MIN_LEN); -+ pkeylen = TLS_DH_MIN_LEN; -+ } -+ } -+ -+ if (pkeylen != keylen) { -+ pr_trace_msg(trace_channel, 13, -+ "adjusted DH parameter length from %d to %d bits", keylen, pkeylen); -+ use_pkeylen = TRUE; -+ } -+ } -+ } - - if (tls_tmp_dhs != NULL && - tls_tmp_dhs->nelts > 0) { - register unsigned int i; -- DH **dhs; -+ DH *best_dh = NULL, **dhs; -+ int best_dhlen = 0; - - dhs = tls_tmp_dhs->elts; -+ -+ /* Search the configured list of DH parameters twice: once for any sizes -+ * matching the actual requested size (usually 1024), and once for any -+ * matching the certificate private key size (pkeylen). -+ * -+ * This behavior allows site admins to configure a TLSDHParamFile that -+ * contains 1024-bit parameters, for e.g. Java 7 (and earlier) clients. -+ */ -+ -+ /* Note: the keylen argument is in BITS, but DH_size() returns the number -+ * of BYTES. -+ */ - for (i = 0; i < tls_tmp_dhs->nelts; i++) { -- /* Note: the keylength argument is in BITS, but DH_size() returns -- * the number of BYTES. -+ int dhlen; -+ -+ dhlen = DH_size(dhs[i]) * 8; -+ if (dhlen == keylen) { -+ pr_trace_msg(trace_channel, 11, -+ "found matching DH parameter for key length %d", keylen); -+ return dhs[i]; -+ } -+ -+ /* Try to find the next "best" DH to use, where "best" means -+ * the smallest DH that is larger than the necessary keylen. - */ -- if (DH_size(dhs[i]) == (keylength / 8)) { -+ if (dhlen > keylen) { -+ if (best_dh != NULL) { -+ if (dhlen < best_dhlen) { -+ best_dh = dhs[i]; -+ best_dhlen = dhlen; -+ } -+ -+ } else { -+ best_dh = dhs[i]; -+ best_dhlen = dhlen; -+ } -+ } -+ } -+ -+ for (i = 0; i < tls_tmp_dhs->nelts; i++) { -+ int dhlen; -+ -+ dhlen = DH_size(dhs[i]) * 8; -+ if (dhlen == pkeylen) { -+ pr_trace_msg(trace_channel, 11, -+ "found matching DH parameter for certificate private key length %d", -+ pkeylen); - return dhs[i]; - } -+ -+ if (dhlen > pkeylen) { -+ if (best_dh != NULL) { -+ if (dhlen < best_dhlen) { -+ best_dh = dhs[i]; -+ best_dhlen = dhlen; -+ } -+ -+ } else { -+ best_dh = dhs[i]; -+ best_dhlen = dhlen; -+ } -+ } -+ } -+ -+ if (best_dh != NULL) { -+ pr_trace_msg(trace_channel, 11, -+ "using best DH parameter for key length %d (length %d)", keylen, -+ best_dhlen); -+ return best_dh; - } - } - -- switch (keylength) { -+ /* Still no DH parameters found? Use the built-in ones. */ -+ -+ if (keylen < TLS_DH_MIN_LEN) { -+ if (!(tls_opts & TLS_OPT_ALLOW_WEAK_DH)) { -+ pr_trace_msg(trace_channel, 11, -+ "requested key length %d less than %d bits, using %d " -+ "(see AllowWeakDH TLSOption)", keylen, TLS_DH_MIN_LEN, TLS_DH_MIN_LEN); -+ keylen = TLS_DH_MIN_LEN; -+ } -+ } -+ -+ if (use_pkeylen) { -+ keylen = pkeylen; -+ } -+ -+ switch (keylen) { - case 512: - dh = get_dh512(); - break; -@@ -2443,32 +2566,33 @@ static DH *tls_dh_cb(SSL *ssl, int is_export, int keylength) { - dh = get_dh768(); - break; - -- case 1024: -- dh = get_dh1024(); -- break; -+ case 1024: -+ dh = get_dh1024(); -+ break; - -- case 1536: -- dh = get_dh1536(); -- break; -+ case 1536: -+ dh = get_dh1536(); -+ break; - -- case 2048: -- dh = get_dh2048(); -- break; -+ case 2048: -+ dh = get_dh2048(); -+ break; - -- default: -- tls_log("unsupported DH key length %d requested, returning 1024 bits", -- keylength); -- dh = get_dh1024(); -- break; -+ default: -+ tls_log("unsupported DH key length %d requested, returning 1024 bits", -+ keylen); -+ dh = get_dh1024(); -+ break; - } - -+ pr_trace_msg(trace_channel, 11, "using builtin DH for %d bits", keylen); -+ - /* Add this DH to the list, so that it can be freed properly later. */ - if (tls_tmp_dhs == NULL) { - tls_tmp_dhs = make_array(session.pool, 1, sizeof(DH *)); - } - - *((DH **) push_array(tls_tmp_dhs)) = dh; -- - return dh; - } - -@@ -8445,6 +8569,9 @@ MODRET set_tlsoptions(cmd_rec *cmd) { - strcmp(cmd->argv[i], "AllowClientRenegotiations") == 0) { - opts |= TLS_OPT_ALLOW_CLIENT_RENEGOTIATIONS; - -+ } else if (strcmp(cmd->argv[i], "AllowWeakDH") == 0) { -+ opts |= TLS_OPT_ALLOW_WEAK_DH; -+ - } else if (strcmp(cmd->argv[i], "EnableDiags") == 0) { - opts |= TLS_OPT_ENABLE_DIAGS; - --- -2.7.4 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/proftpd.service b/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/proftpd.service index ba97f8e1cac960e97b747e6c309af0b774adb093..18764385ef3df2fabe2639344e5a25b78d438184 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/proftpd.service +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/files/proftpd.service @@ -1,7 +1,12 @@ [Unit] Description=proftpd Daemon +After=network.target [Service] Type=forking -ExecStart=-@SBINDIR@/proftpd -c @SYSCONFDIR@/proftpd.conf +ExecStart=@SBINDIR@/proftpd -c @SYSCONFDIR@/proftpd.conf StandardError=syslog + +[Install] +WantedBy=default.target + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5b.bb similarity index 73% rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb rename to import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5b.bb index 57d4984bd97a80e0b999f70aef67eacfbaf672d9..c27a1cc9b393ff30dea33f2b573f2bd4b326ad6d 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5a.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.5b.bb @@ -12,17 +12,17 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \ file://contrib.patch \ file://build_fixup.patch \ file://proftpd.service \ - file://CVE-2016-3125.patch \ " -SRC_URI[md5sum] = "b9d3092411478415b31d435f8e26d173" -SRC_URI[sha256sum] = "a1f48df8539c414ec56e0cea63dcf4b8e16e606c05f10156f030a4a67fae5696" +SRC_URI[md5sum] = "f7b8e3a383b34a894c2502db74ccccde" +SRC_URI[sha256sum] = "afc1789f2478acf88dfdc7d70da90a4fa2786d628218e9574273295d044b4fc8" inherit autotools-brokensep useradd update-rc.d systemd -PACKAGECONFIG ??= "sia shadow" -PACKAGECONFIG += " ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" -PACKAGECONFIG += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" +PACKAGECONFIG ??= "shadow \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + " PACKAGECONFIG[curses] = "--enable-curses --enable-ncurses, --disable-curses --disable-ncurses, ncurses" PACKAGECONFIG[openssl] = "--enable-openssl, --disable-openssl, openssl, openssl" @@ -90,6 +90,15 @@ do_install () { # create the pub directory mkdir -p ${D}/home/${FTPUSER}/pub/ chown -R ${FTPUSER}:${FTPGROUP} ${D}/home/${FTPUSER}/pub + if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then + # install proftpd pam configuration + install -d ${D}${sysconfdir}/pam.d + install -m 644 ${S}/contrib/dist/rpm/ftp.pamd ${D}${sysconfdir}/pam.d/proftpd + sed -i '/ftpusers/d' ${D}${sysconfdir}/pam.d/proftpd + # specify the user Authentication config + sed -i '/^MaxInstances/a\AuthPAM on\nAuthPAMConfig proftpd' \ + ${D}${sysconfdir}/proftpd.conf + fi install -d ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/proftpd.service ${D}/${systemd_unitdir}/system @@ -97,6 +106,20 @@ do_install () { -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@SBINDIR@,${sbindir},g' \ -i ${D}${systemd_unitdir}/system/*.service + + sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \ + -e 's|${STAGING_DIR_NATIVE}||g' \ + -e 's|-fdebug-prefix-map=[^ ]*||g' \ + -i ${D}/${bindir}/prxs + + # ftpmail perl script, which reads the proftpd log file and sends + # automatic email notifications once an upload finishs, + # depends on an old perl Mail::Sendmail + # The Mail::Sendmail has not been maintained for almost 10 years + # Other distribution not ship with ftpmail, so do the same to + # avoid confusion about having it fails to run + rm -rf ${D}${bindir}/ftpmail + rm -rf ${D}${mandir}/man1/ftpmail.1 } INITSCRIPT_NAME = "proftpd" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc b/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc index 47e4736b77b737ea6f31148ba70adfb2a3e452f1..bff693ca975eab131e104db9326692f66fae6cc7 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd.inc @@ -62,6 +62,6 @@ USERADD_PARAM_${PN} = "--system --home ${localstatedir}/run/radvd/ -M -g nogroup pkg_postinst_${PN} () { if [ -z "$D" -a -x /etc/init.d/populate-volatile.sh ]; then - /etc/init.d/populate-volatile.sh update + /etc/init.d/populate-volatile.sh update fi } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.11.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.11.bb deleted file mode 100644 index c0b7532baec8dda5b1acc995b456da780c38fa44..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.11.bb +++ /dev/null @@ -1,5 +0,0 @@ - -require radvd.inc - -SRC_URI[md5sum] = "57fc6021f6a5e5472e455937685472a3" -SRC_URI[sha256sum] = "80ad60b15689e9591a5af393a57a1d93304deeff2e46482f0fd98046c00622f8" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.14.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.14.bb new file mode 100644 index 0000000000000000000000000000000000000000..2525249cb550e70ca038946a02ab5630afc4d123 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/radvd/radvd_2.14.bb @@ -0,0 +1,5 @@ + +require radvd.inc + +SRC_URI[md5sum] = "acd3883dece2c7888d15596b05c9fae4" +SRC_URI[sha256sum] = "46d31c05daea11c3d1e3dc092997d3631b3bc72b20a4f279b05304b83dbd7aa8" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/CVE-2016-3947.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/CVE-2016-3947.patch deleted file mode 100644 index c83e6ab51212bfa20a1d518acf846f9542e25a2c..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/CVE-2016-3947.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 0fe108ecb2bbdf684f159950eaa55d22f07c4008 Mon Sep 17 00:00:00 2001 -From: Catalin Enache -Date: Wed, 20 Apr 2016 15:17:18 +0300 -Subject: [PATCH] pinger: Fix buffer overflow in Icmp6::Recv - -Upstream-Status: Backport -CVE: CVE-2016-3947 - -Author: Yuriy M. Kaminskiy -Committer: Amos Jeffries ---- - src/icmp/Icmp6.cc | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/icmp/Icmp6.cc b/src/icmp/Icmp6.cc -index 794a51a..ee84b80 100644 ---- a/src/icmp/Icmp6.cc -+++ b/src/icmp/Icmp6.cc -@@ -256,7 +256,7 @@ Icmp6::Recv(void) - #define ip6_hops // HOPS!!! (can it be true??) - - ip = (struct ip6_hdr *) pkt; -- pkt += sizeof(ip6_hdr); -+ NP: echo size needs to +sizeof(ip6_hdr); - - debugs(42, DBG_CRITICAL, HERE << "ip6_nxt=" << ip->ip6_nxt << - ", ip6_plen=" << ip->ip6_plen << -@@ -267,7 +267,6 @@ Icmp6::Recv(void) - */ - - icmp6header = (struct icmp6_hdr *) pkt; -- pkt += sizeof(icmp6_hdr); - - if (icmp6header->icmp6_type != ICMP6_ECHO_REPLY) { - -@@ -292,7 +291,7 @@ Icmp6::Recv(void) - return; - } - -- echo = (icmpEchoData *) pkt; -+ echo = (icmpEchoData *) (pkt + sizeof(icmp6_hdr)); - - preply.opcode = echo->opcode; - --- -2.7.4 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch new file mode 100644 index 0000000000000000000000000000000000000000..fdcd174d3b2ecdd98be9c289361b9d0b736e6df0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/set_sysroot_patch.patch @@ -0,0 +1,33 @@ +Set the SYSROOT for libxml2 header file to avoid host contamination. + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yue Tao +Signed-off-by: Yi Zhao + +diff --git a/configure.ac.old b/configure.ac +index 54eda73..874f48e 100644 +--- a/configure.ac.old ++++ b/configure.ac +@@ -964,15 +964,15 @@ if test "x$squid_opt_use_esi" = "xyes" -a "x$with_libxml2" != "xno" ; then + dnl Find the main header and include path... + AC_CACHE_CHECK([location of libxml2 include files], [ac_cv_libxml2_include], [ + AC_CHECK_HEADERS([libxml/parser.h], [], [ +- AC_MSG_NOTICE([Testing in /usr/include/libxml2]) ++ AC_MSG_NOTICE([Testing in $SYSROOT/usr/include/libxml2]) + SAVED_CPPFLAGS="$CPPFLAGS" +- CPPFLAGS="-I/usr/include/libxml2 $CPPFLAGS" ++ CPPFLAGS="-I$SYSROOT/usr/include/libxml2 $CPPFLAGS" + unset ac_cv_header_libxml_parser_h +- AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/include/libxml2"], [ +- AC_MSG_NOTICE([Testing in /usr/local/include/libxml2]) +- CPPFLAGS="-I/usr/local/include/libxml2 $SAVED_CPPFLAGS" ++ AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I$SYSROOT/usr/include/libxml2"], [ ++ AC_MSG_NOTICE([Testing in $SYSROOT/usr/local/include/libxml2]) ++ CPPFLAGS="-I$SYSROOT/usr/local/include/libxml2 $SAVED_CPPFLAGS" + unset ac_cv_header_libxml_parser_h +- AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I/usr/local/include/libxml2"], [ ++ AC_CHECK_HEADERS([libxml/parser.h], [ac_cv_libxml2_include="-I$SYSROOT/usr/local/include/libxml2"], [ + AC_MSG_NOTICE([Failed to find libxml2 header file libxml/parser.h]) + ]) + ]) diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch new file mode 100644 index 0000000000000000000000000000000000000000..312f44f8ebf06bd3aeb3117e1b8843153487a3d2 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-don-t-do-squid-conf-tests-at-build-time.patch @@ -0,0 +1,63 @@ +From 54a9c2ba60adc7ec2724786662fd398e7c03999f Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Thu, 25 Aug 2016 15:22:57 +0800 +Subject: [PATCH] squid: don't do squid-conf-tests at build time + +* squid-conf-tests is a test to run "squid -k parse -f" + to perse the config files, which should not be run + at build time since we are cross compiling, so remove + it but it will be added back for the runtime ptest. + +* Fix the directories of the conf files for squid-conf-tests + so that it can run on the target board. + +Upstream-Status: Inappropriate [cross compile specific] + +Signed-off-by: Jackie Huang +--- + test-suite/Makefile.am | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am +index d5468be..77fc480 100644 +--- a/test-suite/Makefile.am ++++ b/test-suite/Makefile.am +@@ -41,8 +41,7 @@ TESTS += debug \ + MemPoolTest\ + mem_node_test\ + mem_hdr_test\ +- $(ESI_TESTS) \ +- squid-conf-tests ++ $(ESI_TESTS) + + ## Sort by alpha - any build failures are significant. + check_PROGRAMS += debug \ +@@ -125,19 +124,19 @@ VirtualDeleteOperator_SOURCES = VirtualDeleteOperator.cc $(DEBUG_SOURCE) + ##$(TARGLIB): $(LIBOBJS) + ## $(AR_R) $(TARGLIB) $(LIBOBJS) + +-squid-conf-tests: $(top_builddir)/src/squid.conf.default $(srcdir)/squidconf/* ++squid-conf-tests: $(sysconfdir)/squid.conf.default squidconf/* + @failed=0; cfglist="$?"; rm -f $@ || $(TRUE); \ + for cfg in $$cfglist ; do \ +- $(top_builddir)/src/squid -k parse -f $$cfg || \ ++ squid -k parse -f $$cfg || \ + { echo "FAIL: squid.conf test: $$cfg" | \ +- sed s%$(top_builddir)/src/%% | \ +- sed s%$(srcdir)/squidconf/%% ; \ ++ sed s%$(sysconfdir)/%% | \ ++ sed s%squidconf/%% ; \ + failed=1; break; \ + }; \ + if test "$$failed" -eq 0; then \ + echo "PASS: squid.conf test: $$cfg" | \ +- sed s%$(top_builddir)/src/%% | \ +- sed s%$(srcdir)/squidconf/%% ; \ ++ sed s%$(sysconfdir)/%% | \ ++ sed s%squidconf/%% ; \ + else break; fi; \ + done; \ + if test "$$failed" -eq 0; then cp $(TRUE) $@ ; fi +-- +2.8.3 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch index 9e2ceab88056b1af60813a7837769d531d313066..01ec59622352702d0e32d586d7206a63bad6cfe3 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/squid-use-serial-tests-config-needed-by-ptest.patch @@ -1,6 +1,6 @@ -From 2192fdbc90b0ff2d5408e8763df200620870deea Mon Sep 17 00:00:00 2001 +From bd58d3672bc267824000f34a37561c7ab2bd571f Mon Sep 17 00:00:00 2001 From: Jackie Huang -Date: Mon, 13 Oct 2014 01:32:37 -0700 +Date: Tue, 19 Jul 2016 01:56:23 -0400 Subject: [PATCH] squid: use serial-tests config needed by ptest ptest needs buildtest-TESTS and runtest-TESTS targets. @@ -10,22 +10,22 @@ Upstream-Status: Inappropriate [default automake behavior incompatible with ptes Signed-off-by: Jackie Huang --- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 6f7171f..ab9b93e 100644 +index 05ad027..e324b93 100644 --- a/configure.ac +++ b/configure.ac -@@ -3,7 +3,7 @@ AC_PREREQ(2.61) +@@ -10,7 +10,7 @@ AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) AC_CONFIG_SRCDIR([src/main.cc]) --AM_INIT_AUTOMAKE([tar-ustar nostdinc]) -+AM_INIT_AUTOMAKE([tar-ustar nostdinc serial-tests]) +-AM_INIT_AUTOMAKE([tar-ustar nostdinc subdir-objects]) ++AM_INIT_AUTOMAKE([tar-ustar nostdinc subdir-objects serial-tests]) AC_REVISION($Revision$)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE -- -1.7.1 +2.8.1 diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/volatiles.03_squid b/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/volatiles.03_squid index b96865d731ac57eea8c48c612f5981bdd6004315..83e1f8b7a585c7c6dcb061793a31b00e141ada0f 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/volatiles.03_squid +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/files/volatiles.03_squid @@ -1,2 +1,3 @@ # d squid squid 0755 /var/run/squid none +d squid squid 0750 /var/log/squid none diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/squid_3.5.7.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/squid_3.5.20.bb similarity index 52% rename from import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/squid_3.5.7.bb rename to import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/squid_3.5.20.bb index e35aad7cf22019c138adf996799ed9c02565e134..364d00e122ac9e5523ffadc9a232b893abaa086a 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/squid_3.5.7.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/squid/squid_3.5.20.bb @@ -19,14 +19,15 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P file://squid-use-serial-tests-config-needed-by-ptest.patch \ file://run-ptest \ file://volatiles.03_squid \ - file://CVE-2016-3947.patch \ + file://set_sysroot_patch.patch \ + file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \ - file://errors/COPYRIGHT;md5=0fed8f1462f6fdbc62bb431bcb618f46 \ + file://errors/COPYRIGHT;md5=0d98c4448c368d146f31a970bb0ced21 \ " -SRC_URI[md5sum] = "06e43abc67aedcc3903a2780de20a3ed" -SRC_URI[sha256sum] = "b7dcec8c5cb7f5687aff4256a7522f670c310a350cc9e9c0f29f3fd9cf88d017" +SRC_URI[md5sum] = "6a29d7dfc544205001f7a75c6996dc60" +SRC_URI[sha256sum] = "5a114f8f7f44b5ae3c9b77d7b81aef13fe69e7f530855213d551f48b157cb5f1" DEPENDS = "libtool krb5 openldap db cyrus-sasl" @@ -35,20 +36,28 @@ inherit autotools useradd ptest USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --shell /bin/false --user-group squid" -PACKAGECONFIG ??= "${@base_contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ - ${@base_contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', '', d)} \ + ${@bb.utils.contains('TARGET_ARCH', 'mips', 'noatomics', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ " PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack" PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," BASIC_AUTH = "DB SASL LDAP NIS" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -BASIC_AUTH += "${@base_contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" + +EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}' --sysconfdir=${sysconfdir}/${BPN} --with-logdir=${localstatedir}/log/${BPN}" -EXTRA_OECONF += "--with-default-user=squid --enable-auth-basic='${BASIC_AUTH}'" export BUILDCXXFLAGS="${BUILD_CXXFLAGS}" TESTDIR = "test-suite" + +do_configure_prepend() { + export SYSROOT=$PKG_CONFIG_SYSROOT_DIR +} + do_compile_ptest() { oe_runmake -C ${TESTDIR} buildtest-TESTS } @@ -59,13 +68,31 @@ do_install_ptest() { # do NOT need to rebuild Makefile itself sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + + # Add squid-conf-tests for runtime tests + sed -e 's/^\(runtest-TESTS:\)/\1 squid-conf-tests/' \ + -e "s/\(list=' \$(TESTS)\)/\1 squid-conf-tests/" \ + -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile + + # Ensure the path for command true is correct + sed -i 's:^TRUE = .*$:TRUE = /bin/true:' ${D}${PTEST_PATH}/${TESTDIR}/Makefile } do_install_append() { - install -d ${D}${sysconfdir}/default/volatiles - install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/volatiles.03_squid - rmdir "${D}${localstatedir}/run/${BPN}" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run" + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/tmpfiles.d + echo "d ${localstatedir}/run/${BPN} 0755 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + echo "d ${localstatedir}/log/${BPN} 0750 squid squid -" >> ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf + fi + + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/volatiles.03_squid ${D}${sysconfdir}/default/volatiles/03_squid + + rmdir "${D}${localstatedir}/run/${BPN}" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/run" + + rmdir "${D}${localstatedir}/log/${BPN}" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}/log" } FILES_${PN} += "${libdir} ${datadir}/errors ${datadir}/icons" @@ -74,6 +101,3 @@ FILES_${PN}-doc += "${datadir}/*.txt" RDEPENDS_${PN} += "perl" RDEPENDS_${PN}-ptest += "make" - -# http://errors.yoctoproject.org/Errors/Details/35128/ -PNBLACKLIST[squid] ?= "BROKEN: sysroots/qemuarm/usr/include/linux/in.h:28:16: error: redeclaration of 'IPPROTO_IP'" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb index 98842e4e9f53f5f8614dd583dde9f5e898aadbb2..115fa2ecede9a91e247e6f91fe3f3eacf41a55c4 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb @@ -37,6 +37,9 @@ export AR = "${HOST_PREFIX}ar cq" EXTRA_OECONF += "--disable-option-checking" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + # configure.in has errors do_configure() { oe_runconf diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/makefile-add-ldflags.patch new file mode 100644 index 0000000000000000000000000000000000000000..a74452db6981c5b02cc3739f2340c6e348790909 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/files/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 98008da..c328ba7 100644 +--- a/makefile ++++ b/makefile +@@ -11,7 +11,7 @@ mandir = ${sharedir}/man + O=aoe.o bpf.o ${PLATFORM}.o ata.o + + vblade: $O +- ${CC} -o vblade $O ++ ${CC} ${LDFLAGS} -o vblade $O + + aoe.o : aoe.c config.h dat.h fns.h makefile + ${CC} ${CFLAGS} -c $< diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_20.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_20.bb index a357e4037554c511fd3ec91a6c966a6d3c9f5d83..344c7462c7ee756de63e0f1296e2da4196f1e8d2 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_20.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/vblade/vblade_20.bb @@ -5,7 +5,9 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "${SOURCEFORGE_MIRROR}/aoetools/${BPN}-${PV}.tgz \ - file://cross.patch" + file://cross.patch \ + file://makefile-add-ldflags.patch \ + " SRC_URI[md5sum] = "3c80e4a6bc7d66ae0c235b88cb44bd59" SRC_URI[sha256sum] = "c8fe2fc4f2fba8e07e5cfdf17335982584eef2cd5c78bf8b1db93f2b56e7121d" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch b/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch new file mode 100644 index 0000000000000000000000000000000000000000..7accbbc241bc947df2ae2faa5bdf6907b9cdbaab --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd-3.0.3/0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch @@ -0,0 +1,45 @@ +From 37cc924363515c8c309944c455bcbba7ddcc8eda Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Tue, 6 Sep 2016 17:17:44 +0800 +Subject: [PATCH] vsftpd: allow sysinfo() in the seccomp sandbox + +Upstream-Status: Pending + +* Allow sysinfo() in the seccomp sandbox otherwise + comes below OOPS: priv_sock_get_cmd as the syscall + sysinfo() not allowed + +tnftp 192.168.1.1 +Connected to 192.168.1.1. +220 (vsFTPd 3.0.3) +Name (192.168.1.1:root): anonymous +331 Please specify the password. +Password: +230 Login successful. +Remote system type is UNIX. +Using binary mode to transfer files. +ftp> prompt +Interactive mode off. +ftp> mget small* +OOPS: priv_sock_get_cmd + +Signed-off-by: Mingli Yu +--- + seccompsandbox.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/seccompsandbox.c b/seccompsandbox.c +index 2c350a9..67d9ca5 100644 +--- a/seccompsandbox.c ++++ b/seccompsandbox.c +@@ -409,6 +409,7 @@ seccomp_sandbox_setup_postlogin(const struct vsf_session* p_sess) + allow_nr(__NR_getcwd); + allow_nr(__NR_chdir); + allow_nr(__NR_getdents); ++ allow_nr(__NR_sysinfo); + /* Misc */ + allow_nr(__NR_umask); + +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb index 4ee881ddd5a657860a3c47b178e40dd960e0072d..3eaaa30b6210955f7d0bbd4b1951f6551e36284a 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb @@ -18,6 +18,7 @@ SRC_URI = "https://security.appspot.com/downloads/vsftpd-${PV}.tar.gz \ file://volatiles.99_vsftpd \ file://vsftpd.service \ file://vsftpd-2.1.0-filter.patch \ + file://0001-vsftpd-allow-sysinfo-in-the-seccomp-sandbox.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=a6067ad950b28336613aed9dd47b1271 \ @@ -29,13 +30,13 @@ SRC_URI[sha256sum] = "9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c PACKAGECONFIG ??= "tcp-wrappers" PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers" -SRC_URI +="${@base_contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" +SRC_URI +="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://vsftpd-tcp_wrappers-support.patch', '', d)}" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" -RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" -PAMLIB = "${@base_contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" -NOPAM_SRC ="${@base_contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}" +PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}" +NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}" +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '${NOPAM_SRC}', d)}" inherit update-rc.d useradd systemd @@ -75,7 +76,7 @@ do_install() { sed -i "s:/lib/security:${base_libdir}/security:" ${D}${sysconfdir}/pam.d/vsftpd sed -i "s:ftpusers:vsftpd.ftpusers:" ${D}${sysconfdir}/pam.d/vsftpd fi - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d /var/run/vsftpd/empty 0755 root root -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf @@ -100,10 +101,10 @@ SYSTEMD_SERVICE_${PN} = "vsftpd.service" pkg_postinst_${PN}() { if [ -z "$D" ]; then - if type systemd-tmpfiles >/dev/null; then - systemd-tmpfiles --create - elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then - ${sysconfdir}/init.d/populate-volatile.sh update - fi + if type systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create + elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update + fi fi } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_interfaces_of_linux_v4.8_and_above.patch b/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_interfaces_of_linux_v4.8_and_above.patch new file mode 100644 index 0000000000000000000000000000000000000000..e55c407a41435ae44eb363905256081518430ea2 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/files/build_with_updated_interfaces_of_linux_v4.8_and_above.patch @@ -0,0 +1,525 @@ +Resolve build error with linux kernel 4.8 + +The below changes in kernel source, triggered iscsitarget +build fail with linux kernel v4.8. + +1. An extra 'flags' argument has been passed to vfs_readv/vfs_writev + syscalls in v4.8. So, set this argument to "0" for now + (as there is no real need for that). + Ref: https://github.com/torvalds/linux/commit/793b80ef14af56d20c998265287648ad34239b6f + Solves: + -- snip -- +TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/nthread.c: In function 'write_data': +TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/nthread.c:350:9: error: too few arguments to function 'vfs_writev' + res = vfs_writev(file, (struct iovec __user *) iop, count, &off); + ^~~~~~~~~~ + -- snip -- + +2. Redefine dropped PAGE_CACHE_* and page_cache_{get,release} definitions, + as they have been dropped with v4.8 + Ref: https://github.com/torvalds/linux/commit/1fa64f198b9f8d6ec0f7aec7c18dc94684391140 + Solves: + -- snip -- +TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/param.c: In function 'sess_param_check': +TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/param.c:48:41: error: 'PAGE_CACHE_SIZE' undeclared (first use in this function) + (u32) ((ISCSI_CONN_IOV_MAX - 1) * PAGE_CACHE_SIZE)); + ^ + -- snip -- + +3. Replace crypto_hash interfaces with crypto_ahash interfaces, + Ref: https://github.com/torvalds/linux/commit/896545098777564212b9e91af4c973f094649aa7 + Ref: https://www.redhat.com/archives/dm-devel/2016-January/msg00244.html + Solves: + -- snip -- +TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/digest.c: In function 'digest_init': +TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/digest.c:42:23: error: implicit declaration of function 'crypto_alloc_hash' [-Werror=implicit-function-declaration] + conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0, + ^~~~~~~~~~~~~~~~~ +TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/digest.c: In function 'digest_cleanup': +TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/digest.c:77:3: error: implicit declaration of function 'crypto_free_hash' [-Werror=implicit-function-declaration] + crypto_free_hash(conn->tx_hash.tfm); + ^~~~~~~~~~~~~~~~ + -- snip -- + +4. The earlier "rw" parameter has been set in "bi_rw" within + bio structure, hence remove "rw" argument. + Ref: https://github.com/torvalds/linux/commit/4e49ea4a3d276365bf7396c9b77b4d1d5923835a + Solves: +-- snip -- +TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/block-io.c:140:14: warning: passing argument 1 of 'submit_bio' makes pointer from integer without a cast [-Wint-conversion] + submit_bio(rw, bio); + ^~ +-- snip -- + +5. The 'len' argument from sk_data_ready() callback has been removed in + linux kernel v4.3 and above. + Ref: https://github.com/torvalds/linux/commit/676d23690fb62b5d51ba5d659935e9f7d9da9f8e + Solves: +-- snip -- +TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/conn.c: In function 'iet_socket_bind': +TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/conn.c:143:38: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types] + target->nthread_info.old_data_ready = conn->sock->sk->sk_data_ready; + ^ +TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/conn.c:144:32: error: assignment from incompatible pointer type [-Werror=incompatible-pointer-types] + conn->sock->sk->sk_data_ready = iet_data_ready; + ^ +-- snip -- + +6. + A. The "size" argument has been dropped from sock_recvmsg syscall in v4.8, + as all callers have it equal to msg_data_left(msg). + B. 'struct user_msghdr' is being used for userland-side msghdr instead + of 'struct msghdr', which is used for kernel-side msghdr in linux v3.19 + and above, so typecase it while calling sock_recvmsg syscall. + Ref: https://github.com/torvalds/linux/commit/2da62906b1e298695e1bb725927041cd59942c98 + https://github.com/torvalds/linux/commit/666547ff591cebdedc4679bf6b1b3f3383a8dea3 + Solves: + -- snip -- +TOPDIR/tmp-glibc/work-shared/qemux86/kernel-source/include/linux/net.h:222:5: note: expected 'struct msghdr *' but argument is of type 'struct user_msghdr *' + int sock_recvmsg(struct socket *sock, struct msghdr *msg, int flags); + ^~~~~~~~~~~~ +TOPDIR/tmp-glibc/work/qemux86-oe-linux/iscsitarget/1.4.20.3+svn502-r0/iscsitarget-1.4.20.3+svn502/kernel/nthread.c:129:8: error: too many arguments to function 'sock_recvmsg' + res = sock_recvmsg(conn->sock, &msg, len, MSG_DONTWAIT | MSG_NOSIGNAL); + ^~~~~~~~~~~~ + -- snip -- + +Detailed error log is at: http://errors.yoctoproject.org/Errors/Details/83334/ + +Upstream-Status: Pending + +Signed-off-by: Jagadeesh Krishnanjanappa + +diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/block-io.c iscsitarget-1.4.20.3+svn502/kernel/block-io.c +--- iscsitarget-1.4.20.3+svn502_org/kernel/block-io.c 2016-09-25 19:45:01.814641016 +0530 ++++ iscsitarget-1.4.20.3+svn502/kernel/block-io.c 2016-09-25 19:47:59.666474094 +0530 +@@ -57,7 +57,6 @@ static int + blockio_make_request(struct iet_volume *volume, struct tio *tio, int rw) + { + struct blockio_data *bio_data = volume->private; +- struct request_queue *bdev_q = bdev_get_queue(bio_data->bdev); + struct tio_work *tio_work; + struct bio *tio_bio = NULL, *bio = NULL, *biotail = NULL; + struct blk_plug plug; +@@ -69,6 +68,7 @@ blockio_make_request(struct iet_volume * + int err = 0; + loff_t ppos = tio->offset; + #else ++ struct request_queue *bdev_q = bdev_get_queue(bio_data->bdev); + int max_pages = 1; + int err = 0; + +@@ -102,7 +102,11 @@ blockio_make_request(struct iet_volume * + /* bi_sector is ALWAYS in units of 512 bytes */ + bio->bi_iter.bi_sector = ppos >> 9; + bio->bi_bdev = bio_data->bdev; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ bio->bi_end_io = (bio_end_io_t *) blockio_bio_endio; ++#else + bio->bi_end_io = blockio_bio_endio; ++#endif + bio->bi_private = tio_work; + + if (tio_bio) +@@ -137,7 +141,12 @@ blockio_make_request(struct iet_volume * + tio_bio = tio_bio->bi_next; + bio->bi_next = NULL; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ bio_set_op_attrs(bio, REQ_OP_WRITE, 0); ++ submit_bio(bio); ++#else + submit_bio(rw, bio); ++#endif + } + + blk_finish_plug(&plug); +diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/conn.c iscsitarget-1.4.20.3+svn502/kernel/conn.c +--- iscsitarget-1.4.20.3+svn502_org/kernel/conn.c 2016-09-25 19:45:01.774641057 +0530 ++++ iscsitarget-1.4.20.3+svn502/kernel/conn.c 2016-09-25 19:47:59.666474094 +0530 +@@ -89,13 +89,21 @@ static void iet_state_change(struct sock + target->nthread_info.old_state_change(sk); + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) ++static void iet_data_ready(struct sock *sk) ++#else + static void iet_data_ready(struct sock *sk, int len) ++#endif + { + struct iscsi_conn *conn = sk->sk_user_data; + struct iscsi_target *target = conn->session->target; + + nthread_wakeup(target); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) ++ target->nthread_info.old_data_ready(sk); ++#else + target->nthread_info.old_data_ready(sk, len); ++#endif + } + + /* +@@ -140,8 +148,14 @@ static void iet_socket_bind(struct iscsi + target->nthread_info.old_state_change = conn->sock->sk->sk_state_change; + conn->sock->sk->sk_state_change = iet_state_change; + ++#if 0//LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ target->nthread_info.old_data_ready = (void (*) (struct sock *, int )) \ ++ conn->sock->sk->sk_data_ready; ++ conn->sock->sk->sk_data_ready = (void (*) (struct sock *)) iet_data_ready; ++#else + target->nthread_info.old_data_ready = conn->sock->sk->sk_data_ready; + conn->sock->sk->sk_data_ready = iet_data_ready; ++#endif + + target->nthread_info.old_write_space = conn->sock->sk->sk_write_space; + conn->sock->sk->sk_write_space = iet_write_space; +diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/digest.c iscsitarget-1.4.20.3+svn502/kernel/digest.c +--- iscsitarget-1.4.20.3+svn502_org/kernel/digest.c 2014-05-07 02:29:55.000000000 +0530 ++++ iscsitarget-1.4.20.3+svn502/kernel/digest.c 2016-09-25 19:47:59.666474094 +0530 +@@ -30,6 +30,9 @@ void digest_alg_available(unsigned int * + int digest_init(struct iscsi_conn *conn) + { + int err = 0; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ struct crypto_ahash *tfm; ++#endif + + if (!(conn->hdigest_type & DIGEST_ALL)) + conn->hdigest_type = DIGEST_NONE; +@@ -39,15 +42,40 @@ int digest_init(struct iscsi_conn *conn) + + if (conn->hdigest_type & DIGEST_CRC32C || + conn->ddigest_type & DIGEST_CRC32C) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ tfm = crypto_alloc_ahash("crc32c", 0, CRYPTO_ALG_ASYNC); ++ if (IS_ERR(tfm)) { ++ tfm = NULL; ++#else + conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0, + CRYPTO_ALG_ASYNC); + conn->rx_hash.flags = 0; + if (IS_ERR(conn->rx_hash.tfm)) { + conn->rx_hash.tfm = NULL; ++#endif + err = -ENOMEM; + goto out; + } +- ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ conn->rx_hash = ahash_request_alloc(tfm, GFP_KERNEL); ++ if (!conn->rx_hash) { ++ pr_err("ahash_request_alloc() failed for conn->rx_hash\n"); ++ crypto_free_ahash(tfm); ++ err = -ENOMEM; ++ goto out; ++ } ++ ahash_request_set_callback(conn->rx_hash, 0, NULL, NULL); ++ conn->tx_hash = ahash_request_alloc(tfm, GFP_KERNEL); ++ if(!conn->tx_hash) { ++ pr_err("ahash_request_alloc() failed for conn->tx_hash\n"); ++ ahash_request_free(conn->rx_hash); ++ conn->rx_hash = NULL; ++ crypto_free_ahash(tfm); ++ err = -ENOMEM; ++ goto out; ++ } ++ ahash_request_set_callback(conn->tx_hash, 0, NULL, NULL); ++#else + conn->tx_hash.tfm = crypto_alloc_hash("crc32c", 0, + CRYPTO_ALG_ASYNC); + conn->tx_hash.flags = 0; +@@ -56,6 +84,7 @@ int digest_init(struct iscsi_conn *conn) + err = -ENOMEM; + goto out; + } ++#endif + } + + out: +@@ -73,10 +102,21 @@ out: + */ + void digest_cleanup(struct iscsi_conn *conn) + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ ahash_request_free(conn->tx_hash); ++ if (conn->rx_hash) { ++ struct crypto_ahash *tfm; ++ tfm = crypto_ahash_reqtfm(conn->rx_hash); ++ ahash_request_free(conn->rx_hash); ++ crypto_free_ahash(tfm); ++ } ++ ++#else + if (conn->tx_hash.tfm) + crypto_free_hash(conn->tx_hash.tfm); + if (conn->rx_hash.tfm) + crypto_free_hash(conn->rx_hash.tfm); ++#endif + } + + /** +@@ -160,8 +200,13 @@ static inline void __dbg_simulate_data_d + } + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++static void digest_header(struct ahash_request *hash, struct iscsi_pdu *pdu, ++ u8 *crc) ++#else + static void digest_header(struct hash_desc *hash, struct iscsi_pdu *pdu, + u8 *crc) ++#endif + { + struct scatterlist sg[2]; + unsigned int nbytes = sizeof(struct iscsi_hdr); +@@ -174,16 +219,27 @@ static void digest_header(struct hash_de + nbytes += pdu->ahssize; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ crypto_ahash_init(hash); ++ ahash_request_set_crypt(hash, sg, crc, nbytes); ++ crypto_ahash_update(hash); ++ crypto_ahash_digest(hash); ++#else + crypto_hash_init(hash); + crypto_hash_update(hash, sg, nbytes); + crypto_hash_final(hash, crc); ++#endif + } + + int digest_rx_header(struct iscsi_cmnd *cmnd) + { + u32 crc; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ digest_header(cmnd->conn->rx_hash, &cmnd->pdu, (u8 *) &crc); ++#else + digest_header(&cmnd->conn->rx_hash, &cmnd->pdu, (u8 *) &crc); ++#endif + if (crc != cmnd->hdigest) + return -EIO; + +@@ -192,11 +248,20 @@ int digest_rx_header(struct iscsi_cmnd * + + void digest_tx_header(struct iscsi_cmnd *cmnd) + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ digest_header(cmnd->conn->tx_hash, &cmnd->pdu, (u8 *) &cmnd->hdigest); ++#else + digest_header(&cmnd->conn->tx_hash, &cmnd->pdu, (u8 *) &cmnd->hdigest); ++#endif + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++static void digest_data(struct ahash_request *hash, struct iscsi_cmnd *cmnd, ++ struct tio *tio, u32 offset, u8 *crc) ++#else + static void digest_data(struct hash_desc *hash, struct iscsi_cmnd *cmnd, + struct tio *tio, u32 offset, u8 *crc) ++#endif + { + struct scatterlist *sg = cmnd->conn->hash_sg; + u32 size, length, npages; +@@ -214,7 +279,11 @@ static void digest_data(struct hash_desc + BUG_ON(npages > ISCSI_CONN_IOV_MAX); + + sg_init_table(sg, ARRAY_SIZE(cmnd->conn->hash_sg)); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ crypto_ahash_init(hash); ++#else + crypto_hash_init(hash); ++#endif + + for (i = 0; size > 0; i++) { + length = min_t(u32, PAGE_CACHE_SIZE - offset, size); +@@ -225,8 +294,14 @@ static void digest_data(struct hash_desc + + sg_mark_end(&sg[i - 1]); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ ahash_request_set_crypt(hash, sg, crc, nbytes); ++ crypto_ahash_update(hash); ++ crypto_ahash_digest(hash); ++#else + crypto_hash_update(hash, sg, nbytes); + crypto_hash_final(hash, crc); ++#endif + } + + int digest_rx_data(struct iscsi_cmnd *cmnd) +@@ -251,8 +326,11 @@ int digest_rx_data(struct iscsi_cmnd *cm + tio = cmnd->tio; + offset = 0; + } +- ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ digest_data(cmnd->conn->rx_hash, cmnd, tio, offset, (u8 *) &crc); ++#else + digest_data(&cmnd->conn->rx_hash, cmnd, tio, offset, (u8 *) &crc); ++#endif + + if (!cmnd->conn->read_overflow && + (cmnd_opcode(cmnd) != ISCSI_OP_PDU_REJECT)) { +@@ -269,6 +347,11 @@ void digest_tx_data(struct iscsi_cmnd *c + struct iscsi_data_out_hdr *req = (struct iscsi_data_out_hdr *)&cmnd->pdu.bhs; + + assert(tio); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ digest_data(cmnd->conn->tx_hash, cmnd, tio, ++ be32_to_cpu(req->buffer_offset), (u8 *) &cmnd->ddigest); ++#else + digest_data(&cmnd->conn->tx_hash, cmnd, tio, + be32_to_cpu(req->buffer_offset), (u8 *) &cmnd->ddigest); ++#endif + } +diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/iscsi.h iscsitarget-1.4.20.3+svn502/kernel/iscsi.h +--- iscsitarget-1.4.20.3+svn502_org/kernel/iscsi.h 2016-09-25 19:45:01.734641099 +0530 ++++ iscsitarget-1.4.20.3+svn502/kernel/iscsi.h 2016-09-25 19:47:59.666474094 +0530 +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -81,7 +82,11 @@ struct network_thread_info { + spinlock_t nthread_lock; + + void (*old_state_change)(struct sock *); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) ++ void (*old_data_ready)(struct sock *); ++#else + void (*old_data_ready)(struct sock *, int); ++#endif + void (*old_write_space)(struct sock *); + }; + +@@ -275,8 +280,13 @@ struct iscsi_conn { + u32 write_offset; + int write_state; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ struct ahash_request *rx_hash; ++ struct ahash_request *tx_hash; ++#else + struct hash_desc rx_hash; + struct hash_desc tx_hash; ++#endif + struct scatterlist hash_sg[ISCSI_CONN_IOV_MAX]; + }; + +@@ -552,4 +562,10 @@ enum cmnd_flags { + #define PRODUCT_ID "VIRTUAL-DISK" + #define PRODUCT_REV "0" + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++#define PAGE_CACHE_SHIFT PAGE_SHIFT ++#define PAGE_CACHE_SIZE PAGE_SIZE ++#define PAGE_CACHE_MASK PAGE_MASK ++#endif ++ + #endif /* __ISCSI_H__ */ +diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/nthread.c iscsitarget-1.4.20.3+svn502/kernel/nthread.c +--- iscsitarget-1.4.20.3+svn502_org/kernel/nthread.c 2016-09-25 19:45:01.734641099 +0530 ++++ iscsitarget-1.4.20.3+svn502/kernel/nthread.c 2016-09-25 19:47:59.666474094 +0530 +@@ -126,7 +126,12 @@ static int do_recv(struct iscsi_conn *co + + oldfs = get_fs(); + set_fs(get_ds()); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ res = sock_recvmsg(conn->sock, (struct msghdr *) &msg, \ ++ MSG_DONTWAIT | MSG_NOSIGNAL); ++#else + res = sock_recvmsg(conn->sock, &msg, len, MSG_DONTWAIT | MSG_NOSIGNAL); ++#endif + set_fs(oldfs); + + if (res <= 0) { +@@ -347,7 +352,11 @@ static int write_data(struct iscsi_conn + ; + oldfs = get_fs(); + set_fs(KERNEL_DS); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ res = vfs_writev(file, (struct iovec __user *) iop, count, &off, 0); ++#else + res = vfs_writev(file, (struct iovec __user *) iop, count, &off); ++#endif + set_fs(oldfs); + dprintk(D_DATA, "%#Lx:%u: %d(%ld)\n", + (unsigned long long) conn->session->sid, conn->cid, +@@ -478,7 +487,11 @@ static int tx_ddigest(struct iscsi_cmnd + iov.iov_base = (char *) (&cmnd->ddigest) + (sizeof(u32) - rest); + iov.iov_len = rest; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ res = kernel_sendmsg(cmnd->conn->sock, (struct msghdr *) &msg, &iov, 1, rest); ++#else + res = kernel_sendmsg(cmnd->conn->sock, &msg, &iov, 1, rest); ++#endif + + if (res > 0) { + cmnd->conn->write_size -= res; +@@ -677,7 +690,12 @@ static void close_conn(struct iscsi_conn + + write_lock_bh(&conn->sock->sk->sk_callback_lock); + conn->sock->sk->sk_state_change = target->nthread_info.old_state_change; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ conn->sock->sk->sk_data_ready = (void (*) (struct sock *)) \ ++ target->nthread_info.old_data_ready; ++#else + conn->sock->sk->sk_data_ready = target->nthread_info.old_data_ready; ++#endif + conn->sock->sk->sk_write_space = target->nthread_info.old_write_space; + write_unlock_bh(&conn->sock->sk->sk_callback_lock); + +diff -Naurp iscsitarget-1.4.20.3+svn502_org/kernel/volume.c iscsitarget-1.4.20.3+svn502/kernel/volume.c +--- iscsitarget-1.4.20.3+svn502_org/kernel/volume.c 2016-09-25 19:45:01.734641099 +0530 ++++ iscsitarget-1.4.20.3+svn502/kernel/volume.c 2016-09-25 19:47:59.666474094 +0530 +@@ -84,12 +84,25 @@ static int set_scsisn(struct iet_volume + /* Generate a MD5 hash of the target IQN and LUN number */ + static void gen_scsiid(struct iet_volume *volume) + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ struct ahash_request *hash; ++ struct crypto_ahash *tfm; ++#else + struct hash_desc hash; ++#endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ tfm = crypto_alloc_ahash("md5", 0, CRYPTO_ALG_ASYNC); ++#else + hash.tfm = crypto_alloc_hash("md5", 0, CRYPTO_ALG_ASYNC); + hash.flags = 0; ++#endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ if (!IS_ERR(tfm)) { ++#else + if (!IS_ERR(hash.tfm)) { ++#endif + struct scatterlist sg[2]; + unsigned int nbytes = 0; + +@@ -102,11 +115,19 @@ static void gen_scsiid(struct iet_volume + sg_set_buf(&sg[1], &volume->lun, sizeof(volume->lun)); + nbytes += sizeof(volume->lun); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0) ++ crypto_ahash_init(hash); ++ ahash_request_set_crypt(hash, sg, volume->scsi_id, nbytes); ++ crypto_ahash_update(hash); ++ crypto_ahash_digest(hash); ++ crypto_free_ahash(tfm); ++#else + crypto_hash_init(&hash); + crypto_hash_update(&hash, sg, nbytes); + crypto_hash_final(&hash, volume->scsi_id); + + crypto_free_hash(hash.tfm); ++#endif + } else { + /* If no MD5 available set ID to TID and LUN */ + memcpy(volume->scsi_id, &volume->target->tid, diff --git a/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb b/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb index 4c5eed6de993cb398822b0da89f567249b4e6bc2..7279bc6378f775d458155fbc81f8c6824a597f85 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-extended/iscsitarget/iscsitarget_1.4.20.3+svn502.bb @@ -12,7 +12,8 @@ SRC_URI = "http://ftp.heanet.ie/mirrors/ubuntu/pool/universe/i/${BPN}/${BPN}_${P file://use-kernel-makefile-to-get-kernel-version.patch \ file://fix-errors-observed-with-linux-3.19-and-greater.patch \ file://access-sk_v6_daddr-iff-IPV6-defined.patch \ - file://build_with_updated_bio_struct_of_linux_v4.3_and_above.patch" + file://build_with_updated_bio_struct_of_linux_v4.3_and_above.patch \ + file://build_with_updated_interfaces_of_linux_v4.8_and_above.patch" SRC_URI[md5sum] = "ef9bc823bbabd3c772208c00d5f2d089" SRC_URI[sha256sum] = "d3196ccb78a43266dce28587bfe30d8ab4db7566d7bce96057dfbb84100babb5" @@ -26,7 +27,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() { @@ -34,12 +36,12 @@ do_install() { install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/iscsi install -m 0644 kernel/iscsi_trgt.ko \ ${D}/lib/modules/${KERNEL_VERSION}/kernel/iscsi/iscsi_trgt.ko - + # Userspace utilities install -d ${D}${sbindir} install -m 0755 usr/ietd ${D}${sbindir}/ietd install -m 0755 usr/ietadm ${D}${sbindir}/ietadm - + # Config files, init scripts mkdir -p ${D}${sysconfdir}/iet install -m 0644 etc/ietd.conf ${D}/${sysconfdir}/iet/ietd.conf diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-filter/libmnl/libmnl_1.0.4.bb similarity index 78% rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb rename to import-layers/meta-openembedded/meta-networking/recipes-filter/libmnl/libmnl_1.0.4.bb index b3a5f2e956eada9300dd060cef3ee3cc406e6a15..b45879980075c0488abf885b449e40437f3b51e0 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-filter/libmnl/libmnl_1.0.3.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-filter/libmnl/libmnl_1.0.4.bb @@ -7,7 +7,7 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "http://www.netfilter.org/projects/libmnl/files/libmnl-${PV}.tar.bz2;name=tar" -SRC_URI[tar.md5sum] = "7d95fc3bea3365bc03c48e484224f65f" -SRC_URI[tar.sha256sum] = "6f14336e9acdbc62c2dc71bbb59ce162e54e9af5c80153e92476c5443fe784de" +SRC_URI[tar.md5sum] = "be9b4b5328c6da1bda565ac5dffadb2d" +SRC_URI[tar.sha256sum] = "171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81" inherit autotools pkgconfig diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb new file mode 100644 index 0000000000000000000000000000000000000000..0d713033c11aa05208f186188e755aba62970131 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-filter/libnetfilter/libnetfilter-acct_1.0.3.bb @@ -0,0 +1,15 @@ +SUMMARY = "libnetfilter_acct accounting infrastructure." +DESCRIPTION = "libnetfilter_acct is the userspace library providing interface to extended accounting infrastructure." +HOMEPAGE = "http://netfilter.org/projects/libnetfilter_acct/index.html" +SECTION = "libs" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +DEPENDS = "libnfnetlink libmnl" + +SRC_URI = "http://ftp.netfilter.org/pub/libnetfilter_acct/libnetfilter_acct-1.0.3.tar.bz2" +SRC_URI[md5sum] = "814b2972b2f5c740ff87510bc109168b" +SRC_URI[sha256sum] = "4250ceef3efe2034f4ac05906c3ee427db31b9b0a2df41b2744f4bf79a959a1a" + +S = "${WORKDIR}/libnetfilter_acct-${PV}" + +inherit autotools pkgconfig diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.5.bb b/import-layers/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.6.bb similarity index 70% rename from import-layers/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.5.bb rename to import-layers/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.6.bb index 6171151dfd039a0b3f68c984ed4710a012bf6b0f..72aec19d2e643ae7e8d3a832d2c7674fd088f1b5 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.5.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.0.6.bb @@ -7,7 +7,7 @@ DEPENDS = "libmnl" SRC_URI = "http://netfilter.org/projects/libnftnl/files/${BP}.tar.bz2 \ " -SRC_URI[md5sum] = "af0c62ce6bbd7a7d39def0996c1c17c9" -SRC_URI[sha256sum] = "f6d4f5a702e38bc7987f2363f9fcd65930e8b702595c221a497e2f3a359be497" +SRC_URI[md5sum] = "6d7f9f161538ca7efd535dcc70caf964" +SRC_URI[sha256sum] = "ad3b932a39a1e567308e91b683b32239a5e1aea9b4582dfffe2288c3400ab07e" inherit autotools pkgconfig diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb b/import-layers/meta-openembedded/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb new file mode 100644 index 0000000000000000000000000000000000000000..d92f7c045d778e008fd4c416d0b0671b4fd5920c --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-filter/nfacct/nfacct_1.0.2.bb @@ -0,0 +1,17 @@ +SUMMARY = "nfacct is the command line tool to create/retrieve/delete accounting objects" +HOMEPAGE = "http://netfilter.org/projects/nfacct/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" + +SRC_URI = "ftp://ftp.netfilter.org/pub/nfacct/nfacct-1.0.2.tar.bz2" + +SRC_URI[md5sum] = "94faafdaaed85ca9220c5692be8a408e" +SRC_URI[sha256sum] = "ecff2218754be318bce3c3a5d1775bab93bf4168b2c4aac465785de5655fbd69" +DEPENDS = "libnfnetlink libmnl libnetfilter-acct" + +EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' + +S = "${WORKDIR}/nfacct-${PV}" + +inherit autotools pkgconfig + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.5.bb b/import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.6.bb similarity index 74% rename from import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.5.bb rename to import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.6.bb index 11b5e5a9088a74f53d3a7d663b4296d987c8e8ab..5dd93627ae268e9d4cc29397a8b511bab531df92 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.5.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_0.6.bb @@ -10,8 +10,7 @@ RRECOMMENDS_${PN} += "kernel-module-nf-tables \ SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2 \ file://fix-to-generate-ntf.8.patch \ " - -SRC_URI[md5sum] = "94bfe1c54bcb9f6ed974835f2fca8069" -SRC_URI[sha256sum] = "1fb6dff333d8a4fc347cbbe273bf905a2634b27a8c39df0d3a45d5a3fde10ad6" +SRC_URI[md5sum] = "fd320e35fdf14b7be795492189b13dae" +SRC_URI[sha256sum] = "dede62655f1c56f2bc9f9be12d103d930dcef6d5f9e0855854ad9c6f93cd6c2d" inherit autotools pkgconfig diff --git a/import-layers/meta-openembedded/meta-networking/recipes-irc/znc/znc_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-irc/znc/znc_git.bb index 22aecbad2dc1ab1452154913e5c8f88cdc6018b4..f3345a9443c8785ed48f5f80c8a27ea3f4f6d331 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-irc/znc/znc_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-irc/znc/znc_git.bb @@ -21,6 +21,9 @@ S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + # ZNC has a custom autogen.sh that states that this command is needed *and* expected to fail do_configure_prepend() { automake --add-missing || true diff --git a/import-layers/meta-openembedded/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb index 406a4f3cffb188473ca77486b668cd63a92b26cc..e9eea56cd8294ed5c02b0b1ef11e0e2b027d1c48 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb @@ -70,7 +70,7 @@ do_configure_append () { #define NETMAP_LINUX_HAVE_E1000E_DOWN2 EOF -if ${@ 'false' if (bb.utils.vercmp_string(d.getVar('KERNEL_VERSION', True), '3.17') < 0) else 'true' } ; then +if ${@ 'false' if (bb.utils.vercmp_string(d.getVar('KERNEL_VERSION', True) or "0", '3.17') < 0) else 'true' } ; then echo OK cat >> ${S}/LINUX/netmap_linux_config.h < + +Index: netkit-rsh-0.17/rlogin/rlogin.c +=================================================================== +--- netkit-rsh-0.17.orig/rlogin/rlogin.c ++++ netkit-rsh-0.17/rlogin/rlogin.c +@@ -460,7 +460,7 @@ writeroob(int ignore) + void + catch_child(int ignore) + { +- union wait status; ++ int status; + int pid; + + (void)ignore; +@@ -471,7 +471,7 @@ catch_child(int ignore) + return; + /* if the child (reader) dies, just quit */ + if (pid < 0 || (pid == childpid && !WIFSTOPPED(status))) +- done((int)(status.w_termsig | status.w_retcode)); ++ done((int)(WTERMSIG(status) | WEXITSTATUS(status))); + } + /* NOTREACHED */ + } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb b/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb index e29369c4959a8e9daa8afb374e0aff298207ce6c..8f08acf30f26b11ac069111456374512badd442c 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-netkit/netkit-rsh/netkit-rsh_0.17.bb @@ -15,6 +15,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rsh/netkit-rsh_${PV}.orig.tar.gz;name= file://rsh.xinetd.netkit \ file://netkit-rsh-0.17-rexec-ipv6.patch \ file://fix-host-variable.patch \ + file://fixup_wait3_api_change.patch \ " SRC_URI[archive.md5sum] = "65f5f28e2fe22d9ad8b17bb9a10df096" @@ -24,9 +25,10 @@ SRC_URI[patch15.sha256sum] = "2bc071c438e8b0ed42a0bd2db2d8b681b27a1e9b1798694d98 # Other support files PAM_SRC_URI = "file://rexec.pam \ - file://rlogin.pam \ - file://rsh.pam" -SRC_URI += "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" + file://rlogin.pam \ + file://rsh.pam \ +" +SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" inherit pkgconfig @@ -41,7 +43,7 @@ do_configure () { ./configure --prefix=${prefix} --exec-prefix=${exec_prefix} echo "INSTALLROOT=${D}" > MCONFIG - if [ "${@base_contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then echo "USE_PAM=1" >> MCONFIG fi @@ -63,7 +65,7 @@ do_install () { 'BINDIR=${bindir}' 'SBINDIR=${sbindir}' \ 'MANDIR=${mandir}' install - if [ "${@base_contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'pam', 'pam', '', d)}" != "" ]; then install -d ${D}${sysconfdir}/pam.d install -m 0644 debian/hosts.equiv ${D}/${sysconfdir} install -m 0644 ${WORKDIR}/rexec.pam ${D}/${sysconfdir}/pam.d/rexec diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb index 10e98a416d63bb7450818e0b32ebf2e7e514c408..22b7cfe929d52194bc167c79ae9a8dc4c446786c 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/accel-ppp/accel-ppp_git.bb @@ -40,3 +40,6 @@ do_install_prepend() { $cmlist done } + +# http://errors.yoctoproject.org/Errors/Details/81003/ +PNBLACKLIST[accel-ppp] ?= "BROKEN: fails to build with new binutils-2.27" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch new file mode 100644 index 0000000000000000000000000000000000000000..60ce80996dcd8d87c6733c364a711a6cb55cfe05 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-get_pid_from_inode-Include-limit.h.patch @@ -0,0 +1,29 @@ +From 7136d593ba96b64537069637c328bc65e1b66b2d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 22 Jul 2016 18:34:39 +0000 +Subject: [PATCH] get_pid_from_inode: Include limit.h + +PATH_MAX and NAME_MAX are required by this file + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + agent/mibgroup/util_funcs/get_pid_from_inode.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/agent/mibgroup/util_funcs/get_pid_from_inode.c b/agent/mibgroup/util_funcs/get_pid_from_inode.c +index 8e157ae..a494ec7 100644 +--- a/agent/mibgroup/util_funcs/get_pid_from_inode.c ++++ b/agent/mibgroup/util_funcs/get_pid_from_inode.c +@@ -5,6 +5,7 @@ + #include + + #include ++#include + #include + #if HAVE_STDLIB_H + #include +-- +1.8.3.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-agentx-crash.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-agentx-crash.patch new file mode 100644 index 0000000000000000000000000000000000000000..5eed893e18e57ba37dc4b933307d9d7335af187a --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/net-snmp-agentx-crash.patch @@ -0,0 +1,75 @@ +Description: fix snmpd crash via AgentX connection + + taken from Fedora, net-snmp-5.7-agentx-crash.patch + +bz729738 - net-snmp dumps core in netsnmp_oid_find_prefix +bz1038011 - net-snmp: snmpd crashes/hangs when AgentX subagent times-out + +commit f9304c83f76202db0e684269ca1af32e43cd9db4 +Author: Jan Safranek +Date: Tue Feb 7 14:53:44 2012 +0100 + + CHANGES: PATCH 1633670: fixed snmpd crashing when an AgentX subagent + disconnect in the middle of processing of a request. + + I fixed also the memory leak reported in the tracker comments. + +Upstream-Status: Backport + +Signed-off-by: Zhu Yanjun +Signed-off-by: Jackie Huang + +--- + agent/mibgroup/agentx/master.c | 5 +++++ + agent/mibgroup/agentx/master_admin.c | 9 +++++++-- + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/agent/mibgroup/agentx/master.c b/agent/mibgroup/agentx/master.c +index c42a42a..baeebaf 100644 +--- a/agent/mibgroup/agentx/master.c ++++ b/agent/mibgroup/agentx/master.c +@@ -219,6 +219,9 @@ agentx_got_response(int operation, + if (!cache) { + DEBUGMSGTL(("agentx/master", "response too late on session %8p\n", + session)); ++ /* response is too late, free the cache */ ++ if (magic) ++ netsnmp_free_delegated_cache((netsnmp_delegated_cache*) magic); + return 0; + } + requests = cache->requests; +@@ -606,6 +609,8 @@ agentx_master_handler(netsnmp_mib_handler *handler, + result = snmp_async_send(ax_session, pdu, agentx_got_response, cb_data); + if (result == 0) { + snmp_free_pdu(pdu); ++ if (cb_data) ++ netsnmp_free_delegated_cache((netsnmp_delegated_cache*) cb_data); + } + + return SNMP_ERR_NOERROR; +diff --git a/agent/mibgroup/agentx/master_admin.c b/agent/mibgroup/agentx/master_admin.c +index f16f392..b84b85e 100644 +--- a/agent/mibgroup/agentx/master_admin.c ++++ b/agent/mibgroup/agentx/master_admin.c +@@ -133,11 +133,16 @@ close_agentx_session(netsnmp_session * session, int sessid) + * requests, so that the delegated request will be completed and + * further requests can be processed + */ +- netsnmp_remove_delegated_requests_for_session(session); ++ while (netsnmp_remove_delegated_requests_for_session(session)) { ++ DEBUGMSGTL(("agentx/master", "Continue removing delegated reqests\n")); ++ } ++ + if (session->subsession != NULL) { + netsnmp_session *subsession = session->subsession; + for(; subsession; subsession = subsession->next) { +- netsnmp_remove_delegated_requests_for_session(subsession); ++ while (netsnmp_remove_delegated_requests_for_session(subsession)) { ++ DEBUGMSGTL(("agentx/master", "Continue removing delegated subsession reqests\n")); ++ } + } + } + +-- +2.7.4 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb index ee8878f9de5600e0adad8ac80dee1c62b50e8036..1997d5cd0ce9eea80f4873a3a7c6862b7b975882 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb @@ -8,21 +8,23 @@ LIC_FILES_CHKSUM = "file://README;beginline=3;endline=8;md5=7f7f00ba639ac8e8deb5 DEPENDS = "openssl libnl pciutils" SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.zip \ - file://init \ - file://snmpd.conf \ - file://snmptrapd.conf \ - file://systemd-support.patch \ - file://snmpd.service \ - file://snmptrapd.service \ - file://net-snmp-add-knob-whether-nlist.h-are-checked.patch \ - file://fix-libtool-finish.patch \ - file://net-snmp-testing-add-the-output-format-for-ptest.patch \ - file://run-ptest \ - file://dont-return-incompletely-parsed-varbinds.patch \ - file://0001-config_os_headers-Error-Fix.patch \ - file://0001-config_os_libs2-Error-Fix.patch \ - file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \ -" + file://init \ + file://snmpd.conf \ + file://snmptrapd.conf \ + file://systemd-support.patch \ + file://snmpd.service \ + file://snmptrapd.service \ + file://net-snmp-add-knob-whether-nlist.h-are-checked.patch \ + file://fix-libtool-finish.patch \ + file://net-snmp-testing-add-the-output-format-for-ptest.patch \ + file://run-ptest \ + file://dont-return-incompletely-parsed-varbinds.patch \ + file://0001-config_os_headers-Error-Fix.patch \ + file://0001-config_os_libs2-Error-Fix.patch \ + file://0001-snmplib-keytools.c-Don-t-check-for-return-from-EVP_M.patch \ + file://net-snmp-agentx-crash.patch \ + file://0001-get_pid_from_inode-Include-limit.h.patch \ + " SRC_URI[md5sum] = "9f682bd70c717efdd9f15b686d07baee" SRC_URI[sha256sum] = "e8dfc79b6539b71a6ff335746ce63d2da2239062ad41872fff4354cafed07a3e" @@ -142,11 +144,11 @@ FILES_${PN}-dev += "${bindir}/mib2c ${bindir}/mib2c-update" CONFFILES_${PN}-server-snmpd = "${sysconfdir}/snmp/snmpd.conf" CONFFILES_${PN}-server-snmptrapd = "${sysconfdir}/snmp/snmptrapd.conf" -INITSCRIPT_PACKAGES = "${PN}-server" -INITSCRIPT_NAME_${PN}-server = "snmpd" -INITSCRIPT_PARAMS_${PN}-server = "start 90 2 3 4 5 . stop 60 0 1 6 ." +INITSCRIPT_PACKAGES = "${PN}-server-snmpd" +INITSCRIPT_NAME_${PN}-server-snmpd = "snmpd" +INITSCRIPT_PARAMS_${PN}-server-snmpd = "start 90 2 3 4 5 . stop 60 0 1 6 ." -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemd', '--without-systemd', d)}" SYSTEMD_PACKAGES = "${PN}-server-snmpd \ ${PN}-server-snmptrapd" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc index 5f465cea6e85aecc56d83af8f244f400d427cb77..d309ae1a807aab918acc79ae87f2b2831f10b895 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow.inc @@ -20,7 +20,7 @@ PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl, openssl, libssl" EXTRA_OECONF += " \ KARCH=${TARGET_ARCH} \ - ${@base_contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'openssl', 'SSL_LIBS="-lssl -lcrypto"', '', d)} \ " S = "${WORKDIR}/git" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch new file mode 100644 index 0000000000000000000000000000000000000000..1f576fa7102a64670ae3a359f251b84925613806 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-test-pppd_dummy.c-Fix-return-value.patch @@ -0,0 +1,38 @@ +From ce5f5563ab54db9d28dba44a0e25e8a8c7bb9876 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 19 Oct 2016 00:34:35 +0000 +Subject: [PATCH] test/pppd_dummy.c: Fix return value + +pause() is defined in unistd.h, clang does not +like the fact that we are using a function without +declaration + +Signed-off-by: Khem Raj +--- + test/pppd_dummy.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/pppd_dummy.c b/test/pppd_dummy.c +index 148e7d2..b564c36 100644 +--- a/test/pppd_dummy.c ++++ b/test/pppd_dummy.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #define PPPD_DUMMY_TMP_FILE "/tmp/pppd_dummy" + +@@ -40,7 +41,7 @@ int main(int argc, char **argv) + + if (file == NULL) { + syslog(LOG_ERR, "Failed to open %s\n", filename); +- return; ++ return -1; + } + + for (arg = 1; arg < argc; arg++) { +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-obey-LDFLAGS.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-obey-LDFLAGS.patch new file mode 100644 index 0000000000000000000000000000000000000000..811faddd01abd956e18514c29444cf7726e963b1 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp/Makefile-obey-LDFLAGS.patch @@ -0,0 +1,15 @@ +Upstream-Status: Pending + +--- openl2tp-1.8/Makefile.orig 2016-09-16 14:54:18.554291976 +0200 ++++ openl2tp-1.8/Makefile 2016-09-16 14:57:23.559090400 +0200 +@@ -157,8 +157,8 @@ ADD_CFLAGS= -I. -Iusl -Icli -isystem i + -MMD -Wall -Wno-strict-aliasing \ + $(ADD_CPPFLAGS) $(CPPFLAGS.dmalloc) \ + -DSYS_LIBDIR=$(SYS_LIBDIR) +-LDFLAGS.l2tpd= -Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc +-LDFLAGS.l2tpconfig= -Lcli -lcli -lreadline $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc ++LDFLAGS.l2tpd= -Wl,-E -L. -Lusl -lusl -ldl $(LIBS.dmalloc) -lc $(LDFLAGS) ++LDFLAGS.l2tpconfig= -Lcli -lcli -lreadline $(LIBS.dmalloc) $(READLINE_LDFLAGS) -lc $(LDFLAGS) + + OPT_CFLAGS?= -O + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index d043b63898846fd64fe17d6473003712ae7e5e74..5a634048679ca186c86adbf06972a23b9ad18a44 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -14,14 +14,16 @@ DEPENDS = "popt flex readline" SRC_URI = "http://ftp.jaist.ac.jp/pub/sourceforge/o/op/${PN}/${PN}/${PV}/${BP}.tar.gz \ file://Makefile-modify-CFLAGS-to-aviod-build-error.patch \ file://openl2tp-simplify-gcc-warning-hack.patch \ - " + file://Makefile-obey-LDFLAGS.patch \ + file://0001-test-pppd_dummy.c-Fix-return-value.patch \ + " SRC_URI[md5sum] = "e3d08dedfb9e6a9a1e24f6766f6dadd0" SRC_URI[sha256sum] = "1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f" inherit autotools-brokensep pkgconfig PARALLEL_MAKE = "" -EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-nused-but-set-variable"' +EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -Wno-unused-but-set-variable"' do_compile_prepend() { sed -i -e "s:SYS_LIBDIR=.*:SYS_LIBDIR=${libdir}:g" \ diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/Zebra-sync-zebra-routing-table-with-the-kernel-one.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/Zebra-sync-zebra-routing-table-with-the-kernel-one.patch deleted file mode 100644 index 35f4637d8e8434d28b9b6086e184d3be32bce300..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/Zebra-sync-zebra-routing-table-with-the-kernel-one.patch +++ /dev/null @@ -1,48 +0,0 @@ -sync zebra routing table with the kernel one when interface is down - -Add router to kernel main router table with "ip", then you can see -a router item in kernel main router table. Also can see this router -item in zebra router table. If down the interface, this router item -will be deleted from kernel main router table, but it will not be -deleted from zebra router table, just set as inactive. - -This patch is adopted from [1]. -[1] http://www.gossamer-threads.com/lists/quagga/dev/22609 - -Upstream-Status: Pending - -Signed-of-by: Aws Ismail -Signed-of-by: Roy.Li - ---- - zebra/zebra_rib.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c -index 154e8d5..63434d0 100644 ---- a/zebra/zebra_rib.c -+++ b/zebra/zebra_rib.c -@@ -765,6 +765,9 @@ rib_match_ipv6 (struct in6_addr *addr) - #define RIB_SYSTEM_ROUTE(R) \ - ((R)->type == ZEBRA_ROUTE_KERNEL || (R)->type == ZEBRA_ROUTE_CONNECT) - -+#define RIB_KERNEL_ROUTE(R) \ -+ ((R)->type == ZEBRA_ROUTE_KERNEL) -+ - /* This function verifies reachability of one given nexthop, which can be - * numbered or unnumbered, IPv4 or IPv6. The result is unconditionally stored - * in nexthop->flags field. If the 4th parameter, 'set', is non-zero, -@@ -1135,6 +1138,10 @@ rib_process (struct route_node *rn) - redistribute_delete (&rn->p, fib); - if (! RIB_SYSTEM_ROUTE (fib)) - rib_uninstall_kernel (rn, fib); -+#ifdef GNU_LINUX -+ else if(RIB_KERNEL_ROUTE (fib) && !if_is_up(if_lookup_by_index(fib->nexthop->ifindex))) -+ del=fib; -+#endif - UNSET_FLAG (fib->flags, ZEBRA_FLAG_SELECTED); - - /* Set real nexthop. */ --- -1.7.4.1 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/babel-close-the-stdout-stderr-as-in-other-daemons.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/babel-close-the-stdout-stderr-as-in-other-daemons.patch deleted file mode 100644 index c2757a2fb7f4cb0a0d67a82e664e1fc7084d8541..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/babel-close-the-stdout-stderr-as-in-other-daemons.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ba71f768e6dbb1f2ac72ed3bd880bff75a48d345 Mon Sep 17 00:00:00 2001 -From: Roy Li -Date: Wed, 19 Feb 2014 14:13:40 +0800 -Subject: [PATCH] babeld: close stdout once the background daemon is created - -Upstream-Status: pending - -Once babald becomes a background daemon, it should not output information to -stdout, so need to close stdout. - -In fact, other daemons close their stdout when they run into background, like -ospfd, isisd and bgpd, by calling daemon() which is in lib/daemon.c - -Closing the stdout can fix a tee hang issue { #/usr/sbin/babeld -d |tee tmp } - -Signed-off-by: Roy Li ---- - babeld/util.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/babeld/util.c b/babeld/util.c -index 011f382..76203bc 100644 ---- a/babeld/util.c -+++ b/babeld/util.c -@@ -425,7 +425,7 @@ uchar_to_in6addr(struct in6_addr *dest, const unsigned char *src) - int - daemonise() - { -- int rc; -+ int rc, fd; - - fflush(stdout); - fflush(stderr); -@@ -441,5 +441,13 @@ daemonise() - if(rc < 0) - return -1; - -+ fd = open("/dev/null", O_RDWR, 0); -+ if (fd != -1) -+ { -+ dup2(fd, STDOUT_FILENO); -+ if (fd > 2) -+ close(fd); -+ } -+ - return 1; - } --- -1.7.10.4 - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/babeld.service b/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/babeld.service deleted file mode 100644 index dd344b0b341372def1ae34326877d02f797f98b7..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/files/babeld.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Babel routing daemon -BindTo=zebra.service -After=zebra.service -ConditionPathExists=@SYSCONFDIR@/quagga/babeld.conf - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/quagga -ExecStart=@SBINDIR@/babeld -d $babeld_options -f /etc/quagga/babeld.conf -Restart=on-abort - -[Install] -WantedBy=multi-user.target diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc b/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc index de78e2679931e445cef49cbb6a14a1565ab28cf8..ae08a2d323feac6d234ee75b025fea631480b1dd 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga.inc @@ -9,8 +9,8 @@ HOMEPAGE = "http://www.nongnu.org/quagga/" SECTION = "net" LICENSE = "GPL-2.0 & LGPL-2.0" DEPENDS = "readline ncurses perl-native" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" -SNMP_CONF="${@base_contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'snmp', 'net-snmp', '', d)}" +SNMP_CONF="${@bb.utils.contains('DISTRO_FEATURES', 'snmp', '--enable-snmp', '', d)}" LIC_FILES_CHKSUM = "file://COPYING;md5=81bcece21748c91ba9992349a91ec11d \ file://COPYING.LIB;md5=01ef24401ded36cd8e5d18bfe947240c" @@ -22,7 +22,6 @@ QUAGGASUBDIR = "" # ${QUAGGASUBDIR} is deal with old versions. Set to "/attic" for old # versions and leave it empty for recent versions. SRC_URI = "${SAVANNAH_GNU_MIRROR}/quagga${QUAGGASUBDIR}/quagga-${PV}.tar.gz; \ - file://Zebra-sync-zebra-routing-table-with-the-kernel-one.patch \ file://quagga.init \ file://quagga.default \ file://watchquagga.init \ @@ -31,7 +30,6 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quagga${QUAGGASUBDIR}/quagga-${PV}.tar.gz; \ file://quagga.pam \ file://ripd-fix-two-bugs-after-received-SIGHUP.patch \ file://quagga-Avoid-duplicate-connected-address.patch \ - file://babeld.service \ file://bgpd.service \ file://isisd.service \ file://ospf6d.service \ @@ -41,14 +39,13 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/quagga${QUAGGASUBDIR}/quagga-${PV}.tar.gz; \ file://zebra.service \ " -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" PACKAGECONFIG[cap] = "--enable-capabilities,--disable-capabilities,libcap" PACKAGECONFIG[pam] = "--with-libpam, --without-libpam, libpam" inherit autotools update-rc.d useradd systemd -SYSTEMD_PACKAGES = "${PN} ${PN}-babeld ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" -SYSTEMD_SERVICE_${PN}-babeld = "babeld.service" +SYSTEMD_PACKAGES = "${PN} ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" SYSTEMD_SERVICE_${PN}-bgpd = "bgpd.service" SYSTEMD_SERVICE_${PN}-isisd = "isisd.service" SYSTEMD_SERVICE_${PN}-ospf6d = "ospf6d.service" @@ -62,9 +59,7 @@ EXTRA_OECONF = "--sysconfdir=${sysconfdir}/quagga \ --enable-exampledir=${docdir}/quagga/examples/ \ --enable-vtysh \ --enable-isisd \ - ${@base_contains('DISTRO_FEATURES', 'sysvinit', '--enable-watchquagga', '--disable-watchquagga', d)} \ - --enable-ospf-te \ - --enable-opaque-lsa \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--enable-watchquagga', '--disable-watchquagga', d)} \ --enable-ospfclient=yes \ --enable-multipath=64 \ --enable-user=quagga \ @@ -88,12 +83,12 @@ do_install () { install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga # Install sample configurations for the daemons - for f in bgpd vtysh babeld isisd ospfd ripngd zebra ripd ospf6d; do + for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do install -m 0640 ${S}/$f/$f.conf.sample ${D}${sysconfdir}/quagga/$f.conf.sample done - for f in bgpd vtysh babeld isisd ospfd ripngd zebra ripd ospf6d; do - touch ${D}${sysconfdir}/quagga/$f.conf + for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do + touch ${D}${sysconfdir}/quagga/$f.conf done chown quagga:quaggavty ${D}${sysconfdir}/quagga chown quagga:quagga ${D}${sysconfdir}/quagga/*.conf @@ -125,7 +120,7 @@ do_install () { fi done - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d /var/run/quagga 0755 quagga quagga -" \ > ${D}${sysconfdir}/tmpfiles.d/${BPN}.conf @@ -138,7 +133,7 @@ do_install () { fi install -d ${D}${systemd_unitdir}/system - for i in babeld bgpd isisd ospf6d ospfd ripd ripngd zebra; do + for i in bgpd isisd ospf6d ospfd ripd ripngd zebra; do install -m 0644 ${WORKDIR}/$i.service ${D}${systemd_unitdir}/system done sed -e 's,@BASE_SBINDIR@,${base_sbindir},g' \ @@ -160,15 +155,14 @@ pkg_postinst_${PN} () { } # Split into a main package and separate per-protocol packages -PACKAGE_BEFORE_PN = "${PN}-ospfd ${PN}-ospf6d ${PN}-babeld ${PN}-bgpd \ +PACKAGE_BEFORE_PN = "${PN}-ospfd ${PN}-ospf6d ${PN}-bgpd \ ${PN}-ripd ${PN}-ripngd ${PN}-isisd \ - ${PN}-ospfclient ${@base_contains('DISTRO_FEATURES', 'sysvinit', '${PN}-watchquagga', '', d)}" + ${PN}-ospfclient ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${PN}-watchquagga', '', d)}" -RDEPENDS_${PN} += "${PN}-babeld ${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" +RDEPENDS_${PN} += "${PN}-bgpd ${PN}-isisd ${PN}-ospf6d ${PN}-ospfd ${PN}-ripd ${PN}-ripngd" FILES_${PN}-ospfd = "${sbindir}/ospfd ${libdir}/libospf.so.*" FILES_${PN}-ospf6d = "${sbindir}/ospf6d" -FILES_${PN}-babeld = "${sbindir}/babeld" FILES_${PN}-bgpd = "${sbindir}/bgpd" FILES_${PN}-ripd = "${sbindir}/ripd" FILES_${PN}-ripngd = "${sbindir}/ripngd" @@ -181,7 +175,6 @@ FILES_${PN}-watchquagga = "${sbindir}/watchquagga ${sysconfdir}/default/watchqua CONFFILES_${PN} = "${sysconfdir}/default/quagga \ ${sysconfdir}/quagga/bgpd.conf \ ${sysconfdir}/quagga/vtysh.conf \ - ${sysconfdir}/quagga/babeld.conf \ ${sysconfdir}/quagga/isisd.conf \ ${sysconfdir}/quagga/ospfd.conf \ ${sysconfdir}/quagga/ripngd.conf \ @@ -230,10 +223,6 @@ pkg_prerm_${PN}-ospf6d () { ${sysconfdir}/init.d/quagga stop ospf6d } -pkg_prerm_${PN}-babeld () { - ${sysconfdir}/init.d/quagga stop babeld -} - pkg_prerm_${PN}-bgpd () { ${sysconfdir}/init.d/quagga stop bgpd } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_0.99.24.1.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_0.99.24.1.bb deleted file mode 100644 index cecf4385c1c08eb022c3fcbd475830e2c1d04790..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_0.99.24.1.bb +++ /dev/null @@ -1,10 +0,0 @@ -require quagga.inc - -SRC_URI += "file://babel-close-the-stdout-stderr-as-in-other-daemons.patch \ - file://0001-ospf6d-check-ospf6-before-using-it-in-ospf6_clean.patch \ -" - -SRC_URI[md5sum] = "7986bdc2fe6027d4c9216f7f5791e718" -SRC_URI[sha256sum] = "84ae1a47df085119a8fcab6c43ccea9efb9bc3112388b1dece5a9f0a0262754f" - -QUAGGASUBDIR = "" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.0.20160315.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.0.20160315.bb new file mode 100644 index 0000000000000000000000000000000000000000..d1657818c4b97e19eee4decb876552cefb4bc46c --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/quagga/quagga_1.0.20160315.bb @@ -0,0 +1,10 @@ +require quagga.inc + +SRC_URI += " \ + file://0001-ospf6d-check-ospf6-before-using-it-in-ospf6_clean.patch \ +" + +SRC_URI[md5sum] = "e73d6e527fb80240f180de420cfe8042" +SRC_URI[sha256sum] = "21ffb7bad0ef5f130f18dd299d219ea1cb4f5c03d473b6b32c83c340cd853263" + +QUAGGASUBDIR = "" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks/makefile-add-ldflags.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks/makefile-add-ldflags.patch new file mode 100644 index 0000000000000000000000000000000000000000..21464188ca4679a553dc7f415636a0666f0c91a9 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks/makefile-add-ldflags.patch @@ -0,0 +1,19 @@ +Add LDFLAGS variable to Makefile.in, make sure the extra linker flags can be passed. + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao + +diff --git a/Makefile.in b/Makefile.in +index cad6706..0ed55c5 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -50,7 +50,7 @@ ${SAVE}: ${SAVE}.c + ${SHCC} ${CFLAGS} ${INCLUDES} -static -o ${SAVE} ${SAVE}.c + + ${SHLIB}: ${OBJS} ${COMMON}.o ${PARSER}.o +- ${SHCC} ${CFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS} ++ ${SHCC} ${CFLAGS} ${LDFLAGS} ${INCLUDES} -nostdlib -shared -o ${SHLIB} ${OBJS} ${COMMON}.o ${PARSER}.o ${DYNLIB_FLAGS} ${SPECIALLIBS} ${LIBS} + ln -sf ${SHLIB} ${LIB_NAME}.so + + %.so: %.c diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb index b3a9620c689bd0b69f96606e1b11ddcb7720c053..22287ce2621e16aa13b54205ebee2473c35b33e4 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/tsocks/tsocks_1.8beta5.bb @@ -9,7 +9,9 @@ SECTION = "net" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" -SRC_URI = "http://downloads.sourceforge.net/tsocks/tsocks-${PV}.tar.gz" +SRC_URI = "http://downloads.sourceforge.net/tsocks/tsocks-${PV}.tar.gz \ + file://makefile-add-ldflags.patch \ + " SRC_URI[md5sum] = "51caefd77e5d440d0bbd6443db4fc0f8" SRC_URI[sha256sum] = "849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/makefile-add-ldflags.patch b/import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/makefile-add-ldflags.patch new file mode 100644 index 0000000000000000000000000000000000000000..c5a4414db84fc623bb08724c8c83ded06b6c794b --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf/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 77f3364..c98083f 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,7 +18,7 @@ clean: + + zeroconf: zeroconf.o delay.o + $(Q)echo "Creating $@" +- $(Q)$(CC) $(CFLAGS) -o $@ $^ $(LIBS) ++ $(Q)$(CC) $(CFLAGS) ${LDFLAGS} -o $@ $^ $(LIBS) + + + # Automatic dependency generation diff --git a/import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb b/import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb index 9307263c7ba6d5926a381ed345867e2cd7d4285b..13f9b9b9a3fcf217e0fbf2365550df23c3d7d845 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb @@ -18,6 +18,7 @@ PR = "r1" SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${BPN}-${PV}.tar.gz \ file://compilefix.patch \ + file://makefile-add-ldflags.patch \ file://zeroconf-default \ file://debian-zeroconf" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/makefile-add-ldflags.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/makefile-add-ldflags.patch new file mode 100644 index 0000000000000000000000000000000000000000..726d8c564d8ae26faea60916dfed45a0da5e0644 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools/makefile-add-ldflags.patch @@ -0,0 +1,31 @@ +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 0c56ade..79f2e2b 100644 +--- a/Makefile ++++ b/Makefile +@@ -68,17 +68,17 @@ clean : + rm -f ${CONF_SCRIPTS} ${AOE_PING_OBJ} ${AOE_CFG_OBJ} ${SANCHECK_OBJ} ${PROGS} + + aoeping : ${AOE_PING_OBJ} +- ${CC} ${CFLAGS} -o $@ ${AOE_PING_OBJ} ++ ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${AOE_PING_OBJ} + aoeping.o : aoeping.c dat.h fns.h + ${CC} ${CFLAGS} -o $@ -c $< + linux.o : linux.c config.h + ${CC} ${CFLAGS} -o $@ -c $< + aoecfg: ${AOE_CFG_OBJ} +- ${CC} ${CFLAGS} -o $@ ${AOE_CFG_OBJ} ++ ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ${AOE_CFG_OBJ} + aoecfg.o : aoecfg.c dat.h fns.h + ${CC} ${CFLAGS} -o $@ -c $< + aoe-sancheck : ${SANCHECK_OBJ} +- -$(CC) $(CFLAGS) -o $@ ${SANCHECK_OBJ} $(SANCHECKLIBS) ++ -$(CC) $(CFLAGS) ${LDFLAGS} -o $@ ${SANCHECK_OBJ} $(SANCHECKLIBS) + aoe-sancheck.o : aoe-sancheck.c + -$(CC) $(CFLAGS) -o $@ -c $< + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb index c382a718ff51f5d5011cfde5307af4a340a9e740..9b73b442abdb4ee4af6df108d0cf8ee8215ddc7b 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/aoetools/aoetools_36.bb @@ -12,6 +12,7 @@ RRECOMMENDS_${PN} = "kernel-module-aoe" SRC_URI = "http://sourceforge.net/projects/${BPN}/files/${BPN}/${BPN}-${PV}.tar.gz \ file://aoe-stat-no-bashism.patch \ + file://makefile-add-ldflags.patch \ " SRC_URI[md5sum] = "bff30daa988a65f69d4448ce4726a6db" SRC_URI[sha256sum] = "fb5e2cd0de7644cc1ec04ee3aeb43211cf7445a0c19e13d6b3ed5a8fbdf215ff" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service b/import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service new file mode 100644 index 0000000000000000000000000000000000000000..f9fd56df018c178b58af8c3fcaa569c82f0b1c1d --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables-0.0.3-4/arptables.service @@ -0,0 +1,16 @@ +[Unit] +Description=Arp filtering arptables +After=network.target +Requires=network.target + +[Service] +Type=oneshot +ExecStartPre=/bin/sh -c "mkdir -p /etc/sysconfig; if [ ! -f /etc/sysconfig/arptables ]; then /usr/sbin/arptables-save > /etc/sysconfig/arptables; fi" +ExecStart=/bin/sh -c "/usr/sbin/arptables-restore < /etc/sysconfig/arptables" +ExecStartPost=/bin/sh -c "touch /var/lock/subsys/arptables" +RemainAfterExit=yes +ExecStop=/bin/sh -c "/usr/sbin/arptables-restore < /dev/null" +ExecStopPost=/bin/sh -c "rm -f /var/lock/subsys/arptables" + +[Install] +WantedBy=multi-user.target diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb index be2ac665910aedd457c7ff5a344bf93cbf7910dc..f53640847aacc6530b8437327d277828624aeb39 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/arptables/arptables_0.0.3-4.bb @@ -13,6 +13,7 @@ SRC_URI = " \ file://arptables-init-busybox.patch \ file://arptables-arpt-get-target-fix.patch \ file://arptables-remove-bashism.patch \ + file://arptables.service \ " SRC_URI[arptables.md5sum] = "1d4ab05761f063b0751645d8f2b8f8e5" SRC_URI[arptables.sha256sum] = "e529fd465c67d69ad335299a043516e6b38cdcd337a5ed21718413e96073f928" @@ -31,3 +32,12 @@ PARALLEL_MAKEINST = "-j1" fakeroot do_install () { oe_runmake 'BINDIR=${sbindir}' 'MANDIR=${mandir}/' 'DESTDIR=${D}' install } + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/arptables.service ${D}${systemd_unitdir}/system +} + +inherit systemd + +SYSTEMD_SERVICE_${PN} = "arptables.service" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch new file mode 100644 index 0000000000000000000000000000000000000000..c6897b4e7e5bd7bd61e11f3a8110e0587c01f8da --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-build-error-out-correctly-if-a-submake-fails.patch @@ -0,0 +1,69 @@ +From 5e102b453e254d16af1f95053134f58348e0f83a Mon Sep 17 00:00:00 2001 +From: root +Date: Wed, 20 Jul 2016 23:40:30 +0100 +Subject: [PATCH 1/5] build: error out correctly if a submake fails +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Due to use of a for loop, return status from submake was always +ignored. + +In the context of build-systems like OE this causes them to not +detect any errors and continue happily, resulting in a successful, +but incomplete, build. + +Fix by having a nicer Makefile.in which now has rules for the +individual targets (directories) so that make itself can +figure out all the dependencies and build those targets as +needed rather than using a for loop to iterate over the +directories in a shell and thus loosing the return status of +the command inside the loop. + +This has the added advantage that parallel builds work now. + +Upstream-Status: Pending + +Signed-off-by: André Draszik +--- + Makefile.in | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 6028513..dab88bb 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -13,11 +13,11 @@ distdir = $(PACKAGE)-$(VERSION) + + SUBDIRS=libbridge brctl doc + +-all: +- for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x ; done ++all: override ACTION= ++all: $(SUBDIRS) + +-clean: +- for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x clean ; done ++clean: override ACTION=clean ++clean: $(SUBDIRS) + + distclean: clean + rm -f config.log +@@ -30,6 +30,12 @@ maintainer-clean: distclean + rm -f libbridge/Makefile + rm -f doc/Makefile + +-install: +- for x in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$x install; done ++install: override ACTION=install ++install: $(SUBDIRS) + ++ ++brctl: libbridge ++$(SUBDIRS): ++ $(MAKE) $(MFLAGS) -C $@ $(ACTION) ++ ++.PHONY: $(SUBDIRS) +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-libbridge-fix-some-build-time-warnings-fcntl.h.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-libbridge-fix-some-build-time-warnings-fcntl.h.patch new file mode 100644 index 0000000000000000000000000000000000000000..25d08ab9511f77ff90a514b77b317fc6688bd20b --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-libbridge-fix-some-build-time-warnings-fcntl.h.patch @@ -0,0 +1,64 @@ +From 68fafc4ea10365ac2e74ab7c660d097696857677 Mon Sep 17 00:00:00 2001 +From: root +Date: Wed, 20 Jul 2016 23:40:32 +0100 +Subject: [PATCH 2/5] libbridge: fix some build-time warnings (fcntl.h) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There are build-time warnings at the moment when building +against musl, as the code here #include's the wrong file, +sys/fcntl.h instead of fcntl.h + +In file included from libbridge_devif.c:26:0: +/usr/include/sys/fcntl.h:1:2: warning: #warning redirecting incorrect #include to [-Wcpp] + #warning redirecting incorrect #include to + ^~~~~~~ +In file included from libbridge_if.c:23:0: +/usr/include/sys/fcntl.h:1:2: warning: #warning redirecting incorrect #include to [-Wcpp] + #warning redirecting incorrect #include to + ^~~~~~~ + +glibc headers silently redirect sys/fcntl.h to fcntl.h so the +issue is not seen there. + +Let's fix the #include's to so as to use the correct ones +and silence the compiler. + +Upstream-Status: Pending + +Signed-off-by: André Draszik +--- + libbridge/libbridge_devif.c | 2 +- + libbridge/libbridge_if.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c +index 1e83925..2cf78f6 100644 +--- a/libbridge/libbridge_devif.c ++++ b/libbridge/libbridge_devif.c +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + + #include "libbridge.h" + #include "libbridge_private.h" +diff --git a/libbridge/libbridge_if.c b/libbridge/libbridge_if.c +index 77d3f8a..9cf4bac 100644 +--- a/libbridge/libbridge_if.c ++++ b/libbridge/libbridge_if.c +@@ -20,7 +20,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "libbridge.h" +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-bridge-fix-some-build-time-warnings-errno.h.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-bridge-fix-some-build-time-warnings-errno.h.patch new file mode 100644 index 0000000000000000000000000000000000000000..72f2a6292ce62ccfa316998e948a484b6ca6228b --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-bridge-fix-some-build-time-warnings-errno.h.patch @@ -0,0 +1,46 @@ +From 2b9dc245f93ab27d7da42a16ddbb9212888006e4 Mon Sep 17 00:00:00 2001 +From: root +Date: Wed, 20 Jul 2016 23:40:33 +0100 +Subject: [PATCH 3/5] bridge: fix some build-time warnings (errno.h) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There is a build-time warning at the moment when building +against musl, as the code here #include's the wrong file, +sys/errno.h instead of errno.h + +In file included from brctl.c:22:0: +/usr/include/sys/errno.h:1:2: warning: #warning redirecting incorrect #include to [-Wcpp] + #warning redirecting incorrect #include to + ^~~~~~~ + +glibc headers silently redirect sys/errno.h to errno.h so the +issue is not seen there. + +Let's fix the #include's to so as to use the correct ones +and silence the compiler. + +Upstream-Status: Pending + +Signed-off-by: André Draszik +--- + brctl/brctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/brctl/brctl.c b/brctl/brctl.c +index 46ca352..8855234 100644 +--- a/brctl/brctl.c ++++ b/brctl/brctl.c +@@ -19,7 +19,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "libbridge.h" +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-libbridge-add-missing-include-s-fix-build-against-mu.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-libbridge-add-missing-include-s-fix-build-against-mu.patch new file mode 100644 index 0000000000000000000000000000000000000000..565186e0faff0648f597caff8a1ff1ca8faa82c0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-libbridge-add-missing-include-s-fix-build-against-mu.patch @@ -0,0 +1,47 @@ +From c45b73829a8b8c7924df528baa7e16498f917288 Mon Sep 17 00:00:00 2001 +From: root +Date: Wed, 20 Jul 2016 23:40:33 +0100 +Subject: [PATCH 4/5] libbridge: add missing #include's (fix build against + musl) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes error like: + +In file included from libbridge_devif.c:28:0: +libbridge.h:45:17: error: field 'max_age' has incomplete type + struct timeval max_age; + ^~~~~~~ +In file included from libbridge_devif.c:28:0: +libbridge.h:51:2: error: unknown type name 'u_int16_t' + u_int16_t root_port; + ^~~~~~~~~ + +These types are not standard C but rather Posix, +for struct timeval see: +http://pubs.opengroup.org/onlinepubs/7908799/xsh/systime.h.html + +Upstream-Status: Pending + +Signed-off-by: André Draszik +--- + libbridge/libbridge.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h +index 53ec869..b0727c1 100644 +--- a/libbridge/libbridge.h ++++ b/libbridge/libbridge.h +@@ -20,6 +20,8 @@ + #define _LIBBRIDGE_H + + #include ++#include ++#include + #include + #include + #include +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch new file mode 100644 index 0000000000000000000000000000000000000000..9f2155e9b56135df1b823795b3d048c698be05e4 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch @@ -0,0 +1,53 @@ +From 7bc1932cabfafca8c68e18bd43e3d203c70d2dd8 Mon Sep 17 00:00:00 2001 +From: root +Date: Wed, 20 Jul 2016 23:40:33 +0100 +Subject: [PATCH 5/5] build: don't ignore CFLAGS from environment +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We need to take them into account so as to behave nicely towards +build environments which expect to be able to set them, e.g. for +optimisation flags, or debug options. + +Therefore they need to be added to the compiler command line of +every source file, and in addition, the same CFLAGS that were +used during compilation must also always be used during linking! + +Upstream-Status: Pending + +Signed-off-by: André Draszik +--- + brctl/Makefile.in | 2 +- + libbridge/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/brctl/Makefile.in b/brctl/Makefile.in +index e1956d6..eff260c 100644 +--- a/brctl/Makefile.in ++++ b/brctl/Makefile.in +@@ -34,7 +34,7 @@ install: $(PROGRAMS) + $(INSTALL) -m 755 $(PROGRAMS) $(DESTDIR)$(sbindir) + + brctl: $(brctl_OBJECTS) ../libbridge/libbridge.a +- $(CC) $(LDFLAGS) $(brctl_OBJECTS) $(LIBS) -o brctl ++ $(CC) $(CFLAGS) $(LDFLAGS) $(brctl_OBJECTS) $(LIBS) -o brctl + + %.o: %.c brctl.h + $(CC) $(CFLAGS) $(INCLUDE) -c $< +diff --git a/libbridge/Makefile.in b/libbridge/Makefile.in +index 20512c4..4e1cddc 100644 +--- a/libbridge/Makefile.in ++++ b/libbridge/Makefile.in +@@ -5,7 +5,7 @@ AR=ar + RANLIB=@RANLIB@ + + CC=@CC@ +-CFLAGS = -Wall -g $(KERNEL_HEADERS) ++CFLAGS = -Wall -g $(KERNEL_HEADERS) @CFLAGS@ + + prefix=@prefix@ + exec_prefix=@exec_prefix@ +-- +2.8.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb index 04f863b2239328794c8f6909ba4d5a22ec6a59d2..6032ab05ecbea98bc08b18e673bedb80eb716b5d 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/bridge-utils/bridge-utils_1.5.bb @@ -1,8 +1,13 @@ require bridge-utils.inc -SRC_URI += "file://kernel-headers.patch" - -PARALLEL_MAKE = "" +SRC_URI += "\ + file://kernel-headers.patch \ + file://0001-build-error-out-correctly-if-a-submake-fails.patch \ + file://0002-libbridge-fix-some-build-time-warnings-fcntl.h.patch \ + file://0003-bridge-fix-some-build-time-warnings-errno.h.patch \ + file://0004-libbridge-add-missing-include-s-fix-build-against-mu.patch \ + file://0005-build-don-t-ignore-CFLAGS-from-environment.patch \ +" LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares/0001-configure.ac-don-t-override-passed-cflags.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares/0001-configure.ac-don-t-override-passed-cflags.patch new file mode 100644 index 0000000000000000000000000000000000000000..10fad4e9410cee83c0f72bff900811ce02152564 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares/0001-configure.ac-don-t-override-passed-cflags.patch @@ -0,0 +1,26 @@ +From 2a7236d2a7bb9c3d3c3f44ebf59404bf7134fcb3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Draszik?= +Date: Tue, 12 Apr 2016 11:37:28 +0100 +Subject: [PATCH] configure.ac: don't override passed cflags + +We are controlling debug and optimiser flags from OE +--- + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5c02450..3cf9fcd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -147,8 +147,6 @@ dnl ********************************************************************** + + CARES_CHECK_COMPILER + CARES_SET_COMPILER_BASIC_OPTS +-CARES_SET_COMPILER_DEBUG_OPTS +-CARES_SET_COMPILER_OPTIMIZE_OPTS + CARES_SET_COMPILER_WARNING_OPTS + + if test "$compiler_id" = "INTEL_UNIX_C"; then +-- +2.8.0.rc3 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares_1.11.0.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares_1.11.0.bb deleted file mode 100644 index 2f72ab495c2d9d2f00195ed31ed7f1d80555c2a7..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares_1.11.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2012-2014 LG Electronics, Inc. - -DESCRIPTION = "c-ares is a C library that resolves names asynchronously." -HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://ares_init.c;beginline=1;endline=3;md5=53f5ecf4c22c37cf1ddd1ef8f8eccce0" - -SRC_URI = "http://c-ares.haxx.se/download/${BP}.tar.gz" -SRC_URI[md5sum] = "d5c6d522cfc54bb6f215a0b7912d46be" -SRC_URI[sha256sum] = "b3612e6617d9682928a1d50c1040de4db6519f977f0b25d40cf1b632900b3efd" - -inherit autotools pkgconfig diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares_1.12.0.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares_1.12.0.bb new file mode 100644 index 0000000000000000000000000000000000000000..4e28d6abc6bb2b1db343ee5e672c9216fd67e99f --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/c-ares/c-ares_1.12.0.bb @@ -0,0 +1,15 @@ +# Copyright (c) 2012-2014 LG Electronics, Inc. + +SUMMARY = "c-ares is a C library that resolves names asynchronously." +HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=f4b026880834eb01c035c5e5cb47ccac" + +SRC_URI = "http://c-ares.haxx.se/download/${BP}.tar.gz \ + file://0001-configure.ac-don-t-override-passed-cflags.patch \ +" +SRC_URI[md5sum] = "2ca44be1715cd2c5666a165d35788424" +SRC_URI[sha256sum] = "8692f9403cdcdf936130e045c84021665118ee9bfea905d1a76f04d4e6f365fb" + +inherit autotools pkgconfig diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chrony.conf b/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chrony.conf new file mode 100644 index 0000000000000000000000000000000000000000..8d226d31a5e59965e8e33189edb3d8e8875e84dc --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chrony.conf @@ -0,0 +1,44 @@ +# Use public NTP servers from the pool.ntp.org project. +# Please consider joining the pool project if possible by running your own +# server(s). +# If you are a vendor distributing a product using chrony, you *MUST* +# read and comply with http://www.pool.ntp.org/vendors.html +pool 0.openembedded.pool.ntp.org iburst + +# Use a local timeserver in preference to the pool, if it's reachable. +#server 192.168.22.22 iburst minpoll 2 prefer + +# Sync to pulse-per-second from an onboard GPS. +#refclock PPS /dev/pps0 poll 0 prefer +# You'll want to enable CONFIG_PPS and CONFIG_PPS_CLIENT_GPIO in your kernel, +# and an entry something like this in your device tree: +# pps { +# compatible = "pps-gpio"; +# gpios = <&ps7_gpio_0 56 0>; +# }; + +# In first three updates step the system clock instead of slew +# if the adjustment is larger than 1 second. +makestep 1.0 3 + +# Record the rate at which the system clock gains/loses time, +# improving accuracy after reboot +driftfile /var/lib/chrony/drift + +# Enable kernel synchronization of the hardware real-time clock (RTC). +rtcsync + +# Allow NTP client access from local network. +#allow 192.168/16 + +# Serve time even if not synchronized to any NTP server. +#local stratum 10 + +# Specify file containing keys for NTP authentication. +#keyfile /etc/chrony.keys + +# Specify directory for log files. +logdir /var/log/chrony + +# Select which information is logged. +#log measurements statistics tracking diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd b/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd new file mode 100644 index 0000000000000000000000000000000000000000..04f1b681c43aaec3737c6c1a7607409f34be5065 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony/chronyd @@ -0,0 +1,58 @@ +#! /bin/sh + +# System V init script for chrony +# Adapted from the script already in meta-networking for ntpd + +### BEGIN INIT INFO +# Provides: chrony +# Required-Start: $network $remote_fs $syslog +# Required-Stop: $network $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: +# Short-Description: Start chrony time daemon +### END INIT INFO + +PATH=/sbin:/bin:/usr/bin:/usr/sbin + +DAEMON=/usr/sbin/chronyd +PIDFILE=/var/run/chronyd.pid + +test -x $DAEMON -a -r /etc/chrony.conf || exit 0 + +# Source function library. +. /etc/init.d/functions + +# Functions to do individual actions +startdaemon(){ + echo -n "Starting chronyd: " + start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --startas $DAEMON -- "$@" + echo "done" +} +stopdaemon(){ + echo -n "Stopping chronyd: " + start-stop-daemon --stop --quiet --oknodo -p $PIDFILE + echo "done" +} + +case "$1" in + start) + startdaemon + ;; + stop) + stopdaemon + ;; + force-reload | restart | reload) + stopdaemon + startdaemon + ;; + status) + status /usr/sbin/chronyd; + exit $? + ;; + *) + echo "Usage: chronyd { start | stop | status | restart | reload }" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony_2.4.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony_2.4.bb new file mode 100644 index 0000000000000000000000000000000000000000..a8898dc80dac8f351e81acf259ea457ac6c1f327 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/chrony/chrony_2.4.bb @@ -0,0 +1,133 @@ +SUMMARY = "Versatile implementation of the Network Time Protocol" +DESCRIPTION = "Chrony can synchronize the system clock with NTP \ +servers, reference clocks (e.g. GPS receiver), and manual input using \ +wristwatch and keyboard. It can also operate as an NTPv4 (RFC 5905) \ +server and peer to provide a time service to other computers in the \ +network. \ +\ +It is designed to perform well in a wide range of conditions, \ +including intermittent network connections, heavily congested \ +networks, changing temperatures (ordinary computer clocks are \ +sensitive to temperature), and systems that do not run continuously, or \ +run on a virtual machine. \ +\ +Typical accuracy between two machines on a LAN is in tens, or a few \ +hundreds, of microseconds; over the Internet, accuracy is typically \ +within a few milliseconds. With a good hardware reference clock \ +sub-microsecond accuracy is possible. \ +\ +Two programs are included in chrony: chronyd is a daemon that can be \ +started at boot time and chronyc is a command-line interface program \ +which can be used to monitor chronyd's performance and to change \ +various operating parameters whilst it is running. \ +\ +This recipe produces two binary packages: 'chrony' which contains chronyd, \ +the configuration file and the init script, and 'chronyc' which contains \ +the client program only." + +HOMEPAGE = "http://chrony.tuxfamily.org/" +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ + file://chrony.conf \ + file://chronyd \ +" +SRC_URI[md5sum] = "d0598aa8a9be8faccef9386f6fc0d5f2" +SRC_URI[sha256sum] = "8d04e7cda2333289c2104b731d39c3c1db94816e43bae35d7ee4e7ae8af6391f" + +DEPENDS = "pps-tools" + +# Note: Despite being built via './configure; make; make install', +# chrony does not use GNU Autotools. +inherit update-rc.d systemd + +# Configuration options: +# - For command line editing support in chronyc, you may specify either +# 'editline' or 'readline' but not both. editline is smaller, but +# many systems already have readline for other purposes so you might want +# to choose that instead. However, beware license incompatibility +# since chrony is GPLv2 and readline versions after 6.0 are GPLv3+. +# You can of course choose neither, but if you're that tight on space +# consider dropping chronyc entirely (you can use it remotely with +# appropriate chrony.conf options). +# - Security-related: +# - 'sechash' is omitted by default because it pulls in nss which is huge. +# - 'privdrop' allows chronyd to run as non-root; would need changes to +# chrony.conf and init script. +# - 'scfilter' enables support for system call filtering, but requires the +# kernel to have CONFIG_SECCOMP enabled. +PACKAGECONFIG ??= "editline scfilter \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" +PACKAGECONFIG[readline] = "--without-editline,--without-readline,readline" +PACKAGECONFIG[editline] = ",--without-editline,libedit" +PACKAGECONFIG[sechash] = "--without-tomcrypt,--disable-sechash,nss" +PACKAGECONFIG[privdrop] = ",--disable-privdrop,libcap" +PACKAGECONFIG[scfilter] = "--enable-scfilter,--without-seccomp" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," +PACKAGECONFIG[nss] = "--with-nss,--without-nss,nss" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" + +# --disable-static isn't supported by chrony's configure script. +DISABLE_STATIC = "" + +do_configure() { + ./configure --sysconfdir=${sysconfdir} --bindir=${bindir} --sbindir=${sbindir} \ + --localstatedir=${localstatedir} --datarootdir=${datadir} \ + ${PACKAGECONFIG_CONFARGS} +} + +do_install() { + # Binaries + install -d ${D}${bindir} + install -m 0755 ${S}/chronyc ${D}${bindir} + install -d ${D}${sbindir} + install -m 0755 ${S}/chronyd ${D}${sbindir} + + # Config file + install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/chrony.conf ${D}${sysconfdir} + + # System V init script + install -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/chronyd ${D}${sysconfdir}/init.d + + # systemd unit configuration file + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${S}/examples/chronyd.service ${D}${systemd_unitdir}/system/ + + # Variable data (for drift and/or rtc file) + install -d ${D}${localstatedir}/lib/chrony + + # Log files + install -d ${D}${localstatedir}/log/chrony + + # Fix hard-coded paths in config files and init scripts + sed -i -e 's!/var/!${localstatedir}/!g' -e 's!/etc/!${sysconfdir}/!g' \ + -e 's!/usr/sbin/!${sbindir}/!g' -e 's!/usr/bin/!${bindir}/!g' \ + ${D}${sysconfdir}/chrony.conf \ + ${D}${sysconfdir}/init.d/chronyd \ + ${D}${systemd_unitdir}/system/chronyd.service + sed -i 's!^PATH=.*!PATH=${base_sbindir}:${base_bindir}:${sbindir}:${bindir}!' ${D}${sysconfdir}/init.d/chronyd + sed -i 's!^EnvironmentFile=.*!EnvironmentFile=-${sysconfdir}/default/chronyd!' ${D}${systemd_unitdir}/system/chronyd.service +} + +FILES_${PN} = "${sbindir}/chronyd ${sysconfdir} ${localstatedir}" +CONFFILES_${PN} = "${sysconfdir}/chrony.conf" +INITSCRIPT_NAME = "chronyd" +INITSCRIPT_PARAMS = "defaults" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "chronyd.service" + +# It's probably a bad idea to run chrony and another time daemon on +# the same system. systemd includes the SNTP client 'timesyncd', which +# will be disabled by chronyd.service, however it will remain on the rootfs +# wasting 150 kB unless you put 'PACKAGECONFIG_remove_pn-systemd = "timesyncd"' +# in a conf file or bbappend somewhere. +RCONFLICTS_${PN} = "ntp ntimed" + +# Separate the client program into its own package +PACKAGES =+ "chronyc" +FILES_chronyc = "${bindir}/chronyc" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb index 87306a6f28016ec659df24d5c75d6c6db5974db0..099d885c901a5756496a60f6ec68848c747396c8 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/cifs/cifs-utils_git.bb @@ -4,7 +4,6 @@ SECTION = "otherosfs" LICENSE = "GPLv3 & LGPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "samba" PV = "6.4" SRCREV = "487f46da737291877867cbd3acb40fea087d3863" @@ -18,7 +17,8 @@ PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" PACKAGECONFIG[cifscreds] = "--enable-cifscreds,--disable-cifscreds,keyutils" # when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install_append is needed PACKAGECONFIG[cifsupcall] = "--enable-cifsupcall,--disable-cifsupcall,krb5 libtalloc keyutils" -PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap, keyutils" +PACKAGECONFIG[cifsidmap] = "--enable-cifsidmap,--disable-cifsidmap,keyutils samba" +PACKAGECONFIG[cifsacl] = "--enable-cifsacl,--disable-cifsacl,samba" PACKAGECONFIG[pam] = "--enable-pam --with-pamdir=${base_libdir}/security,--disable-pam,libpam keyutils" inherit autotools pkgconfig diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb index 4b07c0bd09d7e188cad8fce9f08d580aa14880a0..2b49096078356f5c9f8f8bbcf7d07cae947d96b4 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-exper_2.39.0.bb @@ -5,24 +5,24 @@ LICENSE = "DMTF" RCONFLICTS_${PN} = "cim-schema-final" SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2390/cim_schema_${PV}Experimental-MOFs.zip;subdir=${BPN}-${PV} \ - file://LICENSE \ - " + file://LICENSE \ +" SRC_URI[md5sum] = "b82b31c609c6bcc69521829409f58ccc" SRC_URI[sha256sum] = "ed2096ef1ea25d189a02bbc6603fed7a48297f2987f254265763a6eecb7fc870" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" do_install() { - install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/ - install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV} - install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} + install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/ + install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV} + install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} - cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/mof/cimv${PV}/ - chown -R root:root ${D}${datadir}/mof/cimv${PV} - for i in `find ${D}${datadir}/mof/cimv${PV} -name "*.mof"`; do - sed -i -e 's/\r//g' $i - done - ln -s cimv${PV} ${D}${datadir}/mof/cim-current - ln -s cim_schema_${PV}.mof ${D}${datadir}/mof/cim-current/CIM_Schema.mof + cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/mof/cimv${PV}/ + chown -R root:root ${D}${datadir}/mof/cimv${PV} + for i in `find ${D}${datadir}/mof/cimv${PV} -name "*.mof"`; do + sed -i -e 's/\r//g' $i + done + ln -s cimv${PV} ${D}${datadir}/mof/cim-current + ln -s cim_schema_${PV}.mof ${D}${datadir}/mof/cim-current/CIM_Schema.mof } FILES_${PN} = "${datadir}/mof/* ${datadir}/doc/*" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb index 5675384410619a572146255f3bd23744ef78b00e..a14de46db63ecdf92044267a58ec161b6fce7496 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/cim-schema/cim-schema-final_2.40.0.bb @@ -5,29 +5,29 @@ LICENSE = "DMTF" RCONFLICTS_${PN} = "cim-schema-exper" SRC_URI = "http://dmtf.org/sites/default/files/cim/cim_schema_v2400/cim_schema_${PV}Final-MOFs.zip \ - file://LICENSE \ - " + file://LICENSE \ +" SRC_URI[md5sum] = "a9bdf17c7374e3b5b7adeaac4842c4ad" SRC_URI[sha256sum] = "dbfa3064ea427acd71a4bebbc172ca2dc44b0b09a6d83b0945b9ffa988a9058a" LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=eecc6f71a56ff3caf17f15bf7aeac7b4" do_unpack() { - unzip -q ${DL_DIR}/cim_schema_${PV}Final-MOFs.zip -d ${S} - cp -f ${FILE_DIRNAME}/files/LICENSE ${WORKDIR}/ + unzip -q ${DL_DIR}/cim_schema_${PV}Final-MOFs.zip -d ${S} + cp -f ${FILE_DIRNAME}/files/LICENSE ${WORKDIR}/ } do_install() { - install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/ - install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV} - install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} + install -d -m 0755 ${D}${datadir}/mof/cimv${PV}/ + install -d -m 0755 ${D}${datadir}/doc/cim-schema-${PV} + install -m 644 ${WORKDIR}/LICENSE ${D}${datadir}/doc/cim-schema-${PV} - cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/mof/cimv${PV}/ - chown -R root:root ${D}${datadir}/mof/cimv${PV}/ - for i in `find ${D}${datadir}/mof/cimv${PV} -name "*.mof"`; do - sed -i -e 's/\r//g' $i - done - ln -s cimv${PV} ${D}${datadir}/mof/cim-current - ln -s cim_schema_${PV}.mof ${D}${datadir}/mof/cim-current/CIM_Schema.mof + cp -R --no-dereference --preserve=mode,links -v ${S}/* ${D}${datadir}/mof/cimv${PV}/ + chown -R root:root ${D}${datadir}/mof/cimv${PV}/ + for i in `find ${D}${datadir}/mof/cimv${PV} -name "*.mof"`; do + sed -i -e 's/\r//g' $i + done + ln -s cimv${PV} ${D}${datadir}/mof/cim-current + ln -s cim_schema_${PV}.mof ${D}${datadir}/mof/cim-current/CIM_Schema.mof } FILES_${PN} = "${datadir}/mof/* ${datadir}/doc/*" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb similarity index 93% rename from import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb index 5d757847abffb3af55b7931baed6dad95b9a89ec..d58e572ec8bbb6fa4c2c0e3a6d80923a9d4a23da 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb_2.5.1.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ctdb/ctdb_2.5.6.bb @@ -16,8 +16,8 @@ SRC_URI = "https://ftp.samba.org/pub/${PN}/${BP}.tar.gz \ file://service-ensure-the-PID-directory-is-created.patch \ " -SRC_URI[md5sum] = "d0cd91726ff4ca2229e1b21859c94717" -SRC_URI[sha256sum] = "d5bf3f674cae986bb6178b1db215a703ac94adc5f75fadfdcff63dcbb5e98ab5" +SRC_URI[md5sum] = "efc50109f90a4c790124c35e4ba234ad" +SRC_URI[sha256sum] = "fc1cdd7efcc91afc629f21408281bba5da107b9c17e74bdee2f28a532d14f874" inherit autotools-brokensep pkgconfig systemd diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb index 5663f0e918feb0864d6a716a94b6702cc48fa724..1848aa6dbb38c7b3bfcdf2331cc142839dfe360f 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.7.3.bb @@ -8,23 +8,31 @@ DEPENDS = "curl boost" DEPENDS_class-native = "curl-native" SRC_URI = "http://curlpp.googlecode.com/files/curlpp-${PV}.tar.gz \ - file://example21.cpp-remove-deprecated-code.patch \ - " + file://example21.cpp-remove-deprecated-code.patch \ +" SRC_URI[md5sum] = "ccc3d30d4b3b5d2cdbed635898c29485" SRC_URI[sha256sum] = "e3f9427b27c5bddf898d383d45c0d3d5397e2056ff935d9a5cdaef6a9a653bd5" inherit autotools-brokensep pkgconfig binconfig +# Upstream is currently working on porting the code to use std::unique_ptr instead of the +# deprecated auto_ptr. For now, ignore the issue. +CXXFLAGS += "-Wno-error=deprecated-declarations" + +do_install_append () { + sed -i 's,${STAGING_DIR_TARGET},,g' ${D}${libdir}/pkgconfig/curlpp.pc +} + PACKAGES =+ "libcurlpp libcurlpp-dev libcurlpp-staticdev" -FILES_lib${BPN} = "${libdir}/lib*.so.* \ - " +FILES_lib${BPN} = "${libdir}/lib*.so.*" FILES_lib${BPN}-dev = "${includedir} \ - ${libdir}/lib*.la \ - ${libdir}/pkgconfig \ - ${bindir}/*-config" + ${libdir}/lib*.la \ + ${libdir}/pkgconfig \ + ${bindir}/*-config \ +" FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc b/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc index cc7f9e3be005ba006210a14939953c3ad8372a55..9ef54fe17c6434ae4b7a980bc4da42d35f53bb60 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq.inc @@ -26,10 +26,10 @@ PACKAGECONFIG[conntrack] = ",,libnetfilter-conntrack" PACKAGECONFIG[lua] = ",,lua" PACKAGECONFIG[resolvconf] = ",,,resolvconf" EXTRA_OEMAKE = "\ - 'COPTS=${@base_contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \ + 'COPTS=${@bb.utils.contains('PACKAGECONFIG', 'dbus', '-DHAVE_DBUS', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'idn', '-DHAVE_IDN', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'conntrack', '-DHAVE_CONNTRACK', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'lua', '-DHAVE_LUASCRIPT', '', d)}' \ 'CFLAGS=${CFLAGS}' \ 'LDFLAGS=${LDFLAGS}' \ " @@ -38,7 +38,7 @@ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'file://dnsmasq. do_compile_append() { # build dhcp_release - cd ${S}/contrib/wrt + cd ${S}/contrib/lease-tools oe_runmake } @@ -53,19 +53,19 @@ do_install () { install -d ${D}${systemd_unitdir}/system - if [ "${@base_contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then install -m 0644 ${WORKDIR}/dnsmasq-resolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service else install -m 0644 ${WORKDIR}/dnsmasq-noresolvconf.service ${D}${systemd_unitdir}/system/dnsmasq.service fi - install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir} + install -m 0755 ${S}/contrib/lease-tools/dhcp_release ${D}${bindir} - if [ "${@base_contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'dbus', '', d)}" != "" ]; then install -d ${D}${sysconfdir}/dbus-1/system.d install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/ fi - if [ "${@base_contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then + if [ "${@bb.utils.contains('PACKAGECONFIG', 'resolvconf', 'resolvconf', '', d)}" != "" ]; then install -d ${D}${sysconfdir}/resolvconf/update.d/ install -m 0755 ${WORKDIR}/dnsmasq.resolvconf ${D}${sysconfdir}/resolvconf/update.d/dnsmasq diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb deleted file mode 100644 index a11aabbd948fede6a22de4c028cb223afacc14a3..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.75.bb +++ /dev/null @@ -1,9 +0,0 @@ -require dnsmasq.inc - -SRC_URI += "\ - file://lua.patch \ -" - -SRC_URI[dnsmasq-2.75.md5sum] = "d99ac126d4fe910c679d88430559669b" -SRC_URI[dnsmasq-2.75.sha256sum] = "f8252c0a0ba162c2cd45f81140c7c17cc40a5fca2b869d1a420835b74acad294" - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb new file mode 100644 index 0000000000000000000000000000000000000000..41573d9dd664b218ee6704b58e6a8c6cde7e570b --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.76.bb @@ -0,0 +1,8 @@ +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/import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.25.bb similarity index 90% rename from import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.25.bb index d7a7cc5e69d0c7762427c75ecea53066fe59b6a8..66af361e49aaa48289eb8b1d7f6338fa2f3e7834 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.21.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.2.25.bb @@ -9,16 +9,16 @@ SRC_URI = "http://dovecot.org/releases/2.2/dovecot-${PV}.tar.gz \ file://dovecot.service \ file://dovecot.socket" -SRC_URI[md5sum] = "28c39ab78a20f00701c26960d9190cf0" -SRC_URI[sha256sum] = "7ab7139e59e1f0353bf9c24251f13c893cf1a6ef4bcc47e2d44de437108d0b20" +SRC_URI[md5sum] = "8f62ea76489c47c369cbbe0b19818448" +SRC_URI[sha256sum] = "d8d9f32c846397f7c22749a84c5cf6f59c55ff7ded3dc9f07749a255182f9667" DEPENDS = "openssl xz zlib bzip2 libcap icu" inherit autotools pkgconfig systemd useradd PACKAGECONFIG ??= " \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ " PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb similarity index 86% rename from import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.3.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb index 44459b529c6ccc219d59ece86eff663cda8bf78c..3d6f5b2621486e8db7dfd8a4738b432524351627 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.3.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb @@ -9,11 +9,10 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" SRC_URI = "http://oss.linbit.com/drbd/${BP}.tar.gz \ - file://0001-Makefile.in-don-t-compile-documentation.patch \ file://0001-Makefile.in-fix-permission-bits-for-drbd.service.patch \ " -SRC_URI[md5sum] = "09c9c33c041e1f4f85dd359f9e0b0f24" -SRC_URI[sha256sum] = "011050578c153bf4fef86e03749304ff9f333b7af3512c5c395e0e870a0445bd" +SRC_URI[md5sum] = "76ed6d3190cd77b00890f3365353124b" +SRC_URI[sha256sum] = "297b77c9b3f88de2e7dae459234f2753ea4fc2805282b2d276e35cf51e292913" SYSTEMD_SERVICE_${PN} = "drbd.service" SYSTEMD_AUTO_ENABLE = "disable" @@ -28,6 +27,7 @@ EXTRA_OECONF = " \ --with-distro debian \ --with-initscripttype=both \ --with-systemdunitdir=${systemd_unitdir}/system \ + --without-manual\ " RDEPENDS_${PN} += "bash perl" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb index 163148cee3dbb47db24cff9040a87e31e4874ef7..2da73e77564797e20ec5f03fc374f904bfe4aa63 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/esmtp/esmtp_1.2.bb @@ -24,6 +24,11 @@ ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" ALTERNATIVE_TARGET[sendmail] = "${bindir}/esmtp" ALTERNATIVE_PRIORITY = "10" +ALTERNATIVE_${PN}-doc += "mailq.1 newaliases.1 sendmail.1" +ALTERNATIVE_LINK_NAME[mailq.1] = "${mandir}/man1/mailq.1" +ALTERNATIVE_LINK_NAME[newaliases.1] = "${mandir}/man1/newaliases.1" +ALTERNATIVE_LINK_NAME[sendmail.1] = "${mandir}/man1/sendmail.1" + SRC_URI[md5sum] = "79a9c1f9023d53f35bb82bf446150a72" SRC_URI[sha256sum] = "a0d26931bf731f97514da266d079d8bc7d73c65b3499ed080576ab606b21c0ce" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/fping/fping_3.5.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/fping/fping_3.5.bb index b6b17b70cee4021c7356698240e071a97adca444..2f5f2b6c64031b6e1230f6930113d0bd0eba6554 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/fping/fping_3.5.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/fping/fping_3.5.bb @@ -21,5 +21,5 @@ inherit autotools EXTRA_OECONF = "--enable-ipv4" -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.45.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb similarity index 69% rename from import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.45.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb index 728ad5843da78a8772063ec09d4dea0ec60c6fa9..a8c8bcf5809492e7c0b2d5b7e130ff658c4932de 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.45.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip-perl_1.50.bb @@ -7,16 +7,16 @@ DESCRIPTION = "perl library for country/city/organization to IP address or hostn HOMEPAGE = "http://www.maxmind.com/app/ip-location" SECTION = "libdevel" LICENSE = "Artistic-1.0 | GPL-1.0+" -LIC_FILES_CHKSUM = "file://README;md5=b0fa745303912bd2d64430f7ae69487d" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b7a36f55e8ba62aadd74e4f0886a405e" # Note that we do not want to use the upstream file name locally. # SRC_URI = "http://github.com/maxmind/geoip-api-perl/archive/v${PV}.tar.gz;downloadfilename=${BPN}-${PV}.tar.gz \ - file://run-ptest \ - " + file://run-ptest \ +" -SRC_URI[md5sum] = "0ce57140890bf81958e0cea4fe1885b2" -SRC_URI[sha256sum] = "c56437b1cc8887736cb1e435d0320c1c1ff3754830249516317b99137005fb23" +SRC_URI[md5sum] = "2d7f8b1b54e6ba6d9e3fefce52675815" +SRC_URI[sha256sum] = "86da0dd67f417a43dc70f15a49bd3619f668970c117b9e7f737b4ab246c240a6" S = "${WORKDIR}/geoip-api-perl-${PV}" @@ -30,10 +30,10 @@ EXTRA_CPANFLAGS = "LIBS='-L${STAGING_LIBDIR}' INC='-I${STAGING_INCDIR}'" # perl scripts and some special small data files # do_install_ptest () { - install -d -m 0755 ${D}${PTEST_PATH}/t/data + install -d -m 0755 ${D}${PTEST_PATH}/t/data - install ${S}/t/*.t* ${D}${PTEST_PATH}/t - install ${S}/t/data/* ${D}${PTEST_PATH}/t/data + install ${S}/t/*.t* ${D}${PTEST_PATH}/t + install ${S}/t/data/* ${D}${PTEST_PATH}/t/data } FILES_${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/Geo/IP/.debug" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.6.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.9.bb similarity index 76% rename from import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.6.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.9.bb index 06051542c500b2d3847d6ff3e9e08c2eee446ecf..9e8e0714f8293a5e02b9582021d7e4e7e39616e8 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.6.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoip_1.6.9.bb @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/maxmind/geoip-api-c.git \ http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz;apply=no;name=GeoLiteCityv6-dat \ file://run-ptest \ " -SRCREV = "ed3f3e2b87fba05a8f2a5b9b1328e7d55be8bf30" +SRCREV = "4f487bf95532e0bba7783d591faff178ab0aa462" SRC_URI[GeoIP-dat.md5sum] = "37c84ead332dda0362a5ac7b049b72d4" SRC_URI[GeoIP-dat.sha256sum] = "79ff1099e96c2dc1c2539c9a18aaa13a9afd085cae477df60d95f1644d42bc07" @@ -62,32 +62,29 @@ RDEPENDS_${PN} += "${PN}-database" inherit ptest do_configure_ptest() { - sed -i -e "s/noinst_PROGRAMS = /test_PROGRAMS = /g" \ - -e 's:SRCDIR=\\"$(top_srcdir)\\":SRCDIR=\\"$(testdir)\\":' \ - ${S}/test/Makefile.am - - if ! grep "^testdir = " ${S}/test/Makefile.am ; then - sed -e '/EXTRA_PROGRAMS = /itestdir = ${PTEST_PATH}/tests' \ - -i ${S}/test/Makefile.am - fi - - sed -i -e "s:/usr/local/share:/usr/share:g" \ - ${S}/test/benchmark.c - - sed -i -e 's:"../data/:"/usr/share/GeoIP/:g' \ - ${S}/test/test-geoip-city.c \ - ${S}/test/test-geoip-isp.c \ - ${S}/test/test-geoip-asnum.c \ - ${S}/test/test-geoip-netspeed.c \ - ${S}/test/test-geoip-org.c \ - ${S}/test/test-geoip-region.c + sed -i -e "s/noinst_PROGRAMS = /test_PROGRAMS = /g" \ + -e 's:SRCDIR=\\"$(top_srcdir)\\":SRCDIR=\\"$(testdir)\\":' \ + ${S}/test/Makefile.am + + if ! grep "^testdir = " ${S}/test/Makefile.am ; then + sed -e '/EXTRA_PROGRAMS = /itestdir = ${PTEST_PATH}/tests' \ + -i ${S}/test/Makefile.am + fi + + sed -i -e "s:/usr/local/share:/usr/share:g" \ + ${S}/test/benchmark.c + + sed -i -e 's:"../data/:"/usr/share/GeoIP/:g' \ + ${S}/test/test-geoip-city.c \ + ${S}/test/test-geoip-isp.c \ + ${S}/test/test-geoip-asnum.c \ + ${S}/test/test-geoip-netspeed.c \ + ${S}/test/test-geoip-org.c \ + ${S}/test/test-geoip-region.c } do_install_ptest() { - oe_runmake -C test DESTDIR=${D} install-testPROGRAMS - install ${S}/test/*.txt ${D}${PTEST_PATH}/tests + oe_runmake -C test DESTDIR=${D} install-testPROGRAMS + install ${S}/test/*.txt ${D}${PTEST_PATH}/tests } - - - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.2.1/GeoIP.conf b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.2.2/GeoIP.conf similarity index 100% rename from import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.2.1/GeoIP.conf rename to import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.2.2/GeoIP.conf diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.2.1/geoipupdate.cron b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.2.2/geoipupdate.cron similarity index 100% rename from import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.2.1/geoipupdate.cron rename to import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate-2.2.2/geoipupdate.cron diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.2.1.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.2.2.bb similarity index 72% rename from import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.2.1.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.2.2.bb index 7a3a002524b6c59379731578d7e7fc181770fb3a..3bc936a0d0294745f4f32ca324cb3fb61fc64d8a 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.2.1.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/geoip/geoipupdate_2.2.2.bb @@ -6,18 +6,18 @@ SECTION = "net" DEPENDS = "zlib curl" -SRC_URI = "https://github.com/maxmind/geoipupdate/releases/download/v2.2.1/geoipupdate-2.2.1.tar.gz \ +SRC_URI = "https://github.com/maxmind/geoipupdate/releases/download/v2.2.2/geoipupdate-2.2.2.tar.gz \ file://GeoIP.conf \ file://geoipupdate.cron \ " -SRC_URI[md5sum] = "abfd4bb9dd7fd489c103888dde5f2a57" -SRC_URI[sha256sum] = "9547c42cc8620b2c3040fd8df95e8ee45c8b6ebcca7737d641f9526104d5f446" +SRC_URI[md5sum] = "06284bd7bcb298d078d794eb630dae55" +SRC_URI[sha256sum] = "156ab7604255a9c62c4a442c76d48d024ac813c6542639bffa93b28e2a781621" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "\ -file://ChangeLog.md;md5=5ca3d911ed549b0756b03410ff77fa62 \ +file://ChangeLog.md;md5=8ebf6f27a39125c3d600c90914b4034a \ " inherit autotools diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb deleted file mode 100644 index acc086420ca087c8d044b60bd5d96e28426fd840..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_1.1.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Configure network interfaces for parallel routing" -HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bonding" -SECTION = "net" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://ifenslave.c;beginline=8;endline=12;md5=a9f0bd2324cdc1b36d1f44f0e643a62a" - -SRC_URI = "http://ftp.debian.org/debian/pool/main/i/${BPN}-2.6/${BPN}-2.6_${PV}.orig.tar.gz" -SRC_URI[md5sum] = "56126cd1013cefe0ce6f81613e677bdd" -SRC_URI[sha256sum] = "7917bf34de80a2492eb225adf9168c83a4854ac8a008ed0fd5b3fd147ccd3041" - -do_compile() { - ${CC} ifenslave.c -o ifenslave -} -do_install() { - install -d "${D}${sbindir}" - install -m 755 "${S}/ifenslave" "${D}${sbindir}/" -} diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.7.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.7.bb new file mode 100644 index 0000000000000000000000000000000000000000..7473b0dafa5fa58cd88431955f4a34ceac8eae2f --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ifenslave/ifenslave_2.7.bb @@ -0,0 +1,20 @@ +SUMMARY = "Configure network interfaces for parallel routing" +HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/networking/bonding" +SECTION = "net" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=6807ba81c0744ab50d735c94628c3f64" + +SRCREV = "400c490d52acb31f1064e1bf4fc9fcaf3791888f" +SRC_URI = "git://anonscm.debian.org/collab-maint/ifenslave.git" + +S = "${WORKDIR}/git" + +do_install() { + install -d ${D}${sbindir} + install -m 0755 ${S}/ifenslave ${D}${sbindir}/ + + install -m 0755 -D ${S}/debian/ifenslave.if-pre-up ${D}${sysconfdir}/network/if-pre-up.d/ifenslave + install -m 0755 -D ${S}/debian/ifenslave.if-post-down ${D}${sysconfdir}/network/if-post-down.d/ifenslave + install -m 0755 -D ${S}/debian/ifenslave.if-up ${D}${sysconfdir}/network/if-up.d/ifenslave +} diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb index d9f1212735491ac56a76070965fac0296afcc228..446697447bf7f8b4cbf0fe8bff5ddaacfc55932d 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ipsec-tools/ipsec-tools_0.8.2.bb @@ -61,7 +61,7 @@ EXTRA_OECONF = "--with-kernel-headers=${STAGING_INCDIR} \ --enable-dpd \ --enable-natt=yes \ --sysconfdir=${sysconfdir}/racoon \ - ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6=yes', '', d)}" # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530527 CFLAGS += "-fno-strict-aliasing" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm/makefile-add-ldflags.patch new file mode 100644 index 0000000000000000000000000000000000000000..1bf1eed4c326d21184a84c34124ffe25036e8ce7 --- /dev/null +++ b/import-layers/meta-openembedded/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/import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb index 7302e9d3e4bc4afe4f6f3962fdba28e5dcd3001a..8d1b3f0159744c114413a34132e36ac5705f0b42 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/ipvsadm/ipvsadm_1.26.bb +++ b/import-layers/meta-openembedded/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" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch new file mode 100644 index 0000000000000000000000000000000000000000..93bd4578e1a51710ff7007bb17d8202f19dba177 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb/ldb-Add-configure-options-for-packages.patch @@ -0,0 +1,177 @@ +From 49dde22e798fd7f39fd59250036c0ae1fe2b9152 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Wed, 21 Sep 2016 10:06:39 +0800 +Subject: [PATCH] ldb: Add configure options for packages + +Add configure options for the following packages: + - acl + - attr + - libaio + - libbsd + - libcap + - valgrind + +Upstream-Status: Inappropriate [oe deterministic build specific] + +Signed-off-by: Jackie Huang +--- + lib/replace/system/wscript_configure | 6 ++- + lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- + wscript | 7 +++ + 3 files changed, 80 insertions(+), 18 deletions(-) + +diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure +index 2035474..10f9ae7 100644 +--- a/lib/replace/system/wscript_configure ++++ b/lib/replace/system/wscript_configure +@@ -1,6 +1,10 @@ + #!/usr/bin/env python + +-conf.CHECK_HEADERS('sys/capability.h') ++import Options ++ ++if Options.options.enable_libcap: ++ conf.CHECK_HEADERS('sys/capability.h') ++ + conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') + + # solaris varients of getXXent_r +diff --git a/lib/replace/wscript b/lib/replace/wscript +index 145300d..8218fa5 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -23,6 +23,41 @@ def set_options(opt): + opt.PRIVATE_EXTENSION_DEFAULT('') + opt.RECURSE('buildtools/wafsamba') + ++ opt.add_option('--with-acl', ++ help=("Enable use of acl"), ++ action="store_true", dest='enable_acl') ++ opt.add_option('--without-acl', ++ help=("Disable use of acl"), ++ action="store_false", dest='enable_acl', default=False) ++ ++ opt.add_option('--with-attr', ++ help=("Enable use of attr"), ++ action="store_true", dest='enable_attr') ++ opt.add_option('--without-attr', ++ help=("Disable use of attr"), ++ action="store_false", dest='enable_attr', default=False) ++ ++ opt.add_option('--with-libaio', ++ help=("Enable use of libaio"), ++ action="store_true", dest='enable_libaio') ++ opt.add_option('--without-libaio', ++ help=("Disable use of libaio"), ++ action="store_false", dest='enable_libaio', default=False) ++ ++ opt.add_option('--with-libbsd', ++ help=("Enable use of libbsd"), ++ action="store_true", dest='enable_libbsd') ++ opt.add_option('--without-libbsd', ++ help=("Disable use of libbsd"), ++ action="store_false", dest='enable_libbsd', default=False) ++ ++ opt.add_option('--with-libcap', ++ help=("Enable use of libcap"), ++ action="store_true", dest='enable_libcap') ++ opt.add_option('--without-libcap', ++ help=("Disable use of libcap"), ++ action="store_false", dest='enable_libcap', default=False) ++ + @Utils.run_once + def configure(conf): + conf.RECURSE('buildtools/wafsamba') +@@ -32,12 +67,25 @@ def configure(conf): + conf.DEFINE('HAVE_LIBREPLACE', 1) + conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) + +- conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h') +- conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') ++ conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') ++ conf.CHECK_HEADERS('compat.h ctype.h dustat.h') + conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') +- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') +- conf.CHECK_HEADERS('shadow.h sys/acl.h') +- conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') ++ conf.CHECK_HEADERS('locale.h ndir.h pwd.h') ++ conf.CHECK_HEADERS('shadow.h') ++ conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') ++ ++ if Options.options.enable_acl: ++ conf.CHECK_HEADERS('acl/libacl.h sys/acl.h') ++ ++ if Options.options.enable_attr: ++ conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') ++ ++ if Options.options.enable_libaio: ++ conf.CHECK_HEADERS('libaio.h') ++ ++ if Options.options.enable_libcap: ++ conf.CHECK_HEADERS('sys/capability.h') ++ + conf.CHECK_HEADERS('port.h') + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') + conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') +@@ -73,7 +121,9 @@ def configure(conf): + + conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') + +- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') ++ if Options.options.enable_valgrind: ++ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') ++ + conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') + conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') + conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') +@@ -248,17 +298,18 @@ def configure(conf): + + conf.CHECK_FUNCS('prctl dirname basename') + +- # libbsd on some platforms provides strlcpy and strlcat +- if not conf.CHECK_FUNCS('strlcpy strlcat'): +- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True) +- if not conf.CHECK_FUNCS('getpeereid'): +- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): +- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- +- if not conf.CHECK_FUNCS('closefrom'): +- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') ++ if Options.options.enable_libbsd: ++ # libbsd on some platforms provides strlcpy and strlcat ++ if not conf.CHECK_FUNCS('strlcpy strlcat'): ++ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ checklibc=True) ++ if not conf.CHECK_FUNCS('getpeereid'): ++ conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): ++ conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ ++ if not conf.CHECK_FUNCS('closefrom'): ++ conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + + conf.CHECK_CODE(''' + struct ucred cred; +diff --git a/wscript b/wscript +index 2af8571..059408b 100755 +--- a/wscript ++++ b/wscript +@@ -29,6 +29,13 @@ def set_options(opt): + opt.RECURSE('lib/replace') + opt.tool_options('python') # options for disabling pyc or pyo compilation + ++ opt.add_option('--with-valgrind', ++ help=("enable use of valgrind"), ++ action="store_true", dest='enable_valgrind') ++ opt.add_option('--without-valgrind', ++ help=("disable use of valgrind"), ++ action="store_false", dest='enable_valgrind', default=False) ++ + def configure(conf): + conf.RECURSE('lib/tdb') + conf.RECURSE('lib/tevent') +-- +2.8.3 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.1.26.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.1.27.bb similarity index 57% rename from import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.1.26.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.1.27.bb index 5458d47285e65b7fe3ee45711c4693103ca7b977..f4370efcdcaa9d666336260d8a6b297c93a5bb5a 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.1.26.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libldb/libldb_1.1.27.bb @@ -3,22 +3,34 @@ HOMEPAGE = "http://ldb.samba.org" SECTION = "libs" LICENSE = "LGPL-3.0+ & LGPL-2.1+ & GPL-3.0+" -DEPENDS += "libbsd libtdb libtalloc libtevent popt" +DEPENDS += "libtdb libtalloc libtevent popt" RDEPENDS_pyldb += "python" SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ file://do-not-import-target-module-while-cross-compile.patch \ + file://ldb-Add-configure-options-for-packages.patch \ " +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" PACKAGECONFIG[ldap] = ",,openldap" +PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" + SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'ldap', '', 'file://avoid-openldap-unless-wanted.patch', d)}" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ - file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780 \ - file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891" +LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9adade \ + file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ + file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[md5sum] = "31780b702b638ad32aa5d9853d257839" -SRC_URI[sha256sum] = "8843c7a72b980d9413ba6c494c039bccd10c524b37fda2917afb147745d8b2e6" +SRC_URI[md5sum] = "50a194dea128d062cf4b44c59130219b" +SRC_URI[sha256sum] = "cdb8269cba09006ddf3766eb7721192b52ae3fdc8a6b95f4318b6b740b9d35ac" inherit waf-samba diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/talloc-Add-configure-options-for-packages.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/talloc-Add-configure-options-for-packages.patch new file mode 100644 index 0000000000000000000000000000000000000000..46b2405cbddf78bc336bbe49cee7f53947d2eb05 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc/talloc-Add-configure-options-for-packages.patch @@ -0,0 +1,177 @@ +From efc1b02144f23fdf84dbc5ff15307815e0f2a425 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Wed, 14 Sep 2016 11:11:35 +0800 +Subject: [PATCH] talloc: Add configure options for packages + +Add configure options for the following packages: + - acl + - attr + - libaio + - libbsd + - libcap + - valgrind + +Upstream-Status: Inappropriate [oe deterministic build specific] + +Signed-off-by: Jackie Huang +--- + lib/replace/system/wscript_configure | 6 ++- + lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- + wscript | 7 ++- + 3 files changed, 79 insertions(+), 19 deletions(-) + +diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure +index 2035474..10f9ae7 100644 +--- a/lib/replace/system/wscript_configure ++++ b/lib/replace/system/wscript_configure +@@ -1,6 +1,10 @@ + #!/usr/bin/env python + +-conf.CHECK_HEADERS('sys/capability.h') ++import Options ++ ++if Options.options.enable_libcap: ++ conf.CHECK_HEADERS('sys/capability.h') ++ + conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') + + # solaris varients of getXXent_r +diff --git a/lib/replace/wscript b/lib/replace/wscript +index fc43e1a..12d2a70 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -23,6 +23,41 @@ def set_options(opt): + opt.PRIVATE_EXTENSION_DEFAULT('') + opt.RECURSE('buildtools/wafsamba') + ++ opt.add_option('--with-acl', ++ help=("Enable use of acl"), ++ action="store_true", dest='enable_acl') ++ opt.add_option('--without-acl', ++ help=("Disable use of acl"), ++ action="store_false", dest='enable_acl', default=False) ++ ++ opt.add_option('--with-attr', ++ help=("Enable use of attr"), ++ action="store_true", dest='enable_attr') ++ opt.add_option('--without-attr', ++ help=("Disable use of attr"), ++ action="store_false", dest='enable_attr', default=False) ++ ++ opt.add_option('--with-libaio', ++ help=("Enable use of libaio"), ++ action="store_true", dest='enable_libaio') ++ opt.add_option('--without-libaio', ++ help=("Disable use of libaio"), ++ action="store_false", dest='enable_libaio', default=False) ++ ++ opt.add_option('--with-libbsd', ++ help=("Enable use of libbsd"), ++ action="store_true", dest='enable_libbsd') ++ opt.add_option('--without-libbsd', ++ help=("Disable use of libbsd"), ++ action="store_false", dest='enable_libbsd', default=False) ++ ++ opt.add_option('--with-libcap', ++ help=("Enable use of libcap"), ++ action="store_true", dest='enable_libcap') ++ opt.add_option('--without-libcap', ++ help=("Disable use of libcap"), ++ action="store_false", dest='enable_libcap', default=False) ++ + @Utils.run_once + def configure(conf): + conf.RECURSE('buildtools/wafsamba') +@@ -32,12 +67,25 @@ def configure(conf): + conf.DEFINE('HAVE_LIBREPLACE', 1) + conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) + +- conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h') +- conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') ++ conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') ++ conf.CHECK_HEADERS('compat.h ctype.h dustat.h') + conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') +- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') +- conf.CHECK_HEADERS('shadow.h sys/acl.h') +- conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') ++ conf.CHECK_HEADERS('locale.h ndir.h pwd.h') ++ conf.CHECK_HEADERS('shadow.h') ++ conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') ++ ++ if Options.options.enable_acl: ++ conf.CHECK_HEADERS('acl/libacl.h sys/acl.h') ++ ++ if Options.options.enable_attr: ++ conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') ++ ++ if Options.options.enable_libaio: ++ conf.CHECK_HEADERS('libaio.h') ++ ++ if Options.options.enable_libcap: ++ conf.CHECK_HEADERS('sys/capability.h') ++ + conf.CHECK_HEADERS('port.h') + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') + conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') +@@ -73,7 +121,9 @@ def configure(conf): + + conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') + +- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') ++ if Options.options.enable_valgrind: ++ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') ++ + conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') + conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') + conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') +@@ -248,17 +298,18 @@ def configure(conf): + + conf.CHECK_FUNCS('prctl dirname basename') + +- # libbsd on some platforms provides strlcpy and strlcat +- if not conf.CHECK_FUNCS('strlcpy strlcat'): +- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True) +- if not conf.CHECK_FUNCS('getpeereid'): +- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): +- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- +- if not conf.CHECK_FUNCS('closefrom'): +- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') ++ if Options.options.enable_libbsd: ++ # libbsd on some platforms provides strlcpy and strlcat ++ if not conf.CHECK_FUNCS('strlcpy strlcat'): ++ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ checklibc=True) ++ if not conf.CHECK_FUNCS('getpeereid'): ++ conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): ++ conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ ++ if not conf.CHECK_FUNCS('closefrom'): ++ conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + + conf.CHECK_CODE(''' + struct ucred cred; +diff --git a/wscript b/wscript +index 41f3be7..556c1c8 100644 +--- a/wscript ++++ b/wscript +@@ -35,7 +35,12 @@ def set_options(opt): + opt.add_option('--disable-python', + help=("disable the pytalloc module"), + action="store_true", dest='disable_python', default=False) +- ++ opt.add_option('--with-valgrind', ++ help=("enable use of valgrind"), ++ action="store_true", dest='enable_valgrind') ++ opt.add_option('--without-valgrind', ++ help=("disable use of valgrind"), ++ action="store_false", dest='enable_valgrind', default=False) + + def configure(conf): + conf.RECURSE('lib/replace') +-- +2.8.3 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.6.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb similarity index 52% rename from import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.6.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb index 89373117f838d8535e1fed32976510edf8e00173..97a9a758b78a7a4c168ac0865984c451a7c75a31 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.6.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libtalloc/libtalloc_2.1.8.bb @@ -3,19 +3,28 @@ HOMEPAGE = "http://talloc.samba.org" SECTION = "libs" LICENSE = "LGPL-3.0+ & GPL-3.0+" -DEPENDS += "libbsd" +SRC_URI = "http://samba.org/ftp/talloc/talloc-${PV}.tar.gz \ + file://talloc-Add-configure-options-for-packages.patch \ +" +LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6d5228bfa7825249 \ + file://pytalloc.h;beginline=1;endline=18;md5=2c498cc6f2263672483237b20f46b43d" -SRC_URI = "http://samba.org/ftp/talloc/talloc-${PV}.tar.gz" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ - file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891" - -SRC_URI[md5sum] = "707010c6ede5821fd34397f5d9ec6ab8" -SRC_URI[sha256sum] = "3b8e1a50bacb359d99942e0dd9941cef779ae4b5eb20f138873bd8270cb1d47b" +SRC_URI[md5sum] = "6fb70af4174330e4cc139ea63b07c9e9" +SRC_URI[sha256sum] = "22d14911164d4de67ff76b5269fa5250d01f78c955bc77e28615350996877130" inherit waf-samba -PACKAGECONFIG[attr] = ",,attr" +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch new file mode 100644 index 0000000000000000000000000000000000000000..40005577324c98a3dba17154416f3ec36a42d59f --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb/tdb-Add-configure-options-for-packages.patch @@ -0,0 +1,177 @@ +From 10ac5e5fdda44adcc2a159b6f9a2d51a51361057 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Wed, 21 Sep 2016 10:46:19 +0800 +Subject: [PATCH] tdb: Add configure options for packages + +Add configure options for the following packages: + - acl + - attr + - libaio + - libbsd + - libcap + - valgrind + +Upstream-Status: Inappropriate [oe deterministic build specific] + +Signed-off-by: Jackie Huang +--- + lib/replace/system/wscript_configure | 6 ++- + lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- + wscript | 7 ++- + 3 files changed, 79 insertions(+), 19 deletions(-) + +diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure +index 2035474..10f9ae7 100644 +--- a/lib/replace/system/wscript_configure ++++ b/lib/replace/system/wscript_configure +@@ -1,6 +1,10 @@ + #!/usr/bin/env python + +-conf.CHECK_HEADERS('sys/capability.h') ++import Options ++ ++if Options.options.enable_libcap: ++ conf.CHECK_HEADERS('sys/capability.h') ++ + conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') + + # solaris varients of getXXent_r +diff --git a/lib/replace/wscript b/lib/replace/wscript +index 145300d..310048c 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -23,6 +23,41 @@ def set_options(opt): + opt.PRIVATE_EXTENSION_DEFAULT('') + opt.RECURSE('buildtools/wafsamba') + ++ opt.add_option('--with-acl', ++ help=("Enable use of acl"), ++ action="store_true", dest='enable_acl') ++ opt.add_option('--without-acl', ++ help=("Disable use of acl"), ++ action="store_false", dest='enable_acl', default=False) ++ ++ opt.add_option('--with-attr', ++ help=("Enable use of attr"), ++ action="store_true", dest='enable_attr') ++ opt.add_option('--without-attr', ++ help=("Disable use of attr"), ++ action="store_false", dest='enable_attr', default=False) ++ ++ opt.add_option('--with-libaio', ++ help=("Enable use of libaio"), ++ action="store_true", dest='enable_libaio') ++ opt.add_option('--without-libaio', ++ help=("Disable use of libaio"), ++ action="store_false", dest='enable_libaio', default=False) ++ ++ opt.add_option('--with-libbsd', ++ help=("Enable use of libbsd"), ++ action="store_true", dest='enable_libbsd') ++ opt.add_option('--without-libbsd', ++ help=("Disable use of libbsd"), ++ action="store_false", dest='enable_libbsd', default=False) ++ ++ opt.add_option('--with-libcap', ++ help=("Enable use of libcap"), ++ action="store_true", dest='enable_libcap') ++ opt.add_option('--without-libcap', ++ help=("Disable use of libcap"), ++ action="store_false", dest='enable_libcap', default=False) ++ + @Utils.run_once + def configure(conf): + conf.RECURSE('buildtools/wafsamba') +@@ -32,12 +67,25 @@ def configure(conf): + conf.DEFINE('HAVE_LIBREPLACE', 1) + conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) + +- conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h') +- conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') ++ conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') ++ conf.CHECK_HEADERS('compat.h ctype.h dustat.h') + conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') +- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') +- conf.CHECK_HEADERS('shadow.h sys/acl.h') +- conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') ++ conf.CHECK_HEADERS('locale.h ndir.h pwd.h') ++ conf.CHECK_HEADERS('shadow.h') ++ conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') ++ ++ if Options.options.enable_acl: ++ conf.CHECK_HEADERS('acl/libacl.h sys/acl.h') ++ ++ if Options.options.enable_attr: ++ conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') ++ ++ if Options.options.enable_libaio: ++ conf.CHECK_HEADERS('libaio.h') ++ ++ if Options.options.enable_libcap: ++ conf.CHECK_HEADERS('sys/capability.h') ++ + conf.CHECK_HEADERS('port.h') + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') + conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') +@@ -73,7 +121,9 @@ def configure(conf): + + conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') + +- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') ++ if Options.options.enable_valgrind: ++ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') ++ + conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') + conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') + conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') +@@ -248,17 +298,18 @@ def configure(conf): + + conf.CHECK_FUNCS('prctl dirname basename') + +- # libbsd on some platforms provides strlcpy and strlcat +- if not conf.CHECK_FUNCS('strlcpy strlcat'): +- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True) +- if not conf.CHECK_FUNCS('getpeereid'): +- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): +- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- +- if not conf.CHECK_FUNCS('closefrom'): +- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') ++ if Options.options.enable_libbsd: ++ # libbsd on some platforms provides strlcpy and strlcat ++ if not conf.CHECK_FUNCS('strlcpy strlcat'): ++ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ checklibc=True) ++ if not conf.CHECK_FUNCS('getpeereid'): ++ conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): ++ conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ ++ if not conf.CHECK_FUNCS('closefrom'): ++ conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + + conf.CHECK_CODE(''' + struct ucred cred; +diff --git a/wscript b/wscript +index 50b2286..748eef1 100644 +--- a/wscript ++++ b/wscript +@@ -64,7 +64,12 @@ def set_options(opt): + opt.add_option('--disable-python', + help=("disable the pytdb module"), + action="store_true", dest='disable_python', default=False) +- ++ opt.add_option('--with-valgrind', ++ help=("enable use of valgrind"), ++ action="store_true", dest='enable_valgrind') ++ opt.add_option('--without-valgrind', ++ help=("disable use of valgrind"), ++ action="store_false", dest='enable_valgrind', default=False) + + def configure(conf): + conf.env.disable_tdb_mutex_locking = getattr(Options.options, +-- +2.8.3 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.10.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.10.bb new file mode 100644 index 0000000000000000000000000000000000000000..1d65d391466b3a203547462572fc82c0104ee4aa --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.10.bb @@ -0,0 +1,44 @@ +SUMMARY = "The tdb library" +SECTION = "libs" +LICENSE = "LGPL-3.0+ & GPL-3.0+" + +LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c98f48018c4 \ + file://include/tdb.h;endline=27;md5=f5bb544641d3081821bcc1dd58310be6" + +SRC_URI = "http://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ + file://do-not-check-xsltproc-manpages.patch \ + file://tdb-Add-configure-options-for-packages.patch \ +" + +SRC_URI[md5sum] = "c98f24eb469022b0f1741d3a504cfda5" +SRC_URI[sha256sum] = "5578fb726bd04835f250bea11fe7d1398fe0bb3a7c9390404241c83cd6b50c1c" + +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" + +S = "${WORKDIR}/tdb-${PV}" + +inherit waf-samba + +EXTRA_OECONF += "--disable-rpath \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + " +DISABLE_STATIC = "" + +PACKAGES += "tdb-tools python-tdb python-tdb-dbg" + +FILES_${PN} = "${libdir}/*.so.*" +FILES_tdb-tools = "${bindir}/*" +FILES_python-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +FILES_python-tdb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/*" +RDEPENDS_python-tdb = "python" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.8.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.8.bb deleted file mode 100644 index bf6698ae55e89e8ab91246f59a3a55ca4732f090..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.3.8.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "The tdb library" -SECTION = "libs" -LICENSE = "LGPL-3.0+ & GPL-3.0+" - -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b \ - file://${COREBASE}/meta/files/common-licenses/GPL-3.0;md5=c79ff39f19dfec6d293b95dea7b07891" - -SRC_URI = "http://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ - file://do-not-check-xsltproc-manpages.patch" - -SRC_URI[md5sum] = "fa4c9e2f59fcf41441285bca5f5ab481" -SRC_URI[sha256sum] = "0605ac0427eac9c23bf61ebfd8206a07d5ece198498eab1769cd0cfb6e7de6b1" - -S = "${WORKDIR}/tdb-${PV}" - -inherit waf-samba - -EXTRA_OECONF += "--disable-rpath \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - " -DISABLE_STATIC = "" - -PACKAGES += "tdb-tools python-tdb python-tdb-dbg" - -FILES_${PN} = "${libdir}/*.so.*" -FILES_tdb-tools = "${bindir}/*" -FILES_python-tdb = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -FILES_python-tdb-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/*" -RDEPENDS_python-tdb = "python" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/tevent-Add-configure-options-for-packages.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/tevent-Add-configure-options-for-packages.patch new file mode 100644 index 0000000000000000000000000000000000000000..ddb8e4e23b65634266ffc5ab784285bafad5ba96 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent/tevent-Add-configure-options-for-packages.patch @@ -0,0 +1,180 @@ +From c00f6d35bdc06dffb54daa815e57b44210a5de04 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Wed, 21 Sep 2016 09:57:49 +0800 +Subject: [PATCH] tevent: Add configure options for packages + +Add configure options for the following packages: + - acl + - attr + - libaio + - libbsd + - libcap + - valgrind + +Upstream-Status: Inappropriate [oe deterministic build specific] + +Signed-off-by: Jackie Huang +--- + lib/replace/system/wscript_configure | 6 ++- + lib/replace/wscript | 85 ++++++++++++++++++++++++++++-------- + wscript | 7 ++- + 3 files changed, 79 insertions(+), 19 deletions(-) + mode change 100755 => 100644 wscript + +diff --git a/lib/replace/system/wscript_configure b/lib/replace/system/wscript_configure +index 2035474..10f9ae7 100644 +--- a/lib/replace/system/wscript_configure ++++ b/lib/replace/system/wscript_configure +@@ -1,6 +1,10 @@ + #!/usr/bin/env python + +-conf.CHECK_HEADERS('sys/capability.h') ++import Options ++ ++if Options.options.enable_libcap: ++ conf.CHECK_HEADERS('sys/capability.h') ++ + conf.CHECK_FUNCS('getpwnam_r getpwuid_r getpwent_r') + + # solaris varients of getXXent_r +diff --git a/lib/replace/wscript b/lib/replace/wscript +index fc43e1a..12d2a70 100644 +--- a/lib/replace/wscript ++++ b/lib/replace/wscript +@@ -23,6 +23,41 @@ def set_options(opt): + opt.PRIVATE_EXTENSION_DEFAULT('') + opt.RECURSE('buildtools/wafsamba') + ++ opt.add_option('--with-acl', ++ help=("Enable use of acl"), ++ action="store_true", dest='enable_acl') ++ opt.add_option('--without-acl', ++ help=("Disable use of acl"), ++ action="store_false", dest='enable_acl', default=False) ++ ++ opt.add_option('--with-attr', ++ help=("Enable use of attr"), ++ action="store_true", dest='enable_attr') ++ opt.add_option('--without-attr', ++ help=("Disable use of attr"), ++ action="store_false", dest='enable_attr', default=False) ++ ++ opt.add_option('--with-libaio', ++ help=("Enable use of libaio"), ++ action="store_true", dest='enable_libaio') ++ opt.add_option('--without-libaio', ++ help=("Disable use of libaio"), ++ action="store_false", dest='enable_libaio', default=False) ++ ++ opt.add_option('--with-libbsd', ++ help=("Enable use of libbsd"), ++ action="store_true", dest='enable_libbsd') ++ opt.add_option('--without-libbsd', ++ help=("Disable use of libbsd"), ++ action="store_false", dest='enable_libbsd', default=False) ++ ++ opt.add_option('--with-libcap', ++ help=("Enable use of libcap"), ++ action="store_true", dest='enable_libcap') ++ opt.add_option('--without-libcap', ++ help=("Disable use of libcap"), ++ action="store_false", dest='enable_libcap', default=False) ++ + @Utils.run_once + def configure(conf): + conf.RECURSE('buildtools/wafsamba') +@@ -32,12 +67,25 @@ def configure(conf): + conf.DEFINE('HAVE_LIBREPLACE', 1) + conf.DEFINE('LIBREPLACE_NETWORK_CHECKS', 1) + +- conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h') +- conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h') ++ conf.CHECK_HEADERS('linux/types.h crypt.h locale.h compat.h') ++ conf.CHECK_HEADERS('compat.h ctype.h dustat.h') + conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h') +- conf.CHECK_HEADERS('libaio.h locale.h ndir.h pwd.h') +- conf.CHECK_HEADERS('shadow.h sys/acl.h') +- conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h') ++ conf.CHECK_HEADERS('locale.h ndir.h pwd.h') ++ conf.CHECK_HEADERS('shadow.h') ++ conf.CHECK_HEADERS('sys/attributes.h sys/dir.h sys/epoll.h') ++ ++ if Options.options.enable_acl: ++ conf.CHECK_HEADERS('acl/libacl.h sys/acl.h') ++ ++ if Options.options.enable_attr: ++ conf.CHECK_HEADERS('attr/attributes.h attr/xattr.h') ++ ++ if Options.options.enable_libaio: ++ conf.CHECK_HEADERS('libaio.h') ++ ++ if Options.options.enable_libcap: ++ conf.CHECK_HEADERS('sys/capability.h') ++ + conf.CHECK_HEADERS('port.h') + conf.CHECK_HEADERS('sys/fcntl.h sys/filio.h sys/filsys.h sys/fs/s5param.h sys/fs/vx/quota.h') + conf.CHECK_HEADERS('sys/id.h sys/ioctl.h sys/ipc.h sys/mman.h sys/mode.h sys/ndir.h sys/priv.h') +@@ -73,7 +121,9 @@ def configure(conf): + + conf.CHECK_CODE('', headers='rpc/rpc.h rpcsvc/yp_prot.h', define='HAVE_RPCSVC_YP_PROT_H') + +- conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') ++ if Options.options.enable_valgrind: ++ conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h') ++ + conf.CHECK_HEADERS('nss_common.h nsswitch.h ns_api.h') + conf.CHECK_HEADERS('sys/extattr.h sys/ea.h sys/proplist.h sys/cdefs.h') + conf.CHECK_HEADERS('utmp.h utmpx.h lastlog.h') +@@ -248,17 +298,18 @@ def configure(conf): + + conf.CHECK_FUNCS('prctl dirname basename') + +- # libbsd on some platforms provides strlcpy and strlcat +- if not conf.CHECK_FUNCS('strlcpy strlcat'): +- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', +- checklibc=True) +- if not conf.CHECK_FUNCS('getpeereid'): +- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') +- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): +- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') +- +- if not conf.CHECK_FUNCS('closefrom'): +- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') ++ if Options.options.enable_libbsd: ++ # libbsd on some platforms provides strlcpy and strlcat ++ if not conf.CHECK_FUNCS('strlcpy strlcat'): ++ conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', ++ checklibc=True) ++ if not conf.CHECK_FUNCS('getpeereid'): ++ conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') ++ if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): ++ conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') ++ ++ if not conf.CHECK_FUNCS('closefrom'): ++ conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') + + conf.CHECK_CODE(''' + struct ucred cred; +diff --git a/wscript b/wscript +old mode 100755 +new mode 100644 +index 71b9475..50793db +--- a/wscript ++++ b/wscript +@@ -26,7 +26,12 @@ def set_options(opt): + opt.add_option('--disable-python', + help=("disable the pytevent module"), + action="store_true", dest='disable_python', default=False) +- ++ opt.add_option('--with-valgrind', ++ help=("enable use of valgrind"), ++ action="store_true", dest='enable_valgrind') ++ opt.add_option('--without-valgrind', ++ help=("disable use of valgrind"), ++ action="store_false", dest='enable_valgrind', default=False) + + def configure(conf): + conf.RECURSE('lib/replace') +-- +2.8.3 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.28.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.28.bb deleted file mode 100644 index d0ad748f595c7c1232a57161ffb139d7486008db..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.28.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "Hierarchical, reference counted memory pool system with destructors" -HOMEPAGE = "http://tevent.samba.org" -SECTION = "libs" -LICENSE = "LGPLv3+" - -DEPENDS += "libbsd libtalloc" -RDEPENDS_python-tevent = "python" - -SRC_URI = "http://samba.org/ftp/tevent/tevent-${PV}.tar.gz" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/LGPL-3.0;md5=bfccfe952269fff2b407dd11f2f3083b" - -SRC_URI[md5sum] = "945845817918f5cfbe0202d80a7db118" -SRC_URI[sha256sum] = "04d953379025b1560af5c4ffcce58a3ee84db7aaa09c9f1e3eff5b2945a13529" - -inherit waf-samba - -PACKAGECONFIG[attr] = ",,attr" - -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" - -S = "${WORKDIR}/tevent-${PV}" - -EXTRA_OECONF += "--disable-rpath \ - --bundled-libraries=NONE \ - --builtin-libraries=replace \ - --with-libiconv=${STAGING_DIR_HOST}${prefix}\ - --without-gettext \ - " -DISABLE_STATIC = "" - -PACKAGES += "python-tevent python-tevent-dbg" - -FILES_python-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -FILES_python-tevent-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.29.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.29.bb new file mode 100644 index 0000000000000000000000000000000000000000..9f4e235c5d0666dad32169c35aba0ddc0aa03d35 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/libtevent/libtevent_0.9.29.bb @@ -0,0 +1,45 @@ +SUMMARY = "Hierarchical, reference counted memory pool system with destructors" +HOMEPAGE = "http://tevent.samba.org" +SECTION = "libs" +LICENSE = "LGPLv3+" + +DEPENDS += "libtalloc" +RDEPENDS_python-tevent = "python" + +SRC_URI = "http://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ + file://tevent-Add-configure-options-for-packages.patch \ +" +LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a" + +SRC_URI[md5sum] = "4372c1430a1ecb7ea0adddfdf21c0d55" +SRC_URI[sha256sum] = "a4f519b0bbb718fe2175bee9011ee4d199675f28c2ef80531be38e7bbaa1c42b" + +inherit waf-samba + +PACKAGECONFIG ??= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \ +" +PACKAGECONFIG[acl] = "--with-acl,--without-acl,acl" +PACKAGECONFIG[attr] = "--with-attr,--without-attr,attr" +PACKAGECONFIG[libaio] = "--with-libaio,--without-libaio,libaio" +PACKAGECONFIG[libbsd] = "--with-libbsd,--without-libbsd,libbsd" +PACKAGECONFIG[libcap] = "--with-libcap,--without-libcap,libcap" +PACKAGECONFIG[valgrind] = "--with-valgrind,--without-valgrind,valgrind" + +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'attr', '', 'file://avoid-attr-unless-wanted.patch', d)}" + +S = "${WORKDIR}/tevent-${PV}" + +EXTRA_OECONF += "--disable-rpath \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --with-libiconv=${STAGING_DIR_HOST}${prefix}\ + --without-gettext \ + " +DISABLE_STATIC = "" + +PACKAGES += "python-tevent python-tevent-dbg" + +FILES_python-tevent = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" +FILES_python-tevent-dbg = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch new file mode 100644 index 0000000000000000000000000000000000000000..583a6ca60ba0301931bf676df55a586781a030bb --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm/0001-fix-compile-error-with-linux-kernel-v4.8.patch @@ -0,0 +1,74 @@ +From 7cdafc0dee8054f82777ed3bf6d4c8b5582d09ad Mon Sep 17 00:00:00 2001 +From: Dengke Du +Date: Tue, 18 Oct 2016 07:56:02 +0000 +Subject: [PATCH] fix compile error with linux kernel v4.8 + +In src/maint/zntune.c, the glibc time.h is included before linux +time.h, so when compile the zntune.c, it break down by errors: + + redefinition of 'struct timespec' 'struct timeval' + 'struct timezone' 'struct itimerval' + +We should exclude the linux time.h by disable linux/atm_zatm.h and +move some useful definition in linux/atm_zatm.h to zntune.c to resolve +it. + +Upstream-status: Pending + +Signed-off-by: Dengke Du +--- + src/include/atm_zatm.h | 26 ++++++++++++++++++++++++++ + src/maint/zntune.c | 3 +-- + 2 files changed, 27 insertions(+), 2 deletions(-) + create mode 100644 src/include/atm_zatm.h + +diff --git a/src/include/atm_zatm.h b/src/include/atm_zatm.h +new file mode 100644 +index 0000000..7d64f4d +--- /dev/null ++++ b/src/include/atm_zatm.h +@@ -0,0 +1,26 @@ ++#include ++#include ++ ++#define ZATM_GETPOOL _IOW('a',ATMIOC_SARPRV+1,struct atmif_sioc) ++ /* get pool statistics */ ++#define ZATM_GETPOOLZ _IOW('a',ATMIOC_SARPRV+2,struct atmif_sioc) ++ /* get statistics and zero */ ++#define ZATM_SETPOOL _IOW('a',ATMIOC_SARPRV+3,struct atmif_sioc) ++ ++struct zatm_pool_info { ++ int ref_count; /* free buffer pool usage counters */ ++ int low_water,high_water; /* refill parameters */ ++ int rqa_count,rqu_count; /* queue condition counters */ ++ int offset,next_off; /* alignment optimizations: offset */ ++ int next_cnt,next_thres; /* repetition counter and threshold */ ++}; /* set pool parameters */ ++ ++struct zatm_pool_req { ++ int pool_num; /* pool number */ ++ struct zatm_pool_info info; /* actual information */ ++}; ++ ++#define ZATM_OAM_POOL 0 /* free buffer pool for OAM cells */ ++#define ZATM_AAL0_POOL 1 /* free buffer pool for AAL0 cells */ ++#define ZATM_AAL5_POOL_BASE 2 /* first AAL5 free buffer pool */ ++#define ZATM_LAST_POOL ZATM_AAL5_POOL_BASE+10 /* max. 64 kB */ +diff --git a/src/maint/zntune.c b/src/maint/zntune.c +index 62d62ab..bb93eab 100644 +--- a/src/maint/zntune.c ++++ b/src/maint/zntune.c +@@ -13,9 +13,8 @@ + #include + #include + #include ++#include + #include /* for struct timeval, although it's not used */ +-#include +- + + static void usage(const char *name) + { +-- +2.9.0 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index edfb045a961878bb8d7baaadc28ace4152efbd78..6ab8b07d025a6fb8d4bdcecaed4cc7da64352d0f 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -9,7 +9,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI = "http://nchc.dl.sourceforge.net/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ file://link-with-ldflags.patch \ - file://install-from-buildir.patch" + file://install-from-buildir.patch \ + file://0001-fix-compile-error-with-linux-kernel-v4.8.patch \ +" SRC_URI[md5sum] = "d49499368c3cf15f73a05d9bce8824a8" SRC_URI[sha256sum] = "9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb similarity index 76% rename from import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb index d3e6a5dda8da58418fef7d2fb397d958117838d6..11c43ff0f6181fc4f59176975b722f793c6273cb 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.16.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.17.bb @@ -9,19 +9,19 @@ LIC_FILES_CHKSUM = " \ " SRC_URI = "${SOURCEFORGE_MIRROR}/lksctp/${BP}.tar.gz \ - file://run-ptest \ - file://v4test.sh \ - file://v6test.sh \ - " + file://run-ptest \ + file://v4test.sh \ + file://v6test.sh \ +" -SRC_URI[md5sum] = "708bb0b5a6806ad6e8d13c55b067518e" -SRC_URI[sha256sum] = "0903dd526b7f30a89d5031aa2c82757612becc38ed7bc6e4f972f8deae351f26" +SRC_URI[md5sum] = "68e9b8fa4d4e331029b247b72d46d7a5" +SRC_URI[sha256sum] = "1aeb204cdb2befc94d9eb3037d1609c9d1d2cd5379d6dd2c0a8ca9b10533aa15" #| arm-oe-linux-gnueabi-libtool: link: arm-oe-linux-gnueabi-gcc -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -shared -fPIC -DPIC .libs/bindx.o .libs/connectx.o .libs/peeloff.o .libs/opt_info.o .libs/addrs.o .libs/sendmsg.o .libs/recvmsg.o -march=armv5te -marm -mthumb-interwork --sysroot=/home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/qemuarm -O2 -Wl,--version-script=/home/jenkins/oe/world/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/lksctp-tools/1.0.16-r0/lksctp-tools-1.0.16/src/lib/Versions.map -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-soname -Wl,libsctp.so.1 -o .libs/libsctp.so.1.0.16 #| /home/jenkins/oe/world/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.9.0/ld: error: symbol sctp_connectx has undefined version #| collect2: error: ld returned 1 exit status #| make[4]: *** [libsctp.la] Error 1 -PNBLACKLIST[lksctp-tools] ?= "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}" +PNBLACKLIST[lksctp-tools] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', "BROKEN: fails to link against sctp_connectx symbol", '', d)}" S = "${WORKDIR}/${BP}" @@ -30,11 +30,11 @@ BBCLASSEXTEND = "native" inherit autotools pkgconfig binconfig ptest do_install_ptest () { - install -m 0755 ${WORKDIR}/v4test.sh ${D}${PTEST_PATH} - install -m 0755 ${WORKDIR}/v6test.sh ${D}${PTEST_PATH} - for testcase in `find ${B}/src/apps/.libs ${B}/src/func_tests/.libs -maxdepth 1 -type f -executable`; do - install $testcase ${D}${PTEST_PATH} - done + install -m 0755 ${WORKDIR}/v4test.sh ${D}${PTEST_PATH} + install -m 0755 ${WORKDIR}/v6test.sh ${D}${PTEST_PATH} + for testcase in `find ${B}/src/apps/.libs ${B}/src/func_tests/.libs -maxdepth 1 -type f -executable`; do + install $testcase ${D}${PTEST_PATH} + done } SOLIBVERSION="${PV}" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-build-errors-with-clang.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-build-errors-with-clang.patch new file mode 100644 index 0000000000000000000000000000000000000000..8e906f7ce08b11e93ccecb798acccb99d188c2a0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools/0001-Fix-build-errors-with-clang.patch @@ -0,0 +1,34 @@ +From 5f9e80acb0a1ac399839bf160e43f6120c4b5128 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 18 Oct 2016 23:49:09 +0000 +Subject: [PATCH] Fix build errors with clang + +| ../../../../../../../workspace/sources/lowpan-tools/src/coordinator.c:313:50: error: format specifies type 'unsigned char' but the argument has type 'int' [-Werror,-Wformat] +| fprintf(stderr, "Opt: %c (%hhx)\n", (char)opt, opt); +| ~~~~ ^~~ +| %x +| 1 error generated. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/coordinator.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/coordinator.c b/src/coordinator.c +index c139aae..f0de6d2 100644 +--- a/src/coordinator.c ++++ b/src/coordinator.c +@@ -310,7 +310,7 @@ int main(int argc, char **argv) + #else + opt = getopt(argc, argv, "l:f:d:m:n:i:s:p:c:hv"); + #endif +- fprintf(stderr, "Opt: %c (%hhx)\n", opt, opt); ++ fprintf(stderr, "Opt: %c (%hhx)\n", opt, (unsigned char)opt); + if (opt == -1) + break; + +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb index b1bd926bc838e74f3b5f6beaa121c7b31b15f70d..8c7dbc09af519d34c59b28ae66445d0a262e8ffd 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/lowpan-tools/lowpan-tools_git.bb @@ -9,7 +9,9 @@ DEPENDS = "flex-native bison-native libnl python" PV = "0.3.1+git${SRCPV}" SRC_URI = "git://git.code.sf.net/p/linux-zigbee/linux-zigbee \ - file://no-help2man.patch" + file://no-help2man.patch \ + file://0001-Fix-build-errors-with-clang.patch \ + " SRCREV = "38f42dbfce9e13629263db3bd3b81f14c69bb733" S = "${WORKDIR}/git" @@ -18,8 +20,10 @@ inherit autotools python-dir pkgconfig CACHED_CONFIGUREVARS += "am_cv_python_pythondir=${PYTHON_SITEPACKAGES_DIR}/lowpan-tools" +CFLAGS += "-Wno-initializer-overrides" + do_install_append() { - rmdir ${D}${localstatedir}/run + rmdir ${D}${localstatedir}/run } FILES_${PN}-dbg += "${libexecdir}/lowpan-tools/.debug/" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb index 7b737916bbc939d754941bd8d9f3d7814eafd61b..1d8a2cf9da8a0264747cad516379819428205daf 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb @@ -17,3 +17,5 @@ inherit autotools EXTRA_OECONF = "--without-gtk" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb index 89a646f51934d92898df98d384d92514b3b5261f..3311d24a5183db44acc8a1978d7fc08efcb71f38 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb @@ -16,6 +16,8 @@ SRC_URI[netcat-patch.sha256sum] = "eee759327ffea293e81d0dde67921b7fcfcad279ffd7a S = "${WORKDIR}/${BPN}-${PV}" +EXTRA_OEMAKE += "'LDFLAGS=${LDFLAGS}'" + do_configure[noexec] = "1" netcat_do_patch() { diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netcf/netcf_git.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/netcf/netcf_git.bb index 8fb69bb27ac0155bf1f82bd522f71d65cf3c5051..ed713ace28877a1546a53fc9693fe71536f51dea 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/netcf/netcf_git.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/netcf/netcf_git.bb @@ -28,9 +28,10 @@ do_configure_prepend() { cd ${S} # avoid bootstrap cloning gnulib on every configure - # the rmdir acts as a sentinel to let us know if the pkg ever changes - # the path for GNUlib or populates the dir making it non-empty. - rmdir ${S}/.gnulib + # the dir starts out empty from the pkg, but unconditionally blow it + # away so if we reconfigure due to gnulib sysroot sig changes, we will + # get the newer gnulib content into the build here. + rm -rf ${S}/.gnulib cp -rf ${STAGING_DATADIR}/gnulib ${S}/.gnulib # --force to avoid errors on reconfigure e.g if recipes changed we depend on @@ -43,7 +44,7 @@ do_configure_prepend() { } do_install_append() { - if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system if [ -d "${D}${libdir}/systemd/system" ]; then mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/ diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/netperf/netperf_2.6.0.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/netperf/netperf_2.6.0.bb index 760bab0f30adab5890f89082cab0d3c1369f3db2..650fdaeedb9438f855cecdf1a50bc34a9269d104 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/netperf/netperf_2.6.0.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/netperf/netperf_2.6.0.bb @@ -24,7 +24,7 @@ CFLAGS_append = " -DDO_UNIX -DDO_IPV6 -D_GNU_SOURCE" # set the "_FILE_OFFSET_BITS" preprocessor symbol to 64 to support files # larger than 2GB -CFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'largefile', \ +CFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', \ ' -D_FILE_OFFSET_BITS=64', '', d)}" PACKAGECONFIG ??= "" @@ -60,7 +60,7 @@ do_install() { install -m 0644 ${S}/doc/netperf_old.ps ${D}${docdir}/netperf } -RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" +RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'sctp', 'kernel-module-sctp', '', d)}" INITSCRIPT_NAME="netperf" INITSCRIPT_PARAMS="defaults" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/alignment-cheat.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/alignment-cheat.patch new file mode 100644 index 0000000000000000000000000000000000000000..be9b62b8cc74e18cc720eae396c7315e91ebcd5c --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools/alignment-cheat.patch @@ -0,0 +1,52 @@ +yp-tools: avoid fatal cast warning + +The way casting is done, we will get a fatal alignment warning on some +architectures. This patch cheats our way around this. + +We also eliminate an unused constant which causes a fatal warning. + +Upstream-status: Inappropriate [code does not exist in version 4.x] + +Signed-off-by: Joe Slater + +--- a/lib/do_ypcall.c ++++ b/lib/do_ypcall.c +@@ -44,7 +44,6 @@ struct dom_binding + typedef struct dom_binding dom_binding; + + static const struct timeval RPCTIMEOUT = {25, 0}; +-static const struct timeval UDPTIMEOUT = {5, 0}; + static int const MAXTRIES = 2; + static pthread_mutex_t ypbindlist_lock = PTHREAD_MUTEX_INITIALIZER; + static dom_binding *ypbindlist = NULL; +@@ -381,7 +380,7 @@ __ypclnt_call (u_long prog, xdrproc_t xa + + int + do_ypcall (const char *domain, u_long prog, xdrproc_t xargs, +- caddr_t req, xdrproc_t xres, caddr_t resp) ++ caddr_t req, xdrproc_t xres, void *resp) + { + dom_binding *ydb; + int status; +@@ -450,7 +449,7 @@ do_ypcall (const char *domain, u_long pr + /* Like do_ypcall, but translate the status value if necessary. */ + int + do_ypcall_tr (const char *domain, u_long prog, xdrproc_t xargs, +- caddr_t req, xdrproc_t xres, caddr_t resp) ++ caddr_t req, xdrproc_t xres, void *resp) + { + int status = do_ypcall (domain, prog, xargs, req, xres, resp); + if (status == YPERR_SUCCESS) +--- a/lib/internal.h ++++ b/lib/internal.h +@@ -17,8 +17,8 @@ + #define _INTERNAL_H_ + + extern int do_ypcall (const char *domain, u_long prog, xdrproc_t xargs, +- caddr_t req, xdrproc_t xres, caddr_t resp); ++ caddr_t req, xdrproc_t xres, void *resp); + extern int do_ypcall_tr (const char *domain, u_long prog, xdrproc_t xargs, +- caddr_t req, xdrproc_t xres, caddr_t resp); ++ caddr_t req, xdrproc_t xres, void *resp); + extern int yp_maplist (const char *, struct ypmaplist **); + #endif diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_3.3.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_3.3.bb index b89f0b84aae65a505730493dcfce6020475d7aba..69217fad1ef2e953be6411bc09ca5b95f4dbe14b 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_3.3.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/yp-tools_3.3.bb @@ -11,11 +11,10 @@ ypwhich, yppasswd, domainname, nisdomainname \ and ypdomainname. \ " -PNBLACKLIST[yp-tools] ?= "BROKEN: fails to build for qemuarm." - SRC_URI = "http://www.linux-nis.org/download/yp-tools/${BP}.tar.bz2 \ file://domainname.service \ file://yp-tools-ipv4-ipv6-Provide-an-in-place-version-of-mapv4v6addr.patch \ + file://alignment-cheat.patch \ " SRC_URI[md5sum] = "acebeecc11a73fb8097503670344834c" SRC_URI[sha256sum] = "812be817df3d4c25813552be336c6c6ad5aedaf65611b81af3ad9f98fb3c2e50" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb index d113b82e89d0d7ce16a159d8610e87bfd70724d9..9fc6406b73c5765974bb25eb3dfdf39fa35898e9 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_1.38.bb @@ -19,7 +19,7 @@ This is the final IPv4-only version of ypbind-mt. \ HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" DEPENDS = " \ yp-tools \ - ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ " RDEPENDS_${PN} += "yp-tools" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb index cee5880f7a15d5d0da6f47e0cebd35241a52efa4..82544e7590967a2053cb1dc5a12843cf39041880 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/nis/ypbind-mt_2.2.bb @@ -15,7 +15,7 @@ of known secure NIS server (/etc/yp.conf) Binds to \ the server which answered as first. \ " HOMEPAGE = "http://www.linux-nis.org/nis/ypbind-mt/index.html" -DEPENDS = "yp-tools ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" +DEPENDS = "yp-tools ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" PROVIDES += "ypbind" PNBLACKLIST[ypbind-mt] ?= "BROKEN: Depends on broken yp-tools" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p7.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p8.bb similarity index 90% rename from import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p7.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p8.bb index ff4ba64157ee04df901cb78a6b14b74549c4519b..202d1a3a12182796fe277250db735a495f3e88e2 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p7.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ntp/ntp_4.2.8p8.bb @@ -23,8 +23,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://ntpd.list \ " -SRC_URI[md5sum] = "46dfba933c3e4bc924d8e55068797578" -SRC_URI[sha256sum] = "81d20c06a0b01abe3b84fac092185bf014252d38fe5e7b2758f604680a0220dc" +SRC_URI[md5sum] = "4a8636260435b230636f053ffd070e34" +SRC_URI[sha256sum] = "2ab3d0b5f0456e6311dda1cc27ab75da108762773a19e46abd938bd9407b97ee" inherit autotools update-rc.d useradd systemd pkgconfig @@ -46,7 +46,9 @@ USERADD_PARAM_${PN} = "--system --home-dir ${NTP_USER_HOME} \ --shell /bin/false --user-group ntp" # NB: debug is default-enabled by NTP; keep it default-enabled here. -PACKAGECONFIG ??= "cap debug refclocks" +PACKAGECONFIG ??= "cap debug refclocks openssl \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG[openssl] = "--with-openssl-libdir=${STAGING_LIBDIR} \ --with-openssl-incdir=${STAGING_INCDIR} \ --with-crypto, \ @@ -56,6 +58,8 @@ PACKAGECONFIG[cap] = "--enable-linuxcaps,--disable-linuxcaps,libcap" PACKAGECONFIG[readline] = "--with-lineeditlibs,--without-lineeditlibs,readline" PACKAGECONFIG[refclocks] = "--enable-all-clocks,--disable-all-clocks,pps-tools" PACKAGECONFIG[debug] = "--enable-debugging,--disable-debugging" +PACKAGECONFIG[mdns] = "ac_cv_header_dns_sd_h=yes,ac_cv_header_dns_sd_h=no,mdns" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," do_install_append() { install -d ${D}${sysconfdir}/init.d @@ -125,7 +129,7 @@ RCONFLICTS_ntpdate += "ntpdate-systemd" RSUGGESTS_${PN} = "iana-etc" -FILES_${PN} = "${sbindir}/ntpd ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${libdir} \ +FILES_${PN} = "${sbindir}/ntpd.ntp ${sysconfdir}/ntp.conf ${sysconfdir}/init.d/ntpd ${libdir} \ ${NTP_USER_HOME} \ ${systemd_unitdir}/ntp-units.d/60-ntpd.list ${libexecdir}\ " @@ -158,3 +162,9 @@ pkg_postinst_ntpdate() { fi } +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN} = "ntpd" +ALTERNATIVE_LINK_NAME[ntpd] = "${sbindir}/ntpd" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb index a275238a3b340d139c00c57d58a044e0c09a50f8..9430add487cd954e86bf2700208c3e7ef77c3f2a 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/nuttcp/nuttcp_7.2.1.bb @@ -20,10 +20,10 @@ SRC_URI[sha256sum] = "c6e33810ccce67260f8d5d627f60e429d44f532365c58ed5673d035e2a S = "${WORKDIR}" do_compile () { - ${CC} ${CFLAGS} -o nuttcp nuttcp-${PV}.c + ${CC} ${CFLAGS} ${LDFLAGS} -o nuttcp nuttcp-${PV}.c } do_install () { - install -d ${D}${bindir} - install -m 0755 nuttcp ${D}${bindir} + install -d ${D}${bindir} + install -m 0755 nuttcp ${D}${bindir} } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb similarity index 84% rename from import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb index f0109069cb34404b5a1b904f99b7c08f1a1473c5..a3ef76568cb2c3ee478eee8a7329f284c9d4ee05 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.3.8.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.3.9.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://openvpn.sourceforge.net" SECTION = "net" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=5aac200199fde47501876cba7263cb0c" -DEPENDS = "lzo openssl iproute2 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" +DEPENDS = "lzo openssl iproute2 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" inherit autotools systemd @@ -12,8 +12,8 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/openvpn-${PV}.tar.gz \ file://openvpn@.service \ file://openvpn-volatile.conf" -SRC_URI[md5sum] = "51d996f1f1fc30f501ae251a254effeb" -SRC_URI[sha256sum] = "532435eff61c14b44a583f27b72f93e7864e96c95fe51134ec0ad4b1b1107c51" +SRC_URI[md5sum] = "265755044ae88f9249d509f6d061f7e5" +SRC_URI[sha256sum] = "2c12fe9ea641ac1291e70322cc500641c84e5903dd4f40bf2eda7e9f209b2f9c" SYSTEMD_SERVICE_${PN} += "openvpn@loopback-server.service openvpn@loopback-client.service" SYSTEMD_AUTO_ENABLE = "disable" @@ -21,8 +21,8 @@ SYSTEMD_AUTO_ENABLE = "disable" CFLAGS += "-fno-inline" # I want openvpn to be able to read password from file (hrw) -EXTRA_OECONF += "--enable-password-save --enable-iproute2" -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" +EXTRA_OECONF += "--enable-iproute2" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '', '--disable-plugin-auth-pam', d)}" # Explicitly specify IPROUTE to bypass the configure-time check for /sbin/ip on the host. EXTRA_OECONF += "IPROUTE=/sbin/ip" @@ -38,7 +38,7 @@ do_install_append() { install -dm 755 ${D}${sysconfdir}/openvpn/sample/sample-keys install -m 644 ${S}/sample/sample-keys/* ${D}${sysconfdir}/openvpn/sample/sample-keys - if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system install -m 644 ${WORKDIR}/openvpn@.service ${D}/${systemd_unitdir}/system/openvpn@loopback-server.service diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb new file mode 100644 index 0000000000000000000000000000000000000000..4ed3ed1e40474ec4ea5f6c6275a7526d37285883 --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/phytool/phytool.bb @@ -0,0 +1,15 @@ +SUMMARY = "PHY interface tool for Linux" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0" + +PV = "1.0.1+git${SRCPV}" +SRCREV = "3149bfdb4f513e2f0da0a7d0bc5d0873578696f2" +SRC_URI = "git://github.com/wkz/phytool.git" + +S = "${WORKDIR}/git" + +# The Makefile has "$PREFIX/bin" hardcoded into it, hence not using $bindir here +do_install() { + install -d ${D}${prefix}/bin + oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install +} diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/pimd/pimd_2.1.8.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/pimd/pimd_2.1.8.bb index 34690437d01fba624a77bfb8ec0ceb25df198a43..41b8f6d20ddf3d3bf633da5dcd53b89fb800d326 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/pimd/pimd_2.1.8.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/pimd/pimd_2.1.8.bb @@ -12,8 +12,8 @@ EXTRA_OEMAKE = "-e MAKEFLAGS=" CFLAGS += "-I ${S}/include " do_install() { - unset datadir - unset mandir - oe_runmake 'DESTDIR=${D}' install + unset datadir + unset mandir + oe_runmake 'DESTDIR=${D}' install } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb index 32caec6bf7cec281b93d4a0177bff375822f6a1f..0531ffe640d6597fb9c268e85e03dba70a816cfe 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb @@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://asmping.c;beginline=2;endline=11;md5=1ca8d1a1ca931e5cfe604ebf20a78b71" SRC_URI = "http://www.venaas.no/multicast/ssmping/${BP}.tar.gz \ - file://0001-Makefile-tweak-install-dir.patch \ + file://0001-Makefile-tweak-install-dir.patch \ " SRC_URI[md5sum] = "ad8e3d13f6d72918f73be7e7975d7fad" SRC_URI[sha256sum] = "22103a37eaa28489169a0927bc01e0596c3485fc4d29fc8456c07fd2c70fca6d" @@ -13,5 +13,5 @@ SRC_URI[sha256sum] = "22103a37eaa28489169a0927bc01e0596c3485fc4d29fc8456c07fd2c7 CFLAGS += "-D_GNU_SOURCE " do_install() { - oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install + oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.5.0.bb similarity index 81% rename from import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.5.0.bb index 7ec1a8ee1775326f1d80e75bdf0e99754917047c..8941cf63dfdcb70fe0dac2d892eab87f04b451fe 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.3.2.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/strongswan/strongswan_5.5.0.bb @@ -9,22 +9,20 @@ DEPENDS = "gmp openssl flex-native flex bison-native" SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \ file://fix-funtion-parameter.patch \ - file://support-newer-systemd.patch \ - file://install-strongswan-swanctl-service.patch \ " -SRC_URI[md5sum] = "fab014be1477ef4ebf9a765e10f8802c" -SRC_URI[sha256sum] = "a4a9bc8c4e42bdc4366a87a05a02bf9f425169a7ab0c6f4482d347e44acbf225" +SRC_URI[md5sum] = "a96fa7eb6c62b40143dadb064b6bd586" +SRC_URI[sha256sum] = "58463998ac6725eac3687e8a20c1f69803c3772657076d06c43386a24b4c8454" EXTRA_OECONF = " \ --without-lib-prefix \ " -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" +EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}" PACKAGECONFIG ??= "charon curl gmp openssl stroke sqlite3 \ - ${@base_contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ldap', 'ldap', '', d)} \ " PACKAGECONFIG[aesni] = "--enable-aesni,--disable-aesni," PACKAGECONFIG[charon] = "--enable-charon,--disable-charon," diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.28.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.35.bb similarity index 61% rename from import-layers/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.28.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.35.bb index 0a8bcd8bc2b7686866f10ab4d02c66021c664bd5..51369f4d4c9a2cc8481a5a002b9053b8deb3c038 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.28.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.35.bb @@ -9,12 +9,15 @@ RDEPENDS_${PN} += "perl" SRC_URI = "ftp://ftp.stunnel.org/stunnel/archive/5.x/${BP}.tar.gz" -SRC_URI[md5sum] = "2c39ae0be771f91bf5b0205beafddca6" -SRC_URI[sha256sum] = "9a25b87b1ef0c08fa3d796edce07b4408e6a8acece23de2eb7ee9285b78852b5" +SRC_URI[md5sum] = "9079f5fafbccaf88b7d92b227d78249a" +SRC_URI[sha256sum] = "ffa386ae4c825f35f35157c285e7402a6d58779ad8c3822f74a9d355b54aba1d" inherit autotools EXTRA_OECONF += "--with-ssl='${STAGING_EXECPREFIXDIR}' --disable-fips" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','',d)}" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb index 150e55fd7993bfbada7f018deaf8f9fd28279469..e18228f26d10ceb09fc3f12e73076159de9f0447 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.7.4.bb @@ -47,5 +47,5 @@ do_install_append() { } do_compile_ptest() { - oe_runmake buildtest-TESTS + oe_runmake buildtest-TESTS } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb index 293760ffc8076fd89e5194d4940510285b22f889..e65739a5c7ac07f26f90e7e56694246b4e1f9e3b 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.2a3.bb @@ -22,15 +22,15 @@ DEPENDS += "libpcap" # cross-compilation options to configure! # do_configure () { - oe_runconf \ - --srcdir="." \ - ac_cv_build=${BUILD_SYS} \ - ac_cv_host=${HOST_SYS} \ - ac_cv_target=${HOST_SYS} + oe_runconf \ + --srcdir="." \ + ac_cv_build=${BUILD_SYS} \ + ac_cv_host=${HOST_SYS} \ + ac_cv_target=${HOST_SYS} } do_install () { - mkdir -p ${D}/usr/sbin - install -c -m 555 tcpslice ${D}/usr/sbin + mkdir -p ${D}/usr/sbin + install -c -m 555 tcpslice ${D}/usr/sbin } diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch deleted file mode 100755 index a856b1809ae167bd0276408eab11162461407f19..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-cross-compile.patch +++ /dev/null @@ -1,92 +0,0 @@ -Uptream-Status: Pending - -Signed-off-by: Zongchun Yu - ---- a/configure.ac -+++ b/configure.ac -@@ -402,7 +402,6 @@ - - dnl 0.9.6 (which is still thinks it is 0.9.5 due to a bug) introduces an important - dnl fix for OSX. See: http://tcpreplay.synfin.net/trac/ticket/167 --libpcap_version_096=no - AC_RUN_IFELSE(AC_LANG_PROGRAM([[ - #include - #include -@@ -419,11 +418,12 @@ - exit(0); - - exit(1); --]]), [ -- libpcap_version_096=yes --]) -+]]), -+ [libpcap_version_096=yes], -+ [libpcap_version_096=no], -+ [libpcap_version_096=yes] -+) - --libpcap_ver8=no - AC_RUN_IFELSE(AC_LANG_PROGRAM([[ - #include - #include -@@ -444,13 +444,12 @@ - exit(0); - - exit(1); --]]), [ -- libpcap_ver8=yes --], [ -- libpcap_ver8=no --]) -+]]), -+ [libpcap_ver8=yes], -+ [libpcap_ver8=no], -+ [libpcap_ver8=yes] -+) - --libpcap_ver7=no - AC_RUN_IFELSE(AC_LANG_PROGRAM([[ - #include - #include -@@ -469,11 +468,11 @@ - exit(0); - - exit(1); --]]), [ -- libpcap_ver7=yes --], [ -- libpcap_ver7=no --]) -+]]), -+ [libpcap_ver7=yes], -+ [libpcap_ver7=no], -+ [libpcap_ver7=yes] -+) - - if test x$libpcap_ver8 = xyes ; then - AC_MSG_RESULT(>= 0.8.0) -@@ -761,8 +760,8 @@ - - have_bpf=no - dnl Check for BSD's BPF --AC_MSG_CHECKING(for BPF device sending support) --AC_TRY_RUN([ -+AC_CACHE_CHECK([for BPF device sending support], ac_cv_have_bpf, -+[AC_TRY_RUN([ - #include - #include - #include -@@ -796,8 +795,11 @@ - [Do we have BPF device support?]) - AC_MSG_RESULT(yes) - have_bpf=yes --],[ -- AC_MSG_RESULT(no) -+], -+[AC_MSG_RESULT(no)], -+[AC_MSG_ERROR([cross-compiling, -+ presetting ac_cv_have_bpf=(yes|no) will help])] -+) - ]) - - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch deleted file mode 100644 index 5f36c68c9bd1071f84ce8b9a6ab760b360aa0062..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch +++ /dev/null @@ -1,17 +0,0 @@ -Uptream-Status: Pending - -Signed-off-by: Zongchun Yu - -Index: tcpreplay-3.4.4/configure.ac -=================================================================== ---- tcpreplay-3.4.4.orig/configure.ac -+++ tcpreplay-3.4.4/configure.ac -@@ -389,7 +389,7 @@ CFLAGS="$CFLAGS -I$LPCAPINCDIR" - AC_SEARCH_LIBS([pcap_close], [pcap], - LPCAPLIB="$LIBS", - AC_ERROR([Unable to link libpcap in ${foundpcap}]), -- -lnl) -+ -lnl-3) - - AC_SUBST(LPCAPINC) - AC_SUBST(LPCAPLIB) diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-improve-search-for-libpcap.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-improve-search-for-libpcap.patch deleted file mode 100644 index 50f024c67b5fd4c81a5131a9601bd2dfab95251c..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-improve-search-for-libpcap.patch +++ /dev/null @@ -1,33 +0,0 @@ -tcpreplay: improve search for libpcap - -Add a test which will find libpcap if $testdir/.. is a sysroot. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater - - ---- a/configure.ac -+++ b/configure.ac -@@ -350,14 +350,20 @@ for testdir in $trypcapdir /usr/local /o - if test -f "${testdir}/include/pcap.h" -a $foundpcap = no ; then - LPCAPINC="${testdir}/include/pcap.h" - LPCAPINCDIR="${testdir}/include" -+ # If testdir/.. is a sysroot, then sDir should point to where the libraries are. -+ sDir=$(readlink -m ${testdir}/../${libdir}) - if test $dynamic_link = yes; then -- if test -f "${testdir}/lib64/libpcap${shrext_cmds}" ; then -+ if test -f "${sDir}/libpcap${shrext_cmds}" ; then -+ LPCAPLIB="-L${sDir} -lpcap" -+ elif test -f "${testdir}/lib64/libpcap${shrext_cmds}" ; then - LPCAPLIB="-L${testdir}/lib64 -lpcap" - elif test -f "${testdir}/lib/libpcap${shrext_cmds}" ; then - LPCAPLIB="-L${testdir}/lib -lpcap" - else - AC_ERROR([Unable to find libpcap in ${testdir}]) - fi -+ elif test -f "${sDir}/libpcap.${libext}" ; then -+ LPCAPLIB="${sDir}/libpcap.${libext}" - elif test -f "${testdir}/lib64/libpcap.${libext}" ; then - LPCAPLIB="${testdir}/lib64/libpcap.${libext}" - elif test -f "${testdir}/lib/libpcap.${libext}" ; then diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-no-bfp-support.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-no-bfp-support.patch deleted file mode 100644 index 3c11c922bdfc78f8f80a0bf8e7b268790456a65f..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/files/tcpreplay-3.4.4-no-bfp-support.patch +++ /dev/null @@ -1,15 +0,0 @@ -Uptream-Status: Pending - -Signed-off-by: Zongchun Yu - ---- a/configure.ac -+++ b/configure.ac -@@ -758,6 +758,8 @@ - AC_MSG_RESULT(no) - ]) - -+ac_cv_have_bpf=no -+ - have_bpf=no - dnl Check for BSD's BPF - AC_CACHE_CHECK([for BPF device sending support], ac_cv_have_bpf, diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_3.4.4.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_3.4.4.bb deleted file mode 100644 index ccbab9f088c423f0272fe25cbeb1cb022f02cfca..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_3.4.4.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Use previously captured traffic to test network devices" - -HOMEPAGE = "http://tcpreplay.synfin.net/" -SECTION = "net" - -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=c33cccf72cc1603e8a72a84811ae3ac8" - -SRC_URI = "http://prdownloads.sourceforge.net/tcpreplay/${PV}/tcpreplay-${PV}.tar.gz \ - file://tcpreplay-3.4.4-cross-compile.patch \ - file://tcpreplay-3.4.4-no-bfp-support.patch \ - file://tcpreplay-3.4.4-fix-unable-to-link-libpcap-issue.patch \ - file://tcpreplay-3.4.4-improve-search-for-libpcap.patch \ - " -SRC_URI[md5sum] = "22725feb9b2590809f9350308ec65180" -SRC_URI[sha256sum] = "7a809c58ddec86407fd6e5597ac883d7874a19bea81d716bb2b1c6e3b0e7b58f" - -DEPENDS = "libpcap" - -EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}/usr" - -inherit siteinfo autotools-brokensep - diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.1.1.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.1.1.bb new file mode 100644 index 0000000000000000000000000000000000000000..389d61b58848f9db30ca19ae48ae2a4d69a6506c --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.1.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "Use previously captured traffic to test network devices" + +HOMEPAGE = "http://tcpreplay.synfin.net/" +SECTION = "net" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=890b830b22fd632e9ffd996df20338f8" + +SRC_URI = "http://prdownloads.sourceforge.net/tcpreplay/${PV}/tcpreplay-${PV}.tar.gz \ + " +SRC_URI[md5sum] = "80394c33fe697b53b69eac9bb0968ae9" +SRC_URI[sha256sum] = "61b916ef91049cad2a9ddc8de6f5e3e3cc5d9998dbb644dc91cf3a798497ffe4" + +DEPENDS = "libpcap" + +EXTRA_OECONF += "--with-libpcap=${STAGING_DIR_HOST}/usr" + +inherit siteinfo autotools-brokensep + diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20130505.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20151004.bb similarity index 77% rename from import-layers/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20130505.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20151004.bb index 7d1c5152b23432bec0d02688d26aed0799078df8..8c2c111fd089af2512abd7850964e3d32725d951 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20130505.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/tnftp/tnftp_20151004.bb @@ -15,8 +15,8 @@ LICENSE = "BSD-4-Clause" DEPENDS = "ncurses" SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \ - file://tnftp-autotools.patch \ - " + file://tnftp-autotools.patch \ +" inherit autotools update-alternatives pkgconfig @@ -29,8 +29,11 @@ ALTERNATIVE_TARGET_${PN} = "${bindir}/tnftp" FILES_${PN} = "${bindir}/tnftp" LIC_FILES_CHKSUM = "file://COPYING;md5=6d6796cb166a9bb050958241dad9479e" -SRC_URI[md5sum] = "66e218d02ec7d9fc39ab70ba2900305a" -SRC_URI[sha256sum] = "6f650e25f6fd51538f677b789b49379f367ae9f1dee74c94cfe24d92abc2cffb" +SRC_URI[md5sum] = "a49fbe752318d5a7893f900046ea00d5" +SRC_URI[sha256sum] = "c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0" -PACKAGECONFIG ?= "openssl" +PACKAGECONFIG ?= "openssl \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ +" PACKAGECONFIG[openssl] = "--enable-ssl, --disable-ssl --with-ssl=no, openssl" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.0.21.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb similarity index 91% rename from import-layers/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.0.21.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb index 09da1ef573064138707f854aef67b7b0dedd2fd0..48a0c12795b32454373b06df1e5b7776ea195f1e 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.0.21.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.0.bb @@ -17,8 +17,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \ file://filter-out-the-patches-from-subdirs.patch \ " -SRC_URI[md5sum] = "79289adabd6f3ebf9160fc0815ab3150" -SRC_URI[sha256sum] = "f7ac93ef30b13a587292b8d6a7e2538a65bc978a3a576eab238c392b884e96e0" +SRC_URI[md5sum] = "84d329d67abc3fb83fc8cb12aeaddaba" +SRC_URI[sha256sum] = "3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6" EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}" diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl.inc b/import-layers/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl.inc index e95cfa523d78ca0ab6034c34e08f846f0c4b6f25..1c11823dd5bbf2d90857a817004226886fe8c8d3 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl.inc +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl.inc @@ -3,7 +3,9 @@ SECTION = "net" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://tunctl.c;beginline=1;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999" -SRC_URI = "${SOURCEFORGE_MIRROR}/tunctl/tunctl-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/tunctl/tunctl-${PV}.tar.gz \ + file://makefile-add-ldflags.patch \ + " do_compile() { oe_runmake tunctl diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch b/import-layers/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl/makefile-add-ldflags.patch new file mode 100644 index 0000000000000000000000000000000000000000..c96f538d2dd42e4e8049821b47cdac17e45cf82b --- /dev/null +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/tunctl/tunctl/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 a0aa7f6..d6ce2c7 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,7 +14,7 @@ MAN_DIR ?= /usr/share/man/man$(MANS) + all : $(BIN) $(MAN) + + $(BIN) : $(BIN).c +- $(CC) $(CFLAGS) -o $(BIN) $(BIN).c ++ $(CC) $(CFLAGS) ${LDFLAGS} -o $(BIN) $(BIN).c + + $(MAN) : $(PACKAGE).sgml + docbook2man $(PACKAGE).sgml diff --git a/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.0.2.bb b/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb similarity index 51% rename from import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.0.2.bb rename to import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb index f3061727f3f591e84f859c1963900998f329bd8c..a8f61fead23e7b101a81e65cfe0b1fbc23cf0e8a 100644 --- a/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.0.2.bb +++ b/import-layers/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_2.2.1.bb @@ -4,25 +4,20 @@ SECTION = "net" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://README.linux;md5=631e077455b7972172eb149195e065b0" -DEPENDS = "perl-native pcre expat glib-2.0 sbc" +DEPENDS = "pcre expat glib-2.0" SRC_URI = "https://2.na.dl.wireshark.org/src/all-versions/${BP}.tar.bz2" -SRC_URI[md5sum] = "204d053e0796c7da09292e0b54bc8503" -SRC_URI[sha256sum] = "e921fb072085a5654d899949bb561d0687f4819f7b63ba35777bb949a9b6b9c1" - PE = "1" +SRC_URI[md5sum] = "49a1023a69ac108ca089d750eee50e37" +SRC_URI[sha256sum] = "900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149" -inherit autotools pkgconfig +inherit autotools pkgconfig perlnative ARM_INSTRUCTION_SET = "arm" -# Works with either gtk+ or gtk3. -WHICH_GTK = "gtk+" - -PACKAGECONFIG ?= "libpcap gnutls libnl libcap" +PACKAGECONFIG ?= "libpcap gnutls libnl libcap sbc" PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk2 graphics", "", d)}" -PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}" #PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "gtk3", "", d)}" PACKAGECONFIG[libcap] = "--with-libcap=${STAGING_LIBDIR}, --with-libcap=no --enable-pcap-ng-default , libcap" @@ -30,10 +25,9 @@ PACKAGECONFIG[libpcap] = "--with-pcap=${STAGING_LIBDIR} --with-pcap-remote, --wi PACKAGECONFIG[libsmi] = "--with-libsmi=yes, --with-libsmi=no, libsmi" PACKAGECONFIG[libnl] = "--with-libnl=yes, --with-libnl=no, libnl" PACKAGECONFIG[portaudio] = "--with-portaudio=yes, --with-portaudio=no, portaudio-v19" -PACKAGECONFIG[gtk2] = "--with-gtk2=yes, --with-gtk2=no, gtk+" -PACKAGECONFIG[gtk3] = "--with-gtk3=yes, --with-gtk3=no, gtk+3" -PACKAGECONFIG[graphics] = "--enable-wireshark, --disable-wireshark," -PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6," +PACKAGECONFIG[gtk2] = "--with-gtk=2, , gtk+" +PACKAGECONFIG[gtk3] = "--with-gtk=3, , gtk+3" +PACKAGECONFIG[graphics] = "--enable-wireshark, --with-gtk=no --disable-wireshark," PACKAGECONFIG[gnutls] = "--with-gnutls=yes, --with-gnutls=no, gnutls" PACKAGECONFIG[gcrypt] = "--with-gcrypt=yes, --with-gcrypt=no, libgcrypt" PACKAGECONFIG[ssl] = "--with-ssl=yes, --with-ssl=no, openssl" @@ -42,19 +36,35 @@ PACKAGECONFIG[lua] = "--with-lua=yes, --with-lua=no, lua" PACKAGECONFIG[zlib] = "--with-zlib=yes, --with-zlib=no, zlib" 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" + # these next two options require addional layers -PACKAGECONFIG[adns] = "--with-adns=yes, --with-adns=no, adns" PACKAGECONFIG[c-ares] = "--with-c-ares=yes, --with-c-ares=no, c-ares" -EXTRA_OECONF += "--with-qt=no --enable-usr-local=no --enable-tshark --enable-rawshark" +EXTRA_OECONF += "--with-qt=no --enable-tshark --enable-rawshark" -do_configure_prepend() { - # force to use fallback - sed -i -e '/^glib_prefix/s/=.*$/=""/' ${S}/aclocal-flags -} +# Currently wireshark does not install header files +do_install_append () { + + install -d ${D}/${includedir}/${BPN} + install -d ${D}/${includedir}/${BPN}/epan + install -d ${D}/${includedir}/${BPN}/epan/crypt + install -d ${D}/${includedir}/${BPN}/epan/dfilter + install -d ${D}/${includedir}/${BPN}/epan/dissectors + install -d ${D}/${includedir}/${BPN}/epan/ftypes + install -d ${D}/${includedir}/${BPN}/epan/wmem -ALLOW_EMPTY_${PN} = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + install config.h ${D}/${includedir}/${BPN} + install ${S}/register.h ${D}/${includedir}/${BPN} + install -D ${S}/epan/*.h ${D}/${includedir}/${BPN}/epan + install -D ${S}/epan/crypt/*.h ${D}/${includedir}/${BPN}/epan/crypt + install -D ${S}/epan/dfilter/*.h ${D}/${includedir}/${BPN}/epan/dfilter + install -D ${S}/epan/dissectors/*.h ${D}/${includedir}/${BPN}/epan/dissectors + install -D ${S}/epan/ftypes/*.h ${D}/${includedir}/${BPN}/epan/ftypes + install -D ${S}/epan/wmem/*.h ${D}/${includedir}/${BPN}/epan/wmem +} FILES_${PN} += "${datadir}*" diff --git a/import-layers/meta-openembedded/meta-oe/README b/import-layers/meta-openembedded/meta-oe/README index a564c29df122964a89bfd441116a8d06a43b7398..a4fc10e792c41d82d72c989d9008ecc288b945e0 100644 --- a/import-layers/meta-openembedded/meta-oe/README +++ b/import-layers/meta-openembedded/meta-oe/README @@ -1,15 +1,16 @@ This layer depends on: URI: git://github.com/openembedded/oe-core.git -branch: krogoth +branch: morty revision: HEAD -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe][krogoth]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe]' in the subject' When sending single patches, please use something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-oe][krogoth][PATCH' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-oe][morty][PATCH' You are encouraged to fork the mirror on github https://github.com/openembedded/meta-oe/ to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like gitorious, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch ' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -krogoth Branch Maintainer: +morty branch maintainer(s): Armin Kuster + diff --git a/import-layers/meta-openembedded/meta-oe/classes/gitpkgv.bbclass b/import-layers/meta-openembedded/meta-oe/classes/gitpkgv.bbclass index 1cba00ca4d425fb19ee5bec40d36ca2c747a63be..8cd4bfd1ed71ce23847262ba0929dd5fd8de6cc6 100644 --- a/import-layers/meta-openembedded/meta-oe/classes/gitpkgv.bbclass +++ b/import-layers/meta-openembedded/meta-oe/classes/gitpkgv.bbclass @@ -61,7 +61,14 @@ def get_git_pkgv(d, use_tags): # format = d.getVar('SRCREV_FORMAT', True) if not format: - format = 'default' + names = [] + for url in ud.values(): + if url.type == 'git' or url.type == 'gitsm': + names.extend(url.revisions.keys()) + if len(names) > 0: + format = '_'.join(names) + else: + format = 'default' found = False for url in ud.values(): @@ -87,11 +94,13 @@ def get_git_pkgv(d, use_tags): if commits != "": oe.path.remove(rev_file, recurse=False) - open(rev_file, "w").write("%d\n" % int(commits)) + with open(rev_file, "w") as f: + f.write("%d\n" % int(commits)) else: commits = "0" else: - commits = open(rev_file, "r").readline(128).strip() + with open(rev_file, "r") as f: + commits = f.readline(128).strip() if use_tags: try: diff --git a/import-layers/meta-openembedded/meta-oe/conf/distro/include/meta_oe_security_flags.inc b/import-layers/meta-openembedded/meta-oe/conf/distro/include/meta_oe_security_flags.inc index 2565e32adf1178ba5d2de7f8985290fa6701b62d..25599487d6937c1abf122f495c0cee225b054d3b 100644 --- a/import-layers/meta-openembedded/meta-oe/conf/distro/include/meta_oe_security_flags.inc +++ b/import-layers/meta-openembedded/meta-oe/conf/distro/include/meta_oe_security_flags.inc @@ -3,5 +3,12 @@ SECURITY_CFLAGS_pn-lvm2 = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-rrdtool = "${SECURITY_NO_PIE_CFLAGS}" # This has text reloc errors with the pie options enabled +SECURITY_CFLAGS_pn-llvm3.3 = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-mozjs = "${SECURITY_NO_PIE_CFLAGS}" SECURITY_CFLAGS_pn-openldap = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-s3c64xx-gpio = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-s3c24xx-gpio = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-cpufrequtils = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-libcec = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-libmodplug = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS_pn-libcdio = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/import-layers/meta-openembedded/meta-oe/conf/layer.conf b/import-layers/meta-openembedded/meta-oe/conf/layer.conf index a67cc1a19d2c55f1b3f017e5decba50ece1cb1f9..bdc821006d317db905c1486619f430ea1c404040 100644 --- a/import-layers/meta-openembedded/meta-oe/conf/layer.conf +++ b/import-layers/meta-openembedded/meta-oe/conf/layer.conf @@ -37,6 +37,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \ gpsd-machine-conf \ distro-feed-configs \ ca-certificates \ + pointercal \ " SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ @@ -50,6 +51,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ # ttf.inc inherits fontcache which adds fontconfig-utils to RDEPENDS SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ terminus-font->fontconfig \ + ttf-abyssinica->fontconfig \ ttf-arphic-uming->fontconfig \ ttf-dejavu->fontconfig \ ttf-droid->fontconfig \ @@ -57,11 +59,15 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ ttf-hunkyfonts->fontconfig \ ttf-inconsolata->fontconfig \ ttf-liberation->fontconfig \ + ttf-liberation-sans-narrow->fontconfig \ + ttf-lklug->fontconfig \ + ttf-lohit->fontconfig \ ttf-pt-sans->fontconfig \ ttf-mplus->fontconfig \ ttf-sazanami->fontconfig \ ttf-tlwg->fontconfig \ ttf-ubuntu-font-family->fontconfig \ + ttf-vlgothic->fontconfig \ ttf-wqy-zenhei->fontconfig \ source-han-sans-cn-fonts->fontconfig \ source-han-sans-jp-fonts->fontconfig \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_git.bb index d97ff0a5bdd272837a6f70e2750b20daaf8ea91c..8888b226780be83e9edd22a344c2ffe1a5752f4e 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_git.bb @@ -17,13 +17,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" RDEPENDS_${PN} += "python-core python-datetime python-stringold" PV = "3.2+gitr${SRCPV}" -SRCREV = "bce3cbec43bc2ce7a8c79b210314dd9d9ac1010b" +SRCREV = "c669e002a2e7504f21e277ad248fa81033926391" SRC_URI = "git://github.com/01org/suspendresume.git;protocol=https" S = "${WORKDIR}/git" do_install() { - install -Dm 0755 analyze_suspend.py ${D}${bindir}/analyze_suspend.py - install -Dm 0644 README ${D}${docdir}/analyze-suspend/README + install -Dm 0755 analyze_suspend.py ${D}${bindir}/analyze_suspend.py + install -Dm 0644 README ${D}${docdir}/analyze-suspend/README } BBCLASSEXTEND = "native" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_2.2.6.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_2.9.bb similarity index 95% rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_2.2.6.bb rename to import-layers/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_2.9.bb index db6717300768c7ec88501162564172d7488ebf31..67b513fa0b7a189fd955336d8afb6472f3977017 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_2.2.6.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_2.9.bb @@ -19,8 +19,8 @@ PACKAGECONFIG_NUMA_arm = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -# rev for v2.2.6 -SRCREV = "f52c9691bc8c285f3445235c69acdfd6de7f9b82" +# rev for v2.9 +SRCREV = "fe8d0f4c54f0c308c9a02a4e3c2f5084e8bf5461" SRC_URI = "git://git.kernel.dk/fio.git" S = "${WORKDIR}/git" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-build-error-due-missing-space-before-macro.patch b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-build-error-due-missing-space-before-macro.patch new file mode 100644 index 0000000000000000000000000000000000000000..00eb2ed7339125cbb0ec13fe9a62bf7ad7271705 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-build-error-due-missing-space-before-macro.patch @@ -0,0 +1,27 @@ +From 3fb9b6aeed2e2758239e59ba9ba1ca98535fe510 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Fri, 19 Aug 2016 15:08:44 +0000 +Subject: [PATCH] Fix build error due missing space before macro +Organization: O.S. Systems Software LTDA. + +Signed-off-by: Otavio Salvador +--- + src/native-state-x11.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/native-state-x11.cpp b/src/native-state-x11.cpp +index 3b66b77..3c1703b 100644 +--- a/src/native-state-x11.cpp ++++ b/src/native-state-x11.cpp +@@ -60,7 +60,7 @@ NativeStateX11::display() + bool + NativeStateX11::create_window(WindowProperties const& properties) + { +- static const char *win_name("glmark2 "GLMARK_VERSION); ++ static const char *win_name("glmark2 " GLMARK_VERSION); + + if (!xdpy_) { + Log::error("Error: X11 Display has not been initialized!\n"); +-- +2.1.4 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch new file mode 100644 index 0000000000000000000000000000000000000000..fde82381d5bcb997d9b9cdfe3fa6ec5fb901c0a8 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch @@ -0,0 +1,13 @@ +Index: git/wscript +=================================================================== +--- git.orig/wscript 2016-07-29 13:15:44.954249796 -0500 ++++ git/wscript 2016-07-29 15:52:06.196768865 -0500 +@@ -90,7 +90,7 @@ + ctx.check_cxx(lib = lib, uselib_store = uselib) + + # Check required functions +- req_funcs = [('memset', 'string.h', []) ,('sqrt', 'math.h', ['m'])] ++ req_funcs = [('memset', 'string.h', [])] + for func, header, uselib in req_funcs: + ctx.check_cxx(function_name = func, header_name = header, + uselib = uselib, mandatory = True) diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-deprecated-declarations.patch b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-deprecated-declarations.patch new file mode 100644 index 0000000000000000000000000000000000000000..7a25de7908fae3fa6011eb876bc7262798c79b51 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-deprecated-declarations.patch @@ -0,0 +1,61 @@ +Index: git/src/image-reader.cpp +=================================================================== +--- git.orig/src/image-reader.cpp 2016-07-29 16:17:51.000000000 -0500 ++++ git/src/image-reader.cpp 2016-07-29 16:18:43.000000000 -0500 +@@ -120,7 +120,7 @@ + + Log::debug("Reading PNG file %s\n", filename.c_str()); + +- const std::auto_ptr is_ptr(Util::get_resource(filename)); ++ const std::unique_ptr is_ptr(Util::get_resource(filename)); + if (!(*is_ptr)) { + Log::error("Cannot open file %s!\n", filename.c_str()); + return false; +Index: git/src/libmatrix/shader-source.cc +=================================================================== +--- git.orig/src/libmatrix/shader-source.cc 2016-07-29 16:18:14.000000000 -0500 ++++ git/src/libmatrix/shader-source.cc 2016-07-29 16:18:43.000000000 -0500 +@@ -34,7 +34,7 @@ + bool + ShaderSource::load_file(const std::string& filename, std::string& str) + { +- std::auto_ptr is_ptr(Util::get_resource(filename)); ++ std::unique_ptr is_ptr(Util::get_resource(filename)); + std::istream& inputFile(*is_ptr); + + if (!inputFile) +Index: git/src/model.cpp +=================================================================== +--- git.orig/src/model.cpp 2016-07-29 16:18:00.000000000 -0500 ++++ git/src/model.cpp 2016-07-29 16:18:43.000000000 -0500 +@@ -361,7 +361,7 @@ + + Log::debug("Loading model from 3ds file '%s'\n", filename.c_str()); + +- const std::auto_ptr input_file_ptr(Util::get_resource(filename)); ++ const std::unique_ptr input_file_ptr(Util::get_resource(filename)); + std::istream& input_file(*input_file_ptr); + + if (!input_file) { +@@ -681,7 +681,7 @@ + { + Log::debug("Loading model from obj file '%s'\n", filename.c_str()); + +- const std::auto_ptr input_file_ptr(Util::get_resource(filename)); ++ const std::unique_ptr input_file_ptr(Util::get_resource(filename)); + std::istream& inputFile(*input_file_ptr); + if (!inputFile) + { +Index: git/src/scene-jellyfish.cpp +=================================================================== +--- git.orig/src/scene-jellyfish.cpp 2016-07-29 16:18:08.000000000 -0500 ++++ git/src/scene-jellyfish.cpp 2016-07-29 16:18:43.000000000 -0500 +@@ -272,7 +272,7 @@ + { + Log::debug("Loading model from file '%s'\n", filename.c_str()); + +- const std::auto_ptr input_file_ptr(Util::get_resource(filename)); ++ const std::unique_ptr input_file_ptr(Util::get_resource(filename)); + std::istream& inputFile(*input_file_ptr); + if (!inputFile) + { diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index e29921b52579380de3b943caed89be8b17b43202..a2558a72a09ef28430567c120d612a870354ea54 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -14,7 +14,10 @@ PV = "2014.03+${SRCPV}" SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \ - file://0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch" + file://0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch \ + file://Fix-build-error-due-missing-space-before-macro.patch \ + file://Fix-configure-for-sqrt-check.patch \ + file://Fix-deprecated-declarations.patch" SRCREV = "fa71af2dfab711fac87b9504b6fc9862f44bf72a" S = "${WORKDIR}/git" @@ -25,6 +28,9 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gl ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gl wayland-gles2', '', d)} \ drm-gl drm-gles2" +# Enable C++11 features +CXXFLAGS += "-std=c++11" + PACKAGECONFIG[x11-gl] = ",,virtual/libgl virtual/libx11" PACKAGECONFIG[x11-gles2] = ",,virtual/libgles2 virtual/libx11" PACKAGECONFIG[drm-gl] = ",,virtual/libgl libdrm" @@ -50,3 +56,4 @@ python __anonymous() { if flavors: d.appendVar("EXTRA_OECONF", " --with-flavors=%s" % ",".join(flavors)) } + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_414.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_434.bb similarity index 95% rename from import-layers/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_414.bb rename to import-layers/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_434.bb index 14373b9e0189fc9b468765401b82e595b70beb93..daa36ee0b8be2de21d9356480fc34cbb5e3b289d 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_414.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_434.bb @@ -3,13 +3,13 @@ HOMEPAGE = "http://www.iozone.org/" AUTHOR = "Don Capps , William D. Norcott " SECTION = "console/tests" LICENSE = "iozone3" -LIC_FILES_CHKSUM = "file://iozone.c;beginline=266;endline=270;md5=ab42a6185fd0443978871f11a007ac0b" +LIC_FILES_CHKSUM = "file://iozone.c;beginline=268;endline=272;md5=ab42a6185fd0443978871f11a007ac0b" SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ file://copyright.txt \ " -SRC_URI[md5sum] = "a40dcda593f5841d0aaffe9f21172020" -SRC_URI[sha256sum] = "9f60e854d7bc5bc3de15355cf5621e15098bd744a26845d11730b3060f4a5fff" +SRC_URI[md5sum] = "3e8f4213581407225065b91774e970ed" +SRC_URI[sha256sum] = "2c388d9db393a5505b31eca38951883744c69745f687f3c7df5185b4681d462a" S = "${WORKDIR}/${BPN}_${PV}/src/current/" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch new file mode 100644 index 0000000000000000000000000000000000000000..348e316ce46ce91f5894a8f2181047e9e61f5143 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch @@ -0,0 +1,16 @@ +--- iperf-2.0.5/m4/dast.m4.orig 2016-06-15 11:42:03.945581785 -0400 ++++ iperf-2.0.5/m4/dast.m4 2016-06-15 11:42:11.053581641 -0400 +@@ -11,7 +11,12 @@ + + AC_DEFUN(DAST_CHECK_BOOL, [ + +-AC_CHECK_SIZEOF(bool) ++if test "$ac_cv_header_stdbool_h" = yes; then ++ AC_CHECK_SIZEOF(bool,,[#include ]) ++else ++ AC_CHECK_SIZEOF(bool) ++fi ++ + if test "$ac_cv_sizeof_bool" = 0 ; then + AC_DEFINE(bool, int) + fi diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb index 4e667928fe3734a1ade3aba3d6c4839d9e0c20f7..9981d8275f25971f706c8233b47f05859fe157d0 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e8478eae9f479e39bc34975193360298" SRC_URI = " ${SOURCEFORGE_MIRROR}/iperf/${BP}.tar.gz \ file://iperf-2.0.5_ManPage.patch \ file://0001-fix-out-of-tree-config.patch \ + file://0002-fix-bool-size-m4.patch \ " SRC_URI[md5sum] = "44b5536b67719f4250faed632a3cd016" @@ -17,3 +18,6 @@ S = "${WORKDIR}/${BP}" inherit autotools pkgconfig EXTRA_OECONF = "--exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb index 4a0f28ec71cad08587d1acb41a7bcce06afc7c42..bcf65374ac34a48658b27ac80f2bce53c83e08bd 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_git.bb @@ -9,15 +9,15 @@ SECTION = "console/network" BUGTRACKER = "https://github.com/esnet/iperf/issues" AUTHOR = "ESNET , Lawrence Berkeley National Laboratory " LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=062ab1bc33fae1926387ac1274cb0873" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3434c5a9a53c78c7739f0bc9e5adda" SRC_URI = "\ git://github.com/esnet/iperf.git \ file://automake-foreign.patch \ " -PV = "3.1+gitr${SRCPV}" -SRCREV = "e396134952a01199326665d1df7c51ae9e62e945" +PV = "3.1.2+gitr${SRCPV}" +SRCREV = "4fbdab392caf6fcd77c538b6712b721a56ff31b8" S = "${WORKDIR}/git" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch new file mode 100644 index 0000000000000000000000000000000000000000..ce6974d7c1e44fec5039b09c1d70865ca6ad5abe --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch @@ -0,0 +1,92 @@ +From 3c6f8d0e3c0694f79244ec6ad5ad9ba3ca26bc0a Mon Sep 17 00:00:00 2001 +From: Yang Shi +Date: Mon, 7 Dec 2015 14:12:13 -0800 +Subject: [PATCH] Force text segment alignment to 0x08000000 for i386 with gold + linker + +Upstream-Status: Backport + +When build libhugetlbfs tests with gold linker for i386, the below error occurs: + +i586-oe-linux-gcc -m32 -march=i586 -Wl,-O1 -Wl,--hash-style=gnu +-Wl,--as-needed +--sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86 -I.. +-O2 +-Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c +| i586-oe-linux-gcc -m32 -march=i586 -Wl,-O1 -Wl,--hash-style=gnu +-Wl,--as-needed +--sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86 +-B./obj32 +-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,noexecstack -ldl +-L../obj32 +-o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl -lhugetlbfs_privutils +-Wl,--hugetlbfs-align obj32/linkhuge_rw.o obj32/testutils.o +| i586-oe-linux-ld: internal error in do_write, at +/home/jenkins/oe/world/shr-core/tmp-glibc/work/x86_64-oe-linux/binutils-cross-i586/2.25-r0/git/gold/output.cc:464 +| collect2: error: ld returned 1 exit status + +But, it works well with GNU linker. --hugetlbfs-align flag passes +"-zcommon-page-size=$SLICE_SIZE -zmax-page-size=$SLICE_SIZE", that are supported by gold linker too. +But, it looks gold linker deal with them in a different way from gnu linker for i586. + +The readelf shows the below result with GNU linker: + +Elf file type is EXEC (Executable file) +Entry point 0x8048fbd +There are 8 program headers, starting at offset 52 + +Program Headers: + Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align + PHDR 0x000034 0x08000034 0x08000034 0x00100 0x00100 R E 0x4 + INTERP 0x048134 0x08048134 0x08048134 0x00013 0x00013 R 0x1 + [Requesting program interpreter: /lib/ld-linux.so.2] + LOAD 0x000000 0x08000000 0x08000000 0x5a5bc 0x5a5bc R E 0x400000 + LOAD 0x05a5bc 0x0845a5bc 0x0845a5bc 0x1028c 0x202cc RW 0x400000 + DYNAMIC 0x05a5d0 0x0845a5d0 0x0845a5d0 0x000e8 0x000e8 RW 0x4 + NOTE 0x048148 0x08048148 0x08048148 0x00044 0x00044 R 0x4 + GNU_EH_FRAME 0x059e5c 0x08059e5c 0x08059e5c 0x0009c 0x0009c R 0x4 + GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10 + +"--relax" linker option doesn't solve this problem. +Forced textsegment alignment to 0x08000000 with gold linker, the build will pass and +readelf shows the same result with GNU linker: + +Elf file type is EXEC (Executable file) +Entry point 0x8048fbd +There are 8 program headers, starting at offset 52 + +Program Headers: + Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align + PHDR 0x000034 0x08000034 0x08000034 0x00100 0x00100 R E 0x4 + INTERP 0x048134 0x08048134 0x08048134 0x00013 0x00013 R 0x1 + [Requesting program interpreter: /lib/ld-linux.so.2] + LOAD 0x000000 0x08000000 0x08000000 0x5a5bc 0x5a5bc R E 0x400000 + LOAD 0x05a5bc 0x0845a5bc 0x0845a5bc 0x1028c 0x202cc RW 0x400000 + DYNAMIC 0x05a5d0 0x0845a5d0 0x0845a5d0 0x000e8 0x000e8 RW 0x4 + NOTE 0x048148 0x08048148 0x08048148 0x00044 0x00044 R 0x4 + GNU_EH_FRAME 0x059e5c 0x08059e5c 0x08059e5c 0x0009c 0x0009c R 0x4 + GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10 + +The fix just have impact on hugelink_rw test case, which needs --hugetlbfs-align flag. + +Signed-off-by: Yang Shi +Signed-off-by: Eric B Munson +--- + ld.hugetlbfs | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ld.hugetlbfs b/ld.hugetlbfs +index 4417442..32bc6fb 100755 +--- a/ld.hugetlbfs ++++ b/ld.hugetlbfs +@@ -98,6 +98,7 @@ if [ "$HTLB_ALIGN" == "slice" ]; then + # otherwise it will be NULL. + case "$EMU" in + armelf*_linux_eabi) HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE" ;; ++ elf_i386) HTLBOPTS="$HTLBOPTS -Ttext-segment=0x08000000" ;; + esac + fi + +-- +2.0.2 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index 015d4463a5330921fa4fa6c577bd255b1335c216..301b5505d9bc068c89dadf8e511da98c5a331dbc 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "sysfsutils perl" -RDEPENDS_${PN} += "bash perl python python-io python-lang python-subprocess python-resource" +RDEPENDS_${PN} += "bash perl python python-io python-lang python-subprocess python-resource ${PN}-perl" RDEPENDS_${PN}-tests += "bash" PV = "2.19" @@ -19,11 +19,12 @@ SRC_URI = " \ file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \ file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \ file://libhugetlbfs-avoid-using-restrict-as-var-name.patch \ + file://Force-text-segment-alignment-to-0x08000000-for-i386-.patch \ " S = "${WORKDIR}/git" -COMPATIBLE_HOST = "(x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" +COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" LIBARGS = "LIB32=${baselib} LIB64=${baselib}" LIBHUGETLBFS_ARCH = "${TARGET_ARCH}" @@ -36,6 +37,7 @@ CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -g0 TARGET_CC_ARCH += "${LDFLAGS}" #The CUSTOM_LDSCRIPTS doesn't work with the gold linker +inherit cpan-base do_configure() { if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile @@ -43,6 +45,11 @@ do_configure() { # fixup perl module directory hardcoded to perl5 sed -i 's/perl5/perl/g' Makefile + + # fixup to install perl module under $(LIBDIR)/perl/${@get_perl_version(d)}/TLBC + # to avoid below error + # Can't locate TLBC/OpCollect.pm in @INC + sed -i '/^PMDIR/ s:perl:perl/${@get_perl_version(d)}:g' Makefile } do_install() { diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index a62389d0941e601e784beb0cc04774ad7c1ad381..62906fd68f9725acc024ccbae6ccb6566a24fa69 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -32,7 +32,9 @@ do_configure() { } do_compile () { - . ${CONFIG_SITE} + for CONFIG_SITE_ITEM in $CONFIG_SITE; do + . $CONFIG_SITE_ITEM + done if [ X"$ac_cv_uint" = X"yes" ]; then CFLAGS="${CFLAGS} -DHAVE_uint" fi diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb index 5acfbf1bb5503b4ccd34a6f7ebffcb05f41c0a42..aab64a354dadd1ff7e17e0fc3937f8b2b1741b5e 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_6.0.1.bb @@ -13,23 +13,23 @@ S = "${WORKDIR}/phoronix-test-suite" inherit systemd allarch do_install() { - DESTDIR=${D} ./install-sh ${exec_prefix} + DESTDIR=${D} ./install-sh ${exec_prefix} - if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then - install -d ${D}/${systemd_unitdir}/system/ - mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/ - rm -rf ${D}/usr/lib/ - fi + if [ "${systemd_unitdir}" != "/usr/lib/systemd" ]; then + install -d ${D}/${systemd_unitdir}/system/ + mv ${D}/usr/lib/systemd/system/* ${D}/${systemd_unitdir}/system/ + rm -rf ${D}/usr/lib/ + fi } SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service" RDEPENDS_${PN} += "bash python php-cli" FILES_${PN} += " \ - ${datadir}/phoronix-test-suite \ - ${datadir}/appdata/phoronix-test-suite.appdata.xml \ - ${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \ - ${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \ - ${datadir}/mime/packages/openbenchmarking-mime.xml \ - ${systemd_unitdir}/* \ + ${datadir}/phoronix-test-suite \ + ${datadir}/appdata/phoronix-test-suite.appdata.xml \ + ${datadir}/icons/hicolor/48x48/apps/phoronix-test-suite.png \ + ${datadir}/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png \ + ${datadir}/mime/packages/openbenchmarking-mime.xml \ + ${systemd_unitdir}/* \ " diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb new file mode 100644 index 0000000000000000000000000000000000000000..fdf54e3b1f795e2193a5fadff44789217207fb23 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb @@ -0,0 +1,26 @@ +SUMMARY = "System performance benchmark" +HOMEPAGE = "http://github.com/akopytov/sysbench" +SECTION = "console/tests" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit autotools + +# The project has moved from Sourceforge to Launchpad, to Github. Use the source tarball from +# Launchpad until the next release is available from Github. +SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/${BPN}_${PV}.orig.tar.gz" + +SRC_URI[md5sum] = "3a6d54fdd3fe002328e4458206392b9d" +SRC_URI[sha256sum] = "83fa7464193e012c91254e595a89894d8e35b4a38324b52a5974777e3823ea9e" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)}" +PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," +PACKAGECONFIG[aio] = "--enable-aio,--disable-aio,libaio," +PACKAGECONFIG[mysql] = "--with-mysql \ + --with-mysql-includes=${STAGING_INCDIR}/mysql \ + --with-mysql-libs=${STAGING_LIBDIR}, \ + --without-mysql,mysql5" + +do_configure_prepend() { + touch ${S}/NEWS ${S}/AUTHORS +} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb index 9898a70c2ce36e419899a2e5a6a10f9dfb244e5b..38e71be52e5c602d6ec342d56bd6c499399a9b73 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb @@ -6,9 +6,9 @@ HOMEPAGE = "https://github.com/ssvb/tinymembench/wiki" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://main.c;endline=22;md5=879b9bbb60851454885b5fa47eb6b345" -PV = "0.3.9+git${SRCPV}" +PV = "0.4.0+git${SRCPV}" -SRCREV = "95e68477588d41187b2d2e52ecf6be0e7eb06b8d" +SRCREV = "2c789849709d837b4bd114c11ed2d9bdc65afbc6" SRC_URI = "git://github.com/ssvb/tinymembench.git" S = "${WORKDIR}/git" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/COPYING b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/COPYING new file mode 100644 index 0000000000000000000000000000000000000000..63f529381094e41704605f1370ceec462504e6b3 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/COPYING @@ -0,0 +1,2 @@ +This is a blank COPYING file, and should be filled in by original author in future. + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/pointercal b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/pointercal new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarm/pointercal b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarm/pointercal new file mode 100644 index 0000000000000000000000000000000000000000..abd84ca4b501fd3477d24d7f5fca4a292ba7a6d0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarm/pointercal @@ -0,0 +1 @@ +8313 4 -8526 7 8334 -82604 65536 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal new file mode 100644 index 0000000000000000000000000000000000000000..abd84ca4b501fd3477d24d7f5fca4a292ba7a6d0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv6/pointercal @@ -0,0 +1 @@ +8313 4 -8526 7 8334 -82604 65536 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal new file mode 100644 index 0000000000000000000000000000000000000000..abd84ca4b501fd3477d24d7f5fca4a292ba7a6d0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuarmv7/pointercal @@ -0,0 +1 @@ +8313 4 -8526 7 8334 -82604 65536 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemumips/pointercal b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemumips/pointercal new file mode 100644 index 0000000000000000000000000000000000000000..abd84ca4b501fd3477d24d7f5fca4a292ba7a6d0 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemumips/pointercal @@ -0,0 +1 @@ +8313 4 -8526 7 8334 -82604 65536 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuppc/pointercal b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuppc/pointercal new file mode 100644 index 0000000000000000000000000000000000000000..c2d6e37bf0c0d956ba17ba9955613c4cee5a147a Binary files /dev/null and b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemuppc/pointercal differ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal new file mode 100644 index 0000000000000000000000000000000000000000..640053d393c257f89356e0afb793633ea889e877 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86-64/pointercal @@ -0,0 +1 @@ +1280 0 1002 0 960 328 65536 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86/pointercal b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86/pointercal new file mode 100644 index 0000000000000000000000000000000000000000..640053d393c257f89356e0afb793633ea889e877 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal/qemux86/pointercal @@ -0,0 +1 @@ +1280 0 1002 0 960 328 65536 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb new file mode 100644 index 0000000000000000000000000000000000000000..fcfd0386d9fa03b1d3d10648e7cfe1e364839d21 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "Touchscreen calibration data" +SECTION = "base" +PR = "r11" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=4b5fcfc87fb615860d398b5e38685edf" + +SRC_URI = "file://pointercal \ + file://COPYING" + +S = "${WORKDIR}" + +do_install() { + # Only install file if it has a contents + if [ -s ${S}/pointercal ]; then + install -d ${D}${sysconfdir}/ + install -m 0644 ${S}/pointercal ${D}${sysconfdir}/ + fi +} + +ALLOW_EMPTY_${PN} = "1" +PACKAGE_ARCH = "${MACHINE_ARCH}" +INHIBIT_DEFAULT_DEPS = "1" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb index f33b43507a3b643fc9da48ea52bc563336a7d39e..44411751e0efde74da15a4b7683f22cd5570c26f 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb @@ -1,6 +1,6 @@ SUMMARY = "GNU All Mobile Managment Utilities" SECTION = "console/network" -DEPENDS = "cmake-native virtual/libiconv libdbi mysql5 glib-2.0 udev libgudev" +DEPENDS = "cmake-native virtual/libiconv libdbi mysql5 glib-2.0 udev libgudev unixodbc" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf" HOMEPAGE = "http://www.gammu.org/" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb index cfd794de5e07e2f52a3d007466dccb1196c2a2d8..2de547a7096db40867cc208ad6382029b3564750 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" SRC_URI = "http://www.gnokii.org/download/gnokii/gnokii-${PV}.tar.bz2" -DEPENDS = "glib-2.0" +DEPENDS = "glib-2.0 intltool-native" X11DEPENDS = " libxpm gtk+" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" @@ -24,8 +24,9 @@ EXTRA_OECONF = "--disable-smsd" FILES_${PN} = "${bindir} ${sbindir}" FILES_libgnokii-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ - /lib/*.a /lib/*.o ${datadir}/aclocal" + ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig \ + /lib/*.a /lib/*.o ${datadir}/aclocal \ +" FILES_${PN}-dev = "" FILES_libgnokii = "${libdir}/libgnokii.so.*" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-WPS-Reject-a-Credential-with-invalid-passphrase.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-WPS-Reject-a-Credential-with-invalid-passphrase.patch new file mode 100644 index 0000000000000000000000000000000000000000..2fc78968a7be2ccc464e6a09f398482e684395fd --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd/0001-WPS-Reject-a-Credential-with-invalid-passphrase.patch @@ -0,0 +1,86 @@ +From ecbb0b3dc122b0d290987cf9c84010bbe53e1022 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Fri, 4 Mar 2016 17:20:18 +0200 +Subject: [PATCH 1/1] WPS: Reject a Credential with invalid passphrase + +WPA/WPA2-Personal passphrase is not allowed to include control +characters. Reject a Credential received from a WPS Registrar both as +STA (Credential) and AP (AP Settings) if the credential is for WPAPSK or +WPA2PSK authentication type and includes an invalid passphrase. + +This fixes an issue where hostapd or wpa_supplicant could have updated +the configuration file PSK/passphrase parameter with arbitrary data from +an external device (Registrar) that may not be fully trusted. Should +such data include a newline character, the resulting configuration file +could become invalid and fail to be parsed. + +Upstream-Status: Backport + +CVE: CVE-2016-4476 + +Signed-off-by: Jouni Malinen +Signed-off-by: Zhixiong Chi +--- + src/utils/common.c | 12 ++++++++++++ + src/utils/common.h | 1 + + src/wps/wps_attr_process.c | 10 ++++++++++ + 3 files changed, 23 insertions(+) + +diff --git a/src/utils/common.c b/src/utils/common.c +index 450e2c6..27b7c02 100644 +--- a/src/utils/common.c ++++ b/src/utils/common.c +@@ -697,6 +697,18 @@ int is_hex(const u8 *data, size_t len) + } + + ++int has_ctrl_char(const u8 *data, size_t len) ++{ ++ size_t i; ++ ++ for (i = 0; i < len; i++) { ++ if (data[i] < 32 || data[i] == 127) ++ return 1; ++ } ++ return 0; ++} ++ ++ + size_t merge_byte_arrays(u8 *res, size_t res_len, + const u8 *src1, size_t src1_len, + const u8 *src2, size_t src2_len) +diff --git a/src/utils/common.h b/src/utils/common.h +index 701dbb2..a972240 100644 +--- a/src/utils/common.h ++++ b/src/utils/common.h +@@ -488,6 +488,7 @@ const char * wpa_ssid_txt(const u8 *ssid, size_t ssid_len); + + char * wpa_config_parse_string(const char *value, size_t *len); + int is_hex(const u8 *data, size_t len); ++int has_ctrl_char(const u8 *data, size_t len); + size_t merge_byte_arrays(u8 *res, size_t res_len, + const u8 *src1, size_t src1_len, + const u8 *src2, size_t src2_len); +diff --git a/src/wps/wps_attr_process.c b/src/wps/wps_attr_process.c +index eadb22f..e8c4579 100644 +--- a/src/wps/wps_attr_process.c ++++ b/src/wps/wps_attr_process.c +@@ -229,6 +229,16 @@ static int wps_workaround_cred_key(struct wps_credential *cred) + cred->key_len--; + #endif /* CONFIG_WPS_STRICT */ + } ++ ++ ++ if (cred->auth_type & (WPS_AUTH_WPAPSK | WPS_AUTH_WPA2PSK) && ++ (cred->key_len < 8 || has_ctrl_char(cred->key, cred->key_len))) { ++ wpa_printf(MSG_INFO, "WPS: Reject credential with invalid WPA/WPA2-Personal passphrase"); ++ wpa_hexdump_ascii_key(MSG_INFO, "WPS: Network Key", ++ cred->key, cred->key_len); ++ return -1; ++ } ++ + return 0; + } + +-- +1.9.1 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.5.bb index c38e20a723a536515af5e8ef0b40704ca9a43c0e..ab01235ec9130aaf9cb3c977b72957557c5467eb 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.5.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.5.bb @@ -16,6 +16,7 @@ SRC_URI = " \ file://defconfig \ file://init \ file://hostapd.service \ + file://0001-WPS-Reject-a-Credential-with-invalid-passphrase.patch \ " S = "${WORKDIR}/hostapd-${PV}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/Fix-IAKERB-context-aliasing-bugs-CVE-2015-2696.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/Fix-IAKERB-context-aliasing-bugs-CVE-2015-2696.patch deleted file mode 100644 index b771b41466fb64dcc8d8595d9fba9f96264b9e14..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/Fix-IAKERB-context-aliasing-bugs-CVE-2015-2696.patch +++ /dev/null @@ -1,739 +0,0 @@ -From f6e57c402688f4bc386d1a39512657a30f0bafd3 Mon Sep 17 00:00:00 2001 -From: Nicolas Williams -Date: Mon, 14 Sep 2015 12:28:36 -0400 -Subject: [PATCH 2/4] Fix IAKERB context aliasing bugs [CVE-2015-2696] - -The IAKERB mechanism currently replaces its context handle with the -krb5 mechanism handle upon establishment, under the assumption that -most GSS functions are only called after context establishment. This -assumption is incorrect, and can lead to aliasing violations for some -programs. Maintain the IAKERB context structure after context -establishment and add new IAKERB entry points to refer to it with that -type. Add initiate and established flags to the IAKERB context -structure for use in gss_inquire_context() prior to context -establishment. - -CVE-2015-2696: - -In MIT krb5 1.9 and later, applications which call -gss_inquire_context() on a partially-established IAKERB context can -cause the GSS-API library to read from a pointer using the wrong type, -generally causing a process crash. Java server applications using the -native JGSS provider are vulnerable to this bug. A carefully crafted -IAKERB packet might allow the gss_inquire_context() call to succeed -with attacker-determined results, but applications should not make -access control decisions based on gss_inquire_context() results prior -to context establishment. - - CVSSv2 Vector: AV:N/AC:M/Au:N/C:N/I:N/A:C/E:POC/RL:OF/RC:C - -[ghudson@mit.edu: several bugfixes, style changes, and edge-case -behavior changes; commit message and CVE description] - -ticket: 8244 -target_version: 1.14 -tags: pullup - -Backport upstream commit: -https://github.com/krb5/krb5/commit/e04f0283516e80d2f93366e0d479d13c9b5c8c2a - -Upstream-Status: Backport ---- - src/lib/gssapi/krb5/gssapiP_krb5.h | 114 ++++++++++++ - src/lib/gssapi/krb5/gssapi_krb5.c | 105 +++++++++-- - src/lib/gssapi/krb5/iakerb.c | 351 +++++++++++++++++++++++++++++++++---- - 3 files changed, 529 insertions(+), 41 deletions(-) - -diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h -index a0e8625..05dc321 100644 ---- a/src/lib/gssapi/krb5/gssapiP_krb5.h -+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h -@@ -620,6 +620,21 @@ OM_uint32 KRB5_CALLCONV krb5_gss_accept_sec_context_ext - ); - #endif /* LEAN_CLIENT */ - -+OM_uint32 KRB5_CALLCONV krb5_gss_inquire_sec_context_by_oid -+(OM_uint32*, /* minor_status */ -+ const gss_ctx_id_t, -+ /* context_handle */ -+ const gss_OID, /* desired_object */ -+ gss_buffer_set_t* /* data_set */ -+); -+ -+OM_uint32 KRB5_CALLCONV krb5_gss_set_sec_context_option -+(OM_uint32*, /* minor_status */ -+ gss_ctx_id_t*, /* context_handle */ -+ const gss_OID, /* desired_object */ -+ const gss_buffer_t/* value */ -+); -+ - OM_uint32 KRB5_CALLCONV krb5_gss_process_context_token - (OM_uint32*, /* minor_status */ - gss_ctx_id_t, /* context_handle */ -@@ -1301,6 +1316,105 @@ OM_uint32 KRB5_CALLCONV - krb5_gss_import_cred(OM_uint32 *minor_status, gss_buffer_t token, - gss_cred_id_t *cred_handle); - -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_process_context_token(OM_uint32 *minor_status, -+ const gss_ctx_id_t context_handle, -+ const gss_buffer_t token_buffer); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_context_time(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ OM_uint32 *time_rec); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_inquire_context(OM_uint32 *minor_status, -+ gss_ctx_id_t context_handle, gss_name_t *src_name, -+ gss_name_t *targ_name, OM_uint32 *lifetime_rec, -+ gss_OID *mech_type, OM_uint32 *ctx_flags, -+ int *locally_initiated, int *opened); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_get_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ gss_qop_t qop_req, gss_buffer_t message_buffer, -+ gss_buffer_t message_token); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_get_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ gss_qop_t qop_req, gss_iov_buffer_desc *iov, -+ int iov_count); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_get_mic_iov_length(OM_uint32 *minor_status, -+ gss_ctx_id_t context_handle, gss_qop_t qop_req, -+ gss_iov_buffer_desc *iov, int iov_count); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_verify_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ gss_buffer_t msg_buffer, gss_buffer_t token_buffer, -+ gss_qop_t *qop_state); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_verify_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ gss_qop_t *qop_state, gss_iov_buffer_desc *iov, -+ int iov_count); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_wrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ int conf_req_flag, gss_qop_t qop_req, -+ gss_buffer_t input_message_buffer, int *conf_state, -+ gss_buffer_t output_message_buffer); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_wrap_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ int conf_req_flag, gss_qop_t qop_req, int *conf_state, -+ gss_iov_buffer_desc *iov, int iov_count); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_wrap_iov_length(OM_uint32 *minor_status, -+ gss_ctx_id_t context_handle, int conf_req_flag, -+ gss_qop_t qop_req, int *conf_state, -+ gss_iov_buffer_desc *iov, int iov_count); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_unwrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ gss_buffer_t input_message_buffer, -+ gss_buffer_t output_message_buffer, int *conf_state, -+ gss_qop_t *qop_state); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_unwrap_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ int *conf_state, gss_qop_t *qop_state, -+ gss_iov_buffer_desc *iov, int iov_count); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_wrap_size_limit(OM_uint32 *minor_status, -+ gss_ctx_id_t context_handle, int conf_req_flag, -+ gss_qop_t qop_req, OM_uint32 req_output_size, -+ OM_uint32 *max_input_size); -+ -+#ifndef LEAN_CLIENT -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_export_sec_context(OM_uint32 *minor_status, -+ gss_ctx_id_t *context_handle, -+ gss_buffer_t interprocess_token); -+#endif /* LEAN_CLIENT */ -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_inquire_sec_context_by_oid(OM_uint32 *minor_status, -+ const gss_ctx_id_t context_handle, -+ const gss_OID desired_object, -+ gss_buffer_set_t *data_set); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_set_sec_context_option(OM_uint32 *minor_status, -+ gss_ctx_id_t *context_handle, -+ const gss_OID desired_object, -+ const gss_buffer_t value); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_pseudo_random(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ int prf_key, const gss_buffer_t prf_in, -+ ssize_t desired_output_len, gss_buffer_t prf_out); -+ - /* Magic string to identify exported krb5 GSS credentials. Increment this if - * the format changes. */ - #define CRED_EXPORT_MAGIC "K5C1" -diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c -index 77b7fff..9a23656 100644 ---- a/src/lib/gssapi/krb5/gssapi_krb5.c -+++ b/src/lib/gssapi/krb5/gssapi_krb5.c -@@ -345,7 +345,7 @@ static struct { - } - }; - --static OM_uint32 KRB5_CALLCONV -+OM_uint32 KRB5_CALLCONV - krb5_gss_inquire_sec_context_by_oid (OM_uint32 *minor_status, - const gss_ctx_id_t context_handle, - const gss_OID desired_object, -@@ -459,7 +459,7 @@ static struct { - }; - #endif - --static OM_uint32 KRB5_CALLCONV -+OM_uint32 KRB5_CALLCONV - krb5_gss_set_sec_context_option (OM_uint32 *minor_status, - gss_ctx_id_t *context_handle, - const gss_OID desired_object, -@@ -904,20 +904,103 @@ static struct gss_config krb5_mechanism = { - krb5_gss_get_mic_iov_length, - }; - -+/* Functions which use security contexts or acquire creds are IAKERB-specific; -+ * other functions can borrow from the krb5 mech. */ -+static struct gss_config iakerb_mechanism = { -+ { GSS_MECH_KRB5_OID_LENGTH, GSS_MECH_KRB5_OID }, -+ NULL, -+ iakerb_gss_acquire_cred, -+ krb5_gss_release_cred, -+ iakerb_gss_init_sec_context, -+#ifdef LEAN_CLIENT -+ NULL, -+#else -+ iakerb_gss_accept_sec_context, -+#endif -+ iakerb_gss_process_context_token, -+ iakerb_gss_delete_sec_context, -+ iakerb_gss_context_time, -+ iakerb_gss_get_mic, -+ iakerb_gss_verify_mic, -+#if defined(IOV_SHIM_EXERCISE_WRAP) || defined(IOV_SHIM_EXERCISE) -+ NULL, -+#else -+ iakerb_gss_wrap, -+#endif -+#if defined(IOV_SHIM_EXERCISE_UNWRAP) || defined(IOV_SHIM_EXERCISE) -+ NULL, -+#else -+ iakerb_gss_unwrap, -+#endif -+ krb5_gss_display_status, -+ krb5_gss_indicate_mechs, -+ krb5_gss_compare_name, -+ krb5_gss_display_name, -+ krb5_gss_import_name, -+ krb5_gss_release_name, -+ krb5_gss_inquire_cred, -+ NULL, /* add_cred */ -+#ifdef LEAN_CLIENT -+ NULL, -+ NULL, -+#else -+ iakerb_gss_export_sec_context, -+ NULL, -+#endif -+ krb5_gss_inquire_cred_by_mech, -+ krb5_gss_inquire_names_for_mech, -+ iakerb_gss_inquire_context, -+ krb5_gss_internal_release_oid, -+ iakerb_gss_wrap_size_limit, -+ krb5_gss_localname, -+ krb5_gss_authorize_localname, -+ krb5_gss_export_name, -+ krb5_gss_duplicate_name, -+ krb5_gss_store_cred, -+ iakerb_gss_inquire_sec_context_by_oid, -+ krb5_gss_inquire_cred_by_oid, -+ iakerb_gss_set_sec_context_option, -+ krb5_gssspi_set_cred_option, -+ krb5_gssspi_mech_invoke, -+ NULL, /* wrap_aead */ -+ NULL, /* unwrap_aead */ -+ iakerb_gss_wrap_iov, -+ iakerb_gss_unwrap_iov, -+ iakerb_gss_wrap_iov_length, -+ NULL, /* complete_auth_token */ -+ NULL, /* acquire_cred_impersonate_name */ -+ NULL, /* add_cred_impersonate_name */ -+ NULL, /* display_name_ext */ -+ krb5_gss_inquire_name, -+ krb5_gss_get_name_attribute, -+ krb5_gss_set_name_attribute, -+ krb5_gss_delete_name_attribute, -+ krb5_gss_export_name_composite, -+ krb5_gss_map_name_to_any, -+ krb5_gss_release_any_name_mapping, -+ iakerb_gss_pseudo_random, -+ NULL, /* set_neg_mechs */ -+ krb5_gss_inquire_saslname_for_mech, -+ krb5_gss_inquire_mech_for_saslname, -+ krb5_gss_inquire_attrs_for_mech, -+ krb5_gss_acquire_cred_from, -+ krb5_gss_store_cred_into, -+ iakerb_gss_acquire_cred_with_password, -+ krb5_gss_export_cred, -+ krb5_gss_import_cred, -+ NULL, /* import_sec_context_by_mech */ -+ NULL, /* import_name_by_mech */ -+ NULL, /* import_cred_by_mech */ -+ iakerb_gss_get_mic_iov, -+ iakerb_gss_verify_mic_iov, -+ iakerb_gss_get_mic_iov_length, -+}; -+ - #ifdef _GSS_STATIC_LINK - #include "mglueP.h" - static int gss_iakerbmechglue_init(void) - { - struct gss_mech_config mech_iakerb; -- struct gss_config iakerb_mechanism = krb5_mechanism; -- -- /* IAKERB mechanism mirrors krb5, but with different context SPIs */ -- iakerb_mechanism.gss_accept_sec_context = iakerb_gss_accept_sec_context; -- iakerb_mechanism.gss_init_sec_context = iakerb_gss_init_sec_context; -- iakerb_mechanism.gss_delete_sec_context = iakerb_gss_delete_sec_context; -- iakerb_mechanism.gss_acquire_cred = iakerb_gss_acquire_cred; -- iakerb_mechanism.gssspi_acquire_cred_with_password -- = iakerb_gss_acquire_cred_with_password; - - memset(&mech_iakerb, 0, sizeof(mech_iakerb)); - mech_iakerb.mech = &iakerb_mechanism; -diff --git a/src/lib/gssapi/krb5/iakerb.c b/src/lib/gssapi/krb5/iakerb.c -index f30de32..4662bd9 100644 ---- a/src/lib/gssapi/krb5/iakerb.c -+++ b/src/lib/gssapi/krb5/iakerb.c -@@ -47,6 +47,8 @@ struct _iakerb_ctx_id_rec { - gss_ctx_id_t gssc; - krb5_data conv; /* conversation for checksumming */ - unsigned int count; /* number of round trips */ -+ int initiate; -+ int established; - krb5_get_init_creds_opt *gic_opts; - }; - -@@ -695,7 +697,7 @@ cleanup: - * Allocate and initialise an IAKERB context - */ - static krb5_error_code --iakerb_alloc_context(iakerb_ctx_id_t *pctx) -+iakerb_alloc_context(iakerb_ctx_id_t *pctx, int initiate) - { - iakerb_ctx_id_t ctx; - krb5_error_code code; -@@ -709,6 +711,8 @@ iakerb_alloc_context(iakerb_ctx_id_t *pctx) - ctx->magic = KG_IAKERB_CONTEXT; - ctx->state = IAKERB_AS_REQ; - ctx->count = 0; -+ ctx->initiate = initiate; -+ ctx->established = 0; - - code = krb5_gss_init_context(&ctx->k5c); - if (code != 0) -@@ -732,7 +736,7 @@ iakerb_gss_delete_sec_context(OM_uint32 *minor_status, - gss_ctx_id_t *context_handle, - gss_buffer_t output_token) - { -- OM_uint32 major_status = GSS_S_COMPLETE; -+ iakerb_ctx_id_t iakerb_ctx = (iakerb_ctx_id_t)*context_handle; - - if (output_token != GSS_C_NO_BUFFER) { - output_token->length = 0; -@@ -740,23 +744,10 @@ iakerb_gss_delete_sec_context(OM_uint32 *minor_status, - } - - *minor_status = 0; -+ *context_handle = GSS_C_NO_CONTEXT; -+ iakerb_release_context(iakerb_ctx); - -- if (*context_handle != GSS_C_NO_CONTEXT) { -- iakerb_ctx_id_t iakerb_ctx = (iakerb_ctx_id_t)*context_handle; -- -- if (iakerb_ctx->magic == KG_IAKERB_CONTEXT) { -- iakerb_release_context(iakerb_ctx); -- *context_handle = GSS_C_NO_CONTEXT; -- } else { -- assert(iakerb_ctx->magic == KG_CONTEXT); -- -- major_status = krb5_gss_delete_sec_context(minor_status, -- context_handle, -- output_token); -- } -- } -- -- return major_status; -+ return GSS_S_COMPLETE; - } - - static krb5_boolean -@@ -802,7 +793,7 @@ iakerb_gss_accept_sec_context(OM_uint32 *minor_status, - int initialContextToken = (*context_handle == GSS_C_NO_CONTEXT); - - if (initialContextToken) { -- code = iakerb_alloc_context(&ctx); -+ code = iakerb_alloc_context(&ctx, 0); - if (code != 0) - goto cleanup; - -@@ -854,11 +845,8 @@ iakerb_gss_accept_sec_context(OM_uint32 *minor_status, - time_rec, - delegated_cred_handle, - &exts); -- if (major_status == GSS_S_COMPLETE) { -- *context_handle = ctx->gssc; -- ctx->gssc = NULL; -- iakerb_release_context(ctx); -- } -+ if (major_status == GSS_S_COMPLETE) -+ ctx->established = 1; - if (mech_type != NULL) - *mech_type = (gss_OID)gss_mech_krb5; - } -@@ -897,7 +885,7 @@ iakerb_gss_init_sec_context(OM_uint32 *minor_status, - int initialContextToken = (*context_handle == GSS_C_NO_CONTEXT); - - if (initialContextToken) { -- code = iakerb_alloc_context(&ctx); -+ code = iakerb_alloc_context(&ctx, 1); - if (code != 0) { - *minor_status = code; - goto cleanup; -@@ -983,11 +971,8 @@ iakerb_gss_init_sec_context(OM_uint32 *minor_status, - ret_flags, - time_rec, - &exts); -- if (major_status == GSS_S_COMPLETE) { -- *context_handle = ctx->gssc; -- ctx->gssc = GSS_C_NO_CONTEXT; -- iakerb_release_context(ctx); -- } -+ if (major_status == GSS_S_COMPLETE) -+ ctx->established = 1; - if (actual_mech_type != NULL) - *actual_mech_type = (gss_OID)gss_mech_krb5; - } else { -@@ -1010,3 +995,309 @@ cleanup: - - return major_status; - } -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_unwrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ gss_buffer_t input_message_buffer, -+ gss_buffer_t output_message_buffer, int *conf_state, -+ gss_qop_t *qop_state) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; -+ -+ return krb5_gss_unwrap(minor_status, ctx->gssc, input_message_buffer, -+ output_message_buffer, conf_state, qop_state); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_wrap(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ int conf_req_flag, gss_qop_t qop_req, -+ gss_buffer_t input_message_buffer, int *conf_state, -+ gss_buffer_t output_message_buffer) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; -+ -+ return krb5_gss_wrap(minor_status, ctx->gssc, conf_req_flag, qop_req, -+ input_message_buffer, conf_state, -+ output_message_buffer); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_process_context_token(OM_uint32 *minor_status, -+ const gss_ctx_id_t context_handle, -+ const gss_buffer_t token_buffer) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_DEFECTIVE_TOKEN; -+ -+ return krb5_gss_process_context_token(minor_status, ctx->gssc, -+ token_buffer); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_context_time(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ OM_uint32 *time_rec) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; -+ -+ return krb5_gss_context_time(minor_status, ctx->gssc, time_rec); -+} -+ -+#ifndef LEAN_CLIENT -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_export_sec_context(OM_uint32 *minor_status, -+ gss_ctx_id_t *context_handle, -+ gss_buffer_t interprocess_token) -+{ -+ OM_uint32 maj; -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ /* We don't currently support exporting partially established contexts. */ -+ if (!ctx->established) -+ return GSS_S_UNAVAILABLE; -+ -+ maj = krb5_gss_export_sec_context(minor_status, &ctx->gssc, -+ interprocess_token); -+ if (ctx->gssc == GSS_C_NO_CONTEXT) { -+ iakerb_release_context(ctx); -+ *context_handle = GSS_C_NO_CONTEXT; -+ } -+ return maj; -+} -+ -+/* -+ * Until we implement partial context exports, there are no SPNEGO exported -+ * context tokens, only tokens for the underlying krb5 context. So we do not -+ * need to implement an iakerb_gss_import_sec_context() yet; it would be -+ * unreachable except via a manually constructed token. -+ */ -+ -+#endif /* LEAN_CLIENT */ -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_inquire_context(OM_uint32 *minor_status, -+ gss_ctx_id_t context_handle, gss_name_t *src_name, -+ gss_name_t *targ_name, OM_uint32 *lifetime_rec, -+ gss_OID *mech_type, OM_uint32 *ctx_flags, -+ int *initiate, int *opened) -+{ -+ OM_uint32 ret; -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (src_name != NULL) -+ *src_name = GSS_C_NO_NAME; -+ if (targ_name != NULL) -+ *targ_name = GSS_C_NO_NAME; -+ if (lifetime_rec != NULL) -+ *lifetime_rec = 0; -+ if (mech_type != NULL) -+ *mech_type = (gss_OID)gss_mech_iakerb; -+ if (ctx_flags != NULL) -+ *ctx_flags = 0; -+ if (initiate != NULL) -+ *initiate = ctx->initiate; -+ if (opened != NULL) -+ *opened = ctx->established; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_COMPLETE; -+ -+ ret = krb5_gss_inquire_context(minor_status, ctx->gssc, src_name, -+ targ_name, lifetime_rec, mech_type, -+ ctx_flags, initiate, opened); -+ -+ if (!ctx->established) { -+ /* Report IAKERB as the mech OID until the context is established. */ -+ if (mech_type != NULL) -+ *mech_type = (gss_OID)gss_mech_iakerb; -+ -+ /* We don't support exporting partially-established contexts. */ -+ if (ctx_flags != NULL) -+ *ctx_flags &= ~GSS_C_TRANS_FLAG; -+ } -+ -+ return ret; -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_wrap_size_limit(OM_uint32 *minor_status, -+ gss_ctx_id_t context_handle, int conf_req_flag, -+ gss_qop_t qop_req, OM_uint32 req_output_size, -+ OM_uint32 *max_input_size) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; -+ -+ return krb5_gss_wrap_size_limit(minor_status, ctx->gssc, conf_req_flag, -+ qop_req, req_output_size, max_input_size); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_get_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ gss_qop_t qop_req, gss_buffer_t message_buffer, -+ gss_buffer_t message_token) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; -+ -+ return krb5_gss_get_mic(minor_status, ctx->gssc, qop_req, message_buffer, -+ message_token); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_verify_mic(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ gss_buffer_t msg_buffer, gss_buffer_t token_buffer, -+ gss_qop_t *qop_state) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; -+ -+ return krb5_gss_verify_mic(minor_status, ctx->gssc, msg_buffer, -+ token_buffer, qop_state); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_inquire_sec_context_by_oid(OM_uint32 *minor_status, -+ const gss_ctx_id_t context_handle, -+ const gss_OID desired_object, -+ gss_buffer_set_t *data_set) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_UNAVAILABLE; -+ -+ return krb5_gss_inquire_sec_context_by_oid(minor_status, ctx->gssc, -+ desired_object, data_set); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_set_sec_context_option(OM_uint32 *minor_status, -+ gss_ctx_id_t *context_handle, -+ const gss_OID desired_object, -+ const gss_buffer_t value) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)*context_handle; -+ -+ if (ctx == NULL || ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_UNAVAILABLE; -+ -+ return krb5_gss_set_sec_context_option(minor_status, &ctx->gssc, -+ desired_object, value); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_wrap_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ int conf_req_flag, gss_qop_t qop_req, int *conf_state, -+ gss_iov_buffer_desc *iov, int iov_count) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; -+ -+ return krb5_gss_wrap_iov(minor_status, ctx->gssc, conf_req_flag, qop_req, -+ conf_state, iov, iov_count); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_unwrap_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ int *conf_state, gss_qop_t *qop_state, -+ gss_iov_buffer_desc *iov, int iov_count) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; -+ -+ return krb5_gss_unwrap_iov(minor_status, ctx->gssc, conf_state, qop_state, -+ iov, iov_count); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_wrap_iov_length(OM_uint32 *minor_status, -+ gss_ctx_id_t context_handle, int conf_req_flag, -+ gss_qop_t qop_req, int *conf_state, -+ gss_iov_buffer_desc *iov, int iov_count) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; -+ -+ return krb5_gss_wrap_iov_length(minor_status, ctx->gssc, conf_req_flag, -+ qop_req, conf_state, iov, iov_count); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_pseudo_random(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ int prf_key, const gss_buffer_t prf_in, -+ ssize_t desired_output_len, gss_buffer_t prf_out) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; -+ -+ return krb5_gss_pseudo_random(minor_status, ctx->gssc, prf_key, prf_in, -+ desired_output_len, prf_out); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_get_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ gss_qop_t qop_req, gss_iov_buffer_desc *iov, -+ int iov_count) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; -+ -+ return krb5_gss_get_mic_iov(minor_status, ctx->gssc, qop_req, iov, -+ iov_count); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_verify_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, -+ gss_qop_t *qop_state, gss_iov_buffer_desc *iov, -+ int iov_count) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; -+ -+ return krb5_gss_verify_mic_iov(minor_status, ctx->gssc, qop_state, iov, -+ iov_count); -+} -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_get_mic_iov_length(OM_uint32 *minor_status, -+ gss_ctx_id_t context_handle, gss_qop_t qop_req, -+ gss_iov_buffer_desc *iov, int iov_count) -+{ -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ -+ if (ctx->gssc == GSS_C_NO_CONTEXT) -+ return GSS_S_NO_CONTEXT; -+ -+ return krb5_gss_get_mic_iov_length(minor_status, ctx->gssc, qop_req, iov, -+ iov_count); -+} --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/Fix-IAKERB-context-export-import-CVE-2015-2698.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/Fix-IAKERB-context-export-import-CVE-2015-2698.patch deleted file mode 100644 index 2f45d306b8e4e581e0f70a37f0500b93340e87a7..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/Fix-IAKERB-context-export-import-CVE-2015-2698.patch +++ /dev/null @@ -1,134 +0,0 @@ -From aa769c8c6905d1abfac66d4d1b0fc73740ccbe7d Mon Sep 17 00:00:00 2001 -From: Greg Hudson -Date: Sat, 14 Nov 2015 02:47:04 -0500 -Subject: [PATCH 4/4] Fix IAKERB context export/import [CVE-2015-2698] - -The patches for CVE-2015-2696 contained a regression in the newly -added IAKERB iakerb_gss_export_sec_context() function, which could -cause it to corrupt memory. Fix the regression by properly -dereferencing the context_handle pointer before casting it. - -Also, the patches did not implement an IAKERB gss_import_sec_context() -function, under the erroneous belief that an exported IAKERB context -would be tagged as a krb5 context. Implement it now to allow IAKERB -contexts to be successfully exported and imported after establishment. - -CVE-2015-2698: - -In any MIT krb5 release with the patches for CVE-2015-2696 applied, an -application which calls gss_export_sec_context() may experience memory -corruption if the context was established using the IAKERB mechanism. -Historically, some vulnerabilities of this nature can be translated -into remote code execution, though the necessary exploits must be -tailored to the individual application and are usually quite -complicated. - - CVSSv2 Vector: AV:N/AC:H/Au:S/C:C/I:C/A:C/E:POC/RL:OF/RC:C - -ticket: 8273 (new) -target_version: 1.14 -tags: pullup - -Backport upstream commit: -https://github.com/krb5/krb5/commit/3db8dfec1ef50ddd78d6ba9503185995876a39fd - -Upstream-Status: Backport ---- - src/lib/gssapi/krb5/gssapiP_krb5.h | 5 +++++ - src/lib/gssapi/krb5/gssapi_krb5.c | 2 +- - src/lib/gssapi/krb5/iakerb.c | 42 +++++++++++++++++++++++++++++++------- - 3 files changed, 41 insertions(+), 8 deletions(-) - -diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h -index 05dc321..ac53662 100644 ---- a/src/lib/gssapi/krb5/gssapiP_krb5.h -+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h -@@ -1396,6 +1396,11 @@ OM_uint32 KRB5_CALLCONV - iakerb_gss_export_sec_context(OM_uint32 *minor_status, - gss_ctx_id_t *context_handle, - gss_buffer_t interprocess_token); -+ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_import_sec_context(OM_uint32 *minor_status, -+ const gss_buffer_t interprocess_token, -+ gss_ctx_id_t *context_handle); - #endif /* LEAN_CLIENT */ - - OM_uint32 KRB5_CALLCONV -diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c -index 9a23656..d7ba279 100644 ---- a/src/lib/gssapi/krb5/gssapi_krb5.c -+++ b/src/lib/gssapi/krb5/gssapi_krb5.c -@@ -945,7 +945,7 @@ static struct gss_config iakerb_mechanism = { - NULL, - #else - iakerb_gss_export_sec_context, -- NULL, -+ iakerb_gss_import_sec_context, - #endif - krb5_gss_inquire_cred_by_mech, - krb5_gss_inquire_names_for_mech, -diff --git a/src/lib/gssapi/krb5/iakerb.c b/src/lib/gssapi/krb5/iakerb.c -index 4662bd9..48beaee 100644 ---- a/src/lib/gssapi/krb5/iakerb.c -+++ b/src/lib/gssapi/krb5/iakerb.c -@@ -1061,7 +1061,7 @@ iakerb_gss_export_sec_context(OM_uint32 *minor_status, - gss_buffer_t interprocess_token) - { - OM_uint32 maj; -- iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)context_handle; -+ iakerb_ctx_id_t ctx = (iakerb_ctx_id_t)*context_handle; - - /* We don't currently support exporting partially established contexts. */ - if (!ctx->established) -@@ -1076,13 +1076,41 @@ iakerb_gss_export_sec_context(OM_uint32 *minor_status, - return maj; - } - --/* -- * Until we implement partial context exports, there are no SPNEGO exported -- * context tokens, only tokens for the underlying krb5 context. So we do not -- * need to implement an iakerb_gss_import_sec_context() yet; it would be -- * unreachable except via a manually constructed token. -- */ -+OM_uint32 KRB5_CALLCONV -+iakerb_gss_import_sec_context(OM_uint32 *minor_status, -+ gss_buffer_t interprocess_token, -+ gss_ctx_id_t *context_handle) -+{ -+ OM_uint32 maj, tmpmin; -+ krb5_error_code code; -+ gss_ctx_id_t gssc; -+ krb5_gss_ctx_id_t kctx; -+ iakerb_ctx_id_t ctx; -+ -+ maj = krb5_gss_import_sec_context(minor_status, interprocess_token, &gssc); -+ if (maj != GSS_S_COMPLETE) -+ return maj; -+ kctx = (krb5_gss_ctx_id_t)gssc; -+ -+ if (!kctx->established) { -+ /* We don't currently support importing partially established -+ * contexts. */ -+ krb5_gss_delete_sec_context(&tmpmin, &gssc, GSS_C_NO_BUFFER); -+ return GSS_S_FAILURE; -+ } - -+ code = iakerb_alloc_context(&ctx, kctx->initiate); -+ if (code != 0) { -+ krb5_gss_delete_sec_context(&tmpmin, &gssc, GSS_C_NO_BUFFER); -+ *minor_status = code; -+ return GSS_S_FAILURE; -+ } -+ -+ ctx->gssc = gssc; -+ ctx->established = 1; -+ *context_handle = (gss_ctx_id_t)ctx; -+ return GSS_S_COMPLETE; -+} - #endif /* LEAN_CLIENT */ - - OM_uint32 KRB5_CALLCONV --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/Fix-SPNEGO-context-aliasing-bugs-CVE-2015-2695.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/Fix-SPNEGO-context-aliasing-bugs-CVE-2015-2695.patch deleted file mode 100644 index 227e6c614fa584fe6ebec8b5adc3a7222afc163c..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/Fix-SPNEGO-context-aliasing-bugs-CVE-2015-2695.patch +++ /dev/null @@ -1,572 +0,0 @@ -From 884913e807414a1e06245918dea71243c5fdd0e6 Mon Sep 17 00:00:00 2001 -From: Nicolas Williams -Date: Mon, 14 Sep 2015 12:27:52 -0400 -Subject: [PATCH 1/4] Fix SPNEGO context aliasing bugs [CVE-2015-2695] - -The SPNEGO mechanism currently replaces its context handle with the -mechanism context handle upon establishment, under the assumption that -most GSS functions are only called after context establishment. This -assumption is incorrect, and can lead to aliasing violations for some -programs. Maintain the SPNEGO context structure after context -establishment and refer to it in all GSS methods. Add initiate and -opened flags to the SPNEGO context structure for use in -gss_inquire_context() prior to context establishment. - -CVE-2015-2695: - -In MIT krb5 1.5 and later, applications which call -gss_inquire_context() on a partially-established SPNEGO context can -cause the GSS-API library to read from a pointer using the wrong type, -generally causing a process crash. This bug may go unnoticed, because -the most common SPNEGO authentication scenario establishes the context -after just one call to gss_accept_sec_context(). Java server -applications using the native JGSS provider are vulnerable to this -bug. A carefully crafted SPNEGO packet might allow the -gss_inquire_context() call to succeed with attacker-determined -results, but applications should not make access control decisions -based on gss_inquire_context() results prior to context establishment. - - CVSSv2 Vector: AV:N/AC:M/Au:N/C:N/I:N/A:C/E:POC/RL:OF/RC:C - -[ghudson@mit.edu: several bugfixes, style changes, and edge-case -behavior changes; commit message and CVE description] - -ticket: 8244 -target_version: 1.14 -tags: pullup - -Backport upstream commit: -https://github.com/krb5/krb5/commit/b51b33f2bc5d1497ddf5bd107f791c101695000d - -Upstream-Status: Backport ---- - src/lib/gssapi/spnego/gssapiP_spnego.h | 2 + - src/lib/gssapi/spnego/spnego_mech.c | 254 ++++++++++++++++++++++++--------- - 2 files changed, 192 insertions(+), 64 deletions(-) - -diff --git a/src/lib/gssapi/spnego/gssapiP_spnego.h b/src/lib/gssapi/spnego/gssapiP_spnego.h -index bc23f56..8e05736 100644 ---- a/src/lib/gssapi/spnego/gssapiP_spnego.h -+++ b/src/lib/gssapi/spnego/gssapiP_spnego.h -@@ -102,6 +102,8 @@ typedef struct { - int firstpass; - int mech_complete; - int nego_done; -+ int initiate; -+ int opened; - OM_uint32 ctx_flags; - gss_name_t internal_name; - gss_OID actual_mech; -diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c -index f9248ab..3423f22 100644 ---- a/src/lib/gssapi/spnego/spnego_mech.c -+++ b/src/lib/gssapi/spnego/spnego_mech.c -@@ -101,7 +101,7 @@ static OM_uint32 get_negotiable_mechs(OM_uint32 *, spnego_gss_cred_id_t, - gss_cred_usage_t, gss_OID_set *); - static void release_spnego_ctx(spnego_gss_ctx_id_t *); - static void check_spnego_options(spnego_gss_ctx_id_t); --static spnego_gss_ctx_id_t create_spnego_ctx(void); -+static spnego_gss_ctx_id_t create_spnego_ctx(int); - static int put_mech_set(gss_OID_set mechSet, gss_buffer_t buf); - static int put_input_token(unsigned char **, gss_buffer_t, unsigned int); - static int put_mech_oid(unsigned char **, gss_OID_const, unsigned int); -@@ -439,7 +439,7 @@ check_spnego_options(spnego_gss_ctx_id_t spnego_ctx) - } - - static spnego_gss_ctx_id_t --create_spnego_ctx(void) -+create_spnego_ctx(int initiate) - { - spnego_gss_ctx_id_t spnego_ctx = NULL; - spnego_ctx = (spnego_gss_ctx_id_t) -@@ -462,6 +462,8 @@ create_spnego_ctx(void) - spnego_ctx->mic_rcvd = 0; - spnego_ctx->mech_complete = 0; - spnego_ctx->nego_done = 0; -+ spnego_ctx->opened = 0; -+ spnego_ctx->initiate = initiate; - spnego_ctx->internal_name = GSS_C_NO_NAME; - spnego_ctx->actual_mech = GSS_C_NO_OID; - -@@ -627,7 +629,7 @@ init_ctx_new(OM_uint32 *minor_status, - OM_uint32 ret; - spnego_gss_ctx_id_t sc = NULL; - -- sc = create_spnego_ctx(); -+ sc = create_spnego_ctx(1); - if (sc == NULL) - return GSS_S_FAILURE; - -@@ -644,10 +646,7 @@ init_ctx_new(OM_uint32 *minor_status, - ret = GSS_S_FAILURE; - goto cleanup; - } -- /* -- * The actual context is not yet determined, set the output -- * context handle to refer to the spnego context itself. -- */ -+ - sc->ctx_handle = GSS_C_NO_CONTEXT; - *ctx = (gss_ctx_id_t)sc; - sc = NULL; -@@ -1088,16 +1087,11 @@ cleanup: - } - gss_release_buffer(&tmpmin, &mechtok_out); - if (ret == GSS_S_COMPLETE) { -- /* -- * Now, switch the output context to refer to the -- * negotiated mechanism's context. -- */ -- *context_handle = (gss_ctx_id_t)spnego_ctx->ctx_handle; -+ spnego_ctx->opened = 1; - if (actual_mech != NULL) - *actual_mech = spnego_ctx->actual_mech; - if (ret_flags != NULL) - *ret_flags = spnego_ctx->ctx_flags; -- release_spnego_ctx(&spnego_ctx); - } else if (ret != GSS_S_CONTINUE_NEEDED) { - if (spnego_ctx != NULL) { - gss_delete_sec_context(&tmpmin, -@@ -1341,7 +1335,7 @@ acc_ctx_hints(OM_uint32 *minor_status, - if (ret != GSS_S_COMPLETE) - goto cleanup; - -- sc = create_spnego_ctx(); -+ sc = create_spnego_ctx(0); - if (sc == NULL) { - ret = GSS_S_FAILURE; - goto cleanup; -@@ -1423,7 +1417,7 @@ acc_ctx_new(OM_uint32 *minor_status, - gss_release_buffer(&tmpmin, &sc->DER_mechTypes); - assert(mech_wanted != GSS_C_NO_OID); - } else -- sc = create_spnego_ctx(); -+ sc = create_spnego_ctx(0); - if (sc == NULL) { - ret = GSS_S_FAILURE; - *return_token = NO_TOKEN_SEND; -@@ -1806,13 +1800,12 @@ cleanup: - ret = GSS_S_FAILURE; - } - if (ret == GSS_S_COMPLETE) { -- *context_handle = (gss_ctx_id_t)sc->ctx_handle; -+ sc->opened = 1; - if (sc->internal_name != GSS_C_NO_NAME && - src_name != NULL) { - *src_name = sc->internal_name; - sc->internal_name = GSS_C_NO_NAME; - } -- release_spnego_ctx(&sc); - } else if (ret != GSS_S_CONTINUE_NEEDED) { - if (sc != NULL) { - gss_delete_sec_context(&tmpmin, &sc->ctx_handle, -@@ -2125,8 +2118,13 @@ spnego_gss_unwrap( - gss_qop_t *qop_state) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ - ret = gss_unwrap(minor_status, -- context_handle, -+ sc->ctx_handle, - input_message_buffer, - output_message_buffer, - conf_state, -@@ -2146,8 +2144,13 @@ spnego_gss_wrap( - gss_buffer_t output_message_buffer) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ - ret = gss_wrap(minor_status, -- context_handle, -+ sc->ctx_handle, - conf_req_flag, - qop_req, - input_message_buffer, -@@ -2164,8 +2167,14 @@ spnego_gss_process_context_token( - const gss_buffer_t token_buffer) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ /* SPNEGO doesn't have its own context tokens. */ -+ if (!sc->opened) -+ return (GSS_S_DEFECTIVE_TOKEN); -+ - ret = gss_process_context_token(minor_status, -- context_handle, -+ sc->ctx_handle, - token_buffer); - - return (ret); -@@ -2189,19 +2198,9 @@ spnego_gss_delete_sec_context( - if (*ctx == NULL) - return (GSS_S_COMPLETE); - -- /* -- * If this is still an SPNEGO mech, release it locally. -- */ -- if ((*ctx)->magic_num == SPNEGO_MAGIC_ID) { -- (void) gss_delete_sec_context(minor_status, -- &(*ctx)->ctx_handle, -- output_token); -- (void) release_spnego_ctx(ctx); -- } else { -- ret = gss_delete_sec_context(minor_status, -- context_handle, -- output_token); -- } -+ (void) gss_delete_sec_context(minor_status, &(*ctx)->ctx_handle, -+ output_token); -+ (void) release_spnego_ctx(ctx); - - return (ret); - } -@@ -2213,8 +2212,13 @@ spnego_gss_context_time( - OM_uint32 *time_rec) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ - ret = gss_context_time(minor_status, -- context_handle, -+ sc->ctx_handle, - time_rec); - return (ret); - } -@@ -2226,9 +2230,20 @@ spnego_gss_export_sec_context( - gss_buffer_t interprocess_token) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = *(spnego_gss_ctx_id_t *)context_handle; -+ -+ /* We don't currently support exporting partially established -+ * contexts. */ -+ if (!sc->opened) -+ return GSS_S_UNAVAILABLE; -+ - ret = gss_export_sec_context(minor_status, -- context_handle, -+ &sc->ctx_handle, - interprocess_token); -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) { -+ release_spnego_ctx(&sc); -+ *context_handle = GSS_C_NO_CONTEXT; -+ } - return (ret); - } - -@@ -2238,11 +2253,12 @@ spnego_gss_import_sec_context( - const gss_buffer_t interprocess_token, - gss_ctx_id_t *context_handle) - { -- OM_uint32 ret; -- ret = gss_import_sec_context(minor_status, -- interprocess_token, -- context_handle); -- return (ret); -+ /* -+ * Until we implement partial context exports, there are no SPNEGO -+ * exported context tokens, only tokens for underlying mechs. So just -+ * return an error for now. -+ */ -+ return GSS_S_UNAVAILABLE; - } - #endif /* LEAN_CLIENT */ - -@@ -2259,16 +2275,48 @@ spnego_gss_inquire_context( - int *opened) - { - OM_uint32 ret = GSS_S_COMPLETE; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (src_name != NULL) -+ *src_name = GSS_C_NO_NAME; -+ if (targ_name != NULL) -+ *targ_name = GSS_C_NO_NAME; -+ if (lifetime_rec != NULL) -+ *lifetime_rec = 0; -+ if (mech_type != NULL) -+ *mech_type = (gss_OID)gss_mech_spnego; -+ if (ctx_flags != NULL) -+ *ctx_flags = 0; -+ if (locally_initiated != NULL) -+ *locally_initiated = sc->initiate; -+ if (opened != NULL) -+ *opened = sc->opened; -+ -+ if (sc->ctx_handle != GSS_C_NO_CONTEXT) { -+ ret = gss_inquire_context(minor_status, sc->ctx_handle, -+ src_name, targ_name, lifetime_rec, -+ mech_type, ctx_flags, NULL, NULL); -+ } - -- ret = gss_inquire_context(minor_status, -- context_handle, -- src_name, -- targ_name, -- lifetime_rec, -- mech_type, -- ctx_flags, -- locally_initiated, -- opened); -+ if (!sc->opened) { -+ /* -+ * We are still doing SPNEGO negotiation, so report SPNEGO as -+ * the OID. After negotiation is complete we will report the -+ * underlying mechanism OID. -+ */ -+ if (mech_type != NULL) -+ *mech_type = (gss_OID)gss_mech_spnego; -+ -+ /* -+ * Remove flags we don't support with partially-established -+ * contexts. (Change this to keep GSS_C_TRANS_FLAG if we add -+ * support for exporting partial SPNEGO contexts.) -+ */ -+ if (ctx_flags != NULL) { -+ *ctx_flags &= ~GSS_C_PROT_READY_FLAG; -+ *ctx_flags &= ~GSS_C_TRANS_FLAG; -+ } -+ } - - return (ret); - } -@@ -2283,8 +2331,13 @@ spnego_gss_wrap_size_limit( - OM_uint32 *max_input_size) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ - ret = gss_wrap_size_limit(minor_status, -- context_handle, -+ sc->ctx_handle, - conf_req_flag, - qop_req, - req_output_size, -@@ -2301,8 +2354,13 @@ spnego_gss_get_mic( - gss_buffer_t message_token) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ - ret = gss_get_mic(minor_status, -- context_handle, -+ sc->ctx_handle, - qop_req, - message_buffer, - message_token); -@@ -2318,8 +2376,13 @@ spnego_gss_verify_mic( - gss_qop_t *qop_state) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ - ret = gss_verify_mic(minor_status, -- context_handle, -+ sc->ctx_handle, - msg_buffer, - token_buffer, - qop_state); -@@ -2334,8 +2397,14 @@ spnego_gss_inquire_sec_context_by_oid( - gss_buffer_set_t *data_set) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ /* There are no SPNEGO-specific OIDs for this function. */ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_UNAVAILABLE); -+ - ret = gss_inquire_sec_context_by_oid(minor_status, -- context_handle, -+ sc->ctx_handle, - desired_object, - data_set); - return (ret); -@@ -2404,8 +2473,15 @@ spnego_gss_set_sec_context_option( - const gss_buffer_t value) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)*context_handle; -+ -+ /* There are no SPNEGO-specific OIDs for this function, and we cannot -+ * construct an empty SPNEGO context with it. */ -+ if (sc == NULL || sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_UNAVAILABLE); -+ - ret = gss_set_sec_context_option(minor_status, -- context_handle, -+ &sc->ctx_handle, - desired_object, - value); - return (ret); -@@ -2422,8 +2498,13 @@ spnego_gss_wrap_aead(OM_uint32 *minor_status, - gss_buffer_t output_message_buffer) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ - ret = gss_wrap_aead(minor_status, -- context_handle, -+ sc->ctx_handle, - conf_req_flag, - qop_req, - input_assoc_buffer, -@@ -2444,8 +2525,13 @@ spnego_gss_unwrap_aead(OM_uint32 *minor_status, - gss_qop_t *qop_state) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ - ret = gss_unwrap_aead(minor_status, -- context_handle, -+ sc->ctx_handle, - input_message_buffer, - input_assoc_buffer, - output_payload_buffer, -@@ -2464,8 +2550,13 @@ spnego_gss_wrap_iov(OM_uint32 *minor_status, - int iov_count) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ - ret = gss_wrap_iov(minor_status, -- context_handle, -+ sc->ctx_handle, - conf_req_flag, - qop_req, - conf_state, -@@ -2483,8 +2574,13 @@ spnego_gss_unwrap_iov(OM_uint32 *minor_status, - int iov_count) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ - ret = gss_unwrap_iov(minor_status, -- context_handle, -+ sc->ctx_handle, - conf_state, - qop_state, - iov, -@@ -2502,8 +2598,13 @@ spnego_gss_wrap_iov_length(OM_uint32 *minor_status, - int iov_count) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ - ret = gss_wrap_iov_length(minor_status, -- context_handle, -+ sc->ctx_handle, - conf_req_flag, - qop_req, - conf_state, -@@ -2520,8 +2621,13 @@ spnego_gss_complete_auth_token( - gss_buffer_t input_message_buffer) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_UNAVAILABLE); -+ - ret = gss_complete_auth_token(minor_status, -- context_handle, -+ sc->ctx_handle, - input_message_buffer); - return (ret); - } -@@ -2773,8 +2879,13 @@ spnego_gss_pseudo_random(OM_uint32 *minor_status, - gss_buffer_t prf_out) - { - OM_uint32 ret; -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ - ret = gss_pseudo_random(minor_status, -- context, -+ sc->ctx_handle, - prf_key, - prf_in, - desired_output_len, -@@ -2915,7 +3026,12 @@ spnego_gss_get_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, - gss_qop_t qop_req, gss_iov_buffer_desc *iov, - int iov_count) - { -- return gss_get_mic_iov(minor_status, context_handle, qop_req, iov, -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ -+ return gss_get_mic_iov(minor_status, sc->ctx_handle, qop_req, iov, - iov_count); - } - -@@ -2924,7 +3040,12 @@ spnego_gss_verify_mic_iov(OM_uint32 *minor_status, gss_ctx_id_t context_handle, - gss_qop_t *qop_state, gss_iov_buffer_desc *iov, - int iov_count) - { -- return gss_verify_mic_iov(minor_status, context_handle, qop_state, iov, -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ -+ return gss_verify_mic_iov(minor_status, sc->ctx_handle, qop_state, iov, - iov_count); - } - -@@ -2933,7 +3054,12 @@ spnego_gss_get_mic_iov_length(OM_uint32 *minor_status, - gss_ctx_id_t context_handle, gss_qop_t qop_req, - gss_iov_buffer_desc *iov, int iov_count) - { -- return gss_get_mic_iov_length(minor_status, context_handle, qop_req, iov, -+ spnego_gss_ctx_id_t sc = (spnego_gss_ctx_id_t)context_handle; -+ -+ if (sc->ctx_handle == GSS_C_NO_CONTEXT) -+ return (GSS_S_NO_CONTEXT); -+ -+ return gss_get_mic_iov_length(minor_status, sc->ctx_handle, qop_req, iov, - iov_count); - } - --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/Fix-build_principal-memory-bug-CVE-2015-2697.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/Fix-build_principal-memory-bug-CVE-2015-2697.patch deleted file mode 100644 index 9b0c18b75f65e0af66884b35a18c4a9d6628a5cd..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/Fix-build_principal-memory-bug-CVE-2015-2697.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 9cb63711e63042f22da914ba039c4537b22e8fb0 Mon Sep 17 00:00:00 2001 -From: Greg Hudson -Date: Fri, 25 Sep 2015 12:51:47 -0400 -Subject: [PATCH 3/4] Fix build_principal memory bug [CVE-2015-2697] - -In build_principal_va(), use k5memdup0() instead of strdup() to make a -copy of the realm, to ensure that we allocate the correct number of -bytes and do not read past the end of the input string. This bug -affects krb5_build_principal(), krb5_build_principal_va(), and -krb5_build_principal_alloc_va(). krb5_build_principal_ext() is not -affected. - -CVE-2015-2697: - -In MIT krb5 1.7 and later, an authenticated attacker may be able to -cause a KDC to crash using a TGS request with a large realm field -beginning with a null byte. If the KDC attempts to find a referral to -answer the request, it constructs a principal name for lookup using -krb5_build_principal() with the requested realm. Due to a bug in this -function, the null byte causes only one byte be allocated for the -realm field of the constructed principal, far less than its length. -Subsequent operations on the lookup principal may cause a read beyond -the end of the mapped memory region, causing the KDC process to crash. - -CVSSv2: AV:N/AC:L/Au:S/C:N/I:N/A:C/E:POC/RL:OF/RC:C - -ticket: 8252 (new) -target_version: 1.14 -tags: pullup - -Backport upstream commit: -https://github.com/krb5/krb5/commit/f0c094a1b745d91ef2f9a4eae2149aac026a5789 - -Upstream-Status: Backport ---- - src/lib/krb5/krb/bld_princ.c | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c -index ab6fed8..8604268 100644 ---- a/src/lib/krb5/krb/bld_princ.c -+++ b/src/lib/krb5/krb/bld_princ.c -@@ -40,10 +40,8 @@ build_principal_va(krb5_context context, krb5_principal princ, - data = malloc(size * sizeof(krb5_data)); - if (!data) { retval = ENOMEM; } - -- if (!retval) { -- r = strdup(realm); -- if (!r) { retval = ENOMEM; } -- } -+ if (!retval) -+ r = k5memdup0(realm, rlen, &retval); - - while (!retval && (component = va_arg(ap, char *))) { - if (count == size) { --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-CVE-2016-3119.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-CVE-2016-3119.patch deleted file mode 100644 index 67fefed898329bb2ec3ee916139d6a7d4a42e480..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-CVE-2016-3119.patch +++ /dev/null @@ -1,36 +0,0 @@ -Subject: kerb: Fix LDAP null deref on empty arg [CVE-2016-3119] -From: Greg Hudson - -In the LDAP KDB module's process_db_args(), strtok_r() may return NULL -if there is an empty string in the db_args array. Check for this case -and avoid dereferencing a null pointer. - -CVE-2016-3119: - -In MIT krb5 1.6 and later, an authenticated attacker with permission -to modify a principal entry can cause kadmind to dereference a null -pointer by supplying an empty DB argument to the modify_principal -command, if kadmind is configured to use the LDAP KDB module. - - CVSSv2 Vector: AV:N/AC:H/Au:S/C:N/I:N/A:C/E:H/RL:OF/RC:ND - -ticket: 8383 (new) -target_version: 1.14-next -target_version: 1.13-next -tags: pullup - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi -Index: krb5-1.13.2/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c -=================================================================== ---- krb5-1.13.2.orig/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c 2015-05-09 07:27:02.000000000 +0800 -+++ krb5-1.13.2/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c 2016-04-11 15:17:12.874140518 +0800 -@@ -267,6 +267,7 @@ - if (db_args) { - for (i=0; db_args[i]; ++i) { - arg = strtok_r(db_args[i], "=", &arg_val); -+ arg = (arg != NULL) ? arg : ""; - if (strcmp(arg, TKTPOLICY_ARG) == 0) { - dptr = &xargs->tktpolicydn; - } else { diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-admin-server.service b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-admin-server.service new file mode 100644 index 0000000000000000000000000000000000000000..1b4271643e05dcd500b1c0697825e17e5ed388e3 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-admin-server.service @@ -0,0 +1,14 @@ +[Unit] +Description=MIT Kerberos KDC administrative daemon +After=syslog.target network.target +ConditionPathExists=/etc/krb5.conf + +[Service] +Type=forking +ExecStartPre=/bin/sh -c "test ! -f /var/log/kadmind.log || test ! -x /sbin/restorecon || /sbin/restorecon -F /var/log/kadmind.log" +ExecStart=/usr/sbin/kadmind +SuccessExitStatus=1 2 SIGKILL +TimeoutStopSec=30 + +[Install] +WantedBy=multi-user.target diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-kdc.service b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-kdc.service new file mode 100644 index 0000000000000000000000000000000000000000..d5e5a957943ddcc589054a8a421b0e186e2502bd --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/krb5-kdc.service @@ -0,0 +1,13 @@ +[Unit] +Description=MIT Kerberos KDC +After=syslog.target network.target +ConditionPathExists=/etc/krb5.conf + +[Service] +Type=forking +ExecStart=/usr/sbin/krb5kdc +SuccessExitStatus=1 2 SIGKILL +TimeoutStopSec=30 + +[Install] +WantedBy=multi-user.target diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.13.6.bb similarity index 68% rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb rename to import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.13.6.bb index 713b76c080d5aac8d026aadef6bfb84168736805..06f7f90bdc0242fd7403329d0403fabef46e3ee3 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.13.6.bb @@ -14,31 +14,31 @@ DESCRIPTION = "Kerberos is a system for authenticating users and services on a n HOMEPAGE = "http://web.mit.edu/Kerberos/" SECTION = "console/network" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=f64248328d2d9928e1f04158b5243e7f" +LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=c6f37efad53b098e420f45e7ab6807dc" DEPENDS = "ncurses util-linux e2fsprogs e2fsprogs-native" -inherit autotools-brokensep binconfig perlnative +inherit autotools-brokensep binconfig perlnative systemd SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" -SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}-signed.tar \ +SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ file://0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch \ file://debian-suppress-usr-lib-in-krb5-config.patch;striplevel=2 \ - file://Fix-SPNEGO-context-aliasing-bugs-CVE-2015-2695.patch;striplevel=2 \ - file://Fix-IAKERB-context-aliasing-bugs-CVE-2015-2696.patch;striplevel=2 \ - file://Fix-build_principal-memory-bug-CVE-2015-2697.patch;striplevel=2 \ - file://Fix-IAKERB-context-export-import-CVE-2015-2698.patch;striplevel=2 \ file://crosscompile_nm.patch \ file://etc/init.d/krb5-kdc \ file://etc/init.d/krb5-admin-server \ file://etc/default/krb5-kdc \ file://etc/default/krb5-admin-server \ - file://krb5-CVE-2016-3119.patch;striplevel=2 \ + file://krb5-kdc.service \ + file://krb5-admin-server.service \ " -SRC_URI[md5sum] = "f7ebfa6c99c10b16979ebf9a98343189" -SRC_URI[sha256sum] = "e528c30b0209c741f6f320cb83122ded92f291802b6a1a1dc1a01dcdb3ff6de1" +SRC_URI[md5sum] = "6164ca9c075b4ecc68eadd6d13040417" +SRC_URI[sha256sum] = "9c0a46b8918237a53916370d2e02298c2b294f55f0351f9404e18930bc26badc" S = "${WORKDIR}/${BP}/src" +SYSTEMD_SERVICE_${PN} = "krb5-admin-server.service krb5-kdc.service" +SYSTEMD_AUTO_ENABLE = "disable" + PACKAGECONFIG ??= "openssl" PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit" PACKAGECONFIG[openssl] = "--with-pkinit-crypto-impl=openssl,,openssl" @@ -51,8 +51,8 @@ CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regc ac_cv_printf_positional=yes ac_cv_file__etc_environment=yes \ ac_cv_file__etc_TIMEZONE=no" -CFLAGS_append += "-DDESTRUCTOR_ATTR_WORKS=1 -I${STAGING_INCDIR}/et" -LDFLAGS_append += "-lpthread" +CFLAGS_append = " -fPIC -DDESTRUCTOR_ATTR_WORKS=1 -I${STAGING_INCDIR}/et" +LDFLAGS_append = " -pthread" FILES_${PN} += "${datadir}/gnats" FILES_${PN}-doc += "${datadir}/examples" @@ -61,16 +61,6 @@ FILES_${PN}-dbg += "${libdir}/krb5/plugins/*/.debug" # As this recipe doesn't inherit update-rc.d, we need to add this dependency here RDEPENDS_${PN}_class-target += "initscripts-functions" -krb5_do_unpack() { - # ${P}-signed.tar contains ${P}.tar.gz.asc and ${P}.tar.gz - tar xzf ${WORKDIR}/${BP}.tar.gz -C ${WORKDIR}/ -} - -python do_unpack() { - bb.build.exec_func('base_do_unpack', d) - bb.build.exec_func('krb5_do_unpack', d) -} - do_configure() { gnu-configize --force autoreconf @@ -78,20 +68,26 @@ do_configure() { } do_install_append() { - mkdir -p ${D}/${sysconfdir}/init.d ${D}/${sysconfdir}/default - install -m 0755 ${WORKDIR}/etc/init.d/* ${D}/${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/etc/default/* ${D}/${sysconfdir}/default - rm -rf ${D}/${localstatedir}/run - mkdir -p ${D}/${sysconfdir}/default/volatiles - echo "d root root 0755 ${localstatedir}/run/krb5kdc none" \ - > ${D}${sysconfdir}/default/volatiles/87_krb5 + + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + mkdir -p ${D}/${sysconfdir}/init.d ${D}/${sysconfdir}/default + install -m 0755 ${WORKDIR}/etc/init.d/* ${D}/${sysconfdir}/init.d + install -m 0644 ${WORKDIR}/etc/default/* ${D}/${sysconfdir}/default + + mkdir -p ${D}/${sysconfdir}/default/volatiles + echo "d root root 0755 ${localstatedir}/run/krb5kdc none" \ + > ${D}${sysconfdir}/default/volatiles/87_krb5 + fi if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d /run/krb5kdc - - - -" \ > ${D}${sysconfdir}/tmpfiles.d/krb5.conf - fi + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/krb5-admin-server.service ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/krb5-kdc.service ${D}${systemd_system_unitdir} + fi } pkg_postinst_${PN} () { diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch new file mode 100644 index 0000000000000000000000000000000000000000..92e657c00a0292bc98799d194b72597f8b40bddf --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim/clang.patch @@ -0,0 +1,73 @@ +Check for clang compiler since we need to disable +unused-function warning for clang, at same time +pass werror when checking for compiler options if +werror is enabled so spurious options do not get +enabled. Only the ones that are supported by given +compiler are accepted. + +Signed-off-by: Khem Raj +Upstream-Status: Pending + +Index: libmbim-1.14.0/m4/compiler-warnings.m4 +=================================================================== +--- libmbim-1.14.0.orig/m4/compiler-warnings.m4 ++++ libmbim-1.14.0/m4/compiler-warnings.m4 +@@ -2,10 +2,30 @@ AC_DEFUN([LIBMBIM_COMPILER_WARNINGS], + [AC_ARG_ENABLE(more-warnings, + AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]), + set_more_warnings="$enableval",set_more_warnings=error) ++ ++# Clang throws a lot of warnings when it does not understand a flag. Disable ++# this warning for now so other warnings are visible. ++AC_MSG_CHECKING([if compiling with clang]) ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ ++#ifndef __clang__ ++ not clang ++#endif ++ ]])], ++ [CLANG=yes], ++ [CLANG=no] ++) ++AC_MSG_RESULT([$CLANG]) ++AS_IF([test "x$CLANG" = "xyes"], [CLANG_FLAGS=-Wno-error=unused-function]) ++CFLAGS="$CFLAGS $CLANG_FLAGS" ++LDFLAGS="$LDFLAGS $CLANG_FLAGS" ++ + AC_MSG_CHECKING(for more warnings) + if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then + AC_MSG_RESULT(yes) + CFLAGS="-Wall -std=gnu89 $CFLAGS" ++ if test "x$set_more_warnings" = xerror; then ++ WERROR="-Werror" ++ fi + + for option in -Wmissing-declarations -Wmissing-prototypes \ + -Wdeclaration-after-statement -Wstrict-prototypes \ +@@ -17,22 +37,23 @@ if test "$GCC" = "yes" -a "$set_more_war + -Wmissing-include-dirs -Waggregate-return \ + -Wformat-security; do + SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" ++ CFLAGS="$CFLAGS $option $WERROR" + AC_MSG_CHECKING([whether gcc understands $option]) + AC_TRY_COMPILE([], [], + has_option=yes, + has_option=no,) + if test $has_option = no; then + CFLAGS="$SAVE_CFLAGS" ++ else ++ CFLAGS="$SAVE_CFLAGS $option" + fi + AC_MSG_RESULT($has_option) + unset has_option + unset SAVE_CFLAGS + done ++ CFLAGS="$CFLAGS $WERROR" + unset option +- if test "x$set_more_warnings" = xerror; then +- CFLAGS="$CFLAGS -Werror" +- fi ++ unset WERROR + else + AC_MSG_RESULT(no) + fi diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.12.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.14.0.bb similarity index 70% rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.12.2.bb rename to import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.14.0.bb index f1ecce59c11b200627b6385ab0817675a3c45e28..02a178863374ca53256161f6868a2dc76f7bcd16 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.12.2.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libmbim/libmbim_1.14.0.bb @@ -9,8 +9,10 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "glib-2.0 libgudev" -inherit autotools pkgconfig +inherit autotools pkgconfig bash-completion -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "921fb5ab3f13f1e00833e009d8f3b4f6" -SRC_URI[sha256sum] = "949351d3e3d69b81e40a49f1d187944c26149e0647a415f0227ccdc112047b29" +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ + file://clang.patch \ +" +SRC_URI[md5sum] = "2ed809e65c85353d3ab59e372890e549" +SRC_URI[sha256sum] = "ca8d52a95a18cbabae8f15f83f1572316e888b6504f946e6645d24405127ab5b" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb similarity index 61% rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.5.bb rename to import-layers/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb index 8f1d1ffd01cd9335a2bbed2e20fd0df4ace24a2c..a35dff8b77229a50db67431d8cb6aceec64cf4ce 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.5.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.6.bb @@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "http://libndp.org/files/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "beb82e8d75d8382d1b7c0bb0f68be429" -SRC_URI[sha256sum] = "faf116ab70ce9514ec4e8573556025debea08f606e7f38b616de1f26e120c795" +SRC_URI[md5sum] = "1e54d26bcb4a4110bc3f90c5dd04f1a7" +SRC_URI[sha256sum] = "0c7dfa84e013bd5e569ef2c6292a6f72cfaf14f4ff77a77425e52edc33ffac0e" inherit autotools diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Support-musl-libc-remove-support-for-glibc-2.1.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Support-musl-libc-remove-support-for-glibc-2.1.patch new file mode 100644 index 0000000000000000000000000000000000000000..98008dba947f9792b878ce16fab62d8f13c72fb6 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet/0001-Support-musl-libc-remove-support-for-glibc-2.1.patch @@ -0,0 +1,58 @@ +From ffd7fab744a9ad2893169a8fb6244074604d5d0d Mon Sep 17 00:00:00 2001 +From: rofl0r +Date: Tue, 12 Aug 2014 21:51:39 +0200 +Subject: [PATCH] Support musl libc, remove support for glibc < 2.1 + +Upstream-Status: Backport + +The workarounds for glibc < 2.1 (was released february 1999) break the +build with musl libc. + +It is very unlikely that 2.0 or earlier is still in use, and if so, +1) that's a big security hole +2) code wouldnt compile anyway since noone tested build in the last decade +3) user of it wouldn't expect anyway to get bleeding edge sw built on it, + so he would just use the latest version that works for him. + +Closes #52 + +Signed-off-by: rofl0r +Signed-off-by: Ming Liu +--- + libnet/src/libnet_link_linux.c | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/src/libnet_link_linux.c b/src/libnet_link_linux.c +index 054458d..3c6df3c 100644 +--- a/src/libnet_link_linux.c ++++ b/src/libnet_link_linux.c +@@ -30,26 +30,15 @@ + #include + + #include +-#if (__GLIBC__) + #include + #include +-#else +-#include +-#include +-#endif + + #if (HAVE_PACKET_SOCKET) + #ifndef SOL_PACKET + #define SOL_PACKET 263 + #endif /* SOL_PACKET */ +-#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 + #include + #include /* the L2 protocols */ +-#else +-#include +-#include +-#include /* The L2 protocols */ +-#endif + #endif /* HAVE_PACKET_SOCKET */ + + #include "../include/libnet.h" +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb index a558e8096c381bb2b83ad1ef39f3301e73759cbb..dfc20496046204d802dac6c61248561ae78c4a75 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libnet/libnet_1.2-rc3.bb @@ -8,7 +8,9 @@ DEPENDS = "libpcap" # There are major API changes beween libnet v1.0 and libnet v1.1 PROVIDES = "libnet-1.2rc2" -SRC_URI = "${SOURCEFORGE_MIRROR}/libnet-dev/${BPN}-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/libnet-dev/${BPN}-${PV}.tar.gz \ + file://0001-Support-musl-libc-remove-support-for-glibc-2.1.patch \ + " SRC_URI[md5sum] = "f051e6e5bdecddb90f77c701c2ca1804" SRC_URI[sha256sum] = "72c380785ad44183005e654b47cc12485ee0228d7fa6b0a87109ff7614be4a63" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch new file mode 100644 index 0000000000000000000000000000000000000000..4047ffbf238a1017f134b4178e455c3dd0365881 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi/0001-Detect-clang.patch @@ -0,0 +1,84 @@ +From 4cfb728804157e8f3c69e11ba4df449d8f76388f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 20 Oct 2016 04:42:26 +0000 +Subject: [PATCH] Detect clang + +Check for clang compiler since we need to disable +unused-function warning for clang, at same time +pass werror when checking for compiler options if +werror is enabled so spurious options do not get +enabled. Only the ones that are supported by given +compiler are accepted. + +Signed-off-by: Khem Raj +Upstream-Status: Pending +--- + m4/compiler-warnings.m4 | 29 +++++++++++++++++++++++++---- + 1 file changed, 25 insertions(+), 4 deletions(-) + +diff --git a/m4/compiler-warnings.m4 b/m4/compiler-warnings.m4 +index de4a8b0..e4ba718 100644 +--- a/m4/compiler-warnings.m4 ++++ b/m4/compiler-warnings.m4 +@@ -2,10 +2,30 @@ AC_DEFUN([LIBQMI_COMPILER_WARNINGS], + [AC_ARG_ENABLE(more-warnings, + AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]), + set_more_warnings="$enableval",set_more_warnings=error) ++ ++# Clang throws a lot of warnings when it does not understand a flag. Disable ++# this warning for now so other warnings are visible. ++AC_MSG_CHECKING([if compiling with clang]) ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ ++#ifndef __clang__ ++ not clang ++#endif ++ ]])], ++ [CLANG=yes], ++ [CLANG=no] ++) ++AC_MSG_RESULT([$CLANG]) ++AS_IF([test "x$CLANG" = "xyes"], [CLANG_FLAGS=-Wno-error=unused-function]) ++CFLAGS="$CFLAGS $CLANG_FLAGS" ++LDFLAGS="$LDFLAGS $CLANG_FLAGS" ++ + AC_MSG_CHECKING(for more warnings) + if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then + AC_MSG_RESULT(yes) + CFLAGS="-Wall -std=gnu89 $CFLAGS" ++ if test "x$set_more_warnings" = xerror; then ++ WERROR="-Werror" ++ fi + + for option in -Wmissing-declarations -Wmissing-prototypes \ + -Wdeclaration-after-statement -Wstrict-prototypes \ +@@ -17,22 +37,23 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then + -Wmissing-include-dirs -Waggregate-return \ + -Wformat-security; do + SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" ++ CFLAGS="$CFLAGS $option $WERROR" + AC_MSG_CHECKING([whether gcc understands $option]) + AC_TRY_COMPILE([], [], + has_option=yes, + has_option=no,) + if test $has_option = no; then + CFLAGS="$SAVE_CFLAGS" ++ else ++ CFLAGS="$SAVE_CFLAGS $option" + fi + AC_MSG_RESULT($has_option) + unset has_option + unset SAVE_CFLAGS + done ++ CFLAGS="$CFLAGS $WERROR" + unset option +- if test "x$set_more_warnings" = xerror; then +- CFLAGS="$CFLAGS -Werror" +- fi ++ unset WERROR + else + AC_MSG_RESULT(no) + fi +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.12.6.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.16.0.bb similarity index 63% rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.12.6.bb rename to import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.16.0.bb index 7a15527f147944b4c191dffd0bd6465226c98876..679b102d9210ead9ecfc9b85221e58e5809131f1 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.12.6.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/libqmi/libqmi_1.16.0.bb @@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " -DEPENDS = "glib-2.0" +DEPENDS = "glib-2.0 libgudev libmbim" -inherit autotools pkgconfig +inherit autotools pkgconfig bash-completion -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "24c9eb300662ba6cff0152de89bd9ec0" -SRC_URI[sha256sum] = "0857bffece4e8ddfa7f721dd9ca63b4c78de345ac9ae2faebf04062cacba3780" +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-Detect-clang.patch \ + " +SRC_URI[md5sum] = "4970c110f160b33637a3515004c637b2" +SRC_URI[sha256sum] = "7ab6bb47fd23bf4d3fa17424e40ea5552d08b19e5ee4f125f21f316c8086ba2a" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb index 254b855f3d5b408d991593e983d3fb4f7f23e6da..0939d17f9a5acdb15010d982564e0730a54862ea 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/linuxptp/linuxptp_1.6.bb @@ -9,7 +9,7 @@ SRC_URI[md5sum] = "6aa15d83f5a35f1fd076ba9adc4e7285" SRC_URI[sha256sum] = "e7fd16a9f235b059be527bd512e86f0c1d9f2e7c36736e6d6d9727a4427ac14c" EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} \ - EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_ONESTEP_SYNC ${CFLAGS}'" + EXTRA_CFLAGS='-D_GNU_SOURCE -DHAVE_CLOCK_ADJTIME -DHAVE_ONESTEP_SYNC ${CFLAGS}'" do_install () { install -d ${D}/${bindir} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/0001-lircrcd-Mark-local-inline-funtions-as-static.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/0001-lircrcd-Mark-local-inline-funtions-as-static.patch new file mode 100644 index 0000000000000000000000000000000000000000..e19d27671495617640c7f1a4fae7bd643fb7ad42 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc/0001-lircrcd-Mark-local-inline-funtions-as-static.patch @@ -0,0 +1,49 @@ +From c2be4543e4777c9e3d74b30326ba37b01917b0a9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 25 Aug 2016 03:02:37 +0000 +Subject: [PATCH] lircrcd: Mark local inline funtions as static + +These functions are not used anywhere outside +this file, so they should be converted into static + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + daemons/lircrcd.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/daemons/lircrcd.c b/daemons/lircrcd.c +index 55777cd..5ddc94d 100644 +--- a/daemons/lircrcd.c ++++ b/daemons/lircrcd.c +@@ -153,7 +153,7 @@ char *s; + /* A safer write(), since sockets might not write all but only some of the + bytes requested */ + +-inline int write_socket(int fd, char *buf, int len) ++static inline int write_socket(int fd, char *buf, int len) + { + int done, todo = len; + +@@ -167,7 +167,7 @@ inline int write_socket(int fd, char *buf, int len) + return (len); + } + +-inline int write_socket_len(int fd, char *buf) ++static inline int write_socket_len(int fd, char *buf) + { + int len; + +@@ -177,7 +177,7 @@ inline int write_socket_len(int fd, char *buf) + return (1); + } + +-inline int read_timeout(int fd, char *buf, int len, int timeout) ++static inline int read_timeout(int fd, char *buf, int len, int timeout) + { + fd_set fds; + struct timeval tv; +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb index 900b68d20d260fc703b574dabc196f76f6dc14e2..17261921fe68370feecc02737c943bf83d8e45fa 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb @@ -1,6 +1,7 @@ require lirc.inc SRC_URI += " \ + file://0001-lircrcd-Mark-local-inline-funtions-as-static.patch \ file://lircd.service \ file://lircd.init \ file://lircexec.init \ @@ -17,7 +18,7 @@ SYSTEMD_PACKAGES = "lirc" SYSTEMD_SERVICE_${PN} = "lircd.service lircmd.service" SYSTEMD_AUTO_ENABLE_lirc = "enable" -inherit autotools pkgconfig systemd pythonnative +inherit autotools pkgconfig systemd python3native PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,--without-systemdsystemunitdir,systemd" PACKAGECONFIG[x11] = "--with-x,--with-x=no,libx11," diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch new file mode 100644 index 0000000000000000000000000000000000000000..a3fb0f3eb86fefc553a0980f4ef75336153cac95 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager/enum-conversion.patch @@ -0,0 +1,21 @@ +Fixes errors found bt Clang + +| ../../ModemManager-1.6.4/src/mm-bearer-qmi.c:774:50: error: implicit conversion from enumeration type 'MMBearerStatus' to different enumeration type 'MMBearerConnectionStatus' [-Werror,-Wenum-conversion] +| MMBearerConnectionStatus bearer_status = mm_base_bearer_get_status (MM_BASE_BEARER (self)); +| ~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| 1 error generated. + + +Index: ModemManager-1.6.4/src/mm-bearer-qmi.c +=================================================================== +--- ModemManager-1.6.4.orig/src/mm-bearer-qmi.c ++++ ModemManager-1.6.4/src/mm-bearer-qmi.c +@@ -771,7 +771,7 @@ packet_service_status_indication_cb (Qmi + &connection_status, + NULL, + NULL)) { +- MMBearerConnectionStatus bearer_status = mm_base_bearer_get_status (MM_BASE_BEARER (self)); ++ MMBearerConnectionStatus bearer_status = (MMBearerConnectionStatus)mm_base_bearer_get_status (MM_BASE_BEARER (self)); + + if (connection_status == QMI_WDS_CONNECTION_STATUS_DISCONNECTED && + bearer_status != MM_BEARER_CONNECTION_STATUS_DISCONNECTED && diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb similarity index 81% rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb rename to import-layers/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb index a173e696abb2982ba6fea317f0158a4313643bca..5e4e220821cd087b0616069f397f4ea2e233e749 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.4.12.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/modemmanager/modemmanager_1.6.4.bb @@ -7,13 +7,15 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " -inherit gnomebase gettext systemd vala gobject-introspection +inherit gnomebase gettext systemd vala gobject-introspection bash-completion -DEPENDS = "glib-2.0 libgudev dbus-glib" +DEPENDS = "glib-2.0 libgudev dbus-glib intltool-native" -SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" -SRC_URI[md5sum] = "66cc7266b15525cb366253e6639fc564" -SRC_URI[sha256sum] = "7ef5035375a953b285a742591df0a65fd442f4641ce4d8f4392a41d6d6bc70b3" +SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz \ + file://enum-conversion.patch \ +" +SRC_URI[md5sum] = "06488186c7dd53f8104183b86f7a1568" +SRC_URI[sha256sum] = "cdd5b4cb1e4d7643643a28ccbfc4bb354bfa9cb89a77ea160ebdf7926171c668" S = "${WORKDIR}/ModemManager-${PV}" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.2.4.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.2.4.bb index 16e2a7dca1239babf85fdab96578cec1d43e9d43..4bf238d28aa9cc9cdbf1e2b9479cdd57427af6c3 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.2.4.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.2.4.bb @@ -25,11 +25,11 @@ PACKAGE_BEFORE_PN += "${PN}-server" FILES_${PN}-server = "${bindir}/mosh-server" NEEDED_PERL_MODULES = "\ - perl-module-socket \ - perl-module-getopt-long \ - perl-module-errno \ - perl-module-io-socket-inet \ - perl-module-posix \ + perl-module-socket \ + perl-module-getopt-long \ + perl-module-errno \ + perl-module-io-socket-inet \ + perl-module-posix \ " # mosh uses SSH to authenticate and the client uses OpenSSH-specific features diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.8.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.8.bb index 258ee681e830fba906fbd4d0152596123b31f550..fe1d601216523e042992d8de163bc190927a415c 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.8.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager-openvpn_1.0.8.bb @@ -4,7 +4,7 @@ SECTION = "net/misc" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c" -DEPENDS = "dbus dbus-glib networkmanager openvpn" +DEPENDS = "dbus dbus-glib networkmanager openvpn intltool-native" inherit gnomebase useradd gettext systemd diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch new file mode 100644 index 0000000000000000000000000000000000000000..4eb9e21686ebec1e5387d208f3da97110e6f1eed --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager/0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch @@ -0,0 +1,44 @@ +From 0690452b863286e524d2037427816b7850301f93 Mon Sep 17 00:00:00 2001 +From: Haiqing Bai +Date: Tue, 6 Sep 2016 09:27:38 +0800 +Subject: [PATCH] networkmanager: fixed issues of + NetworkManager-wait-online.service.in. + +Remove network.target in "Before" to avoid circle dependency. +Wants=network.target +Before=network.target network-online.target + +Correct the "WantedBy" to network-online.target. + +Upstream-status: Pending + +Signed-off-by: Haiqing Bai +--- + data/NetworkManager-wait-online.service.in | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in +index 6ad6942..1753d20 100644 +--- a/data/NetworkManager-wait-online.service.in ++++ b/data/NetworkManager-wait-online.service.in +@@ -1,13 +1,14 @@ + [Unit] + Description=Network Manager Wait Online ++Documentation=man:nm-online(1) + Requisite=NetworkManager.service + After=NetworkManager.service +-Wants=network.target +-Before=network.target network-online.target ++Before=network-online.target + + [Service] + Type=oneshot + ExecStart=@bindir@/nm-online -s -q --timeout=30 ++RemainAfterExit=yes + + [Install] +-WantedBy=multi-user.target ++WantedBy=network-online.target +-- +1.9.1 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.12.bb similarity index 87% rename from import-layers/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb rename to import-layers/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.12.bb index 831ddf0cab1da2dee9035ebc10144965f76a0a7c..9134880855f7b0c03570e799f62615e7d1ad231a 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.10.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/networkmanager/networkmanager_1.0.12.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cbbffd568227ada506640fe950a4823b \ file://docs/api/html/license.html;md5=51d7fb67bde992e58533a8481cee070b \ " -DEPENDS = "libnl dbus dbus-glib libgudev util-linux libndp libnewt polkit" +DEPENDS = "intltool-native libnl dbus dbus-glib dbus-glib-native libgudev util-linux libndp libnewt polkit" inherit gnomebase gettext systemd bluetooth bash-completion vala gobject-introspection @@ -15,13 +15,11 @@ SRC_URI = " \ ${GNOME_MIRROR}/NetworkManager/${@gnome_verdir("${PV}")}/NetworkManager-${PV}.tar.xz \ file://0001-don-t-try-to-run-sbin-dhclient-to-get-the-version-nu.patch \ file://0002-add-pkg-config-for-libgcrypt.patch \ - file://0003-core-fix-failure-to-configure-routes-due-to-wrong-de.patch \ - file://0004-ppp-manager-clear-ppp_watch_id-upon-pppd-termination.patch \ - file://0005-device-update-ip_iface-only-if-IP-interface-exists.patch \ file://0006-Fix-nm-version-macro-includes.patch \ + file://0002-networkmanager-fixed-issues-of-NetworkManager-wait-o.patch \ " -SRC_URI[md5sum] = "a8f54460a4708efd840358f32d0968fd" -SRC_URI[sha256sum] = "1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc" +SRC_URI[md5sum] = "ebb273456a81ccf9dfaf2461061b0e96" +SRC_URI[sha256sum] = "3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e" S = "${WORKDIR}/NetworkManager-${PV}" @@ -65,7 +63,7 @@ PACKAGECONFIG[ifupdown] = "--enable-ifupdown,--disable-ifupdown" PACKAGECONFIG[netconfig] = "--with-netconfig=yes,--with-netconfig=no" PACKAGECONFIG[qt4-x11-free] = "--enable-qt,--disable-qt,qt4-x11-free" -PACKAGES =+ "libnmutil libnmglib libnmglib-vpn ${PN}-tests \ +PACKAGES =+ "libnmutil libnmglib libnmglib-vpn \ ${PN}-nmtui ${PN}-nmtui-doc \ ${PN}-adsl \ " @@ -102,10 +100,6 @@ FILES_${PN}-dev += " \ ${libdir}/NetworkManager/*.la \ " -FILES_${PN}-tests = " \ - ${bindir}/nm-online \ -" - FILES_${PN}-nmtui = " \ ${bindir}/nmtui \ ${bindir}/nmtui-edit \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.23.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.23.bb index fcd447cc7c6aabb41872c4cde1408199c6d2a50c..b6bdfb7e436a5e45c4d76df42080511316ae402a 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.23.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.23.bb @@ -4,9 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS += "openobex" -# Depends on openobex -PNBLACKLIST[obexftp] ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5 conflicts with bluez4 and bluez5 is selected in DISTRO_FEATURES', '', d)}" - SRC_URI = "http://sourceforge.net/projects/openobex/files/obexftp/${PV}/obexftp-${PV}.tar.bz2 \ file://Remove_some_printf_in_obexftpd.patch " diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb index dde4599ac4bd1af33fc97d0f62f2a21b9ba55520..0ede5e57bb39593a2a9c358faaeb1f6812961048 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/packagegroups/packagegroup-tools-bluetooth.bb @@ -2,7 +2,7 @@ # Released under the MIT license (see COPYING.MIT for the terms) LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" SUMMARY = "Set of Bluetooth related tools for inclusion in images" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb index 95adecdf9672f828efc432edda8bf955bc9c8b75..b8a9d4a23569e4777c7ba68cbd05ad424d9f3fd8 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/smstools3/smstools3_3.1.15.bb @@ -22,25 +22,25 @@ INITSCRIPT_PARAMS = "defaults" inherit update-rc.d do_install () { - - install -d ${D}${bindir} - install -m 755 ${S}/src/smsd "${D}${bindir}/smsd" - - install -m 755 ${S}/scripts/sendsms "${D}${bindir}/sendsms" - install -m 755 ${S}/scripts/sms2html "${D}${bindir}/sms2html" - install -m 755 ${S}/scripts/sms2unicode "${D}${bindir}/sms2unicode" - install -m 755 ${S}/scripts/unicode2sms "${D}${bindir}/unicode2sms" - - install -d ${D}${sysconfdir} - install -m 644 ${S}/examples/smsd.conf.easy "${D}${sysconfdir}/smsd.conf" - - install -d "${D}${localstatedir}/spool" - install -d "${D}${localstatedir}/spool/sms" - install -d "${D}${localstatedir}/spool/sms/incoming" - install -d "${D}${localstatedir}/spool/sms/outgoing" - install -d "${D}${localstatedir}/spool/sms/checked" - - install -d ${D}${sysconfdir}/init.d - install -m 755 ${S}/scripts/sms3 "${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}" + + install -d ${D}${bindir} + install -m 755 ${S}/src/smsd "${D}${bindir}/smsd" + + install -m 755 ${S}/scripts/sendsms "${D}${bindir}/sendsms" + install -m 755 ${S}/scripts/sms2html "${D}${bindir}/sms2html" + install -m 755 ${S}/scripts/sms2unicode "${D}${bindir}/sms2unicode" + install -m 755 ${S}/scripts/unicode2sms "${D}${bindir}/unicode2sms" + + install -d ${D}${sysconfdir} + install -m 644 ${S}/examples/smsd.conf.easy "${D}${sysconfdir}/smsd.conf" + + install -d "${D}${localstatedir}/spool" + install -d "${D}${localstatedir}/spool/sms" + install -d "${D}${localstatedir}/spool/sms/incoming" + install -d "${D}${localstatedir}/spool/sms/outgoing" + install -d "${D}${localstatedir}/spool/sms/checked" + + install -d ${D}${sysconfdir}/init.d + install -m 755 ${S}/scripts/sms3 "${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}" } diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb index f13e7093c81d607e4637b6cc69089c7c2e64352e..c398dc15a219000f0b1c137b4d3f7a43381f763b 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/libtelepathy_0.3.3.bb @@ -11,8 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ PR = "r5" SRC_URI = "http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-${PV}.tar.gz \ - file://prefer_python_2.5.patch \ - file://doublefix.patch" + file://prefer_python_2.5.patch \ + file://doublefix.patch \ +" SRC_URI[md5sum] = "490ca1a0c614d4466394b72d43bf7370" SRC_URI[sha256sum] = "e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed115878" @@ -20,4 +21,4 @@ SRC_URI[sha256sum] = "e0d230be855125163579743418203c6f6be2f10f98c4f065735c1dc9ed inherit autotools pkgconfig pythonnative FILES_${PN} += "${datadir}/telepathy \ - ${datadir}/dbus-1" + ${datadir}/dbus-1" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb index 9ae68ddea984ff356198fac97f50ff93628fc6e8..582783c9d6a91775197e47f269e0b6baf3aff1fc 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/telepathy/telepathy-mission-control_5.16.1.bb @@ -23,15 +23,15 @@ PACKAGECONFIG[connman] = "--with-connectivity=connman,,connman" PACKAGECONFIG[nm] = "--with-connectivity=nm,,networkmanager" PACKAGES =+ " \ - libmissioncontrol \ - libmissioncontrol-config \ - libmissioncontrol-server \ - libmissioncontrol-dev \ - libmissioncontrol-config-dev \ - libmissioncontrol-server-dev \ - libmissioncontrol-dbg \ - libmissioncontrol-config-dbg \ - libmissioncontrol-server-dbg \ + libmissioncontrol \ + libmissioncontrol-config \ + libmissioncontrol-server \ + libmissioncontrol-dev \ + libmissioncontrol-config-dev \ + libmissioncontrol-server-dev \ + libmissioncontrol-dbg \ + libmissioncontrol-config-dbg \ + libmissioncontrol-server-dbg \ " FILES_${PN} += "${datadir}/dbus* ${datadir}/glib-2.0/schemas" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-Forcibly-disable-check-for-Qt5.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-Forcibly-disable-check-for-Qt5.patch new file mode 100644 index 0000000000000000000000000000000000000000..fcc2f0821488bffe92d7a6a49dd16cb5b5050bf3 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-Forcibly-disable-check-for-Qt5.patch @@ -0,0 +1,27 @@ +From b3da0d8677b7e8467367a303c18551c56ed20e15 Mon Sep 17 00:00:00 2001 +From: Philip Balister +Date: Tue, 12 Apr 2016 17:30:15 -0400 +Subject: [PATCH] Forcibly disable check for Qt5. + +Signed-off-by: Philip Balister +--- + build/cmake/DefineOptions.cmake | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/build/cmake/DefineOptions.cmake b/build/cmake/DefineOptions.cmake +index 62e240f..f8b4493 100644 +--- a/build/cmake/DefineOptions.cmake ++++ b/build/cmake/DefineOptions.cmake +@@ -52,9 +52,6 @@ CMAKE_DEPENDENT_OPTION(WITH_LIBEVENT "Build with libevent support" ON + find_package(Qt4 QUIET COMPONENTS QtCore QtNetwork) + CMAKE_DEPENDENT_OPTION(WITH_QT4 "Build with Qt4 support" ON + "QT4_FOUND" OFF) +-find_package(Qt5 QUIET COMPONENTS Core Network) +-CMAKE_DEPENDENT_OPTION(WITH_QT5 "Build with Qt5 support" ON +- "Qt5_FOUND" OFF) + if(${WITH_QT4} AND ${WITH_QT5} AND ${CMAKE_MAJOR_VERSION} LESS 3) + # cmake < 3.0.0 causes conflict when building both Qt4 and Qt5 + set(WITH_QT4 OFF) +-- +2.5.5 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-THRIFT-3828-In-cmake-avoid-use-of-both-quoted-paths-.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-THRIFT-3828-In-cmake-avoid-use-of-both-quoted-paths-.patch new file mode 100644 index 0000000000000000000000000000000000000000..7cc8d17393165573175274cfb667ee82b8951e31 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0001-THRIFT-3828-In-cmake-avoid-use-of-both-quoted-paths-.patch @@ -0,0 +1,110 @@ +From bc577820ad25795543b31f123e309cdaebc7d6c6 Mon Sep 17 00:00:00 2001 +From: Cody P Schafer +Date: Mon, 16 May 2016 15:21:10 -0400 +Subject: [PATCH 1/2] THRIFT-3828 In cmake avoid use of both quoted paths and + SYSTEM with include_directories() + +This allows us to avoid issues where there are no paths to be added to +the include path (include_directories() errors when given an empty +string). + +Specifically, gcc-6 requires that libraries stop passing paths like +'/usr/include' (or they will get libstdc++ build errors), so these paths +will be empty more often in the future. +--- + lib/cpp/CMakeLists.txt | 8 ++++---- + lib/cpp/test/CMakeLists.txt | 2 +- + test/cpp/CMakeLists.txt | 6 +++--- + tutorial/cpp/CMakeLists.txt | 2 +- + 4 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt +index 4c7caeb..a716ac3 100755 +--- a/lib/cpp/CMakeLists.txt ++++ b/lib/cpp/CMakeLists.txt +@@ -24,7 +24,7 @@ else() + find_package(Boost 1.53.0 REQUIRED) + endif() + +-include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") ++include_directories(${Boost_INCLUDE_DIRS}) + include_directories(src) + + # SYSLIBS contains libraries that need to be linked to all lib targets +@@ -104,7 +104,7 @@ if(OPENSSL_FOUND AND WITH_OPENSSL) + src/thrift/transport/TSSLSocket.cpp + src/thrift/transport/TSSLServerSocket.cpp + ) +- include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++ include_directories(${OPENSSL_INCLUDE_DIR}) + list(APPEND SYSLIBS "${OPENSSL_LIBRARIES}") + endif() + +@@ -162,7 +162,7 @@ TARGET_LINK_LIBRARIES_THRIFT(thrift ${SYSLIBS}) + + if(WITH_LIBEVENT) + find_package(Libevent REQUIRED) # Libevent comes with CMake support form upstream +- include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) ++ include_directories(${LIBEVENT_INCLUDE_DIRS}) + + ADD_LIBRARY_THRIFT(thriftnb ${thriftcppnb_SOURCES}) + TARGET_LINK_LIBRARIES_THRIFT(thriftnb ${SYSLIBS} ${LIBEVENT_LIBRARIES}) +@@ -171,7 +171,7 @@ endif() + + if(WITH_ZLIB) + find_package(ZLIB REQUIRED) +- include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ++ include_directories(${ZLIB_INCLUDE_DIRS}) + + ADD_LIBRARY_THRIFT(thriftz ${thriftcppz_SOURCES}) + TARGET_LINK_LIBRARIES_THRIFT(thriftz ${SYSLIBS} ${ZLIB_LIBRARIES}) +diff --git a/lib/cpp/test/CMakeLists.txt b/lib/cpp/test/CMakeLists.txt +index 5de9fc4..c956c38 100644 +--- a/lib/cpp/test/CMakeLists.txt ++++ b/lib/cpp/test/CMakeLists.txt +@@ -20,7 +20,7 @@ + # Find required packages + set(Boost_USE_STATIC_LIBS ON) # Force the use of static boost test framework + find_package(Boost 1.53.0 REQUIRED COMPONENTS chrono filesystem system thread unit_test_framework) +-include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") ++include_directories(${Boost_INCLUDE_DIRS}) + + #Make sure gen-cpp files can be included + include_directories("${CMAKE_CURRENT_BINARY_DIR}") +diff --git a/test/cpp/CMakeLists.txt b/test/cpp/CMakeLists.txt +index 2d75f2e..b1409de 100755 +--- a/test/cpp/CMakeLists.txt ++++ b/test/cpp/CMakeLists.txt +@@ -22,13 +22,13 @@ include(ThriftMacros) + + set(Boost_USE_STATIC_LIBS ON) + find_package(Boost 1.53.0 REQUIRED COMPONENTS program_options system filesystem) +-include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") ++include_directories(${Boost_INCLUDE_DIRS}) + + find_package(OpenSSL REQUIRED) +-include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") ++include_directories(${OPENSSL_INCLUDE_DIR}) + + find_package(Libevent REQUIRED) # Libevent comes with CMake support from upstream +-include_directories(SYSTEM ${LIBEVENT_INCLUDE_DIRS}) ++include_directories(${LIBEVENT_INCLUDE_DIRS}) + + #Make sure gen-cpp files can be included + include_directories("${CMAKE_CURRENT_BINARY_DIR}") +diff --git a/tutorial/cpp/CMakeLists.txt b/tutorial/cpp/CMakeLists.txt +index 2b0c143..5ecae17 100644 +--- a/tutorial/cpp/CMakeLists.txt ++++ b/tutorial/cpp/CMakeLists.txt +@@ -18,7 +18,7 @@ + # + + find_package(Boost 1.53.0 REQUIRED) +-include_directories(SYSTEM "${Boost_INCLUDE_DIRS}") ++include_directories(${Boost_INCLUDE_DIRS}) + + #Make sure gen-cpp files can be included + include_directories("${CMAKE_CURRENT_BINARY_DIR}") +-- +2.9.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0002-THRIFT-3831-in-test-cpp-explicitly-use-signed-char.patch b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0002-THRIFT-3831-in-test-cpp-explicitly-use-signed-char.patch new file mode 100644 index 0000000000000000000000000000000000000000..f13adbb6bc4507ac1baf164480790d163ba40dc9 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0002-THRIFT-3831-in-test-cpp-explicitly-use-signed-char.patch @@ -0,0 +1,40 @@ +From f6cad0580e5391c37af7f60adddb71bf1a403dc4 Mon Sep 17 00:00:00 2001 +From: Cody P Schafer +Date: Fri, 9 Sep 2016 15:50:26 -0400 +Subject: [PATCH 2/2] THRIFT-3831 in test/cpp explicitly use `signed char` + +`char`'s signed-ness is implimentation dependent, and in the case where +`char` was not signed, we previously recieved errors like + + thrift/0.9.3-r0/git/test/cpp/src/TestClient.cpp:404:15: error: narrowing conversion of '-127' from 'int' to 'char' inside { } [-Wnarrowing] + +(This example from gcc-6 on arm) +--- + test/cpp/src/TestClient.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/cpp/src/TestClient.cpp b/test/cpp/src/TestClient.cpp +index e709899..4a961f8 100644 +--- a/test/cpp/src/TestClient.cpp ++++ b/test/cpp/src/TestClient.cpp +@@ -383,7 +383,7 @@ int main(int argc, char** argv) { + * BINARY TEST + */ + printf("testBinary([-128..127]) = {"); +- const char bin_data[256] ++ const signed char bin_data[256] + = {-128, -127, -126, -125, -124, -123, -122, -121, -120, -119, -118, -117, -116, -115, -114, + -113, -112, -111, -110, -109, -108, -107, -106, -105, -104, -103, -102, -101, -100, -99, + -98, -97, -96, -95, -94, -93, -92, -91, -90, -89, -88, -87, -86, -85, -84, +@@ -404,7 +404,7 @@ int main(int argc, char** argv) { + 127}; + try { + string bin_result; +- testClient.testBinary(bin_result, string(bin_data, 256)); ++ testClient.testBinary(bin_result, string(reinterpret_cast(bin_data), 256)); + if (bin_result.size() != 256) { + printf("}\n*** FAILED ***\n"); + printf("invalid length: %lu\n", bin_result.size()); +-- +2.9.3 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb new file mode 100644 index 0000000000000000000000000000000000000000..905e5618d53b364cda1e797b0ed76982ce88b372 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/thrift/thrift_0.9.3.bb @@ -0,0 +1,36 @@ +SUMMARY = "Apache Thrift" +DESCRIPTION = "A software framework, for scalable cross-language services development" +HOMEPAGE = "https://thrift.apache.org/" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e4ed21f679b2aafef26eac82ab0c2cbf" + +DEPENDS = "thrift-native boost python libevent flex-native bison-native \ + glib-2.0 openssl" + +SRC_URI = "git://git-wip-us.apache.org/repos/asf/thrift.git;protocol=https \ + file://0001-Forcibly-disable-check-for-Qt5.patch \ + file://0001-THRIFT-3828-In-cmake-avoid-use-of-both-quoted-paths-.patch \ + file://0002-THRIFT-3831-in-test-cpp-explicitly-use-signed-char.patch \ +" +SRCREV = "61b8a29b0704ccd81b520f2300f5d1bb261fea3e" +S = "${WORKDIR}/git" + +BBCLASSEXTEND = "native nativesdk" + +inherit pkgconfig cmake pythonnative + +export STAGING_INCDIR +export STAGING_LIBDIR +export BUILD_SYS +export HOST_SYS + +EXTRA_OECMAKE = "-DWITH_QT4=OFF -DWITH_QT5=OFF -DBUILD_JAVA=OFF" +EXTRA_OECMAKE_append_class-native = "\ + -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DWITH_CPP=OFF" +EXTRA_OECMAKE_append_class-nativesdk = "\ + -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DWITH_PYTHON=OFF" + +do_install_append () { + ln -sf thrift ${D}/${bindir}/thrift-compiler +} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb index f7adf4c9f4feb477f4d2443bd598b7959e8ac004..65617fa3be01dd990dfc53d56ec56ff3186403fe 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb @@ -28,3 +28,5 @@ do_configure() { do_install() { oe_runmake prefix=${D}/usr PPPDIR=${D}/etc/ppp/peers install } + +PNBLACKLIST[wvdial] ?= "Depends on broken wvstreams" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb index 6199a2f7ec2e080f89e993f7467af0efa1516a6f..8d864484ab23fd4add30d39d3681931823bf0bf8 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb @@ -46,3 +46,6 @@ FILES_libwvstreams-extras-dbg = "${libdir}/.debug/libwvbase.so.* ${libdir}/.debu FILES_${PN}-valgrind = "${libdir}/valgrind/wvstreams.supp" RDEPENDS_${PN} += "perl" + +# http://errors.yoctoproject.org/Errors/Details/68614/ +PNBLACKLIST[wvstreams] ?= "BROKEN: fails to build with gcc-6" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb index c2c4eaefa5fa97dec6f4c337167e86ea3dbaed39..8b9c4b844d5588881b442f20b39e11c08a82a327 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb @@ -24,8 +24,9 @@ DEPENDS = "openldap virtual/libiconv" PACKAGE_ARCH = "${MACHINE_ARCH}" SRC_URI = "http://jaist.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-Fix-configure.ac.patch \ - file://zabbix-agent.service" + file://0001-Fix-configure.ac.patch \ + file://zabbix-agent.service \ +" SRC_URI[md5sum] = "9f8aeb11d8415585f41c3f2f22566b78" SRC_URI[sha256sum] = "d2c47b8f5b9b91f18010d54c45de55845d979014a8b3fe4bef64e0b08f8b00da" @@ -39,21 +40,23 @@ SYSTEMD_AUTO_ENABLE = "enable" USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "-r zabbix" USERADD_PARAM_${PN} = "-r -g zabbix -d /var/lib/zabbix \ - -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix" + -s /sbin/nologin -c \"Zabbix Monitoring System\" zabbix \ +" KERNEL_VERSION = "${@get_kernelversion_headers('${STAGING_KERNEL_DIR}')}" -EXTRA_OECONF = '--enable-dependency-tracking \ - --enable-agent \ - --enable-ipv6 \ - --with-net-snmp \ - --with-ldap=${STAGING_EXECPREFIXDIR} \ - --with-jabber \ - --with-unixodbc \ - --with-ssh2 \ - --with-sqlite3 \ - ' -CFLAGS_append += "-lldap -llber" +EXTRA_OECONF = " \ + --enable-dependency-tracking \ + --enable-agent \ + --enable-ipv6 \ + --with-net-snmp \ + --with-ldap=${STAGING_EXECPREFIXDIR} \ + --with-jabber \ + --with-unixodbc \ + --with-ssh2 \ + --with-sqlite3 \ +" +CFLAGS_append = " -lldap -llber" do_configure_prepend() { export KERNEL_VERSION="${KERNEL_VERSION}" @@ -62,7 +65,7 @@ do_configure_prepend() { do_install_append() { if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service fi } diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.4.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.4.bb deleted file mode 100644 index 2090152da20a1088892c78c4af659213fd16b857..0000000000000000000000000000000000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.4.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework" -HOMEPAGE = "http://www.zeromq.org" -LICENSE = "LGPLv3+" -LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1" -DEPENDS = "libsodium" - -SRC_URI = "http://download.zeromq.org/zeromq-${PV}.tar.gz \ - file://run-ptest \ - " -SRC_URI[md5sum] = "a611ecc93fffeb6d058c0e6edf4ad4fb" -SRC_URI[sha256sum] = "e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378" - -S = "${WORKDIR}/zeromq-${PV}" - -#Uncomment to choose polling system manually. valid values are kqueue, epoll, devpoll, poll or select -#EXTRA_OECONF += "--with-poller=kqueue" -#CFLAGS_append += "-O0" -#CXXFLAGS_append += "-O0" - -inherit autotools ptest pkgconfig - -do_compile_ptest () { - echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${B}/Makefile - oe_runmake buildtest-TESTS -} - -do_install_ptest () { - install -d ${D}${PTEST_PATH}/tests - install -m 0755 ${B}/.libs/test_* ${D}${PTEST_PATH}/tests -} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb new file mode 100644 index 0000000000000000000000000000000000000000..8da86746be4fcef143ea013b95d93810ec2979a4 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.5.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "ZeroMQ looks like an embeddable networking library but acts like a concurrency framework" +HOMEPAGE = "http://www.zeromq.org" +LICENSE = "LGPLv3+" +LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1" + +PACKAGECONFIG ??= "libsodium" +PACKAGECONFIG[libsodium] = "--with-libsodium, --without-libsodium, libsodium" + +SRC_URI = "http://github.com/zeromq/zeromq4-1/releases/download/v${PV}/zeromq-${PV}.tar.gz \ + file://run-ptest \ +" +SRC_URI[md5sum] = "e7adf4b7dbae09b28cfd10d26cd67fac" +SRC_URI[sha256sum] = "04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf" + +S = "${WORKDIR}/zeromq-${PV}" + +#Uncomment to choose polling system manually. valid values are kqueue, epoll, devpoll, poll or select +#EXTRA_OECONF += "--with-poller=kqueue" +#CFLAGS_append = " -O0" +#CXXFLAGS_append = " -O0" + +inherit autotools ptest pkgconfig + +do_compile_ptest () { + echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${B}/Makefile + oe_runmake buildtest-TESTS +} + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/.libs/test_* ${D}${PTEST_PATH}/tests +} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/llvm/llvm-common/llvm-config b/import-layers/meta-openembedded/meta-oe/recipes-core/llvm/llvm-common/llvm-config index a9a416d93164642c883b3c329e6f2206fc739204..b0f33c8d68d382db9f1c56b595750f065b8a9f5e 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-core/llvm/llvm-common/llvm-config +++ b/import-layers/meta-openembedded/meta-oe/recipes-core/llvm/llvm-common/llvm-config @@ -4,7 +4,8 @@ if [ $WANT_LLVM_RELEASE ]; then exec `dirname $0`/${TARGET_PREFIX}llvm-config$WANT_LLVM_RELEASE ${@} else - echo "The variable WANT_LLVM_RELEASE is not defined and exported" - echo "by your build recipe. Go figure." - exit 1 + echo "To use llvm-common WANT_LLVM_RELEASE needs to be exported." + echo "For example if this is being called through a recipe:" + echo "export WANT_LLVM_RELEASE=\"3.3\"" + exit 1 fi diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/import-layers/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb index 21dd1deb65b664fd69a9b67748f9be5f748ab9aa..a53fa69de40a34edf6c778ec01bd6719bf66d5a5 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb @@ -22,7 +22,7 @@ MACHINE_EXTRA_RRECOMMENDS ?= "" TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server" # -# The section below is designed to match with packagegroup-boot, but doesn't depend on it to allow for more freedom +# The section below is designed to match with packagegroup-boot, but doesn't depend on it to allow for more freedom # when writing image recipes. # It also avoids the choice between connman/networkmanager/ifupdown since that is an image feature, not a # distro feature. @@ -38,7 +38,7 @@ RDEPENDS_${PN} = "\ # The following section is split in 3: # 1) Machine features: kernel modules and userspace helpers for those # 2) Distro features: packages associated with those -# 3) Nice to have: packages that are nice to have, but aren't strictly needed +# 3) Nice to have: packages that are nice to have, but aren't strictly needed # RRECOMMENDS_${PN} = "\ ${MACHINE_EXTRA_RRECOMMENDS} \ diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb index 9ca85028181ce6e9e9946e56503227e64615f7b4..1c1a02d0bf104d07fa8c8496789ef459893aa823 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-core/plymouth/plymouth_0.9.2.bb @@ -1,8 +1,9 @@ SUMMARY = "Plymouth is a project from Fedora providing a flicker-free graphical boot process." DESCRIPTION = "Plymouth is an application that runs very early in the boot process \ - (even before the root filesystem is mounted!) that provides a \ - graphical boot animation while the boot process happens in the background." + (even before the root filesystem is mounted!) that provides a \ + graphical boot animation while the boot process happens in the background. \ +" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/Plymouth" SECTION = "base" @@ -19,34 +20,38 @@ SRC_URI = "http://www.freedesktop.org/software/plymouth/releases/${BPN}-${PV}.ta SRC_URI[md5sum] = "ff420994deb7ea203df678df92e7ab7d" SRC_URI[sha256sum] = "2f0ce82042cf9c7eadd2517a1f74c8a85fa8699781d9f294a06eade29fbed57f" -EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation\ - --with-logo=${LOGO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-system-root-install', '', d)} \ - " +EXTRA_OECONF += " --enable-shared --disable-static --disable-gtk --disable-documentation \ + --with-logo=${LOGO} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--enable-systemd-integration --with-system-root-install', '', d)} \ +" + +PACKAGECONFIG ??= "pango initrd" +PACKAGECONFIG_append_x86 = " drm" +PACKAGECONFIG_append_x86-64 = " drm" PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+" - -PACKAGECONFIG ??= "pango" +PACKAGECONFIG[initrd] = ",,," LOGO ??= "${datadir}/plymouth/bizcom.png" -PACKAGECONFIG_append_x86 = " drm" -PACKAGECONFIG_append_x86-64 = " drm" - inherit autotools pkgconfig systemd - do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 644 ${B}/systemd-units/*.service ${D}${systemd_unitdir}/system - install -m 644 ${B}/systemd-units/systemd-ask-password-plymouth.path ${D}${systemd_unitdir}/system - # Remove /var/run from package as plymouth will populate it on startup - rm -fr "${D}${localstatedir}/run" + install -d ${D}${systemd_unitdir}/system + install -m 644 ${B}/systemd-units/*.service ${D}${systemd_unitdir}/system + install -m 644 ${B}/systemd-units/systemd-ask-password-plymouth.path ${D}${systemd_unitdir}/system + # Remove /var/run from package as plymouth will populate it on startup + rm -fr "${D}${localstatedir}/run" + + if ! ${@bb.utils.contains('PACKAGECONFIG', 'initrd', 'true', 'false', d)}; then + rm -rf "${D}${libexecdir}" + fi } -PACKAGES =+ "${PN}-initrd ${PN}-set-default-theme" +PACKAGES =. "${@bb.utils.contains('PACKAGECONFIG', 'initrd', '${PN}-initrd ', '', d)}" +PACKAGES =+ "${PN}-set-default-theme" FILES_${PN}-initrd = "${libexecdir}/plymouth/*" FILES_${PN}-set-default-theme = "${sbindir}/plymouth-set-default-theme" diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Fix-TOYBOX_VERSION.patch b/import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Fix-TOYBOX_VERSION.patch new file mode 100644 index 0000000000000000000000000000000000000000..8af4305111249ef6fd73643d19bb50ab7b4a8021 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0001-Fix-TOYBOX_VERSION.patch @@ -0,0 +1,29 @@ +From 209fad8ebd17bf46d0431dafbb547f429a3cffdf Mon Sep 17 00:00:00 2001 +From: Paul Barker +Date: Sat, 4 Jun 2016 15:05:49 +0100 +Subject: [PATCH 1/2] Fix TOYBOX_VERSION + +The latest tagged version is 0.7.1. + +Signed-off-by: Paul Barker +Upstream-status: Submitted +--- + main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/main.c b/main.c +index eeae2f3..bedb333 100644 +--- a/main.c ++++ b/main.c +@@ -6,7 +6,7 @@ + #include "toys.h" + + #ifndef TOYBOX_VERSION +-#define TOYBOX_VERSION "0.7.0" ++#define TOYBOX_VERSION "0.7.1" + #endif + + // Populate toy_list[]. +-- +2.1.4 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0002-Fix-trimmed-printf-in-grep.patch b/import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0002-Fix-trimmed-printf-in-grep.patch new file mode 100644 index 0000000000000000000000000000000000000000..37808d03bc56b2e6f6a8a6a82ccb8d532d01adbf --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox/0002-Fix-trimmed-printf-in-grep.patch @@ -0,0 +1,34 @@ +From 9c51a0d7690fb3b08871dae2486af4032d8442fb Mon Sep 17 00:00:00 2001 +From: Paul Barker +Date: Sat, 4 Jun 2016 15:42:48 +0100 +Subject: [PATCH 2/2] Fix trimmed printf in grep + +Using a default trim value of INT_MAX/2 when printing a line causes nothing to +be printed on a system built using OpenEmbedded for the qemux86 target. This may +also affect other systems. + +Signed-off-by: Paul Barker +Upstream-status: Submitted +--- + toys/posix/grep.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/toys/posix/grep.c b/toys/posix/grep.c +index 2ca02d2..f38c538 100644 +--- a/toys/posix/grep.c ++++ b/toys/posix/grep.c +@@ -74,7 +74,10 @@ static void outline(char *line, char dash, char *name, long lcount, long bcount, + if (!line || (lcount && (toys.optflags&FLAG_n))) + printf("%ld%c", lcount, line ? dash : TT.outdelim); + if (bcount && (toys.optflags&FLAG_b)) printf("%ld%c", bcount-1, dash); +- if (line) xprintf("%.*s%c", trim ? trim : INT_MAX/2, line, TT.outdelim); ++ if (line) { ++ if (trim) xprintf("%.*s%c", trim, line, TT.outdelim); ++ else xprintf("%s%c", line, TT.outdelim); ++ } + } + + // Show matches in one file +-- +2.1.4 + diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.6.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.1.bb similarity index 68% rename from import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.6.0.bb rename to import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.1.bb index da03200b2d0f57d2e5eb77d1dcdb282b67da66fd..defca7016f5545995bb96eed1bbb874a7794c566 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.6.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-core/toybox/toybox_0.7.1.bb @@ -1,29 +1,38 @@ SUMMARY = "Toybox combines common utilities together into a single executable." HOMEPAGE = "http://www.landley.net/toybox/" +DEPENDS = "attr" -SRC_URI = "http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz" - -SRC_URI[md5sum] = "7f4a6c89e56c48e3350e611f5b36c2cf" -SRC_URI[sha256sum] = "b6e2694d19ac08f1c3416d5b2a02a31d445db2ed98dec89761430cdff2c9710d" +SRC_URI = " \ + http://www.landley.net/toybox/downloads/${BPN}-${PV}.tar.gz \ + file://0001-Fix-TOYBOX_VERSION.patch \ + file://0002-Fix-trimmed-printf-in-grep.patch \ +" +SRC_URI[md5sum] = "e959e5ff8c6806781eb06e56f302a393" +SRC_URI[sha256sum] = "5bb3069f58faf12940d5cfde3209ac7f63210bebdd9023979b0c20cede126ea7" LICENSE = "BSD-0-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=f0b8b3dd6431bcaa245da0a08bd0d511" SECTION = "base" +TOYBOX_BIN = "generated/unstripped/toybox" + do_configure() { oe_runmake defconfig # Disable killall5 as it isn't managed by update-alternatives sed -e 's/CONFIG_KILLALL5=y/# CONFIG_KILLALL5 is not set/' -i .config + + # Disable swapon as it doesn't handle the '-a' argument used during boot + sed -e 's/CONFIG_SWAPON=y/# CONFIG_SWAPON is not set/' -i .config } do_compile() { - oe_runmake toybox_unstripped + oe_runmake ${TOYBOX_BIN} # Create a list of links needed - oe_runmake generated/instlist + ${BUILD_CC} -I . scripts/install.c -o generated/instlist ./generated/instlist long | sed -e 's#^#/#' > toybox.links } @@ -31,9 +40,9 @@ do_install() { # Install manually instead of using 'make install' install -d ${D}${base_bindir} if grep -q "CONFIG_TOYBOX_SUID=y" ${B}/.config; then - install -m 4755 ${B}/toybox_unstripped ${D}${base_bindir}/toybox + install -m 4755 ${B}/${TOYBOX_BIN} ${D}${base_bindir}/toybox else - install -m 0755 ${B}/toybox_unstripped ${D}${base_bindir}/toybox + install -m 0755 ${B}/${TOYBOX_BIN} ${D}${base_bindir}/toybox fi install -d ${D}${sysconfdir} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb index 2ef4b7c024c813c4ff971edd78952c183eb42e43..9e9c7ed8c4593ba135406da42188b60539d5c14a 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.0.bb @@ -3,24 +3,22 @@ SECTION = "base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PR = "r0" - S = "${WORKDIR}" DEPENDS = "popt" SRC_URI = "file://usleep.c \ - file://usleep.1 \ - file://GPLv2.patch \ + file://usleep.1 \ + file://GPLv2.patch \ " do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} usleep.c -o usleep -lpopt + ${CC} ${CFLAGS} ${LDFLAGS} usleep.c -o usleep -lpopt } do_install() { - install -d ${D}${base_bindir} - install -d ${D}${mandir}/man1 + install -d ${D}${base_bindir} + install -d ${D}${mandir}/man1 - install -m 0755 ${WORKDIR}/usleep ${D}${base_bindir} - install -m 0644 ${WORKDIR}/usleep.1 ${D}${mandir}/man1 + install -m 0755 ${WORKDIR}/usleep ${D}${base_bindir} + install -m 0644 ${WORKDIR}/usleep.1 ${D}${mandir}/man1 } diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup new file mode 100644 index 0000000000000000000000000000000000000000..f7d9973722ae6bab3818e3dd8b59cba284a396db --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf/android-gadget-setup @@ -0,0 +1,25 @@ +#!/bin/sh + +# TODO enable the lines below once we have support for getprop +# retrieve the product info from Android +# manufacturer=$(getprop ro.product.manufacturer Android) +# model=$(getprop ro.product.model Android) +# serial=$(getprop ro.serialno 0123456789ABCDEF) + +manufacturer="$(cat /system/build.prop | grep -o 'ro.product.manufacturer=.*' | cut -d'=' -f 2)" +model="$(cat /system/build.prop | grep -o 'ro.product.model=.*' | cut -d'=' -f 2)" +# get the device serial number from /proc/cmdline directly(since we have no getprop on +# GNU/Linux) +serial="$(cat /proc/cmdline | sed 's/.*androidboot.serialno=//' | sed 's/ .*//')" + +echo $serial > /sys/class/android_usb/android0/iSerial +echo $manufacturer > /sys/class/android_usb/android0/iManufacturer +echo $model > /sys/class/android_usb/android0/iProduct + +echo "0" > /sys/class/android_usb/android0/enable +echo "18d1" > /sys/class/android_usbid_usb/android0/idVendor +echo "D002" > /sys/class/android_usb/android0/idProduct +echo "adb" > /sys/class/android_usb/android0/functions +echo "1" > /sys/class/android_usb/android0/enable + +sleep 4 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb new file mode 100644 index 0000000000000000000000000000000000000000..af98f92f05e2526b0182c2517a504fb847500b62 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Different utilities from Android - corressponding configuration files" +SECTION = "console/utils" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = "file://android-gadget-setup" + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir} +} diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..b8a08f82489cf2502d8cd6aadea974dff3a4e143 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/.gitignore @@ -0,0 +1,57 @@ +* +!.gitignore +!*.indirectionsymlink +!*.[ch] +!*.mk +!NOTICE +!MODULE_LICENSE_* +!/system/ +!/system/core/ +!/system/core/adb/ +!/system/core/fastboot/ +!/system/core/fs_mgr/ +!/system/core/fs_mgr/include/ +!/system/core/include/ +!/system/core/include/android/ +!/system/core/include/cutils/ +!/system/core/include/log/ +!/system/core/include/mincrypt/ +!/system/core/include/private/ +!/system/core/include/utils/ +!/system/core/include/zipfile/ +!/system/core/liblog/ +!/system/core/liblog/tests/ +!/system/core/libcutils/ +!/system/core/libmincrypt/ +!/system/core/libzipfile/ +!/system/core/libsparse/ +!/system/core/libsparse/include/ +!/system/core/libsparse/include/sparse/ +!/system/core/libsparse/simg_dump.py +!/system/core/mkbootimg/ +!/system/extras/ +!/system/extras/ext4_utils/ +!/system/extras/ext4_utils/mkuserimg.sh +!/system/extras/ext4_utils/test_ext4fixup +!/system/extras/f2fs_utils/ +!/hardware/ +!/hardware/libhardware/ +!/hardware/libhardware/include/ +!/hardware/libhardware/include/hardware/ +!/external/ +!/external/libselinux/ +!/external/libselinux/include/ +!/external/libselinux/include/selinux/ +!/external/libselinux/src/ +!/external/f2fs-tools/ +!/external/f2fs-tools/include/ +!/external/f2fs-tools/lib/ +!/external/f2fs-tools/mkfs/ +!/build/ +!/build/core/ +!/build/core/version_defaults.mk +!/build/core/combo/ +!/build/core/combo/include/ +!/build/core/combo/include/arch/ +!/build/core/combo/include/arch/linux-*/ +!/build/core/combo/include/arch/linux-*/AndroidConfig.h diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk new file mode 100644 index 0000000000000000000000000000000000000000..0687c22c17f70b5448d04ab80d6813b483c4102e --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adb.mk @@ -0,0 +1,72 @@ +# Makefile for adb + +SRCDIR ?= $(S) + +VPATH += $(SRCDIR)/system/core/adb +adb_SRC_FILES += adb.c +adb_SRC_FILES += console.c +adb_SRC_FILES += transport.c +adb_SRC_FILES += transport_local.c +adb_SRC_FILES += transport_usb.c +adb_SRC_FILES += commandline.c +adb_SRC_FILES += adb_client.c +adb_SRC_FILES += adb_auth_host.c +adb_SRC_FILES += sockets.c +adb_SRC_FILES += services.c +adb_SRC_FILES += file_sync_client.c +adb_SRC_FILES += get_my_path_linux.c +adb_SRC_FILES += usb_linux.c +adb_SRC_FILES += usb_vendors.c +adb_SRC_FILES += fdevent.c +adb_OBJS := $(adb_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/libcutils +libcutils_SRC_FILES += atomic.c +libcutils_SRC_FILES += hashmap.c +libcutils_SRC_FILES += native_handle.c +libcutils_SRC_FILES += config_utils.c +libcutils_SRC_FILES += cpu_info.c +libcutils_SRC_FILES += load_file.c +# libcutils_SRC_FILES += open_memstream.c +# libcutils_SRC_FILES += strdup16to8.c +# libcutils_SRC_FILES += strdup8to16.c +# libcutils_SRC_FILES += record_stream.c +# libcutils_SRC_FILES += process_name.c +# libcutils_SRC_FILES += threads.c +# libcutils_SRC_FILES += sched_policy.c +# libcutils_SRC_FILES += iosched_policy.c +libcutils_SRC_FILES += str_parms.c +libcutils_SRC_FILES += fs.c +libcutils_SRC_FILES += multiuser.c +libcutils_SRC_FILES += socket_inaddr_any_server.c +libcutils_SRC_FILES += socket_local_client.c +libcutils_SRC_FILES += socket_local_server.c +libcutils_SRC_FILES += socket_loopback_client.c +libcutils_SRC_FILES += socket_loopback_server.c +libcutils_SRC_FILES += socket_network_client.c +libcutils_SRC_FILES += sockets.c +libcutils_SRC_FILES += ashmem-host.c +libcutils_SRC_FILES += dlmalloc_stubs.c +libcutils_OBJS := $(libcutils_SRC_FILES:.c=.o) + +CFLAGS += -DANDROID +CFLAGS += -DWORKAROUND_BUG6558362 +CFLAGS += -DADB_HOST=1 +CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE +CFLAGS += -DANDROID_SMP=0 +CFLAGS += -I$(SRCDIR)/system/core/adb +CFLAGS += -I$(SRCDIR)/system/core/include +CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h + +LIBS += libcutils.a -lpthread -lcrypto + +all: adb + +adb: libcutils.a $(adb_OBJS) + $(CC) -o $@ $(LDFLAGS) $(adb_OBJS) $(LIBS) + +libcutils.a: $(libcutils_OBJS) + $(AR) rcs $@ $(libcutils_OBJS) + +clean: + $(RM) $(adb_OBJS) $(libcutils_OBJS) adb *.a diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk new file mode 100644 index 0000000000000000000000000000000000000000..84cd06b109763aa6d7bc3dcedd84d28b02b821ba --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/adbd.mk @@ -0,0 +1,163 @@ +# Makefile for adbd + +SRCDIR ?= $(S) + +VPATH += $(SRCDIR)/system/core/adb +adbd_SRC_FILES += adb.c +adbd_SRC_FILES += fdevent.c +adbd_SRC_FILES += transport.c +adbd_SRC_FILES += transport_local.c +adbd_SRC_FILES += transport_usb.c +adbd_SRC_FILES += adb_auth_client.c +adbd_SRC_FILES += sockets.c +adbd_SRC_FILES += services.c +adbd_SRC_FILES += file_sync_service.c +adbd_SRC_FILES += jdwp_service.c +adbd_SRC_FILES += framebuffer_service.c +adbd_SRC_FILES += remount_service.c +adbd_SRC_FILES += disable_verity_service.c +adbd_SRC_FILES += usb_linux_client.c +adbd_OBJS := $(adbd_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/liblog +liblog_SRC_FILES += logd_write.c +liblog_SRC_FILES += log_event_write.c +liblog_SRC_FILES += logprint.c +liblog_SRC_FILES += event_tag_map.c +liblog_SRC_FILES += fake_log_device.c +liblog_OBJS := $(liblog_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/fs_mgr +fs_mgr_SRC_FILES += fs_mgr_fstab.c +fs_mgr_OBJS := $(fs_mgr_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/libcutils +libcutils_SRC_FILES += atomic.c +libcutils_SRC_FILES += hashmap.c +libcutils_SRC_FILES += native_handle.c +libcutils_SRC_FILES += config_utils.c +libcutils_SRC_FILES += cpu_info.c +libcutils_SRC_FILES += load_file.c +# libcutils_SRC_FILES += open_memstream.c +# libcutils_SRC_FILES += strdup16to8.c +# libcutils_SRC_FILES += strdup8to16.c +# libcutils_SRC_FILES += record_stream.c +# libcutils_SRC_FILES += process_name.c +# libcutils_SRC_FILES += threads.c +# libcutils_SRC_FILES += sched_policy.c +# libcutils_SRC_FILES += iosched_policy.c +libcutils_SRC_FILES += str_parms.c +libcutils_SRC_FILES += fs.c +libcutils_SRC_FILES += multiuser.c +libcutils_SRC_FILES += socket_inaddr_any_server.c +libcutils_SRC_FILES += socket_local_client.c +libcutils_SRC_FILES += socket_local_server.c +libcutils_SRC_FILES += socket_loopback_client.c +libcutils_SRC_FILES += socket_loopback_server.c +libcutils_SRC_FILES += socket_network_client.c +libcutils_SRC_FILES += sockets.c +libcutils_SRC_FILES += ashmem-host.c +libcutils_SRC_FILES += dlmalloc_stubs.c +libcutils_SRC_FILES += klog.c +libcutils_SRC_FILES += properties.c +libcutils_OBJS := $(libcutils_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/external/libselinux/src +libselinux_SRC_FILES += booleans.c +libselinux_SRC_FILES += canonicalize_context.c +libselinux_SRC_FILES += disable.c +libselinux_SRC_FILES += enabled.c +libselinux_SRC_FILES += fgetfilecon.c +libselinux_SRC_FILES += fsetfilecon.c +libselinux_SRC_FILES += getenforce.c +libselinux_SRC_FILES += getfilecon.c +libselinux_SRC_FILES += getpeercon.c +libselinux_SRC_FILES += lgetfilecon.c +libselinux_SRC_FILES += load_policy.c +libselinux_SRC_FILES += lsetfilecon.c +libselinux_SRC_FILES += policyvers.c +libselinux_SRC_FILES += procattr.c +libselinux_SRC_FILES += setenforce.c +libselinux_SRC_FILES += setfilecon.c +libselinux_SRC_FILES += context.c +libselinux_SRC_FILES += mapping.c +libselinux_SRC_FILES += stringrep.c +libselinux_SRC_FILES += compute_create.c +libselinux_SRC_FILES += compute_av.c +libselinux_SRC_FILES += avc.c +libselinux_SRC_FILES += avc_internal.c +libselinux_SRC_FILES += avc_sidtab.c +libselinux_SRC_FILES += get_initial_context.c +libselinux_SRC_FILES += checkAccess.c +libselinux_SRC_FILES += sestatus.c +libselinux_SRC_FILES += deny_unknown.c + +libselinux_SRC_FILES += callbacks.c +libselinux_SRC_FILES += check_context.c +libselinux_SRC_FILES += freecon.c +libselinux_SRC_FILES += init.c +libselinux_SRC_FILES += label.c +libselinux_SRC_FILES += label_file.c +libselinux_SRC_FILES += label_android_property.c +libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/extras/ext4_utils +libext4_utils_SRC_FILES += make_ext4fs.c +libext4_utils_SRC_FILES += ext4fixup.c +libext4_utils_SRC_FILES += ext4_utils.c +libext4_utils_SRC_FILES += allocate.c +libext4_utils_SRC_FILES += contents.c +libext4_utils_SRC_FILES += extent.c +libext4_utils_SRC_FILES += indirect.c +libext4_utils_SRC_FILES += uuid.c +libext4_utils_SRC_FILES += sha1.c +libext4_utils_SRC_FILES += wipe.c +libext4_utils_SRC_FILES += crc16.c +libext4_utils_SRC_FILES += ext4_sb.c +libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o) + +CFLAGS += -std=gnu11 +CFLAGS += -DANDROID +CFLAGS += -DADB_HOST=0 +CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE +CFLAGS += -DALLOW_ADBD_ROOT=1 +CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1 +CFLAGS += -DPROP_NAME_MAX=32 +CFLAGS += -DPROP_VALUE_MAX=92 +CFLAGS += -DAUDITD_LOG_TAG=1003 +# CFLAGS += -DHOST +CFLAGS += -DANDROID_SMP=0 +CFLAGS += -I$(SRCDIR)/system/core/adb +CFLAGS += -I$(SRCDIR)/system/core/include +CFLAGS += -I$(SRCDIR)/system/core/libsparse/include +CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils +CFLAGS += -I$(SRCDIR)/system/core/fs_mgr/include +CFLAGS += -I$(SRCDIR)/hardware/libhardware/include +CFLAGS += -I$(SRCDIR)/external/libselinux/include +CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h + +LIBS += liblog.a libfs_mgr.a libcutils.a libselinux.a libext4_utils.a -lpthread -lbsd -lpcre -lresolv -lcrypto + +all: adbd + +adbd: liblog.a libfs_mgr.a libcutils.a libselinux.a libext4_utils.a $(adbd_OBJS) + $(CC) -o $@ $(LDFLAGS) $(adbd_OBJS) $(LIBS) + +liblog.a: $(liblog_OBJS) + $(AR) rcs $@ $(liblog_OBJS) + +libfs_mgr.a: $(fs_mgr_OBJS) + $(AR) rcs $@ $(fs_mgr_OBJS) + +libcutils.a: $(libcutils_OBJS) + $(AR) rcs $@ $(libcutils_OBJS) + +libselinux.a: $(libselinux_OBJS) + export CFLAGS="-DANDROID -DHOST" + $(AR) rcs $@ $(libselinux_OBJS) + +libext4_utils.a: $(libext4_utils_OBJS) + $(AR) rcs $@ $(libext4_utils_OBJS) + +clean: + $(RM) *.o *.a adbd diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service new file mode 100644 index 0000000000000000000000000000000000000000..88ed6871d37f56006e8ce86f060853ef93db6cbb --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Android Debug Bridge + +[Service] +Type=simple +Restart=on-failure +ExecStartPre=/usr/bin/android-gadget-setup adb +ExecStart=/usr/bin/adbd +StandardOutput=null + +[Install] +WantedBy=basic.target diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/define-shell-command.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/define-shell-command.patch new file mode 100644 index 0000000000000000000000000000000000000000..8381967c442cdd0b8dbb270c375d9976b6ff81ac --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/define-shell-command.patch @@ -0,0 +1,23 @@ +Description: we intend to run on Linux system so the shell is always /bin/sh, + for the host or the target. +Author: Fathi Boudra + +Upstream-Status: Inappropriate +--- + system/core/adb/services.c | 4 ---- + 1 file changed, 4 deletions(-) + +--- a/system/core/adb/services.c ++++ b/system/core/adb/services.c +@@ -299,11 +299,7 @@ static int create_subproc_raw(const char + } + #endif /* !ABD_HOST */ + +-#if ADB_HOST + #define SHELL_COMMAND "/bin/sh" +-#else +-#define SHELL_COMMAND "/system/bin/sh" +-#endif + + #if !ADB_HOST + static void subproc_waiter_service(int fd, void *cookie) diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk new file mode 100644 index 0000000000000000000000000000000000000000..c18aa9c4d2ccf84de021c1c287c9982e3027e1e3 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/ext4_utils.mk @@ -0,0 +1,103 @@ +# Makefile for ext4_utils + +SRCDIR ?= $(S) + +VPATH += $(SRCDIR)/system/extras/ext4_utils +make_ext4fs_SRC_FILES += make_ext4fs_main.c +make_ext4fs_SRC_FILES += canned_fs_config.c +make_ext4fs_OBJS := $(make_ext4fs_SRC_FILES:.c=.o) + +ext2simg_SRC_FILES += ext2simg.c +ext2simg_OBJS := $(ext2simg_SRC_FILES:.c=.o) + +ext4fixup_SRC_FILES += ext4fixup_main.c +ext4fixup_OBJS := $(ext4fixup_SRC_FILES:.c=.o) + +libext4_utils_SRC_FILES += make_ext4fs.c +libext4_utils_SRC_FILES += ext4fixup.c +libext4_utils_SRC_FILES += ext4_utils.c +libext4_utils_SRC_FILES += allocate.c +libext4_utils_SRC_FILES += contents.c +libext4_utils_SRC_FILES += extent.c +libext4_utils_SRC_FILES += indirect.c +libext4_utils_SRC_FILES += uuid.c +libext4_utils_SRC_FILES += sha1.c +libext4_utils_SRC_FILES += wipe.c +libext4_utils_SRC_FILES += crc16.c +libext4_utils_SRC_FILES += ext4_sb.c +libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/libsparse +simg2img_SRC_FILES += simg2img.c +simg2img_SRC_FILES += sparse_crc32.c +simg2img_OBJS := $(simg2img_SRC_FILES:.c=.o) + +img2simg_SRC_FILES += img2simg.c +img2simg_OBJS := $(img2simg_SRC_FILES:.c=.o) + +simg2simg_SRC_FILES += simg2simg.c +simg2simg_SRC_FILES += sparse_crc32.c +simg2simg_OBJS := $(simg2simg_SRC_FILES:.c=.o) + +libsparse_SRC_FILES += backed_block.c +libsparse_SRC_FILES += output_file.c +libsparse_SRC_FILES += sparse.c +libsparse_SRC_FILES += sparse_crc32.c +libsparse_SRC_FILES += sparse_err.c +libsparse_SRC_FILES += sparse_read.c +libsparse_OBJS := $(libsparse_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/external/libselinux/src +libselinux_SRC_FILES += callbacks.c +libselinux_SRC_FILES += check_context.c +libselinux_SRC_FILES += freecon.c +libselinux_SRC_FILES += init.c +libselinux_SRC_FILES += label.c +libselinux_SRC_FILES += label_file.c +libselinux_SRC_FILES += label_android_property.c +libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o) + +CFLAGS += -DANDROID +CFLAGS += -DHOST +CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils +CFLAGS += -I$(SRCDIR)/system/core/include +CFLAGS += -I$(SRCDIR)/system/core/libsparse/include +CFLAGS += -I$(SRCDIR)/external/libselinux/include +CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h + +all: make_ext4fs ext2simg ext4fixup simg2img img2simg simg2simg + +make_ext4fs: libext4_utils.a libsparse.a libselinux.a $(make_ext4fs_OBJS) + $(CC) -o $@ $(LDFLAGS) $(make_ext4fs_OBJS) \ + libext4_utils.a libsparse.a libselinux.a -lz -lpcre + +ext2simg: libext4_utils.a libselinux.a libsparse.a $(ext2simg_OBJS) + $(CC) -o $@ $(LDFLAGS) $(ext2simg_OBJS) \ + libext4_utils.a libselinux.a libsparse.a -lz -lpcre + +ext4fixup: libext4_utils.a libsparse.a $(ext4fixup_OBJS) + $(CC) -o $@ $(LDFLAGS) $(ext4fixup_OBJS) libext4_utils.a libsparse.a -lz + +simg2img: libsparse.a $(simg2img_OBJS) + $(CC) -o $@ $(LDFLAGS) $(simg2img_OBJS) libsparse.a -lz + +img2simg: libsparse.a $(img2simg_OBJS) + $(CC) -o $@ $(LDFLAGS) $(img2simg_OBJS) libsparse.a -lz + +simg2simg: libsparse.a $(simg2simg_OBJS) + $(CC) -o $@ $(LDFLAGS) $(simg2simg_OBJS) libsparse.a -lz + +libext4_utils.a: $(libext4_utils_OBJS) + $(AR) rcs $@ $(libext4_utils_OBJS) + +libsparse.a: $(libsparse_OBJS) + $(AR) rcs $@ $(libsparse_OBJS) + +libselinux.a: $(libselinux_OBJS) + $(AR) rcs $@ $(libselinux_OBJS) + +clean: + $(RM) $(make_ext4fs_OBJS) $(ext2simg_OBJS) $(ext4fixup_OBJS) \ + $(simg2img_OBJS) $(img2simg_OBJS) $(simg2simg_OBJS) \ + $(libext4_utils_OBJS) $(libsparse_OBJS) $(libselinux_OBJS) \ + make_ext4fs ext2simg ext4fixup simg2img img2simg simg2simg *.a diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk new file mode 100644 index 0000000000000000000000000000000000000000..b9ba95f38afee151dca33bb43b8e97e028e0a5cf --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/fastboot.mk @@ -0,0 +1,89 @@ +# Makefile for fastboot + +SRCDIR ?= $(S) + +VPATH += $(SRCDIR)/system/core/fastboot +fastboot_SRC_FILES += protocol.c +fastboot_SRC_FILES += engine.c +fastboot_SRC_FILES += bootimg.c +fastboot_SRC_FILES += fastboot.c +fastboot_SRC_FILES += util.c +fastboot_SRC_FILES += fs.c +fastboot_SRC_FILES += usb_linux.c +fastboot_SRC_FILES += util_linux.c +fastboot_OBJS := $(fastboot_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/libzipfile +libzipfile_SRC_FILES += centraldir.c +libzipfile_SRC_FILES += zipfile.c +libzipfile_OBJS := $(libzipfile_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/extras/ext4_utils +libext4_utils_SRC_FILES += make_ext4fs.c +libext4_utils_SRC_FILES += ext4fixup.c +libext4_utils_SRC_FILES += ext4_utils.c +libext4_utils_SRC_FILES += allocate.c +libext4_utils_SRC_FILES += contents.c +libext4_utils_SRC_FILES += extent.c +libext4_utils_SRC_FILES += indirect.c +libext4_utils_SRC_FILES += uuid.c +libext4_utils_SRC_FILES += sha1.c +libext4_utils_SRC_FILES += wipe.c +libext4_utils_SRC_FILES += crc16.c +libext4_utils_SRC_FILES += ext4_sb.c +libext4_utils_OBJS := $(libext4_utils_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/libsparse +libsparse_SRC_FILES += backed_block.c +libsparse_SRC_FILES += output_file.c +libsparse_SRC_FILES += sparse.c +libsparse_SRC_FILES += sparse_crc32.c +libsparse_SRC_FILES += sparse_err.c +libsparse_SRC_FILES += sparse_read.c +libsparse_OBJS := $(libsparse_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/external/libselinux/src +libselinux_SRC_FILES += callbacks.c +libselinux_SRC_FILES += check_context.c +libselinux_SRC_FILES += freecon.c +libselinux_SRC_FILES += init.c +libselinux_SRC_FILES += label.c +libselinux_SRC_FILES += label_file.c +libselinux_SRC_FILES += label_android_property.c +libselinux_OBJS := $(libselinux_SRC_FILES:.c=.o) + +CFLAGS += -std=gnu11 +CFLAGS += -DANDROID +# CFLAGS += -DUSE_F2FS +CFLAGS += -DHOST +CFLAGS += -I$(SRCDIR)/system/core/fastboot +CFLAGS += -I$(SRCDIR)/system/core/include +CFLAGS += -I$(SRCDIR)/system/core/mkbootimg +CFLAGS += -I$(SRCDIR)/system/extras/ext4_utils +CFLAGS += -I$(SRCDIR)/system/extras/f2fs_utils +CFLAGS += -I$(SRCDIR)/system/core/libsparse/include +CFLAGS += -I$(SRCDIR)/external/libselinux/include +CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h + +LIBS += libzipfile.a libext4_utils.a libsparse.a libselinux.a -lz -lpcre + +all: fastboot + +fastboot: libzipfile.a libext4_utils.a libsparse.a libselinux.a $(fastboot_OBJS) + $(CC) -o $@ $(LDFLAGS) $(fastboot_OBJS) $(LIBS) + +libzipfile.a: $(libzipfile_OBJS) + $(AR) rcs $@ $(libzipfile_OBJS) + +libext4_utils.a: $(libext4_utils_OBJS) + $(AR) rcs $@ $(libext4_utils_OBJS) + +libsparse.a: $(libsparse_OBJS) + $(AR) rcs $@ $(libsparse_OBJS) + +libselinux.a: $(libselinux_OBJS) + $(AR) rcs $@ $(libselinux_OBJS) + +clean: + $(RM) $(fastboot_OBJS) $(libzipfile_OBJS) $(libext4_utils_OBJS) \ + $(libsparse_OBJS) $(libselinux_OBJS) fastboot *.a diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch new file mode 100644 index 0000000000000000000000000000000000000000..64db6168c6380af5531b4d24a4da93563c11e5e4 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/implicit-declaration-function-strlcat-strlcopy.patch @@ -0,0 +1,42 @@ +Description: fix implicit declaration of stlcat/strlcopy functions. +Author: Fathi Boudra + +Upstream-Status: Inappropriate +--- + system/core/adb/adb.c | 1 + + system/core/fs_mgr/fs_mgr_fstab.c | 2 +- + system/core/include/cutils/sockets.h | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +--- a/system/core/fs_mgr/fs_mgr_fstab.c ++++ b/system/core/fs_mgr/fs_mgr_fstab.c +@@ -17,7 +17,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "fs_mgr_priv.h" +--- a/system/core/include/cutils/sockets.h ++++ b/system/core/include/cutils/sockets.h +@@ -19,7 +19,7 @@ + + #include + #include +-#include ++#include + #include + + #ifdef HAVE_WINSOCK +--- a/system/core/adb/adb.c ++++ b/system/core/adb/adb.c +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + #else + #include "usb_vendors.h" + #endif diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg-Add-dt-parameter-to-specify-DT-image.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg-Add-dt-parameter-to-specify-DT-image.patch new file mode 100644 index 0000000000000000000000000000000000000000..35bb766a7f6c65c8d8626a23a325f9f4e39ccd69 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg-Add-dt-parameter-to-specify-DT-image.patch @@ -0,0 +1,108 @@ +From cc5e7b02a3be57709a1aed6e34be100b82a71620 Mon Sep 17 00:00:00 2001 +From: David Ng +Date: Fri, 27 Jul 2012 17:15:03 -0700 +Subject: [PATCH 1/2] mkbootimg: Add --dt parameter to specify DT image + +New optional --dt parameter to specify a kernel device +tree image. + +Change-Id: Ie29a11cbf4138426bfd19ae486d69a5fcbd8f442 + +Upstream-Status: Inappropriate +--- + system/core/mkbootimg/bootimg.h | 7 +++++-- + system/core/mkbootimg/mkbootimg.c | 21 +++++++++++++++++++++ + 2 files changed, 26 insertions(+), 2 deletions(-) + +--- a/system/core/mkbootimg/bootimg.h ++++ b/system/core/mkbootimg/bootimg.h +@@ -41,8 +41,8 @@ struct boot_img_hdr + + unsigned tags_addr; /* physical addr for kernel tags */ + unsigned page_size; /* flash page size we assume */ +- unsigned unused[2]; /* future expansion: should be 0 */ +- ++ unsigned dt_size; /* device tree in bytes */ ++ unsigned unused; /* future expansion: should be 0 */ + unsigned char name[BOOT_NAME_SIZE]; /* asciiz product name */ + + unsigned char cmdline[BOOT_ARGS_SIZE]; +@@ -64,10 +64,13 @@ struct boot_img_hdr + ** +-----------------+ + ** | second stage | o pages + ** +-----------------+ ++** | device tree | p pages ++** +-----------------+ + ** + ** n = (kernel_size + page_size - 1) / page_size + ** m = (ramdisk_size + page_size - 1) / page_size + ** o = (second_size + page_size - 1) / page_size ++** p = (dt_size + page_size - 1) / page_size + ** + ** 0. all entities are page_size aligned in flash + ** 1. kernel and ramdisk are required (size != 0) +--- a/system/core/mkbootimg/mkbootimg.c ++++ b/system/core/mkbootimg/mkbootimg.c +@@ -65,6 +65,7 @@ int usage(void) + " [ --board ]\n" + " [ --base
]\n" + " [ --pagesize ]\n" ++ " [ --dt ]\n" + " -o|--output \n" + ); + return 1; +@@ -105,6 +106,8 @@ int main(int argc, char **argv) + char *cmdline = ""; + char *bootimg = 0; + char *board = ""; ++ char *dt_fn = 0; ++ void *dt_data = 0; + unsigned pagesize = 2048; + int fd; + SHA_CTX ctx; +@@ -158,6 +161,8 @@ int main(int argc, char **argv) + fprintf(stderr,"error: unsupported page size %d\n", pagesize); + return -1; + } ++ } else if(!strcmp(arg, "--dt")) { ++ dt_fn = val; + } else { + return usage(); + } +@@ -232,6 +237,14 @@ int main(int argc, char **argv) + } + } + ++ if(dt_fn) { ++ dt_data = load_file(dt_fn, &hdr.dt_size); ++ if (dt_data == 0) { ++ fprintf(stderr,"error: could not load device tree image '%s'\n", dt_fn); ++ return 1; ++ } ++ } ++ + /* put a hash of the contents in the header so boot images can be + * differentiated based on their first 2k. + */ +@@ -242,6 +255,10 @@ int main(int argc, char **argv) + SHA_update(&ctx, &hdr.ramdisk_size, sizeof(hdr.ramdisk_size)); + SHA_update(&ctx, second_data, hdr.second_size); + SHA_update(&ctx, &hdr.second_size, sizeof(hdr.second_size)); ++ if(dt_data) { ++ SHA_update(&ctx, dt_data, hdr.dt_size); ++ SHA_update(&ctx, &hdr.dt_size, sizeof(hdr.dt_size)); ++ } + sha = SHA_final(&ctx); + memcpy(hdr.id, sha, + SHA_DIGEST_SIZE > sizeof(hdr.id) ? sizeof(hdr.id) : SHA_DIGEST_SIZE); +@@ -266,6 +283,10 @@ int main(int argc, char **argv) + if(write_padding(fd, pagesize, hdr.second_size)) goto fail; + } + ++ if(dt_data) { ++ if(write(fd, dt_data, hdr.dt_size) != (ssize_t) hdr.dt_size) goto fail; ++ if(write_padding(fd, pagesize, hdr.dt_size)) goto fail; ++ } + return 0; + + fail: diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk new file mode 100644 index 0000000000000000000000000000000000000000..519f609fd2ccad861a571d991770cbce3c9f2218 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/mkbootimg.mk @@ -0,0 +1,29 @@ +# Makefile for mkbootimg + +SRCDIR ?= $(S) + +VPATH += $(SRCDIR)/system/core/mkbootimg +mkbootimg_SRC_FILES += mkbootimg.c +mkbootimg_OBJS := $(mkbootimg_SRC_FILES:.c=.o) + +VPATH += $(SRCDIR)/system/core/libmincrypt +libmincrypt_SRC_FILES := dsa_sig.c p256.c p256_ec.c p256_ecdsa.c rsa.c sha.c sha256.c +libmincrypt_OBJS := $(libmincrypt_SRC_FILES:.c=.o) + +CFLAGS += -DANDROID +CFLAGS += -I$(SRCDIR)/system/core/mkbootimg +CFLAGS += -I$(SRCDIR)/system/core/include +CFLAGS += -include $(SRCDIR)/build/core/combo/include/arch/$(android_arch)/AndroidConfig.h + +LIBS += libmincrypt.a + +all: mkbootimg + +mkbootimg: libmincrypt.a $(mkbootimg_OBJS) + $(CC) -o $@ $(LDFLAGS) $(mkbootimg_OBJS) $(LIBS) + +libmincrypt.a: $(libmincrypt_OBJS) + $(AR) rcs $@ $(libmincrypt_OBJS) + +clean: + $(RM) $(mkbootimg_OBJS) $(libmincrypt_OBJS) mkbootimg *.a diff --git a/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch new file mode 100644 index 0000000000000000000000000000000000000000..85af81f0f95bb2676eeb4e4b1439902884c09208 --- /dev/null +++ b/import-layers/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/preserve-ownership.patch @@ -0,0 +1,72 @@ +Description: add -o argument to preserve ownership +Author: Markus Mayer + +See also https://android-review.googlesource.com/#/c/100312/ + +Upstream-Status: Inappropriate +--- + system/extras/ext4_utils/make_ext4fs.c | 6 ++++++ + system/extras/ext4_utils/make_ext4fs_main.c | 10 ++++++++-- + 2 files changed, 14 insertions(+), 2 deletions(-) + +--- a/system/extras/ext4_utils/make_ext4fs_main.c ++++ b/system/extras/ext4_utils/make_ext4fs_main.c +@@ -49,13 +49,15 @@ extern struct fs_info info; + + extern struct selabel_handle* selinux_android_file_context_handle(void); + ++extern int preserve_owner; ++ + static void usage(char *path) + { + fprintf(stderr, "%s [ -l ] [ -j ] [ -b ]\n", basename(path)); + fprintf(stderr, " [ -g ] [ -i ] [ -I ]\n"); + fprintf(stderr, " [ -L