summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-06-01 21:11:37 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-06-07 23:31:24 (GMT)
commit67bcbf986a19ada7574224d1b6cc3ec7039398b8 (patch)
treecb525e655848a183423486ab5e64f1aba671a3dc
parent975c40201ecfee899932f0a8a532b82a3b8141bf (diff)
downloaddefinitions-67bcbf986a19ada7574224d1b6cc3ec7039398b8.tar.gz
Use latest zlib (1.2.8)
Also remove morph file as doesnt seem to be needed Change-Id: I2be278552baee752db39d1af7f95e7e98de75cf9
-rw-r--r--strata/build-essential.morph5
-rw-r--r--strata/build-essential/zlib.morph9
2 files changed, 2 insertions, 12 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 4a03fe3..3c7bbfa 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -266,10 +266,9 @@ chunks:
glibc-nss: build-essential-runtime
- name: zlib
- morph: strata/build-essential/zlib.morph
repo: upstream:zlib
- ref: db333af7e9b90a23fd7f9cd8dc128123b34bf698
- unpetrify-ref: baserock/build-essential
+ ref: 50893291621658f355bc5b4d450a8d06a563053d
+ unpetrify-ref: v1.2.8
build-depends:
- stage2-binutils
- stage2-busybox
diff --git a/strata/build-essential/zlib.morph b/strata/build-essential/zlib.morph
deleted file mode 100644
index a69eebf..0000000
--- a/strata/build-essential/zlib.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: zlib
-kind: chunk
-max-jobs: 1
-configure-commands:
-- ./configure --prefix="$PREFIX"
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install