From patchwork Fri Jul 24 11:56:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Barnett X-Patchwork-Id: 1335648 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=pBsBpSsF; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BCnk42WsRz9sSt for ; Fri, 24 Jul 2020 21:57:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B54AF2283C; Fri, 24 Jul 2020 11:56:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vpRK1oTkJS8Z; Fri, 24 Jul 2020 11:56:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4925020337; Fri, 24 Jul 2020 11:56:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 41CD81BF2BB for ; Fri, 24 Jul 2020 11:56:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3EB5686DAA for ; Fri, 24 Jul 2020 11:56:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9jjNWugH9BLe for ; Fri, 24 Jul 2020 11:56:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-il1-f196.google.com (mail-il1-f196.google.com [209.85.166.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 9309286D42 for ; Fri, 24 Jul 2020 11:56:24 +0000 (UTC) Received: by mail-il1-f196.google.com with SMTP id j9so3587657ilc.11 for ; Fri, 24 Jul 2020 04:56:24 -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=WTDNvtXsDvDriAGRWxAfoG0LOfr7tn1lRzM59qMNwJM=; b=pBsBpSsF1im7E9RW8QRXNXhrSojX0Onaq/Xmd1+hIuBiQFgIC1zO28efzWQPnlNjBv 7KuFcS7g6DqJBJLGh5tSBCMN3sPT6jl6utDcpxcKRmogHfKcy4O0E3q9RiZFKBWdRexd Rygf3GDzaFbPDeOr9JvmXHnpmHiI+MzqRta7Rr2dEgS+bk2pGHBstxGv0h7dCbMU0U2i R2oa8E18TuqbTPSGz8pLACCBY2LHrvq9l3/XraDsM/rOJC1z6w8kAcFaL4n5wpzcmrQ7 KiJbAzoZR/ihRCQ9uRgYSvM3r3huSHVhmyX0S17AreEwxMRq1g2ItzbjA69+H2GAP7wL p8Xg== 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=WTDNvtXsDvDriAGRWxAfoG0LOfr7tn1lRzM59qMNwJM=; b=i74ATdNNsJwpz2RyhRdYX/qkGKmnjAn257jCzQ8x7WIhcJue8The4wEZYk0BIjGQqs ijfpDz0K/iL4xVHABKH5CVvoUurEuFivRdB2V9LzVsK+6PabCfeX/S8NkTr4H43y/Pb0 yxyq9U3P0yVXDtx3HKpdytJN7XNH5OYVoqc+nMoAtdz7UyR1NGhBWITu8OQxmJzWvogq 0xYWm9DfSeDea3DljysdPgXJ4+xeG9Yjg2/vQL7X/9gX6EFf71LsQ2fIPYg+oE4e6w7a hlHCYBwOgXRkEsj+PjjQ6YF+Zb1FElbX9AbtnQV2WiF6hPkPyAaXPexHi/gfcKBhOaFX ykjg== X-Gm-Message-State: AOAM530Aj4J9sZlsnXwXl2vqUUYkNYsbgRoIpIcrBuNRSiMh/qidAgm3 vrPHB0cLlvXC281uzoABpHhy2BgCKQ8= X-Google-Smtp-Source: ABdhPJxju5uzqJN9DxJ18aVu+lzJbtjaFCmCxW9RgpK97A6pcPG4+3fwO7tQtM+8/nJ9dMr0f5XIMw== X-Received: by 2002:a92:aa4b:: with SMTP id j72mr10108294ili.141.1595591783304; Fri, 24 Jul 2020 04:56:23 -0700 (PDT) Received: from ryan-xps13.birdiebarn.net (50-83-38-60.client.mchsi.com. [50.83.38.60]) by smtp.gmail.com with ESMTPSA id u12sm540558ilj.17.2020.07.24.04.56.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 04:56:22 -0700 (PDT) From: Ryan Barnett To: buildroot@buildroot.org Date: Fri, 24 Jul 2020 06:56:04 -0500 Message-Id: <20200724115604.7741-1-ryanbarnett3@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH] package/c-periphery: bump to v2.2.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" c-periphery now supports building on older kernels before 4.8 as there are now checks for the new kernel cdev gpio interface. Also updated hash file to two space format. Signed-off-by: Ryan Barnett --- ...MakeLists.txt-add-BUILD_TESTS-option.patch | 61 ------------------- package/c-periphery/Config.in | 4 -- package/c-periphery/c-periphery.hash | 4 +- package/c-periphery/c-periphery.mk | 2 +- 4 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 package/c-periphery/0001-CMakeLists.txt-add-BUILD_TESTS-option.patch diff --git a/package/c-periphery/0001-CMakeLists.txt-add-BUILD_TESTS-option.patch b/package/c-periphery/0001-CMakeLists.txt-add-BUILD_TESTS-option.patch deleted file mode 100644 index f932ec6366..0000000000 --- a/package/c-periphery/0001-CMakeLists.txt-add-BUILD_TESTS-option.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 7b3f137af40f4355404c146af7d9764c961a2fc7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 7 Jun 2020 09:46:10 +0200 -Subject: [PATCH] CMakeLists.txt: add BUILD_TESTS option - -Add an option to enable or disable tests. This will allow the user to -build c-periphery without threads and will avoid the following build -failure: - -[ 68%] Building C object CMakeFiles/test_serial.dir/tests/test_serial.c.o -/data/buildroot/buildroot-test/instance-0/output/build/c-periphery-2.2.1/tests/test_gpio_sysfs.c:13:10: fatal error: pthread.h: No such file or directory - #include - ^~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/6bbc4de3f857dcb7ff5e6f9fa1441ba4e0af1338 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/vsergeev/c-periphery/pull/26] ---- - CMakeLists.txt | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f442bce..6565557 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,8 @@ - cmake_minimum_required(VERSION 2.6) - project(periphery C) - -+option(BUILD_TESTS "Build tests" ON) -+ - # Check for Linux kernel headers - include(CheckIncludeFiles) - CHECK_INCLUDE_FILES(linux/gpio.h HAVE_LINUX_HEADERS) -@@ -44,11 +46,13 @@ install(TARGETS periphery DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES ${periphery_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}) - install(FILES ${CMAKE_BINARY_DIR}/libperiphery.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - --# Declare tests targets --foreach(TEST_SOURCE ${periphery_TESTS}) -- get_filename_component(TEST_PROGRAM ${TEST_SOURCE} NAME_WE) -- add_executable(${TEST_PROGRAM} ${TEST_SOURCE}) -- target_link_libraries(${TEST_PROGRAM} periphery pthread) -- set(TEST_PROGRAMS ${TEST_PROGRAMS} ${TEST_PROGRAM}) --endforeach() --add_custom_target(tests DEPENDS periphery ${TEST_PROGRAMS}) -+if(BUILD_TESTS) -+ # Declare tests targets -+ foreach(TEST_SOURCE ${periphery_TESTS}) -+ get_filename_component(TEST_PROGRAM ${TEST_SOURCE} NAME_WE) -+ add_executable(${TEST_PROGRAM} ${TEST_SOURCE}) -+ target_link_libraries(${TEST_PROGRAM} periphery pthread) -+ set(TEST_PROGRAMS ${TEST_PROGRAMS} ${TEST_PROGRAM}) -+ endforeach() -+ add_custom_target(tests DEPENDS periphery ${TEST_PROGRAMS}) -+endif() --- -2.26.2 - diff --git a/package/c-periphery/Config.in b/package/c-periphery/Config.in index cf8675801e..0bfb4b1f11 100644 --- a/package/c-periphery/Config.in +++ b/package/c-periphery/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_C_PERIPHERY bool "c-periphery" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 help c-periphery is a set of C wrapper functions for GPIO, SPI, I2C, MMIO, and Serial peripheral I/O interface access in @@ -15,6 +14,3 @@ config BR2_PACKAGE_C_PERIPHERY integration with other projects, and is MIT licensed. https://github.com/vsergeev/c-periphery - -comment "c-periphery needs a toolchain w/ kernel headers >= 4.8" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 diff --git a/package/c-periphery/c-periphery.hash b/package/c-periphery/c-periphery.hash index a1842612b9..26f9a73f81 100644 --- a/package/c-periphery/c-periphery.hash +++ b/package/c-periphery/c-periphery.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7afa2a18e0bf0ccb09b832017c61a411a94cff648a9a57f9f9068bcf14a5d972 c-periphery-2.2.1.tar.gz -sha256 7121a0a2ba36ed9388be2f1a916f0e3584d8e49cc7888fbcfcf83bab2a8bebef LICENSE +sha256 e1ad855dfe8595d0aff306a23eee1d4c4a140212d3cbdc7a6bef5e4d39dc70cc c-periphery-2.2.2.tar.gz +sha256 7121a0a2ba36ed9388be2f1a916f0e3584d8e49cc7888fbcfcf83bab2a8bebef LICENSE diff --git a/package/c-periphery/c-periphery.mk b/package/c-periphery/c-periphery.mk index 3869fc1111..e602e76a94 100644 --- a/package/c-periphery/c-periphery.mk +++ b/package/c-periphery/c-periphery.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_PERIPHERY_VERSION = 2.2.1 +C_PERIPHERY_VERSION = 2.2.2 C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,v$(C_PERIPHERY_VERSION)) C_PERIPHERY_INSTALL_STAGING = YES C_PERIPHERY_LICENSE = MIT