From patchwork Sun Jun 24 19:18:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139772 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3198048lji; Sun, 24 Jun 2018 12:19:38 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIvfZnhvq7eIqI3oIVXtLgvJoUKAwgdcnf1esVeBGluvNsp9YVYhSv3cG8CMUaihEx9jy65 X-Received: by 2002:a63:6441:: with SMTP id y62-v6mr8177939pgb.240.1529867978021; Sun, 24 Jun 2018 12:19:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529867978; cv=none; d=google.com; s=arc-20160816; b=BgqPfu/PWXEPD4vh8Sd7bk1VdJjNDa7WJIszkWTN+pZq/C8BHhfiPH9Ay8+oARyynJ 4yp4OJyB8frqUZlhcMqXvJom4psNwC6J3xVLzYKkQHZ7r+DKDGtxI38jTUbdpw6R0d5a Tijbvj1IPxW417jfyNl2AKBvfJIeiofIIaGuMH0neN2sbg0pIb0aTGWSFysrGlSO1j9M GMpX5aZOoU+yRrfMuQmrmVXZ0J5A/HXP1ZCIki3oZclGyBPY4uY95aDE6f+zHtKqHsnT arUwHQV2b832FcvGv02DLs8vECwAA7HK4zSYtx95DuGj6QkQ65uPcN14Xvnak2PG+V0B cUSA== 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=1Aeg5aYNwI/7R/CzS4ednUjS9q2r6glLjHttzNSLN30=; b=Dub9uueeXI+sjyb/NxyY30PmgOSNY/wDJCX9lKH6ckm1F4anY2qdCSvEg3UoBf34cg Ld1bRkm1lZmSPeYKgyGDm+j/YeRGWGOzjbj6ExfkuIQJeHYebdUVO0i9CsLjWItMwwV1 M6gEZIci/G0XXU8R5LSONJbPKW54iFTVKIhxUqTo44qwt7TPAm1HKYV8g00Myl4bHUnJ 8DT1M4QWI+0d9vyKedj+zKkYeDJP5WNlhuIAU52DvAu76VN66x9hHNPKVN6X4E8RV0CS 6HwnrlMkpRmKQeh1hlcr1AZhxvaPzJ1UR/q5fUcHtgzjtp17V/nXQaTL2843zH5QFpZL OL9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HbqhEtfU; 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=QUARANTINE 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 j84-v6si12375201pfj.79.2018.06.24.12.19.37; Sun, 24 Jun 2018 12:19:38 -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=HbqhEtfU; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3371F74CAF; Sun, 24 Jun 2018 19:19:30 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f53.google.com (mail-pl0-f53.google.com [209.85.160.53]) by mail.openembedded.org (Postfix) with ESMTP id C9D1A74CAF for ; Sun, 24 Jun 2018 19:19:28 +0000 (UTC) Received: by mail-pl0-f53.google.com with SMTP id g20-v6so5778310plq.1 for ; Sun, 24 Jun 2018 12:19:30 -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=9C3wDbgd6F+PxsXa+gLs/cL2Sg9oofs5NkNk+SgozN4=; b=HbqhEtfUFsPU2ETbH7kPSH5mR8GaAX4C32mheEbdh1H172iSCm8iFOL//Bz+51H6ly MphCC1wOJ06lm3hsHiGzJwfXu2q/j7nfefhhBM3dSse/NVg8R+DA4Fp2vFUA/UVUxMmQ 4vhrkpcVQlm8/9YU3NXEFi02j3ZZHO00qmMeUA1fYiH1T30Ggmd+6LNItsVQk1sk/vyj qON2sElGwyvlEeAXQVhMGuoxxdnHbV/b18jDQrAHw3ahbRpOnedtOqO6xXAO2V2VCCIR YvcWwsBwsNrMpJZRmo/0IRQPgQ2lkYRtM0hcsbJkLIdgvwnw3sClryWZ80S5T9COwkAY gpHw== 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=9C3wDbgd6F+PxsXa+gLs/cL2Sg9oofs5NkNk+SgozN4=; b=W5RKpFUCvAKATenHO6MlBDBJM5f43H2dYDzMc6nwcA6JkqM2rddtAonslnOsGtcaSI 2zW5FD/wJICSGemwWwZWZTy5TByc5+MCIpHzbZj/DAvw4hTOPascKXbvPap5yyxezyA2 8pkQNDCaVPSeEm1bKaQZ09QRrT92KfJ9Lmp78PS8EB0uq26IliLpsKpufaWe2Ak3Fzop SlVyKBuNd1BTiTUycdYBS8T0Ehx10d/wB4EQwa7ZVe2DgNI6L/mgIOL4cfNm3iiTGLWs ZNsvEX+Y+bmB0+JOkK5mC6adY3boXgCeotKqGuaGOTCk6MZ3zIAEP90jZqyJgGg4yjFs B3xA== X-Gm-Message-State: APt69E1LpFnrJyqJP53srC4Kur+vgTQQ8adIPo7OaNeraL0c7Fj1sAOj AIDX3G5yJr8PNSmNAujxM0VLcg== X-Received: by 2002:a17:902:bd05:: with SMTP id p5-v6mr9749615pls.32.1529867969465; Sun, 24 Jun 2018 12:19:29 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:28 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:26 -0700 Message-Id: <20180624191845.31082-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [oe] [meta-oe][PATCH 01/20] pcmciautils: add (from oe-core) 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 From: Ross Burton Modern hardware doesn't really use PCMCIA so the support has been moved out of oe-core. Move into meta-oe for people who still want it. Signed-off-by: Ross Burton Signed-off-by: Khem Raj --- .../pcmciautils/lex_sys_types.patch | 21 ++++ .../pcmciautils/makefile_fix.patch | 101 ++++++++++++++++++ .../pcmciautils/makefile_race.patch | 43 ++++++++ .../pcmciautils/pcmciautils_018.bb | 41 +++++++ 4 files changed, 206 insertions(+) create mode 100644 meta-oe/recipes-bsp/pcmciautils/pcmciautils/lex_sys_types.patch create mode 100644 meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_fix.patch create mode 100644 meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch create mode 100644 meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-bsp/pcmciautils/pcmciautils/lex_sys_types.patch b/meta-oe/recipes-bsp/pcmciautils/pcmciautils/lex_sys_types.patch new file mode 100644 index 0000000000..d4c2bed15c --- /dev/null +++ b/meta-oe/recipes-bsp/pcmciautils/pcmciautils/lex_sys_types.patch @@ -0,0 +1,21 @@ +Include sys/types.h for u_long definition + +Fix errors like +In file included from src/lex_config.l:34:0: +src/yacc_config.y:45:5: error: unknown type name 'u_long' + u_long num; + +Signed-off-by: Khem Raj +Upstream-Status: Pending +Index: pcmciautils-018/src/lex_config.l +=================================================================== +--- pcmciautils-018.orig/src/lex_config.l ++++ pcmciautils-018/src/lex_config.l +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #ifdef HAS_WORDEXP + #include diff --git a/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_fix.patch b/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_fix.patch new file mode 100644 index 0000000000..7b0ce21194 --- /dev/null +++ b/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_fix.patch @@ -0,0 +1,101 @@ +Upstream-Status: Inappropriate [configuration] + +Hardcoded paths are bad... +This lets us use the install from OE's native sysroot +rebase the patch to 018, removing hardcoded path for true +as well. Removing of -D in install invocation is a little +questionable, is it some GNU extention? + +-Khem Raj + +Index: pcmciautils-018/Makefile +=================================================================== +--- pcmciautils-018.orig/Makefile ++++ pcmciautils-018/Makefile +@@ -76,7 +76,7 @@ sbindir = ${exec_prefix}/sbin + mandir = ${prefix}/usr/share/man + udevdir = ${prefix}/lib/udev + +-INSTALL = /usr/bin/install -c ++INSTALL = install -c + INSTALL_PROGRAM = ${INSTALL} + INSTALL_DATA = ${INSTALL} -m 644 + INSTALL_SCRIPT = ${INSTALL_PROGRAM} +@@ -180,7 +180,7 @@ endif + # if DEBUG is enabled, then we do not strip or optimize + ifeq ($(strip $(DEBUG)),true) + CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE +- STRIPCMD = /bin/true -Since_we_are_debugging ++ STRIPCMD = true -Since_we_are_debugging + else + CFLAGS += $(OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE + STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment +@@ -273,30 +273,32 @@ clean: + + install-hotplug: + $(INSTALL) -d $(DESTDIR)$(hotplugdir) +- $(INSTALL_PROGRAM) -D hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent +- $(INSTALL_PROGRAM) -D hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc ++ $(INSTALL_PROGRAM) hotplug/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.agent ++ $(INSTALL_PROGRAM) hotplug/pcmcia.rc $(DESTDIR)$(hotplugdir)/pcmcia.rc + + uninstall-hotplug: + - rm -f $(DESTDIR)$(hotplugdir)/pcmcia.agent $(DESTDIR)$(hotplugdir)/pcmcia.rc + + install-socket-hotplug: +- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent +- $(INSTALL_PROGRAM) -D hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc ++ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent ++ $(INSTALL_PROGRAM) hotplug/pcmcia_socket.rc $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc + + uninstall-socket-hotplug: + - rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent $(DESTDIR)$(hotplugdir)/pcmcia_socket.rc + + install-socket-tools: +- $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) ++ $(INSTALL) -d $(DESTDIR)$(udevhelperdir) ++ $(INSTALL_PROGRAM) $(PCMCIA_SOCKET_STARTUP) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) + + uninstall-socket-tools: + - rm -f $(DESTDIR)$(udevhelperdir)/$(PCMCIA_SOCKET_STARTUP) + + install-tools: + $(INSTALL) -d $(DESTDIR)$(sbindir) +- $(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) ++ $(INSTALL) -d $(DESTDIR)$(udevhelperdir) ++ $(INSTALL_PROGRAM) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL) + $(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA) +- $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS) ++ $(INSTALL_PROGRAM) $(PCMCIA_CHECK_BROKEN_CIS) $(DESTDIR)$(udevhelperdir)/$(PCMCIA_CHECK_BROKEN_CIS) + + uninstall-tools: + - rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL) +@@ -305,22 +307,24 @@ uninstall-tools: + + install-config: + $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir) +- $(INSTALL_DATA) -D config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts ++ $(INSTALL_DATA) config/config.opts $(DESTDIR)$(pcmciaconfdir)/config.opts + if [ -f config/config.opts.$(ARCH) ]; then \ +- $(INSTALL_DATA) -D config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \ ++ $(INSTALL_DATA) config/config.opts.$(ARCH) $(DESTDIR)$(pcmciaconfdir)/config.opts; \ + fi + + uninstall-config: + # - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts + + install-udev: +- $(INSTALL_DATA) -D $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules ++ $(INSTALL) -d $(DESTDIR)$(udevrulesdir) ++ $(INSTALL_DATA) $(UDEV_RULES_FILE) $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules + + uninstall-udev: + - rm -f $(DESTDIR)$(udevrulesdir)/60-pcmcia.rules + + install-man: +- $(INSTALL_DATA) -D man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 ++ $(INSTALL) -d $(DESTDIR)$(mandir)/man8 ++ $(INSTALL_DATA) man/man8/pccardctl.8 $(DESTDIR)$(mandir)/man8/pccardctl.8 + $(SYMLINK) pccardctl.8 $(DESTDIR)$(mandir)/man8/lspcmcia.8 + + uninstall-man: diff --git a/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch b/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch new file mode 100644 index 0000000000..f5a518ff73 --- /dev/null +++ b/meta-oe/recipes-bsp/pcmciautils/pcmciautils/makefile_race.patch @@ -0,0 +1,43 @@ +"make src/lex_config.o" + +results in: + +src/lex_config.l:35:25: fatal error: yacc_config.h: No such file or directory + +so add missing dependency through a missing rule. Also remove a rule which +doesn't appear to do anything. + +RP +2016/1/31 + +Upstream-Status: Pending + +Index: pcmciautils-018/Makefile +=================================================================== +--- pcmciautils-018.orig/Makefile ++++ pcmciautils-018/Makefile +@@ -249,6 +249,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st + yacc_config.o lex_config.o: %.o: %.c src/yacc_config.h + $(CC) -c -MD -O -pipe $(CPPFLAGS) $< + ++src/lex_config.o : src/lex_config.c src/yacc_config.h ++ $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< ++ + debugtools: ccdv $(CBDUMP) $(CISDUMP) + + $(CBDUMP): $(LIBC) debug/cbdump.o +Index: pcmciautils-018/Makefile +=================================================================== +--- pcmciautils-018.orig/Makefile ++++ pcmciautils-018/Makefile +@@ -246,8 +246,8 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/st + $(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) src/startup.o src/yacc_config.o src/lex_config.o $(LIB_OBJS) $(ARCH_LIB_OBJS) + $(QUIET) $(STRIPCMD) $@ + +-yacc_config.o lex_config.o: %.o: %.c +- $(CC) -c -MD -O -pipe $(CPPFLAGS) $< ++src/lex_config.o : src/lex_config.c src/yacc_config.h ccdv ++ $(QUIET) $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + + debugtools: ccdv $(CBDUMP) $(CISDUMP) + diff --git a/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb new file mode 100644 index 0000000000..2e59f05c2c --- /dev/null +++ b/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb @@ -0,0 +1,41 @@ +SUMMARY = "Linux kernel userland utilities for the PCMCIA subsystem" +HOMEPAGE = "https://www.kernel.org/pub/linux/utils/kernel/pcmcia/" +SECTION = "kernel/userland" + +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "udev sysfsutils flex-native" +RDEPENDS_${PN} = "udev module-init-tools" + +PR = "r1" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/${BP}.tar.xz \ + file://makefile_fix.patch \ + file://makefile_race.patch \ + file://lex_sys_types.patch \ +" + +SRC_URI[md5sum] = "885431c3cefb76ffdad8cb985134e996" +SRC_URI[sha256sum] = "57c27be8f04ef4d535bcfa988567316cc57659fe69068327486dab53791e6558" + +inherit pkgconfig + +export HOSTCC = "${BUILD_CC}" +export etcdir = "${sysconfdir}" +export sbindir = "${base_sbindir}" +export pcmciaconfdir = "${sysconfdir}/pcmcia" +export udevdir = "`pkg-config --variable=udevdir udev`" +export udevrulesdir = "`pkg-config --variable=udevdir udev`/rules.d" +export UDEV = "1" +LD = "${CC}" +CFLAGS =+ "-I${S}/src" +CFLAGS =+ "-DPCMCIAUTILS_VERSION=\\"${PV}\\"" + +EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs' 'LEX=flex'" + +do_install () { + oe_runmake 'DESTDIR=${D}' install +} + +CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" From patchwork Sun Jun 24 19:18:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139773 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3198217lji; Sun, 24 Jun 2018 12:19:54 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIboJyd7cK4dOXC1ipcmKOyY5y/SArRITQiWIqcf8nGJ5oLSxiOtOZggq5On55Gn3AnV/SV X-Received: by 2002:a17:902:722:: with SMTP id 31-v6mr9810935pli.3.1529867994781; Sun, 24 Jun 2018 12:19:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529867994; cv=none; d=google.com; s=arc-20160816; b=iD+XO5FSHYvY+Rs4/74rv+GsPky37hxypFmRRZAJyzrXw+7hGNs+FO9VB5rYdzas3s CZgCKRn1dYUSWnobSGK39IMRqFcQqjIvtkoe9VoEY0NCzINlyEAWslaMRZKYLZ9Ipgi0 PEsPbwTmfcaC170dMfAk0VxiuI062ldJ5y8Fzfz5cI4gNLh4ILPF7FPpL3bmjkkNECGT xQ3PRCi+1vGEeM9vHUnWfiClQoJDJsxxeHoxY29aDKFZ7OS0elwB8S7yOad42cc/fhp1 SBIgTb0LFacRkdDdYDo+cTpFVWnG1UuL1LvCIxcKVAMUYS4IqOBmjBytcS+nv6Y7zCAw KnNw== 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=YixF0F7RJThd+f5ppmsS/N8RnGTvSSDpSo+scpJSDeU=; b=Ph0VrMvn/WWseZpp88Ii5o4/HvFck7cCxQYyrPf3xBIspMSUtc43yquB/sTf2hrbOR u1qikgiEHVuCXIwVj4gwXuGcmokGQKCHRykHdpDGJdb8lgUsD9Bz+LTbda3j5i95AtCt a3y8KVy2yNtbOi38qLlPkQO4uPAr36y8IvMSCVBPQOJI2z/AgHHpUOII7BMGWcyMA0wQ k7Ms5nVTU5Z3SE7vjeV7LUfZe0dNuEwImeaaWu2cubKEiBE8pD4ipfvEaPiph6yqq5BD pN782NE3YxFCgLg4XfOxrrPVyNivkwJ9pQnwwK/GZ6AgiEOaukIO6ZzZUxav4a6N9vPz SDnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QNr228dX; 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=QUARANTINE 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 e189-v6si10495332pgc.461.2018.06.24.12.19.54; Sun, 24 Jun 2018 12:19:54 -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=QNr228dX; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 479CC74FE7; Sun, 24 Jun 2018 19:19:51 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f43.google.com (mail-pl0-f43.google.com [209.85.160.43]) by mail.openembedded.org (Postfix) with ESMTP id E608A74CAF for ; Sun, 24 Jun 2018 19:19:29 +0000 (UTC) Received: by mail-pl0-f43.google.com with SMTP id o18-v6so5068004pll.12 for ; Sun, 24 Jun 2018 12:19:31 -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=aMp1YEfKWXlGd0zL683hdOMKRA4hY3Z+PuYvA0sCfAQ=; b=QNr228dXMyeXn1tPticbDIeCcCuE/zWbAuuFahshDPg73DtsdYg3uCAGogNPuBHPMK izVINvthiCV54bUPwELCKzvJ09vx3mNMbE1NhUNHe8gpgJwYK43B+e3g7/wV+VF6szRT 0m56dTSAm8D31qI3yznzf9R/WKZbzJfRXrHYZx8HAAXOiM3/5X0DeC7u6aeosu8NqqK1 B1RzUajUF2fRdRByMkJKCm5joHFCAHjaj7T4pbEZFRGQjbKZd8i8cXY6c+GmdJq6+nS/ 8SP9DwCWFVMNY/JEHOdszxkl4YVIig41ZkScuJe5nT6IJlwOxfey4tIms97zXwMC84V0 7Yig== 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=aMp1YEfKWXlGd0zL683hdOMKRA4hY3Z+PuYvA0sCfAQ=; b=JR3bSjE8bj08PO5jjkIz7aPB5bVKlKKURf5TENuGU7wF9+N+PEjyQ4jZ7/oODdvF4o eIdjbLZ1HwuKtFoiHEG5VehaShaeauH/gKm0dxjdEfylKnlj7TOHvr92LbE3OHwWpSX7 y2z7AE8LbJfFa7cJSsJpW1mUxsLCkEZ9V1yUOqgErstpiGIBO8vKv8X6+BsCsu8juJkh 1JC4X6mmSaHdkPW52YJny0fCbtP74aoDVTTspydHf4ne8q96YQZm22i+HT24WA4DP327 SSSblBDVu+E0Q3ztaEIQW8lLzGjz66E5e66nr2tKseCwuXMvm6uXrh+SR2ivsGwg7+xO pqXg== X-Gm-Message-State: APt69E3YN3QOh5XyLLsk79cfIMWg5TFmh18eHGOalBnLdSTU6moejEi/ cg5yxBEg6DMMtjWDXmAGHeqpeQ== X-Received: by 2002:a17:902:381:: with SMTP id d1-v6mr9602846pld.309.1529867970717; Sun, 24 Jun 2018 12:19:30 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:29 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:27 -0700 Message-Id: <20180624191845.31082-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 02/20] gperftools: add the setting of COMPATIBLE_HOST back 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 From: Chen Qi This setting was deleted, but on mips and glibc, we still have this problem. So add this setting back, but limit it to glibc. Signed-off-by: Chen Qi Signed-off-by: Khem Raj --- meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb | 4 ++++ 1 file changed, 4 insertions(+) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb b/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb index ecac6c5cc8..e475663f22 100644 --- a/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb +++ b/meta-oe/recipes-support/gperftools/gperftools_2.6.1.bb @@ -19,6 +19,10 @@ inherit autotools S = "${WORKDIR}/git" +# On mips, we have the following error. +# do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 +# Segmentation fault (core dumped) +COMPATIBLE_HOST_mipsarch_libc-glibc = "null" # Disable thumb1 # {standard input}: Assembler messages: # {standard input}:434: Error: lo register required -- `ldr pc,[sp]' From patchwork Sun Jun 24 19:18:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139774 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3198276lji; Sun, 24 Jun 2018 12:20:00 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIaJ/mnJLYuTLhMA/hIImDd4Tupsg+joEcJYpFLsiO2YnRIlZnLgqIi4H4RukZHIO6RNPIe X-Received: by 2002:a65:4e86:: with SMTP id b6-v6mr8398902pgs.322.1529868000651; Sun, 24 Jun 2018 12:20:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868000; cv=none; d=google.com; s=arc-20160816; b=FRBiaxK9ucNbVG5lz3oPlCfWH/waz/E+y1Wd85RYU+MSVRU0WCvcEvGTF2pVDDYsMO L3B7PQydWGfbc3kc+G1ms0Cm8EnYTXy3WqFnQ8or7uYQyV433rDea/Wl5UFQlpDsF8X9 gE88yg7uuJLkgwBGNYpqi/B99eiwPkSCcMJ3KUOMQxcnck6BdTc42nyvyeoHJ7rNZdKZ A/4xcLkjTGcQOfHDIPtQ1+XbWP1bJi230ytPG8hO79yRtpK1y+umeunzMAPGq271aUgF aF5m+wxTTIjen6unkp74ujC5XOoyc4PxPTLt/t0UPLOOy7H0uhl2zk79invJv1KT1y9G ExyQ== 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=r3Jf9Yml8JnOK2n3gZtV6qkYdXHnZkasrcqf2XsPZ18=; b=J/jaKH1QE+dm+VXKCJIdWXfHZXhE3qArnRLTLnXL85jBOuqm9BU9H9WJgKrrkCVMXq z0znYceaxYm6KpOU3U5QAsY1b4GbrU2SkXuq4E7X6Yj3SauXzyJY9ZYtYy/49wXoW122 uQ4AiHG9ymUBjgo3c2jEN45bFLS+3uPLZJP7PEg5noJj7yLZEU2XyaeMU4zX3hbefMf6 RSP3f4JbA3qYJRP51uzR2id7IW02a8Ixb4ef6pAabM7zZ86bnlSHvL6SHJTd495W703y tJRB3VMn4lbo/IUIF+4tkquSgrrPcBXye7blS8/h9IgGzlzHeg/03jCXWhh7ZeDYU0xb MJmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lFRsoa8i; 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=QUARANTINE 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 139-v6si7722755pgc.87.2018.06.24.12.20.00; Sun, 24 Jun 2018 12:20: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=lFRsoa8i; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 6C75F74FC4; Sun, 24 Jun 2018 19:19:52 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id 1657374C0D for ; Sun, 24 Jun 2018 19:19:30 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id q1-v6so5422042pff.13 for ; Sun, 24 Jun 2018 12:19:32 -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=kmb/rvdBqtsBQ/5vNte6OEAfJ0nUw1kOJgg9KjELcow=; b=lFRsoa8i7Hnl4N0hxO1C7vY02fmCdbnG0w93l7bQU6nn/gEDnoo/bBT19yqkP/amJE qfwV7iBg80KeFUtsca7BxzBntAvqGBU9hAxi72+qwFX9l45iSMXMUXkho+jeJRsIHBRa 28CfhdSbs+D6k1L3JNBf4OmZHWjS82IfcKfNo5PyXQ4f0AGMV38qNi+5OvNCJyJi7gIF oOsKBnDMJ9DkHp9vbuXVirKVxOjkelPEny5v7iN+vqlQ8QMZ/hjRNNccWXXGobHjfd7y FIm4SoJ6cl0FXu0ebeWXRPytxEJyY+IX/TPp49ry1jDtQmrR8/r6H2uBJHhLspZQyzCp 58yQ== 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=kmb/rvdBqtsBQ/5vNte6OEAfJ0nUw1kOJgg9KjELcow=; b=ebYS0GFCJdjwa09R6lnMbE2OIJLxXtW+YzU40tm6BvYWQ7WuySP3K+YSZZK5x2z63+ F2z/HvACOsYyOeYl8C/gv1VEyLXbj1SQ3xKuQOMMpeIJK3W/++LfKzZVpmQEorZcZxxv Qmu2NHINeGwbzBioCs0g4xOX1PId3+vC/h1wsTqvNFTWaO0ubrIvTtvimB5H4MoczroI kHBX1VwwrpZcm7AXaO36iEG+hFXmXKXeWhuMUp59xIv94MgTtAw2M/2VJr4WyNW7arI0 UskxLG66FMteCY4sxhxKV15RydHJmDhR16kg6kMMVQx21rKZXGkoLtFP4QlPvnfio1IU K0GQ== X-Gm-Message-State: APt69E1ogycI6TUUpW8WdRZBLSdPM4FqwdMDwgDmapyGF6VoTjNRfkve yxazruPlq5jyoWjDbamjyTSosw== X-Received: by 2002:a63:6e82:: with SMTP id j124-v6mr8354608pgc.349.1529867971778; Sun, 24 Jun 2018 12:19:31 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:30 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:28 -0700 Message-Id: <20180624191845.31082-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 03/20] upm: Upgrade to latest and 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 --- ...lude-sys-types.h-for-uint-definition.patch | 33 +++++++++++++++++++ meta-oe/recipes-extended/upm/upm_git.bb | 11 +++---- 2 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch b/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch new file mode 100644 index 0000000000..a0a47411d7 --- /dev/null +++ b/meta-oe/recipes-extended/upm/upm/0001-include-sys-types.h-for-uint-definition.patch @@ -0,0 +1,33 @@ +From 48a580bd402cf6a3ee9e42013653219bfeb3caf6 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 21 Jun 2018 18:39:16 -0700 +Subject: [PATCH] include sys/types.h for uint definition + +uint is defined in sys/types.h, therefore this +header needs to be included, it gets exposed with +musl where this header is not getting included indirectly +as it is happening when building on glibc + +Fixes build errors on musl e.g. +upm/src/kx122/kx122.hpp:456:31: error: 'uint' has not been declared +| void setBufferThreshold(uint samples); +| ^~~~ + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted [https://github.com/intel-iot-devkit/upm/pull/656] + src/kx122/kx122.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/kx122/kx122.h b/src/kx122/kx122.h +index 1622ed50..56e5215e 100644 +--- a/src/kx122/kx122.h ++++ b/src/kx122/kx122.h +@@ -31,6 +31,7 @@ extern "C"{ + #include + #include + #include ++#include + + #include + #include diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb index 478aa0db1d..babe5f4893 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -7,13 +7,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=66493d54e65bfc12c7983ff2e884f37f" DEPENDS = "libjpeg-turbo mraa" -SRCREV = "37642f3b0194f6ddd63f1e6b5d49b8cb689d5c81" +SRCREV = "dc45cd78595c7c24c8a8574c63bb48b5bb99c5aa" PV = "1.6.0-git${SRCPV}" -SRC_URI = " \ - git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ - file://0001-Replace-strncpy-with-memcpy.patch \ -" +SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ + file://0001-Replace-strncpy-with-memcpy.patch \ + file://0001-include-sys-types.h-for-uint-definition.patch \ + " S = "${WORKDIR}/git" @@ -22,7 +22,6 @@ COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" inherit distutils3-base cmake - # override this in local.conf to get needed bindings. # BINDINGS_pn-upm="python" # will result in only the python bindings being built/packaged. From patchwork Sun Jun 24 19:18:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139775 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3198368lji; Sun, 24 Jun 2018 12:20:08 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI3LRUZF7xCnoeUvidTGKDsqm/YyJL71U2GEbrQnJ1Tz/7Y9slkeK8YGexdk0Iw+2Up2/2v X-Received: by 2002:a17:902:8604:: with SMTP id f4-v6mr9467881plo.4.1529868008302; Sun, 24 Jun 2018 12:20:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868008; cv=none; d=google.com; s=arc-20160816; b=UPQp4Qah82H68QXDNysCNjw4l77Oc1X8FCnXVoCZuziwKTqZ7Cfph7TPS5gs/nktxr 3kF4a3Qzx5PWNO2rbqti65Tb2cAbH11KuwHkP6zc4JKDotLJt1KdEqLh7rmMr1d9oD4k 4LgKXfSCZOrjdiThUkslxaCxSY3IUnnnwwOZzYCXmG0OvP9VXLEwBLZy5mQSwnJYKhjZ LHiYIIJL+19Ts65r58sRuGwvGWqOuXIUtTHFBGZrb8A/VZJOaaFdcmEPLXI0rnCsfnpf Lw8EWYR80I9sTbP3tUgBqyVRbizelBkNwlvwgBNdiEoIZzlMsotMUPKrRG6Jfc1DHIhO mweA== 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=Jru/QPRAA04UBVBC9Vt207d17Lw2nKasmcVM0W3wgb4=; b=X/TsXGeOJKRkHQYT7xEKouHfKKjlyPwPfmONudCqBnd7IuMcBGqKmU9fOy3PleO1Ej 6Wzix9qJ0hZX/T8yPj0r7544dI4KWwQ+h5bTU6EtJv1BAJdIvcIloNRu6DR1HLfJfijc MX8HRjsZH+44lm6IcEzZhFlUCRivyotUXLJWRNXD/RduLE2sHDrJQlDCUQ6L4noLOkoC EOiBzSPa2L5xdR77tkBn38g2xBw/4GSUNKzctSX3PD5ofY8Ub6ogQzVv6IWnmP8KUikp EgDc5yhPUgm6tIRU1joo0SPIhEcAmlXwMVUwBl2AzxtK3uOyGxqjcL+bTEkXjAF4pkF3 ZPfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Gu5L0Xlm; 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=QUARANTINE 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 t1-v6si3786237plj.334.2018.06.24.12.20.08; Sun, 24 Jun 2018 12:20:08 -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=Gu5L0Xlm; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8732F74F37; Sun, 24 Jun 2018 19:19:53 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id 2F61774DCB for ; Sun, 24 Jun 2018 19:19:32 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id x23-v6so1500618pfn.11 for ; Sun, 24 Jun 2018 12:19:33 -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=fVoqnR2xOKUd9fMm5JXK0Tw88nGHL+lJRt+SIsWmof8=; b=Gu5L0XlmFzWJfXV5nPQIWO0QBTGezHHlfFOeJ8cSCVOmOR7QN5BzgJC+UD55cBHhOO KGUgBK+hrv0i7AfjK6XaClCLSCntpnzojZBOGXcxzc2SQuPb12VE6PcZ7vSFZwFTa7Uq Ff+Zn2kLgVnRKSGb/71V4ej6QpkEwqtD2YhS8bTDGbCIRCWh7XoHMKZpCTvl2S2iD63E FoFDzyhyXRSgJQu0Tb2kMlk3UJM1RS/bUXRg9N2KWvWaWo1YwjHNxVviVZk+XKBPJOgK G//EiK12GJgDcv6Tx7Hvsw8jtTx9ChngtOVZ4ZlELpOSi3lbdlTxRK6zc/V0yvbc4G8z CFmw== 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=fVoqnR2xOKUd9fMm5JXK0Tw88nGHL+lJRt+SIsWmof8=; b=Orv8li0C/tRY7Hh/WzChm8VnZTymaZcXfv+DLphVdfufHdnkwv1TDms+dXJweMueQZ ZRKraiPuk1OVDRBbXQIWxM3MbKSl+sQJSFCvr9/A8M0EJ7TSwbvatZP3V1xt1L41g1TK knPniZqjdL5YTg1TRSCL9ASnNrKsY5LEqYFdCs+lcDTuqe/JUiCWwGBUmd1nx0gpOviG LqFLGcDkkqk2WqLVtN8RlAC5Wdv9msAiKImPhDRw8rkT1F+CFm3cupIasYGofjmTYiY6 rDrdkR/5IfM+RjQ658MLq/LClmtkcJ2aomDLL+JJgO0bXN76/XfyT/SJNzLzU4G7EtWb 5O0Q== X-Gm-Message-State: APt69E03T8m7TP680XwLaYI0vLIEm8W7kugr/UPo5IhvEnfOoRs30ldj 9BCUfW4UX0foImbXAt8fq/yugA== X-Received: by 2002:a65:5b4c:: with SMTP id y12-v6mr8430197pgr.442.1529867972854; Sun, 24 Jun 2018 12:19:32 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:32 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:29 -0700 Message-Id: <20180624191845.31082-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 04/20] libhugetlbfs: Fix build on 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 needs more runtime testing Signed-off-by: Khem Raj --- .../0001-include-stddef.h-for-ptrdiff_t.patch | 25 ++++++++++ .../0002-Mark-glibc-specific-code-so.patch | 39 +++++++++++++++ ...sconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch | 49 +++++++++++++++++++ ...shm.c-Mark-glibc-specific-changes-so.patch | 30 ++++++++++++ .../0005-Include-dirent.h-for-ino_t.patch | 28 +++++++++++ .../0006-include-limits.h-for-PATH_MAX.patch | 42 ++++++++++++++++ .../libhugetlbfs/libhugetlbfs_git.bb | 6 +++ 7 files changed, 219 insertions(+) create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch new file mode 100644 index 0000000000..bae90b4edc --- /dev/null +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch @@ -0,0 +1,25 @@ +From d3c2187716a0a1f9359a869ca383c129603554d9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 21 Jun 2018 19:25:57 -0700 +Subject: [PATCH 1/6] include stddef.h for ptrdiff_t + +Signed-off-by: Khem Raj +--- + morecore.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/morecore.c b/morecore.c +index 62ad252..c5981d2 100644 +--- a/morecore.c ++++ b/morecore.c +@@ -19,6 +19,7 @@ + + #define _GNU_SOURCE + ++#include + #include + #include + #include +-- +2.17.1 + diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch new file mode 100644 index 0000000000..4354d78615 --- /dev/null +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch @@ -0,0 +1,39 @@ +From b72bf6a81fa879f32a074fe53776fc8291c83b6f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 21 Jun 2018 19:32:59 -0700 +Subject: [PATCH 2/6] Mark glibc specific code so + +Signed-off-by: Khem Raj +--- + morecore.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/morecore.c b/morecore.c +index c5981d2..ec9fafa 100644 +--- a/morecore.c ++++ b/morecore.c +@@ -347,6 +347,7 @@ void hugetlbfs_setup_morecore(void) + + INFO("setup_morecore(): heapaddr = 0x%lx\n", heapaddr); + ++#ifdef __GLIBC__ + heaptop = heapbase = (void *)heapaddr; + if (__hugetlb_opts.thp_morecore) + __morecore = &thp_morecore; +@@ -354,7 +355,6 @@ void hugetlbfs_setup_morecore(void) + __morecore = &hugetlbfs_morecore; + + /* Set some allocator options more appropriate for hugepages */ +- + if (__hugetlb_opts.shrink_ok) + mallopt(M_TRIM_THRESHOLD, hpage_size / 2); + else +@@ -364,4 +364,5 @@ void hugetlbfs_setup_morecore(void) + * This doesn't appear to prohibit malloc() from falling back + * to mmap() if we run out of hugepages. */ + mallopt(M_MMAP_MAX, 0); ++#endif + } +-- +2.17.1 + diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch new file mode 100644 index 0000000000..f6d8a10a9a --- /dev/null +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch @@ -0,0 +1,49 @@ +From 3d6ab5ea8e23f96ee6fdd915e05acd9a751dd876 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 21 Jun 2018 19:44:26 -0700 +Subject: [PATCH 3/6] alloc.c: Avoid sysconf(_SC_LEVEL2_CACHE_LINESIZE) on + linux + +musl does not have it + +Signed-off-by: Khem Raj +--- + alloc.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/alloc.c b/alloc.c +index bce9464..cf7eb40 100644 +--- a/alloc.c ++++ b/alloc.c +@@ -245,6 +245,19 @@ void free_huge_pages(void *ptr) + __free_huge_pages(ptr, 1); + } + ++static size_t get_cacheline_size() { ++#if defined(__linux__) ++ FILE * fp = fopen("/sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size", "r"); ++ unsigned int line_size = 0; ++ if (fp) { ++ fscanf(fp, "%d", &line_size); ++ fclose(fp); ++ } ++ return line_size; ++#else ++ return sysconf(_SC_LEVEL2_CACHE_LINESIZE); ++#endif ++} + /* + * Offset the buffer using bytes wasted due to alignment to avoid using the + * same cache lines for the start of every buffer returned by +@@ -261,7 +274,7 @@ void *cachecolor(void *buf, size_t len, size_t color_bytes) + + /* Lookup our cacheline size once */ + if (cacheline_size == 0) { +- cacheline_size = sysconf(_SC_LEVEL2_CACHE_LINESIZE); ++ cacheline_size = get_cacheline_size(); + linemod = time(NULL); + } + +-- +2.17.1 + diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch new file mode 100644 index 0000000000..960e152939 --- /dev/null +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch @@ -0,0 +1,30 @@ +From 7002dec46dae375e8aa1aa8577a5b274c02fc697 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 21 Jun 2018 19:48:04 -0700 +Subject: [PATCH 4/6] shm.c: Mark glibc specific changes so + +Signed-off-by: Khem Raj +--- + shm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/shm.c b/shm.c +index 1f82cab..9447b63 100644 +--- a/shm.c ++++ b/shm.c +@@ -48,10 +48,11 @@ + * system shmget() may be performed without worry as there is no dynamic + * call chain. + */ ++#ifdef __GLIBC__ + extern void *dlsym (void *__restrict __handle, __const char *__restrict __name) + __attribute__((weak)) __THROW __nonnull ((2)); + extern char *dlerror (void) __attribute__((weak)) __THROW; +- ++#endif + + /* call syscall shmget through the generic syscall mechanism */ + static int syscall_shmget(key_t key, size_t size, int shmflg) +-- +2.17.1 + diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch new file mode 100644 index 0000000000..543302b135 --- /dev/null +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch @@ -0,0 +1,28 @@ +From 87ed1706f426ed27fc4eeca7c3b09a4086c9a2a9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 21 Jun 2018 19:51:02 -0700 +Subject: [PATCH 5/6] Include dirent.h for ino_t + +Fixes +error: unknown type name 'ino_t'; did you mean 'int'? + +Signed-off-by: Khem Raj +--- + tests/hugetests.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/hugetests.h b/tests/hugetests.h +index 8b1d8d9..056042c 100644 +--- a/tests/hugetests.h ++++ b/tests/hugetests.h +@@ -22,6 +22,7 @@ + + #include + #include ++#include + + #include "libhugetlbfs_privutils.h" + #include "libhugetlbfs_testprobes.h" +-- +2.17.1 + diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch new file mode 100644 index 0000000000..35dd6e11cc --- /dev/null +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch @@ -0,0 +1,42 @@ +From 96c012ea31a2d124528f3b6f3b9857b71b059db3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 21 Jun 2018 19:58:53 -0700 +Subject: [PATCH 6/6] include limits.h for PATH_MAX + +Fixes + +error: 'PATH_MAX' undeclared + +Signed-off-by: Khem Raj +--- + hugeadm.c | 1 + + tests/gethugepagesizes.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/hugeadm.c b/hugeadm.c +index fe4211d..8db274c 100644 +--- a/hugeadm.c ++++ b/hugeadm.c +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + #include + #include +diff --git a/tests/gethugepagesizes.c b/tests/gethugepagesizes.c +index 9551b38..2645e3f 100644 +--- a/tests/gethugepagesizes.c ++++ b/tests/gethugepagesizes.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include "hugetests.h" + +-- +2.17.1 + diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index ee1b9d0507..14c909e758 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -19,6 +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://Force-text-segment-alignment-to-0x08000000-for-i386-.patch \ + file://0001-include-stddef.h-for-ptrdiff_t.patch \ + file://0002-Mark-glibc-specific-code-so.patch \ + file://0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch \ + file://0004-shm.c-Mark-glibc-specific-changes-so.patch \ + file://0005-Include-dirent.h-for-ino_t.patch \ + file://0006-include-limits.h-for-PATH_MAX.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" From patchwork Sun Jun 24 19:18:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139776 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3198450lji; Sun, 24 Jun 2018 12:20:16 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLFNEYiM+qHnuF+KIILk7Xv9wb7JsGxFuJ07299Szd6224Uu9bvtZvm2d18HPrLI/VVSZYc X-Received: by 2002:a65:61c7:: with SMTP id j7-v6mr8512753pgv.358.1529868016750; Sun, 24 Jun 2018 12:20:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868016; cv=none; d=google.com; s=arc-20160816; b=IXwFZD0T+PByf6CMTc9y7SmU5sOIX83Bs0kMR3KsNgF9erq9LIwni2ohj32L49MPjg v3a53mBMRSVpxzEGzDJE1pBNG7do/E6bSNLBPySyMbTI6uDQEBHAVxQVoFjMG9mzRG9i 5Gnv3dsP2C/PIS5LYsNnn+fQMhZNHbwCUrhZfCPuXGpuxMLM7HMLINs3r+th8A3uRy7D yjrVWL7SF8YBz3fgD+/1hMO85g4AEVdfBl7TWQ0/sayGW7uw8f4kC2MEPTh3uyZ/vjkD nq9BtyEMcpNrLB6iaLQqq4y9VCVEck/kHFsueoSmcI02D82U8KSTdiEuScAqAsKGKFPc IoOQ== 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=3ssTf9c0N4gRU8zDK6sLJGQ0ShFNDo9lvCqclfaDXlI=; b=JWr/kVFTZ6Q1a8f6hzVzbLKhPb7gGQDWJb/7F1QMDKx165IqOA/TGwc228xNgIoTu8 ipYHzTiJK+hM2FplzIzvmho1EzpsTvm8HcQ7QspylduhvE/GRq1pLJyOsJM2JtEAWBOZ 2ckYkU/o5lWQe+s9e6sSwvlRnOH6U/2QSQEcCoegMy+tCOXteGMDTOnKyWlZVNcGNna+ XCn3LY31fAFd4PsatDFZytbAu+ceEJMWQB8UNPJeKvoLzL0jfGAtJt4NS2vcMQZW3XlB OVLzKTrIA1+ckQ85uFXcjNcfPGwuJi6zxaF0Nmvs4S8QAQ+Do7JZMYociE1M8yTN0XAL Aqaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=aJlAhHSO; 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=QUARANTINE 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 h1-v6si10439589pgs.221.2018.06.24.12.20.16; Sun, 24 Jun 2018 12:20: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=aJlAhHSO; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9B3317507B; Sun, 24 Jun 2018 19:19:54 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f52.google.com (mail-pg0-f52.google.com [74.125.83.52]) by mail.openembedded.org (Postfix) with ESMTP id EBF2274C0D for ; Sun, 24 Jun 2018 19:19:32 +0000 (UTC) Received: by mail-pg0-f52.google.com with SMTP id i7-v6so5096943pgp.2 for ; Sun, 24 Jun 2018 12:19:34 -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=GcB1L5TRCNewAQHOat9sDedTrDPv+IWnazBFRRl41ds=; b=aJlAhHSOroqvd/+O9GXJ7EvIcIk33jbZ8enIAua9b3lH/Ihkzf+b1nXUVgPtWgyt2t 59TdtzZ15iamUeVLpHIvQyHmVAlJyZ2cNilgCszfMGDGey2ZTNytKmSoPvIjA/9QpGjE RxKKZDlQ2cqCK1+nHXiknKS730uhxH/TELRZZQ7U1ioWrumzMts9s3abX6sWxy+7DmV1 rofzh8FKGjXk2hIjvlfsxi8KvtUKzluhgKkHtlmehVTRymqf8ynprh7eZfPV4/bw7FR2 yYLHzlnaI6tCdcM6/We5bEi+3gwb3fk7BIKGOxvJOzrioekksv5I+TfCLGxYf1hOzqVI Z8ig== 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=GcB1L5TRCNewAQHOat9sDedTrDPv+IWnazBFRRl41ds=; b=WYUGR9mOE4SwYRamJ/J5U0v4dcEeul86C781Q6W3+OVQAwGDoC+jW5GhCB+7ZV1yZs ozYiN3Yr6qV/8MHMFZ7piZ2dIy3KIVwfY8w/RojzORTbdpRLlDHabJQoD0QP8Nj+hbo3 MfsSztAY7otULNNMO+frqbwsk2hIorDKq4ZdJNbvIEk4Upy2Qz0dzHZ5vtKvIvUjzsyh l8PiZc5P4vADb9rzlRmQDWfy6SRcsteK9hI31rIUD5s1V7Nv/t1xuDuHzgl0dfSIlvSO pOr1KCmGiFfD8KHzU9D4nALohb37lFTOvSc+lIj1z5UpkJu7tt0X8XFHS8NWpbsrgl4A AFVw== X-Gm-Message-State: APt69E3jKndBs3zvqMk85rgT6QQmOLuIF5SVTLeXXvzaU9re2iCiZ9LP G+oySTKYD5dLfq1w2+vdWCHkmw== X-Received: by 2002:a65:508c:: with SMTP id r12-v6mr3757120pgp.115.1529867973637; Sun, 24 Jun 2018 12:19:33 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:33 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:30 -0700 Message-Id: <20180624191845.31082-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-multimedia][PATCH 05/20] libdc1394: libglu needs both openGL and X11 but not tvirtual/libgl 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 Epxress this dependency accurately Signed-off-by: Khem Raj --- meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb b/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb index 8a9e9a1d7d..b6bb447bc2 100755 --- a/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb +++ b/meta-multimedia/recipes-multimedia/libdc1394/libdc1394_git.bb @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c848e78d9a4a5cc69906178e4d6fbd64" # libsdl to provide sdl.m4 with AM_PATH_SDL DEPENDS += "libusb1 libraw1394 libsdl \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxv virtual/libx11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'libglu', '', d)} \ " PV = "2.2.5+gitr${SRCPV}" From patchwork Sun Jun 24 19:18:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139777 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3198547lji; Sun, 24 Jun 2018 12:20:26 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLVXbmr2pBecXyUlhH6bG+GCS7rEfA/O6B8NNML6t70W/DLgrsT25O3C1yBuem9HQNE3VC/ X-Received: by 2002:a62:3101:: with SMTP id x1-v6mr9990828pfx.246.1529868025993; Sun, 24 Jun 2018 12:20:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868025; cv=none; d=google.com; s=arc-20160816; b=vVXpWdDFTaE1YpoPzQQEcY5kW8ah4X9r9Rb1iQD9ZA3ViAJeKHiJJwWHdtjuZvFndU rPJWUqWEBtb+wbmHg/xRbhch0EJmAUdxa/BIw3SlXCZbxRNCi0pDTRoBA4CsnKH7IxxT E0EsH+C8FI6XZ3r+BDj8zJW2Rv2ug4kI5GhJHoWokvXF0p6wTmdV9HE6SmTnjsjqSaHs 5td5D3/KR5P7JACVvg4c8AKKc0nVwXLSjTnP5+5BStuBnqrD+jR0Yu9QVvHgY5Yw/Yr0 4kSOfOQQFU6sNWvIjlCX6BVJldU7wHM/NDfg7750h6KdOYMb+y1se09n93h/uggSCa7B ZKjQ== 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=JHNacUJAD02ujXU0P6uo/7Mm0dTNu0MtBd1v/3dmk6o=; b=zk/GKEXQQOO9b5L17fuYxMDR5ixcX+74XbugWOWWHxYakyELxfEaq8pI+/n21bwZvm EP3nCzHBcJioY/9X96iUyio5K++k/KlkYqAy+ZlU3hqEyFHpXzjJJggSEHwP2nraBYOg LIjNdpLORAkNzjCVjfHQHAsOvuBJZo6R2TeiSFc7D43cjnOuQef+0PbYvgBMODrcGigr jd78kboKBQEktmq8td9HVv0nzIxrL8YTMufMCuIRPgVva09p8DEuP4FljWYj7WO0dM4d F2yYQF9HHDflUGnL3W02HL/pffLdOwp0/FO/gS/iT/zE5hKBuH7I+diaakyNWVmoh1Ua YFUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=t4NmWL1m; 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=QUARANTINE 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 d66-v6si10419466pgc.141.2018.06.24.12.20.25; Sun, 24 Jun 2018 12:20:25 -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=t4NmWL1m; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 66E4E74E98; Sun, 24 Jun 2018 19:19:59 +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 220B974DD2 for ; Sun, 24 Jun 2018 19:19:33 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id z1-v6so5084310pgv.12 for ; Sun, 24 Jun 2018 12:19:35 -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=43MoM0V4D/wBLnLMyGAMOtHSp2hWWKPlP+iQOEibwo0=; b=t4NmWL1mepgc5q1soDqMwUG2RNOsglBbClr31GE5BPJFfeOvjOTKMOo9bkvb2WTPOn aU9yjC9vKX8AChHBCeHrWQ6WTZDxOiiDCS3Jej0GCNEVm09BGNwccyga0ucXDuAs92xm fVSvqOw8suJXfDRgP4HhrOyrLUb5mjO+5363B+gRc1TrEipAc8YQvHFJB5UvE+gbYsr1 WGqFICrBwGnVWFxQ7MyOHLMDB51XMAvP41yy1aFnI7mCMaVh1kqGGx3/E168zgXM8eQX dRw/a1hxw52Bp/Mg5KPBNE1WXd+djgsVDo5J4/IEcTK46IJuJERnnOol3QYFElsZ4m/C yjxg== 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=43MoM0V4D/wBLnLMyGAMOtHSp2hWWKPlP+iQOEibwo0=; b=VQ44/VFzGvJGy/GLNNn34peAMbEfZTj7Xg6T6QRYMejUCVW5eymJvRxHuzQqZF6r0S BbovYV55cI/RBVs/olKKsZyzrkoo1it/o1YwcTK+/dk1jBtLWVTHqZyBjckKGL1bJaaW 0yNz5cMHEAFFM7cuDrbKGg+sx/OEdxRYzcLZUF9fvnSZambbI+5yT+MUFta+05uUs6k/ /YJgqi66ZcpZ6Ts09oR0UPxdGiJV3FYcbxtiKu3AP7uB2DXJxkbQAkAFCXhM83Ude503 a7JUAC59CpQTMS4jbHFG7VroUCNAjPUxl/TDroRK/tjyypP9h0k2qe2dodF/5fHO6imT 1DeQ== X-Gm-Message-State: APt69E1E5r/0IZe83dPu9aO0CEO+5o/fbbUZJNt3dmzsLLeJCHxfgvQF MdsQMHoZBWPXGNGeR5aIBWaKeQ== X-Received: by 2002:a63:b543:: with SMTP id u3-v6mr8283465pgo.365.1529867974776; Sun, 24 Jun 2018 12:19:34 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:33 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:31 -0700 Message-Id: <20180624191845.31082-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-python][PATCH 06/20] python-pywbem: update to version 0.11.0 and add a python3 recipe 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 From: Derek Straka Signed-off-by: Derek Straka Signed-off-by: Khem Raj --- .../openlmi/openlmi-tools_0.10.5.bb | 2 +- .../{pywbem_0.8.0.bb => python-pywbem.inc} | 36 ++++++++++++------- .../pywbem/python-pywbem_0.11.0.bb | 13 +++++++ .../pywbem/python3-pywbem_0.11.0.bb | 2 ++ 4 files changed, 40 insertions(+), 13 deletions(-) rename meta-python/recipes-extended/pywbem/{pywbem_0.8.0.bb => python-pywbem.inc} (59%) create mode 100644 meta-python/recipes-extended/pywbem/python-pywbem_0.11.0.bb create mode 100644 meta-python/recipes-extended/pywbem/python3-pywbem_0.11.0.bb -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb index 13e67cba12..05dc854fca 100644 --- a/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb +++ b/meta-oe/recipes-extended/openlmi/openlmi-tools_0.10.5.bb @@ -7,7 +7,7 @@ SECTION = "System/Management" inherit setuptools -DEPENDS = "python-native pywbem-native python-m2crypto pywbem" +DEPENDS = "python-native python-pywbem-native python-m2crypto python-pywbem" SRC_URI = "http://fedorahosted.org/released/${BPN}/${BP}.tar.gz \ " diff --git a/meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb b/meta-python/recipes-extended/pywbem/python-pywbem.inc similarity index 59% rename from meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb rename to meta-python/recipes-extended/pywbem/python-pywbem.inc index 7f1986e516..5151c33ea9 100644 --- a/meta-python/recipes-extended/pywbem/pywbem_0.8.0.bb +++ b/meta-python/recipes-extended/pywbem/python-pywbem.inc @@ -12,25 +12,37 @@ at http://www.dmtf.org/standards/wbem. \ \ It also provides a Python provider interface, and is the fastest and easiest \ way to write providers on the planet." -HOMEPAGE = "http://pywbem.sf.net/" -LICENSE = "LGPLv2" +HOMEPAGE = "http://pywbem.github.io" +LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://pywbem/LICENSE.txt;md5=fbc093901857fcd118f065f900982c24" -SECTION = "Development/Libraries" -DEPENDS = "python-m2crypto-native python-typing-native" -SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BPN}/${BP}/${BP}-dev.r704.zip" -SRC_URI[md5sum] = "84072451dcdd1aa9ee82363848faf7ad" -SRC_URI[sha256sum] = "898035866d3cc741bbcd62c4ac26e633ad07b7c11d89db2472b9f923f3fd3ed8" +SRC_URI[md5sum] = "1465dfa92e4cbe558c773838b9b00711" +SRC_URI[sha256sum] = "2a05f2c1a6ab4b08560a6da55fdaabd0f52f4d1e6df6e288b9ed927bf5c289ed" -S = "${WORKDIR}/${BP}-dev" +inherit pypi -inherit setuptools python-dir +DEPENDS += " \ + ${PYTHON_PN}-ply-native \ + ${PYTHON_PN}-pyyaml-native \ + ${PYTHON_PN}-six-native \ +" do_install_append() { mv ${D}${bindir}/wbemcli.py ${D}${bindir}/pywbemcli - mv ${D}${bindir}/mof_compiler.py ${D}${bindir}/mofcomp - rm ${D}${libdir}/python2.7/site-packages/${BPN}/wbemcli.py* - rm ${D}${libdir}/python2.7/site-packages/${BPN}/mof_compiler.py* + rm -f ${D}${bindir}/*.bat } +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-datetime \ + ${PYTHON_PN}-io \ + ${PYTHON_PN}-netclient \ + ${PYTHON_PN}-ply \ + ${PYTHON_PN}-pyyaml \ + ${PYTHON_PN}-six \ + ${PYTHON_PN}-stringold \ + ${PYTHON_PN}-threading \ + ${PYTHON_PN}-unixadmin \ + ${PYTHON_PN}-xml \ +" + BBCLASSEXTEND = "native" diff --git a/meta-python/recipes-extended/pywbem/python-pywbem_0.11.0.bb b/meta-python/recipes-extended/pywbem/python-pywbem_0.11.0.bb new file mode 100644 index 0000000000..7410749071 --- /dev/null +++ b/meta-python/recipes-extended/pywbem/python-pywbem_0.11.0.bb @@ -0,0 +1,13 @@ +require python-pywbem.inc +inherit setuptools + +DEPENDS += " \ + ${PYTHON_PN}-m2crypto-native \ + ${PYTHON_PN}-typing-native \ +" + +RDEPENDS_${PN}_class-target += "\ + ${PYTHON_PN}-argparse \ + ${PYTHON_PN}-m2crypto \ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta-python/recipes-extended/pywbem/python3-pywbem_0.11.0.bb b/meta-python/recipes-extended/pywbem/python3-pywbem_0.11.0.bb new file mode 100644 index 0000000000..6a35a87442 --- /dev/null +++ b/meta-python/recipes-extended/pywbem/python3-pywbem_0.11.0.bb @@ -0,0 +1,2 @@ +require python-pywbem.inc +inherit setuptools3 From patchwork Sun Jun 24 19:18:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139778 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3198615lji; Sun, 24 Jun 2018 12:20:34 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKIPjw+7v8isDsQAB2FRkAn8EQTPsrVVF6cZQyvXL2bCWb7bVmBVh0gIXWCmMrcKsM0O5ZT X-Received: by 2002:a17:902:6847:: with SMTP id f7-v6mr9531420pln.173.1529868034613; Sun, 24 Jun 2018 12:20:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868034; cv=none; d=google.com; s=arc-20160816; b=OHYZ+VNdvUifLPiKgPzOBugIckUulxl0Cv59yiqr59Wq2lhIhr+8b2YAVcShwA4LdF GSOQSkydfdTP8ib7061OTIhG7x1/cahiPsvLDY8qI2jMUQUx6diV3ruZs7RG4fUX8SWg udqlugSFowK+w2sSKWzGVwerhHqfAWN2/49oG8Gw4Ywk8qavFMbMpuGyauum/if/7Osa niWWk2bxN8fJH/KFEuYp4QqtfH6rQkZTnk9EV+ewRWS7X15mAG73sXvDVyqF2dzH9Sih FNJcvMIH+Ah5sBW/OHjpWwSN6SDZlud6c/aI5J+HLXSZ/CtDxqP02/ZvWla6Hu8dwk4L rFXA== 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=twf4nPhO/RS/TlefwHgHzDgYY/Thbyj6ztKhszAzWd4=; b=c0DGTozGYyDGAcjHF07SeCcO5mRy9UV8K1JFwxKEp7ST/MJFH2jqqfEngPG23xSfaC 9A0M/t7q3PSxbhR7SjyeCXNZaFw4pJ8py7VmPX633Q1TCP0ZIqhKzu7itrUitgMGWZXr naIewoSUgydEjZo3VEi90w4D/y4XKzMnlzhYknv/rSk4GqucR0/5iTFl9XeZo7ai8pfJ Vc4uV/IPdIiH6ImHyQmmS1rtgyTtRTP1GztwFRSSpn1/HAHL9ffa83cWGpCRDzV2WCik QaovIyyE4tcH7//aWoQoInP/X/iehZxkKqktUTSk0GCLfd8ualHKnsO1sYpjCV5RbCFh tOmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=XEmnXcu6; 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=QUARANTINE 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 j16-v6si12067571pfj.55.2018.06.24.12.20.34; Sun, 24 Jun 2018 12:20:34 -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=XEmnXcu6; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 80F51750E8; Sun, 24 Jun 2018 19:20:00 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f175.google.com (mail-pf0-f175.google.com [209.85.192.175]) by mail.openembedded.org (Postfix) with ESMTP id 6797B74C0D for ; Sun, 24 Jun 2018 19:19:35 +0000 (UTC) Received: by mail-pf0-f175.google.com with SMTP id a11-v6so5423713pff.8 for ; Sun, 24 Jun 2018 12:19:36 -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=WzGg8MRTxvYXMwlqHDHkRdMI5YyJYVMT5odBcoar2eI=; b=XEmnXcu688dbUYzgG/AMkMbm96xTN6eGgsAFPjU94pOnbQvSBdBstT1w7K/+kW1xvO HSir6Fp45IEPq9Pmx6djWXA4tjc6GwR4WrUrdEdQEbcqyQXd4J8axCWH1FqivdS6czyh Ue07xBzUpHt2K+TmdcDK1K0zvpimxN5PvLCipKiRrLpqToe9E80MCP12+cPgdH9OdUpR De2rbaaleTUH2CpHyaZLw7ssNS5pvp6mgJ7pZ5+xe+Ps4p21P01Prx1dx25UrDrPT70j xbYt+g3LG1KmU0Y0r+kUHknpWp5RkP1dVFhFu09iT3+8cnpeCBvyVw48CqoweO5S5i7f gIoA== 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=WzGg8MRTxvYXMwlqHDHkRdMI5YyJYVMT5odBcoar2eI=; b=rf3v01c3iGDBQSx1qdMyXpk3V9b54zoq34kTF8M9GS9MyqdmLUHS1BZ9BFOIppZPcV MDFColLHcB2cVO3rtnJaM5QSHMZu7HEaT0V5jhBlT11aX+gO0K8jUmEdoQoNUBCYNpfA QfE5WjFsQRs6lKFOAddf7OxCK+mSgm+FAbGbLhMCHreV621XhDit6UJPXzSHDnyCQmF9 OLdeE+T2tkkRdxOCM9KTlXW+W7d9x+/vJqF00NT8NAoo8sZ23iseVmVCVYVR36jx/yTp GrSKFnPAnc8CT5hVzArjGYJsmdZv6VZvKlgsLwAU2Bf+9VxrHeT5g6Dj++W/x7eBkRa/ XlsA== X-Gm-Message-State: APt69E3LNOeAvT8lIlQJZEXJSNnCR1z8CJcE5vbWIkcHWdDfxBBfdauc 3aJMCsDTvCaPaoA6uF1SVqKFCA== X-Received: by 2002:a65:61cc:: with SMTP id j12-v6mr4495524pgv.299.1529867975986; Sun, 24 Jun 2018 12:19:35 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:35 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:32 -0700 Message-Id: <20180624191845.31082-7-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 07/20] kpatch: Upgrade to 0.6.1 release 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 --- meta-oe/recipes-kernel/kpatch/kpatch.inc | 1 + ...-build-add-cross-compilation-support.patch | 24 +++++++++---------- ...uild-allow-overriding-of-distro-name.patch | 14 +++++------ meta-oe/recipes-kernel/kpatch/kpatch_git.bb | 4 ++-- 4 files changed, 20 insertions(+), 23 deletions(-) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-kernel/kpatch/kpatch.inc b/meta-oe/recipes-kernel/kpatch/kpatch.inc index b1e73e9542..e2e9511464 100644 --- a/meta-oe/recipes-kernel/kpatch/kpatch.inc +++ b/meta-oe/recipes-kernel/kpatch/kpatch.inc @@ -38,6 +38,7 @@ FILES_${PN} = " \ ${sbindir}/kpatch \ ${systemd_system_unitdir}/kpatch.service \ ${mandir}/man1/kpatch.1.gz \ + ${sysconfdir}/init/kpatch.conf \ " FILES_kpatch-build = " \ ${bindir}/kpatch-build \ diff --git a/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch b/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch index 459fb21977..ab3b127641 100644 --- a/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch +++ b/meta-oe/recipes-kernel/kpatch/kpatch/0001-kpatch-build-add-cross-compilation-support.patch @@ -1,4 +1,4 @@ -From a9a80a1f4df65892a0269295ce8a64b06f2ff61d Mon Sep 17 00:00:00 2001 +From 70de3fecbc551907c4fd504cfff385c73be8db75 Mon Sep 17 00:00:00 2001 From: Ruslan Bilovol Date: Tue, 19 Dec 2017 15:59:04 +0200 Subject: [PATCH] kpatch-build: add cross-compilation support @@ -17,16 +17,17 @@ possible to pass multy-component strings like Upstream-Status: Pending Signed-off-by: Ruslan Bilovol + --- kpatch-build/kpatch-build | 13 +++++++++++-- kpatch-build/kpatch-gcc | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build -index 166ecbd..af24cc4 100755 +index a76913f..4a011aa 100755 --- a/kpatch-build/kpatch-build +++ b/kpatch-build/kpatch-build -@@ -195,7 +195,7 @@ gcc_version_check() { +@@ -197,7 +197,7 @@ gcc_version_check() { # gcc --version varies between distributions therefore extract version # by compiling a test file and compare it to vmlinux's version. echo 'void main(void) {}' > "$c" @@ -35,7 +36,7 @@ index 166ecbd..af24cc4 100755 gccver="$(gcc_version_from_file "$o")" kgccver="$(gcc_version_from_file "$VMLINUX")" rm -f "$c" "$o" -@@ -381,12 +381,14 @@ usage() { +@@ -392,12 +392,14 @@ usage() { echo " -d, --debug Enable 'xtrace' and keep scratch files" >&2 echo " in /tmp" >&2 echo " (can be specified multiple times)" >&2 @@ -51,7 +52,7 @@ index 166ecbd..af24cc4 100755 eval set -- "$options" -@@ -444,6 +446,10 @@ while [[ $# -gt 0 ]]; do +@@ -455,6 +457,10 @@ while [[ $# -gt 0 ]]; do echo "DEBUG mode enabled" fi ;; @@ -62,7 +63,7 @@ index 166ecbd..af24cc4 100755 --skip-cleanup) echo "Skipping cleanup" SKIPCLEANUP=1 -@@ -691,6 +697,8 @@ if [[ $DEBUG -ge 4 ]]; then +@@ -710,6 +716,8 @@ if [[ $DEBUG -ge 4 ]]; then export KPATCH_GCC_DEBUG=1 fi @@ -70,8 +71,8 @@ index 166ecbd..af24cc4 100755 + echo "Building original kernel" ./scripts/setlocalversion --save-scmversion || die - make mrproper 2>&1 | logger || die -@@ -840,6 +848,7 @@ cd "$TEMPDIR/patch" || die + unset KPATCH_GCC_TEMPDIR +@@ -874,6 +882,7 @@ cd "$TEMPDIR/patch" || die KPATCH_BUILD="$SRCDIR" KPATCH_NAME="$MODNAME" \ KBUILD_EXTRA_SYMBOLS="$KBUILD_EXTRA_SYMBOLS" \ KPATCH_LDFLAGS="$KPATCH_LDFLAGS" \ @@ -80,7 +81,7 @@ index 166ecbd..af24cc4 100755 if ! "$KPATCH_MODULE"; then diff --git a/kpatch-build/kpatch-gcc b/kpatch-build/kpatch-gcc -index 6ba133c..3937948 100755 +index 2d56da1..59a4255 100755 --- a/kpatch-build/kpatch-gcc +++ b/kpatch-build/kpatch-gcc @@ -8,7 +8,7 @@ TOOLCHAINCMD="$1" @@ -92,12 +93,9 @@ index 6ba133c..3937948 100755 fi declare -a args=("$@") -@@ -80,4 +80,4 @@ elif [[ "$TOOLCHAINCMD" = "ld" ]] ; then +@@ -82,4 +82,4 @@ elif [[ "$TOOLCHAINCMD" = "ld" ]] ; then done fi -exec "$TOOLCHAINCMD" "${args[@]}" +exec ${KPATCH_CROSS_COMPILE}${TOOLCHAINCMD} "${args[@]}" --- -1.9.1 - diff --git a/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch b/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch index a9d8a7f2c5..13cdc6bfb4 100644 --- a/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch +++ b/meta-oe/recipes-kernel/kpatch/kpatch/0002-kpatch-build-allow-overriding-of-distro-name.patch @@ -1,4 +1,4 @@ -From d418d716dae1e2a05131dfb42a19a4da2fc8a85d Mon Sep 17 00:00:00 2001 +From 15838a86d5ea94fa05976ea32fd847b18261b403 Mon Sep 17 00:00:00 2001 From: Ruslan Bilovol Date: Tue, 2 Jan 2018 14:50:03 +0200 Subject: [PATCH] kpatch-build: allow overriding of distro name @@ -14,15 +14,16 @@ implements all needed functionality Upstream-Status: Pending Signed-off-by: Ruslan Bilovol + --- kpatch-build/kpatch-build | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build -index af24cc4..4f9f78d 100755 +index 4a011aa..eb6cd64 100755 --- a/kpatch-build/kpatch-build +++ b/kpatch-build/kpatch-build -@@ -383,12 +383,13 @@ usage() { +@@ -394,12 +394,13 @@ usage() { echo " (can be specified multiple times)" >&2 echo " --cross-compile Specify the prefix used for all executables" >&2 echo " used during compilation" >&2 @@ -37,7 +38,7 @@ index af24cc4..4f9f78d 100755 eval set -- "$options" -@@ -450,6 +451,10 @@ while [[ $# -gt 0 ]]; do +@@ -461,6 +462,10 @@ while [[ $# -gt 0 ]]; do KPATCH_CROSS_COMPILE="$2" shift ;; @@ -48,7 +49,7 @@ index af24cc4..4f9f78d 100755 --skip-cleanup) echo "Skipping cleanup" SKIPCLEANUP=1 -@@ -526,7 +531,7 @@ fi +@@ -539,7 +544,7 @@ fi # Don't check external file. # shellcheck disable=SC1091 source /etc/os-release @@ -57,6 +58,3 @@ index af24cc4..4f9f78d 100755 if [[ "$DISTRO" = fedora ]] || [[ "$DISTRO" = rhel ]] || [[ "$DISTRO" = ol ]] || [[ "$DISTRO" = centos ]]; then [[ -z "$VMLINUX" ]] && VMLINUX="/usr/lib/debug/lib/modules/$ARCHVERSION/vmlinux" [[ -e "$VMLINUX" ]] || die "kernel-debuginfo-$ARCHVERSION not installed" --- -1.9.1 - diff --git a/meta-oe/recipes-kernel/kpatch/kpatch_git.bb b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb index e495e2882c..024cca6553 100644 --- a/meta-oe/recipes-kernel/kpatch/kpatch_git.bb +++ b/meta-oe/recipes-kernel/kpatch/kpatch_git.bb @@ -2,9 +2,9 @@ require kpatch.inc LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "db6efbb8c7e90d2b761272cf563047119072768f" +SRCREV = "7f550f01bd308cf058ae782327d29c8916cc5602" -PV = "0.5.0+git${SRCPV}" +PV = "0.6.1+git${SRCPV}" S = "${WORKDIR}/git" From patchwork Sun Jun 24 19:18:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139779 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3198693lji; Sun, 24 Jun 2018 12:20:43 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJTJQ1Gg5JX7a1AAe+XuJxkTNIOVLCSoalHYb2xsOeBE4WcTOcHtCAXxEPmSszNXkBPv/5v X-Received: by 2002:a63:85c8:: with SMTP id u191-v6mr4355766pgd.36.1529868042916; Sun, 24 Jun 2018 12:20:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868042; cv=none; d=google.com; s=arc-20160816; b=sE3524QE8PcUIxT4ytoLdGqkCidoFwhUZbNMgRDRxoI5Kh3BNz1qkBnU1aqJVopRLR 7dslT1+qk75eQMqLv2H8LxxnIF1OgTlAp2p5eDZhqj0K6YMiLn0gfTQCd5AOKUDIHZdE 5pc0RePM6o7VT6nu7pI3sAGmi2M1qFhAzqf1jS/+HFJwSf3KlLznToCvmWStv4KfP8u5 QwaUP0t15W2booq+Dc0yfO2p7rHrWaRt2lRxc0EtbNbGIMdyLXSCMMfWIiXoY/YudDIK GHePz8IFezdKOXdqW+M2rUcVBzSt60PzyfZXl1wgAxr6gKHCZbd8d0lnuvmkh/7L71AZ PpEQ== 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=dJdQrNMBQQ6LAAnxAUlLYNiWWEvePOOcqokpT0nfsmk=; b=sVPCWpFIZVWfvkttzzEpyQzVPSxnq9vnnOg8MKiZ4Ilq8GzxU79BEPCrDgkuwnKNvU UYo/vdr/62SuDzMABtNpzQ0t/b2ZumVNC8gdqBidiQ+9pH3bbnU7dMX//3u5k5KWT2Xa iYI9bhFyZfPQxtGOc+sfTDszAViK7e80KiT4ZBm9Qxz0y5I2PEI4TRfj4+l+u8HRXZXu TG07q1bATsXVOVsUbeDaxiPNJF+ZSV/qzVHs7mixBcBJoVjSVn6R2KZDRcxc1pDKKtqd lTqkgDuCYur7hBUuehg9Rmz5mh85QAGh4MOeVBzW93IDa73vMe9fiwPIeAqr49RQYYPm gHiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Za90AOVL; 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=QUARANTINE 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 i3-v6si12123753pld.189.2018.06.24.12.20.41; Sun, 24 Jun 2018 12:20:41 -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=Za90AOVL; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id C172475136; Sun, 24 Jun 2018 19:20:01 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by mail.openembedded.org (Postfix) with ESMTP id B9A6174E47 for ; Sun, 24 Jun 2018 19:19:36 +0000 (UTC) Received: by mail-pf0-f180.google.com with SMTP id g3-v6so682065pfi.1 for ; Sun, 24 Jun 2018 12:19:38 -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=xWcnSV3nedrAtKYP/3mPM10fAB64LUZP2HyPQE6/1HI=; b=Za90AOVLQ0g6lEpqBK98mpK1+tcId2I/eup5hKB1i04j1ynJf6DK/oinisB0fnFgTw G+MWs5EbIPGeq+kP0+rxVxRVQRIm2G+2b1djlhMZzjWIes8FYZ2RvgkXiEAfNkdZ6880 BGOI5aSYJwXouQPlrFpVuY7XkydW5Z2K0zMe5CulVBmAxmVSilNm2F4Uow+BQ9S/7L3o Aufy22fEy5aDNjGtUiceKGqTKhR/qN6vF+O852h2rH3JQ0WCkPKM1XnuFi4gsIvXYsvP yRzNo0gO/s3wRngwFBEpkPW6MqZG3bjsYH7yOA5cdPD6VYKC/UpZN9Y9c9BvTH3XyBOY sPLg== 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=xWcnSV3nedrAtKYP/3mPM10fAB64LUZP2HyPQE6/1HI=; b=hZFXVbYc7hSbMOaprqSwwjgrL7e/zZoffiMQDJ2DYvjb2uJPBL+3czGPwvoyielHFk YXhT5PxMCP2jmmBH6v1OlR/1JUvjdVyupG3/6bOvw9H8a9uUvmqB802ddYHe/MbUivyy FtV8IZAL/iTyi3NldVciXC75O0h94ZvrmkrwUyJIWj2/kdkrEDKLmiRoMvaW6mMnuAnm Gr38Q9M+kcKRUDR9cKrMKLK1bHaX8Wo37oMt5UnacUyrkPmPKhLflYBZ/4dcYlw3hPMa YJHTHM4sXJTQf/IhHzjQbGjQz7oqxiQZj/VZ3FYVof9gqp3EJJO8yJAgvaFH+wOssAd6 j1KA== X-Gm-Message-State: APt69E02VymtkxnD7+sGPAIXlaHAnEiHNUIFFG9l3flyQZw9AYYF0mL6 mvwXyHYRkzIY8isU9vpzW7cyXA== X-Received: by 2002:a65:6008:: with SMTP id m8-v6mr8371357pgu.134.1529867977409; Sun, 24 Jun 2018 12:19:37 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:36 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:33 -0700 Message-Id: <20180624191845.31082-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 08/20] corosync: Upgrade to 2.4.4 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 --- .../corosync/{corosync_2.4.3.bb => corosync_2.4.4.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-networking/recipes-extended/corosync/{corosync_2.4.3.bb => corosync_2.4.4.bb} (95%) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb b/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb similarity index 95% rename from meta-networking/recipes-extended/corosync/corosync_2.4.3.bb rename to meta-networking/recipes-extended/corosync/corosync_2.4.4.bb index dc2f01b0fb..b760c117cf 100644 --- a/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb +++ b/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb @@ -9,8 +9,8 @@ inherit autotools pkgconfig systemd useradd SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "bf0ede13018aadc8a046183bc593b0e0" -SRC_URI[sha256sum] = "b1e7e422e8d2f7af8e5315fa329b1dbd1175fff32efaa55e8054584c80a2c597" +SRC_URI[md5sum] = "69db29ff4bc035936946be44fc8be5cd" +SRC_URI[sha256sum] = "9bd4707bb271df16f8d543ec782eb4c35ec0330b7be696b797da4bd8f058a25d" UPSTREAM_CHECK_REGEX = "(?P\d+\.(?!99)\d+(\.\d+)+)" From patchwork Sun Jun 24 19:18:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139780 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3198751lji; Sun, 24 Jun 2018 12:20:48 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLfiGfx3Nxow7dSVix7CHyJFOn0ZjQxteD4N0TtsVbSgFGhZvYnDu3dxe5jVsmD5kxpMqXa X-Received: by 2002:a17:902:2809:: with SMTP id e9-v6mr9527085plb.89.1529868048821; Sun, 24 Jun 2018 12:20:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868048; cv=none; d=google.com; s=arc-20160816; b=xl/SKrpn+uLhosbvC6bVbelYuu/0XUhjF2Yz9OX3V038anaS1dRJtq30O0n/0Woiyr NbmrehMQB97uEKLzp+Nn+9Bt1aXOVmIRQ5prEQ6E18bG5UIo4woi78U94V4O5Bd4Rn8u XSuvVzk/BhvZa1yahVvVcrZmpdjs7kI/mIygaWiqgGY+bZxrkSV8cd+glPCQUXGnpskO cPRWFpO+u0+0VB8S6wdHIxm+x2UAgCMzRYx7UYonMfAtlAzoVmdCAsmGJ3FYHmTOdfAA Qf9cqIclYwaw/aCN8CrwE61DOfAoBV63O5WGm+mN+dTwl+7SoGduhhCF8PkjsFtyIzIa cOxA== 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=HPD+aBvBtf7WrApWXixYF2D/o928P1MZEEwxzvzQy8o=; b=x+M+fyJ2LyXuqziCVeC236ZqLy3VXwWZEjz5KRYE7qzRXJd5afqisoNVgU0HzsIAH6 l+guI8rW0ahZJapwi4VJPmWMO8AdMErZ1mRiIYbRqHASHUFuXYbwIY1w6+YdZwcIamKN zuRuXd1OzH9+r9KCi16SC9Kbr3aSLTCltqEqdSJdfo/pRjZk+Osq/hg82JXe5cDYVXsb G6y5/nlDzlctmtplVVbPFYV2oLQgeivp1w2brLS1ZQ5RUNQ8DjzRbA5CJDQFwaLrBXhR xPDCTY6WsTBW65dxa08paiZu5+hIbpccGWBKY1W66M/8Gvf5hpaRqLmv24HFG+yKWidk iLlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="bWSyfL/X"; 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=QUARANTINE 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 a7-v6si513387plz.510.2018.06.24.12.20.48; Sun, 24 Jun 2018 12:20:48 -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="bWSyfL/X"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id DD42D75185; Sun, 24 Jun 2018 19:20:02 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by mail.openembedded.org (Postfix) with ESMTP id 8D69274EB2 for ; Sun, 24 Jun 2018 19:19:37 +0000 (UTC) Received: by mail-pf0-f180.google.com with SMTP id u16-v6so1657586pfh.3 for ; Sun, 24 Jun 2018 12:19:39 -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=i2SBWAFNc2JMJRRX0m4naYebXnX14Cf8i65weh/cZKs=; b=bWSyfL/XNruWD8B/UJ49nQJQcih9yCFuUB8u7L8LZgjF99B8gD2D854QTK8M6hrbE4 kTiX1GkI9jsc2bvITjOPr2MljI/U6OihCCGkBRtP7bUQdG04Czf0lnSBsz7ZCvPSKMfS KWc3VtcaLW5n8ddJhsjgpKn0sGMqhIBpNFIY8pcrADz6VpoP7niLr/apjpU8c/TETI1O GTrrYT0U2x+UV1kM44NMGaysILBDAcn7Aw6kVWaB4oMzB/eMTssWS9JwkjjzMgf98CZg hUSVAKs4E9pT8+Vb3cKuVuoGyULkYhKzd+sdRfT+kx8nOiJVdLl38TND6Cum8R31vAdd U5yg== 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=i2SBWAFNc2JMJRRX0m4naYebXnX14Cf8i65weh/cZKs=; b=IvzpPGJ5uK9UvRmT5sT+AY9lhaU6rwNCfgsiG1/1h6kVz8tZRqROj2Ofryjumn5bxl mWAGkODgo6+Cq4j7ZHCImt6XQQFGJbGz0xwDdzGeBBA5yIrWSFCm4dPfHbc2uT+5gqnp 2ydDefps16ad4DSJD1iwc3qGcZUUS7hyhOjKUKrrVzX0eIyOViqj37mf6o7GfI5AK+my FdLxH9+ArZ/aEPRq04f30yphyCKSfJf5j3ELwz6tGWNdxDQX+ogOlXFATic/kg/UCt/H NSlfLJMa9eusPUIIlgo62TkSiS436rf9kp6fAABr1THd+yg6PftTpI9CTABW2zYAN8Hk 7VJQ== X-Gm-Message-State: APt69E0J7/MgkoHsdaDI+WytTZYFQQdbf2r4H80A8QJCGBo1iUdSkUBx vVv0U21A3+l9IFc6gp5Tc3gA1Q== X-Received: by 2002:a65:52c3:: with SMTP id z3-v6mr8382630pgp.69.1529867978442; Sun, 24 Jun 2018 12:19:38 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:37 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:34 -0700 Message-Id: <20180624191845.31082-9-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 09/20] corosync: add corosync.conf.example 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 From: Mingli Yu * Add corosync.conf.example as the template for /etc/corosync/corosync.conf to make the cluster works as the previous default config doesn't work as below output: root@host1:/# crm status Stack: unknown Current DC: NONE Last updated: Mon Dec 25 05:30:59 2017 Last change: Mon Dec 25 05:30:32 2017 by root via cibadmin on host1 0 nodes configured 1 resource configured Full list of resources: WebSite (ocf::heartbeat:apache): Stopped Signed-off-by: Mingli Yu Signed-off-by: Khem Raj --- .../corosync/corosync/corosync.conf | 58 +++++++++++++++++++ .../corosync/corosync_2.4.4.bb | 5 +- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 meta-networking/recipes-extended/corosync/corosync/corosync.conf -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-extended/corosync/corosync/corosync.conf b/meta-networking/recipes-extended/corosync/corosync/corosync.conf new file mode 100644 index 0000000000..6aef9de950 --- /dev/null +++ b/meta-networking/recipes-extended/corosync/corosync/corosync.conf @@ -0,0 +1,58 @@ +# Starting point for cluster with pacemaker/openais +compatibility: none + +corosync { + user: root + group: root +} + +aisexec { + with Pacemaker + user: root + group: root +} + +service { + name: pacemaker + ver: 1 +} + +totem { + version: 2 + secauth: off + threads: 0 + interface { + ringnumber: 0 + # Cluster network address + bindnetaddr: 192.168.10.0 + # Should be fine in most cases, don't forget to allow + # packets for this address/port in netfilter if there + # is restrictive policy set for cluster network + mcastaddr: 226.94.1.1 + mcastport: 5405 + } +} + +logging { + fileline: off + to_stderr: no + to_logfile: yes + to_syslog: yes + logfile: /var/log/cluster/corosync.log + debug: off + timestamp: on + logger_subsys { + subsys: AMF + debug: off + } +} + +amf { + mode: disabled +} + +quorum { + # Quorum for the Pacemaker Cluster Resource Manager + provider: corosync_votequorum + expected_votes: 1 +} diff --git a/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb b/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb index b760c117cf..5ebec08b99 100644 --- a/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb +++ b/meta-networking/recipes-extended/corosync/corosync_2.4.4.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://corosync.conf \ + " SRC_URI[md5sum] = "69db29ff4bc035936946be44fc8be5cd" SRC_URI[sha256sum] = "9bd4707bb271df16f8d543ec782eb4c35ec0330b7be696b797da4bd8f058a25d" @@ -47,6 +49,7 @@ do_configure_prepend() { } do_install_append() { + install -D -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example install -d ${D}${sysconfdir}/sysconfig/ install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync install -m 0644 ${S}/tools/corosync-notifyd.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync-notifyd From patchwork Sun Jun 24 19:18:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139781 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3198833lji; Sun, 24 Jun 2018 12:20:55 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIEoqeDJ4a6ZvHLsy4b02VG2oasUWOyYX5UGHOic8gD0meTgIx+fliiri4wQi/pvi4p1BBB X-Received: by 2002:a62:859c:: with SMTP id m28-v6mr10201967pfk.42.1529868055636; Sun, 24 Jun 2018 12:20:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868055; cv=none; d=google.com; s=arc-20160816; b=l3rGdkpH+InSmxV98KEGA1HtSeyNLdOzrhMmrwLxLCvj47X3lqHjWfye2lLldLLmDj g9shc05INN9ulr6xz02GE7GK9Ez4HFp8I4asL/XJOUt/m1tt+dBWPJbxWc0OW4on9+mj fwAOTjk55SpFXSAi8NKh6/f1FWJcY9D8IZB4CXHpJoBxLggPcFAMnBp8lN/l5T2oIqSJ RRuJBjrpH08BZZvqEKK2/ZJif3wrVDQw4myC26Hskiie38WYv2x2nid5PaCKxayDabHA owhhCq2F+hUNW6E6sTt1UDF3OSJsPf5vT8QR7xv/BWic+SVLdM5yq7mNRlNWG9Lq9Ssq Mw3w== 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:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to:arc-authentication-results; bh=I7lCypqKaUMVhYzVtNSiwwCC2jTU9MQQVehExc8U5Pk=; b=QWCEFoVWXtRu2hoJBV+X9y3uKQkSixy5k5GTdBqiHqc1pHUfmYuedyGcZ3jDMXbNl8 ZKa44OMI6jEQpdfXEpSV0Vp1u0yZmRksXkemUMVKp0u3kAY3mnpzSCqnCS+g24+/8aXd V9SzxErRZmXg3QeidYpL3CQNcqV3+DnoaLlkSudiYfP/NZHRnBtGbQE5mdl/K/Tf687S La0vOzb7poo4tE8qe7BL2RzsAF01xB2EbYbP5rEliFZmYT2K/cR49YqwbFxkM1VMlltL PH+5yDCn2rjwQrU5IopxCDrZXWND4yTdqpZ2vS+kKqgvQSM0rtRYC+MrfxsuRaZEZxh3 wH5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TcnuUUbG; 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=QUARANTINE 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 90-v6si12608570plf.56.2018.06.24.12.20.55; Sun, 24 Jun 2018 12:20:55 -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=TcnuUUbG; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3232D751CD; Sun, 24 Jun 2018 19:20:04 +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 C4EC474E86 for ; Sun, 24 Jun 2018 19:19:38 +0000 (UTC) Received: by mail-pf0-f179.google.com with SMTP id c22-v6so5433721pfi.2 for ; Sun, 24 Jun 2018 12:19:40 -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=kckuvwWBfuvB9J5zs26D+c7fmJhEp8Gt2EuT7aMpZmM=; b=TcnuUUbGhuCxy7vL9xzl6e1kUX8KZrwvSyPV+aE6zAR+7bqtuOT0CgzSF2XWQWFw6b wib4yzdz0iyt5C9Lj5bsHX1YA69u8luCNlP2Nsixqrf/0sdrhKI4F+W4U6wSX1hClKCL HDC7Wjk+M50lykUI/TnXw9DFBiPNwEePEojZ7iSJ89EZI6jcoN5TujjIXYr2kEHrZaY/ +7ATdEtzS+TNb9KemBmhyP0MZ2QkV1KMGy7B/yv0MzWWDAH4txYBHIM+BrPVpBrcqfu7 m/mdQhoxxLKNgbUE+8yJwbH3F4biQOm3MGpWGXtT/1o8L7C2J4u+oiuO1iVlPhaPUBtM hzXg== 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=kckuvwWBfuvB9J5zs26D+c7fmJhEp8Gt2EuT7aMpZmM=; b=Q6l3DU+PlTrK6Yki2Ia+avPmsga3KVYlQGbZdtEdVckQBJdr3myJTb+9aB/LjBDx9G lgridFuKeVEQG/iJJUViyAJH7P+WGzTAtxkRsgxa/ni22H/2gU1ilKfoKi+6V4lq50+T PZF/oSwzOgitdE5hAmdmp4Zn4hUgrptQreUTTJ25WwRMSgwTX3qmctIyHyXCIm4pAUyj N5PEM7Qls/f/kOXIGuzpW0uG6BIJhQkF/wGf58ENolXFqLfzDMYqsr2L/8QX0nSrt8O/ 73D7AK4vSbrGQHS8o8+3BVHtx7Nuuv53/SBsOAIFUJ3hhMbvuPPCjDwauMdZAJKYwwi2 53Zg== X-Gm-Message-State: APt69E1MfJ3nlM7QNR0y+ghhjmlu00NobcFU8pb7Lp8pn2Lv6laz3SDp T0k0v1hG8zqUyEhrYpLgHw3mAA== X-Received: by 2002:a65:6688:: with SMTP id b8-v6mr8453249pgw.24.1529867979507; Sun, 24 Jun 2018 12:19:39 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:38 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:35 -0700 Message-Id: <20180624191845.31082-10-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Cc: Huang Qiyu Subject: [oe] [meta-networking][PATCH 10/20] drbd-utils: 8.9.6 -> 9.4.0 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 From: Huang Qiyu 1.Upgrade drbd-utils from 8.9.6 to 9.4.0. 2.Delete 0001-Makefile.in-fix-permission-bits-for-drbd.service.patch, since it is integrated upstream. 3.Upgrade the SRC_URI to use git fetcher Signed-off-by: Huang Qiyu Signed-off-by: Khem Raj --- ...fix-permission-bits-for-drbd.service.patch | 25 ------------------- ...rbd-utils_8.9.6.bb => drbd-utils_9.4.0.bb} | 11 ++++---- 2 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch rename meta-networking/recipes-support/drbd/{drbd-utils_8.9.6.bb => drbd-utils_9.4.0.bb} (80%) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch b/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch deleted file mode 100644 index 90dd1f8618..0000000000 --- a/meta-networking/recipes-support/drbd/drbd-utils/0001-Makefile.in-fix-permission-bits-for-drbd.service.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Pending - -Subject: Makefile.in: fix permission bits for drbd.service - -Signed-off-by: Chen Qi ---- - scripts/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/Makefile.in b/scripts/Makefile.in -index 402b93b..4a45407 100644 ---- a/scripts/Makefile.in -+++ b/scripts/Makefile.in -@@ -65,7 +65,7 @@ endif - # yes, debian apparently allows installing both types from the same package - ifneq ($(initscripttype),sysv) # "systemd" or "both" - install -d $(DESTDIR)$(systemdunitdir) -- install -m 755 drbd.service $(DESTDIR)$(systemdunitdir)/ -+ install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/ - install -d $(DESTDIR)/lib/drbd/ - install -m 755 drbd $(DESTDIR)/lib/drbd/ - install -d $(DESTDIR)$(tmpfilesdir)/ --- -1.9.1 - diff --git a/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb b/meta-networking/recipes-support/drbd/drbd-utils_9.4.0.bb similarity index 80% rename from meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb rename to meta-networking/recipes-support/drbd/drbd-utils_9.4.0.bb index 90c920447b..d6e913f00a 100644 --- a/meta-networking/recipes-support/drbd/drbd-utils_8.9.6.bb +++ b/meta-networking/recipes-support/drbd/drbd-utils_9.4.0.bb @@ -8,13 +8,14 @@ SECTION = "admin" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=5574c6965ae5f583e55880e397fbb018" -SRC_URI = "http://www.linbit.com/downloads/drbd/utils/archive/${BP}.tar.gz \ - file://0001-Makefile.in-fix-permission-bits-for-drbd.service.patch \ +SRC_URI = "git://github.com/LINBIT/drbd-utils \ " -SRC_URI[md5sum] = "76ed6d3190cd77b00890f3365353124b" -SRC_URI[sha256sum] = "297b77c9b3f88de2e7dae459234f2753ea4fc2805282b2d276e35cf51e292913" +# v9.4.0 +SRCREV = "eff6423ee72931aa0f8d0eb51742acee7c7cd3e1" -UPSTREAM_CHECK_URI = "http://www.linbit.com/downloads/drbd/utils/" +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_URI = "https://github.com/LINBIT/drbd-utils/releases" SYSTEMD_SERVICE_${PN} = "drbd.service" SYSTEMD_AUTO_ENABLE = "disable" From patchwork Sun Jun 24 19:18:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139782 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3198895lji; Sun, 24 Jun 2018 12:21:02 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKPnNPo73N3c/8iNL/FWFsG4v8B0sg2RRfvSUp7DXOVOoL6AqxMVBuCkVoHFRUBT+ECC5tp X-Received: by 2002:a62:23d5:: with SMTP id q82-v6mr2843589pfj.1.1529868062080; Sun, 24 Jun 2018 12:21:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868062; cv=none; d=google.com; s=arc-20160816; b=bNxGh2RGNaQhFs8v1vunPPNdLaca8/KtAVGO5a8eF4xeGTryMvq6Vosv0aE4als17C OVyw382X8PTt4aRK2runNrOOQxgnUQamq9vTST6iUvh5+tT5UEyWkvP0/c6sn0duKWct AufPrjWYqx5e58h5N8iaP3gx6P022SYPC8YvHfQVK36Tyecn0A1Lpp0cTGyMCMBJbX0x mGXN+87JYLViLVsd5pjtlHKGrSPg0BOo5Xfms+/Yas2vy7Bmk2E5i1IcWIn/mToLybk1 5iCCLoNuR/SWBu6f5EtU3u/fFMQr/Nzpr0RrCPNfBd08rAqyWkOilAo8/LMQ/83U9Swe KkQQ== 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:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to:arc-authentication-results; bh=Vd4Gr85nwX2ydodmBhIi0q1st155xD2VlqZXV4uyIns=; b=TJtB6BoP6ANgPQNGiXnDx1BLi8nTTCj4PKIP/clo7KyrjrGG9q+ipgZqgdc6C4t/xA j4CKv5sdU5PJzhId5TQxgs9chHyGX1vXl6PDPglkjNWCJM9HIm4ZKTYJsTiyjIc0X8QW aBWPCX2yikjY2vzltBAkSJUlOSFdj2dOlRaQQPUZDqwgqrmiU3tjBshuZGkanxYy1pk6 gqCpWJFnfvme2eOtsphhFMjIry725R3YVuL9pPWXYC/td1hbRF675tSRy7vL+02JoiLk GqxcKxj3HCoJJfMELESWewDS1VQztMsPyWQn7/6+vqXsTz9HbtkCjmBdVKWxxtzTILUs XgpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ompj51Kn; 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=QUARANTINE 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 e9-v6si12615014pli.337.2018.06.24.12.21.01; Sun, 24 Jun 2018 12:21:02 -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=ompj51Kn; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 4A979751E8; Sun, 24 Jun 2018 19:20:05 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by mail.openembedded.org (Postfix) with ESMTP id DB97774E86 for ; Sun, 24 Jun 2018 19:19:39 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id a11-v6so5423757pff.8 for ; Sun, 24 Jun 2018 12:19:41 -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=8yc/lwrq0hj8UcW32C03YGC+JMFpzFtqCtW+gR3A9qY=; b=ompj51KnHWw+C2cChOHCTLnlfJR1U/MVTCZlSkbyVEaYIHyoW9cgIxn/15vPJmtbWK lwAFsQkJ/JL2sScD510rxokPgFZ7Cjo9Wqr2+y9KBN984AgndlyowZm+dRFFP8OcAE+p tqlYygtAn78Oiz5SgdZBKDqvDlzDfe+0BfbnMKGeTUGHlg93RiCrwh7S4R8qJzJtv6FO feyc1UACTbtyvaAmWVBMyrBLzvgiLs0/4DyBC18NEutq30lXZUzSusWi2c04JNEHeGah ftHd84UtTT39lIB2pKvZ826iGDWISkg/xO4IH8t+AAGGQ+K1qyYTwpDLJ7tkgi6pGp7/ Mj0Q== 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=8yc/lwrq0hj8UcW32C03YGC+JMFpzFtqCtW+gR3A9qY=; b=MHAX0InSghWYT+g1aZWGNsjJbdz88reoI18c7E6GT/oLCe7hOnTt+1w4GWyLteNI1Q J8DQ0TlUHMazcINB9CWQQm+G6vWMJKh1dTDEg592IbvIfO+B1Atc4q1SSubFgb5cBCdI o07qlkc4sIfiKXQrk9fDxr3SiSx4O5DvY7D+S2okw4nh1u2Mesec/Ytal9w5FAPssWRP AaA6ZcoqDpYoT9baJOWj0ajlHt5OXm76yVN0ipFxy9nkhuzFjaheeCpLxePAZwE8+TKI 2sn15Km9iOcgLTafrmGvXRHGTF8RE1W+dtajRK+RZgotU54mB7eL9fZIyxWhvrzldfIp yLTw== X-Gm-Message-State: APt69E2x0s9Nk2e53nshYstZDsSQd3yx+wFlf9n5OYL18wdIcnprwukG jDHmw3vr0aYDDVG/77rBJSTymw== X-Received: by 2002:a65:63cd:: with SMTP id n13-v6mr3549221pgv.185.1529867980767; Sun, 24 Jun 2018 12:19:40 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:39 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:36 -0700 Message-Id: <20180624191845.31082-11-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Cc: Huang Qiyu Subject: [oe] [meta-python][PATCH 11/20] python-cryptography: 2.1.4 -> 2.2 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 From: Huang Qiyu Upgrade python-cryptography from 2.1.4 to 2.2. here is the change in LICENSE file thats resulting in checksums changes -from the same in CPython itself, and is licensed under the terms of the PSF -License Agreement. +from CPython, and is licensed under the terms of the PSF License Agreement. Signed-off-by: Huang Qiyu Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python-cryptography.inc | 6 +++--- ...hon-cryptography_2.1.4.bb => python-cryptography_2.2.bb} | 0 ...n3-cryptography_2.1.4.bb => python3-cryptography_2.2.bb} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename meta-python/recipes-devtools/python/{python-cryptography_2.1.4.bb => python-cryptography_2.2.bb} (100%) rename meta-python/recipes-devtools/python/{python3-cryptography_2.1.4.bb => python3-cryptography_2.2.bb} (100%) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-python/recipes-devtools/python/python-cryptography.inc b/meta-python/recipes-devtools/python/python-cryptography.inc index 13d2ba800d..cdc8185c92 100644 --- a/meta-python/recipes-devtools/python/python-cryptography.inc +++ b/meta-python/recipes-devtools/python/python-cryptography.inc @@ -1,7 +1,7 @@ SUMMARY = "Provides cryptographic recipes and primitives to python developers" HOMEPAGE = "https://cryptography.io/" LICENSE = "Apache-2.0 | BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d5ede125ed08d4fd14ec44d334bdb388" +LIC_FILES_CHKSUM = "file://LICENSE;md5=097f805837700cfac572ac274cd38124" DEPENDS += " \ ${PYTHON_PN}-cffi \ @@ -10,8 +10,8 @@ DEPENDS += " \ ${PYTHON_PN}-six \ " -SRC_URI[md5sum] = "9f39d4d8f2b05f295fa0ff52475ec4f2" -SRC_URI[sha256sum] = "e4d967371c5b6b2e67855066471d844c5d52d210c36c28d49a8507b96e2c5291" +SRC_URI[md5sum] = "c49c1ee145a900313a216fa2c788208c" +SRC_URI[sha256sum] = "f5a0279e362c37e2150a32fe35ec20226e9237b6c9927fce8d53ef8e49e64f48" RDEPENDS_${PN} += " \ ${PYTHON_PN}-cffi \ diff --git a/meta-python/recipes-devtools/python/python-cryptography_2.1.4.bb b/meta-python/recipes-devtools/python/python-cryptography_2.2.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-cryptography_2.1.4.bb rename to meta-python/recipes-devtools/python/python-cryptography_2.2.bb diff --git a/meta-python/recipes-devtools/python/python3-cryptography_2.1.4.bb b/meta-python/recipes-devtools/python/python3-cryptography_2.2.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-cryptography_2.1.4.bb rename to meta-python/recipes-devtools/python/python3-cryptography_2.2.bb From patchwork Sun Jun 24 19:18:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139783 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3198959lji; Sun, 24 Jun 2018 12:21:08 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ96xCYpaYwucKdoUHYarD2v4AcNxm5BP5Ckh/hUnbiwUXjjey4tw0RjX3gjI8QuIReHBDM X-Received: by 2002:a62:d09:: with SMTP id v9-v6mr9991637pfi.163.1529868067993; Sun, 24 Jun 2018 12:21:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868067; cv=none; d=google.com; s=arc-20160816; b=yz4j/4r+l0a0hMbM+uCKPyGjwrzbHui0Gbb0nfNzGWGBn/pu5EhR1EYYV1b7Oy5M7C 7FJY0D/4ae+BwRMvPFFtf5/3zzDDBXmTXY2Zfn57QleVG//bI2040LOzQpywPhI/KQHb Egk68NLDZa/CqcBgZzVkhvCa4hv1+hkcjPEILao7VmNNihp0DTcZAL8bOCtQ8SFDT47D pKmBjGc5PyAb1AfMa14rivULf2+GPEhYdzDvkTFc9ds23taxEX3kK97tifBoTg+fFMBj MW+qrIBWL+IrHH8mE+hsJkCH6C4eSnqOFi1Skdey1z2wF+qfaSGRI2EnxUxHOeQu9fky Hftg== 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=wf12FFflQlFxgUzIfe40JsyBzibuYPl6Yjiak5fpQrM=; b=BxB1ML5bMYe9o+6UTQ7eqBA/hYIy84fRwxAhwZuQN6IiQVF+Gq9FohzT2UYe9c/YeA 9a0JuTp0BvEu3WgbMJiertbsewWTPNOnRPOksJYlBD/b9x/c+BY9lm738+VxxSlzOS9k Dk4gIsyAdWwL7eAl75S/kGHGymhU3H0F7hJadr3b13lUUKN0X96Etk2PV6h9f26roSBu fnGahz3Mxdn1O4VADCqLHb5qmcPUpN91NQSL3ZzogzrMToMTaxl8di+yw8B4qsZ2f+pl dG+WrQhSVJ7nN1e0h3VVwggNQ2ndHWMLWrFIqEKrHqHV2oecAUNlBo2K8y7AFmXh7+5F JR4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lfgLncEz; 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=QUARANTINE 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 x2-v6si12458744plv.388.2018.06.24.12.21.07; Sun, 24 Jun 2018 12:21: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=lfgLncEz; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 61790751C2; Sun, 24 Jun 2018 19:20:06 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f176.google.com (mail-pf0-f176.google.com [209.85.192.176]) by mail.openembedded.org (Postfix) with ESMTP id 21DA274DD2 for ; Sun, 24 Jun 2018 19:19:40 +0000 (UTC) Received: by mail-pf0-f176.google.com with SMTP id c22-v6so5433747pfi.2 for ; Sun, 24 Jun 2018 12:19:42 -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=ArYWM6Zk7Lzg4L0OjWZ1Tq6wfCT9rE5M4QVfTW1zVQo=; b=lfgLncEzwjKPn0kGZMlZYjrtHzq8QfQsCWps2Q9ZtUStGClaWBL9MaHNKGCGcfeLTb hYtZ2hI6Q+4IX9Req8zN7LJSQzgRn+ueahLlgzGkwmvCW9dreype5Qk/4/hwR/nbVuVs NnQcOoLrsu4pNMYoP7z0xp0A0gwZMtiaW49mgcmy0Uv4ktUK0II6jRKSWmJTWWU2oklf 8I5+DUUsesvlCpJYLtm9biI9BXHyxcWLLNFDHFUJkBS0l6Ok2Tv4MIoGVhBU0/Y76bXs dWbmsR3+tRa6R4u+OsqHo4gL7XgZC90oztNCuHEbYs208Em/IrszLqbvProcwhaLuDOt uGjg== 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=ArYWM6Zk7Lzg4L0OjWZ1Tq6wfCT9rE5M4QVfTW1zVQo=; b=VL3grxSHXPV4u74UnsDvP26hQ4cwymdRLjRBEHDskdblFamAVex/qkS10m88Nru7yf QqKg9tK20+FiumpXy9Uaf4mr1DBlCtq50wJb1ZPXaAjf87kOc4zi0fLuWx8leW2MpZ17 U3eZrYYoNL9niQTADrc1oiMl7igTIJcMZYIP3SL+K2D78N4ImlEtRugqhC9KqRotQRvW rLmBkQH9jP8zJImt0GMTXVOiNTNeJpsD1J3Q4rZnyHIPEeoUY4kgEqP+ScATeLfS3HI+ NwajmPBNGlQrJGaIWY5zI5hf7Pg6KrydTX5wib7bcgO6eKv7rM6/mWxfbsGPN1/kUWE0 38RQ== X-Gm-Message-State: APt69E3eF5kU8hq+4dOvAlfF1lNd+/7ztGj99xWCyGZJCHPiPFxi7xWE RIFRnQUyilKzc2ZagjMx5KsoSA== X-Received: by 2002:a62:c918:: with SMTP id k24-v6mr10139001pfg.160.1529867981791; Sun, 24 Jun 2018 12:19:41 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:41 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:37 -0700 Message-Id: <20180624191845.31082-12-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 12/20] geoip-perl: add UPSTREAM_CHECK_URI 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 From: Yi Zhao Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- meta-networking/recipes-support/geoip/geoip-perl_1.51.bb | 2 ++ 1 file changed, 2 insertions(+) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb index ed5c3a9799..bd37ce5005 100644 --- a/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb +++ b/meta-networking/recipes-support/geoip/geoip-perl_1.51.bb @@ -9,6 +9,8 @@ SECTION = "libdevel" LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=e4f3ea6e9b28af88dc0321190a1f8250" +UPSTREAM_CHECK_URI = "https://github.com/maxmind/geoip-api-perl/tags" + S = "${WORKDIR}/git" SRCREV = "4cdfdc38eca237c19c22a8b90490446ce6d970fa" SRC_URI = "git://github.com/maxmind/geoip-api-perl.git;protocol=https; \ From patchwork Sun Jun 24 19:18:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139784 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3199018lji; Sun, 24 Jun 2018 12:21:14 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJKsM9J6UxmI31bMb31CgIu0W/gjwEyCvaUUhBbY0+hHdytKyquZwGZgn1aARrJcRaU4c/O X-Received: by 2002:a65:6004:: with SMTP id m4-v6mr8309114pgu.124.1529868074146; Sun, 24 Jun 2018 12:21:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868074; cv=none; d=google.com; s=arc-20160816; b=kOWBGMEEELeF3H48LDtApduX7q89OTdf1lyKEPlAvcljb2qcyrOLtwb0DRtN2MQFA9 ZzMgRVoBcLdAzBILiKhrK053PimlXY+ZB10I3TNro0YavfzOn/GbBRq3xzoqjeAU4/jG mQ9o1m5CGr15W5DudGwp2iSHVj4S3uMwpLxQLPKkWaS89cpsk7Dydsx4FbbCunaT39zi 2CzJLRdz0cRdACkJJLPRhFXLb/5OeEFB4Yzun3Xn4BRRju7pRBFkhPwDpE57UWpEKPhR 8IPJFdMYzYxsmiLnLLaTnBErdq+PQfdJ6QstogdHz+i2op9MGGx0v+TSPcMC96wmp1Kn OTbw== 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:cc:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to:arc-authentication-results; bh=9WbR+thhc9EckEQ1KFUIw5yqoWwDqej+zSPPQHlP8pg=; b=RIkOv3wyfIZPt9qLflQoagdgnj6j6z2udpMRDqMBW1GC4B6WiblSBILDGfUK27y+Hw rDVpVT8NvL7gZk+zNigAQtC8nM4wOCUBkB6UJF6BFfl/UoqpATzXcIw4ecIaym+ythYD qNBh8dYWIlpNthZIal9ZAqvoE19rZ9YjPHUM5wC7PhZAmqMB9O98uydjgie9YD4wqj0M klUmU2aQJbIzMOdTt7wS8Smg/Zj3wUMoaNTjGSj5Rut8AQmV9C+9vGKwy1s6XmqbOHWv D72VJQlOTUIt+0OKvH17c5CeeAVsupb4uEZgjpf0Kg/xt6CmvdhDXqipO0LXtkxvfrI/ qkDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rSLjKejV; 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=QUARANTINE 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 o3-v6si9986371pgf.344.2018.06.24.12.21.13; Sun, 24 Jun 2018 12:21:14 -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=rSLjKejV; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7D69C751F4; Sun, 24 Jun 2018 19:20:07 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by mail.openembedded.org (Postfix) with ESMTP id 1D32274EB2 for ; Sun, 24 Jun 2018 19:19:42 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id x23-v6so1500699pfn.11 for ; Sun, 24 Jun 2018 12:19:43 -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=fne/ZJonzm/GKoXx5wOTOwiaADH5dYNfQ8B7sqkOgag=; b=rSLjKejVsaK7OsKAOtNnzXkhSSFBl+r/nA6UuObehkepiE+ogQ0Ha32sFTr1bJ8yMP QjkyG9IOsGsQ4NDdFBkzsCtht74SU2tmgNSIIg251nNLtBv3+IQfw6ZYXv6uZr9nZjM9 WCXmfzUsOkvdYBswJSfJgkVHd9ov1u+Dc4dzl1H0VCLB2TSbSKv2GaEq1Enwc8LyQl/u 9fVw2vYSvriG7Thr517fnmHFuI4KbzJWazbZhjz7gnG7/C2Vj/m1+PAlzJ08PR8UHT/y kuAwotvkmWVLXRsQXU5XN8Bih2gjgB3xvGmdwRmzMDEijbh7Tx7cviiiElcPISHiKuPG Zd+A== 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=fne/ZJonzm/GKoXx5wOTOwiaADH5dYNfQ8B7sqkOgag=; b=Ke36hG2GT7VD5AP1r+yVYh8RegfvkYs9iQThX9c0qwqQ8IPlbLs6VIm2DixgQAMueT RAAgngHAJDB2z7uogPb6X5D0FG1xjDnsLUomU1Rb8TwqTLfmC3+7+zCskMcQkoXVhKVE rBlvhu36Pr4hExM+vO/uuZUyMDeMO89a73QhGwJ/0Pvu+zyaiMYmLEiNiONedd2g6Vy/ k+wsP0w8PUNVvoLvUx1nOdGHrhtlu1C/Fs+QlHiTr9BbSh15qo41OMGDbM/8I6Ha1Tj+ mq4gsUeu/kjjvhlp0t0TDZl5dCoWkswll2CyZ//8RTIOuHsKnnTcmjgN6/GfKwln77Ws +RrA== X-Gm-Message-State: APt69E3+L6Y/qkpDgRYBqWOZu6WZy9+AjtAHU2Qo2/wINOlc9bHy8Sqt OsLjRPx6R1mD2UZizY31eYQO9A== X-Received: by 2002:a65:6103:: with SMTP id z3-v6mr8252194pgu.125.1529867982906; Sun, 24 Jun 2018 12:19:42 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:42 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:38 -0700 Message-Id: <20180624191845.31082-13-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Cc: Huang Qiyu Subject: [oe] [meta-python][PATCH 13/20] python-cryptography-vectors: 2.1.4 -> 2.2 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 From: Huang Qiyu Upgrade python-cryptography-vectors from 2.1.4 to 2.2. Signed-off-by: Huang Qiyu Signed-off-by: Khem Raj --- .../recipes-devtools/python/python-cryptography-vectors.inc | 4 ++-- ...hy-vectors_2.1.4.bb => python-cryptography-vectors_2.2.bb} | 0 ...y-vectors_2.1.4.bb => python3-cryptography-vectors_2.2.bb} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename meta-python/recipes-devtools/python/{python-cryptography-vectors_2.1.4.bb => python-cryptography-vectors_2.2.bb} (100%) rename meta-python/recipes-devtools/python/{python3-cryptography-vectors_2.1.4.bb => python3-cryptography-vectors_2.2.bb} (100%) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-python/recipes-devtools/python/python-cryptography-vectors.inc b/meta-python/recipes-devtools/python/python-cryptography-vectors.inc index 00bb87b0c8..31461ecf48 100644 --- a/meta-python/recipes-devtools/python/python-cryptography-vectors.inc +++ b/meta-python/recipes-devtools/python/python-cryptography-vectors.inc @@ -8,8 +8,8 @@ DEPENDS += " \ ${PYTHON_PN}-cryptography \ " -SRC_URI[md5sum] = "ef115b870cc8d8b9f0f4189b512bc170" -SRC_URI[sha256sum] = "78c4b4f3f84853ea5d038e2f53d355229dd8119fe9cf949c3e497c85c760a5ca" +SRC_URI[md5sum] = "303a08ff50a5590d0ba05252981417ee" +SRC_URI[sha256sum] = "cf601c7d87ad6a938bcea29062375dce1d3e26dabd1db52bbc37eeaf4aac970d" PYPI_PACKAGE = "cryptography_vectors" diff --git a/meta-python/recipes-devtools/python/python-cryptography-vectors_2.1.4.bb b/meta-python/recipes-devtools/python/python-cryptography-vectors_2.2.bb similarity index 100% rename from meta-python/recipes-devtools/python/python-cryptography-vectors_2.1.4.bb rename to meta-python/recipes-devtools/python/python-cryptography-vectors_2.2.bb diff --git a/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.1.4.bb b/meta-python/recipes-devtools/python/python3-cryptography-vectors_2.2.bb similarity index 100% rename from meta-python/recipes-devtools/python/python3-cryptography-vectors_2.1.4.bb rename to meta-python/recipes-devtools/python/python3-cryptography-vectors_2.2.bb From patchwork Sun Jun 24 19:18:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139785 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3199091lji; Sun, 24 Jun 2018 12:21:20 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKJZzQpKy8Y96ZBm6YaXsRmjZcQ1Egg3ZbxFik7Z6hPumr1fDtg7/JsNsdeqeO4MQxKrdGM X-Received: by 2002:a65:4985:: with SMTP id r5-v6mr8253073pgs.110.1529868080622; Sun, 24 Jun 2018 12:21:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868080; cv=none; d=google.com; s=arc-20160816; b=kGlfXgT5Ki+7xoDl1naE9Jizt42ZhfSjqzs6TwInodB724raEvnTm3O5T3yXUgJkCN ZxCeGBS6THRjtFjI0yJOBP2VfJ4s9FUHK9fm6QSSoElV6bKsBoUlL/oP2+RX1f08UxRW Mssq/KS+iewJL0Eo7DAf6kLfJ93RHt7Rns6CVxdPTdbQckxfje5IpDpkiF1DlBvbAM3t GFkSZYPq0RYXtYx4+BIRTOrGmp6CF7o/SMAdISABgseHlRjHIuXRDbo+euLLMNEmh7E7 IQVoDXbYVtSD4jogVNb8NDkhnJwd1KhsvlpiHJEMNN7tQfr/Yir4DHVBMuafKdK2fV83 m9hQ== 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=gdUO/SRYXWRg4zvzPuubtKZxf0g9mZVVjIEDz1CFU0s=; b=q7GFPZwWH2VnITzAvRyDbXt6bLxNTA8IfhWXR46rxZmupohNoheEPeuTZ5a67Vf0UT gjPYxiIzodqRlcq6kBrRzBZN4Jn67+ayzMRSHs6kPdFonnoY1X2h+xgIfE4wi5Y7YtRb czz9ywBPlu6ULZPswBH/jDiW7fPW21QQ34F9qhrN72Mi0AKzCHMEIrLMXZR9N4gwQyDB NHnBM5Ty4hDt3bsX5dCCI2zFz8MNIfgns6qsMpe3Ztsjy/kPNmD2gaVZ4PaL1jJ95sV7 m/6B8YnVjbWXXrs1AmLFsi0P3/wR4VftDr2e9rXQ/f8ck/1QnyhA8LGwuQ6gg9cVotb5 L2iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=JAdxjIPi; 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=QUARANTINE 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 b16-v6si10294589pgv.358.2018.06.24.12.21.20; Sun, 24 Jun 2018 12:21:20 -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=JAdxjIPi; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9F61075203; Sun, 24 Jun 2018 19:20:08 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f49.google.com (mail-pg0-f49.google.com [74.125.83.49]) by mail.openembedded.org (Postfix) with ESMTP id 649F074DCB for ; Sun, 24 Jun 2018 19:19:43 +0000 (UTC) Received: by mail-pg0-f49.google.com with SMTP id q14-v6so1324629pgt.13 for ; Sun, 24 Jun 2018 12:19:44 -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=qV74r2zDeG6groc4PbGufSUOozLqYDXfVxTyaK1b69c=; b=JAdxjIPi87JnPHJuZJ2xcN23ZdxDs9mdtyoVvBKKMBDkVOV7eBdpYIz8vQMvVZ22wg YXM9ADr/UDWI37a6uHXdj66lwjKbcLVSUNVNC35RPhA8Uf5yW+LIlZYGXEjEtJ+euWI8 UBJ6i8124GaQXqRuaKSjSQTKEZvvA9U9nM/LtAjB7gMBcP2AUwjuL8a8hWME7TQQySkD PeEMoPm+0QCOKuUJb1gmvSTBe3EhTHKc1cmi2l7L2Yq1/u03Bt3czGw0LAFkmm3s82dv 28JvdpE/9its3wpoOigAOqqYp/WCGrMMvpo/3Y7V+AnmVVAfH+zUHoNV5lv33NWR7nha cX7w== 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=qV74r2zDeG6groc4PbGufSUOozLqYDXfVxTyaK1b69c=; b=K4FojvIVMHcTo1PrMguOxn7aTvUDYw8xGz9Z++NlK3iKeH8sk2L80gaYML3B8/9KDz FRAuJsNIh8gHEZYI/Hue0HbC+KYw8BRE7l6bkZ3ZfJ3MBnjw3hRxHSSNk2wuR/sHxsEe z7YgjtAudHZ4v5QNctWPJwbJIYQ2+OYfaN61Rv+ySMc+gzRx8O5U2XhOjQ2LYSz+u8hr E6t5QnET1Hzd8G1at8HB8ZaXPOhwdMYsJA1TWk3G7yxbVzz1i+k7ItTvROto9CAlXeH5 v/HKEbfQnyGCzFFtlxY4Z85tY/2KzaqObqOhPNhI8b1Qt/Z02j6H78Iwxy2KNJl1syhp oXiw== X-Gm-Message-State: APt69E3qwX6gGCJyeP3gpbMzqOH9Pxr4WE1RdcE3ujtbhwHIwRvdfMca DQgBkrisLJYiXpRMnMXuxh7lRw== X-Received: by 2002:a62:8917:: with SMTP id v23-v6mr10233847pfd.127.1529867983890; Sun, 24 Jun 2018 12:19:43 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:43 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:39 -0700 Message-Id: <20180624191845.31082-14-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 14/20] opensaf: Upgrade to 5.18.04 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 fix strncpy overflow errors seen with gcc8 refresh patches with devtool Signed-off-by: Khem Raj --- ...ch-std-ifstream-failure-by-reference.patch | 16 ++++----- ...0001-Fix-string-overflow-in-snprintf.patch | 3 +- ...e-format-overflow-if-supported-by-gc.patch | 34 ++++++++++--------- ...Pass-linker-specific-options-with-Wl.patch | 10 +++--- ....cc-Use-sys-wait.h-instead-of-wait.h.patch | 12 +++---- ...header-limits.h-for-_POSIX_HOST_NAME.patch | 20 +++++------ .../0002-Fix-format-truncation-errors.patch | 12 +++---- ...-check-for-size-before-using-strncpy.patch | 33 ++++++++++++++++++ ...{opensaf_5.18.02.bb => opensaf_5.18.04.bb} | 5 +-- 9 files changed, 86 insertions(+), 59 deletions(-) create mode 100644 meta-networking/recipes-daemons/opensaf/opensaf/0008-check-for-size-before-using-strncpy.patch rename meta-networking/recipes-daemons/opensaf/{opensaf_5.18.02.bb => opensaf_5.18.04.bb} (93%) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch index 8f8dba0541..30fdb8bf14 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Catch-std-ifstream-failure-by-reference.patch @@ -1,7 +1,7 @@ -From 77d50b8d92ef1903cbc50d8f39e05fc828696bb9 Mon Sep 17 00:00:00 2001 +From 38c5343f84799fc5041575f3ec808f7476b6eea3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Apr 2018 14:33:35 -0700 -Subject: [PATCH 1/2] Catch std::ifstream::failure by reference +Subject: [PATCH] Catch std::ifstream::failure by reference Fixes error: catching polymorphic type 'class std::ios_base::failure' by value @@ -10,6 +10,7 @@ error: catching polymorphic type 'class std::ios_base::failure' by value ^~~~~~~ Signed-off-by: Khem Raj + --- src/base/conf.cc | 4 ++-- src/dtm/dtmnd/dtm_main.cc | 2 +- @@ -39,10 +40,10 @@ index d5755a1..4820357 100644 } str.close(); diff --git a/src/dtm/dtmnd/dtm_main.cc b/src/dtm/dtmnd/dtm_main.cc -index 3260a81..a55afac 100644 +index 585e11e..5cf6ad7 100644 --- a/src/dtm/dtmnd/dtm_main.cc +++ b/src/dtm/dtmnd/dtm_main.cc -@@ -359,7 +359,7 @@ void UpdateNodeIdFile(DTM_INTERNODE_CB *cb) { +@@ -367,7 +367,7 @@ void UpdateNodeIdFile(DTM_INTERNODE_CB *cb) { try { str.open(PKGLOCALSTATEDIR "/node_id", std::ofstream::out); str << std::hex << node_id << std::endl; @@ -52,10 +53,10 @@ index 3260a81..a55afac 100644 str.close(); } diff --git a/src/dtm/dtmnd/multicast.cc b/src/dtm/dtmnd/multicast.cc -index bf67b9c..7232066 100644 +index cadc002..7c25fea 100644 --- a/src/dtm/dtmnd/multicast.cc +++ b/src/dtm/dtmnd/multicast.cc -@@ -198,7 +198,7 @@ bool Multicast::GetPeersFromFile(const std::string &path_name) { +@@ -199,7 +199,7 @@ bool Multicast::GetPeersFromFile(const std::string &path_name) { } } } @@ -64,6 +65,3 @@ index bf67b9c..7232066 100644 LOG_ER("Caught std::ifstream::failure when reading file '%s', peers=%zu", path_name.c_str(), static_cast(peers_.size())); peers_.clear(); --- -2.17.0 - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch index 428e462289..db6796d05d 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch @@ -1,4 +1,4 @@ -From 8cf323a2d8e02ca0bd36deb38e613c6edac546ad Mon Sep 17 00:00:00 2001 +From ae7178a78aba2e5766b70191617113487fd7ad0b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Apr 2018 18:29:17 -0700 Subject: [PATCH] Fix string overflow in snprintf @@ -13,6 +13,7 @@ t-truncation=] ~~~~~~~~ Signed-off-by: Khem Raj + --- src/log/logd/lgs_util.cc | 4 ++-- src/rde/rded/rde_amf.cc | 2 +- diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch index effe25c85c..be0a587679 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Disable-format-overflow-if-supported-by-gc.patch @@ -1,20 +1,21 @@ -From ab00d6f5793b2d850f975bcb6d5d0aa6d7a9eaa4 Mon Sep 17 00:00:00 2001 +From c2668f7f2ea82a61115b7cae56ed081b41ff5153 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 22 Apr 2017 12:34:37 -0700 Subject: [PATCH] configure: Disable format-overflow if supported by gcc Signed-off-by: Khem Raj + --- - Makefile.am | 6 ++-- - configure.ac | 2 ++ - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ + Makefile.am | 6 +-- + configure.ac | 2 + + m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 m4/ax_check_compile_flag.m4 -Index: opensaf-5.18.02/Makefile.am -=================================================================== ---- opensaf-5.18.02.orig/Makefile.am -+++ opensaf-5.18.02/Makefile.am +diff --git a/Makefile.am b/Makefile.am +index b3d6553..5607fc2 100644 +--- a/Makefile.am ++++ b/Makefile.am @@ -52,10 +52,10 @@ AM_CPPFLAGS = \ -pthread \ -D_GNU_SOURCE -DINTERNAL_VERSION_ID='"@INTERNAL_VERSION_ID@"' \ @@ -29,11 +30,11 @@ Index: opensaf-5.18.02/Makefile.am if ENABLE_GCOV AM_CFLAGS += --coverage -Index: opensaf-5.18.02/configure.ac -=================================================================== ---- opensaf-5.18.02.orig/configure.ac -+++ opensaf-5.18.02/configure.ac -@@ -593,6 +593,8 @@ if test -z "$OSAF_HARDEN_FLAGS"; then +diff --git a/configure.ac b/configure.ac +index 5b86730..47d1002 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -600,6 +600,8 @@ if test -z "$OSAF_HARDEN_FLAGS"; then fi AC_SUBST(OSAF_HARDEN_FLAGS) @@ -42,10 +43,11 @@ Index: opensaf-5.18.02/configure.ac ############################################# # List the output Makefiles ############################################# -Index: opensaf-5.18.02/m4/ax_check_compile_flag.m4 -=================================================================== +diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 +new file mode 100644 +index 0000000..dcabb92 --- /dev/null -+++ opensaf-5.18.02/m4/ax_check_compile_flag.m4 ++++ b/m4/ax_check_compile_flag.m4 @@ -0,0 +1,74 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch index 5756a027b4..e4bbb4c3cd 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-configure-Pass-linker-specific-options-with-Wl.patch @@ -1,4 +1,4 @@ -From 6248b717b4861d16b80235fd8e57d64e4f636428 Mon Sep 17 00:00:00 2001 +From 979b2b6a1aa574a26e8b736049c4207d568f60f3 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 13 Apr 2017 17:39:07 -0700 Subject: [PATCH] configure: Pass linker specific options with -Wl @@ -7,15 +7,16 @@ This helps make it pass the options to linker correctly and we can use non-gcc compilers Signed-off-by: Khem Raj + --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index df4fc58..02771c6 100644 +index 12a5d5c..5b86730 100644 --- a/configure.ac +++ b/configure.ac -@@ -553,7 +553,7 @@ if test -z "$OSAF_HARDEN_FLAGS"; then +@@ -596,7 +596,7 @@ if test -z "$OSAF_HARDEN_FLAGS"; then if echo "${CFLAGS} ${CXXFLAGS}" | grep -q -- -O0; then OSAF_HARDEN_FLAGS="" fi @@ -24,6 +25,3 @@ index df4fc58..02771c6 100644 fi AC_SUBST(OSAF_HARDEN_FLAGS) --- -2.12.2 - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch index 76c47c6584..e40d2b3198 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-immpbe_dump.cc-Use-sys-wait.h-instead-of-wait.h.patch @@ -1,4 +1,4 @@ -From 508ea7c0d67243feb1684eaa83569cb687561d64 Mon Sep 17 00:00:00 2001 +From c21f77d592415f316138c05f581192a1f061e735 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Sep 2017 10:09:03 -0700 Subject: [PATCH] immpbe_dump.cc: Use sys/wait.h instead of wait.h @@ -7,12 +7,13 @@ Fixes redirecting incorrect #include to Signed-off-by: Khem Raj + --- src/imm/common/immpbe_dump.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imm/common/immpbe_dump.cc b/src/imm/common/immpbe_dump.cc -index 100222f37..33e47ce3c 100644 +index e6b3cc5..3956028 100644 --- a/src/imm/common/immpbe_dump.cc +++ b/src/imm/common/immpbe_dump.cc @@ -26,12 +26,12 @@ @@ -27,8 +28,5 @@ index 100222f37..33e47ce3c 100644 #include +#include #include - - #include --- -2.14.1 - + #include + #include diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch index 4a2a825f99..e4a3975da6 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-src-Add-missing-header-limits.h-for-_POSIX_HOST_NAME.patch @@ -1,4 +1,4 @@ -From 6442b57a855e273aa5a3d93e8596783cea128073 Mon Sep 17 00:00:00 2001 +From 7fb393c66df33110fef0cbabac7d304f12eb82e4 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 15 Sep 2017 09:39:40 -0700 Subject: [PATCH] src: Add missing header limits.h for _POSIX_HOST_NAME_MAX @@ -7,6 +7,7 @@ Use _GNU_SOURCE instead of libc internal __USE_GNU Do not use the deprecated headers under include/sys Signed-off-by: Khem Raj + --- src/base/os_defs.h | 5 +++-- src/mds/mds_dt_tcp.c | 1 - @@ -18,7 +19,7 @@ Signed-off-by: Khem Raj 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/base/os_defs.h b/src/base/os_defs.h -index 50a9bf5fc..af6842863 100644 +index a570c43..3559b19 100644 --- a/src/base/os_defs.h +++ b/src/base/os_defs.h @@ -47,17 +47,18 @@ @@ -43,7 +44,7 @@ index 50a9bf5fc..af6842863 100644 #include diff --git a/src/mds/mds_dt_tcp.c b/src/mds/mds_dt_tcp.c -index 1407eb1ab..a87c22faa 100644 +index 1407eb1..a87c22f 100644 --- a/src/mds/mds_dt_tcp.c +++ b/src/mds/mds_dt_tcp.c @@ -27,7 +27,6 @@ @@ -55,7 +56,7 @@ index 1407eb1ab..a87c22faa 100644 #include #include diff --git a/src/mds/mds_dt_tcp_disc.h b/src/mds/mds_dt_tcp_disc.h -index a6249d73e..574f52681 100644 +index a6249d7..574f526 100644 --- a/src/mds/mds_dt_tcp_disc.h +++ b/src/mds/mds_dt_tcp_disc.h @@ -24,7 +24,7 @@ @@ -68,7 +69,7 @@ index a6249d73e..574f52681 100644 /* mds_indentifire + mds_version + msg_type + scope_type + server_type + server_instance_lower + server_instance_upper + sub_ref_val + sub_ref_val + diff --git a/src/mds/mds_dt_tipc.c b/src/mds/mds_dt_tipc.c -index 37745e7f0..9b3255567 100644 +index 7714175..a0ed3b6 100644 --- a/src/mds/mds_dt_tipc.c +++ b/src/mds/mds_dt_tipc.c @@ -35,7 +35,6 @@ @@ -80,7 +81,7 @@ index 37745e7f0..9b3255567 100644 #include #include diff --git a/src/mds/mds_dt_tipc.h b/src/mds/mds_dt_tipc.h -index e73a11b09..401d208c2 100644 +index e73a11b..401d208 100644 --- a/src/mds/mds_dt_tipc.h +++ b/src/mds/mds_dt_tipc.h @@ -32,7 +32,7 @@ @@ -93,7 +94,7 @@ index e73a11b09..401d208c2 100644 #include #include diff --git a/src/mds/mds_dt_trans.c b/src/mds/mds_dt_trans.c -index 6f621e04e..5aacbd33e 100644 +index 6f621e0..5aacbd3 100644 --- a/src/mds/mds_dt_trans.c +++ b/src/mds/mds_dt_trans.c @@ -26,7 +26,6 @@ @@ -105,7 +106,7 @@ index 6f621e04e..5aacbd33e 100644 #define MDS_PROT_TCP 0xA0 diff --git a/src/ntf/ntfd/NtfLogger.cc b/src/ntf/ntfd/NtfLogger.cc -index 84014b578..31b1ccc6c 100644 +index fd17c58..1120008 100644 --- a/src/ntf/ntfd/NtfLogger.cc +++ b/src/ntf/ntfd/NtfLogger.cc @@ -20,7 +20,7 @@ @@ -117,6 +118,3 @@ index 84014b578..31b1ccc6c 100644 #include "base/osaf_utility.h" #include --- -2.14.1 - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-format-truncation-errors.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-format-truncation-errors.patch index 9865a5e1b8..f98e28da9c 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-format-truncation-errors.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0002-Fix-format-truncation-errors.patch @@ -1,12 +1,13 @@ -From 4d58d26cbd3622183afc2e8f85c9c81edaf135df Mon Sep 17 00:00:00 2001 +From c5034fe42df8923bcefc10e163151997d70b6241 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Apr 2018 14:56:47 -0700 -Subject: [PATCH 2/2] Fix format-truncation errors +Subject: [PATCH] Fix format-truncation errors Fixes errors with gcc8 eg. error: '%u' directive output may be truncated writing between 1 and 10 bytes into a region of size between 0 and 254 [-Werror=format-truncation=] Signed-off-by: Khem Raj + --- src/base/daemon.c | 4 ++-- src/mds/mds_c_db.c | 8 ++++---- @@ -15,10 +16,10 @@ Signed-off-by: Khem Raj 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/base/daemon.c b/src/base/daemon.c -index 27170d7..da97700 100644 +index 361dd8d..4001b73 100644 --- a/src/base/daemon.c +++ b/src/base/daemon.c -@@ -92,11 +92,11 @@ static int __create_pidfile(const char *pidfile) +@@ -95,11 +95,11 @@ static int __create_pidfile(const char *pidfile) { FILE *file = NULL; int fd, rc = 0; @@ -97,6 +98,3 @@ index 012999c..006b722 100644 MDS_SEND_PRIORITY_TYPE pri; MDS_CLIENT_MSG_FORMAT_VER msg_fmt_ver; /* message format version specification */ --- -2.17.0 - diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0008-check-for-size-before-using-strncpy.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0008-check-for-size-before-using-strncpy.patch new file mode 100644 index 0000000000..497bb07d8d --- /dev/null +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0008-check-for-size-before-using-strncpy.patch @@ -0,0 +1,33 @@ +From 29510dd81e3a5e96151afdb0702863cbfd640766 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 22 Jun 2018 18:58:59 -0700 +Subject: [PATCH] check for size before using strncpy + +ensures that size is never execeding the string length +that execPath can hold + +Fixes +error: '__builtin___strncpy_chk' specified size between 18446744071562067968 and 18446744073709551615 exceeds maximum object size 9223372036854775807 [-Werror=stringop-overflow=] + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + src/imm/immnd/immnd_proc.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/imm/immnd/immnd_proc.c b/src/imm/immnd/immnd_proc.c +index 015932a..c8f115e 100644 +--- a/src/imm/immnd/immnd_proc.c ++++ b/src/imm/immnd/immnd_proc.c +@@ -1902,6 +1902,10 @@ static int immnd_forkPbe(IMMND_CB *cb) + LOG_ER("Pathname too long: %u max is 1023", newLen); + return -1; + } ++ if (execDirLen > 1023 || execDirLen < 0) { ++ LOG_ER("Execdir name too long: %u max is 1023", execDirLen); ++ return -1; ++ } + + strncpy(execPath, cb->mProgName, execDirLen); + execPath[execDirLen] = 0; diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.18.04.bb similarity index 93% rename from meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb rename to meta-networking/recipes-daemons/opensaf/opensaf_5.18.04.bb index 0ef13b0485..effe956999 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.18.02.bb +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.18.04.bb @@ -27,9 +27,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-Catch-std-ifstream-failure-by-reference.patch \ file://0002-Fix-format-truncation-errors.patch \ file://0001-Fix-string-overflow-in-snprintf.patch \ + file://0008-check-for-size-before-using-strncpy.patch \ " -SRC_URI[md5sum] = "42064f5ddbc7f560bfc5ff93ea9eecc7" -SRC_URI[sha256sum] = "f9e24897f9cfd63bb3115f6275c706de1702d3d9bae2fc423227db72b23c37f0" +SRC_URI[md5sum] = "21836e43b13ad33bed9bd0ed391e5a6e" +SRC_URI[sha256sum] = "e55dc2645487fb22938e8386b99eef6eb7aff43a246ce3e92488daf6ee46247a" inherit autotools useradd systemd pkgconfig From patchwork Sun Jun 24 19:18:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139786 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3199151lji; Sun, 24 Jun 2018 12:21:28 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLlL6O7o10xoA88N0joripbaEHfOBf/doaupBRynH0Iz1XNyzNTg+hnV0mondobd6BCGfSV X-Received: by 2002:a17:902:3181:: with SMTP id x1-v6mr9622457plb.198.1529868088356; Sun, 24 Jun 2018 12:21:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868088; cv=none; d=google.com; s=arc-20160816; b=Ppw7/Nt6UsvLpDTuDfWM4ADYqotcXe510T5UgTNT5SqiTtOH5aEtQMAczl8ntMO5TW FH/JSKd3W0s+3j5DgDHudGiu7xJdL7a0+mybjvkKGP5L5BKFqajoQRVZtRP7Hguicydl F4+T/r1xolBSLrncncpY62X/DwQ7NgUEXjGfVrlMDxgGalHEBv69irgp2mZFO0U9WxHg yt7zg++00C8dNiw50uKH3XchJNTHGFOEFQrvq0ePHmbqTNcGHwxKgKsKrBZ/N205ReB9 qAu932NhqgOHwUXLri9op//3SOL36HBEx3da0C+cp8LL8ldiiaaJ0qmZPwGWwOfR+Hth BJkA== 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=SmJZl+QN5si3Y8EJfL363HZ2HExV4kzVS2xUrWlHtH4=; b=ybVn2G1+D0pBge0aSeCpQNAEj4l9Xc8rjabicUcm0UTG69f90eSuR98gtSHoqUo0Gk iE8HwRfi82IV7BD6R3yDIzN/C1EpUeAh7BEBzWsYzNSnFZynwo49xJEI9OHkZcDxwcWx YJHzIv/HXO0i8a3AWd8ULZrHUlmuHPf0KIFLuqdbBmhHFVpkxRxiUpR24+1+Ng+2Z6mp OG+lrCgRL+jrPmkXDRjY2nfldnQwqP0qc+qDI6AR0dibns1CPzoOccES4TIpAiWB5123 Dl2xRLQi5+F/G6hnPNhrcp3JXQZESVYWuYlBkIUKcnlThDdGaRmG0kOIu2/4DNCPqDrZ gqLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LEF7u2Ob; 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=QUARANTINE 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 a68-v6si11946057pfc.106.2018.06.24.12.21.28; Sun, 24 Jun 2018 12:21:28 -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=LEF7u2Ob; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BD30E75210; Sun, 24 Jun 2018 19:20:09 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by mail.openembedded.org (Postfix) with ESMTP id B32FC74DD2 for ; Sun, 24 Jun 2018 19:19:44 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id q14-v6so1324636pgt.13 for ; Sun, 24 Jun 2018 12:19:46 -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=0EBwlxXebn4DXton6USq6N08EBQXSTjhcs/GjJX++AA=; b=LEF7u2Ob2jbPULUyGZzyqWvsuTHxDU4uIRQ4DHY7SHOU6+PVPPogOepsHd7VzWuQTz 7LcaVIKb1YoZ+rc6wacVP9hy5NrgrYCWkrg0z8HrluFnA54vuhd2ZV6zajmJkrmyK2AL Vnh2i0s4/oMtQFi8lUtxdUmBGlUecHpZbT2M9LYVz1sDYGSA3LD9f7Jk3DfOohI8tpAd KqcZFSk7NJflKJP7KYTV9Dp1hL46Eh22OZeV/UuOn6JN7/OunAx81qg0BD0eQdSKumwe AmVvIpbcRpFbaYrYabaGHjtjWr7elOxK4zR/uMC7UXQ3TQp/jV+pQDYAtm31zPNnVfiu xwig== 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=0EBwlxXebn4DXton6USq6N08EBQXSTjhcs/GjJX++AA=; b=t5Zmw80wK/smBZ6nb+yzDbfHns1ZP5805fuV4H008j5lQ968cAP/F0/ndgP6kh9NSf esl5UaZhslVyGF24pEfiuFXWRW74jjWLvQ+ylejxfm8vrfx5sn4Bxll0Nxhpfhz93OVl 4tpGxxEmWq94/qPEu5uwvO5lF0tTv2ZZCE1eu5bxOquQIOCrk0OrP5fkDakRkh3SJ34d PsVfoC9CUkErHT57momJybdq1Tsa6oqKUTa6MRDoMaHvcg6/dQKYm9JX6yaowLQIP6UF fdLdjcrcc4F963dLBGbWNlhBudcjd7Nfwj/qLN2Km/KHFtE2nZzQaA9xP0D4HgbEdWLz KZZg== X-Gm-Message-State: APt69E0Q56Eo3WSOVJY+RtA3oYirOSSuHGsswXmssgcDOSa8eaL8PWmZ RGRFgTfueuBQlYx4Uyjcn1Vx5g== X-Received: by 2002:a65:450c:: with SMTP id n12-v6mr8330720pgq.242.1529867985205; Sun, 24 Jun 2018 12:19:45 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:44 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:40 -0700 Message-Id: <20180624191845.31082-15-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 15/20] squid: Fix build with gcc8 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 --- ..._edirectory_userip_acl-refactoring-f.patch | 506 ++++++++++++++++++ .../0002-smblib-fix-buffer-over-read.patch | 39 ++ .../recipes-daemons/squid/squid_3.5.27.bb | 3 + 3 files changed, 548 insertions(+) create mode 100644 meta-networking/recipes-daemons/squid/files/0001-Bug-4843-pt1-ext_edirectory_userip_acl-refactoring-f.patch create mode 100644 meta-networking/recipes-daemons/squid/files/0002-smblib-fix-buffer-over-read.patch -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/squid/files/0001-Bug-4843-pt1-ext_edirectory_userip_acl-refactoring-f.patch b/meta-networking/recipes-daemons/squid/files/0001-Bug-4843-pt1-ext_edirectory_userip_acl-refactoring-f.patch new file mode 100644 index 0000000000..001d9e906e --- /dev/null +++ b/meta-networking/recipes-daemons/squid/files/0001-Bug-4843-pt1-ext_edirectory_userip_acl-refactoring-f.patch @@ -0,0 +1,506 @@ +From 01a44c96dbd04936e9cb2501745a834a0b09d504 Mon Sep 17 00:00:00 2001 +From: Amos Jeffries +Date: Sun, 13 May 2018 06:57:41 +0000 +Subject: [PATCH] Bug 4843 pt1: ext_edirectory_userip_acl refactoring for GCC-8 + (#204) + +Proposed changes to this helper to fix strcat / strncat buffer +overread / overflow issues. + +The approach takes three parts: + +* adds a makeHexString function to replace many for-loops + catenating bits of strings together with hex conversion into a + second buffer. Replacing with a snprintf() and buffer overflow + handling. + +* a copy of Ip::Address::lookupHostIp to convert the input + string into IP address binary format, then generate the hex + string using the above new hex function instead of looped + sub-string concatenations across several buffers. + This removes all the "00" and "0000" strncat() calls and + allows far simpler code even with added buffer overflow + handling. + +* replace multiple string part concatenations with a few simpler + calls to snprintf() for all the search_ip buffer constructions. + Adding buffer overflow handling as needed for the new calls. +--- +Signed-off-by: Khem Raj +Upstream-Status: Backport + + .../ext_edirectory_userip_acl.cc | 376 ++++++------------ + 1 file changed, 120 insertions(+), 256 deletions(-) + +diff --git a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc +index 63609e4..ad16bfd 100644 +--- a/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc ++++ b/helpers/external_acl/eDirectory_userip/ext_edirectory_userip_acl.cc +@@ -67,6 +67,9 @@ + #ifdef HAVE_LDAP_H + #include + #endif ++#ifdef HAVE_NETDB_H ++#include ++#endif + + #ifdef HELPER_INPUT_BUFFER + #define EDUI_MAXLEN HELPER_INPUT_BUFFER +@@ -714,11 +717,14 @@ BindLDAP(edui_ldap_t *l, char *dn, char *pw, unsigned int t) + + /* Copy details - dn and pw CAN be NULL for anonymous and/or TLS */ + if (dn != NULL) { ++ if (strlen(dn) >= sizeof(l->dn)) ++ return LDAP_ERR_OOB; /* DN too large */ ++ + if ((l->basedn[0] != '\0') && (strstr(dn, l->basedn) == NULL)) { + /* We got a basedn, but it's not part of dn */ +- xstrncpy(l->dn, dn, sizeof(l->dn)); +- strncat(l->dn, ",", 1); +- strncat(l->dn, l->basedn, strlen(l->basedn)); ++ const int x = snprintf(l->dn, sizeof(l->dn)-1, "%s,%s", dn, l->basedn); ++ if (x < 0 || static_cast(x) >= sizeof(l->dn)) ++ return LDAP_ERR_OOB; /* DN too large */ + } else + xstrncpy(l->dn, dn, sizeof(l->dn)); + } +@@ -778,24 +784,73 @@ BindLDAP(edui_ldap_t *l, char *dn, char *pw, unsigned int t) + } + } + ++// XXX: duplicate (partial) of Ip::Address::lookupHostIp ++/** ++ * Convert the IP address string representation in src to ++ * its binary representation. ++ * ++ * \return binary representation of the src IP address. ++ * Must be free'd using freeaddrinfo(). ++ */ ++static struct addrinfo * ++makeIpBinary(const char *src) ++{ ++ struct addrinfo want; ++ memset(&want, 0, sizeof(want)); ++ want.ai_flags = AI_NUMERICHOST; // prevent actual DNS lookups! ++ ++ struct addrinfo *dst = nullptr; ++ if (getaddrinfo(src, nullptr, &want, &dst) != 0) { ++ // not an IP address ++ /* free any memory getaddrinfo() dynamically allocated. */ ++ if (dst) ++ freeaddrinfo(dst); ++ return nullptr; ++ } ++ ++ return dst; ++} ++ ++/** ++ * Convert srcLen bytes from src into HEX and store into dst, which ++ * has a maximum content size of dstSize including c-string terminator. ++ * The dst value produced will be a 0-terminated c-string. ++ * ++ * \retval N length of dst written (excluding c-string terminator) ++ * \retval -11 (LDAP_ERR_OOB) buffer overflow detected ++ */ ++static int ++makeHexString(char *dst, const int dstSize, const char *src, const int srcLen) ++{ ++ // HEX encoding doubles the amount of bytes/octets copied ++ if ((srcLen*2) >= dstSize) ++ return LDAP_ERR_OOB; // cannot copy that many ++ ++ *dst = 0; ++ ++ for (int k = 0; k < srcLen; ++k) { ++ int c = static_cast(src[k]); ++ if (c < 0) ++ c = c + 256; ++ char hexc[4]; ++ const int hlen = snprintf(hexc, sizeof(hexc), "%02X", c); ++ if (hlen < 0 || static_cast(hlen) > sizeof(hexc)) // should be impossible ++ return LDAP_ERR_OOB; ++ strcat(dst, hexc); ++ } ++ return strlen(dst); ++} ++ + /* + * ConvertIP() - + * + * Take an IPv4 address in dot-decimal or IPv6 notation, and convert to 2-digit HEX stored in l->search_ip + * This is the networkAddress that we search LDAP for. +- * +- * PENDING -- CHANGE OVER TO inet*_pton, but inet6_pton does not provide the correct syntax +- * + */ + static int + ConvertIP(edui_ldap_t *l, char *ip) + { +- char bufa[EDUI_MAXLEN], bufb[EDUI_MAXLEN], obj[EDUI_MAXLEN]; +- char hexc[4], *p; + void *y, *z; +- size_t s; +- long x; +- int i, j, t, swi; /* IPv6 "::" cut over toggle */ + if (l == NULL) return LDAP_ERR_NULL; + if (ip == NULL) return LDAP_ERR_PARAM; + if (!(l->status & LDAP_INIT_S)) return LDAP_ERR_INIT; /* Not initalized */ +@@ -831,183 +886,22 @@ ConvertIP(edui_ldap_t *l, char *ip) + l->status |= (LDAP_IPV4_S); + z = NULL; + } +- s = strlen(ip); +- *(bufa) = '\0'; +- *(bufb) = '\0'; +- *(obj) = '\0'; +- /* StringSplit() will zero out bufa & obj at each call */ +- memset(l->search_ip, '\0', sizeof(l->search_ip)); +- xstrncpy(bufa, ip, sizeof(bufa)); /* To avoid segfaults, use bufa instead of ip */ +- swi = 0; +- if (l->status & LDAP_IPV6_S) { +- /* Search for :: in string */ +- if ((bufa[0] == ':') && (bufa[1] == ':')) { +- /* bufa starts with a ::, so just copy and clear */ +- xstrncpy(bufb, bufa, sizeof(bufb)); +- *(bufa) = '\0'; +- ++swi; /* Indicates that there is a bufb */ +- } else if ((bufa[0] == ':') && (bufa[1] != ':')) { +- /* bufa starts with a :, a typo so just fill in a ':', cat and clear */ +- bufb[0] = ':'; +- strncat(bufb, bufa, strlen(bufa)); +- *(bufa) = '\0'; +- ++swi; /* Indicates that there is a bufb */ +- } else { +- p = strstr(bufa, "::"); +- if (p != NULL) { +- /* Found it, break bufa down and split into bufb here */ +- *(bufb) = '\0'; +- i = strlen(p); +- memcpy(bufb, p, i); +- *p = '\0'; +- bufb[i] = '\0'; +- ++swi; /* Indicates that there is a bufb */ +- } +- } +- } +- s = strlen(bufa); +- if (s < 1) +- s = strlen(bufb); +- while (s > 0) { +- if ((l->status & LDAP_IPV4_S) && (swi == 0)) { +- /* Break down IPv4 address */ +- t = StringSplit(bufa, '.', obj, sizeof(obj)); +- if (t > 0) { +- errno = 0; +- x = strtol(obj, (char **)NULL, 10); +- if (((x < 0) || (x > 255)) || ((errno != 0) && (x == 0)) || ((obj[0] != '0') && (x == 0))) +- return LDAP_ERR_OOB; /* Out of bounds -- Invalid address */ +- memset(hexc, '\0', sizeof(hexc)); +- int hlen = snprintf(hexc, sizeof(hexc), "%02X", (int)x); +- strncat(l->search_ip, hexc, hlen); +- } else +- break; /* reached end of octet */ +- } else if (l->status & LDAP_IPV6_S) { +- /* Break down IPv6 address */ +- if (swi > 1) +- t = StringSplit(bufb, ':', obj, sizeof(obj)); /* After "::" */ +- else +- t = StringSplit(bufa, ':', obj, sizeof(obj)); /* Before "::" */ +- /* Convert octet by size (t) - and fill 0's */ +- switch (t) { /* IPv6 is already in HEX, copy contents */ +- case 4: +- hexc[0] = (char) toupper((int)obj[0]); +- i = (int)hexc[0]; +- if (!isxdigit(i)) +- return LDAP_ERR_OOB; /* Out of bounds */ +- hexc[1] = (char) toupper((int)obj[1]); +- i = (int)hexc[1]; +- if (!isxdigit(i)) +- return LDAP_ERR_OOB; /* Out of bounds */ +- hexc[2] = '\0'; +- strncat(l->search_ip, hexc, 2); +- hexc[0] = (char) toupper((int)obj[2]); +- i = (int)hexc[0]; +- if (!isxdigit(i)) +- return LDAP_ERR_OOB; /* Out of bounds */ +- hexc[1] = (char) toupper((int)obj[3]); +- i = (int)hexc[1]; +- if (!isxdigit(i)) +- return LDAP_ERR_OOB; /* Out of bounds */ +- hexc[2] = '\0'; +- strncat(l->search_ip, hexc, 2); +- break; +- case 3: +- hexc[0] = '0'; +- hexc[1] = (char) toupper((int)obj[0]); +- i = (int)hexc[1]; +- if (!isxdigit(i)) +- return LDAP_ERR_OOB; /* Out of bounds */ +- hexc[2] = '\0'; +- strncat(l->search_ip, hexc, 2); +- hexc[0] = (char) toupper((int)obj[1]); +- i = (int)hexc[0]; +- if (!isxdigit(i)) +- return LDAP_ERR_OOB; /* Out of bounds */ +- hexc[1] = (char) toupper((int)obj[2]); +- i = (int)hexc[1]; +- if (!isxdigit(i)) +- return LDAP_ERR_OOB; /* Out of bounds */ +- hexc[2] = '\0'; +- strncat(l->search_ip, hexc, 2); +- break; +- case 2: +- strncat(l->search_ip, "00", 2); +- hexc[0] = (char) toupper((int)obj[0]); +- i = (int)hexc[0]; +- if (!isxdigit(i)) +- return LDAP_ERR_OOB; /* Out of bounds */ +- hexc[1] = (char) toupper((int)obj[1]); +- i = (int)hexc[1]; +- if (!isxdigit(i)) +- return LDAP_ERR_OOB; /* Out of bounds */ +- hexc[2] = '\0'; +- strncat(l->search_ip, hexc, 2); +- break; +- case 1: +- strncat(l->search_ip, "00", 2); +- hexc[0] = '0'; +- hexc[1] = (char) toupper((int)obj[0]); +- i = (int)hexc[1]; +- if (!isxdigit(i)) +- return LDAP_ERR_OOB; /* Out of bounds */ +- hexc[2] = '\0'; +- strncat(l->search_ip, hexc, 2); +- break; +- default: +- if (t > 4) +- return LDAP_ERR_OOB; +- break; +- } +- /* Code to pad the address with 0's between a '::' */ +- if ((strlen(bufa) == 0) && (swi == 1)) { +- /* We are *AT* the split, pad in some 0000 */ +- t = strlen(bufb); +- /* How many ':' exist in bufb ? */ +- j = 0; +- for (i = 0; i < t; ++i) { +- if (bufb[i] == ':') +- ++j; +- } +- --j; /* Preceding "::" doesn't count */ +- t = 8 - (strlen(l->search_ip) / 4) - j; /* Remainder */ +- if (t > 0) { +- for (i = 0; i < t; ++i) +- strncat(l->search_ip, "0000", 4); +- } +- } +- } +- if ((bufa[0] == '\0') && (swi > 0)) { +- s = strlen(bufb); +- ++swi; +- } else +- s = strlen(bufa); +- } +- s = strlen(l->search_ip); + +- /* CHECK sizes of address, truncate or pad */ +- /* if "::" is at end of ip, then pad another block or two */ +- while ((l->status & LDAP_IPV6_S) && (s < 32)) { +- strncat(l->search_ip, "0000", 4); +- s = strlen(l->search_ip); +- } +- if ((l->status & LDAP_IPV6_S) && (s > 32)) { +- /* Too long, truncate */ +- l->search_ip[32] = '\0'; +- s = strlen(l->search_ip); +- } +- /* If at end of ip, and its not long enough, then pad another block or two */ +- while ((l->status & LDAP_IPV4_S) && (s < 8)) { +- strncat(l->search_ip, "00", 2); +- s = strlen(l->search_ip); +- } +- if ((l->status & LDAP_IPV4_S) && (s > 8)) { +- /* Too long, truncate */ +- l->search_ip[8] = '\0'; +- s = strlen(l->search_ip); ++ size_t s = LDAP_ERR_INVALID; ++ if (struct addrinfo *dst = makeIpBinary(ip)) { ++ if (dst->ai_family == AF_INET6) { ++ struct sockaddr_in6 *sia = reinterpret_cast(dst->ai_addr); ++ const char *ia = reinterpret_cast(sia->sin6_addr.s6_addr); ++ s = makeHexString(l->search_ip, sizeof(l->search_ip), ia, 16); // IPv6 = 16-byte address ++ ++ } else if (dst->ai_family == AF_INET) { ++ struct sockaddr_in *sia = reinterpret_cast(dst->ai_addr); ++ const char *ia = reinterpret_cast(&(sia->sin_addr)); ++ s = makeHexString(l->search_ip, sizeof(l->search_ip), ia, 4); // IPv4 = 4-byte address ++ } // else leave s with LDAP_ERR_INVALID value ++ freeaddrinfo(dst); + } + +- /* Completed, s is length of address in HEX */ + return s; + } + +@@ -1099,48 +993,42 @@ SearchFilterLDAP(edui_ldap_t *l, char *group) + } + if (group == NULL) { + /* No groupMembership= to add, yay! */ +- xstrncpy(bufa, "(&", sizeof(bufa)); +- strncat(bufa, edui_conf.search_filter, strlen(edui_conf.search_filter)); + /* networkAddress */ +- snprintf(bufb, sizeof(bufb), "(|(networkAddress=1\\23%s)", bufc); + if (l->status & LDAP_IPV4_S) { +- int ln = snprintf(bufd, sizeof(bufd), "(networkAddress=8\\23\\00\\00%s)(networkAddress=9\\23\\00\\00%s))", \ +- bufc, bufc); +- strncat(bufb, bufd, ln); ++ const int ln = snprintf(bufd, sizeof(bufd), "(networkAddress=8\\23\\00\\00%s)(networkAddress=9\\23\\00\\00%s)", bufc, bufc); ++ if (ln < 0 || static_cast(ln) >= sizeof(bufd)) ++ return LDAP_ERR_OOB; ++ + } else if (l->status & LDAP_IPV6_S) { +- int ln = snprintf(bufd, sizeof(bufd), "(networkAddress=10\\23\\00\\00%s)(networkAddress=11\\23\\00\\00%s))", \ +- bufc, bufc); +- strncat(bufb, bufd, ln); +- } else +- strncat(bufb, ")", 1); +- strncat(bufa, bufb, strlen(bufb)); +- strncat(bufa, ")", 1); ++ const int ln = snprintf(bufd, sizeof(bufd), "(networkAddress=10\\23\\00\\00%s)(networkAddress=11\\23\\00\\00%s)", bufc, bufc); ++ if (ln < 0 || static_cast(ln) >= sizeof(bufd)) ++ return LDAP_ERR_OOB; ++ } ++ const int x = snprintf(bufa, sizeof(bufa), "(&%s(|(networkAddress=1\\23%s)%s))", edui_conf.search_filter, bufc, bufd); ++ if (x < 0 || static_cast(x) >= sizeof(bufa)) ++ return LDAP_ERR_OOB; ++ + } else { + /* Needs groupMembership= to add... */ +- xstrncpy(bufa, "(&(&", sizeof(bufa)); +- strncat(bufa, edui_conf.search_filter, strlen(edui_conf.search_filter)); + /* groupMembership -- NOTE: Squid *MUST* provide "cn=" from squid.conf */ +- snprintf(bufg, sizeof(bufg), "(groupMembership=%s", group); + if ((l->basedn[0] != '\0') && (strstr(group, l->basedn) == NULL)) { +- strncat(bufg, ",", 1); +- strncat(bufg, l->basedn, strlen(l->basedn)); ++ const int ln = snprintf(bufg, sizeof(bufg), ",%s", l->basedn); ++ if (ln < 0 || static_cast(ln) >= sizeof(bufd)) ++ return LDAP_ERR_OOB; + } +- strncat(bufg, ")", 1); +- strncat(bufa, bufg, strlen(bufg)); + /* networkAddress */ +- snprintf(bufb, sizeof(bufb), "(|(networkAddress=1\\23%s)", bufc); + if (l->status & LDAP_IPV4_S) { +- int ln = snprintf(bufd, sizeof(bufd), "(networkAddress=8\\23\\00\\00%s)(networkAddress=9\\23\\00\\00%s))", \ +- bufc, bufc); +- strncat(bufb, bufd, ln); ++ const int ln = snprintf(bufd, sizeof(bufd), "(networkAddress=8\\23\\00\\00%s)(networkAddress=9\\23\\00\\00%s)", bufc, bufc); ++ if (ln < 0 || static_cast(ln) >= sizeof(bufd)) ++ return LDAP_ERR_OOB; + } else if (l->status & LDAP_IPV6_S) { +- int ln = snprintf(bufd, sizeof(bufd), "(networkAddress=10\\23\\00\\00%s)(networkAddress=11\\23\\00\\00%s))", \ +- bufc, bufc); +- strncat(bufb, bufd, ln); +- } else +- strncat(bufb, ")", 1); +- strncat(bufa, bufb, strlen(bufb)); +- strncat(bufa, "))", 2); ++ const int ln = snprintf(bufd, sizeof(bufd), "(networkAddress=10\\23\\00\\00%s)(networkAddress=11\\23\\00\\00%s)", bufc, bufc); ++ if (ln < 0 || static_cast(ln) >= sizeof(bufd)) ++ return LDAP_ERR_OOB; ++ } ++ const int x = snprintf(bufa, sizeof(bufa), "(&(&%s(groupMembership=%s%s)(|(networkAddress=1\\23%s)%s)))", edui_conf.search_filter, group, bufg, bufc, bufd); ++ if (x < 0 || static_cast(x) >= sizeof(bufa)) ++ return LDAP_ERR_OOB; + } + s = strlen(bufa); + xstrncpy(l->search_filter, bufa, sizeof(l->search_filter)); +@@ -1212,10 +1100,10 @@ static int + SearchIPLDAP(edui_ldap_t *l) + { + ber_len_t i, x; +- ber_len_t j, k; +- ber_len_t y, z; +- int c; +- char bufa[EDUI_MAXLEN], bufb[EDUI_MAXLEN], hexc[4]; ++ ber_len_t j; ++ ber_len_t z; ++ char bufa[EDUI_MAXLEN]; ++ char bufb[EDUI_MAXLEN]; + LDAPMessage *ent; + if (l == NULL) return LDAP_ERR_NULL; + if (l->lp == NULL) return LDAP_ERR_POINTER; +@@ -1273,19 +1161,11 @@ SearchIPLDAP(edui_ldap_t *l) + /* bufa is the address, just compare it */ + if (!(l->status & LDAP_IPV4_S) || (l->status & LDAP_IPV6_S)) + break; /* Not looking for IPv4 */ +- for (k = 0; k < z; ++k) { +- c = (int) bufa[k]; +- if (c < 0) +- c = c + 256; +- int hlen = snprintf(hexc, sizeof(hexc), "%02X", c); +- if (k == 0) +- xstrncpy(bufb, hexc, sizeof(bufb)); +- else +- strncat(bufb, hexc, hlen); +- } +- y = strlen(bufb); ++ const int blen = makeHexString(bufb, sizeof(bufb), bufa, z); ++ if (blen < 0) ++ return blen; + /* Compare value with IP */ +- if (memcmp(l->search_ip, bufb, y) == 0) { ++ if (memcmp(l->search_ip, bufb, blen) == 0) { + /* We got a match! - Scan 'ber' for 'cn' values */ + z = ldap_count_values_len(ber); + for (j = 0; j < z; ++j) { +@@ -1308,19 +1188,11 @@ SearchIPLDAP(edui_ldap_t *l) + /* bufa + 2 is the address (skip 2 digit port) */ + if (!(l->status & LDAP_IPV4_S) || (l->status & LDAP_IPV6_S)) + break; /* Not looking for IPv4 */ +- for (k = 2; k < z; ++k) { +- c = (int) bufa[k]; +- if (c < 0) +- c = c + 256; +- int hlen = snprintf(hexc, sizeof(hexc), "%02X", c); +- if (k == 2) +- xstrncpy(bufb, hexc, sizeof(bufb)); +- else +- strncat(bufb, hexc, hlen); +- } +- y = strlen(bufb); ++ const int blen = makeHexString(bufb, sizeof(bufb), &bufa[2], z); ++ if (blen < 0) ++ return blen; + /* Compare value with IP */ +- if (memcmp(l->search_ip, bufb, y) == 0) { ++ if (memcmp(l->search_ip, bufb, blen) == 0) { + /* We got a match! - Scan 'ber' for 'cn' values */ + z = ldap_count_values_len(ber); + for (j = 0; j < z; ++j) { +@@ -1343,19 +1215,11 @@ SearchIPLDAP(edui_ldap_t *l) + /* bufa + 2 is the address (skip 2 digit port) */ + if (!(l->status & LDAP_IPV6_S)) + break; /* Not looking for IPv6 */ +- for (k = 2; k < z; ++k) { +- c = (int) bufa[k]; +- if (c < 0) +- c = c + 256; +- int hlen = snprintf(hexc, sizeof(hexc), "%02X", c); +- if (k == 2) +- xstrncpy(bufb, hexc, sizeof(bufb)); +- else +- strncat(bufb, hexc, hlen); +- } +- y = strlen(bufb); ++ const int blen = makeHexString(bufb, sizeof(bufb), &bufa[2], z); ++ if (blen < 0) ++ return blen; + /* Compare value with IP */ +- if (memcmp(l->search_ip, bufb, y) == 0) { ++ if (memcmp(l->search_ip, bufb, blen) == 0) { + /* We got a match! - Scan 'ber' for 'cn' values */ + z = ldap_count_values_len(ber); + for (j = 0; j < z; ++j) { diff --git a/meta-networking/recipes-daemons/squid/files/0002-smblib-fix-buffer-over-read.patch b/meta-networking/recipes-daemons/squid/files/0002-smblib-fix-buffer-over-read.patch new file mode 100644 index 0000000000..c8f0c47bd1 --- /dev/null +++ b/meta-networking/recipes-daemons/squid/files/0002-smblib-fix-buffer-over-read.patch @@ -0,0 +1,39 @@ +From a6b1e0fd14311587186e40d09bff5c8c3aada2e4 Mon Sep 17 00:00:00 2001 +From: Amos Jeffries +Date: Sat, 25 Jul 2015 05:53:16 -0700 +Subject: [PATCH] smblib: fix buffer over-read + +When parsing SMB LanManager packets with invalid protocol ID and the +default set of Squid supported protocols. It may access memory outside +the buffer storing protocol names. + +smblib is only used by already deprecated helpers which are deprecated +due to far more significant NTLM protocol issues. It will also only +result in packets being rejected later with invalid protocol names. So +this is a minor bug rather than a vulnerability. + + Detected by Coverity Scan. Issue 1256165 +--- +Signed-off-by: Khem Raj +Upstream-Status: Backport + + lib/smblib/smblib-util.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/lib/smblib/smblib-util.c b/lib/smblib/smblib-util.c +index 6139ae2..e722cbb 100644 +--- a/lib/smblib/smblib-util.c ++++ b/lib/smblib/smblib-util.c +@@ -204,7 +204,11 @@ int SMB_Figure_Protocol(const char *dialects[], int prot_index) + { + int i; + +- if (dialects == SMB_Prots) { /* The jobs is easy, just index into table */ ++ // prot_index may be a value outside the table SMB_Types[] ++ // which holds data at offsets 0 to 11 ++ int ourType = (prot_index < 0 || prot_index > 11); ++ ++ if (ourType && dialects == SMB_Prots) { /* The jobs is easy, just index into table */ + + return(SMB_Types[prot_index]); + } else { /* Search through SMB_Prots looking for a match */ diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.27.bb b/meta-networking/recipes-daemons/squid/squid_3.5.27.bb index 7dae3cd83f..1557c4b2d6 100644 --- a/meta-networking/recipes-daemons/squid/squid_3.5.27.bb +++ b/meta-networking/recipes-daemons/squid/squid_3.5.27.bb @@ -23,6 +23,8 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch \ file://0001-tools.cc-fixed-unused-result-warning.patch \ + file://0001-Bug-4843-pt1-ext_edirectory_userip_acl-refactoring-f.patch \ + file://0002-smblib-fix-buffer-over-read.patch \ " SRC_URI_remove_toolchain-clang = "file://0001-configure-Check-for-Wno-error-format-truncation-comp.patch" @@ -48,6 +50,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('TARGET_ARCH', 'powerpc', 'noatomics', ' 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," +PACKAGECONFIG[werror] = "--enable-strict-error-checking,--disable-strict-error-checking," BASIC_AUTH = "DB SASL LDAP" From patchwork Sun Jun 24 19:18:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139787 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3199220lji; Sun, 24 Jun 2018 12:21:35 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIgWtCVmu5ItVVum2ZShnCW0X1K9Z684zOfmOuf+zEzQ/Hq0v2HjfQ/aer6JgsOVZhc5Esl X-Received: by 2002:a17:902:5402:: with SMTP id d2-v6mr9623425pli.38.1529868095622; Sun, 24 Jun 2018 12:21:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868095; cv=none; d=google.com; s=arc-20160816; b=IkEueBYTRenF3qdpBr4IR3jrcKXGkC7NNAWERoeBMCzKaWJIJctzkvaDlNLN5MSKhk KGpX4No2JWY7LPZQR2u7RplsPVJEkfqNMK5QmV1zHc3aIvQvhDeR/0L+YX5atTWdxRfe TaLQ3WaF9WnsU/i2pgjHyPJVsAUMw4uqS3MIy5WLzVuYAN8J0EBgi69FZxJDppYnqbFs 8D7PATYFULPSo2r+JN4b12aWvDantWEcfJ7eDokTQR4Hq56SfVwvR7ZQqokBXh4P/kWD J4u8jKlidVU5zLINAzcmY+FmVHf0AP+gMT66QMeGFv6/tTYfW265z7EeDWC1oHOUQWmV 9mGg== 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=WgA/QZWYht9vd0EHSnAhj+Vm2bBwksHaxctBB2fWsLo=; b=SAu56OHUoD3lro9Gp7NyqYqRkjcS1LhfjqFJVdPEBBoXEaamV3BBiitl8OsIJMoBnN sZ5hB9K34T14xegedj7VHtpJUSLBo/ZkpnNr7XBBk8fO0pdWeoUv/WJnErGkwJzKpx64 TSnKFFURj7i+5/fmRoHmas0RVGI4/i0+roWOXSB7FVmOWkF2lIY6U0hzXhskqdcn8VhR XCwNT+a8iZfomoGjmY+dSYIoTBlyguW5glzPDq+Kdqg3cgs1fpvTUVA5g7RJBxnFdKuq NxIjDrnZqbQIXgsYw48YGp2pYt60pr9ecNYThj0sevf3buBOXZtgLapP10NBS2l9PxiQ u48Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="QuOlufH/"; 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=QUARANTINE 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 p23-v6si12548325plr.384.2018.06.24.12.21.35; Sun, 24 Jun 2018 12:21:35 -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="QuOlufH/"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id DFA7775264; Sun, 24 Jun 2018 19:20:10 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f178.google.com (mail-pf0-f178.google.com [209.85.192.178]) by mail.openembedded.org (Postfix) with ESMTP id 43AD774DD2 for ; Sun, 24 Jun 2018 19:19:45 +0000 (UTC) Received: by mail-pf0-f178.google.com with SMTP id u16-v6so1657637pfh.3 for ; Sun, 24 Jun 2018 12:19:46 -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=Qa8CvlwoWwcl/74t5JOTua/LsjrnIO+bqIwQGk2FVqM=; b=QuOlufH/eXoIN32nbKZdHc1FK4PEEZ4JAvbUYybeklMqZA1LNBxvQNPPbKZd0TG6vD arUU3hb6EJvVXd5JBujDB0mafejUkEiO8wCGmTuMnNZ1Rk1RZl11WQTcxxMZujTuIetZ +r0b/rpJlK+Pl5QXC5eBAWxg7ajyta92913IIggxp35UyUmLVk4leYqW8rUdETloOy9e rRvMVEg87tg3UyY/kQZ+v68Oq3KOpcEsSfIQ9N+nSppYA7Izoa5OCQpajazCamsO1zmk qqTtTj0/p9fov/hVDWXhSLvhvKApyEdvSLjaH15PBQJgT5m25OzMn10nsaEHzgtVsPYH f9lw== 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=Qa8CvlwoWwcl/74t5JOTua/LsjrnIO+bqIwQGk2FVqM=; b=YJcEOBROWQiQi79vJVUSoXCTXMW0kyZwvV7q0PJ3GxW6jqMl8saGVvB56PsQcaxexF Dzmd7CVDH4YyCSLUqEOSB7K+ZtZSKaiQzk57pEiGRjvc0ssRE0f4hQ/NwTFrly1XUDeh BN6P2ACIdEHgp3Sy0tGsSYxaI/YRn8yYHu1QqFUP7qe85GnheB0UgaX7u4RstSt5h8pA EzXZMVAda5MEGQA7iJNGzb4fZhjlQ+Wu/DCISzBOlS5mDpr08EqtmqG41mFGl1XVxiMa weZT8tl5XZ2i6Q/lmyxrZyJb3wq+tkmev2qDpH6g86e68AQRGRDxhoY3E8E9svYufuyc sXwA== X-Gm-Message-State: APt69E2Ye7cf8eno38OGEOIkNoQARKXKi5hqjynmJKFVKv1Q7vKpIm1/ mNZ2y3QrSK2G0iSyXjIb2sYOuw== X-Received: by 2002:a62:6303:: with SMTP id x3-v6mr5434751pfb.91.1529867985969; Sun, 24 Jun 2018 12:19:45 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:45 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:41 -0700 Message-Id: <20180624191845.31082-16-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 16/20] corosync: corosync-qnetd.conf is now created under /run during runtime 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 --- meta-networking/recipes-extended/corosync/corosync_2.4.4.bb | 4 ---- 1 file changed, 4 deletions(-) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb b/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb index 5ebec08b99..23a3d147f3 100644 --- a/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb +++ b/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb @@ -67,10 +67,6 @@ do_install_append() { if [ ${@bb.utils.filter('DISTRO_FEATURES','systemd',d)} ]; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf - - if [ ${@bb.utils.filter('PACKAGECONFIG', 'qnetd', d)} ]; then - install -m 0644 ${S}/conf/tmpfiles.d/corosync-qnetd.conf ${D}${sysconfdir}/tmpfiles.d - fi fi } From patchwork Sun Jun 24 19:18:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139788 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3199326lji; Sun, 24 Jun 2018 12:21:43 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJWKesErNe8jvmxR9q/IzsBxPm6cLShfxL/5NLsNLIJuqaix3Cw5EyBdgu+yKt6dVEtCp6u X-Received: by 2002:a62:1d97:: with SMTP id d145-v6mr5936869pfd.101.1529868103223; Sun, 24 Jun 2018 12:21:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868103; cv=none; d=google.com; s=arc-20160816; b=ox6zFC124za/U0Gk0D8rDL26LZjl0xmu3getUlfkKIbB99JdpL5/zH9vW+gRKtt+W9 tYELslDR34xPHS0KOrly0IvG/c7vLNxLJ7lt3iwoX1XTfPaQjpgeufjkTHPNHIbzdvMF 8VfuXfTI3roSg1K2srztR/ZUDBxZjrNOyExEZWYO+l/fRBmTT9Y4LmYf7mbspfURs/tj 2NcMDDjpbuIZr48aaZyEN65h+c5eAm/vECXFdJh7hfXpIB02hHu4JKcul3s7pgMwHXc9 rQKIm5I/qv7vfezjLN9BuvDcKZVIjhrm2pfcjFCiDRLA74fljoc6lNpBV2b3tejpRTdx WwyA== 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=G05BsoNOFhTI0oeY6z9QKYSsBKS63QlB1EsFkSjLaz4=; b=KEnBNojLceQIuOf2XTr8Sm8GKlU1DQv2v07Hoy06cMQ+nUsPGV3XwPWPhRqQaS03Rr dG7xROMocI3luF/Pdh8zD5yfPEOHNqGvfm9IL5IWOvMnjoQrobX91BZaO3ui7sQeiCli eeawnbi8c2IeuYsUHZbHchEF6abJ3gIzDfoGbBzOpT1Cw1NdGJ9SGCHQ9DiF9WtL8zjj LyudcG+ACGIxsVdbjzOIDtFYcqitPBO2fdnZlEPKviO/9Cp4XbALNG2AHhQhFLkSHgcd mdSUEuIhv4PmOCtCSQNcnRfnVsapZE68aSEzZv/6ooV3e2WWUHWDGOZNJXAiqhqbRwLY Gstg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=R7tf7g5G; 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=QUARANTINE 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 u8-v6si1240835plz.300.2018.06.24.12.21.42; Sun, 24 Jun 2018 12:21:43 -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=R7tf7g5G; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 63D5875320; Sun, 24 Jun 2018 19:20:12 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f51.google.com (mail-pl0-f51.google.com [209.85.160.51]) by mail.openembedded.org (Postfix) with ESMTP id 7E42174EB2 for ; Sun, 24 Jun 2018 19:19:46 +0000 (UTC) Received: by mail-pl0-f51.google.com with SMTP id c41-v6so5744285plj.10 for ; Sun, 24 Jun 2018 12:19:47 -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=8yK/aLyI+nyUkNwc40NEo42O/WUWfVGKuvM93c51rBU=; b=R7tf7g5GFl5mu6vewD5YMlzV+DEU3tKYcMeR88c5GSRANUOwrFLkkqJtmSzIrVBQ+R FdIS/Zg91H36WhUY0U3t5MBEJWVPxVKg7tPWBqj1Rv3X6pHpwKSfTmWDgEzYkbUkpeZb M3+xqIV5Z/83HJQxWlBnTEKAHeI0UUCW4Sm6MyBKkdv1cgm+ZmFlt72KBs4gC9UF/7y0 BHxXKhGVvaxRKP2QBw8quss7mAaCWan9MVZd8cKcJHfSc60p6A1+fUCHckOg0249DwgW vmhl1ti5k6AyKOn95kjTc9Cwu77nlCYFc2Y02K9ThzwpwkRCqc3nak+95gM2yY4Q6BO1 jvhw== 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=8yK/aLyI+nyUkNwc40NEo42O/WUWfVGKuvM93c51rBU=; b=rDC+/88MGXSiK5XFijS7sJq5uli7cVMY7HCXcZsWxLP7/qz7jp01vlvNHORA0WaFuO x13ZTQ/offJSLdwKUGuQ4r3I/X5SAz7wn8oWPRPnVsina6bYFrmV59iyQhdPQuBQpABh I/P6LN6g4jMrg4yUXYGO0KuOhxmSvnsBccZgahmHjbmpZiUX/05Af2l2PGNoVeuuFvAx h/DfPh7Sc3gLue8jNOs5kblFsEMwI8rFpdtmhZCVCFzlij9CEMgouxS5pnfsFm3TKksQ yyZVhzMYxa6zxXTycGUHue6MPAgBdNO93weutvdEP3SQTpRzdIfOgHSRyA1rcygHu2md cATg== X-Gm-Message-State: APt69E0W/ZFi79wOQvvdaqy1+Rve6HfXYFsYLL/ESQ37edcbJPT780St rIESOzqnF+zxoovweOlbmXPcYA== X-Received: by 2002:a17:902:7785:: with SMTP id o5-v6mr9678530pll.42.1529867987069; Sun, 24 Jun 2018 12:19:47 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:46 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:42 -0700 Message-Id: <20180624191845.31082-17-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 17/20] civetweb: Fix paths to librt and libm, use -l linker option 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 Fixes build where it pokes for libraries on host system Signed-off-by: Khem Raj --- ...-librt-and-libm-during-native-compil.patch | 42 ------------------- ...t-Link-librt-and-libm-using-l-option.patch | 40 ++++++++++++++++++ .../civetweb/civetweb_git.bb | 10 ++--- 3 files changed, 45 insertions(+), 47 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/civetweb/civetweb/0001-Test-Fix-missing-librt-and-libm-during-native-compil.patch create mode 100644 meta-networking/recipes-connectivity/civetweb/civetweb/0001-Unittest-Link-librt-and-libm-using-l-option.patch -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb/0001-Test-Fix-missing-librt-and-libm-during-native-compil.patch b/meta-networking/recipes-connectivity/civetweb/civetweb/0001-Test-Fix-missing-librt-and-libm-during-native-compil.patch deleted file mode 100644 index 401cf39ad8..0000000000 --- a/meta-networking/recipes-connectivity/civetweb/civetweb/0001-Test-Fix-missing-librt-and-libm-during-native-compil.patch +++ /dev/null @@ -1,42 +0,0 @@ -From cd93e2c538cecb3192fd24c0fbd6e834d0c47eec Mon Sep 17 00:00:00 2001 -From: Krzysztof Kozlowski -Date: Wed, 18 Apr 2018 14:11:52 +0200 -Subject: [PATCH] Unittest: Fix missing librt and libm during native compilation - -civetweb looks for librt and libm in weird places and for native build -this fails: - - | ../third_party/lib/libcheck.a(check.c.o): In function `tcase_create': - | build/tmp/work/x86_64-linux/civetweb-native/1.10-r0/build/third_party/src/check-unit-test-framework/src/check.c:145: undefined reference to `floor' - | build/tmp/work/x86_64-linux/civetweb-native/1.10-r0/build/third_party/src/check-unit-test-framework/src/check.c:148: undefined reference to `floor' - -These are needed dependencies so try regular system linkage in such -case. - -Signed-off-by: Krzysztof Kozlowski ---- - unittest/CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt -index f34b2e0e4ce4..05d25702178c 100644 ---- a/unittest/CMakeLists.txt -+++ b/unittest/CMakeLists.txt -@@ -60,10 +60,14 @@ endif() - find_package(LibM) - if (LIBM_FOUND) - set(CHECK_LIBRARIES "${CHECK_LIBRARIES};LIBM::LIBM") -+else() -+ set(CHECK_LIBRARIES "${CHECK_LIBRARIES};-lm") - endif() - find_package(LibRt) - if (LIBRT_FOUND) - set(CHECK_LIBRARIES "${CHECK_LIBRARIES};LIBRT::LIBRT") -+else() -+ set(CHECK_LIBRARIES "${CHECK_LIBRARIES};-lrt") - endif() - - # Build the C unit tests --- -2.7.4 - diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb/0001-Unittest-Link-librt-and-libm-using-l-option.patch b/meta-networking/recipes-connectivity/civetweb/civetweb/0001-Unittest-Link-librt-and-libm-using-l-option.patch new file mode 100644 index 0000000000..eecbc14682 --- /dev/null +++ b/meta-networking/recipes-connectivity/civetweb/civetweb/0001-Unittest-Link-librt-and-libm-using-l-option.patch @@ -0,0 +1,40 @@ +From 21e9a4bb214648ffd43c66b535fbf096bfcc9f4f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 24 Jun 2018 00:04:37 -0700 +Subject: [PATCH] Unittest: Link librt and libm using -l option + +cmake'ry forces full path to .so files when found using +find_package and since we have proper sysrooted toolchain +-lm and -lrt is all we need + +Upstream-Status: Inappropriate [Cross compile specific] + +Signed-off-by: Khem Raj +--- + unittest/CMakeLists.txt | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt +index c4cdf229..e1b63caf 100644 +--- a/unittest/CMakeLists.txt ++++ b/unittest/CMakeLists.txt +@@ -57,14 +57,8 @@ elseif (WIN32) + else() + set(CHECK_LIBRARIES "${CHECK_INSTALL_DIR}/lib/libcheck.a") + endif() +-find_package(LibM) +-if (LIBM_FOUND) +- set(CHECK_LIBRARIES "${CHECK_LIBRARIES};LIBM::LIBM") +-endif() +-find_package(LibRt) +-if (LIBRT_FOUND) +- set(CHECK_LIBRARIES "${CHECK_LIBRARIES};LIBRT::LIBRT") +-endif() ++set(CHECK_LIBRARIES "${CHECK_LIBRARIES};-lm") ++set(CHECK_LIBRARIES "${CHECK_LIBRARIES};-lrt") + + # Build the C unit tests + add_library(shared-c-unit-tests STATIC shared.c) +-- +2.18.0 + diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb b/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb index 45d6ec8864..471a665099 100644 --- a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb +++ b/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb @@ -4,12 +4,12 @@ HOMEPAGE = "https://github.com/civetweb/civetweb" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=6f28fdcba0dda735eed62bac6a397562" -SRCREV = "b8148afe8fa44c64f75e69655c4fdc9095565568" +SRCREV = "19f31ba8dd8443e86c7028a4b4c37f4b299aa68c" PV = "1.10+git${SRCPV}" -SRC_URI = "git://github.com/civetweb/civetweb.git" -SRC_URI_append_class-native = " \ - file://0001-Test-Fix-missing-librt-and-libm-during-native-compil.patch \ -" +SRC_URI = "git://github.com/civetweb/civetweb.git \ + file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \ + " + S = "${WORKDIR}/git" # civetweb supports building with make or cmake (although cmake lacks few features) From patchwork Sun Jun 24 19:18:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139789 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3199371lji; Sun, 24 Jun 2018 12:21:49 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLqrQBDpUIARR0GLCBU8NzrJdfODJgN8dvtSFxcAM63HhbWbArCW654mCCWR/hvATt1Iq6y X-Received: by 2002:a65:6007:: with SMTP id m7-v6mr8010063pgu.92.1529868108973; Sun, 24 Jun 2018 12:21:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868108; cv=none; d=google.com; s=arc-20160816; b=XJ5XdS4VMZ/OYnqzDPGAMp1zQO98sH2/qsrKtVC4zkYgS0f17a3O1MAu7gGugnfbdP 7u9CPuDez+BrcRdIRDdnZri4hojx8lbNHV1jv88G/EKORoJyhALxdBtqFswCOvfJ/yG3 TzmxEypx9hTViYe2lSXPGIIdGLIgYFjvFvdJa5ueNZmB9lgVOb2GfpiX9qAfuzxZFjwr EUbMhgl+tPwAwhHeNUOpeylnw9SS8fnk8ggfQclnQ8kHpTpOECYbXsLUzvR+Td6eKrM0 H2js49ZmgkzrgNWy/Yhrmo60Nup1nloFb86aDExxo/s/8hSXlAJW24L2u2HBsTl0HKqT AoKg== 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=uXRQR/n7OYuNniN4ECUuI8ziLJ3wLG5AYgmEeBC8ccs=; b=hVz2r2tFSThth/MTAejN/XzbQxW6zmDYLMTcMnqa1xGEakPqcKZ9wJ2rDBt+sIzfG1 0tiHlxMDL/OuIEAa7CG9DxaV/vmnUW+P1VnL+xedR327oNWoD1Wocu7cUE6yUhRdWCwI 7CfUMFDhaTRUPLNnOVMZLiu90ib44L/VuFdqOZ6hhG7JC5lb4gLvd+KnSLdYc0U8bzC5 QIpKKHaDLcMPI0N9SGvn8AqS8mzlmwGChEqdoCmvIM2BCIcM6S7pYcnRSYGLpRcAHUnH 2jzql8aIawZe2DIgZujX7svYXmK5CHxleRmzvJRdaUYvrSuLlUEG2ivq2xrmnyjWtWEL gQXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="IL2/CeuX"; 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=QUARANTINE 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 s36-v6si11843914pld.278.2018.06.24.12.21.48; Sun, 24 Jun 2018 12:21:48 -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="IL2/CeuX"; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 898BD753F4; Sun, 24 Jun 2018 19:20:13 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf0-f178.google.com (mail-pf0-f178.google.com [209.85.192.178]) by mail.openembedded.org (Postfix) with ESMTP id 008A574E1A for ; Sun, 24 Jun 2018 19:19:46 +0000 (UTC) Received: by mail-pf0-f178.google.com with SMTP id y8-v6so5423107pfm.10 for ; Sun, 24 Jun 2018 12:19:48 -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=iCaOw0qeiyCifNMHXIaPDpkuUuo/vExxPks7IAIfWeU=; b=IL2/CeuXUiQJJSMhu9CGdaOeD/xbO/KZAYpKJ/LWELeGakbc0pp5iJf2r2LTRKNdDC R1T+VTXTsXmvmdHlQVr5VbMNFqdemS5kzHC0RNxn96I2lsG7n0QhDjr4MiZgIavgjswz PL+CsmPtYb62t2Uhzw8dXl/QufS3CieMnRHVhRRMUNmUYXQvpWqSkoUp3PY1O8SBtrD4 xtTuFjGn0A24aowSc7XbtKzEyZEj/BttMOdx7P2UJuBJaxERjJd+KEBZ1oxgVC2ITMek 5S5lD3CulFH8yFIMw76MWQThwne+zPSFMpMkN2HPfhOL5d4eMBRG+Eaqs1P5NjxAaL6V AMgA== 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=iCaOw0qeiyCifNMHXIaPDpkuUuo/vExxPks7IAIfWeU=; b=cqpQvbQ27AFImvycmqcZKyVjdYIz5Jw+k6Exa+uKtbN+LpWgjQhXAK26iAncj3MxoX i6URSsU0JEh8mSG6qek24M8dzaIfnBjkkJ8eIrcrSnRP4zGyVv6EPJf8i7XYDNVeqmBp ciJdOjIQIofv/D51NVmyCE4NmWXCHJXHT7X2J78gB052iZeapzO+P6KrLjxxTHxf74Gr TZStPseIUJ4IkNHNwYhtVFjwgKExWVzjXMQjgxozpeUbDCv9km41A9JTdiff8m0eaDwP XevQIA9eaKxnxwAedpnHqfaXVJd6uIXmp6ZxqnxKSXEMFeVTxlKYKBKHcZEMRTTF8X4f +v+A== X-Gm-Message-State: APt69E2+gplS1U+nzo0ZxJnOFmp8nHjqciJcQaMu5dbLZSMpjgkNYq9A vm+ASZvrZnWYZlmAqhwxLc0zLQ== X-Received: by 2002:a65:590c:: with SMTP id f12-v6mr8441490pgu.128.1529867987832; Sun, 24 Jun 2018 12:19:47 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:47 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:43 -0700 Message-Id: <20180624191845.31082-18-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 18/20] check: add recipe 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 It is a C unittest framework Signed-off-by: Khem Raj --- meta-oe/recipes-test/check/check_git.bb | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 meta-oe/recipes-test/check/check_git.bb -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-test/check/check_git.bb b/meta-oe/recipes-test/check/check_git.bb new file mode 100644 index 0000000000..e7bfece3cf --- /dev/null +++ b/meta-oe/recipes-test/check/check_git.bb @@ -0,0 +1,21 @@ +# Copyright (C) 2018 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "A unit testing framework for C" +HOMEPAGE = "https://libcheck.github.io/check/" +LICENSE = "LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=2d5025d4aa3495befef8f17206a5b0a1" + +PV = "0.12.0+git${SRCPV}" + +SRCREV = "285d04b3d461ba68dc39e0f9e847784fb6064bb3" + +SRC_URI = "git://github.com/libcheck/check" + +S = "${WORKDIR}/git" + +inherit cmake + +do_install_append() { + rm -rf ${D}${exec_prefix}/cmake +} From patchwork Sun Jun 24 19:18:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139790 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3199445lji; Sun, 24 Jun 2018 12:21:55 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKUU31D5ZmfwbMwoJ3AZLikf9eCxI9zt8f/dEu1Bk95SfYQBeHLdV7KcEUplXhbtLgDPiRN X-Received: by 2002:a17:902:788e:: with SMTP id q14-v6mr9494475pll.234.1529868115061; Sun, 24 Jun 2018 12:21:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868115; cv=none; d=google.com; s=arc-20160816; b=khHFw0D+XLfT5+SQxkLen9aK7rLLrzxswyUWcTnUJ+s39AzrlRdEIWpE9KpQqN9yHT tJxT60/GYV+uCZ/Kq/RoW1ki/IYGFSdlJFCZc3hR67nbIcpfY4Ry5pD42tV9O0s3Har6 Mdp0tOnrp6kuJhUsATCQWYEmh0KdfSXBHvjN865U0vqCc6G/0JiLjLAFyY7vrJYnehIp RCRDiWklYsihWq416ZGgDO4S6/HEZOD0vBEg0Z9NXJ7iiJY3dW5E1gT9z9BO+1zxDcLi OBrgpkqiaqXo+Nc60n+lsdEla/mUfDNZrsPgIo9MC5vhkummtyViRrkiyLDbIs38EOFA vxiA== 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=SaJ1dt2CMI126nbMbWZ3k0w/ZBfYMkGzqwKTvXR1h9s=; b=DVniyeJHTvsTJ9Pn/Wx+hznqAkHMGu2Gv/WWxPerMIP6zFwZz8mDxnUnJV/xGIacO0 m/U19GzwAScq6Z93Owt8YiBfkMgllj/HeNrFv5zmyf+zxoSgqxjj2rbEgVzA3u7tT24G RqTgOKgPFZhPf+P9fMbu4n68q1/coT5GCa+h6QcCr/tDntRmwKI3qAU2kWMDU9YEyt2l E/3SMfucJx/oAtfIbxiQj/DH3w8CB0NV7sfMQ39soroZI/9RndwJJ0DDTHF1YIGDa6ZP +AAsaU9K5iyeafEBYziGHr44eZneayLgfO+yMTQ17S2l35nKCRgw6Asibj5j2P7Q1ZRe afrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=dqBA8huB; 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=QUARANTINE 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 4-v6si12428992plc.436.2018.06.24.12.21.54; Sun, 24 Jun 2018 12:21:55 -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=dqBA8huB; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9D69F75412; Sun, 24 Jun 2018 19:20:14 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f67.google.com (mail-pl0-f67.google.com [209.85.160.67]) by mail.openembedded.org (Postfix) with ESMTP id 3341B74DCB for ; Sun, 24 Jun 2018 19:19:48 +0000 (UTC) Received: by mail-pl0-f67.google.com with SMTP id 31-v6so5766169plc.4 for ; Sun, 24 Jun 2018 12:19:49 -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=y4o8J9Km1uYhzVtrFnjqF+l6mlJwFjRodNZbPipZddU=; b=dqBA8huBEOYLUbD2i1521YH80kVGsVGKUplrWtDi31QtgR7U94mMstSpdG2o25o3rM CIDPgY8tiaG0X5uuOHQOHLe6dvKg0h/U6IvdI9w+Lu3zLMlJtMZVNaq72Nsm7zOtTbZs 6sKwz151B+rVD/jq9xQXjrcVHP7NoPUNALHyJlTPuX1auw6GdlQdxH35XIodTnQTXg8/ MilzqapVRYxik/Ijf7mpT41IeFfqWh6n5NtQL7HJ1xe7jevQmE+Sd0BFxgBRAyokdrHJ fV2RmP0AJNEfkLwGNSL8s+8RzC/auJWDIyW+9U6WwmKxpK8pmDiJzEKXC5UKsd86EtSx jrdg== 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=y4o8J9Km1uYhzVtrFnjqF+l6mlJwFjRodNZbPipZddU=; b=VHjL9DbzMF0rO62X68TliDY6+cfl9Vc/Ryve5BdCbWCYrQBmp5vjegjV9KxugrRw73 I1sExM7CEP2xkVM77yhsJVg2lDrcbG8W64MNVRpD2fJZxeQ6BjM5v6e1m1ZH7zy5w5pi rsPfaviSBt57zSUCCdn6kZu0hn4AMvoRk6ztg3qgrinfnGzfLVuo0/RdcqXRPO51Z5KA AXBuxKZryQdHyiZhIIs8BOdejJPJ86Mp6RkFb+6izIUO7MccDi/y3qq1rDsiv2P11khP OAo0xMFdDuPugu82lkXmbDAKQ8b31gQ/efTof2EkxfeBnGLOiiNhs7Ck1WeS2sJ2HUZv zSQQ== X-Gm-Message-State: APt69E01hSD7/SBqI1+kM/xStbu4+n0KzWGdS0/yeyOaaS14s/Bv8rCv et+Nic32CMj7SSzYrO/RVJKKgQ== X-Received: by 2002:a17:902:8d96:: with SMTP id v22-v6mr9531159plo.176.1529867988981; Sun, 24 Jun 2018 12:19:48 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:48 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:44 -0700 Message-Id: <20180624191845.31082-19-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 19/20] net-snmp: Refresh openssl support patch 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 Avoid fuzz warnings Signed-off-by: Khem Raj --- .../net-snmp/fix-openssl-build-errors.patch | 50 +++++++++++-------- 1 file changed, 30 insertions(+), 20 deletions(-) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-openssl-build-errors.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-openssl-build-errors.patch index 53bc372267..5c6436c343 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-openssl-build-errors.patch +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp/fix-openssl-build-errors.patch @@ -5,8 +5,10 @@ OpenSSL 1.0.x and 1.1.x. Author: Sharmila Podury ---- a/apps/snmpusm.c -+++ b/apps/snmpusm.c +Index: net-snmp-5.7.3/apps/snmpusm.c +=================================================================== +--- net-snmp-5.7.3.orig/apps/snmpusm.c ++++ net-snmp-5.7.3/apps/snmpusm.c @@ -125,6 +125,32 @@ char *usmUserPublic_val = NULL int docreateandwait = 0; @@ -85,10 +87,12 @@ Author: Sharmila Podury key_len = DH_size(dh); if (!key_len) { ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -327,10 +327,16 @@ if test "x$tryopenssl" != "xno" -a "x$tr - [[#include ]]) +Index: net-snmp-5.7.3/configure.d/config_os_libs2 +=================================================================== +--- net-snmp-5.7.3.orig/configure.d/config_os_libs2 ++++ net-snmp-5.7.3/configure.d/config_os_libs2 +@@ -293,10 +293,16 @@ if test "x$tryopenssl" != "xno" -a "x$tr + [Define to 1 if you have the `AES_cfb128_encrypt' function.])) AC_CHECK_LIB(${CRYPTO}, EVP_MD_CTX_create, - AC_DEFINE([HAVE_EVP_MD_CTX_CREATE], [], @@ -106,9 +110,11 @@ Author: Sharmila Podury fi if echo " $transport_result_list " | $GREP "DTLS" > /dev/null; then AC_CHECK_LIB(ssl, DTLSv1_method, ---- a/include/net-snmp/net-snmp-config.h.in -+++ b/include/net-snmp/net-snmp-config.h.in -@@ -164,6 +164,12 @@ +Index: net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in +=================================================================== +--- net-snmp-5.7.3.orig/include/net-snmp/net-snmp-config.h.in ++++ net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in +@@ -155,6 +155,12 @@ /* Define to 1 if you have the `EVP_MD_CTX_destroy' function. */ #undef HAVE_EVP_MD_CTX_DESTROY @@ -121,11 +127,13 @@ Author: Sharmila Podury /* Define if you have EVP_sha224/256 in openssl */ #undef HAVE_EVP_SHA224 ---- a/snmplib/keytools.c -+++ b/snmplib/keytools.c -@@ -176,7 +176,9 @@ generate_Ku(const oid * hashtype, u_int - QUITFUN(SNMPERR_GENERR, generate_Ku_quit); - } +Index: net-snmp-5.7.3/snmplib/keytools.c +=================================================================== +--- net-snmp-5.7.3.orig/snmplib/keytools.c ++++ net-snmp-5.7.3/snmplib/keytools.c +@@ -149,7 +149,9 @@ generate_Ku(const oid * hashtype, u_int + */ + #ifdef NETSNMP_USE_OPENSSL -#ifdef HAVE_EVP_MD_CTX_CREATE +#ifdef HAVE_EVP_MD_CTX_NEW @@ -134,7 +142,7 @@ Author: Sharmila Podury ctx = EVP_MD_CTX_create(); #else ctx = malloc(sizeof(*ctx)); -@@ -278,7 +280,9 @@ generate_Ku(const oid * hashtype, u_int +@@ -258,7 +260,9 @@ generate_Ku(const oid * hashtype, u_int memset(buf, 0, sizeof(buf)); #ifdef NETSNMP_USE_OPENSSL if (ctx) { @@ -145,10 +153,12 @@ Author: Sharmila Podury EVP_MD_CTX_destroy(ctx); #else EVP_MD_CTX_cleanup(ctx); ---- a/snmplib/scapi.c -+++ b/snmplib/scapi.c -@@ -627,7 +627,9 @@ sc_hash(const oid * hashtype, size_t has - return SNMPERR_GENERR; +Index: net-snmp-5.7.3/snmplib/scapi.c +=================================================================== +--- net-snmp-5.7.3.orig/snmplib/scapi.c ++++ net-snmp-5.7.3/snmplib/scapi.c +@@ -488,7 +488,9 @@ sc_hash(const oid * hashtype, size_t has + } /** initialize the pointer */ -#ifdef HAVE_EVP_MD_CTX_CREATE @@ -158,7 +168,7 @@ Author: Sharmila Podury cptr = EVP_MD_CTX_create(); #else cptr = malloc(sizeof(*cptr)); -@@ -648,7 +650,9 @@ sc_hash(const oid * hashtype, size_t has +@@ -509,7 +511,9 @@ sc_hash(const oid * hashtype, size_t has /** do the final pass */ EVP_DigestFinal(cptr, MAC, &tmp_len); *MAC_len = tmp_len; From patchwork Sun Jun 24 19:18:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139791 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3199483lji; Sun, 24 Jun 2018 12:22:00 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJLgAe2Q+cXQqXdlch7+qlZO9GnrnnUMQnXL+6iwz3+K5jw0NL/1iZyH2biP+brYGzVgEzh X-Received: by 2002:a62:1013:: with SMTP id y19-v6mr10029194pfi.166.1529868120641; Sun, 24 Jun 2018 12:22:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529868120; cv=none; d=google.com; s=arc-20160816; b=HzkbHJxXbs4YzpdHyMPYYLqQ9J+aZTxpJowkOlcpnJEiP8lxSUiK1Qz6DfLPC01Ihs n8r9RX7PSMVp8Beel9/MlifMRtB9cR8ulyCIJi/lFXKw6MAC3pj1WKmnDRp7HfqI3N3p DENMYRbsR47QnagTruURziret9Gf2vr8XyBbfLeLKBcOIcFQWPmdVZqdtBJIPeaR+6ZD 7PrwFm8PO8445o2CHeAFrvh6YC7ZHOdXh6gtIE8rZ7Q025s5WrMKJz0HgCdzS6I3092j gD6pW0Yy98f10Pmj+qCddze/0dE9/RX9fHEgFiHhBIWieASAKeIVZ163b0rBuJGUWL5S 1ejw== 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=Oun27BDRbm/AJ6nLWYe46J2rlskNfHLpD+3un7PrPyo=; b=nULNLnoByDbcxRv/UVXgVnqs26w8UGncJWzR44HRBBaV1o/E98NKuVPymcYdji2WLj hxXfn9A7CBsdU9gQtSIS5CJCEk5EoviMeB54T6PvY26TkA7LTQrYPdkco8roFWpoLk9r aV5FjUixnsJWUWSq5VIP4XvYCBhCGIr9MFxrmG4lt2Z3DWnQg67MtKiE6drN81OHB9Si LQr4K/3Q5nILT1mvhvrvZpSsWFF2M35SGEpS1geCxkOmKqESP4fYTflFmgq4wJgZVnEQ XmBEBHFXPVLq6ePyznueTp/8rjQ8DLIEVILU3NPU882N0JNsjNoF+3p/F1ni0sgcOF8K Gbhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=GTnkReQ8; 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=QUARANTINE 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 m9-v6si12806042pfg.323.2018.06.24.12.22.00; Sun, 24 Jun 2018 12:22: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=GTnkReQ8; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id B809774FBB; Sun, 24 Jun 2018 19:20:15 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f51.google.com (mail-pg0-f51.google.com [74.125.83.51]) by mail.openembedded.org (Postfix) with ESMTP id 9CB7974E1A for ; Sun, 24 Jun 2018 19:19:49 +0000 (UTC) Received: by mail-pg0-f51.google.com with SMTP id w8-v6so5089879pgp.7 for ; Sun, 24 Jun 2018 12:19:51 -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=g15aJWUw6F4hZLX54HTkMmzOmJgQ8tkhIF5jsATcDTA=; b=GTnkReQ8TrFk5o6mkmDR6KgpK4xofp2izQW0TTUz89cQcS+W1oEzhJfvkEKB+G3Wgp diaNax2qHtN0mcd5iDV83aXOoUsFTsmXgFcZYKiw4c6/q9kbDwwRrEpqe3OSAigWs+BU ah4JNykyCvVc8UPSkUIJNoRXEbTkLdW691o1QuA/gJhuY6xOgH5ysfvLeqmuxKtYcm2L E4HM++VWZGYsL0gXYQ2FzSKWipwq2WpZMldFThZjkrAlE913zPWQ7y7cO3WyW3DAHErw crAGcm7WukD0uWtoSft7u1hQhnZliJWb5of66UhafSE9aBJgV84bKFbM/ULes5TkN4ej s4hg== 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=g15aJWUw6F4hZLX54HTkMmzOmJgQ8tkhIF5jsATcDTA=; b=nB7bObm96InMgvshl8lfK5yUVogi1bIGLMtPP1+IN9jbDvCSVMK9Ce2dxGG1TucJ3L gGn2GSQ5ZfHzi9HeQ+UyKTuw9y++rEhg/4rfasuSbU8qYAg6W6XC16hDprNSGgfKszkF XQbCg3DlnwuvalQpUxCGXfwNd+yzFqoJn1+/860tvzPWk+SrjuP/gsTABuGwXFO+4uJt iryk4f51/pu1z4kLIkXZLFxcqxmlnfIjlj6LbAD7DI/mPNORZB5iYYL/H0oZMXX42I/F nzFjaV0uk349HTPaRfgRC6SuqmjYfIgu1mBGeUpHrH4N/nsG3d9Y1W5ckEURTf7gCjUX lYwA== X-Gm-Message-State: APt69E1fSgSZO2uoeGxjDhVnDwbYqOt6Fk4MqmpoCCJ+tJaUBnslIL/j EoJkcrnDajGTBcNaocJ9yuYXnQ== X-Received: by 2002:a63:6e82:: with SMTP id j124-v6mr8355168pgc.349.1529867990473; Sun, 24 Jun 2018 12:19:50 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id m11-v6sm36700461pfj.25.2018.06.24.12.19.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 12:19:49 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 24 Jun 2018 12:18:45 -0700 Message-Id: <20180624191845.31082-20-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624191845.31082-1-raj.khem@gmail.com> References: <20180624191845.31082-1-raj.khem@gmail.com> Subject: [oe] [meta-gnome][PATCH 20/20] metacity: allow for warnings during compilation 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 From: "Slater, Joseph" Add a PACKAGECONFIG option which lets us permit warnings during compilation until warnings from new compiler versions are dealt with. enable the packageconfig by default since we default to gcc8 which produces these warning Signed-off-by: Joe Slater Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/metacity/metacity_3.28.0.bb | 5 +++++ 1 file changed, 5 insertions(+) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.28.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.28.0.bb index ce97a803f1..189f6ec558 100644 --- a/meta-gnome/recipes-gnome/metacity/metacity_3.28.0.bb +++ b/meta-gnome/recipes-gnome/metacity/metacity_3.28.0.bb @@ -23,6 +23,11 @@ SRCREV = "c0d4b2fc0fcd6f2d3c37da935923f9e9ed5eb99f" EXTRA_OECONF += "--disable-xinerama" +PACKAGECONFIG ?= "" + +# enable as neccessary until new warnings are dealt with +PACKAGECONFIG[werror] = "--enable-Werror,--disable-Werror,," + do_configure_prepend() { cd ${S} aclocal --install || exit 1