diff options
33 files changed, 611 insertions, 91 deletions
diff --git a/add-config-files.configure b/add-config-files.configure new file mode 100755 index 00000000..0094cf6b --- /dev/null +++ b/add-config-files.configure @@ -0,0 +1,27 @@ +#!/bin/sh +# Copyright (C) 2013 Codethink Limited +# +# This program 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; version 2 of the License. +# +# This program 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 this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + + +# Copy all files located in $SRC_CONFIG_DIR to the image /etc. + + +set -e + +if [ "x${SRC_CONFIG_DIR}" != x ] +then + cp -r "$SRC_CONFIG_DIR"/* "$1/etc/" +fi + diff --git a/base-system-armv7-highbank.morph b/base-system-armv7-highbank.morph index 02306a37..9d045f83 100644 --- a/base-system-armv7-highbank.morph +++ b/base-system-armv7-highbank.morph @@ -9,22 +9,27 @@ { "morph": "build-essential", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "bsp-armv7-highbank", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" } + ], + "configuration-extensions": [ + "set-hostname", + "ssh", + "add-config-files" ] } diff --git a/base-system-armv7-versatile.morph b/base-system-armv7-versatile.morph index ea69abc9..ff2aae08 100644 --- a/base-system-armv7-versatile.morph +++ b/base-system-armv7-versatile.morph @@ -9,22 +9,27 @@ { "morph": "build-essential", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "bsp-armv7-versatile", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" } + ], + "configuration-extensions": [ + "set-hostname", + "ssh", + "add-config-files" ] } diff --git a/base-system-armv7b-highbank.morph b/base-system-armv7b-highbank.morph index f99dc806..f575ef4e 100644 --- a/base-system-armv7b-highbank.morph +++ b/base-system-armv7b-highbank.morph @@ -9,22 +9,22 @@ { "morph": "build-essential", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "bsp-armv7b-highbank", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" } ] } diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph index 609f6780..3227d4ea 100644 --- a/base-system-x86_32-generic.morph +++ b/base-system-x86_32-generic.morph @@ -9,22 +9,27 @@ { "morph": "build-essential", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "bsp-x86_32-generic", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" } + ], + "configuration-extensions": [ + "set-hostname", + "ssh", + "add-config-files" ] } diff --git a/base-system-x86_64-generic.morph b/base-system-x86_64-generic.morph index df1c51ca..3d5c45fa 100644 --- a/base-system-x86_64-generic.morph +++ b/base-system-x86_64-generic.morph @@ -9,22 +9,27 @@ { "morph": "build-essential", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "bsp-x86_64-generic", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" } + ], + "configuration-extensions": [ + "set-hostname", + "ssh", + "add-config-files" ] } diff --git a/bsp-armv7-highbank.morph b/bsp-armv7-highbank.morph index 4ad3a6d9..1a49c68d 100644 --- a/bsp-armv7-highbank.morph +++ b/bsp-armv7-highbank.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be", + "ref": "master", "morph": "core" } ], diff --git a/bsp-armv7-versatile.morph b/bsp-armv7-versatile.morph index a488e46e..6f5e4a1c 100644 --- a/bsp-armv7-versatile.morph +++ b/bsp-armv7-versatile.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be", + "ref": "master", "morph": "core" } ], diff --git a/bsp-armv7b-highbank.morph b/bsp-armv7b-highbank.morph index 5c17340c..f4231e97 100644 --- a/bsp-armv7b-highbank.morph +++ b/bsp-armv7b-highbank.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be", + "ref": "master", "morph": "core" } ], @@ -13,7 +13,7 @@ { "name": "linux", "repo": "upstream:linux", - "ref": "baserock/bjdooks/arm_be8_work_v38", + "ref": "baserock/arm/highbank-be", "build-depends": [] } ] diff --git a/bsp-imx53.morph b/bsp-imx53.morph index a4c4460e..d8c668da 100644 --- a/bsp-imx53.morph +++ b/bsp-imx53.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be", + "ref": "master", "morph": "core" } ], diff --git a/bsp-x86_32-generic.morph b/bsp-x86_32-generic.morph index f0506170..bd52755f 100644 --- a/bsp-x86_32-generic.morph +++ b/bsp-x86_32-generic.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be", + "ref": "master", "morph": "core" } ], diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph index 45b0bb30..b984a138 100644 --- a/bsp-x86_64-generic.morph +++ b/bsp-x86_64-generic.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be", + "ref": "master", "morph": "core" } ], @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be", + "ref": "master", "morph": "build-essential" } ], @@ -271,6 +271,14 @@ "gettext", "libtool" ] + }, + { + "name": "nano", + "repo": "upstream:nano-tarball", + "ref": "baserock/morph", + "build-depends": [ + "ncurses" + ] } ] } diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph index da5bae27..f9c48ba1 100644 --- a/devel-system-armv7-highbank.morph +++ b/devel-system-armv7-highbank.morph @@ -9,27 +9,32 @@ { "morph": "build-essential", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "bsp-armv7-highbank", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "tools", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" } + ], + "configuration-extensions": [ + "set-hostname", + "ssh", + "add-config-files" ] } diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph index 75891240..c887a413 100644 --- a/devel-system-armv7-versatile.morph +++ b/devel-system-armv7-versatile.morph @@ -9,27 +9,32 @@ { "morph": "build-essential", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "bsp-armv7-versatile", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "tools", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" } + ], + "configuration-extensions": [ + "set-hostname", + "ssh", + "add-config-files" ] } diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph index 5eb3c352..5a7daa06 100644 --- a/devel-system-armv7b-highbank.morph +++ b/devel-system-armv7b-highbank.morph @@ -9,27 +9,27 @@ { "morph": "build-essential", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "bsp-armv7b-highbank", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "tools", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" } ] } diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph index 5a53ab19..c2d22cb2 100644 --- a/devel-system-x86_32-generic.morph +++ b/devel-system-x86_32-generic.morph @@ -9,27 +9,32 @@ { "morph": "build-essential", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "bsp-x86_32-generic", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "tools", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" } + ], + "configuration-extensions": [ + "set-hostname", + "ssh", + "add-config-files" ] } diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph index e7cbd58f..81e948f1 100644 --- a/devel-system-x86_64-generic.morph +++ b/devel-system-x86_64-generic.morph @@ -9,27 +9,32 @@ { "morph": "build-essential", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "core", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "foundation", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "bsp-x86_64-generic", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" }, { "morph": "tools", "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be" + "ref": "master" } + ], + "configuration-extensions": [ + "set-hostname", + "ssh", + "add-config-files" ] } diff --git a/enlightenment.morph b/enlightenment.morph new file mode 100644 index 00000000..0a0c4a0d --- /dev/null +++ b/enlightenment.morph @@ -0,0 +1,58 @@ +name: enlightenment +description: Enlightenment Desktop and Window Manager +kind: stratum +build-depends: +- repo: baserock:baserock/morphs + ref: master + morph: tools +- repo: baserock:baserock/morphs + ref: master + morph: x-x86_64-generic +- repo: baserock:baserock/morphs + ref: master + morph: lua +chunks: +- name: efl + repo: upstream:enlightenment/efl + ref: baserock/morph + build-depends: [] +- name: elementary + repo: upstream:enlightenment/elementary + ref: baserock/morph + build-depends: + - efl +- name: evas_generic_loaders + repo: upstream:enlightenment/evas_generic_loaders + ref: baserock/morph + build-depends: + - efl +- name: enlightenment + repo: upstream:enlightenment/enlightenment + ref: baserock/morph + build-depends: + - efl + - elementary +- name: imlib2 + repo: upstream:enlightenment/imlib2 + ref: baserock/morph + build-depends: + - efl + - elementary + - enlightenment +- name: libast + repo: upstream:enlightenment/libast + ref: baserock/morph + build-depends: + - efl + - elementary + - enlightenment + - imlib2 +- name: eterm + repo: upstream:enlightenment/eterm + ref: baserock/morph + build-depends: + - efl + - elementary + - enlightenment + - libast + - imlib2 diff --git a/foundation.morph b/foundation.morph index 878d0e1d..39e366d1 100644 --- a/foundation.morph +++ b/foundation.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be", + "ref": "master", "morph": "core" } ], diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph index 2aaf934a..d4ccba69 100644 --- a/genivi-baseline-system-armv7-versatile.morph +++ b/genivi-baseline-system-armv7-versatile.morph @@ -66,5 +66,10 @@ "repo": "baserock:baserock/morphs", "ref": "master" } + ], + "configuration-extensions": [ + "set-hostname", + "ssh", + "add-config-files" ] } diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph index e6584796..92964277 100644 --- a/genivi-baseline-system-x86_64-generic.morph +++ b/genivi-baseline-system-x86_64-generic.morph @@ -66,5 +66,10 @@ "repo": "baserock:baserock/morphs", "ref": "master" } + ], + "configuration-extensions": [ + "set-hostname", + "ssh", + "add-config-files" ] } diff --git a/genivi-devel-system-armv7-versatile.morph b/genivi-devel-system-armv7-versatile.morph index 0642d19e..5e246c1c 100644 --- a/genivi-devel-system-armv7-versatile.morph +++ b/genivi-devel-system-armv7-versatile.morph @@ -71,5 +71,10 @@ "repo": "baserock:baserock/morphs", "ref": "master" } + ], + "configuration-extensions": [ + "set-hostname", + "ssh", + "add-config-files" ] } diff --git a/genivi-devel-system-x86_64-generic.morph b/genivi-devel-system-x86_64-generic.morph index 73995151..05d33e0a 100644 --- a/genivi-devel-system-x86_64-generic.morph +++ b/genivi-devel-system-x86_64-generic.morph @@ -71,5 +71,10 @@ "repo": "baserock:baserock/morphs", "ref": "master" } + ], + "configuration-extensions": [ + "set-hostname", + "ssh", + "add-config-files" ] } diff --git a/genivi-foundation.morph b/genivi-foundation.morph index 872eba95..51fccc0a 100644 --- a/genivi-foundation.morph +++ b/genivi-foundation.morph @@ -28,32 +28,10 @@ "build-depends": [] }, { - "name": "gmp", - "repo": "upstream:gmp", - "ref": "baserock/morph", - "build-depends": [] - }, - { "name": "linuxquota", "repo": "upstream:linuxquota", "ref": "baserock/genivi/morph", "build-depends": [] - }, - { - "name": "nettle", - "repo": "upstream:nettle", - "ref": "baserock/morph", - "build-depends": [ - "gmp" - ] - }, - { - "name": "gnutls", - "repo": "upstream:gnutls", - "ref": "baserock/morph", - "build-depends": [ - "nettle" - ] } ] } diff --git a/lua.morph b/lua.morph new file mode 100644 index 00000000..299e1f3f --- /dev/null +++ b/lua.morph @@ -0,0 +1,20 @@ +{ + "name": "lua", + "kind": "stratum", + "description": "Interpreter for the lua scripting language.", + "build-depends": [ + { + "repo": "baserock:baserock/morphs", + "ref": "master", + "morph": "tools" + } + ], + "chunks": [ + { + "name": "lua", + "repo": "upstream:lua", + "ref": "baserock/5.1-morph", + "build-depends": [] + } + ] +} diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph new file mode 100644 index 00000000..a8157d7b --- /dev/null +++ b/qt5-devel-system-x86_64-generic.morph @@ -0,0 +1,65 @@ +{ + "name": "qt5-devel-system-x86_64-generic", + "description": "A system that is able to build other systems based on the 64-bit x86 architecture.", + "kind": "system", + "system-kind": "rootfs-tarball", + "arch": "x86_64", + "disk-size": "2G", + "strata": [ + { + "morph": "build-essential", + "repo": "baserock:baserock/morphs", + "ref": "master" + }, + { + "morph": "core", + "repo": "baserock:baserock/morphs", + "ref": "master" + }, + { + "morph": "foundation", + "repo": "baserock:baserock/morphs", + "ref": "master" + }, + { + "morph": "bsp-x86_64-generic", + "repo": "baserock:baserock/morphs", + "ref": "master" + }, + { + "morph": "tools", + "repo": "baserock:baserock/morphs", + "ref": "master" + }, + { + "morph": "x-common", + "repo": "baserock:baserock/morphs", + "ref": "master" + }, + { + "morph": "x-x86_64-generic", + "repo": "baserock:baserock/morphs", + "ref": "master" + }, + { + "morph": "qt5-tools", + "repo": "baserock:baserock/morphs", + "ref": "master" + }, + { + "morph": "qt5-sdk", + "repo": "baserock:baserock/morphs", + "ref": "master" + }, + { + "morph": "lua", + "repo": "baserock:baserock/morphs", + "ref": "master" + }, + { + "morph": "enlightenment", + "repo": "baserock:baserock/morphs", + "ref": "master" + } + ] +} diff --git a/qt5-sdk.morph b/qt5-sdk.morph new file mode 100644 index 00000000..86626564 --- /dev/null +++ b/qt5-sdk.morph @@ -0,0 +1,26 @@ +{ + "name": "qt5-sdk", + "description": "Qt5 Desktop Environment, IDE and Example Apps", + "kind": "stratum", + "build-depends": [ + { + "repo": "baserock:baserock/morphs", + "ref": "master", + "morph": "qt5-tools" + } + ], + "chunks": [ + { + "name": "qt-creator", + "repo": "upstream:qt-creator", + "ref": "baserock/morph/2.7", + "build-depends": [] + }, + { + "name": "snowshoe", + "repo": "upstream:snowshoe", + "ref": "baserock/morph", + "build-depends": [] + } + ] +} diff --git a/qt5-tools.morph b/qt5-tools.morph new file mode 100644 index 00000000..b0d1bd6a --- /dev/null +++ b/qt5-tools.morph @@ -0,0 +1,223 @@ +{ + "name": "qt5-tools", + "description": "Qt5 Development Libraries and Tools", + "kind": "stratum", + "build-depends": [ + { + "repo": "baserock:baserock/morphs", + "ref": "master", + "morph": "tools" + }, + { + "repo": "baserock:baserock/morphs", + "ref": "master", + "morph": "x-x86_64-generic" + }, + { + "repo": "baserock:baserock/morphs", + "ref": "master", + "morph": "multimedia" + } + ], + "chunks": [ + { + "name": "icu", + "repo": "upstream:icu", + "ref": "baserock/morph", + "build-depends": [] + }, + { + "name": "sqlite3", + "repo": "upstream:sqlite3", + "ref": "baserock/morph", + "build-depends": [] + }, + { + "name": "ruby-1.8", + "repo": "upstream:ruby", + "ref": "baserock/morph/ruby_1_8_7", + "build-depends": [] + }, + { + "name": "ruby-1.9", + "repo": "upstream:ruby", + "ref": "baserock/morph/ruby_1_9_3", + "build-depends": [ + "ruby-1.8" + ] + }, + { + "name": "qtbase", + "repo": "upstream:qt5/qtbase", + "ref": "baserock/morph", + "build-depends": [ + "icu" + ] + }, + { + "name": "qtsvg", + "repo": "upstream:qt5/qtsvg", + "ref": "baserock/morph", + "build-depends": [ + "qtbase" + ] + }, + { + "name": "qtjsbackend", + "repo": "upstream:qt5/qtjsbackend", + "ref": "baserock/morph", + "build-depends": [ + "qtbase" + ] + }, + { + "name": "qtscript", + "repo": "upstream:qt5/qtscript", + "ref": "baserock/morph", + "build-depends": [ + "qtbase", + "qtjsbackend" + ] + }, + { + "name": "qtdeclarative", + "repo": "upstream:qt5/qtdeclarative", + "ref": "baserock/morph", + "build-depends": [ + "qtbase", + "qtjsbackend", + "qtscript" + ] + }, + { + "name": "qtquick1", + "repo": "upstream:qt5/qtquick1", + "ref": "baserock/morph", + "build-depends": [ + "qtbase", + "qtjsbackend", + "qtscript" + ] + }, + { + "name": "qtquickcontrols", + "repo": "upstream:qt5/qtquickcontrols", + "ref": "baserock/morph", + "build-depends": [ + "qtbase", + "qtjsbackend", + "qtdeclarative" + ] + }, + { + "name": "qtsensors", + "repo": "upstream:qt5/qtsensors", + "ref": "baserock/morph", + "build-depends": [ + "qtbase" + ] + }, + { + "name": "qtserialport", + "repo": "upstream:qt5/qtserialport", + "ref": "baserock/morph", + "build-depends": [ + "qtbase" + ] + }, + { + "name": "qtx11extras", + "repo": "upstream:qt5/qtx11extras", + "ref": "baserock/morph", + "build-depends": [ + "qtbase" + ] + }, + { + "name": "qtwebkit", + "repo": "upstream:qt5/qtwebkit", + "ref": "baserock/morph", + "build-depends": [ + "qtbase", + "sqlite3", + "icu", + "ruby-1.9", + "qtjsbackend", + "qtdeclarative" + ] + }, + { + "name": "qtwebkit-examples", + "repo": "upstream:qt5/qtwebkit-examples", + "ref": "baserock/morph", + "build-depends": [ + "qtbase", + "qtjsbackend", + "qtdeclarative", + "qtwebkit" + ] + }, + { + "name": "qtmultimedia", + "repo": "upstream:qt5/qtmultimedia", + "ref": "baserock/morph", + "build-depends": [ + "qtbase" + ] + }, + { + "name": "qtxmlpatterns", + "repo": "upstream:qt5/qtxmlpatterns", + "ref": "baserock/morph", + "build-depends": [ + "qtbase" + ] + }, + { + "name": "qtdoc", + "repo": "upstream:qt5/qtdoc", + "ref": "baserock/morph", + "build-depends": [ + "qtbase" + ] + }, + { + "name": "qtgraphicaleffects", + "repo": "upstream:qt5/qtgraphicaleffects", + "ref": "baserock/morph", + "build-depends": [ + "qtbase", + "qtjsbackend", + "qtdeclarative" + ] + }, + { + "name": "qtimageformats", + "repo": "upstream:qt5/qtimageformats", + "ref": "baserock/morph", + "build-depends": [ + "qtbase" + ] + }, + { + "name": "qttools", + "repo": "upstream:qt5/qttools", + "ref": "baserock/morph", + "build-depends": [ + "qtbase", + "qtjsbackend", + "qtdeclarative", + "qtwebkit" + ] + }, + { + "name": "qttranslations", + "repo": "upstream:qt5/qttranslations", + "ref": "baserock/morph", + "build-depends": [ + "qtbase", + "qttools" + ] + } + ] +} diff --git a/scripting.morph b/scripting.morph deleted file mode 100644 index 513fb28a..00000000 --- a/scripting.morph +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "scripting", - "kind": "stratum", - "description": "Interpreters for scripting languages.", - "chunks": [ - { - "name": "lua", - "repo": "upstream:lua", - "ref": "baserock/5.1-morph", - "build-depends": [] - } - ] -} diff --git a/tools.morph b/tools.morph index 55e2fdb7..74a8c804 100644 --- a/tools.morph +++ b/tools.morph @@ -5,7 +5,7 @@ "build-depends": [ { "repo": "baserock:baserock/morphs", - "ref": "baserock/samthursfield/highbank-be", + "ref": "master", "morph": "foundation" } ], @@ -130,7 +130,7 @@ { "name": "morph", "repo": "baserock:baserock/morph", - "ref": "f697a616324a78f3beb0a768138c7c6dbb133dcc", + "ref": "master", "build-depends": [ "cliapp", "cmdtest", @@ -167,6 +167,12 @@ "repo": "upstream:vim", "ref": "baserock/morph", "build-depends": [] + }, + { + "name": "screen", + "repo": "upstream:screen", + "ref": "baserock/morph", + "build-depends": [] } ] } diff --git a/x-common.morph b/x-common.morph index c5c27498..4b09f414 100644 --- a/x-common.morph +++ b/x-common.morph @@ -452,6 +452,44 @@ "xorg-proto-damageproto", "xorg-util-macros" ] + }, + { + "name": "xorg-lib-libXcursor", + "repo": "upstream:xorg-lib-libXcursor", + "ref": "baserock/morph", + "build-depends": [ + "xorg-util-macros", + "xorg-lib-libXrender", + "xorg-lib-libXfixes", + "xorg-proto-fixesproto", + "xorg-lib-libXau", + "xorg-lib-libX11"] + }, + { + "name": "xorg-proto-printproto", + "repo": "upstream:xorg-proto-printproto", + "ref": "baserock/morph", + "build-depends": ["xorg-util-macros"] + }, + { + "name": "xorg-lib-libXp", + "repo": "upstream:xorg-lib-libXp", + "ref": "baserock/morph", + "build-depends": [ + "xorg-proto-printproto", + "xorg-proto-xextproto", + "xorg-lib-libXext", + "xorg-lib-libX11"] + }, + { + "name": "xorg-lib-libXScrnSaver", + "repo": "upstream:xorg-lib-libXScrnSaver", + "ref": "baserock/morph", + "build-depends": [ + "xorg-proto-scrnsaverproto", + "xorg-proto-xextproto", + "xorg-lib-libXext", + "xorg-lib-libX11"] } ] } diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph index 302917f0..d8568474 100644 --- a/x-x86_64-generic.morph +++ b/x-x86_64-generic.morph @@ -79,6 +79,12 @@ "xorg-lib-libfontenc" ] }, + { + "name": "freefont-otf", + "repo": "upstream:freefont-otf", + "ref": "baserock/morph", + "build-depends": [] + }, { "name": "xorg-lib-libICE", "repo": "upstream:xorg-lib-libICE", @@ -236,6 +242,24 @@ "ref": "baserock/morph", "build-depends": [] }, + { + "name": "util-wm", + "repo": "upstream:util-wm", + "ref": "baserock/morph", + "build-depends": [] + }, + { + "name": "util-keysyms", + "repo": "upstream:util-keysyms", + "ref": "baserock/morph", + "build-depends": [] + }, + { + "name": "util-image", + "repo": "upstream:util-image", + "ref": "baserock/morph", + "build-depends": ["xcb-util"] + }, { "name": "xterm", "repo": "upstream:xterm", |