* [PATCH] gnu: Add busybox.
@ 2014-06-13 12:54 John Darrington
2014-06-13 13:32 ` Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: John Darrington @ 2014-06-13 12:54 UTC (permalink / raw)
To: guix-devel; +Cc: John Darrington
* gnu/packages/busybox.scm: New file
* gnu-system.am: Add gnu/packages/busybox.scm
---
gnu-system.am | 1 +
gnu/packages/busybox.scm | 108 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 109 insertions(+)
create mode 100644 gnu/packages/busybox.scm
diff --git a/gnu-system.am b/gnu-system.am
index c5331fa..fbe031a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -45,6 +45,7 @@ GNU_SYSTEM_MODULES = \
gnu/packages/bison.scm \
gnu/packages/boost.scm \
gnu/packages/bootstrap.scm \
+ gnu/packages/busybox.scm \
gnu/packages/calcurse.scm \
gnu/packages/ccache.scm \
gnu/packages/cdrom.scm \
diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm
new file mode 100644
index 0000000..953cd2a
--- /dev/null
+++ b/gnu/packages/busybox.scm
@@ -0,0 +1,108 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 John Darrington <jmd@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages busybox)
+ #:use-module (guix licenses)
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages admin)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages zip))
+
+(define-public busybox
+ (package
+ (name "busybox")
+ (version "1.22.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "http://www.busybox.net/downloads/" name "-"
+ version ".tar.bz2"))
+ (sha256
+ (base32
+ "12v7nri79v8gns3inmz4k24q7pcnwi00hybs0wddfkcy1afh42xf"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (alist-replace
+ 'configure
+ (lambda _ (zero? (system* "make" "defconfig")))
+ (alist-replace
+ 'check
+ (lambda _
+ (begin
+ (substitute* '("testsuite/du/du-s-works"
+ "testsuite/du/du-works")
+ (("/bin") "/etc")) ; there is no /bin but there is a /etc
+
+ ;; There is no /usr/bin - replace it with /gnu/store
+ (substitute* "testsuite/cpio.tests"
+ (("/usr/bin") "/gnu/store"))
+
+ (substitute* "testsuite/cpio.tests"
+ (("usr") "gnu"))
+
+ (substitute* "testsuite/date/date-works-1"
+ (("/bin/date") (which "date")))
+
+ ;; The pidof tests assume that pid 1 is called "init" but that is not
+ ;; true in guix build environment
+ (substitute* "testsuite/pidof.tests"
+ (("-s init") "-s $(cat /proc/1/comm)"))
+
+ (substitute* "testsuite/grep.tests"
+ ;; The subject of this test is buggy. It is known by upstream (fixed in git)
+ ;; So mark it with SKIP_KNOWN_BUGS like the others.
+ ;; Presumably it wasn't known at the time of release ...
+ ;; (It is strange that they release software which they know to have bugs)
+ (("testing \"grep -w \\^str doesn't match str not at the beginning\"")
+ "test x\"$SKIP_KNOWN_BUGS\" = x\"\" && testing \"grep -w ^str doesn't match str not at the beginning\""))
+
+ ;; This test cannot possibly pass
+ ;; It is trying to test that "which ls" returns "/bin/ls" when PATH is not set.
+ ;; However, this relies on /bin/ls existing. Which it does not in guix
+ (delete-file "testsuite/which/which-uses-default-path")
+ (rmdir "testsuite/which")
+
+ (zero? (system* "make"
+ ;; "V=1"
+ "SKIP_KNOWN_BUGS=1"
+ "SKIP_INTERNET_TESTS=1"
+ "check"))))
+ (alist-replace
+ 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (zero?
+ (system* "make"
+ (string-append "CONFIG_PREFIX=" out)
+ "install"))))
+ %standard-phases)))))
+ (native-inputs `(("perl" ,perl) ; Needed to generate the man pages (pod2man)
+ ;; The following are needed by the tests
+ ("inetutils" ,inetutils)
+ ("zip" ,zip)))
+ (synopsis "Many common UNIX utilities in a single executable")
+ (description "BusyBox combines tiny versions of many common UNIX utilities
+into a single small executable. It provides a fairly complete
+environment for any small or embedded system.")
+ (home-page "http://www.busybox.net")
+ ;; Some files are gplv2+
+ (license gpl2)))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] gnu: Add busybox.
2014-06-13 12:54 [PATCH] gnu: Add busybox John Darrington
@ 2014-06-13 13:32 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2014-06-13 13:32 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
Overall looks good to me. Minor improvements suggested below.
John Darrington <jmd@gnu.org> skribis:
> * gnu/packages/busybox.scm: New file
> * gnu-system.am: Add gnu/packages/busybox.scm
No indentation needed.
Phrases/sentences started with a capital letter must end with a period.
> + (lambda _
> + (begin
No need for ‘begin’ here.
> + ;; There is no /usr/bin - replace it with /gnu/store
> + (substitute* "testsuite/cpio.tests"
> + (("/usr/bin") "/gnu/store"))
> +
> + (substitute* "testsuite/cpio.tests"
> + (("usr") "gnu"))
Both clauses can go in a single ‘substitute*’.
> + ;; This test cannot possibly pass
> + ;; It is trying to test that "which ls" returns "/bin/ls" when PATH is not set.
> + ;; However, this relies on /bin/ls existing. Which it does not in guix
Periods & capitalization.
> + (native-inputs `(("perl" ,perl) ; Needed to generate the man pages (pod2man)
Lower-case.
> + ;; The following are needed by the tests
Period.
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-13 13:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-13 12:54 [PATCH] gnu: Add busybox John Darrington
2014-06-13 13:32 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).