diff options
-rw-r--r-- | bootstrap-pass1.morph | 43 | ||||
-rw-r--r-- | bootstrap-pass2.morph | 170 | ||||
-rw-r--r-- | devel.morph | 150 | ||||
-rw-r--r-- | foundation.morph | 134 |
4 files changed, 224 insertions, 273 deletions
diff --git a/bootstrap-pass1.morph b/bootstrap-pass1.morph index 7096236f..e2459aa1 100644 --- a/bootstrap-pass1.morph +++ b/bootstrap-pass1.morph @@ -38,11 +38,6 @@ "name": "zlib" }, { - "repo": "upstream:file", - "ref": "baserock/morph", - "name": "file" - }, - { "repo": "upstream:ncurses", "ref": "baserock/bootstrap-pass1", "name": "ncurses" @@ -53,24 +48,9 @@ "name": "bash" }, { - "repo": "upstream:bzip2", + "repo": "upstream:busybox", "ref": "baserock/morph", - "name": "bzip2" - }, - { - "repo": "upstream:coreutils", - "ref": "baserock/bootstrap-pass1", - "name": "coreutils" - }, - { - "repo": "upstream:diffutils", - "ref": "baserock/bootstrap", - "name": "diffutils" - }, - { - "repo": "upstream:findutils", - "ref": "baserock/bootstrap-pass1", - "name": "findutils" + "name": "busybox" }, { "repo": "upstream:gawk", @@ -83,15 +63,6 @@ "name": "gettext" }, { - "repo": "upstream:grep", - "ref": "baserock/bootstrap-pass1", - "name": "grep" - }, - { - "repo": "upstream:gzip", - "ref": "baserock/bootstrap-pass1", - "name": "gzip" - }, { "repo": "upstream:m4", "ref": "baserock/bootstrap", @@ -113,16 +84,6 @@ "name": "perl" }, { - "repo": "upstream:sed", - "ref": "baserock/bootstrap", - "name": "sed" - }, - { - "repo": "upstream:tar", - "ref": "baserock/bootstrap-pass1", - "name": "tar" - }, - { "repo": "upstream:texinfo-tarball", "ref": "baserock/bootstrap-pass1", "name": "texinfo-tarball" diff --git a/bootstrap-pass2.morph b/bootstrap-pass2.morph index d30e7ba6..72c276de 100644 --- a/bootstrap-pass2.morph +++ b/bootstrap-pass2.morph @@ -34,13 +34,8 @@ "ref": "baserock/bootstrap" }, { - "name": "sed", - "repo": "upstream:sed", - "ref": "baserock/bootstrap" - }, - { - "name": "bzip2", - "repo": "upstream:bzip2", + "name": "busybox", + "repo": "upstream:busybox", "ref": "baserock/morph" }, { @@ -54,16 +49,6 @@ "ref": "baserock/bootstrap" }, { - "name": "psmisc", - "repo": "upstream:psmisc", - "ref": "baserock/bootstrap" - }, - { - "name": "e2fsprogs", - "repo": "upstream:e2fsprogs", - "ref": "baserock/bootstrap" - }, - { "name": "gperf", "repo": "upstream:gperf", "ref": "baserock/morph" @@ -71,12 +56,7 @@ { "name": "coreutils", "repo": "upstream:coreutils", - "ref": "baserock/bootstrap" - }, - { - "name": "iana-etc", - "repo": "upstream:iana-etc", - "ref": "baserock/morph" + "ref": "rm/no-bb-overlap/bootstrap-pass2" }, { "name": "m4", @@ -89,14 +69,9 @@ "ref": "baserock/bootstrap" }, { - "name": "procps", - "repo": "upstream:procps", - "ref": "baserock/morph" - }, - { - "name": "grep", - "repo": "upstream:grep", - "ref": "baserock/bootstrap" + "name": "patch", + "repo": "upstream:patch", + "ref": "baserock/bootstrap-pass2" }, { "name": "readline", @@ -134,21 +109,11 @@ "ref": "baserock/bootstrap" }, { - "name": "diffutils", - "repo": "upstream:diffutils", - "ref": "baserock/bootstrap" - }, - { "name": "gawk", "repo": "upstream:gawk", "ref": "baserock/morph" }, { - "name": "findutils", - "repo": "upstream:findutils", - "ref": "baserock/bootstrap" - }, - { "name": "help2man", "repo": "upstream:help2man", "ref": "baserock/morph" @@ -169,43 +134,61 @@ "ref": "baserock/bootstrap" }, { - "name": "groff", - "repo": "upstream:groff", + "name": "xz", + "repo": "upstream:xz", "ref": "baserock/morph" }, { - "name": "rsync", - "repo": "upstream:rsync", - "ref": "baserock/morph" + "name": "libexpat", + "repo": "upstream:libexpat", + "ref": "baserock/morph", + "build-depends": [ + "autoconf", + "libtool" + ] }, { - "name": "gzip", - "repo": "upstream:gzip", - "ref": "baserock/morph" + "name": "XML-Parser", + "repo": "upstream:XML-Parser", + "ref": "master", + "build-depends": [ + "libexpat", + "perl" + ] }, { - "name": "libpipeline", - "repo": "upstream:libpipeline", + "name": "intltool", + "repo": "upstream:intltool", "ref": "baserock/morph" }, { - "name": "gmp", - "repo": "upstream:gmp", - "ref": "baserock/morph" + "name": "gtk-doc-stub", + "repo": "upstream:gtk-doc-stub", + "ref": "master", + "build-depends": [ + ] }, { - "name": "libnettle", - "repo": "upstream:lsh", - "ref": "baserock/morph" + "name": "libffi", + "ref": "master", + "build-depends": [ + "autoconf", + "automake", + "libtool" + ] }, { - "name": "gnutls", - "repo": "upstream:gnutls", - "ref": "baserock/morph" + "name": "glib", + "ref": "master", + "build-depends": [ + "gtk-doc-stub", + "libffi", + "pkg-config" + ] }, { - "name": "wget", - "repo": "upstream:wget", + "name": "groff", + "repo": "upstream:groff", "ref": "baserock/morph" }, { @@ -214,44 +197,22 @@ "ref": "baserock/morph" }, { - "name": "xz", - "repo": "upstream:xz", - "ref": "baserock/morph" - }, - { - "name": "patch", - "repo": "upstream:patch", - "ref": "baserock/morph" - }, - { - "name": "tar", - "repo": "upstream:tar", - "ref": "baserock/morph" - }, - { "name": "texinfo-tarball", "repo": "upstream:texinfo-tarball", "ref": "baserock/morph" }, { - "name": "vim", - "repo": "upstream:vim", - "ref": "baserock/morph" - }, - { - "name": "libexpat", - "repo": "upstream:libexpat", + "name": "openssl", + "repo": "upstream:openssl", "ref": "baserock/morph" }, { "name": "curl", "repo": "upstream:curl", - "ref": "baserock/morph" - }, - { - "name": "openssl", - "repo": "upstream:openssl", - "ref": "baserock/morph" + "ref": "baserock/morph", + "build-depends": [ + "openssl" + ] }, { "name": "cpython", @@ -261,33 +222,32 @@ { "name": "cliapp", "repo": "upstream:cliapp", - "ref": "baserock/morph" - }, - { - "name": "git", - "repo": "upstream:git", - "ref": "baserock/morph" - }, - { - "name": "busybox-devel", - "repo": "upstream:busybox", - "ref": "baserock/morph" + "ref": "baserock/morph", + "build-depends": [ + "cpython" + ] }, { "name": "linux-user-chroot", "repo": "upstream:linux-user-chroot", "ref": "master", "build-depends": [ - "busybox-devel", + "busybox", "autoconf", "automake", "libtool" ] }, { - "name": "linux", - "repo": "upstream:linux", - "ref": "baserock/morph" + "name": "git", + "repo": "upstream:git", + "ref": "baserock/morph", + "build-depends": [ + "curl", + "cpython", + "openssl", + "libexpat" + ] } ] } diff --git a/devel.morph b/devel.morph index 112131b9..164c5ffb 100644 --- a/devel.morph +++ b/devel.morph @@ -5,7 +5,7 @@ { "name": "linux-api-headers", "repo": "upstream:linux", - "ref": "baserock/3.2-headers" + "ref": "baserock/morph" }, { "name": "eglibc", @@ -39,13 +39,8 @@ "ref": "baserock/morph" }, { - "name": "sed", - "repo": "upstream:sed", - "ref": "baserock/morph" - }, - { - "name": "bzip2", - "repo": "upstream:bzip2", + "name": "patch", + "repo": "upstream:patch", "ref": "baserock/morph" }, { @@ -54,29 +49,19 @@ "ref": "baserock/morph" }, { - "name": "psmisc", - "repo": "upstream:psmisc", - "ref": "baserock/morph" - }, - { - "name": "e2fsprogs", - "repo": "upstream:e2fsprogs", - "ref": "baserock/morph" - }, - { "name": "gperf", "repo": "upstream:gperf", "ref": "baserock/morph" }, { - "name": "coreutils", - "repo": "upstream:coreutils", + "name": "xz", + "repo": "upstream:xz", "ref": "baserock/morph" }, { - "name": "iana-etc", - "repo": "upstream:iana-etc", - "ref": "baserock/morph" + "name": "coreutils", + "repo": "upstream:coreutils", + "ref": "rm/no-bb-overlap/morph" }, { "name": "m4", @@ -89,16 +74,6 @@ "ref": "baserock/morph" }, { - "name": "procps", - "repo": "upstream:procps", - "ref": "baserock/morph" - }, - { - "name": "grep", - "repo": "upstream:grep", - "ref": "baserock/morph" - }, - { "name": "readline", "repo": "upstream:readline", "ref": "baserock/morph" @@ -120,32 +95,22 @@ }, { "name": "autoconf", - "repo": "upstream:autoconf", + "repo": "upstream:autoconf" "ref": "baserock/morph" }, { "name": "automake", - "repo": "upstream:automake", + "repo": "upstream:automake" "ref": "baserock/morph" }, { "name": "libtool", - "repo": "upstream:libtool", - "ref": "baserock/morph" - }, - { - "name": "diffutils", - "repo": "upstream:diffutils", + "repo": "upstream:libtool" "ref": "baserock/morph" }, { "name": "gawk", - "repo": "upstream:gawk", - "ref": "baserock/morph" - }, - { - "name": "findutils", - "repo": "upstream:findutils", + "repo": "upstream:gawk" "ref": "baserock/morph" }, { @@ -160,7 +125,7 @@ }, { "name": "gettext", - "repo": "upstream:gettext", + "upstream:gettext", "ref": "baserock/morph" }, { @@ -184,56 +149,11 @@ "ref": "baserock/morph" }, { - "name": "rsync", - "repo": "upstream:rsync", - "ref": "baserock/morph" - }, - { - "name": "gzip", - "repo": "upstream:gzip", - "ref": "baserock/morph" - }, - { - "name": "libpipeline", - "repo": "upstream:libpipeline", - "ref": "baserock/morph" - }, - { - "name": "libnettle", - "repo": "upstream:lsh", - "ref": "baserock/morph" - }, - { - "name": "gnutls", - "repo": "upstream:gnutls", - "ref": "baserock/morph" - }, - { - "name": "wget", - "repo": "upstream:wget", - "ref": "baserock/morph" - }, - { "name": "make", "repo": "upstream:make", "ref": "baserock/morph" }, { - "name": "xz", - "repo": "upstream:xz", - "ref": "baserock/morph" - }, - { - "name": "patch", - "repo": "upstream:patch", - "ref": "baserock/morph" - }, - { - "name": "tar", - "repo": "upstream:tar", - "ref": "baserock/morph" - }, - { "name": "texinfo-tarball", "repo": "upstream:texinfo-tarball", "ref": "baserock/morph" @@ -244,19 +164,17 @@ "ref": "baserock/morph" }, { - "name": "libexpat", - "repo": "upstream:libexpat", + "name": "openssl", + "repo": "upstream:openssl", "ref": "baserock/morph" }, { "name": "curl", "repo": "upstream:curl", - "ref": "baserock/morph" - }, - { - "name": "openssl", - "repo": "upstream:openssl", - "ref": "baserock/morph" + "ref": "baserock/morph", + "build-depends": [ + "openssl" + ] }, { "name": "cpython", @@ -266,22 +184,20 @@ { "name": "cliapp", "repo": "upstream:cliapp", - "ref": "baserock/morph" + "ref": "baserock/morph", + "build-depends": [ + "cpython" + ] }, { "name": "git", "repo": "upstream:git", - "ref": "baserock/morph" - }, - { - "name": "sudo", - "repo": "upstream:sudo", - "ref": "baserock/morph" - }, - { - "name": "nasm", - "repo": "upstream:nasm", - "ref": "baserock/morph" + "ref": "baserock/morph", + "build-depends": [ + "openssl", + "curl", + "cpython" + ] }, { "name": "openssh", @@ -296,10 +212,12 @@ ] }, { - "name": "portmap", - "repo": "upstream:portmap", + "name": "nasm", + "repo": "upstream:nasm", "ref": "baserock/morph", - "build-depends": [] + "build-depends": [ + "autoconf" + ] }, { "name": "python-setuptools", diff --git a/foundation.morph b/foundation.morph index 62a76564..72e62201 100644 --- a/foundation.morph +++ b/foundation.morph @@ -11,38 +11,150 @@ "name": "eglibc", "morph": "eglibc", "repo": "upstream:eglibc2", - "ref": "baserock/2.15-morph" + "ref": "baserock/2.15-morph", + "build-depends": [] }, { - "name": "busybox-devel", - "morph": "busybox-devel", + "name": "zlib", + "repo": "upstream:zlib", + "ref": "baserock/morph", + "build-depends": [ + "eglibc" + ] + }, + { + "name": "busybox", "repo": "upstream:busybox", - "ref": "baserock/morph" + "ref": "baserock/morph", + "build-depends": [ + "eglibc" + ] + }, + { + "name": "kmod", + "repo": "upstream:kmod", + "ref": "baserock/morph", + "build-depends": [ + "eglibc" + ] }, { "name": "attr", "repo": "upstream:attr", - "ref": "baserock/morph" + "ref": "baserock/morph", + "build-depends": [ + "eglibc" + ] }, { "name": "util-linux", "repo": "upstream:util-linux", - "ref": "baserock/morph" + "ref": "baserock/morph", + "build-depends": [ + "eglibc" + ] + }, + { + "name": "libcap2", + "repo": "upstream:libcap2", + "ref": "baserock/morph", + "build-depends": [ + "attr" + ] }, { "name": "btrfs-progs", "repo": "upstream:btrfs-progs", - "ref": "baserock/morph" + "ref": "baserock/morph", + "build-depends": [ + "eglibc" + ] }, { "name": "tbdiff", "repo": "baserock:tbdiff", - "ref": "master" + "ref": "master", + "build-depends": [ + "eglibc", + "attr" + ] }, { - "name": "zlib", - "repo": "upstream:zlib", - "ref": "baserock/morph" + "name": "libusb", + "repo": "git://git.libusb.org/libusb.git", + "ref": "master", + "build-depends": [ + "eglibc" + ] + }, + { + "name": "usbutils", + "repo": "git://github.com/gregkh/usbutils.git", + "ref": "master", + "build-depends": [ + "libusb" + ] + }, + { + "name": "pciutils", + "repo": "upstream:pciutils", + "ref": "baserock/morph", + "build-depends": [ + "eglibc" + ] + }, + { + "name": "libffi", + "repo": "upstream:libffi", + "ref": "master", + "build-depends": [ + "eglibc" + ] + }, + { + "name": "libexpat", + "repo": "upstream:libexpat", + "ref": "baserock/morph", + "build-depends": [ + "eglibc" + ] + }, + { + "name": "glib", + "repo": "upstream:glib", + "ref": "master", + "build-depends": [ + "libffi" + ] + }, + { + "name": "dbus", + "repo": "upstream:dbus", + "ref": "baserock/morph", + "build-depends": [ + "libexpat", + "glib" + ] + }, + { + "name": "gobject-introspection", + "repo": "upstream:gobject-introspection", + "ref": "baserock/morph", + "build-depends": [ + "glib" + ] + }, + { + "name": "systemd", + "repo": "upstream:systemd", + "ref": "rm/forwardpatch", + "build-depends": [ + "dbus", + "gobject-introspection", + "libcap2", + "usbutils", + "pciutils" + ] } ] } |