summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--strata/core.morph12
-rw-r--r--strata/core/git-minimal.morph (renamed from strata/core/git.morph)2
-rw-r--r--strata/devtools.morph6
-rw-r--r--strata/devtools/git.morph9
4 files changed, 22 insertions, 7 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 4d51b763..23b24e8d 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -159,8 +159,8 @@ chunks:
unpetrify-ref: gettext-0.19.4
build-depends:
- libexpat
-- name: git
- morph: strata/core/git.morph
+- name: git-minimal
+ morph: strata/core/git-minimal.morph
repo: upstream:git
ref: 9874fca7122563e28d699a911404fc49d2a24f1c
unpetrify-ref: v2.3.0
@@ -195,7 +195,7 @@ chunks:
- automake
- flex
- gettext-tarball
- - git
+ - git-minimal
- help2man
- mini-utils
- name: patch
@@ -207,7 +207,7 @@ chunks:
- autoconf
- automake
- bison
- - git
+ - git-minimal
- mini-utils
- name: xz
repo: upstream:xz
@@ -230,7 +230,7 @@ chunks:
- automake
- file
- help2man
- - git
+ - git-minimal
- patch
- texinfo-tarball
- xz
@@ -317,7 +317,7 @@ chunks:
- autoconf
- automake
- gettext-tarball
- - git
+ - git-minimal
- libtool
- pkg-config
- linux-pam
diff --git a/strata/core/git.morph b/strata/core/git-minimal.morph
index 765f4a5c..8b562ef6 100644
--- a/strata/core/git.morph
+++ b/strata/core/git-minimal.morph
@@ -1,4 +1,4 @@
-name: git
+name: git-minimal
kind: chunk
build-system: autotools
pre-configure-commands:
diff --git a/strata/devtools.morph b/strata/devtools.morph
index c48d63ab..5b714397 100644
--- a/strata/devtools.morph
+++ b/strata/devtools.morph
@@ -8,6 +8,7 @@ description: |
build-depends:
- morph: strata/core.morph
- morph: strata/python2-core.morph
+- morph: strata/docutils.morph
chunks:
- name: nano
morph: strata/devtools/nano.morph
@@ -44,3 +45,8 @@ chunks:
repo: upstream:wget
ref: 71d79f4f3043cf4ca3b2fb7f5328eae725c1293f
unpetrify-ref: baserock/v1.16.3
+- name: git
+ morph: strata/devtools/git.morph
+ repo: upstream:git
+ ref: 9874fca7122563e28d699a911404fc49d2a24f1c
+ unpetrify-ref: v2.3.0
diff --git a/strata/devtools/git.morph b/strata/devtools/git.morph
new file mode 100644
index 00000000..6ca079a5
--- /dev/null
+++ b/strata/devtools/git.morph
@@ -0,0 +1,9 @@
+name: git
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- make configure
+build-commands:
+- make all doc
+install-commands:
+- make install install-doc