[RFCv2] Trove configuration, changing the model.
by Pedro Alvarez
Hi all!
After my first RFC email about Trove configuration [0], many things (problems
and limitations) has happened in my development which have made me change my
model.
Following my previous model
---------------------------
In my last model I explained my desire to remove all the configuration done in
the trove.configure extension. That would be possible creating a new systemd
unit to run before trove-early-setup, to configure the system in the same way
trove.configure did.
This new unit that I called trove-early-configure, would read the configuration
needed from a file (e.g. /baserock/trove/trove.conf), and then configure the
trove to leave everything ready for trove-early-setup. Some of this
configuration implied the modification of the trove-early-setup unit.
After this , I came to some conclusions:
1 - Create a different unit is undesirable. Is not clear what have to be done
in the different units.
2 - Performing substitutions on installed unit files in running systems is not
a good idea.
3- Modify files in /usr or in /baserock is not a good decision, I should treat
everything outside /etc and /var as read-only
This problems seemed easy to fix, so I started working in how to change the
model to make it fit with the previous conclusions
Le unit: One unit to configure Trove
------------------------------------
After all the comments I had in the email, I decided that the configuration
needed to configure a Trove should be all together in one script, being
executed from one unit only once. Doing this I would fix the problem mentioned
in the conclusion No 1.
Also I made an effort to modify the trove-early-setup script to include all the
configuration needed in the Trove (that is, the configuration previously done
in trove.configure and trove-early-setup). Now the script would read the
configuration from /etc/trove/trove.conf, which means now it doesn't need to
perform substitutions in other units, avoiding the problem explained in the
conclusion No 2.
And, to finish the implementation of this model and fix the problem described
in the conclusion No 3, I moved the files I was modifying from /usr to /etc.
- Some files were from gitano, and upgrading gitano to the latest version
allowed me to move its skeleton files to /etc.
- Others files are scripts for migrations located in /home/shares. It must be
easy to move them to /etc.
But WAIT, doesn't it mean that we were already installing more than one unit to
configure a Trove? And also, will the upgrades work with this model?
Migrations and "why my model is wrong?"
---------------------------------------
I have to say I forgot to think about the migrations scripts, and about how
would my model handle them. So after this thought came to my mind, I decided to
check what would do my model if I try to upgrade an old Trove.
If, for example, I try to upgrade a Trove with the old lorry controller, the
configuration needed for the new lorry controller which are now generated in
trove.configure extension, will be generated (in my model) in trove-early-setup
(first boot), but this script won't be called, because the Trove is only
configured once, so I should put this specific configuration in a migration script.
* But, shouldn't I do the same (create a migration script and unit) for all the
changes we have done in trove.configure since it was created?
Yes I should.
* And doesn't it mean that we will have to create a new syetemd unit and a new
script for every further changes in the trove configuration?
Yes it does.
* And is it possible that we will end up with some migration scripts depending
in other migration scripts making the creation of new migration scripts complex?
Yes it is.
This conclusions made me realize that my new model make things more complex
than before. So I decided to rethink the model.
Rethinking the model
--------------------
If we don't want to end up with a migration script for every change we do in
the configuration needed for Trove, we have some options:
1 - Following the model I've described in "Le Unit:...", if I move all the
configuration to the trove-early-setup script, and I want to add also the
migrations scripts into it, then trove-early-setup must run every boot, and be
clever enough to configure just the things that it needs to configure.
2 - Divide all the configuration needed in scripts, every script makes an
indivisible part of the configuration. A single systemd unit can call them, and
they have to run on the right order, and without breaking things if they run
more than once.
3 - Implement a Baserock configuration manager or integrate an existing one.
In my ideal world of configuration, we should be able to:
- Specify all the configuration in one place.
- Add more configuration scripts whenever needed and be sure that the new
script will run after a fresh deployment and after an upgrade.
Declarative configuration
-------------------------
When I was in the "Rethinking the model" phase, somebody suggested me to take a
look at "Declarative configuration". And I found it pretty interesting. If we
integrate a configuration manager in Baserock we can change the Trove
configuration model to a simpler way.
After researching about one concrete declarative configuration management tool
(Ansible [1]). I can say that using it we can:
- create simple pieces of configuration (scripts) to configure the systems.
- create dependencies between the pieces of configuration.
- it has facilities to create idempotent scripts.
This is really close to my "ideal world", if is not exactly what I was looking
for from the beginning. I would like to hear opinions about this, and see if
including Ansible as a configuration management tool in some of our systems
makes sense. Meanwhile I will create a Trove with Ansible integrated and
working as a proof of concept.
Pedro.
[0]:
http://listmaster.pepperfish.net/pipermail/baserock-dev-baserock.org/2014...
[1]: http://docs.ansible.com/
9 years, 2 months
[PATCH v2 0/3] Things for automating releases
by Richard Ipsum
repo: git://git.baserock.org/baserock/baserock/morph
ref: baserock/richardipsum/write_kernel
head: 92842ab0c05d33ceefaa78736358aef3112c38d4
Richard Ipsum (3):
Add ssh keys conf ext
Make status message clearer
Add option to write out kernel image
morphlib/exts/kvm.write | 3 ++-
morphlib/exts/ssh-authorized-keys.configure | 24 ++++++++++++++++++++++++
morphlib/writeexts.py | 17 ++++++++++++++++-
3 files changed, 42 insertions(+), 2 deletions(-)
create mode 100755 morphlib/exts/ssh-authorized-keys.configure
--
1.7.10.4
9 years, 2 months
[PATCH] Make the morphologies of Mesa generic.
by Pedro Alvarez
Repo: upstream:mesa
Branch: baserock/genivi/morph-generic
Sha1: d880498b44107e847a5da94b37a61b60fb0db446
With this change, the mesa chunk morphology will be generic for
armv7 and x86. As a consecuence can drop one of the following strata
morphologies:
- wayland-armv7-versatile.morph
- wayland-x86_64-versatile.morph
Pedro Alvarez (1):
Make the morphologies genieric.
mesa-wayland.morph | 2 +-
mesa-x.morph | 2 +-
morph-arch-config | 10 ++++++++++
3 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 morph-arch-config
--
1.7.10.4
9 years, 3 months
[PATCH 1/2] Consolidate X definitions
by Emmet Hikory
As the X morphlogies no longer carry significant variation, and
maintaining syncronisation becomes a frustrating manual exercise, they
are consolidated, based on the x86_64 X, which seems most current.
---
devel-system-armv7-highbank.morph | 2 +-
devel-system-armv7-versatile.morph | 2 +-
devel-system-armv7-wandboard.morph | 2 +-
devel-system-armv7b-highbank.morph | 2 +-
devel-system-armv7lhf-highbank.morph | 2 +-
devel-system-ppc64-generic.morph | 2 +-
devel-system-x86_32-generic.morph | 2 +-
devel-system-x86_64-generic.morph | 2 +-
devel-system-x86_64-vagrant.morph | 2 +-
enlightenment.morph | 2 +-
genivi-x-armv7-versatile.morph | 2 +-
genivi-x-ppc64-generic.morph | 2 +-
genivi-x-x86_64-generic.morph | 2 +-
gitlab-ci-runner.morph | 2 +-
gtk2.morph | 2 +-
nodejs-system-x86_64.morph | 2 +-
qt4-devel-system-x86_64-generic.morph | 2 +-
qt4-tools.morph | 2 +-
qt5-devel-system-x86_64-generic.morph | 2 +-
qt5-tools.morph | 2 +-
virtualbox-guest-x86_64.morph | 2 +-
x-armv7-versatile.morph | 179 -----------------------------
x-generic.morph | 206 ++++++++++++++++++++++++++++++++++
x-ppc64-generic.morph | 206 ----------------------------------
x-x86_64-generic.morph | 206 ----------------------------------
xfce-system.morph | 2 +-
xfce.morph | 4 +-
27 files changed, 230 insertions(+), 615 deletions(-)
delete mode 100644 x-armv7-versatile.morph
create mode 100644 x-generic.morph
delete mode 100644 x-ppc64-generic.morph
delete mode 100644 x-x86_64-generic.morph
diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph
index adeb07b..b9d4058 100644
--- a/devel-system-armv7-highbank.morph
+++ b/devel-system-armv7-highbank.morph
@@ -18,7 +18,7 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-armv7-versatile
+- morph: x-generic
- morph: multimedia
- morph: genivi
- morph: genivi-x-armv7-versatile
diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph
index e4cf3d5..98445bb 100644
--- a/devel-system-armv7-versatile.morph
+++ b/devel-system-armv7-versatile.morph
@@ -18,7 +18,7 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-armv7-versatile
+- morph: x-generic
- morph: multimedia
- morph: genivi
- morph: genivi-x-armv7-versatile
diff --git a/devel-system-armv7-wandboard.morph b/devel-system-armv7-wandboard.morph
index 2d75882..349d166 100644
--- a/devel-system-armv7-wandboard.morph
+++ b/devel-system-armv7-wandboard.morph
@@ -17,7 +17,7 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-armv7-versatile
+- morph: x-generic
- morph: multimedia
- morph: genivi
- morph: genivi-x-armv7-versatile
diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph
index 1a120e1..66b1a81 100644
--- a/devel-system-armv7b-highbank.morph
+++ b/devel-system-armv7b-highbank.morph
@@ -18,7 +18,7 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-armv7-versatile
+- morph: x-generic
- morph: multimedia
- morph: genivi
- morph: genivi-x-armv7-versatile
diff --git a/devel-system-armv7lhf-highbank.morph b/devel-system-armv7lhf-highbank.morph
index d357f48..4c00e6f 100644
--- a/devel-system-armv7lhf-highbank.morph
+++ b/devel-system-armv7lhf-highbank.morph
@@ -18,7 +18,7 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-armv7-versatile
+- morph: x-generic
- morph: multimedia
- morph: genivi
- morph: genivi-x-armv7-versatile
diff --git a/devel-system-ppc64-generic.morph b/devel-system-ppc64-generic.morph
index 1297acb..312fd6f 100644
--- a/devel-system-ppc64-generic.morph
+++ b/devel-system-ppc64-generic.morph
@@ -18,7 +18,7 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-ppc64-generic
+- morph: x-generic
- morph: multimedia
- morph: genivi
- morph: genivi-x-ppc64-generic
diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph
index 42d363b..e7f3466 100644
--- a/devel-system-x86_32-generic.morph
+++ b/devel-system-x86_32-generic.morph
@@ -18,7 +18,7 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia
- morph: genivi
- morph: genivi-x-x86_64-generic
diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph
index 7048df5..fadda48 100644
--- a/devel-system-x86_64-generic.morph
+++ b/devel-system-x86_64-generic.morph
@@ -18,7 +18,7 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia
- morph: genivi
- morph: genivi-x-x86_64-generic
diff --git a/devel-system-x86_64-vagrant.morph b/devel-system-x86_64-vagrant.morph
index a346ad2..db5ada4 100644
--- a/devel-system-x86_64-vagrant.morph
+++ b/devel-system-x86_64-vagrant.morph
@@ -19,7 +19,7 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia
- morph: genivi
- morph: genivi-x-x86_64-generic
diff --git a/enlightenment.morph b/enlightenment.morph
index d5ab533..752dd68 100644
--- a/enlightenment.morph
+++ b/enlightenment.morph
@@ -3,7 +3,7 @@ kind: stratum
description: Enlightenment Desktop and Window Manager
build-depends:
- morph: tools
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: lua
- morph: audio-bluetooth
- morph: multimedia-gstreamer-0.10
diff --git a/genivi-x-armv7-versatile.morph b/genivi-x-armv7-versatile.morph
index cd308bb..3fa43e9 100644
--- a/genivi-x-armv7-versatile.morph
+++ b/genivi-x-armv7-versatile.morph
@@ -3,7 +3,7 @@ kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
- morph: genivi
-- morph: x-armv7-versatile
+- morph: x-generic
chunks:
- name: layer_management
repo: upstream:layer_management
diff --git a/genivi-x-ppc64-generic.morph b/genivi-x-ppc64-generic.morph
index 9843341..1b84525 100644
--- a/genivi-x-ppc64-generic.morph
+++ b/genivi-x-ppc64-generic.morph
@@ -3,7 +3,7 @@ kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
- morph: genivi
-- morph: x-ppc64-generic
+- morph: x-generic
chunks:
- name: layer_management
repo: upstream:layer_management
diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic.morph
index 45929b1..c9dd30c 100644
--- a/genivi-x-x86_64-generic.morph
+++ b/genivi-x-x86_64-generic.morph
@@ -3,7 +3,7 @@ kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
- morph: genivi
-- morph: x-x86_64-generic
+- morph: x-generic
chunks:
- name: layer_management
repo: upstream:layer_management
diff --git a/gitlab-ci-runner.morph b/gitlab-ci-runner.morph
index 9845dcc..65cde1f 100644
--- a/gitlab-ci-runner.morph
+++ b/gitlab-ci-runner.morph
@@ -18,7 +18,7 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia
- morph: genivi
- morph: genivi-x-x86_64-generic
diff --git a/gtk2.morph b/gtk2.morph
index 82afb7e..01eef81 100644
--- a/gtk2.morph
+++ b/gtk2.morph
@@ -4,7 +4,7 @@ description: the gtk2 stratum
build-depends:
- morph: genivi-foundation
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
chunks:
- name: shared-mime-info
repo: upstream:shared-mime-info
diff --git a/nodejs-system-x86_64.morph b/nodejs-system-x86_64.morph
index 0018fbd..35ad292 100644
--- a/nodejs-system-x86_64.morph
+++ b/nodejs-system-x86_64.morph
@@ -18,7 +18,7 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia
- morph: genivi
- morph: genivi-x-x86_64-generic
diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph
index 7a45c0f..c62363e 100644
--- a/qt4-devel-system-x86_64-generic.morph
+++ b/qt4-devel-system-x86_64-generic.morph
@@ -18,7 +18,7 @@ strata:
- morph: bsp-x86_64-generic
- morph: tools
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: qt4-tools
- morph: qt4-sdk
- morph: lua
diff --git a/qt4-tools.morph b/qt4-tools.morph
index 3c14828..6dfc9b8 100644
--- a/qt4-tools.morph
+++ b/qt4-tools.morph
@@ -3,7 +3,7 @@ kind: stratum
description: Qt4 Development Libraries and Tools
build-depends:
- morph: tools
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia-gstreamer-0.10
chunks:
- name: icu
diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph
index 2c75333..e717571 100644
--- a/qt5-devel-system-x86_64-generic.morph
+++ b/qt5-devel-system-x86_64-generic.morph
@@ -18,7 +18,7 @@ strata:
- morph: bsp-x86_64-generic
- morph: tools
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: qt5-tools
- morph: qt5-sdk
- morph: lua
diff --git a/qt5-tools.morph b/qt5-tools.morph
index 39a8264..26e5755 100644
--- a/qt5-tools.morph
+++ b/qt5-tools.morph
@@ -3,7 +3,7 @@ kind: stratum
description: Qt5 Development Libraries and Tools
build-depends:
- morph: tools
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia-gstreamer-0.10
chunks:
- name: icu
diff --git a/virtualbox-guest-x86_64.morph b/virtualbox-guest-x86_64.morph
index 4babc6d..49df240 100644
--- a/virtualbox-guest-x86_64.morph
+++ b/virtualbox-guest-x86_64.morph
@@ -6,7 +6,7 @@ build-depends:
- morph: tools
- morph: bsp-x86_64-generic
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
chunks:
- name: yasm
repo: upstream:yasm
diff --git a/x-armv7-versatile.morph b/x-armv7-versatile.morph
deleted file mode 100644
index 3fcf1ea..0000000
--- a/x-armv7-versatile.morph
+++ /dev/null
@@ -1,179 +0,0 @@
-name: x-armv7-versatile
-kind: stratum
-build-depends:
-- morph: x-common
-chunks:
-- name: mesa-x
- repo: upstream:mesa
- ref: e96f3daac78e3971e4500a31e72c0a7e5845c3d1
- unpetrify-ref: baserock/genivi/baseline-armv7-versatile
- build-depends: []
-- name: xorg-lib-libxkbfile
- repo: upstream:xorg-lib-libxkbfile
- ref: 7381c2f9013ef7784c78091fa671e652a62ca706
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pixman
- repo: upstream:pixman
- ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-font-util
- repo: upstream:xorg-font-util
- ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libfontenc
- repo: upstream:xorg-lib-libfontenc
- ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-font-util
-- name: freetype2
- repo: upstream:freetype2
- ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: fontconfig
- repo: upstream:fontconfig
- ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
- unpetrify-ref: baserock/morph
- build-depends:
- - freetype2
-- name: xorg-lib-libXfont
- repo: upstream:xorg-lib-libXfont
- ref: b8dd42dce868f9c16a59790ce51f0542b59cb79d
- unpetrify-ref: baserock/morph
- build-depends:
- - freetype2
- - xorg-lib-libfontenc
-- name: xorg-lib-libICE
- repo: upstream:xorg-lib-libICE
- ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libSM
- repo: upstream:xorg-lib-libSM
- ref: 77ddd273239a629eeed7bd1d5b4509b1bd6d4e37
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libICE
-- name: xorg-lib-libXt
- repo: upstream:xorg-lib-libXt
- ref: ead50a9a274aa96bef94e57c4625be8e9288af4e
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libSM
-- name: xorg-lib-libXmu
- repo: upstream:xorg-lib-libXmu
- ref: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXpm
- repo: upstream:xorg-lib-libXpm
- ref: 81608285e11f2455800001a965dfece878861162
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXaw
- repo: upstream:xorg-lib-libXaw
- ref: a5630e166921b5b5322b30fb152df01bb6536e42
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
-- name: libsha1
- repo: upstream:libsha1
- ref: 17173732b9f1b2d4142de27913250b4563db2436
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xserver
- repo: upstream:xserver
- ref: b7cbfa882778cf8857577e0da77aa9295f072db3
- unpetrify-ref: baserock/morph
- build-depends:
- - libsha1
- - mesa-x
- - pixman
- - xorg-font-util
- - xorg-lib-libXaw
- - xorg-lib-libXfont
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
- - xorg-lib-libfontenc
- - xorg-lib-libxkbfile
-- name: xorg-driver-xf86-video-cirrus
- repo: upstream:xorg-driver-xf86-video-cirrus
- ref: 6504929481eab616f064b5d661a057de74b8b488
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-fbdev
- repo: upstream:xorg-driver-xf86-video-fbdev
- ref: ac293412a01d87f87eb61f4adb9db7486a75d3fc
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-vesa
- repo: upstream:xorg-driver-xf86-video-vesa
- ref: 29a149544e2120a582043738d5b09dd80e896345
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-evdev
- repo: upstream:xorg-driver-xf86-input-evdev
- ref: 2b8b0df62ec554952784f2820fb4143c495232b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-keyboard
- repo: upstream:xorg-driver-xf86-input-keyboard
- ref: 4a954bc6a8fbc4aa50dfcabec011274252713204
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-mouse
- repo: upstream:xorg-driver-xf86-input-mouse
- ref: 585f4030d77accf2a4ba115729ca08da82217863
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-app-xkbcomp
- repo: upstream:xorg-app-xkbcomp
- ref: 705b9bbb426410f9510601c7010da51184919b36
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libxkbfile
-- name: xkeyboard-config
- repo: upstream:xkeyboard-config
- ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-app-xkbcomp
-- name: xorg-app-xinit
- repo: upstream:xorg-app-xinit
- ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libXft
- repo: upstream:xorg-lib-libXft
- ref: c5e760a239afc62a1c75e0509868e35957c8df52
- unpetrify-ref: baserock/morph
- build-depends:
- - fontconfig
- - freetype2
-- name: xcb-util
- repo: upstream:xcb-util
- ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xterm
- repo: upstream:xterm
- ref: 7fc0a9529babac61d9a0b30e6ddb3c79e44af0e5
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXaw
- - xorg-lib-libxkbfile
diff --git a/x-generic.morph b/x-generic.morph
new file mode 100644
index 0000000..142e743
--- /dev/null
+++ b/x-generic.morph
@@ -0,0 +1,206 @@
+name: x-generic
+kind: stratum
+build-depends:
+- morph: x-common
+chunks:
+- name: mesa-x
+ repo: upstream:mesa
+ ref: f64dd91f4f2a2591e66b38fdfdfa83077f8221ab
+ unpetrify-ref: baserock/genivi/morph
+ build-depends: []
+- name: xorg-lib-libxkbfile
+ repo: upstream:xorg-lib-libxkbfile
+ ref: 7381c2f9013ef7784c78091fa671e652a62ca706
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: pixman
+ repo: upstream:pixman
+ ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: xorg-font-util
+ repo: upstream:xorg-font-util
+ ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: xorg-lib-libfontenc
+ repo: upstream:xorg-lib-libfontenc
+ ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-font-util
+- name: freetype2
+ repo: upstream:freetype2
+ ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: fontconfig
+ repo: upstream:fontconfig
+ ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - freetype2
+- name: xorg-lib-libXfont
+ repo: upstream:xorg-lib-libXfont
+ ref: b8dd42dce868f9c16a59790ce51f0542b59cb79d
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - freetype2
+ - xorg-lib-libfontenc
+- name: freefont-otf
+ repo: upstream:freefont-otf
+ ref: 0ca3ccce74e81f7feb6e922edd988be0e1a43f05
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: xorg-lib-libICE
+ repo: upstream:xorg-lib-libICE
+ ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: xorg-lib-libSM
+ repo: upstream:xorg-lib-libSM
+ ref: 77ddd273239a629eeed7bd1d5b4509b1bd6d4e37
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libICE
+- name: xorg-lib-libXt
+ repo: upstream:xorg-lib-libXt
+ ref: ead50a9a274aa96bef94e57c4625be8e9288af4e
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libSM
+- name: xorg-lib-libXmu
+ repo: upstream:xorg-lib-libXmu
+ ref: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXt
+- name: xorg-lib-libXpm
+ repo: upstream:xorg-lib-libXpm
+ ref: 81608285e11f2455800001a965dfece878861162
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXt
+- name: xorg-lib-libXaw
+ repo: upstream:xorg-lib-libXaw
+ ref: a5630e166921b5b5322b30fb152df01bb6536e42
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXmu
+ - xorg-lib-libXpm
+ - xorg-lib-libXt
+- name: libsha1
+ repo: upstream:libsha1
+ ref: 17173732b9f1b2d4142de27913250b4563db2436
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: xserver
+ repo: upstream:xserver
+ ref: b7cbfa882778cf8857577e0da77aa9295f072db3
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libsha1
+ - mesa-x
+ - pixman
+ - xorg-font-util
+ - xorg-lib-libXaw
+ - xorg-lib-libXfont
+ - xorg-lib-libXmu
+ - xorg-lib-libXpm
+ - xorg-lib-libXt
+ - xorg-lib-libfontenc
+ - xorg-lib-libxkbfile
+- name: xorg-driver-xf86-video-cirrus
+ repo: upstream:xorg-driver-xf86-video-cirrus
+ ref: 6504929481eab616f064b5d661a057de74b8b488
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xserver
+- name: xorg-driver-xf86-video-fbdev
+ repo: upstream:xorg-driver-xf86-video-fbdev
+ ref: ac293412a01d87f87eb61f4adb9db7486a75d3fc
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xserver
+- name: xorg-driver-xf86-video-vesa
+ repo: upstream:xorg-driver-xf86-video-vesa
+ ref: 29a149544e2120a582043738d5b09dd80e896345
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xserver
+- name: xorg-driver-xf86-input-evdev
+ repo: upstream:xorg-driver-xf86-input-evdev
+ ref: 2b8b0df62ec554952784f2820fb4143c495232b0
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xserver
+- name: xorg-driver-xf86-input-keyboard
+ repo: upstream:xorg-driver-xf86-input-keyboard
+ ref: 4a954bc6a8fbc4aa50dfcabec011274252713204
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xserver
+- name: xorg-driver-xf86-input-mouse
+ repo: upstream:xorg-driver-xf86-input-mouse
+ ref: 585f4030d77accf2a4ba115729ca08da82217863
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xserver
+- name: xorg-app-xkbcomp
+ repo: upstream:xorg-app-xkbcomp
+ ref: 705b9bbb426410f9510601c7010da51184919b36
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libxkbfile
+- name: xkeyboard-config
+ repo: upstream:xkeyboard-config
+ ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-app-xkbcomp
+- name: xorg-app-xinit
+ repo: upstream:xorg-app-xinit
+ ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: xorg-lib-libXft
+ repo: upstream:xorg-lib-libXft
+ ref: c5e760a239afc62a1c75e0509868e35957c8df52
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - fontconfig
+ - freetype2
+- name: xcb-util
+ repo: upstream:xcb-util
+ ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: util-wm
+ repo: upstream:util-wm
+ ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: util-keysyms
+ repo: upstream:util-keysyms
+ ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: util-image
+ repo: upstream:util-image
+ ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xcb-util
+- name: xterm
+ repo: upstream:xterm
+ ref: 7fc0a9529babac61d9a0b30e6ddb3c79e44af0e5
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXaw
+ - xorg-lib-libxkbfile
+- name: xorg-app-xauth
+ repo: upstream:xorg-app-xauth
+ ref: 6dda11c17f2fdc47d43f269dccee98ec66cc8c4b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - xorg-lib-libXmu
diff --git a/x-ppc64-generic.morph b/x-ppc64-generic.morph
deleted file mode 100644
index ee24f56..0000000
--- a/x-ppc64-generic.morph
+++ /dev/null
@@ -1,206 +0,0 @@
-name: x-ppc64-generic
-kind: stratum
-build-depends:
-- morph: x-common
-chunks:
-- name: mesa-x
- repo: upstream:mesa
- ref: e96f3daac78e3971e4500a31e72c0a7e5845c3d1
- unpetrify-ref: baserock/genivi/baseline-armv7-versatile
- build-depends: []
-- name: xorg-lib-libxkbfile
- repo: upstream:xorg-lib-libxkbfile
- ref: 7381c2f9013ef7784c78091fa671e652a62ca706
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pixman
- repo: upstream:pixman
- ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-font-util
- repo: upstream:xorg-font-util
- ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libfontenc
- repo: upstream:xorg-lib-libfontenc
- ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-font-util
-- name: freetype2
- repo: upstream:freetype2
- ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: fontconfig
- repo: upstream:fontconfig
- ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
- unpetrify-ref: baserock/morph
- build-depends:
- - freetype2
-- name: xorg-lib-libXfont
- repo: upstream:xorg-lib-libXfont
- ref: b8dd42dce868f9c16a59790ce51f0542b59cb79d
- unpetrify-ref: baserock/morph
- build-depends:
- - freetype2
- - xorg-lib-libfontenc
-- name: freefont-otf
- repo: upstream:freefont-otf
- ref: 0ca3ccce74e81f7feb6e922edd988be0e1a43f05
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libICE
- repo: upstream:xorg-lib-libICE
- ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libSM
- repo: upstream:xorg-lib-libSM
- ref: 77ddd273239a629eeed7bd1d5b4509b1bd6d4e37
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libICE
-- name: xorg-lib-libXt
- repo: upstream:xorg-lib-libXt
- ref: ead50a9a274aa96bef94e57c4625be8e9288af4e
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libSM
-- name: xorg-lib-libXmu
- repo: upstream:xorg-lib-libXmu
- ref: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXpm
- repo: upstream:xorg-lib-libXpm
- ref: 81608285e11f2455800001a965dfece878861162
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXaw
- repo: upstream:xorg-lib-libXaw
- ref: a5630e166921b5b5322b30fb152df01bb6536e42
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
-- name: libsha1
- repo: upstream:libsha1
- ref: 17173732b9f1b2d4142de27913250b4563db2436
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xserver
- repo: upstream:xserver
- ref: b7cbfa882778cf8857577e0da77aa9295f072db3
- unpetrify-ref: baserock/morph
- build-depends:
- - libsha1
- - mesa-x
- - pixman
- - xorg-font-util
- - xorg-lib-libXaw
- - xorg-lib-libXfont
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
- - xorg-lib-libfontenc
- - xorg-lib-libxkbfile
-- name: xorg-driver-xf86-video-cirrus
- repo: upstream:xorg-driver-xf86-video-cirrus
- ref: 6504929481eab616f064b5d661a057de74b8b488
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-fbdev
- repo: upstream:xorg-driver-xf86-video-fbdev
- ref: ac293412a01d87f87eb61f4adb9db7486a75d3fc
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-vesa
- repo: upstream:xorg-driver-xf86-video-vesa
- ref: 29a149544e2120a582043738d5b09dd80e896345
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-evdev
- repo: upstream:xorg-driver-xf86-input-evdev
- ref: 2b8b0df62ec554952784f2820fb4143c495232b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-keyboard
- repo: upstream:xorg-driver-xf86-input-keyboard
- ref: 4a954bc6a8fbc4aa50dfcabec011274252713204
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-mouse
- repo: upstream:xorg-driver-xf86-input-mouse
- ref: 585f4030d77accf2a4ba115729ca08da82217863
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-app-xkbcomp
- repo: upstream:xorg-app-xkbcomp
- ref: 705b9bbb426410f9510601c7010da51184919b36
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libxkbfile
-- name: xkeyboard-config
- repo: upstream:xkeyboard-config
- ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-app-xkbcomp
-- name: xorg-app-xinit
- repo: upstream:xorg-app-xinit
- ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libXft
- repo: upstream:xorg-lib-libXft
- ref: c5e760a239afc62a1c75e0509868e35957c8df52
- unpetrify-ref: baserock/morph
- build-depends:
- - fontconfig
- - freetype2
-- name: xcb-util
- repo: upstream:xcb-util
- ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-wm
- repo: upstream:util-wm
- ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-keysyms
- repo: upstream:util-keysyms
- ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-image
- repo: upstream:util-image
- ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816
- unpetrify-ref: baserock/morph
- build-depends:
- - xcb-util
-- name: xterm
- repo: upstream:xterm
- ref: 7fc0a9529babac61d9a0b30e6ddb3c79e44af0e5
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXaw
- - xorg-lib-libxkbfile
-- name: xorg-app-xauth
- repo: upstream:xorg-app-xauth
- ref: 6dda11c17f2fdc47d43f269dccee98ec66cc8c4b
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph
deleted file mode 100644
index c19356c..0000000
--- a/x-x86_64-generic.morph
+++ /dev/null
@@ -1,206 +0,0 @@
-name: x-x86_64-generic
-kind: stratum
-build-depends:
-- morph: x-common
-chunks:
-- name: mesa-x
- repo: upstream:mesa
- ref: f64dd91f4f2a2591e66b38fdfdfa83077f8221ab
- unpetrify-ref: baserock/genivi/morph
- build-depends: []
-- name: xorg-lib-libxkbfile
- repo: upstream:xorg-lib-libxkbfile
- ref: 7381c2f9013ef7784c78091fa671e652a62ca706
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pixman
- repo: upstream:pixman
- ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-font-util
- repo: upstream:xorg-font-util
- ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libfontenc
- repo: upstream:xorg-lib-libfontenc
- ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-font-util
-- name: freetype2
- repo: upstream:freetype2
- ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: fontconfig
- repo: upstream:fontconfig
- ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
- unpetrify-ref: baserock/morph
- build-depends:
- - freetype2
-- name: xorg-lib-libXfont
- repo: upstream:xorg-lib-libXfont
- ref: b8dd42dce868f9c16a59790ce51f0542b59cb79d
- unpetrify-ref: baserock/morph
- build-depends:
- - freetype2
- - xorg-lib-libfontenc
-- name: freefont-otf
- repo: upstream:freefont-otf
- ref: 0ca3ccce74e81f7feb6e922edd988be0e1a43f05
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libICE
- repo: upstream:xorg-lib-libICE
- ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libSM
- repo: upstream:xorg-lib-libSM
- ref: 77ddd273239a629eeed7bd1d5b4509b1bd6d4e37
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libICE
-- name: xorg-lib-libXt
- repo: upstream:xorg-lib-libXt
- ref: ead50a9a274aa96bef94e57c4625be8e9288af4e
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libSM
-- name: xorg-lib-libXmu
- repo: upstream:xorg-lib-libXmu
- ref: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXpm
- repo: upstream:xorg-lib-libXpm
- ref: 81608285e11f2455800001a965dfece878861162
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXaw
- repo: upstream:xorg-lib-libXaw
- ref: a5630e166921b5b5322b30fb152df01bb6536e42
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
-- name: libsha1
- repo: upstream:libsha1
- ref: 17173732b9f1b2d4142de27913250b4563db2436
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xserver
- repo: upstream:xserver
- ref: b7cbfa882778cf8857577e0da77aa9295f072db3
- unpetrify-ref: baserock/morph
- build-depends:
- - libsha1
- - mesa-x
- - pixman
- - xorg-font-util
- - xorg-lib-libXaw
- - xorg-lib-libXfont
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
- - xorg-lib-libfontenc
- - xorg-lib-libxkbfile
-- name: xorg-driver-xf86-video-cirrus
- repo: upstream:xorg-driver-xf86-video-cirrus
- ref: 6504929481eab616f064b5d661a057de74b8b488
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-fbdev
- repo: upstream:xorg-driver-xf86-video-fbdev
- ref: ac293412a01d87f87eb61f4adb9db7486a75d3fc
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-vesa
- repo: upstream:xorg-driver-xf86-video-vesa
- ref: 29a149544e2120a582043738d5b09dd80e896345
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-evdev
- repo: upstream:xorg-driver-xf86-input-evdev
- ref: 2b8b0df62ec554952784f2820fb4143c495232b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-keyboard
- repo: upstream:xorg-driver-xf86-input-keyboard
- ref: 4a954bc6a8fbc4aa50dfcabec011274252713204
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-mouse
- repo: upstream:xorg-driver-xf86-input-mouse
- ref: 585f4030d77accf2a4ba115729ca08da82217863
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-app-xkbcomp
- repo: upstream:xorg-app-xkbcomp
- ref: 705b9bbb426410f9510601c7010da51184919b36
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libxkbfile
-- name: xkeyboard-config
- repo: upstream:xkeyboard-config
- ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-app-xkbcomp
-- name: xorg-app-xinit
- repo: upstream:xorg-app-xinit
- ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libXft
- repo: upstream:xorg-lib-libXft
- ref: c5e760a239afc62a1c75e0509868e35957c8df52
- unpetrify-ref: baserock/morph
- build-depends:
- - fontconfig
- - freetype2
-- name: xcb-util
- repo: upstream:xcb-util
- ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-wm
- repo: upstream:util-wm
- ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-keysyms
- repo: upstream:util-keysyms
- ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-image
- repo: upstream:util-image
- ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816
- unpetrify-ref: baserock/morph
- build-depends:
- - xcb-util
-- name: xterm
- repo: upstream:xterm
- ref: 7fc0a9529babac61d9a0b30e6ddb3c79e44af0e5
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXaw
- - xorg-lib-libxkbfile
-- name: xorg-app-xauth
- repo: upstream:xorg-app-xauth
- ref: 6dda11c17f2fdc47d43f269dccee98ec66cc8c4b
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
diff --git a/xfce-system.morph b/xfce-system.morph
index b2fd7d2..b771d5e 100644
--- a/xfce-system.morph
+++ b/xfce-system.morph
@@ -17,7 +17,7 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia
- morph: genivi
- morph: genivi-x-x86_64-generic
diff --git a/xfce.morph b/xfce.morph
index 1e7a1f4..e3dcb8e 100644
--- a/xfce.morph
+++ b/xfce.morph
@@ -2,9 +2,9 @@ name: xfce
kind: stratum
description: xfce stratum
build-depends:
-- morph: genivi-x-x86_64-generic
+- morph: genivi-x-generic
- morph: gtk2
-- morph: x-x86_64-generic
+- morph: x-generic
chunks:
- name: xfce-dev-tools
repo: upstream:xfce/xfce4-dev-tools
--
1.8.4
9 years, 3 months
[PATCH 0/6 v2] Allow morph deploy to deploy individual systems from a cluster
by Adam Coldrick
Hi all,
This revision of the series fixes the lack of tests for the new
functionality, and also fixes the issue where subsystems would not
have been deployed correctly (or validated).
Repo: git://git.baserock.org/baserock/baserock/morph.git
Ref: baserock/adamcoldrick/deploy-specific-systems-v3
SHA1: 10130eae94d567a27d5b34410314f2a68b0fa352
Target: master
Adam Coldrick (6):
Don't validate when loading all morphologies
Validate cluster morphologies
Add unit test to test the validation of cluster morphs
Allow the user to specify deployments in a cluster
Update the help text for morph deploy
Add yarn tests for new deployment functionality
morphlib/morphloader.py | 19 ++++++++++-
morphlib/morphloader_tests.py | 15 +++++++++
morphlib/plugins/deploy_plugin.py | 36 +++++++++++++++------
morphlib/sysbranchdir.py | 4 ++-
yarns/deployment.yarn | 67 +++++++++++++++++++++++++++++++++++++++
yarns/implementations.yarn | 3 ++
6 files changed, 133 insertions(+), 11 deletions(-)
--
1.9.1
9 years, 3 months
[PATCH 0/2] Build cpython with readline
by Richard Ipsum
repo: https://richardipsum@bitbucket.org/richardipsum/definitions.git
ref: baserock/straycat/readline_python
head: 33d836cbf27af4be142281d08c3fb02902b7e98c
Hey all,
This builds cpython with readline.
I've built and deployed a base-system-x86_32 and a devel-system-x86_32
and it works well.
Initially I tried using the newer readline (6.3) but python wouldn't compile
with that, so for now it's using readline 5.2. I think the issue I encountered
compiling with 6.3 may have been fixed now [1] so we might want to move
to the fixed version.
[1] http://bugs.python.org/issue20374
Richard Ipsum (2):
Build cpython with readline
Take readline out of audio-bluetooth
audio-bluetooth.morph | 6 ------
core.morph | 7 +++++++
2 files changed, 7 insertions(+), 6 deletions(-)
--
1.7.10.4
9 years, 3 months
Baserock 14.22 is released
by Sam Thursfield
Major changes since Baserock 14.20:
* VirtualBox deployment now supports Vagrant. See:
<http://wiki.baserock.org/guides/vagrant-basebox/>
* Additional checks when deploying upgrades with the 'ssh-rsync'
extension.
* Added example web-system, containing Node, Python, Ruby, PostgreSQL,
Redis, Memcached and more.
* Added gitlab-system, which can be used to build and deploy an
instance of the GitLab git management software. See
<http://www.gitlab.com> for more info about Gitlab.
* The development system image for the Wandboard ARM device is now
built and released with each new Baserock version.
* Development chroots now contain BSP tools, which means that,
provided the host system's kernel includes the Btrfs filesystem,
`morph deploy` inside a development chroot can now be used to deploy
systems as disk images.
There have also been small bug fixes and component updates.
Please get in touch if you have any issues! See below for contact
information.
# How do I get started?
Start with the following page: <http://wiki.baserock.org/quick-start/>
# How do I get in contact?
- IRC: freenode #baserock
- Public mailing list: baserock-dev(a)baserock.org
- See also: <http://wiki.baserock.org/mailinglist/>
If you find a bug in Baserock, we'd like to hear from you using one of
the above methods.
The Baserock project welcomes new participants! We hope you enjoy
experimenting with Baserock and look forward to hearing about any cool
things you do with our work.
--
Sam Thursfield, Codethink Ltd.
Office telephone: +44 161 236 5575
9 years, 3 months
DRAFT: Baserock 14.22 release notes
by Sam Thursfield
I realise I'm cutting it a bit fine with these release notes ... I
apologise! I'd appreciate review from anyone who has time.
---
# Baserock 14.22 is released
Major changes since Baserock 14.20:
* VirtualBox deployment now supports Vagrant. See:
<http://wiki.baserock.org/guides/vagrant-basebox/>
* Additional checks when deploying upgrades with the 'ssh-rsync'
extension.
* Added example web-system, containing Node, Python, Ruby, PostgreSQL,
Redis, Memcached and more.
* Added gitlab-system, which can be used to build and deploy an
instance of the GitLab git management software. See
<http://www.gitlab.com> for more info about Gitlab.
* The development system image for the Wandboard ARM device is now
built and released with each new Baserock version.
* Development chroots now contain BSP tools, which means that,
provided the host system's kernel includes the Btrfs filesystem,
`morph deploy` inside a development chroot can now be used to deploy
systems as disk images.
There have also been small bug fixes and component updates.
Please get in touch if you have any issues! See below for contact
information.
# How do I get started?
Start with the following page: <http://wiki.baserock.org/quick-start/>
# How do I get in contact?
- IRC: freenode #baserock
- Public mailing list: baserock-dev(a)baserock.org
- See also: <http://wiki.baserock.org/mailinglist/>
If you find a bug in Baserock, we'd like to hear from you using one of
the above methods.
The Baserock project welcomes new participants! We hope you enjoy
experimenting with Baserock and look forward to hearing about any cool
things you do with our work.
--
Sam Thursfield, Codethink Ltd.
Office telephone: +44 161 236 5575
9 years, 3 months
[PATCH 00/25] TBDiff Overhaul
by Ben Brewer
REPO: ssh://git@git.baserock.org/baserock/baserock/tbdiff.git
BRANCH: baserock/benbrewer/overhaul
HEAD: ebfbba3caa591c472715169a000425fcf0750799
This is a set of patches which cleans up and fixes some bugs in
tbdiff, this cleanup is a precursor to continuing with the items
on the TODO list.
Ben Brewer (25):
documentation: Remove issues which have already been resolved
Update gitignore file to ignore autotools generated files
Use sys/xattr from libc if attr/xattr is unavailable
Use ENODATA instead of ENOATTR
Fix memory leak of name in tbdiff-stat.c
Fix fp resource leaks in tbdiff-apply
style: Convert all cpp style comments to c style comments
style: Fix alignment of tbd_stat_t struct members
style: Fix indentation and whitespace in tbdiff-io.c
style: Fix alignment and whitespace issues in tbdiff-create
style: Fix alignment and func defs in tbdiff-apply.c
style: Fix whitespace in tbdiff-common.h
Create tbd_cmd_t type to for commands and use sizeof in write
Use correct pointer type for parent member in tbd_stat_t
Make TB_DIFF_PROTOCOL_ID a static const char for type safety
Simplify endian swapping in tbdiff-io.c
Add externs to functions in tbdiff-io.h and cleanup
style: Cleanup the names of the tbd read/write wrappers
Remove read/write_size from tbdiff-io since they're unused
style: Rename fread/fwrite in function names to read and write
Cleanup writing of xattr pairs in tbdiff-create.c
Added warning and debug mechanism to tbdiff-common.h
Use TBD_DEBUG macro instead of fprint for debug messages
Use TBD_DEBUG macro to print the value of an invalid command
Print warning using TBD_WARN when chown fails
.gitignore | 28 +++++
TODO | 14 ---
tbdiff/tbdiff-apply.c | 267 ++++++++++++++++++++++++++------------------
tbdiff/tbdiff-common.h | 81 +++++++++-----
tbdiff/tbdiff-create.c | 289 ++++++++++++++++++++++++------------------------
tbdiff/tbdiff-io.c | 202 +++++++++++++++------------------
tbdiff/tbdiff-io.h | 48 +++-----
tbdiff/tbdiff-private.h | 4 +-
tbdiff/tbdiff-stat.c | 6 +-
tbdiff/tbdiff-stat.h | 18 +--
tbdiff/tbdiff-xattrs.c | 11 +-
11 files changed, 513 insertions(+), 455 deletions(-)
--
1.9.1
9 years, 3 months
[PATCH 0/3] Things for automating releases
by Richard Ipsum
repo: git://git.baserock.org/baserock/baserock/morph
ref: baserock/richardipsum/write_kernel
head: 95e5845ed1b846915f196939359466a5490f93e1
Richard Ipsum (3):
Add ssh keys conf ext
More info in msg
Add option to write out kernel image
morphlib/exts/kvm.write | 3 ++-
morphlib/exts/ssh-keys.configure | 28 ++++++++++++++++++++++++++++
morphlib/writeexts.py | 9 +++++++++
3 files changed, 39 insertions(+), 1 deletion(-)
create mode 100755 morphlib/exts/ssh-keys.configure
--
1.7.10.4
9 years, 3 months
