From patchwork Tue Jun 2 10:40:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1302330 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=pPqVnSK3; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49bpV17514z9sSy for ; Tue, 2 Jun 2020 20:40:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DAE8785A84; Tue, 2 Jun 2020 10:40:39 +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 oOUwbYBWRO0M; Tue, 2 Jun 2020 10:40:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 00A5585817; Tue, 2 Jun 2020 10:40:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8ADBF1BF27A for ; Tue, 2 Jun 2020 10:40:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8813586505 for ; Tue, 2 Jun 2020 10:40:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iLtj6jk63OpC for ; Tue, 2 Jun 2020 10:40:36 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id BAED88636A for ; Tue, 2 Jun 2020 10:40:35 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id h5so2865936wrc.7 for ; Tue, 02 Jun 2020 03:40:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gjFT9u+HYlkrB+cEpe6yTfy7ynxPso3lvhkFIes/BhE=; b=pPqVnSK3lrL6cVjj0aMEK2fE9IdCvGyfwqyI5+6otSHxpMay6g8X/lX6tIV2iCpfsb 0VPdcqHrLqIBZBMjEpPsmKM10nyiSbjsw3CxtPjL9c+T9Ta+ygd7veJHVUFP31zMQFEK pEqH69mV+KqLuf7ZzLNT/rcGka1JpCQuPFj4RKbumiopxW7ldi4eWgimu5sY4k1dqrrI 9e2XPgbizpkIgka/dhQKW0wVrR+mC07nO7MMsU8l2v2TF8asdrHGn+ydMogtTShUd4zo Ya9SWC6HqaxZmaF80czHEJK1Euz/4PfO7yXjrUSFl1R8jxahANlGBdlMg06Flk/eYr2L /kkw== 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:mime-version:content-transfer-encoding; bh=gjFT9u+HYlkrB+cEpe6yTfy7ynxPso3lvhkFIes/BhE=; b=HKn4hV7rO5YYvIKyD2b6psH3JFLp0af1pdFipf7A08JrbpdCgHL8XgN8xMkO5Y3fbt hj+ZE+IYes6QshaQVGzXO304bkVRNJBD58HztrZPfH1PV3zsBhkQ6mjunCxGy71ZM/2L 9K3DlNKt1JeZD8ebSXn1N4o63J8CxSDZNKvDNhsDwt+LHCxnGFUBf+lI+PegwsryiiO+ rwoytdOlNjN1wFW05EpZPcJBS5ChKlMZZz34FxeLKr434DcQdmXX0kXhSck00b+nM0MT TkwDHSUimNu+HEjfSy6Ym9qB9qDq9/TmRQxbrwyxD4Hpej/D125b7gf6a/6+XXelXjKq WyOA== X-Gm-Message-State: AOAM532MhaKr1KkLX10BtqG53L9ID20c6HCLYftXOD4YxoeZonr79QDg jLAWww1K5/nFrdGwMPnMxpFlj0iO8gG6yw== X-Google-Smtp-Source: ABdhPJz8LQFurFxvGbSWcN0wa2tx2WbSSr+fKd5TAobzmpfKg75dBHYKPhY1OHPenxdo+7PnTXFYsQ== X-Received: by 2002:adf:a1d3:: with SMTP id v19mr25528962wrv.245.1591094433844; Tue, 02 Jun 2020 03:40:33 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:63d3:7700:5fb9:2a66:a7a8:378f]) by smtp.gmail.com with ESMTPSA id g3sm3627738wrb.46.2020.06.02.03.40.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 03:40:33 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Tue, 2 Jun 2020 12:40:08 +0200 Message-Id: <20200602104011.837-2-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200602104011.837-1-titouan.christophe@railnova.eu> References: <20200602104011.837-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/4] package/redis: bump to version 6.0.4 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: Daniel Price , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Update dependencies in Config.in because of new requirements - Update the help text in Config.in to a more recent wording - Update the hash file to the new 2 spaces convention Signed-off-by: Titouan Christophe --- package/redis/Config.in | 15 +++++++++------ package/redis/redis.hash | 4 ++-- package/redis/redis.mk | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/package/redis/Config.in b/package/redis/Config.in index 2450ccdf7f..5c418da73c 100644 --- a/package/redis/Config.in +++ b/package/redis/Config.in @@ -2,16 +2,19 @@ config BR2_PACKAGE_REDIS bool "redis" depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # _Atomic keyword depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_setname_np() help - Redis is an open source, advanced key-value store. It is - often referred to as a data structure server since keys can - contain strings, hashes, lists, sets and sorted sets. + Redis is an open source (BSD licensed), in-memory data structure + store, used as a database, cache and message broker. It supports + data structures such as strings, hashes, lists, sets, sorted sets + with range queries, bitmaps, hyperloglogs, geospatial indexes with + radius queries and streams. http://www.redis.io -comment "redis needs a toolchain w/ dynamic library, threads" +comment "redis needs a toolchain w/ gcc>=4.9, dynamic library, nptl" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package/redis/redis.hash b/package/redis/redis.hash index ee15b75e08..cf13bb9c0a 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/antirez/redis-hashes/blob/master/README -sha256 f3c7eac42f433326a8d981b50dba0169fdfaf46abb23fcda2f933a7552ee4ed7 redis-5.0.8.tar.gz +sha256 3337005a1e0c3aa293c87c313467ea8ac11984921fab08807998ba765c9943de redis-6.0.4.tar.gz # Locally calculated -sha256 cbf420a3672475a6e2765e3c0984c1f81efe0212afb94a3c998ee63bfd661063 COPYING +sha256 cbf420a3672475a6e2765e3c0984c1f81efe0212afb94a3c998ee63bfd661063 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index d3954d87ca..1578f97e0d 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 5.0.8 +REDIS_VERSION = 6.0.4 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From patchwork Tue Jun 2 10:40:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1302332 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.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=tEK0zVaE; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49bpV654Fdz9sSg for ; Tue, 2 Jun 2020 20:40:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5DB9D863D9; Tue, 2 Jun 2020 10:40:43 +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 DHDz7BsR1aQ8; Tue, 2 Jun 2020 10:40:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5610985BC2; Tue, 2 Jun 2020 10:40:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 8C5CD1BF27A for ; Tue, 2 Jun 2020 10:40:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 82A862078B for ; Tue, 2 Jun 2020 10:40:38 +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 Maf5fH4Y-eKf for ; Tue, 2 Jun 2020 10:40:37 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by silver.osuosl.org (Postfix) with ESMTPS id 3D15A20110 for ; Tue, 2 Jun 2020 10:40:37 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id y17so2834902wrn.11 for ; Tue, 02 Jun 2020 03:40:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lOClLLSsJtnlFCaHXy4sZblBysudIShUIimPeZzyeEk=; b=tEK0zVaEsl9j54YbXpobE21CW5drnY4Gzjgdc40Crgig3HRSmI4Y+9JIN1LS+1Vq3x fnHvtNhG0ZG/0sfuIVv137IMtLEp97fiNiJGT2vk7+7PRoUCGfvvG1w0aN/Voj78Nojx 2jetra2YMura2jg9LUPUXl/LKRdAcph8d4e2GY6xnGyiMHJBTitaBz4v41l5HvkbxCIk W2MxS9Dejp6c0gwmPufNx+65ubXCX7CscGqly6hYNWSasR1pgaGnhJUYv0hYG4r24lJz G4RPKtTUdkqaE/L0QEbkM/ysTJSz7Si0n0M3RMYq1YzgBMCZ5liyh3X4EfTTYMkqQi/c 3EGg== 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:mime-version:content-transfer-encoding; bh=lOClLLSsJtnlFCaHXy4sZblBysudIShUIimPeZzyeEk=; b=leueJt9Xjy03QU/DqyqF3HFrGC9UswM++QmB3wuUo/c8wb5xSvfNyjwkqY/yK6Rark 7VjjugmdAnS7Jl1aaCb3t0MkkvjyswoWyQc0X2kuIoyHbNkYCk9bBhYREAl5bQKh73pM GvrTwAwdeEXxqv8i5ArrQcObXGc1IQpI9q+2znA8OzPPpXBnVBprAg/N7ZzX0ymLc3WI kKEIPTbsw9mixZLpGs+XoqI3kDU/eyS6yKrvNlPQhVCxtYXac6e5mTtl7QUznIopUCC4 2aOo8ZlNWWSm4/0/kvILO8cue4RTfazm9oXjAZgCe80pQfkqHEl5x7uey6f4uDj+AGnv 8XYw== X-Gm-Message-State: AOAM532J9XFdhbwazsxY6/ET/CxXKb8tS9q7fRPh9dwXchaYFkGp/Wg7 p8zwecPALO0nN418AZakPGQThe5MqbzXMg== X-Google-Smtp-Source: ABdhPJwgdrcfLsQtDgNN8UTtkV+kUJG7sr498WiNfBNqTRV7CGq4h2knrNYZfzB1abeKpmqnfTYKMg== X-Received: by 2002:adf:c6c5:: with SMTP id c5mr16877479wrh.13.1591094435226; Tue, 02 Jun 2020 03:40:35 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:63d3:7700:5fb9:2a66:a7a8:378f]) by smtp.gmail.com with ESMTPSA id g3sm3627738wrb.46.2020.06.02.03.40.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 03:40:34 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Tue, 2 Jun 2020 12:40:09 +0200 Message-Id: <20200602104011.837-3-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200602104011.837-1-titouan.christophe@railnova.eu> References: <20200602104011.837-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/4] support/testing: add runtime test for Redis 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: Daniel Price , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Titouan Christophe --- .gitlab-ci.yml | 1 + DEVELOPERS | 1 + support/testing/tests/package/test_redis.py | 24 +++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 support/testing/tests/package/test_redis.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fa8e077a07..a3800d4ba1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -513,6 +513,7 @@ tests.package.test_python_txtorcon.TestPythonPy2Txtorcon: { extends: .runtime_te tests.package.test_python_txtorcon.TestPythonPy3Txtorcon: { extends: .runtime_test } tests.package.test_python_ubjson.TestPythonPy2Ubjson: { extends: .runtime_test } tests.package.test_python_ubjson.TestPythonPy3Ubjson: { extends: .runtime_test } +tests.package.test_redis.TestRedis: { extends: .runtime_test } tests.package.test_rings.TestLuaRings: { extends: .runtime_test } tests.package.test_rings.TestLuajitRings: { extends: .runtime_test } tests.package.test_rust.TestRust: { extends: .runtime_test } diff --git a/DEVELOPERS b/DEVELOPERS index efb97c739c..ae46331c63 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2521,6 +2521,7 @@ F: package/python-avro/ F: package/redis/ F: package/waf/ F: support/testing/tests/package/test_crudini.py +F: support/testing/tests/package/test_redis.py N: Trent Piepho F: package/libp11/ diff --git a/support/testing/tests/package/test_redis.py b/support/testing/tests/package/test_redis.py new file mode 100644 index 0000000000..d79998514e --- /dev/null +++ b/support/testing/tests/package/test_redis.py @@ -0,0 +1,24 @@ +import os + +import infra.basetest + + +class TestRedis(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + """ + BR2_TARGET_ROOTFS_CPIO=y + BR2_PACKAGE_REDIS=y + """ + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + _, exit_code = self.emulator.run("redis-cli SET hello world") + self.assertEqual(exit_code, 0) + + output, exit_code = self.emulator.run("redis-cli GET hello") + self.assertEqual(exit_code, 0) + self.assertEqual(output[0].strip(), '"world"') From patchwork Tue Jun 2 10:40:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1302334 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.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=VyCZDDcW; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49bpV94n1Kz9sRK for ; Tue, 2 Jun 2020 20:40:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6987D87FB2; Tue, 2 Jun 2020 10:40:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Yxayx4rz3dFd; Tue, 2 Jun 2020 10:40:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 00E1F87EE6; Tue, 2 Jun 2020 10:40:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0CCE11BF27A for ; Tue, 2 Jun 2020 10:40:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 09EF4868B0 for ; Tue, 2 Jun 2020 10:40:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G5srpepFUL+L for ; Tue, 2 Jun 2020 10:40:38 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4E0B086D39 for ; Tue, 2 Jun 2020 10:40:38 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id e1so2876305wrt.5 for ; Tue, 02 Jun 2020 03:40:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZwE81cN3IPVoRGQe8mkevfD8f045vzhPm2gsT+5RUk4=; b=VyCZDDcW4tTTFFUrw8eucBQp9WlnFmgf6BiEJrh9xOhWtZLODGbBDpWDSqPejE5B2u 1Yl8VtG3YOPC9FmfT3F7IuHKcWvz0FrI/IDcZVmg3i3cwSQeHivpDJqxtma3qoW3cPYV /Sqfy7a9sLpsc44kzmZfWtsRh2VKS6g1KUV+lqn+U3x/vExskLx3qt1EfEtn5nQj27Cf LzR01HUOeUNBsLUU7a1kcCm1YekyMMvxTXt9xBaqBfevlZwUIMxA5Ot4ZUj+A0V5XnL/ 3jDlkTepj+H0+A0xeKW1BlSTlaPv1ip+lzpWo1DU0IATZy3Nk7vcxpJzv+hE3R+4mPIR rLkQ== 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:mime-version:content-transfer-encoding; bh=ZwE81cN3IPVoRGQe8mkevfD8f045vzhPm2gsT+5RUk4=; b=mSCm9Hpmx3jAigsK8A6l8msRYFOpJdurr2exs1bx8vOzIBQfNzhVgal4DruGXpMgnD o1IHyhrFLrOvKOPyZshe029srdcpM8GHOPjP29HK7pRlqq17hPV0YzQNUAaybUYMcwlw 8VslzxSoMgrF5VJlGdnufra2Z4ib2et4ieofB4nw8fB4H0q1MYjq7QA7aGAPG2t3rb66 47oMOdskomyrUcIDOJxAgMP++GD1c3iIT8TNy+eXhyAmoPOtUYRwQnP/CXqbhrXbqAT7 p93CShJgCtPiivVamsxWP0G25BZpadIn6v13jKhlsO46C6CPpU0iXuBJ3r2W5ZjRRa1I +OiA== X-Gm-Message-State: AOAM532Ix2RX1JcnZAyLVOZ0As7UTrEvLxP1foECmJLszk6wy50J1IRr 9aHearhuDxP1JT2L/rEE3Xk2FiEuPKo2uA== X-Google-Smtp-Source: ABdhPJyjYc1CaR7k3qjD+0x2ryKrBQUo5l5e4om5O/D2Brq3N64fgPHslgKEpsz5dhzxWXPmxRBFMA== X-Received: by 2002:adf:fc81:: with SMTP id g1mr26546552wrr.156.1591094436550; Tue, 02 Jun 2020 03:40:36 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:63d3:7700:5fb9:2a66:a7a8:378f]) by smtp.gmail.com with ESMTPSA id g3sm3627738wrb.46.2020.06.02.03.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 03:40:36 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Tue, 2 Jun 2020 12:40:10 +0200 Message-Id: <20200602104011.837-4-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200602104011.837-1-titouan.christophe@railnova.eu> References: <20200602104011.837-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 3/4] package/redis: add optional support for TLS connections 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: Daniel Price , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Titouan Christophe --- package/redis/redis.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 1578f97e0d..c88e107c2b 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -30,6 +30,11 @@ endif REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \ PREFIX=$(TARGET_DIR)/usr MALLOC=libc +ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) +REDIS_DEPENDENCIES += libopenssl +REDIS_BUILDOPTS += BUILD_TLS=yes +endif + define REDIS_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D) endef From patchwork Tue Jun 2 10:40:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Titouan Christophe X-Patchwork-Id: 1302333 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=railnova.eu Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=railnova-eu.20150623.gappssmtp.com header.i=@railnova-eu.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=yXfAJXmv; 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 49bpV90ddFz9sSy for ; Tue, 2 Jun 2020 20:40:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 745301FE49; Tue, 2 Jun 2020 10:40:46 +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 SRTs-yrs1YQM; Tue, 2 Jun 2020 10:40:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 731A21FEBF; Tue, 2 Jun 2020 10:40:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 172471BF27A for ; Tue, 2 Jun 2020 10:40:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 03FCF2078B for ; Tue, 2 Jun 2020 10:40:41 +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 1dLNLHfGsmD3 for ; Tue, 2 Jun 2020 10:40:40 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by silver.osuosl.org (Postfix) with ESMTPS id D4E9020110 for ; Tue, 2 Jun 2020 10:40:39 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id r7so2901182wro.1 for ; Tue, 02 Jun 2020 03:40:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=railnova-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3AsvKH5ARmzDJ/p5cz3yeEZvCJzdySginyBOEW+irps=; b=yXfAJXmviKGbF5Bx+GVRt8rUAjbIwIMVgmaviKoagGnbXCu3wWnHOS2QpJY/qBkUMj BFAHzqj2DdvokMyph3fKkapRXRt/g+Ijdx8FbqjRnudk6ApHQWMa2JyNVJ7ftjDiHi0v RRndRo0v1O5Mso98W+4JVkxcBC/FnUkpyVUDmrCxwR5LllBsTpfRQKnyoOMR9eTHp0er 7gqiKz4/m4nGhubT7I2hOFUCNjc6j/Pm6S5phnrXkA//f8/0vpXevtIOz2MjLc37PfVd BQk08/9GbedDCWEEz2GnVxJqXXDmJLQtpItcW6r4OCPASSa5po5JYF12cHQHMFuPe0mp nUVw== 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:mime-version:content-transfer-encoding; bh=3AsvKH5ARmzDJ/p5cz3yeEZvCJzdySginyBOEW+irps=; b=fJ631rHn27uEAZ8sqbzvZG8TJLN/4F0W3dINfdSN10Ld+muHqjre249JRDS0CLRzsG F8ssnNRU/S1aIn4Sp1XKAbJz/LxkF6/6siqpmejyKqer2kCmc56xV+koH8vEfkl0wmT9 Nz35jJjGVEIjWQ4/RcMkEOEk3jslfwv84/ud3tOAILcOy9TeZCLmRzjk2uEvzdmAilTm iSCiHqaP/fd5frr1/u83+VCKgJJ/xc2CsZLicW6WZBvYPTRiMdFkXVqOL+ghcQX/76Ku gYrV6Ju2gBlwopJUdVpOr+KE1TtN07ucqqChkZDmuOeDFIYJbr+fu17z/DJXrms3rMt5 MLBw== X-Gm-Message-State: AOAM532gdz4eGmSH8810ELR0OmLH0IjyNW+6KGP2rYvFP5IWJUAmlVW2 7G2Bk0H+szdNLcbLeBaxbTsY18zuC2xP0w== X-Google-Smtp-Source: ABdhPJy+7q0eoOr9hF/9nszSWSE0KXSLhoi2R6ook/xuvWZBQorUb9Thl2uCtRORVGp/jfAiMvYlQA== X-Received: by 2002:adf:a491:: with SMTP id g17mr1711435wrb.132.1591094437975; Tue, 02 Jun 2020 03:40:37 -0700 (PDT) Received: from localhost.localdomain ([2a02:a03f:63d3:7700:5fb9:2a66:a7a8:378f]) by smtp.gmail.com with ESMTPSA id g3sm3627738wrb.46.2020.06.02.03.40.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 03:40:37 -0700 (PDT) From: Titouan Christophe To: buildroot@buildroot.org Date: Tue, 2 Jun 2020 12:40:11 +0200 Message-Id: <20200602104011.837-5-titouan.christophe@railnova.eu> X-Mailer: git-send-email 2.25.3 In-Reply-To: <20200602104011.837-1-titouan.christophe@railnova.eu> References: <20200602104011.837-1-titouan.christophe@railnova.eu> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 4/4] package/redis: add optional support for systemd 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: Daniel Price , Titouan Christophe Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Use the unit type=notify (Redis contacts systemd when ready) - Start redis with the supervised option, so it knows it should talk to systemd Signed-off-by: Titouan Christophe --- package/redis/redis.mk | 4 ++++ package/redis/redis.service | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/package/redis/redis.mk b/package/redis/redis.mk index c88e107c2b..1883f2fbaa 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -30,6 +30,10 @@ endif REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \ PREFIX=$(TARGET_DIR)/usr MALLOC=libc +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +REDIS_DEPENDENCIES += systemd +endif + ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) REDIS_DEPENDENCIES += libopenssl REDIS_BUILDOPTS += BUILD_TLS=yes diff --git a/package/redis/redis.service b/package/redis/redis.service index 0a8162b8ab..2cc82a1980 100644 --- a/package/redis/redis.service +++ b/package/redis/redis.service @@ -1,13 +1,15 @@ [Unit] -Description=Advanced key-value store +Description=Redis data structure server +Documentation=https://redis.io/documentation After=network.target [Service] -Type=simple +Type=notify User=redis Group=redis -ExecStart=/usr/bin/redis-server /etc/redis.conf -ExecStop=/usr/bin/redis-cli shutdown +ExecStart=/usr/bin/redis-server --supervised systemd --daemonize no +TimeoutStartSec=5 +TimeoutStopSec=5 CapabilityBoundingSet= PrivateTmp=true PrivateDevices=true