From patchwork Thu Jun 11 21:08:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 22678 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7C96727BBE3; Thu, 11 Jun 2020 22:21:00 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5110C27BBE1 for ; Thu, 11 Jun 2020 22:21:00 +0100 (BST) Received: from localhost ([::1]:34162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjUd9-0004Vt-PY for patchwork@mira.cbaines.net; Thu, 11 Jun 2020 17:20:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40272) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjURa-0006hg-6X for guix-patches@gnu.org; Thu, 11 Jun 2020 17:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jjURZ-0002bt-Sl for guix-patches@gnu.org; Thu, 11 Jun 2020 17:09:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jjURZ-0008BT-NV for guix-patches@gnu.org; Thu, 11 Jun 2020 17:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41816] [PATCH 1/4] gnu: busybox: Make build reproducible. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jun 2020 21:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41816 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41816@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 41816-submit@debbugs.gnu.org id=B41816.159190973731429 (code B ref 41816); Thu, 11 Jun 2020 21:09:01 +0000 Received: (at 41816) by debbugs.gnu.org; 11 Jun 2020 21:08:57 +0000 Received: from localhost ([127.0.0.1]:38235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjURU-0008Aq-Uv for submit@debbugs.gnu.org; Thu, 11 Jun 2020 17:08:57 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:48294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjURT-0008AT-6d for 41816@debbugs.gnu.org; Thu, 11 Jun 2020 17:08:55 -0400 Received: from dayas.lan (80-110-127-207.cgn.dynamic.surfer.at [80.110.127.207]) by dd26836.kasserver.com (Postfix) with ESMTPSA id A82283362146; Thu, 11 Jun 2020 23:08:53 +0200 (CEST) From: Danny Milosavljevic Date: Thu, 11 Jun 2020 23:08:45 +0200 Message-Id: <20200611210848.28784-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200611210540.28722-1-dannym@scratchpost.org> References: <20200611210540.28722-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/busybox.scm (busybox)[arguments]<#:phases>[disable-timestamps]: New phase. --- gnu/packages/busybox.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index e3431aa31b..0d692c6586 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -45,6 +45,10 @@ (arguments '(#:phases (modify-phases %standard-phases + (add-before 'configure 'disable-timestamps + (lambda _ + (setenv "KCONFIG_NOTIMESTAMP" "1") + #t)) (add-before 'configure 'disable-taskset ;; This feature fails its tests in the build environment, ;; was default 'n' until after 1.26.2. From patchwork Thu Jun 11 21:08:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 22674 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3959227BBE4; Thu, 11 Jun 2020 22:09:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0633827BBE1 for ; Thu, 11 Jun 2020 22:09:10 +0100 (BST) Received: from localhost ([::1]:39888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjURh-0006ky-HI for patchwork@mira.cbaines.net; Thu, 11 Jun 2020 17:09:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjURa-0006i5-HB for guix-patches@gnu.org; Thu, 11 Jun 2020 17:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54929) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jjURa-0002bx-87 for guix-patches@gnu.org; Thu, 11 Jun 2020 17:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jjURa-0008Bb-3f for guix-patches@gnu.org; Thu, 11 Jun 2020 17:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41816] [PATCH 2/4] gnu: busybox: Update to 1.31.1. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jun 2020 21:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41816 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41816@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 41816-submit@debbugs.gnu.org id=B41816.159190973731437 (code B ref 41816); Thu, 11 Jun 2020 21:09:02 +0000 Received: (at 41816) by debbugs.gnu.org; 11 Jun 2020 21:08:57 +0000 Received: from localhost ([127.0.0.1]:38237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjURV-0008As-7U for submit@debbugs.gnu.org; Thu, 11 Jun 2020 17:08:57 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:48302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjURT-0008AV-6d for 41816@debbugs.gnu.org; Thu, 11 Jun 2020 17:08:55 -0400 Received: from dayas.lan (80-110-127-207.cgn.dynamic.surfer.at [80.110.127.207]) by dd26836.kasserver.com (Postfix) with ESMTPSA id F35E03363898; Thu, 11 Jun 2020 23:08:53 +0200 (CEST) From: Danny Milosavljevic Date: Thu, 11 Jun 2020 23:08:46 +0200 Message-Id: <20200611210848.28784-2-dannym@scratchpost.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200611210848.28784-1-dannym@scratchpost.org> References: <20200611210540.28722-1-dannym@scratchpost.org> <20200611210848.28784-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/busybox.scm (busybox): Update to 1.31.1. --- gnu/packages/busybox.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 0d692c6586..61a382e854 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -32,7 +32,7 @@ (define-public busybox (package (name "busybox") - (version "1.29.3") + (version "1.31.1") (source (origin (method url-fetch) (uri (string-append @@ -40,7 +40,7 @@ version ".tar.bz2")) (sha256 (base32 - "1dzg45vgy2w1xcd3p6h8d76ykhabbvk1h0lf8yb24ikrwlv8cr4p")))) + "1659aabzp8w4hayr4z8kcpbk2z1q2wqhw7i1yb0l72b45ykl1yfh")))) (build-system gnu-build-system) (arguments '(#:phases From patchwork Thu Jun 11 21:08:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 22679 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 38CD527BBE3; Thu, 11 Jun 2020 22:21:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7625327BBE1 for ; Thu, 11 Jun 2020 22:21:11 +0100 (BST) Received: from localhost ([::1]:34970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjUdK-0004rn-Sq for patchwork@mira.cbaines.net; Thu, 11 Jun 2020 17:21:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjUSY-0008HA-ML for guix-patches@gnu.org; Thu, 11 Jun 2020 17:10:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54935) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jjUSY-0002ib-B9 for guix-patches@gnu.org; Thu, 11 Jun 2020 17:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jjUSY-0008Da-6C for guix-patches@gnu.org; Thu, 11 Jun 2020 17:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41816] [PATCH 3/4] gnu: busybox: Fix build with new glibc. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jun 2020 21:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41816 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41816@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 41816-submit@debbugs.gnu.org id=B41816.159190974231495 (code B ref 41816); Thu, 11 Jun 2020 21:10:02 +0000 Received: (at 41816) by debbugs.gnu.org; 11 Jun 2020 21:09:02 +0000 Received: from localhost ([127.0.0.1]:38241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjURY-0008BK-NY for submit@debbugs.gnu.org; Thu, 11 Jun 2020 17:09:02 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:48304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjURT-0008AW-EC for 41816@debbugs.gnu.org; Thu, 11 Jun 2020 17:08:59 -0400 Received: from dayas.lan (80-110-127-207.cgn.dynamic.surfer.at [80.110.127.207]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 3F1023366D21; Thu, 11 Jun 2020 23:08:54 +0200 (CEST) From: Danny Milosavljevic Date: Thu, 11 Jun 2020 23:08:47 +0200 Message-Id: <20200611210848.28784-3-dannym@scratchpost.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200611210848.28784-1-dannym@scratchpost.org> References: <20200611210540.28722-1-dannym@scratchpost.org> <20200611210848.28784-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/busybox.scm (busybox)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/busybox.scm | 5 +- ...box-1.31.1-fix-build-with-glibc-2.31.patch | 68 +++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch diff --git a/gnu/local.mk b/gnu/local.mk index 76d6b5deba..221e3b12e4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -805,6 +805,7 @@ dist_patch_DATA = \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ %D%/packages/patches/bluez-CVE-2020-0556.patch \ + %D%/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-msgpack-compat.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 61a382e854..dce5ccf766 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -40,7 +40,10 @@ version ".tar.bz2")) (sha256 (base32 - "1659aabzp8w4hayr4z8kcpbk2z1q2wqhw7i1yb0l72b45ykl1yfh")))) + "1659aabzp8w4hayr4z8kcpbk2z1q2wqhw7i1yb0l72b45ykl1yfh")) + (patches + (search-patches + "busybox-1.31.1-fix-build-with-glibc-2.31.patch")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch b/gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch new file mode 100644 index 0000000000..1518df067f --- /dev/null +++ b/gnu/packages/patches/busybox-1.31.1-fix-build-with-glibc-2.31.patch @@ -0,0 +1,68 @@ +See: https://bugs.gentoo.org/708350 +Author: Patrick McLean +Date: 2020-02-06 23:06:22 +0000 +diff --git a/coreutils/date.c b/coreutils/date.c +index 3414d38ae..4ade6abb4 100644 +--- a/coreutils/date.c ++++ b/coreutils/date.c +@@ -279,6 +279,9 @@ int date_main(int argc UNUSED_PARAM, char **argv) + time(&ts.tv_sec); + #endif + } ++#if !ENABLE_FEATURE_DATE_NANO ++ ts.tv_nsec = 0; ++#endif + localtime_r(&ts.tv_sec, &tm_time); + + /* If date string is given, update tm_time, and maybe set date */ +@@ -301,9 +304,10 @@ int date_main(int argc UNUSED_PARAM, char **argv) + if (date_str[0] != '@') + tm_time.tm_isdst = -1; + ts.tv_sec = validate_tm_time(date_str, &tm_time); ++ ts.tv_nsec = 0; + + /* if setting time, set it */ +- if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) { ++ if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) { + bb_perror_msg("can't set date"); + } + } +diff --git a/libbb/missing_syscalls.c b/libbb/missing_syscalls.c +index 87cf59b3d..dc40d9155 100644 +--- a/libbb/missing_syscalls.c ++++ b/libbb/missing_syscalls.c +@@ -15,14 +15,6 @@ pid_t getsid(pid_t pid) + return syscall(__NR_getsid, pid); + } + +-int stime(const time_t *t) +-{ +- struct timeval tv; +- tv.tv_sec = *t; +- tv.tv_usec = 0; +- return settimeofday(&tv, NULL); +-} +- + int sethostname(const char *name, size_t len) + { + return syscall(__NR_sethostname, name, len); +diff --git a/util-linux/rdate.c b/util-linux/rdate.c +index 70f829e7f..878375d78 100644 +--- a/util-linux/rdate.c ++++ b/util-linux/rdate.c +@@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv) + if (!(flags & 2)) { /* no -p (-s may be present) */ + if (time(NULL) == remote_time) + bb_error_msg("current time matches remote time"); +- else +- if (stime(&remote_time) < 0) ++ else { ++ struct timespec ts; ++ ts.tv_sec = remote_time; ++ ts.tv_nsec = 0; ++ if (clock_settime(CLOCK_REALTIME, &ts) < 0) + bb_perror_msg_and_die("can't set time of day"); ++ } + } + + if (flags != 1) /* not lone -s */ From patchwork Thu Jun 11 21:08:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 22675 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7089427BBE1; Thu, 11 Jun 2020 22:09:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 1CE8D27BBE3 for ; Thu, 11 Jun 2020 22:09:10 +0100 (BST) Received: from localhost ([::1]:39890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjURh-0006l3-JR for patchwork@mira.cbaines.net; Thu, 11 Jun 2020 17:09:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjURa-0006ii-Ts for guix-patches@gnu.org; Thu, 11 Jun 2020 17:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54930) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jjURa-0002c1-KT for guix-patches@gnu.org; Thu, 11 Jun 2020 17:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jjURa-0008Bi-G5 for guix-patches@gnu.org; Thu, 11 Jun 2020 17:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41816] [PATCH 4/4] gnu: busybox: Fix test. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jun 2020 21:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41816 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41816@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 41816-submit@debbugs.gnu.org id=B41816.159190973731443 (code B ref 41816); Thu, 11 Jun 2020 21:09:02 +0000 Received: (at 41816) by debbugs.gnu.org; 11 Jun 2020 21:08:57 +0000 Received: from localhost ([127.0.0.1]:38239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjURV-0008Az-F7 for submit@debbugs.gnu.org; Thu, 11 Jun 2020 17:08:57 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:48312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jjURT-0008AY-Na for 41816@debbugs.gnu.org; Thu, 11 Jun 2020 17:08:56 -0400 Received: from dayas.lan (80-110-127-207.cgn.dynamic.surfer.at [80.110.127.207]) by dd26836.kasserver.com (Postfix) with ESMTPSA id ECC83336793B; Thu, 11 Jun 2020 23:08:54 +0200 (CEST) From: Danny Milosavljevic Date: Thu, 11 Jun 2020 23:08:48 +0200 Message-Id: <20200611210848.28784-4-dannym@scratchpost.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200611210848.28784-1-dannym@scratchpost.org> References: <20200611210540.28722-1-dannym@scratchpost.org> <20200611210848.28784-1-dannym@scratchpost.org> MIME-Version: 1.0 Tags: patch X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/busybox.scm (busybox)[arguments]<#:phases>[check]: Fix test. --- gnu/packages/busybox.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index dce5ccf766..305a61f40b 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -82,6 +82,9 @@ (substitute* "testsuite/date/date-works-1" (("/bin/date") (which "date"))) + (substitute* "testsuite/start-stop-daemon.tests" + (("/bin/false") (which "false"))) + ;; The pidof tests assume that pid 1 is called "init" but that is not ;; true in guix build environment (substitute* "testsuite/pidof.tests"