From c6b6225e4f5872ea749fde416bca8e6b89cb5424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Wed, 19 Aug 2015 19:11:29 +0100
Subject: Use git as a build dependency instead hack morphologies manually

This actually revert some changes we made a while back (74ce6a18, 7cb71771,
7c2bfac9)
I realize we will have to patch a lot of modules manually following this route.
Also, I remember to see some commands from chunks that, even they build fine,
they will show UNKNOWN if you type <command> --version

Basically the chunks assume that if you are building from git, you have git
installed

Change-Id: I886288553e8edf05ffc1cb497fabbadb468819b7
---
 strata/core.morph            | 82 ++++++++++++++++++++------------------------
 strata/core/bison.morph      |  1 -
 strata/core/libtool.morph    |  1 -
 strata/core/patch.morph      |  1 -
 strata/core/util-linux.morph |  1 -
 5 files changed, 37 insertions(+), 49 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index 9e4fd4e1..6f831cdb 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -166,9 +166,38 @@ chunks:
   unpetrify-ref: 0.22
   build-depends:
   - cpython
-# Note: bison's version number must be set in bison's chunk morph,
-# so if you update bison be sure to also update the version number
-# in strata/core/bison.morph
+- name: ca-certificates
+  morph: strata/core/ca-certificates.morph
+  repo: upstream:ca-certificates
+  ref: e9b06b26d9e57444e74a5cb6beca3f12726fc3c6
+  unpetrify-ref: baserock/debian/20140325
+  build-depends:
+  - automake
+  - cpython
+- name: curl
+  morph: strata/core/curl.morph
+  repo: upstream:curl
+  ref: 202aa9f7758636730299b86715d924f54468a908
+  unpetrify-ref: curl-7_38_0
+  build-depends:
+  - autoconf
+  - automake
+  - file
+  - libtool-tarball
+  - openssl-new
+  - ca-certificates
+- name: git
+  morph: strata/core/git.morph
+  repo: upstream:git
+  ref: 9874fca7122563e28d699a911404fc49d2a24f1c
+  unpetrify-ref: v2.3.0
+  build-depends:
+  - autoconf
+  - cpython
+  - curl
+  - gettext-tarball
+  - libexpat
+  - openssl-new
 - name: bison
   morph: strata/core/bison.morph
   repo: upstream:bison
@@ -179,11 +208,9 @@ chunks:
   - automake
   - flex
   - gettext-tarball
+  - git
   - help2man
   - mini-utils
-# Note: patch's version number must be set in patch's chunk morph,
-# so if you update patch be sure to also update the version number
-# in strata/core/patch.morph
 - name: patch
   morph: strata/core/patch.morph
   repo: upstream:patch
@@ -192,8 +219,9 @@ chunks:
   build-depends:
   - autoconf
   - automake
-  - mini-utils
   - bison
+  - git
+  - mini-utils
 - name: xz
   repo: upstream:xz
   ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a
@@ -204,9 +232,6 @@ chunks:
   - file
   - gettext-tarball
   - libtool-tarball
-# Note: libtool's version number must be set in libtool's chunk morph,
-# so if you update libtool be sure to also update the version number
-# in strata/core/libtool.morph
 - name: libtool
   morph: strata/core/libtool.morph
   repo: upstream:libtool
@@ -217,6 +242,7 @@ chunks:
   - automake
   - file
   - help2man
+  - git
   - patch
   - texinfo-tarball
   - xz
@@ -231,26 +257,6 @@ chunks:
   - cpython
   - libtool
   - xz
-- name: ca-certificates
-  morph: strata/core/ca-certificates.morph
-  repo: upstream:ca-certificates
-  ref: e9b06b26d9e57444e74a5cb6beca3f12726fc3c6
-  unpetrify-ref: baserock/debian/20140325
-  build-depends:
-  - automake
-  - cpython
-- name: curl
-  morph: strata/core/curl.morph
-  repo: upstream:curl
-  ref: 202aa9f7758636730299b86715d924f54468a908
-  unpetrify-ref: curl-7_38_0
-  build-depends:
-  - autoconf
-  - automake
-  - file
-  - libtool
-  - openssl-new
-  - ca-certificates
 - name: XML-Parser
   repo: upstream:XML-Parser
   ref: e1a3ec157140a699e3020836475a0df622f70f1b
@@ -258,18 +264,6 @@ chunks:
   build-depends:
   - libexpat
   - perl
-- name: git
-  morph: strata/core/git.morph
-  repo: upstream:git
-  ref: 9874fca7122563e28d699a911404fc49d2a24f1c
-  unpetrify-ref: v2.3.0
-  build-depends:
-  - autoconf
-  - cpython
-  - curl
-  - gettext-tarball
-  - libexpat
-  - openssl-new
 - name: gperf
   morph: strata/core/gperf.morph
   repo: upstream:gperf
@@ -358,9 +352,6 @@ chunks:
   - acl
   - linux-pam
   - libcap2
-# Note: util-linux's version number must be set in util-linux's chunk morph,
-# so if you update util-linux be sure to also update the version number
-# in strata/core/util-linux.morph
 - name: util-linux
   morph: strata/core/util-linux.morph
   repo: upstream:util-linux
@@ -370,6 +361,7 @@ chunks:
   - autoconf
   - automake
   - gettext-tarball
+  - git
   - libtool
   - pkg-config
   - linux-pam
diff --git a/strata/core/bison.morph b/strata/core/bison.morph
index 352f5fcf..f122ca3f 100644
--- a/strata/core/bison.morph
+++ b/strata/core/bison.morph
@@ -2,5 +2,4 @@ name: bison
 kind: chunk
 build-system: autotools
 pre-configure-commands:
-- echo "3.0.2" > .tarball-version
 - sh bootstrap --skip-po --no-git --gnulib-srcdir=gnulib
diff --git a/strata/core/libtool.morph b/strata/core/libtool.morph
index d4465c31..04263ac9 100644
--- a/strata/core/libtool.morph
+++ b/strata/core/libtool.morph
@@ -2,5 +2,4 @@ name: libtool
 kind: chunk
 build-system: autotools
 pre-configure-commands:
-- echo "2.4.6" > .tarball-version
 - ./bootstrap
diff --git a/strata/core/patch.morph b/strata/core/patch.morph
index 48c9c437..b7f146ef 100644
--- a/strata/core/patch.morph
+++ b/strata/core/patch.morph
@@ -2,5 +2,4 @@ name: patch
 kind: chunk
 build-system: autotools
 pre-configure-commands:
-- echo "2.7.1" > .tarball-version
 - ./bootstrap --skip-po
diff --git a/strata/core/util-linux.morph b/strata/core/util-linux.morph
index 290283d1..1ec7f8e2 100644
--- a/strata/core/util-linux.morph
+++ b/strata/core/util-linux.morph
@@ -2,7 +2,6 @@ name: util-linux
 kind: chunk
 build-system: autotools
 pre-configure-commands:
-- echo "2.26.1" > .tarball-version
 - ./autogen.sh
 configure-commands:
 # Installing to /bin so that they overwrite busybox login.
-- 
cgit v1.2.1