From patchwork Thu Aug 31 02:03:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111344 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp1847261qge; Wed, 30 Aug 2017 19:04:27 -0700 (PDT) X-Google-Smtp-Source: ADKCNb5KgSs3AW+alTZfdUz+0G0T3BlBumUt1d9/I2Vu0/Mv/jiJRNiaztXYs+yiJ0M8JFHKMM/4 X-Received: by 10.84.217.155 with SMTP id p27mr766435pli.410.1504145066887; Wed, 30 Aug 2017 19:04:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504145066; cv=none; d=google.com; s=arc-20160816; b=x6X6oSG7tDiozKAls6cdH7rAJhA0zTCd5FcStS4IuaFigYgbHwK0LMJUgzjeCOs/o7 0i4pGtimmBpN0gU11qxjGqGd8+z0bun2oO0H5WMME5/y+k68EcyK57J2SJeMu3GEmCii FNXJ+B5cvolet5iFJdgSLGzCzdjVWp2pzgu4gA6aNi8kPjWOrMlxdotYkCNRCqrs88tg 9q419GsVkRyxoJa3FjIn0fhp620zsSrFlZmDPuiY1e9qXQf1EiacLqhAzarwChB1gYeI zqIRJ4gxzvBz4UY2ajEeUwdSx3FN9LcGRFGhwVG+16pU4UldsfoWL9Zrt+jpT+kO8vkL HQUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=nJ1jZJ9mLz9HoZTi+Er+Sjjc8b54PF8QOSPQZuk7nRY=; b=g0GrEmPN6rbWsHPMhZwBZ+SJSZQ+r8d9/MTrX7rxmjtvWSsN3HpvsKpEKfk6k4/iOO jYHfuF1DXZvRQARcW9tK+e863H7Qubw1k0NWtv77QlE7IFS3NrgTuVX+ksnxfCuQ9JCK TaO5casYvkzGy4W/yR+mQsB+dsIeSm6w6CJ/dYHF4mTggTBB8m1qfv2c9rzQXCRDlOoI te+aB12jVUt8Ho3nliOdxC9SVZg2Zbjx+VNNavzD2TI6Yhd0r1pNy/H9Un+vvA3NMlNZ seEuvvFSu1WrxcOH8OfVnEHsG5jCykL4F2MEDIpsMCNDeJCqAdxKCQU8sD+si9wHWNO2 VX1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ooDZ+TgO; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id o19si5532488pgn.264.2017.08.30.19.04.26; Wed, 30 Aug 2017 19:04:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ooDZ+TgO; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A4A0D7826E; Thu, 31 Aug 2017 02:04:17 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f45.google.com (mail-pg0-f45.google.com [74.125.83.45]) by mail.openembedded.org (Postfix) with ESMTP id 9AF7D7826E for ; Thu, 31 Aug 2017 02:04:15 +0000 (UTC) Received: by mail-pg0-f45.google.com with SMTP id b8so24838886pgn.5 for ; Wed, 30 Aug 2017 19:04:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=LY5+gnaoapii5gtZGC7nqnyRC4KGXtpu8o7AgVVb7Rg=; b=ooDZ+TgOEk3KFRvAlQTQqjjrAlI9ylN0GHQ5ApRjXXUgZcTtNP1rEZZNXhzBOn9jjk jHx2L5VAirFnOA4gwwEfh4kq0axAM6M0bS6Dpcae40wZgtme1s/EJObqHZA6kkteqDfZ ppi4+kOOomYJW+PFWtGsWKYMyLdS+zyt4UCXa1qdQy917ZCAc+nNy5q29EVyTXlCplin vtjVykRjYcLfHI0T9YmWaiUzYUfxbgOTqpEt7r6vhecJ/r106JzCV3YTlHB7waPm7rWN Z6lpLKFmTOgRtAuO39qaqby1R4xqlzjlGO+Sc5J6SFDrq38IK4nUHiMKPMvzxbg8rPqV eGHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=LY5+gnaoapii5gtZGC7nqnyRC4KGXtpu8o7AgVVb7Rg=; b=UBjdzRdd3+nwmMFswaJP7wggPpoeYdCYxUMH0pjKV1PLr+MqlXxPLNV2JZxf1C5oPs zSqlns8fH2R/L1xddwSCKvjIDX2r33OKkTXjjC5JAWAoYUKWG38avSK70dGz5JzWMpx2 V9AD6ns438vvNFbGa7WCSu3bt7ZNWEisHFPJeTGKHymK7BuN8K+dQ+cZZ37WSGgBeDGM rZ0QWSdif/tYKfBvYWINr+o1UDQ726sasF8/0PiQ/VILxjoe8c32ediWwExQEWRbxWXE az74V6hBWEJ1HD6WL7P+3f7sr1jxfRgRUyPqvyMvie9Eajqj3wL+sW344s2w+NCtjcIf JLQg== X-Gm-Message-State: AHYfb5jxClu4X95YqKOd5+EgIKSXC49MzMx2BlqsJpso569z2db4r3jS /9swBf2rl/68/W4p X-Received: by 10.99.173.79 with SMTP id y15mr629550pgo.432.1504145056331; Wed, 30 Aug 2017 19:04:16 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::79ab]) by smtp.gmail.com with ESMTPSA id c10sm12347641pfk.101.2017.08.30.19.04.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 19:04:15 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 30 Aug 2017 19:03:58 -0700 Message-Id: <20170831020401.6367-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [oe] [meta-networking][PATCH 1/4] ntop: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org move away from .inc file, when its included in single recipe helps with devtool workflow too. Signed-off-by: Khem Raj --- meta-networking/recipes-support/ntop/ntop.inc | 131 -------------------- .../ntop/ntop/0001-nDPI-Include-sys-types.h.patch | 24 ++++ .../recipes-support/ntop/ntop/support-arm64.patch | 28 ----- meta-networking/recipes-support/ntop/ntop_5.0.1.bb | 135 ++++++++++++++++++++- 4 files changed, 158 insertions(+), 160 deletions(-) delete mode 100644 meta-networking/recipes-support/ntop/ntop.inc create mode 100644 meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch delete mode 100644 meta-networking/recipes-support/ntop/ntop/support-arm64.patch -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/ntop/ntop.inc b/meta-networking/recipes-support/ntop/ntop.inc deleted file mode 100644 index b96433425..000000000 --- a/meta-networking/recipes-support/ntop/ntop.inc +++ /dev/null @@ -1,131 +0,0 @@ -SUMMARY = "ntop is network top" -DESCRIPTION = "ntop is a network traffic probe that shows the network usage, \ -similar to what the popular top Unix command does." - -SECTION = "console/network" - -LICENSE = "GPLv2+ & GPLv3 & OpenSSL" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE-OpenSSL.txt;md5=a409f902e447ddd889cffa0c70e7c7c2 \ - " - -SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tar.gz \ - file://ntop_configure_in.patch \ - file://ntop_init.patch \ - file://ntop_webInterface.patch \ - file://ntop_configure_in_net_snmp_config_exist.patch \ - file://ntop.service \ - file://use-static-inline.patch \ - file://support-arm64.patch \ - " - -inherit autotools-brokensep useradd pythonnative pkgconfig systemd - -DEPENDS = "geoip rrdtool python zlib libpcap gdbm" - -PACKAGECONFIG ??= "openssl snmp plugins" -PACKAGECONFIG[openssl] = "--with-ssl, --without-ssl, openssl, openssl" -PACKAGECONFIG[snmp] = "--enable-snmp=yes NETSNMP=${STAGING_BINDIR_CROSS}/net-snmp-config, \ ---disable-snmp,net-snmp," -PACKAGECONFIG[plugins] = "--enable-plugins=yes, --disable-plugins, ," - -EXTRA_OECONF += "ac_cv_file_aclocal_m4=yes ac_cv_file_depcomp=no" - -do_configure() { - cp ${STAGING_DATADIR_NATIVE}/aclocal/libtool.m4 libtool.m4.in - cat acinclude.m4.in acinclude.m4.ntop libtool.m4.in > acinclude.m4 - cp 3rd_party/* ./ - - # config nDPI - cd nDPI - ./configure ${CONFIGUREOPTS} --with-pic - cd .. - - sed -i -e 's:^CFG_DBFILE_DIR=$localstatedir/ntop:CFG_DBFILE_DIR=$localstatedir/lib/ntop:' ${S}/configure.in - - # fix the CFLAGS, CPPFLAGS, LDFLAGS, remove the host include - sed -i \ - -e 's:\(^CFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \ - -e 's:\(^CPPFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \ - -e 's:\(^LDFLAGS="\$.*\) -L/usr/local/lib -L/opt/local/lib":\1":' \ - ${S}/configure.in - - # replace the DISTRO RELEASE in configure.in which are host's - # with our release, although those doesn't affect functionality - sed -i -e \ - '/DEFINEOS="LINUX"/{N;s/DISTRO=.*/DISTRO="${DISTRO}"/;N;s/RELEASE=.*/RELEASE="${DISTRO_VERSION}"/;}' \ - ${S}/configure.in - - # osName in original configure.in should be ${TARGET_SYS} - # which will show in ntop's "show configuration" - sed -i -e \ - 's:^osName=.*:osName=${TARGET_SYS}:' \ - ${S}/configure.in - - # rename configureextra to configureextra_rename to avoid - # configure.in to guess host OS and pull in more configure, non needed - # which will cause some cross-compiling failure on specific host - # e.g. SUSE(SLED...) - test ! -f configureextra || mv -f configureextra configureextra_rename - - # make sure configure finds python includdirs/libs with these envs - export BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - STAGING_INCDIR=${STAGING_INCDIR} \ - STAGING_LIBDIR=${STAGING_LIBDIR} - - autotools_do_configure -} - -do_compile_prepend() { - cd nDPI - oe_runmake - cd .. -} - -do_install_append() { - # remove the empty dirs - rm -rf ${D}${libdir}/plugins - - install -D -m 0755 ${S}/packages/RedHat/ntop.init \ - ${D}${sysconfdir}/init.d/ntop - install -D -m 0644 ${S}/packages/RedHat/ntop.conf.sample \ - ${D}${sysconfdir}/ntop.conf - - # change ntop dir in ntop.conf - # don't use the -P as the ntop.init didn't support it - sed -i -e "s:^--db-file-path /usr/share/ntop:--db-file-path /var/lib/ntop:" \ - -e "s:^#? -P /var/ntop:#? -P /var/lib/ntop:" \ - ${D}${sysconfdir}/ntop.conf - - # For systemd - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -D -m 0755 ${S}/packages/RedHat/ntop.init ${D}${libexecdir}/ntop-helper - install -D -m 0644 ${WORKDIR}/ntop.service ${D}${systemd_system_unitdir}/ntop.service - sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ - -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - ${D}${systemd_system_unitdir}/ntop.service - fi - - # Fix host-user-contaminated issue - chown -R root:root ${D} - - chown -R ntop.ntop ${D}${datadir}/ntop - chown -R ntop:ntop ${D}${localstatedir}/lib/ntop -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-M -g ntop -r -d ${localstatedir}/lib/ntop \ --s /usr/sbin/nologin -c 'ntop' ntop" -GROUPADD_PARAM_${PN} = "-r ntop" - -SYSTEMD_SERVICE_${PN} = "ntop.service" -SYSTEMD_AUTO_ENABLE = "disable" - -FILES_${PN}_append = "${libdir}/ntop/plugins ${libdir}/libntop-*.so \ - ${libdir}/libntopreport-*.so ${libdir}/lib*-${PV}.so" -FILES_${PN}-dev = "${includedir} ${libdir}/libntop.so \ - ${libdir}/libntopreport.so \ - ${libdir}/libnetflowPlugin.so ${libdir}/libsflowPlugin.so \ - ${libdir}/librrdPlugin.so \ - ${libdir}/*.a ${libdir}/libntopreport.a ${libdir}/*.la" - diff --git a/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch b/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch new file mode 100644 index 000000000..3a6a76120 --- /dev/null +++ b/meta-networking/recipes-support/ntop/ntop/0001-nDPI-Include-sys-types.h.patch @@ -0,0 +1,24 @@ +From 6543f3e2d5fe214e2fc6c050289bf1ae73b18724 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Aug 2017 13:56:24 -0700 +Subject: [PATCH] nDPI: Include sys/types.h + +Needed for uint_t types + +Signed-off-by: Khem Raj +--- + nDPI/src/include/ipq_api.h | 1 + + 1 file changed, 1 insertion(+) + +Index: ntop-5.0.1/nDPI/src/include/ipq_api.h +=================================================================== +--- ntop-5.0.1.orig/nDPI/src/include/ipq_api.h ++++ ntop-5.0.1/nDPI/src/include/ipq_api.h +@@ -24,6 +24,7 @@ + #ifndef __IPOQUE_API_INCLUDE_FILE__ + #define __IPOQUE_API_INCLUDE_FILE__ + ++#include + + #if defined(HAVE_NTOP) && defined(WIN32) + #include diff --git a/meta-networking/recipes-support/ntop/ntop/support-arm64.patch b/meta-networking/recipes-support/ntop/ntop/support-arm64.patch deleted file mode 100644 index 0b1e8afbc..000000000 --- a/meta-networking/recipes-support/ntop/ntop/support-arm64.patch +++ /dev/null @@ -1,28 +0,0 @@ -Add support for arm64 - -Upstream-Status: Inappropriate [no longer maintained] - -Signed-off-by: Yue Tao - -diff --git a/nDPI/config.sub.old b/nDPI/config.sub -index c2d1257..e4347ac 100755 ---- a/nDPI/config.sub.old -+++ b/nDPI/config.sub -@@ -249,7 +249,7 @@ case $basic_machine in - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 | aarch64 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -@@ -331,7 +331,7 @@ case $basic_machine in - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ -+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | aarch64-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ diff --git a/meta-networking/recipes-support/ntop/ntop_5.0.1.bb b/meta-networking/recipes-support/ntop/ntop_5.0.1.bb index 77b5e436f..298fbec61 100644 --- a/meta-networking/recipes-support/ntop/ntop_5.0.1.bb +++ b/meta-networking/recipes-support/ntop/ntop_5.0.1.bb @@ -1,4 +1,137 @@ -include ntop.inc +SUMMARY = "ntop is network top" +DESCRIPTION = "ntop is a network traffic probe that shows the network usage, \ +similar to what the popular top Unix command does." +SECTION = "console/network" + +LICENSE = "GPLv2+ & GPLv3 & OpenSSL" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE-OpenSSL.txt;md5=a409f902e447ddd889cffa0c70e7c7c2 \ + " + +SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tar.gz \ + file://ntop_configure_in.patch \ + file://ntop_init.patch \ + file://ntop_webInterface.patch \ + file://ntop_configure_in_net_snmp_config_exist.patch \ + file://ntop.service \ + file://use-static-inline.patch \ + file://0001-nDPI-Include-sys-types.h.patch \ + " SRC_URI[md5sum] = "01710b6925a8a5ffe1a41b8b512ebd69" SRC_URI[sha256sum] = "7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8" + +inherit autotools-brokensep useradd pythonnative pkgconfig systemd + +DEPENDS = "geoip rrdtool python zlib libpcap gdbm" + +PACKAGECONFIG ??= "openssl snmp plugins" +PACKAGECONFIG[openssl] = "--with-ssl, --without-ssl, openssl, openssl" +PACKAGECONFIG[snmp] = "--enable-snmp=yes NETSNMP=${STAGING_BINDIR_CROSS}/net-snmp-config, \ +--disable-snmp,net-snmp," +PACKAGECONFIG[plugins] = "--enable-plugins=yes, --disable-plugins, ," + +EXTRA_OECONF += "ac_cv_file_aclocal_m4=yes ac_cv_file_depcomp=no" + +do_configure() { + cp ${STAGING_DATADIR_NATIVE}/aclocal/libtool.m4 libtool.m4.in + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/nDPI + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}/nDPI + cat acinclude.m4.in acinclude.m4.ntop libtool.m4.in > acinclude.m4 + cp 3rd_party/* ./ + + # config nDPI + cd nDPI + ./configure ${CONFIGUREOPTS} --with-pic + cd .. + + sed -i -e 's:^CFG_DBFILE_DIR=$localstatedir/ntop:CFG_DBFILE_DIR=$localstatedir/lib/ntop:' ${S}/configure.in + + # fix the CFLAGS, CPPFLAGS, LDFLAGS, remove the host include + sed -i \ + -e 's:\(^CFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \ + -e 's:\(^CPPFLAGS="\$.*\) -I/usr/local/include -I/opt/local/include":\1":' \ + -e 's:\(^LDFLAGS="\$.*\) -L/usr/local/lib -L/opt/local/lib":\1":' \ + ${S}/configure.in + + # replace the DISTRO RELEASE in configure.in which are host's + # with our release, although those doesn't affect functionality + sed -i -e \ + '/DEFINEOS="LINUX"/{N;s/DISTRO=.*/DISTRO="${DISTRO}"/;N;s/RELEASE=.*/RELEASE="${DISTRO_VERSION}"/;}' \ + ${S}/configure.in + + # osName in original configure.in should be ${TARGET_SYS} + # which will show in ntop's "show configuration" + sed -i -e \ + 's:^osName=.*:osName=${TARGET_SYS}:' \ + ${S}/configure.in + + # rename configureextra to configureextra_rename to avoid + # configure.in to guess host OS and pull in more configure, non needed + # which will cause some cross-compiling failure on specific host + # e.g. SUSE(SLED...) + test ! -f configureextra || mv -f configureextra configureextra_rename + + # make sure configure finds python includdirs/libs with these envs + export BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ + STAGING_INCDIR=${STAGING_INCDIR} \ + STAGING_LIBDIR=${STAGING_LIBDIR} + + autotools_do_configure +} + +do_compile_prepend() { + cd nDPI + oe_runmake + cd .. +} + +do_install_append() { + # remove the empty dirs + rm -rf ${D}${libdir}/plugins + + install -D -m 0755 ${S}/packages/RedHat/ntop.init \ + ${D}${sysconfdir}/init.d/ntop + install -D -m 0644 ${S}/packages/RedHat/ntop.conf.sample \ + ${D}${sysconfdir}/ntop.conf + + # change ntop dir in ntop.conf + # don't use the -P as the ntop.init didn't support it + sed -i -e "s:^--db-file-path /usr/share/ntop:--db-file-path /var/lib/ntop:" \ + -e "s:^#? -P /var/ntop:#? -P /var/lib/ntop:" \ + ${D}${sysconfdir}/ntop.conf + + # For systemd + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -D -m 0755 ${S}/packages/RedHat/ntop.init ${D}${libexecdir}/ntop-helper + install -D -m 0644 ${WORKDIR}/ntop.service ${D}${systemd_system_unitdir}/ntop.service + sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ + -e 's,@SYSCONFDIR@,${sysconfdir},g' \ + ${D}${systemd_system_unitdir}/ntop.service + fi + + # Fix host-user-contaminated issue + chown -R root:root ${D} + + chown -R ntop.ntop ${D}${datadir}/ntop + chown -R ntop:ntop ${D}${localstatedir}/lib/ntop +} + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM_${PN} = "-M -g ntop -r -d ${localstatedir}/lib/ntop \ +-s /usr/sbin/nologin -c 'ntop' ntop" +GROUPADD_PARAM_${PN} = "-r ntop" + +SYSTEMD_SERVICE_${PN} = "ntop.service" +SYSTEMD_AUTO_ENABLE = "disable" + +FILES_${PN}_append = "${libdir}/ntop/plugins ${libdir}/libntop-*.so \ + ${libdir}/libntopreport-*.so ${libdir}/lib*-${PV}.so" +FILES_${PN}-dev = "${includedir} ${libdir}/libntop.so \ + ${libdir}/libntopreport.so \ + ${libdir}/libnetflowPlugin.so ${libdir}/libsflowPlugin.so \ + ${libdir}/librrdPlugin.so \ + ${libdir}/*.a ${libdir}/libntopreport.a ${libdir}/*.la" + From patchwork Thu Aug 31 02:03:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111345 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp1847823qge; Wed, 30 Aug 2017 19:05:00 -0700 (PDT) X-Google-Smtp-Source: ADKCNb6HaUbCPTs1Ww+YtizN4+VSh+KFA2YfNL52fWTrCO/oSD3Uh2HVZvliTq2IIuwchafB/Ww2 X-Received: by 10.84.176.3 with SMTP id u3mr751844plb.388.1504145100133; Wed, 30 Aug 2017 19:05:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504145100; cv=none; d=google.com; s=arc-20160816; b=wpaBvaEHG988EBj0eAzeLxUxtcDPyxJwhkObqKbgcfAs9m4230BQHG44sZdiR6TjFp KTL/eGW2NBRT5Nj/nnCQyMEPc4R1c5qf7limuD/9r5em/SOP6GKSx0IgYSQDcYUd712J KrYCoT6ZDS+G5aBIBub1I7mdMrquOo1glssygcYsJaA9QSyORDksskvjUUqkHvUYttpg HXfsQPW2c4zkPou3CVOJAj7f7Let+q0yTKM5IVztSENL2sn0v3nyZZ06gxvsizRuA1Uh szg+Dt44tDH56eEho5JD+JUyYyJggO7h9cgYryPHCOj2dpdkDKamtnkR14V0RAPU7IBZ zMAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=fUsuLydKmHTloaWufHbumvuZWSXcf81AJRxjOnYuEMs=; b=BQ1ebo+v9y9RUS9JYSDX/SF/80925AH96DNN4XhPjYg3ie/2UVs0ij1ZUZBYikdmhG Ol6gruTaEOaOKf5+w7F13JGDd41JUhhck1bPxFHXHbRChLzhiNCeyp+oCbW+HV9HOyTA hC5qwl8VSYqTUIl52V+9FI5tbncSRuWp4s/YuiYOEymfUIBcKp/ci3ajs1qK8KoEElvU ZeyfcYUz+ddNBL6PUSsfdyAL+PtgtbI5WBhwCR2SnhZb20PKg+hV1Qeeo+HreYgqOt2Q wSX2gUTv7URZNKTa9ugiToXGJaBR/ZArBeyEb/FXl8PmOB8A4OgMps3pxrHE2FEjginy rfMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=fqN2Wy0a; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 31si5585236ply.816.2017.08.30.19.04.59; Wed, 30 Aug 2017 19:05:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=fqN2Wy0a; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3570578395; Thu, 31 Aug 2017 02:04:56 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f179.google.com (mail-pf0-f179.google.com [209.85.192.179]) by mail.openembedded.org (Postfix) with ESMTP id 22F687826E for ; Thu, 31 Aug 2017 02:04:16 +0000 (UTC) Received: by mail-pf0-f179.google.com with SMTP id l87so14399417pfj.1 for ; Wed, 30 Aug 2017 19:04:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=C2E4RP6hZYVoKlIUO1d2ailQeu9E509WCoYJsiMDPdU=; b=fqN2Wy0aGYzm9o7wRyHtyY5VQmox2XvZ2otlPbY3K7W+oUw4B+0swKsSu7NWmnwxnI t+DMyv6a9NCGK9vw9yhGtsSgHYJDsjqbH1gQmvovEbffx3ZcPWAlpHMj50IkBv9ktv+v LgMe1NHhrhJ0S7vA6fDw5VuU3up+Etr+NeuPr1+l6fL4Ds/3Sle/jYDP/kd7N2QW8aPM jAxDz+MSrzJhgq2MTc4qJDtGI/Id0C9KkrPKdB8VSbnKK+Ok5ROwDChT7K6T7510wflt 3lTOqKTCutbFAj9rIZbzgGe58gIV8l/kggKAsDzNeYm2kqfSorFFKejERrhxWBLvt7mK AVaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=C2E4RP6hZYVoKlIUO1d2ailQeu9E509WCoYJsiMDPdU=; b=anOLcSExZyraSF0wrmh+L0Pve4+uneZF64hA3Ke95BIymMvEUAOUf9Ap8MO3Fo94W/ gR+jTNNxmWjwutvOA0v9/owziLW1wKyf9ZStLq0NFxfTombgLdiF9bj8AlmxthYhvenv MswU8v6rq28gfBgEJRZlzxIK5W0BSknz1EJqpeyO8+fZcejDebADaeHUcPr+D+UQeTN9 /qaFqrC9uIlAMYMNfr6i6X575vf7RnHmCmnwLO/QzF9dTR3rpmu8SBQyd7DPfkuXcVJw +vjUQyot3VcKzEYmQJ2UEPSKZZ+ESBcX9211pjkKpaLO2u0CzGm81vb2iUhTZKgKi9jd lbkw== X-Gm-Message-State: AHYfb5hRLr8schjVd0lqNr14FXP30WVvuOoQj07FMKSJcMw4pJTjG6TZ nw6qtsHlutRMy9xB X-Received: by 10.99.119.201 with SMTP id s192mr614943pgc.227.1504145057864; Wed, 30 Aug 2017 19:04:17 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::79ab]) by smtp.gmail.com with ESMTPSA id c10sm12347641pfk.101.2017.08.30.19.04.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 19:04:16 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 30 Aug 2017 19:03:59 -0700 Message-Id: <20170831020401.6367-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170831020401.6367-1-raj.khem@gmail.com> References: <20170831020401.6367-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 2/4] corosync: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...001-Include-fcntl.h-for-F_-and-O_-defines.patch | 28 ++++++++++++++++++++++ .../recipes-extended/corosync/corosync_2.4.2.bb | 4 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/corosync/corosync/0001-Include-fcntl.h-for-F_-and-O_-defines.patch -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/corosync/corosync/0001-Include-fcntl.h-for-F_-and-O_-defines.patch b/meta-oe/recipes-extended/corosync/corosync/0001-Include-fcntl.h-for-F_-and-O_-defines.patch new file mode 100644 index 000000000..fe4b0793f --- /dev/null +++ b/meta-oe/recipes-extended/corosync/corosync/0001-Include-fcntl.h-for-F_-and-O_-defines.patch @@ -0,0 +1,28 @@ +From 85ea47fedbc96ed9180e08b0d371d9966e3a88da Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Aug 2017 17:28:55 -0700 +Subject: [PATCH] Include fcntl.h for F_* and O_* defines + +Fixes errors like +utils.c:95:22: error: use of undeclared identifier 'O_WRONLY' + +Signed-off-by: Khem Raj +--- + qdevices/utils.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/qdevices/utils.c b/qdevices/utils.c +index 41850b8c..87090853 100644 +--- a/qdevices/utils.c ++++ b/qdevices/utils.c +@@ -39,6 +39,7 @@ + + #include + #include ++#include + #include + #include + #include +-- +2.14.1 + diff --git a/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb b/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb index 7d5a87e4c..33e74e2ff 100644 --- a/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb +++ b/meta-oe/recipes-extended/corosync/corosync_2.4.2.bb @@ -7,7 +7,9 @@ SECTION = "base" inherit autotools pkgconfig systemd useradd -SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz" +SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz \ + file://0001-Include-fcntl.h-for-F_-and-O_-defines.patch \ + " SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f" SRC_URI[sha256sum] = "f26e3011309fe4bcce94b1dc20ea8c462f19483a73f3ca62f13b925d011a4ba9" From patchwork Thu Aug 31 02:04:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111346 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp1847951qge; Wed, 30 Aug 2017 19:05:07 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7pK3wJTyJ/t3dAWpRU329eU/kYBAdjiDttJ3GdgDQ7VeDOGktjqaFw+LCkSNmuesCZ/o39 X-Received: by 10.84.236.8 with SMTP id q8mr729881plk.211.1504145107854; Wed, 30 Aug 2017 19:05:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504145107; cv=none; d=google.com; s=arc-20160816; b=UUWoU9dqjRMUKcJhL2YjxnAH6fMX2g+g67sjY5+FBlND2HVdVcGJrT+nWza40BK3LG lZgmeAwaTgKIgjfDot5UZhcqTrlXaMulawUHYYOZv90PT/+4WB+FI9SecSbOu04iiwIi q2mSfCT1C6MVeCSaXr0Zl+P2IxYbtLluiQI+DelO7TAFEuNINK7C6he7tTGg83JMmXw6 dy/gJ8jbcOfs48FknZF09oaH4NCEpYGHwaSau7vH5/RxFSx2B520XNTC8paSjH/marpN qBXTTlrRDHj9ev25EjVIwfSNOj9foNG0sN9uDSbg4rZbLqX37PXqxsZM02eDksnkwsf8 RRLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=9iR/PzE/ufjt9huMCk6io3wDrxq4HYhtwBfQIdRHwi8=; b=uEE+75jnAERSagwTgwWK8SfhTVbF/he8ZlXTi/gapSw877Ej40J53dw3guzH5BWus+ cctNlo4iZGOgNSwLuX5PgPoL5VaJBfsbmcGULfZIbG6mJvJrfWTM41gy6zR8PaG5Eg1Z OHefw8imgrwHv5aCK/oFS0iRF8S36SzA5Ya4/+bGPVnq3NT+VQrsek9Xybc80ZNDiH6d IeJ4QSemb+qfPIyYrU6MuApFrChaYR/hxieVskPPXeFH/880Vboulr2Pg8UNVr0Gjgp0 cCcHh8GN7SKDrqfrwNlieSJIRtigxvjmOAHPT8r2BoBgKqRkjGV/XqgS+j2lG5iGICsu Wccg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=l9tqrGKP; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id c3si5453418pfm.392.2017.08.30.19.05.07; Wed, 30 Aug 2017 19:05:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=l9tqrGKP; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 403E0783A0; Thu, 31 Aug 2017 02:04:57 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id 1986B7838D for ; Thu, 31 Aug 2017 02:04:17 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id r133so6280991pgr.2 for ; Wed, 30 Aug 2017 19:04:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=azs0En5vK8137opvx5IwGSVgVpLzAsb9416Tjcuavzk=; b=l9tqrGKP7aLR333WwmITmOro5zz/GNHTS43Hdau1AjDLuneu6EnycKUZ8ylRRYZQY+ 7JnMuzY/M4bN2mHOqhQ3HLuU0GRorUkSbkoQUGFznG3VAsAQjW0SWXnd4+94Ma819WXt aMbuiOBsaBfbdlZFXwR7dFpmlWJ03IwXQhBo2XOmFMaUt0xOXfDs7TqY+JdF9o90mEj0 rgM2xQ9mPDrWQ9kyufBPVlAEMgJ3khCGG3h1RzejZnveDqWUHRFe5kFPx6uq/OlEX+76 8PzyVN0wMn6uqhObjwzGnUpDsbhiy7A1W25KArSzjnxKGiaK/Sqmn2Vo4a9pRlKnv0+O r4BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=azs0En5vK8137opvx5IwGSVgVpLzAsb9416Tjcuavzk=; b=Bixvzn0CAjs+mHbGyc+M3D3DdeGlks+4HvAK8PObmzE5VRuwdlWYPKom3gPO27gSMT EN7Zokp3zTsukdOr3cs8p5jbMovtWOMn8Q3pzrzgKQlltxAIt7V242M/hwD5nA79Qi/6 /HRjaz0zLRQVFQ/JkQIomnZXGZr3RIrCtZj06KcO17EuUtK+MpwphgKa11S9FEOxP/De SSf3hYdMq4etSx5rCghyJUb/s1DHHNpYnCii3GUi9qbUk38Xe9Ir/lZ7CWbDl6+PKFe/ JXNtpSLCGYc2+u7UjOdkjCL4T4mReSXti/eQ4fgxWMI2ttkOKT0mZPl6x4NjjCypfGui 5Cmw== X-Gm-Message-State: AHYfb5hqAjyJOxd5EMhmS7CJx7fWaVjya8k0aEF2tpDe3KU8Otey1WRo JmkWjKwQ1GU/iX/p X-Received: by 10.99.164.26 with SMTP id c26mr628517pgf.141.1504145059207; Wed, 30 Aug 2017 19:04:19 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::79ab]) by smtp.gmail.com with ESMTPSA id c10sm12347641pfk.101.2017.08.30.19.04.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 19:04:18 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 30 Aug 2017 19:04:00 -0700 Message-Id: <20170831020401.6367-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170831020401.6367-1-raj.khem@gmail.com> References: <20170831020401.6367-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 3/4] netkit-rwho: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...001-Add-missing-include-path-to-I-options.patch | 44 ++++++++++++++ .../0002-Fix-build-issues-found-with-musl.patch | 69 ++++++++++++++++++++++ .../recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb | 4 +- 3 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch create mode 100644 meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch new file mode 100644 index 000000000..9899292b0 --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0001-Add-missing-include-path-to-I-options.patch @@ -0,0 +1,44 @@ +From 55ab6f1389261edff5f4c942bc3b0d8e695856d7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Aug 2017 18:11:33 -0700 +Subject: [PATCH 1/2] Add missing include path to -I options + +Fixes errors like +| rwho.c:52:10: fatal error: 'protocols/rwhod.h' file not found +| #include +| ^~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj +--- + rwho/Makefile | 1 + + rwhod/Makefile | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/rwho/Makefile b/rwho/Makefile +index 6f86388..67b28d4 100644 +--- a/rwho/Makefile ++++ b/rwho/Makefile +@@ -6,6 +6,7 @@ include ../MRULES + rwho: rwho.o + $(CC) $(LDFLAGS) $^ $(LIBS) -o $@ + ++CFLAGS += -I../include + rwho.o: ../version.h + + install: rwho +diff --git a/rwhod/Makefile b/rwhod/Makefile +index 772b641..9034218 100644 +--- a/rwhod/Makefile ++++ b/rwhod/Makefile +@@ -7,6 +7,8 @@ ifneq ($(USE_GLIBC),1) + CFLAGS += -D_GNU_SOURCE + endif + ++CFLAGS += -I../include ++ + OBJS = rwhod.o + + rwhod: $(OBJS) +-- +2.14.1 + diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch new file mode 100644 index 000000000..e149f3468 --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho/0002-Fix-build-issues-found-with-musl.patch @@ -0,0 +1,69 @@ +From 2108213242638fa355f662382f55495d91301858 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Aug 2017 18:13:17 -0700 +Subject: [PATCH 2/2] Fix build issues found with musl + +Signed-off-by: Khem Raj +--- + ruptime/ruptime.c | 1 + + rwho/rwho.c | 1 + + rwhod/rwhod.c | 5 +++-- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/ruptime/ruptime.c b/ruptime/ruptime.c +index 1d4f7b6..f1f043c 100644 +--- a/ruptime/ruptime.c ++++ b/ruptime/ruptime.c +@@ -53,6 +53,7 @@ char ruptime_rcsid[] = + #include + #include + #include ++#include + + struct hs { + char hs_hostname[MAXHOSTNAMELEN]; +diff --git a/rwho/rwho.c b/rwho/rwho.c +index 63919ac..71aec9e 100644 +--- a/rwho/rwho.c ++++ b/rwho/rwho.c +@@ -49,6 +49,7 @@ char rcsid[] = "$Id: rwho.c,v 1.7 1999/08/01 20:44:18 dholland Exp $"; + #include + #include + #include ++#include + #include + + #include "../version.h" +diff --git a/rwhod/rwhod.c b/rwhod/rwhod.c +index 54498d0..40cabcf 100644 +--- a/rwhod/rwhod.c ++++ b/rwhod/rwhod.c +@@ -76,6 +76,7 @@ char rcsid[] = + #include + #include + #include ++#include + + #include "../version.h" + +@@ -102,7 +103,7 @@ struct nlist nl[] = { + static void broadcaster(void); + static int configure(int s); + static int verify(const char *name); +-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) ++#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)) + static int getloadavg(double ptr[3], int n); + #endif + +@@ -549,7 +550,7 @@ sendpacket(struct whod *wd) + } + } + +-#if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) ++#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2)) + /* + * Taken from: + * +-- +2.14.1 + diff --git a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb index 04baa4286..5685f03d6 100644 --- a/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb +++ b/meta-networking/recipes-netkit/netkit-rwho/netkit-rwho_0.17.bb @@ -8,7 +8,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}.orig.tar.gz;nam ${DEBIAN_MIRROR}/main/n/netkit-rwho/netkit-rwho_${PV}-13.debian.tar.gz;name=patch13 \ file://rwhod \ file://rwhod.default \ -" + file://0001-Add-missing-include-path-to-I-options.patch \ + file://0002-Fix-build-issues-found-with-musl.patch \ + " SRC_URI[archive.md5sum] = "0f71620d45d472f89134ba0d74242e75" SRC_URI[archive.sha256sum] = "0409e2ce4bfdb2dacb2c193d0fedfc49bb975cb057c5c6b0ffcca603a1188da7" SRC_URI[patch13.md5sum] = "82ed5a3c6b0bbf00b36508b9787963b9" From patchwork Thu Aug 31 02:04:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 111347 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp1848081qge; Wed, 30 Aug 2017 19:05:16 -0700 (PDT) X-Google-Smtp-Source: ADKCNb5RZPSq4q1c73xaW94nVvrH6JWOt0HWmv4QSU1Ssxba5pcrxh/ojfMX7JK8ecgPIJgBx5mS X-Received: by 10.84.233.143 with SMTP id l15mr711254plk.333.1504145116162; Wed, 30 Aug 2017 19:05:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504145116; cv=none; d=google.com; s=arc-20160816; b=U3gtkbjpOXnSStZGKrnv+0E8LXfQDS66ZSWBq72ouDgvtVWMsMnBZDTus8BTw7zI1a 29QD43hx5yqHq2X9oRCV14nimChcFbi1sjD0vPLwCjV7Duri4JwB3p+Nk3Oo8abNu77z zale4CXgblf8pCkHrRP0l8dhWL1k61frp8E9iuqFOF+sVGLhOhmHY2QxvZDPy60vNFTz eGOtVR0FFZAHL9syZX0q/qWoowpn5X1rt165NmdUbfmim1fLMjocLa1sw+WrHFQc6meV Kc6fPsuhKhbTghiqIjwGxtwZ6gnWUGYKY4Zw9qXEK1DyZEhztMoDySMwcqE9rWqKUICz c5WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=EBXVa75HnGuuaQLGth48x8560XxNV51uQcTIo6b59OM=; b=l4LfS0dMypPnpbdy3YmLq0dOH/PqyvrNcbvK9rY5qR5JeoWg7umFEoGKa21VLTUDkR jtlaYy6igjHb/R2mUF/PU8ps/UzkQ6eASwhd78X+maFtCJ6bIEepF5H4lDEkUpVEMwU8 +O127NZ8AnoZk2jgkFQwZ1Y4RbWY8R14GPbtcX0ZyxKsXlkfXKitcP42VWCLV0h0CvC+ TQnwV+9oLTheFOBORgiWEYTp2O0A5XEzCyRb5aQy+PARieCO4OPLrVU/kSAXd2BUo0bs kFIXal2nGTL2BcDe2Q9G029aVXzAVHDcSIE7ANnFWOT5D1iqSzehAj2uYjUjMsfrbN9T fajA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tj+HAh5s; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id b11si5686947plk.426.2017.08.30.19.05.15; Wed, 30 Aug 2017 19:05:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tj+HAh5s; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 5258E783A5; Thu, 31 Aug 2017 02:04:58 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by mail.openembedded.org (Postfix) with ESMTP id A69D978387 for ; Thu, 31 Aug 2017 02:04:18 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id m15so6292056pgc.0 for ; Wed, 30 Aug 2017 19:04:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Vi43fk9yvySmbT4Y10dC+c5GiHl1hYjhWoaHH2VE39k=; b=tj+HAh5szAKeJ/tqbMk3xrM4d+s8lLmDoDLeWfDyXRh792fQzew9JW6TWE6+/IZKH+ uJUBSBATOtJ2+hZJt6/xkvUSK0EHEOJcukLdGE8KEnWqfqi1ugdnYunfYZb5wxceV7Vn QWCIUmjezy5Bfiwf6yD2wrCu6G0beh1glyEDDjGCPdHXyhsVVZmkg6VihdEW67lfW56A 2lmClA+fdqQ2DPNkERejyfyNZ5Jf1QmNbkMfjPnwR4IJkHN5oVyyeJDQHK4N6fc8FR8o lsH5dhhGmkRbIVh5t3Rc2P/9Ts/V0bhSbVYybnD4ArpPIIdwzo+jHlx2TJ+hy82TS1Se qEWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Vi43fk9yvySmbT4Y10dC+c5GiHl1hYjhWoaHH2VE39k=; b=NdvltiOXLw8mTs6Z3rMK6xyJZloemVYFkvse5r30bND4oFkiuWy/mWe4OfF41QE/s7 7wrkTMfySeAZQh9c4kX7riKwXgpoXr+GJYaEN/CiH+CWFBirsk3DNt7U5LitOKksiK9a ixhO7EISmuQRcK/M6xmADdnHE769qaDYGzGzhXubVpk9eVAwdF6NwjKzg1iqaqDSlaJL k0TAZVGrkDlLLyLnwBW8YyJSGFzQvdfGyFpStBfU7rtYa5SJbDXKxQ3hjg79ej9CuszR wvDZNZlW+sAm0B6OXz6vBFSTrHbCvkJ4Wi8YlfWhwu25c9TDvuJnvSFtmQseL+SaLGc3 Namw== X-Gm-Message-State: AHYfb5jEng8tNIwWlqKHdPPIDIRCvwDf0hu8kRWGs3o7a4za/03VozBc H6vPI4ynmtj4nZ0W X-Received: by 10.99.113.29 with SMTP id m29mr630899pgc.39.1504145060124; Wed, 30 Aug 2017 19:04:20 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8882:b8c::79ab]) by smtp.gmail.com with ESMTPSA id c10sm12347641pfk.101.2017.08.30.19.04.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Aug 2017 19:04:19 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 30 Aug 2017 19:04:01 -0700 Message-Id: <20170831020401.6367-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170831020401.6367-1-raj.khem@gmail.com> References: <20170831020401.6367-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 4/4] netkit-tftp: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../0001-tftp-Include-missing-fcntl.h.patch | 25 ++++++++++++++++++++++ .../recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb | 7 +++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch -- 2.14.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch b/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch new file mode 100644 index 000000000..c5dcdb423 --- /dev/null +++ b/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp/0001-tftp-Include-missing-fcntl.h.patch @@ -0,0 +1,25 @@ +From fa57e161fc953264a75d50a787cb83983e60acc7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 30 Aug 2017 18:30:02 -0700 +Subject: [PATCH] tftp: Include missing fcntl.h + +Signed-off-by: Khem Raj +--- + tftp/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tftp/main.c b/tftp/main.c +index 8c54843..5c9b698 100644 +--- a/tftp/main.c ++++ b/tftp/main.c +@@ -63,6 +63,7 @@ char main_rcsid[] = + #include + #include + #include ++#include + + #include "tftpsubs.h" /* for mysignal() */ + +-- +2.14.1 + diff --git a/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb b/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb index 67a541d25..92c13e850 100644 --- a/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb +++ b/meta-networking/recipes-netkit/netkit-tftp/netkit-tftp_0.17.bb @@ -6,9 +6,10 @@ DEPENDS = "tcp-wrappers" LIC_FILES_CHKSUM = "file://tftp/tftp.c;beginline=2;endline=3;md5=84d2cfe1e60863a7d82648734ba4d30c" SRC_URI = "${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}.orig.tar.gz;name=archive \ - ${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}-18.diff.gz;name=patch18 \ - file://tftp.conf \ -" + ${DEBIAN_MIRROR}/main/n/${BPN}/${BPN}_${PV}-18.diff.gz;name=patch18 \ + file://tftp.conf \ + file://0001-tftp-Include-missing-fcntl.h.patch \ + " SRC_URI[archive.md5sum] = "b7262c798e2ff50e29c2ff50dfd8d6a8" SRC_URI[archive.sha256sum] = "3a43c0010d4e61f412563fd83769d4667d8b8e82903526d21cb9205fe55ad14d"